Skip to content

Commit 5290514

Browse files
committed
Merge tag 'arm-soc/for-5.19/devicetree-arm64-fixes' of https://github.com/Broadcom/stblinux into arm/fixes
This pull request contains Broadcom ARM64-based SoCs Device Tree fixes for 5.19, please pull the following: - William corrects the BCM4906 DTS to have an armv8-timer Device Tree, necessary for booting, and fixes the BCM4908 DTS to have a proper 'enable-method' and 'cpu-release-addr' properties for the kernel to boot when using u-boot * tag 'arm-soc/for-5.19/devicetree-arm64-fixes' of https://github.com/Broadcom/stblinux: arm64: dts: broadcom: bcm4908: Fix cpu node for smp boot arm64: dts: broadcom: bcm4908: Fix timer node for BCM4906 SoC Link: https://lore.kernel.org/r/20220712231222.97850-1-f.fainelli@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 0127773 + 8bd582a commit 5290514

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99
/delete-node/ cpu@3;
1010
};
1111

12+
timer {
13+
compatible = "arm,armv8-timer";
14+
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
15+
<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
16+
<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
17+
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
18+
};
19+
1220
pmu {
1321
compatible = "arm,cortex-a53-pmu";
1422
interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,

arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
device_type = "cpu";
3030
compatible = "brcm,brahma-b53";
3131
reg = <0x0>;
32+
enable-method = "spin-table";
33+
cpu-release-addr = <0x0 0xfff8>;
3234
next-level-cache = <&l2>;
3335
};
3436

0 commit comments

Comments
 (0)