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

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

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

+0 −2
Original line number Diff line number Diff line
@@ -280,8 +280,6 @@ 
				      "timing-adjustment";

			rx-fifo-depth = <4096>;

			tx-fifo-depth = <2048>;

			resets = <&reset RESET_ETHERNET>;

			reset-names = "stmmaceth";

			power-domains = <&pwrc PWRC_AXG_ETHERNET_MEM_ID>;

			status = "disabled";

		};

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

+0 −2
Original line number Diff line number Diff line
@@ -224,8 +224,6 @@ 
				      "timing-adjustment";

			rx-fifo-depth = <4096>;

			tx-fifo-depth = <2048>;

			resets = <&reset RESET_ETHERNET>;

			reset-names = "stmmaceth";

			status = "disabled";



			mdio0: mdio {

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

+0 −3
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/power/meson-gxbb-power.h>

#include <dt-bindings/reset/amlogic,meson-gxbb-reset.h>

#include <dt-bindings/thermal/thermal.h>



/ {
@@ -576,8 +575,6 @@ 
			interrupt-names = "macirq";

			rx-fifo-depth = <4096>;

			tx-fifo-depth = <2048>;

			resets = <&reset RESET_ETHERNET>;

			reset-names = "stmmaceth";

			power-domains = <&pwrc PWRC_GXBB_ETHERNET_MEM_ID>;

			status = "disabled";

		};