summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRomain Izard <romain.izard.pro@gmail.com>2017-02-17 16:12:50 +0100
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2017-03-05 23:57:33 +0100
commit9e10889a3177340dcda7d29c6d8fbd97247b007b (patch)
tree7a21594c585ceac1b73c43b49739f58868bce517 /arch
parentc1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 (diff)
downloadlinux-stable-9e10889a3177340dcda7d29c6d8fbd97247b007b.tar.gz
linux-stable-9e10889a3177340dcda7d29c6d8fbd97247b007b.tar.bz2
linux-stable-9e10889a3177340dcda7d29c6d8fbd97247b007b.zip
Revert "ARM: at91/dt: sama5d2: Use new compatible for ohci node"
This reverts commit cab43282682e ("ARM: at91/dt: sama5d2: Use new compatible for ohci node") It depends from commit 7150bc9b4d43 ("usb: ohci-at91: Forcibly suspend ports while USB suspend") which was reverted and implemented differently. With the new implementation, the compatible string must remain the same. The compatible string introduced by this commit has been used in the default SAMA5D2 dtsi starting from Linux 4.8. As it has never been working correctly in an official release, removing it should not be breaking the stability rules. Fixes: cab43282682e ("ARM: at91/dt: sama5d2: Use new compatible for ohci node") Signed-off-by: Romain Izard <romain.izard.pro@gmail.com> cc: <stable@vger.kernel.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/sama5d2.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi
index 22332be72140..528b4e9c6d3d 100644
--- a/arch/arm/boot/dts/sama5d2.dtsi
+++ b/arch/arm/boot/dts/sama5d2.dtsi
@@ -266,7 +266,7 @@
};
usb1: ohci@00400000 {
- compatible = "atmel,sama5d2-ohci", "usb-ohci";
+ compatible = "atmel,at91rm9200-ohci", "usb-ohci";
reg = <0x00400000 0x100000>;
interrupts = <41 IRQ_TYPE_LEVEL_HIGH 2>;
clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;