8c405cdccc
The patches were generated from the RPi repo with the following command: git format-patch v6.6.34..rpi-6.1.y Some patches needed rebasing and, as usual, the applied and reverted, wireless drivers, Github workflows, READMEs and defconfigs patches were removed. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
55 lines
1.4 KiB
Diff
55 lines
1.4 KiB
Diff
From 7196450d72fd55bcb8f4295ad3af537e62446b82 Mon Sep 17 00:00:00 2001
|
|
From: Dom Cobley <popcornmix@gmail.com>
|
|
Date: Tue, 20 Feb 2024 18:14:44 +0000
|
|
Subject: [PATCH 0911/1085] ARM: dts: Add support for 2712 axi performance
|
|
monitors
|
|
|
|
Also give a unique compatible string to 2711 to allow for
|
|
driver differences.
|
|
---
|
|
arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi | 4 ++++
|
|
arch/arm/boot/dts/broadcom/bcm2712-rpi.dtsi | 1 +
|
|
arch/arm/boot/dts/broadcom/bcm2712.dtsi | 8 ++++++++
|
|
3 files changed, 13 insertions(+)
|
|
|
|
--- a/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi
|
|
+++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi
|
|
@@ -505,6 +505,10 @@ i2c_vc: &i2c0 {};
|
|
pinctrl-names = "default";
|
|
};
|
|
|
|
+&axiperf {
|
|
+ compatible = "brcm,bcm2711-axiperf";
|
|
+};
|
|
+
|
|
/delete-node/ &v3d;
|
|
|
|
/ {
|
|
--- a/arch/arm/boot/dts/broadcom/bcm2712-rpi.dtsi
|
|
+++ b/arch/arm/boot/dts/broadcom/bcm2712-rpi.dtsi
|
|
@@ -66,6 +66,7 @@
|
|
/ {
|
|
__overrides__ {
|
|
arm_freq;
|
|
+ axiperf = <&axiperf>,"status";
|
|
};
|
|
};
|
|
|
|
--- a/arch/arm/boot/dts/broadcom/bcm2712.dtsi
|
|
+++ b/arch/arm/boot/dts/broadcom/bcm2712.dtsi
|
|
@@ -112,6 +112,14 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
+ axiperf: axiperf {
|
|
+ compatible = "brcm,bcm2712-axiperf";
|
|
+ reg = <0x7c012800 0x100>,
|
|
+ <0x7e000000 0x100>;
|
|
+ firmware = <&firmware>;
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
mailbox: mailbox@7c013880 {
|
|
compatible = "brcm,bcm2835-mbox";
|
|
reg = <0x7c013880 0x40>;
|