diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-19 23:19:17 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-19 23:19:17 +0100 |
| commit | 7d9e89c7c4812f74e6540e015d36f88295ff0b60 (patch) | |
| tree | f3633f9a739872309307844579fe9dfaf63cd5d3 /arch/arm/boot/dts/Makefile | |
| parent | Merge tag 'hix5hd2-dt-for-3.19' of git://github.com/hisilicon/linux-hisi into... (diff) | |
| parent | ARM: mvebu: armada-xp: Fix 74hc595 count for Lenovo ix4-300d (diff) | |
| download | linux-7d9e89c7c4812f74e6540e015d36f88295ff0b60.tar.xz linux-7d9e89c7c4812f74e6540e015d36f88295ff0b60.zip | |
Merge tag 'mvebu-dt-3.19' of git://git.infradead.org/linux-mvebu into next/dt
Pull "mvebu DT changes for v3.19" from Jason Cooper:
- mvebu
- ReadyNAS 102 leds, esata
- ReadyNAS 2120 esata
- Add cache-unified for Aurora L2 node
- Add ref clk for timer and watchdog on Armada 375
- Cleanup Armada XP pinctrl for GigE
- Add RGMII pinctrl, i2c eeprom, and fix 74hc595 counter on Lenovo ix4-300d
- kirkwood
- Add DLink DIR665 and it's DSA configuration
* tag 'mvebu-dt-3.19' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: armada-xp: Fix 74hc595 count for Lenovo ix4-300d
ARM: mvebu: armada-xp: Add I2C eeprom on Lenovo ix4-300d
ARM: mvebu: armada-xp: Add RGMII pinctrl to Lenovo ix4-300d
ARM: mvebu: armada-xp: Add GE0 pinctrl settings for GMII
ARM: mvebu: armada-xp: Move GE0/1 pinctrl settings for RGMII
ARM: mvebu: armada-xp: Use pinctrl node alias
ARM: mvebu: armada-xp: Add node alias to pinctrl and add base address
ARM: mvebu: armada-xp: Consolidate pinctrl node
ARM: Kirkwood: DIR665: Instantiate Distributed Switch Architecture
ARM: Kirkwood: Add support for DLink DIR665
ARM: mvebu: Enable rear eSATA ports of NETGEAR ReadyNAS 2120
ARM: mvebu: Enable the reference clock for timer and watchdog on Armada 375 SoC
arm: mvebu: Clarify (e)SATA ports info in NETGEAR ReadyNAS 102 .dts file
arm: mvebu: Fix LED color in NETGEAR ReadyNAS 102 .dts file
ARM: mvebu: Fix the Aurora L2 cache node with the required cache-unified property
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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 dde363b64f23..5a8b065e3d7b 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -109,6 +109,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += kirkwood-b3.dtb \ kirkwood-d2net.dtb \ kirkwood-db-88f6281.dtb \ kirkwood-db-88f6282.dtb \ + kirkwood-dir665.dtb \ kirkwood-dns320.dtb \ kirkwood-dns325.dtb \ kirkwood-dockstar.dtb \ |