Skip to content

Commit 19f6fe9

Browse files
superna9999khilman
authored andcommitted
Revert "arm64: dts: amlogic: add missing ethernet reset ID"
It has been reported on IRC and in KernelCI boot tests, this change breaks internal PHY support on the Amlogic G12A/SM1 Based boards. We suspect the added signal to reset more than the Ethernet MAC but also the MDIO/(RG)MII mux used to redirect the MAC signals to the internal PHY. This reverts commit f3362f0 while we find and acceptable solution to cleanly reset the Ethernet MAC. Reported-by: Corentin Labbe <clabbe@baylibre.com> Acked-by: Jérôme Brunet <jbrunet@baylibre.com> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Signed-off-by: Kevin Hilman <khilman@baylibre.com> Link: https://lore.kernel.org/r/20210126080951.2383740-1-narmstrong@baylibre.com
1 parent 7386a55 commit 19f6fe9

3 files changed

Lines changed: 0 additions & 7 deletions

File tree

arch/arm64/boot/dts/amlogic/meson-axg.dtsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,6 @@
280280
"timing-adjustment";
281281
rx-fifo-depth = <4096>;
282282
tx-fifo-depth = <2048>;
283-
resets = <&reset RESET_ETHERNET>;
284-
reset-names = "stmmaceth";
285283
power-domains = <&pwrc PWRC_AXG_ETHERNET_MEM_ID>;
286284
status = "disabled";
287285
};

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,6 @@
224224
"timing-adjustment";
225225
rx-fifo-depth = <4096>;
226226
tx-fifo-depth = <2048>;
227-
resets = <&reset RESET_ETHERNET>;
228-
reset-names = "stmmaceth";
229227
status = "disabled";
230228

231229
mdio0: mdio {

arch/arm64/boot/dts/amlogic/meson-gx.dtsi

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <dt-bindings/interrupt-controller/irq.h>
1414
#include <dt-bindings/interrupt-controller/arm-gic.h>
1515
#include <dt-bindings/power/meson-gxbb-power.h>
16-
#include <dt-bindings/reset/amlogic,meson-gxbb-reset.h>
1716
#include <dt-bindings/thermal/thermal.h>
1817

1918
/ {
@@ -576,8 +575,6 @@
576575
interrupt-names = "macirq";
577576
rx-fifo-depth = <4096>;
578577
tx-fifo-depth = <2048>;
579-
resets = <&reset RESET_ETHERNET>;
580-
reset-names = "stmmaceth";
581578
power-domains = <&pwrc PWRC_GXBB_ETHERNET_MEM_ID>;
582579
status = "disabled";
583580
};

0 commit comments

Comments
 (0)