From patchwork Mon Feb 18 13:47:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2159051 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id DCBBDDF25A for ; Mon, 18 Feb 2013 13:44:43 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U7Qz3-0004yp-9w; Mon, 18 Feb 2013 13:42:17 +0000 Received: from mail-pa0-f52.google.com ([209.85.220.52]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U7QyS-0004gz-VP for linux-arm-kernel@lists.infradead.org; Mon, 18 Feb 2013 13:41:42 +0000 Received: by mail-pa0-f52.google.com with SMTP id fb1so2854916pad.39 for ; Mon, 18 Feb 2013 05:41:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:date:message-id:in-reply-to:references :subject; bh=+aKQyIoJ24ra6PorMw6ybA0ecikWgPi3ud+nKxDl88Y=; b=PPY8UaTJB5S4OJfEEp4r7vFjwyQZDW4gH1Zuc+yR4fKRpK7Ormk8B00mxSXVFbJ23y HoLhO++Smnt/6/kFaoSR6LRG4E1g6W1sNaVxnLgAypds2gdwh+1XnTa6UC9cThwEy8LI 93edXdN1y0+Vguu2DbZ11iFGrJdyfh03E8i+r6ftq74mmkhhEPtw5ekCVxANqXDVIbKb VFn29VdqOi0bU7xYSM6VGRlWgiQqj4iS+IoL6C2uNiCO/5iMFrBiW/k3ZIHuTjPwCG+p a8qrVsd5v1lJcQ6GXhi3gAvJkdB/IDXtRQ04PbKZbgGE+WVRY8nDh7SZgM8Nzbkk5QKc 81lg== X-Received: by 10.66.75.66 with SMTP id a2mr35863770paw.65.1361194898584; Mon, 18 Feb 2013 05:41:38 -0800 (PST) Received: from [127.0.0.1] (FL1-122-135-132-124.tky.mesh.ad.jp. [122.135.132.124]) by mx.google.com with ESMTPS id iv3sm14521428pbc.40.2013.02.18.05.41.35 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 18 Feb 2013 05:41:37 -0800 (PST) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Mon, 18 Feb 2013 22:47:16 +0900 Message-Id: <20130218134716.17303.17033.sendpatchset@w520> In-Reply-To: <20130218134648.17303.97576.sendpatchset@w520> References: <20130218134648.17303.97576.sendpatchset@w520> Subject: [PATCH 03/08] ARM: shmobile: Use R8A7779_SCU_BASE with TWD X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130218_084141_642874_31BD999E X-CRM114-Status: UNSURE ( 9.73 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.52 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (magnus.damm[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: hechtb@gmail.com, horms@verge.net.au, Magnus Damm , arnd@arndb.de, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Magnus Damm Rework the IOMEM() usage for the SCU base address in the case of r8a7779. Adjusts the TWD to use R8A7779_SCU_BASE. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/smp-r8a7779.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) --- 0003/arch/arm/mach-shmobile/smp-r8a7779.c +++ work/arch/arm/mach-shmobile/smp-r8a7779.c 2013-02-18 16:21:10.000000000 +0900 @@ -32,7 +32,7 @@ #include #define AVECR IOMEM(0xfe700040) -#define R8A7779_SCU_BASE IOMEM(0xf0000000) +#define R8A7779_SCU_BASE 0xf0000000 static struct r8a7779_pm_ch r8a7779_ch_cpu1 = { .chan_offs = 0x40, /* PWRSR0 .. PWRER0 */ @@ -59,8 +59,7 @@ static struct r8a7779_pm_ch *r8a7779_ch_ }; #ifdef CONFIG_HAVE_ARM_TWD -static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, 0xf0000600, 29); - +static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, R8A7779_SCU_BASE + 0x600, 29); void __init r8a7779_register_twd(void) { twd_local_timer_register(&twd_local_timer); @@ -178,7 +177,7 @@ static void __init r8a7779_smp_prepare_c static void __init r8a7779_smp_init_cpus(void) { /* setup r8a7779 specific SCU base */ - shmobile_scu_base = R8A7779_SCU_BASE; + shmobile_scu_base = IOMEM(R8A7779_SCU_BASE); shmobile_smp_init_cpus(scu_get_core_count(shmobile_scu_base)); }