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

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

Pull "Broadcom devicetree changes for 4.9" from Florian Fainelli:

This pull request contains Broadcom ARM-based Device Tree changes for v4.9,
please pull the following:

- Jon adds support for the Ethernet MAC DT nodes (AMAC) and provides the
  following updates for Broadcom references boards:
  * New Northstar Plus reference boards added: BCM958525er, BCM958522er,
    BCM988312hr, BCM958623hr and BCM958622hr
  * Add SATA nodes to the BCM958625hr and XMC boards
  * Add I2C nodes to the XMC board
  * Fixes the amount of RAM on BCM958625HR, BCM958625K and BCM958525XMC boards
  * Add the GPIO reboot method for BCM958625hr and XMC boards

- Dhanajay adds PWM nodes for the Northstar Plus SoCs

- Rafal adds the USB 2.0 PHY to the BCM5301x Device Tree file include

- Stefan adds a missing USB clock to the BCM283x DT files, adds a DTSI file for
  the USB host mode on BCM283x and finally documents and adds support for the
  Raspberry Pi Zero

- Florian adds support for the Northstar Plus Switch Register Access block which
  enables the integrated switch on these SoCs and enables the switch ports on the
  BCM958625HR reference board

* tag 'arm-soc/for-4.9/devicetree' of http://github.com/Broadcom/stblinux: (22 commits)
  ARM: dts: bcm2835: Add Raspberry Pi Zero
  DT: bindings: bcm: Add Raspberry Pi Zero
  ARM: dts: bcm283x: Add dtsi for USB host mode
  ARM: dts: bcm283x: Add missing USB clock
  ARM: dts: NSP: Add new DT file for bcm958622hr
  ARM: dts: NSP: Add new DT file for bcm958623hr
  ARM: dts: NSP: Add new DT file for bcm988312hr
  ARM: dts: NSP: Add new DT file for bcm958522er
  ARM: dts: NSP: Add new DT file for bcm958525er
  ARM: dts: NSP: Add GPIO reboot method to bcm958625xmc DTS file
  ARM: dts: NSP: Add GPIO reboot method to bcm958625hr DTS file
  ARM: dts: NSP: Specify RAM amount for BCM958525XMC board
  ARM: dts: NSP: Specify RAM amount for BCM958625K board
  ARM: dts: NSP: Enable SATA and add i2c devices on XMC
  ARM: dts: NSP: Enable SATA on bcm958625hr
  ARM: dts: NSP: Correct RAM amount for BCM958625HR board
  ARM: dts: NSP: Add PWM Support to DT
  ARM: BCM5301X: Specify PHY of USB 2.0 in DT
  ARM: dts: NSP: Add BCM958625HR switch ports
  ARM: dts: NSP: Add Switch Register Access Block node
  ...
parents 327c2c15 7260ecd2

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

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ Raspberry Pi Compute Module 
Required root node properties:

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



Raspberry Pi Zero

Required root node properties:

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



Generic BCM2835 board

Required root node properties:

compatible = "brcm,bcm2835";

Documentation/devicetree/bindings/net/brcm,amac.txt

0 → 100644
+24 −0
Original line number Diff line number Diff line 
Broadcom AMAC Ethernet Controller Device Tree Bindings

-------------------------------------------------------------



Required properties:

 - compatible:	"brcm,amac" or "brcm,nsp-amac"

 - reg:		Address and length of the GMAC registers,

		Address and length of the GMAC IDM registers

 - reg-names:	Names of the registers.  Must have both "amac_base" and

		"idm_base"

 - interrupts:	Interrupt number



Optional properties:

- mac-address:	See ethernet.txt file in the same directory



Examples:



amac0: ethernet@18022000 {

	compatible = "brcm,nsp-amac";

	reg = <0x18022000 0x1000>,

	      <0x18110000 0x1000>;

	reg-names = "amac_base", "idm_base";

	interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;

	status = "disabled";

};

Documentation/devicetree/bindings/net/brcm,bgmac-nsp.txt

0 → 100644
+24 −0
Original line number Diff line number Diff line 
Broadcom GMAC Ethernet Controller Device Tree Bindings

-------------------------------------------------------------



Required properties:

 - compatible:	"brcm,bgmac-nsp"

 - reg:		Address and length of the GMAC registers,

		Address and length of the GMAC IDM registers

 - reg-names:	Names of the registers.  Must have both "gmac_base" and

		"idm_base"

 - interrupts:	Interrupt number



Optional properties:

- mac-address:	See ethernet.txt file in the same directory



Examples:



gmac0: ethernet@18022000 {

	compatible = "brcm,bgmac-nsp";

	reg = <0x18022000 0x1000>,

	      <0x18110000 0x1000>;

	reg-names = "gmac_base", "idm_base";

	interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;

	status = "disabled";

};

arch/arm/boot/dts/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ 
	bcm2835-rpi-b-rev2.dtb \

	bcm2835-rpi-b-plus.dtb \

	bcm2835-rpi-a-plus.dtb \

	bcm2836-rpi-2-b.dtb

	bcm2836-rpi-2-b.dtb \

	bcm2835-rpi-zero.dtb

dtb-$(CONFIG_ARCH_BCM_5301X) += \

	bcm4708-asus-rt-ac56u.dtb \

	bcm4708-asus-rt-ac68u.dtb \
@@ -102,8 +103,13 @@ dtb-$(CONFIG_ARCH_BCM_MOBILE) += \ 
	bcm21664-garnet.dtb \

	bcm23550-sparrow.dtb

dtb-$(CONFIG_ARCH_BCM_NSP) += \

	bcm958522er.dtb \

	bcm958525er.dtb \

	bcm958525xmc.dtb \

	bcm958622hr.dtb \

	bcm958623hr.dtb \

	bcm958625hr.dtb \

	bcm988312hr.dtb \

	bcm958625k.dtb

dtb-$(CONFIG_ARCH_BERLIN) += \

	berlin2-sony-nsz-gs7.dtb \

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

+37 −0
Original line number Diff line number Diff line
@@ -209,6 +209,24 @@ 
			#dma-cells = <1>;

		};



		amac0: ethernet@22000 {

			compatible = "brcm,nsp-amac";

			reg = <0x022000 0x1000>,

			      <0x110000 0x1000>;

			reg-names = "amac_base", "idm_base";

			interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		amac1: ethernet@23000 {

			compatible = "brcm,nsp-amac";

			reg = <0x023000 0x1000>,

			      <0x111000 0x1000>;

			reg-names = "amac_base", "idm_base";

			interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		nand: nand@26000 {

			compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";

			reg = <0x026000 0x600>,
@@ -223,6 +241,14 @@ 
			brcm,nand-has-wp;

		};



		pwm: pwm@31000 {

			compatible = "brcm,iproc-pwm";

			reg = <0x31000 0x28>;

			clocks = <&osc>;

			#pwm-cells = <3>;

			status = "disabled";

		};



		rng: rng@33000 {

			compatible = "brcm,bcm-nsp-rng";

			reg = <0x33000 0x14>;
@@ -246,6 +272,17 @@ 
			clock-names = "apb_pclk";

		};



		srab: srab@36000 {

			compatible = "brcm,nsp-srab";

			reg = <0x36000 0x1000>;

			#address-cells = <1>;

			#size-cells = <0>;



			status = "disabled";



			/* ports are defined in board DTS */

		};



		i2c0: i2c@38000 {

			compatible = "brcm,iproc-i2c";

			reg = <0x38000 0x50>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE