Commit 67f34fa8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB / PHY driver fixes from Greg KH:
 "Here are a few small USB and PHY driver fixes for 5.10-rc6. They
  include:

   - small PHY driver fixes to resolve reported issues

   - USB quirks added for "broken" devices

   - typec fixes for reported problems

   - USB gadget fixes for small issues

  Full details are in the shortlog, nothing major in here and all have
  been in linux-next with no reported issues"

* tag 'usb-5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: typec: stusb160x: fix power-opmode property with typec-power-opmode
  USB: core: Change %pK for __user pointers to %px
  USB: core: Fix regression in Hercules audio card
  usb: gadget: Fix memleak in gadgetfs_fill_super
  usb: gadget: f_midi: Fix memleak in f_midi_alloc
  USB: quirks: Add USB_QUIRK_DISCONNECT_SUSPEND quirk for Lenovo A630Z TIO built-in usb-audio card
  usb: typec: qcom-pmic-typec: fix builtin build errors
  phy: mediatek: fix spelling mistake in Kconfig "veriosn" -> "version"
  phy: qualcomm: Fix 28 nm Hi-Speed USB PHY OF dependency
  phy: qualcomm: usb: Fix SuperSpeed PHY OF dependency
  phy: intel: PHY_INTEL_KEEMBAY_EMMC should depend on ARCH_KEEMBAY
  usb: cdns3: gadget: calculate TD_SIZE based on TD
  usb: cdns3: gadget: initialize link_trb as NULL
  phy: cpcap-usb: Use IRQF_ONESHOT
  phy: qcom-qmp: Initialize another pointer to NULL
  phy: tegra: xusb: Fix dangling pointer on probe failure
  phy: usb: Fix incorrect clearing of tca_drv_sel bit in SETUP reg for 7211
parents 7b2c800d 484cfbe5

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

+0 −5
Original line number Diff line number Diff line
@@ -270,11 +270,6 @@ static void usb_init_common_7211b0(struct brcm_usb_init_params *params) 
	reg |= params->mode << USB_PHY_UTMI_CTL_1_PHY_MODE_SHIFT;

	brcm_usb_writel(reg, usb_phy + USB_PHY_UTMI_CTL_1);



	/* Fix the incorrect default */

	reg = brcm_usb_readl(ctrl + USB_CTRL_SETUP);

	reg &= ~USB_CTRL_SETUP_tca_drv_sel_MASK;

	brcm_usb_writel(reg, ctrl + USB_CTRL_SETUP);



	usb_init_common(params);



	/*

drivers/phy/intel/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

config PHY_INTEL_KEEMBAY_EMMC

	tristate "Intel Keem Bay EMMC PHY driver"

	depends on (OF && ARM64) || COMPILE_TEST

	depends on ARCH_KEEMBAY || COMPILE_TEST

	depends on HAS_IOMEM

	select GENERIC_PHY

	select REGMAP_MMIO

drivers/phy/mediatek/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ config PHY_MTK_TPHY 
	  it supports multiple usb2.0, usb3.0 ports, PCIe and

	  SATA, and meanwhile supports two version T-PHY which have

	  different banks layout, the T-PHY with shared banks between

	  multi-ports is first version, otherwise is second veriosn,

	  multi-ports is first version, otherwise is second version,

	  so you can easily distinguish them by banks layout.



config PHY_MTK_UFS

drivers/phy/motorola/phy-cpcap-usb.c

+2 −1
Original line number Diff line number Diff line
@@ -364,7 +364,8 @@ static int cpcap_usb_init_irq(struct platform_device *pdev, 


	error = devm_request_threaded_irq(ddata->dev, irq, NULL,

					  cpcap_phy_irq_thread,

					  IRQF_SHARED,

					  IRQF_SHARED |

					  IRQF_ONESHOT,

					  name, ddata);

	if (error) {

		dev_err(ddata->dev, "could not get irq %s: %i\n",

drivers/phy/qualcomm/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ config PHY_QCOM_USB_HSIC 


config PHY_QCOM_USB_HS_28NM

	tristate "Qualcomm 28nm High-Speed PHY"

	depends on ARCH_QCOM || COMPILE_TEST

	depends on OF && (ARCH_QCOM || COMPILE_TEST)

	depends on EXTCON || !EXTCON # if EXTCON=m, this cannot be built-in

	select GENERIC_PHY

	help
@@ -98,7 +98,7 @@ config PHY_QCOM_USB_HS_28NM 


config PHY_QCOM_USB_SS

	tristate "Qualcomm USB Super-Speed PHY driver"

	depends on ARCH_QCOM || COMPILE_TEST

	depends on OF && (ARCH_QCOM || COMPILE_TEST)

	depends on EXTCON || !EXTCON # if EXTCON=m, this cannot be built-in

	select GENERIC_PHY

	help

CRA Git | Maintained and supported by SUSTech CRA and CCSE