refactor(boards): Move nice!nano to power domains

* Set a chosen `zmk,default-power-domain` * Enable the relevant Kconfig settings for PDs.
zmkfirmware · Oct 21, 2023 · 7678910 · 7678910
1 parent 81a7efb
commit 7678910
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 39 deletions.
diff --git a/app/boards/arm/nice_nano/Kconfig.board b/app/boards/arm/nice_nano/Kconfig.board
@@ -5,9 +5,13 @@
 
 config BOARD_NICE_NANO
     bool "nice!nano"
+    imply ZMK_POWER_DOMAINS
+    imply ZMK_POWER_DOMAINS_DYNAMIC_DEFAULT
     depends on SOC_NRF52840_QIAA
 
 config BOARD_NICE_NANO_V2
     bool "nice!nano v2"
+    imply ZMK_POWER_DOMAINS
+    imply ZMK_POWER_DOMAINS_DYNAMIC_DEFAULT
     depends on SOC_NRF52840_QIAA
 
diff --git a/app/boards/arm/nice_nano/arduino_pro_micro_pins.dtsi b/app/boards/arm/nice_nano/arduino_pro_micro_pins.dtsi
@@ -11,25 +11,25 @@
         gpio-map-mask = <0xffffffff 0xffffffc0>;
         gpio-map-pass-thru = <0 0x3f>;
         gpio-map
-            = <0 0 &gpio0 8 0>      /* D0 */
-            , <1 0 &gpio0 6 0>      /* D1 */
-            , <2 0 &gpio0 17 0>     /* D2 */
-            , <3 0 &gpio0 20 0>     /* D3 */
-            , <4 0 &gpio0 22 0>     /* D4/A6 */
-            , <5 0 &gpio0 24 0>     /* D5 */
-            , <6 0 &gpio1 0 0>      /* D6/A7 */
-            , <7 0 &gpio0 11 0>     /* D7 */
-            , <8 0 &gpio1 4 0>      /* D8/A8 */
-            , <9 0 &gpio1 6 0>      /* D9/A9 */
-            , <10 0 &gpio0 9 0>     /* D10/A10 */
-            , <16 0 &gpio0 10 0>    /* D16 */
-            , <14 0 &gpio1 11 0>    /* D14 */
-            , <15 0 &gpio1 13 0>    /* D15 */
-            , <18 0 &gpio1 15 0>    /* D18/A0 */
-            , <19 0 &gpio0 2 0> /* D19/A1 */
-            , <20 0 &gpio0 29 0>    /* D20/A2 */
-            , <21 0 &gpio0 31 0>    /* D21/A3 */
-            ;
+        = <0 0 &gpio0 8 0>        /* D0 */
+        , <1 0 &gpio0 6 0>        /* D1 */
+        , <2 0 &gpio0 17 0>        /* D2 */
+        , <3 0 &gpio0 20 0>        /* D3 */
+        , <4 0 &gpio0 22 0>        /* D4/A6 */
+        , <5 0 &gpio0 24 0>        /* D5 */
+        , <6 0 &gpio1 0 0>        /* D6/A7 */
+        , <7 0 &gpio0 11 0>        /* D7 */
+        , <8 0 &gpio1 4 0>        /* D8/A8 */
+        , <9 0 &gpio1 6 0>        /* D9/A9 */
+        , <10 0 &gpio0 9 0>        /* D10/A10 */
+        , <16 0 &gpio0 10 0>    /* D16 */
+        , <14 0 &gpio1 11 0>    /* D14 */
+        , <15 0 &gpio1 13 0>    /* D15 */
+        , <18 0 &gpio1 15 0>    /* D18/A0 */
+        , <19 0 &gpio0 2 0>    /* D19/A1 */
+        , <20 0 &gpio0 29 0>    /* D20/A2 */
+        , <21 0 &gpio0 31 0>    /* D21/A3 */
+        ;
     };
 
     pro_micro_a: connector_a {
@@ -38,20 +38,23 @@
         gpio-map-mask = <0xffffffff 0xffffffc0>;
         gpio-map-pass-thru = <0 0x3f>;
         gpio-map
-            = <0 0 &gpio1 15 0> /* D18/A0 */
-            , <1 0 &gpio0 2 0>  /* D19/A1 */
-            , <2 0 &gpio0 29 0> /* D20/A2 */
-            , <3 0 &gpio0 31 0> /* D21/A3 */
-            , <6 0 &gpio0 22 0> /* D4/A6 */
-            , <7 0 &gpio1 0 0>  /* D6/A7 */
-            , <8 0 &gpio1 4 0>  /* D8/A8 */
-            , <9 0 &gpio1 6 0>  /* D9/A9 */
-            , <10 0 &gpio0 9 0> /* D10/A10 */
-            ;
+        = <0 0 &gpio1 15 0>    /* D18/A0 */
+        , <1 0 &gpio0 2 0>    /* D19/A1 */
+        , <2 0 &gpio0 29 0>    /* D20/A2 */
+        , <3 0 &gpio0 31 0>    /* D21/A3 */
+        , <6 0 &gpio0 22 0>    /* D4/A6 */
+        , <7 0 &gpio1 0 0>    /* D6/A7 */
+        , <8 0 &gpio1 4 0>    /* D8/A8 */
+        , <9 0 &gpio1 6 0>    /* D9/A9 */
+        , <10 0 &gpio0 9 0>    /* D10/A10 */
+        ;
     };
 };
 
 pro_micro_d: &pro_micro {};
 pro_micro_i2c: &i2c0 {};
 pro_micro_spi: &spi0 {};
 pro_micro_serial: &uart0 {};
+
+pro_micro_power_domain: &core_power_domain {};
+
diff --git a/app/boards/arm/nice_nano/nice_nano.dts b/app/boards/arm/nice_nano/nice_nano.dts
@@ -10,12 +10,15 @@
 / {
     chosen {
         zmk,battery = &vbatt;
+        zmk,default-power-domain = &core_power_domain;
     };
 
-    ext-power {
-        compatible = "zmk,ext-power-generic";
-        label = "EXT_POWER";
-        control-gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+    core_power_domain: core_power_domain {
+        compatible = "power-domain-gpio", "power-domain";
+        startup-delay-us = <50000>;
+        off-on-delay-us = <50000>;
+        enable-gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+        zephyr,pm-device-runtime-auto;
     };
 
     vbatt: vbatt {
@@ -26,3 +29,5 @@
         full-ohms = <(2000000 + 806000)>;
     };
 };
+
+#include "arduino_pro_micro_pins.dtsi"
diff --git a/app/boards/arm/nice_nano/nice_nano.dtsi b/app/boards/arm/nice_nano/nice_nano.dtsi
@@ -6,7 +6,6 @@
 
 #include <nordic/nrf52840_qiaa.dtsi>
 #include "nice_nano-pinctrl.dtsi"
-#include "arduino_pro_micro_pins.dtsi"
 
 / {
     model = "nice!nano";

diff --git a/app/boards/arm/nice_nano/nice_nano_v2.dts b/app/boards/arm/nice_nano/nice_nano_v2.dts
@@ -10,17 +10,21 @@
 / {
     chosen {
         zmk,battery = &vbatt;
+        zmk,default-power-domain = &core_power_domain;
     };
 
-    ext-power {
-        compatible = "zmk,ext-power-generic";
-        label = "EXT_POWER";
-        control-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
-        init-delay-ms = <50>;
+    core_power_domain: core_power_domain {
+        compatible = "power-domain-gpio", "power-domain";
+        startup-delay-us = <50000>;
+        off-on-delay-us = <50000>;
+        enable-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
+        zephyr,pm-device-runtime-auto;
     };
 
     vbatt: vbatt {
         compatible = "zmk,battery-nrf-vddh";
         label = "BATTERY";
     };
 };
+
+#include "arduino_pro_micro_pins.dtsi"