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: 1523161 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id DDFC4DF283 for ; Fri, 28 Sep 2012 20:03:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031809Ab2I1UDB (ORCPT ); Fri, 28 Sep 2012 16:03:01 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:57072 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031445Ab2I1UC6 (ORCPT ); Fri, 28 Sep 2012 16:02:58 -0400 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; ; ) Cc: Olof Johansson , linux-sh@vger.kernel.org, arm@kernel.org, linux-arm-kernel@lists.infradead.org, Magnus Damm , Paul Mundt , Nobuhiro Iwamatsu , Kuninori Morimoto , Tetsuyuki Kobayashi 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= Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.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 --- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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); }