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

Commit 943bba78 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'socfpga_updates_v4.8' of... 

Merge tag 'socfpga_updates_v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt

SoCFPGA DTS updates for v4.8
- Update Arria10 ECC manager
- Add ethernet alias for Arria10
- Update serial alias for Arria10

* tag 'socfpga_updates_v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux

:
  ARM: dts: socfpga: fix definitions of serial console
  ARM: dts: socfpga: add ethernet alias on Arria10
  ARM: dts: Move Arria10 SDRAM as child of ECC Manager
  ARM: dts: Arria10 ECC Manager IRQ controller changes

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a264cc2e b65c0efa

arch/arm/boot/dts/socfpga_arria10.dtsi

+13 −11
Original line number Diff line number Diff line
@@ -22,11 +22,6 @@ 
	#address-cells = <1>;

	#size-cells = <1>;



	aliases {

		serial0 = &uart0;

		serial1 = &uart1;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;
@@ -572,12 +567,6 @@ 
			reg = <0xffcfb100 0x80>;

		};



		sdramedac {

			compatible = "altr,sdram-edac-a10";

			altr,sdr-syscon = <&sdr>;

			interrupts = <0 2 4>, <0 0 4>;

		};



		L2: l2-cache@fffff000 {

			compatible = "arm,pl310-cache";

			reg = <0xfffff000 0x1000>;
@@ -610,16 +599,29 @@ 
			#size-cells = <1>;

			interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>,

				     <0 0 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-controller;

			#interrupt-cells = <2>;

			ranges;



			sdramedac {

				compatible = "altr,sdram-edac-a10";

				altr,sdr-syscon = <&sdr>;

				interrupts = <17 IRQ_TYPE_LEVEL_HIGH>,

					     <49 IRQ_TYPE_LEVEL_HIGH>;

			};



			l2-ecc@ffd06010 {

				compatible = "altr,socfpga-a10-l2-ecc";

				reg = <0xffd06010 0x4>;

				interrupts = <0 IRQ_TYPE_LEVEL_HIGH>,

					     <32 IRQ_TYPE_LEVEL_HIGH>;

			};



			ocram-ecc@ff8c3000 {

				compatible = "altr,socfpga-a10-ocram-ecc";

				reg = <0xff8c3000 0x400>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH>,

					     <33 IRQ_TYPE_LEVEL_HIGH>;

			};

		};

arch/arm/boot/dts/socfpga_arria10_socdk.dtsi

+6 −1
Original line number Diff line number Diff line
@@ -20,9 +20,14 @@ 
	model = "Altera SOCFPGA Arria 10";

	compatible = "altr,socfpga-arria10", "altr,socfpga";



	aliases {

		ethernet0 = &gmac0;

		serial0 = &uart1;

	};



	chosen {

		bootargs = "earlyprintk";

		stdout-path = "serial1:115200n8";

		stdout-path = "serial0:115200n8";

	};



	memory {