lkml.org 
[lkml]   [2014]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v5 9/9] usb: chipidea: add support to the generic PHY framework in ChipIdea
    On Mon, Sep 15, 2014 at 12:35:09PM +0200, Antoine Tenart wrote:
    > This patch adds support of the PHY framework for ChipIdea drivers.
    > Changes are done in both the ChipIdea common code and in the drivers
    > accessing the PHY. This is done by adding a new PHY member in
    > ChipIdea's structures and by taking care of it in the code.
    >
    > Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
    > ---
    > drivers/usb/chipidea/ci.h | 5 ++-
    > drivers/usb/chipidea/core.c | 83 +++++++++++++++++++++++++++++++++---------
    > drivers/usb/chipidea/debug.c | 2 +-
    > drivers/usb/chipidea/host.c | 5 ++-
    > drivers/usb/chipidea/otg_fsm.c | 6 ++-
    > include/linux/usb/chipidea.h | 2 +
    > 6 files changed, 81 insertions(+), 22 deletions(-)
    >
    > diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h
    > index dac5ab6adfa2..7e9e8223672a 100644
    > --- a/drivers/usb/chipidea/ci.h
    > +++ b/drivers/usb/chipidea/ci.h
    > @@ -161,7 +161,8 @@ struct hw_bank {
    > * @test_mode: the selected test mode
    > * @platdata: platform specific information supplied by parent device
    > * @vbus_active: is VBUS active
    > - * @usb_phy: pointer to USB PHY, if any
    > + * @phy: pointer to PHY, if any
    > + * @usb_phy: pointer to USB PHY, if any and if using the USB PHY framework
    > * @hcd: pointer to usb_hcd for ehci host driver
    > * @debugfs: root dentry for this controller in debugfs
    > * @id_event: indicates there is an id event, and handled at ci_otg_work
    > @@ -202,6 +203,8 @@ struct ci_hdrc {
    >
    > struct ci_hdrc_platform_data *platdata;
    > int vbus_active;
    > + struct phy *phy;
    > + /* old usb_phy interface */
    > struct usb_phy *usb_phy;
    > struct usb_hcd *hcd;
    > struct dentry *debugfs;
    > diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
    > index ee96b0696a7b..e1d3d3f44075 100644
    > --- a/drivers/usb/chipidea/core.c
    > +++ b/drivers/usb/chipidea/core.c
    > @@ -47,6 +47,7 @@
    > #include <linux/delay.h>
    > #include <linux/device.h>
    > #include <linux/dma-mapping.h>
    > +#include <linux/phy/phy.h>
    > #include <linux/platform_device.h>
    > #include <linux/module.h>
    > #include <linux/idr.h>
    > @@ -293,6 +294,49 @@ static void hw_phymode_configure(struct ci_hdrc *ci)
    > }
    >
    > /**
    > + * _ci_usb_phy_init: initialize phy taking in account both phy and usb_phy
    > + * interfaces
    > + * @ci: the controller
    > + *
    > + * This function returns an error code if the phy failed to init
    > + */
    > +static int _ci_usb_phy_init(struct ci_hdrc *ci)
    > +{
    > + int ret;
    > +
    > + if (ci->phy) {
    > + ret = phy_init(ci->phy);
    > + if (ret)
    > + return ret;
    > +
    > + ret = phy_power_on(ci->phy);
    > + if (ret) {
    > + phy_exit(ci->phy);
    > + return ret;
    > + }
    > + } else {
    > + ret = usb_phy_init(ci->usb_phy);
    > + }
    > +
    > + return ret;
    > +}
    > +
    > +/**
    > + * _ci_usb_phy_exit: deinitialize phy taking in account both phy and usb_phy
    > + * interfaces
    > + * @ci: the controller
    > + */
    > +static void ci_usb_phy_exit(struct ci_hdrc *ci)
    > +{
    > + if (ci->phy) {
    > + phy_power_off(ci->phy);
    > + phy_exit(ci->phy);
    > + } else {
    > + usb_phy_shutdown(ci->usb_phy);
    > + }
    > +}
    > +
    > +/**
    > * ci_usb_phy_init: initialize phy according to different phy type
    > * @ci: the controller
    > *
    > @@ -306,7 +350,7 @@ static int ci_usb_phy_init(struct ci_hdrc *ci)
    > case USBPHY_INTERFACE_MODE_UTMI:
    > case USBPHY_INTERFACE_MODE_UTMIW:
    > case USBPHY_INTERFACE_MODE_HSIC:
    > - ret = usb_phy_init(ci->usb_phy);
    > + ret = _ci_usb_phy_init(ci);
    > if (ret)
    > return ret;
    > hw_phymode_configure(ci);
    > @@ -314,12 +358,12 @@ static int ci_usb_phy_init(struct ci_hdrc *ci)
    > case USBPHY_INTERFACE_MODE_ULPI:
    > case USBPHY_INTERFACE_MODE_SERIAL:
    > hw_phymode_configure(ci);
    > - ret = usb_phy_init(ci->usb_phy);
    > + ret = _ci_usb_phy_init(ci);
    > if (ret)
    > return ret;
    > break;
    > default:
    > - ret = usb_phy_init(ci->usb_phy);
    > + ret = _ci_usb_phy_init(ci);
    > }
    >
    > return ret;
    > @@ -595,23 +639,26 @@ static int ci_hdrc_probe(struct platform_device *pdev)
    > return -ENODEV;
    > }
    >
    > - if (ci->platdata->usb_phy)
    > + if (ci->platdata->phy) {
    > + ci->phy = ci->platdata->phy;
    > + } else if (ci->platdata->usb_phy) {
    > ci->usb_phy = ci->platdata->usb_phy;
    > - else
    > + } else {
    > + ci->phy = devm_phy_get(dev, "usb-phy");
    > ci->usb_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
    >
    > - if (IS_ERR(ci->usb_phy)) {
    > - ret = PTR_ERR(ci->usb_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;
    > + /* if both generic PHY and USB PHY layers aren't enabled */
    > + if (PTR_ERR(ci->phy) == -ENOSYS &&
    > + PTR_ERR(ci->usb_phy) == -ENXIO)
    > + return -ENXIO;
    > +
    > + if (IS_ERR(ci->phy) && IS_ERR(ci->usb_phy))
    > + return -EPROBE_DEFER;
    >
    > - dev_err(dev, "no usb2 phy configured\n");
    > - return -EPROBE_DEFER;
    > + if (IS_ERR(ci->phy))
    > + ci->phy = NULL;
    > + else if (IS_ERR(ci->usb_phy))
    > + ci->usb_phy = NULL;
    > }
    >
    > ret = ci_usb_phy_init(ci);
    > @@ -718,7 +765,7 @@ static int ci_hdrc_probe(struct platform_device *pdev)
    > stop:
    > ci_role_destroy(ci);
    > deinit_phy:
    > - usb_phy_shutdown(ci->usb_phy);
    > + ci_usb_phy_exit(ci);
    >
    > return ret;
    > }
    > @@ -731,7 +778,7 @@ static int ci_hdrc_remove(struct platform_device *pdev)
    > free_irq(ci->irq, ci);
    > ci_role_destroy(ci);
    > ci_hdrc_enter_lpm(ci, true);
    > - usb_phy_shutdown(ci->usb_phy);
    > + ci_usb_phy_exit(ci);
    > kfree(ci->hw_bank.regmap);
    >
    > return 0;
    > diff --git a/drivers/usb/chipidea/debug.c b/drivers/usb/chipidea/debug.c
    > index 8f437e1512fa..999e9d683d7a 100644
    > --- a/drivers/usb/chipidea/debug.c
    > +++ b/drivers/usb/chipidea/debug.c
    > @@ -220,7 +220,7 @@ static int ci_otg_show(struct seq_file *s, void *unused)
    >
    > /* ------ State ----- */
    > seq_printf(s, "OTG state: %s\n\n",
    > - usb_otg_state_string(ci->usb_phy->otg.state));
    > + usb_otg_state_string(ci->otg.state));

    This one should be at your 8th patch, isn't it?

    Others look ok, but need test.

    Peter
    >
    > /* ------ State Machine Variables ----- */
    > seq_printf(s, "a_bus_drop: %d\n", fsm->a_bus_drop);
    > diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
    > index 4fcebb6a6d14..e9a872ac355d 100644
    > --- a/drivers/usb/chipidea/host.c
    > +++ b/drivers/usb/chipidea/host.c
    > @@ -59,7 +59,10 @@ static int host_start(struct ci_hdrc *ci)
    > hcd->has_tt = 1;
    >
    > hcd->power_budget = ci->platdata->power_budget;
    > - hcd->usb_phy = ci->usb_phy;
    > + if (ci->phy)
    > + hcd->phy = ci->phy;
    > + else
    > + hcd->usb_phy = ci->usb_phy;
    >
    > ehci = hcd_to_ehci(hcd);
    > ehci->caps = ci->hw_bank.cap;
    > diff --git a/drivers/usb/chipidea/otg_fsm.c b/drivers/usb/chipidea/otg_fsm.c
    > index 862d7cb01b92..3c2ab1ae00fc 100644
    > --- a/drivers/usb/chipidea/otg_fsm.c
    > +++ b/drivers/usb/chipidea/otg_fsm.c
    > @@ -779,7 +779,11 @@ int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci)
    > {
    > int retval = 0;
    >
    > - ci->otg.usb_phy = ci->usb_phy;
    > + if (ci->phy)
    > + ci->otg.phy = ci->phy;
    > + else
    > + ci->otg.usb_phy = ci->usb_phy;
    > +
    > ci->otg.gadget = &ci->gadget;
    > ci->fsm.otg = &ci->otg;
    > ci->fsm.power_up = 1;
    > diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h
    > index 57d757a1aa83..a0285623b9c1 100644
    > --- a/include/linux/usb/chipidea.h
    > +++ b/include/linux/usb/chipidea.h
    > @@ -13,6 +13,8 @@ struct ci_hdrc_platform_data {
    > /* offset of the capability registers */
    > uintptr_t capoffset;
    > unsigned power_budget;
    > + struct phy *phy;
    > + /* old usb_phy interface */
    > struct usb_phy *usb_phy;
    > enum usb_phy_interface phy_mode;
    > unsigned long flags;
    > --
    > 1.9.1
    >

    --
    Best Regards,
    Peter Chen


    \
     
     \ /
      Last update: 2014-09-16 02:21    [W:3.948 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site