From e6f351b7712af302e1121c0f8ee919f69c20ebad Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Wed, 19 Oct 2005 16:48:46 +0300 Subject: [PATCH] ARM: OMAP: Undo of adding early GPIO init to board specific files The early GPIO should only be needed in cases where some interrupts are routed via FPGA. In most cases doing the init with arch_initcall() should be fine. --- arch/arm/mach-omap1/board-generic.c | 3 --- arch/arm/mach-omap1/board-innovator.c | 2 -- arch/arm/mach-omap1/board-osk.c | 2 -- arch/arm/mach-omap1/board-palmte.c | 3 --- arch/arm/mach-omap1/board-perseus2.c | 2 -- arch/arm/mach-omap2/board-generic.c | 3 --- arch/arm/mach-omap2/board-h4.c | 2 -- 7 files changed, 17 deletions(-) diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c index b5535eac1d2..8f88ce0abb6 100644 --- a/arch/arm/mach-omap1/board-generic.c +++ b/arch/arm/mach-omap1/board-generic.c @@ -28,12 +28,9 @@ #include #include -extern int omap_gpio_init(void); - static void __init omap_generic_init_irq(void) { omap_init_irq(); - omap_gpio_init(); } /* assume no Mini-AB port */ diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c index f4dc3193763..c1618850438 100644 --- a/arch/arm/mach-omap1/board-innovator.c +++ b/arch/arm/mach-omap1/board-innovator.c @@ -36,8 +36,6 @@ #include #include -extern int omap_gpio_init(void); - static struct mtd_partition innovator_partitions[] = { /* bootloader (U-Boot, etc) in first sector */ { diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index d458d86151f..b5600568e90 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c @@ -46,8 +46,6 @@ #include #include -extern int omap_gpio_init(void); - static struct mtd_partition osk_partitions[] = { /* bootloader (U-Boot, etc) in first sector */ { diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index 48697d2c439..b8aea2da7ea 100644 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c @@ -32,12 +32,9 @@ #include #include -extern int omap_gpio_init(void); - static void __init omap_generic_init_irq(void) { omap_init_irq(); - omap_gpio_init(); } static struct omap_usb_config palmte_usb_config __initdata = { diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c index 7c7d26713ef..43021aa628b 100644 --- a/arch/arm/mach-omap1/board-perseus2.c +++ b/arch/arm/mach-omap1/board-perseus2.c @@ -31,8 +31,6 @@ #include #include -extern int omap_gpio_init(void); - static struct resource smc91x_resources[] = { [0] = { .start = H2P2_DBG_FPGA_ETHR_START, /* Physical */ diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 02ea9e12d84..c602e7a3d93 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -31,12 +31,9 @@ #include #include -extern int omap_gpio_init(void); - static void __init omap_generic_init_irq(void) { omap_init_irq(); - omap_gpio_init(); } static struct omap_uart_config generic_uart_config __initdata = { diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 7492d8d57aa..6c15efca003 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c @@ -34,8 +34,6 @@ #include #include -extern int omap_gpio_init(void); - static struct mtd_partition h4_partitions[] = { /* bootloader (U-Boot, etc) in first sector */ { -- 2.41.1