diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2014-02-11 11:35:28 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-11 16:39:54 -0500 |
| commit | ce149c30b9f89d0c9addd1d71ccdb57c1051553b (patch) | |
| tree | 17aa9df989bfd0917c081a9b3462be82047bf2e8 /Documentation/devicetree | |
| parent | 22f6a0f0e3549b73b3319e26e1689f72b1f1284b (diff) | |
ohci-platform: Change compatible string from usb-ohci to generic-ohci
The initial versions of the devicetree enablement patches for ohci-platform
used "ohci-platform" as compatible string. However this was disliked by various
reviewers because the platform bus is a Linux invention and devicetree is
supposed to be OS agnostic. After much discussion I gave up and went with
the generic usb-ohci as requested.
In retro-spect I should have chosen something different, the dts files for many
existing boards already claim to be compatible with "usb-ohci", ie they have:
compatible = "ti,ohci-omap3", "usb-ohci";
In theory this should not be a problem since the "ti,ohci-omap3" entry takes
presedence, but in practice using a conflicting compatible string is an issue,
because it makes which driver gets used depend on driver registration order.
This patch changes the compatible string claimed by ohci-platform to
"generic-ohci", avoiding the driver registration / module loading ordering
problems.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Kevin Hilman <khilman@linaro.org>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/usb/usb-ohci.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/usb/usb-ohci.txt b/Documentation/devicetree/bindings/usb/usb-ohci.txt index 6933b0c6487d..45f67d91e888 100644 --- a/Documentation/devicetree/bindings/usb/usb-ohci.txt +++ b/Documentation/devicetree/bindings/usb/usb-ohci.txt | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | USB OHCI controllers | 1 | USB OHCI controllers |
| 2 | 2 | ||
| 3 | Required properties: | 3 | Required properties: |
| 4 | - compatible : "usb-ohci" | 4 | - compatible : "generic-ohci" |
| 5 | - reg : ohci controller register range (address and length) | 5 | - reg : ohci controller register range (address and length) |
| 6 | - interrupts : ohci controller interrupt | 6 | - interrupts : ohci controller interrupt |
| 7 | 7 | ||
| @@ -16,7 +16,7 @@ Optional properties: | |||
| 16 | Example: | 16 | Example: |
| 17 | 17 | ||
| 18 | ohci0: usb@01c14400 { | 18 | ohci0: usb@01c14400 { |
| 19 | compatible = "allwinner,sun4i-a10-ohci", "usb-ohci"; | 19 | compatible = "allwinner,sun4i-a10-ohci", "generic-ohci"; |
| 20 | reg = <0x01c14400 0x100>; | 20 | reg = <0x01c14400 0x100>; |
| 21 | interrupts = <64>; | 21 | interrupts = <64>; |
| 22 | clocks = <&usb_clk 6>, <&ahb_gates 2>; | 22 | clocks = <&usb_clk 6>, <&ahb_gates 2>; |