You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
84 lines
3.4 KiB
84 lines
3.4 KiB
11 years ago
|
From 80c544c77beeffee4e9484bf193ab391297688cd Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
||
|
|
Date: Tue, 11 Feb 2014 11:46:13 +0100
|
||
|
|
Subject: [PATCH] ehci-platform: Change compatible string from usb-ehci to
|
||
|
|
generic-ehci
|
||
|
|
|
||
|
|
The initial versions of the devicetree enablement patches for ehci-platform
|
||
|
|
used "ehci-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, added a:
|
||
|
|
"depends on !PPC_OF" to Kconfig to avoid a known conflict with PPC-OF platforms
|
||
|
|
and went with the generic usb-ehci 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-ehci", ie they have:
|
||
|
|
|
||
|
|
compatible = "ti,ehci-omap", "usb-ehci";
|
||
|
|
|
||
|
|
In theory this should not be a problem since the "ti,ehci-omap" 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 ehci-platform to
|
||
|
|
"generic-ehci", avoiding the driver registration / module loading ordering
|
||
|
|
problems, and removes the "depends on !PPC_OF" workaround.
|
||
|
|
|
||
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||
|
|
---
|
||
|
|
Documentation/devicetree/bindings/usb/usb-ehci.txt | 4 ++--
|
||
|
|
drivers/usb/host/Kconfig | 1 -
|
||
|
|
drivers/usb/host/ehci-platform.c | 2 +-
|
||
|
|
3 files changed, 3 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Documentation/devicetree/bindings/usb/usb-ehci.txt b/Documentation/devicetree/bindings/usb/usb-ehci.txt
|
||
|
|
index 2c1aeeb..ff151ec 100644
|
||
|
|
--- a/Documentation/devicetree/bindings/usb/usb-ehci.txt
|
||
|
|
+++ b/Documentation/devicetree/bindings/usb/usb-ehci.txt
|
||
|
|
@@ -1,7 +1,7 @@
|
||
|
|
USB EHCI controllers
|
||
|
|
|
||
|
|
Required properties:
|
||
|
|
- - compatible : should be "usb-ehci".
|
||
|
|
+ - compatible : should be "generic-ehci".
|
||
|
|
- reg : should contain at least address and length of the standard EHCI
|
||
|
|
register set for the device. Optional platform-dependent registers
|
||
|
|
(debug-port or other) can be also specified here, but only after
|
||
|
|
@@ -27,7 +27,7 @@ Example (Sequoia 440EPx):
|
||
|
|
|
||
|
|
Example (Allwinner sun4i A10 SoC):
|
||
|
|
ehci0: usb@01c14000 {
|
||
|
|
- compatible = "allwinner,sun4i-a10-ehci", "usb-ehci";
|
||
|
|
+ compatible = "allwinner,sun4i-a10-ehci", "generic-ehci";
|
||
|
|
reg = <0x01c14000 0x100>;
|
||
|
|
interrupts = <39>;
|
||
|
|
clocks = <&ahb_gates 1>;
|
||
|
|
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
|
||
|
|
index e28cbe0..a9707da 100644
|
||
|
|
--- a/drivers/usb/host/Kconfig
|
||
|
|
+++ b/drivers/usb/host/Kconfig
|
||
|
|
@@ -255,7 +255,6 @@ config USB_EHCI_ATH79
|
||
|
|
|
||
|
|
config USB_EHCI_HCD_PLATFORM
|
||
|
|
tristate "Generic EHCI driver for a platform device"
|
||
|
|
- depends on !PPC_OF
|
||
|
|
default n
|
||
|
|
---help---
|
||
|
|
Adds an EHCI host driver for a generic platform device, which
|
||
|
|
diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
|
||
|
|
index 8fde649..1178730 100644
|
||
|
|
--- a/drivers/usb/host/ehci-platform.c
|
||
|
|
+++ b/drivers/usb/host/ehci-platform.c
|
||
|
|
@@ -333,7 +333,7 @@ static int ehci_platform_resume(struct device *dev)
|
||
|
|
static const struct of_device_id vt8500_ehci_ids[] = {
|
||
|
|
{ .compatible = "via,vt8500-ehci", },
|
||
|
|
{ .compatible = "wm,prizm-ehci", },
|
||
|
|
- { .compatible = "usb-ehci", },
|
||
|
|
+ { .compatible = "generic-ehci", },
|
||
|
|
{}
|
||
|
|
};
|
||
|
|
MODULE_DEVICE_TABLE(of, vt8500_ehci_ids);
|
||
|
|
--
|
||
|
|
1.8.5.5
|
||
|
|
|