diff options
| author | Olof Johansson <olof@lixom.net> | 2014-01-02 11:17:05 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-01-02 11:17:05 -0800 |
| commit | dee4bd4c7ed2eac16f55806e0e49d34dfb3c79fd (patch) | |
| tree | a53fe92c65d94f804486c200d9f69877a1b9c84f /arch/arm/boot/dts/Makefile | |
| parent | c56569b37273e23c5f9576592fa4c5e5f859ed47 (diff) | |
| parent | 2cc64b5655da65bbb6a760a722b5ab1f53f92cf7 (diff) | |
| download | linux-dee4bd4c7ed2eac16f55806e0e49d34dfb3c79fd.tar.gz | |
Merge tag 'mvebu-dt-3.14-5' of git://git.infradead.org/linux-mvebu into next/dt
From Jason Cooper:
mvebu DT changes for v3.14 (incremental #5)
- mvebu
- add rtc chip isl12057 node to ReadyNAS boards
- fix register length in Armada XP pmsu
- kirkwood
- sort ocp nodes by address in 6282 dtsi file
- add 6192 dtsi file
- add LaPlug board
- add sata phy node
- dove
- add sata phy node
* tag 'mvebu-dt-3.14-5' of git://git.infradead.org/linux-mvebu:
ARM: Kirkwood: DT board setup for LaPlug
ARM: Kirkwood: Add 6192 DTSI file
ARM: mvebu: fix register length for Armada XP PMSU
ARM: kirkwood: 6282: sort DT nodes by address
Phy: Add DT nodes on kirkwood and Dove for the SATA PHY
ARM: mvebu: Enable ISL12057 RTC chip in ReadyNAS 2120 .dts file
ARM: mvebu: Enable ISL12057 RTC chip in ReadyNAS 104 .dts file
ARM: mvebu: Enable ISL12057 RTC chip in ReadyNAS 102 .dts file
Signed-off-by: Olof Johansson <olof@lixom.net>
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 25d708c47eb5..2752a13f1b60 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -88,6 +88,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ kirkwood-iomega_ix2_200.dtb \ kirkwood-is2.dtb \ kirkwood-km_kirkwood.dtb \ + kirkwood-laplug.dtb \ kirkwood-lschlv2.dtb \ kirkwood-lsxhl.dtb \ kirkwood-mplcec4.dtb \ |