diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-13 17:47:47 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-13 17:47:47 +0200 |
| commit | 2cac46a4157e3c541bfe007f4d8f2c6ebb07911c (patch) | |
| tree | 5b3cc9aed8b23d08f3d52db402be824c288f589d /arch/arm | |
| parent | 2b424c7a0b4d6b54e7e6d09855bdf0b3929580cd (diff) | |
| parent | 8508452e57f7d50216338c28db6d42dfe585389a (diff) | |
| download | talos-op-linux-2cac46a4157e3c541bfe007f4d8f2c6ebb07911c.tar.gz talos-op-linux-2cac46a4157e3c541bfe007f4d8f2c6ebb07911c.zip | |
Merge tag 'socfpga_dts_for_v4.2_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt
Merge "SoCFPGA update for v4.2 part 2" from Dinh Nguyen:
- Add a DTS node for the A9 SCU
* tag 'socfpga_dts_for_v4.2_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
ARM: socfpga: dts: add the a9-scu node
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/socfpga.dtsi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi index 2e9ed36df12e..9b653edd003f 100644 --- a/arch/arm/boot/dts/socfpga.dtsi +++ b/arch/arm/boot/dts/socfpga.dtsi @@ -667,6 +667,11 @@ status = "disabled"; }; + scu: snoop-control-unit@fffec000 { + compatible = "arm,cortex-a9-scu"; + reg = <0xfffec000 0x100>; + }; + spi1: spi@fff01000 { compatible = "snps,dw-apb-ssi"; #address-cells = <1>; |
