| Submitter | Ajay Kumar Gupta |
|---|---|
| Date | 2009-10-28 15:12:36 |
| Message ID | <1256742758-32702-1-git-send-email-ajay.gupta@ti.com> |
| Download | mbox | patch |
| Permalink | /patch/56297/ |
| State | Changes Requested, archived |
| Delegated to: | Tony Lindgren |
| Headers | show |
Comments
> From: linux-omap-owner@vger.kernel.org [mailto:linux-omap- > owner@vger.kernel.org] On Behalf Of Gupta, Ajay Kumar > Sent: Wednesday, October 28, 2009 5:13 PM [...] > > Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> > --- > arch/arm/mach-omap2/mux.c | 7 +++++++ > arch/arm/plat-omap/include/plat/mux.h | 5 +++++ > 2 files changed, 12 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c > index 32c953e..00ad592 100644 > --- a/arch/arm/mach-omap2/mux.c > +++ b/arch/arm/mach-omap2/mux.c > @@ -551,6 +551,13 @@ MUX_CFG_34XX("AF13_3430_MMC3_DAT3", 0x5e2, > MUX_CFG_34XX("AF26_34XX_SYS_NIRQ", 0x1E0, > OMAP3_WAKEUP_EN | OMAP34XX_PIN_INPUT_PULLUP | > OMAP34XX_MUX_MODE0) > +/* EHCI GPIO's on OMAP3EVM (Rev >= E) */ > +MUX_CFG_34XX("AH14_34XX_GPIO21", 0x5ea, > + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT_PULLUP) > +MUX_CFG_34XX("AF9_34XX_GPIO22", 0x5ec, > + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT_PULLUP) > +MUX_CFG_34XX("U3_34XX_GPIO61", 0x0c8, > + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT_PULLUP) Apologies, but cant the bootloader handle this? do we want to wait for cleanup of mux system before doing this? Regards, Nishanth Menon -- 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
Nishanth, > > Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> > > --- > > arch/arm/mach-omap2/mux.c | 7 +++++++ > > arch/arm/plat-omap/include/plat/mux.h | 5 +++++ > > 2 files changed, 12 insertions(+), 0 deletions(-) > > > > diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c > > index 32c953e..00ad592 100644 > > --- a/arch/arm/mach-omap2/mux.c > > +++ b/arch/arm/mach-omap2/mux.c > > @@ -551,6 +551,13 @@ MUX_CFG_34XX("AF13_3430_MMC3_DAT3", 0x5e2, > > MUX_CFG_34XX("AF26_34XX_SYS_NIRQ", 0x1E0, > > OMAP3_WAKEUP_EN | OMAP34XX_PIN_INPUT_PULLUP | > > OMAP34XX_MUX_MODE0) > > +/* EHCI GPIO's on OMAP3EVM (Rev >= E) */ > > +MUX_CFG_34XX("AH14_34XX_GPIO21", 0x5ea, > > + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT_PULLUP) > > +MUX_CFG_34XX("AF9_34XX_GPIO22", 0x5ec, > > + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT_PULLUP) > > +MUX_CFG_34XX("U3_34XX_GPIO61", 0x0c8, > > + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT_PULLUP) > Apologies, but cant the bootloader handle this? do we want to wait for > cleanup of mux system before doing this? Bootloader can take care of this but I wanted to remove dependency on uboot. I will wait for others' comment and then revise the patch. Thanks, ajay > > Regards, > Nishanth Menon -- 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
Patch
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index 32c953e..00ad592 100644 --- a/arch/arm/mach-omap2/mux.c +++ b/arch/arm/mach-omap2/mux.c @@ -551,6 +551,13 @@ MUX_CFG_34XX("AF13_3430_MMC3_DAT3", 0x5e2, MUX_CFG_34XX("AF26_34XX_SYS_NIRQ", 0x1E0, OMAP3_WAKEUP_EN | OMAP34XX_PIN_INPUT_PULLUP | OMAP34XX_MUX_MODE0) +/* EHCI GPIO's on OMAP3EVM (Rev >= E) */ +MUX_CFG_34XX("AH14_34XX_GPIO21", 0x5ea, + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT_PULLUP) +MUX_CFG_34XX("AF9_34XX_GPIO22", 0x5ec, + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT_PULLUP) +MUX_CFG_34XX("U3_34XX_GPIO61", 0x0c8, + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT_PULLUP) }; #define OMAP34XX_PINS_SZ ARRAY_SIZE(omap34xx_pins) diff --git a/arch/arm/plat-omap/include/plat/mux.h b/arch/arm/plat-omap/include/plat/mux.h index f3c1d8a..8316d4f 100644 --- a/arch/arm/plat-omap/include/plat/mux.h +++ b/arch/arm/plat-omap/include/plat/mux.h @@ -840,6 +840,11 @@ enum omap34xx_index { /* SYS_NIRQ T2 INT1 */ AF26_34XX_SYS_NIRQ, + + /* EHCI GPIO's for OMAP3EVM (Rev >= E) */ + AH14_34XX_GPIO21, + AF9_34XX_GPIO22, + U3_34XX_GPIO61, }; struct omap_mux_cfg {
OMAP3EVM (Rev >= E) has EHCI port on main board itself. Apart from this there is a slot to connect Mistral Daughter Card (MDC) to it which also has one EHCI port. Only one EHCI port can be used at a time and we can choose the port using GPIO61. These are the new GPIO lines used for different purpose on EHCI interface. - GPIO21 - EHCI phy reset - GPIO22 - EHCI VBUS enable - GPIO61 - Selects EHCI port either on main board or on Mistral Daughter Card (MDC). Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> --- arch/arm/mach-omap2/mux.c | 7 +++++++ arch/arm/plat-omap/include/plat/mux.h | 5 +++++ 2 files changed, 12 insertions(+), 0 deletions(-)