target/linux/sunxi/patches-3.13/180-8-usb-xhci-change-compat-string.patch

   1 From 1f5109503787538c4a5deb3be7da8336951b105b Mon Sep 17 00:00:00 2001
   2 From: Hans de Goede <hdegoede@redhat.com>
   3 Date: Tue, 11 Feb 2014 17:50:51 +0100
   4 Subject: [PATCH] xhci-platform: Change compatible string from xhci-platform to
   5  generic-xhci
   6
   7 This brings the xhci-platform bindings in sync with what we've done for
   8 the ohci- and ehci-platform drivers. As discussed there using platform as a
   9 postfix is a bit weird as the platform bus is a Linux specific thing and
  10 the bindings are supposed to be OS agnostic.
  11
  12 Note that the old xhci-platform compatible string is kept around for, well,
  13 compatibility reasons.
  14
  15 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  16 ---
  17  Documentation/devicetree/bindings/usb/usb-xhci.txt | 4 ++--
  18  drivers/usb/host/xhci-plat.c                       | 1 +
  19  2 files changed, 3 insertions(+), 2 deletions(-)
  20
  21 diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt
  22 index 5752df0..90f8f60 100644
  23 --- a/Documentation/devicetree/bindings/usb/usb-xhci.txt
  24 +++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt
  25 @@ -1,14 +1,14 @@
  26  USB xHCI controllers
  27
  28  Required properties:
  29 -  - compatible: should be "xhci-platform".
  30 +  - compatible: should be "generic-xhci" (deprecated: "xhci-platform").
  31    - reg: should contain address and length of the standard XHCI
  32      register set for the device.
  33    - interrupts: one XHCI interrupt should be described here.
  34
  35  Example:
  36         usb@f0931000 {
  37 -               compatible = "xhci-platform";
  38 +               compatible = "generic-xhci";
  39                 reg = <0xf0931000 0x8c8>;
  40                 interrupts = <0x0 0x4e 0x0>;
  41         };
  42 diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
  43 index 8abda5c..8affef9 100644
  44 --- a/drivers/usb/host/xhci-plat.c
  45 +++ b/drivers/usb/host/xhci-plat.c
  46 @@ -226,6 +226,7 @@ static int xhci_plat_resume(struct device *dev)
  47
  48  #ifdef CONFIG_OF
  49  static const struct of_device_id usb_xhci_of_match[] = {
  50 +       { .compatible = "generic-xhci" },
  51         { .compatible = "xhci-platform" },
  52         { },
  53  };
  54 --
  55 1.8.5.5
  56