ARM: dts: bcmbca: bcm6846: fix timer node cpu mask flag
Subsystems (2)
William Zhang
maintainerPATCH 1/3 ARM: dts: bcmbca: bcm6846: fix timer node cpu mask flag
The cpu mask flag value should match the number of cpu cores in the chip. Correct the value to two cpus for BCM6846 dual core SoC.
---
arch/arm/boot/dts/bcm6846.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/bcm6846.dtsi +4 -4
@@ -40,10 +40,10 @@ L2_0: l2-cache0 { timer { compatible = "arm,armv7-timer"; - interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, - <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, - <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, - <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, + <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, + <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, + <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>; arm,cpu-registers-not-fw-configured; };
Signature · 1 line
2.34.1
William Zhang
maintainerPATCH 2/3 ARM: dts: bcmbca: bcm6846: clean up psci node
Remove unnecessary cpu_on and cpu_off properties from psci node as they are only needed for psci version prior to 0.2.
---
arch/arm/boot/dts/bcm6846.dtsi | 2 -- 1 file changed, 2 deletions(-)
arch/arm/boot/dts/bcm6846.dtsi +0 -2
@@ -65,8 +65,6 @@ periph_clk: periph-clk { psci { compatible = "arm,psci-0.2"; method = "smc"; - cpu_off = <1>; - cpu_on = <2>; }; axi@81000000 {
Signature · 1 line
2.34.1
Florian Fainelli
AppliedRe: [PATCH 2/3] ARM: dts: bcmbca: bcm6846: clean up psci node
Quoted 6 lines · William Zhang
Remove unnecessary
cpu_onandcpu_offproperties from psci node as they are only needed for psci version prior to 0.2.Fixes de1a99ac0b64 ("ARM: dts: Add DTS files for bcmbca SoC BCM6846")Signed-off-by William Zhang <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/fixes, thanks! --
Florian
William Zhang
maintainerPATCH 3/3 ARM: dts: bcmbca: bcm6846: fix interrupt controller node
In reply to William ZhangAdd the missing gic registers and interrupts property to the gic node.
---
arch/arm/boot/dts/bcm6846.dtsi | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
arch/arm/boot/dts/bcm6846.dtsi +5 -3
@@ -71,15 +71,17 @@ axi@81000000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; - ranges = <0 0x81000000 0x4000>; + ranges = <0 0x81000000 0x8000>; gic: interrupt-controller@1000 { compatible = "arm,cortex-a7-gic"; #interrupt-cells = <3>; - #address-cells = <0>; interrupt-controller; + interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>; reg = <0x1000 0x1000>, - <0x2000 0x2000>; + <0x2000 0x2000>, + <0x4000 0x2000>, + <0x6000 0x2000>; }; };
Signature · 1 line
2.34.1
Florian Fainelli
AppliedRe: [PATCH 3/3] ARM: dts: bcmbca: bcm6846: fix interrupt controller node
Quoted 6 lines · William Zhang
Add the missing gic registers and interrupts property to the gic node.
Fixes de1a99ac0b64 ("ARM: dts: Add DTS files for bcmbca SoC BCM6846")Signed-off-by William Zhang <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/fixes, thanks! --
Florian
Florian Fainelli
AppliedQuoted 6 lines · William Zhang
The cpu mask flag value should match the number of cpu cores in the chip. Correct the value to two cpus for BCM6846 dual core SoC.
Fixes de1a99ac0b64 ("ARM: dts: Add DTS files for bcmbca SoC BCM6846")Signed-off-by William Zhang <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/fixes, thanks! --
Florian