Commit 6125a690 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

- Rafal updates the Broadcom BCM5301x (Northstar) DTS files to use the
  new style partition parser and removes the unsupported/undocumented
  linux,part-probe properties that were previously introduced

- Stefan adds supports for the Raspberry Pi Compute Module 3/3Lite, he
  also updates the Raspberry Pi 3B+ USB Ethernet adapter to have proper
  LED configuration

- Rob fixes a bunch of SPI bus warnings in the Northstar Plus and
  Hurricane 2 DTS files

- Florian documents the Broadcom roboswitch Switch Register Access Block
  (SRAB) interrupts, adds the switch interrupts to the Northstar Plus
  DTS include file and finally updates the BCM958625HR reference board to
  have the proper SFP module definition

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

:
  ARM: dts: bcm: Fix SPI bus warnings
  ARM: dts: NSP: Wire up switch interrupts
  dt-bindings: net: dsa: Document B53 SRAB interrupts and registers
  ARM: dts: NSP: Enable SFP on bcm958625hr
  ARM: dts: bcm283x-rpi-lan7515: Enable Ethernet LEDs
  ARM: dts: BCM5301X: Specify flash partitions
  ARM: dts: add Raspberry Pi Compute Module 3 and IO board
  dt-bindings: bcm: Add Raspberry Pi CM3 and CM3L

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 68df1dba ab0b47d2

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

+8 −0
Original line number Diff line number Diff line
@@ -42,6 +42,14 @@ Raspberry Pi Compute Module 
Required root node properties:

compatible = "raspberrypi,compute-module", "brcm,bcm2835";



Raspberry Pi Compute Module 3

Required root node properties:

compatible = "raspberrypi,3-compute-module", "brcm,bcm2837";



Raspberry Pi Compute Module 3 Lite

Required root node properties:

compatible = "raspberrypi,3-compute-module-lite", "brcm,bcm2837";



Raspberry Pi Zero

Required root node properties:

compatible = "raspberrypi,model-zero", "brcm,bcm2835";

Documentation/devicetree/bindings/net/dsa/b53.txt

+36 −0
Original line number Diff line number Diff line
@@ -46,6 +46,42 @@ Required properties: 
      "brcm,bcm6328-switch"

      "brcm,bcm6368-switch" and the mandatory "brcm,bcm63xx-switch"



Required properties for BCM585xx/586xx/88312 SoCs:



 - reg: a total of 3 register base addresses, the first one must be the

   Switch Register Access block base, the second is the port 5/4 mux

   configuration register and the third one is the SGMII configuration

   and status register base address.



 - interrupts: a total of 13 interrupts must be specified, in the following

   order: port 0-5, 7-8 link status change, then the integrated PHY interrupt,

   then the timestamping interrupt and the sleep timer interrupts for ports

   5,7,8.



Optional properties for BCM585xx/586xx/88312 SoCs:



  - reg-names: a total of 3 names matching the 3 base register address, must

    be in the following order:

	"srab"

	"mux_config"

	"sgmii_config"



  - interrupt-names: a total of 13 names matching the 13 interrupts specified

    must be in the following order:

	"link_state_p0"

	"link_state_p1"

	"link_state_p2"

	"link_state_p3"

	"link_state_p4"

	"link_state_p5"

	"link_state_p7"

	"link_state_p8"

	"phy"

	"ts"

	"imp_sleep_timer_p5"

	"imp_sleep_timer_p7"

	"imp_sleep_timer_p8"



See Documentation/devicetree/bindings/net/dsa/dsa.txt for a list of additional

required and optional properties.

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ 
	bcm2836-rpi-2-b.dtb \

	bcm2837-rpi-3-b.dtb \

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

	bcm2837-rpi-cm3-io3.dtb \

	bcm2835-rpi-zero.dtb \

	bcm2835-rpi-zero-w.dtb

dtb-$(CONFIG_ARCH_BCM_5301X) += \

arch/arm/boot/dts/bcm-hr2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ rng: rng@33000 { 
			reg = <0x33000 0x14>;

		};



		qspi: qspi@27200 {

		qspi: spi@27200 {

			compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi";

			reg = <0x027200 0x184>,

			      <0x027000 0x124>,

arch/arm/boot/dts/bcm-nsp.dtsi

+31 −2
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ nand: nand@26000 { 
			brcm,nand-has-wp;

		};



		qspi: qspi@27200 {

		qspi: spi@27200 {

			compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi";

			reg = <0x027200 0x184>,

			      <0x027000 0x124>,
@@ -377,7 +377,36 @@ ccbtimer1: timer@35000 { 


		srab: srab@36000 {

			compatible = "brcm,nsp-srab";

			reg = <0x36000 0x1000>;

			reg = <0x36000 0x1000>,

			      <0x3f308 0x8>,

			      <0x3f410 0xc>;

			reg-names = "srab", "mux_config", "sgmii";

			interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "link_state_p0",

					  "link_state_p1",

					  "link_state_p2",

					  "link_state_p3",

					  "link_state_p4",

					  "link_state_p5",

					  "link_state_p7",

					  "link_state_p8",

					  "phy",

					  "ts",

					  "imp_sleep_timer_p5",

					  "imp_sleep_timer_p7",

					  "imp_sleep_timer_p8";

			#address-cells = <1>;

			#size-cells = <0>;