target/linux/brcm2708/patches-4.19/950-0143-overlays-Fix-a-few-dtc-warnings.patch

   1 From 17ded7b344a73b5a590ca8dc4599ac1ad3c1edb7 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.org>
   3 Date: Mon, 8 Oct 2018 17:16:28 +0100
   4 Subject: [PATCH 143/703] overlays: Fix a few dtc warnings
   5
   6 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
   7 ---
   8  .../overlays/pitft28-resistive-overlay.dts    |  2 --
   9  .../overlays/pitft35-resistive-overlay.dts    |  2 --
  10  .../arm/boot/dts/overlays/qca7000-overlay.dts | 13 ++++++----
  11  .../overlays/rpi-cirrus-wm5102-overlay.dts    | 26 ++++++++++++-------
  12  arch/arm/boot/dts/overlays/rpi-tv-overlay.dts | 11 +++++---
  13  .../boot/dts/overlays/smi-nand-overlay.dts    |  3 ---
  14  .../boot/dts/overlays/tinylcd35-overlay.dts   |  2 --
  15  7 files changed, 31 insertions(+), 28 deletions(-)
  16
  17 --- a/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts
  18 +++ b/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts
  19 @@ -64,8 +64,6 @@
  20                         };
  21
  22                         pitft_ts@1 {
  23 -                               #address-cells = <1>;
  24 -                               #size-cells = <0>;
  25                                 compatible = "st,stmpe610";
  26                                 reg = <1>;
  27
  28 --- a/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts
  29 +++ b/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts
  30 @@ -64,8 +64,6 @@
  31                         };
  32
  33                         pitft_ts@1 {
  34 -                               #address-cells = <1>;
  35 -                               #size-cells = <0>;
  36                                 compatible = "st,stmpe610";
  37                                 reg = <1>;
  38
  39 --- a/arch/arm/boot/dts/overlays/qca7000-overlay.dts
  40 +++ b/arch/arm/boot/dts/overlays/qca7000-overlay.dts
  41 @@ -8,6 +8,13 @@
  42         compatible = "brcm,bcm2708";
  43
  44         fragment@0 {
  45 +               target = <&spidev0>;
  46 +               __overlay__ {
  47 +                       status = "disabled";
  48 +               };
  49 +       };
  50 +
  51 +       fragment@1 {
  52                 target = <&spi0>;
  53                 __overlay__ {
  54                         /* needed to avoid dtc warning */
  55 @@ -16,10 +23,6 @@
  56
  57                         status = "okay";
  58
  59 -                       spidev@0 {
  60 -                               status = "disabled";
  61 -                       };
  62 -
  63                         eth1: qca7000@0 {
  64                                 compatible = "qca,qca7000";
  65                                 reg = <0>; /* CE0 */
  66 @@ -33,7 +36,7 @@
  67                 };
  68         };
  69
  70 -       fragment@1 {
  71 +       fragment@2 {
  72                 target = <&gpio>;
  73                 __overlay__ {
  74                         eth1_pins: eth1_pins {
  75 --- a/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts
  76 +++ b/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts
  77 @@ -44,20 +44,26 @@
  78         };
  79
  80         fragment@3 {
  81 +               target = <&spidev0>;
  82 +               __overlay__ {
  83 +                       status = "disabled";
  84 +               };
  85 +       };
  86 +
  87 +       fragment@4 {
  88 +               target = <&spidev1>;
  89 +               __overlay__ {
  90 +                       status = "disabled";
  91 +               };
  92 +       };
  93 +
  94 +       fragment@5 {
  95                 target = <&spi0>;
  96                 __overlay__ {
  97                         #address-cells = <1>;
  98                         #size-cells = <0>;
  99                         status = "okay";
 100
 101 -                       spidev@0{
 102 -                               status = "disabled";
 103 -                       };
 104 -
 105 -                       spidev@1{
 106 -                               status = "disabled";
 107 -                       };
 108 -
 109                         wm5102@1{
 110                                 compatible = "wlf,wm5102";
 111                                 reg = <1>;
 112 @@ -117,7 +123,7 @@
 113                 };
 114         };
 115
 116 -       fragment@4 {
 117 +       fragment@6 {
 118                 target = <&i2c1>;
 119                 __overlay__ {
 120                         status = "okay";
 121 @@ -135,7 +141,7 @@
 122                 };
 123         };
 124
 125 -       fragment@5 {
 126 +       fragment@7 {
 127                 target = <&sound>;
 128                 __overlay__ {
 129                         compatible = "wlf,rpi-cirrus";
 130 --- a/arch/arm/boot/dts/overlays/rpi-tv-overlay.dts
 131 +++ b/arch/arm/boot/dts/overlays/rpi-tv-overlay.dts
 132 @@ -7,6 +7,13 @@
 133         compatible = "brcm,bcm2708", "brcm,bcm2709";
 134
 135         fragment@0 {
 136 +               target = <&spidev0>;
 137 +               __overlay__ {
 138 +                       status = "disabled";
 139 +               };
 140 +       };
 141 +
 142 +       fragment@1 {
 143                 target = <&spi0>;
 144                 __overlay__ {
 145                         /* needed to avoid dtc warning */
 146 @@ -15,10 +22,6 @@
 147
 148                         status = "okay";
 149
 150 -                       spidev@0 {
 151 -                               status = "disabled";
 152 -                       };
 153 -
 154                         cxd2880@0 {
 155                                 compatible = "sony,cxd2880";
 156                                 reg = <0>; /* CE0 */
 157 --- a/arch/arm/boot/dts/overlays/smi-nand-overlay.dts
 158 +++ b/arch/arm/boot/dts/overlays/smi-nand-overlay.dts
 159 @@ -20,9 +20,6 @@
 160         fragment@1 {
 161                 target = <&soc>;
 162                 __overlay__ {
 163 -                       #address-cells = <1>;
 164 -                       #size-cells = <1>;
 165 -
 166                         nand: flash@0 {
 167                                 compatible = "brcm,bcm2835-smi-nand";
 168                                 smi_handle = <&smi>;
 169 --- a/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts
 170 +++ b/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts
 171 @@ -171,8 +171,6 @@
 172                 __overlay__ {
 173                         keypad: keypad {
 174                                 compatible = "gpio-keys";
 175 -                               #address-cells = <1>;
 176 -                               #size-cells = <0>;
 177                                 pinctrl-names = "default";
 178                                 pinctrl-0 = <&keypad_pins>;
 179                                 status = "disabled";