From 91e3a7d75a961db68aa8bbc7a8836695748b961e Mon Sep 17 00:00:00 2001
From: Nick <nick.win999@gmail.com>
Date: Sun, 8 Nov 2020 15:05:13 -0600
Subject: [PATCH] boards: Cleanup and standardize features

---
 .../arm/bluemicro840/bluemicro840_v1.dts      | 21 ++++++++++++-------
 app/boards/arm/nice_nano/nice_nano.dts        | 11 ++++------
 app/boards/arm/nrf52840_m2/nrf52840_m2.dts    | 21 ++++++++++++-------
 app/boards/arm/nrfmicro/nrfmicro_11.dts       | 12 +++++++----
 .../arm/nrfmicro/nrfmicro_11_flipped.dts      | 12 +++++++----
 app/boards/arm/nrfmicro/nrfmicro_13.dts       | 12 +++++++----
 6 files changed, 55 insertions(+), 34 deletions(-)

diff --git a/app/boards/arm/bluemicro840/bluemicro840_v1.dts b/app/boards/arm/bluemicro840/bluemicro840_v1.dts
index 141dbe10..18dff1af 100644
--- a/app/boards/arm/bluemicro840/bluemicro840_v1.dts
+++ b/app/boards/arm/bluemicro840/bluemicro840_v1.dts
@@ -14,9 +14,6 @@
 
 	chosen {
 		zephyr,code-partition = &code_partition;
-		// zephyr,console = &uart0;
-		//zephyr,bt-mon-uart = &uart0;
-		//zephyr,bt-c2h-uart = &uart0;
 		zephyr,sram = &sram0;
 		zephyr,flash = &flash0;
 	};
@@ -29,6 +26,12 @@
 		};
 	};
 
+	ext-power {
+		compatible = "zmk,ext-power-generic";
+		label = "EXT_POWER";
+		control-gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+	};
+
 	vbatt {
 		compatible = "zmk,battery-voltage-divider";
 		label = "BATTERY";
@@ -43,6 +46,10 @@
 	status = "okay";
 };
 
+&gpiote {
+	status = "okay";
+};
+
 &gpio0 {
 	status = "okay";
 };
@@ -61,10 +68,10 @@
 	compatible = "nordic,nrf-uarte";
 	status = "okay";
 	current-speed = <115200>;
-	tx-pin = <39>;
-	rx-pin = <34>;
-	rts-pin = <33>;
-	cts-pin = <12>;
+	tx-pin = <19>;
+	rx-pin = <21>;
+	rts-pin = <23>;
+	cts-pin = <25>;
 };
 
 &usbd {
diff --git a/app/boards/arm/nice_nano/nice_nano.dts b/app/boards/arm/nice_nano/nice_nano.dts
index a9bdeb30..01efb289 100644
--- a/app/boards/arm/nice_nano/nice_nano.dts
+++ b/app/boards/arm/nice_nano/nice_nano.dts
@@ -14,9 +14,6 @@
 
 	chosen {
 		zephyr,code-partition = &code_partition;
-		// zephyr,console = &uart0;
-		//zephyr,bt-mon-uart = &uart0;
-		//zephyr,bt-c2h-uart = &uart0;
 		zephyr,sram = &sram0;
 		zephyr,flash = &flash0;
 	};
@@ -70,10 +67,10 @@
 	compatible = "nordic,nrf-uarte";
 	status = "okay";
 	current-speed = <115200>;
-	tx-pin = <39>;
-	rx-pin = <34>;
-	rts-pin = <33>;
-	cts-pin = <12>;
+	tx-pin = <19>;
+	rx-pin = <21>;
+	rts-pin = <23>;
+	cts-pin = <25>;
 };
 
 &usbd {
diff --git a/app/boards/arm/nrf52840_m2/nrf52840_m2.dts b/app/boards/arm/nrf52840_m2/nrf52840_m2.dts
index e998b391..f9354edf 100644
--- a/app/boards/arm/nrf52840_m2/nrf52840_m2.dts
+++ b/app/boards/arm/nrf52840_m2/nrf52840_m2.dts
@@ -12,9 +12,6 @@
 
 	chosen {
 		zephyr,code-partition = &code_partition;
-		//zephyr,console = &uart0;
-		//zephyr,bt-mon-uart = &uart0;
-		//zephyr,bt-c2h-uart = &uart0;
 		zephyr,sram = &sram0;
 		zephyr,flash = &flash0;
 	};
@@ -37,6 +34,14 @@
 
 };
 
+&adc {
+	status = "okay";
+};
+
+&gpiote {
+	status = "okay";
+};
+
 &gpio0 {
 	status = "okay";
 };
@@ -46,13 +51,13 @@
 };
 
 &uart0 {
-	compatible = "nordic,nrf-uart";
+	compatible = "nordic,nrf-uarte";
 	status = "okay";
 	current-speed = <115200>;
-	tx-pin = <16>;
-	rx-pin = <15>;
-	rts-pin = <14>;
-	cts-pin = <13>;
+	tx-pin = <19>;
+	rx-pin = <21>;
+	rts-pin = <23>;
+	cts-pin = <25>;
 };
 
 &usbd {
diff --git a/app/boards/arm/nrfmicro/nrfmicro_11.dts b/app/boards/arm/nrfmicro/nrfmicro_11.dts
index 0cec6628..164b66d2 100644
--- a/app/boards/arm/nrfmicro/nrfmicro_11.dts
+++ b/app/boards/arm/nrfmicro/nrfmicro_11.dts
@@ -33,6 +33,10 @@
 	};
 };
 
+&gpiote {
+	status = "okay";
+};
+
 &gpio0 {
 	status = "okay";
 };
@@ -51,10 +55,10 @@
 	compatible = "nordic,nrf-uarte";
 	status = "okay";
 	current-speed = <115200>;
-	tx-pin = <39>;
-	rx-pin = <34>;
-	rts-pin = <33>;
-	cts-pin = <12>;
+	tx-pin = <19>;
+	rx-pin = <21>;
+	rts-pin = <23>;
+	cts-pin = <25>;
 };
 
 &usbd {
diff --git a/app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts b/app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts
index 6c1bb6ae..fb558382 100644
--- a/app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts
+++ b/app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts
@@ -33,6 +33,10 @@
 	};
 };
 
+&gpiote {
+	status = "okay";
+};
+
 &gpio0 {
 	status = "okay";
 };
@@ -51,10 +55,10 @@
 	compatible = "nordic,nrf-uarte";
 	status = "okay";
 	current-speed = <115200>;
-	tx-pin = <39>;
-	rx-pin = <34>;
-	rts-pin = <33>;
-	cts-pin = <12>;
+	tx-pin = <19>;
+	rx-pin = <21>;
+	rts-pin = <23>;
+	cts-pin = <25>;
 };
 
 &usbd {
diff --git a/app/boards/arm/nrfmicro/nrfmicro_13.dts b/app/boards/arm/nrfmicro/nrfmicro_13.dts
index 2910980b..1a05c7a1 100644
--- a/app/boards/arm/nrfmicro/nrfmicro_13.dts
+++ b/app/boards/arm/nrfmicro/nrfmicro_13.dts
@@ -45,6 +45,10 @@
 	status = "okay";
 };
 
+&gpiote {
+	status = "okay";
+};
+
 &gpio0 {
 	status = "okay";
 };
@@ -63,10 +67,10 @@
 	compatible = "nordic,nrf-uarte";
 	status = "okay";
 	current-speed = <115200>;
-	tx-pin = <39>;
-	rx-pin = <34>;
-	rts-pin = <33>;
-	cts-pin = <12>;
+	tx-pin = <19>;
+	rx-pin = <21>;
+	rts-pin = <23>;
+	cts-pin = <25>;
 };
 
 &usbd {