diff options
author | Oleg Drokin <green@linuxhacker.ru> | 2011-06-06 14:57:08 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-06-14 07:46:56 -0400 |
commit | fd4a0286cecd3b1e15771e02bc36bd8494a4a1d8 (patch) | |
tree | 66c045916f6541eba6902187d60d0fce7190004b /arch/arm/mach-omap2 | |
parent | 786b01a8c1db0c0decca55d660a2a3ebd7cfb26b (diff) |
Remove old-style supply.dev assignments common in hsmmc init
CC: Mark Brown <broonie@opensource.wolfsonmicro.com>
CC: Mike Rapoport <mike@compulab.co.il>
CC: Nishant Kamat <nskamat@ti.com>
CC: Steve Sakoman <steve@sakoman.com>
CC: Felipe Balbi <balbi@ti.com>
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/board-cm-t35.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-ldp.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-omap3evm.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-omap3logic.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-omap3stalker.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-omap3touchbook.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-overo.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-zoom-peripherals.c | 7 |
9 files changed, 0 insertions, 33 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index e7bf32de753d..ceb581e2b1da 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c | |||
@@ -483,10 +483,6 @@ static int cm_t35_twl_gpio_setup(struct device *dev, unsigned gpio, | |||
483 | mmc[0].gpio_cd = gpio + 0; | 483 | mmc[0].gpio_cd = gpio + 0; |
484 | omap2_hsmmc_init(mmc); | 484 | omap2_hsmmc_init(mmc); |
485 | 485 | ||
486 | /* link regulators to MMC adapters */ | ||
487 | cm_t35_vmmc1_supply.dev = mmc[0].dev; | ||
488 | cm_t35_vsim_supply.dev = mmc[0].dev; | ||
489 | |||
490 | return 0; | 486 | return 0; |
491 | } | 487 | } |
492 | 488 | ||
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index 069bc9f0cf3c..2d7e0aed605e 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c | |||
@@ -341,8 +341,6 @@ static void __init omap_ldp_init(void) | |||
341 | ARRAY_SIZE(ldp_nand_partitions), ZOOM_NAND_CS, 0); | 341 | ARRAY_SIZE(ldp_nand_partitions), ZOOM_NAND_CS, 0); |
342 | 342 | ||
343 | omap2_hsmmc_init(mmc); | 343 | omap2_hsmmc_init(mmc); |
344 | /* link regulators to MMC adapters */ | ||
345 | ldp_vmmc1_supply.dev = mmc[0].dev; | ||
346 | } | 344 | } |
347 | 345 | ||
348 | MACHINE_START(OMAP_LDP, "OMAP LDP board") | 346 | MACHINE_START(OMAP_LDP, "OMAP LDP board") |
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 4cf7c19ea0ef..8ef0e19127ad 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
@@ -268,10 +268,6 @@ static int beagle_twl_gpio_setup(struct device *dev, | |||
268 | mmc[0].gpio_cd = gpio + 0; | 268 | mmc[0].gpio_cd = gpio + 0; |
269 | omap2_hsmmc_init(mmc); | 269 | omap2_hsmmc_init(mmc); |
270 | 270 | ||
271 | /* link regulators to MMC adapters */ | ||
272 | beagle_vmmc1_supply.dev = mmc[0].dev; | ||
273 | beagle_vsim_supply.dev = mmc[0].dev; | ||
274 | |||
275 | /* | 271 | /* |
276 | * TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, XM active | 272 | * TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, XM active |
277 | * high / others active low) | 273 | * high / others active low) |
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index fc7a23add5f6..e2202ddae667 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c | |||
@@ -365,10 +365,6 @@ static int omap3evm_twl_gpio_setup(struct device *dev, | |||
365 | mmc[0].gpio_cd = gpio + 0; | 365 | mmc[0].gpio_cd = gpio + 0; |
366 | omap2_hsmmc_init(mmc); | 366 | omap2_hsmmc_init(mmc); |
367 | 367 | ||
368 | /* link regulators to MMC adapters */ | ||
369 | omap3evm_vmmc1_supply.dev = mmc[0].dev; | ||
370 | omap3evm_vsim_supply.dev = mmc[0].dev; | ||
371 | |||
372 | /* | 368 | /* |
373 | * Most GPIOs are for USB OTG. Some are mostly sent to | 369 | * Most GPIOs are for USB OTG. Some are mostly sent to |
374 | * the P2 connector; notably LEDA for the LCD backlight. | 370 | * the P2 connector; notably LEDA for the LCD backlight. |
diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c index ec18435bc5d5..eaefb5916595 100644 --- a/arch/arm/mach-omap2/board-omap3logic.c +++ b/arch/arm/mach-omap2/board-omap3logic.c | |||
@@ -130,8 +130,6 @@ static void __init board_mmc_init(void) | |||
130 | } | 130 | } |
131 | 131 | ||
132 | omap2_hsmmc_init(board_mmc_info); | 132 | omap2_hsmmc_init(board_mmc_info); |
133 | /* link regulators to MMC adapters */ | ||
134 | omap3logic_vmmc1_supply.dev = board_mmc_info[0].dev; | ||
135 | } | 133 | } |
136 | 134 | ||
137 | static struct omap_smsc911x_platform_data __initdata board_smsc911x_data = { | 135 | static struct omap_smsc911x_platform_data __initdata board_smsc911x_data = { |
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index 99be540dbabe..63d12a3df30a 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c | |||
@@ -321,10 +321,6 @@ omap3stalker_twl_gpio_setup(struct device *dev, | |||
321 | mmc[0].gpio_cd = gpio + 0; | 321 | mmc[0].gpio_cd = gpio + 0; |
322 | omap2_hsmmc_init(mmc); | 322 | omap2_hsmmc_init(mmc); |
323 | 323 | ||
324 | /* link regulators to MMC adapters */ | ||
325 | omap3stalker_vmmc1_supply.dev = mmc[0].dev; | ||
326 | omap3stalker_vsim_supply.dev = mmc[0].dev; | ||
327 | |||
328 | /* | 324 | /* |
329 | * Most GPIOs are for USB OTG. Some are mostly sent to | 325 | * Most GPIOs are for USB OTG. Some are mostly sent to |
330 | * the P2 connector; notably LEDA for the LCD backlight. | 326 | * the P2 connector; notably LEDA for the LCD backlight. |
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index ab5c37d9540b..c80e2c3a919b 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c | |||
@@ -137,10 +137,6 @@ static int touchbook_twl_gpio_setup(struct device *dev, | |||
137 | mmc[0].gpio_cd = gpio + 0; | 137 | mmc[0].gpio_cd = gpio + 0; |
138 | omap2_hsmmc_init(mmc); | 138 | omap2_hsmmc_init(mmc); |
139 | 139 | ||
140 | /* link regulators to MMC adapters */ | ||
141 | touchbook_vmmc1_supply.dev = mmc[0].dev; | ||
142 | touchbook_vsim_supply.dev = mmc[0].dev; | ||
143 | |||
144 | /* REVISIT: need ehci-omap hooks for external VBUS | 140 | /* REVISIT: need ehci-omap hooks for external VBUS |
145 | * power switch and overcurrent detect | 141 | * power switch and overcurrent detect |
146 | */ | 142 | */ |
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index 30c7556d251e..031a9a68156c 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c | |||
@@ -417,8 +417,6 @@ static int overo_twl_gpio_setup(struct device *dev, | |||
417 | { | 417 | { |
418 | omap2_hsmmc_init(mmc); | 418 | omap2_hsmmc_init(mmc); |
419 | 419 | ||
420 | overo_vmmc1_supply.dev = mmc[0].dev; | ||
421 | |||
422 | #if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE) | 420 | #if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE) |
423 | /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ | 421 | /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ |
424 | gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; | 422 | gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; |
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index cb012e16ba0f..8495f82fcbab 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c | |||
@@ -270,13 +270,6 @@ static int zoom_twl_gpio_setup(struct device *dev, | |||
270 | mmc[0].gpio_cd = gpio + 0; | 270 | mmc[0].gpio_cd = gpio + 0; |
271 | omap2_hsmmc_init(mmc); | 271 | omap2_hsmmc_init(mmc); |
272 | 272 | ||
273 | /* link regulators to MMC adapters ... we "know" the | ||
274 | * regulators will be set up only *after* we return. | ||
275 | */ | ||
276 | zoom_vmmc1_supply.dev = mmc[0].dev; | ||
277 | zoom_vsim_supply.dev = mmc[0].dev; | ||
278 | zoom_vmmc2_supply.dev = mmc[1].dev; | ||
279 | |||
280 | ret = gpio_request_one(LCD_PANEL_ENABLE_GPIO, GPIOF_OUT_INIT_LOW, | 273 | ret = gpio_request_one(LCD_PANEL_ENABLE_GPIO, GPIOF_OUT_INIT_LOW, |
281 | "lcd enable"); | 274 | "lcd enable"); |
282 | if (ret) | 275 | if (ret) |