git.openwrt.org Git - openwrt/staging/linusw.git/blob

   1 From 2d7a55e6a467b54ea40366f689e7702b88383e38 Mon Sep 17 00:00:00 2001
   2 From: kFYatek <4499762+kFYatek@users.noreply.github.com>
   3 Date: Sat, 27 Mar 2021 21:43:33 +0100
   4 Subject: [PATCH] drm/vc4: Fix VEC address for BCM2711 in the
   5  devicetrees
   6
   7 The VEC has a different address (0x7ec13000) on the BCM2711 (used in
   8 e.g. Raspberry Pi 4) compared to BCM238x (e.g. Pi 3 and earlier). This
   9 was erroneously not taken account for.
  10
  11 Definition of the VEC in the devicetrees had to be moved from
  12 bcm283x.dtsi to bcm2711.dtsi and bcm2835-common.dtsi to allow for this
  13 differentiation.
  14
  15 Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
  16 ---
  17  arch/arm/boot/dts/bcm2711.dtsi        | 8 ++++++++
  18  arch/arm/boot/dts/bcm2835-common.dtsi | 8 ++++++++
  19  arch/arm/boot/dts/bcm283x.dtsi        | 8 --------
  20  3 files changed, 16 insertions(+), 8 deletions(-)
  21
  22 --- a/arch/arm/boot/dts/bcm2711.dtsi
  23 +++ b/arch/arm/boot/dts/bcm2711.dtsi
  24 @@ -300,6 +300,14 @@
  25                         status = "disabled";
  26                 };
  27
  28 +               vec: vec@7ec13000 {
  29 +                       compatible = "brcm,bcm2835-vec";
  30 +                       reg = <0x7ec13000 0x1000>;
  31 +                       clocks = <&clocks BCM2835_CLOCK_VEC>;
  32 +                       interrupts = <2 27>;
  33 +                       status = "disabled";
  34 +               };
  35 +
  36                 dvp: clock@7ef00000 {
  37                         compatible = "brcm,brcm2711-dvp";
  38                         reg = <0x7ef00000 0x10>;
  39 --- a/arch/arm/boot/dts/bcm2835-common.dtsi
  40 +++ b/arch/arm/boot/dts/bcm2835-common.dtsi
  41 @@ -106,6 +106,14 @@
  42                         status = "okay";
  43                 };
  44
  45 +               vec: vec@7e806000 {
  46 +                       compatible = "brcm,bcm2835-vec";
  47 +                       reg = <0x7e806000 0x1000>;
  48 +                       clocks = <&clocks BCM2835_CLOCK_VEC>;
  49 +                       interrupts = <2 27>;
  50 +                       status = "disabled";
  51 +               };
  52 +
  53                 pixelvalve@7e807000 {
  54                         compatible = "brcm,bcm2835-pixelvalve2";
  55                         reg = <0x7e807000 0x100>;
  56 --- a/arch/arm/boot/dts/bcm283x.dtsi
  57 +++ b/arch/arm/boot/dts/bcm283x.dtsi
  58 @@ -488,14 +488,6 @@
  59                         status = "disabled";
  60                 };
  61
  62 -               vec: vec@7e806000 {
  63 -                       compatible = "brcm,bcm2835-vec";
  64 -                       reg = <0x7e806000 0x1000>;
  65 -                       clocks = <&clocks BCM2835_CLOCK_VEC>;
  66 -                       interrupts = <2 27>;
  67 -                       status = "disabled";
  68 -               };
  69 -
  70                 usb: usb@7e980000 {
  71                         compatible = "brcm,bcm2835-usb";
  72                         reg = <0x7e980000 0x10000>;