> -----Original Message----- > From: linux-omap-owner@xxxxxxxxxxxxxxx > [mailto:linux-omap-owner@xxxxxxxxxxxxxxx] On Behalf Of Menon, Nishanth > Sent: Thursday, May 26, 2011 7:27 AM > To: linux-omap > Cc: Sonasath, Moiz; Menon, Nishanth > Subject: [RFC][PATCH 3/9] OMAP4460: HWMOD: DO not reset GPIO1 > during HWMOD init [sp] typo in the subject. "DO" -> "Do" Another nit: Are 2 HWMODs required in the subject? ~sanjeev > > From: Moiz Sonasath <m-sonasath@xxxxxx> > > For OMAP4460, GPIO-7 of bank1 is used for controling > the TPS modes, hence GPIO1 should not be reset > during init as reset will cause the TPS voltage to > drop to 0.9 V. > > Originally from: > http://git.omapzoom.org/?p=kernel/omap.git;a=commitdiff;h=52ae > 4f0de03b17c064d9ce90a580230f1a596ec1 > > [nm@xxxxxx: upstream version] > Signed-off-by: Nishanth Menon <nm@xxxxxx> > Signed-off-by: Moiz Sonasath <m-sonasath@xxxxxx> > --- > arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 27 > ++++++++++++++++++++++++--- > 1 files changed, 24 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c > b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c > index 2f51a5a..27319c4 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c > +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c > @@ -1745,7 +1745,7 @@ static struct omap_hwmod_opt_clk > gpio1_opt_clks[] = { > { .role = "dbclk", .clk = "gpio1_dbclk" }, > }; > > -static struct omap_hwmod omap44xx_gpio1_hwmod = { > +static struct omap_hwmod omap443x_gpio1_hwmod = { > .name = "gpio1", > .class = &omap44xx_gpio_hwmod_class, > .mpu_irqs = omap44xx_gpio1_irqs, > @@ -1761,7 +1761,27 @@ static struct omap_hwmod > omap44xx_gpio1_hwmod = { > .dev_attr = &gpio_dev_attr, > .slaves = omap44xx_gpio1_slaves, > .slaves_cnt = ARRAY_SIZE(omap44xx_gpio1_slaves), > - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP44XX), > + .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), > +}; > + > +static struct omap_hwmod omap446x_gpio1_hwmod = { > + .name = "gpio1", > + .class = &omap44xx_gpio_hwmod_class, > + .flags = HWMOD_INIT_NO_RESET, > + .mpu_irqs = omap44xx_gpio1_irqs, > + .mpu_irqs_cnt = ARRAY_SIZE(omap44xx_gpio1_irqs), > + .main_clk = "gpio1_ick", > + .prcm = { > + .omap4 = { > + .clkctrl_reg = OMAP4430_CM_WKUP_GPIO1_CLKCTRL, > + }, > + }, > + .opt_clks = gpio1_opt_clks, > + .opt_clks_cnt = ARRAY_SIZE(gpio1_opt_clks), > + .dev_attr = &gpio_dev_attr, > + .slaves = omap44xx_gpio1_slaves, > + .slaves_cnt = ARRAY_SIZE(omap44xx_gpio1_slaves), > + .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4460), > }; > > /* gpio2 */ > @@ -5079,7 +5099,8 @@ static __initdata struct omap_hwmod > *omap44xx_hwmods[] = { > &omap44xx_dss_venc_hwmod, > > /* gpio class */ > - &omap44xx_gpio1_hwmod, > + &omap443x_gpio1_hwmod, > + &omap446x_gpio1_hwmod, > &omap44xx_gpio2_hwmod, > &omap44xx_gpio3_hwmod, > &omap44xx_gpio4_hwmod, > -- > 1.7.1 > > -- > To unsubscribe from this list: send the line "unsubscribe > linux-omap" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > 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@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
