diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2022-05-16 23:40:32 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2022-05-17 15:11:22 +0200 |
| commit | 20ea6adbf199097c4f5f591ffee088340630dae4 (patch) | |
| tree | d6719d95e136611a1c25bbf7789652d6d402779d /target/linux/bcm27xx/patches-5.15/950-0570-dtoverlays-Remove-i2c0mux-and-i20if-status-from-edt-.patch | |
| parent | bca05bd072180dc38ef740b37ded9572a6db1981 (diff) | |
| download | upstream-20ea6adbf199097c4f5f591ffee088340630dae4.tar.gz upstream-20ea6adbf199097c4f5f591ffee088340630dae4.tar.bz2 upstream-20ea6adbf199097c4f5f591ffee088340630dae4.zip | |
bcm27xx: add support for linux v5.15
Build system: x86_64
Build-tested: bcm2708, bcm2709, bcm2710, bcm2711
Run-tested: bcm2708/RPiB+, bcm2709/RPi3B, bcm2710/RPi3B, bcm2711/RPi4B
Signed-off-by: Marty Jones <mj8263788@gmail.com>
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15/950-0570-dtoverlays-Remove-i2c0mux-and-i20if-status-from-edt-.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.15/950-0570-dtoverlays-Remove-i2c0mux-and-i20if-status-from-edt-.patch | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0570-dtoverlays-Remove-i2c0mux-and-i20if-status-from-edt-.patch b/target/linux/bcm27xx/patches-5.15/950-0570-dtoverlays-Remove-i2c0mux-and-i20if-status-from-edt-.patch new file mode 100644 index 0000000000..be5648c028 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.15/950-0570-dtoverlays-Remove-i2c0mux-and-i20if-status-from-edt-.patch @@ -0,0 +1,77 @@ +From 064acb7882a7d9897dc5f8117ca9a94970387701 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson <dave.stevenson@raspberrypi.com> +Date: Wed, 10 Nov 2021 15:55:32 +0000 +Subject: [PATCH] dtoverlays: Remove i2c0mux and i20if status from + edt-ft5406.dtsi + +edt-ft5406.dtsi is included from vc4-kms-dsi-7inch which was +also setting i2c0mux and i2c0if status fields. This meant that +dtoverlay wouldn't apply the overlay due to multiple fragments +changing the same parameter. + +Move the enable from edt-ft5406.dtsi to edt-ft5406-overlay.dts +for when it should be needed as an independent overlay. + +Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> +--- + .../arm/boot/dts/overlays/edt-ft5406-overlay.dts | 16 ++++++++++++++++ + arch/arm/boot/dts/overlays/edt-ft5406.dtsi | 8 -------- + .../dts/overlays/vc4-kms-dsi-7inch-overlay.dts | 2 +- + 3 files changed, 17 insertions(+), 9 deletions(-) + +--- a/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts ++++ b/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts +@@ -8,3 +8,19 @@ + /plugin/; + + #include "edt-ft5406.dtsi" ++ ++/ { ++ fragment@0 { ++ target = <&i2c0if>; ++ __overlay__ { ++ status = "okay"; ++ }; ++ }; ++ ++ fragment@1 { ++ target = <&i2c0mux>; ++ __overlay__ { ++ status = "okay"; ++ }; ++ }; ++}; +--- a/arch/arm/boot/dts/overlays/edt-ft5406.dtsi ++++ b/arch/arm/boot/dts/overlays/edt-ft5406.dtsi +@@ -27,7 +27,6 @@ + __overlay__ { + #address-cells = <1>; + #size-cells = <0>; +- status = "okay"; + ft5406: ts@38 { + compatible = "edt,edt-ft5406"; + reg = <0x38>; +@@ -38,13 +37,6 @@ + }; + }; + +- fragment@13 { +- target = <&i2c0if>; +- __overlay__ { +- status = "okay"; +- }; +- }; +- + __overrides__ { + sizex = <&ft5406>,"touchscreen-size-x:0"; + sizey = <&ft5406>,"touchscreen-size-y:0"; +--- a/arch/arm/boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts ++++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts +@@ -113,6 +113,6 @@ + }; + + __overrides__ { +- disable_touch = <0>, "-10-11-12-13"; ++ disable_touch = <0>, "-10-11-12"; + }; + }; |