From f07e572f6447465d8938679533d604e402b0f066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Thu, 18 Feb 2021 18:04:33 +0100 Subject: bcm27xx: import latest patches from the RPi foundation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bcm2708: boot tested on RPi B+ v1.2 bcm2709: boot tested on RPi 3B v1.2 and RPi 4B v1.1 4G bcm2710: boot tested on RPi 3B v1.2 bcm2711: boot tested on RPi 4B v1.1 4G Signed-off-by: Álvaro Fernández Rojas --- ...6-ARM-dts-bcm271x-Use-a53-pmu-drop-RPI364.patch | 67 ++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 target/linux/bcm27xx/patches-5.4/950-0466-ARM-dts-bcm271x-Use-a53-pmu-drop-RPI364.patch (limited to 'target/linux/bcm27xx/patches-5.4/950-0466-ARM-dts-bcm271x-Use-a53-pmu-drop-RPI364.patch') diff --git a/target/linux/bcm27xx/patches-5.4/950-0466-ARM-dts-bcm271x-Use-a53-pmu-drop-RPI364.patch b/target/linux/bcm27xx/patches-5.4/950-0466-ARM-dts-bcm271x-Use-a53-pmu-drop-RPI364.patch new file mode 100644 index 0000000000..9504bb3982 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.4/950-0466-ARM-dts-bcm271x-Use-a53-pmu-drop-RPI364.patch @@ -0,0 +1,67 @@ +From 70b0d5d07426e1b9c34ddd6ab4ee99b8c2fb81a6 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Thu, 19 Mar 2020 10:04:46 +0000 +Subject: [PATCH] ARM: dts: bcm271x: Use a53 pmu, drop RPI364 + +The upstream bcm2837.dtsi uses cortex-a53-pmu, so we can do the same +but with a fallback to the cortex-a7-pmu which is supported by the +32-bit kernel. + +Now that we're using the natural fallback mechanism of compatible +strings, the RPI364 macro no longer serves any purpose - remove it. + +Signed-off-by: Phil Elwell +--- + arch/arm/boot/dts/bcm2710.dtsi | 6 +----- + arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts | 2 -- + arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts | 2 -- + arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts | 2 -- + arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts | 2 -- + arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts | 2 -- + 6 files changed, 1 insertion(+), 15 deletions(-) + +--- a/arch/arm/boot/dts/bcm2710.dtsi ++++ b/arch/arm/boot/dts/bcm2710.dtsi +@@ -5,11 +5,7 @@ + compatible = "brcm,bcm2837", "brcm,bcm2836"; + + arm-pmu { +-#ifdef RPI364 +- compatible = "arm,armv8-pmuv3", "arm,cortex-a7-pmu"; +-#else +- compatible = "arm,cortex-a7-pmu"; +-#endif ++ compatible = "arm,cortex-a53-pmu", "arm,cortex-a7-pmu"; + }; + + soc { +--- a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts ++++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts +@@ -1,3 +1 @@ +-#define RPI364 +- + #include "../../../../arm/boot/dts/bcm2710-rpi-2-b.dts" +--- a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts ++++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts +@@ -1,3 +1 @@ +-#define RPI364 +- + #include "../../../../arm/boot/dts/bcm2710-rpi-3-b-plus.dts" +--- a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts ++++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts +@@ -1,3 +1 @@ +-#define RPI364 +- + #include "../../../../arm/boot/dts/bcm2710-rpi-3-b.dts" +--- a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts ++++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts +@@ -1,3 +1 @@ +-#define RPI364 +- + #include "../../../../arm/boot/dts/bcm2710-rpi-cm3.dts" +--- a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts ++++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts +@@ -1,3 +1 @@ +-#define RPI364 +- + #include "../../../../arm/boot/dts/bcm2711-rpi-4-b.dts" -- cgit v1.2.3