From: Tony Lindgren Date: Fri, 5 Dec 2008 02:17:29 +0000 (-0800) Subject: Misc clean-up for upstream merges X-Git-Tag: v2.6.28-omap1~93 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1705711d8ac7564c7cc6880973e36b0582e8293c;p=linux-2.6-omap-h63xx.git Misc clean-up for upstream merges - Rename hsmmc_init to twl4030_mmc_init - Select twl4030 core by default when hsmmc is selected, so far all boards use it - Replace remaining omap_gpio_set_direction calls Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index a3bbb078782..669cd15d2cc 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include @@ -417,7 +416,7 @@ static void __init omap_2430sdp_init(void) spi_register_board_info(sdp2430_spi_board_info, ARRAY_SIZE(sdp2430_spi_board_info)); ads7846_dev_init(); - hsmmc_init(mmc); + twl4030_mmc_init(mmc); /* turn off secondary LCD backlight */ gpio_direction_output(SECONDARY_LCD_GPIO, 0); diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index e2eed499fc2..ade186bd9c4 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -481,7 +480,7 @@ static void __init omap_3430sdp_init(void) omap_serial_init(); usb_musb_init(); usb_ehci_init(); - hsmmc_init(mmc); + twl4030_mmc_init(mmc); } static void __init omap_3430sdp_map_io(void) diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index c8119a4d38f..eff413a5e72 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include @@ -340,7 +339,7 @@ static inline void __init ldp_init_smc911x(void) eth_gpio); return; } - omap_set_gpio_direction(eth_gpio, 1); + gpio_direction_input(eth_gpio); } @@ -531,7 +530,7 @@ static void __init omap_ldp_init(void) ads7846_dev_init(); omap_serial_init(); usb_musb_init(); - hsmmc_init(mmc); + twl4030_mmc_init(mmc); } static void __init omap_ldp_map_io(void) diff --git a/arch/arm/mach-omap2/board-omap2evm.c b/arch/arm/mach-omap2/board-omap2evm.c index 3925b189f96..73b3b71d3e8 100644 --- a/arch/arm/mach-omap2/board-omap2evm.c +++ b/arch/arm/mach-omap2/board-omap2evm.c @@ -359,7 +359,7 @@ static void __init omap2_evm_init(void) spi_register_board_info(omap2evm_spi_board_info, ARRAY_SIZE(omap2evm_spi_board_info)); omap_serial_init(); - hsmmc_init(mmc); + twl4030_mmc_init(mmc); omap2evm_flash_init(); ads7846_dev_init(); } diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index d98457c5571..fe97bab53e9 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include @@ -135,7 +134,7 @@ static int beagle_twl_gpio_setup(struct device *dev, /* gpio + 0 is "mmc0_cd" (input/IRQ) */ omap_cfg_reg(AH8_34XX_GPIO29); mmc[0].gpio_cd = gpio + 0; - hsmmc_init(mmc); + twl4030_mmc_init(mmc); /* REVISIT: need ehci-omap hooks for external VBUS * power switch and overcurrent detect diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index 8a1b86ef455..e4e60e239e1 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -256,7 +255,7 @@ static void __init omap3_evm_init(void) ARRAY_SIZE(omap3evm_spi_board_info)); omap_serial_init(); - hsmmc_init(mmc); + twl4030_mmc_init(mmc); usb_musb_init(); usb_ehci_init(); omap3evm_flash_init(); diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index edf5000be3d..ec7ea03b6a8 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include @@ -172,7 +171,7 @@ static int omap3pandora_twl_gpio_setup(struct device *dev, /* gpio + {0,1} is "mmc{0,1}_cd" (input/IRQ) */ omap3pandora_mmc[0].gpio_cd = gpio + 0; omap3pandora_mmc[1].gpio_cd = gpio + 1; - hsmmc_init(omap3pandora_mmc); + twl4030_mmc_init(omap3pandora_mmc); return 0; } diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index 24db6dccb99..9995ac2ba1c 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include @@ -231,7 +230,7 @@ static void __init overo_init(void) omap_board_config = overo_config; omap_board_config_size = ARRAY_SIZE(overo_config); omap_serial_init(); - hsmmc_init(mmc); + twl4030_mmc_init(mmc); usb_musb_init(); usb_ehci_init(); overo_flash_init(); diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c index 626d6686717..437f52073f6 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.c +++ b/arch/arm/mach-omap2/mmc-twl4030.c @@ -25,7 +25,8 @@ #include "mmc-twl4030.h" -#if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE) +#if defined(CONFIG_TWL4030_CORE) && \ + (defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)) #define LDO_CLR 0x00 #define VSEL_S2_CLR 0x40 @@ -315,7 +316,7 @@ static int twl_mmc2_set_power(struct device *dev, int slot, int power_on, int vd static struct omap_mmc_platform_data *hsmmc_data[OMAP34XX_NR_MMC] __initdata; -void __init hsmmc_init(struct twl4030_hsmmc_info *controllers) +void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) { struct twl4030_hsmmc_info *c; int nr_hsmmc = ARRAY_SIZE(hsmmc_data); diff --git a/arch/arm/mach-omap2/mmc-twl4030.h b/arch/arm/mach-omap2/mmc-twl4030.h index e2d58a28f24..e1c8076400c 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.h +++ b/arch/arm/mach-omap2/mmc-twl4030.h @@ -14,14 +14,15 @@ struct twl4030_hsmmc_info { int ext_clock:1; /* use external pin for input clock */ }; -#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \ - defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE) +#if defined(CONFIG_TWL4030_CORE) && \ + (defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \ + defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)) -void hsmmc_init(struct twl4030_hsmmc_info *); +void twl4030_mmc_init(struct twl4030_hsmmc_info *); #else -static inline void hsmmc_init(struct twl4030_hsmmc_info *info) +static inline void twl4030_mmc_init(struct twl4030_hsmmc_info *info) { } diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 23a4b81aed2..6fef94fd4ad 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -80,7 +80,7 @@ config MMC_OMAP config MMC_OMAP_HS tristate "TI OMAP High Speed Multimedia Card Interface support" depends on (ARCH_OMAP2 && ARCH_OMAP2430) || ARCH_OMAP3 - select TWL4030_CORE if MACH_OMAP_2430SDP || MACH_OMAP_3430SDP + select TWL4030_CORE help This selects the TI OMAP High Speed Multimedia card Interface. If you have an OMAP2(2430) or OMAP3 board with a Multimedia Card slot, diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 0df684181a0..4ab132546eb 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -103,7 +103,7 @@ #define OMAP_MMC_DATADIR_WRITE 2 #define MMC_TIMEOUT_MS 20 #define OMAP_MMC_MASTER_CLOCK 96000000 -#define DRIVER_NAME "mmci-omap" +#define DRIVER_NAME "mmci-omap-hs" /* * One controller can have multiple slots, like on some omap boards using diff --git a/drivers/video/omap/lcd_ldp.c b/drivers/video/omap/lcd_ldp.c index e9441669c02..69af1253676 100644 --- a/drivers/video/omap/lcd_ldp.c +++ b/drivers/video/omap/lcd_ldp.c @@ -69,8 +69,8 @@ static int ldp_panel_init(struct lcd_panel *panel, gpio_request(LCD_PANEL_ENABLE_GPIO, "lcd panel"); gpio_request(LCD_PANEL_BACKLIGHT_GPIO, "lcd backlight"); - omap_set_gpio_direction(LCD_PANEL_QVGA_GPIO, 0); - omap_set_gpio_direction(LCD_PANEL_RESET_GPIO, 0); + gpio_direction_output(LCD_PANEL_QVGA_GPIO, 0); + gpio_direction_output(LCD_PANEL_RESET_GPIO, 0); gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 0); gpio_direction_output(LCD_PANEL_BACKLIGHT_GPIO, 0);