diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-20 19:22:56 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-20 19:22:56 (GMT) |
| commit | 87adf92b95715ece8c8102e465d0682d57037d22 (patch) | |
| tree | 15fab7157c9337d927bc487ee45f17f782f5d106 /arch/arm/boot/dts/Makefile | |
| parent | aaaa10b0961f1fca534dea100ace0fc2991a07dd (diff) | |
| parent | d854fa8a1500bec982ed9cb26b82d96bd5ae8dab (diff) | |
| download | linux-87adf92b95715ece8c8102e465d0682d57037d22.tar.xz | |
Merge tag 'mvebu-dt-3.17' of git://git.infradead.org/linux-mvebu into next/dt
Merge "ARM: mvebu: DT changes for v3.17" from Jason Cooper:
mvebu DT changes for v3.17
- kirkwood
* add boards net2big and net5big
- dove
* add vendor prefix for SolidRun
* split CuBox into it's variants
* tag 'mvebu-dt-3.17' of git://git.infradead.org/linux-mvebu:
ARM: kirkwood: fix net5big regulator gpio assignments
ARM: dts: mvebu: split SolidRun CuBox into variants
dt-binding: add vendor prefix for SolidRun
ARM: Kirkwood: Add DT descriptions for net2big and net5big.
Signed-off-by: Olof Johansson <olof@lixom.net>
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 81bd72a..41c73a1 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -125,6 +125,8 @@ kirkwood := \ kirkwood-lsxhl.dtb \ kirkwood-mplcec4.dtb \ kirkwood-mv88f6281gtw-ge.dtb \ + kirkwood-net2big.dtb \ + kirkwood-net5big.dtb \ kirkwood-netgear_readynas_duo_v2.dtb \ kirkwood-netgear_readynas_nv+_v2.dtb \ kirkwood-ns2.dtb \ @@ -471,6 +473,7 @@ dtb-$(CONFIG_MACH_ARMADA_XP) += \ armada-xp-openblocks-ax3-4.dtb dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \ dove-cubox.dtb \ + dove-cubox-es.dtb \ dove-d2plug.dtb \ dove-d3plug.dtb \ dove-dove-db.dtb |