aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-mxs
diff options
context:
space:
mode:
authorShawn Guo2012-05-10 06:23:26 +0800
committerShawn Guo2012-05-12 13:32:17 +0800
commit8c92013643f5c40633d61ae331cef49c1069af10 (patch)
tree7c385fabafab5ded73621c42639b61e06fa94f6e /arch/arm/mach-mxs
parentbb11fb63fc2e5d1092f17d91790bb4aede6d3ef2 (diff)
dma: mxs-dma: make platform_device_id more generic
Rewrite mxs_dma_is_apbh and mxs_dma_is_apbx in order to support other SoCs like imx6q and reform the platform_device_id for the better further dt support. Cc: Dan Williams <dan.j.williams@intel.com> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Huang Shijie <b32955@freescale.com> Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'arch/arm/mach-mxs')
-rw-r--r--arch/arm/mach-mxs/devices/platform-dma.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-mxs/devices/platform-dma.c b/arch/arm/mach-mxs/devices/platform-dma.c
index 6a0202b1016c..aff481360212 100644
--- a/arch/arm/mach-mxs/devices/platform-dma.c
+++ b/arch/arm/mach-mxs/devices/platform-dma.c
@@ -32,17 +32,19 @@ static struct platform_device *__init mxs_add_dma(const char *devid,
static int __init mxs_add_mxs_dma(void)
{
- char *apbh = "mxs-dma-apbh";
- char *apbx = "mxs-dma-apbx";
+ char *mx23_apbh = "imx23-dma-apbh";
+ char *mx23_apbx = "imx23-dma-apbx";
+ char *mx28_apbh = "imx28-dma-apbh";
+ char *mx28_apbx = "imx28-dma-apbx";
if (cpu_is_mx23()) {
- mxs_add_dma(apbh, MX23_APBH_DMA_BASE_ADDR);
- mxs_add_dma(apbx, MX23_APBX_DMA_BASE_ADDR);
+ mxs_add_dma(mx23_apbh, MX23_APBH_DMA_BASE_ADDR);
+ mxs_add_dma(mx23_apbx, MX23_APBX_DMA_BASE_ADDR);
}
if (cpu_is_mx28()) {
- mxs_add_dma(apbh, MX28_APBH_DMA_BASE_ADDR);
- mxs_add_dma(apbx, MX28_APBX_DMA_BASE_ADDR);
+ mxs_add_dma(mx28_apbh, MX28_APBH_DMA_BASE_ADDR);
+ mxs_add_dma(mx28_apbx, MX28_APBX_DMA_BASE_ADDR);
}
return 0;