aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@nokia.com>2010-02-15 13:03:34 -0500
committerTony Lindgren <tony@atomide.com>2010-02-15 13:03:34 -0500
commit68ff04231ce9128d400f47762ae3c921be79cd49 (patch)
treece0c321726d2df6239feeab1ddf145f5d0a549f9 /arch/arm
parentd02a900b5952597b6beebd709d92ab392fa3005a (diff)
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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/board-2430sdp.c4
-rw-r--r--arch/arm/mach-omap2/board-3430sdp.c4
-rw-r--r--arch/arm/mach-omap2/board-cm-t35.c4
-rw-r--r--arch/arm/mach-omap2/board-igep0020.c4
-rw-r--r--arch/arm/mach-omap2/board-ldp.c4
-rw-r--r--arch/arm/mach-omap2/board-omap3beagle.c4
-rw-r--r--arch/arm/mach-omap2/board-omap3evm.c4
-rw-r--r--arch/arm/mach-omap2/board-omap3pandora.c4
-rw-r--r--arch/arm/mach-omap2/board-omap3touchbook.c4
-rw-r--r--arch/arm/mach-omap2/board-overo.c4
-rw-r--r--arch/arm/mach-omap2/board-rx51-peripherals.c18
-rwxr-xr-xarch/arm/mach-omap2/board-zoom-peripherals.c4
-rw-r--r--arch/arm/mach-omap2/hsmmc.c24
-rw-r--r--arch/arm/mach-omap2/hsmmc.h6
14 files changed, 45 insertions, 47 deletions
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
index a43c0943dbf3..d6f55ef9059d 100644
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -182,7 +182,7 @@ static int __init omap2430_i2c_init(void)
182 return 0; 182 return 0;
183} 183}
184 184
185static struct twl4030_hsmmc_info mmc[] __initdata = { 185static struct omap2_hsmmc_info mmc[] __initdata = {
186 { 186 {
187 .mmc = 1, 187 .mmc = 1,
188 .wires = 4, 188 .wires = 4,
@@ -201,7 +201,7 @@ static void __init omap_2430sdp_init(void)
201 201
202 platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices)); 202 platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices));
203 omap_serial_init(); 203 omap_serial_init();
204 twl4030_mmc_init(mmc); 204 omap2_hsmmc_init(mmc);
205 usb_musb_init(); 205 usb_musb_init();
206 board_smc91x_init(); 206 board_smc91x_init();
207 207
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 6c7261b6b06f..5adef517a2b3 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -328,7 +328,7 @@ static struct twl4030_bci_platform_data sdp3430_bci_data = {
328 .tblsize = ARRAY_SIZE(sdp3430_batt_table), 328 .tblsize = ARRAY_SIZE(sdp3430_batt_table),
329}; 329};
330 330
331static struct twl4030_hsmmc_info mmc[] = { 331static struct omap2_hsmmc_info mmc[] = {
332 { 332 {
333 .mmc = 1, 333 .mmc = 1,
334 /* 8 bits (default) requires S6.3 == ON, 334 /* 8 bits (default) requires S6.3 == ON,
@@ -365,7 +365,7 @@ static int sdp3430_twl_gpio_setup(struct device *dev,
365 */ 365 */
366 mmc[0].gpio_cd = gpio + 0; 366 mmc[0].gpio_cd = gpio + 0;
367 mmc[1].gpio_cd = gpio + 1; 367 mmc[1].gpio_cd = gpio + 1;
368 twl4030_mmc_init(mmc); 368 omap2_hsmmc_init(mmc);
369 369
370 /* link regulators to MMC adapters ... we "know" the 370 /* link regulators to MMC adapters ... we "know" the
371 * regulators will be set up only *after* we return. 371 * regulators will be set up only *after* we return.
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index ac3c9332d0fa..8659c3e2ef6e 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -593,7 +593,7 @@ static struct twl4030_keypad_data cm_t35_kp_data = {
593 .rep = 1, 593 .rep = 1,
594}; 594};
595 595
596static struct twl4030_hsmmc_info mmc[] = { 596static struct omap2_hsmmc_info mmc[] = {
597 { 597 {
598 .mmc = 1, 598 .mmc = 1,
599 .wires = 4, 599 .wires = 4,
@@ -642,7 +642,7 @@ static int cm_t35_twl_gpio_setup(struct device *dev, unsigned gpio,
642 642
643 /* gpio + 0 is "mmc0_cd" (input/IRQ) */ 643 /* gpio + 0 is "mmc0_cd" (input/IRQ) */
644 mmc[0].gpio_cd = gpio + 0; 644 mmc[0].gpio_cd = gpio + 0;
645 twl4030_mmc_init(mmc); 645 omap2_hsmmc_init(mmc);
646 646
647 /* link regulators to MMC adapters */ 647 /* link regulators to MMC adapters */
648 cm_t35_vmmc1_supply.dev = mmc[0].dev; 648 cm_t35_vmmc1_supply.dev = mmc[0].dev;
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index ea7bfbaceddd..adc1b46fa04e 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -121,7 +121,7 @@ static struct regulator_init_data igep2_vmmc1 = {
121 .consumer_supplies = &igep2_vmmc1_supply, 121 .consumer_supplies = &igep2_vmmc1_supply,
122}; 122};
123 123
124static struct twl4030_hsmmc_info mmc[] = { 124static struct omap2_hsmmc_info mmc[] = {
125 { 125 {
126 .mmc = 1, 126 .mmc = 1,
127 .wires = 4, 127 .wires = 4,
@@ -142,7 +142,7 @@ static int igep2_twl_gpio_setup(struct device *dev,
142{ 142{
143 /* gpio + 0 is "mmc0_cd" (input/IRQ) */ 143 /* gpio + 0 is "mmc0_cd" (input/IRQ) */
144 mmc[0].gpio_cd = gpio + 0; 144 mmc[0].gpio_cd = gpio + 0;
145 twl4030_mmc_init(mmc); 145 omap2_hsmmc_init(mmc);
146 146
147 /* link regulators to MMC adapters ... we "know" the 147 /* link regulators to MMC adapters ... we "know" the
148 * regulators will be set up only *after* we return. 148 * regulators will be set up only *after* we return.
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index f2b47cb7275a..095adcb642b8 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -359,7 +359,7 @@ static int __init omap_i2c_init(void)
359 return 0; 359 return 0;
360} 360}
361 361
362static struct twl4030_hsmmc_info mmc[] __initdata = { 362static struct omap2_hsmmc_info mmc[] __initdata = {
363 { 363 {
364 .mmc = 1, 364 .mmc = 1,
365 .wires = 4, 365 .wires = 4,
@@ -396,7 +396,7 @@ static void __init omap_ldp_init(void)
396 omap_serial_init(); 396 omap_serial_init();
397 usb_musb_init(); 397 usb_musb_init();
398 398
399 twl4030_mmc_init(mmc); 399 omap2_hsmmc_init(mmc);
400 /* link regulators to MMC adapters */ 400 /* link regulators to MMC adapters */
401 ldp_vmmc1_supply.dev = mmc[0].dev; 401 ldp_vmmc1_supply.dev = mmc[0].dev;
402} 402}
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 7812da065d2f..1bae69913376 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -108,7 +108,7 @@ static struct platform_device omap3beagle_nand_device = {
108 108
109#include "sdram-micron-mt46h32m32lf-6.h" 109#include "sdram-micron-mt46h32m32lf-6.h"
110 110
111static struct twl4030_hsmmc_info mmc[] = { 111static struct omap2_hsmmc_info mmc[] = {
112 { 112 {
113 .mmc = 1, 113 .mmc = 1,
114 .wires = 8, 114 .wires = 8,
@@ -147,7 +147,7 @@ static int beagle_twl_gpio_setup(struct device *dev,
147 } 147 }
148 /* gpio + 0 is "mmc0_cd" (input/IRQ) */ 148 /* gpio + 0 is "mmc0_cd" (input/IRQ) */
149 mmc[0].gpio_cd = gpio + 0; 149 mmc[0].gpio_cd = gpio + 0;
150 twl4030_mmc_init(mmc); 150 omap2_hsmmc_init(mmc);
151 151
152 /* link regulators to MMC adapters */ 152 /* link regulators to MMC adapters */
153 beagle_vmmc1_supply.dev = mmc[0].dev; 153 beagle_vmmc1_supply.dev = mmc[0].dev;
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 78724d859216..45227f394758 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -367,7 +367,7 @@ static struct regulator_init_data omap3evm_vsim = {
367 .consumer_supplies = &omap3evm_vsim_supply, 367 .consumer_supplies = &omap3evm_vsim_supply,
368}; 368};
369 369
370static struct twl4030_hsmmc_info mmc[] = { 370static struct omap2_hsmmc_info mmc[] = {
371 { 371 {
372 .mmc = 1, 372 .mmc = 1,
373 .wires = 4, 373 .wires = 4,
@@ -407,7 +407,7 @@ static int omap3evm_twl_gpio_setup(struct device *dev,
407 /* gpio + 0 is "mmc0_cd" (input/IRQ) */ 407 /* gpio + 0 is "mmc0_cd" (input/IRQ) */
408 omap_mux_init_gpio(63, OMAP_PIN_INPUT); 408 omap_mux_init_gpio(63, OMAP_PIN_INPUT);
409 mmc[0].gpio_cd = gpio + 0; 409 mmc[0].gpio_cd = gpio + 0;
410 twl4030_mmc_init(mmc); 410 omap2_hsmmc_init(mmc);
411 411
412 /* link regulators to MMC adapters */ 412 /* link regulators to MMC adapters */
413 omap3evm_vmmc1_supply.dev = mmc[0].dev; 413 omap3evm_vmmc1_supply.dev = mmc[0].dev;
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index 63437037fc9f..9967b5d24b50 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -192,7 +192,7 @@ static struct twl4030_keypad_data pandora_kp_data = {
192 .rep = 1, 192 .rep = 1,
193}; 193};
194 194
195static struct twl4030_hsmmc_info omap3pandora_mmc[] = { 195static struct omap2_hsmmc_info omap3pandora_mmc[] = {
196 { 196 {
197 .mmc = 1, 197 .mmc = 1,
198 .wires = 4, 198 .wires = 4,
@@ -231,7 +231,7 @@ static int omap3pandora_twl_gpio_setup(struct device *dev,
231 /* gpio + {0,1} is "mmc{0,1}_cd" (input/IRQ) */ 231 /* gpio + {0,1} is "mmc{0,1}_cd" (input/IRQ) */
232 omap3pandora_mmc[0].gpio_cd = gpio + 0; 232 omap3pandora_mmc[0].gpio_cd = gpio + 0;
233 omap3pandora_mmc[1].gpio_cd = gpio + 1; 233 omap3pandora_mmc[1].gpio_cd = gpio + 1;
234 twl4030_mmc_init(omap3pandora_mmc); 234 omap2_hsmmc_init(omap3pandora_mmc);
235 235
236 /* link regulators to MMC adapters */ 236 /* link regulators to MMC adapters */
237 pandora_vmmc1_supply.dev = omap3pandora_mmc[0].dev; 237 pandora_vmmc1_supply.dev = omap3pandora_mmc[0].dev;
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c
index 1e3f53c605ca..8252ba49a664 100644
--- a/arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/arch/arm/mach-omap2/board-omap3touchbook.c
@@ -122,7 +122,7 @@ static struct platform_device omap3touchbook_nand_device = {
122 122
123#include "sdram-micron-mt46h32m32lf-6.h" 123#include "sdram-micron-mt46h32m32lf-6.h"
124 124
125static struct twl4030_hsmmc_info mmc[] = { 125static struct omap2_hsmmc_info mmc[] = {
126 { 126 {
127 .mmc = 1, 127 .mmc = 1,
128 .wires = 8, 128 .wires = 8,
@@ -161,7 +161,7 @@ static int touchbook_twl_gpio_setup(struct device *dev,
161 } 161 }
162 /* gpio + 0 is "mmc0_cd" (input/IRQ) */ 162 /* gpio + 0 is "mmc0_cd" (input/IRQ) */
163 mmc[0].gpio_cd = gpio + 0; 163 mmc[0].gpio_cd = gpio + 0;
164 twl4030_mmc_init(mmc); 164 omap2_hsmmc_init(mmc);
165 165
166 /* link regulators to MMC adapters */ 166 /* link regulators to MMC adapters */
167 touchbook_vmmc1_supply.dev = mmc[0].dev; 167 touchbook_vmmc1_supply.dev = mmc[0].dev;
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 3fc918b0c655..7e6aa8292746 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -272,7 +272,7 @@ static void __init overo_flash_init(void)
272 } 272 }
273} 273}
274 274
275static struct twl4030_hsmmc_info mmc[] = { 275static struct omap2_hsmmc_info mmc[] = {
276 { 276 {
277 .mmc = 1, 277 .mmc = 1,
278 .wires = 4, 278 .wires = 4,
@@ -297,7 +297,7 @@ static struct regulator_consumer_supply overo_vmmc1_supply = {
297static int overo_twl_gpio_setup(struct device *dev, 297static int overo_twl_gpio_setup(struct device *dev,
298 unsigned gpio, unsigned ngpio) 298 unsigned gpio, unsigned ngpio)
299{ 299{
300 twl4030_mmc_init(mmc); 300 omap2_hsmmc_init(mmc);
301 301
302 overo_vmmc1_supply.dev = mmc[0].dev; 302 overo_vmmc1_supply.dev = mmc[0].dev;
303 303
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 = {
209 .irq_line = 1, 209 .irq_line = 1,
210}; 210};
211 211
212static struct twl4030_hsmmc_info mmc[] = { 212static struct omap2_hsmmc_info mmc[] __initdata = {
213 { 213 {
214 .name = "external", 214 .name = "external",
215 .mmc = 1, 215 .mmc = 1,
@@ -232,15 +232,18 @@ static struct twl4030_hsmmc_info mmc[] = {
232}; 232};
233 233
234static struct regulator_consumer_supply rx51_vmmc1_supply = { 234static struct regulator_consumer_supply rx51_vmmc1_supply = {
235 .supply = "vmmc", 235 .supply = "vmmc",
236 .dev_name = "mmci-omap-hs.0",
236}; 237};
237 238
238static struct regulator_consumer_supply rx51_vmmc2_supply = { 239static struct regulator_consumer_supply rx51_vmmc2_supply = {
239 .supply = "vmmc", 240 .supply = "vmmc",
241 .dev_name = "mmci-omap-hs.1",
240}; 242};
241 243
242static struct regulator_consumer_supply rx51_vsim_supply = { 244static struct regulator_consumer_supply rx51_vsim_supply = {
243 .supply = "vmmc_aux", 245 .supply = "vmmc_aux",
246 .dev_name = "mmci-omap-hs.1",
244}; 247};
245 248
246static struct regulator_init_data rx51_vaux1 = { 249static struct regulator_init_data rx51_vaux1 = {
@@ -375,12 +378,6 @@ static int rx51_twlgpio_setup(struct device *dev, unsigned gpio, unsigned n)
375 gpio_request(gpio + 7, "speaker_en"); 378 gpio_request(gpio + 7, "speaker_en");
376 gpio_direction_output(gpio + 7, 1); 379 gpio_direction_output(gpio + 7, 1);
377 380
378 /* set up MMC adapters, linking their regulators to them */
379 twl4030_mmc_init(mmc);
380 rx51_vmmc1_supply.dev = mmc[0].dev;
381 rx51_vmmc2_supply.dev = mmc[1].dev;
382 rx51_vsim_supply.dev = mmc[1].dev;
383
384 return 0; 381 return 0;
385} 382}
386 383
@@ -751,5 +748,6 @@ void __init rx51_peripherals_init(void)
751 rx51_init_wl1251(); 748 rx51_init_wl1251();
752 spi_register_board_info(rx51_peripherals_spi_board_info, 749 spi_register_board_info(rx51_peripherals_spi_board_info,
753 ARRAY_SIZE(rx51_peripherals_spi_board_info)); 750 ARRAY_SIZE(rx51_peripherals_spi_board_info));
751 omap2_hsmmc_init(mmc);
754} 752}
755 753
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c
index 52940a426d9d..4278d5e14bb8 100755
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -150,7 +150,7 @@ static struct regulator_init_data zoom_vsim = {
150 .consumer_supplies = &zoom_vsim_supply, 150 .consumer_supplies = &zoom_vsim_supply,
151}; 151};
152 152
153static struct twl4030_hsmmc_info mmc[] __initdata = { 153static struct omap2_hsmmc_info mmc[] __initdata = {
154 { 154 {
155 .name = "external", 155 .name = "external",
156 .mmc = 1, 156 .mmc = 1,
@@ -175,7 +175,7 @@ static int zoom_twl_gpio_setup(struct device *dev,
175{ 175{
176 /* gpio + 0 is "mmc0_cd" (input/IRQ) */ 176 /* gpio + 0 is "mmc0_cd" (input/IRQ) */
177 mmc[0].gpio_cd = gpio + 0; 177 mmc[0].gpio_cd = gpio + 0;
178 twl4030_mmc_init(mmc); 178 omap2_hsmmc_init(mmc);
179 179
180 /* link regulators to MMC adapters ... we "know" the 180 /* link regulators to MMC adapters ... we "know" the
181 * regulators will be set up only *after* we return. 181 * regulators will be set up only *after* we return.
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index df1cf7273317..2ba0d55c323d 100644
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -26,20 +26,20 @@ static u16 control_devconf1_offset;
26 26
27#define HSMMC_NAME_LEN 9 27#define HSMMC_NAME_LEN 9
28 28
29static struct twl_mmc_controller { 29static struct hsmmc_controller {
30 char name[HSMMC_NAME_LEN + 1]; 30 char name[HSMMC_NAME_LEN + 1];
31} hsmmc[OMAP34XX_NR_MMC]; 31} hsmmc[OMAP34XX_NR_MMC];
32 32
33#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM) 33#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM)
34 34
35static int twl4030_mmc_get_context_loss(struct device *dev) 35static int hsmmc_get_context_loss(struct device *dev)
36{ 36{
37 /* FIXME: PM DPS not implemented yet */ 37 /* FIXME: PM DPS not implemented yet */
38 return 0; 38 return 0;
39} 39}
40 40
41#else 41#else
42#define twl4030_mmc_get_context_loss NULL 42#define hsmmc_get_context_loss NULL
43#endif 43#endif
44 44
45static void hsmmc1_before_set_reg(struct device *dev, int slot, 45static void hsmmc1_before_set_reg(struct device *dev, int slot,
@@ -135,9 +135,9 @@ static void hsmmc23_before_set_reg(struct device *dev, int slot,
135 135
136static struct omap_mmc_platform_data *hsmmc_data[OMAP34XX_NR_MMC] __initdata; 136static struct omap_mmc_platform_data *hsmmc_data[OMAP34XX_NR_MMC] __initdata;
137 137
138void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) 138void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers)
139{ 139{
140 struct twl4030_hsmmc_info *c; 140 struct omap2_hsmmc_info *c;
141 int nr_hsmmc = ARRAY_SIZE(hsmmc_data); 141 int nr_hsmmc = ARRAY_SIZE(hsmmc_data);
142 int i; 142 int i;
143 143
@@ -150,7 +150,7 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
150 } 150 }
151 151
152 for (c = controllers; c->mmc; c++) { 152 for (c = controllers; c->mmc; c++) {
153 struct twl_mmc_controller *twl = hsmmc + c->mmc - 1; 153 struct hsmmc_controller *hc = hsmmc + c->mmc - 1;
154 struct omap_mmc_platform_data *mmc = hsmmc_data[c->mmc - 1]; 154 struct omap_mmc_platform_data *mmc = hsmmc_data[c->mmc - 1];
155 155
156 if (!c->mmc || c->mmc > nr_hsmmc) { 156 if (!c->mmc || c->mmc > nr_hsmmc) {
@@ -162,25 +162,25 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
162 continue; 162 continue;
163 } 163 }
164 164
165 mmc = kzalloc(sizeof(struct omap_mmc_platform_data), GFP_KERNEL); 165 mmc = kzalloc(sizeof(struct omap_mmc_platform_data),
166 GFP_KERNEL);
166 if (!mmc) { 167 if (!mmc) {
167 pr_err("Cannot allocate memory for mmc device!\n"); 168 pr_err("Cannot allocate memory for mmc device!\n");
168 goto done; 169 goto done;
169 } 170 }
170 171
171 if (c->name) 172 if (c->name)
172 strncpy(twl->name, c->name, HSMMC_NAME_LEN); 173 strncpy(hc->name, c->name, HSMMC_NAME_LEN);
173 else 174 else
174 snprintf(twl->name, ARRAY_SIZE(twl->name), 175 snprintf(hc->name, ARRAY_SIZE(hc->name),
175 "mmc%islot%i", c->mmc, 1); 176 "mmc%islot%i", c->mmc, 1);
176 mmc->slots[0].name = twl->name; 177 mmc->slots[0].name = hc->name;
177 mmc->nr_slots = 1; 178 mmc->nr_slots = 1;
178 mmc->slots[0].wires = c->wires; 179 mmc->slots[0].wires = c->wires;
179 mmc->slots[0].internal_clock = !c->ext_clock; 180 mmc->slots[0].internal_clock = !c->ext_clock;
180 mmc->dma_mask = 0xffffffff; 181 mmc->dma_mask = 0xffffffff;
181 182
182 mmc->get_context_loss_count = 183 mmc->get_context_loss_count = hsmmc_get_context_loss;
183 twl4030_mmc_get_context_loss;
184 184
185 mmc->slots[0].switch_pin = c->gpio_cd; 185 mmc->slots[0].switch_pin = c->gpio_cd;
186 mmc->slots[0].gpio_wp = c->gpio_wp; 186 mmc->slots[0].gpio_wp = c->gpio_wp;
diff --git a/arch/arm/mach-omap2/hsmmc.h b/arch/arm/mach-omap2/hsmmc.h
index 87d67c10bdec..e946b5f79be1 100644
--- a/arch/arm/mach-omap2/hsmmc.h
+++ b/arch/arm/mach-omap2/hsmmc.h
@@ -6,7 +6,7 @@
6 * published by the Free Software Foundation. 6 * published by the Free Software Foundation.
7 */ 7 */
8 8
9struct twl4030_hsmmc_info { 9struct omap2_hsmmc_info {
10 u8 mmc; /* controller 1/2/3 */ 10 u8 mmc; /* controller 1/2/3 */
11 u8 wires; /* 1/4/8 wires */ 11 u8 wires; /* 1/4/8 wires */
12 bool transceiver; /* MMC-2 option */ 12 bool transceiver; /* MMC-2 option */
@@ -23,11 +23,11 @@ struct twl4030_hsmmc_info {
23 23
24#if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE) 24#if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
25 25
26void twl4030_mmc_init(struct twl4030_hsmmc_info *); 26void omap2_hsmmc_init(struct omap2_hsmmc_info *);
27 27
28#else 28#else
29 29
30static inline void twl4030_mmc_init(struct twl4030_hsmmc_info *info) 30static inline void omap2_hsmmc_init(struct omap2_hsmmc_info *info)
31{ 31{
32} 32}
33 33