diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-03-11 22:51:11 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-03-11 22:51:11 +0100 |
| commit | 4d0b756ec74861f1ca4bf3fe41c3266aa9317f4e (patch) | |
| tree | b9b80c86a7e45cacf09d5378046290153f3f2563 /arch/arm/boot/dts/Makefile | |
| parent | e3d00145e3c9e9d39219e183a47aa196a93447ef (diff) | |
| parent | 7875b470c9d80dff2d58ae9692adb3a2b5814a89 (diff) | |
| download | linux-next-4d0b756ec74861f1ca4bf3fe41c3266aa9317f4e.tar.gz | |
Merge tag 'arm-soc/for-4.1/devicetree' of http://github.com/broadcom/stblinux into next/dt
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
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 90e01de5c6e6..c97519d6336f 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -60,13 +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 |