msm: dmov: Support for multiple concurrent targets
Rename the data mover devices to allow one kernel to be
compiled for 8960 and 8064 simultaneously.
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-apq8064.c b/arch/arm/mach-msm/board-apq8064.c
index 88724f1..1056cbb 100644
--- a/arch/arm/mach-msm/board-apq8064.c
+++ b/arch/arm/mach-msm/board-apq8064.c
@@ -71,7 +71,7 @@
}
static struct platform_device *common_devices[] __initdata = {
- &msm_device_dmov,
+ &apq8064_device_dmov,
&apq8064_device_uart_gsbi3,
&apq8064_device_qup_spi_gsbi5,
&apq8064_device_ssbi_pmic1,
diff --git a/arch/arm/mach-msm/board-msm8960.c b/arch/arm/mach-msm/board-msm8960.c
index 15dd7c0..d6676eb 100644
--- a/arch/arm/mach-msm/board-msm8960.c
+++ b/arch/arm/mach-msm/board-msm8960.c
@@ -2684,7 +2684,7 @@
};
static struct platform_device *common_devices[] __initdata = {
- &msm_device_dmov,
+ &msm8960_device_dmov,
&msm_device_smd,
&msm8960_device_uart_gsbi5,
&msm_device_uart_dm6,
diff --git a/arch/arm/mach-msm/devices-8064.c b/arch/arm/mach-msm/devices-8064.c
index f2b52b2..c723f54 100644
--- a/arch/arm/mach-msm/devices-8064.c
+++ b/arch/arm/mach-msm/devices-8064.c
@@ -57,7 +57,7 @@
},
};
-struct platform_device msm_device_dmov = {
+struct platform_device apq8064_device_dmov = {
.name = "msm_dmov",
.id = -1,
.resource = msm_dmov_resource,
diff --git a/arch/arm/mach-msm/devices-8960.c b/arch/arm/mach-msm/devices-8960.c
index ebc1826..8c668fe 100644
--- a/arch/arm/mach-msm/devices-8960.c
+++ b/arch/arm/mach-msm/devices-8960.c
@@ -771,7 +771,7 @@
.id = -1,
};
-struct resource msm_dmov_resource[] = {
+static struct resource msm_dmov_resource[] = {
{
.start = ADM_0_SCSS_1_IRQ,
.end = (resource_size_t)MSM_DMOV_BASE,
@@ -779,7 +779,7 @@
},
};
-struct platform_device msm_device_dmov = {
+struct platform_device msm8960_device_dmov = {
.name = "msm_dmov",
.id = -1,
.resource = msm_dmov_resource,
diff --git a/arch/arm/mach-msm/devices.h b/arch/arm/mach-msm/devices.h
index 5bb8b8e..5e321b2 100644
--- a/arch/arm/mach-msm/devices.h
+++ b/arch/arm/mach-msm/devices.h
@@ -90,6 +90,8 @@
extern struct platform_device msm_device_bam_dmux;
extern struct platform_device msm_device_smd;
extern struct platform_device msm_device_dmov;
+extern struct platform_device msm8960_device_dmov;
+extern struct platform_device apq8064_device_dmov;
extern struct platform_device msm_device_dmov_adm0;
extern struct platform_device msm_device_dmov_adm1;