From patchwork Fri Aug 9 09:49:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2841848 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F18DC9F271 for ; Fri, 9 Aug 2013 10:18:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DD95E20222 for ; Fri, 9 Aug 2013 10:18:53 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A8C862022F for ; Fri, 9 Aug 2013 10:18:52 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V7jL6-00048b-3k; Fri, 09 Aug 2013 09:50:35 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V7jKM-0008DY-NG; Fri, 09 Aug 2013 09:49:46 +0000 Received: from mail-pa0-x236.google.com ([2607:f8b0:400e:c03::236]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V7jKC-00089U-Mc for linux-arm-kernel@lists.infradead.org; Fri, 09 Aug 2013 09:49:40 +0000 Received: by mail-pa0-f54.google.com with SMTP id kx1so4766191pab.41 for ; Fri, 09 Aug 2013 02:49:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=kefuodqBml8KWp/v1MYvGImw920KOUI7ppNwldXVKNo=; b=Pn+sQTkyJoHe0Qa4g+CdQvyesADFfqLYiKPJHsRuJ+UjqFC4KmfaEkgvFeCzYvzd2P qsBcA6ij0qvx+wNZpQ9xR0F+TD5zu3nrtLfVyDl2WqCSA0MPZYnsX7KqMQtUQ6baFU5/ oOpjSxsc4bPDRly9w/pSy+nHNAniSgah4M+ZYyLYtAyEKOKcYNkYKJSD00BEsERsQx15 lwdnkApZSD21PtE03hbRY2awwxk0CWS+Ef1BwNOaEirtbq6IuWuehMDRwDih0P+CShlt S3A0JqJDRtAZekuFn/anwl09ZOhq1nkwlbZ7Z78cb41u4j6/hFAFfbsaQTRAdRgX4MVh d0WQ== X-Received: by 10.68.212.229 with SMTP id nn5mr10654165pbc.44.1376041755139; Fri, 09 Aug 2013 02:49:15 -0700 (PDT) Received: from [127.0.0.1] (ac230065.ppp.asahi-net.or.jp. [183.77.230.65]) by mx.google.com with ESMTPSA id bb1sm19210744pbc.10.2013.08.09.02.49.11 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 09 Aug 2013 02:49:13 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Fri, 09 Aug 2013 18:49:26 +0900 Message-Id: <20130809094926.6530.46771.sendpatchset@w520> In-Reply-To: <20130809094748.6530.16511.sendpatchset@w520> References: <20130809094748.6530.16511.sendpatchset@w520> Subject: [PATCH 09/14] ARM: shmobile: Rename to sh7372_init_early() X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130809_054936_907369_40FDEFFA X-CRM114-Status: GOOD ( 10.03 ) X-Spam-Score: -2.0 (--) Cc: olof@lixom.net, 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.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Magnus Damm Rename sh7372_add_early_device_dt() into sh7372_init_early() and make it static since we have no sh7372 DT reference board code. Also, in case of DT we do not use any early console or early timers, so get rid of early platform stuff and early console for the DT case. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/include/mach/sh7372.h | 1 - arch/arm/mach-shmobile/setup-sh7372.c | 10 ++-------- 2 files changed, 2 insertions(+), 9 deletions(-) --- 0007/arch/arm/mach-shmobile/include/mach/sh7372.h +++ work/arch/arm/mach-shmobile/include/mach/sh7372.h 2013-08-08 15:46:38.000000000 +0900 @@ -63,7 +63,6 @@ extern void sh7372_map_io(void); extern void sh7372_earlytimer_init(void); extern void sh7372_add_early_devices(void); extern void sh7372_add_standard_devices(void); -extern void sh7372_add_early_devices_dt(void); extern void sh7372_clock_init(void); extern void sh7372_pinmux_init(void); extern void sh7372_pm_init(void); --- 0007/arch/arm/mach-shmobile/setup-sh7372.c +++ work/arch/arm/mach-shmobile/setup-sh7372.c 2013-08-08 15:48:51.000000000 +0900 @@ -1135,15 +1135,9 @@ void __init sh7372_add_early_devices(voi #ifdef CONFIG_USE_OF -void __init sh7372_add_early_devices_dt(void) +static void __init sh7372_init_early(void) { shmobile_setup_delay(800, 1, 3); /* Cortex-A8 @ 800MHz */ - - early_platform_add_devices(sh7372_early_devices, - ARRAY_SIZE(sh7372_early_devices)); - - /* setup early console here as well */ - shmobile_setup_console(); } static const char *sh7372_boards_compat_dt[] __initdata = { @@ -1153,7 +1147,7 @@ static const char *sh7372_boards_compat_ DT_MACHINE_START(SH7372_DT, "Generic SH7372 (Flattened Device Tree)") .map_io = sh7372_map_io, - .init_early = sh7372_add_early_devices_dt, + .init_early = sh7372_init_early, .nr_irqs = NR_IRQS_LEGACY, .init_irq = sh7372_init_irq, .handle_irq = shmobile_handle_irq_intc,