57 lines
2 KiB
Diff
57 lines
2 KiB
Diff
|
From 1f5109503787538c4a5deb3be7da8336951b105b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
||
|
|
Date: Tue, 11 Feb 2014 17:50:51 +0100
|
||
|
|
Subject: [PATCH] xhci-platform: Change compatible string from xhci-platform to
|
||
|
|
generic-xhci
|
||
|
|
|
||
|
|
This brings the xhci-platform bindings in sync with what we've done for
|
||
|
|
the ohci- and ehci-platform drivers. As discussed there using platform as a
|
||
|
|
postfix is a bit weird as the platform bus is a Linux specific thing and
|
||
|
|
the bindings are supposed to be OS agnostic.
|
||
|
|
|
||
|
|
Note that the old xhci-platform compatible string is kept around for, well,
|
||
|
|
compatibility reasons.
|
||
|
|
|
||
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||
|
|
---
|
||
|
|
Documentation/devicetree/bindings/usb/usb-xhci.txt | 4 ++--
|
||
|
|
drivers/usb/host/xhci-plat.c | 1 +
|
||
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt
|
||
|
|
index 5752df0..90f8f60 100644
|
||
|
|
--- a/Documentation/devicetree/bindings/usb/usb-xhci.txt
|
||
|
|
+++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt
|
||
|
|
@@ -1,14 +1,14 @@
|
||
|
|
USB xHCI controllers
|
||
|
|
|
||
|
|
Required properties:
|
||
|
|
- - compatible: should be "xhci-platform".
|
||
|
|
+ - compatible: should be "generic-xhci" (deprecated: "xhci-platform").
|
||
|
|
- reg: should contain address and length of the standard XHCI
|
||
|
|
register set for the device.
|
||
|
|
- interrupts: one XHCI interrupt should be described here.
|
||
|
|
|
||
|
|
Example:
|
||
|
|
usb@f0931000 {
|
||
|
|
- compatible = "xhci-platform";
|
||
|
|
+ compatible = "generic-xhci";
|
||
|
|
reg = <0xf0931000 0x8c8>;
|
||
|
|
interrupts = <0x0 0x4e 0x0>;
|
||
|
|
};
|
||
|
|
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
|
||
|
|
index 8abda5c..8affef9 100644
|
||
|
|
--- a/drivers/usb/host/xhci-plat.c
|
||
|
|
+++ b/drivers/usb/host/xhci-plat.c
|
||
|
|
@@ -226,6 +226,7 @@ static int xhci_plat_resume(struct device *dev)
|
||
|
|
|
||
|
|
#ifdef CONFIG_OF
|
||
|
|
static const struct of_device_id usb_xhci_of_match[] = {
|
||
|
|
+ { .compatible = "generic-xhci" },
|
||
|
|
{ .compatible = "xhci-platform" },
|
||
|
|
{ },
|
||
|
|
};
|
||
|
|
--
|
||
|
|
1.8.5.5
|
||
|
|
|