target/linux/bcm27xx/patches-5.10/950-0419-overlays-Rebuild-upstream-with-latest-ovmerge.patch

   1 From 9deb443820a6cbcc39446928bab722a2a6c1f72a 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     | 66 +++++--------------
  13  2 files changed, 31 insertions(+), 73 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 @@ -8,144 +8,114 @@
 130  / {
 131         compatible = "brcm,bcm2835";
 132         fragment@0 {
 133 -               target = <&cma>;
 134 -               __dormant__ {
 135 -                       size = <0x10000000>;
 136 -               };
 137 -       };
 138 -       fragment@1 {
 139                 target = <&ddc0>;
 140                 __overlay__ {
 141                         status = "okay";
 142                 };
 143         };
 144 -       fragment@2 {
 145 +       fragment@1 {
 146                 target = <&ddc1>;
 147                 __overlay__ {
 148                         status = "okay";
 149                 };
 150         };
 151 -       fragment@3 {
 152 +       fragment@2 {
 153                 target = <&hdmi0>;
 154                 __overlay__ {
 155                         status = "okay";
 156                 };
 157         };
 158 -       fragment@4 {
 159 +       fragment@3 {
 160                 target = <&hdmi1>;
 161                 __overlay__ {
 162                         status = "okay";
 163                 };
 164         };
 165 -       fragment@5 {
 166 +       fragment@4 {
 167                 target = <&hvs>;
 168                 __overlay__ {
 169                         status = "okay";
 170                 };
 171         };
 172 -       fragment@6 {
 173 +       fragment@5 {
 174                 target = <&pixelvalve0>;
 175                 __overlay__ {
 176                         status = "okay";
 177                 };
 178         };
 179 -       fragment@7 {
 180 +       fragment@6 {
 181                 target = <&pixelvalve1>;
 182                 __overlay__ {
 183                         status = "okay";
 184                 };
 185         };
 186 -       fragment@8 {
 187 +       fragment@7 {
 188                 target = <&pixelvalve2>;
 189                 __overlay__ {
 190                         status = "okay";
 191                 };
 192         };
 193 -       fragment@9 {
 194 +       fragment@8 {
 195                 target = <&pixelvalve3>;
 196                 __overlay__ {
 197                         status = "okay";
 198                 };
 199         };
 200 -       fragment@10 {
 201 +       fragment@9 {
 202                 target = <&pixelvalve4>;
 203                 __overlay__ {
 204                         status = "okay";
 205                 };
 206         };
 207 -       fragment@11 {
 208 +       fragment@10 {
 209                 target = <&v3d>;
 210                 __overlay__ {
 211                         status = "okay";
 212                 };
 213         };
 214 -       fragment@12 {
 215 +       fragment@11 {
 216                 target = <&vc4>;
 217                 __overlay__ {
 218                         status = "okay";
 219                 };
 220         };
 221 -       fragment@13 {
 222 +       fragment@12 {
 223                 target = <&txp>;
 224                 __overlay__ {
 225                         status = "okay";
 226                 };
 227         };
 228 -       fragment@14 {
 229 +       fragment@13 {
 230                 target = <&fb>;
 231                 __overlay__ {
 232                         status = "disabled";
 233                 };
 234         };
 235 -       fragment@15 {
 236 +       fragment@14 {
 237                 target = <&firmwarekms>;
 238                 __overlay__ {
 239                         status = "disabled";
 240                 };
 241         };
 242 -       fragment@16 {
 243 +       fragment@15 {
 244                 target = <&vec>;
 245                 __overlay__ {
 246                         status = "disabled";
 247                 };
 248         };
 249 -       fragment@17 {
 250 -               target = <&hdmi0>;
 251 -               __dormant__ {
 252 -                       dmas;
 253 -               };
 254 -       };
 255 -       fragment@18 {
 256 -               target = <&hdmi1>;
 257 -               __dormant__ {
 258 -                       dmas;
 259 -               };
 260 -       };
 261 -       fragment@19 {
 262 +       fragment@16 {
 263                 target = <&audio>;
 264                 __overlay__ {
 265                         brcm,disable-hdmi;
 266                 };
 267         };
 268 -       fragment@20 {
 269 +       fragment@17 {
 270                 target = <&dvp>;
 271                 __overlay__ {
 272                         status = "okay";
 273                 };
 274         };
 275 -       fragment@21 {
 276 -               target = <&pixelvalve3>;
 277 -               __dormant__ {
 278 -                       status = "okay";
 279 -               };
 280 -       };
 281 -       fragment@22 {
 282 -               target = <&vec>;
 283 -               __dormant__ {
 284 -                       status = "okay";
 285 -               };
 286 -       };
 287 -       fragment@23 {
 288 +       fragment@18 {
 289                 target = <&usb>;
 290                 #address-cells = <1>;
 291                 #size-cells = <1>;