diff options
Diffstat (limited to 'arch/arm/mach-mx5/mm.c')
-rw-r--r-- | arch/arm/mach-mx5/mm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-mx5/mm.c b/arch/arm/mach-mx5/mm.c index ef8aec9319b6..baea6e5cddd9 100644 --- a/arch/arm/mach-mx5/mm.c +++ b/arch/arm/mach-mx5/mm.c | |||
@@ -115,7 +115,6 @@ static struct sdma_script_start_addrs imx51_sdma_script __initdata = { | |||
115 | }; | 115 | }; |
116 | 116 | ||
117 | static struct sdma_platform_data imx51_sdma_pdata __initdata = { | 117 | static struct sdma_platform_data imx51_sdma_pdata __initdata = { |
118 | .sdma_version = 2, | ||
119 | .fw_name = "sdma-imx51.bin", | 118 | .fw_name = "sdma-imx51.bin", |
120 | .script_addrs = &imx51_sdma_script, | 119 | .script_addrs = &imx51_sdma_script, |
121 | }; | 120 | }; |
@@ -135,7 +134,6 @@ static struct sdma_script_start_addrs imx53_sdma_script __initdata = { | |||
135 | }; | 134 | }; |
136 | 135 | ||
137 | static struct sdma_platform_data imx53_sdma_pdata __initdata = { | 136 | static struct sdma_platform_data imx53_sdma_pdata __initdata = { |
138 | .sdma_version = 2, | ||
139 | .fw_name = "sdma-imx53.bin", | 137 | .fw_name = "sdma-imx53.bin", |
140 | .script_addrs = &imx53_sdma_script, | 138 | .script_addrs = &imx53_sdma_script, |
141 | }; | 139 | }; |
@@ -148,7 +146,8 @@ void __init imx51_soc_init(void) | |||
148 | mxc_register_gpio("imx31-gpio", 2, MX51_GPIO3_BASE_ADDR, SZ_16K, MX51_MXC_INT_GPIO3_LOW, MX51_MXC_INT_GPIO3_HIGH); | 146 | mxc_register_gpio("imx31-gpio", 2, MX51_GPIO3_BASE_ADDR, SZ_16K, MX51_MXC_INT_GPIO3_LOW, MX51_MXC_INT_GPIO3_HIGH); |
149 | mxc_register_gpio("imx31-gpio", 3, MX51_GPIO4_BASE_ADDR, SZ_16K, MX51_MXC_INT_GPIO4_LOW, MX51_MXC_INT_GPIO4_HIGH); | 147 | mxc_register_gpio("imx31-gpio", 3, MX51_GPIO4_BASE_ADDR, SZ_16K, MX51_MXC_INT_GPIO4_LOW, MX51_MXC_INT_GPIO4_HIGH); |
150 | 148 | ||
151 | imx_add_imx_sdma(MX51_SDMA_BASE_ADDR, MX51_INT_SDMA, &imx51_sdma_pdata); | 149 | /* i.mx51 has the i.mx35 type sdma */ |
150 | imx_add_imx_sdma("imx35-sdma", MX51_SDMA_BASE_ADDR, MX51_INT_SDMA, &imx51_sdma_pdata); | ||
152 | } | 151 | } |
153 | 152 | ||
154 | void __init imx53_soc_init(void) | 153 | void __init imx53_soc_init(void) |
@@ -162,5 +161,6 @@ void __init imx53_soc_init(void) | |||
162 | mxc_register_gpio("imx31-gpio", 5, MX53_GPIO6_BASE_ADDR, SZ_16K, MX53_INT_GPIO6_LOW, MX53_INT_GPIO6_HIGH); | 161 | mxc_register_gpio("imx31-gpio", 5, MX53_GPIO6_BASE_ADDR, SZ_16K, MX53_INT_GPIO6_LOW, MX53_INT_GPIO6_HIGH); |
163 | mxc_register_gpio("imx31-gpio", 6, MX53_GPIO7_BASE_ADDR, SZ_16K, MX53_INT_GPIO7_LOW, MX53_INT_GPIO7_HIGH); | 162 | mxc_register_gpio("imx31-gpio", 6, MX53_GPIO7_BASE_ADDR, SZ_16K, MX53_INT_GPIO7_LOW, MX53_INT_GPIO7_HIGH); |
164 | 163 | ||
165 | imx_add_imx_sdma(MX53_SDMA_BASE_ADDR, MX53_INT_SDMA, &imx53_sdma_pdata); | 164 | /* i.mx53 has the i.mx35 type sdma */ |
165 | imx_add_imx_sdma("imx35-sdma", MX53_SDMA_BASE_ADDR, MX53_INT_SDMA, &imx53_sdma_pdata); | ||
166 | } | 166 | } |