Skip to content

Commit

Permalink
dt-bindings: usb: Convert OMAP OHCI/EHCI bindings to schema
Browse files Browse the repository at this point in the history
The OMAP OHCI and EHCI USB host bindings follow the generic binding, so
add the compatibles and remove the old txt binding docs.

The examples in omap-usb-host.txt don't match actual users, so update
them dropping the fallback compatible.

Signed-off-by: Rob Herring <robh@kernel.org>
  • Loading branch information
robherring authored and intel-lab-lkp committed Jan 18, 2023
1 parent 8f4db34 commit e7220b2
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 51 deletions.
8 changes: 4 additions & 4 deletions Documentation/devicetree/bindings/mfd/omap-usb-host.txt
Expand Up @@ -64,8 +64,8 @@ Required properties if child node exists:
Properties for children:

The OMAP HS USB Host subsystem contains EHCI and OHCI controllers.
See Documentation/devicetree/bindings/usb/ehci-omap.txt and
Documentation/devicetree/bindings/usb/ohci-omap3.txt.
See Documentation/devicetree/bindings/usb/ehci-generic.yaml and
Documentation/devicetree/bindings/usb/ohci-generic.yaml.

Example for OMAP4:

Expand All @@ -78,14 +78,14 @@ usbhshost: usbhshost@4a064000 {
ranges;

usbhsohci: ohci@4a064800 {
compatible = "ti,ohci-omap3", "usb-ohci";
compatible = "ti,ohci-omap3";
reg = <0x4a064800 0x400>;
interrupt-parent = <&gic>;
interrupts = <0 76 0x4>;
};

usbhsehci: ehci@4a064c00 {
compatible = "ti,ehci-omap", "usb-ehci";
compatible = "ti,ehci-omap";
reg = <0x4a064c00 0x400>;
interrupt-parent = <&gic>;
interrupts = <0 77 0x4>;
Expand Down
31 changes: 0 additions & 31 deletions Documentation/devicetree/bindings/usb/ehci-omap.txt

This file was deleted.

1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/usb/generic-ehci.yaml
Expand Up @@ -74,6 +74,7 @@ properties:
- const: usb-ehci
- enum:
- generic-ehci
- ti,ehci-omap
- usb-ehci

reg:
Expand Down
4 changes: 3 additions & 1 deletion Documentation/devicetree/bindings/usb/generic-ohci.yaml
Expand Up @@ -46,7 +46,9 @@ 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
Expand Down
15 changes: 0 additions & 15 deletions Documentation/devicetree/bindings/usb/ohci-omap3.txt

This file was deleted.

0 comments on commit e7220b2

Please sign in to comment.