iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: renesas_usbhs: clean up rcar2.c to support a generic PHY

Browse Source 
To support both usb PHY and generic PHY, this patch cleans up rcar2.c.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Yoshihiro Shimoda 2014-10-07 12:43:05 +09:00 committed by Felipe Balbi
parent c042b85a2c
commit 5f6aea3453
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/usb/renesas_usbhs/rcar2.c
View File

@ -20,25 +20,28 @@
static int usbhs_rcar2_hardware_init(struct platform_device *pdev) static int usbhs_rcar2_hardware_init(struct platform_device *pdev)
{ {
struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev); struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
struct usb_phy *usb_phy;
usb_phy = usb_get_phy_dev(&pdev->dev, 0); if (IS_ENABLED(CONFIG_USB_PHY)) {
if (IS_ERR(usb_phy)) struct usb_phy *usb_phy = usb_get_phy_dev(&pdev->dev, 0);
return PTR_ERR(usb_phy);
priv->usb_phy = usb_phy; if (IS_ERR(usb_phy))
return 0; return PTR_ERR(usb_phy);
priv->usb_phy = usb_phy;
return 0;
}
return -ENXIO;
} }
static int usbhs_rcar2_hardware_exit(struct platform_device *pdev) static int usbhs_rcar2_hardware_exit(struct platform_device *pdev)
{ {
struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev); struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
if (!priv->usb_phy) if (priv->usb_phy) {
return 0; usb_put_phy(priv->usb_phy);
priv->usb_phy = NULL;
usb_put_phy(priv->usb_phy); }
priv->usb_phy = NULL;
return 0; return 0;
} }
@ -47,21 +50,22 @@ static int usbhs_rcar2_power_ctrl(struct platform_device *pdev,
void __iomem *base, int enable) void __iomem *base, int enable)
{ {
struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev); struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
int retval = -ENODEV;
if (!priv->usb_phy) if (priv->usb_phy) {
return -ENODEV; if (enable) {
retval = usb_phy_init(priv->usb_phy);
if (enable) { if (!retval)
int retval = usb_phy_init(priv->usb_phy); retval = usb_phy_set_suspend(priv->usb_phy, 0);
} else {
if (!retval) usb_phy_set_suspend(priv->usb_phy, 1);
retval = usb_phy_set_suspend(priv->usb_phy, 0); usb_phy_shutdown(priv->usb_phy);
return retval; retval = 0;
}
} }
usb_phy_set_suspend(priv->usb_phy, 1); return retval;
usb_phy_shutdown(priv->usb_phy);
return 0;
} }
static int usbhs_rcar2_get_id(struct platform_device *pdev) static int usbhs_rcar2_get_id(struct platform_device *pdev)