Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20230110-dt-usb-v3-2-5af0541fcf8c@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Rob Herring and committed by
Greg Kroah-Hartman
4aa46619 60c4da9f

+26 -73
-10
Documentation/devicetree/bindings/powerpc/nintendo/wii.txt
··· 97 97 - reg : should contain the EXI registers location and length 98 98 - interrupts : should contain the EXI interrupt 99 99 100 - 1.g) The Open Host Controller Interface (OHCI) nodes 101 - 102 - Represent the USB 1.x Open Host Controller Interfaces. 103 - 104 - Required properties: 105 - 106 - - compatible : should be "nintendo,hollywood-usb-ohci","usb-ohci" 107 - - reg : should contain the OHCI registers location and length 108 - - interrupts : should contain the OHCI interrupt 109 - 110 100 1.h) The Enhanced Host Controller Interface (EHCI) node 111 101 112 102 Represents the USB 2.0 Enhanced Host Controller Interface.
+25 -3
Documentation/devicetree/bindings/usb/generic-ohci.yaml
··· 6 6 7 7 title: USB OHCI Controller 8 8 9 - allOf: 10 - - $ref: "usb-hcd.yaml" 11 - 12 9 maintainers: 13 10 - Greg Kroah-Hartman <gregkh@linuxfoundation.org> 14 11 ··· 47 50 - snps,hsdk-v1.0-ohci 48 51 - const: generic-ohci 49 52 - const: generic-ohci 53 + - items: 54 + - enum: 55 + - cavium,octeon-6335-ohci 56 + - nintendo,hollywood-usb-ohci 57 + - nxp,ohci-nxp 58 + - st,spear600-ohci 59 + - const: usb-ohci 50 60 51 61 reg: 52 62 maxItems: 1 ··· 123 119 - host 124 120 - otg 125 121 122 + transceiver: 123 + $ref: /schemas/types.yaml#/definitions/phandle 124 + description: 125 + The associated ISP1301 device. Necessary for the UDC controller for 126 + connecting to the USB physical layer. 127 + 126 128 required: 127 129 - compatible 128 130 - reg 129 131 - interrupts 132 + 133 + allOf: 134 + - $ref: usb-hcd.yaml 135 + - if: 136 + not: 137 + properties: 138 + compatible: 139 + contains: 140 + const: nxp,ohci-nxp 141 + then: 142 + properties: 143 + transceiver: false 130 144 131 145 additionalProperties: false 132 146
-24
Documentation/devicetree/bindings/usb/ohci-nxp.txt
··· 1 - * OHCI controller, NXP ohci-nxp variant 2 - 3 - Required properties: 4 - - compatible: must be "nxp,ohci-nxp" 5 - - reg: physical base address of the controller and length of memory mapped 6 - region. 7 - - interrupts: The OHCI interrupt 8 - - transceiver: phandle of the associated ISP1301 device - this is necessary for 9 - the UDC controller for connecting to the USB physical layer 10 - 11 - Example (LPC32xx): 12 - 13 - isp1301: usb-transceiver@2c { 14 - compatible = "nxp,isp1301"; 15 - reg = <0x2c>; 16 - }; 17 - 18 - ohci@31020000 { 19 - compatible = "nxp,ohci-nxp"; 20 - reg = <0x31020000 0x300>; 21 - interrupt-parent = <&mic>; 22 - interrupts = <0x3b 0>; 23 - transceiver = <&isp1301>; 24 - };
+1 -1
Documentation/devicetree/bindings/usb/pxa-usb.txt
··· 22 22 Example: 23 23 24 24 usb0: ohci@4c000000 { 25 - compatible = "marvell,pxa-ohci", "usb-ohci"; 25 + compatible = "marvell,pxa-ohci"; 26 26 reg = <0x4c000000 0x100000>; 27 27 interrupts = <18>; 28 28 marvell,enable-port1;
-35
Documentation/devicetree/bindings/usb/spear-usb.txt
··· 1 - ST SPEAr SoC USB controllers: 2 - ----------------------------- 3 - 4 - EHCI: 5 - ----- 6 - 7 - Required properties: 8 - - compatible: "st,spear600-ehci" 9 - - interrupts: Should contain the EHCI interrupt 10 - 11 - Example: 12 - 13 - ehci@e1800000 { 14 - compatible = "st,spear600-ehci", "usb-ehci"; 15 - reg = <0xe1800000 0x1000>; 16 - interrupt-parent = <&vic1>; 17 - interrupts = <27>; 18 - }; 19 - 20 - 21 - OHCI: 22 - ----- 23 - 24 - Required properties: 25 - - compatible: "st,spear600-ohci" 26 - - interrupts: Should contain the OHCI interrupt 27 - 28 - Example: 29 - 30 - ohci@e1900000 { 31 - compatible = "st,spear600-ohci", "usb-ohci"; 32 - reg = <0xe1800000 0x1000>; 33 - interrupt-parent = <&vic1>; 34 - interrupts = <26>; 35 - };