target/linux/brcm2708/patches-4.14/950-0195-BCM270X_DT-More-cosmetic-DT-changes.patch

   1 From 6f6916802d79d16acd3339f96a2d87da52fa1ad1 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.org>
   3 Date: Tue, 6 Feb 2018 13:10:09 +0000
   4 Subject: [PATCH 195/454] BCM270X_DT: More cosmetic DT changes
   5
   6 Remove unnecessary duplicate labels (but keep spi0).
   7
   8 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
   9 ---
  10  arch/arm/boot/dts/bcm2708-rpi.dtsi            |  5 ----
  11  arch/arm/boot/dts/bcm270x.dtsi                | 15 ++++------
  12  .../dts/overlays/vc4-fkms-v3d-overlay.dts     |  2 +-
  13  .../boot/dts/overlays/vc4-kms-v3d-overlay.dts | 29 +++++++------------
  14  4 files changed, 17 insertions(+), 34 deletions(-)
  15
  16 --- a/arch/arm/boot/dts/bcm2708-rpi.dtsi
  17 +++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi
  18 @@ -81,11 +81,6 @@
  19                         status = "okay";
  20                 };
  21
  22 -               thermal: thermal@7e212000 {
  23 -                       #thermal-sensor-cells = <0>;
  24 -                       status = "okay";
  25 -               };
  26 -
  27                 /* Onboard audio */
  28                 audio: audio {
  29                         compatible = "brcm,bcm2835-audio";
  30 --- a/arch/arm/boot/dts/bcm270x.dtsi
  31 +++ b/arch/arm/boot/dts/bcm270x.dtsi
  32 @@ -12,10 +12,6 @@
  33                         /* Add alias */
  34                 };
  35
  36 -               cprman: cprman@7e101000 {
  37 -                       /* Add alias */
  38 -               };
  39 -
  40                 random: rng@7e104000 {
  41                         /* Add alias */
  42                 };
  43 @@ -94,7 +90,7 @@
  44                         reg = <0x7e600000 0x100>;
  45                         interrupts = <2 16>;
  46                         clocks = <&clocks BCM2835_CLOCK_SMI>;
  47 -                       assigned-clocks = <&cprman BCM2835_CLOCK_SMI>;
  48 +                       assigned-clocks = <&clocks BCM2835_CLOCK_SMI>;
  49                         assigned-clock-rates = <125000000>;
  50                         dmas = <&dma 4>;
  51                         dma-names = "rx-tx";
  52 @@ -124,11 +120,6 @@
  53                         status = "disabled";
  54                 };
  55
  56 -               gpu: gpu {
  57 -                       /* Add alias */
  58 -                       status = "disabled";
  59 -               };
  60 -
  61                 axiperf: axiperf {
  62                         compatible = "brcm,bcm2835-axiperf";
  63                         reg = <0x7e009800 0x100>,
  64 @@ -177,3 +168,7 @@
  65         interrupt-parent = <&aux>;
  66         interrupts = <2>;
  67  };
  68 +
  69 +&vc4 {
  70 +       status = "disabled";
  71 +};
  72 --- a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts
  73 +++ b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts
  74 @@ -66,7 +66,7 @@
  75         };
  76
  77         fragment@8 {
  78 -               target = <&gpu>;
  79 +               target = <&vc4>;
  80                 __overlay__  {
  81                         status = "okay";
  82                 };
  83 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
  84 +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
  85 @@ -53,20 +53,13 @@
  86         };
  87
  88         fragment@6 {
  89 -               target = <&cprman>;
  90 -               __overlay__  {
  91 -                       status = "okay";
  92 -               };
  93 -       };
  94 -
  95 -       fragment@7 {
  96                 target = <&fb>;
  97                 __overlay__  {
  98                         status = "disabled";
  99                 };
 100         };
 101
 102 -       fragment@8 {
 103 +       fragment@7 {
 104                 target = <&pixelvalve0>;
 105                 __overlay__  {
 106                         interrupts = <2 13>; /* pwa0 */
 107 @@ -74,7 +67,7 @@
 108                 };
 109         };
 110
 111 -       fragment@9 {
 112 +       fragment@8 {
 113                 target = <&pixelvalve1>;
 114                 __overlay__  {
 115                         interrupts = <2 14>; /* pwa1 */
 116 @@ -82,7 +75,7 @@
 117                 };
 118         };
 119
 120 -       fragment@10 {
 121 +       fragment@9 {
 122                 target = <&pixelvalve2>;
 123                 __overlay__  {
 124                         interrupts = <2 10>; /* pixelvalve */
 125 @@ -90,7 +83,7 @@
 126                 };
 127         };
 128
 129 -       fragment@11 {
 130 +       fragment@10 {
 131                 target = <&hvs>;
 132                 __overlay__  {
 133                         interrupts = <2 1>;
 134 @@ -98,7 +91,7 @@
 135                 };
 136         };
 137
 138 -       fragment@12 {
 139 +       fragment@11 {
 140                 target = <&hdmi>;
 141                 __overlay__  {
 142                         interrupts = <2 8>, <2 9>;
 143 @@ -106,7 +99,7 @@
 144                 };
 145         };
 146
 147 -       fragment@13 {
 148 +       fragment@12 {
 149                 target = <&v3d>;
 150                 __overlay__  {
 151                         interrupts = <1 10>;
 152 @@ -114,14 +107,14 @@
 153                 };
 154         };
 155
 156 -       fragment@14 {
 157 -               target = <&gpu>;
 158 +       fragment@13 {
 159 +               target = <&vc4>;
 160                 __overlay__  {
 161                         status = "okay";
 162                 };
 163         };
 164
 165 -       fragment@15 {
 166 +       fragment@14 {
 167                 target-path = "/soc/dma";
 168                 __overlay__ {
 169                         brcm,dma-channel-mask = <0x7f35>;
 170 @@ -129,7 +122,7 @@
 171         };
 172
 173
 174 -       fragment@16 {
 175 +       fragment@15 {
 176                 target = <&clocks>;
 177                 __overlay__  {
 178                         claim-clocks = <
 179 @@ -141,7 +134,7 @@
 180                 };
 181         };
 182
 183 -       fragment@17 {
 184 +       fragment@16 {
 185                 target = <&vec>;
 186                 __overlay__  {
 187                         status = "okay";