diff options
| author | Gary Zhang <b13634@freescale.com> | 2012-05-21 18:39:05 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-07-20 13:37:52 +0800 |
| commit | 766891eaf8d16f06b4c306bcc386d560980a12cf (patch) | |
| tree | 117b8a7f1878f02ca1f9bb517280cdac58b0369a /arch/arm/plat-mxc/devices/platform-imx-dma.c | |
| parent | ce7640728fa91f26998f26dd1bebfcc6f5850c67 (diff) | |
| download | linux-766891eaf8d16f06b4c306bcc386d560980a12cf.tar.gz | |
ENGR00209739-4 add AUDMUX/SDMA support for MX6SL
check CONFIG_ARCH_MX6 to replace cpu type
Signed-off-by: Gary Zhang <b13634@freescale.com>
Diffstat (limited to 'arch/arm/plat-mxc/devices/platform-imx-dma.c')
| -rwxr-xr-x | arch/arm/plat-mxc/devices/platform-imx-dma.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-imx-dma.c b/arch/arm/plat-mxc/devices/platform-imx-dma.c index 65a71ac8b9e9..e7caaf4ce36f 100755 --- a/arch/arm/plat-mxc/devices/platform-imx-dma.c +++ b/arch/arm/plat-mxc/devices/platform-imx-dma.c @@ -260,15 +260,17 @@ static int __init imxXX_add_imx_dma(void) ret = imx_add_imx_sdma(&imx53_imx_sdma_data); } else #endif -#if defined(CONFIG_SOC_IMX6Q) - if (cpu_is_mx6q() || cpu_is_mx6dl()) { - int to_version = 1; - imx6q_imx_sdma_data.pdata.to_version = to_version; - if (to_version == 1) - imx6q_imx_sdma_data.pdata.script_addrs = - &addr_imx6q_to1; - ret = imx_add_imx_sdma(&imx6q_imx_sdma_data); - } else +#if defined(CONFIG_ARCH_MX6) + int to_version = 1; + imx6q_imx_sdma_data.pdata.to_version = to_version; + if (to_version == 1) + imx6q_imx_sdma_data.pdata.script_addrs = + &addr_imx6q_to1; + ret = imx_add_imx_sdma(&imx6q_imx_sdma_data); + if (IS_ERR(ret)) + return PTR_ERR(ret); + + return 0; #endif ret = ERR_PTR(-ENODEV); |