73 lines
2.1 KiB
Diff
73 lines
2.1 KiB
Diff
From 2d7a55e6a467b54ea40366f689e7702b88383e38 Mon Sep 17 00:00:00 2001
|
|
From: kFYatek <4499762+kFYatek@users.noreply.github.com>
|
|
Date: Sat, 27 Mar 2021 21:43:33 +0100
|
|
Subject: [PATCH] drm/vc4: Fix VEC address for BCM2711 in the
|
|
devicetrees
|
|
|
|
The VEC has a different address (0x7ec13000) on the BCM2711 (used in
|
|
e.g. Raspberry Pi 4) compared to BCM238x (e.g. Pi 3 and earlier). This
|
|
was erroneously not taken account for.
|
|
|
|
Definition of the VEC in the devicetrees had to be moved from
|
|
bcm283x.dtsi to bcm2711.dtsi and bcm2835-common.dtsi to allow for this
|
|
differentiation.
|
|
|
|
Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
|
|
---
|
|
arch/arm/boot/dts/bcm2711.dtsi | 8 ++++++++
|
|
arch/arm/boot/dts/bcm2835-common.dtsi | 8 ++++++++
|
|
arch/arm/boot/dts/bcm283x.dtsi | 8 --------
|
|
3 files changed, 16 insertions(+), 8 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/bcm2711.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm2711.dtsi
|
|
@@ -301,6 +301,14 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
+ vec: vec@7ec13000 {
|
|
+ compatible = "brcm,bcm2835-vec";
|
|
+ reg = <0x7ec13000 0x1000>;
|
|
+ clocks = <&clocks BCM2835_CLOCK_VEC>;
|
|
+ interrupts = <2 27>;
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
dvp: clock@7ef00000 {
|
|
compatible = "brcm,brcm2711-dvp";
|
|
reg = <0x7ef00000 0x10>;
|
|
--- a/arch/arm/boot/dts/bcm2835-common.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm2835-common.dtsi
|
|
@@ -106,6 +106,14 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+ vec: vec@7e806000 {
|
|
+ compatible = "brcm,bcm2835-vec";
|
|
+ reg = <0x7e806000 0x1000>;
|
|
+ clocks = <&clocks BCM2835_CLOCK_VEC>;
|
|
+ interrupts = <2 27>;
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
pixelvalve@7e807000 {
|
|
compatible = "brcm,bcm2835-pixelvalve2";
|
|
reg = <0x7e807000 0x100>;
|
|
--- a/arch/arm/boot/dts/bcm283x.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm283x.dtsi
|
|
@@ -490,14 +490,6 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
- vec: vec@7e806000 {
|
|
- compatible = "brcm,bcm2835-vec";
|
|
- reg = <0x7e806000 0x1000>;
|
|
- clocks = <&clocks BCM2835_CLOCK_VEC>;
|
|
- interrupts = <2 27>;
|
|
- status = "disabled";
|
|
- };
|
|
-
|
|
usb: usb@7e980000 {
|
|
compatible = "brcm,bcm2835-usb";
|
|
reg = <0x7e980000 0x10000>;
|