git.librecmc.org Git - oweals/openwrt.git/blob

   1 From 99c805aa346cf88fba8b26eb1093192bcc822986 Mon Sep 17 00:00:00 2001
   2 From: 6by9 <6by9@users.noreply.github.com>
   3 Date: Wed, 30 Jan 2019 14:22:03 +0000
   4 Subject: [PATCH 648/703] ARM: dts: bcm283x: Correct vchiq compatible string
   5  (#2840)
   6
   7 commit 499770ede3f829e80539f46b59b5f460dc327aa6 upstream.
   8
   9 To allow VCHIQ to determine the correct cache line size, use the new
  10 "brcm,bcm2836-vchiq" compatible string on BCM2836 and BCM2837.
  11
  12 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  13 Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
  14 Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
  15 ---
  16  arch/arm/boot/dts/bcm2835-rpi.dtsi         | 2 +-
  17  arch/arm/boot/dts/bcm2836-rpi-2-b.dts      | 2 +-
  18  arch/arm/boot/dts/bcm2836-rpi.dtsi         | 6 ++++++
  19  arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 2 +-
  20  arch/arm/boot/dts/bcm2837-rpi-3-b.dts      | 2 +-
  21  5 files changed, 10 insertions(+), 4 deletions(-)
  22  create mode 100644 arch/arm/boot/dts/bcm2836-rpi.dtsi
  23
  24 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
  25 +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
  26 @@ -30,7 +30,7 @@
  27                         #power-domain-cells = <1>;
  28                 };
  29
  30 -               mailbox@7e00b840 {
  31 +               vchiq: mailbox@7e00b840 {
  32                         compatible = "brcm,bcm2835-vchiq";
  33                         reg = <0x7e00b840 0x3c>;
  34                         interrupts = <0 2>;
  35 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
  36 +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
  37 @@ -1,7 +1,7 @@
  38  // SPDX-License-Identifier: GPL-2.0
  39  /dts-v1/;
  40  #include "bcm2836.dtsi"
  41 -#include "bcm2835-rpi.dtsi"
  42 +#include "bcm2836-rpi.dtsi"
  43  #include "bcm283x-rpi-smsc9514.dtsi"
  44  #include "bcm283x-rpi-usb-host.dtsi"
  45  #include "bcm283x-rpi-csi1-2lane.dtsi"
  46 --- /dev/null
  47 +++ b/arch/arm/boot/dts/bcm2836-rpi.dtsi
  48 @@ -0,0 +1,6 @@
  49 +// SPDX-License-Identifier: GPL-2.0
  50 +#include "bcm2835-rpi.dtsi"
  51 +
  52 +&vchiq {
  53 +       compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq";
  54 +};
  55 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
  56 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
  57 @@ -1,7 +1,7 @@
  58  // SPDX-License-Identifier: GPL-2.0
  59  /dts-v1/;
  60  #include "bcm2837.dtsi"
  61 -#include "bcm2835-rpi.dtsi"
  62 +#include "bcm2836-rpi.dtsi"
  63  #include "bcm283x-rpi-lan7515.dtsi"
  64  #include "bcm283x-rpi-usb-host.dtsi"
  65
  66 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
  67 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
  68 @@ -1,7 +1,7 @@
  69  // SPDX-License-Identifier: GPL-2.0
  70  /dts-v1/;
  71  #include "bcm2837.dtsi"
  72 -#include "bcm2835-rpi.dtsi"
  73 +#include "bcm2836-rpi.dtsi"
  74  #include "bcm283x-rpi-smsc9514.dtsi"
  75  #include "bcm283x-rpi-usb-host.dtsi"
  76  #include "bcm283x-rpi-csi1-2lane.dtsi"