Re: [PATCH v4 7/9] usb: rename transceiver and phy to usb_phy in ChipIdea

[Antoine Tenart]

On Sat, Sep 13, 2014 at 06:27:06AM +, Peter Chen wrote:
>  
> > On Thu, Sep 11, 2014 at 08:28:59AM +0800, Peter Chen wrote:
> > > On Wed, Sep 03, 2014 at 09:40:38AM +0200, Antoine Tenart wrote:
> > >
> > > Again, rebase my next-tree, and modify the msm part.
> > 
> > git://github.com/hzpeterchen/linux-usb.git ci-for-usb-next ?
> > 
> 
> Yes.
> 
> > I can do that. But that would be easier if you rebased this branch on top 
> > of at
> > least v3.17-rc1 so that other series depending on this one could be tested 
> > easily
> > (like my other series introducing the USB support for Marvell Berlin).
> > 
> > Antoine
>  
> Done 

Thanks! I'll send a new version today then.

Antoine

-- 
Antoine Ténart, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH v4 7/9] usb: rename transceiver and phy to usb_phy in ChipIdea

[Peter Chen]

 
> On Thu, Sep 11, 2014 at 08:28:59AM +0800, Peter Chen wrote:
> > On Wed, Sep 03, 2014 at 09:40:38AM +0200, Antoine Tenart wrote:
> >
> > Again, rebase my next-tree, and modify the msm part.
> 
> git://github.com/hzpeterchen/linux-usb.git ci-for-usb-next ?
> 

Yes.

> I can do that. But that would be easier if you rebased this branch on top of 
> at
> least v3.17-rc1 so that other series depending on this one could be tested 
> easily
> (like my other series introducing the USB support for Marvell Berlin).
> 
> Antoine
 
Done 

Peter
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v4 7/9] usb: rename transceiver and phy to usb_phy in ChipIdea

[Antoine Tenart]

Peter,

On Thu, Sep 11, 2014 at 08:28:59AM +0800, Peter Chen wrote:
> On Wed, Sep 03, 2014 at 09:40:38AM +0200, Antoine Tenart wrote:
> 
> Again, rebase my next-tree, and modify the msm part.

git://github.com/hzpeterchen/linux-usb.git ci-for-usb-next ?

I can do that. But that would be easier if you rebased this branch on top
of at least v3.17-rc1 so that other series depending on this one could
be tested easily (like my other series introducing the USB support for
Marvell Berlin).

Antoine

-- 
Antoine Ténart, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v4 7/9] usb: rename transceiver and phy to usb_phy in ChipIdea

[Peter Chen]

On Wed, Sep 03, 2014 at 09:40:38AM +0200, Antoine Tenart wrote:
> This patch prepares the introduction of the generic PHY support in the
> USB ChipIdea common functions. The USB PHY member of the ChipIdea
> structure ('transceiver') is renamed to 'usb_phy', the 'phy' member of
> the ChipIdea pdata structure is renamed to 'usb_phy' and modifications
> are done in all drivers accessing it. Renaming this pointer will allow
> to keep the compatibility for USB PHY drivers.
> 
> Signed-off-by: Antoine Tenart 
> ---
>  drivers/usb/chipidea/ci.h  |  4 ++--
>  drivers/usb/chipidea/ci_hdrc_imx.c |  2 +-
>  drivers/usb/chipidea/ci_hdrc_msm.c |  8 
>  drivers/usb/chipidea/core.c| 20 ++--
>  drivers/usb/chipidea/debug.c   |  2 +-
>  drivers/usb/chipidea/host.c|  4 ++--
>  drivers/usb/chipidea/otg_fsm.c |  4 ++--
>  drivers/usb/chipidea/udc.c |  4 ++--
>  include/linux/usb/chipidea.h   |  2 +-
>  9 files changed, 25 insertions(+), 25 deletions(-)
> 
> diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h
> index 9563cb56d564..b2caa1772712 100644
> --- a/drivers/usb/chipidea/ci.h
> +++ b/drivers/usb/chipidea/ci.h
> @@ -161,7 +161,7 @@ struct hw_bank {
>   * @test_mode: the selected test mode
>   * @platdata: platform specific information supplied by parent device
>   * @vbus_active: is VBUS active
> - * @transceiver: pointer to USB PHY, if any
> + * @usb_phy: pointer to USB PHY, if any
>   * @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
> @@ -201,7 +201,7 @@ struct ci_hdrc {
>  
>   struct ci_hdrc_platform_data*platdata;
>   int vbus_active;
> - struct usb_phy  *transceiver;
> + struct usb_phy  *usb_phy;
>   struct usb_hcd  *hcd;
>   struct dentry   *debugfs;
>   boolid_event;
> diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c 
> b/drivers/usb/chipidea/ci_hdrc_imx.c
> index 65444b02bd68..3aa3f62e079c 100644
> --- a/drivers/usb/chipidea/ci_hdrc_imx.c
> +++ b/drivers/usb/chipidea/ci_hdrc_imx.c
> @@ -139,7 +139,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
>   goto err_clk;
>   }
>  
> - pdata.phy = data->phy;
> + pdata.usb_phy = data->phy;
>  
>   if (imx_platform_flag->flags & CI_HDRC_IMX_IMX28_WRITE_FIX)
>   pdata.flags |= CI_HDRC_IMX28_WRITE_FIX;
> diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c 
> b/drivers/usb/chipidea/ci_hdrc_msm.c
> index d72b9d2de2c5..94cd7c3e12a3 100644
> --- a/drivers/usb/chipidea/ci_hdrc_msm.c
> +++ b/drivers/usb/chipidea/ci_hdrc_msm.c
> @@ -31,13 +31,13 @@ static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, 
> unsigned event)
>   case CI_HDRC_CONTROLLER_STOPPED_EVENT:
>   dev_dbg(dev, "CI_HDRC_CONTROLLER_STOPPED_EVENT received\n");
>   /*
> -  * Put the transceiver in non-driving mode. Otherwise host
> +  * Put the phy in non-driving mode. Otherwise host
>* may not detect soft-disconnection.
>*/
> - val = usb_phy_io_read(ci->transceiver, ULPI_FUNC_CTRL);
> + val = usb_phy_io_read(ci->usb_phy, ULPI_FUNC_CTRL);
>   val &= ~ULPI_FUNC_CTRL_OPMODE_MASK;
>   val |= ULPI_FUNC_CTRL_OPMODE_NONDRIVING;
> - usb_phy_io_write(ci->transceiver, val, ULPI_FUNC_CTRL);
> + usb_phy_io_write(ci->usb_phy, val, ULPI_FUNC_CTRL);
>   break;
>   default:
>   dev_dbg(dev, "unknown ci_hdrc event\n");
> @@ -71,7 +71,7 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev)
>   if (IS_ERR(phy))
>   return PTR_ERR(phy);
>  
> - ci_hdrc_msm_platdata.phy = phy;
> + ci_hdrc_msm_platdata.usb_phy = phy;
>  
>   plat_ci = ci_hdrc_add_device(&pdev->dev,
>   pdev->resource, pdev->num_resources,
> diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
> index 619d13e29995..a8cd35fd8175 100644
> --- a/drivers/usb/chipidea/core.c
> +++ b/drivers/usb/chipidea/core.c
> @@ -306,7 +306,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->transceiver);
> + ret = usb_phy_init(ci->usb_phy);
>   if (ret)
>   return ret;
>   hw_phymode_configure(ci);
> @@ -314,12 +314,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->transceiver);
> + ret = usb_phy_init(ci->usb_phy);
>  

[PATCH v4 7/9] usb: rename transceiver and phy to usb_phy in ChipIdea

[Antoine Tenart]

This patch prepares the introduction of the generic PHY support in the
USB ChipIdea common functions. The USB PHY member of the ChipIdea
structure ('transceiver') is renamed to 'usb_phy', the 'phy' member of
the ChipIdea pdata structure is renamed to 'usb_phy' and modifications
are done in all drivers accessing it. Renaming this pointer will allow
to keep the compatibility for USB PHY drivers.

Signed-off-by: Antoine Tenart 
---
 drivers/usb/chipidea/ci.h  |  4 ++--
 drivers/usb/chipidea/ci_hdrc_imx.c |  2 +-
 drivers/usb/chipidea/ci_hdrc_msm.c |  8 
 drivers/usb/chipidea/core.c| 20 ++--
 drivers/usb/chipidea/debug.c   |  2 +-
 drivers/usb/chipidea/host.c|  4 ++--
 drivers/usb/chipidea/otg_fsm.c |  4 ++--
 drivers/usb/chipidea/udc.c |  4 ++--
 include/linux/usb/chipidea.h   |  2 +-
 9 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h
index 9563cb56d564..b2caa1772712 100644
--- a/drivers/usb/chipidea/ci.h
+++ b/drivers/usb/chipidea/ci.h
@@ -161,7 +161,7 @@ struct hw_bank {
  * @test_mode: the selected test mode
  * @platdata: platform specific information supplied by parent device
  * @vbus_active: is VBUS active
- * @transceiver: pointer to USB PHY, if any
+ * @usb_phy: pointer to USB PHY, if any
  * @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
@@ -201,7 +201,7 @@ struct ci_hdrc {
 
struct ci_hdrc_platform_data*platdata;
int vbus_active;
-   struct usb_phy  *transceiver;
+   struct usb_phy  *usb_phy;
struct usb_hcd  *hcd;
struct dentry   *debugfs;
boolid_event;
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c 
b/drivers/usb/chipidea/ci_hdrc_imx.c
index 65444b02bd68..3aa3f62e079c 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -139,7 +139,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
goto err_clk;
}
 
-   pdata.phy = data->phy;
+   pdata.usb_phy = data->phy;
 
if (imx_platform_flag->flags & CI_HDRC_IMX_IMX28_WRITE_FIX)
pdata.flags |= CI_HDRC_IMX28_WRITE_FIX;
diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c 
b/drivers/usb/chipidea/ci_hdrc_msm.c
index d72b9d2de2c5..94cd7c3e12a3 100644
--- a/drivers/usb/chipidea/ci_hdrc_msm.c
+++ b/drivers/usb/chipidea/ci_hdrc_msm.c
@@ -31,13 +31,13 @@ static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, 
unsigned event)
case CI_HDRC_CONTROLLER_STOPPED_EVENT:
dev_dbg(dev, "CI_HDRC_CONTROLLER_STOPPED_EVENT received\n");
/*
-* Put the transceiver in non-driving mode. Otherwise host
+* Put the phy in non-driving mode. Otherwise host
 * may not detect soft-disconnection.
 */
-   val = usb_phy_io_read(ci->transceiver, ULPI_FUNC_CTRL);
+   val = usb_phy_io_read(ci->usb_phy, ULPI_FUNC_CTRL);
val &= ~ULPI_FUNC_CTRL_OPMODE_MASK;
val |= ULPI_FUNC_CTRL_OPMODE_NONDRIVING;
-   usb_phy_io_write(ci->transceiver, val, ULPI_FUNC_CTRL);
+   usb_phy_io_write(ci->usb_phy, val, ULPI_FUNC_CTRL);
break;
default:
dev_dbg(dev, "unknown ci_hdrc event\n");
@@ -71,7 +71,7 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev)
if (IS_ERR(phy))
return PTR_ERR(phy);
 
-   ci_hdrc_msm_platdata.phy = phy;
+   ci_hdrc_msm_platdata.usb_phy = phy;
 
plat_ci = ci_hdrc_add_device(&pdev->dev,
pdev->resource, pdev->num_resources,
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 619d13e29995..a8cd35fd8175 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -306,7 +306,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->transceiver);
+   ret = usb_phy_init(ci->usb_phy);
if (ret)
return ret;
hw_phymode_configure(ci);
@@ -314,12 +314,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->transceiver);
+   ret = usb_phy_init(ci->usb_phy);
if (ret)
return ret;
break;
default:
-   ret = usb_phy_init(ci->transceiver);
+   ret = usb_phy_init(