Skip to contentSkip to conversation

ARM: dts: bcmbca: bcm6846: fix timer node cpu mask flag

PATCH Applied William Zhang 2 participants 6 messages Aug 1, 2022 – Aug 4, 2022

Subsystems (2)
lore
Share & tools
lore

William Zhang

author maintainer
#0 lore raw

PATCH 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.

Fixes de1a99ac0b64 ("ARM: dts: Add DTS files for bcmbca SoC BCM6846")

---

 arch/arm/boot/dts/bcm6846.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/bcm6846.dtsi +4 -4
index e610c102498f..b74491a3f111 100644
@@ -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
author maintainer
#1 lore raw

PATCH 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.

Fixes de1a99ac0b64 ("ARM: dts: Add DTS files for bcmbca SoC BCM6846")

---

 arch/arm/boot/dts/bcm6846.dtsi | 2 --
 1 file changed, 2 deletions(-)
arch/arm/boot/dts/bcm6846.dtsi +0 -2
index b74491a3f111..9876ceb1d47c 100644
@@ -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
author maintainer
#3 lore raw

PATCH 3/3 ARM: dts: bcmbca: bcm6846: fix interrupt controller node

In reply to 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")

---

 arch/arm/boot/dts/bcm6846.dtsi | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
arch/arm/boot/dts/bcm6846.dtsi +5 -3
index 9876ceb1d47c..8aa47a2583b2 100644
@@ -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