omap3evm: ehci: Add EHCI padconfig for board Rev >= E
Hi,
Quoted 10 lines · Ajay Kumar Gupta
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).
Let's put this on hold until we have the new mux framework. Should be trivial to do then.
Tony
Quoted 41 lines
Signed-off-by Ajay Kumar Gupta <[email protected]>---
arch/arm/mach-omap2/mux.c| 7 +++++++arch/arm/plat-omap/include/plat/mux.h | 5 +++++ 2 files changed, 12 insertions(+), 0 deletions(-)arch/arm/mach-omap2/mux.c +7
-0@@ -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)arch/arm/plat-omap/include/plat/mux.h +5
-0@@ -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 {
Hi,
Quoted 8 lines · Ajay Kumar Gupta
Quoted 6 lines
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
Quoted 8 lines
interface.
Quoted 4 lines
- GPIO21 - EHCI phy reset
- GPIO22 - EHCI VBUS enable
- GPIO61 - Selects EHCI port either on main board or on Mistral Daughter Card (MDC).Let's put this on hold until we have the new mux framework. Should be trivial to do then.
Tony,
Another patch [1] which depends on this is already merged to 'for-next' branch causing a compilation error.
[1] omap3evm: ehci: Update EHCI support on OMAP3EVM (Rev >= E)
So either revert the above patch from 'for-next' or merge the pinmux patch also.
Regards,
Ajay
Quoted 45 lines
Tony
arch/arm/plat-
Quoted 26 lines
Signed-off-by Ajay Kumar Gupta <[email protected]>---
arch/arm/mach-omap2/mux.c| 7 +++++++arch/arm/plat-omap/include/plat/mux.h | 5 +++++ 2 files changed, 12 insertions(+), 0 deletions(-)arch/arm/mach-omap2/mux.c +7
-0@@ -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)arch/arm/plat- renamed from arch/arm/plat-omap/include/plat/mux.h +0
-0
omap/include/plat/mux.hQuoted 15 lines
index f3c1d8a..8316d4f 100644
arch/arm/plat-omap/include/plat/mux.h +5
-0@@ -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 {
Quoted 20 lines · Gupta, Ajay Kumar
Hi,
Quoted 8 lines · Ajay Kumar Gupta
Quoted 6 lines
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
Quoted 8 lines
interface.
Quoted 4 lines
- GPIO21 - EHCI phy reset
- GPIO22 - EHCI VBUS enable
- GPIO61 - Selects EHCI port either on main board or on Mistral Daughter Card (MDC).Let's put this on hold until we have the new mux framework. Should be trivial to do then.
Tony,
Quoted 7 lines
Another patch [1] which depends on this is already merged to 'for-next' branch causing a compilation error.
[1] omap3evm: ehci: Update EHCI support on OMAP3EVM (Rev >= E)
So either revert the above patch from 'for-next' or merge the pinmux patch also.
OK, merged the additional pinmux patch into the "Update EHCI support.." patch.
Tony
Quoted 48 lines
Regards,
AjayQuoted 45 lines
Tony
arch/arm/plat-
Quoted 26 lines
Signed-off-by Ajay Kumar Gupta <[email protected]>---
arch/arm/mach-omap2/mux.c| 7 +++++++arch/arm/plat-omap/include/plat/mux.h | 5 +++++ 2 files changed, 12 insertions(+), 0 deletions(-)arch/arm/mach-omap2/mux.c +7
-0@@ -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)arch/arm/plat- renamed from arch/arm/plat-omap/include/plat/mux.h +0
-0
omap/include/plat/mux.hQuoted 15 lines
index f3c1d8a..8316d4f 100644
arch/arm/plat-omap/include/plat/mux.h +5
-0@@ -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 {