Commit 89601f67 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-6.10-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 changes for 6.10-rc1.
  Nothing hugely earth-shattering, just constant forward progress for
  hardware support of new devices and cleanups over the drivers.

  Included in here are:

   - Thunderbolt / USB 4 driver updates

   - typec driver updates

   - dwc3 driver updates

   - gadget driver updates

   - uss720 driver id additions and fixes (people use USB->arallel port
     devices still!)

   - onboard-hub driver rename and additions for new hardware

   - xhci driver updates

   - other small USB driver updates and additions for quirks and api
     changes

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

* tag 'usb-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (154 commits)
  drm/bridge: aux-hpd-bridge: correct devm_drm_dp_hpd_bridge_add() stub
  usb: fotg210: Add missing kernel doc description
  usb: dwc3: core: Fix unused variable warning in core driver
  usb: typec: tipd: rely on i2c_get_match_data()
  usb: typec: tipd: fix event checking for tps6598x
  usb: typec: tipd: fix event checking for tps25750
  dt-bindings: usb: qcom,dwc3: fix interrupt max items
  usb: fotg210: Use *-y instead of *-objs in Makefile
  usb: phy: tegra: Replace of_gpio.h by proper one
  usb: typec: ucsi: displayport: Fix potential deadlock
  usb: typec: qcom-pmic-typec: split HPD bridge alloc and registration
  usb: musc: Remove unused list 'buffers'
  usb: dwc3: Wait unconditionally after issuing EndXfer command
  usb: gadget: u_audio: Clear uac pointer when freed.
  usb: gadget: u_audio: Fix race condition use of controls after free during gadget unbind.
  dt-bindings: usb: dwc3: Add QDU1000 compatible
  usb: core: Remove the useless struct usb_devmap which is just a bitmap
  MAINTAINERS: Remove {ehci,uhci}-platform.c from ARM/VT8500 entry
  USB: usb_parse_endpoint: ignore reserved bits
  usb: xhci: compact 'trb_in_td()' arguments
  ...
parents f3033eb7 51474ab4

Documentation/ABI/testing/sysfs-bus-platform-onboard-usb-hub→Documentation/ABI/testing/sysfs-bus-platform-onboard-usb-dev

+2 −1
Original line number Diff line number Diff line
@@ -5,4 +5,5 @@ Contact: Matthias Kaehlcke <matthias@kaehlcke.net> 
		linux-usb@vger.kernel.org

Description:

		(RW) Controls whether the USB hub remains always powered

		during system suspend or not.
 
 No newline at end of file
 
		during system suspend or not. This attribute is not

		available for non-hub devices.

Documentation/devicetree/bindings/sound/xmos,xvf3500.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/xmos,xvf3500.yaml#

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



title: XMOS XVF3500 VocalFusion Voice Processor



maintainers:

  - Javier Carrasco <javier.carrasco@wolfvision.net>



description:

  The XMOS XVF3500 VocalFusion Voice Processor is a low-latency, 32-bit

  multicore controller for voice processing.

  https://www.xmos.com/xvf3500/



allOf:

  - $ref: /schemas/usb/usb-device.yaml#



properties:

  compatible:

    const: usb20b1,0013



  reg: true



  reset-gpios:

    maxItems: 1



  vdd-supply:

    description:

      Regulator for the 1V0 supply.



  vddio-supply:

    description:

      Regulator for the 3V3 supply.



required:

  - compatible

  - reg

  - reset-gpios

  - vdd-supply

  - vddio-supply



additionalProperties: false



examples:

  - |

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



    usb {

        #address-cells = <1>;

        #size-cells = <0>;



        voice_processor: voice-processor@1 {

            compatible = "usb20b1,0013";

            reg = <1>;

            reset-gpios = <&gpio 5 GPIO_ACTIVE_LOW>;

            vdd-supply = <&vcc1v0>;

            vddio-supply = <&vcc3v3>;

        };

    };



...

Documentation/devicetree/bindings/usb/chipidea,usb2-common.yaml

0 → 100644
+200 −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/chipidea,usb2-common.yaml#

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



title: USB2 ChipIdea USB controller Common Properties



maintainers:

  - Xu Yang <xu.yang_2@nxp.com>



properties:

  reg:

    minItems: 1

    maxItems: 2



  interrupts:

    minItems: 1

    maxItems: 2



  clocks:

    minItems: 1

    maxItems: 3



  clock-names:

    minItems: 1

    maxItems: 3



  dr_mode: true



  power-domains:

    maxItems: 1



  resets:

    maxItems: 1



  reset-names:

    maxItems: 1



  "#reset-cells":

    const: 1



  phy_type: true



  itc-setting:

    description:

      interrupt threshold control register control, the setting should be

      aligned with ITC bits at register USBCMD.

    $ref: /schemas/types.yaml#/definitions/uint32



  ahb-burst-config:

    description:

      it is vendor dependent, the required value should be aligned with

      AHBBRST at SBUSCFG, the range is from 0x0 to 0x7. This property is

      used to change AHB burst configuration, check the chipidea spec for

      meaning of each value. If this property is not existed, it will use

      the reset value.

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0x0

    maximum: 0x7



  tx-burst-size-dword:

    description:

      it is vendor dependent, the tx burst size in dword (4 bytes), This

      register represents the maximum length of a the burst in 32-bit

      words while moving data from system memory to the USB bus, the value

      of this property will only take effect if property "ahb-burst-config"

      is set to 0, if this property is missing the reset default of the

      hardware implementation will be used.

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0x0

    maximum: 0x20



  rx-burst-size-dword:

    description:

      it is vendor dependent, the rx burst size in dword (4 bytes), This

      register represents the maximum length of a the burst in 32-bit words

      while moving data from the USB bus to system memory, the value of

      this property will only take effect if property "ahb-burst-config"

      is set to 0, if this property is missing the reset default of the

      hardware implementation will be used.

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0x0

    maximum: 0x20



  extcon:

    description:

      Phandles to external connector devices. First phandle should point

      to external connector, which provide "USB" cable events, the second

      should point to external connector device, which provide "USB-HOST"

      cable events. If one of the external connector devices is not

      required, empty <0> phandle should be specified.

    $ref: /schemas/types.yaml#/definitions/phandle-array

    minItems: 1

    items:

      - description: vbus extcon

      - description: id extcon



  phy-clkgate-delay-us:

    description:

      The delay time (us) between putting the PHY into low power mode and

      gating the PHY clock.



  non-zero-ttctrl-ttha:

    description:

      After setting this property, the value of register ttctrl.ttha

      will be 0x7f; if not, the value will be 0x0, this is the default

      value. It needs to be very carefully for setting this property, it

      is recommended that consult with your IC engineer before setting

      this value.  On the most of chipidea platforms, the "usage_tt" flag

      at RTL is 0, so this property only affects siTD.



      If this property is not set, the max packet size is 1023 bytes, and

      if the total of packet size for previous transactions are more than

      256 bytes, it can't accept any transactions within this frame. The

      use case is single transaction, but higher frame rate.



      If this property is set, the max packet size is 188 bytes, it can

      handle more transactions than above case, it can accept transactions

      until it considers the left room size within frame is less than 188

      bytes, software needs to make sure it does not send more than 90%

      maximum_periodic_data_per_frame. The use case is multiple

      transactions, but less frame rate.

    type: boolean



  mux-controls:

    description:

      The mux control for toggling host/device output of this controller.

      It's expected that a mux state of 0 indicates device mode and a mux

      state of 1 indicates host mode.

    maxItems: 1



  mux-control-names:

    const: usb_switch



  pinctrl-names:

    description:

      Names for optional pin modes in "default", "host", "device".

      In case of HSIC-mode, "idle" and "active" pin modes are mandatory.

      In this case, the "idle" state needs to pull down the data and

      strobe pin and the "active" state needs to pull up the strobe pin.

    oneOf:

      - items:

          - const: idle

          - const: active

      - items:

          - const: default

          - const: host

          - const: device

      - items:

          - const: default

          - enum:

              - host

              - device

      - items:

          - const: default



  pinctrl-0:

    maxItems: 1



  pinctrl-1:

    maxItems: 1



  phys:

    maxItems: 1



  phy-names:

    const: usb-phy



  vbus-supply:

    description: reference to the VBUS regulator.



  usb-phy:

    description: phandle for the PHY device. Use "phys" instead.

    maxItems: 1

    deprecated: true



  port:

    description:

      Any connector to the data bus of this controller should be modelled

      using the OF graph bindings specified, if the "usb-role-switch"

      property is used.

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



  reset-gpios:

    maxItems: 1



dependencies:

  port: [ usb-role-switch ]

  mux-controls: [ mux-control-names ]



required:

  - reg

  - interrupts



allOf:

  - $ref: usb-hcd.yaml#

  - $ref: usb-drd.yaml#



additionalProperties: true

Documentation/devicetree/bindings/usb/chipidea,usb2-imx.yaml

0 → 100644
+287 −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/chipidea,usb2-imx.yaml#

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



title: NXP USB2 ChipIdea USB controller



maintainers:

  - Xu Yang <xu.yang_2@nxp.com>



properties:

  compatible:

    oneOf:

      - enum:

          - fsl,imx27-usb

      - items:

          - enum:

              - fsl,imx23-usb

              - fsl,imx25-usb

              - fsl,imx28-usb

              - fsl,imx35-usb

              - fsl,imx50-usb

              - fsl,imx51-usb

              - fsl,imx53-usb

              - fsl,imx6q-usb

              - fsl,imx6sl-usb

              - fsl,imx6sx-usb

              - fsl,imx6ul-usb

              - fsl,imx7d-usb

              - fsl,vf610-usb

          - const: fsl,imx27-usb

      - items:

          - enum:

              - fsl,imx8dxl-usb

              - fsl,imx8ulp-usb

          - const: fsl,imx7ulp-usb

          - const: fsl,imx6ul-usb

      - items:

          - enum:

              - fsl,imx8mm-usb

              - fsl,imx8mn-usb

              - fsl,imx93-usb

          - const: fsl,imx7d-usb

          - const: fsl,imx27-usb

      - items:

          - enum:

              - fsl,imx6sll-usb

              - fsl,imx7ulp-usb

          - const: fsl,imx6ul-usb

          - const: fsl,imx27-usb



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    minItems: 1

    maxItems: 3



  clock-names:

    minItems: 1

    maxItems: 3



  fsl,usbmisc:

    description:

      Phandler of non-core register device, with one argument that

      indicate usb controller index

    $ref: /schemas/types.yaml#/definitions/phandle-array

    items:

      - items:

          - description: phandle to usbmisc node

          - description: index of usb controller



  disable-over-current:

    type: boolean

    description: disable over current detect



  over-current-active-low:

    type: boolean

    description: over current signal polarity is active low



  over-current-active-high:

    type: boolean

    description:

      Over current signal polarity is active high. It's recommended to

      specify the over current polarity.



  power-active-high:

    type: boolean

    description: power signal polarity is active high



  external-vbus-divider:

    type: boolean

    description: enables off-chip resistor divider for Vbus



  samsung,picophy-pre-emp-curr-control:

    description:

      HS Transmitter Pre-Emphasis Current Control. This signal controls

      the amount of current sourced to the USB_OTG*_DP and USB_OTG*_DN

      pins after a J-to-K or K-to-J transition. The range is from 0x0 to

      0x3, the default value is 0x1. Details can refer to TXPREEMPAMPTUNE0

      bits of USBNC_n_PHY_CFG1.

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0x0

    maximum: 0x3



  samsung,picophy-dc-vol-level-adjust:

    description:

      HS DC Voltage Level Adjustment. Adjust the high-speed transmitter DC

      level voltage. The range is from 0x0 to 0xf, the default value is

      0x3. Details can refer to TXVREFTUNE0 bits of USBNC_n_PHY_CFG1.

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0x0

    maximum: 0xf



  fsl,picophy-rise-fall-time-adjust:

    description:

      HS Transmitter Rise/Fall Time Adjustment. Adjust the rise/fall times

      of the high-speed transmitter waveform. It has no unit. The rise/fall

      time will be increased or decreased by a certain percentage relative

      to design default time. (0:-10%; 1:design default; 2:+15%; 3:+20%)

      Details can refer to TXRISETUNE0 bit of USBNC_n_PHY_CFG1.

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0

    maximum: 3

    default: 1



  fsl,usbphy:

    description: phandle of usb phy that connects to the port. Use "phys" instead.

    $ref: /schemas/types.yaml#/definitions/phandle

    deprecated: true



required:

  - compatible



allOf:

  - $ref: chipidea,usb2-common.yaml#

  - if:

      properties:

        phy_type:

          const: hsic

      required:

        - phy_type

    then:

      properties:

        pinctrl-names:

          items:

            - const: idle

            - const: active



  # imx27 Soc needs three clocks

  - if:

      properties:

        compatible:

          const: fsl,imx27-usb

    then:

      properties:

        clocks:

          minItems: 3

        clock-names:

          items:

            - const: ipg

            - const: ahb

            - const: per



  # imx25 and imx35 Soc need three clocks

  - if:

      properties:

        compatible:

          contains:

            enum:

              - fsl,imx25-usb

              - fsl,imx35-usb

    then:

      properties:

        clocks:

          minItems: 3

        clock-names:

          items:

            - const: ipg

            - const: ahb

            - const: per



  # imx93 Soc needs two clocks

  - if:

      properties:

        compatible:

          contains:

            enum:

              - fsl,imx93-usb

    then:

      properties:

        clocks:

          minItems: 2

          maxItems: 2

        clock-names:

          items:

            - const: usb_ctrl_root

            - const: usb_wakeup



  # imx7d Soc need one clock

  - if:

      properties:

        compatible:

          items:

            - const: fsl,imx7d-usb

            - const: fsl,imx27-usb

    then:

      properties:

        clocks:

          maxItems: 1

        clock-names: false



  # other Soc need one clock

  - if:

      properties:

        compatible:

          contains:

            enum:

              - fsl,imx23-usb

              - fsl,imx28-usb

              - fsl,imx50-usb

              - fsl,imx51-usb

              - fsl,imx53-usb

              - fsl,imx6q-usb

              - fsl,imx6sl-usb

              - fsl,imx6sx-usb

              - fsl,imx6ul-usb

              - fsl,imx8mm-usb

              - fsl,imx8mn-usb

              - fsl,vf610-usb

    then:

      properties:

        clocks:

          maxItems: 1

        clock-names: false



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/clock/imx7d-clock.h>



    usb@30b10000 {

        compatible = "fsl,imx7d-usb", "fsl,imx27-usb";

        reg = <0x30b10000 0x200>;

        interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&clks IMX7D_USB_CTRL_CLK>;

        fsl,usbphy = <&usbphynop1>;

        fsl,usbmisc = <&usbmisc1 0>;

        phy-clkgate-delay-us = <400>;

    };



  # Example for HSIC:

  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/clock/imx6qdl-clock.h>



    usb@2184400 {

        compatible = "fsl,imx6q-usb", "fsl,imx27-usb";

        reg = <0x02184400 0x200>;

        interrupts = <0 41 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&clks IMX6QDL_CLK_USBOH3>;

        fsl,usbphy = <&usbphynop1>;

        fsl,usbmisc = <&usbmisc 2>;

        phy_type = "hsic";

        dr_mode = "host";

        ahb-burst-config = <0x0>;

        tx-burst-size-dword = <0x10>;

        rx-burst-size-dword = <0x10>;

        pinctrl-names = "idle", "active";

        pinctrl-0 = <&pinctrl_usbh2_idle>;

        pinctrl-1 = <&pinctrl_usbh2_active>;

        #address-cells = <1>;

        #size-cells = <0>;



        ethernet@1 {

            compatible = "usb424,9730";

            reg = <1>;

        };

    };



...

Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml

+3 −357

File changed.

Preview size limit exceeded, changes collapsed.