Commit 9287e91e authored by Mateusz Kwiatkowski's avatar Mateusz Kwiatkowski Committed by Nicolas Saenz Julienne
Browse files

ARM: dts: bcm283x: Fix VEC address for BCM2711 



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: 7894bdc6 ("ARM: boot: dts: bcm2711: Add BCM2711 VEC compatible")
Signed-off-by: default avatarMateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/1626980528-3835-1-git-send-email-stefan.wahren@i2se.com


Signed-off-by: default avatarNicolas Saenz Julienne <nsaenz@kernel.org>
parent 6880fa6c

arch/arm/boot/dts/bcm2711.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/bcm2835-common.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/bcm283x.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -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>;