diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-10-09 21:11:03 (GMT) |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-10-09 21:11:13 (GMT) |
| commit | 0398436522b5deff4c1729ac3b47e4a2280e3ee7 (patch) | |
| tree | 4780add542c0b435c5497753247ffa6d814f44b9 /arch/arm/boot/dts/Makefile | |
| parent | 3197e4a123d90a2ece9488267a05fcb52766e52d (diff) | |
| parent | 7837feff0d881835309fced7a7c4b5f32866d632 (diff) | |
| download | linux-fsl-qoriq-0398436522b5deff4c1729ac3b47e4a2280e3ee7.tar.xz | |
Merge tag 'dt-3.13-2' of git://git.infradead.org/linux-mvebu into next/dt
From Jason Cooper:
mvebu dt changes for v3.13 (round 2)
- kirkwood
- use MBus DT binding for setting up the windows
- move crypto and nand underneath the mbus node
- ib62x0 has a u-boot env partition
- mvebu
- add the Armada XP matrix board
* tag 'dt-3.13-2' of git://git.infradead.org/linux-mvebu:
arm: mvebu: add support for the Armada XP Matrix board
ARM: kirkwood: ib62x0: add u-boot environment partition
ARM: kirkwood: Move the nand node under the mbus node
ARM: kirkwood: Move the crypto node under the mbus node
ARM: kirkwood: Remove kirkwood_setup_wins and rely on the DT binding
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index c4e7fa0..b9b4b59 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -111,6 +111,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \ armada-xp-axpwifiap.dtb \ armada-xp-db.dtb \ armada-xp-gp.dtb \ + armada-xp-matrix.dtb \ armada-xp-openblocks-ax3-4.dtb dtb-$(CONFIG_ARCH_MXC) += \ imx25-karo-tx25.dtb \ |