Merge tag 'arm-soc/for-4.1/devicetree' of http://github.com/broadcom/stblinux into...
authorArnd Bergmann <arnd@arndb.de>
Wed, 11 Mar 2015 21:51:11 +0000 (22:51 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 11 Mar 2015 21:51:11 +0000 (22:51 +0100)
Pull "Broadcom Device Tree changes for 4.1 #1" from Florian Fainelli:

This pull request contains the following Broadcom SoCs Device Tree changes:

- Jonathan adds support for the Broadcom Cygnus BCM958305K board

- Rafal adds support for Netgear R8000 and fixes the default for power LEDs
  on Netgear R6250

* tag 'arm-soc/for-4.1/devicetree' of http://github.com/broadcom/stblinux:
  ARM: BCM5301X: Fix default state of power LEDs on Netgear R6250
  ARM: BCM5301X: Add DT for Netgear R8000
  ARM: dts: Enable Broadcom Cygnus BCM958305K

1  2 
arch/arm/boot/dts/Makefile

index 90e01de5c6e67fe31fe2dfd0a9a75e12e38ec65c,c6e0a4c5080c1a274e3212e5b49fffac3211fb11..c97519d6336fab006bd35535cb6381ca27fad0d8
@@@ -42,7 -42,6 +42,7 @@@ dtb-$(CONFIG_SOC_SAM_V7) += 
        sama5d34ek.dtb \
        sama5d35ek.dtb \
        sama5d36ek.dtb \
 +      at91-sama5d4_xplained.dtb \
        at91-sama5d4ek.dtb
  dtb-$(CONFIG_ARCH_ATLAS6) += \
        atlas6-evb.dtb
@@@ -60,13 -59,15 +60,15 @@@ dtb-$(CONFIG_ARCH_BCM_5301X) += 
        bcm4708-netgear-r6300-v2.dtb \
        bcm47081-asus-rt-n18u.dtb \
        bcm47081-buffalo-wzr-600dhp2.dtb \
-       bcm47081-buffalo-wzr-900dhp.dtb
+       bcm47081-buffalo-wzr-900dhp.dtb \
+       bcm4709-netgear-r8000.dtb
  dtb-$(CONFIG_ARCH_BCM_63XX) += \
        bcm963138dvt.dtb
  dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \
        bcm911360_entphn.dtb \
        bcm911360k.dtb \
-       bcm958300k.dtb
+       bcm958300k.dtb \
+       bcm958305k.dtb
  dtb-$(CONFIG_ARCH_BCM_MOBILE) += \
        bcm28155-ap.dtb \
        bcm21664-garnet.dtb
@@@ -200,8 -201,6 +202,8 @@@ dtb-$(CONFIG_ARCH_LPC32XX) += 
        ea3250.dtb phy3250.dtb
  dtb-$(CONFIG_MACH_MESON6) += \
        meson6-atv1200.dtb
 +dtb-$(CONFIG_MACH_MESON8) += \
 +      meson8-minix-neo-x8.dtb
  dtb-$(CONFIG_ARCH_MMP) += \
        pxa168-aspenite.dtb \
        pxa910-dkb.dtb \