target/linux/brcm2708/patches-4.19/950-0649-arm-dts-Change-downstream-vchiq-compatible-string.patch

   1 From 4ef78a596dcde685022fde07c4cb5bc993ce7aa3 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.org>
   3 Date: Wed, 6 Feb 2019 20:45:16 +0000
   4 Subject: [PATCH 649/703] arm: dts: Change downstream vchiq compatible string
   5
   6 The new cache line size mechanism requires a different vchiq compatible
   7 string on BCM2836 and BCM2837, but the downstream dts files didn't
   8 inherit the upstream changes.
   9
  10 See: https://github.com/raspberrypi/linux/issues/2643
  11
  12 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  13 ---
  14  arch/arm/boot/dts/bcm2708-rpi.dtsi | 2 +-
  15  arch/arm/boot/dts/bcm2709-rpi.dtsi | 5 +++++
  16  arch/arm/boot/dts/bcm2709.dtsi     | 2 +-
  17  arch/arm/boot/dts/bcm2710.dtsi     | 2 +-
  18  4 files changed, 8 insertions(+), 3 deletions(-)
  19  create mode 100644 arch/arm/boot/dts/bcm2709-rpi.dtsi
  20
  21 --- a/arch/arm/boot/dts/bcm2708-rpi.dtsi
  22 +++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi
  23 @@ -68,7 +68,7 @@
  24                         status = "disabled";
  25                 };
  26
  27 -               mailbox@7e00b840 {
  28 +               vchiq: mailbox@7e00b840 {
  29                         compatible = "brcm,bcm2835-vchiq";
  30                         reg = <0x7e00b840 0x3c>;
  31                         interrupts = <0 2>;
  32 --- /dev/null
  33 +++ b/arch/arm/boot/dts/bcm2709-rpi.dtsi
  34 @@ -0,0 +1,5 @@
  35 +#include "bcm2708-rpi.dtsi"
  36 +
  37 +&vchiq {
  38 +       compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq";
  39 +};
  40 --- a/arch/arm/boot/dts/bcm2709.dtsi
  41 +++ b/arch/arm/boot/dts/bcm2709.dtsi
  42 @@ -1,6 +1,6 @@
  43  #include "bcm2836.dtsi"
  44  #include "bcm270x.dtsi"
  45 -#include "bcm2708-rpi.dtsi"
  46 +#include "bcm2709-rpi.dtsi"
  47
  48  / {
  49         soc {
  50 --- a/arch/arm/boot/dts/bcm2710.dtsi
  51 +++ b/arch/arm/boot/dts/bcm2710.dtsi
  52 @@ -1,6 +1,6 @@
  53  #include "bcm2837.dtsi"
  54  #include "bcm270x.dtsi"
  55 -#include "bcm2708-rpi.dtsi"
  56 +#include "bcm2709-rpi.dtsi"
  57
  58  / {
  59         compatible = "brcm,bcm2837", "brcm,bcm2836";