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

2 files changed, 10 insertions, 1 deletions

diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi
index 65904db153be..6b0b7463f36f 100644
--- a/arch/arm/boot/dts/socfpga_arria10.dtsi
+++ b/arch/arm/boot/dts/socfpga_arria10.dtsi
@@ -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";
                 };
 
diff --git a/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi b/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi
index 4c99c99d1752..c57e6cea0d83 100644
--- a/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi
+++ b/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi
@@ -160,6 +160,6 @@
         status = "okay";
 };
 
-&watchdog0 {
+&watchdog1 {
         status = "okay";
 };