summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-02-15 16:49:40 +0300
committerArnd Bergmann <arnd@arndb.de>2019-02-15 16:50:05 +0300
commit33067418cedd3a20ef5948bf7f3747dc4906f602 (patch)
tree80ad938f39571cee99e17f849e6392d601cac517 /arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
parentbb173ff7f127aaf35cee843565eee23a3380232d (diff)
parent0a37cac509063da4696937482ab0d4e960ba358d (diff)
downloadlinux-33067418cedd3a20ef5948bf7f3747dc4906f602.tar.xz
Merge tag 'arm-soc/for-5.1/devicetree' of https://github.com/Broadcom/stblinux into arm/dt
This pull request contains Broadcom ARM-based SoCs Device Tree updates for 5.1, please pull the following: - Dan relicenses the Luxul DTS files to GPL 2.0+/MIT - Hao adds support for the Phicomm K3 which is a BCM4709 SoC with dual BCM4366 radio - Stefan adds support for the Raspberry Pi A+: binding and DTS files. He also provides a bunch of DTC warning fixes for the different RPi DTS(i) files and adds support for missing GPIO lines on RPi 2/3 * tag 'arm-soc/for-5.1/devicetree' of https://github.com/Broadcom/stblinux: ARM: dts: bcm2835-rpi-zero-w: Drop unnecessary pinctrl ARM: dts: bcm283x: Add missing GPIO line names ARM: dts: bcm2837-rpi-3-b-plus: Clarify label for STATUS_LED ARM: dts: bcm2837-rpi-3-b: Use consistent label for HDMI hotplug ARM: dts: bcm2835: Fix labels for GPIO 0,1 ARM: dts: bcm2835-rpi: Drop unnecessary #address-cells/#size-cells ARM: dts: bcm283x: Fix DTC warning for memory node ARM: dts: add Raspberry Pi 3 A+ dt-bindings: bcm: Add Raspberry Pi 3 A+ ARM: dts: BCM5301X: Add basic DT for Phicomm K3 ARM: dts: BCM53573: Relicense Luxul files to the GPL 2.0+ / MIT Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts')
-rw-r--r--arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
index 1a5ec22a172c..eb59508578e4 100644
--- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
+++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright 2017 Luxul Inc.
- *
- * Licensed under the ISC license.
*/
/dts-v1/;