| Message ID | 1405342198-3870-3-git-send-email-gautam.vivek@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Jul 14, 2014 at 5:49 AM, Vivek Gautam <gautam.vivek@samsung.com> wrote: > The host controller by itself may sometimes need to handle PHY > and/or calibrate some of the PHY settings to get full support out > of the PHY controller. The PHY core provides a calibration > funtionality now to do so. > Therefore, facilitate getting the two possible PHYs, viz. > USB 2.0 type (UTMI+) and USB 3.0 type (PIPE3). > > Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com> > --- > drivers/usb/host/xhci-plat.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c > index 1a0cf9f..d097d60 100644 > --- a/drivers/usb/host/xhci-plat.c > +++ b/drivers/usb/host/xhci-plat.c > @@ -16,6 +16,7 @@ > #include <linux/module.h> > #include <linux/of.h> > #include <linux/platform_device.h> > +#include <linux/phy/phy.h> > #include <linux/slab.h> > #include <linux/usb/xhci_pdriver.h> > > @@ -180,6 +181,14 @@ static int xhci_plat_probe(struct platform_device *pdev) > goto put_hcd; > } > > + /* Get possile USB 2.0 type PHY (UTMI+) available with xhci */ > + hcd->gen_phy = devm_phy_get(&pdev->dev, "usb2-phy"); > + if (IS_ERR(hcd->gen_phy)) { > + ret = PTR_ERR(hcd->gen_phy); > + if (ret != -ENOSYS && ret != -ENODEV) > + dev_dbg(&pdev->dev, "no usb2 phy configured\n"); nit: This message is not really accurate anymore, right? If there is no phy configured, you get ENODEV and (correctly) skip the message completely. What you probably want is dev_warn(..., "error retrieving usb2 phy: %d\n"); or something like that. > + } > + > ret = usb_add_hcd(hcd, irq, IRQF_SHARED); > if (ret) > goto disable_clk; > @@ -209,6 +218,14 @@ static int xhci_plat_probe(struct platform_device *pdev) > if (HCC_MAX_PSA(xhci->hcc_params) >= 4) > xhci->shared_hcd->can_do_streams = 1; > > + /* Get possile USB 3.0 type PHY (PIPE3) available with xhci */ > + xhci->shared_hcd->gen_phy = devm_phy_get(&pdev->dev, "usb3-phy"); > + if (IS_ERR(xhci->shared_hcd->gen_phy)) { > + ret = PTR_ERR(xhci->shared_hcd->gen_phy); > + if (ret != -ENOSYS && ret != -ENODEV) > + dev_dbg(&pdev->dev, "no usb3 phy configured\n"); > + } > + > ret = usb_add_hcd(xhci->shared_hcd, irq, IRQF_SHARED); > if (ret) > goto put_usb3_hcd; > -- > 1.7.10.4 >
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index 1a0cf9f..d097d60 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -16,6 +16,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h> +#include <linux/phy/phy.h> #include <linux/slab.h> #include <linux/usb/xhci_pdriver.h> @@ -180,6 +181,14 @@ static int xhci_plat_probe(struct platform_device *pdev) goto put_hcd; } + /* Get possile USB 2.0 type PHY (UTMI+) available with xhci */ + hcd->gen_phy = devm_phy_get(&pdev->dev, "usb2-phy"); + if (IS_ERR(hcd->gen_phy)) { + ret = PTR_ERR(hcd->gen_phy); + if (ret != -ENOSYS && ret != -ENODEV) + dev_dbg(&pdev->dev, "no usb2 phy configured\n"); + } + ret = usb_add_hcd(hcd, irq, IRQF_SHARED); if (ret) goto disable_clk; @@ -209,6 +218,14 @@ static int xhci_plat_probe(struct platform_device *pdev) if (HCC_MAX_PSA(xhci->hcc_params) >= 4) xhci->shared_hcd->can_do_streams = 1; + /* Get possile USB 3.0 type PHY (PIPE3) available with xhci */ + xhci->shared_hcd->gen_phy = devm_phy_get(&pdev->dev, "usb3-phy"); + if (IS_ERR(xhci->shared_hcd->gen_phy)) { + ret = PTR_ERR(xhci->shared_hcd->gen_phy); + if (ret != -ENOSYS && ret != -ENODEV) + dev_dbg(&pdev->dev, "no usb3 phy configured\n"); + } + ret = usb_add_hcd(xhci->shared_hcd, irq, IRQF_SHARED); if (ret) goto put_usb3_hcd;
The host controller by itself may sometimes need to handle PHY and/or calibrate some of the PHY settings to get full support out of the PHY controller. The PHY core provides a calibration funtionality now to do so. Therefore, facilitate getting the two possible PHYs, viz. USB 2.0 type (UTMI+) and USB 3.0 type (PIPE3). Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com> --- drivers/usb/host/xhci-plat.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)