diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-07-07 15:28:37 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-07 15:28:37 +0200 |
| commit | 885a976e2c4c3bf35e2144b6023cb781b3b996bb (patch) | |
| tree | 35200b3d0f2c9e66355467a485d5e132f3d897e7 /arch/arm/boot/dts/Makefile | |
| parent | dddaea6b963bca23c5fdbf7d3acdb80039aec528 (diff) | |
| parent | 9a4865d42fe50650e37061da93441133786feac2 (diff) | |
| download | linux-885a976e2c4c3bf35e2144b6023cb781b3b996bb.tar.bz2 | |
Merge tag 'arm-soc/for-4.8/devicetree-part2' of http://github.com/Broadcom/stblinux into next/dt
Merge "additional Broadcom ARM-based SoC Device Tree changes" from Florian Fainelli:
- Lubomir updates all BCM2835 (Raspberry Pi family) Device Tree source files with
their proper information about the on-board USB Ethernet adapter so there is
appropriate binding between this USB device and a device_node (useful for MAC
address fetching and stuff)
- Raveendra adds the ADC controller Device Tree nodes to the Cygnus SoC device
tree include files
- Rafal updates the BCM5301x Device Tree by separating how we specify the NAND
chip-select information in a first change and then fixes the NAND controller
ECC configuration for the D-Link DIR-885L
- Florian adds support for the BCM953012ER reference board, adds the HW random
number generator DT node and adds proper memory node information to the
BCM958625HR reference board
* tag 'arm-soc/for-4.8/devicetree-part2' of http://github.com/Broadcom/stblinux:
ARM: dts: NSP: Specify RAM amount for BCM958625HR board
ARM: BCM5301X: Fix NAND ECC parameters for D-Link DIR-885L
ARM: BCM5301X: Specify NAND chip select and ECC in separated files
ARM: dts: Cygnus: Add Broadcom iproc-static-adc DT node
ARM: dts: BCM5301x: Add BCM953012ER board
ARM: dts: BCM5301x: Add RNG Device Tree node
ARM: bcm2835: dt: Add the ethernet to the device trees
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 8f780c75ee3a..3cc5f0841c00 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -87,6 +87,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ bcm47094-dlink-dir-885l.dtb \ bcm94708.dtb \ bcm94709.dtb \ + bcm953012er.dtb \ bcm953012k.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += \ bcm963138dvt.dtb |