ARM: dts: bcmbca: fix arch timer node cpu mask flag value
Subsystems (2)
William Zhang
maintainerPATCH 1/4 ARM: dts: bcmbca: fix arch timer node cpu mask flag value
The cpu mask flag value should match the number of cpu cores in the chip. Correct the value accordingly for BCM63178, BCM6846 and BCM6878.
---
arch/arm/boot/dts/bcm63178.dtsi | 8 ++++---- arch/arm/boot/dts/bcm6846.dtsi | 8 ++++---- arch/arm/boot/dts/bcm6878.dtsi | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-)
arch/arm/boot/dts/bcm63178.dtsi +4 -4
@@ -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; };
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; };
arch/arm/boot/dts/bcm6878.dtsi +4 -4
@@ -39,10 +39,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/4 ARM: dts: bcmbca: fix interrupt controller properties
Add the missing gic registers and interrupts property to the gic node for BCM63178 and BCM6846.
---
arch/arm/boot/dts/bcm63178.dtsi | 8 +++++--- arch/arm/boot/dts/bcm6846.dtsi | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-)
arch/arm/boot/dts/bcm63178.dtsi +5 -3
@@ -88,15 +88,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>; }; };
arch/arm/boot/dts/bcm6846.dtsi +5 -3
@@ -73,15 +73,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
William Zhang
maintainerPATCH 3/4 ARM: dts: bcmbca: clean up psci node
In reply to William ZhangRemove unnecessary cpu_on and cpu_off properties from psci node for BCM63178 and BCM6846 as they are only needed for psci version prior to 0.2.
---
arch/arm/boot/dts/bcm63178.dtsi | 2 -- arch/arm/boot/dts/bcm6846.dtsi | 2 -- 2 files changed, 4 deletions(-)
arch/arm/boot/dts/bcm63178.dtsi +0 -2
@@ -80,8 +80,6 @@ uart_clk: uart-clk { psci { compatible = "arm,psci-0.2"; method = "smc"; - cpu_off = <1>; - cpu_on = <2>; }; axi@81000000 {
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
William Zhang
maintainerPATCH 4/4 ARM: dts: bcmbca: cosmetic change
In reply to William ZhangAdd new line between dts nodes for BCM63178 and BCM6878.
---
arch/arm/boot/dts/bcm63178.dtsi | 3 +++ arch/arm/boot/dts/bcm6878.dtsi | 2 ++ 2 files changed, 5 insertions(+)
arch/arm/boot/dts/bcm63178.dtsi +3 -0
@@ -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"; };
@@ -68,6 +70,7 @@ periph_clk: periph-clk { #clock-cells = <0>; clock-frequency = <200000000>; }; + uart_clk: uart-clk { compatible = "fixed-factor-clock"; #clock-cells = <0>;
arch/arm/boot/dts/bcm6878.dtsi +2 -0
@@ -32,6 +32,7 @@ CA7_1: cpu@1 { next-level-cache = <&L2_0>; enable-method = "psci"; }; + L2_0: l2-cache0 { compatible = "cache"; };
@@ -59,6 +60,7 @@ periph_clk: periph-clk { #clock-cells = <0>; clock-frequency = <200000000>; }; + uart_clk: uart-clk { compatible = "fixed-factor-clock"; #clock-cells = <0>;
Signature · 1 line
2.34.1
Hi William,
Quoted 8 lines · William Zhang
The cpu mask flag value should match the number of cpu cores in the chip. Correct the value accordingly for BCM63178, BCM6846 and BCM6878.
Fixes fc85b7e64acb ("ARM: dts: add dts files for bcmbca soc 63178")Fixes de1a99ac0b64 ("ARM: dts: Add DTS files for bcmbca SoC BCM6846")Fixes 6bcad714e173 ("ARM: dts: Add DTS files for bcmbca SoC BCM6878")Signed-off-by William Zhang <[email protected]>
This looks fine, if you could split one patch per file you modify that would look a bit better, this is particularly relevant for bug fixes so if you can split patch 1 into 3, patch 2 into 2 and patch 3 into 2 that would be great. Patch 4 can be taken as is since it is sort of a bca-wide cleanup.
Right now all of those changes went into the same release cycle, but in the future that might not be the case.
Thank you!
Signature · 1 line
Florian