Commit 1d23d2fc authored by viresh kumar's avatar viresh kumar Committed by Russell King

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

Reviewed-by: default avatarStanley Miao <stanley.miao@windriver.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@st.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 6618c3ad
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
#define SPEAR_GPT0_CHAN1_IRQ SPEAR3XX_IRQ_CPU_GPT1_2 #define SPEAR_GPT0_CHAN1_IRQ SPEAR3XX_IRQ_CPU_GPT1_2
/* Add spear3xx family device structure declarations here */ /* Add spear3xx family device structure declarations here */
extern struct amba_device gpio_device; extern struct amba_device spear3xx_gpio_device;
extern struct amba_device uart_device; extern struct amba_device spear3xx_uart_device;
extern struct sys_timer spear3xx_timer; extern struct sys_timer spear3xx_timer;
/* Add spear3xx family function declarations here */ /* Add spear3xx family function declarations here */
...@@ -98,7 +98,7 @@ extern struct pmx_dev spear3xx_pmx_plgpio_45_46_49_50; ...@@ -98,7 +98,7 @@ extern struct pmx_dev spear3xx_pmx_plgpio_45_46_49_50;
/* spear300 declarations */ /* spear300 declarations */
#ifdef CONFIG_MACH_SPEAR300 #ifdef CONFIG_MACH_SPEAR300
/* Add spear300 machine device structure declarations here */ /* Add spear300 machine device structure declarations here */
extern struct amba_device gpio1_device; extern struct amba_device spear300_gpio1_device;
/* pad mux modes */ /* pad mux modes */
extern struct pmx_mode spear300_nand_mode; extern struct pmx_mode spear300_nand_mode;
......
...@@ -430,7 +430,7 @@ static struct pl061_platform_data gpio1_plat_data = { ...@@ -430,7 +430,7 @@ static struct pl061_platform_data gpio1_plat_data = {
.irq_base = SPEAR300_GPIO1_INT_BASE, .irq_base = SPEAR300_GPIO1_INT_BASE,
}; };
struct amba_device gpio1_device = { struct amba_device spear300_gpio1_device = {
.dev = { .dev = {
.init_name = "gpio1", .init_name = "gpio1",
.platform_data = &gpio1_plat_data, .platform_data = &gpio1_plat_data,
......
...@@ -34,11 +34,11 @@ static struct pmx_dev *pmx_devs[] = { ...@@ -34,11 +34,11 @@ static struct pmx_dev *pmx_devs[] = {
static struct amba_device *amba_devs[] __initdata = { static struct amba_device *amba_devs[] __initdata = {
/* spear3xx specific devices */ /* spear3xx specific devices */
&gpio_device, &spear3xx_gpio_device,
&uart_device, &spear3xx_uart_device,
/* spear300 specific devices */ /* spear300 specific devices */
&gpio1_device, &spear300_gpio1_device,
}; };
static struct platform_device *plat_devs[] __initdata = { static struct platform_device *plat_devs[] __initdata = {
......
...@@ -42,8 +42,8 @@ static struct pmx_dev *pmx_devs[] = { ...@@ -42,8 +42,8 @@ static struct pmx_dev *pmx_devs[] = {
static struct amba_device *amba_devs[] __initdata = { static struct amba_device *amba_devs[] __initdata = {
/* spear3xx specific devices */ /* spear3xx specific devices */
&gpio_device, &spear3xx_gpio_device,
&uart_device, &spear3xx_uart_device,
/* spear310 specific devices */ /* spear310 specific devices */
}; };
......
...@@ -39,8 +39,8 @@ static struct pmx_dev *pmx_devs[] = { ...@@ -39,8 +39,8 @@ static struct pmx_dev *pmx_devs[] = {
static struct amba_device *amba_devs[] __initdata = { static struct amba_device *amba_devs[] __initdata = {
/* spear3xx specific devices */ /* spear3xx specific devices */
&gpio_device, &spear3xx_gpio_device,
&uart_device, &spear3xx_uart_device,
/* spear320 specific devices */ /* spear320 specific devices */
}; };
......
...@@ -28,7 +28,7 @@ static struct pl061_platform_data gpio_plat_data = { ...@@ -28,7 +28,7 @@ static struct pl061_platform_data gpio_plat_data = {
.irq_base = SPEAR3XX_GPIO_INT_BASE, .irq_base = SPEAR3XX_GPIO_INT_BASE,
}; };
struct amba_device gpio_device = { struct amba_device spear3xx_gpio_device = {
.dev = { .dev = {
.init_name = "gpio", .init_name = "gpio",
.platform_data = &gpio_plat_data, .platform_data = &gpio_plat_data,
...@@ -42,7 +42,7 @@ struct amba_device gpio_device = { ...@@ -42,7 +42,7 @@ struct amba_device gpio_device = {
}; };
/* uart device registration */ /* uart device registration */
struct amba_device uart_device = { struct amba_device spear3xx_uart_device = {
.dev = { .dev = {
.init_name = "uart", .init_name = "uart",
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment