From: Tony Lindgren Date: Tue, 31 Mar 2009 21:27:43 +0000 (-0700) Subject: ARM: OMAP: No need to include board-h4.h from hardware.h X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=7173740b02fb12334147326fbd884d62da998946 ARM: OMAP: No need to include board-h4.h from hardware.h Move the defines to the associated board file and remove the now unnecessary header file. Also rename OMAP24XX_ETHR_GPIO_IRQ to H4_ETHR_GPIO_IRQ. Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index cb5c09b0324..dd55149a8b8 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c @@ -54,6 +54,51 @@ #define H4_FLASH_CS 0 #define H4_SMC91X_CS 1 +#define H4_ETHR_GPIO_IRQ 92 + +/* FPGA on debug board has 32 GPIOs: 16 dedicated to leds, + * 8 outputs on a header, and 6 inputs from a DIP switch. + */ +#define H4_DEBUG_GPIO_BASE OMAP_MAX_GPIO_LINES +# define H4_DEBUG_GPIO_SW3_1 (H4_DEBUG_GPIO_BASE + 24) +# define H4_DEBUG_GPIO_SW3_2 (H4_DEBUG_GPIO_BASE + 25) +# define H4_DEBUG_GPIO_SW3_3 (H4_DEBUG_GPIO_BASE + 26) +# define H4_DEBUG_GPIO_SW3_4 (H4_DEBUG_GPIO_BASE + 27) +# define H4_DEBUG_GPIO_SW3_5 (H4_DEBUG_GPIO_BASE + 28) +# define H4_DEBUG_GPIO_SW3_8 (H4_DEBUG_GPIO_BASE + 29) + +/* H4 baseboard has 3 PCF8574 (8 bit) I2C GPIO expanders */ +#define H4_U191_GPIO_BASE (H4_DEBUG_GPIO_BASE + 32) +# define H4_GPIO_IRDA_FIRSEL (H4_U191_GPIO_BASE + 0) +# define H4_GPIO_MODEM_MOD_EN (H4_U191_GPIO_BASE + 1) +# define H4_GPIO_WLAN_MOD_EN (H4_U191_GPIO_BASE + 2) +# define H4_GPIO_CAM_MODULE_EN (H4_U191_GPIO_BASE + 3) +# define H4_GPIO_HANDSET_EN (H4_U191_GPIO_BASE + 4) +# define H4_GPIO_LCD_ENBKL (H4_U191_GPIO_BASE + 5) +# define H4_GPIO_AUDIO_ENVDD (H4_U191_GPIO_BASE + 6) +# define H4_GPIO_LCD_ENVDD (H4_U191_GPIO_BASE + 7) + +#define H4_U192_GPIO_BASE (H4_U191_GPIO_BASE + 8) +# define H4_GPIO_IRDA_AGPSn (H4_U192_GPIO_BASE + 0) +# define H4_GPIO_AGPS_PWREN (H4_U192_GPIO_BASE + 1) +# define H4_GPIO_AGPS_RSTn (H4_U192_GPIO_BASE + 2) +# define H4_GPIO_AGPS_SLEEP (H4_U192_GPIO_BASE + 3) +# define H4_GPIO_AGPS_PA_XMT (H4_U192_GPIO_BASE + 4) +# define H4_GPIO_MODEM_SPR2 (H4_U192_GPIO_BASE + 5) +# define H4_GPIO_MODEM_SPR1 (H4_U192_GPIO_BASE + 6) +# define H4_GPIO_BT_ACLK_ENn (H4_U192_GPIO_BASE + 7) + +#define H4_U193_GPIO_BASE (H4_U192_GPIO_BASE + 8) +# define H4_GPIO_SPR0 (H4_U193_GPIO_BASE + 0) +# define H4_GPIO_SPR1 (H4_U193_GPIO_BASE + 1) +# define H4_GPIO_WLAN_SHUTDOWN (H4_U193_GPIO_BASE + 2) +# define H4_GPIO_WLAN_RESET (H4_U193_GPIO_BASE + 3) +# define H4_GPIO_WLAN_CLK_ENn (H4_U193_GPIO_BASE + 4) + /* 5, 6 not connected */ +# define H4_GPIO_CAM_RST (H4_U193_GPIO_BASE + 7) + +extern void h4_mmc_init(void); + static unsigned int row_gpios[6] = { 88, 89, 124, 11, 6, 96 }; static unsigned int col_gpios[7] = { 90, 91, 100, 36, 12, 97, 98 }; @@ -326,7 +371,7 @@ static inline void __init h4_init_debug(void) udelay(100); omap_cfg_reg(M15_24XX_GPIO92); - if (debug_card_init(cs_mem_base, OMAP24XX_ETHR_GPIO_IRQ) < 0) + if (debug_card_init(cs_mem_base, H4_ETHR_GPIO_IRQ) < 0) gpmc_cs_free(eth_cs); out: diff --git a/arch/arm/plat-omap/include/mach/board-h4.h b/arch/arm/plat-omap/include/mach/board-h4.h deleted file mode 100644 index 60b3ce177a4..00000000000 --- a/arch/arm/plat-omap/include/mach/board-h4.h +++ /dev/null @@ -1,80 +0,0 @@ -/* - * arch/arm/plat-omap/include/mach/board-h4.h - * - * Hardware definitions for TI OMAP2420 H4 board. - * - * Initial creation by Dirk Behme - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef __ASM_ARCH_OMAP_H4_H -#define __ASM_ARCH_OMAP_H4_H - -/* MMC Prototypes */ -extern void h4_mmc_init(void); - -/* Placeholder for H4 specific defines */ -#define OMAP24XX_ETHR_GPIO_IRQ 92 - -/* FPGA on debug board has 32 GPIOs: 16 dedicated to leds, - * 8 outputs on a header, and 6 inputs from a DIP switch. - */ -#define H4_DEBUG_GPIO_BASE OMAP_MAX_GPIO_LINES -# define H4_DEBUG_GPIO_SW3_1 (H4_DEBUG_GPIO_BASE + 24) -# define H4_DEBUG_GPIO_SW3_2 (H4_DEBUG_GPIO_BASE + 25) -# define H4_DEBUG_GPIO_SW3_3 (H4_DEBUG_GPIO_BASE + 26) -# define H4_DEBUG_GPIO_SW3_4 (H4_DEBUG_GPIO_BASE + 27) -# define H4_DEBUG_GPIO_SW3_5 (H4_DEBUG_GPIO_BASE + 28) -# define H4_DEBUG_GPIO_SW3_8 (H4_DEBUG_GPIO_BASE + 29) - -/* H4 baseboard has 3 PCF8574 (8 bit) I2C GPIO expanders */ -#define H4_U191_GPIO_BASE (H4_DEBUG_GPIO_BASE + 32) -# define H4_GPIO_IRDA_FIRSEL (H4_U191_GPIO_BASE + 0) -# define H4_GPIO_MODEM_MOD_EN (H4_U191_GPIO_BASE + 1) -# define H4_GPIO_WLAN_MOD_EN (H4_U191_GPIO_BASE + 2) -# define H4_GPIO_CAM_MODULE_EN (H4_U191_GPIO_BASE + 3) -# define H4_GPIO_HANDSET_EN (H4_U191_GPIO_BASE + 4) -# define H4_GPIO_LCD_ENBKL (H4_U191_GPIO_BASE + 5) -# define H4_GPIO_AUDIO_ENVDD (H4_U191_GPIO_BASE + 6) -# define H4_GPIO_LCD_ENVDD (H4_U191_GPIO_BASE + 7) - -#define H4_U192_GPIO_BASE (H4_U191_GPIO_BASE + 8) -# define H4_GPIO_IRDA_AGPSn (H4_U192_GPIO_BASE + 0) -# define H4_GPIO_AGPS_PWREN (H4_U192_GPIO_BASE + 1) -# define H4_GPIO_AGPS_RSTn (H4_U192_GPIO_BASE + 2) -# define H4_GPIO_AGPS_SLEEP (H4_U192_GPIO_BASE + 3) -# define H4_GPIO_AGPS_PA_XMT (H4_U192_GPIO_BASE + 4) -# define H4_GPIO_MODEM_SPR2 (H4_U192_GPIO_BASE + 5) -# define H4_GPIO_MODEM_SPR1 (H4_U192_GPIO_BASE + 6) -# define H4_GPIO_BT_ACLK_ENn (H4_U192_GPIO_BASE + 7) - -#define H4_U193_GPIO_BASE (H4_U192_GPIO_BASE + 8) -# define H4_GPIO_SPR0 (H4_U193_GPIO_BASE + 0) -# define H4_GPIO_SPR1 (H4_U193_GPIO_BASE + 1) -# define H4_GPIO_WLAN_SHUTDOWN (H4_U193_GPIO_BASE + 2) -# define H4_GPIO_WLAN_RESET (H4_U193_GPIO_BASE + 3) -# define H4_GPIO_WLAN_CLK_ENn (H4_U193_GPIO_BASE + 4) - /* 5, 6 not connected */ -# define H4_GPIO_CAM_RST (H4_U193_GPIO_BASE + 7) - -#endif /* __ASM_ARCH_OMAP_H4_H */ - diff --git a/arch/arm/plat-omap/include/mach/hardware.h b/arch/arm/plat-omap/include/mach/hardware.h index 3f12302faf7..090452125ad 100644 --- a/arch/arm/plat-omap/include/mach/hardware.h +++ b/arch/arm/plat-omap/include/mach/hardware.h @@ -294,10 +294,6 @@ * --------------------------------------------------------------------------- */ -#ifdef CONFIG_MACH_OMAP_H4 -#include "board-h4.h" -#endif - #if defined(CONFIG_MACH_NOKIA_N800) || defined(CONFIG_MACH_NOKIA770) #include "board-nokia.h" #endif diff --git a/drivers/net/irda/omap-ir.c b/drivers/net/irda/omap-ir.c index b706253aae0..59401b7dadc 100644 --- a/drivers/net/irda/omap-ir.c +++ b/drivers/net/irda/omap-ir.c @@ -66,7 +66,7 @@ #include #include #include -#include +#include #include #include #include