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

Commit d268e9bc authored by Peter Chen's avatar Peter Chen Committed by Greg Kroah-Hartman
Browse files

usb: chipidea: retire flag CI_HDRC_PULLUP_ON_VBUS 



Currently, the controller only runs when the ci->vbus_active is true.
So the flag CI_HDRC_PULLUP_ON_VBUS is useless no longer.
If the user doesn't have otgsc, he/she needs to change ci_handle_vbus_change
to update ci->vbus_active.

Signed-off-by: default avatarPeter Chen <peter.chen@freescale.com>
Signed-off-by: default avatarAlexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e7e621eb

drivers/usb/chipidea/ci_hdrc_imx.c

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) 
		.name		= "ci_hdrc_imx",

		.capoffset	= DEF_CAPOFFSET,

		.flags		= CI_HDRC_REQUIRE_TRANSCEIVER |

				  CI_HDRC_PULLUP_ON_VBUS |

				  CI_HDRC_DISABLE_STREAMING,

	};

	int ret;

drivers/usb/chipidea/ci_hdrc_msm.c

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = { 
	.name			= "ci_hdrc_msm",

	.flags			= CI_HDRC_REGS_SHARED |

				  CI_HDRC_REQUIRE_TRANSCEIVER |

				  CI_HDRC_PULLUP_ON_VBUS |

				  CI_HDRC_DISABLE_STREAMING,



	.notify_event		= ci_hdrc_msm_notify_event,

drivers/usb/chipidea/udc.c

+6 −18
Original line number Diff line number Diff line
@@ -1448,9 +1448,6 @@ static int ci_udc_vbus_session(struct usb_gadget *_gadget, int is_active) 
	unsigned long flags;

	int gadget_ready = 0;



	if (!(ci->platdata->flags & CI_HDRC_PULLUP_ON_VBUS))

		return -EOPNOTSUPP;



	spin_lock_irqsave(&ci->lock, flags);

	ci->vbus_active = is_active;

	if (ci->driver)
@@ -1635,14 +1632,12 @@ static int ci_udc_start(struct usb_gadget *gadget, 


	ci->driver = driver;

	pm_runtime_get_sync(&ci->gadget.dev);

	if (ci->platdata->flags & CI_HDRC_PULLUP_ON_VBUS) {

	if (ci->vbus_active) {

		hw_device_reset(ci, USBMODE_CM_DC);

	} else {

		pm_runtime_put_sync(&ci->gadget.dev);

		goto done;

	}

	}



	retval = hw_device_state(ci, ci->ep0out->qh.dma);

	if (retval)
@@ -1664,8 +1659,7 @@ static int ci_udc_stop(struct usb_gadget *gadget, 


	spin_lock_irqsave(&ci->lock, flags);



	if (!(ci->platdata->flags & CI_HDRC_PULLUP_ON_VBUS) ||

			ci->vbus_active) {

	if (ci->vbus_active) {

		hw_device_state(ci, 0);

		if (ci->platdata->notify_event)

			ci->platdata->notify_event(ci,
@@ -1800,12 +1794,6 @@ static int udc_start(struct ci_hdrc *ci) 
		}

	}



	if (!(ci->platdata->flags & CI_HDRC_PULLUP_ON_VBUS)) {

		retval = hw_device_reset(ci, USBMODE_CM_DC);

		if (retval)

			goto put_transceiver;

	}



	if (ci->transceiver) {

		retval = otg_set_peripheral(ci->transceiver->otg,

						&ci->gadget);

include/linux/usb/chipidea.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ struct ci_hdrc_platform_data { 
	unsigned long	 flags;

#define CI_HDRC_REGS_SHARED		BIT(0)

#define CI_HDRC_REQUIRE_TRANSCEIVER	BIT(1)

#define CI_HDRC_PULLUP_ON_VBUS		BIT(2)

#define CI_HDRC_DISABLE_STREAMING	BIT(3)

	/*

	 * Only set it when DCCPARAMS.DC==1 and DCCPARAMS.HC==1,