From: Romain Izard Date: Fri, 17 Feb 2017 15:12:50 +0000 (+0100) Subject: Revert "ARM: at91/dt: sama5d2: Use new compatible for ohci node" X-Git-Tag: v4.9.19~19 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca5477ad190b87ed19838c49ab8208268f47ae2c;p=platform%2Fkernel%2Flinux-amlogic.git Revert "ARM: at91/dt: sama5d2: Use new compatible for ohci node" commit 9e10889a3177340dcda7d29c6d8fbd97247b007b upstream. 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 Signed-off-by: Alexandre Belloni Signed-off-by: Greg Kroah-Hartman --- diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi index 7173ec9..8158c873 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>;