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

Commit b96d3b08 authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Felipe Balbi
Browse files

usb: Convert all users to new usb_phy 



Use the new usb_phy_* functions with transceiver
operations instead of the old otg functions.

Includes fixes from Sascha Hauer.

Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarPavankumar Kondeti <pkondeti@codeaurora.org>
Acked-by: default avatarLi Yang <leoli@freescale.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Reviewed-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent b1c711d6

arch/arm/mach-tegra/usb_phy.c

+2 −2
Original line number Diff line number Diff line
@@ -608,13 +608,13 @@ static int ulpi_phy_power_on(struct tegra_usb_phy *phy) 
	writel(val, base + ULPI_TIMING_CTRL_1);



	/* Fix VbusInvalid due to floating VBUS */

	ret = otg_io_write(phy->ulpi, 0x40, 0x08);

	ret = usb_phy_io_write(phy->ulpi, 0x40, 0x08);

	if (ret) {

		pr_err("%s: ulpi write failed\n", __func__);

		return ret;

	}



	ret = otg_io_write(phy->ulpi, 0x80, 0x0B);

	ret = usb_phy_io_write(phy->ulpi, 0x80, 0x0B);

	if (ret) {

		pr_err("%s: ulpi write failed\n", __func__);

		return ret;

drivers/usb/gadget/ci13xxx_msm.c

+2 −2
Original line number Diff line number Diff line
@@ -37,10 +37,10 @@ static void ci13xxx_msm_notify_event(struct ci13xxx *udc, unsigned event) 
		 * Put the transceiver in non-driving mode. Otherwise host

		 * may not detect soft-disconnection.

		 */

		val = otg_io_read(udc->transceiver, ULPI_FUNC_CTRL);

		val = usb_phy_io_read(udc->transceiver, ULPI_FUNC_CTRL);

		val &= ~ULPI_FUNC_CTRL_OPMODE_MASK;

		val |= ULPI_FUNC_CTRL_OPMODE_NONDRIVING;

		otg_io_write(udc->transceiver, val, ULPI_FUNC_CTRL);

		usb_phy_io_write(udc->transceiver, val, ULPI_FUNC_CTRL);

		break;

	default:

		dev_dbg(dev, "unknown ci13xxx_udc event\n");

drivers/usb/gadget/ci13xxx_udc.c

+5 −5
Original line number Diff line number Diff line
@@ -2537,7 +2537,7 @@ static int ci13xxx_vbus_draw(struct usb_gadget *_gadget, unsigned mA) 
	struct ci13xxx *udc = container_of(_gadget, struct ci13xxx, gadget);



	if (udc->transceiver)

		return otg_set_power(udc->transceiver, mA);

		return usb_phy_set_power(udc->transceiver, mA);

	return -ENOTSUPP;

}
@@ -2900,7 +2900,7 @@ static int udc_probe(struct ci13xxx_udc_driver *driver, struct device *dev, 
	if (retval < 0)

		goto free_udc;



	udc->transceiver = otg_get_transceiver();

	udc->transceiver = usb_get_transceiver();



	if (udc->udc_driver->flags & CI13XXX_REQUIRE_TRANSCEIVER) {

		if (udc->transceiver == NULL) {
@@ -2946,7 +2946,7 @@ static int udc_probe(struct ci13xxx_udc_driver *driver, struct device *dev, 
remove_trans:

	if (udc->transceiver) {

		otg_set_peripheral(udc->transceiver, &udc->gadget);

		otg_put_transceiver(udc->transceiver);

		usb_put_transceiver(udc->transceiver);

	}



	err("error = %i", retval);
@@ -2958,7 +2958,7 @@ static int udc_probe(struct ci13xxx_udc_driver *driver, struct device *dev, 
	device_unregister(&udc->gadget.dev);

put_transceiver:

	if (udc->transceiver)

		otg_put_transceiver(udc->transceiver);

		usb_put_transceiver(udc->transceiver);

free_udc:

	kfree(udc);

	_udc = NULL;
@@ -2982,7 +2982,7 @@ static void udc_remove(void) 


	if (udc->transceiver) {

		otg_set_peripheral(udc->transceiver, &udc->gadget);

		otg_put_transceiver(udc->transceiver);

		usb_put_transceiver(udc->transceiver);

	}

#ifdef CONFIG_USB_GADGET_DEBUG_FILES

	dbg_remove_files(&udc->gadget.dev);

drivers/usb/gadget/fsl_udc_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1217,7 +1217,7 @@ static int fsl_vbus_draw(struct usb_gadget *gadget, unsigned mA) 


	udc = container_of(gadget, struct fsl_udc, gadget);

	if (udc->transceiver)

		return otg_set_power(udc->transceiver, mA);

		return usb_phy_set_power(udc->transceiver, mA);

	return -ENOTSUPP;

}
@@ -2430,7 +2430,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev) 


#ifdef CONFIG_USB_OTG

	if (pdata->operating_mode == FSL_USB2_DR_OTG) {

		udc_controller->transceiver = otg_get_transceiver();

		udc_controller->transceiver = usb_get_transceiver();

		if (!udc_controller->transceiver) {

			ERR("Can't find OTG driver!\n");

			ret = -ENODEV;

drivers/usb/gadget/langwell_udc.c

+2 −2
Original line number Diff line number Diff line
@@ -1261,9 +1261,9 @@ static int langwell_vbus_draw(struct usb_gadget *_gadget, unsigned mA) 
	dev_vdbg(&dev->pdev->dev, "---> %s()\n", __func__);



	if (dev->transceiver) {

		dev_vdbg(&dev->pdev->dev, "otg_set_power\n");

		dev_vdbg(&dev->pdev->dev, "usb_phy_set_power\n");

		dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__);

		return otg_set_power(dev->transceiver, mA);

		return usb_phy_set_power(dev->transceiver, mA);

	}



	dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__);