From dc5a02f4e8bf55ee73d9a178f6fdea5054885b5a Mon Sep 17 00:00:00 2001
From: hyx0329 <hyx0329@163.com>
Date: Wed, 28 Feb 2024 14:38:15 +0800
Subject: [PATCH] fix(boards): move battery node from nrf52840_m2 to M60
 overlay

---
 app/boards/arm/nrf52840_m2/nrf52840_m2.dts | 8 --------
 app/boards/shields/m60/m60.overlay         | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/boards/arm/nrf52840_m2/nrf52840_m2.dts b/app/boards/arm/nrf52840_m2/nrf52840_m2.dts
index 85e9ce21..ea519a53 100644
--- a/app/boards/arm/nrf52840_m2/nrf52840_m2.dts
+++ b/app/boards/arm/nrf52840_m2/nrf52840_m2.dts
@@ -16,7 +16,6 @@
         zephyr,sram = &sram0;
         zephyr,flash = &flash0;
         zephyr,console = &cdc_acm_uart;
-        zmk,battery = &vbatt;
     };
 
     leds {
@@ -32,13 +31,6 @@
         };
     };
 
-    vbatt: vbatt {
-        compatible = "zmk,battery-voltage-divider";
-        io-channels = <&adc 0>;
-        output-ohms = <1000000>;
-        full-ohms = <(1000000 + 1000000)>;
-    };
-
 };
 
 &adc {
diff --git a/app/boards/shields/m60/m60.overlay b/app/boards/shields/m60/m60.overlay
index 22eed44f..ed5071c2 100644
--- a/app/boards/shields/m60/m60.overlay
+++ b/app/boards/shields/m60/m60.overlay
@@ -10,6 +10,7 @@
     chosen {
         zmk,kscan = &kscan0;
         zmk,matrix-transform = &default_transform;
+        zmk,battery = &vbatt;
     };
 
     kscan0: kscan {
@@ -55,5 +56,12 @@ RC(6,4)       RC(6,3) RC(6,2) RC(6,1) RC(6,0) RC(5,7) RC(5,6) RC(5,5) RC(5,4) RC
 RC(6,5)    RC(6,6)   RC(6,7)                     RC(7,0)                    RC(7,1)    RC(7,2)    RC(7,3)    RC(7,4)
         >;
     };
+
+    vbatt: vbatt {
+        compatible = "zmk,battery-voltage-divider";
+        io-channels = <&adc 0>;
+        output-ohms = <1000000>;
+        full-ohms = <(1000000 + 1000000)>;
+    };
 };