From patchwork Fri Sep 28 20:02:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1523221 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 0C49C3FE80 for ; Fri, 28 Sep 2012 20:05:06 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1THgm3-0006Vt-0n; Fri, 28 Sep 2012 20:02:59 +0000 Received: from moutng.kundenserver.de ([212.227.126.186]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1THgly-0006Vf-9l for linux-arm-kernel@lists.infradead.org; Fri, 28 Sep 2012 20:02:56 +0000 Received: from klappe2.localnet (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0M1AGu-1Tbhct1rzs-00tLyI; Fri, 28 Sep 2012 22:02:31 +0200 From: Arnd Bergmann To: Simon Horman Subject: Re: [GIT PULL] Renesas ARM-based SoC: KZM-9A-GT for 3.7 Date: Fri, 28 Sep 2012 20:02:28 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0; KDE/4.3.2; x86_64; ; ) References: <1346113116-20252-1-git-send-email-horms@verge.net.au> In-Reply-To: <1346113116-20252-1-git-send-email-horms@verge.net.au> MIME-Version: 1.0 Message-Id: <201209282002.28445.arnd@arndb.de> X-Provags-ID: V02:K0:6wep+2voSnVs1I1glXZCzLNbwma6tQFGqgRR8Z1KX79 w7P2GfaoeICA9+nHDqZsb0yzh/QfyinyqbIhUiPEjhThN/9KYu 2yX2hhzNQFoIzjT3bgVK3R3OwQkHHHOdWltDda3dlErQTV4J+q /L27OGTFMXTxGrq/cgNVVJcslapfe6c0z9qPrmV1vbNjghCvBD r86vI5x3gT5QEVKBBCsslAX/UhSC5Mw8qMF0R2SdL+lHdW0PJa IErjp2+bSYISs/doGF5aMRcmYpc3XmlHMh2eWX88LO1HBMp2XE GnTyuGpTiFBOpDd8BBJcpYE3WP3G2Ll/dOUtFxyyXsoUPnj8Nn CLKxXnll9oR8q4ojrfQg= X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.186 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Tetsuyuki Kobayashi , arm@kernel.org, Kuninori Morimoto , linux-sh@vger.kernel.org, Magnus Damm , Paul Mundt , Olof Johansson , Nobuhiro Iwamatsu , 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: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Tuesday 28 August 2012, Simon Horman wrote: > ---------------------------------------------------------------- > Tetsuyuki Kobayashi (1): > ARM: shmobile: kzm9g: enable restarting > > arch/arm/mach-shmobile/board-kzm9g.c | 8 ++++++++ > 1 file changed, 8 insertions(+) This patch ended up causing a new build warning in combination with the io.h changes in Russell's tree. I've just applied this patch on top, which is the same thing we did to all the other open-coded mmio locations. Arnd commit 28901c1fed11dfeab65f640878e85a9b61d311ed Author: Arnd Bergmann Date: Sun Sep 23 22:41:21 2012 +0000 ARM: shmobile: add new __iomem annotation for new code While we fixed up all instances that were already present in v3.6, this one came in through new code. Without this patch, building kzm9g_defconfig results in: arch/arm/mach-shmobile/board-kzm9g.c: In function 'kzm9g_restart': arch/arm/mach-shmobile/board-kzm9g.c:781:2: warning: passing argument 2 of '__raw_writel' makes pointer from integer without a cast [enabled by default] Signed-off-by: Arnd Bergmann Cc: Nobuhiro Iwamatsu Cc: Kuninori Morimoto Cc: Tetsuyuki Kobayashi Cc: Simon Horman diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c index fd21fb6..5d792e4 100644 --- a/arch/arm/mach-shmobile/board-kzm9g.c +++ b/arch/arm/mach-shmobile/board-kzm9g.c @@ -765,7 +765,7 @@ static void __init kzm_init(void) static void kzm9g_restart(char mode, const char *cmd) { -#define RESCNT2 0xe6188020 +#define RESCNT2 IOMEM(0xe6188020) /* Do soft power on reset */ writel((1 << 31), RESCNT2); }