Commit 96dd4bcb authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'arm-soc/for-5.5/devicetree-fixes' of https://github.com/Broadcom/stblinux into arm/fixes

This pull request contains Broadcom ARM-based SoCs Device Tree fixes for
v5.5-rc1, please pull the following:

- Nicolas fixes the SoC's dma-range property to cover the full 1GB
  aperture

- Stefan fixes the critical temperature trip point to be set before the
  firmware performs thermal throttling

- Florian fixes the BCM5301X and Cygnus MDIO nodes to have corrected
  #address-cells and #size-cells properties

* tag 'arm-soc/for-5.5/devicetree-fixes' of https://github.com/Broadcom/stblinux:
  ARM: dts: bcm283x: Fix critical trip point
  ARM: dts: Cygnus: Fix MDIO node address/size cells
  ARM: dts: bcm2711: fix soc's node dma-ranges
  ARM: dts: BCM5301X: Fix MDIO node address/size cells

Link: https://lore.kernel.org/r/20191210205850.12442-1-f.fainelli@gmail.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 8ecad8c0 30e647a7
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -174,8 +174,8 @@
		mdio: mdio@18002000 {
			compatible = "brcm,iproc-mdio";
			reg = <0x18002000 0x8>;
			#size-cells = <1>;
			#address-cells = <0>;
			#size-cells = <0>;
			#address-cells = <1>;
			status = "disabled";

			gphy0: ethernet-phy@0 {
+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@
			 <0x7c000000  0x0 0xfc000000  0x02000000>,
			 <0x40000000  0x0 0xff800000  0x00800000>;
		/* Emulate a contiguous 30-bit address range for DMA */
		dma-ranges = <0xc0000000  0x0 0x00000000  0x3c000000>;
		dma-ranges = <0xc0000000  0x0 0x00000000  0x40000000>;

		/*
		 * This node is the provider for the enable-method for
+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@

			trips {
				cpu-crit {
					temperature	= <80000>;
					temperature	= <90000>;
					hysteresis	= <0>;
					type		= "critical";
				};
+2 −2
Original line number Diff line number Diff line
@@ -353,8 +353,8 @@
	mdio: mdio@18003000 {
		compatible = "brcm,iproc-mdio";
		reg = <0x18003000 0x8>;
		#size-cells = <1>;
		#address-cells = <0>;
		#size-cells = <0>;
		#address-cells = <1>;
	};

	mdio-bus-mux@18003000 {