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

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

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

Pull USB fixes from Greg KH:
 "Here are a number of USB fixes and new device ids for 4.18-rc7.

  The largest number are a bunch of gadget driver fixes that got delayed
  in being submitted earlier due to vacation schedules, but nothing
  really huge is present in them. There are some new device ids and some
  PHY driver fixes that were connected to some USB ones. Full details
  are in the shortlog.

  All have been in linux-next for a while with no reported issues"

* tag 'usb-4.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (28 commits)
  usb: core: handle hub C_PORT_OVER_CURRENT condition
  usb: xhci: Fix memory leak in xhci_endpoint_reset()
  usb: typec: tcpm: Fix sink PDO starting index for PPS APDO selection
  usb: gadget: f_fs: Only return delayed status when len is 0
  usb: gadget: f_uac2: fix endianness of 'struct cntrl_*_lay3'
  usb: dwc2: Fix inefficient copy of unaligned buffers
  usb: dwc2: Fix DMA alignment to start at allocated boundary
  usb: dwc3: rockchip: Fix PHY documentation links.
  tools: usb: ffs-test: Fix build on big endian systems
  usb: gadget: aspeed: Workaround memory ordering issue
  usb: dwc3: gadget: remove redundant variable maxpacket
  usb: dwc2: avoid NULL dereferences
  usb/phy: fix PPC64 build errors in phy-fsl-usb.c
  usb: dwc2: host: do not delay retries for CONTROL IN transfers
  usb: gadget: u_audio: protect stream runtime fields with stream spinlock
  usb: gadget: u_audio: remove cached period bytes value
  usb: gadget: u_audio: remove caching of stream buffer parameters
  usb: gadget: u_audio: update hw_ptr in iso_complete after data copied
  usb: gadget: u_audio: fix pcm/card naming in g_audio_setup()
  usb: gadget: f_uac2: fix error handling in afunc_bind (again)
  ...
parents fd4f84fa 249a32b7

Documentation/devicetree/bindings/usb/rockchip,dwc3.txt

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ A child node must exist to represent the core DWC3 IP block. The name of 
the node is not important. The content of the node is defined in dwc3.txt.



Phy documentation is provided in the following places:

Documentation/devicetree/bindings/phy/qcom-dwc3-usb-phy.txt

Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt - USB2.0 PHY

Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt     - Type-C PHY



Example device nodes:

drivers/phy/broadcom/phy-brcm-usb-init.c

+4 −0
Original line number Diff line number Diff line
@@ -962,6 +962,10 @@ void brcm_usb_init_xhci(struct brcm_usb_init_params *params) 
{

	void __iomem *ctrl = params->ctrl_regs;



	USB_CTRL_UNSET(ctrl, USB30_PCTL, PHY3_IDDQ_OVERRIDE);

	/* 1 millisecond - for USB clocks to settle down */

	usleep_range(1000, 2000);



	if (BRCM_ID(params->family_id) == 0x7366) {

		/*

		 * The PHY3_SOFT_RESETB bits default to the wrong state.

drivers/phy/motorola/phy-mapphone-mdm6600.c

+2 −2
Original line number Diff line number Diff line
@@ -182,13 +182,13 @@ static void phy_mdm6600_status(struct work_struct *work) 
	ddata = container_of(work, struct phy_mdm6600, status_work.work);

	dev = ddata->dev;



	error = gpiod_get_array_value_cansleep(PHY_MDM6600_NR_CMD_LINES,

	error = gpiod_get_array_value_cansleep(PHY_MDM6600_NR_STATUS_LINES,

					       ddata->status_gpios->desc,

					       values);

	if (error)

		return;



	for (i = 0; i < PHY_MDM6600_NR_CMD_LINES; i++) {

	for (i = 0; i < PHY_MDM6600_NR_STATUS_LINES; i++) {

		val |= values[i] << i;

		dev_dbg(ddata->dev, "XXX %s: i: %i values[i]: %i val: %i\n",

			__func__, i, values[i], val);

drivers/usb/chipidea/Kconfig

+1 −8
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config USB_CHIPIDEA 
	depends on ((USB_EHCI_HCD && USB_GADGET) || (USB_EHCI_HCD && !USB_GADGET) || (!USB_EHCI_HCD && USB_GADGET)) && HAS_DMA

	select EXTCON

	select RESET_CONTROLLER

	select USB_ULPI_BUS

	help

	  Say Y here if your system has a dual role high speed USB

	  controller based on ChipIdea silicon IP. It supports:
@@ -38,12 +39,4 @@ config USB_CHIPIDEA_HOST 
	help

	  Say Y here to enable host controller functionality of the

	  ChipIdea driver.



config USB_CHIPIDEA_ULPI

	bool "ChipIdea ULPI PHY support"

	depends on USB_ULPI_BUS=y || USB_ULPI_BUS=USB_CHIPIDEA

	help

	  Say Y here if you have a ULPI PHY attached to your ChipIdea

	  controller.



endif

drivers/usb/chipidea/Makefile

+1 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_USB_CHIPIDEA)		+= ci_hdrc.o



ci_hdrc-y				:= core.o otg.o debug.o

ci_hdrc-y				:= core.o otg.o debug.o ulpi.o

ci_hdrc-$(CONFIG_USB_CHIPIDEA_UDC)	+= udc.o

ci_hdrc-$(CONFIG_USB_CHIPIDEA_HOST)	+= host.o

ci_hdrc-$(CONFIG_USB_OTG_FSM)		+= otg_fsm.o

ci_hdrc-$(CONFIG_USB_CHIPIDEA_ULPI)	+= ulpi.o



# Glue/Bridge layers go here