| Message ID | 1314203836-3799-1-git-send-email-bdefaria@adeneo-embedded.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, [...] > arch/arm/mach-omap2/board-omap3evm.c | 25 +++++++++++++++++++++++++ > 1 files changed, 25 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach- > omap2/board-omap3evm.c > index c452b3f..13a2b71 100644 > --- a/arch/arm/mach-omap2/board-omap3evm.c > +++ b/arch/arm/mach-omap2/board-omap3evm.c > @@ -377,6 +377,10 @@ static int omap3evm_twl_gpio_setup(struct device > *dev, > if (r) > printk(KERN_ERR "failed to get/set lcd_bkl gpio\n"); > > + /* gpio + 2 == HSUSB2 Clock Enable */ This comment should be modified. gpio+2 not only enables EHCI but also camera and Audio lines. > + if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2) > + gpio_request_one(gpio + 2, GPIOF_OUT_INIT_LOW, > "EN_HSUSB2_CLK"); This name "EN_HSUSB2_CLK" should also be changed. Ajay > + > /* gpio + 7 == DVI Enable */ > gpio_request_one(gpio + 7, GPIOF_OUT_INIT_LOW, "EN_DVI"); > > @@ -450,6 +454,25 @@ static struct regulator_init_data omap3evm_vio = { > .consumer_supplies = omap3evm_vio_supply, > }; > > +/* VAUX2 for EHCI */ > +static struct regulator_consumer_supply omap3evm_vaux2_supplies[] = { > + REGULATOR_SUPPLY("hsusb1", "ehci-omap.0"), > +}; > + > +static struct regulator_init_data omap3evm_vaux2 = { > + .constraints = { > + .min_uV = 1800000, > + .max_uV = 1800000, > + .apply_uV = true, > + .valid_modes_mask = REGULATOR_MODE_NORMAL > + | REGULATOR_MODE_STANDBY, > + .valid_ops_mask = REGULATOR_CHANGE_MODE > + | REGULATOR_CHANGE_STATUS, > + }, > + .num_consumer_supplies = ARRAY_SIZE(omap3evm_vaux2_supplies), > + .consumer_supplies = omap3evm_vaux2_supplies, > +}; > + > #ifdef CONFIG_WL12XX_PLATFORM_DATA > > #define OMAP3EVM_WLAN_PMENA_GPIO (150) > @@ -510,6 +533,8 @@ static int __init omap3_evm_i2c_init(void) > > omap3evm_twldata.vdac->constraints.apply_uV = true; > omap3evm_twldata.vpll2->constraints.apply_uV = true; > + if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2) > + omap3evm_twldata.vaux2 = &omap3evm_vaux2; > > omap3_pmic_init("twl4030", &omap3evm_twldata); > omap_register_i2c_bus(2, 400, NULL, 0); > -- > 1.7.4.1 > > -- > 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 -- 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 --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index c452b3f..13a2b71 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -377,6 +377,10 @@ static int omap3evm_twl_gpio_setup(struct device *dev, if (r) printk(KERN_ERR "failed to get/set lcd_bkl gpio\n"); + /* gpio + 2 == HSUSB2 Clock Enable */ + if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2) + gpio_request_one(gpio + 2, GPIOF_OUT_INIT_LOW, "EN_HSUSB2_CLK"); + /* gpio + 7 == DVI Enable */ gpio_request_one(gpio + 7, GPIOF_OUT_INIT_LOW, "EN_DVI"); @@ -450,6 +454,25 @@ static struct regulator_init_data omap3evm_vio = { .consumer_supplies = omap3evm_vio_supply, }; +/* VAUX2 for EHCI */ +static struct regulator_consumer_supply omap3evm_vaux2_supplies[] = { + REGULATOR_SUPPLY("hsusb1", "ehci-omap.0"), +}; + +static struct regulator_init_data omap3evm_vaux2 = { + .constraints = { + .min_uV = 1800000, + .max_uV = 1800000, + .apply_uV = true, + .valid_modes_mask = REGULATOR_MODE_NORMAL + | REGULATOR_MODE_STANDBY, + .valid_ops_mask = REGULATOR_CHANGE_MODE + | REGULATOR_CHANGE_STATUS, + }, + .num_consumer_supplies = ARRAY_SIZE(omap3evm_vaux2_supplies), + .consumer_supplies = omap3evm_vaux2_supplies, +}; + #ifdef CONFIG_WL12XX_PLATFORM_DATA #define OMAP3EVM_WLAN_PMENA_GPIO (150) @@ -510,6 +533,8 @@ static int __init omap3_evm_i2c_init(void) omap3evm_twldata.vdac->constraints.apply_uV = true; omap3evm_twldata.vpll2->constraints.apply_uV = true; + if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2) + omap3evm_twldata.vaux2 = &omap3evm_vaux2; omap3_pmic_init("twl4030", &omap3evm_twldata); omap_register_i2c_bus(2, 400, NULL, 0);
Set the VAUX2 regulator supply to 1.8V for the HSUSB host interface. Tps65950 GPIO2 has to be set to zero in order to enable the EHCI select line. Signed-off-by: Bryan DE FARIA <bdefaria@adeneo-embedded.com> --- arch/arm/mach-omap2/board-omap3evm.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-)