Merge tag 'socfpga_dts_updates_for_v3.19' of git://git.rocketboards.org/linux-socfpga...
authorArnd Bergmann <arnd@arndb.de>
Fri, 21 Nov 2014 12:31:06 +0000 (13:31 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 21 Nov 2014 12:31:06 +0000 (13:31 +0100)
commitd1940cbd4687ea517801ef5c861e8625450e7285
treefc86e9fd618b4890500864eb58266b43a3aae68e
parent5ba3c24ca069738b8d12ac90e2ab03eef9bfb293
parent475dc86d08de4af61b6e8524bbcdbf8d675cb4fa
Merge tag 'socfpga_dts_updates_for_v3.19' of git://git.rocketboards.org/linux-socfpga-next into next/dt

Pull "SoCFPGA DTS updates for v3.19" from Dinh Nguyen:

- Add DTS support for a new chip in the SOCFPGA family, the Arria 10.
- Enable watchdog node.
- Add SPI nodes.
- Add the OCRAM node.

* tag 'socfpga_dts_updates_for_v3.19' of git://git.rocketboards.org/linux-socfpga-next:
  arm: dts: socfpga: Add a base DTSI for Altera's Arria10 SOC
  arm: dts: socfpga: enable watchdog for socfpga platform
  arm: dts: socfpga: Add SPI nodes to SOCFPGA DT.
  arm: dts: socfpga: Add OCRAM node

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/socfpga.dtsi