This is preparation for early platform device implementation
for GPIO in OMAP2PLUS. This patch moves initialization of gpio
from board files to omap2_init_common_hw API in io.c
Init_irq needs to be done before gpio_init, the init_irq
is called before omap2_init_common_hw in board files
Signed-off-by: Charulatha V
---
arch/arm/mach-omap2/board-2430sdp.c|3 +--
arch/arm/mach-omap2/board-3430sdp.c|3 +--
arch/arm/mach-omap2/board-3630sdp.c|3 +--
arch/arm/mach-omap2/board-4430sdp.c|3 +--
arch/arm/mach-omap2/board-am3517evm.c |3 +--
arch/arm/mach-omap2/board-apollon.c|3 +--
arch/arm/mach-omap2/board-cm-t35.c |3 +--
arch/arm/mach-omap2/board-devkit8000.c |3 +--
arch/arm/mach-omap2/board-generic.c|2 +-
arch/arm/mach-omap2/board-h4.c |3 +--
arch/arm/mach-omap2/board-igep0020.c |3 +--
arch/arm/mach-omap2/board-ldp.c|3 +--
arch/arm/mach-omap2/board-n8x0.c |3 +--
arch/arm/mach-omap2/board-omap3beagle.c|3 +--
arch/arm/mach-omap2/board-omap3evm.c |3 +--
arch/arm/mach-omap2/board-omap3pandora.c |3 +--
arch/arm/mach-omap2/board-omap3touchbook.c |3 +--
arch/arm/mach-omap2/board-overo.c |3 +--
arch/arm/mach-omap2/board-rx51.c |3 +--
arch/arm/mach-omap2/board-zoom2.c |3 +--
arch/arm/mach-omap2/board-zoom3.c |3 +--
arch/arm/mach-omap2/io.c |2 ++
22 files changed, 23 insertions(+), 41 deletions(-)
diff --git a/arch/arm/mach-omap2/board-2430sdp.c
b/arch/arm/mach-omap2/board-2430sdp.c
index 01d113f..7f55fcf 100644
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -146,9 +146,8 @@ static void __init omap_2430sdp_init_irq(void)
{
omap_board_config = sdp2430_config;
omap_board_config_size = ARRAY_SIZE(sdp2430_config);
- omap2_init_common_hw(NULL, NULL);
omap_init_irq();
- omap_gpio_init();
+ omap2_init_common_hw(NULL, NULL);
}
static struct twl4030_gpio_platform_data sdp2430_gpio_data = {
diff --git a/arch/arm/mach-omap2/board-3430sdp.c
b/arch/arm/mach-omap2/board-3430sdp.c
index 5822bcf..6cd640c 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -327,9 +327,8 @@ static void __init omap_3430sdp_init_irq(void)
omap_board_config = sdp3430_config;
omap_board_config_size = ARRAY_SIZE(sdp3430_config);
omap3_pm_init_cpuidle(omap3_cpuidle_params_table);
- omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL);
omap_init_irq();
- omap_gpio_init();
+ omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL);
}
static int sdp3430_batt_table[] = {
diff --git a/arch/arm/mach-omap2/board-3630sdp.c
b/arch/arm/mach-omap2/board-3630sdp.c
index 504d2bd..843a729 100644
--- a/arch/arm/mach-omap2/board-3630sdp.c
+++ b/arch/arm/mach-omap2/board-3630sdp.c
@@ -79,10 +79,9 @@ static void __init omap_sdp_init_irq(void)
{
omap_board_config = sdp_config;
omap_board_config_size = ARRAY_SIZE(sdp_config);
+ omap_init_irq();
omap2_init_common_hw(h8mbx00u0mer0em_sdrc_params,
h8mbx00u0mer0em_sdrc_params);
- omap_init_irq();
- omap_gpio_init();
}
#ifdef CONFIG_OMAP_MUX
diff --git a/arch/arm/mach-omap2/board-4430sdp.c
b/arch/arm/mach-omap2/board-4430sdp.c
index b88f28c..baf5955 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -97,12 +97,11 @@ static void __init omap_4430sdp_init_irq(void)
{
omap_board_config = sdp4430_config;
omap_board_config_size = ARRAY_SIZE(sdp4430_config);
+ gic_init_irq();
omap2_init_common_hw(NULL, NULL);
#ifdef CONFIG_OMAP_32K_TIMER
omap2_gp_clockevent_set_gptimer(1);
#endif
- gic_init_irq();
- omap_gpio_init();
}
static struct omap_musb_board_data musb_board_data = {
diff --git a/arch/arm/mach-omap2/board-am3517evm.c
b/arch/arm/mach-omap2/board-am3517evm.c
index 6ae8805..ea52dc9 100644
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@ -268,9 +268,8 @@ static void __init am3517_evm_init_irq(void)
omap_board_config = am3517_evm_config;
omap_board_config_size = ARRAY_SIZE(am3517_evm_config);
- omap2_init_common_hw(NULL, NULL);
omap_init_irq();
- omap_gpio_init();
+ omap2_init_common_hw(NULL, NULL);
}
static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
diff --git a/arch/arm/mach-omap2/board-apollon.c
b/arch/arm/mach-omap2/board-apollon.c
index aa69fb9..3fe86df 100644
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -277,9 +277,8 @@ static void __init omap_apollon_init_irq(void)
{
omap_board_config = apollon_config;
omap_board_config_size = ARRAY_SI