Commit 090e502e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'socfpga_dts_fix_for_v5.12' of... 

Merge tag 'socfpga_dts_fix_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/fixes

SoCFPGA Agilex fix for v5.12
- Fix PHY interface register offset for GMACs

* tag 'socfpga_dts_fix_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  arm64: dts: agilex: fix phy interface bit shift for gmac1 and gmac2

Link: https://lore.kernel.org/r/20210208203703.36109-1-dinguyen@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d30337da b7ff3a44

arch/arm64/boot/dts/intel/socfpga_agilex.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ gmac1: ethernet@ff802000 { 
			rx-fifo-depth = <16384>;

			snps,multicast-filter-bins = <256>;

			iommus = <&smmu 2>;

			altr,sysmgr-syscon = <&sysmgr 0x48 8>;

			altr,sysmgr-syscon = <&sysmgr 0x48 0>;

			clocks = <&clkmgr AGILEX_EMAC1_CLK>, <&clkmgr AGILEX_EMAC_PTP_CLK>;

			clock-names = "stmmaceth", "ptp_ref";

			status = "disabled";
@@ -184,7 +184,7 @@ gmac2: ethernet@ff804000 { 
			rx-fifo-depth = <16384>;

			snps,multicast-filter-bins = <256>;

			iommus = <&smmu 3>;

			altr,sysmgr-syscon = <&sysmgr 0x4c 16>;

			altr,sysmgr-syscon = <&sysmgr 0x4c 0>;

			clocks = <&clkmgr AGILEX_EMAC2_CLK>, <&clkmgr AGILEX_EMAC_PTP_CLK>;

			clock-names = "stmmaceth", "ptp_ref";

			status = "disabled";