git.openwrt.org Git - openwrt/staging/blocktrron.git/blob

   1 From 064acb7882a7d9897dc5f8117ca9a94970387701 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
   3 Date: Wed, 10 Nov 2021 15:55:32 +0000
   4 Subject: [PATCH] dtoverlays: Remove i2c0mux and i20if status from
   5  edt-ft5406.dtsi
   6
   7 edt-ft5406.dtsi is included from vc4-kms-dsi-7inch which was
   8 also setting i2c0mux and i2c0if status fields. This meant that
   9 dtoverlay wouldn't apply the overlay due to multiple fragments
  10 changing the same parameter.
  11
  12 Move the enable from edt-ft5406.dtsi to edt-ft5406-overlay.dts
  13 for when it should be needed as an independent overlay.
  14
  15 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  16 ---
  17  .../arm/boot/dts/overlays/edt-ft5406-overlay.dts | 16 ++++++++++++++++
  18  arch/arm/boot/dts/overlays/edt-ft5406.dtsi       |  8 --------
  19  .../dts/overlays/vc4-kms-dsi-7inch-overlay.dts   |  2 +-
  20  3 files changed, 17 insertions(+), 9 deletions(-)
  21
  22 --- a/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts
  23 +++ b/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts
  24 @@ -8,3 +8,19 @@
  25  /plugin/;
  26
  27  #include "edt-ft5406.dtsi"
  28 +
  29 +/ {
  30 +       fragment@0 {
  31 +               target = <&i2c0if>;
  32 +               __overlay__ {
  33 +                       status = "okay";
  34 +               };
  35 +       };
  36 +
  37 +       fragment@1 {
  38 +               target = <&i2c0mux>;
  39 +               __overlay__ {
  40 +                       status = "okay";
  41 +               };
  42 +       };
  43 +};
  44 --- a/arch/arm/boot/dts/overlays/edt-ft5406.dtsi
  45 +++ b/arch/arm/boot/dts/overlays/edt-ft5406.dtsi
  46 @@ -27,7 +27,6 @@
  47                 __overlay__ {
  48                         #address-cells = <1>;
  49                         #size-cells = <0>;
  50 -                       status = "okay";
  51                         ft5406: ts@38 {
  52                                 compatible = "edt,edt-ft5406";
  53                                 reg = <0x38>;
  54 @@ -38,13 +37,6 @@
  55                 };
  56         };
  57
  58 -       fragment@13 {
  59 -               target = <&i2c0if>;
  60 -               __overlay__ {
  61 -                       status = "okay";
  62 -               };
  63 -       };
  64 -
  65         __overrides__ {
  66                 sizex = <&ft5406>,"touchscreen-size-x:0";
  67                 sizey = <&ft5406>,"touchscreen-size-y:0";
  68 --- a/arch/arm/boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts
  69 +++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts
  70 @@ -113,6 +113,6 @@
  71         };
  72
  73         __overrides__ {
  74 -               disable_touch = <0>, "-10-11-12-13";
  75 +               disable_touch = <0>, "-10-11-12";
  76         };
  77  };