* [PATCH] ARM: dts: bcm283x: Fix VEC address for BCM2711
@ 2021-07-22 19:02 Stefan Wahren
2021-07-26 8:30 ` nicolas saenz julienne
0 siblings, 1 reply; 2+ messages in thread
From: Stefan Wahren @ 2021-07-22 19:02 UTC (permalink / raw)
To: Rob Herring, Nicolas Saenz Julienne, Florian Fainelli
Cc: Ray Jui, Scott Branden, bcm-kernel-feedback-list, Maxime Ripard,
devicetree, linux-rpi-kernel, linux-arm-kernel,
Mateusz Kwiatkowski, Stefan Wahren
From: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
The VEC has a different address (0x7ec13000) on the BCM2711 (used in
e.g. Raspberry Pi 4) compared to BCM283x (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.
Fixes: 7894bdc6228f ("ARM: boot: dts: bcm2711: Add BCM2711 VEC compatible")
Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.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(-)
diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
index b8a4096..734342c 100644
--- a/arch/arm/boot/dts/bcm2711.dtsi
+++ b/arch/arm/boot/dts/bcm2711.dtsi
@@ -300,6 +300,14 @@
status = "disabled";
};
+ vec: vec@7ec13000 {
+ compatible = "brcm,bcm2711-vec";
+ reg = <0x7ec13000 0x1000>;
+ clocks = <&clocks BCM2835_CLOCK_VEC>;
+ interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
dvp: clock@7ef00000 {
compatible = "brcm,brcm2711-dvp";
reg = <0x7ef00000 0x10>;
diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi
index 4119271..c25e797 100644
--- 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>;
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
index 0f3be55..a3e06b6 100644
--- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -464,14 +464,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>;
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ARM: dts: bcm283x: Fix VEC address for BCM2711
2021-07-22 19:02 [PATCH] ARM: dts: bcm283x: Fix VEC address for BCM2711 Stefan Wahren
@ 2021-07-26 8:30 ` nicolas saenz julienne
0 siblings, 0 replies; 2+ messages in thread
From: nicolas saenz julienne @ 2021-07-26 8:30 UTC (permalink / raw)
To: Stefan Wahren, Rob Herring, Florian Fainelli
Cc: Ray Jui, Scott Branden, bcm-kernel-feedback-list, Maxime Ripard,
devicetree, linux-rpi-kernel, linux-arm-kernel,
Mateusz Kwiatkowski
On Thu, 2021-07-22 at 21:02 +0200, Stefan Wahren wrote:
> From: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
>
> The VEC has a different address (0x7ec13000) on the BCM2711 (used in
> e.g. Raspberry Pi 4) compared to BCM283x (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.
>
> Fixes: 7894bdc6228f ("ARM: boot: dts: bcm2711: Add BCM2711 VEC compatible")
> Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
> ---
Applied for next.
Thanks,
Nicolas
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-26 8:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-22 19:02 [PATCH] ARM: dts: bcm283x: Fix VEC address for BCM2711 Stefan Wahren
2021-07-26 8:30 ` nicolas saenz julienne
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).