From patchwork Fri Aug 9 09:49:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2841857 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 612029F271 for ; Fri, 9 Aug 2013 10:30:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2CE1B202C6 for ; Fri, 9 Aug 2013 10:30:42 +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 35923202FE for ; Fri, 9 Aug 2013 10:30:41 +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 1V7jLe-0004cg-KT; Fri, 09 Aug 2013 09:51:09 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V7jKu-0008Hh-4Q; Fri, 09 Aug 2013 09:50:20 +0000 Received: from mail-pd0-x232.google.com ([2607:f8b0:400e:c02::232]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V7jKk-0008EB-S2 for linux-arm-kernel@lists.infradead.org; Fri, 09 Aug 2013 09:50:12 +0000 Received: by mail-pd0-f178.google.com with SMTP id w10so352014pde.23 for ; Fri, 09 Aug 2013 02:49:49 -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=ivVkgyAMIQYz9XHjBH0Z8mGhkN6hWMkkAOqVHnKaqW0=; b=W1LzTunnMqORXTSEytRQmcxC0/WxOn1I5gjoalBU5vNxmK5Q0vVem3z3xTTikEzXCz xWajKmy4g8fgd9iNtcrcIIROu5OFkbqChN9OFaxZGumOoUpm80kxqb0cpf6uIyZyUH54 egWQkzvzv7WJUosigS708c9BG7WG3oAao3J4LXUgE2ft1/Oys2bMeK3h4UKOHmTe01Qs gxIlT7UyWy2HWi/EowqMmdghzdfVxtYsqzSaMEj5G+6tJJD0rR7ssCaBlmo7YvFLMGLY DhD2XO9HREdTbQf+iugAaD06WpgMpreKdK3AGcw+4+YBgXDDNlhzFT5trBBUNTqPuiWi VF0w== X-Received: by 10.66.233.37 with SMTP id tt5mr10466329pac.95.1376041789131; Fri, 09 Aug 2013 02:49:49 -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 wr9sm19219443pbc.7.2013.08.09.02.49.45 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 09 Aug 2013 02:49:46 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Fri, 09 Aug 2013 18:49:58 +0900 Message-Id: <20130809094958.6530.41120.sendpatchset@w520> In-Reply-To: <20130809094748.6530.16511.sendpatchset@w520> References: <20130809094748.6530.16511.sendpatchset@w520> Subject: [PATCH 12/14] ARM: shmobile: Rename to r8a7740_init_early() X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130809_055011_062463_3248EC69 X-CRM114-Status: UNSURE ( 9.40 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) Cc: olof@lixom.net, horms@verge.net.au, Magnus Damm , linux-arm-kernel@lists.infradead.org, arnd@arndb.de 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 r8a7740_init_delay() into r8a7740_init_early() to make the function name show that more than just delay setup may happen in the future. Also, make sure shmobile_setup_delay() gets executed for both DT and C board code by updating r8a7740_add_early_devices() to call r8a7740_init_early(). Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/board-armadillo800eva-reference.c | 2 +- arch/arm/mach-shmobile/include/mach/r8a7740.h | 2 +- arch/arm/mach-shmobile/setup-r8a7740.c | 14 ++++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) --- 0005/arch/arm/mach-shmobile/board-armadillo800eva-reference.c +++ work/arch/arm/mach-shmobile/board-armadillo800eva-reference.c 2013-08-08 16:37:19.000000000 +0900 @@ -189,7 +189,7 @@ static const char *eva_boards_compat_dt[ DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva-reference") .map_io = r8a7740_map_io, - .init_early = r8a7740_init_delay, + .init_early = r8a7740_init_early, .init_irq = r8a7740_init_irq_of, .init_machine = eva_init, .init_late = shmobile_init_late, --- 0005/arch/arm/mach-shmobile/include/mach/r8a7740.h +++ work/arch/arm/mach-shmobile/include/mach/r8a7740.h 2013-08-08 16:37:19.000000000 +0900 @@ -47,7 +47,7 @@ enum { }; extern void r8a7740_meram_workaround(void); -extern void r8a7740_init_delay(void); +extern void r8a7740_init_early(void); extern void r8a7740_init_irq_of(void); extern void r8a7740_map_io(void); extern void r8a7740_add_early_devices(void); --- 0006/arch/arm/mach-shmobile/setup-r8a7740.c +++ work/arch/arm/mach-shmobile/setup-r8a7740.c 2013-08-08 16:37:19.000000000 +0900 @@ -984,8 +984,15 @@ void __init r8a7740_add_standard_devices rmobile_add_device_to_domain("A3SP", &i2c1_device); } +void __init r8a7740_init_early(void) +{ + shmobile_setup_delay(800, 1, 3); /* Cortex-A9 @ 800MHz */ +}; + void __init r8a7740_add_early_devices(void) { + r8a7740_init_early(); + early_platform_add_devices(r8a7740_early_devices, ARRAY_SIZE(r8a7740_early_devices)); early_platform_add_devices(r8a7740_devices_dt, @@ -1003,11 +1010,6 @@ void __init r8a7740_add_dt_devices(void) #ifdef CONFIG_USE_OF -void __init r8a7740_init_delay(void) -{ - shmobile_setup_delay(800, 1, 3); /* Cortex-A9 @ 800MHz */ -}; - void __init r8a7740_init_irq_of(void) { void __iomem *intc_prio_base = ioremap_nocache(0xe6900010, 0x10); @@ -1045,7 +1047,7 @@ static const char *r8a7740_boards_compat DT_MACHINE_START(R8A7740_DT, "Generic R8A7740 (Flattened Device Tree)") .map_io = r8a7740_map_io, - .init_early = r8a7740_init_delay, + .init_early = r8a7740_init_early, .init_irq = r8a7740_init_irq_of, .dt_compat = r8a7740_boards_compat_dt, MACHINE_END