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

Commit b5b654f2 authored by Russell King's avatar Russell King
Browse files

ARM: amba: spear: use common amba device initializers 



Acked-by: default avatarViresh Kumar <viresh.kumar@st.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 53d68af1

arch/arm/mach-spear3xx/spear300.c

+2 −12
Original line number Diff line number Diff line
@@ -430,18 +430,8 @@ static struct pl061_platform_data gpio1_plat_data = { 
	.irq_base	= SPEAR300_GPIO1_INT_BASE,

};



struct amba_device spear300_gpio1_device = {

	.dev = {

		.init_name = "gpio1",

		.platform_data = &gpio1_plat_data,

	},

	.res = {

		.start = SPEAR300_GPIO_BASE,

		.end = SPEAR300_GPIO_BASE + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	},

	.irq = {SPEAR300_VIRQ_GPIO1},

};

AMBA_APB_DEVICE(spear300_gpio1, "gpio1", 0, SPEAR300_GPIO_BASE,

	{SPEAR300_VIRQ_GPIO1}, &gpio1_plat_data);



/* spear300 routines */

void __init spear300_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs,

arch/arm/mach-spear3xx/spear3xx.c

+4 −23
Original line number Diff line number Diff line
@@ -28,31 +28,12 @@ static struct pl061_platform_data gpio_plat_data = { 
	.irq_base	= SPEAR3XX_GPIO_INT_BASE,

};



struct amba_device spear3xx_gpio_device = {

	.dev = {

		.init_name = "gpio",

		.platform_data = &gpio_plat_data,

	},

	.res = {

		.start = SPEAR3XX_ICM3_GPIO_BASE,

		.end = SPEAR3XX_ICM3_GPIO_BASE + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	},

	.irq = {SPEAR3XX_IRQ_BASIC_GPIO},

};

AMBA_APB_DEVICE(spear3xx_gpio, "gpio", 0, SPEAR3XX_ICM3_GPIO_BASE,

	{SPEAR3XX_IRQ_BASIC_GPIO}, &gpio_plat_data);



/* uart device registration */

struct amba_device spear3xx_uart_device = {

	.dev = {

		.init_name = "uart",

	},

	.res = {

		.start = SPEAR3XX_ICM1_UART_BASE,

		.end = SPEAR3XX_ICM1_UART_BASE + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	},

	.irq = {SPEAR3XX_IRQ_UART},

};

AMBA_APB_DEVICE(spear3xx_uart, "uart", 0, SPEAR3XX_ICM1_UART_BASE,

	{SPEAR3XX_IRQ_UART}, NULL);



/* Do spear3xx familiy common initialization part here */

void __init spear3xx_init(void)