From patchwork Thu Mar 28 16:11:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rickard Andersson X-Patchwork-Id: 2357561 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 6AF823FD40 for ; Thu, 28 Mar 2013 16:15:29 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ULFRP-0005xb-3A; Thu, 28 Mar 2013 16:12:39 +0000 Received: from eu1sys200aog122.obsmtp.com ([207.126.144.153]) by merlin.infradead.org with smtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ULFQw-0005no-2N for linux-arm-kernel@lists.infradead.org; Thu, 28 Mar 2013 16:12:14 +0000 Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob122.postini.com ([207.126.147.11]) with SMTP ID DSNKUVRr0Iuh+CZNFFuNA2IK/Kdt6GP7E151@postini.com; Thu, 28 Mar 2013 16:12:09 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id A4AF8F6; Thu, 28 Mar 2013 16:03:50 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 3CABE157D; Thu, 28 Mar 2013 16:11:57 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 2DF19A807B; Thu, 28 Mar 2013 17:11:50 +0100 (CET) Received: from steludxu2826.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.279.5; Thu, 28 Mar 2013 17:11:56 +0100 From: Rickard Andersson To: , , Subject: [PATCH V2 10/12] ARM: ux500: Create ICN device Date: Thu, 28 Mar 2013 17:11:36 +0100 Message-ID: <1364487098-10319-11-git-send-email-rickard.andersson@stericsson.com> X-Mailer: git-send-email 1.8.2 In-Reply-To: <1364487098-10319-1-git-send-email-rickard.andersson@stericsson.com> References: <1364487098-10319-1-git-send-email-rickard.andersson@stericsson.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130328_121210_373547_49FC10E4 X-CRM114-Status: GOOD ( 15.39 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: hongbo.zhang@linaro.org, ulf.hansson@linaro.org, khilman@linaro.org, linus.walleij@stericsson.com, daniel.lezcano@linaro.org, rickard.andersson@stericsson.com 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Add platform device for dbx500-icn. Also add the device to the generic power domain APE. Signed-off-by: Rickard Andersson --- arch/arm/boot/dts/dbx5x0.dtsi | 5 +++++ arch/arm/mach-ux500/board-mop500.c | 1 + arch/arm/mach-ux500/cpu-db8500.c | 1 + arch/arm/mach-ux500/devices-common.c | 16 ++++++++++++++++ arch/arm/mach-ux500/devices-common.h | 1 + drivers/bus/Makefile | 1 + 6 files changed, 25 insertions(+) diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi index b1438d2..ef98422 100644 --- a/arch/arm/boot/dts/dbx5x0.dtsi +++ b/arch/arm/boot/dts/dbx5x0.dtsi @@ -666,6 +666,11 @@ <0xa03cf000 0x1000>; }; + icn { + compatible = "stericsson,db8500-icn"; + reg = <0x81000000 0x2000>; + }; + external-bus@50000000 { compatible = "simple-bus"; reg = <0x50000000 0x4000000>; diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index b351f25..76bace3 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -660,6 +660,7 @@ static void __init init_pm_domains(void) pm_genpd_init(&ape_domain, NULL, false); add_platform_device_to_genpd(&db8500_clk_device, &ape_domain); + add_platform_device_to_genpd(&dbx500_icn_device, &ape_domain); } static void __init mop500_init_machine(void) diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 6ead606..d849986 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -143,6 +143,7 @@ static struct platform_device db8500_prcmu_device = { static struct platform_device *platform_devs[] __initdata = { &db8500_clk_device, + &dbx500_icn_device, &u8500_dma40_device, &db8500_pmu_device, &db8500_prcmu_device, diff --git a/arch/arm/mach-ux500/devices-common.c b/arch/arm/mach-ux500/devices-common.c index 16b5f71..74c7a76 100644 --- a/arch/arm/mach-ux500/devices-common.c +++ b/arch/arm/mach-ux500/devices-common.c @@ -18,6 +18,22 @@ #include "devices-common.h" +static struct resource icn_resources[] = { + [0] = { + .start = U8500_ICN_BASE, + .end = U8500_ICN_BASE + SZ_8K - 1, + .flags = IORESOURCE_MEM, + .name = "base", + }, +}; + +struct platform_device dbx500_icn_device = { + .name = "dbx500-icn", + .id = -1, + .num_resources = ARRAY_SIZE(icn_resources), + .resource = icn_resources +}; + static struct platform_device * dbx500_add_gpio(struct device *parent, int id, resource_size_t addr, int irq, struct nmk_gpio_platform_data *pdata) diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h index 96fa4ac..adbf524 100644 --- a/arch/arm/mach-ux500/devices-common.h +++ b/arch/arm/mach-ux500/devices-common.h @@ -16,6 +16,7 @@ #include struct spi_master_cntlr; +extern struct platform_device dbx500_icn_device; static inline struct amba_device * dbx500_add_msp_spi(struct device *parent, const char *name, diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile index 45d997c..78851c0 100644 --- a/drivers/bus/Makefile +++ b/drivers/bus/Makefile @@ -2,6 +2,7 @@ # Makefile for the bus drivers. # +obj-$(CONFIG_UX500_SOC_DB8500) += dbx500-icn.o obj-$(CONFIG_OMAP_OCP2SCP) += omap-ocp2scp.o # Interconnect bus driver for OMAP SoCs.