diff options
author | Vipul Kumar Samar <vipulkumar.samar@st.com> | 2012-10-15 08:25:58 -0400 |
---|---|---|
committer | Viresh Kumar <viresh.kumar@linaro.org> | 2012-11-26 06:25:31 -0500 |
commit | 300a6856324a56955ab909e1dca93dabb8464c8a (patch) | |
tree | 00c01040339f900f1225920d7aa1317138208510 /arch/arm/mach-spear13xx/spear1310.c | |
parent | 3e270ba6e9158f0958e46a606cbeb14ddaf6979b (diff) |
ARM: SPEAr1310: Fix AUXDATA for compact flash controller
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>
Diffstat (limited to 'arch/arm/mach-spear13xx/spear1310.c')
-rw-r--r-- | arch/arm/mach-spear13xx/spear1310.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-spear13xx/spear1310.c b/arch/arm/mach-spear13xx/spear1310.c index 451f3b1867b0..02f4724bb0d4 100644 --- a/arch/arm/mach-spear13xx/spear1310.c +++ b/arch/arm/mach-spear13xx/spear1310.c | |||
@@ -15,6 +15,7 @@ | |||
15 | 15 | ||
16 | #include <linux/amba/pl022.h> | 16 | #include <linux/amba/pl022.h> |
17 | #include <linux/of_platform.h> | 17 | #include <linux/of_platform.h> |
18 | #include <linux/pata_arasan_cf_data.h> | ||
18 | #include <asm/hardware/gic.h> | 19 | #include <asm/hardware/gic.h> |
19 | #include <asm/mach/arch.h> | 20 | #include <asm/mach/arch.h> |
20 | #include <asm/mach/map.h> | 21 | #include <asm/mach/map.h> |
@@ -32,6 +33,12 @@ | |||
32 | #define SPEAR1310_RAS_BASE UL(0xD8400000) | 33 | #define SPEAR1310_RAS_BASE UL(0xD8400000) |
33 | #define VA_SPEAR1310_RAS_BASE IOMEM(UL(0xFA400000)) | 34 | #define VA_SPEAR1310_RAS_BASE IOMEM(UL(0xFA400000)) |
34 | 35 | ||
36 | static struct arasan_cf_pdata cf_pdata = { | ||
37 | .cf_if_clk = CF_IF_CLK_166M, | ||
38 | .quirk = CF_BROKEN_UDMA, | ||
39 | .dma_priv = &cf_dma_priv, | ||
40 | }; | ||
41 | |||
35 | /* ssp device registration */ | 42 | /* ssp device registration */ |
36 | static struct pl022_ssp_controller ssp1_plat_data = { | 43 | static struct pl022_ssp_controller ssp1_plat_data = { |
37 | .enable_dma = 0, | 44 | .enable_dma = 0, |
@@ -39,7 +46,7 @@ static struct pl022_ssp_controller ssp1_plat_data = { | |||
39 | 46 | ||
40 | /* Add SPEAr1310 auxdata to pass platform data */ | 47 | /* Add SPEAr1310 auxdata to pass platform data */ |
41 | static struct of_dev_auxdata spear1310_auxdata_lookup[] __initdata = { | 48 | static struct of_dev_auxdata spear1310_auxdata_lookup[] __initdata = { |
42 | OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL, &cf_dma_priv), | 49 | OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL, &cf_pdata), |
43 | OF_DEV_AUXDATA("snps,dma-spear1340", DMAC0_BASE, NULL, &dmac_plat_data), | 50 | OF_DEV_AUXDATA("snps,dma-spear1340", DMAC0_BASE, NULL, &dmac_plat_data), |
44 | OF_DEV_AUXDATA("snps,dma-spear1340", DMAC1_BASE, NULL, &dmac_plat_data), | 51 | OF_DEV_AUXDATA("snps,dma-spear1340", DMAC1_BASE, NULL, &dmac_plat_data), |
45 | OF_DEV_AUXDATA("arm,pl022", SSP_BASE, NULL, &pl022_plat_data), | 52 | OF_DEV_AUXDATA("arm,pl022", SSP_BASE, NULL, &pl022_plat_data), |