diff options
| author |   Olof Johansson <olof@lixom.net> | 2019-12-11 08:52:16 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-12-11 08:52:17 -0800 |
| commit | 96dd4bcbac8ab5164ec3f07f9ae1f1611e767417 (patch) | |
| tree | a87f6245dc2c0c01eb6da8f857f8b13b99ad07ea /arch | |
| parent | ARM: mmp: include the correct cputype.h (diff) | |
| parent | ARM: dts: bcm283x: Fix critical trip point (diff) | |
| download | linux-dev-96dd4bcbac8ab5164ec3f07f9ae1f1611e767417.tar.xz linux-dev-96dd4bcbac8ab5164ec3f07f9ae1f1611e767417.zip | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/bcm-cygnus.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm2711.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm283x.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm5301x.dtsi | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi index 2dac3efc7640..1bc45cfd5453 100644 --- a/arch/arm/boot/dts/bcm-cygnus.dtsi +++ b/arch/arm/boot/dts/bcm-cygnus.dtsi @@ -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 { diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi index 961bed832755..e2f6ffb00aa9 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -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 diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index 3caaa57eb6c8..839491628e87 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -37,7 +37,7 @@ trips { cpu-crit { - temperature = <80000>; + temperature = <90000>; hysteresis = <0>; type = "critical"; }; diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi index 372dc1eb88a0..2d9b4dd05830 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -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 { |