From: Viresh Kumar <viresh.kumar@linaro.org> To: arm@kernel.org, olof@lixom.net, arnd@arndb.de Cc: Vipul Kumar Samar <vipulkumar.samar@st.com>, Viresh Kumar <viresh.kumar@linaro.org>, devicetree-discuss@lists.ozlabs.org, spear-devel@list.st.com, sr@denx.de, linux-arm-kernel@lists.infradead.org Subject: [PATCH 11/14] ARM: SPEAr1310: Fix AUXDATA for compact flash controller Date: Sun, 11 Nov 2012 10:09:33 +0530 [thread overview] Message-ID: <4d8f93cb25c6d29c20972e3b1fd8945c299034a5.1352608333.git.viresh.kumar@linaro.org> (raw) In-Reply-To: <cover.1352608333.git.viresh.kumar@linaro.org> In-Reply-To: <cover.1352608333.git.viresh.kumar@linaro.org> From: Vipul Kumar Samar <vipulkumar.samar@st.com> This patch fixes the platform data for compact flash controller. Signed-off-by: Vipul Kumar Samar <vipulkumar.samar@st.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- arch/arm/mach-spear13xx/spear1310.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-spear13xx/spear1310.c b/arch/arm/mach-spear13xx/spear1310.c index 451f3b1..02f4724 100644 --- a/arch/arm/mach-spear13xx/spear1310.c +++ b/arch/arm/mach-spear13xx/spear1310.c @@ -15,6 +15,7 @@ #include <linux/amba/pl022.h> #include <linux/of_platform.h> +#include <linux/pata_arasan_cf_data.h> #include <asm/hardware/gic.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -32,6 +33,12 @@ #define SPEAR1310_RAS_BASE UL(0xD8400000) #define VA_SPEAR1310_RAS_BASE IOMEM(UL(0xFA400000)) +static struct arasan_cf_pdata cf_pdata = { + .cf_if_clk = CF_IF_CLK_166M, + .quirk = CF_BROKEN_UDMA, + .dma_priv = &cf_dma_priv, +}; + /* ssp device registration */ static struct pl022_ssp_controller ssp1_plat_data = { .enable_dma = 0, @@ -39,7 +46,7 @@ static struct pl022_ssp_controller ssp1_plat_data = { /* Add SPEAr1310 auxdata to pass platform data */ static struct of_dev_auxdata spear1310_auxdata_lookup[] __initdata = { - OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL, &cf_dma_priv), + OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL, &cf_pdata), OF_DEV_AUXDATA("snps,dma-spear1340", DMAC0_BASE, NULL, &dmac_plat_data), OF_DEV_AUXDATA("snps,dma-spear1340", DMAC1_BASE, NULL, &dmac_plat_data), OF_DEV_AUXDATA("arm,pl022", SSP_BASE, NULL, &pl022_plat_data), -- 1.7.12.rc2.18.g61b472e
WARNING: multiple messages have this Message-ID (diff)
From: viresh.kumar@linaro.org (Viresh Kumar) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 11/14] ARM: SPEAr1310: Fix AUXDATA for compact flash controller Date: Sun, 11 Nov 2012 10:09:33 +0530 [thread overview] Message-ID: <4d8f93cb25c6d29c20972e3b1fd8945c299034a5.1352608333.git.viresh.kumar@linaro.org> (raw) In-Reply-To: <cover.1352608333.git.viresh.kumar@linaro.org> From: Vipul Kumar Samar <vipulkumar.samar@st.com> This patch fixes the platform data for compact flash controller. Signed-off-by: Vipul Kumar Samar <vipulkumar.samar@st.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- arch/arm/mach-spear13xx/spear1310.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-spear13xx/spear1310.c b/arch/arm/mach-spear13xx/spear1310.c index 451f3b1..02f4724 100644 --- a/arch/arm/mach-spear13xx/spear1310.c +++ b/arch/arm/mach-spear13xx/spear1310.c @@ -15,6 +15,7 @@ #include <linux/amba/pl022.h> #include <linux/of_platform.h> +#include <linux/pata_arasan_cf_data.h> #include <asm/hardware/gic.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -32,6 +33,12 @@ #define SPEAR1310_RAS_BASE UL(0xD8400000) #define VA_SPEAR1310_RAS_BASE IOMEM(UL(0xFA400000)) +static struct arasan_cf_pdata cf_pdata = { + .cf_if_clk = CF_IF_CLK_166M, + .quirk = CF_BROKEN_UDMA, + .dma_priv = &cf_dma_priv, +}; + /* ssp device registration */ static struct pl022_ssp_controller ssp1_plat_data = { .enable_dma = 0, @@ -39,7 +46,7 @@ static struct pl022_ssp_controller ssp1_plat_data = { /* Add SPEAr1310 auxdata to pass platform data */ static struct of_dev_auxdata spear1310_auxdata_lookup[] __initdata = { - OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL, &cf_dma_priv), + OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL, &cf_pdata), OF_DEV_AUXDATA("snps,dma-spear1340", DMAC0_BASE, NULL, &dmac_plat_data), OF_DEV_AUXDATA("snps,dma-spear1340", DMAC1_BASE, NULL, &dmac_plat_data), OF_DEV_AUXDATA("arm,pl022", SSP_BASE, NULL, &pl022_plat_data), -- 1.7.12.rc2.18.g61b472e
next prev parent reply other threads:[~2012-11-11 4:39 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-11-11 4:39 [PATCH 00/14] ARM: SPEAr: DT updates Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar 2012-11-11 4:39 ` [PATCH 01/14] pinctrl: SPEAr: add spi chipselect control driver Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar [not found] ` <4a92290e8a3b1a19c3a5e864edfa7badfc2af5d0.1352608333.git.viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2012-11-12 15:03 ` Arnd Bergmann 2012-11-12 15:03 ` Arnd Bergmann 2012-11-15 14:17 ` Linus Walleij 2012-11-15 14:17 ` Linus Walleij [not found] ` <CACRpkdb9tSUUGQjWdHqRr5rUSyiPgWm2i3-QZq9VbWFY2EAQeQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-11-15 14:19 ` Viresh Kumar 2012-11-15 14:19 ` Viresh Kumar [not found] ` <CAKohpomLRYAKJ=dNLVsjj1xf=G6xj4EcTpPmhSDvgBYUMXc1mA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-11-15 19:09 ` Linus Walleij 2012-11-15 19:09 ` Linus Walleij 2012-11-16 5:15 ` [PATCH 01/16] gpio: " Viresh Kumar 2012-11-16 5:15 ` Viresh Kumar [not found] ` <3702a1036f8e714e6d18e4726569bbb1eadd65bf.1353042873.git.viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2012-11-16 8:19 ` Arnd Bergmann 2012-11-16 8:19 ` Arnd Bergmann [not found] ` <201211160819.04343.arnd-r2nGTMty4D4@public.gmane.org> 2012-11-16 8:19 ` Viresh Kumar 2012-11-16 8:19 ` Viresh Kumar 2012-11-17 23:02 ` Linus Walleij 2012-11-17 23:02 ` Linus Walleij 2012-11-11 4:39 ` [PATCH 02/14] ARM: SPEAr13xx: DT: Add spics gpio controller nodes Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar [not found] ` <58a7d91cab20b924784fb5a09e16ca08e6f13318.1352608333.git.viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2012-11-13 14:08 ` Linus Walleij 2012-11-13 14:08 ` Linus Walleij 2012-11-13 14:34 ` Viresh Kumar 2012-11-13 14:34 ` Viresh Kumar [not found] ` <CAKohpon=AVGZmR_cwUZ4=buw0kr3JVtXh51BtXteWkJ7E-f_bQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-11-15 14:06 ` Linus Walleij 2012-11-15 14:06 ` Linus Walleij [not found] ` <CACRpkdaJ2kCYfSP=xCRQAG2wDnkMKX9fey+ByhDDiOS==u+XwA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-11-15 14:08 ` Viresh Kumar 2012-11-15 14:08 ` Viresh Kumar [not found] ` <CAKohpok7-iBCoYk+aAXZPsOODyh6tp2nutC+6wYOot-bK3=wkg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-11-15 17:25 ` Linus Walleij 2012-11-15 17:25 ` Linus Walleij 2012-11-11 4:39 ` [PATCH 03/14] ARM: SPEAr: DT: Update pinctrl list Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar 2012-11-11 4:39 ` [PATCH 04/14] ARM: SPEAr: DT: Update partition info for MTD devices Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar 2012-11-11 4:39 ` [PATCH 05/14] ARM: SPEAr: DT: Fix existing DT support Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar 2012-11-11 4:39 ` [PATCH 06/14] ARM: SPEAr: DT: Modify DT bindings for STMMAC Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar 2012-11-11 4:39 ` [PATCH 07/14] ARM: SPEAr: DT: add uart state to fix warning Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar 2012-11-11 4:39 ` [PATCH 08/14] ARM: SPEAr: DT: Update device nodes Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar [not found] ` <b3925b105ee2c6fe828ef3b54928aeee02a801ae.1352608333.git.viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2012-11-26 11:25 ` Viresh Kumar 2012-11-26 11:25 ` Viresh Kumar 2012-11-11 4:39 ` [PATCH 09/14] ARM: SPEAr1310: Move 1310 specific misc register into machine specific files Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar 2012-11-11 4:39 ` [PATCH 10/14] ARM: SPEAr13xx: Remove fields not required for ssp controller Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar [this message] 2012-11-11 4:39 ` [PATCH 11/14] ARM: SPEAr1310: Fix AUXDATA for compact flash controller Viresh Kumar 2012-11-11 4:39 ` [PATCH 12/14] ARM: SPEAr3xx: shirq: simplify and move the shared irq multiplexor to DT Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar 2012-11-12 15:09 ` Arnd Bergmann 2012-11-12 15:09 ` Arnd Bergmann 2012-11-12 16:37 ` viresh kumar 2012-11-12 16:37 ` viresh kumar [not found] ` <CAOh2x=nJXVVjFmDFnTN_02PSG9hcDuXToRUzRMi5jwJqUFtgfw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-11-12 17:00 ` Arnd Bergmann 2012-11-12 17:00 ` Arnd Bergmann 2012-11-12 17:16 ` [PATCH] fixup! " Viresh Kumar 2012-11-12 17:16 ` Viresh Kumar 2012-11-12 17:35 ` [PATCH] ARM: SPEAr3xx: Shirq: Move shirq controller out of plat/ Viresh Kumar 2012-11-12 17:35 ` Viresh Kumar 2012-11-11 4:39 ` [PATCH 13/14] ARM: SPEAr3xx: DT: add shirq node for interrupt multiplexor Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar 2012-11-11 4:39 ` [PATCH 14/14] ARM: SPEAr320: DT: Add SPEAr 320 HMI board support Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar [not found] ` <cover.1352608333.git.viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2012-11-12 15:21 ` [PATCH 00/14] ARM: SPEAr: DT updates Arnd Bergmann 2012-11-12 15:21 ` Arnd Bergmann 2012-11-12 16:39 ` viresh kumar 2012-11-12 16:39 ` viresh kumar 2012-11-12 17:18 ` Viresh Kumar 2012-11-12 17:18 ` Viresh Kumar [not found] ` <CAKohpom0kMjuHx5jO-LTPKQhy_-r4khKi7UBPB_O-50K42FOeQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-11-21 20:24 ` Olof Johansson 2012-11-21 20:24 ` Olof Johansson [not found] ` <20121121202405.GA15549-O5ziIzlqnXUVNXGz7ipsyg@public.gmane.org> 2012-11-22 3:19 ` Viresh Kumar 2012-11-22 3:19 ` Viresh Kumar [not found] ` <CAKohpokMUTQja6tCz1RmKXFgu+X7MGFAi1+UWLgKhpViOuiMSA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-11-22 9:47 ` Linus Walleij 2012-11-22 9:47 ` Linus Walleij
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=4d8f93cb25c6d29c20972e3b1fd8945c299034a5.1352608333.git.viresh.kumar@linaro.org \ --to=viresh.kumar@linaro.org \ --cc=arm@kernel.org \ --cc=arnd@arndb.de \ --cc=devicetree-discuss@lists.ozlabs.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=olof@lixom.net \ --cc=spear-devel@list.st.com \ --cc=sr@denx.de \ --cc=vipulkumar.samar@st.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.