From 80b64247d51aae63ad18dc5b714fb0c39b6de8de Mon Sep 17 00:00:00 2001
From: Peter Johanson <peter@peterjohanson.com>
Date: Fri, 29 Mar 2024 18:15:06 +0000
Subject: [PATCH] fix: Add wakeup-source; to kscan nodes for ZMK_SLEEP.

* ZMK_SLEEP also enables PM_DEVICE, so be sure to mark kscan
  nodes as wakeup sources so they can wake keyboards from sleep.
---
 app/boards/arm/adv360pro/adv360pro_left.dts               | 1 +
 app/boards/arm/adv360pro/adv360pro_right.dts              | 1 +
 app/boards/arm/bt60/bt60_v1.dts                           | 2 ++
 app/boards/arm/bt60/bt60_v1_hs.dts                        | 2 ++
 app/boards/arm/ckp/ckp.dtsi                               | 2 ++
 app/boards/arm/corneish_zen/corneish_zen_v1_left.dts      | 1 +
 app/boards/arm/corneish_zen/corneish_zen_v1_right.dts     | 1 +
 app/boards/arm/corneish_zen/corneish_zen_v2_left.dts      | 1 +
 app/boards/arm/corneish_zen/corneish_zen_v2_right.dts     | 1 +
 app/boards/arm/glove80/glove80.dtsi                       | 2 ++
 app/boards/arm/nice60/nice60.dts                          | 1 +
 app/boards/arm/s40nc/s40nc.dts                            | 1 +
 app/boards/shields/a_dux/a_dux.dtsi                       | 2 ++
 app/boards/shields/bat43/bat43.overlay                    | 1 +
 app/boards/shields/bfo9000/bfo9000.dtsi                   | 1 +
 app/boards/shields/boardsource3x4/boardsource3x4.overlay  | 2 ++
 .../shields/boardsource5x12/boardsource5x12.overlay       | 2 ++
 app/boards/shields/chalice/chalice.overlay                | 2 ++
 app/boards/shields/clog/clog.dtsi                         | 1 +
 app/boards/shields/contra/contra.overlay                  | 2 ++
 app/boards/shields/corne/corne.dtsi                       | 1 +
 app/boards/shields/cradio/cradio.dtsi                     | 2 ++
 app/boards/shields/crbn/crbn.overlay                      | 2 ++
 app/boards/shields/eek/eek.overlay                        | 2 ++
 app/boards/shields/elephant42/elephant42.dtsi             | 1 +
 app/boards/shields/ergodash/ergodash.dtsi                 | 1 +
 app/boards/shields/eternal_keypad/eternal_keypad.dtsi     | 1 +
 app/boards/shields/fourier/fourier.dtsi                   | 1 +
 app/boards/shields/helix/helix.dtsi                       | 1 +
 app/boards/shields/hummingbird/hummingbird.overlay        | 2 ++
 app/boards/shields/iris/iris.dtsi                         | 1 +
 app/boards/shields/jian/jian.dtsi                         | 1 +
 app/boards/shields/jiran/jiran.dtsi                       | 1 +
 app/boards/shields/jorne/jorne.dtsi                       | 1 +
 app/boards/shields/knob_goblin/knob_goblin.overlay        | 2 ++
 app/boards/shields/kyria/kyria_common.dtsi                | 1 +
 app/boards/shields/leeloo/leeloo_common.dtsi              | 1 +
 app/boards/shields/leeloo_micro/leeloo_micro.dtsi         | 1 +
 app/boards/shields/lily58/lily58.dtsi                     | 1 +
 app/boards/shields/lotus58/lotus58.dtsi                   | 1 +
 app/boards/shields/m60/m60.overlay                        | 1 +
 app/boards/shields/microdox/microdox.dtsi                 | 1 +
 app/boards/shields/microdox/microdox_v2.dtsi              | 1 +
 app/boards/shields/murphpad/murphpad.overlay              | 1 +
 app/boards/shields/naked60/naked60.overlay                | 1 +
 app/boards/shields/osprette/osprette.overlay              | 1 +
 app/boards/shields/pancake/pancake.overlay                | 1 +
 app/boards/shields/qaz/qaz.overlay                        | 1 +
 app/boards/shields/quefrency/quefrency_left.overlay       | 2 ++
 app/boards/shields/quefrency/quefrency_right.overlay      | 2 ++
 app/boards/shields/redox/redox.dtsi                       | 1 +
 app/boards/shields/reviung34/reviung34.overlay            | 2 ++
 app/boards/shields/reviung41/reviung41.overlay            | 2 ++
 app/boards/shields/reviung5/reviung5.overlay              | 1 +
 app/boards/shields/reviung53/reviung53.overlay            | 2 ++
 app/boards/shields/romac/romac.overlay                    | 1 +
 app/boards/shields/romac_plus/romac_plus.overlay          | 1 +
 app/boards/shields/sofle/sofle.dtsi                       | 1 +
 app/boards/shields/softie/Kconfig.defconfig               | 0
 app/boards/shields/softie/Kconfig.shield                  | 5 +++++
 app/boards/shields/softie/softie_d0.conf                  | 0
 app/boards/shields/softie/softie_d0.overlay               | 8 ++++++++
 .../splitkb_aurora_corne_left.overlay                     | 2 ++
 .../splitkb_aurora_corne_right.overlay                    | 2 ++
 .../splitkb_aurora_helix_left.overlay                     | 2 ++
 .../splitkb_aurora_helix_right.overlay                    | 2 ++
 .../splitkb_aurora_lily58_left.overlay                    | 2 ++
 .../splitkb_aurora_lily58_right.overlay                   | 2 ++
 .../splitkb_aurora_sofle_left.overlay                     | 2 ++
 .../splitkb_aurora_sofle_right.overlay                    | 2 ++
 .../splitkb_aurora_sweep_left.overlay                     | 2 ++
 .../splitkb_aurora_sweep_right.overlay                    | 1 +
 app/boards/shields/splitreus62/splitreus62.dtsi           | 1 +
 app/boards/shields/tg4x/tg4x.overlay                      | 1 +
 .../shields/two_percent_milk/two_percent_milk.overlay     | 1 +
 app/boards/shields/waterfowl/waterfowl.dtsi               | 1 +
 app/boards/shields/zodiark/zodiark.dtsi                   | 1 +
 77 files changed, 114 insertions(+)
 create mode 100644 app/boards/shields/softie/Kconfig.defconfig
 create mode 100644 app/boards/shields/softie/Kconfig.shield
 create mode 100644 app/boards/shields/softie/softie_d0.conf
 create mode 100644 app/boards/shields/softie/softie_d0.overlay

diff --git a/app/boards/arm/adv360pro/adv360pro_left.dts b/app/boards/arm/adv360pro/adv360pro_left.dts
index 6ef5f59071b3..459a2232f1ef 100644
--- a/app/boards/arm/adv360pro/adv360pro_left.dts
+++ b/app/boards/arm/adv360pro/adv360pro_left.dts
@@ -10,6 +10,7 @@
 /{
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/arm/adv360pro/adv360pro_right.dts b/app/boards/arm/adv360pro/adv360pro_right.dts
index 97d846f855cd..748cc42aeb04 100644
--- a/app/boards/arm/adv360pro/adv360pro_right.dts
+++ b/app/boards/arm/adv360pro/adv360pro_right.dts
@@ -10,6 +10,7 @@
 /{
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/arm/bt60/bt60_v1.dts b/app/boards/arm/bt60/bt60_v1.dts
index 53d4e77b41d0..315d8cceb841 100644
--- a/app/boards/arm/bt60/bt60_v1.dts
+++ b/app/boards/arm/bt60/bt60_v1.dts
@@ -81,6 +81,8 @@
 
     kscan0: kscan_0 {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
 
         col-gpios
diff --git a/app/boards/arm/bt60/bt60_v1_hs.dts b/app/boards/arm/bt60/bt60_v1_hs.dts
index 57b47554fc5f..27e38286178d 100644
--- a/app/boards/arm/bt60/bt60_v1_hs.dts
+++ b/app/boards/arm/bt60/bt60_v1_hs.dts
@@ -30,6 +30,8 @@
 
     kscan0: kscan_0 {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
 
         col-gpios
diff --git a/app/boards/arm/ckp/ckp.dtsi b/app/boards/arm/ckp/ckp.dtsi
index 6bbbbdd74fba..4142622ac863 100644
--- a/app/boards/arm/ckp/ckp.dtsi
+++ b/app/boards/arm/ckp/ckp.dtsi
@@ -34,6 +34,8 @@
 
     kscan0: kscan_0 {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
 
         col-gpios
diff --git a/app/boards/arm/corneish_zen/corneish_zen_v1_left.dts b/app/boards/arm/corneish_zen/corneish_zen_v1_left.dts
index 6683b1b2408b..2c77f01c0baf 100644
--- a/app/boards/arm/corneish_zen/corneish_zen_v1_left.dts
+++ b/app/boards/arm/corneish_zen/corneish_zen_v1_left.dts
@@ -15,6 +15,7 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/arm/corneish_zen/corneish_zen_v1_right.dts b/app/boards/arm/corneish_zen/corneish_zen_v1_right.dts
index 492c79fa1084..536e46eab2d3 100644
--- a/app/boards/arm/corneish_zen/corneish_zen_v1_right.dts
+++ b/app/boards/arm/corneish_zen/corneish_zen_v1_right.dts
@@ -15,6 +15,7 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/arm/corneish_zen/corneish_zen_v2_left.dts b/app/boards/arm/corneish_zen/corneish_zen_v2_left.dts
index dacb24c3a247..42839b616462 100644
--- a/app/boards/arm/corneish_zen/corneish_zen_v2_left.dts
+++ b/app/boards/arm/corneish_zen/corneish_zen_v2_left.dts
@@ -15,6 +15,7 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/arm/corneish_zen/corneish_zen_v2_right.dts b/app/boards/arm/corneish_zen/corneish_zen_v2_right.dts
index f1baea426561..b47d122fe546 100644
--- a/app/boards/arm/corneish_zen/corneish_zen_v2_right.dts
+++ b/app/boards/arm/corneish_zen/corneish_zen_v2_right.dts
@@ -15,6 +15,7 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/arm/glove80/glove80.dtsi b/app/boards/arm/glove80/glove80.dtsi
index 0078fe627fae..4803488b0789 100644
--- a/app/boards/arm/glove80/glove80.dtsi
+++ b/app/boards/arm/glove80/glove80.dtsi
@@ -34,6 +34,8 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
         debounce-press-ms = <4>;
         debounce-release-ms = <20>;
diff --git a/app/boards/arm/nice60/nice60.dts b/app/boards/arm/nice60/nice60.dts
index 7397cffaba34..d1b9f9927ccc 100644
--- a/app/boards/arm/nice60/nice60.dts
+++ b/app/boards/arm/nice60/nice60.dts
@@ -42,6 +42,7 @@ RC(4,0)   RC(4,1)   RC(4,2)                      RC(4,5)                       R
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/arm/s40nc/s40nc.dts b/app/boards/arm/s40nc/s40nc.dts
index a04f42e1ffb0..a2eb89ea2077 100644
--- a/app/boards/arm/s40nc/s40nc.dts
+++ b/app/boards/arm/s40nc/s40nc.dts
@@ -37,6 +37,7 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/shields/a_dux/a_dux.dtsi b/app/boards/shields/a_dux/a_dux.dtsi
index caeae8dba294..46aa8fda2c1c 100644
--- a/app/boards/shields/a_dux/a_dux.dtsi
+++ b/app/boards/shields/a_dux/a_dux.dtsi
@@ -27,6 +27,8 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-direct";
+        wakeup-source;
+
         input-gpios =
             <&pro_micro  5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
             <&pro_micro  0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
diff --git a/app/boards/shields/bat43/bat43.overlay b/app/boards/shields/bat43/bat43.overlay
index 600dccec4ad5..89c2428d1e2d 100644
--- a/app/boards/shields/bat43/bat43.overlay
+++ b/app/boards/shields/bat43/bat43.overlay
@@ -28,6 +28,7 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)         RC(6,0) RC(6,1) RC(6,2)
 
     kscan0: kscan_0 {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
         diode-direction = "col2row";
 
         col-gpios
diff --git a/app/boards/shields/bfo9000/bfo9000.dtsi b/app/boards/shields/bfo9000/bfo9000.dtsi
index ea9283ad03a5..1108067196ec 100644
--- a/app/boards/shields/bfo9000/bfo9000.dtsi
+++ b/app/boards/shields/bfo9000/bfo9000.dtsi
@@ -28,6 +28,7 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/shields/boardsource3x4/boardsource3x4.overlay b/app/boards/shields/boardsource3x4/boardsource3x4.overlay
index 389f5b7ab7c9..0d63214dde41 100644
--- a/app/boards/shields/boardsource3x4/boardsource3x4.overlay
+++ b/app/boards/shields/boardsource3x4/boardsource3x4.overlay
@@ -13,6 +13,8 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
 
          row-gpios
diff --git a/app/boards/shields/boardsource5x12/boardsource5x12.overlay b/app/boards/shields/boardsource5x12/boardsource5x12.overlay
index 9a721d0c4aa0..15ae7b68f25d 100644
--- a/app/boards/shields/boardsource5x12/boardsource5x12.overlay
+++ b/app/boards/shields/boardsource5x12/boardsource5x12.overlay
@@ -13,6 +13,8 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
 
         row-gpios
diff --git a/app/boards/shields/chalice/chalice.overlay b/app/boards/shields/chalice/chalice.overlay
index 92dfe356101a..8631d73572dc 100644
--- a/app/boards/shields/chalice/chalice.overlay
+++ b/app/boards/shields/chalice/chalice.overlay
@@ -44,6 +44,8 @@
 
     kscan0: kscan_0 {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
 
         col-gpios
diff --git a/app/boards/shields/clog/clog.dtsi b/app/boards/shields/clog/clog.dtsi
index feea830c6abd..883aaa29bb3a 100644
--- a/app/boards/shields/clog/clog.dtsi
+++ b/app/boards/shields/clog/clog.dtsi
@@ -26,6 +26,7 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-direct";
+        wakeup-source;
 
         input-gpios
             = <&pro_micro 18 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
diff --git a/app/boards/shields/contra/contra.overlay b/app/boards/shields/contra/contra.overlay
index 0ac042d63571..45cc3088f23e 100644
--- a/app/boards/shields/contra/contra.overlay
+++ b/app/boards/shields/contra/contra.overlay
@@ -11,6 +11,8 @@
 
     kscan0: kscan_0 {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
 
         col-gpios
diff --git a/app/boards/shields/corne/corne.dtsi b/app/boards/shields/corne/corne.dtsi
index f6d41e3353b0..e1edcce81e4b 100644
--- a/app/boards/shields/corne/corne.dtsi
+++ b/app/boards/shields/corne/corne.dtsi
@@ -47,6 +47,7 @@ RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/shields/cradio/cradio.dtsi b/app/boards/shields/cradio/cradio.dtsi
index 4f8a09d715c3..b510c636f64e 100644
--- a/app/boards/shields/cradio/cradio.dtsi
+++ b/app/boards/shields/cradio/cradio.dtsi
@@ -27,6 +27,8 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-direct";
+        wakeup-source;
+
         input-gpios
         = <&pro_micro  7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
         , <&pro_micro 18 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
diff --git a/app/boards/shields/crbn/crbn.overlay b/app/boards/shields/crbn/crbn.overlay
index af5910d69936..c6a2b87c040c 100644
--- a/app/boards/shields/crbn/crbn.overlay
+++ b/app/boards/shields/crbn/crbn.overlay
@@ -13,6 +13,8 @@
 
     kscan0: kscan_0 {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
 
         col-gpios
diff --git a/app/boards/shields/eek/eek.overlay b/app/boards/shields/eek/eek.overlay
index e9e734ac8a9e..28aab7efb8c1 100644
--- a/app/boards/shields/eek/eek.overlay
+++ b/app/boards/shields/eek/eek.overlay
@@ -26,6 +26,8 @@
 
     kscan0: kscan_0 {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
 
         col-gpios
diff --git a/app/boards/shields/elephant42/elephant42.dtsi b/app/boards/shields/elephant42/elephant42.dtsi
index 22a727086866..d72aa9a87619 100644
--- a/app/boards/shields/elephant42/elephant42.dtsi
+++ b/app/boards/shields/elephant42/elephant42.dtsi
@@ -26,6 +26,7 @@ RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)                 RC(1,6) RC(1,7)
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/shields/ergodash/ergodash.dtsi b/app/boards/shields/ergodash/ergodash.dtsi
index 2e41ca3081dc..b6ef7fc41c26 100644
--- a/app/boards/shields/ergodash/ergodash.dtsi
+++ b/app/boards/shields/ergodash/ergodash.dtsi
@@ -35,6 +35,7 @@ RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4)         RC(4,5) RC(4,6) RC(4,13) RC(4,12
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
 
diff --git a/app/boards/shields/eternal_keypad/eternal_keypad.dtsi b/app/boards/shields/eternal_keypad/eternal_keypad.dtsi
index 3144f986f614..1274e3dd9584 100644
--- a/app/boards/shields/eternal_keypad/eternal_keypad.dtsi
+++ b/app/boards/shields/eternal_keypad/eternal_keypad.dtsi
@@ -14,6 +14,7 @@
 
   kscan0: kscan {
     compatible = "zmk,kscan-gpio-matrix";
+    wakeup-source;
 
     diode-direction = "col2row";
 
diff --git a/app/boards/shields/fourier/fourier.dtsi b/app/boards/shields/fourier/fourier.dtsi
index 3b309b8dcda1..f486e0a44e5d 100644
--- a/app/boards/shields/fourier/fourier.dtsi
+++ b/app/boards/shields/fourier/fourier.dtsi
@@ -30,6 +30,7 @@ RC(3,0)   RC(3,1) RC(3,2) RC(3,3) RC(3,4)            /**/  RC(3,6)        RC(3,9
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/shields/helix/helix.dtsi b/app/boards/shields/helix/helix.dtsi
index df80f4caec7c..8566ffc6bf2a 100644
--- a/app/boards/shields/helix/helix.dtsi
+++ b/app/boards/shields/helix/helix.dtsi
@@ -32,6 +32,7 @@ RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6)   RC(4,7) RC(4,8) RC(4,9
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/shields/hummingbird/hummingbird.overlay b/app/boards/shields/hummingbird/hummingbird.overlay
index 871728a28e51..2474d089dff0 100644
--- a/app/boards/shields/hummingbird/hummingbird.overlay
+++ b/app/boards/shields/hummingbird/hummingbird.overlay
@@ -29,6 +29,8 @@
 
     kscan0: kscan_0 {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "row2col";
 
         col-gpios
diff --git a/app/boards/shields/iris/iris.dtsi b/app/boards/shields/iris/iris.dtsi
index c979214c3160..8ddbd359ebbf 100644
--- a/app/boards/shields/iris/iris.dtsi
+++ b/app/boards/shields/iris/iris.dtsi
@@ -32,6 +32,7 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,2) RC(4,9) RC(3,6) RC(3,7)
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/shields/jian/jian.dtsi b/app/boards/shields/jian/jian.dtsi
index c5ae1b9e4441..439bf93c05c1 100644
--- a/app/boards/shields/jian/jian.dtsi
+++ b/app/boards/shields/jian/jian.dtsi
@@ -62,6 +62,7 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/shields/jiran/jiran.dtsi b/app/boards/shields/jiran/jiran.dtsi
index b6633b655860..517cbe5f7c55 100644
--- a/app/boards/shields/jiran/jiran.dtsi
+++ b/app/boards/shields/jiran/jiran.dtsi
@@ -67,6 +67,7 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/shields/jorne/jorne.dtsi b/app/boards/shields/jorne/jorne.dtsi
index a2d804b9abc1..e7b81e5f1133 100644
--- a/app/boards/shields/jorne/jorne.dtsi
+++ b/app/boards/shields/jorne/jorne.dtsi
@@ -63,6 +63,7 @@ RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/shields/knob_goblin/knob_goblin.overlay b/app/boards/shields/knob_goblin/knob_goblin.overlay
index 49306ddf0abf..c42482dbf498 100644
--- a/app/boards/shields/knob_goblin/knob_goblin.overlay
+++ b/app/boards/shields/knob_goblin/knob_goblin.overlay
@@ -14,6 +14,8 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
 
          row-gpios
diff --git a/app/boards/shields/kyria/kyria_common.dtsi b/app/boards/shields/kyria/kyria_common.dtsi
index 23058f376ade..f662fa1c4022 100644
--- a/app/boards/shields/kyria/kyria_common.dtsi
+++ b/app/boards/shields/kyria/kyria_common.dtsi
@@ -15,6 +15,7 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
     };
diff --git a/app/boards/shields/leeloo/leeloo_common.dtsi b/app/boards/shields/leeloo/leeloo_common.dtsi
index df4f228e9d2b..8ae5b0648e00 100644
--- a/app/boards/shields/leeloo/leeloo_common.dtsi
+++ b/app/boards/shields/leeloo/leeloo_common.dtsi
@@ -32,6 +32,7 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5) RC(4,6) RC(3,6) RC(3,7)
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
 
diff --git a/app/boards/shields/leeloo_micro/leeloo_micro.dtsi b/app/boards/shields/leeloo_micro/leeloo_micro.dtsi
index bc314205c28a..f23396533fa6 100644
--- a/app/boards/shields/leeloo_micro/leeloo_micro.dtsi
+++ b/app/boards/shields/leeloo_micro/leeloo_micro.dtsi
@@ -31,6 +31,7 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(3,4) RC(3,5) RC(2,5) RC(2,6) RC(2,7)
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
 
diff --git a/app/boards/shields/lily58/lily58.dtsi b/app/boards/shields/lily58/lily58.dtsi
index 1a326d62e187..c82b197cc51d 100644
--- a/app/boards/shields/lily58/lily58.dtsi
+++ b/app/boards/shields/lily58/lily58.dtsi
@@ -33,6 +33,7 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5) RC(4,6) RC(3,6) RC(3,7)
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/shields/lotus58/lotus58.dtsi b/app/boards/shields/lotus58/lotus58.dtsi
index afa311d9a6ad..e4595930cd0a 100644
--- a/app/boards/shields/lotus58/lotus58.dtsi
+++ b/app/boards/shields/lotus58/lotus58.dtsi
@@ -33,6 +33,7 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5)  RC(4,6)  RC(3,6) RC(3,7
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/shields/m60/m60.overlay b/app/boards/shields/m60/m60.overlay
index 22eed44f35aa..c479233cd523 100644
--- a/app/boards/shields/m60/m60.overlay
+++ b/app/boards/shields/m60/m60.overlay
@@ -14,6 +14,7 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/shields/microdox/microdox.dtsi b/app/boards/shields/microdox/microdox.dtsi
index 4869cfeabbde..65c670f01ef3 100644
--- a/app/boards/shields/microdox/microdox.dtsi
+++ b/app/boards/shields/microdox/microdox.dtsi
@@ -9,6 +9,7 @@
 / {
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
         diode-direction = "col2row";
         row-gpios
             = <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
diff --git a/app/boards/shields/microdox/microdox_v2.dtsi b/app/boards/shields/microdox/microdox_v2.dtsi
index 6eb7efa58f44..95aaf79dbeb1 100644
--- a/app/boards/shields/microdox/microdox_v2.dtsi
+++ b/app/boards/shields/microdox/microdox_v2.dtsi
@@ -9,6 +9,7 @@
 / {
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
         diode-direction = "col2row";
     };
 };
diff --git a/app/boards/shields/murphpad/murphpad.overlay b/app/boards/shields/murphpad/murphpad.overlay
index a82349684ffd..e2c9117f93db 100644
--- a/app/boards/shields/murphpad/murphpad.overlay
+++ b/app/boards/shields/murphpad/murphpad.overlay
@@ -14,6 +14,7 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/shields/naked60/naked60.overlay b/app/boards/shields/naked60/naked60.overlay
index 843c867f1094..4e36bc762f9b 100644
--- a/app/boards/shields/naked60/naked60.overlay
+++ b/app/boards/shields/naked60/naked60.overlay
@@ -11,6 +11,7 @@
 
     kscan0: kscan_0 {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
         diode-direction = "col2row";
 
         col-gpios
diff --git a/app/boards/shields/osprette/osprette.overlay b/app/boards/shields/osprette/osprette.overlay
index af2e56254790..ed893f4737ee 100644
--- a/app/boards/shields/osprette/osprette.overlay
+++ b/app/boards/shields/osprette/osprette.overlay
@@ -26,6 +26,7 @@ RC(0,0) RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8)
 
     kscan0: kscan_0 {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
         diode-direction = "row2col";
 
         col-gpios
diff --git a/app/boards/shields/pancake/pancake.overlay b/app/boards/shields/pancake/pancake.overlay
index 0ceb2d5c6f70..0538bf71ed92 100644
--- a/app/boards/shields/pancake/pancake.overlay
+++ b/app/boards/shields/pancake/pancake.overlay
@@ -11,6 +11,7 @@
 
     kscan0: kscan_0 {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
         diode-direction = "col2row";
 
         col-gpios
diff --git a/app/boards/shields/qaz/qaz.overlay b/app/boards/shields/qaz/qaz.overlay
index d0ec5b3a0eb1..5c76b98f8738 100644
--- a/app/boards/shields/qaz/qaz.overlay
+++ b/app/boards/shields/qaz/qaz.overlay
@@ -27,6 +27,7 @@
 
     kscan0: kscan_0 {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
         diode-direction = "col2row";
 
         col-gpios
diff --git a/app/boards/shields/quefrency/quefrency_left.overlay b/app/boards/shields/quefrency/quefrency_left.overlay
index cf7958410c60..a40d47c1bb09 100644
--- a/app/boards/shields/quefrency/quefrency_left.overlay
+++ b/app/boards/shields/quefrency/quefrency_left.overlay
@@ -12,6 +12,8 @@
      */
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
 
 
diff --git a/app/boards/shields/quefrency/quefrency_right.overlay b/app/boards/shields/quefrency/quefrency_right.overlay
index 446a614a2291..ebb9f8447ac0 100644
--- a/app/boards/shields/quefrency/quefrency_right.overlay
+++ b/app/boards/shields/quefrency/quefrency_right.overlay
@@ -17,6 +17,8 @@
      */
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
 
 
diff --git a/app/boards/shields/redox/redox.dtsi b/app/boards/shields/redox/redox.dtsi
index 505a5c69b0ae..098be4344812 100644
--- a/app/boards/shields/redox/redox.dtsi
+++ b/app/boards/shields/redox/redox.dtsi
@@ -32,6 +32,7 @@ RC(4,0) RC(4,1) RC(4,2) RC(4,3)      RC(4,4)    RC(4,5) RC(4,6) RC(4,7) RC(4,8)
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/shields/reviung34/reviung34.overlay b/app/boards/shields/reviung34/reviung34.overlay
index 6ec9813df3b0..0f58b99da3a1 100644
--- a/app/boards/shields/reviung34/reviung34.overlay
+++ b/app/boards/shields/reviung34/reviung34.overlay
@@ -38,6 +38,8 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(3,7)
 
     kscan0: kscan_0 {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
 
         col-gpios
diff --git a/app/boards/shields/reviung41/reviung41.overlay b/app/boards/shields/reviung41/reviung41.overlay
index 079fd36b96e0..f8503fc35a8f 100644
--- a/app/boards/shields/reviung41/reviung41.overlay
+++ b/app/boards/shields/reviung41/reviung41.overlay
@@ -27,6 +27,8 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(5,0) RC(5,1) RC(5,2) RC(5,3)
 
     kscan0: kscan_0 {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
 
         col-gpios
diff --git a/app/boards/shields/reviung5/reviung5.overlay b/app/boards/shields/reviung5/reviung5.overlay
index 0382145c69a5..0abd3a06ecc7 100644
--- a/app/boards/shields/reviung5/reviung5.overlay
+++ b/app/boards/shields/reviung5/reviung5.overlay
@@ -22,6 +22,7 @@
 
     kscan0: kscan_0 {
             compatible = "zmk,kscan-gpio-matrix";
+            wakeup-source;
             diode-direction = "col2row";
 
             col-gpios
diff --git a/app/boards/shields/reviung53/reviung53.overlay b/app/boards/shields/reviung53/reviung53.overlay
index d6037aecdafe..fa784478bfbd 100644
--- a/app/boards/shields/reviung53/reviung53.overlay
+++ b/app/boards/shields/reviung53/reviung53.overlay
@@ -28,6 +28,8 @@ RC(6,0) RC(6,1) RC(6,2)      RC(6,3)         RC(6,4)                    RC(6,5)
 
     kscan0: kscan_0 {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
 
         col-gpios
diff --git a/app/boards/shields/romac/romac.overlay b/app/boards/shields/romac/romac.overlay
index 3d99e51bfe96..8c11a8ac531e 100644
--- a/app/boards/shields/romac/romac.overlay
+++ b/app/boards/shields/romac/romac.overlay
@@ -13,6 +13,7 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/shields/romac_plus/romac_plus.overlay b/app/boards/shields/romac_plus/romac_plus.overlay
index 229b4a2cfe88..39e123c0c21d 100644
--- a/app/boards/shields/romac_plus/romac_plus.overlay
+++ b/app/boards/shields/romac_plus/romac_plus.overlay
@@ -13,6 +13,7 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
 
diff --git a/app/boards/shields/sofle/sofle.dtsi b/app/boards/shields/sofle/sofle.dtsi
index f88339d79514..ef89e4a59223 100644
--- a/app/boards/shields/sofle/sofle.dtsi
+++ b/app/boards/shields/sofle/sofle.dtsi
@@ -33,6 +33,7 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5) RC(4,6) RC(3,6) RC(3,7)
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/shields/softie/Kconfig.defconfig b/app/boards/shields/softie/Kconfig.defconfig
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/app/boards/shields/softie/Kconfig.shield b/app/boards/shields/softie/Kconfig.shield
new file mode 100644
index 000000000000..f8b9d868f968
--- /dev/null
+++ b/app/boards/shields/softie/Kconfig.shield
@@ -0,0 +1,5 @@
+# Copyright (c) 2023 Pete Johanson
+# SPDX-License-Identifier: MIT
+
+config SHIELD_SOFTIE_D0
+    def_bool $(shields_list_contains,softie_d0)
diff --git a/app/boards/shields/softie/softie_d0.conf b/app/boards/shields/softie/softie_d0.conf
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/app/boards/shields/softie/softie_d0.overlay b/app/boards/shields/softie/softie_d0.overlay
new file mode 100644
index 000000000000..e7f629ea069d
--- /dev/null
+++ b/app/boards/shields/softie/softie_d0.overlay
@@ -0,0 +1,8 @@
+/ {
+    softlock {
+        compatible = "zmk,soft-locker-gpio";
+
+        input-gpios = <&pro_micro 0 0>;
+        wakeup-sources = <&{/chosen/zmk,kscan}>;
+    };
+};
diff --git a/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne_left.overlay b/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne_left.overlay
index df930cd25473..ec40a0165d3e 100644
--- a/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne_left.overlay
+++ b/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne_left.overlay
@@ -13,6 +13,8 @@
 
     kscan: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
 
         row-gpios
diff --git a/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne_right.overlay b/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne_right.overlay
index 3823cdfb76ea..7341f072be5a 100644
--- a/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne_right.overlay
+++ b/app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne_right.overlay
@@ -13,6 +13,8 @@
 
     kscan: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
 
         row-gpios
diff --git a/app/boards/shields/splitkb_aurora_helix/splitkb_aurora_helix_left.overlay b/app/boards/shields/splitkb_aurora_helix/splitkb_aurora_helix_left.overlay
index 59d825530efc..61b663e605db 100644
--- a/app/boards/shields/splitkb_aurora_helix/splitkb_aurora_helix_left.overlay
+++ b/app/boards/shields/splitkb_aurora_helix/splitkb_aurora_helix_left.overlay
@@ -13,6 +13,8 @@
 
     kscan: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
 
         row-gpios
diff --git a/app/boards/shields/splitkb_aurora_helix/splitkb_aurora_helix_right.overlay b/app/boards/shields/splitkb_aurora_helix/splitkb_aurora_helix_right.overlay
index 95cea9ecc3ce..5aee19bdbb1d 100644
--- a/app/boards/shields/splitkb_aurora_helix/splitkb_aurora_helix_right.overlay
+++ b/app/boards/shields/splitkb_aurora_helix/splitkb_aurora_helix_right.overlay
@@ -13,6 +13,8 @@
 
     kscan: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
 
         row-gpios
diff --git a/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58_left.overlay b/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58_left.overlay
index fc38bbcbc765..8d56890f3135 100644
--- a/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58_left.overlay
+++ b/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58_left.overlay
@@ -13,6 +13,8 @@
 
     kscan: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "row2col";
 
         row-gpios
diff --git a/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58_right.overlay b/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58_right.overlay
index c9a96491ee98..6b719020a2b6 100644
--- a/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58_right.overlay
+++ b/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58_right.overlay
@@ -13,6 +13,8 @@
 
     kscan: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "row2col";
 
         row-gpios
diff --git a/app/boards/shields/splitkb_aurora_sofle/splitkb_aurora_sofle_left.overlay b/app/boards/shields/splitkb_aurora_sofle/splitkb_aurora_sofle_left.overlay
index 024c9e75b29b..2a3f485da557 100644
--- a/app/boards/shields/splitkb_aurora_sofle/splitkb_aurora_sofle_left.overlay
+++ b/app/boards/shields/splitkb_aurora_sofle/splitkb_aurora_sofle_left.overlay
@@ -13,6 +13,8 @@
 
     kscan: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
 
         row-gpios
diff --git a/app/boards/shields/splitkb_aurora_sofle/splitkb_aurora_sofle_right.overlay b/app/boards/shields/splitkb_aurora_sofle/splitkb_aurora_sofle_right.overlay
index 58df0026f068..6eb0d113829a 100644
--- a/app/boards/shields/splitkb_aurora_sofle/splitkb_aurora_sofle_right.overlay
+++ b/app/boards/shields/splitkb_aurora_sofle/splitkb_aurora_sofle_right.overlay
@@ -13,6 +13,8 @@
 
     kscan: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "col2row";
 
         row-gpios
diff --git a/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep_left.overlay b/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep_left.overlay
index 4a1bec902afb..9c1fd9757698 100644
--- a/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep_left.overlay
+++ b/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep_left.overlay
@@ -13,6 +13,8 @@
 
     kscan: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
+
         diode-direction = "row2col";
 
         row-gpios
diff --git a/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep_right.overlay b/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep_right.overlay
index c36554776170..b280b42d31cd 100644
--- a/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep_right.overlay
+++ b/app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep_right.overlay
@@ -13,6 +13,7 @@
 
     kscan: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
         diode-direction = "row2col";
 
         row-gpios
diff --git a/app/boards/shields/splitreus62/splitreus62.dtsi b/app/boards/shields/splitreus62/splitreus62.dtsi
index d80f8731fbe6..1a4f3af1b955 100644
--- a/app/boards/shields/splitreus62/splitreus62.dtsi
+++ b/app/boards/shields/splitreus62/splitreus62.dtsi
@@ -34,6 +34,7 @@ RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5)                 RC(4,6) RC(4,7)
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "row2col";
         row-gpios
diff --git a/app/boards/shields/tg4x/tg4x.overlay b/app/boards/shields/tg4x/tg4x.overlay
index 07a0635d5d45..ac05e8108d7f 100644
--- a/app/boards/shields/tg4x/tg4x.overlay
+++ b/app/boards/shields/tg4x/tg4x.overlay
@@ -9,6 +9,7 @@
 / {
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
 
diff --git a/app/boards/shields/two_percent_milk/two_percent_milk.overlay b/app/boards/shields/two_percent_milk/two_percent_milk.overlay
index 474150ef2fad..7647f55151d9 100644
--- a/app/boards/shields/two_percent_milk/two_percent_milk.overlay
+++ b/app/boards/shields/two_percent_milk/two_percent_milk.overlay
@@ -11,6 +11,7 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-direct";
+        wakeup-source;
 
         input-gpios
             = <&pro_micro 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
diff --git a/app/boards/shields/waterfowl/waterfowl.dtsi b/app/boards/shields/waterfowl/waterfowl.dtsi
index d46910a3f2ad..2329ca78f70c 100644
--- a/app/boards/shields/waterfowl/waterfowl.dtsi
+++ b/app/boards/shields/waterfowl/waterfowl.dtsi
@@ -31,6 +31,7 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4)                                 RC(3,5)
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios
diff --git a/app/boards/shields/zodiark/zodiark.dtsi b/app/boards/shields/zodiark/zodiark.dtsi
index 3151f31c9901..aa68e20d8cc6 100644
--- a/app/boards/shields/zodiark/zodiark.dtsi
+++ b/app/boards/shields/zodiark/zodiark.dtsi
@@ -33,6 +33,7 @@ RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4)      RC(4,5)    RC(4,6)   RC(4,7)      R
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
+        wakeup-source;
 
         diode-direction = "col2row";
         row-gpios