diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-22 23:56:14 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 23:56:14 +0300 |
| commit | 2ea698c63559e3a70f345b0060622a4169f2ed64 (patch) | |
| tree | b1dcfad5fb07750d23ffdbcbfa5acb18549158bb /arch/arm/boot/dts/Makefile | |
| parent | 0d639e0a65af84a2cf636f1aaa7775131931356f (diff) | |
| parent | 8b44f5be20fd531054e546b662f46e619bff2e72 (diff) | |
| download | linux-2ea698c63559e3a70f345b0060622a4169f2ed64.tar.xz | |
Merge tag 'mvebu-dt-4.5-3' of git://git.infradead.org/linux-mvebu into next/dt
mvebu dt for 4.5 (part 3)
Add dts for the following boards:
- Zyxel NSA325
- PogoPlug series 4
Add GPU support for Dove
Update boolean property to wakeup source for isil
* tag 'mvebu-dt-4.5-3' of git://git.infradead.org/linux-mvebu:
ARM: dts: armada: replace isil, irq2-can-wakeup-machine with wakeup-source property
ARM: dts: enable GPU for SolidRun's Cubox
ARM: dts: dove: add DT GPU support
ARM: mvebu: kirkwood: add PogoPlug series 4 device tree
ARM: mvebu: add kirkwood compatibles for cloudengine boards
ARM: dts: kirkwood: Add DTS for Zyxel NSA325
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index cbe1beeea08c..e18acd393d57 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -204,12 +204,14 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ kirkwood-ns2mini.dtb \ kirkwood-nsa310.dtb \ kirkwood-nsa310a.dtb \ + kirkwood-nsa325.dtb \ kirkwood-openblocks_a6.dtb \ kirkwood-openblocks_a7.dtb \ kirkwood-openrd-base.dtb \ kirkwood-openrd-client.dtb \ kirkwood-openrd-ultimate.dtb \ kirkwood-pogo_e02.dtb \ + kirkwood-pogoplug-series-4.dtb \ kirkwood-rd88f6192.dtb \ kirkwood-rd88f6281-z0.dtb \ kirkwood-rd88f6281-a.dtb \ |