Commit 37eee103 authored May 14, 2018 by Olof Johansson

Merge tag 'arm-soc/for-4.18/devicetree' of https://github.com/Broadcom/stblinux into next/dt

This pull request contains Broadcom ARM-based SoC Device Tree changes
for 4.18, please pull the following:

- Stefan provides updates to the BCM2835 RNG Device Tree binding and
  Device Tree node by adding its missing interrupt line.

- Rafal switches the Luxul XWC-1000 and the D-Link DIR-885L to the new
  partitions syntax which allows specifying a partition parser

- Rafal also updates a bunch of BCM5301X Device Tree source files to a
  more standard SPDX tag and dual GPL 2.0 and MIT. This is a follow-up
  to this discussion with Greg:
  https://lkml.org/lkml/2018/4/28/179

- Dan adds support for two Luxul devices: XAP-1610 (based on BCM47094)
  and XWR-3150 V1 (similar to XWR-3100)

- Stefan provides a set of updates to the BCM283x Device Tree sources to
  support the Raspberry Pi 3 B+ for both the ARM and ARM64 kernels. He
  adds the required nodes for the LAN7515 USB Ethernet, Cypress CYW43455
  BT/WiFi combo chip. Stefan also provides a few fixes for the PWM pin
  assignment for RPi 3B and Zero/Zero W. Finally, Stefan adds the
  missing GPIOs for controlling additional peripherals now that support
  for the RPi 3 GPIO expander has landed

* tag 'arm-soc/for-4.18/devicetree' of https://github.com/Broadcom/stblinux

:
  ARM: dts: BCM5301X: Switch D-Link DIR-885L to the new partitions syntax
  ARM: dts: BCM5301X: Relicense Asus RT-AC87U file to the GPL 2.0+ / MIT
  ARM: dts: BCM5301X: Add DT for Luxul XAP-1610
  ARM: dts: BCM5301X: Add DT for Luxul XWR-3150 V1
  ARM: dts: BCM5301X: Relicense Buffalo files to the GPL 2.0+ / MIT
  ARM: dts: BCM5301X: Relicense most DTS files to the GPL 2.0+ / MIT
  arm64: dts: broadcom: Add reference to Raspberry Pi 3 B+
  ARM: dts: bcm2837: Add Raspberry Pi 3 B+
  dt-bindings: bcm: Add Raspberry Pi 3 B+
  ARM: dts: bcm2837: Add missing GPIOs of Expander
  ARM: dts: bcm283x: Fix PWM pin assignment
  ARM: dts: BCM5301X: Switch Luxul XWC-1000 to the new fixed partitions syntax
  ARM: bcm283x: Add missing interrupt for RNG block
  dt-binding: rng: Add interrupt property for BCM2835

Signed-off-by: Olof Johansson <olof@lixom.net>

parents f4f8ef04 a05f1e36

Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,10 @@ Raspberry Pi 3 Model B
		Required root node properties:
		compatible = "raspberrypi,3-model-b", "brcm,bcm2837";

		Raspberry Pi 3 Model B+
		Required root node properties:
		compatible = "raspberrypi,3-model-b-plus", "brcm,bcm2837";

		Raspberry Pi Compute Module
		Required root node properties:
		compatible = "raspberrypi,compute-module", "brcm,bcm2835";

Documentation/devicetree/bindings/rng/brcm,bcm2835.txt

+7 −2

Original line number	Diff line number	Diff line
		@@ -14,11 +14,16 @@ Optional properties:
		- clocks : phandle to clock-controller plus clock-specifier pair
		- clock-names : "ipsec" as a clock name

		Optional properties:

		- interrupts: specify the interrupt for the RNG block

		Example:

		rng {
		compatible = "brcm,bcm2835-rng";
		reg = <0x7e104000 0x10>;
		interrupts = <2 29>;
		};

		rng@18033000 {

arch/arm/boot/dts/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
		bcm2835-rpi-a-plus.dtb \
		bcm2836-rpi-2-b.dtb \
		bcm2837-rpi-3-b.dtb \
		bcm2837-rpi-3-b-plus.dtb \
		bcm2835-rpi-zero.dtb \
		bcm2835-rpi-zero-w.dtb
		dtb-$(CONFIG_ARCH_BCM_5301X) += \
		@@ -102,8 +103,10 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
		bcm47094-dlink-dir-885l.dtb \
		bcm47094-linksys-panamera.dtb \
		bcm47094-luxul-abr-4500.dtb \
		bcm47094-luxul-xap-1610.dtb \
		bcm47094-luxul-xbr-4500.dtb \
		bcm47094-luxul-xwr-3100.dtb \
		bcm47094-luxul-xwr-3150-v1.dtb \
		bcm47094-netgear-r8500.dtb \
		bcm94708.dtb \
		bcm94709.dtb \

arch/arm/boot/dts/bcm2835-rpi-a-plus.dts

+6 −0

Original line number	Diff line number	Diff line
		@@ -101,6 +101,12 @@ &hdmi {
		hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
		};

		&pwm {
		pinctrl-names = "default";
		pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
		status = "okay";
		};

		&uart0 {
		pinctrl-names = "default";
		pinctrl-0 = <&uart0_gpio14>;

arch/arm/boot/dts/bcm2835-rpi-a.dts

+6 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,12 @@ &hdmi {
		hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
		};

		&pwm {
		pinctrl-names = "default";
		pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
		status = "okay";
		};

		&uart0 {
		pinctrl-names = "default";
		pinctrl-0 = <&uart0_gpio14>;