Skip to content

overlays: Make more overlays runtime-capable #5101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions arch/arm/boot/dts/bcm270x-rpi.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@

&cpu_thermal {
/delete-node/ trips;
/delete-node/ cooling-maps;
};

&vec {
Expand Down
22 changes: 10 additions & 12 deletions arch/arm/boot/dts/overlays/apds9960-overlay.dts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,15 @@
};

fragment@2 {
target = <&apds9960>;
apds9960_irq: __overlay__ {
#interrupt-cells = <2>;
interrupt-parent = <&gpio>;
interrupts = <4 1>;
};
};

fragment@3 {
target = <&i2c1>;
__overlay__ {
#address-cells = <1>;
Expand All @@ -37,21 +46,10 @@
};
};

fragment@3 {
target = <&i2c1>;
__overlay__ {
apds9960_irq: apds@39 {
#interrupt-cells=<2>;
interrupt-parent = <&gpio>;
interrupts = <4 1>;
};
};
};

__overrides__ {
gpiopin = <&apds9960_pins>,"brcm,pins:0",
<&apds9960_irq>,"interrupts:0";
noints = <0>,"!1!3";
noints = <0>,"!1!2";
};
};

2 changes: 1 addition & 1 deletion arch/arm/boot/dts/overlays/balena-fin-overlay.dts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
fragment@1 {
target = <&gpio>;
__overlay__ {
sdio_pins: sdio_pins {
sdio_pins: sdio_ovl_pins {
brcm,pins = <34 35 36 37 38 39>;
brcm,function = <7>; /* ALT3 = SD1 */
brcm,pull = <0 2 2 2 2 2>;
Expand Down
8 changes: 3 additions & 5 deletions arch/arm/boot/dts/overlays/gc9a01-overlay.dts
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,9 @@
compatible = "brcm,bcm2835";

fragment@0 {
target = <&spi0>;
target = <&spidev0>;
__overlay__ {
status = "okay";
spidev@0 {
status = "disabled";
};
status = "disabled";
};
};

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

gc9a01: gc9a01@0 {
compatible = "ilitek,ili9340";
Expand Down
26 changes: 13 additions & 13 deletions arch/arm/boot/dts/overlays/media-center-overlay.dts
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,20 @@
compatible = "brcm,bcm2835";

fragment@0 {
target = <&spi0>;
target = <&spidev0>;
__overlay__ {
status = "okay";

spidev@0{
status = "disabled";
};

spidev@1{
status = "disabled";
};
status = "disabled";
};
};

fragment@1 {
target = <&spidev1>;
__overlay__ {
status = "disabled";
};
};

fragment@2 {
target = <&gpio>;
__overlay__ {
rpi_display_pins: rpi_display_pins {
Expand All @@ -35,12 +34,13 @@
};
};

fragment@2 {
fragment@3 {
target = <&spi0>;
__overlay__ {
/* needed to avoid dtc warning */
#address-cells = <1>;
#size-cells = <0>;
status = "okay";

rpidisplay: rpi-display@0{
compatible = "ilitek,ili9341";
Expand Down Expand Up @@ -73,7 +73,7 @@
};
};

fragment@3 {
fragment@4 {
target-path = "/";
__overlay__ {
lirc_rpi: lirc_rpi {
Expand Down Expand Up @@ -101,7 +101,7 @@
};
};

fragment@4 {
fragment@5 {
target = <&gpio>;
__overlay__ {
lirc_pins: lirc_pins {
Expand Down
22 changes: 11 additions & 11 deletions arch/arm/boot/dts/overlays/minipitft13-overlay.dts
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,20 @@
compatible = "brcm,bcm2835";

fragment@0 {
target = <&spi0>;
target = <&spidev0>;
__overlay__ {
status = "okay";

spidev@0{
status = "disabled";
};

spidev@1{
status = "disabled";
};
status = "disabled";
};
};

fragment@1 {
target = <&spidev1>;
__overlay__ {
status = "disabled";
};
};

fragment@2 {
target = <&gpio>;
__overlay__ {
pitft_pins: pitft_pins {
Expand All @@ -35,12 +34,13 @@
};
};

fragment@2 {
fragment@3 {
target = <&spi0>;
__overlay__ {
/* needed to avoid dtc warning */
#address-cells = <1>;
#size-cells = <0>;
status = "okay";

pitft: pitft@0 {
compatible = "fbtft,minipitft13";
Expand Down
21 changes: 8 additions & 13 deletions arch/arm/boot/dts/overlays/papirus-overlay.dts
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,20 @@
};

fragment@1 {
target-path = "/";
target-path = "/thermal-zones";
__overlay__ {
thermal-zones {
display {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&display_temp>;
};
display {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&display_temp>;
};
};
};

fragment@2 {
target = <&spi0>;
target = <&spidev0>;
__overlay__ {
status = "okay";

spidev@0{
status = "disabled";
};
status = "disabled";
};
};

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

repaper: repaper@0{
compatible = "not_set";
Expand Down
22 changes: 11 additions & 11 deletions arch/arm/boot/dts/overlays/pitft22-overlay.dts
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,20 @@
compatible = "brcm,bcm2835";

fragment@0 {
target = <&spi0>;
target = <&spidev0>;
__overlay__ {
status = "okay";

spidev@0{
status = "disabled";
};

spidev@1{
status = "disabled";
};
status = "disabled";
};
};

fragment@1 {
target = <&spidev1>;
__overlay__ {
status = "disabled";
};
};

fragment@2 {
target = <&gpio>;
__overlay__ {
pitft_pins: pitft_pins {
Expand All @@ -35,12 +34,13 @@
};
};

fragment@2 {
fragment@3 {
target = <&spi0>;
__overlay__ {
/* needed to avoid dtc warning */
#address-cells = <1>;
#size-cells = <0>;
status = "okay";

pitft: pitft@0{
compatible = "ilitek,ili9340";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/overlays/qca7000-uart0-overlay.dts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
fragment@1 {
target = <&gpio>;
__overlay__ {
uart0_pins: uart0_pins {
uart0_pins: uart0_ovl_pins {
brcm,pins = <14 15>;
brcm,function = <4>; /* alt0 */
brcm,pull = <0 2>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/overlays/uart0-overlay.dts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
fragment@1 {
target = <&gpio>;
__overlay__ {
uart0_pins: uart0_pins {
uart0_pins: uart0_ovl_pins {
brcm,pins = <14 15>;
brcm,function = <4>; /* alt0 */
brcm,pull = <0 2>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/overlays/uart1-overlay.dts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
fragment@1 {
target = <&gpio>;
__overlay__ {
uart1_pins: uart1_pins {
uart1_pins: uart1_ovl_pins {
brcm,pins = <14 15>;
brcm,function = <2>; /* alt5 */
brcm,pull = <0 2>;
Expand Down