target/linux/sunxi/patches-3.14/195-3-uhci-plat-changes.patch

   1 From 2adf0917bc9d6db8d957d56c8289a623be4027b6 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 --- a/Documentation/devicetree/bindings/usb/platform-uhci.txt
  28 +++ /dev/null
  29 @@ -1,15 +0,0 @@
  30 -Generic Platform UHCI Controller
  31 ------------------------------------------------------
  32 -
  33 -Required properties:
  34 -- compatible : "platform-uhci"
  35 -- reg : Should contain 1 register ranges(address and length)
  36 -- interrupts : UHCI controller interrupt
  37 -
  38 -Example:
  39 -
  40 -       uhci@d8007b00 {
  41 -               compatible = "platform-uhci";
  42 -               reg = <0xd8007b00 0x200>;
  43 -               interrupts = <43>;
  44 -       };
  45 --- /dev/null
  46 +++ b/Documentation/devicetree/bindings/usb/usb-uhci.txt
  47 @@ -0,0 +1,15 @@
  48 +Generic Platform UHCI Controller
  49 +-----------------------------------------------------
  50 +
  51 +Required properties:
  52 +- compatible : "generic-uhci" (deprecated: "platform-uhci")
  53 +- reg : Should contain 1 register ranges(address and length)
  54 +- interrupts : UHCI controller interrupt
  55 +
  56 +Example:
  57 +
  58 +       uhci@d8007b00 {
  59 +               compatible = "generic-uhci";
  60 +               reg = <0xd8007b00 0x200>;
  61 +               interrupts = <43>;
  62 +       };
  63 --- a/drivers/usb/host/uhci-platform.c
  64 +++ b/drivers/usb/host/uhci-platform.c
  65 @@ -148,6 +148,7 @@ static void uhci_hcd_platform_shutdown(s
  66  }
  67
  68  static const struct of_device_id platform_uhci_ids[] = {
  69 +       { .compatible = "generic-uhci", },
  70         { .compatible = "platform-uhci", },
  71         {}
  72  };