aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory CLEMENT <gregory.clement@free-electrons.com>2016-04-27 09:36:42 -0400
committerGregory CLEMENT <gregory.clement@free-electrons.com>2016-04-27 11:51:51 -0400
commit150fa1128438746280d9d9b403f0a42883a0e70c (patch)
tree25f7a4377ecf882ec5dec9592c05f5b6d6dbaae7
parentcc2684c449a4f637cb9f978f66747e5dc8ae9f49 (diff)
arm64: dts: marvell: Use a SoC-specific compatible for xHCI on Armada37xx
Even if the Armada 37xx does not any specific setup, the device tree binding documentation requires to use a SoC-specific version corresponding to the platform first followed by the generic version. This patch introduce this new compatible string and updates the documentation accordingly. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
-rw-r--r--Documentation/devicetree/bindings/usb/usb-xhci.txt1
-rw-r--r--arch/arm64/boot/dts/marvell/armada-37xx.dtsi3
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt
index 6a17aa85c4d5..966885c636d0 100644
--- a/Documentation/devicetree/bindings/usb/usb-xhci.txt
+++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt
@@ -4,6 +4,7 @@ Required properties:
4 - compatible: should be one or more of 4 - compatible: should be one or more of
5 5
6 - "generic-xhci" for generic XHCI device 6 - "generic-xhci" for generic XHCI device
7 - "marvell,armada3700-xhci" for Armada 37xx SoCs
7 - "marvell,armada-375-xhci" for Armada 375 SoCs 8 - "marvell,armada-375-xhci" for Armada 375 SoCs
8 - "marvell,armada-380-xhci" for Armada 38x SoCs 9 - "marvell,armada-380-xhci" for Armada 38x SoCs
9 - "renesas,xhci-r8a7790" for r8a7790 SoC 10 - "renesas,xhci-r8a7790" for r8a7790 SoC
diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index 55a861d60fae..1d4fb4d27787 100644
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -106,7 +106,8 @@
106 }; 106 };
107 107
108 usb3: usb@58000 { 108 usb3: usb@58000 {
109 compatible = "generic-xhci"; 109 compatible = "marvell,armada3700-xhci",
110 "generic-xhci";
110 reg = <0x58000 0x4000>; 111 reg = <0x58000 0x4000>;
111 interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; 112 interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
112 status = "disabled"; 113 status = "disabled";