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
6 Take advantage of the overlay_map to rename or deprecate some obsolete
9 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
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
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) += \
36 - bmp085_i2c-sensor.dtbo \
39 dionaudio-loco-v2.dtbo \
40 @@ -75,9 +74,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
50 @@ -114,10 +111,6 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
55 - pi3-disable-bt.dtbo \
56 - pi3-disable-wifi.dtbo \
57 - pi3-miniuart-bt.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
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.
71 -Params: sda0_pin GPIO pin for SDA0 (deprecated - use pins_*)
72 - scl0_pin GPIO pin for SCL0 (deprecated - use pins_*)
76 @@ -1307,13 +1304,8 @@ Params: pins_2_3 Use pins
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.
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) -
91 --- a/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts
94 -// Definitions for BMP085/BMP180 digital barometric pressure and temperature sensors from Bosch Sensortec
99 - compatible = "brcm,bcm2835";
102 - target = <&i2c_arm>;
104 - #address-cells = <1>;
109 - compatible = "bosch,bmp085";
111 - default-oversampling = <3>;
117 --- a/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts
120 -#include "i2c0-overlay.dts"
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";
134 --- a/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts
137 -#include "i2c1-overlay.dts"
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";
146 --- a/arch/arm/boot/dts/overlays/overlay_map.dts
147 +++ b/arch/arm/boot/dts/overlays/overlay_map.dts
152 + bmp085_i2c-sensor {
153 + deprecated = "use i2c-sensor,bmp085";
157 + deprecated = "use i2c0";
161 + deprecated = "use i2c1";
172 + deprecated = "use gpio-ir";
176 + renamed = "act-led";
180 + renamed = "disable-bt";
184 + renamed = "disable-wifi";
188 + renamed = "miniuart-bt";
196 + deprecated = "use sdio,bus_width=1,gpios_22_25";
207 + upstream-aux-interrupt {
208 + deprecated = "no longer necessary";
211 --- a/arch/arm/boot/dts/overlays/pi3-act-led-overlay.dts
214 -#include "act-led-overlay.dts"
215 --- a/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts
218 -#include "disable-bt-overlay.dts"
219 --- a/arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts
222 -#include "disable-wifi-overlay.dts"
223 --- a/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts
226 -#include "miniuart-bt-overlay.dts"