Revert "ARM: at91/dt: sama5d2: Use new compatible for ohci node"
Subsystems (2)
PATCH 1/1 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.
--- arch/arm/boot/dts/sama5d2.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/sama5d2.dtsi +1 -1
@@ -266,7 +266,7 @@ }; usb1: ohci at 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>;
Signature · 1 line
2.9.3
Quoted 13 lines · Romain Izard
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.
Quoted 7 lines
Fixes cab43282682e ("ARM: at91/dt: sama5d2: Use new compatible for ohci node")Signed-off-by Romain Izard <[email protected]>cc <[email protected]>--- arch/arm/boot/dts/sama5d2.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Sure, I'll take it as a fix once 4.11-rc1 is released.
Quoted 16 lines
arch/arm/boot/dts/sama5d2.dtsi +1
-1@@ -266,7 +266,7 @@ }; usb1: ohci at 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>;Signature · 1 line
2.9.3
Signature · 3 lines
Alexandre Belloni, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
Alexandre Belloni
AppliedQuoted 13 lines · Romain Izard
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.
Quoted 6 lines
Fixes cab43282682e ("ARM: at91/dt: sama5d2: Use new compatible for ohci node")Signed-off-by Romain Izard <[email protected]>cc <[email protected]>--- arch/arm/boot/dts/sama5d2.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied, thanks.
Signature · 3 lines
Alexandre Belloni, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com