Commit 3aa45174 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'arm-soc/for-5.3/devicetree-arm64' of https://github.com/Broadcom/stblinux into arm/dt 

This pull request contains Broadcom ARM64-based SoCs Device Tree changes
for 5.3, please pull the following:

- Pramod adds the Device Tree nodes for thermal support on Stingray

- Srinath adds the Device Tree nodes for both XHCI (host) and BDC
  (device) modes

- Rayagonda adds the Device Tree node for slave I2C operation when
  Stingray operates as a SmartNIC

* tag 'arm-soc/for-5.3/devicetree-arm64' of https://github.com/Broadcom/stblinux

:
  arm64: dts: Stingray: Add NIC i2c device node
  arm64: dts: Add USB DT nodes for Stingray SoC
  arm64: dts: stingray: Add Stingray Thermal DT support.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3990c991 f8526c2d

arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi

0 → 100644
+72 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0 or BSD-3-Clause)

/*

 *Copyright(c) 2018 Broadcom

 */

	usb {

		compatible = "simple-bus";

		dma-ranges;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0x0 0x0 0x68500000 0x00400000>;



		usbphy0: usb-phy@0 {

			compatible = "brcm,sr-usb-combo-phy";

			reg = <0x00000000 0x100>;

			#phy-cells = <1>;

			status = "disabled";

		};



		xhci0: usb@1000 {

			compatible = "generic-xhci";

			reg = <0x00001000 0x1000>;

			interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>;

			phys = <&usbphy0 1>, <&usbphy0 0>;

			phy-names = "phy0", "phy1";

			dma-coherent;

			status = "disabled";

		};



		bdc0: usb@2000 {

			compatible = "brcm,bdc-v0.16";

			reg = <0x00002000 0x1000>;

			interrupts = <GIC_SPI 259 IRQ_TYPE_LEVEL_HIGH>;

			phys = <&usbphy0 0>, <&usbphy0 1>;

			phy-names = "phy0", "phy1";

			dma-coherent;

			status = "disabled";

		};



		usbphy1: usb-phy@10000 {

			compatible = "brcm,sr-usb-combo-phy";

			reg = <0x00010000 0x100>;

			#phy-cells = <1>;

			status = "disabled";

		};



		usbphy2: usb-phy@20000 {

			compatible = "brcm,sr-usb-hs-phy";

			reg = <0x00020000 0x100>;

			#phy-cells = <0>;

			status = "disabled";

		};



		xhci1: usb@11000 {

			compatible = "generic-xhci";

			reg = <0x00011000 0x1000>;

			interrupts = <GIC_SPI 263 IRQ_TYPE_LEVEL_HIGH>;

			phys = <&usbphy1 1>, <&usbphy2>, <&usbphy1 0>;

			phy-names = "phy0", "phy1", "phy2";

			dma-coherent;

			status = "disabled";

		};



		bdc1: usb@21000 {

			compatible = "brcm,bdc-v0.16";

			reg = <0x00021000 0x1000>;

			interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>;

			phys = <&usbphy2>;

			phy-names = "phy0";

			dma-coherent;

			status = "disabled";

		};

	};

arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi

+108 −0
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ 
	#include "stingray-fs4.dtsi"

	#include "stingray-sata.dtsi"

	#include "stingray-pcie.dtsi"

	#include "stingray-usb.dtsi"



	hsls {

		compatible = "simple-bus";
@@ -612,4 +613,111 @@ 
			status = "disabled";

		};

	};



	tmons {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0x0 0x0 0x8f100000 0x100>;



		tmon: tmon@0 {

			compatible = "brcm,sr-thermal";

			reg = <0x0 0x40>;

			brcm,tmon-mask = <0x3f>;

			#thermal-sensor-cells = <1>;

		};

	};



	thermal-zones {

		ihost0_thermal: ihost0-thermal {

			polling-delay-passive = <0>;

			polling-delay = <1000>;

			thermal-sensors = <&tmon 0>;

			trips {

				cpu-crit {

					temperature = <105000>;

					hysteresis = <0>;

					type = "critical";

				};

			};

		};

		ihost1_thermal: ihost1-thermal {

			polling-delay-passive = <0>;

			polling-delay = <1000>;

			thermal-sensors = <&tmon 1>;

			trips {

				cpu-crit {

					temperature = <105000>;

					hysteresis = <0>;

					type = "critical";

				};

			};

		};

		ihost2_thermal: ihost2-thermal {

			polling-delay-passive = <0>;

			polling-delay = <1000>;

			thermal-sensors = <&tmon 2>;

			trips {

				cpu-crit {

					temperature = <105000>;

					hysteresis = <0>;

					type = "critical";

				};

			};

		};

		ihost3_thermal: ihost3-thermal {

			polling-delay-passive = <0>;

			polling-delay = <1000>;

			thermal-sensors = <&tmon 3>;

			trips {

				cpu-crit {

					temperature = <105000>;

					hysteresis = <0>;

					type = "critical";

				};

			};

		};

		crmu_thermal: crmu-thermal {

			polling-delay-passive = <0>;

			polling-delay = <1000>;

			thermal-sensors = <&tmon 4>;

			trips {

				cpu-crit {

					temperature = <105000>;

					hysteresis = <0>;

					type = "critical";

				};

			};

		};

		nitro_thermal: nitro-thermal {

			polling-delay-passive = <0>;

			polling-delay = <1000>;

			thermal-sensors = <&tmon 5>;

			trips {

				cpu-crit {

					temperature = <105000>;

					hysteresis = <0>;

					type = "critical";

				};

			};

		};

	};



	nic-hsls {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0x0 0x0  0x0 0x7fffffff>;



		nic_i2c0: i2c@60826100 {

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

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x60826100 0x100>,

			      <0x60e00408 0x1000>;

			brcm,ape-hsls-addr-mask = <0x03400000>;

			clock-frequency = <100000>;

			status = "disabled";

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE