Merge branch 'main' into southpaw

cyril279 · Feb 27, 2024 · 27b9cd8 · 27b9cd8
2 parents 6f04243 + ef2972f
commit 27b9cd8
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 12 deletions.
diff --git a/config/boards/arm/one42/one42-pinctrl.dtsi b/config/boards/arm/one42/one42-pinctrl.dtsi
@@ -0,0 +1,40 @@
+/*
+* Copyright (c) 2022 The ZMK Contributors
+* SPDX-License-Identifier: MIT
+*/
+
+&pinctrl {
+  uart0_default: uart0_default {
+    group1 {
+      psels = <NRF_PSEL(UART_RX, 0, 14)>;
+      bias-pull-up;
+    };
+    group2 {
+      psels = <NRF_PSEL(UART_TX, 0, 16)>,
+              <NRF_PSEL(UART_RTS, 0, 13)>,
+              <NRF_PSEL(UART_CTS, 0, 15)>;
+    };
+  };
+  uart0_sleep: uart0_sleep {
+    group1 {
+      psels = <NRF_PSEL(UART_RX, 0, 14)>,
+              <NRF_PSEL(UART_TX, 0, 16)>,
+              <NRF_PSEL(UART_RTS, 0, 13)>,
+              <NRF_PSEL(UART_CTS, 0, 15)>;
+      low-power-enable;
+    };
+  };
+  i2c0_default: i2c0_default {
+    group1 {
+      psels = <NRF_PSEL(TWIM_SDA, 0, 21)>,
+              <NRF_PSEL(TWIM_SCL, 0, 19)>;
+    };
+  };
+  i2c0_sleep: i2c0_sleep {
+    group1 {
+      psels = <NRF_PSEL(TWIM_SDA, 0, 21)>,
+              <NRF_PSEL(TWIM_SCL, 0, 19)>;
+      low-power-enable;
+    };
+  };
+};
diff --git a/config/boards/arm/one42/one42.dts b/config/boards/arm/one42/one42.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 #include <nordic/nrf52840_qiaa.dtsi>
+#include "one42-pinctrl.dtsi"
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
@@ -111,8 +112,8 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
 &i2c0 {
 	status = "disabled";
 	compatible = "nordic,nrf-twi";
-	sda-pin = <21>;
-	scl-pin = <19>;
+	pinctrl-0 = <&i2c0_default>;
+	pinctrl-1 = <&i2c0_sleep>;
 
 	oled: ssd1306@3c {
 		compatible = "solomon,ssd1306fb";
@@ -133,14 +134,12 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
 };
 
 &uart0 {
- 	compatible = "nordic,nrf-uarte";
- 	status = "disabled";
- 	current-speed = <115200>;
- 	tx-pin = <16>;
- 	rx-pin = <14>;
- 	rts-pin = <13>;
-	cts-pin = <15>;
- };
+	compatible = "nordic,nrf-uarte";
+	status = "disabled";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-1 = <&uart0_sleep>;
+};
 
 &usbd {
 	status = "okay";

diff --git a/config/boards/arm/one42/one42.keymap b/config/boards/arm/one42/one42.keymap
@@ -132,7 +132,7 @@
             bindings = <
                 &none    &none    &none    &none    &none    &none           &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR
                 &none    &none    &none    &none    &none    &none           &none        &none        &none        &none        &none        &none
-                &none    &none    &none    &none    &none    &bootloader     &reset       &none        &none        &none        &none        &none
+                &none    &none    &none    &none    &none    &bootloader     &sys_reset   &none        &none        &none        &none        &none
                                              &trans   &trans   &trans     &trans   &trans   &trans
             >;
         };

diff --git a/config/boards/arm/one42/one42_defconfig b/config/boards/arm/one42/one42_defconfig
@@ -12,7 +12,7 @@ CONFIG_GPIO=y
 
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_BUILD_OUTPUT_UF2=y
-
+CONFIG_PINCTRL=y
 CONFIG_MPU_ALLOW_FLASH_WRITE=y
 CONFIG_NVS=y
 CONFIG_SETTINGS_NVS=y