Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

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

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

- Rafal adds support for the Netgear R8500 routers, adds basic support
  for the Tenda AC9 router which uses the new BCM53573 SoC (single core Cortex
  A7). He also enables the UART on the Netgear R8000 and restructures the
  include files a bit for the BCM47094 SoC, finally he adds USB 3.0 PHY nodes
  which enables USB 3.0 on BCM5301X devices that support it. Finally he adds
  support for the TP-LINK Archer C9 V1 router.

- Kamal adds support for the QSPI controller on the Northstar Plus SoCs and updates
  the bcm958625k reference board to have it enabled

- Dan adds support for the Luxul XAP-1510 (using a BCM4708) and XWR-3100 (using
  a BCM47094)

- Scott fixes the pinctrl names in the Cygnus DTS files

- Jonathan enables the Broadcom iProc mailbox controller for Broadcom Cygnus/iProc
  SoCs, he adds interrupt support for the GPIO CRMU hardware block and finally adds
  the node for the OTP controller found on Cygnus SoCs

- Dhananjay enables the GPIO B controller on Norstarh Plus SoCs

- Eric defines standard pinctrl groups in the BCM2835 GPIO node

- Gerd adds definitions for the pinctrl groups and updates the PWM, I2C and SDHCI nodes
  to use their appropriate pinctrl functions

- Linus adds names for the Raspberry Pi GPIO lines based on the datasheet

- Martin adds the DT binding and nodes for the Raspberry Pi firmware thermal block

- Stefan fixes a few typos with respect to the BCM2835 mailbox binding example and
  Device Tree nodes he also fixes the Raspberry Pi GPIO lines names and finally
  adds names for the Raspberry Zero GPIO lines

* tag 'arm-soc/for-4.10/devicetree' of http://github.com/Broadcom/stblinux: (29 commits)
  ARM: bcm2835: Add names for the RPi Zero GPIO lines
  ARM: bcm2835: Fix names for the Raspberry Pi GPIO lines
  ARM: dts: enable GPIO-b for Broadcom NSP
  ARM: BCM5301X: Add DT for TP-LINK Archer C9 V1
  ARM: dts: Add node for Broadcom OTP controller driver
  ARM: dts: Enable interrupt support for cygnus crmu gpio driver
  ARM: dts: Enable Broadcom iProc mailbox controller
  ARM: bcm2835: Add names for the Raspberry Pi GPIO lines
  ARM: bcm2835: dts: add thermal node to device-tree of bcm283x
  dt: bindings: add thermal device driver for bcm2835
  ARM: dts: bcm283x: fix typo in mailbox address
  DT: binding: bcm2835-mbox: fix address typo in example
  ARM: dts: cygnus: fix naming of pinctrl node
  ARM: BCM53573: Specify PMU and its ILP clock in the DT
  ARM: BCM5301X: Add DT for Luxul XWR-3100
  ARM: BCM5301X: Add DT for Luxul XAP-1510
  ARM: BCM5301X: Specify USB 3.0 PHY in DT
  ARM: BCM5301X: Enable UART on Netgear R8000
  ARM: BCM5301X: Add separated DTS include file for BCM47094
  ARM: dts: NSP: Add QSPI nodes to NSPI and bcm958625k DTSes
  ...
parents 82076f81 509f8342

Documentation/devicetree/bindings/mailbox/brcm,bcm2835-mbox.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ Required properties: 


Example:



mailbox: mailbox@7e00b800 {

mailbox: mailbox@7e00b880 {

	compatible = "brcm,bcm2835-mbox";

	reg = <0x7e00b880 0x40>;

	interrupts = <0 1>;

Documentation/devicetree/bindings/thermal/brcm,bcm2835-thermal.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Binding for Thermal Sensor driver for BCM2835 SoCs.



Required parameters:

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



compatible: 	should be one of: "brcm,bcm2835-thermal",

		"brcm,bcm2836-thermal" or "brcm,bcm2837-thermal"

reg:		Address range of the thermal registers.

clocks: 	Phandle of the clock used by the thermal sensor.



Example:



thermal: thermal@7e212000 {

	compatible = "brcm,bcm2835-thermal";

	reg = <0x7e212000 0x8>;

	clocks = <&clocks BCM2835_CLOCK_TSENS>;

};

arch/arm/boot/dts/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
	bcm4708-asus-rt-ac56u.dtb \

	bcm4708-asus-rt-ac68u.dtb \

	bcm4708-buffalo-wzr-1750dhp.dtb \

	bcm4708-luxul-xap-1510.dtb \

	bcm4708-luxul-xwc-1000.dtb \

	bcm4708-netgear-r6250.dtb \

	bcm4708-netgear-r6300-v2.dtb \
@@ -86,11 +87,16 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
	bcm4709-buffalo-wxr-1900dhp.dtb \

	bcm4709-netgear-r7000.dtb \

	bcm4709-netgear-r8000.dtb \

	bcm4709-tplink-archer-c9-v1.dtb \

	bcm47094-dlink-dir-885l.dtb \

	bcm47094-luxul-xwr-3100.dtb \

	bcm47094-netgear-r8500.dtb \

	bcm94708.dtb \

	bcm94709.dtb \

	bcm953012er.dtb \

	bcm953012k.dtb

dtb-$(CONFIG_ARCH_BCM_53573) += \

	bcm47189-tenda-ac9.dtb

dtb-$(CONFIG_ARCH_BCM_63XX) += \

	bcm963138dvt.dtb

dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \

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

+20 −1
Original line number Diff line number Diff line
@@ -91,6 +91,13 @@ 
		#address-cells = <1>;

		#size-cells = <1>;



		otp: otp@0301c800 {

			compatible = "brcm,ocotp";

			reg = <0x0301c800 0x2c>;

			brcm,ocotp-size = <2048>;

			status = "disabled";

		};



		pcie_phy: phy@0301d0a0 {

			compatible = "brcm,cygnus-pcie-phy";

			reg = <0x0301d0a0 0x14>;
@@ -108,12 +115,21 @@ 
			};

		};



		pinctrl: pinctrl@0x0301d0c8 {

		pinctrl: pinctrl@0301d0c8 {

			compatible = "brcm,cygnus-pinmux";

			reg = <0x0301d0c8 0x30>,

			      <0x0301d24c 0x2c>;

		};



		mailbox: mailbox@03024024 {

			compatible = "brcm,iproc-mailbox";

			reg = <0x03024024 0x40>;

			interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;

			#interrupt-cells = <1>;

			interrupt-controller;

			#mbox-cells = <1>;

		};



		gpio_crmu: gpio@03024800 {

			compatible = "brcm,cygnus-crmu-gpio";

			reg = <0x03024800 0x50>,
@@ -121,6 +137,9 @@ 
			ngpios = <6>;

			#gpio-cells = <2>;

			gpio-controller;

			interrupt-controller;

			interrupt-parent = <&mailbox>;

			interrupts = <0>;

		};



		i2c0: i2c@18008000 {

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

+40 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ 


	axi {

		compatible = "simple-bus";

		ranges = <0x00000000 0x18000000 0x0011ba08>;

		ranges = <0x00000000 0x18000000 0x0011c40a>;

		#address-cells = <1>;

		#size-cells = <1>;
@@ -241,6 +241,16 @@ 
			brcm,nand-has-wp;

		};



		gpiob: gpio@30000 {

			compatible = "brcm,iproc-nsp-gpio", "brcm,iproc-gpio";

			reg = <0x30000 0x50>;

			#gpio-cells = <2>;

			gpio-controller;

			ngpios = <4>;

			interrupt-controller;

			interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;

		};



		pwm: pwm@31000 {

			compatible = "brcm,iproc-pwm";

			reg = <0x31000 0x28>;
@@ -254,6 +264,35 @@ 
			reg = <0x33000 0x14>;

		};



		qspi: qspi@27200 {

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

			reg = <0x027200 0x184>,

			      <0x027000 0x124>,

			      <0x11c408 0x004>,

			      <0x0273a0 0x01c>;

			reg-names = "mspi", "bspi", "intr_regs",

				    "intr_status_reg";

			interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "spi_lr_fullness_reached",

					  "spi_lr_session_aborted",

					  "spi_lr_impatient",

					  "spi_lr_session_done",

					  "spi_lr_overhead",

					  "mspi_done",

					  "mspi_halted";

			clocks = <&iprocmed>;

			clock-names = "iprocmed";

			num-cs = <2>;

			#address-cells = <1>;

			#size-cells = <0>;

		};



		ccbtimer0: timer@34000 {

			compatible = "arm,sp804";

			reg = <0x34000 0x1000>;