Commit 1e5e2d3d authored by Antoine Tenart's avatar Antoine Tenart Committed by Felipe Balbi

usb: chipidea: add support to the generic PHY framework

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: default avatarAntoine Tenart <antoine.tenart@free-electrons.com>
Acked-by: default avatarPeter Chen <peter.chen@freescale.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent ef44cb42
...@@ -161,7 +161,8 @@ struct hw_bank { ...@@ -161,7 +161,8 @@ struct hw_bank {
* @test_mode: the selected test mode * @test_mode: the selected test mode
* @platdata: platform specific information supplied by parent device * @platdata: platform specific information supplied by parent device
* @vbus_active: is VBUS active * @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 * @hcd: pointer to usb_hcd for ehci host driver
* @debugfs: root dentry for this controller in debugfs * @debugfs: root dentry for this controller in debugfs
* @id_event: indicates there is an id event, and handled at ci_otg_work * @id_event: indicates there is an id event, and handled at ci_otg_work
...@@ -202,6 +203,8 @@ struct ci_hdrc { ...@@ -202,6 +203,8 @@ struct ci_hdrc {
struct ci_hdrc_platform_data *platdata; struct ci_hdrc_platform_data *platdata;
int vbus_active; int vbus_active;
struct phy *phy;
/* old usb_phy interface */
struct usb_phy *usb_phy; struct usb_phy *usb_phy;
struct usb_hcd *hcd; struct usb_hcd *hcd;
struct dentry *debugfs; struct dentry *debugfs;
......
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/phy/phy.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/idr.h> #include <linux/idr.h>
...@@ -298,6 +299,49 @@ static void hw_phymode_configure(struct ci_hdrc *ci) ...@@ -298,6 +299,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_usb_phy_init: initialize phy according to different phy type
* @ci: the controller * @ci: the controller
...@@ -312,7 +356,7 @@ static int ci_usb_phy_init(struct ci_hdrc *ci) ...@@ -312,7 +356,7 @@ static int ci_usb_phy_init(struct ci_hdrc *ci)
case USBPHY_INTERFACE_MODE_UTMI: case USBPHY_INTERFACE_MODE_UTMI:
case USBPHY_INTERFACE_MODE_UTMIW: case USBPHY_INTERFACE_MODE_UTMIW:
case USBPHY_INTERFACE_MODE_HSIC: case USBPHY_INTERFACE_MODE_HSIC:
ret = usb_phy_init(ci->usb_phy); ret = _ci_usb_phy_init(ci);
if (ret) if (ret)
return ret; return ret;
hw_phymode_configure(ci); hw_phymode_configure(ci);
...@@ -320,12 +364,12 @@ static int ci_usb_phy_init(struct ci_hdrc *ci) ...@@ -320,12 +364,12 @@ static int ci_usb_phy_init(struct ci_hdrc *ci)
case USBPHY_INTERFACE_MODE_ULPI: case USBPHY_INTERFACE_MODE_ULPI:
case USBPHY_INTERFACE_MODE_SERIAL: case USBPHY_INTERFACE_MODE_SERIAL:
hw_phymode_configure(ci); hw_phymode_configure(ci);
ret = usb_phy_init(ci->usb_phy); ret = _ci_usb_phy_init(ci);
if (ret) if (ret)
return ret; return ret;
break; break;
default: default:
ret = usb_phy_init(ci->usb_phy); ret = _ci_usb_phy_init(ci);
} }
return ret; return ret;
...@@ -605,23 +649,26 @@ static int ci_hdrc_probe(struct platform_device *pdev) ...@@ -605,23 +649,26 @@ static int ci_hdrc_probe(struct platform_device *pdev)
return -ENODEV; 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; 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); ci->usb_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
if (IS_ERR(ci->usb_phy)) { /* if both generic PHY and USB PHY layers aren't enabled */
ret = PTR_ERR(ci->usb_phy); if (PTR_ERR(ci->phy) == -ENOSYS &&
/* PTR_ERR(ci->usb_phy) == -ENXIO)
* if -ENXIO is returned, it means PHY layer wasn't return -ENXIO;
* enabled, so it makes no sense to return -EPROBE_DEFER
* in that case, since no PHY driver will ever probe. if (IS_ERR(ci->phy) && IS_ERR(ci->usb_phy))
*/ return -EPROBE_DEFER;
if (ret == -ENXIO)
return ret;
dev_err(dev, "no usb2 phy configured\n"); if (IS_ERR(ci->phy))
return -EPROBE_DEFER; ci->phy = NULL;
else if (IS_ERR(ci->usb_phy))
ci->usb_phy = NULL;
} }
ret = ci_usb_phy_init(ci); ret = ci_usb_phy_init(ci);
...@@ -728,7 +775,7 @@ static int ci_hdrc_probe(struct platform_device *pdev) ...@@ -728,7 +775,7 @@ static int ci_hdrc_probe(struct platform_device *pdev)
stop: stop:
ci_role_destroy(ci); ci_role_destroy(ci);
deinit_phy: deinit_phy:
usb_phy_shutdown(ci->usb_phy); ci_usb_phy_exit(ci);
return ret; return ret;
} }
...@@ -741,7 +788,7 @@ static int ci_hdrc_remove(struct platform_device *pdev) ...@@ -741,7 +788,7 @@ static int ci_hdrc_remove(struct platform_device *pdev)
free_irq(ci->irq, ci); free_irq(ci->irq, ci);
ci_role_destroy(ci); ci_role_destroy(ci);
ci_hdrc_enter_lpm(ci, true); ci_hdrc_enter_lpm(ci, true);
usb_phy_shutdown(ci->usb_phy); ci_usb_phy_exit(ci);
return 0; return 0;
} }
......
...@@ -59,8 +59,11 @@ static int host_start(struct ci_hdrc *ci) ...@@ -59,8 +59,11 @@ static int host_start(struct ci_hdrc *ci)
hcd->has_tt = 1; hcd->has_tt = 1;
hcd->power_budget = ci->platdata->power_budget; hcd->power_budget = ci->platdata->power_budget;
hcd->usb_phy = ci->usb_phy;
hcd->tpl_support = ci->platdata->tpl_support; hcd->tpl_support = ci->platdata->tpl_support;
if (ci->phy)
hcd->phy = ci->phy;
else
hcd->usb_phy = ci->usb_phy;
ehci = hcd_to_ehci(hcd); ehci = hcd_to_ehci(hcd);
ehci->caps = ci->hw_bank.cap; ehci->caps = ci->hw_bank.cap;
......
...@@ -779,7 +779,11 @@ int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci) ...@@ -779,7 +779,11 @@ int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci)
{ {
int retval = 0; 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->otg.gadget = &ci->gadget;
ci->fsm.otg = &ci->otg; ci->fsm.otg = &ci->otg;
ci->fsm.power_up = 1; ci->fsm.power_up = 1;
......
...@@ -13,6 +13,8 @@ struct ci_hdrc_platform_data { ...@@ -13,6 +13,8 @@ struct ci_hdrc_platform_data {
/* offset of the capability registers */ /* offset of the capability registers */
uintptr_t capoffset; uintptr_t capoffset;
unsigned power_budget; unsigned power_budget;
struct phy *phy;
/* old usb_phy interface */
struct usb_phy *usb_phy; struct usb_phy *usb_phy;
enum usb_phy_interface phy_mode; enum usb_phy_interface phy_mode;
unsigned long flags; unsigned long flags;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment