diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-10 08:56:01 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-10 08:56:01 +0100 |
| commit | 09e1e9c4a4009a75c1dd716b6f0797fae3ab4dfd (patch) | |
| tree | 79275c5e522c08012fab90cabb8af817fbe7c3ce /arch | |
| parent | a9011580a99cd4f21546381782582bfaf9e40675 (diff) | |
| parent | 5f85e931278ff80aa3ea7861a73a6c6ce940f2e9 (diff) | |
| download | talos-obmc-linux-09e1e9c4a4009a75c1dd716b6f0797fae3ab4dfd.tar.gz talos-obmc-linux-09e1e9c4a4009a75c1dd716b6f0797fae3ab4dfd.zip | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
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 @@ #include <linux/err.h> #include <linux/mutex.h> +#include <asm/processor.h> /* for cpu_relax() */ + #include <mach/mxs.h> #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 = { #endif #ifdef CONFIG_SOC_IMX51 -static struct sdma_script_start_addrs addr_imx51_to1 = { +static struct sdma_script_start_addrs addr_imx51 = { .ap_2_ap_addr = 642, .uart_2_mcu_addr = 817, .mcu_2_app_addr = 747, @@ -196,7 +196,9 @@ static int __init imxXX_add_imx_dma(void) #if defined(CONFIG_SOC_IMX51) if (cpu_is_mx51()) { - imx51_imx_sdma_data.pdata.script_addrs = &addr_imx51_to1; + int to_version = mx51_revision() >> 4; + imx51_imx_sdma_data.pdata.to_version = to_version; + imx51_imx_sdma_data.pdata.script_addrs = &addr_imx51; ret = imx_add_imx_sdma(&imx51_imx_sdma_data); } else #endif |
