diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-09-19 17:30:06 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-19 17:30:06 +0200 |
commit | fb90bc50602b34cb3d45bbcd1ba5d527c575dc2e (patch) | |
tree | 33a40fb49e7586eb238cb1ad10fb82b057793b98 /arch/arm/boot/dts/Makefile | |
parent | 3598f2470b286113c17e85d6f97145b4fbe67ef9 (diff) | |
parent | d30363364811e956816cb586936269ecb9a30299 (diff) |
Merge tag 'mvebu-dt-4.9-2' of git://git.infradead.org/linux-mvebu into next/dt
Pull "mvebu dt for 4.9 (part 2)" from Gregory CLEMENT:
- convert orion5x based SoC Netgear WNR854T to devicetree
- remove obsolete orion-gpio binding description
* tag 'mvebu-dt-4.9-2' of git://git.infradead.org/linux-mvebu:
ARM: dts: orion5x: Configure WNR854T ethernet PHY LEDs
ARM: dts: orion5x: Add description for Netgear WNR854T
ARM: dts: arm: orion5x: Add DT include for mv88f5181
dt-bindings: arm: add DT binding for Marvell Orion5x SoC family
ARM: dts: orion5x: Add required properties for orion-wdt to DT node
dt-binding: mrvl-gpio: remove orion-gpio description
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 50d730101ab2..2fcd6a10b070 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -598,6 +598,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \ orion5x-linkstation-lswtgl.dtb \ orion5x-lswsgl.dtb \ orion5x-maxtor-shared-storage-2.dtb \ + orion5x-netgear-wnr854t.dtb \ orion5x-rd88f5182-nas.dtb dtb-$(CONFIG_ARCH_PRIMA2) += \ prima2-evb.dtb |