Skip to content

Commit 7c2808e

Browse files
pelwellpelwell
committed
overlays: Make more overlays runtime-capable
The kernel now rejects the creation of a DT node with the same name as an existing node, so take care not to do that. Signed-off-by: Phil Elwell <[email protected]>
1 parent f1d42bf commit 7c2808e

11 files changed

+61
-69
lines changed

‎arch/arm/boot/dts/bcm270x-rpi.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@
132132

133133
&cpu_thermal {
134134
/delete-node/ trips;
135+
/delete-node/ cooling-maps;
135136
};
136137

137138
&vec {

‎arch/arm/boot/dts/overlays/apds9960-overlay.dts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,15 @@
2424
};
2525

2626
fragment@2 {
27+
target = <&apds9960>;
28+
apds9960_irq: __overlay__ {
29+
#interrupt-cells = <2>;
30+
interrupt-parent = <&gpio>;
31+
interrupts = <4 1>;
32+
};
33+
};
34+
35+
fragment@3 {
2736
target = <&i2c1>;
2837
__overlay__ {
2938
#address-cells = <1>;
@@ -37,21 +46,10 @@
3746
};
3847
};
3948

40-
fragment@3 {
41-
target = <&i2c1>;
42-
__overlay__ {
43-
apds9960_irq: apds@39 {
44-
#interrupt-cells=<2>;
45-
interrupt-parent = <&gpio>;
46-
interrupts = <4 1>;
47-
};
48-
};
49-
};
50-
5149
__overrides__ {
5250
gpiopin = <&apds9960_pins>,"brcm,pins:0",
5351
<&apds9960_irq>,"interrupts:0";
54-
noints = <0>,"!1!3";
52+
noints = <0>,"!1!2";
5553
};
5654
};
5755

‎arch/arm/boot/dts/overlays/balena-fin-overlay.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
fragment@1 {
2121
target = <&gpio>;
2222
__overlay__ {
23-
sdio_pins: sdio_pins {
23+
sdio_pins: sdio_ovl_pins {
2424
brcm,pins = <34 35 36 37 38 39>;
2525
brcm,function = <7>; /* ALT3 = SD1 */
2626
brcm,pull = <0 2 2 2 2 2>;

‎arch/arm/boot/dts/overlays/gc9a01-overlay.dts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,9 @@
3737
compatible = "brcm,bcm2835";
3838

3939
fragment@0 {
40-
target = <&spi0>;
40+
target = <&spidev0>;
4141
__overlay__ {
42-
status = "okay";
43-
spidev@0 {
44-
status = "disabled";
45-
};
42+
status = "disabled";
4643
};
4744
};
4845

@@ -63,6 +60,7 @@
6360
/* needed to avoid dtc warning */
6461
#address-cells = <1>;
6562
#size-cells = <0>;
63+
status = "okay";
6664

6765
gc9a01: gc9a01@0 {
6866
compatible = "ilitek,ili9340";

‎arch/arm/boot/dts/overlays/media-center-overlay.dts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,20 @@
1010
compatible = "brcm,bcm2835";
1111

1212
fragment@0 {
13-
target = <&spi0>;
13+
target = <&spidev0>;
1414
__overlay__ {
15-
status = "okay";
16-
17-
spidev@0{
18-
status = "disabled";
19-
};
20-
21-
spidev@1{
22-
status = "disabled";
23-
};
15+
status = "disabled";
2416
};
2517
};
2618

2719
fragment@1 {
20+
target = <&spidev1>;
21+
__overlay__ {
22+
status = "disabled";
23+
};
24+
};
25+
26+
fragment@2 {
2827
target = <&gpio>;
2928
__overlay__ {
3029
rpi_display_pins: rpi_display_pins {
@@ -35,12 +34,13 @@
3534
};
3635
};
3736

38-
fragment@2 {
37+
fragment@3 {
3938
target = <&spi0>;
4039
__overlay__ {
4140
/* needed to avoid dtc warning */
4241
#address-cells = <1>;
4342
#size-cells = <0>;
43+
status = "okay";
4444

4545
rpidisplay: rpi-display@0{
4646
compatible = "ilitek,ili9341";
@@ -73,7 +73,7 @@
7373
};
7474
};
7575

76-
fragment@3 {
76+
fragment@4 {
7777
target-path = "/";
7878
__overlay__ {
7979
lirc_rpi: lirc_rpi {
@@ -101,7 +101,7 @@
101101
};
102102
};
103103

104-
fragment@4 {
104+
fragment@5 {
105105
target = <&gpio>;
106106
__overlay__ {
107107
lirc_pins: lirc_pins {

‎arch/arm/boot/dts/overlays/minipitft13-overlay.dts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,20 @@
1010
compatible = "brcm,bcm2835";
1111

1212
fragment@0 {
13-
target = <&spi0>;
13+
target = <&spidev0>;
1414
__overlay__ {
15-
status = "okay";
16-
17-
spidev@0{
18-
status = "disabled";
19-
};
20-
21-
spidev@1{
22-
status = "disabled";
23-
};
15+
status = "disabled";
2416
};
2517
};
2618

2719
fragment@1 {
20+
target = <&spidev1>;
21+
__overlay__ {
22+
status = "disabled";
23+
};
24+
};
25+
26+
fragment@2 {
2827
target = <&gpio>;
2928
__overlay__ {
3029
pitft_pins: pitft_pins {
@@ -35,12 +34,13 @@
3534
};
3635
};
3736

38-
fragment@2 {
37+
fragment@3 {
3938
target = <&spi0>;
4039
__overlay__ {
4140
/* needed to avoid dtc warning */
4241
#address-cells = <1>;
4342
#size-cells = <0>;
43+
status = "okay";
4444

4545
pitft: pitft@0 {
4646
compatible = "fbtft,minipitft13";

‎arch/arm/boot/dts/overlays/papirus-overlay.dts

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,20 @@
2323
};
2424

2525
fragment@1 {
26-
target-path = "/";
26+
target-path = "/thermal-zones";
2727
__overlay__ {
28-
thermal-zones {
29-
display {
30-
polling-delay-passive = <0>;
31-
polling-delay = <0>;
32-
thermal-sensors = <&display_temp>;
33-
};
28+
display {
29+
polling-delay-passive = <0>;
30+
polling-delay = <0>;
31+
thermal-sensors = <&display_temp>;
3432
};
3533
};
3634
};
3735

3836
fragment@2 {
39-
target = <&spi0>;
37+
target = <&spidev0>;
4038
__overlay__ {
41-
status = "okay";
42-
43-
spidev@0{
44-
status = "disabled";
45-
};
39+
status = "disabled";
4640
};
4741
};
4842

@@ -62,6 +56,7 @@
6256
/* needed to avoid dtc warning */
6357
#address-cells = <1>;
6458
#size-cells = <0>;
59+
status = "okay";
6560

6661
repaper: repaper@0{
6762
compatible = "not_set";

‎arch/arm/boot/dts/overlays/pitft22-overlay.dts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,20 @@
1010
compatible = "brcm,bcm2835";
1111

1212
fragment@0 {
13-
target = <&spi0>;
13+
target = <&spidev0>;
1414
__overlay__ {
15-
status = "okay";
16-
17-
spidev@0{
18-
status = "disabled";
19-
};
20-
21-
spidev@1{
22-
status = "disabled";
23-
};
15+
status = "disabled";
2416
};
2517
};
2618

2719
fragment@1 {
20+
target = <&spidev1>;
21+
__overlay__ {
22+
status = "disabled";
23+
};
24+
};
25+
26+
fragment@2 {
2827
target = <&gpio>;
2928
__overlay__ {
3029
pitft_pins: pitft_pins {
@@ -35,12 +34,13 @@
3534
};
3635
};
3736

38-
fragment@2 {
37+
fragment@3 {
3938
target = <&spi0>;
4039
__overlay__ {
4140
/* needed to avoid dtc warning */
4241
#address-cells = <1>;
4342
#size-cells = <0>;
43+
status = "okay";
4444

4545
pitft: pitft@0{
4646
compatible = "ilitek,ili9340";

‎arch/arm/boot/dts/overlays/qca7000-uart0-overlay.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
fragment@1 {
2525
target = <&gpio>;
2626
__overlay__ {
27-
uart0_pins: uart0_pins {
27+
uart0_pins: uart0_ovl_pins {
2828
brcm,pins = <14 15>;
2929
brcm,function = <4>; /* alt0 */
3030
brcm,pull = <0 2>;

‎arch/arm/boot/dts/overlays/uart0-overlay.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
fragment@1 {
1717
target = <&gpio>;
1818
__overlay__ {
19-
uart0_pins: uart0_pins {
19+
uart0_pins: uart0_ovl_pins {
2020
brcm,pins = <14 15>;
2121
brcm,function = <4>; /* alt0 */
2222
brcm,pull = <0 2>;

‎arch/arm/boot/dts/overlays/uart1-overlay.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
fragment@1 {
1717
target = <&gpio>;
1818
__overlay__ {
19-
uart1_pins: uart1_pins {
19+
uart1_pins: uart1_ovl_pins {
2020
brcm,pins = <14 15>;
2121
brcm,function = <2>; /* alt5 */
2222
brcm,pull = <0 2>;

0 commit comments

Comments
 (0)