summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-03-31 12:02:22 +0200
committerArnd Bergmann <arnd@arndb.de>2017-03-31 12:02:22 +0200
commit1b18832977557a4f326d70c0ff8d6a65c023e807 (patch)
treec8780a2acf014139bc5d32921981fcf231f9f4f7 /arch/arm/boot/dts/Makefile
parentb916a60994bb77dcc83826c1d18ccf18ff307914 (diff)
parent414ce21ae20547e0eea72fe0c4e8ee3280d30888 (diff)
downloadblackbird-obmc-linux-1b18832977557a4f326d70c0ff8d6a65c023e807.tar.gz
blackbird-obmc-linux-1b18832977557a4f326d70c0ff8d6a65c023e807.zip
Merge tag 'arm-soc/for-4.12/devicetree' of http://github.com/Broadcom/stblinux into next/dt
Pull "Broadcom devicetree changes for 4.12" from Florian Fainelli: This pull request contains Broadcom ARM-based SoCs Device Tree updates for 4.12, please pull the following: - Rafal: * adds basic support for the Linksys EA9200, Linksys EA6300 V1, Linksys EA9500, TP-Link Archer C5 V2 which are all based on BCM470x SoCs with a bunch of BCM43602 radios. * updates the BCM5301X DTS and DTS include file and moves the serial console parameters to the DTS include file since all BCM5301X that we have so far are consistent in using the same UART. He also does the same for the BCM53573 DTS. * makes some updates to the Tenda AC9 platform by describing its PCIe controllers and endpoints in order to be able to represent GPIOs attached to the on-chip Wi-Fi module. Once done, he adds the 2Ghz LED which is connected to one of these GPIOs. * re-licenses the DTS files he created to the ISC license * removes the use of the non-existend "default-off" LED trigger in the BCM53573 and BCM5301X DTS files - Aditya adds missing Netgear R8000 LEDS and keys for WAN status LEDS and brightness - Jon: * adds NAND controller Device Tree nodes to the BCM953012K reference board * converts the BCM5301X SoC to use the recently introduced Broadcom QSPI controller Device Tree nodes. * fixes the GIC PPI interrupt flags that the kernel now reports about. * adds ARM TWD watchdog entries to the BCM5301X DTS include file * adds I2C entries to the BCM5301X DTS include files. * disables i2c by default in the Northstar Plus DTS include file, and ,enables it at the board level instead. * adds USB (OHCI & EHCI) Device Tree nodes to the Northstar Plus DTS include files. - Steven adds the mailbox (PDC) unit and the crytographic unit (SPU) to the Broadcom Northstar Plus SoC DTS include file. Steven also adds proper ethernet aliases to the BCM53012HR board since some bootloaders require that for MAC address patching. - Eric adds the DSI and its corresponding clock nodes to the BCM283x DTS files but leaves them disabled by default (overlays should take care of enabling it) - Boris adds support for HDMI audio and related DMA channels to the BCM283x SoCs - Gerd adds support for the BCM2835 specific SDHCI controller to the BCM283x SoCs - Rob fixes the iProc msi-controller name and unit address now that DTC can produce additional errors * tag 'arm-soc/for-4.12/devicetree' of http://github.com/Broadcom/stblinux: (27 commits) ARM: dts: bcm: fix msi-controller name and unit address ARM: dts: BCM53573: Specify serial console parameters ARM: dts: BCM5301X: Specify serial console params in dtsi files ARM: dts: NSP: Add crypto (SPU) to dtsi ARM: dts: NSP: Add mailbox (PDC) to NSP ARM: dts: BCM953012HR: Add ethernet aliases ARM: dts: BCM5301X: Add support for TP-LINK Archer C5 V2 ARM: dts: NSP: disable i2c DT entry by default ARM: dts: NSP: Add EHCI/OHCI USB nodes to device tree ARM: dts: BCM5301X: Add I2C support to the DT ARM: dts: BCM5301X: Add TWD WD Support to DT ARM: dts: BCM5301X: Correct GIC_PPI interrupt flags ARM: dts: bcm2835: add sdhost controller to devicetree ARM: dts: bcm283x: Add HDMI audio related properties ARM: dts: BCM5301X: Don't use nonexistent "default-off" LED trigger ARM: dts: BCM53573: Don't use nonexistent "default-off" LED trigger ARM: dts: BCM5301X: Add missing Netgear R8000 LEDs and Keys ARM: dts: BCM5301X: Relicense DTS files I created to the ISC ARM: dts: bcm2835: Add the DSI module nodes and clocks. ARM: dts: BCM53573: Add Tenda AC9 2 GHz LED ...
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r--arch/arm/boot/dts/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 47048c42d402..93a572936292 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -77,6 +77,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
bcm4708-asus-rt-ac56u.dtb \
bcm4708-asus-rt-ac68u.dtb \
bcm4708-buffalo-wzr-1750dhp.dtb \
+ bcm4708-linksys-ea6300-v1.dtb \
bcm4708-luxul-xap-1510.dtb \
bcm4708-luxul-xwc-1000.dtb \
bcm4708-netgear-r6250.dtb \
@@ -87,17 +88,21 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
bcm47081-buffalo-wzr-900dhp.dtb \
bcm47081-luxul-xap-1410.dtb \
bcm47081-luxul-xwr-1200.dtb \
+ bcm47081-tplink-archer-c5-v2.dtb \
bcm4709-asus-rt-ac87u.dtb \
bcm4709-buffalo-wxr-1900dhp.dtb \
+ bcm4709-linksys-ea9200.dtb \
bcm4709-netgear-r7000.dtb \
bcm4709-netgear-r8000.dtb \
bcm4709-tplink-archer-c9-v1.dtb \
bcm47094-dlink-dir-885l.dtb \
+ bcm47094-linksys-panamera.dtb \
bcm47094-luxul-xwr-3100.dtb \
bcm47094-netgear-r8500.dtb \
bcm94708.dtb \
bcm94709.dtb \
bcm953012er.dtb \
+ bcm953012hr.dtb \
bcm953012k.dtb
dtb-$(CONFIG_ARCH_BCM_53573) += \
bcm47189-tenda-ac9.dtb
OpenPOWER on IntegriCloud