openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

SoCFPGA DTS updates for v4.11, part 2 

- Add AXI configuration for DWMAC ethernet controllers on Arria10
 - Use watchdog1 instead of watchdog0 on Arria10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJYlJ7EAAoJEBmUBAuBoyj0xfoQAJPJkAAJ3oq67oqtG8XtZUSD
 0OgG7Jn6+BFzY0N1oMYdluMWvO9ZRShlF5mLAcvA8kB/+qnUZp20Rq1+oz0ckzw+
 lg3qOBve01xiYkcX+vu/U8IKSVPqUQFE4ctHuO3lS6X3z+HwZtjfWs3uIA5Y2s6u
 riI5QB6QS3tdkfxQtRp9EzH2yLoxruCm50Bl5n4ouNPh1nZi6+O2aY48CcjrUIgL
 jpbPyeI3MnpsUVAKDbJ6Zml1mtCZprtj+gAVNihcGI6re77Ix+GK5C/LXB2+L3DO
 j/MKZz07Y/D6mZWQua+g8zNk53FEHxT7qBH6nBgOUYHctE0mB+6PQ+zLkxze8xXP
 aK0IouUlmIzjchlxtwzUUdbamW5/c/X9nv+I0HBmAbPJSCqq5RvlD0Dm42+BkihU
 VdlZRaYJ6Qyis+O23hRqW9T2qzw/fQy06e9cxItIALlysr+rTmEhD7dXKZpfQ+Md
 AU3Z3FydHURC0Zc20uw7nteSJDWOdeUKjZ7FZhrlJ4AuaVRvFaBBGsU593BE9TQo
 du5GWMp2Vh9hYje9rMTM6blH1d4N3RxSko/JS2KKUBYJyO9Qz5SOVdg84myEzTVx
 1fibfnjvvBe7D46RYlWfLTMTYmLt0QrEYis6gzBSxJgAYzQHiTma6d3vI0rRc0Jf
 uAMDKD5yV28078Tz/7Lf
 =46BH
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2017-02-07 15:58:08 +01:00
parent 5f2f35a1ff cda1ade6a2
commit fd896f5acd
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/boot/dts/socfpga_arria10.dtsi
View File

@ -408,6 +408,12 @@ s2f_usr1_clk: s2f_usr1_clk {
};
};
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 @@ gmac0: ethernet@ff800000 {
clock-names = "stmmaceth";
resets = <&rst EMAC0_RESET>;
reset-names = "stmmaceth";
snps,axi-config = <&socfpga_axi_setup>;
status = "disabled";
};
@ -443,6 +450,7 @@ gmac1: ethernet@ff802000 {
clock-names = "stmmaceth";
resets = <&rst EMAC1_RESET>;
reset-names = "stmmaceth";
snps,axi-config = <&socfpga_axi_setup>;
status = "disabled";
};
@ -460,6 +468,7 @@ gmac2: ethernet@ff804000 {
rx-fifo-depth = <16384>;
clocks = <&l4_mp_clk>;
clock-names = "stmmaceth";
snps,axi-config = <&socfpga_axi_setup>;
status = "disabled";
};

2
arch/arm/boot/dts/socfpga_arria10_socdk.dtsi
View File

@ -160,6 +160,6 @@ &usb0 {
status = "okay";
};
&watchdog0 {
&watchdog1 {
status = "okay";
};