Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd896f5a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'socfpga_dts_for_v4.11_part_2' of... 

Merge tag 'socfpga_dts_for_v4.11_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt

Pull "SoCFPGA DTS updates for v4.11, part 2" from Dinh Nguyen:

- Add AXI configuration for DWMAC ethernet controllers on Arria10
- Use watchdog1 instead of watchdog0 on Arria10

* tag 'socfpga_dts_for_v4.11_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: dts: Add EMAC AXI settings for Arria10
  ARM: dts: watchdog0 cannot reliably trigger reset
parents 5f2f35a1 cda1ade6

arch/arm/boot/dts/socfpga_arria10.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -408,6 +408,12 @@ 
				};

		};



		socfpga_axi_setup: stmmac-axi-config {

			snps,wr_osr_lmt = <0xf>;

			snps,rd_osr_lmt = <0xf>;

			snps,blen = <0 0 0 0 16 0 0>;

		};



		gmac0: ethernet@ff800000 {

			compatible = "altr,socfpga-stmmac", "snps,dwmac-3.72a", "snps,dwmac";

			altr,sysmgr-syscon = <&sysmgr 0x44 0>;
@@ -424,6 +430,7 @@ 
			clock-names = "stmmaceth";

			resets = <&rst EMAC0_RESET>;

			reset-names = "stmmaceth";

			snps,axi-config = <&socfpga_axi_setup>;

			status = "disabled";

		};
@@ -443,6 +450,7 @@ 
			clock-names = "stmmaceth";

			resets = <&rst EMAC1_RESET>;

			reset-names = "stmmaceth";

			snps,axi-config = <&socfpga_axi_setup>;

			status = "disabled";

		};
@@ -460,6 +468,7 @@ 
			rx-fifo-depth = <16384>;

			clocks = <&l4_mp_clk>;

			clock-names = "stmmaceth";

			snps,axi-config = <&socfpga_axi_setup>;

			status = "disabled";

		};

arch/arm/boot/dts/socfpga_arria10_socdk.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -160,6 +160,6 @@ 
	status = "okay";

};



&watchdog0 {

&watchdog1 {

	status = "okay";

};