* Re: [patch 2.6.29-rc7-omap-git] Overo: MMC regulator configuration (V2)
@ 2009-03-16 4:37 Steve Sakoman
2009-03-20 19:12 ` [APPLIED] [patch 2.6.29-rc7-omap-git] Overo: MMC regulator configuration Tony Lindgren
0 siblings, 1 reply; 2+ messages in thread
From: Steve Sakoman @ 2009-03-16 4:37 UTC (permalink / raw)
To: OMAP; +Cc: David Brownell
From: David Brownell <dbrownell@users.sourceforge.net>
This patch hooks up the twl4030 MMC1 regulator on Overo,
The WLAN chip connected to MMC2 on some board versions
has a dedicated regulator.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
Patches still needed for LDP/Zoom and Pandora...
--- a/arch/arm/mach-omap2/board-overo.c 2009-03-14 21:03:05.000000000 -0700
+++ b/arch/arm/mach-omap2/board-overo.c 2009-03-15 20:38:07.000000000 -0700
@@ -267,10 +267,43 @@ static struct omap_uart_config overo_uar
.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
};
+static struct twl4030_hsmmc_info mmc[] = {
+ {
+ .mmc = 1,
+ .wires = 4,
+ .gpio_cd = -EINVAL,
+ .gpio_wp = -EINVAL,
+ },
+ {
+ .mmc = 2,
+ .wires = 4,
+ .gpio_cd = -EINVAL,
+ .gpio_wp = -EINVAL,
+ .transceiver = true,
+ .ocr_mask = 0x00100000, /* 3.3V */
+ },
+ {} /* Terminator */
+};
+
+static struct regulator_consumer_supply overo_vmmc1_supply = {
+ .supply = "vmmc",
+};
+
+static int overo_twl_gpio_setup(struct device *dev,
+ unsigned gpio, unsigned ngpio)
+{
+ twl4030_mmc_init(mmc);
+
+ overo_vmmc1_supply.dev = mmc[0].dev;
+
+ return 0;
+}
+
static struct twl4030_gpio_platform_data overo_gpio_data = {
.gpio_base = OMAP_MAX_GPIO_LINES,
.irq_base = TWL4030_GPIO_IRQ_BASE,
.irq_end = TWL4030_GPIO_IRQ_END,
+ .setup = overo_twl_gpio_setup,
};
static struct twl4030_usb_data overo_usb_data = {
@@ -287,6 +320,8 @@ static struct regulator_init_data overo_
| REGULATOR_CHANGE_MODE
| REGULATOR_CHANGE_STATUS,
},
+ .num_consumer_supplies = 1,
+ .consumer_supplies = &overo_vmmc1_supply,
};
/* mmc2 (WLAN) and Bluetooth don't use twl4030 regulators */
@@ -343,23 +378,6 @@ static struct platform_device *overo_dev
&overo_lcd_device,
};
-static struct twl4030_hsmmc_info mmc[] __initdata = {
- {
- .mmc = 1,
- .wires = 4,
- .gpio_cd = -EINVAL,
- .gpio_wp = -EINVAL,
- },
- {
- .mmc = 2,
- .wires = 4,
- .gpio_cd = -EINVAL,
- .gpio_wp = -EINVAL,
- .transceiver = true,
- },
- {} /* Terminator */
-};
-
static void __init overo_init(void)
{
overo_i2c_init();
@@ -367,7 +385,6 @@ static void __init overo_init(void)
omap_board_config = overo_config;
omap_board_config_size = ARRAY_SIZE(overo_config);
omap_serial_init();
- twl4030_mmc_init(mmc);
usb_musb_init();
usb_ehci_init();
overo_flash_init();
^ permalink raw reply [flat|nested] 2+ messages in thread
* [APPLIED] [patch 2.6.29-rc7-omap-git] Overo: MMC regulator configuration
2009-03-16 4:37 [patch 2.6.29-rc7-omap-git] Overo: MMC regulator configuration (V2) Steve Sakoman
@ 2009-03-20 19:12 ` Tony Lindgren
0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2009-03-20 19:12 UTC (permalink / raw)
To: linux-omap
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Commit: 51b50f420fbb144b5a02dbc817fe7b72c3476d66
PatchWorks
http://patchwork.kernel.org/patch/12294/
Git
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=51b50f420fbb144b5a02dbc817fe7b72c3476d66
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-03-20 19:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-16 4:37 [patch 2.6.29-rc7-omap-git] Overo: MMC regulator configuration (V2) Steve Sakoman
2009-03-20 19:12 ` [APPLIED] [patch 2.6.29-rc7-omap-git] Overo: MMC regulator configuration Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).