aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-08-20 04:04:33 -0400
committerVinod Koul <vinod.koul@intel.com>2013-08-26 11:17:16 -0400
commit0429936697321612e3c2edbfa2161856e737ac09 (patch)
tree8bc90382e7984b33c63dde0397911b7aaa4bd03c /arch/arm
parentdcfec3c09890120d86d4e86887074c76763075ca (diff)
ARM: i.MX: remove sdma script address arrays from platform data
Now that the sdma driver holds the address tables for i.MX25/5 they are no longer needed in platform_data. Remove them. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-imx/mm-imx25.c17
-rw-r--r--arch/arm/mach-imx/mm-imx5.c14
2 files changed, 0 insertions, 31 deletions
diff --git a/arch/arm/mach-imx/mm-imx25.c b/arch/arm/mach-imx/mm-imx25.c
index e065c117f5a6..5211f62c624e 100644
--- a/arch/arm/mach-imx/mm-imx25.c
+++ b/arch/arm/mach-imx/mm-imx25.c
@@ -61,25 +61,8 @@ void __init mx25_init_irq(void)
61 mxc_init_irq(MX25_IO_ADDRESS(MX25_AVIC_BASE_ADDR)); 61 mxc_init_irq(MX25_IO_ADDRESS(MX25_AVIC_BASE_ADDR));
62} 62}
63 63
64static struct sdma_script_start_addrs imx25_sdma_script __initdata = {
65 .ap_2_ap_addr = 729,
66 .uart_2_mcu_addr = 904,
67 .per_2_app_addr = 1255,
68 .mcu_2_app_addr = 834,
69 .uartsh_2_mcu_addr = 1120,
70 .per_2_shp_addr = 1329,
71 .mcu_2_shp_addr = 1048,
72 .ata_2_mcu_addr = 1560,
73 .mcu_2_ata_addr = 1479,
74 .app_2_per_addr = 1189,
75 .app_2_mcu_addr = 770,
76 .shp_2_per_addr = 1407,
77 .shp_2_mcu_addr = 979,
78};
79
80static struct sdma_platform_data imx25_sdma_pdata __initdata = { 64static struct sdma_platform_data imx25_sdma_pdata __initdata = {
81 .fw_name = "sdma-imx25.bin", 65 .fw_name = "sdma-imx25.bin",
82 .script_addrs = &imx25_sdma_script,
83}; 66};
84 67
85static const struct resource imx25_audmux_res[] __initconst = { 68static const struct resource imx25_audmux_res[] __initconst = {
diff --git a/arch/arm/mach-imx/mm-imx5.c b/arch/arm/mach-imx/mm-imx5.c
index cf193d87274a..051add9cc471 100644
--- a/arch/arm/mach-imx/mm-imx5.c
+++ b/arch/arm/mach-imx/mm-imx5.c
@@ -103,22 +103,8 @@ void __init mx53_init_irq(void)
103 tzic_init_irq(MX53_IO_ADDRESS(MX53_TZIC_BASE_ADDR)); 103 tzic_init_irq(MX53_IO_ADDRESS(MX53_TZIC_BASE_ADDR));
104} 104}
105 105
106static struct sdma_script_start_addrs imx51_sdma_script __initdata = {
107 .ap_2_ap_addr = 642,
108 .uart_2_mcu_addr = 817,
109 .mcu_2_app_addr = 747,
110 .mcu_2_shp_addr = 961,
111 .ata_2_mcu_addr = 1473,
112 .mcu_2_ata_addr = 1392,
113 .app_2_per_addr = 1033,
114 .app_2_mcu_addr = 683,
115 .shp_2_per_addr = 1251,
116 .shp_2_mcu_addr = 892,
117};
118
119static struct sdma_platform_data imx51_sdma_pdata __initdata = { 106static struct sdma_platform_data imx51_sdma_pdata __initdata = {
120 .fw_name = "sdma-imx51.bin", 107 .fw_name = "sdma-imx51.bin",
121 .script_addrs = &imx51_sdma_script,
122}; 108};
123 109
124static const struct resource imx51_audmux_res[] __initconst = { 110static const struct resource imx51_audmux_res[] __initconst = {