usb: phy: msm: Select secondary PHY via TCSR
Subsystems (2)
PATCH 1/1 usb: phy: msm: Select secondary PHY via TCSR
Select the secondary PHY using the TCSR register, if phy-num=1 in the DTS (or phy_number is set in the platform data). The SOC has 2 PHYs which can be used with the OTG port, and this code allows configuring the correct one.
Note: This resolves the problem I was seeing where I couldn't get the USB driver working at all on a dragonboard, from cold boot. This patch depends on patch 5/14 from Ivan's msm USB patch set. It does not use DT for the register address, as there's no evidence that this address changes between SoC versions.
--- drivers/usb/phy/phy-msm-usb.c | 14 ++++++++++++++ include/linux/usb/msm_hsusb_hw.h | 3 +++ 2 files changed, 17 insertions(+)
drivers/usb/phy/phy-msm-usb.c +14 -0
@@ -1518,6 +1518,7 @@ static int __init msm_otg_probe(struct platform_device *pdev)struct resource *res;struct msm_otg *motg;struct usb_phy *phy; +void __iomem *phy_select; motg =devm_kzalloc (&pdev->dev,sizeof (struct msm_otg ),GFP_KERNEL );if (!motg) {
@@ -1580,6 +1581,19 @@ static int __init msm_otg_probe(struct platform_device *pdev)if (IS_ERR (motg->regs))return PTR_ERR (motg->regs); +/* +* NOTE: The PHYs can be multiplexed between the chipidea controller +* and the dwc3 controller, using a single bit. It is important that +* the dwc3 driver does not set this bit in an incompatible way. +*/ +if (motg->phy_number) { + phy_select =devm_ioremap_nocache (&pdev->dev,USB2_PHY_SEL ,4 ); +if (IS_ERR (phy_select)) +return PTR_ERR (phy_select); +/* Enable second PHY with the OTG port */ +writel_relaxed (0x1 , phy_select); + } +dev_info (&pdev->dev,"OTG regs = %p\n" , motg->regs); motg->irq =platform_get_irq (pdev,0 );
include/linux/usb/msm_hsusb_hw.h +3 -0
@@ -16,6 +16,9 @@#ifndef __LINUX_USB_GADGET_MSM72K_UDC_H__#define __LINUX_USB_GADGET_MSM72K_UDC_H__ +/* USB phy selector - in TCSR address range */ +#define USB2_PHY_SEL 0xfd4ab000 +#define USB_AHBBURST (MSM_USB_BASE + 0x0090)#define USB_AHBMODE (MSM_USB_BASE + 0x0098)#define USB_CAPLENGTH (MSM_USB_BASE + 0x0100)/* 8 bit */
Signature · 1 line
1.8.2.2
Hi,
Quoted 5 lines · Tim Bird
Select the secondary PHY using the TCSR register, if phy-num=1 in the DTS (or
phy_numberis set in the platform data). The SOC has 2 PHYs which can be used with the OTG port, and this code allows configuring the correct one.
Quoted 8 lines
Note: This resolves the problem I was seeing where I couldn't get the USB driver working at all on a dragonboard, from cold boot. This patch depends on patch 5/14 from Ivan's msm USB patch set. It does not use DT for the register address, as there's no evidence that this address changes between SoC versions.
Signed-off-by Tim Bird <[email protected]>
doesn't apply:
checking file drivers/usb/phy/phy-msm-usb.c
Hunk #1 succeeded at 1412 with fuzz 2 (offset -106 lines). Hunk #2 FAILED at 1581.
1 out of 2 hunks FAILED
checking file include/linux/usb/msm_hsusb_hw.h
Signature · 1 line
balbi
Quoted 17 lines · Felipe Balbi
Hi,
Quoted 5 lines · Tim Bird
Select the secondary PHY using the TCSR register, if phy-num=1 in the DTS (or
phy_numberis set in the platform data). The SOC has 2 PHYs which can be used with the OTG port, and this code allows configuring the correct one.Quoted 8 lines
Note: This resolves the problem I was seeing where I couldn't get the USB driver working at all on a dragonboard, from cold boot. This patch depends on patch 5/14 from Ivan's msm USB patch set. It does not use DT for the register address, as there's no evidence that this address changes between SoC versions.
Signed-off-by Tim Bird <[email protected]>
Quoted 7 lines
doesn't apply:
checking file
drivers/usb/phy/phy-msm-usb.c
Hunk #1 succeeded at 1412 with fuzz 2 (offset -106 lines). Hunk #2 FAILED at 1581.
1 out of 2 hunks FAILED
checking fileinclude/linux/usb/msm_hsusb_hw.h
Sorry about that.
Did you apply this on top of Ivan's USB patch set? That's a pre-requisite.
I've communicated privately with Ivan, and he's preparing an updated patch set which incorporates this fix and a few other things. This should be showing up soon-ish.
-- Tim
Senior Software Engineer, Sony Mobile Architecture Group Chair, CE Workgroup, Linux Foundation
Quoted 26 lines · Tim Bird
Quoted 17 lines · Felipe Balbi
Hi,
Quoted 5 lines · Tim Bird
Select the secondary PHY using the TCSR register, if phy-num=1 in the DTS (or
phy_numberis set in the platform data). The SOC has 2 PHYs which can be used with the OTG port, and this code allows configuring the correct one.Quoted 8 lines
Note: This resolves the problem I was seeing where I couldn't get the USB driver working at all on a dragonboard, from cold boot. This patch depends on patch 5/14 from Ivan's msm USB patch set. It does not use DT for the register address, as there's no evidence that this address changes between SoC versions.
Signed-off-by Tim Bird <[email protected]>Quoted 7 lines
doesn't apply:
checking file
drivers/usb/phy/phy-msm-usb.c
Hunk #1 succeeded at 1412 with fuzz 2 (offset -106 lines). Hunk #2 FAILED at 1581.
1 out of 2 hunks FAILED
checking fileinclude/linux/usb/msm_hsusb_hw.h
Quoted 3 lines
Sorry about that.
Did you apply this on top of Ivan's USB patch set? That's a pre-requisite.
hehe, probably not :-)
Quoted 3 lines
I've communicated privately with Ivan, and he's preparing an updated patch set which incorporates this fix and a few other things. This should be showing up soon-ish.
alright, thanks
Signature · 1 line
balbi