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 <tony@atomide.com>

arch/arm/mach-omap2/board-2430sdp.c

@@ -37,7 +37,6 @@
 #include <mach/mux.h>
 #include <mach/board.h>
 #include <mach/usb-musb.h>
-#include <mach/mmc.h>
 #include <mach/common.h>
 #include <mach/keypad.h>
 #include <mach/gpmc.h>
@@ -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);

arch/arm/mach-omap2/board-3430sdp.c

@@ -35,7 +35,6 @@
 #include <mach/board.h>
 #include <mach/usb-musb.h>
 #include <mach/usb-ehci.h>
-#include <mach/mmc.h>
 #include <mach/common.h>
 #include <mach/keypad.h>
 #include <mach/dma.h>
@@ -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)

arch/arm/mach-omap2/board-ldp.c

@@ -36,7 +36,6 @@
 #include <mach/common.h>
 #include <mach/keypad.h>
 #include <mach/gpmc.h>
-#include <mach/mmc.h>
 #include <mach/usb-musb.h>
 
 #include <asm/io.h>
@@ -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)

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();
 }

arch/arm/mach-omap2/board-omap3beagle.c

@@ -39,7 +39,6 @@
 #include <mach/board.h>
 #include <mach/usb-musb.h>
 #include <mach/usb-ehci.h>
-#include <mach/mmc.h>
 #include <mach/common.h>
 #include <mach/gpmc.h>
 #include <mach/nand.h>
@@ -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

arch/arm/mach-omap2/board-omap3evm.c

@@ -32,7 +32,6 @@
 #include <mach/gpio.h>
 #include <mach/keypad.h>
 #include <mach/board.h>
-#include <mach/mmc.h>
 #include <mach/usb-musb.h>
 #include <mach/usb-ehci.h>
 #include <mach/common.h>
@@ -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();

arch/arm/mach-omap2/board-omap3pandora.c

@@ -43,7 +43,6 @@
 #include <mach/gpio.h>
 #include <mach/gpmc.h>
 #include <mach/hardware.h>
-#include <mach/mmc.h>
 #include <mach/nand.h>
 #include <mach/usb-ehci.h>
 #include <mach/usb-musb.h>
@@ -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;
 }

arch/arm/mach-omap2/board-overo.c

@@ -43,7 +43,6 @@
 #include <mach/gpio.h>
 #include <mach/gpmc.h>
 #include <mach/hardware.h>
-#include <mach/mmc.h>
 #include <mach/nand.h>
 #include <mach/usb-ehci.h>
 #include <mach/usb-musb.h>
@@ -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();

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);

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

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,

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

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);