Commit fd28a52a authored Jan 28, 2021 by Arnd Bergmann

Merge tag 'amlogic-fixes-2' of...

Merge tag 'amlogic-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/fixes

arm64: dts: amlogic fixes for v5.11-rc (round 2)
- fix ethernet resets

* tag 'amlogic-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  Revert "arm64: dts: amlogic: add missing ethernet reset ID"

Link: https://lore.kernel.org/r/7ho8hai7e6.fsf@baylibre.com


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents f2d514b4 19f6fe97

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

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -280,8 +280,6 @@
	"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";
	};		};

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

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -224,8 +224,6 @@
	"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 {

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

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -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 @@
	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";
	};		};