target/linux/sunxi/patches-3.13/180-7-usb-uhci-change-compat-string.patch

   1 From 3aa1e8b65b7db768fade643e26f8995860596795 Mon Sep 17 00:00:00 2001
   2 From: Hans de Goede <hdegoede@redhat.com>
   3 Date: Tue, 11 Feb 2014 17:41:48 +0100
   4 Subject: [PATCH] uhci-platform: Change compatible string from platform-uhci to
   5  generic-uhci
   6
   7 This brings the uhci-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 prefix 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 platform-uhci compatible string is kept around for, well,
  13 compatibility reasons.
  14
  15 While at it rename the bindings txt file to match the name of all the
  16 other ?hci-platform bindings docs.
  17
  18 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  19 ---
  20  Documentation/devicetree/bindings/usb/platform-uhci.txt | 15 ---------------
  21  Documentation/devicetree/bindings/usb/usb-uhci.txt      | 15 +++++++++++++++
  22  drivers/usb/host/uhci-platform.c                        |  1 +
  23  3 files changed, 16 insertions(+), 15 deletions(-)
  24  delete mode 100644 Documentation/devicetree/bindings/usb/platform-uhci.txt
  25  create mode 100644 Documentation/devicetree/bindings/usb/usb-uhci.txt
  26
  27 diff --git a/Documentation/devicetree/bindings/usb/platform-uhci.txt b/Documentation/devicetree/bindings/usb/platform-uhci.txt
  28 deleted file mode 100644
  29 index a4fb071..0000000
  30 --- a/Documentation/devicetree/bindings/usb/platform-uhci.txt
  31 +++ /dev/null
  32 @@ -1,15 +0,0 @@
  33 -Generic Platform UHCI Controller
  34 ------------------------------------------------------
  35 -
  36 -Required properties:
  37 -- compatible : "platform-uhci"
  38 -- reg : Should contain 1 register ranges(address and length)
  39 -- interrupts : UHCI controller interrupt
  40 -
  41 -Example:
  42 -
  43 -       uhci@d8007b00 {
  44 -               compatible = "platform-uhci";
  45 -               reg = <0xd8007b00 0x200>;
  46 -               interrupts = <43>;
  47 -       };
  48 diff --git a/Documentation/devicetree/bindings/usb/usb-uhci.txt b/Documentation/devicetree/bindings/usb/usb-uhci.txt
  49 new file mode 100644
  50 index 0000000..2981334
  51 --- /dev/null
  52 +++ b/Documentation/devicetree/bindings/usb/usb-uhci.txt
  53 @@ -0,0 +1,15 @@
  54 +Generic Platform UHCI Controller
  55 +-----------------------------------------------------
  56 +
  57 +Required properties:
  58 +- compatible : "generic-uhci" (deprecated: "platform-uhci")
  59 +- reg : Should contain 1 register ranges(address and length)
  60 +- interrupts : UHCI controller interrupt
  61 +
  62 +Example:
  63 +
  64 +       uhci@d8007b00 {
  65 +               compatible = "generic-uhci";
  66 +               reg = <0xd8007b00 0x200>;
  67 +               interrupts = <43>;
  68 +       };
  69 diff --git a/drivers/usb/host/uhci-platform.c b/drivers/usb/host/uhci-platform.c
  70 index 44e6c9d..01833ab 100644
  71 --- a/drivers/usb/host/uhci-platform.c
  72 +++ b/drivers/usb/host/uhci-platform.c
  73 @@ -148,6 +148,7 @@ static void uhci_hcd_platform_shutdown(struct platform_device *op)
  74  }
  75
  76  static const struct of_device_id platform_uhci_ids[] = {
  77 +       { .compatible = "generic-uhci", },
  78         { .compatible = "platform-uhci", },
  79         {}
  80  };
  81 --
  82 1.8.5.5
  83