Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f6aea34 authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Felipe Balbi
Browse files

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



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

Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent c042b85a

drivers/usb/renesas_usbhs/rcar2.c

+26 −22
Original line number Diff line number Diff line
@@ -20,9 +20,10 @@ 
static int usbhs_rcar2_hardware_init(struct platform_device *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)) {

		struct usb_phy *usb_phy = usb_get_phy_dev(&pdev->dev, 0);



		if (IS_ERR(usb_phy))

			return PTR_ERR(usb_phy);
@@ -30,15 +31,17 @@ static int usbhs_rcar2_hardware_init(struct platform_device *pdev) 
		return 0;

	}



	return -ENXIO;

}



static int usbhs_rcar2_hardware_exit(struct platform_device *pdev)

{

	struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);



	if (!priv->usb_phy)

		return 0;



	if (priv->usb_phy) {

		usb_put_phy(priv->usb_phy);

		priv->usb_phy = NULL;

	}



	return 0;

}
@@ -47,21 +50,22 @@ static int usbhs_rcar2_power_ctrl(struct platform_device *pdev, 
				void __iomem *base, int enable)

{

	struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);

	int retval = -ENODEV;



	if (!priv->usb_phy)

		return -ENODEV;



	if (priv->usb_phy) {

		if (enable) {

		int retval = usb_phy_init(priv->usb_phy);

			retval = usb_phy_init(priv->usb_phy);



			if (!retval)

				retval = usb_phy_set_suspend(priv->usb_phy, 0);

		return retval;

	}



		} else {

			usb_phy_set_suspend(priv->usb_phy, 1);

			usb_phy_shutdown(priv->usb_phy);

	return 0;

			retval = 0;

		}

	}



	return retval;

}



static int usbhs_rcar2_get_id(struct platform_device *pdev)