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

Commit f21ca2c9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-ci-v4.9-rc1' of... 

Merge tag 'usb-ci-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-testing

Peter writes:

Most of them are refine patches, only new feature is
disable io watchdog for chipidea platform.
parents 81522637 e74e8372

Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ i.mx specific properties 
- fsl,usbmisc: phandler of non-core register device, with one

  argument that indicate usb controller index

- disable-over-current: disable over current detect

- over-current-active-high: over current signal polarity is high active,

  typically over current signal polarity is low active.

- external-vbus-divider: enables off-chip resistor divider for Vbus



Example:

Documentation/devicetree/bindings/usb/usbmisc-imx.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Required properties: 
	"fsl,imx6q-usbmisc" for imx6q

	"fsl,vf610-usbmisc" for Vybrid vf610

	"fsl,imx6sx-usbmisc" for imx6sx

	"fsl,imx7d-usbmisc" for imx7d

- reg: Should contain registers location and length



Examples:

drivers/usb/chipidea/ci_hdrc_imx.c

+3 −0
Original line number Diff line number Diff line
@@ -140,6 +140,9 @@ static struct imx_usbmisc_data *usbmisc_get_init_data(struct device *dev) 
	if (of_find_property(np, "disable-over-current", NULL))

		data->disable_oc = 1;



	if (of_find_property(np, "over-current-active-high", NULL))

		data->oc_polarity = 1;



	if (of_find_property(np, "external-vbus-divider", NULL))

		data->evdo = 1;

drivers/usb/chipidea/ci_hdrc_imx.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ struct imx_usbmisc_data { 
	int index;



	unsigned int disable_oc:1; /* over current detect disabled */

	unsigned int oc_polarity:1; /* over current polarity if oc enabled */

	unsigned int evdo:1; /* set external vbus divider option */

};

drivers/usb/chipidea/host.c

+3 −0
Original line number Diff line number Diff line
@@ -81,12 +81,15 @@ static int ehci_ci_reset(struct usb_hcd *hcd) 
{

	struct device *dev = hcd->self.controller;

	struct ci_hdrc *ci = dev_get_drvdata(dev);

	struct ehci_hcd *ehci = hcd_to_ehci(hcd);

	int ret;



	ret = ehci_setup(hcd);

	if (ret)

		return ret;



	ehci->need_io_watchdog = 0;



	ci_platform_configure(ci);



	return ret;