ehci-msm: Remove global struct usb_phy variable
Subsystems (4)
PATCH 1/2 ehci-msm: Remove global struct usb_phy variable
From: "Ivan T. Ivanov" <[email protected]>
Use struct usb_hcd::phy to hold USB PHY instance.
Signed-off-by Ivan T. Ivanov <[email protected]>
--- drivers/usb/host/ehci-msm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/host/ehci-msm.c +3 -2
@@ -42,7 +42,6 @@static const char hcd_name[] ="ehci-msm" ;static struct hc_driver __read_mostly msm_hc_driver; -static struct usb_phy *phy;static int ehci_msm_reset (struct usb_hcd *hcd) {
@@ -70,6 +69,7 @@ static int ehci_msm_probe(struct platform_device *pdev) {struct usb_hcd *hcd;struct resource *res; +struct usb_phy *phy;int ret;dev_dbg (&pdev->dev,"ehci_msm proble\n" );
@@ -121,6 +121,7 @@ static int ehci_msm_probe(struct platform_device *pdev) goto put_hcd; } + hcd->phy = phy;device_init_wakeup (&pdev->dev,1 );/* * OTG device parent of HCD takes care of putting
@@ -147,7 +148,7 @@ static int ehci_msm_remove(struct platform_device *pdev)pm_runtime_disable (&pdev->dev);pm_runtime_set_suspended (&pdev->dev); -otg_set_host (phy->otg,NULL ); +otg_set_host (hcd->phy->otg,NULL );/* FIXME: need to call usb_remove_hcd() here? */
Signature · 1 line
1.7.9.5
PATCH 2/2 USB: ehci-msm: Add device tree support and binding information
From: "Ivan T. Ivanov" <[email protected]>
Allows MSM EHCI controller to be specified via device tree.
Signed-off-by Ivan T. Ivanov <[email protected]>
--- .../devicetree/bindings/usb/msm-hsusb.txt | 17 +++++++++++++++++ drivers/usb/host/ehci-msm.c | 15 +++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/usb/msm-hsusb.txt
Documentation/devicetree/bindings/usb/msm-hsusb.txt new file +17 -0
@@ -0,0 +1,17 @@ +MSM SoC HSUSB controllers + +EHCI + +Required properties: +- compatible: Should contain "qcom,ehci-host" +- regs: offset and length of the register set in the memory map +- usb-phy: phandle for the PHY device + +Example EHCI controller device node: + + ehci: ehci@f9a55000 { + compatible = "qcom,ehci-host"; + reg = <0xf9a55000 0x400>; + usb-phy = <&usb_otg>; + }; +
drivers/usb/host/ehci-msm.c +13 -2
@@ -108,10 +108,14 @@ static int ehci_msm_probe(struct platform_device *pdev)* powering up VBUS, mapping of registers address space and power * management. */ - phy =devm_usb_get_phy (&pdev->dev,USB_PHY_TYPE_USB2 ); +if (pdev->dev.of_node) + phy =devm_usb_get_phy_by_phandle (&pdev->dev,"usb-phy" ,0 ); +else + phy =devm_usb_get_phy (&pdev->dev,USB_PHY_TYPE_USB2 ); +if (IS_ERR (phy)) {dev_err (&pdev->dev,"unable to find transceiver\n" ); - ret = -ENODEV ; + ret = -EPROBE_DEFER ; goto put_hcd; }
@@ -187,12 +191,19 @@ static const struct dev_pm_ops ehci_msm_dev_pm_ops = { .resume = ehci_msm_pm_resume, }; +static struct of_device_id msm_ehci_dt_match[] = { + { .compatible ="qcom,ehci-host" , }, + {} +}; +MODULE_DEVICE_TABLE (of, msm_ehci_dt_match); +static struct platform_driver ehci_msm_driver = { .probe = ehci_msm_probe, .remove = ehci_msm_remove, .driver = { .name ="msm_hsusb_host" , .pm = &ehci_msm_dev_pm_ops, + .of_match_table = msm_ehci_dt_match, }, };
Signature · 1 line
1.7.9.5
Re: [PATCH 2/2] USB: ehci-msm: Add device tree support and binding information
Quoted 8 lines · Ivan T. Ivanov
From: "Ivan T. Ivanov" <[email protected]>
Allows MSM EHCI controller to be specified via device tree.
Signed-off-by Ivan T. Ivanov <[email protected]>---
.../devicetree/bindings/usb/msm-hsusb.txt | 17 +++++++++++++++++ drivers/usb/host/ehci-msm.c | 15 +++++++++++++--
Acked-by David Brown <[email protected]>
Signature · 3 lines
sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Quoted 7 lines · Ivan T. Ivanov
From: "Ivan T. Ivanov" <[email protected]>
Use struct
usb_hcd::phyto hold USB PHY instance.Signed-off-by Ivan T. Ivanov <[email protected]>---
drivers/usb/host/ehci-msm.c| 5 +++--
Acked-by David Brown <[email protected]>
Signature · 3 lines
sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation