From 297889fabc0a1cdc730cb1c49343a66b2a34c135 Mon Sep 17 00:00:00 2001
From: BarbUk <julien.virey@gmail.com>
Date: Sat, 10 Jan 2026 10:41:45 +0400
Subject: [PATCH] Move I2C to shield

---
 .../nrf52840_m2/nrf52840_m2-pinctrl.dtsi      | 16 ----------
 .../makerdiary/nrf52840_m2/nrf52840_m2.dts    | 14 ---------
 .../shields/m60/boards/nrf52840_m2.overlay    | 31 +++++++++++++++++++
 3 files changed, 31 insertions(+), 30 deletions(-)
 create mode 100644 app/boards/shields/m60/boards/nrf52840_m2.overlay

diff --git a/app/boards/makerdiary/nrf52840_m2/nrf52840_m2-pinctrl.dtsi b/app/boards/makerdiary/nrf52840_m2/nrf52840_m2-pinctrl.dtsi
index f2348f341..0a12efdf8 100644
--- a/app/boards/makerdiary/nrf52840_m2/nrf52840_m2-pinctrl.dtsi
+++ b/app/boards/makerdiary/nrf52840_m2/nrf52840_m2-pinctrl.dtsi
@@ -15,20 +15,4 @@
             low-power-enable;
         };
     };
-
-    /* configuration for i2c0 device, default state */
-    i2c0_default: i2c0_default {
-        group1 {
-            psels = <NRF_PSEL(TWIM_SDA, 1, 5)>,
-                <NRF_PSEL(TWIM_SCL, 1, 6)>;
-        };
-    };
-
-    i2c0_sleep: i2c0_sleep {
-        group1 {
-            psels = <NRF_PSEL(TWIM_SDA, 1, 5)>,
-                <NRF_PSEL(TWIM_SCL, 1, 6)>;
-            low-power-enable;
-        };
-    };
 };
diff --git a/app/boards/makerdiary/nrf52840_m2/nrf52840_m2.dts b/app/boards/makerdiary/nrf52840_m2/nrf52840_m2.dts
index 0e064c20f..bab23c9a9 100644
--- a/app/boards/makerdiary/nrf52840_m2/nrf52840_m2.dts
+++ b/app/boards/makerdiary/nrf52840_m2/nrf52840_m2.dts
@@ -80,20 +80,6 @@
     pinctrl-names = "default", "sleep";
 };
 
-&i2c0 {
-    compatible = "nordic,nrf-twim";
-    status = "okay";
-    pinctrl-0 = <&i2c0_default>;
-    pinctrl-1 = <&i2c0_sleep>;
-    pinctrl-names = "default", "sleep";
-    clock-frequency = <I2C_BITRATE_FAST>;
-    is31fl3733: is31fl3733@50 {
-        compatible = "issi,is31fl3733";
-        reg = <0x50>;
-        sdb-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
-    };
-};
-
 zephyr_udc0: &usbd {
     compatible = "nordic,nrf-usbd";
     status = "okay";
diff --git a/app/boards/shields/m60/boards/nrf52840_m2.overlay b/app/boards/shields/m60/boards/nrf52840_m2.overlay
new file mode 100644
index 000000000..80b4777a0
--- /dev/null
+++ b/app/boards/shields/m60/boards/nrf52840_m2.overlay
@@ -0,0 +1,31 @@
+&pinctrl {
+    /* configuration for i2c0 device, default state */
+    i2c0_default: i2c0_default {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 1, 5)>,
+                <NRF_PSEL(TWIM_SCL, 1, 6)>;
+        };
+    };
+
+    i2c0_sleep: i2c0_sleep {
+        group1 {
+            psels = <NRF_PSEL(TWIM_SDA, 1, 5)>,
+                <NRF_PSEL(TWIM_SCL, 1, 6)>;
+            low-power-enable;
+        };
+    };
+};
+
+&i2c0 {
+    compatible = "nordic,nrf-twim";
+    status = "okay";
+    pinctrl-0 = <&i2c0_default>;
+    pinctrl-1 = <&i2c0_sleep>;
+    pinctrl-names = "default", "sleep";
+    clock-frequency = <I2C_BITRATE_FAST>;
+    is31fl3733: is31fl3733@50 {
+        compatible = "issi,is31fl3733";
+        reg = <0x50>;
+        sdb-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
+    };
+};