Skip to content

Commit

Permalink
overlays: Formally rename/deprecate old overlays
Browse files Browse the repository at this point in the history
Take advantage of the overlay_map to rename or deprecate some obsolete
overlays.

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  • Loading branch information
pelwell committed Apr 6, 2020
1 parent 48f91c2 commit 1c1d6ec
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 67 deletions.
7 changes: 0 additions & 7 deletions arch/arm/boot/dts/overlays/Makefile
Expand Up @@ -27,7 +27,6 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
audiosense-pi.dtbo \
audremap.dtbo \
balena-fin.dtbo \
bmp085_i2c-sensor.dtbo \
dht11.dtbo \
dionaudio-loco.dtbo \
dionaudio-loco-v2.dtbo \
Expand Down Expand Up @@ -75,9 +74,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
i2c-rtc-gpio.dtbo \
i2c-sensor.dtbo \
i2c0.dtbo \
i2c0-bcm2708.dtbo \
i2c1.dtbo \
i2c1-bcm2708.dtbo \
i2c3.dtbo \
i2c4.dtbo \
i2c5.dtbo \
Expand Down Expand Up @@ -114,10 +111,6 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
mz61581.dtbo \
ov5647.dtbo \
papirus.dtbo \
pi3-act-led.dtbo \
pi3-disable-bt.dtbo \
pi3-disable-wifi.dtbo \
pi3-miniuart-bt.dtbo \
pibell.dtbo \
piglow.dtbo \
piscreen.dtbo \
Expand Down
12 changes: 2 additions & 10 deletions arch/arm/boot/dts/overlays/README
Expand Up @@ -1288,11 +1288,8 @@ Params: pins_0_1 Use pins 0 and 1 (default)


Name: i2c0-bcm2708
Info: Deprecated, legacy version of i2c0, from which it inherits its
parameters, just adding the explicit individual pin specifiers.
Info: Deprecated, legacy version of i2c0.
Load: <Deprecated>
Params: sda0_pin GPIO pin for SDA0 (deprecated - use pins_*)
scl0_pin GPIO pin for SCL0 (deprecated - use pins_*)


Name: i2c1
Expand All @@ -1307,13 +1304,8 @@ Params: pins_2_3 Use pins 2 and 3 (default)


Name: i2c1-bcm2708
Info: Deprecated, legacy version of i2c1, from which it inherits its
parameters, just adding the explicit individual pin specifiers.
Info: Deprecated, legacy version of i2c1.
Load: <Deprecated>
Params: sda1_pin GPIO pin for SDA1 (2 or 44 - default 2)
scl1_pin GPIO pin for SCL1 (3 or 45 - default 3)
pin_func Alternative pin function (4 (alt0), 6 (alt2) -
default 4)


Name: i2c3
Expand Down
23 changes: 0 additions & 23 deletions arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts

This file was deleted.

14 changes: 0 additions & 14 deletions arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts

This file was deleted.

9 changes: 0 additions & 9 deletions arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts

This file was deleted.

40 changes: 40 additions & 0 deletions arch/arm/boot/dts/overlays/overlay_map.dts
@@ -1,6 +1,18 @@
/dts-v1/;

/ {
bmp085_i2c-sensor {
deprecated = "use i2c-sensor,bmp085";
};

i2c0-bcm2708 {
deprecated = "use i2c0";
};

i2c1-bcm2708 {
deprecated = "use i2c1";
};

i2c3 {
bcm2711;
};
Expand All @@ -17,10 +29,34 @@
bcm2711;
};

lirc-rpi {
deprecated = "use gpio-ir";
};

pi3-act-led {
renamed = "act-led";
};

pi3-disable-bt {
renamed = "disable-bt";
};

pi3-disable-wifi {
renamed = "disable-wifi";
};

pi3-miniuart-bt {
renamed = "miniuart-bt";
};

rpivid-v4l2 {
bcm2711;
};

sdio-1bit {
deprecated = "use sdio,bus_width=1,gpios_22_25";
};

spi3-1cs {
bcm2711;
};
Expand Down Expand Up @@ -68,4 +104,8 @@
uart5 {
bcm2711;
};

upstream-aux-interrupt {
deprecated = "no longer necessary";
};
};
1 change: 0 additions & 1 deletion arch/arm/boot/dts/overlays/pi3-act-led-overlay.dts

This file was deleted.

1 change: 0 additions & 1 deletion arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts

This file was deleted.

1 change: 0 additions & 1 deletion arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts

This file was deleted.

1 change: 0 additions & 1 deletion arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts

This file was deleted.

0 comments on commit 1c1d6ec

Please sign in to comment.