Commit 828a34b9 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

- Rafal enables the UART by default on all BCM5301x, BCM4708, BCM4709 since
  every device found out there has it enabled by default. He also fixes the
  LED definitions for the Luxul XWR-3100 device, enables USB controllers and
  their respective PHY devices, specifies the correct GPIO to power on USB
  HUBs, adds the additional RAM bank for somes devices, and finally sets the
  correct 5Ghz frequency limits on the Netgear R8000

- Jon does a number of Norsthar Plus SoC cleanups, fixes NAND partitions unit
  addresses, adds QSPI support to a bunch of boards, adds Ethernet switch ports
  to the BCM958625K reference board, enables 3rd Ethernet MAC instance to
  relevant DTSes, enables Ethernet on the XMC board, and finally adds SD/MMC
  support to the XMC board

- Boris adds the Video Encoder nodes to the Raspberry Pi DTS include files
  ands enables it on the relevant boards

- Dan adds support for two new Luxul devices: XAP-1410 and XWR-1200, both
  BCM47081 based SoCs

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

:
  ARM: dts: bcm283x: Enable the VEC IP on all RaspberryPi boards
  ARM: dts: bcm283x: Add VEC node in bcm283x.dtsi
  ARM: dts: BCM5301X: Add DT for Luxul XWR-1200
  ARM: dts: BCM5301X: Add DT for Luxul XAP-1410
  ARM: dts: BCM5301X: Set 5 GHz wireless frequency limits on Netgear R8000
  ARM: dts: NSP: Add SD/MMC support
  ARM: dts: NSP: Add Ethernet to NSP XMC
  ARM: dts: NSP: Add and enable amac2
  ARM: dts: NSP: Add BCM958625K switch ports
  ARM: dts: NSP: Add QSPI support to missing boards
  ARM: dts: NSP: Correct NAND partition unit address
  ARM: dts: NSP: DT Clean-ups
  ARM: dts: BCM53573: Specify USB ports of on-SoC controllers
  ARM: dts: BCM5301X: Specify all RAM by including an extra block
  ARM: dts: BCM5301X: Set GPIO enabling USB power on Netgear R7000
  ARM: dts: BCM5301X: Specify USB controllers in DT
  ARM: dts: BCM5301X: Fix LAN LED labels for Luxul XWR-3100
  ARM: dts: BCM5301X: Enable UART by default for BCM4708(1), BCM4709(4) & BCM53012

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 15fa0009 c5a8e3ad

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
	bcm47081-asus-rt-n18u.dtb \

	bcm47081-buffalo-wzr-600dhp2.dtb \

	bcm47081-buffalo-wzr-900dhp.dtb \

	bcm47081-luxul-xap-1410.dtb \

	bcm47081-luxul-xwr-1200.dtb \

	bcm4709-asus-rt-ac87u.dtb \

	bcm4709-buffalo-wxr-1900dhp.dtb \

	bcm4709-netgear-r7000.dtb \

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

+41 −23
Original line number Diff line number Diff line
@@ -209,6 +209,15 @@ 
			#dma-cells = <1>;

		};



		sdio: sdhci@21000 {

			compatible = "brcm,sdhci-iproc-cygnus";

			reg = <0x21000 0x100>;

			interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;

			sdhci,auto-cmd12;

			clocks = <&lcpll0 BCM_NSP_LCPLL0_SDIO_CLK>;

			status = "disabled";

		};



		amac0: ethernet@22000 {

			compatible = "brcm,nsp-amac";

			reg = <0x022000 0x1000>,
@@ -227,6 +236,15 @@ 
			status = "disabled";

		};



		amac2: ethernet@24000 {

			compatible = "brcm,nsp-amac";

			reg = <0x024000 0x1000>,

			      <0x112000 0x1000>;

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

			interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		nand: nand@26000 {

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

			reg = <0x026000 0x600>,
@@ -241,29 +259,6 @@ 
			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>;

			clocks = <&osc>;

			#pwm-cells = <3>;

			status = "disabled";

		};



		rng: rng@33000 {

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

			reg = <0x33000 0x14>;

		};



		qspi: qspi@27200 {

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

			reg = <0x027200 0x184>,
@@ -293,6 +288,29 @@ 
			#size-cells = <0>;

		};



		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>;

			clocks = <&osc>;

			#pwm-cells = <3>;

			status = "disabled";

		};



		rng: rng@33000 {

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

			reg = <0x33000 0x14>;

		};



		ccbtimer0: timer@34000 {

			compatible = "arm,sp804";

			reg = <0x34000 0x1000>;

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

+5 −0
Original line number Diff line number Diff line
@@ -87,3 +87,8 @@ 
	power-domains = <&power RPI_POWER_DOMAIN_HDMI>;

	status = "okay";

};



&vec {

	power-domains = <&power RPI_POWER_DOMAIN_VEC>;

	status = "okay";

};

arch/arm/boot/dts/bcm283x.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -476,6 +476,14 @@ 
			status = "disabled";

		};



		vec: vec@7e806000 {

			compatible = "brcm,bcm2835-vec";

			reg = <0x7e806000 0x1000>;

			clocks = <&clocks BCM2835_CLOCK_VEC>;

			interrupts = <2 27>;

			status = "disabled";

		};



		pixelvalve@7e807000 {

			compatible = "brcm,bcm2835-pixelvalve2";

			reg = <0x7e807000 0x100>;

arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ 
	};



	memory {

		reg = <0x00000000 0x08000000>;

		reg = <0x00000000 0x08000000

		       0x88000000 0x08000000>;

	};



	leds {

CRA Git | Maintained and supported by SUSTech CRA and CCSE