From: Olof Johansson <olof@lixom.net>
Date: Fri, 23 Jan 2015 21:58:01 +0000 (-0800)
Subject: Merge tag 'bcm5301x-dt-2015-01-20' of https://github.com/hauke/linux into next/dt
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=68f173f515bb8153c170eff691ae0ed3a2235709;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'bcm5301x-dt-2015-01-20' of https://github.com/hauke/linux into next/dt

Merge "ARM: BCM5301X: DT changes for v3.20" from Hauke Mehrtens:

bcm5301x-dt-2015-01-20: ARM: BCM5301X: dts updates for 3.20

* tag 'bcm5301x-dt-2015-01-20' of https://github.com/hauke/linux:
  ARM: BCM5301X: Add DT for Buffalo WZR-900DHP
  ARM: BCM5301X: Add LEDs for Buffalo devices
  ARM: BCM5301X: Drop unused poll-interval from gpio-keys
  ARM: BCM5301X: Add DT for Luxul XWC-1000

Signed-off-by: Olof Johansson <olof@lixom.net>
---

68f173f515bb8153c170eff691ae0ed3a2235709
diff --cc arch/arm/boot/dts/Makefile
index 17ee818d6583,0de664e90c8f..bb55b6a84a6a
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -53,33 -51,27 +53,35 @@@ dtb-$(CONFIG_ARCH_AT91)	+= sama5d36ek.d
  # sama5d4
  dtb-$(CONFIG_ARCH_AT91)	+= at91-sama5d4ek.dtb
  
 -dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
 -dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb
 -dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
 -dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb
 +dtb-$(CONFIG_ARCH_ATLAS6) += \
 +	atlas6-evb.dtb
 +dtb-$(CONFIG_ARCH_ATLAS7) += \
 +	atlas7-evb.dtb
 +dtb-$(CONFIG_ARCH_AXXIA) += \
 +	axm5516-amarillo.dtb
 +dtb-$(CONFIG_ARCH_BCM2835) += \
 +	bcm2835-rpi-b.dtb \
 +	bcm2835-rpi-b-plus.dtb
  dtb-$(CONFIG_ARCH_BCM_5301X) += \
  	bcm4708-buffalo-wzr-1750dhp.dtb \
+ 	bcm4708-luxul-xwc-1000.dtb \
  	bcm4708-netgear-r6250.dtb \
  	bcm4708-netgear-r6300-v2.dtb \
  	bcm47081-asus-rt-n18u.dtb \
- 	bcm47081-buffalo-wzr-600dhp2.dtb
+ 	bcm47081-buffalo-wzr-600dhp2.dtb \
+ 	bcm47081-buffalo-wzr-900dhp.dtb
 -dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
 -dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \
 +dtb-$(CONFIG_ARCH_BCM_63XX) += \
 +	bcm963138dvt.dtb
 +dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \
 +	bcm911360_entphn.dtb \
  	bcm911360k.dtb \
  	bcm958300k.dtb
 -dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \
 +dtb-$(CONFIG_ARCH_BCM_MOBILE) += \
 +	bcm28155-ap.dtb \
  	bcm21664-garnet.dtb
  dtb-$(CONFIG_ARCH_BERLIN) += \
 -	berlin2-sony-nsz-gs7.dtb	\
 -	berlin2cd-google-chromecast.dtb	\
 +	berlin2-sony-nsz-gs7.dtb \
 +	berlin2cd-google-chromecast.dtb \
  	berlin2q-marvell-dmp.dtb
  dtb-$(CONFIG_ARCH_BRCMSTB) += \
  	bcm7445-bcm97445svmb.dtb