ARM: OMAP3: evm: initialize vmmc and vmmc_aux regulators
Subsystems (3)
PATCH 1/1 ARM: OMAP3: evm: initialize vmmc and vmmc_aux regulators
Signed-off-by Mike Rapoport <[email protected]>
--- arch/arm/mach-omap2/board-omap3evm.c | 46 ++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/board-omap3evm.c +46 -0
@@ -27,6 +27,8 @@#include <linux/i2c/twl4030.h> #include <linux/usb/otg.h> +#include <linux/regulator/machine.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
@@ -92,6 +94,44 @@ static inline void __init omap3evm_init_smc911x(void)gpio_direction_input (OMAP3EVM_ETHR_GPIO_IRQ ); } +static struct regulator_consumer_supply omap3evm_vmmc1_supply = { + .supply ="vmmc" , +}; + +static struct regulator_consumer_supply omap3evm_vsim_supply = { + .supply ="vmmc_aux" , +}; + +/* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */ +static struct regulator_init_data omap3evm_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 = &omap3evm_vmmc1_supply, +}; + +/* VSIM for MMC1 pins DAT4..DAT7 (2 mA, plus card == max 50 mA) */ +static struct regulator_init_data omap3evm_vsim = { + .constraints = { + .min_uV =1800000 , + .max_uV =3000000 , + .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 = &omap3evm_vsim_supply, +}; +static struct twl4030_hsmmc_info mmc[] = { { .mmc =1 ,
@@ -134,6 +174,10 @@ static int omap3evm_twl_gpio_setup(struct device *dev, mmc[0 ].gpio_cd = gpio +0 ;twl4030_mmc_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.
@@ -199,6 +243,8 @@ static struct twl4030_platform_data omap3evm_twldata = { .madc = &omap3evm_madc_data, .usb = &omap3evm_usb_data, .gpio = &omap3evm_gpio_data, + .vmmc1 = &omap3evm_vmmc1, + .vsim = &omap3evm_vsim, };static struct i2c_board_info __initdata omap3evm_i2c_boardinfo[] = {
Signature · 1 line
1.6.0.6
Tony Lindgren
maintainerPATCH 1/1 ARM: OMAP3: evm: initialize vmmc and vmmc_aux regulators
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: for-next
Initial commit ID (Likely to change): d237a6c9aa080334bb83e545bb6b7b74aa565334
PatchWorks
http://patchwork.kernel.org/patch/46068/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=d237a6c9aa080334bb83e545bb6b7b74aa565334