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

Commit 2a65ec81 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

This pull request contains Broadcom ARM-based Device Tree changes for 4.13.

Note that Baruch's changes are fixes that are currently included in v4.12-rc2,
but they are also included here in order to keep this tag based off v4.12-rc1.

Please pull the following:

- Rafal adds CPU and thermal zones to the Northstar (BCM5301X) Device Tree and he
  also adds the MDIO controller nodes for later use by USB PHYs

- Eric adds support for the V3D engine and Ethernet switch on the Cygnus
  platforms, he also adds a set of Device Tree sources and include files for the
  Raspberry Pi 3 (BCM2837) to be used with the ARM/Linux kernel,

- Jon adds CPU and thermal zones to the Northstar Plus Device Tree files

- Stefan updates the Raspberry Pi DTS files with thermal trip points and zones,
  adds support for the USB OTG on the Raspberry Pi Zero which includes the
  proper dwc2 configuration, a generic USB PHY and finally the enabling of the
  OTG controller by including the proper DTS include file

- Gerd switches the Raspberry Pi DTS files to use the SDHOST controller (faster
  than the SDHCI)

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

:
  ARM: dts: bcm2835-rpi-zero: Enable OTG mode
  ARM: dts: bcm283x: Add generic USB PHY
  ARM: dts: bcm283x: Add dtsi for OTG mode
  ARM: dts: Cygnus: Add the ethernet switch and ethernet PHY
  ARM: dts: NSP: Add Thermal Support
  ARM: dts: Cygnus: Add BCM11360's V3D device
  ARM: dts: BCM5301X: Specify MDIO bus in the DT
  ARM: dts: BCM5301X: Add CPU thermal sensor and zone
  ARM: dts: bcm283x: switch from &sdhci to &sdhost
  ARM: dts: bcm283x: Add CPU thermal zone with 1 trip point
  ARM: dts: Add devicetree for the Raspberry Pi 3, for arm32 (v6)

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 1830893b 4a579ecf

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ 
	bcm2835-rpi-b-plus.dtb \

	bcm2835-rpi-a-plus.dtb \

	bcm2836-rpi-2-b.dtb \

	bcm2837-rpi-3-b.dtb \

	bcm2835-rpi-zero.dtb

dtb-$(CONFIG_ARCH_BCM_5301X) += \

	bcm4708-asus-rt-ac56u.dtb \

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

+71 −0
Original line number Diff line number Diff line
@@ -142,6 +142,55 @@ 
			interrupts = <0>;

		};



		mdio: mdio@18002000 {

			compatible = "brcm,iproc-mdio";

			reg = <0x18002000 0x8>;

			#size-cells = <1>;

			#address-cells = <0>;

			status = "disabled";



			gphy0: ethernet-phy@0 {

				reg = <0>;

			};



			gphy1: ethernet-phy@1 {

				reg = <1>;

			};

		};



		switch: switch@18007000 {

			compatible = "brcm,bcm11360-srab", "brcm,cygnus-srab";

			reg = <0x18007000 0x1000>;

			status = "disabled";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

					phy-handle = <&gphy0>;

					phy-mode = "rgmii";

				};



				port@1 {

					reg = <1>;

					phy-handle = <&gphy1>;

					phy-mode = "rgmii";

				};



				port@8 {

					reg = <8>;

					label = "cpu";

					ethernet = <&eth0>;

					fixed-link {

						speed = <1000>;

						full-duplex;

					};

				};

			};

		};



		i2c0: i2c@18008000 {

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

			reg = <0x18008000 0x100>;
@@ -295,6 +344,15 @@ 
			status = "disabled";

		};



		eth0: ethernet@18042000 {

			compatible = "brcm,amac";

			reg = <0x18042000 0x1000>,

			      <0x18110000 0x1000>;

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

			interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		nand: nand@18046000 {

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

			reg = <0x18046000 0x600>, <0xf8105408 0x600>,
@@ -386,6 +444,19 @@ 
			status = "disabled";

		};



		v3d: v3d@180a2000 {

			compatible = "brcm,cygnus-v3d";

			reg = <0x180a2000 0x1000>;

			clocks = <&mipipll BCM_CYGNUS_MIPIPLL_CH2_V3D>;

			clock-names = "v3d_clk";

			interrupts = <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		vc4: gpu {

			compatible = "brcm,cygnus-vc4";

		};



		adc: adc@180a6000 {

			compatible = "brcm,iproc-static-adc";

			#io-channel-cells = <1>;

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

+26 −0
Original line number Diff line number Diff line
@@ -413,6 +413,12 @@ 
			      <0x3f408 0x04>;

		};



		thermal: thermal@3f2c0 {

			compatible = "brcm,ns-thermal";

			reg = <0x3f2c0 0x10>;

			#thermal-sensor-cells = <0>;

		};



		sata_phy: sata_phy@40100 {

			compatible = "brcm,iproc-nsp-sata-phy";

			reg = <0x40100 0x340>;
@@ -563,4 +569,24 @@ 
			brcm,pcie-msi-inten;

		};

	};



	thermal-zones {

		cpu-thermal {

			polling-delay-passive = <0>;

			polling-delay = <1000>;

			coefficients = <(-556) 418000>;

			thermal-sensors = <&thermal>;



			trips {

				cpu-crit {

					temperature     = <125000>;

					hysteresis      = <0>;

					type            = "critical";

				};

			};



			cooling-maps {

			};

		};

	};

};

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

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
/dts-v1/;

#include "bcm2835.dtsi"

#include "bcm2835-rpi.dtsi"

#include "bcm283x-rpi-usb-host.dtsi"

#include "bcm283x-rpi-usb-otg.dtsi"



/ {

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

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

+1 −1
Original line number Diff line number Diff line
@@ -65,13 +65,13 @@ 
&sdhci {

	pinctrl-names = "default";

	pinctrl-0 = <&emmc_gpio48>;

	status = "okay";

	bus-width = <4>;

};



&sdhost {

	pinctrl-names = "default";

	pinctrl-0 = <&sdhost_gpio48>;

	status = "okay";

	bus-width = <4>;

};