From patchwork Tue Dec 18 00:46:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1889541 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 95FC8DF266 for ; Tue, 18 Dec 2012 00:51:31 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TklLt-0003ba-Ey; Tue, 18 Dec 2012 00:48:09 +0000 Received: from kirsty.vergenet.net ([202.4.237.240]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TklKK-00035e-2t for linux-arm-kernel@lists.infradead.org; Tue, 18 Dec 2012 00:46:38 +0000 Received: from ayumi.akashicho.tokyo.vergenet.net (p4024-ipbfp1903kobeminato.hyogo.ocn.ne.jp [114.172.131.24]) by kirsty.vergenet.net (Postfix) with ESMTP id B8651267160; Tue, 18 Dec 2012 11:46:20 +1100 (EST) Received: by ayumi.akashicho.tokyo.vergenet.net (Postfix, from userid 7100) id 56211EDE145; Tue, 18 Dec 2012 09:46:18 +0900 (JST) From: Simon Horman To: linux-sh@vger.kernel.org Subject: [PATCH 8/9] ARM: shmobile: sh7372: Do not initialise TMU when using DT Date: Tue, 18 Dec 2012 09:46:12 +0900 Message-Id: <1355791573-20281-9-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1355791573-20281-1-git-send-email-horms+renesas@verge.net.au> References: <1355791573-20281-1-git-send-email-horms+renesas@verge.net.au> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121217_194632_603108_DBEE4DB1 X-CRM114-Status: GOOD ( 14.41 ) X-Spam-Score: -3.3 (---) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-3.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [202.4.237.240 listed in list.dnswl.org] -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: devicetree-discuss@lists.ozlabs.org, Magnus Damm , Bastian Hecht , Magnus Damm , Paul Mundt , Simon Horman , Nobuhiro Iwamatsu , Guennadi Liakhovetski , 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 This is in preparation for initialising INTC using DT. The proposed INTC configuration is not complete and does not allow the TMU to be initialised, to exclude it when using DT. Cc: Magnus Damm Cc: Nobuhiro Iwamatsu Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/setup-sh7372.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c index a07954f..90af2e9 100644 --- a/arch/arm/mach-shmobile/setup-sh7372.c +++ b/arch/arm/mach-shmobile/setup-sh7372.c @@ -968,7 +968,7 @@ static struct platform_device spu1_device = { .num_resources = ARRAY_SIZE(spu1_resources), }; -static struct platform_device *sh7372_early_devices[] __initdata = { +static struct platform_device *sh7372_early_devices_dt[] __initdata = { &scif0_device, &scif1_device, &scif2_device, @@ -977,6 +977,9 @@ static struct platform_device *sh7372_early_devices[] __initdata = { &scif5_device, &scif6_device, &cmt2_device, +}; + +static struct platform_device *sh7372_early_devices[] __initdata = { &tmu00_device, &tmu01_device, }; @@ -1030,6 +1033,8 @@ void __init sh7372_add_standard_devices(void) sh7372_init_pm_domains(); + platform_add_devices(sh7372_early_devices_dt, + ARRAY_SIZE(sh7372_early_devices_dt)); platform_add_devices(sh7372_early_devices, ARRAY_SIZE(sh7372_early_devices)); @@ -1048,6 +1053,8 @@ static void __init sh7372_earlytimer_init(void) void __init sh7372_add_early_devices(void) { + early_platform_add_devices(sh7372_early_devices_dt, + ARRAY_SIZE(sh7372_early_devices_dt)); early_platform_add_devices(sh7372_early_devices, ARRAY_SIZE(sh7372_early_devices)); @@ -1064,8 +1071,8 @@ void __init sh7372_add_early_devices_dt(void) { shmobile_setup_delay(800, 1, 3); /* Cortex-A8 @ 800MHz */ - early_platform_add_devices(sh7372_early_devices, - ARRAY_SIZE(sh7372_early_devices)); + early_platform_add_devices(sh7372_early_devices_dt, + ARRAY_SIZE(sh7372_early_devices_dt)); /* setup early console here as well */ shmobile_setup_console(); @@ -1080,8 +1087,8 @@ void __init sh7372_add_standard_devices_dt(void) /* clocks are setup late during boot in the case of DT */ sh7372_clock_init(); - platform_add_devices(sh7372_early_devices, - ARRAY_SIZE(sh7372_early_devices)); + platform_add_devices(sh7372_early_devices_dt, + ARRAY_SIZE(sh7372_early_devices_dt)); of_platform_populate(NULL, of_default_bus_match_table, sh7372_auxdata_lookup, NULL);