diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2014-02-25 18:16:15 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-02-25 18:16:15 +0100 |
| commit | c58181eb74b995661f368ebdffd4938a40bf39d9 (patch) | |
| tree | a1b54f592d4804bc624188b2b36d325c24ac1023 /arch/arm/boot/dts/Makefile | |
| parent | Merge tag 'mvebu-dt-3.15' of git://git.infradead.org/linux-mvebu into next/dt (diff) | |
| parent | ARM: dove: Enable Dove watchdog in the devicetree (diff) | |
| download | linux-dev-c58181eb74b995661f368ebdffd4938a40bf39d9.tar.xz linux-dev-c58181eb74b995661f368ebdffd4938a40bf39d9.zip | |
Merge tag 'mvebu-dt-3.15-2' of git://git.infradead.org/linux-mvebu into next/dt
Merge "mvebu dt changes for v3.15 (incremental round #2)" from Jason Cooper:
- mvebu
- add audio for Armada 370 DB
- enable Armada 370/XP watchdog
- kirkwood
- convert board rd88f6281
- add board rd88f6192
- dove
enable watchdog
* tag 'mvebu-dt-3.15-2' of git://git.infradead.org/linux-mvebu:
ARM: dove: Enable Dove watchdog in the devicetree
ARM: kirkwood: Add RSTOUT 'reg' entry to devicetree
ARM: mvebu: Enable Armada 370/XP watchdog in the devicetree
ARM: Kirkwood: convert rd88f6281-setup.c to DT.
ARM: Kirkwood: Add DT description of rd88f6192.
ARM: mvebu: enable S/PDIF audio in Armada 370 DB Device Tree
ARM: mvebu: add audio support to Armada 370 DB
ARM: mvebu: add I2C0 muxing option for Armada 370 SoC
ARM: mvebu: add audio I2S controller to Armada 370 Device Tree
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 222fe15a8d53..94b3bb4a08ea 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -113,6 +113,9 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-b3.dtb \ kirkwood-nsa310a.dtb \ kirkwood-openblocks_a6.dtb \ kirkwood-openblocks_a7.dtb \ + kirkwood-rd88f6192.dtb \ + kirkwood-rd88f6281-a0.dtb \ + kirkwood-rd88f6281-a1.dtb \ kirkwood-sheevaplug.dtb \ kirkwood-sheevaplug-esata.dtb \ kirkwood-topkick.dtb \ |