2022-03-16 16:27:22

by Adrien Thierry

Subject: [PATCH 0/2] Add support for bcm2711 in vchiq_arm

The goal of this patch series is to use the bcm2711 compatible string in
vchiq_arm for the Raspberry Pi 4. This allows using the downstream device
tree with the upstream kernel.

Adrien Thierry (2):
dt-bindings: soc: bcm: bcm2835-vchiq: Add support for bcm2711
staging: vchiq_arm: Use bcm2711 compatible string for bcm2711-based
RPi

.../devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml | 6 ++++++
arch/arm/boot/dts/bcm2711-rpi.dtsi | 1 +
.../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 5 +++++
3 files changed, 12 insertions(+)


base-commit: 09688c0166e76ce2fb85e86b9d99be8b0084cdf9
--
2.35.1

2022-03-16 23:29:10

by Adrien Thierry

Subject: [PATCH 2/2] staging: vchiq_arm: Use bcm2711 compatible string for bcm2711-based RPi

Use bcm2711 compatible string in vchiq driver and device tree for
bcm2711-based Raspberry Pi (Raspberry Pi 4). This is consistent with
what the downstream device tree uses, and allows running the vchiq
driver on the upstream kernel with the downstream device tree.

Signed-off-by: Adrien Thierry <[email protected]>
---
arch/arm/boot/dts/bcm2711-rpi.dtsi | 1 +
.../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 5 +++++
2 files changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
index ca266c5d9f9b..c868d1dcaba7 100644
--- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
@@ -70,5 +70,6 @@ blconfig: nvram@0 {
};

&vchiq {
+ compatible = "brcm,bcm2711-vchiq";
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
};
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index 3a2e4582db8e..136c664132f4 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -81,6 +81,10 @@ static struct vchiq_drvdata bcm2836_drvdata = {
.cache_line_size = 64,
};

+static struct vchiq_drvdata bcm2711_drvdata = {
+ .cache_line_size = 64,
+};
+
struct vchiq_arm_state {
/* Keepalive-related data */
struct task_struct *ka_thread;
@@ -1748,6 +1752,7 @@ void vchiq_platform_conn_state_changed(struct vchiq_state *state,
static const struct of_device_id vchiq_of_match[] = {
{ .compatible = "brcm,bcm2835-vchiq", .data = &bcm2835_drvdata },
{ .compatible = "brcm,bcm2836-vchiq", .data = &bcm2836_drvdata },
+ { .compatible = "brcm,bcm2711-vchiq", .data = &bcm2711_drvdata },
{},
};
MODULE_DEVICE_TABLE(of, vchiq_of_match);
--
2.35.1