git.ipfire.org Git - thirdparty/openwrt.git/blob

   1 From 9a86952570b925e68dfd30a12642000353242745 Mon Sep 17 00:00:00 2001
   2 From: Dom Cobley <popcornmix@gmail.com>
   3 Date: Thu, 10 Oct 2024 17:16:08 +0100
   4 Subject: [PATCH 1312/1350] Reapply "dtoverlays: Convert SenseHAT overlays to
   5  use MFD and upstream drivers"
   6
   7 This reverts commit 82a50e430ef1d6eb37d78e25aa572c1f6ea56160.
   8 ---
   9  .../boot/dts/overlays/rpi-sense-overlay.dts   | 28 +++++++++++++++++--
  10  .../dts/overlays/rpi-sense-v2-overlay.dts     | 28 +++++++++++++++++--
  11  2 files changed, 50 insertions(+), 6 deletions(-)
  12
  13 --- a/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts
  14 +++ b/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts
  15 @@ -12,11 +12,23 @@
  16                         #size-cells = <0>;
  17                         status = "okay";
  18
  19 -                       rpi-sense@46 {
  20 -                               compatible = "rpi,rpi-sense";
  21 +                       sensehat@46 {
  22 +                               compatible = "raspberrypi,sensehat";
  23                                 reg = <0x46>;
  24 -                               keys-int-gpios = <&gpio 23 1>;
  25 +                               interrupt-parent = <&gpio>;
  26                                 status = "okay";
  27 +
  28 +                               display {
  29 +                                       compatible = "raspberrypi,rpi-sense-fb";
  30 +                                       status = "okay";
  31 +                               };
  32 +                               joystick {
  33 +                                       compatible = "raspberrypi,sensehat-joystick";
  34 +                                       interrupts = <23 1>;
  35 +                                       pinctrl-names = "default";
  36 +                                       pinctrl-0 = <&sensehat_pins>;
  37 +                                       status = "okay";
  38 +                               };
  39                         };
  40
  41                         lsm9ds1-magn@1c {
  42 @@ -44,4 +56,14 @@
  43                         };
  44                 };
  45         };
  46 +
  47 +       fragment@1 {
  48 +               target = <&gpio>;
  49 +               __overlay__ {
  50 +                       sensehat_pins: sensehat_pins {
  51 +                               brcm,pins = <23>;
  52 +                               brcm,function = <0>;
  53 +                       };
  54 +               };
  55 +       };
  56  };
  57 --- a/arch/arm/boot/dts/overlays/rpi-sense-v2-overlay.dts
  58 +++ b/arch/arm/boot/dts/overlays/rpi-sense-v2-overlay.dts
  59 @@ -12,11 +12,23 @@
  60                         #size-cells = <0>;
  61                         status = "okay";
  62
  63 -                       rpi-sense@46 {
  64 -                               compatible = "rpi,rpi-sense";
  65 +                       sensehat@46 {
  66 +                               compatible = "raspberrypi,sensehat";
  67                                 reg = <0x46>;
  68 -                               keys-int-gpios = <&gpio 23 1>;
  69 +                               interrupt-parent = <&gpio>;
  70                                 status = "okay";
  71 +
  72 +                               display {
  73 +                                       compatible = "raspberrypi,rpi-sense-fb";
  74 +                                       status = "okay";
  75 +                               };
  76 +                               joystick {
  77 +                                       compatible = "raspberrypi,sensehat-joystick";
  78 +                                       interrupts = <23 1>;
  79 +                                       pinctrl-names = "default";
  80 +                                       pinctrl-0 = <&sensehat_pins>;
  81 +                                       status = "okay";
  82 +                               };
  83                         };
  84
  85                         lsm9ds1-magn@1c {
  86 @@ -44,4 +56,14 @@
  87                         };
  88                 };
  89         };
  90 +
  91 +       fragment@1 {
  92 +               target = <&gpio>;
  93 +               __overlay__ {
  94 +                       sensehat_pins: sensehat_pins {
  95 +                               brcm,pins = <23>;
  96 +                               brcm,function = <0>;
  97 +                       };
  98 +               };
  99 +       };
 100  };