aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc/devices/platform-imx-dma.c
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2010-11-26 12:25:58 -0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-12-03 11:05:13 +0100
commitd94ed1287e11f91e4f4096838179984b0206be5e (patch)
treec887a5dddf65e3046757b2562e6bee40ba349e25 /arch/arm/plat-mxc/devices/platform-imx-dma.c
parentabebbb468050ad63caed55fdb7a6bfce732e9a7f (diff)
downloadkernel_samsung_smdk4412-d94ed1287e11f91e4f4096838179984b0206be5e.zip
kernel_samsung_smdk4412-d94ed1287e11f91e4f4096838179984b0206be5e.tar.gz
kernel_samsung_smdk4412-d94ed1287e11f91e4f4096838179984b0206be5e.tar.bz2
ARM: mx5: introduce SOC_IMX51
Introduce SOC_IMX51 to keep consistency with the other i.MX devices Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/devices/platform-imx-dma.c')
-rw-r--r--arch/arm/plat-mxc/devices/platform-imx-dma.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-imx-dma.c b/arch/arm/plat-mxc/devices/platform-imx-dma.c
index 93e2fdc..96b7c2b 100644
--- a/arch/arm/plat-mxc/devices/platform-imx-dma.c
+++ b/arch/arm/plat-mxc/devices/platform-imx-dma.c
@@ -54,10 +54,10 @@ struct imx_imx_sdma_data imx35_imx_sdma_data __initdata =
imx_imx_sdma_data_entry_single(MX35, 2, "imx35", 0);
#endif /* ifdef CONFIG_SOC_IMX35 */
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51
struct imx_imx_sdma_data imx51_imx_sdma_data __initconst =
imx_imx_sdma_data_entry_single(MX51, 2, "imx51", 0);
-#endif /* ifdef CONFIG_ARCH_MX51 */
+#endif /* ifdef CONFIG_SOC_IMX51 */
static struct platform_device __init __maybe_unused *imx_add_imx_sdma(
const struct imx_imx_sdma_data *data)
@@ -146,7 +146,7 @@ static struct sdma_script_start_addrs addr_imx35_to2 = {
};
#endif
-#ifdef CONFIG_ARCH_MX51
+#ifdef CONFIG_SOC_IMX51
static struct sdma_script_start_addrs addr_imx51_to1 = {
.ap_2_ap_addr = 642,
.uart_2_mcu_addr = 817,