From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 1 Sep 2021 16:59:34 +0000 (-0700)
Subject: Merge tag 'usb-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
X-Git-Tag: accepted/tizen/unified/20230118.172025~6522
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07281a257a6868b900da5de1eda808c9e20253f1;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'usb-5.15-rc1' of git://git./linux/kernel/git/gregkh/usb

Pull USB / Thunderbolt updates from Greg KH:
 "Here is the big set of USB and Thunderbolt patches for 5.15-rc1.

  Nothing huge in here, just lots of constant forward progress on a
  number of different drivers and hardware support:

   - more USB 4/Thunderbolt support added

   - dwc3 driver updates and additions

   - usb gadget fixes and addtions for new types

   - udc gadget driver updates

   - host controller updates

   - removal of obsolete drivers

   - other minor driver updates

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

* tag 'usb-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (148 commits)
  usb: isp1760: otg control register access
  usb: isp1760: use the right irq status bit
  usb: isp1760: write to status and address register
  usb: isp1760: fix qtd fill length
  usb: isp1760: fix memory pool initialization
  usb: typec: tcpm: Fix spelling mistake "atleast" -> "at least"
  usb: dwc2: Fix spelling mistake "was't" -> "wasn't"
  usb: renesas_usbhs: Fix spelling mistake "faile" -> "failed"
  usb: host: xhci-rcar: Don't reload firmware after the completion
  usb: xhci-mtk: allow bandwidth table rollover
  usb: mtu3: fix random remote wakeup
  usb: mtu3: return successful suspend status
  usb: xhci-mtk: Do not use xhci's virt_dev in drop_endpoint
  usb: xhci-mtk: modify the SOF/ITP interval for mt8195
  usb: xhci-mtk: add a member of num_esit
  usb: xhci-mtk: check boundary before check tt
  usb: xhci-mtk: update fs bus bandwidth by bw_budget_table
  usb: xhci-mtk: fix issue of out-of-bounds array access
  usb: xhci-mtk: support option to disable usb2 ports
  usb: xhci-mtk: fix use-after-free of mtk->hcd
  ...
---

07281a257a6868b900da5de1eda808c9e20253f1
diff --cc Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
index 1d49cc3,2019983..60dc278
--- a/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
@@@ -14,7 -14,7 +14,8 @@@ properties
    compatible:
      enum:
        - qcom,sc7180-qmp-usb3-dp-phy
+       - qcom,sc7280-qmp-usb3-dp-phy
 +      - qcom,sc8180x-qmp-usb3-dp-phy
        - qcom,sdm845-qmp-usb3-dp-phy
        - qcom,sm8250-qmp-usb3-dp-phy
    reg:
diff --cc drivers/usb/host/xhci-pci-renesas.c
index ef5e91a,aa88e57..52599d9
--- a/drivers/usb/host/xhci-pci-renesas.c
+++ b/drivers/usb/host/xhci-pci-renesas.c
@@@ -584,39 -591,21 +584,39 @@@ int renesas_xhci_check_request_fw(struc
  			(struct xhci_driver_data *)id->driver_data;
  	const char *fw_name = driver_data->firmware;
  	const struct firmware *fw;
 +	bool has_rom;
  	int err;
  
 +	/* Check if device has ROM and loaded, if so skip everything */
 +	has_rom = renesas_check_rom(pdev);
 +	if (has_rom) {
 +		err = renesas_check_rom_state(pdev);
 +		if (!err)
 +			return 0;
 +		else if (err != -ENOENT)
 +			has_rom = false;
 +	}
 +
  	err = renesas_fw_check_running(pdev);
  	/* Continue ahead, if the firmware is already running. */
- 	if (err == 0)
+ 	if (!err)
  		return 0;
  
 +	/* no firmware interface available */
  	if (err != 1)
 -		return err;
 +		return has_rom ? 0 : err;
  
  	pci_dev_get(pdev);
 -	err = request_firmware(&fw, fw_name, &pdev->dev);
 +	err = firmware_request_nowarn(&fw, fw_name, &pdev->dev);
  	pci_dev_put(pdev);
  	if (err) {
 -		dev_err(&pdev->dev, "request_firmware failed: %d\n", err);
 +		if (has_rom) {
 +			dev_info(&pdev->dev, "failed to load firmware %s, fallback to ROM\n",
 +				 fw_name);
 +			return 0;
 +		}
 +		dev_err(&pdev->dev, "failed to load firmware %s: %d\n",
 +			fw_name, err);
  		return err;
  	}