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

Commit 1b188329 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

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

- Rafal:

	* adds basic support for the Linksys EA9200, Linksys EA6300 V1, Linksys
	  EA9500, TP-Link Archer C5 V2 which are all based on BCM470x SoCs with
	  a bunch of BCM43602 radios.

	* updates the BCM5301X DTS and DTS include file and moves the serial
	  console parameters to the DTS include file since all BCM5301X that we have so
	  far are consistent in using the same UART. He also does the same for the
	  BCM53573 DTS.

	* makes some updates to the Tenda AC9 platform by describing its
	  PCIe controllers and endpoints in order to be able to represent GPIOs attached
	  to the on-chip Wi-Fi module. Once done, he adds the 2Ghz LED which is connected
	  to one of these GPIOs.

	* re-licenses the DTS files he created to the ISC license

	* removes the use of the non-existend "default-off" LED trigger in the
	  BCM53573 and BCM5301X DTS files

- Aditya adds missing Netgear R8000 LEDS and keys for WAN status LEDS and brightness

- Jon:
	* adds NAND controller Device Tree nodes to the BCM953012K reference board

  	* converts the BCM5301X SoC to use the recently introduced Broadcom QSPI controller
  	  Device Tree nodes.

	* fixes the GIC PPI interrupt flags that the kernel now
  	  reports about.

	* adds ARM TWD watchdog entries to the BCM5301X DTS include file
  	* adds I2C entries to the BCM5301X DTS include files.

	* disables i2c by default in the Northstar Plus DTS include file, and
	 ,enables it at the board level instead.

	* adds USB (OHCI & EHCI) Device Tree nodes to the Northstar Plus DTS
	  include files.

- Steven adds the mailbox (PDC) unit and the crytographic unit (SPU) to the
  Broadcom Northstar Plus SoC DTS include file. Steven also adds proper ethernet
  aliases to the BCM53012HR board since some bootloaders require that for MAC address
  patching.

- Eric adds the DSI and its corresponding clock nodes to the BCM283x DTS files
  but leaves them disabled by default (overlays should take care of enabling it)

- Boris adds support for HDMI audio and related DMA channels to the BCM283x SoCs

- Gerd adds support for the BCM2835 specific SDHCI controller to the BCM283x SoCs

- Rob fixes the iProc msi-controller name and unit address now that DTC can produce
  additional errors

* tag 'arm-soc/for-4.12/devicetree' of http://github.com/Broadcom/stblinux: (27 commits)
  ARM: dts: bcm: fix msi-controller name and unit address
  ARM: dts: BCM53573: Specify serial console parameters
  ARM: dts: BCM5301X: Specify serial console params in dtsi files
  ARM: dts: NSP: Add crypto (SPU) to dtsi
  ARM: dts: NSP: Add mailbox (PDC) to NSP
  ARM: dts: BCM953012HR: Add ethernet aliases
  ARM: dts: BCM5301X: Add support for TP-LINK Archer C5 V2
  ARM: dts: NSP: disable i2c DT entry by default
  ARM: dts: NSP: Add EHCI/OHCI USB nodes to device tree
  ARM: dts: BCM5301X: Add I2C support to the DT
  ARM: dts: BCM5301X: Add TWD WD Support to DT
  ARM: dts: BCM5301X: Correct GIC_PPI interrupt flags
  ARM: dts: bcm2835: add sdhost controller to devicetree
  ARM: dts: bcm283x: Add HDMI audio related properties
  ARM: dts: BCM5301X: Don't use nonexistent "default-off" LED trigger
  ARM: dts: BCM53573: Don't use nonexistent "default-off" LED trigger
  ARM: dts: BCM5301X: Add missing Netgear R8000 LEDs and Keys
  ARM: dts: BCM5301X: Relicense DTS files I created to the ISC
  ARM: dts: bcm2835: Add the DSI module nodes and clocks.
  ARM: dts: BCM53573: Add Tenda AC9 2 GHz LED
  ...
parents b916a609 414ce21a

arch/arm/boot/dts/Makefile

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

	bcm4708-asus-rt-ac68u.dtb \

	bcm4708-buffalo-wzr-1750dhp.dtb \

	bcm4708-linksys-ea6300-v1.dtb \

	bcm4708-luxul-xap-1510.dtb \

	bcm4708-luxul-xwc-1000.dtb \

	bcm4708-netgear-r6250.dtb \
@@ -87,17 +88,21 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
	bcm47081-buffalo-wzr-900dhp.dtb \

	bcm47081-luxul-xap-1410.dtb \

	bcm47081-luxul-xwr-1200.dtb \

	bcm47081-tplink-archer-c5-v2.dtb \

	bcm4709-asus-rt-ac87u.dtb \

	bcm4709-buffalo-wxr-1900dhp.dtb \

	bcm4709-linksys-ea9200.dtb \

	bcm4709-netgear-r7000.dtb \

	bcm4709-netgear-r8000.dtb \

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

	bcm47094-dlink-dir-885l.dtb \

	bcm47094-linksys-panamera.dtb \

	bcm47094-luxul-xwr-3100.dtb \

	bcm47094-netgear-r8500.dtb \

	bcm94708.dtb \

	bcm94709.dtb \

	bcm953012er.dtb \

	bcm953012hr.dtb \

	bcm953012k.dtb

dtb-$(CONFIG_ARCH_BCM_53573) += \

	bcm47189-tenda-ac9.dtb

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

+2 −2
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ 
			status = "disabled";



			msi-parent = <&msi0>;

			msi0: msi@18012000 {

			msi0: msi-controller {

				compatible = "brcm,iproc-msi";

				msi-controller;

				interrupt-parent = <&gic>;
@@ -240,7 +240,7 @@ 
			status = "disabled";



			msi-parent = <&msi1>;

			msi1: msi@18013000 {

			msi1: msi-controller {

				compatible = "brcm,iproc-msi";

				msi-controller;

				interrupt-parent = <&gic>;

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

+33 −3
Original line number Diff line number Diff line
@@ -245,6 +245,15 @@ 
			status = "disabled";

		};



		mailbox: mailbox@25000 {

			compatible = "brcm,iproc-fa2-mbox";

			reg = <0x25000 0x445>;

			interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;

			#mbox-cells = <1>;

			brcm,rx-status-len = <32>;

			brcm,use-bcm-hdr;

		};



		nand: nand@26000 {

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

			reg = <0x026000 0x600>,
@@ -288,6 +297,12 @@ 
			#size-cells = <0>;

		};



		crypto@2f000 {

			compatible = "brcm,spum-nsp-crypto";

			reg = <0x2f000 0x900>;

			mboxes = <&mailbox 0>;

		};



		gpiob: gpio@30000 {

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

			reg = <0x30000 0x50>;
@@ -306,6 +321,20 @@ 
			status = "disabled";

		};



		ehci0: usb@2a000 {

			compatible = "generic-ehci";

			reg = <0x2a000 0x100>;

			interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		ohci0: usb@2b000 {

			compatible = "generic-ohci";

			reg = <0x2b000 0x100>;

			interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		rng: rng@33000 {

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

			reg = <0x33000 0x14>;
@@ -347,6 +376,7 @@ 
			#size-cells = <0>;

			interrupts = <GIC_SPI 89 IRQ_TYPE_NONE>;

			clock-frequency = <100000>;

			status = "disabled";

		};



		watchdog@39000 {
@@ -450,7 +480,7 @@ 
		status = "disabled";



		msi-parent = <&msi0>;

		msi0: msi@18012000 {

		msi0: msi-controller {

			compatible = "brcm,iproc-msi";

			msi-controller;

			interrupt-parent = <&gic>;
@@ -486,7 +516,7 @@ 
		status = "disabled";



		msi-parent = <&msi1>;

		msi1: msi@18013000 {

		msi1: msi-controller {

			compatible = "brcm,iproc-msi";

			msi-controller;

			interrupt-parent = <&gic>;
@@ -522,7 +552,7 @@ 
		status = "disabled";



		msi-parent = <&msi2>;

		msi2: msi@18014000 {

		msi2: msi-controller {

			compatible = "brcm,iproc-msi";

			msi-controller;

			interrupt-parent = <&gic>;

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

+14 −0
Original line number Diff line number Diff line
@@ -69,6 +69,12 @@ 
	bus-width = <4>;

};



&sdhost {

	pinctrl-names = "default";

	pinctrl-0 = <&sdhost_gpio48>;

	bus-width = <4>;

};



&pwm {

	pinctrl-names = "default";

	pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
@@ -92,3 +98,11 @@ 
	power-domains = <&power RPI_POWER_DOMAIN_VEC>;

	status = "okay";

};



&dsi0 {

	power-domains = <&power RPI_POWER_DOMAIN_DSI0>;

};



&dsi1 {

	power-domains = <&power RPI_POWER_DOMAIN_DSI1>;

};

arch/arm/boot/dts/bcm283x.dtsi

+57 −3
Original line number Diff line number Diff line
@@ -93,10 +93,13 @@ 
			#clock-cells = <1>;

			reg = <0x7e101000 0x2000>;



			/* CPRMAN derives everything from the platform's

			 * oscillator.

			/* CPRMAN derives almost everything from the

			 * platform's oscillator.  However, the DSI

			 * pixel clocks come from the DSI analog PHY.

			 */

			clocks = <&clk_osc>;

			clocks = <&clk_osc>,

				<&dsi0 0>, <&dsi0 1>, <&dsi0 2>,

				<&dsi1 0>, <&dsi1 1>, <&dsi1 2>;

		};



		rng@7e104000 {
@@ -347,6 +350,16 @@ 
			arm,primecell-periphid = <0x00241011>;

		};



		sdhost: mmc@7e202000 {

			compatible = "brcm,bcm2835-sdhost";

			reg = <0x7e202000 0x100>;

			interrupts = <2 24>;

			clocks = <&clocks BCM2835_CLOCK_VPU>;

			dmas = <&dma 13>;

			dma-names = "rx-tx";

			status = "disabled";

		};



		i2s: i2s@7e203000 {

			compatible = "brcm,bcm2835-i2s";

			reg = <0x7e203000 0x20>,
@@ -390,6 +403,25 @@ 
			interrupts = <2 14>; /* pwa1 */

		};



		dsi0: dsi@7e209000 {

			compatible = "brcm,bcm2835-dsi0";

			reg = <0x7e209000 0x78>;

			interrupts = <2 4>;

			#address-cells = <1>;

			#size-cells = <0>;

			#clock-cells = <1>;



			clocks = <&clocks BCM2835_PLLA_DSI0>,

				 <&clocks BCM2835_CLOCK_DSI0E>,

				 <&clocks BCM2835_CLOCK_DSI0P>;

			clock-names = "phy", "escape", "pixel";



			clock-output-names = "dsi0_byte",

					     "dsi0_ddr2",

					     "dsi0_ddr";



		};



		thermal: thermal@7e212000 {

			compatible = "brcm,bcm2835-thermal";

			reg = <0x7e212000 0x8>;
@@ -456,6 +488,26 @@ 
			interrupts = <2 1>;

		};



		dsi1: dsi@7e700000 {

			compatible = "brcm,bcm2835-dsi1";

			reg = <0x7e700000 0x8c>;

			interrupts = <2 12>;

			#address-cells = <1>;

			#size-cells = <0>;

			#clock-cells = <1>;



			clocks = <&clocks BCM2835_PLLD_DSI1>,

				 <&clocks BCM2835_CLOCK_DSI1E>,

				 <&clocks BCM2835_CLOCK_DSI1P>;

			clock-names = "phy", "escape", "pixel";



			clock-output-names = "dsi1_byte",

					     "dsi1_ddr2",

					     "dsi1_ddr";



			status = "disabled";

		};



		i2c1: i2c@7e804000 {

			compatible = "brcm,bcm2835-i2c";

			reg = <0x7e804000 0x1000>;
@@ -499,6 +551,8 @@ 
			clocks = <&clocks BCM2835_PLLH_PIX>,

				 <&clocks BCM2835_CLOCK_HSM>;

			clock-names = "pixel", "hdmi";

			dmas = <&dma 17>;

			dma-names = "audio-rx";

			status = "disabled";

		};