Commit c2c07831 authored by viresh kumar's avatar viresh kumar Committed by Russell King
Browse files

ARM: 6791/1: SPEAr3xx: Declare device structures after shirq code 



Order of declarations should be: pmx_devs, shirq support, amba_devices,
plat_devices, routines. This patch moves gpio_device below shirq support.

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

arch/arm/mach-spear3xx/spear300.c

+20 −20
Original line number Diff line number Diff line
@@ -370,26 +370,6 @@ struct pmx_driver pmx_driver = { 
	.mux_reg = {.offset = PAD_MUX_CONFIG_REG, .mask = 0x00007fff},

};



/* Add spear300 specific devices here */

/* arm gpio1 device registration */

static struct pl061_platform_data gpio1_plat_data = {

	.gpio_base	= 8,

	.irq_base	= SPEAR_GPIO1_INT_BASE,

};



struct amba_device gpio1_device = {

	.dev = {

		.init_name = "gpio1",

		.platform_data = &gpio1_plat_data,

	},

	.res = {

		.start = SPEAR300_GPIO_BASE,

		.end = SPEAR300_GPIO_BASE + SPEAR300_GPIO_SIZE - 1,

		.flags = IORESOURCE_MEM,

	},

	.irq = {VIRQ_GPIO1, NO_IRQ},

};



/* spear3xx shared irq */

struct shirq_dev_config shirq_ras1_config[] = {

	{
@@ -443,6 +423,26 @@ struct spear_shirq shirq_ras1 = { 
	},

};



/* Add spear300 specific devices here */

/* arm gpio1 device registration */

static struct pl061_platform_data gpio1_plat_data = {

	.gpio_base	= 8,

	.irq_base	= SPEAR_GPIO1_INT_BASE,

};



struct amba_device gpio1_device = {

	.dev = {

		.init_name = "gpio1",

		.platform_data = &gpio1_plat_data,

	},

	.res = {

		.start = SPEAR300_GPIO_BASE,

		.end = SPEAR300_GPIO_BASE + SPEAR300_GPIO_SIZE - 1,

		.flags = IORESOURCE_MEM,

	},

	.irq = {VIRQ_GPIO1, NO_IRQ},

};



/* spear300 routines */

void __init spear300_init(void)

{

arch/arm/mach-spear3xx/spear310.c

+2 −2
Original line number Diff line number Diff line
@@ -139,8 +139,6 @@ struct pmx_driver pmx_driver = { 
	.mux_reg = {.offset = PAD_MUX_CONFIG_REG, .mask = 0x00007fff},

};



/* Add spear310 specific devices here */



/* spear3xx shared irq */

struct shirq_dev_config shirq_ras1_config[] = {

	{
@@ -257,6 +255,8 @@ struct spear_shirq shirq_intrcomm_ras = { 
	},

};



/* Add spear310 specific devices here */



/* spear310 routines */

void __init spear310_init(void)

{

arch/arm/mach-spear3xx/spear320.c

+2 −2
Original line number Diff line number Diff line
@@ -384,8 +384,6 @@ struct pmx_driver pmx_driver = { 
	.mux_reg = {.offset = PAD_MUX_CONFIG_REG, .mask = 0x00007fff},

};



/* Add spear320 specific devices here */



/* spear3xx shared irq */

struct shirq_dev_config shirq_ras1_config[] = {

	{
@@ -510,6 +508,8 @@ struct spear_shirq shirq_intrcomm_ras = { 
	},

};



/* Add spear320 specific devices here */



/* spear320 routines */

void __init spear320_init(void)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE