Commit 33067418 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents bb173ff7 0a37cac5

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

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ Raspberry Pi 2 Model B 
Required root node properties:

compatible = "raspberrypi,2-model-b", "brcm,bcm2836";



Raspberry Pi 3 Model A+

Required root node properties:

compatible = "raspberrypi,3-model-a-plus", "brcm,bcm2837";



Raspberry Pi 3 Model B

Required root node properties:

compatible = "raspberrypi,3-model-b", "brcm,bcm2837";

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ 
	bcm2835-rpi-a-plus.dtb \

	bcm2835-rpi-cm1-io1.dtb \

	bcm2836-rpi-2-b.dtb \

	bcm2837-rpi-3-a-plus.dtb \

	bcm2837-rpi-3-b.dtb \

	bcm2837-rpi-3-b-plus.dtb \

	bcm2837-rpi-cm3-io3.dtb \
@@ -115,6 +116,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
	bcm47094-luxul-xwr-3100.dtb \

	bcm47094-luxul-xwr-3150-v1.dtb \

	bcm47094-netgear-r8500.dtb \

	bcm47094-phicomm-k3.dtb \

	bcm94708.dtb \

	bcm94709.dtb \

	bcm953012er.dtb \

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

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
	 * "FOO" = GPIO line named "FOO" on the schematic

	 * "FOO_N" = GPIO line named "FOO" on schematic, active low

	 */

	gpio-line-names = "SDA0",

			  "SCL0",

	gpio-line-names = "ID_SDA",

			  "ID_SCL",

			  "SDA1",

			  "SCL1",

			  "GPIO_GCLK",

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

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ 
	 * "FOO" = GPIO line named "FOO" on the schematic

	 * "FOO_N" = GPIO line named "FOO" on schematic, active low

	 */

	gpio-line-names = "SDA0",

			  "SCL0",

	gpio-line-names = "ID_SDA",

			  "ID_SCL",

			  "SDA1",

			  "SCL1",

			  "GPIO_GCLK",

arch/arm/boot/dts/bcm2835-rpi-zero-w.dts

+2 −9
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 


	wifi_pwrseq: wifi-pwrseq {

		compatible = "mmc-pwrseq-simple";

		pinctrl-names = "default";

		pinctrl-0 = <&wl_on>;

		reset-gpios = <&gpio 41 GPIO_ACTIVE_LOW>;

	};

};
@@ -40,8 +38,8 @@ 
	 * "FOO" = GPIO line named "FOO" on the schematic

	 * "FOO_N" = GPIO line named "FOO" on schematic, active low

	 */

	gpio-line-names = "GPIO0",

			  "GPIO1",

	gpio-line-names = "ID_SDA",

			  "ID_SCL",

			  "SDA1",

			  "SCL1",

			  "GPIO_GCLK",
@@ -98,11 +96,6 @@ 
			  "SD_DATA3_R";



	pinctrl-0 = <&gpioout &alt0>;



	wl_on: wl-on {

		brcm,pins = <41>;

		brcm,function = <BCM2835_FSEL_GPIO_OUT>;

	};

};



&hdmi {

CRA Git | Maintained and supported by SUSTech CRA and CCSE