omap: Rename hsmmc symbols to reflect independence from twl4030

hsmmc.[ch] no longer has any dependency on twl4030
and variable names should be renamed to reflect that.

Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

1 files changed, 8 insertions, 10 deletions

diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index b2de2066fb00..ab07ca2d4085 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -209,7 +209,7 @@ static struct twl4030_madc_platform_data rx51_madc_data = {
         .irq_line               = 1,
 };
 
-static struct twl4030_hsmmc_info mmc[] = {
+static struct omap2_hsmmc_info mmc[] __initdata = {
         {
                 .name           = "external",
                 .mmc            = 1,
@@ -232,15 +232,18 @@ static struct twl4030_hsmmc_info mmc[] = {
 };
 
 static struct regulator_consumer_supply rx51_vmmc1_supply = {
-        .supply                 = "vmmc",
+        .supply   = "vmmc",
+        .dev_name = "mmci-omap-hs.0",
 };
 
 static struct regulator_consumer_supply rx51_vmmc2_supply = {
-        .supply                 = "vmmc",
+        .supply   = "vmmc",
+        .dev_name = "mmci-omap-hs.1",
 };
 
 static struct regulator_consumer_supply rx51_vsim_supply = {
-        .supply                 = "vmmc_aux",
+        .supply   = "vmmc_aux",
+        .dev_name = "mmci-omap-hs.1",
 };
 
 static struct regulator_init_data rx51_vaux1 = {
@@ -375,12 +378,6 @@ static int rx51_twlgpio_setup(struct device *dev, unsigned gpio, unsigned n)
         gpio_request(gpio + 7, "speaker_en");
         gpio_direction_output(gpio + 7, 1);
 
-        /* set up MMC adapters, linking their regulators to them */
-        twl4030_mmc_init(mmc);
-        rx51_vmmc1_supply.dev = mmc[0].dev;
-        rx51_vmmc2_supply.dev = mmc[1].dev;
-        rx51_vsim_supply.dev = mmc[1].dev;
-
         return 0;
 }
 
@@ -751,5 +748,6 @@ void __init rx51_peripherals_init(void)
         rx51_init_wl1251();
         spi_register_board_info(rx51_peripherals_spi_board_info,
                                 ARRAY_SIZE(rx51_peripherals_spi_board_info));
+        omap2_hsmmc_init(mmc);
 }