Commit e80dac11 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB fixes from Greg KH:
 "Here are a bunch (65) of USB fixes for 4.7-rc4.  Sorry about the
  quantity, I've been slow in getting these out.

  The majority are the "normal" gadget, musb, and xhci fixes, that we
  all are used to.  There are also a few other tiny fixes resolving a
  number of reported issues that showed up in 4.7-rc1.

  All of these have been in linux-next"

* tag 'usb-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (65 commits)
  usbip: rate limit get_frame_number message
  usb: musb: sunxi: Remove bogus "Frees glue" comment
  usb: musb: sunxi: Fix NULL ptr deref when gadget is registered before musb
  usb: echi-hcd: Add ehci_setup check before echi_shutdown
  usb: host: ehci-msm: Conditionally call ehci suspend/resume
  MAINTAINERS: Add file patterns for usb device tree bindings
  usb: host: ehci-tegra: Avoid getting the same reset twice
  usb: host: ehci-tegra: Grab the correct UTMI pads reset
  USB: mos7720: delete parport
  USB: OHCI: Don't mark EDs as ED_OPER if scheduling fails
  phy: ti-pipe3: Program the DPLL even if it was already locked
  usb: musb: Stop bulk endpoint while queue is rotated
  usb: musb: Ensure rx reinit occurs for shared_fifo endpoints
  usb: musb: host: correct cppi dma channel for isoch transfer
  usb: musb: only restore devctl when session was set in backup
  usb: phy: Check initial state for twl6030
  usb: musb: Use normal module_init for 2430 glue
  usb: musb: Remove pm_runtime_set_irq_safe
  usb: musb: Remove extra PM runtime calls from 2430 glue layer
  usb: musb: Return error value from musb_mailbox
  ...
parents a50094a4 083d5ad1

Documentation/ABI/testing/configfs-usb-gadget-uvc

+29 −29
Original line number Original line Diff line number Diff line 
What:		/config/usb-gadget/gadget/functions/uvc.name

What:		/config/usb-gadget/gadget/functions/uvc.name

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	UVC function directory

Description:	UVC function directory





		streaming_maxburst	- 0..15 (ss only)

		streaming_maxburst	- 0..15 (ss only)
@@ -9,37 +9,37 @@ Description: UVC function directory 




What:		/config/usb-gadget/gadget/functions/uvc.name/control

What:		/config/usb-gadget/gadget/functions/uvc.name/control

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Control descriptors

Description:	Control descriptors





What:		/config/usb-gadget/gadget/functions/uvc.name/control/class

What:		/config/usb-gadget/gadget/functions/uvc.name/control/class

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Class descriptors

Description:	Class descriptors





What:		/config/usb-gadget/gadget/functions/uvc.name/control/class/ss

What:		/config/usb-gadget/gadget/functions/uvc.name/control/class/ss

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Super speed control class descriptors

Description:	Super speed control class descriptors





What:		/config/usb-gadget/gadget/functions/uvc.name/control/class/fs

What:		/config/usb-gadget/gadget/functions/uvc.name/control/class/fs

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Full speed control class descriptors

Description:	Full speed control class descriptors





What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal

What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Terminal descriptors

Description:	Terminal descriptors





What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal/output

What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal/output

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Output terminal descriptors

Description:	Output terminal descriptors





What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal/output/default

What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal/output/default

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Default output terminal descriptors

Description:	Default output terminal descriptors





		All attributes read only:

		All attributes read only:
@@ -53,12 +53,12 @@ Description: Default output terminal descriptors 




What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera

What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Camera terminal descriptors

Description:	Camera terminal descriptors





What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera/default

What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera/default

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Default camera terminal descriptors

Description:	Default camera terminal descriptors





		All attributes read only:

		All attributes read only:
@@ -75,12 +75,12 @@ Description: Default camera terminal descriptors 




What:		/config/usb-gadget/gadget/functions/uvc.name/control/processing

What:		/config/usb-gadget/gadget/functions/uvc.name/control/processing

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Processing unit descriptors

Description:	Processing unit descriptors





What:		/config/usb-gadget/gadget/functions/uvc.name/control/processing/default

What:		/config/usb-gadget/gadget/functions/uvc.name/control/processing/default

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Default processing unit descriptors

Description:	Default processing unit descriptors





		All attributes read only:

		All attributes read only:
@@ -94,49 +94,49 @@ Description: Default processing unit descriptors 




What:		/config/usb-gadget/gadget/functions/uvc.name/control/header

What:		/config/usb-gadget/gadget/functions/uvc.name/control/header

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Control header descriptors

Description:	Control header descriptors





What:		/config/usb-gadget/gadget/functions/uvc.name/control/header/name

What:		/config/usb-gadget/gadget/functions/uvc.name/control/header/name

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Specific control header descriptors

Description:	Specific control header descriptors





dwClockFrequency

dwClockFrequency

bcdUVC

bcdUVC

What:		/config/usb-gadget/gadget/functions/uvc.name/streaming

What:		/config/usb-gadget/gadget/functions/uvc.name/streaming

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Streaming descriptors

Description:	Streaming descriptors





What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/class

What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/class

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Streaming class descriptors

Description:	Streaming class descriptors





What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/class/ss

What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/class/ss

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Super speed streaming class descriptors

Description:	Super speed streaming class descriptors





What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/class/hs

What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/class/hs

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	High speed streaming class descriptors

Description:	High speed streaming class descriptors





What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/class/fs

What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/class/fs

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Full speed streaming class descriptors

Description:	Full speed streaming class descriptors





What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching

What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Color matching descriptors

Description:	Color matching descriptors





What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching/default

What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching/default

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Default color matching descriptors

Description:	Default color matching descriptors





		All attributes read only:

		All attributes read only:
@@ -150,12 +150,12 @@ Description: Default color matching descriptors 




What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg

What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	MJPEG format descriptors

Description:	MJPEG format descriptors





What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name

What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Specific MJPEG format descriptors

Description:	Specific MJPEG format descriptors





		All attributes read only,

		All attributes read only,
@@ -174,7 +174,7 @@ Description: Specific MJPEG format descriptors 




What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name/name

What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name/name

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Specific MJPEG frame descriptors

Description:	Specific MJPEG frame descriptors





		dwFrameInterval		- indicates how frame interval can be

		dwFrameInterval		- indicates how frame interval can be
@@ -196,12 +196,12 @@ Description: Specific MJPEG frame descriptors 




What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed

What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Uncompressed format descriptors

Description:	Uncompressed format descriptors





What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name

What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Specific uncompressed format descriptors

Description:	Specific uncompressed format descriptors





		bmaControls		- this format's data for bmaControls in

		bmaControls		- this format's data for bmaControls in
@@ -221,7 +221,7 @@ Description: Specific uncompressed format descriptors 




What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name/name

What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name/name

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Specific uncompressed frame descriptors

Description:	Specific uncompressed frame descriptors





		dwFrameInterval		- indicates how frame interval can be

		dwFrameInterval		- indicates how frame interval can be
@@ -243,12 +243,12 @@ Description: Specific uncompressed frame descriptors 




What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/header

What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/header

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Streaming header descriptors

Description:	Streaming header descriptors





What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/header/name

What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/header/name

Date:		Dec 2014

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Specific streaming header descriptors

Description:	Specific streaming header descriptors





		All attributes read only:

		All attributes read only:

MAINTAINERS

+1 −0
Original line number Original line Diff line number Diff line
@@ -11975,6 +11975,7 @@ L: linux-usb@vger.kernel.org 
W:	http://www.linux-usb.org

W:	http://www.linux-usb.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git

S:	Supported

S:	Supported

F:	Documentation/devicetree/bindings/usb/

F:	Documentation/usb/

F:	Documentation/usb/

F:	drivers/usb/

F:	drivers/usb/

F:	include/linux/usb.h

F:	include/linux/usb.h

drivers/phy/phy-exynos-mipi-video.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -233,8 +233,12 @@ static inline int __is_running(const struct exynos_mipi_phy_desc *data, 
			struct exynos_mipi_video_phy *state)

			struct exynos_mipi_video_phy *state)

{

{

	u32 val;

	u32 val;

	int ret;



	ret = regmap_read(state->regmaps[data->resetn_map], data->resetn_reg, &val);

	if (ret)

		return 0;





	regmap_read(state->regmaps[data->resetn_map], data->resetn_reg, &val);

	return val & data->resetn_val;

	return val & data->resetn_val;

}

}

drivers/phy/phy-ti-pipe3.c

+11 −4
Original line number Original line Diff line number Diff line
@@ -293,11 +293,18 @@ static int ti_pipe3_init(struct phy *x) 
		ret = ti_pipe3_dpll_wait_lock(phy);

		ret = ti_pipe3_dpll_wait_lock(phy);

	}

	}





	/* Program the DPLL only if not locked */

	/* SATA has issues if re-programmed when locked */

	val = ti_pipe3_readl(phy->pll_ctrl_base, PLL_STATUS);

	val = ti_pipe3_readl(phy->pll_ctrl_base, PLL_STATUS);

	if (!(val & PLL_LOCK))

	if ((val & PLL_LOCK) && of_device_is_compatible(phy->dev->of_node,

		if (ti_pipe3_dpll_program(phy))

							"ti,phy-pipe3-sata"))

		return ret;



	/* Program the DPLL */

	ret = ti_pipe3_dpll_program(phy);

	if (ret) {

		ti_pipe3_disable_clocks(phy);

		return -EINVAL;

		return -EINVAL;

	}





	return ret;

	return ret;

}

}

drivers/phy/phy-twl4030-usb.c

+10 −4
Original line number Original line Diff line number Diff line
@@ -463,7 +463,8 @@ static int twl4030_phy_power_on(struct phy *phy) 
	twl4030_usb_set_mode(twl, twl->usb_mode);

	twl4030_usb_set_mode(twl, twl->usb_mode);

	if (twl->usb_mode == T2_USB_MODE_ULPI)

	if (twl->usb_mode == T2_USB_MODE_ULPI)

		twl4030_i2c_access(twl, 0);

		twl4030_i2c_access(twl, 0);

	schedule_delayed_work(&twl->id_workaround_work, 0);

	twl->linkstat = MUSB_UNKNOWN;

	schedule_delayed_work(&twl->id_workaround_work, HZ);





	return 0;

	return 0;

}

}
@@ -537,6 +538,7 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl) 
	struct twl4030_usb *twl = _twl;

	struct twl4030_usb *twl = _twl;

	enum musb_vbus_id_status status;

	enum musb_vbus_id_status status;

	bool status_changed = false;

	bool status_changed = false;

	int err;





	status = twl4030_usb_linkstat(twl);

	status = twl4030_usb_linkstat(twl);
@@ -567,7 +569,9 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl) 
			pm_runtime_mark_last_busy(twl->dev);

			pm_runtime_mark_last_busy(twl->dev);

			pm_runtime_put_autosuspend(twl->dev);

			pm_runtime_put_autosuspend(twl->dev);

		}

		}

		musb_mailbox(status);

		err = musb_mailbox(status);

		if (err)

			twl->linkstat = MUSB_UNKNOWN;

	}

	}





	/* don't schedule during sleep - irq works right then */

	/* don't schedule during sleep - irq works right then */
@@ -595,7 +599,8 @@ static int twl4030_phy_init(struct phy *phy) 
	struct twl4030_usb *twl = phy_get_drvdata(phy);

	struct twl4030_usb *twl = phy_get_drvdata(phy);





	pm_runtime_get_sync(twl->dev);

	pm_runtime_get_sync(twl->dev);

	schedule_delayed_work(&twl->id_workaround_work, 0);

	twl->linkstat = MUSB_UNKNOWN;

	schedule_delayed_work(&twl->id_workaround_work, HZ);

	pm_runtime_mark_last_busy(twl->dev);

	pm_runtime_mark_last_busy(twl->dev);

	pm_runtime_put_autosuspend(twl->dev);

	pm_runtime_put_autosuspend(twl->dev);
@@ -763,7 +768,8 @@ static int twl4030_usb_remove(struct platform_device *pdev) 
	if (cable_present(twl->linkstat))

	if (cable_present(twl->linkstat))

		pm_runtime_put_noidle(twl->dev);

		pm_runtime_put_noidle(twl->dev);

	pm_runtime_mark_last_busy(twl->dev);

	pm_runtime_mark_last_busy(twl->dev);

	pm_runtime_put_sync_suspend(twl->dev);

	pm_runtime_dont_use_autosuspend(&pdev->dev);

	pm_runtime_put_sync(twl->dev);

	pm_runtime_disable(twl->dev);

	pm_runtime_disable(twl->dev);





	/* autogate 60MHz ULPI clock,

	/* autogate 60MHz ULPI clock,

CRA Git | Maintained and supported by SUSTech CRA and CCSE