diff mbox

OMAP: pandora: setup regulator framework for MMC

Message ID 1240778719-26353-1-git-send-email-notasas@gmail.com (mailing list archive)
State Accepted
Commit 415f2c76e247f2e6a325621e54f0b1b5dc3669cd
Headers show

Commit Message

Grazvydas Ignotas April 26, 2009, 8:45 p.m. UTC 
Setup regulators for MMC1 and MMC2 to get those SD slots
working again.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
CC: David Brownell <david-b@pacbell.net>
---
 arch/arm/mach-omap2/board-omap3pandora.c |   45 ++++++++++++++++++++++++++++++
 1 files changed, 45 insertions(+), 0 deletions(-)

Comments

David Brownell April 28, 2009, 2:56 a.m. UTC | #1 
On Sunday 26 April 2009, Grazvydas Ignotas wrote:
> Setup regulators for MMC1 and MMC2 to get those SD slots
> working again.
> 
> Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>

Acked-by: David Brownell <dbrownell@users.sourceforge.net>



> CC: David Brownell <david-b@pacbell.net>
> ---
>  arch/arm/mach-omap2/board-omap3pandora.c |   45 ++++++++++++++++++++++++++++++
>  1 files changed, 45 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
> index c67f62f..c525b16 100644
> --- a/arch/arm/mach-omap2/board-omap3pandora.c
> +++ b/arch/arm/mach-omap2/board-omap3pandora.c
> @@ -27,6 +27,7 @@
>  
>  #include <linux/spi/spi.h>
>  #include <linux/spi/ads7846.h>
> +#include <linux/regulator/machine.h>
>  #include <linux/i2c/twl4030.h>
>  
>  #include <linux/mtd/mtd.h>
> @@ -171,6 +172,14 @@ static struct omap_uart_config omap3pandora_uart_config __initdata = {
>  	.enabled_uarts	= (1 << 2), /* UART3 */
>  };
>  
> +static struct regulator_consumer_supply pandora_vmmc1_supply = {
> +	.supply			= "vmmc",
> +};
> +
> +static struct regulator_consumer_supply pandora_vmmc2_supply = {
> +	.supply			= "vmmc",
> +};
> +
>  static int omap3pandora_twl_gpio_setup(struct device *dev,
>  		unsigned gpio, unsigned ngpio)
>  {
> @@ -179,6 +188,10 @@ static int omap3pandora_twl_gpio_setup(struct device *dev,
>  	omap3pandora_mmc[1].gpio_cd = gpio + 1;
>  	twl4030_mmc_init(omap3pandora_mmc);
>  
> +	/* link regulators to MMC adapters */
> +	pandora_vmmc1_supply.dev = omap3pandora_mmc[0].dev;
> +	pandora_vmmc2_supply.dev = omap3pandora_mmc[1].dev;
> +
>  	return 0;
>  }
>  
> @@ -189,6 +202,36 @@ static struct twl4030_gpio_platform_data omap3pandora_gpio_data = {
>  	.setup		= omap3pandora_twl_gpio_setup,
>  };
>  
> +/* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */
> +static struct regulator_init_data pandora_vmmc1 = {
> +	.constraints = {
> +		.min_uV			= 1850000,
> +		.max_uV			= 3150000,
> +		.valid_modes_mask	= REGULATOR_MODE_NORMAL
> +					| REGULATOR_MODE_STANDBY,
> +		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE
> +					| REGULATOR_CHANGE_MODE
> +					| REGULATOR_CHANGE_STATUS,
> +	},
> +	.num_consumer_supplies	= 1,
> +	.consumer_supplies	= &pandora_vmmc1_supply,
> +};
> +
> +/* VMMC2 for MMC2 pins CMD, CLK, DAT0..DAT3 (max 100 mA) */
> +static struct regulator_init_data pandora_vmmc2 = {
> +	.constraints = {
> +		.min_uV			= 1850000,
> +		.max_uV			= 3150000,
> +		.valid_modes_mask	= REGULATOR_MODE_NORMAL
> +					| REGULATOR_MODE_STANDBY,
> +		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE
> +					| REGULATOR_CHANGE_MODE
> +					| REGULATOR_CHANGE_STATUS,
> +	},
> +	.num_consumer_supplies	= 1,
> +	.consumer_supplies	= &pandora_vmmc2_supply,
> +};
> +
>  static struct twl4030_usb_data omap3pandora_usb_data = {
>  	.usb_mode	= T2_USB_MODE_ULPI,
>  };
> @@ -198,6 +241,8 @@ static struct twl4030_platform_data omap3pandora_twldata = {
>  	.irq_end	= TWL4030_IRQ_END,
>  	.gpio		= &omap3pandora_gpio_data,
>  	.usb		= &omap3pandora_usb_data,
> +	.vmmc1		= &pandora_vmmc1,
> +	.vmmc2		= &pandora_vmmc2,
>  };
>  
>  static struct i2c_board_info __initdata omap3pandora_i2c_boardinfo[] = {
> -- 
> 1.5.6.3
> 
> 



--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tony Lindgren April 28, 2009, 6:34 p.m. UTC | #2 
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Initial commit ID (Likely to change): 415f2c76e247f2e6a325621e54f0b1b5dc3669cd

PatchWorks
http://patchwork.kernel.org/patch/20035/

Git
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=415f2c76e247f2e6a325621e54f0b1b5dc3669cd


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index c67f62f..c525b16 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -27,6 +27,7 @@ 
 
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
+#include <linux/regulator/machine.h>
 #include <linux/i2c/twl4030.h>
 
 #include <linux/mtd/mtd.h>
@@ -171,6 +172,14 @@  static struct omap_uart_config omap3pandora_uart_config __initdata = {
 	.enabled_uarts	= (1 << 2), /* UART3 */
 };
 
+static struct regulator_consumer_supply pandora_vmmc1_supply = {
+	.supply			= "vmmc",
+};
+
+static struct regulator_consumer_supply pandora_vmmc2_supply = {
+	.supply			= "vmmc",
+};
+
 static int omap3pandora_twl_gpio_setup(struct device *dev,
 		unsigned gpio, unsigned ngpio)
 {
@@ -179,6 +188,10 @@  static int omap3pandora_twl_gpio_setup(struct device *dev,
 	omap3pandora_mmc[1].gpio_cd = gpio + 1;
 	twl4030_mmc_init(omap3pandora_mmc);
 
+	/* link regulators to MMC adapters */
+	pandora_vmmc1_supply.dev = omap3pandora_mmc[0].dev;
+	pandora_vmmc2_supply.dev = omap3pandora_mmc[1].dev;
+
 	return 0;
 }
 
@@ -189,6 +202,36 @@  static struct twl4030_gpio_platform_data omap3pandora_gpio_data = {
 	.setup		= omap3pandora_twl_gpio_setup,
 };
 
+/* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */
+static struct regulator_init_data pandora_vmmc1 = {
+	.constraints = {
+		.min_uV			= 1850000,
+		.max_uV			= 3150000,
+		.valid_modes_mask	= REGULATOR_MODE_NORMAL
+					| REGULATOR_MODE_STANDBY,
+		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE
+					| REGULATOR_CHANGE_MODE
+					| REGULATOR_CHANGE_STATUS,
+	},
+	.num_consumer_supplies	= 1,
+	.consumer_supplies	= &pandora_vmmc1_supply,
+};
+
+/* VMMC2 for MMC2 pins CMD, CLK, DAT0..DAT3 (max 100 mA) */
+static struct regulator_init_data pandora_vmmc2 = {
+	.constraints = {
+		.min_uV			= 1850000,
+		.max_uV			= 3150000,
+		.valid_modes_mask	= REGULATOR_MODE_NORMAL
+					| REGULATOR_MODE_STANDBY,
+		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE
+					| REGULATOR_CHANGE_MODE
+					| REGULATOR_CHANGE_STATUS,
+	},
+	.num_consumer_supplies	= 1,
+	.consumer_supplies	= &pandora_vmmc2_supply,
+};
+
 static struct twl4030_usb_data omap3pandora_usb_data = {
 	.usb_mode	= T2_USB_MODE_ULPI,
 };
@@ -198,6 +241,8 @@  static struct twl4030_platform_data omap3pandora_twldata = {
 	.irq_end	= TWL4030_IRQ_END,
 	.gpio		= &omap3pandora_gpio_data,
 	.usb		= &omap3pandora_usb_data,
+	.vmmc1		= &pandora_vmmc1,
+	.vmmc2		= &pandora_vmmc2,
 };
 
 static struct i2c_board_info __initdata omap3pandora_i2c_boardinfo[] = {