diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-mxs/ocotp.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-mxc/devices/platform-imx-dma.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-mxs/ocotp.c b/arch/arm/mach-mxs/ocotp.c index 65157a35dbba..54add60f94c9 100644 --- a/arch/arm/mach-mxs/ocotp.c +++ b/arch/arm/mach-mxs/ocotp.c | |||
@@ -16,6 +16,8 @@ | |||
16 | #include <linux/err.h> | 16 | #include <linux/err.h> |
17 | #include <linux/mutex.h> | 17 | #include <linux/mutex.h> |
18 | 18 | ||
19 | #include <asm/processor.h> /* for cpu_relax() */ | ||
20 | |||
19 | #include <mach/mxs.h> | 21 | #include <mach/mxs.h> |
20 | 22 | ||
21 | #define OCOTP_WORD_OFFSET 0x20 | 23 | #define OCOTP_WORD_OFFSET 0x20 |
diff --git a/arch/arm/plat-mxc/devices/platform-imx-dma.c b/arch/arm/plat-mxc/devices/platform-imx-dma.c index 3538b85ede91..b130f60ca6b7 100644 --- a/arch/arm/plat-mxc/devices/platform-imx-dma.c +++ b/arch/arm/plat-mxc/devices/platform-imx-dma.c | |||
@@ -139,7 +139,7 @@ static struct sdma_script_start_addrs addr_imx35_to2 = { | |||
139 | #endif | 139 | #endif |
140 | 140 | ||
141 | #ifdef CONFIG_SOC_IMX51 | 141 | #ifdef CONFIG_SOC_IMX51 |
142 | static struct sdma_script_start_addrs addr_imx51_to1 = { | 142 | static struct sdma_script_start_addrs addr_imx51 = { |
143 | .ap_2_ap_addr = 642, | 143 | .ap_2_ap_addr = 642, |
144 | .uart_2_mcu_addr = 817, | 144 | .uart_2_mcu_addr = 817, |
145 | .mcu_2_app_addr = 747, | 145 | .mcu_2_app_addr = 747, |
@@ -196,7 +196,9 @@ static int __init imxXX_add_imx_dma(void) | |||
196 | 196 | ||
197 | #if defined(CONFIG_SOC_IMX51) | 197 | #if defined(CONFIG_SOC_IMX51) |
198 | if (cpu_is_mx51()) { | 198 | if (cpu_is_mx51()) { |
199 | imx51_imx_sdma_data.pdata.script_addrs = &addr_imx51_to1; | 199 | int to_version = mx51_revision() >> 4; |
200 | imx51_imx_sdma_data.pdata.to_version = to_version; | ||
201 | imx51_imx_sdma_data.pdata.script_addrs = &addr_imx51; | ||
200 | ret = imx_add_imx_sdma(&imx51_imx_sdma_data); | 202 | ret = imx_add_imx_sdma(&imx51_imx_sdma_data); |
201 | } else | 203 | } else |
202 | #endif | 204 | #endif |