target/linux/brcm2708/patches-4.19/950-0509-vc4-Remove-interrupt-and-DMA-trampling.patch

   1 From 66ba94b1099ebc09bf82516499257165495c7c46 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.org>
   3 Date: Wed, 22 May 2019 12:58:47 +0100
   4 Subject: [PATCH 509/703] vc4: Remove interrupt and DMA trampling
   5
   6 As part of the effort to clean up the overlays, remove the interrupt
   7 and DMA mask declarations from the vc4 overlays which just duplicate
   8 that which is in the base DTBs.
   9
  10 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  11 ---
  12  .../boot/dts/overlays/vc4-fkms-v3d-overlay.dts |  8 --------
  13  .../boot/dts/overlays/vc4-kms-v3d-overlay.dts  | 18 ++----------------
  14  2 files changed, 2 insertions(+), 24 deletions(-)
  15
  16 --- a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts
  17 +++ b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts
  18 @@ -60,7 +60,6 @@
  19         fragment@7 {
  20                 target = <&v3d>;
  21                 __overlay__  {
  22 -                       interrupts = <1 10>;
  23                         status = "okay";
  24                 };
  25         };
  26 @@ -72,13 +71,6 @@
  27                 };
  28         };
  29
  30 -       fragment@9 {
  31 -               target-path = "/soc/dma";
  32 -               __overlay__ {
  33 -                       brcm,dma-channel-mask = <0x7f35>;
  34 -               };
  35 -       };
  36 -
  37         __overrides__ {
  38                 cma-256 = <0>,"+0-1-2-3-4";
  39                 cma-192 = <0>,"-0+1-2-3-4";
  40 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
  41 +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
  42 @@ -62,7 +62,6 @@
  43         fragment@7 {
  44                 target = <&pixelvalve0>;
  45                 __overlay__  {
  46 -                       interrupts = <2 13>; /* pwa0 */
  47                         status = "okay";
  48                 };
  49         };
  50 @@ -70,7 +69,6 @@
  51         fragment@8 {
  52                 target = <&pixelvalve1>;
  53                 __overlay__  {
  54 -                       interrupts = <2 14>; /* pwa1 */
  55                         status = "okay";
  56                 };
  57         };
  58 @@ -78,7 +76,6 @@
  59         fragment@9 {
  60                 target = <&pixelvalve2>;
  61                 __overlay__  {
  62 -                       interrupts = <2 10>; /* pixelvalve */
  63                         status = "okay";
  64                 };
  65         };
  66 @@ -86,7 +83,6 @@
  67         fragment@10 {
  68                 target = <&hvs>;
  69                 __overlay__  {
  70 -                       interrupts = <2 1>;
  71                         status = "okay";
  72                 };
  73         };
  74 @@ -94,7 +90,6 @@
  75         fragment@11 {
  76                 target = <&hdmi>;
  77                 __overlay__  {
  78 -                       interrupts = <2 8>, <2 9>;
  79                         status = "okay";
  80                 };
  81         };
  82 @@ -102,7 +97,6 @@
  83         fragment@12 {
  84                 target = <&v3d>;
  85                 __overlay__  {
  86 -                       interrupts = <1 10>;
  87                         status = "okay";
  88                 };
  89         };
  90 @@ -115,14 +109,6 @@
  91         };
  92
  93         fragment@14 {
  94 -               target-path = "/soc/dma";
  95 -               __overlay__ {
  96 -                       brcm,dma-channel-mask = <0x7f35>;
  97 -               };
  98 -       };
  99 -
 100 -
 101 -       fragment@15 {
 102                 target = <&clocks>;
 103                 __overlay__  {
 104                         claim-clocks = <
 105 @@ -134,14 +120,14 @@
 106                 };
 107         };
 108
 109 -       fragment@16 {
 110 +       fragment@15 {
 111                 target = <&vec>;
 112                 __overlay__  {
 113                         status = "okay";
 114                 };
 115         };
 116
 117 -       fragment@17 {
 118 +       fragment@16 {
 119                 target = <&txp>;
 120                 __overlay__  {
 121                         status = "okay";