1 From 70b0d5d07426e1b9c34ddd6ab4ee99b8c2fb81a6 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.com>
3 Date: Thu, 19 Mar 2020 10:04:46 +0000
4 Subject: [PATCH] ARM: dts: bcm271x: Use a53 pmu, drop RPI364
6 The upstream bcm2837.dtsi uses cortex-a53-pmu, so we can do the same
7 but with a fallback to the cortex-a7-pmu which is supported by the
10 Now that we're using the natural fallback mechanism of compatible
11 strings, the RPI364 macro no longer serves any purpose - remove it.
13 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
15 arch/arm/boot/dts/bcm2710.dtsi | 6 +-----
16 arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts | 2 --
17 arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts | 2 --
18 arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts | 2 --
19 arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts | 2 --
20 arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts | 2 --
21 6 files changed, 1 insertion(+), 15 deletions(-)
23 --- a/arch/arm/boot/dts/bcm2710.dtsi
24 +++ b/arch/arm/boot/dts/bcm2710.dtsi
26 compatible = "brcm,bcm2837", "brcm,bcm2836";
30 - compatible = "arm,armv8-pmuv3", "arm,cortex-a7-pmu";
32 - compatible = "arm,cortex-a7-pmu";
34 + compatible = "arm,cortex-a53-pmu", "arm,cortex-a7-pmu";
38 --- a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts
39 +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts
43 #include "../../../../arm/boot/dts/bcm2710-rpi-2-b.dts"
44 --- a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts
45 +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts
49 #include "../../../../arm/boot/dts/bcm2710-rpi-3-b-plus.dts"
50 --- a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts
51 +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts
55 #include "../../../../arm/boot/dts/bcm2710-rpi-3-b.dts"
56 --- a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts
57 +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts
61 #include "../../../../arm/boot/dts/bcm2710-rpi-cm3.dts"
62 --- a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts
63 +++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts
67 #include "../../../../arm/boot/dts/bcm2711-rpi-4-b.dts"