target/linux/bcm27xx/patches-5.4/950-1036-overlays-Rebuild-upstream-with-latest-ovmerge.patch

   1 From 6091a6c5536f422df652c4a14725de7dd1fc5e0f Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Wed, 30 Dec 2020 20:00:38 +0000
   4 Subject: [PATCH] overlays: Rebuild "upstream" with latest ovmerge
   5
   6 The latest ovmerge drops disabled fragments, causing the "upstream"
   7 overlay to change.
   8
   9 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  10 ---
  11  .../boot/dts/overlays/upstream-overlay.dts    | 38 +++++++------------
  12  .../dts/overlays/upstream-pi4-overlay.dts     | 28 +-------------
  13  2 files changed, 15 insertions(+), 51 deletions(-)
  14
  15 --- a/arch/arm/boot/dts/overlays/upstream-overlay.dts
  16 +++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts
  17 @@ -8,96 +8,84 @@
  18  / {
  19         compatible = "brcm,bcm2835";
  20         fragment@0 {
  21 -               target = <&cma>;
  22 -               __dormant__ {
  23 -                       size = <0x10000000>;
  24 -               };
  25 -       };
  26 -       fragment@1 {
  27                 target = <&i2c2>;
  28                 __overlay__ {
  29                         status = "okay";
  30                 };
  31         };
  32 -       fragment@2 {
  33 +       fragment@1 {
  34                 target = <&fb>;
  35                 __overlay__ {
  36                         status = "disabled";
  37                 };
  38         };
  39 -       fragment@3 {
  40 +       fragment@2 {
  41                 target = <&pixelvalve0>;
  42                 __overlay__ {
  43                         status = "okay";
  44                 };
  45         };
  46 -       fragment@4 {
  47 +       fragment@3 {
  48                 target = <&pixelvalve1>;
  49                 __overlay__ {
  50                         status = "okay";
  51                 };
  52         };
  53 -       fragment@5 {
  54 +       fragment@4 {
  55                 target = <&pixelvalve2>;
  56                 __overlay__ {
  57                         status = "okay";
  58                 };
  59         };
  60 -       fragment@6 {
  61 +       fragment@5 {
  62                 target = <&hvs>;
  63                 __overlay__ {
  64                         status = "okay";
  65                 };
  66         };
  67 -       fragment@7 {
  68 +       fragment@6 {
  69                 target = <&hdmi>;
  70                 __overlay__ {
  71                         status = "okay";
  72                 };
  73         };
  74 -       fragment@8 {
  75 +       fragment@7 {
  76                 target = <&v3d>;
  77                 __overlay__ {
  78                         status = "okay";
  79                 };
  80         };
  81 -       fragment@9 {
  82 +       fragment@8 {
  83                 target = <&vc4>;
  84                 __overlay__ {
  85                         status = "okay";
  86                 };
  87         };
  88 -       fragment@10 {
  89 +       fragment@9 {
  90                 target = <&clocks>;
  91                 __overlay__ {
  92                         claim-clocks = <BCM2835_PLLD_DSI0 BCM2835_PLLD_DSI1 BCM2835_PLLH_AUX BCM2835_PLLH_PIX>;
  93                 };
  94         };
  95 -       fragment@11 {
  96 +       fragment@10 {
  97                 target = <&vec>;
  98                 __overlay__ {
  99                         status = "okay";
 100                 };
 101         };
 102 -       fragment@12 {
 103 +       fragment@11 {
 104                 target = <&txp>;
 105                 __overlay__ {
 106                         status = "okay";
 107                 };
 108         };
 109 -       fragment@13 {
 110 -               target = <&hdmi>;
 111 -               __dormant__ {
 112 -                       dmas;
 113 -               };
 114 -       };
 115 -       fragment@14 {
 116 +       fragment@12 {
 117                 target = <&audio>;
 118                 __overlay__ {
 119                         brcm,disable-hdmi;
 120                 };
 121         };
 122 -       fragment@15 {
 123 +       fragment@13 {
 124                 target = <&usb>;
 125                 #address-cells = <1>;
 126                 #size-cells = <1>;
 127 --- a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
 128 +++ b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
 129 @@ -110,42 +110,18 @@
 130                 };
 131         };
 132         fragment@17 {
 133 -               target = <&hdmi0>;
 134 -               __dormant__ {
 135 -                       dmas;
 136 -               };
 137 -       };
 138 -       fragment@18 {
 139 -               target = <&hdmi1>;
 140 -               __dormant__ {
 141 -                       dmas;
 142 -               };
 143 -       };
 144 -       fragment@19 {
 145                 target = <&audio>;
 146                 __overlay__ {
 147                         brcm,disable-hdmi;
 148                 };
 149         };
 150 -       fragment@20 {
 151 +       fragment@18 {
 152                 target = <&dvp>;
 153                 __overlay__ {
 154                         status = "okay";
 155                 };
 156         };
 157 -       fragment@21 {
 158 -               target = <&pixelvalve3>;
 159 -               __dormant__ {
 160 -                       status = "okay";
 161 -               };
 162 -       };
 163 -       fragment@22 {
 164 -               target = <&vec>;
 165 -               __dormant__ {
 166 -                       status = "okay";
 167 -               };
 168 -       };
 169 -       fragment@23 {
 170 +       fragment@19 {
 171                 target = <&usb>;
 172                 #address-cells = <1>;
 173                 #size-cells = <1>;