Skip to contentSkip to conversation

ARM: dts: sun8i: a83t: Fix incorrect clk and reset macros for EMAC device

PATCH Applied Chen-Yu Tsai 3 participants 3 messages Jan 14, 2020 – Jan 17, 2020

Subsystems (2)
lore
Share & tools
lore

Chen-Yu Tsai

author maintainer
#0 lore raw

PATCH 1/1 ARM: dts: sun8i: a83t: Fix incorrect clk and reset macros for EMAC device

From: Chen-Yu Tsai <[email protected]>

When the raw numbers used for clk and reset indices in the EMAC device node were converted to the new macros, the order of the clk and reset properties was overlooked, and thus the incorrect macros were used. This results in the EMAC being non-responsive, as well as an oops due to incorrect usage of the reset control.

Correct the macro types, and also reorder the clk and reset properties to match all the other device nodes.

Fixes 765866edb16a ("ARM: dts: sunxi: Use macros for references to CCU clocks")

---

Error on my part. Hope no one was affected for too long.

---
 arch/arm/boot/dts/sun8i-a83t.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/sun8i-a83t.dtsi +3 -3
index 74ac7ee9383c..e7b9bef1be6b 100644
@@ -1006,10 +1006,10 @@ emac: ethernet@1c30000 {
 			reg = <0x01c30000 0x104>;
 			interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "macirq";
-			resets = <&ccu CLK_BUS_EMAC>;
-			reset-names = "stmmaceth";
-			clocks = <&ccu RST_BUS_EMAC>;
+			clocks = <&ccu CLK_BUS_EMAC>;
 			clock-names = "stmmaceth";
+			resets = <&ccu RST_BUS_EMAC>;
+			reset-names = "stmmaceth";
 			status = "disabled";
 
 			mdio: mdio {
Signature · 1 line
2.24.1
Tested-by on v1 1/1
#1 lore raw
Quoted 8 lines · Chen-Yu Tsai

From: Chen-Yu Tsai <[email protected]>

When the raw numbers used for clk and reset indices in the EMAC device node were converted to the new macros, the order of the clk and reset properties was overlooked, and thus the incorrect macros were used. This results in the EMAC being non-responsive, as well as an oops due to incorrect usage of the reset control.

Quoted 9 lines

Correct the macro types, and also reorder the clk and reset properties to match all the other device nodes.

Fixes 765866edb16a ("ARM: dts: sunxi: Use macros for references to CCU clocks")

---

Error on my part. Hope no one was affected for too long.

I saw this today and with this patch the board is back normal.

Thanks

#2 lore raw
In reply to Chen-Yu Tsai
Quoted 8 lines · Chen-Yu Tsai

From: Chen-Yu Tsai <[email protected]>

When the raw numbers used for clk and reset indices in the EMAC device node were converted to the new macros, the order of the clk and reset properties was overlooked, and thus the incorrect macros were used. This results in the EMAC being non-responsive, as well as an oops due to incorrect usage of the reset control.

Quoted 5 lines

Correct the macro types, and also reorder the clk and reset properties to match all the other device nodes.

Fixes 765866edb16a ("ARM: dts: sunxi: Use macros for references to CCU clocks")

Queued as a fix for 5.6, thanks!
Maxime