Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 13:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

SoCFPGA DTS updates for v4.20, part 3

Browse Source 
- Add ethernet aliases for Stratix10
 - Move ethernet aliases from socfpga dtsi
 - Correct system manager register size for Stratix10
 - Correct SDRAM node address for Arria10
 -----BEGIN PGP SIGNATURE-----
 
 iQJIBAABCgAyFiEEoHhMeiyk5VmwVMwNGZQEC4GjKPQFAlu+E5kUHGRpbmd1eWVu
 QGtlcm5lbC5vcmcACgkQGZQEC4GjKPQxVBAApS3jzuE6jofUL2CXccl8DGuHJ5Ur
 FV3qPKtHB5Zd44VxRk12SODKBED4ry8+vzixvF4+jryvXkXsUXB76p0h4zcmpb2g
 L1Ngl5S8LW0ES74Rr2BMglSPmabjGOK7mSqj+CREwsOmWufZXQkpPV1ytbqscqTt
 S0bXRjChFhvbyc5qJ9NGx96sFpqfAL4SXpb8s9+3nfs8K5BUxI4RQD4zQtr03Fk1
 7wHUo2m0eyQGtTGR8Euml73ZyYdJn3e9Tcfl0vNRcL36/yr/qlA4St7EjscuoUDc
 XBBFydoo8pZUKEHLkAo6m+nSFdDoap048cKf47OLA0R18tSNauknCjkJniftx6JM
 LdD+T/YDRMqXgA7AXPkGwtApVKymJVmVmh4yuyNtqkQ5GGAZu6jCYo7UnEhfAkoQ
 ml20lH+O0WkcyRSrokUQHm8v+xVYt9m21xkS7NaQzCcCwX2LVNJVsXNVDMHlkFvM
 Sm6xK7v1QCT4cst6wtJlE0NHyBRzer+GpP6xH7F57rUrTy99Hfb2wcQ4vN80sFep
 BkGk5NL9OA/LQUweEoPqNGfASfs1YwTZp8od0fCKsQBybIBE4JrbKHGFj91X53SG
 MEMFo8PaNmzbnbopwlqlmUw6Bu58SknuC4H7/Az8ENLZc8AjK/iozR3efqsA759K
 eQqIqZbpW/xORnU=
 =S+pP
 -----END PGP SIGNATURE-----

Merge tag 'socfpga_updates_for_v4.20_part3' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt

SoCFPGA DTS updates for v4.20, part 3
- Add ethernet aliases for Stratix10
- Move ethernet aliases from socfpga dtsi
- Correct system manager register size for Stratix10
- Correct SDRAM node address for Arria10

* tag 'socfpga_updates_for_v4.20_part3' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: dts: socfgpa: remove ethernet aliases from dtsi
  arm64: dts: stratix10: add ethernet aliases
  arm64: dts: stratix10: Correct System Manager register size
  ARM: dts: socfpga: Fix SDRAM node address for Arria10

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2018-10-11 16:06:23 +02:00
commit be59a3282c
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,8 +22,6 @@
#size-cells = <1>;
aliases {
ethernet0 = &gmac0;
ethernet1 = &gmac1;
serial0 = &uart0;
serial1 = &uart1;
timer0 = &timer0;

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

@ -628,7 +628,7 @@
status = "disabled";
};
sdr: sdr@ffc25000 {
sdr: sdr@ffcfb100 {
compatible = "altr,sdr-ctl", "syscon";
reg = <0xffcfb100 0x80>;
};

4
arch/arm/boot/dts/socfpga_cyclone5_socrates.dts
View File

@ -21,6 +21,10 @@
model = "EBV SOCrates";
compatible = "ebv,socrates", "altr,socfpga-cyclone5", "altr,socfpga";
aliases {
ethernet0 = &gmac1;
};
chosen {
bootargs = "earlyprintk";
stdout-path = "serial0:115200n8";

2
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
View File

@ -335,7 +335,7 @@
sysmgr: sysmgr@ffd12000 {
compatible = "altr,sys-mgr", "syscon";
reg = <0xffd12000 0x1000>;
reg = <0xffd12000 0x228>;
};
/* Local timer */

3
arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
View File

@ -21,6 +21,9 @@
aliases {
serial0 = &uart0;
ethernet0 = &gmac0;
ethernet1 = &gmac1;
ethernet2 = &gmac2;
};
chosen {