target/linux/bcm27xx/patches-5.4/950-0625-overlays-Formally-rename-deprecate-old-overlays.patch

   1 From c9d7d2eb73f2c6024e3f94765fc830bce0203f2b Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Wed, 1 Apr 2020 17:24:15 +0100
   4 Subject: [PATCH] overlays: Formally rename/deprecate old overlays
   5
   6 Take advantage of the overlay_map to rename or deprecate some obsolete
   7 overlays.
   8
   9 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  10 ---
  11  arch/arm/boot/dts/overlays/Makefile           |  7 ----
  12  arch/arm/boot/dts/overlays/README             | 12 +-----
  13  .../overlays/bmp085_i2c-sensor-overlay.dts    | 23 -----------
  14  .../dts/overlays/i2c0-bcm2708-overlay.dts     | 14 -------
  15  .../dts/overlays/i2c1-bcm2708-overlay.dts     |  9 -----
  16  arch/arm/boot/dts/overlays/overlay_map.dts    | 40 +++++++++++++++++++
  17  .../boot/dts/overlays/pi3-act-led-overlay.dts |  1 -
  18  .../dts/overlays/pi3-disable-bt-overlay.dts   |  1 -
  19  .../dts/overlays/pi3-disable-wifi-overlay.dts |  1 -
  20  .../dts/overlays/pi3-miniuart-bt-overlay.dts  |  1 -
  21  10 files changed, 42 insertions(+), 67 deletions(-)
  22  delete mode 100644 arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts
  23  delete mode 100644 arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts
  24  delete mode 100644 arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts
  25  delete mode 100644 arch/arm/boot/dts/overlays/pi3-act-led-overlay.dts
  26  delete mode 100644 arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts
  27  delete mode 100644 arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts
  28  delete mode 100644 arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts
  29
  30 --- a/arch/arm/boot/dts/overlays/Makefile
  31 +++ b/arch/arm/boot/dts/overlays/Makefile
  32 @@ -27,7 +27,6 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
  33         audiosense-pi.dtbo \
  34         audremap.dtbo \
  35         balena-fin.dtbo \
  36 -       bmp085_i2c-sensor.dtbo \
  37         dht11.dtbo \
  38         dionaudio-loco.dtbo \
  39         dionaudio-loco-v2.dtbo \
  40 @@ -75,9 +74,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
  41         i2c-rtc-gpio.dtbo \
  42         i2c-sensor.dtbo \
  43         i2c0.dtbo \
  44 -       i2c0-bcm2708.dtbo \
  45         i2c1.dtbo \
  46 -       i2c1-bcm2708.dtbo \
  47         i2c3.dtbo \
  48         i2c4.dtbo \
  49         i2c5.dtbo \
  50 @@ -114,10 +111,6 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
  51         mz61581.dtbo \
  52         ov5647.dtbo \
  53         papirus.dtbo \
  54 -       pi3-act-led.dtbo \
  55 -       pi3-disable-bt.dtbo \
  56 -       pi3-disable-wifi.dtbo \
  57 -       pi3-miniuart-bt.dtbo \
  58         pibell.dtbo \
  59         piglow.dtbo \
  60         piscreen.dtbo \
  61 --- a/arch/arm/boot/dts/overlays/README
  62 +++ b/arch/arm/boot/dts/overlays/README
  63 @@ -1288,11 +1288,8 @@ Params: pins_0_1                Use pins
  64
  65
  66  Name:   i2c0-bcm2708
  67 -Info:   Deprecated, legacy version of i2c0, from which it inherits its
  68 -        parameters, just adding the explicit individual pin specifiers.
  69 +Info:   Deprecated, legacy version of i2c0.
  70  Load:   <Deprecated>
  71 -Params: sda0_pin                GPIO pin for SDA0 (deprecated - use pins_*)
  72 -        scl0_pin                GPIO pin for SCL0 (deprecated - use pins_*)
  73
  74
  75  Name:   i2c1
  76 @@ -1307,13 +1304,8 @@ Params: pins_2_3                Use pins
  77
  78
  79  Name:   i2c1-bcm2708
  80 -Info:   Deprecated, legacy version of i2c1, from which it inherits its
  81 -        parameters, just adding the explicit individual pin specifiers.
  82 +Info:   Deprecated, legacy version of i2c1.
  83  Load:   <Deprecated>
  84 -Params: sda1_pin                GPIO pin for SDA1 (2 or 44 - default 2)
  85 -        scl1_pin                GPIO pin for SCL1 (3 or 45 - default 3)
  86 -        pin_func                Alternative pin function (4 (alt0), 6 (alt2) -
  87 -                                default 4)
  88
  89
  90  Name:   i2c3
  91 --- a/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts
  92 +++ /dev/null
  93 @@ -1,23 +0,0 @@
  94 -// Definitions for BMP085/BMP180 digital barometric pressure and temperature sensors from Bosch Sensortec
  95 -/dts-v1/;
  96 -/plugin/;
  97 -
  98 -/ {
  99 -        compatible = "brcm,bcm2835";
 100 -
 101 -        fragment@0 {
 102 -                target = <&i2c_arm>;
 103 -                __overlay__ {
 104 -                        #address-cells = <1>;
 105 -                        #size-cells = <0>;
 106 -                        status = "okay";
 107 -
 108 -                        bmp085@77 {
 109 -                                compatible = "bosch,bmp085";
 110 -                                reg = <0x77>;
 111 -                                default-oversampling = <3>;
 112 -                                status = "okay";
 113 -                        };
 114 -                };
 115 -        };
 116 -};
 117 --- a/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts
 118 +++ /dev/null
 119 @@ -1,14 +0,0 @@
 120 -#include "i2c0-overlay.dts"
 121 -
 122 -/{
 123 -       __overrides__ {
 124 -               sda0_pin = <&pins1>,"brcm,pins:0",
 125 -                          <&pins2>,"brcm,pins:0",
 126 -                          <&pins3>,"brcm,pins:0",
 127 -                          <&pins4>,"brcm,pins:0";
 128 -               scl0_pin = <&pins1>,"brcm,pins:4",
 129 -                          <&pins2>,"brcm,pins:4",
 130 -                          <&pins3>,"brcm,pins:4",
 131 -                          <&pins4>,"brcm,pins:4";
 132 -       };
 133 -};
 134 --- a/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts
 135 +++ /dev/null
 136 @@ -1,9 +0,0 @@
 137 -#include "i2c1-overlay.dts"
 138 -
 139 -/{
 140 -       __overrides__ {
 141 -               sda1_pin = <&pins1>,"brcm,pins:0", <&pins2>,"brcm,pins:0";
 142 -               scl1_pin = <&pins1>,"brcm,pins:4", <&pins1>,"brcm,pins:4";
 143 -               pin_func = <&pins1>,"brcm,function:0", <&pins2>,"brcm,function:0";
 144 -       };
 145 -};
 146 --- a/arch/arm/boot/dts/overlays/overlay_map.dts
 147 +++ b/arch/arm/boot/dts/overlays/overlay_map.dts
 148 @@ -1,6 +1,18 @@
 149  /dts-v1/;
 150
 151  / {
 152 +       bmp085_i2c-sensor {
 153 +               deprecated = "use i2c-sensor,bmp085";
 154 +       };
 155 +
 156 +       i2c0-bcm2708 {
 157 +               deprecated = "use i2c0";
 158 +       };
 159 +
 160 +       i2c1-bcm2708 {
 161 +               deprecated = "use i2c1";
 162 +       };
 163 +
 164         i2c3 {
 165                 bcm2711;
 166         };
 167 @@ -17,10 +29,34 @@
 168                 bcm2711;
 169         };
 170
 171 +       lirc-rpi {
 172 +               deprecated = "use gpio-ir";
 173 +       };
 174 +
 175 +       pi3-act-led {
 176 +               renamed = "act-led";
 177 +       };
 178 +
 179 +       pi3-disable-bt {
 180 +               renamed = "disable-bt";
 181 +       };
 182 +
 183 +       pi3-disable-wifi {
 184 +               renamed = "disable-wifi";
 185 +       };
 186 +
 187 +       pi3-miniuart-bt {
 188 +               renamed = "miniuart-bt";
 189 +       };
 190 +
 191         rpivid-v4l2 {
 192                 bcm2711;
 193         };
 194
 195 +       sdio-1bit {
 196 +               deprecated = "use sdio,bus_width=1,gpios_22_25";
 197 +       };
 198 +
 199         spi3-1cs {
 200                 bcm2711;
 201         };
 202 @@ -68,4 +104,8 @@
 203         uart5 {
 204                 bcm2711;
 205         };
 206 +
 207 +       upstream-aux-interrupt {
 208 +               deprecated = "no longer necessary";
 209 +       };
 210  };
 211 --- a/arch/arm/boot/dts/overlays/pi3-act-led-overlay.dts
 212 +++ /dev/null
 213 @@ -1 +0,0 @@
 214 -#include "act-led-overlay.dts"
 215 --- a/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts
 216 +++ /dev/null
 217 @@ -1 +0,0 @@
 218 -#include "disable-bt-overlay.dts"
 219 --- a/arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts
 220 +++ /dev/null
 221 @@ -1 +0,0 @@
 222 -#include "disable-wifi-overlay.dts"
 223 --- a/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts
 224 +++ /dev/null
 225 @@ -1 +0,0 @@
 226 -#include "miniuart-bt-overlay.dts"