Commit 048ff862 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-5.16-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
  5.16-rc1.

  Nothing major in here, just lots of little cleanups and additions for
  new hardware, all of which have been in linux-next for a while with no
  reported problems.

  Included in here are:

   - tiny Thunderbolt driver updates

   - USB typec driver updates

   - USB serial driver updates

   - USB gadget driver updates

   - dwc2 and dwc3 controller driver updates

   - tiny USB host driver updates

   - minor USB driver fixes and updates

   - USB dts updates for various platforms"

* tag 'usb-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (123 commits)
  usb: gadget: Mark USB_FSL_QE broken on 64-bit
  usb: gadget: f_mass_storage: Disable eps during disconnect
  usb: gadget: udc: core: Revise comments for USB ep enable/disable
  USB: serial: keyspan: fix memleak on probe errors
  USB: serial: cp210x: use usb_control_msg_recv() and usb_control_msg_send()
  USB: serial: ch314: use usb_control_msg_recv()
  USB: iowarrior: fix control-message timeouts
  Documentation: USB: fix example bulk-message timeout
  usb: dwc2: stm32mp15: set otg_rev
  usb: dwc2: add otg_rev and otg_caps information for gadget driver
  dt-bindings: usb: dwc2: adopt otg properties defined in usb-drd.yaml
  dt-bindings: usb: dwc2: Add reference to usb-drd.yaml
  usb: gadget: uvc: implement dwPresentationTime and scrSourceClock
  usb: gadget: uvc: use on returned header len in video_encode_isoc_sg
  usb:gadget: f_uac1: fixed sync playback
  Docs: usb: remove :c:func: for usb_register and usb_deregister
  Docs: usb: update struct usb_driver
  usb: gadget: configfs: change config attributes file operation
  usb: gadget: configfs: add cfg_to_gadget_info() helper
  usb: dwc3: Align DWC3_EP_* flag macros
  ...
parents 7ddb58cb a0548b26

Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.txt

deleted100644 → 0
+0 −74
Original line number Diff line number Diff line 
Tegra SOC USB PHY



The device node for Tegra SOC USB PHY:



Required properties :

 - compatible : For Tegra20, must contain "nvidia,tegra20-usb-phy".

   For Tegra30, must contain "nvidia,tegra30-usb-phy".  Otherwise, must contain

   "nvidia,<chip>-usb-phy" plus at least one of the above, where <chip> is

   tegra114, tegra124, tegra132, or tegra210.

 - reg : Defines the following set of registers, in the order listed:

   - The PHY's own register set.

     Always present.

   - The register set of the PHY containing the UTMI pad control registers.

     Present if-and-only-if phy_type == utmi.

 - phy_type : Should be one of "utmi", "ulpi" or "hsic".

 - clocks : Defines the clocks listed in the clock-names property.

 - clock-names : The following clock names must be present:

   - reg: The clock needed to access the PHY's own registers. This is the

     associated EHCI controller's clock. Always present.

   - pll_u: PLL_U. Always present.

   - timer: The timeout clock (clk_m). Present if phy_type == utmi.

   - utmi-pads: The clock needed to access the UTMI pad control registers.

     Present if phy_type == utmi.

   - ulpi-link: The clock Tegra provides to the ULPI PHY (usually pad DAP_MCLK2

     with pad group aka "nvidia,pins" cdev2 and pin mux option config aka

     "nvidia,function" pllp_out4).

     Present if phy_type == ulpi, and ULPI link mode is in use.

 - resets : Must contain an entry for each entry in reset-names.

   See ../reset/reset.txt for details.

 - reset-names : Must include the following entries:

   - usb: The PHY's own reset signal.

   - utmi-pads: The reset of the PHY containing the chip-wide UTMI pad control

     registers. Required even if phy_type == ulpi.



Required properties for phy_type == ulpi:

  - nvidia,phy-reset-gpio : The GPIO used to reset the PHY.



Required PHY timing params for utmi phy, for all chips:

  - nvidia,hssync-start-delay : Number of 480 Mhz clock cycles to wait before

    start of sync launches RxActive

  - nvidia,elastic-limit : Variable FIFO Depth of elastic input store

  - nvidia,idle-wait-delay : Number of 480 Mhz clock cycles of idle to wait

    before declare IDLE.

  - nvidia,term-range-adj : Range adjusment on terminations

  - Either one of the following for HS driver output control:

    - nvidia,xcvr-setup : integer, uses the provided value.

    - nvidia,xcvr-setup-use-fuses : boolean, indicates that the value is read

      from the on-chip fuses

    If both are provided, nvidia,xcvr-setup-use-fuses takes precedence.

  - nvidia,xcvr-lsfslew : LS falling slew rate control.

  - nvidia,xcvr-lsrslew :  LS rising slew rate control.



Required PHY timing params for utmi phy, only on Tegra30 and above:

  - nvidia,xcvr-hsslew : HS slew rate control.

  - nvidia,hssquelch-level : HS squelch detector level.

  - nvidia,hsdiscon-level : HS disconnect detector level.



Optional properties:

  - nvidia,has-legacy-mode : boolean indicates whether this controller can

    operate in legacy mode (as APX 2500 / 2600). In legacy mode some

    registers are accessed through the APB_MISC base address instead of

    the USB controller.

  - nvidia,is-wired : boolean. Indicates whether we can do certain kind of power

    optimizations for the devices that are always connected. e.g. modem.

  - dr_mode : dual role mode. Indicates the working mode for the PHY. Can be

    "host", "peripheral", or "otg". Defaults to "host" if not defined.

      host means this is a host controller

      peripheral means it is device controller

      otg means it can operate as either ("on the go")

  - nvidia,has-utmi-pad-registers : boolean indicates whether this controller

    contains the UTMI pad control registers common to all USB controllers.



VBUS control (required for dr_mode == otg, optional for dr_mode == host):

  - vbus-supply: regulator for VBUS

Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.yaml

0 → 100644
+373 −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/phy/nvidia,tegra20-usb-phy.yaml#

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



title: NVIDIA Tegra USB PHY



maintainers:

  - Dmitry Osipenko <digetx@gmail.com>

  - Jon Hunter <jonathanh@nvidia.com>

  - Thierry Reding <thierry.reding@gmail.com>



properties:

  compatible:

    oneOf:

      - items:

          - enum:

              - nvidia,tegra124-usb-phy

              - nvidia,tegra114-usb-phy

          - enum:

              - nvidia,tegra30-usb-phy

      - items:

          - enum:

              - nvidia,tegra30-usb-phy

              - nvidia,tegra20-usb-phy



  reg:

    minItems: 1

    maxItems: 2

    description: |

      PHY0 and PHY2 share power and ground, PHY0 contains shared registers.

      PHY0 and PHY2 must specify two register sets, where the first set is

      PHY own registers and the second set is the PHY0 registers.



  clocks:

    anyOf:

      - items:

          - description: Registers clock

          - description: Main PHY clock



      - items:

          - description: Registers clock

          - description: Main PHY clock

          - description: ULPI PHY clock



      - items:

          - description: Registers clock

          - description: Main PHY clock

          - description: UTMI pads control registers clock



      - items:

          - description: Registers clock

          - description: Main PHY clock

          - description: UTMI timeout clock

          - description: UTMI pads control registers clock



  clock-names:

    oneOf:

      - items:

          - const: reg

          - const: pll_u



      - items:

          - const: reg

          - const: pll_u

          - const: ulpi-link



      - items:

          - const: reg

          - const: pll_u

          - const: utmi-pads



      - items:

          - const: reg

          - const: pll_u

          - const: timer

          - const: utmi-pads



  interrupts:

    maxItems: 1



  resets:

    oneOf:

      - maxItems: 1

        description: PHY reset



      - items:

          - description: PHY reset

          - description: UTMI pads reset



  reset-names:

    oneOf:

      - const: usb



      - items:

          - const: usb

          - const: utmi-pads



  "#phy-cells":

    const: 0



  phy_type:

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

    enum: [utmi, ulpi, hsic]



  dr_mode:

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

    enum: [host, peripheral, otg]

    default: host



  vbus-supply:

    description: Regulator controlling USB VBUS.



  nvidia,has-legacy-mode:

    description: |

      Indicates whether this controller can operate in legacy mode

      (as APX 2500 / 2600). In legacy mode some registers are accessed

      through the APB_MISC base address instead of the USB controller.

    type: boolean



  nvidia,is-wired:

    description: |

      Indicates whether we can do certain kind of power optimizations for

      the devices that are always connected. e.g. modem.

    type: boolean



  nvidia,has-utmi-pad-registers:

    description: |

      Indicates whether this controller contains the UTMI pad control

      registers common to all USB controllers.

    type: boolean



  nvidia,hssync-start-delay:

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

    minimum: 0

    maximum: 31

    description: |

      Number of 480 MHz clock cycles to wait before start of sync launches

      RxActive.



  nvidia,elastic-limit:

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

    minimum: 0

    maximum: 31

    description: Variable FIFO Depth of elastic input store.



  nvidia,idle-wait-delay:

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

    minimum: 0

    maximum: 31

    description: |

      Number of 480 MHz clock cycles of idle to wait before declare IDLE.



  nvidia,term-range-adj:

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

    minimum: 0

    maximum: 15

    description: Range adjustment on terminations.



  nvidia,xcvr-setup:

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

    minimum: 0

    maximum: 127

    description: Input of XCVR cell, HS driver output control.



  nvidia,xcvr-setup-use-fuses:

    description: Indicates that the value is read from the on-chip fuses.

    type: boolean



  nvidia,xcvr-lsfslew:

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

    minimum: 0

    maximum: 3

    description: LS falling slew rate control.



  nvidia,xcvr-lsrslew:

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

    minimum: 0

    maximum: 3

    description: LS rising slew rate control.



  nvidia,xcvr-hsslew:

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

    minimum: 0

    maximum: 511

    description: HS slew rate control.



  nvidia,hssquelch-level:

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

    minimum: 0

    maximum: 3

    description: HS squelch detector level.



  nvidia,hsdiscon-level:

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

    minimum: 0

    maximum: 7

    description: HS disconnect detector level.



  nvidia,phy-reset-gpio:

    maxItems: 1

    description: GPIO used to reset the PHY.



  nvidia,pmc:

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

    items:

      - items:

          - description: Phandle to Power Management controller.

          - description: USB controller ID.

    description:

      Phandle to Power Management controller.



required:

  - compatible

  - reg

  - clocks

  - clock-names

  - resets

  - reset-names

  - "#phy-cells"

  - phy_type



additionalProperties: false



allOf:

  - if:

      properties:

        phy_type:

          const: utmi



    then:

      properties:

        reg:

          minItems: 2

          maxItems: 2



        resets:

          maxItems: 2



        reset-names:

          maxItems: 2



      required:

        - nvidia,hssync-start-delay

        - nvidia,elastic-limit

        - nvidia,idle-wait-delay

        - nvidia,term-range-adj

        - nvidia,xcvr-lsfslew

        - nvidia,xcvr-lsrslew



      anyOf:

        - required: ["nvidia,xcvr-setup"]

        - required: ["nvidia,xcvr-setup-use-fuses"]



      if:

        properties:

          compatible:

            contains:

              const: nvidia,tegra30-usb-phy



      then:

        properties:

          clocks:

            maxItems: 3



          clock-names:

            items:

              - const: reg

              - const: pll_u

              - const: utmi-pads



        required:

          - nvidia,xcvr-hsslew

          - nvidia,hssquelch-level

          - nvidia,hsdiscon-level



        else:

          properties:

            clocks:

              maxItems: 4



            clock-names:

              items:

                - const: reg

                - const: pll_u

                - const: timer

                - const: utmi-pads



  - if:

      properties:

        phy_type:

          const: ulpi



    then:

      properties:

        reg:

          minItems: 1

          maxItems: 1



        clocks:

          minItems: 2

          maxItems: 3



        clock-names:

          minItems: 2

          maxItems: 3



          oneOf:

            - items:

                - const: reg

                - const: pll_u



            - items:

                - const: reg

                - const: pll_u

                - const: ulpi-link



        resets:

          minItems: 1

          maxItems: 2



        reset-names:

          minItems: 1

          maxItems: 2



examples:

  - |

    #include <dt-bindings/clock/tegra124-car.h>



    usb-phy@7d008000 {

        compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";

        reg = <0x7d008000 0x4000>,

              <0x7d000000 0x4000>;

        interrupts = <0 97 4>;

        phy_type = "utmi";

        clocks = <&tegra_car TEGRA124_CLK_USB3>,

                 <&tegra_car TEGRA124_CLK_PLL_U>,

                 <&tegra_car TEGRA124_CLK_USBD>;

        clock-names = "reg", "pll_u", "utmi-pads";

        resets = <&tegra_car 59>, <&tegra_car 22>;

        reset-names = "usb", "utmi-pads";

        #phy-cells = <0>;

        nvidia,hssync-start-delay = <0>;

        nvidia,idle-wait-delay = <17>;

        nvidia,elastic-limit = <16>;

        nvidia,term-range-adj = <6>;

        nvidia,xcvr-setup = <9>;

        nvidia,xcvr-lsfslew = <0>;

        nvidia,xcvr-lsrslew = <3>;

        nvidia,hssquelch-level = <2>;

        nvidia,hsdiscon-level = <5>;

        nvidia,xcvr-hsslew = <12>;

        nvidia,pmc = <&tegra_pmc 2>;

    };



  - |

    #include <dt-bindings/clock/tegra20-car.h>



    usb-phy@c5004000 {

        compatible = "nvidia,tegra20-usb-phy";

        reg = <0xc5004000 0x4000>;

        interrupts = <0 21 4>;

        phy_type = "ulpi";

        clocks = <&tegra_car TEGRA20_CLK_USB2>,

                 <&tegra_car TEGRA20_CLK_PLL_U>,

                 <&tegra_car TEGRA20_CLK_CDEV2>;

        clock-names = "reg", "pll_u", "ulpi-link";

        resets = <&tegra_car 58>, <&tegra_car 22>;

        reset-names = "usb", "utmi-pads";

        #phy-cells = <0>;

        nvidia,pmc = <&tegra_pmc 1>;

    };

Documentation/devicetree/bindings/usb/atmel-usb.txt

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ Required properties: 
		"ehci_clk" for the peripheral clock

		"usb_clk" for the UTMI clock



Optional properties:

 - phy_type : For multi port host USB controllers, should be one of

   "utmi", or "hsic".



usb1: ehci@800000 {

	compatible = "atmel,at91sam9g45-ehci", "usb-ehci";

	reg = <0x00800000 0x100000>;

Documentation/devicetree/bindings/usb/dwc2.yaml

+11 −5
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ title: DesignWare HS OTG USB 2.0 controller Bindings 
maintainers:

  - Rob Herring <robh@kernel.org>



allOf:

  - $ref: usb-drd.yaml#



properties:

  compatible:

    oneOf:
@@ -101,12 +104,15 @@ properties: 
    description: reference to the VBUS and ID sensing comparators supply, in

      order to perform OTG operation, used on STM32MP15 SoCs.



  dr_mode:

    enum: [host, peripheral, otg]

  dr_mode: true



  usb-role-switch:

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

    description: Support role switch.

  otg-rev: true



  hnp-disable: true



  srp-disable: true



  usb-role-switch: true



  g-rx-fifo-size:

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

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

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ properties: 
  compatible:

    items:

      - enum:

          - qcom,ipq6018-dwc3

          - qcom,msm8996-dwc3

          - qcom,msm8998-dwc3

          - qcom,sc7180-dwc3