From patchwork Wed Sep 5 09:59:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Pallardy X-Patchwork-Id: 1408171 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 0DF65DF264 for ; Wed, 5 Sep 2012 10:08:36 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T9CSG-00074g-Og; Wed, 05 Sep 2012 10:03:29 +0000 Received: from eu1sys200aog113.obsmtp.com ([207.126.144.135]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1T9COp-00059a-Qr for linux-arm-kernel@lists.infradead.org; Wed, 05 Sep 2012 10:00:11 +0000 Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob113.postini.com ([207.126.147.11]) with SMTP ID DSNKUEcil0d8tCFGiowY5T7OB0Zrwbu/MzEn@postini.com; Wed, 05 Sep 2012 09:59:55 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 6C1E42DB; Wed, 5 Sep 2012 09:59:48 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 0227227A4; Wed, 5 Sep 2012 09:59:48 +0000 (GMT) Received: from exdcvycastm004.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm004", Issuer "exdcvycastm004" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 440C224C2F5; Wed, 5 Sep 2012 11:59:37 +0200 (CEST) Received: from lmenx30v.lme.st.com (10.230.100.153) by smtp.stericsson.com (10.230.100.2) with Microsoft SMTP Server (TLS) id 8.3.83.0; Wed, 5 Sep 2012 11:59:42 +0200 From: Loic Pallardy To: Samuel Ortiz , , , Linus Walleij Subject: [PATCH 16/17] arm: ux500: add dbx540 prcmu platform data Date: Wed, 5 Sep 2012 11:59:12 +0200 Message-ID: <1346839153-6465-17-git-send-email-loic.pallardy-ext@stericsson.com> X-Mailer: git-send-email 1.7.11.1 In-Reply-To: <1346839153-6465-1-git-send-email-loic.pallardy-ext@stericsson.com> References: <1346839153-6465-1-git-send-email-loic.pallardy-ext@stericsson.com> MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [207.126.144.135 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Loic Pallardy , Loic Pallardy , STEricsson_nomadik_linux , Loic Pallardy , Lee Jones , LT ST-Ericsson 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 Add support for new dbx540-prcmu driver. Signed-off-by: Loic Pallardy Acked-by: Linus Walleij --- arch/arm/mach-ux500/board-mop500.c | 12 ++++++++++++ arch/arm/mach-ux500/cpu-db8500.c | 7 +++++-- arch/arm/mach-ux500/include/mach/devices.h | 3 +++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 0869c58..ed1507a 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -600,6 +600,9 @@ static void __init mop500_init_machine(void) mop500_pinmaps_init(); parent = u8500_init_devices(&ab8500_platdata); + db8500_prcmu_device.dev.parent = parent; + db8500_prcmu_device.dev.platform_data = &ab8500_platdata; + platform_device_register(&db8500_prcmu_device); for (i = 0; i < ARRAY_SIZE(mop500_platform_devs); i++) mop500_platform_devs[i]->dev.parent = parent; @@ -634,6 +637,9 @@ static void __init snowball_init_machine(void) snowball_pinmaps_init(); parent = u8500_init_devices(&ab8500_platdata); + db8500_prcmu_device.dev.parent = parent; + db8500_prcmu_device.dev.platform_data = &ab8500_platdata; + platform_device_register(&db8500_prcmu_device); for (i = 0; i < ARRAY_SIZE(snowball_platform_devs); i++) snowball_platform_devs[i]->dev.parent = parent; @@ -666,6 +672,9 @@ static void __init hrefv60_init_machine(void) hrefv60_pinmaps_init(); parent = u8500_init_devices(&ab8500_platdata); + db8500_prcmu_device.dev.parent = parent; + db8500_prcmu_device.dev.platform_data = &ab8500_platdata; + platform_device_register(&db8500_prcmu_device); for (i = 0; i < ARRAY_SIZE(mop500_platform_devs); i++) mop500_platform_devs[i]->dev.parent = parent; @@ -702,6 +711,9 @@ static void __init u9540_init_machine(void) ccu9540_pins_init(); parent = u8500_init_devices(&ab8500_platdata); + dbx540_prcmu_device.dev.parent = parent; + dbx540_prcmu_device.dev.platform_data = &ab8500_platdata; + platform_device_register(&dbx540_prcmu_device); for (i = 0; i < ARRAY_SIZE(mop500_platform_devs); i++) mop500_platform_devs[i]->dev.parent = parent; diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 59dcf82..8f74c31 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -130,7 +130,7 @@ static struct platform_device db8500_pmu_device = { .dev.platform_data = &db8500_pmu_platdata, }; -static struct platform_device db8500_prcmu_device = { +struct platform_device db8500_prcmu_device = { .name = "db8500-prcmu", }; @@ -139,6 +139,10 @@ struct prcmu_tcdm_map db8500_tcdm_map = { .legacy_offset = 0, }; +struct platform_device dbx540_prcmu_device = { + .name = "dbx540-prcmu", +}; + struct prcmu_tcdm_map db9540_tcdm_map = { .tcdm_size = SZ_4K + SZ_8K, .legacy_offset = SZ_8K, @@ -147,7 +151,6 @@ struct prcmu_tcdm_map db9540_tcdm_map = { static struct platform_device *platform_devs[] __initdata = { &u8500_dma40_device, &db8500_pmu_device, - &db8500_prcmu_device, }; static resource_size_t __initdata db8500_gpio_base[] = { diff --git a/arch/arm/mach-ux500/include/mach/devices.h b/arch/arm/mach-ux500/include/mach/devices.h index 1caa76e..5c4f92e 100644 --- a/arch/arm/mach-ux500/include/mach/devices.h +++ b/arch/arm/mach-ux500/include/mach/devices.h @@ -20,6 +20,9 @@ extern struct platform_device ux500_cryp1_device; extern struct platform_device u8500_dma40_device; extern struct platform_device ux500_ske_keypad_device; +extern struct platform_device db8500_prcmu_device; +extern struct platform_device dbx540_prcmu_device; + extern struct prcmu_tcdm_map db8500_tcdm_map; extern struct prcmu_tcdm_map db9540_tcdm_map;