Commit 4aa46619 authored by Rob Herring's avatar Rob Herring Committed by Greg Kroah-Hartman
Browse files

dt-bindings: usb: Convert multiple "usb-ohci" bindings to DT schema 



"usb-ohci" is another "generic" OHCI controller compatible string used by
several platforms. Add it to the generic-ohci.yaml schema and remove all
the old binding docs.

Marvell pxa-usb.txt has "usb-ohci" in the example, but actual users don't,
so drop it.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20230110-dt-usb-v3-2-5af0541fcf8c@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 60c4da9f

Documentation/devicetree/bindings/powerpc/nintendo/wii.txt

+0 −10
Original line number Diff line number Diff line
@@ -97,16 +97,6 @@ Nintendo Wii device tree 
   - reg : should contain the EXI registers location and length

   - interrupts : should contain the EXI interrupt



1.g) The Open Host Controller Interface (OHCI) nodes



  Represent the USB 1.x Open Host Controller Interfaces.



  Required properties:



   - compatible : should be "nintendo,hollywood-usb-ohci","usb-ohci"

   - reg : should contain the OHCI registers location and length

   - interrupts : should contain the OHCI interrupt



1.h) The Enhanced Host Controller Interface (EHCI) node



  Represents the USB 2.0 Enhanced Host Controller Interface.

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

+25 −3
Original line number Diff line number Diff line
@@ -6,9 +6,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 


title: USB OHCI Controller



allOf:

  - $ref: "usb-hcd.yaml"



maintainers:

  - Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@ -50,6 +47,13 @@ properties: 
              - snps,hsdk-v1.0-ohci

          - const: generic-ohci

      - const: generic-ohci

      - items:

          - enum:

              - cavium,octeon-6335-ohci

              - nintendo,hollywood-usb-ohci

              - nxp,ohci-nxp

              - st,spear600-ohci

          - const: usb-ohci



  reg:

    maxItems: 1
@@ -119,11 +123,29 @@ properties: 
      - host

      - otg



  transceiver:

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

    description:

      The associated ISP1301 device. Necessary for the UDC controller for

      connecting to the USB physical layer.



required:

  - compatible

  - reg

  - interrupts



allOf:

  - $ref: usb-hcd.yaml

  - if:

      not:

        properties:

          compatible:

            contains:

              const: nxp,ohci-nxp

    then:

      properties:

        transceiver: false



additionalProperties: false



examples:

Documentation/devicetree/bindings/usb/ohci-nxp.txt

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
* OHCI controller, NXP ohci-nxp variant



Required properties:

- compatible: must be "nxp,ohci-nxp"

- reg: physical base address of the controller and length of memory mapped

  region.

- interrupts: The OHCI interrupt

- transceiver: phandle of the associated ISP1301 device - this is necessary for

               the UDC controller for connecting to the USB physical layer



Example (LPC32xx):



	isp1301: usb-transceiver@2c {

		compatible = "nxp,isp1301";

		reg = <0x2c>;

	};



	ohci@31020000 {

		compatible = "nxp,ohci-nxp";

		reg = <0x31020000 0x300>;

		interrupt-parent = <&mic>;

		interrupts = <0x3b 0>;

		transceiver = <&isp1301>;

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ Optional properties: 
Example:



	usb0: ohci@4c000000 {

		compatible = "marvell,pxa-ohci", "usb-ohci";

		compatible = "marvell,pxa-ohci";

		reg = <0x4c000000 0x100000>;

		interrupts = <18>;

		marvell,enable-port1;

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

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
ST SPEAr SoC USB controllers:

-----------------------------



EHCI:

-----



Required properties:

- compatible: "st,spear600-ehci"

- interrupts: Should contain the EHCI interrupt



Example:



	ehci@e1800000 {

		compatible = "st,spear600-ehci", "usb-ehci";

		reg = <0xe1800000 0x1000>;

		interrupt-parent = <&vic1>;

		interrupts = <27>;

	};





OHCI:

-----



Required properties:

- compatible: "st,spear600-ohci"

- interrupts: Should contain the OHCI interrupt



Example:



	ohci@e1900000 {

		compatible = "st,spear600-ohci", "usb-ohci";

		reg = <0xe1800000 0x1000>;

		interrupt-parent = <&vic1>;

		interrupts = <26>;

	};