Revert "ARM: at91/dt: sama5d2: Use new compatible for ohci node"

romain-izard-pro · alexandrebelloni · commit 9e10889a3177 · 2017-03-05T23:57:33.000+01:00
This reverts commit cab4328 ("ARM: at91/dt: sama5d2: Use new compatible for ohci node") It depends from commit 7150bc9 ("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: cab4328 ("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>
diff --git 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>;
