From 9a013fe0eb314d8b233321c3c4df3feb2016a21c Mon Sep 17 00:00:00 2001
From: honorless <86894501+lesshonor@users.noreply.github.com>
Date: Sun, 17 Nov 2024 16:02:21 -0500
Subject: [PATCH] refactor: consolidate power nodes

---
 config/boards/arm/corne/corne.dtsi      | 11 +++++++++++
 config/boards/arm/corne/corne_left.dts  | 14 --------------
 config/boards/arm/corne/corne_right.dts | 14 --------------
 3 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/config/boards/arm/corne/corne.dtsi b/config/boards/arm/corne/corne.dtsi
index 643cf56..5b9053e 100644
--- a/config/boards/arm/corne/corne.dtsi
+++ b/config/boards/arm/corne/corne.dtsi
@@ -19,11 +19,22 @@
         zephyr,sram = &sram0;
         zephyr,flash = &flash0;
         zmk,kscan = &kscan0;
+        zmk,battery = &vbatt;
         zmk,underglow = &led_strip;
         zmk,matrix-transform = &default_transform;
         zmk,backlight = &backlight;
     };
 
+    vbatt: vbatt {
+        compatible = "zmk,battery-nrf-vddh";
+    };
+
+    EXT_POWER {
+        compatible = "zmk,ext-power-generic";
+        control-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
+        init-delay-ms = <50>;
+    };
+
     left_encoder: encoder_left {
         compatible = "alps,ec11";
         a-gpios = <&gpio1 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
diff --git a/config/boards/arm/corne/corne_left.dts b/config/boards/arm/corne/corne_left.dts
index 3103028..d4432cd 100644
--- a/config/boards/arm/corne/corne_left.dts
+++ b/config/boards/arm/corne/corne_left.dts
@@ -8,9 +8,6 @@
 #include "corne.dtsi"
 
 /{
-    chosen {
-        zmk,battery = &vbatt;
-    };
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
@@ -34,17 +31,6 @@
             ;
     };
 
-    ext-power {
-        compatible = "zmk,ext-power-generic";
-        label = "EXT_POWER";
-        control-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
-        init-delay-ms = <50>;
-    };
-
-     vbatt: vbatt {
-        compatible = "zmk,battery-nrf-vddh";
-    };
-
 };
 
 &left_encoder {
diff --git a/config/boards/arm/corne/corne_right.dts b/config/boards/arm/corne/corne_right.dts
index ae785c7..86588d8 100644
--- a/config/boards/arm/corne/corne_right.dts
+++ b/config/boards/arm/corne/corne_right.dts
@@ -7,9 +7,6 @@
 #include "corne.dtsi"
 
 /{
-    chosen {
-        zmk,battery = &vbatt;
-    };
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
@@ -34,17 +31,6 @@
             ;
     };
 
-    ext-power {
-        compatible = "zmk,ext-power-generic";
-        label = "EXT_POWER";
-        control-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
-         init-delay-ms = <50>;
-    };
-
-     vbatt: vbatt {
-        compatible = "zmk,battery-nrf-vddh";
-       init-delay-ms = <50>;
-    };
 
 };
 &default_transform {