Commit 19f6fe97 authored by Neil Armstrong's avatar Neil Armstrong Committed by Kevin Hilman

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 f3362f0c while we find
and acceptable solution to cleanly reset the Ethernet MAC.
Reported-by: default avatarCorentin Labbe <clabbe@baylibre.com>
Acked-by: default avatarJérôme Brunet <jbrunet@baylibre.com>
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
Link: https://lore.kernel.org/r/20210126080951.2383740-1-narmstrong@baylibre.com
parent 7386a559
...@@ -280,8 +280,6 @@ ethmac: ethernet@ff3f0000 { ...@@ -280,8 +280,6 @@ ethmac: ethernet@ff3f0000 {
"timing-adjustment"; "timing-adjustment";
rx-fifo-depth = <4096>; rx-fifo-depth = <4096>;
tx-fifo-depth = <2048>; tx-fifo-depth = <2048>;
resets = <&reset RESET_ETHERNET>;
reset-names = "stmmaceth";
power-domains = <&pwrc PWRC_AXG_ETHERNET_MEM_ID>; power-domains = <&pwrc PWRC_AXG_ETHERNET_MEM_ID>;
status = "disabled"; status = "disabled";
}; };
......
...@@ -224,8 +224,6 @@ ethmac: ethernet@ff3f0000 { ...@@ -224,8 +224,6 @@ ethmac: ethernet@ff3f0000 {
"timing-adjustment"; "timing-adjustment";
rx-fifo-depth = <4096>; rx-fifo-depth = <4096>;
tx-fifo-depth = <2048>; tx-fifo-depth = <2048>;
resets = <&reset RESET_ETHERNET>;
reset-names = "stmmaceth";
status = "disabled"; status = "disabled";
mdio0: mdio { mdio0: mdio {
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/power/meson-gxbb-power.h> #include <dt-bindings/power/meson-gxbb-power.h>
#include <dt-bindings/reset/amlogic,meson-gxbb-reset.h>
#include <dt-bindings/thermal/thermal.h> #include <dt-bindings/thermal/thermal.h>
/ { / {
...@@ -576,8 +575,6 @@ ethmac: ethernet@c9410000 { ...@@ -576,8 +575,6 @@ ethmac: ethernet@c9410000 {
interrupt-names = "macirq"; interrupt-names = "macirq";
rx-fifo-depth = <4096>; rx-fifo-depth = <4096>;
tx-fifo-depth = <2048>; tx-fifo-depth = <2048>;
resets = <&reset RESET_ETHERNET>;
reset-names = "stmmaceth";
power-domains = <&pwrc PWRC_GXBB_ETHERNET_MEM_ID>; power-domains = <&pwrc PWRC_GXBB_ETHERNET_MEM_ID>;
status = "disabled"; status = "disabled";
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment