ARM: 6929/1: SPEAr3xx: Append spear3** with global device structures

Reviewed-by: Stanley Miao <stanley.miao@windriver.com>
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-spear3xx/include/mach/generic.h b/arch/arm/mach-spear3xx/include/mach/generic.h
index 8b04f08..b8f31c3 100644 (file)
--- a/arch/arm/mach-spear3xx/include/mach/generic.h
+++ b/arch/arm/mach-spear3xx/include/mach/generic.h
@@ -31,8 +31,8 @@
 #define SPEAR_GPT0_CHAN1_IRQ   SPEAR3XX_IRQ_CPU_GPT1_2
 
 /* Add spear3xx family device structure declarations here */
-extern struct amba_device gpio_device;
-extern struct amba_device uart_device;
+extern struct amba_device spear3xx_gpio_device;
+extern struct amba_device spear3xx_uart_device;
 extern struct sys_timer spear3xx_timer;
 
 /* Add spear3xx family function declarations here */
@@ -98,7 +98,7 @@ extern struct pmx_dev spear3xx_pmx_plgpio_45_46_49_50;
 /* spear300 declarations */
 #ifdef CONFIG_MACH_SPEAR300
 /* Add spear300 machine device structure declarations here */
-extern struct amba_device gpio1_device;
+extern struct amba_device spear300_gpio1_device;
 
 /* pad mux modes */
 extern struct pmx_mode spear300_nand_mode;

diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c
index 67349b5..a5e46b4 100644 (file)
--- a/arch/arm/mach-spear3xx/spear300.c
+++ b/arch/arm/mach-spear3xx/spear300.c
@@ -430,7 +430,7 @@ static struct pl061_platform_data gpio1_plat_data = {
        .irq_base       = SPEAR300_GPIO1_INT_BASE,
 };
 
-struct amba_device gpio1_device = {
+struct amba_device spear300_gpio1_device = {
        .dev = {
                .init_name = "gpio1",
                .platform_data = &gpio1_plat_data,

diff --git a/arch/arm/mach-spear3xx/spear300_evb.c b/arch/arm/mach-spear3xx/spear300_evb.c
index 405ae09..69006f6 100644 (file)
--- a/arch/arm/mach-spear3xx/spear300_evb.c
+++ b/arch/arm/mach-spear3xx/spear300_evb.c
@@ -34,11 +34,11 @@ static struct pmx_dev *pmx_devs[] = {
 
 static struct amba_device *amba_devs[] __initdata = {
        /* spear3xx specific devices */
-       &gpio_device,
-       &uart_device,
+       &spear3xx_gpio_device,
+       &spear3xx_uart_device,
 
        /* spear300 specific devices */
-       &gpio1_device,
+       &spear300_gpio1_device,
 };
 
 static struct platform_device *plat_devs[] __initdata = {

diff --git a/arch/arm/mach-spear3xx/spear310_evb.c b/arch/arm/mach-spear3xx/spear310_evb.c
index 9d4aadb..c8684ce 100644 (file)
--- a/arch/arm/mach-spear3xx/spear310_evb.c
+++ b/arch/arm/mach-spear3xx/spear310_evb.c
@@ -42,8 +42,8 @@ static struct pmx_dev *pmx_devs[] = {
 
 static struct amba_device *amba_devs[] __initdata = {
        /* spear3xx specific devices */
-       &gpio_device,
-       &uart_device,
+       &spear3xx_gpio_device,
+       &spear3xx_uart_device,
 
        /* spear310 specific devices */
 };

diff --git a/arch/arm/mach-spear3xx/spear320_evb.c b/arch/arm/mach-spear3xx/spear320_evb.c
index 7e5f17f..a12b353 100644 (file)
--- a/arch/arm/mach-spear3xx/spear320_evb.c
+++ b/arch/arm/mach-spear3xx/spear320_evb.c
@@ -39,8 +39,8 @@ static struct pmx_dev *pmx_devs[] = {
 
 static struct amba_device *amba_devs[] __initdata = {
        /* spear3xx specific devices */
-       &gpio_device,
-       &uart_device,
+       &spear3xx_gpio_device,
+       &spear3xx_uart_device,
 
        /* spear320 specific devices */
 };

diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c
index b4378a0..10af45d 100644 (file)
--- a/arch/arm/mach-spear3xx/spear3xx.c
+++ b/arch/arm/mach-spear3xx/spear3xx.c
@@ -28,7 +28,7 @@ static struct pl061_platform_data gpio_plat_data = {
        .irq_base       = SPEAR3XX_GPIO_INT_BASE,
 };
 
-struct amba_device gpio_device = {
+struct amba_device spear3xx_gpio_device = {
        .dev = {
                .init_name = "gpio",
                .platform_data = &gpio_plat_data,
@@ -42,7 +42,7 @@ struct amba_device gpio_device = {
 };
 
 /* uart device registration */
-struct amba_device uart_device = {
+struct amba_device spear3xx_uart_device = {
        .dev = {
                .init_name = "uart",
        },