[PATCH 1/7] usb: dwc3: get "usb_phy" only if the platform indicates the presence of PHY

[Vivek Gautam]

On Thu, Sep 12, 2013 at 4:06 PM, Roger Quadros <rogerq at ti.com> wrote:
> Hi Kishon,
>
> On 09/02/2013 06:43 PM, Kishon Vijay Abraham I wrote:
>> There can be systems which does not have a external usb_phy, so get
>> usb_phy only if usb-phy property is added in the case of dt boot or if
>> platform_data indicates the presence of PHY. Also remove checking if
>> return value is -ENXIO since it's now changed to always enable usb_phy layer.
>>
>> Signed-off-by: Kishon Vijay Abraham I <kishon at ti.com>
>> ---
>>  drivers/usb/dwc3/Kconfig         |    1 +
>>  drivers/usb/dwc3/core.c          |   60 +++++++++++++++++---------------------
>>  drivers/usb/dwc3/platform_data.h |    1 +
>>  3 files changed, 28 insertions(+), 34 deletions(-)
>>
>> diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
>> index f969ea2..cfc16dd 100644
>> --- a/drivers/usb/dwc3/Kconfig
>> +++ b/drivers/usb/dwc3/Kconfig
>> @@ -2,6 +2,7 @@ config USB_DWC3
>>       tristate "DesignWare USB3 DRD Core Support"
>>       depends on (USB || USB_GADGET) && GENERIC_HARDIRQS && HAS_DMA
>>       depends on EXTCON
>> +     select USB_PHY
>>       select USB_XHCI_PLATFORM if USB_SUPPORT && USB_XHCI_HCD
>>       help
>>         Say Y or M here if your system has a Dual Role SuperSpeed
>> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
>> index 474162e..428c29e 100644
>> --- a/drivers/usb/dwc3/core.c
>> +++ b/drivers/usb/dwc3/core.c
>> @@ -387,16 +387,38 @@ static int dwc3_probe(struct platform_device *pdev)
>>       if (node) {
>>               dwc->maximum_speed = of_usb_get_maximum_speed(node);
>>
>> -             dwc->usb2_phy = devm_usb_get_phy_by_phandle(dev, "usb-phy", 0);
>> -             dwc->usb3_phy = devm_usb_get_phy_by_phandle(dev, "usb-phy", 1);
>> +             if (of_property_read_bool(node, "usb-phy")) {
>> +                     dwc->usb2_phy = devm_usb_get_phy_by_phandle(dev,
>> +                             "usb-phy", 0);
>> +                     if (IS_ERR(dwc->usb2_phy))
>> +                             return PTR_ERR(dwc->usb2_phy);
>> +                     dwc->usb3_phy = devm_usb_get_phy_by_phandle(dev,
>> +                             "usb-phy", 1);
>> +                     if (IS_ERR(dwc->usb3_phy))
>> +                             return PTR_ERR(dwc->usb3_phy);
>
> Some DWC3 instances use only usb2_phy. e.g. on DRA7 the 2nd dwc3 instance doesn't use usb3_phy.
> This needs to be a valid case and driver shouldn't error out.

So, i think adding flexibility to DWC3 to have either
usb2-phy/usb3-phy or both of them seems to be valid point.
Any suggestions ?

>
>> +             } else {
>> +                     dwc->usb2_phy = NULL;
>> +                     dwc->usb3_phy = NULL;
>> +             }
>>
>>               dwc->needs_fifo_resize = of_property_read_bool(node, "tx-fifo-resize");
>>               dwc->dr_mode = of_usb_get_dr_mode(node);
>>       } else if (pdata) {
>>               dwc->maximum_speed = pdata->maximum_speed;
>>
>> -             dwc->usb2_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
>> -             dwc->usb3_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB3);
>> +             if (pdata->has_phy) {
>> +                     dwc->usb2_phy = devm_usb_get_phy(dev,
>> +                             USB_PHY_TYPE_USB2);
>> +                     if (IS_ERR(dwc->usb2_phy))
>> +                             return PTR_ERR(dwc->usb2_phy);
>> +                     dwc->usb3_phy = devm_usb_get_phy(dev,
>> +                             USB_PHY_TYPE_USB3);
>> +                     if (IS_ERR(dwc->usb3_phy))
>> +                             return PTR_ERR(dwc->usb3_phy);
>
> same here?
>
>> +             } else {
>> +                     dwc->usb2_phy = NULL;
>> +                     dwc->usb3_phy = NULL;
>> +             }
>>
>>               dwc->needs_fifo_resize = pdata->tx_fifo_resize;
>>               dwc->dr_mode = pdata->dr_mode;
>> @@ -409,36 +431,6 @@ static int dwc3_probe(struct platform_device *pdev)
>>       if (dwc->maximum_speed == USB_SPEED_UNKNOWN)
>>               dwc->maximum_speed = USB_SPEED_SUPER;
>>
>> -     if (IS_ERR(dwc->usb2_phy)) {
>> -             ret = PTR_ERR(dwc->usb2_phy);
>> -
>> -             /*
>> -              * if -ENXIO is returned, it means PHY layer wasn't
>> -              * enabled, so it makes no sense to return -EPROBE_DEFER
>> -              * in that case, since no PHY driver will ever probe.
>> -              */
>> -             if (ret == -ENXIO)
>> -                     return ret;
>> -
>> -             dev_err(dev, "no usb2 phy configured\n");
>> -             return -EPROBE_DEFER;
>> -     }
>> -
>> -     if (IS_ERR(dwc->usb3_phy)) {
>> -             ret = PTR_ERR(dwc->usb3_phy);
>> -
>> -             /*
>> -              * if -ENXIO is returned, it means PHY layer wasn't
>> -              * enabled, so it makes no sense to return -EPROBE_DEFER
>> -              * in that case, since no PHY driver will ever probe.
>> -              */
>> -             if (ret == -ENXIO)
>> -                     return ret;
>> -
>> -             dev_err(dev, "no usb3 phy configured\n");
>> -             return -EPROBE_DEFER;
>> -     }
>> -
>>       dwc->xhci_resources[0].start = res->start;
>>       dwc->xhci_resources[0].end = dwc->xhci_resources[0].start +
>>                                       DWC3_XHCI_REGS_END;
>> diff --git a/drivers/usb/dwc3/platform_data.h b/drivers/usb/dwc3/platform_data.h
>> index 7db34f0..5a5e068 100644
>> --- a/drivers/usb/dwc3/platform_data.h
>> +++ b/drivers/usb/dwc3/platform_data.h
>> @@ -24,4 +24,5 @@ struct dwc3_platform_data {
>>       enum usb_device_speed maximum_speed;
>>       enum usb_dr_mode dr_mode;
>>       bool tx_fifo_resize;
>> +     bool has_phy;
>>  };
>>
>
> cheers,
> -roger
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/



-- 
Best Regards
Vivek