mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-27 06:18:13 +00:00
Koen Kooi
161 lines
6.0 KiB
Diff
161 lines
6.0 KiB
Diff
From a3d13ae14bca7c412e5b0575c244ce7370fa3747 Mon Sep 17 00:00:00 2001
|
|
From: Oleg Drokin <green@linuxhacker.ru>
|
|
Date: Mon, 6 Jun 2011 18:57:08 +0000
|
|
Subject: [PATCH 002/149] 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>
|
|
---
|
|
arch/arm/mach-omap2/board-cm-t35.c | 4 ----
|
|
arch/arm/mach-omap2/board-ldp.c | 2 --
|
|
arch/arm/mach-omap2/board-omap3beagle.c | 4 ----
|
|
arch/arm/mach-omap2/board-omap3evm.c | 4 ----
|
|
arch/arm/mach-omap2/board-omap3logic.c | 2 --
|
|
arch/arm/mach-omap2/board-omap3stalker.c | 4 ----
|
|
arch/arm/mach-omap2/board-omap3touchbook.c | 4 ----
|
|
arch/arm/mach-omap2/board-overo.c | 2 --
|
|
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 e7bf32d..ceb581e 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,
|
|
mmc[0].gpio_cd = gpio + 0;
|
|
omap2_hsmmc_init(mmc);
|
|
|
|
- /* link regulators to MMC adapters */
|
|
- cm_t35_vmmc1_supply.dev = mmc[0].dev;
|
|
- cm_t35_vsim_supply.dev = mmc[0].dev;
|
|
-
|
|
return 0;
|
|
}
|
|
|
|
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
|
|
index 069bc9f..2d7e0ae 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)
|
|
ARRAY_SIZE(ldp_nand_partitions), ZOOM_NAND_CS, 0);
|
|
|
|
omap2_hsmmc_init(mmc);
|
|
- /* link regulators to MMC adapters */
|
|
- ldp_vmmc1_supply.dev = mmc[0].dev;
|
|
}
|
|
|
|
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 4cf7c19..8ef0e19 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,
|
|
mmc[0].gpio_cd = gpio + 0;
|
|
omap2_hsmmc_init(mmc);
|
|
|
|
- /* link regulators to MMC adapters */
|
|
- beagle_vmmc1_supply.dev = mmc[0].dev;
|
|
- beagle_vsim_supply.dev = mmc[0].dev;
|
|
-
|
|
/*
|
|
* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, XM active
|
|
* high / others active low)
|
|
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
|
|
index fc7a23a..e2202dd 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,
|
|
mmc[0].gpio_cd = gpio + 0;
|
|
omap2_hsmmc_init(mmc);
|
|
|
|
- /* link regulators to MMC adapters */
|
|
- omap3evm_vmmc1_supply.dev = mmc[0].dev;
|
|
- omap3evm_vsim_supply.dev = mmc[0].dev;
|
|
-
|
|
/*
|
|
* Most GPIOs are for USB OTG. Some are mostly sent to
|
|
* 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 ec18435..eaefb59 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)
|
|
}
|
|
|
|
omap2_hsmmc_init(board_mmc_info);
|
|
- /* link regulators to MMC adapters */
|
|
- omap3logic_vmmc1_supply.dev = board_mmc_info[0].dev;
|
|
}
|
|
|
|
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 99be540..63d12a3 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,
|
|
mmc[0].gpio_cd = gpio + 0;
|
|
omap2_hsmmc_init(mmc);
|
|
|
|
- /* link regulators to MMC adapters */
|
|
- omap3stalker_vmmc1_supply.dev = mmc[0].dev;
|
|
- omap3stalker_vsim_supply.dev = mmc[0].dev;
|
|
-
|
|
/*
|
|
* Most GPIOs are for USB OTG. Some are mostly sent to
|
|
* 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 ab5c37d..c80e2c3 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,
|
|
mmc[0].gpio_cd = gpio + 0;
|
|
omap2_hsmmc_init(mmc);
|
|
|
|
- /* link regulators to MMC adapters */
|
|
- touchbook_vmmc1_supply.dev = mmc[0].dev;
|
|
- touchbook_vsim_supply.dev = mmc[0].dev;
|
|
-
|
|
/* REVISIT: need ehci-omap hooks for external VBUS
|
|
* power switch and overcurrent detect
|
|
*/
|
|
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
|
|
index 30c7556..031a9a6 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,
|
|
{
|
|
omap2_hsmmc_init(mmc);
|
|
|
|
- overo_vmmc1_supply.dev = mmc[0].dev;
|
|
-
|
|
#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)
|
|
/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
|
|
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 cb012e1..8495f82 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,
|
|
mmc[0].gpio_cd = gpio + 0;
|
|
omap2_hsmmc_init(mmc);
|
|
|
|
- /* link regulators to MMC adapters ... we "know" the
|
|
- * regulators will be set up only *after* we return.
|
|
- */
|
|
- zoom_vmmc1_supply.dev = mmc[0].dev;
|
|
- zoom_vsim_supply.dev = mmc[0].dev;
|
|
- zoom_vmmc2_supply.dev = mmc[1].dev;
|
|
-
|
|
ret = gpio_request_one(LCD_PANEL_ENABLE_GPIO, GPIOF_OUT_INIT_LOW,
|
|
"lcd enable");
|
|
if (ret)
|
|
--
|
|
1.7.2.5
|
|
|