OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
viresh kumar 2011-03-07 05:57:05 +01:00 committed by Russell King
parent b5761371c3
commit c2c07831a7
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
arch/arm/mach-spear3xx/spear300.c
View File

@ -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)
{

4
arch/arm/mach-spear3xx/spear310.c
View File

@ -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)
{

4
arch/arm/mach-spear3xx/spear320.c
View File

@ -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)
{