leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SoCFPGA DTS updates for v4.8

Browse Source 
- Update Arria10 ECC manager
 - Add ethernet alias for Arria10
 - Update serial alias for Arria10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXWHESAAoJEBmUBAuBoyj0VV0QALgtV3avO4/bTuAOjkhvUy9Q
 KX4Hbene+bK2zkd82ChMfaFErPD8AYttdy6pLKUHp+F6AssTRH2RTyezwv/dlIBH
 +Q/qFvs6SRvc+0Jto11hVe/Dx5adV7aeBLjzWwLkNJ/BpqRCyM4hKw228i0JwuMl
 /PM3LdZw8V1956rbwcjLCNWV4HaDhOB0hTmfO+nZIGHaj6Qut27BYa4tGLWDKRPs
 QE7RwY3FBNMCXcpRGQBhjFzBGJrFEAT5/tkr3UA2vJnUhSKQa99QQon/L/REhPdY
 EWkrvLOTa86sof51jsm9bSM2TJvbJs+rQkHsp8qgWfgz2TI0S9kvFq72ttDJtII1
 HWxAJqAiJgP6X95RVU/aLPVZ4uyKg3MjPT4mYhIj9H1yex440kPHG9dOx99DKoxA
 1UGDh68J4c0UIL9Uvt+QLeTY2PfaunfDxjcsDVxKfw++sXE4OeazhJCJlceq8P+o
 z5r5hl2CzWeKLnrWP7oNQhfjuRce8G4NzBKAoL+11JVi1xwv8C1ggX2TqAhfY+kz
 WH45OmG2djzuY96sLb3tabatl7i6h3UALFCZTJ6D9XXB3zKbqgwSrq7IlVvkFkf9
 ivDNp8TQ1rczho/ue5GLgrqBN3l1El1KX4Kj3K9ZW3Fj60FzVvP+V5tsNBVq+nBb
 ntn4eP0ZTeozDIm/XvtK
 =WdVs
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2016-06-13 15:47:15 -07:00
commit 943bba786f
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,11 +22,6 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
aliases {
serial0 = &uart0;
serial1 = &uart1;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@ -572,12 +567,6 @@
reg = <0xffcfb100 0x80>; reg = <0xffcfb100 0x80>;
}; };
sdramedac {
compatible = "altr,sdram-edac-a10";
altr,sdr-syscon = <&sdr>;
interrupts = <0 2 4>, <0 0 4>;
};
L2: l2-cache@fffff000 { L2: l2-cache@fffff000 {
compatible = "arm,pl310-cache"; compatible = "arm,pl310-cache";
reg = <0xfffff000 0x1000>; reg = <0xfffff000 0x1000>;
@ -610,16 +599,29 @@
#size-cells = <1>; #size-cells = <1>;
interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>, interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>,
<0 0 IRQ_TYPE_LEVEL_HIGH>; <0 0 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller;
#interrupt-cells = <2>;
ranges; 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 { l2-ecc@ffd06010 {
compatible = "altr,socfpga-a10-l2-ecc"; compatible = "altr,socfpga-a10-l2-ecc";
reg = <0xffd06010 0x4>; reg = <0xffd06010 0x4>;
interrupts = <0 IRQ_TYPE_LEVEL_HIGH>,
<32 IRQ_TYPE_LEVEL_HIGH>;
}; };
ocram-ecc@ff8c3000 { ocram-ecc@ff8c3000 {
compatible = "altr,socfpga-a10-ocram-ecc"; compatible = "altr,socfpga-a10-ocram-ecc";
reg = <0xff8c3000 0x400>; reg = <0xff8c3000 0x400>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH>,
<33 IRQ_TYPE_LEVEL_HIGH>;
}; };
}; };

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

@ -20,9 +20,14 @@
model = "Altera SOCFPGA Arria 10"; model = "Altera SOCFPGA Arria 10";
compatible = "altr,socfpga-arria10", "altr,socfpga"; compatible = "altr,socfpga-arria10", "altr,socfpga";
aliases {
ethernet0 = &gmac0;
serial0 = &uart1;
};
chosen { chosen {
bootargs = "earlyprintk"; bootargs = "earlyprintk";
stdout-path = "serial1:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory { memory {