diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-11 01:40:59 +0300 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-11 01:40:59 +0300 |
| commit | da8d2b5d92b199e9897f5fa8c4a78bf66e76f827 (patch) | |
| tree | 7272fddc00e1a147bf2ea904b7a768fbf29323cb /arch/arm/boot/dts/socfpga_arria10.dtsi | |
| parent | e897ee70dcf9ee50d801a495f4d66a404d37376e (diff) | |
| parent | e0e6f74801e1d027fa172d47b3e2515027f4728e (diff) | |
| download | linux-da8d2b5d92b199e9897f5fa8c4a78bf66e76f827.tar.xz | |
Merge tag 'socfpga_dts_for_v4.2_part_3' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt
SoCFPGA updates for v4.2 part 3
- Add SCU node for Arria 10
- Add enable-method for cpu nodes
- Add SDRAM controller binding doc
- Enable gpio-leds on SoCFPGA Socrates board
* tag 'socfpga_dts_for_v4.2_part_3' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
ARM: socfpga: socrates: add gpio-leds
ARM: socfpga: socrates: enable gpio0/1
ARM: socfpga: dts: add sdram controller dt binding doc
ARM: socfpga: dts: add enable-method property for cpu nodes
ARM: socfpga: dts: add the a9-scu node for arria10
Diffstat (limited to 'arch/arm/boot/dts/socfpga_arria10.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/socfpga_arria10.dtsi | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi index abf97630c592..6ceb26e542ec 100644 --- a/arch/arm/boot/dts/socfpga_arria10.dtsi +++ b/arch/arm/boot/dts/socfpga_arria10.dtsi @@ -24,6 +24,7 @@ cpus { #address-cells = <1>; #size-cells = <0>; + enable-method = "altr,socfpga-a10-smp"; cpu@0 { compatible = "arm,cortex-a9"; @@ -567,6 +568,11 @@ reg = <0xffd05000 0x100>; }; + scu: snoop-control-unit@ffffc000 { + compatible = "arm,cortex-a9-scu"; + reg = <0xffffc000 0x100>; + }; + sysmgr: sysmgr@ffd06000 { compatible = "altr,sys-mgr", "syscon"; reg = <0xffd06000 0x300>; |