From 87374722f65b8c8a2c631550abad35575248ec70 Mon Sep 17 00:00:00 2001
From: zhiayang <gpg@tsumaran.ai>
Date: Sun, 1 Oct 2023 03:07:21 -0400
Subject: [PATCH] Flesh out 7.1 overlay with builtin max17048 dts node

---
 ..._20_0-pinctrl.dtsi => mikoto-pinctrl.dtsi} |  6 +--
 app/boards/arm/mikoto/mikoto.dts              |  4 +-
 app/boards/arm/mikoto/mikoto_5_20_0.overlay   |  1 +
 app/boards/arm/mikoto/mikoto_6_1_0.overlay    |  1 +
 app/boards/arm/mikoto/mikoto_7_1_0.conf       |  2 +
 app/boards/arm/mikoto/mikoto_7_1_0.overlay    | 39 +++++++++++++++++++
 6 files changed, 48 insertions(+), 5 deletions(-)
 rename app/boards/arm/mikoto/{mikoto_5_20_0-pinctrl.dtsi => mikoto-pinctrl.dtsi} (83%)
 create mode 100644 app/boards/arm/mikoto/mikoto_7_1_0.conf

diff --git a/app/boards/arm/mikoto/mikoto_5_20_0-pinctrl.dtsi b/app/boards/arm/mikoto/mikoto-pinctrl.dtsi
similarity index 83%
rename from app/boards/arm/mikoto/mikoto_5_20_0-pinctrl.dtsi
rename to app/boards/arm/mikoto/mikoto-pinctrl.dtsi
index df43c407..675587f2 100644
--- a/app/boards/arm/mikoto/mikoto_5_20_0-pinctrl.dtsi
+++ b/app/boards/arm/mikoto/mikoto-pinctrl.dtsi
@@ -17,7 +17,7 @@
     uart0_sleep: uart0_sleep {
         group1 {
             psels = <NRF_PSEL(UART_RX, 0, 4)>,
-                <NRF_PSEL(UART_TX, 0, 8)>;
+                    <NRF_PSEL(UART_TX, 0, 8)>;
             low-power-enable;
         };
     };
@@ -25,14 +25,14 @@
     i2c0_default: i2c0_default {
         group1 {
             psels = <NRF_PSEL(TWIM_SDA, 0, 17)>,
-                <NRF_PSEL(TWIM_SCL, 0, 20)>;
+                    <NRF_PSEL(TWIM_SCL, 0, 20)>;
         };
     };
 
     i2c0_sleep: i2c0_sleep {
         group1 {
             psels = <NRF_PSEL(TWIM_SDA, 0, 17)>,
-                <NRF_PSEL(TWIM_SCL, 0, 20)>;
+                    <NRF_PSEL(TWIM_SCL, 0, 20)>;
             low-power-enable;
         };
     };
diff --git a/app/boards/arm/mikoto/mikoto.dts b/app/boards/arm/mikoto/mikoto.dts
index c4109aee..ee55c589 100644
--- a/app/boards/arm/mikoto/mikoto.dts
+++ b/app/boards/arm/mikoto/mikoto.dts
@@ -6,8 +6,8 @@
 
 /dts-v1/;
 #include <nordic/nrf52840_qiaa.dtsi>
-#include "arduino_pro_micro_pins_5_20_0.dtsi"
-#include "mikoto_5_20_0-pinctrl.dtsi"
+// #include "arduino_pro_micro_pins_5_20_0.dtsi"
+// #include "mikoto_5_20_0-pinctrl.dtsi"
 
 / {
     model = "mikoto";
diff --git a/app/boards/arm/mikoto/mikoto_5_20_0.overlay b/app/boards/arm/mikoto/mikoto_5_20_0.overlay
index 0e4f10f7..69bf69bc 100644
--- a/app/boards/arm/mikoto/mikoto_5_20_0.overlay
+++ b/app/boards/arm/mikoto/mikoto_5_20_0.overlay
@@ -4,4 +4,5 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include "mikoto-pinctrl.dtsi"
 #include "arduino_pro_micro_pins_5_20_0.dtsi"
diff --git a/app/boards/arm/mikoto/mikoto_6_1_0.overlay b/app/boards/arm/mikoto/mikoto_6_1_0.overlay
index b8fea295..abd99c8d 100644
--- a/app/boards/arm/mikoto/mikoto_6_1_0.overlay
+++ b/app/boards/arm/mikoto/mikoto_6_1_0.overlay
@@ -4,4 +4,5 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include "mikoto-pinctrl.dtsi"
 #include "arduino_pro_micro_pins_6_1_0.dtsi"
diff --git a/app/boards/arm/mikoto/mikoto_7_1_0.conf b/app/boards/arm/mikoto/mikoto_7_1_0.conf
new file mode 100644
index 00000000..4de77de3
--- /dev/null
+++ b/app/boards/arm/mikoto/mikoto_7_1_0.conf
@@ -0,0 +1,2 @@
+CONFIG_I2C=y
+CONFIG_MAX17048=y
diff --git a/app/boards/arm/mikoto/mikoto_7_1_0.overlay b/app/boards/arm/mikoto/mikoto_7_1_0.overlay
index b8fea295..781f9f94 100644
--- a/app/boards/arm/mikoto/mikoto_7_1_0.overlay
+++ b/app/boards/arm/mikoto/mikoto_7_1_0.overlay
@@ -4,4 +4,43 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include "mikoto-pinctrl.dtsi"
 #include "arduino_pro_micro_pins_6_1_0.dtsi"
+
+&pinctrl {
+    i2c1_default: i2c1_default {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 0, 23)>,
+                    <NRF_PSEL(TWIM_SCL, 0, 19)>;
+        };
+    };
+
+    i2c1_sleep: i2c1_sleep {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 0, 23)>,
+                    <NRF_PSEL(TWIM_SCL, 0, 19)>;
+            low-power-enable;
+        };
+    };
+};
+
+&i2c1 {
+    status = "okay";
+    compatible = "nordic,nrf-twi";
+    pinctrl-0 = <&i2c1_default>;
+    pinctrl-1 = <&i2c1_sleep>;
+    pinctrl-names = "default", "sleep";
+
+    builtin_fuel_gauge: max17048@36 {
+        compatible = "maxim,max17048";
+        status = "okay";
+        label = "max17048";
+        reg = <0x36>;
+    };
+};
+
+/ {
+    chosen {
+        zmk,battery = &builtin_fuel_gauge;
+    };
+};