Skip to content

Commit

Permalink
dt-bindings: usb: Convert multiple "usb-ohci" bindings to DT schema
Browse files Browse the repository at this point in the history
"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>
  • Loading branch information
robherring authored and intel-lab-lkp committed Jan 10, 2023
1 parent 7c234b8 commit ba91c0f
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 89 deletions.
10 changes: 0 additions & 10 deletions Documentation/devicetree/bindings/powerpc/nintendo/wii.txt
Expand Up @@ -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.
Expand Down
31 changes: 27 additions & 4 deletions Documentation/devicetree/bindings/usb/generic-ohci.yaml
Expand Up @@ -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>

Expand Down Expand Up @@ -49,7 +46,16 @@ properties:
- ingenic,jz4740-ohci
- snps,hsdk-v1.0-ohci
- const: generic-ohci
- const: generic-ohci
- enum:
- generic-ohci
- ti,ohci-omap3
- items:
- enum:
- cavium,octeon-6335-ohci
- nintendo,hollywood-usb-ohci
- nxp,ohci-nxp
- st,spear600-ohci
- const: usb-ohci

reg:
maxItems: 1
Expand Down Expand Up @@ -119,11 +125,28 @@ 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:
transceiver: false

additionalProperties: false

examples:
Expand Down
24 changes: 0 additions & 24 deletions Documentation/devicetree/bindings/usb/ohci-nxp.txt

This file was deleted.

15 changes: 0 additions & 15 deletions Documentation/devicetree/bindings/usb/ohci-omap3.txt

This file was deleted.

2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/usb/pxa-usb.txt
Expand Up @@ -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;
Expand Down
35 changes: 0 additions & 35 deletions Documentation/devicetree/bindings/usb/spear-usb.txt

This file was deleted.

0 comments on commit ba91c0f

Please sign in to comment.