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

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

Pull USB / Thunderbolt updates from Greg KH:
 "Here is the big set of USB and Thunderbolt driver updates for
  6.15-rc1. Included in here are:

   - Thunderbolt driver and core api updates for new hardware and
     features

   - usb-storage const array cleanups

   - typec driver updates

   - dwc3 driver updates

   - xhci driver updates and bugfixes

   - small USB documentation updates

   - usb cdns3 driver updates

   - usb gadget driver updates

   - other small driver updates and fixes

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

* tag 'usb-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (92 commits)
  thunderbolt: Do not add non-active NVM if NVM upgrade is disabled for retimer
  thunderbolt: Scan retimers after device router has been enumerated
  usb: host: cdns3: forward lost power information to xhci
  usb: host: xhci-plat: allow upper layers to signal power loss
  usb: xhci: change xhci_resume() parameters to explicit the desired info
  usb: cdns3-ti: run HW init at resume() if HW was reset
  usb: cdns3-ti: move reg writes to separate function
  usb: cdns3: call cdns_power_is_lost() only once in cdns_resume()
  usb: cdns3: rename hibernated argument of role->resume() to lost_power
  usb: xhci: tegra: rename `runtime` boolean to `is_auto_runtime`
  usb: host: xhci-plat: mvebu: use ->quirks instead of ->init_quirk() func
  usb: dwc3: Don't use %pK through printk
  usb: core: Don't use %pK through printk
  usb: gadget: aspeed: Add NULL pointer check in ast_vhub_init_dev()
  dt-bindings: usb: qcom,dwc3: Synchronize minItems for interrupts and -names
  usb: common: usb-conn-gpio: switch psy_cfg from of_node to fwnode
  usb: xhci: Avoid Stop Endpoint retry loop if the endpoint seems Running
  usb: xhci: Don't change the status of stalled TDs on failed Stop EP
  xhci: Avoid queuing redundant Stop Endpoint command for stalled endpoint
  xhci: Handle spurious events on Etron host isoc enpoints
  ...
parents ddd0172f ed492c95

Documentation/devicetree/bindings/mfd/aspeed-lpc.yaml

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

# # Copyright (c) 2021 Aspeed Tehchnology Inc.

# # Copyright (c) 2021 Aspeed Technology Inc.

%YAML 1.2

---

$id: http://devicetree.org/schemas/mfd/aspeed-lpc.yaml#

Documentation/devicetree/bindings/usb/generic-xhci.yaml

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ properties: 
      - const: core

      - const: reg



  dma-coherent: true



  power-domains:

    maxItems: 1

Documentation/devicetree/bindings/usb/microchip,usb2514.yaml

+27 −8
Original line number Diff line number Diff line
@@ -9,16 +9,19 @@ title: Microchip USB2514 Hub Controller 
maintainers:

  - Fabio Estevam <festevam@gmail.com>



allOf:

  - $ref: usb-device.yaml#



properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - usb424,2412

          - usb424,2417

          - usb424,2514

          - usb424,2517

      - items:

          - enum:

              - usb424,2512

              - usb424,2513

          - const: usb424,2514



  reg: true
@@ -28,6 +31,9 @@ properties: 
  vdd-supply:

    description: 3.3V power supply.



  vdda-supply:

    description: 3.3V analog power supply.



  clocks:

    description: External 24MHz clock connected to the CLKIN pin.

    maxItems: 1
@@ -43,6 +49,18 @@ patternProperties: 
    $ref: /schemas/usb/usb-device.yaml

    additionalProperties: true



allOf:

  - $ref: usb-device.yaml#

  - if:

      not:

        properties:

          compatible:

            contains:

              const: usb424,2514

    then:

      properties:

        vdda-supply: false



unevaluatedProperties: false



examples:
@@ -60,6 +78,7 @@ examples: 
            clocks = <&clks IMX6QDL_CLK_CKO>;

            reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;

            vdd-supply = <&reg_3v3_hub>;

            vdda-supply = <&reg_3v3a_hub>;

            #address-cells = <1>;

            #size-cells = <0>;

Documentation/devicetree/bindings/usb/parade,ps8830.yaml

0 → 100644
+140 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause

%YAML 1.2

---

$id: http://devicetree.org/schemas/usb/parade,ps8830.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Parade PS883x USB and DisplayPort Retimer



maintainers:

  - Abel Vesa <abel.vesa@linaro.org>



properties:

  compatible:

    enum:

      - parade,ps8830



  reg:

    maxItems: 1



  clocks:

    items:

      - description: XO Clock



  reset-gpios:

    maxItems: 1



  vdd-supply:

    description: power supply (1.07V)



  vdd33-supply:

    description: power supply (3.3V)



  vdd33-cap-supply:

    description: power supply (3.3V)



  vddar-supply:

    description: power supply (1.07V)



  vddat-supply:

    description: power supply (1.07V)



  vddio-supply:

    description: power supply (1.2V or 1.8V)



  orientation-switch: true

  retimer-switch: true



  ports:

    $ref: /schemas/graph.yaml#/properties/ports

    properties:

      port@0:

        $ref: /schemas/graph.yaml#/properties/port

        description: Super Speed (SS) Output endpoint to the Type-C connector



      port@1:

        $ref: /schemas/graph.yaml#/$defs/port-base

        description: Super Speed (SS) Input endpoint from the Super-Speed PHY

        unevaluatedProperties: false



      port@2:

        $ref: /schemas/graph.yaml#/properties/port

        description:

          Sideband Use (SBU) AUX lines endpoint to the Type-C connector for the purpose of

          handling altmode muxing and orientation switching.



required:

  - compatible

  - reg

  - clocks

  - reset-gpios

  - vdd-supply

  - vdd33-supply

  - vdd33-cap-supply

  - vddat-supply

  - vddio-supply

  - orientation-switch

  - retimer-switch



allOf:

  - $ref: usb-switch.yaml#



additionalProperties: false



examples:

  - |

    #include <dt-bindings/gpio/gpio.h>



    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        typec-mux@8 {

            compatible = "parade,ps8830";

            reg = <0x8>;



            clocks = <&clk_rtmr_xo>;



            vdd-supply = <&vreg_rtmr_1p15>;

            vdd33-supply = <&vreg_rtmr_3p3>;

            vdd33-cap-supply = <&vreg_rtmr_3p3>;

            vddar-supply = <&vreg_rtmr_1p15>;

            vddat-supply = <&vreg_rtmr_1p15>;

            vddio-supply = <&vreg_rtmr_1p8>;



            reset-gpios = <&tlmm 10 GPIO_ACTIVE_LOW>;



            retimer-switch;

            orientation-switch;



            ports {

                #address-cells = <1>;

                #size-cells = <0>;



                port@0 {

                    reg = <0>;



                    endpoint {

                        remote-endpoint = <&typec_con_ss>;

                    };

                };



                port@1 {

                    reg = <1>;



                    endpoint {

                        remote-endpoint = <&usb_phy_ss>;

                    };

                };



                port@2 {

                    reg = <2>;



                    endpoint {

                        remote-endpoint = <&typec_dp_aux>;

                    };

                };

            };

        };

    };

...

Documentation/devicetree/bindings/usb/qcom,dwc3.yaml

+2 −0
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ allOf: 
          minItems: 2

          maxItems: 3

        interrupt-names:

          minItems: 2

          items:

            - const: pwr_event

            - const: qusb2_phy
@@ -425,6 +426,7 @@ allOf: 
          minItems: 3

          maxItems: 4

        interrupt-names:

          minItems: 3

          items:

            - const: pwr_event

            - const: qusb2_phy