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>

diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
index a3bbb078782a328b41c00f839ff194b4b7fd7e74..669cd15d2cca1cfe5549494408d9d31703f8b1a5 100644 (file)
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/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);

diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index e2eed499fc28883c7264b39f306ec2d0ce9b4ec7..ade186bd9c4c9add75bf4e6d113510bc7060896b 100644 (file)
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/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)

diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index c8119a4d38f642f99a27de2fddd9d5359ddbaf10..eff413a5e72767847bc0de707a5475730a6532f4 100644 (file)
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/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)

diff --git a/arch/arm/mach-omap2/board-omap2evm.c b/arch/arm/mach-omap2/board-omap2evm.c
index 3925b189f965a81f1c4b8a8344c4c19871d6fa52..73b3b71d3e89c23dae2dd58b27d087a72775e3c9 100644 (file)
--- 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 d98457c557105959effefb3c6988c53ad976bdd8..fe97bab53e988574627199b3c3d74b196a981116 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/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

diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 8a1b86ef45575299075f3a1592f088ea59f1670d..e4e60e239e10d2c88681103145df9311f82ce349 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/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();

diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index edf5000be3d30a35e826332d6c09203a3f144a8e..ec7ea03b6a89d98befcb222142481ff6633e38b1 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/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;
 }

diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 24db6dccb9918ecc1d348f810ca2c2809d8e9d30..9995ac2ba1c12bc2efb2c29454083b1153dc67a0 100644 (file)
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/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();

diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c
index 626d66867172bc907468b9b2ae0786a6a8d6b7c3..437f52073f6ef3f6d4ad93f36c417315fb0ded7e 100644 (file)
--- 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 e2d58a28f248864c033ab71faf8b6cc46ada4916..e1c8076400cabe86a49eafd398eb955bb2df7aa8 100644 (file)
--- 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 23a4b81aed219e684bf1528e32782a491eb1013b..6fef94fd4add4340b50a406173a9fe0e65dccea7 100644 (file)
--- 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 0df684181a03139c1d6efaa7c409851044f77c55..4ab132546eb18b5ae756ae03c07b109f41b7488e 100644 (file)
--- 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 e9441669c02a5227993c396ee07f35e79630a0e3..69af1253676f2897c3564e19ea8138e2edf54de6 100644 (file)
--- 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);