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

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

Merge tag 'socfpga_updates_for_v4.20_part3' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents ce57b60f 2a44d651

arch/arm/boot/dts/socfpga.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
	#size-cells = <1>;



	aliases {

		ethernet0 = &gmac0;

		ethernet1 = &gmac1;

		serial0 = &uart0;

		serial1 = &uart1;

		timer0 = &timer0;

arch/arm/boot/dts/socfpga_arria10.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ 
			status = "disabled";

		};



		sdr: sdr@ffc25000 {

		sdr: sdr@ffcfb100 {

			compatible = "altr,sdr-ctl", "syscon";

			reg = <0xffcfb100 0x80>;

		};

arch/arm/boot/dts/socfpga_cyclone5_socrates.dts

+4 −0
Original line number Diff line number Diff line
@@ -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";

arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ 


		sysmgr: sysmgr@ffd12000 {

			compatible = "altr,sys-mgr", "syscon";

			reg = <0xffd12000 0x1000>;

			reg = <0xffd12000 0x228>;

		};



		/* Local timer */

arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ 


	aliases {

		serial0 = &uart0;

		ethernet0 = &gmac0;

		ethernet1 = &gmac1;

		ethernet2 = &gmac2;

	};



	chosen {