ehci: fix ehci pin mux init
Subsystems (4)
PATCH 1/1 ehci: fix ehci pin mux init
EHCI pin mux init fucntion is still using old #ifdef which are not defined anymore.This causes pin mux init to always set TLL settings and thus EHCI PHY mode doesn't work.
Fixing this issue by using phy_mode parameter to initialize mux settings.
--- arch/arm/mach-omap2/usb-ehci.c | 167 ++++++++++++++++++++-------------------- 1 files changed, 83 insertions(+), 84 deletions(-)
arch/arm/mach-omap2/usb-ehci.c +83 -84
@@ -68,90 +68,89 @@ static struct platform_device ehci_device = {/* * setup_ehci_io_mux - initialize IO pad mux for USBHOST */ -static void setup_ehci_io_mux (void ) +static void setup_ehci_io_mux (enum ehci_hcd_omap_mode phy_mode) { -#ifdef CONFIG_OMAP_EHCI_PHY_MODE -/* PHY mode of operation for board: 750-2083-001 -* ISP1504 connected to Port1 and Port2 -* Do Func Mux setting for 12-pin ULPI PHY mode -*/ - -/* Port1 */ -omap_cfg_reg (Y9_3430_USB1HS_PHY_STP ); -omap_cfg_reg (Y8_3430_USB1HS_PHY_CLK ); -omap_cfg_reg (AA14_3430_USB1HS_PHY_DIR ); -omap_cfg_reg (AA11_3430_USB1HS_PHY_NXT ); -omap_cfg_reg (W13_3430_USB1HS_PHY_DATA0 ); -omap_cfg_reg (W12_3430_USB1HS_PHY_DATA1 ); -omap_cfg_reg (W11_3430_USB1HS_PHY_DATA2 ); -omap_cfg_reg (Y11_3430_USB1HS_PHY_DATA3 ); -omap_cfg_reg (W9_3430_USB1HS_PHY_DATA4 ); -omap_cfg_reg (Y12_3430_USB1HS_PHY_DATA5 ); -omap_cfg_reg (W8_3430_USB1HS_PHY_DATA6 ); -omap_cfg_reg (Y13_3430_USB1HS_PHY_DATA7 ); - -/* Port2 */ -omap_cfg_reg (AA10_3430_USB2HS_PHY_STP ); -omap_cfg_reg (AA8_3430_USB2HS_PHY_CLK ); -omap_cfg_reg (AA9_3430_USB2HS_PHY_DIR ); -omap_cfg_reg (AB11_3430_USB2HS_PHY_NXT ); -omap_cfg_reg (AB10_3430_USB2HS_PHY_DATA0 ); -omap_cfg_reg (AB9_3430_USB2HS_PHY_DATA1 ); -omap_cfg_reg (W3_3430_USB2HS_PHY_DATA2 ); -omap_cfg_reg (T4_3430_USB2HS_PHY_DATA3 ); -omap_cfg_reg (T3_3430_USB2HS_PHY_DATA4 ); -omap_cfg_reg (R3_3430_USB2HS_PHY_DATA5 ); -omap_cfg_reg (R4_3430_USB2HS_PHY_DATA6 ); -omap_cfg_reg (T2_3430_USB2HS_PHY_DATA7 ); - -#else -/* Set Func mux for : -* TLL mode of operation -* 12-pin ULPI SDR TLL mode for Port1/2/3 -*/ - -/* Port1 */ -omap_cfg_reg (Y9_3430_USB1HS_TLL_STP ); -omap_cfg_reg (Y8_3430_USB1HS_TLL_CLK ); -omap_cfg_reg (AA14_3430_USB1HS_TLL_DIR ); -omap_cfg_reg (AA11_3430_USB1HS_TLL_NXT ); -omap_cfg_reg (W13_3430_USB1HS_TLL_DATA0 ); -omap_cfg_reg (W12_3430_USB1HS_TLL_DATA1 ); -omap_cfg_reg (W11_3430_USB1HS_TLL_DATA2 ); -omap_cfg_reg (Y11_3430_USB1HS_TLL_DATA3 ); -omap_cfg_reg (W9_3430_USB1HS_TLL_DATA4 ); -omap_cfg_reg (Y12_3430_USB1HS_TLL_DATA5 ); -omap_cfg_reg (W8_3430_USB1HS_TLL_DATA6 ); -omap_cfg_reg (Y13_3430_USB1HS_TLL_DATA7 ); - -/* Port2 */ -omap_cfg_reg (AA10_3430_USB2HS_TLL_STP ); -omap_cfg_reg (AA8_3430_USB2HS_TLL_CLK ); -omap_cfg_reg (AA9_3430_USB2HS_TLL_DIR ); -omap_cfg_reg (AB11_3430_USB2HS_TLL_NXT ); -omap_cfg_reg (AB10_3430_USB2HS_TLL_DATA0 ); -omap_cfg_reg (AB9_3430_USB2HS_TLL_DATA1 ); -omap_cfg_reg (W3_3430_USB2HS_TLL_DATA2 ); -omap_cfg_reg (T4_3430_USB2HS_TLL_DATA3 ); -omap_cfg_reg (T3_3430_USB2HS_TLL_DATA4 ); -omap_cfg_reg (R3_3430_USB2HS_TLL_DATA5 ); -omap_cfg_reg (R4_3430_USB2HS_TLL_DATA6 ); -omap_cfg_reg (T2_3430_USB2HS_TLL_DATA7 ); - -/* Port3 */ -omap_cfg_reg (AB3_3430_USB3HS_TLL_STP ); -omap_cfg_reg (AA6_3430_USB3HS_TLL_CLK ); -omap_cfg_reg (AA3_3430_USB3HS_TLL_DIR ); -omap_cfg_reg (Y3_3430_USB3HS_TLL_NXT ); -omap_cfg_reg (AA5_3430_USB3HS_TLL_DATA0 ); -omap_cfg_reg (Y4_3430_USB3HS_TLL_DATA1 ); -omap_cfg_reg (Y5_3430_USB3HS_TLL_DATA2 ); -omap_cfg_reg (W5_3430_USB3HS_TLL_DATA3 ); -omap_cfg_reg (AB12_3430_USB3HS_TLL_DATA4 ); -omap_cfg_reg (AB13_3430_USB3HS_TLL_DATA5 ); -omap_cfg_reg (AA13_3430_USB3HS_TLL_DATA6 ); -omap_cfg_reg (AA12_3430_USB3HS_TLL_DATA7 ); -#endif /* CONFIG_OMAP_EHCI_PHY_MODE */ +if (phy_mode ==EHCI_HCD_OMAP_MODE_PHY ) { +/* PHY mode of operation for board: 750-2083-001 +* ISP1504 connected to Port1 and Port2 +* Do Func Mux setting for 12-pin ULPI PHY mode +*/ +/* Port1 */ +omap_cfg_reg (Y9_3430_USB1HS_PHY_STP ); +omap_cfg_reg (Y8_3430_USB1HS_PHY_CLK ); +omap_cfg_reg (AA14_3430_USB1HS_PHY_DIR ); +omap_cfg_reg (AA11_3430_USB1HS_PHY_NXT ); +omap_cfg_reg (W13_3430_USB1HS_PHY_DATA0 ); +omap_cfg_reg (W12_3430_USB1HS_PHY_DATA1 ); +omap_cfg_reg (W11_3430_USB1HS_PHY_DATA2 ); +omap_cfg_reg (Y11_3430_USB1HS_PHY_DATA3 ); +omap_cfg_reg (W9_3430_USB1HS_PHY_DATA4 ); +omap_cfg_reg (Y12_3430_USB1HS_PHY_DATA5 ); +omap_cfg_reg (W8_3430_USB1HS_PHY_DATA6 ); +omap_cfg_reg (Y13_3430_USB1HS_PHY_DATA7 ); + +/* Port2 */ +omap_cfg_reg (AA10_3430_USB2HS_PHY_STP ); +omap_cfg_reg (AA8_3430_USB2HS_PHY_CLK ); +omap_cfg_reg (AA9_3430_USB2HS_PHY_DIR ); +omap_cfg_reg (AB11_3430_USB2HS_PHY_NXT ); +omap_cfg_reg (AB10_3430_USB2HS_PHY_DATA0 ); +omap_cfg_reg (AB9_3430_USB2HS_PHY_DATA1 ); +omap_cfg_reg (W3_3430_USB2HS_PHY_DATA2 ); +omap_cfg_reg (T4_3430_USB2HS_PHY_DATA3 ); +omap_cfg_reg (T3_3430_USB2HS_PHY_DATA4 ); +omap_cfg_reg (R3_3430_USB2HS_PHY_DATA5 ); +omap_cfg_reg (R4_3430_USB2HS_PHY_DATA6 ); +omap_cfg_reg (T2_3430_USB2HS_PHY_DATA7 ); + + }else { +/* Set Func mux for : +* TLL mode of operation +* 12-pin ULPI SDR TLL mode for Port1/2/3 +*/ + +/* Port1 */ +omap_cfg_reg (Y9_3430_USB1HS_TLL_STP ); +omap_cfg_reg (Y8_3430_USB1HS_TLL_CLK ); +omap_cfg_reg (AA14_3430_USB1HS_TLL_DIR ); +omap_cfg_reg (AA11_3430_USB1HS_TLL_NXT ); +omap_cfg_reg (W13_3430_USB1HS_TLL_DATA0 ); +omap_cfg_reg (W12_3430_USB1HS_TLL_DATA1 ); +omap_cfg_reg (W11_3430_USB1HS_TLL_DATA2 ); +omap_cfg_reg (Y11_3430_USB1HS_TLL_DATA3 ); +omap_cfg_reg (W9_3430_USB1HS_TLL_DATA4 ); +omap_cfg_reg (Y12_3430_USB1HS_TLL_DATA5 ); +omap_cfg_reg (W8_3430_USB1HS_TLL_DATA6 ); +omap_cfg_reg (Y13_3430_USB1HS_TLL_DATA7 ); + +/* Port2 */ +omap_cfg_reg (AA10_3430_USB2HS_TLL_STP ); +omap_cfg_reg (AA8_3430_USB2HS_TLL_CLK ); +omap_cfg_reg (AA9_3430_USB2HS_TLL_DIR ); +omap_cfg_reg (AB11_3430_USB2HS_TLL_NXT ); +omap_cfg_reg (AB10_3430_USB2HS_TLL_DATA0 ); +omap_cfg_reg (AB9_3430_USB2HS_TLL_DATA1 ); +omap_cfg_reg (W3_3430_USB2HS_TLL_DATA2 ); +omap_cfg_reg (T4_3430_USB2HS_TLL_DATA3 ); +omap_cfg_reg (T3_3430_USB2HS_TLL_DATA4 ); +omap_cfg_reg (R3_3430_USB2HS_TLL_DATA5 ); +omap_cfg_reg (R4_3430_USB2HS_TLL_DATA6 ); +omap_cfg_reg (T2_3430_USB2HS_TLL_DATA7 ); + +/* Port3 */ +omap_cfg_reg (AB3_3430_USB3HS_TLL_STP ); +omap_cfg_reg (AA6_3430_USB3HS_TLL_CLK ); +omap_cfg_reg (AA3_3430_USB3HS_TLL_DIR ); +omap_cfg_reg (Y3_3430_USB3HS_TLL_NXT ); +omap_cfg_reg (AA5_3430_USB3HS_TLL_DATA0 ); +omap_cfg_reg (Y4_3430_USB3HS_TLL_DATA1 ); +omap_cfg_reg (Y5_3430_USB3HS_TLL_DATA2 ); +omap_cfg_reg (W5_3430_USB3HS_TLL_DATA3 ); +omap_cfg_reg (AB12_3430_USB3HS_TLL_DATA4 ); +omap_cfg_reg (AB13_3430_USB3HS_TLL_DATA5 ); +omap_cfg_reg (AA13_3430_USB3HS_TLL_DATA6 ); +omap_cfg_reg (AA12_3430_USB3HS_TLL_DATA7 ); + }return ; }
@@ -172,7 +171,7 @@ void __init usb_ehci_init(enum ehci_hcd_omap_mode phy_mode,/* Setup Pin IO MUX for EHCI */ if (cpu_is_omap34xx ()) -setup_ehci_io_mux (); +setup_ehci_io_mux (phy_mode);if (platform_device_register (&ehci_device) <0 ) {printk (KERN_ERR "Unable to register HS-USB (EHCI) device\n" );
Signature · 1 line
1.6.2.4
Quoted 8 lines · ext Ajay Kumar Gupta
EHCI pin mux init fucntion is still using old #ifdef which are not defined anymore.This causes pin mux init to always set TLL settings and thus EHCI PHY mode doesn't work.
Fixing this issue by using
phy_modeparameter to initialize mux settings.Signed-off-by Ajay Kumar Gupta <[email protected]>
Signature · 1 line
balbi
Tony Lindgren
maintainerQuoted 11 lines · Felipe Balbi
Quoted 8 lines · ext Ajay Kumar Gupta
EHCI pin mux init fucntion is still using old #ifdef which are not defined anymore.This causes pin mux init to always set TLL settings and thus EHCI PHY mode doesn't work.
Fixing this issue by using
phy_modeparameter to initialize mux settings.Signed-off-by Ajay Kumar Gupta <[email protected]>Acked-by Felipe Balbi <[email protected]>
Adding this to ehci branch.
Tony