195-3-uhci-plat-changes.patch 2.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172
  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. This brings the uhci-platform bindings in sync with what we've done for
  7. the ohci- and ehci-platform drivers. As discussed there using platform as a
  8. prefix is a bit weird as the platform bus is a Linux specific thing and
  9. the bindings are supposed to be OS agnostic.
  10. Note that the old platform-uhci compatible string is kept around for, well,
  11. compatibility reasons.
  12. While at it rename the bindings txt file to match the name of all the
  13. other ?hci-platform bindings docs.
  14. Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  15. ---
  16. Documentation/devicetree/bindings/usb/platform-uhci.txt | 15 ---------------
  17. Documentation/devicetree/bindings/usb/usb-uhci.txt | 15 +++++++++++++++
  18. drivers/usb/host/uhci-platform.c | 1 +
  19. 3 files changed, 16 insertions(+), 15 deletions(-)
  20. delete mode 100644 Documentation/devicetree/bindings/usb/platform-uhci.txt
  21. create mode 100644 Documentation/devicetree/bindings/usb/usb-uhci.txt
  22. --- a/Documentation/devicetree/bindings/usb/platform-uhci.txt
  23. +++ /dev/null
  24. @@ -1,15 +0,0 @@
  25. -Generic Platform UHCI Controller
  26. ------------------------------------------------------
  27. -
  28. -Required properties:
  29. -- compatible : "platform-uhci"
  30. -- reg : Should contain 1 register ranges(address and length)
  31. -- interrupts : UHCI controller interrupt
  32. -
  33. -Example:
  34. -
  35. - uhci@d8007b00 {
  36. - compatible = "platform-uhci";
  37. - reg = <0xd8007b00 0x200>;
  38. - interrupts = <43>;
  39. - };
  40. --- /dev/null
  41. +++ b/Documentation/devicetree/bindings/usb/usb-uhci.txt
  42. @@ -0,0 +1,15 @@
  43. +Generic Platform UHCI Controller
  44. +-----------------------------------------------------
  45. +
  46. +Required properties:
  47. +- compatible : "generic-uhci" (deprecated: "platform-uhci")
  48. +- reg : Should contain 1 register ranges(address and length)
  49. +- interrupts : UHCI controller interrupt
  50. +
  51. +Example:
  52. +
  53. + uhci@d8007b00 {
  54. + compatible = "generic-uhci";
  55. + reg = <0xd8007b00 0x200>;
  56. + interrupts = <43>;
  57. + };
  58. --- a/drivers/usb/host/uhci-platform.c
  59. +++ b/drivers/usb/host/uhci-platform.c
  60. @@ -148,6 +148,7 @@ static void uhci_hcd_platform_shutdown(s
  61. }
  62. static const struct of_device_id platform_uhci_ids[] = {
  63. + { .compatible = "generic-uhci", },
  64. { .compatible = "platform-uhci", },
  65. {}
  66. };