Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d23d2fc authored by Viresh Kumar's avatar Viresh Kumar Committed by Russell King
Browse files

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

arch/arm/mach-spear3xx/include/mach/generic.h

+3 −3
Original line number Diff line number Diff line
@@ -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;

arch/arm/mach-spear3xx/spear300.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

arch/arm/mach-spear3xx/spear300_evb.c

+3 −3
Original line number Diff line number Diff line
@@ -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 = {

arch/arm/mach-spear3xx/spear310_evb.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */

};

arch/arm/mach-spear3xx/spear320_evb.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */

};