Skip to contentSkip to conversation

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

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

Subsystems (2)
lore
Share & tools
lore

William Zhang

author maintainer
#0 lore raw

PATCH 1/4 ARM: dts: bcmbca: bcm63178: 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 three cpus for BCM63178 triple core SoC.

Fixes fc85b7e64acb ("ARM: dts: add dts files for bcmbca soc 63178")

---

 arch/arm/boot/dts/bcm63178.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/bcm63178.dtsi +4 -4
index 5463443f0762..14d2c5bd2c52 100644
@@ -46,10 +46,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(3) | IRQ_TYPE_LEVEL_LOW)>,
+			<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(3) | IRQ_TYPE_LEVEL_LOW)>,
+			<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(3) | IRQ_TYPE_LEVEL_LOW)>,
+			<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(3) | IRQ_TYPE_LEVEL_LOW)>;
 		arm,cpu-registers-not-fw-configured;
 	};
 
Signature · 1 line
2.34.1
author maintainer
#1 lore raw

PATCH 2/4 ARM: dts: bcmbca: bcm63178: 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 fc85b7e64acb ("ARM: dts: add dts files for bcmbca soc 63178")

---

 arch/arm/boot/dts/bcm63178.dtsi | 2 --
 1 file changed, 2 deletions(-)
arch/arm/boot/dts/bcm63178.dtsi +0 -2
index 14d2c5bd2c52..98ab10e1c81e 100644
@@ -80,8 +80,6 @@ uart_clk: uart-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/4 ARM: dts: bcmbca: bcm63178: fix interrupt controller node

In reply to William Zhang

Add the missing gic registers and interrupts property to the gic node.

Fixes fc85b7e64acb ("ARM: dts: add dts files for bcmbca soc 63178")

---

 arch/arm/boot/dts/bcm63178.dtsi | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
arch/arm/boot/dts/bcm63178.dtsi +5 -3
index 98ab10e1c81e..dba71fa53466 100644
@@ -86,15 +86,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(3) | IRQ_TYPE_LEVEL_HIGH)>;
 			reg = <0x1000 0x1000>,
-				<0x2000 0x2000>;
+				<0x2000 0x2000>,
+				<0x4000 0x2000>,
+				<0x6000 0x2000>;
 		};
 	};
 
Signature · 1 line
2.34.1
author maintainer
#5 lore raw

PATCH 4/4 ARM: dts: bcmbca: bcm63178: cosmetic change

In reply to William Zhang

Add new line between dts node.

---

 arch/arm/boot/dts/bcm63178.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/boot/dts/bcm63178.dtsi +2 -0
index dba71fa53466..cbd094dde6d0 100644
@@ -32,6 +32,7 @@ CA7_1: cpu@1 {
 			next-level-cache = <&L2_0>;
 			enable-method = "psci";
 		};
+
 		CA7_2: cpu@2 {
 			device_type = "cpu";
 			compatible = "arm,cortex-a7";
@@ -39,6 +40,7 @@ CA7_2: cpu@2 {
 			next-level-cache = <&L2_0>;
 			enable-method = "psci";
 		};
+
 		L2_0: l2-cache0 {
 			compatible = "cache";
 		};
Signature · 1 line
2.34.1