From 4363aa7af72afb069392aa031cc5b25c117e93a9 Mon Sep 17 00:00:00 2001
From: KemoNine <mcrosson@kemonine.info>
Date: Wed, 30 Dec 2020 22:59:29 +0000
Subject: [PATCH] Bring mdk dongle code in line with current blinky testing

---
 .../arm/nrf52840_mdk_dongle/CMakeLists.txt    |  7 ----
 .../arm/nrf52840_mdk_dongle/Kconfig.board     |  2 +-
 .../arm/nrf52840_mdk_dongle/Kconfig.defconfig |  2 +-
 .../arm/nrf52840_mdk_dongle/board.cmake       |  4 --
 .../nrf52840_mdk_dongle.dts                   | 40 +------------------
 .../nrf52840_mdk_dongle.yaml                  |  4 +-
 .../nrf52840_mdk_dongle_defconfig             |  3 ++
 7 files changed, 8 insertions(+), 54 deletions(-)

diff --git a/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/CMakeLists.txt b/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/CMakeLists.txt
index dc577d17..3afbb730 100644
--- a/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/CMakeLists.txt
+++ b/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/CMakeLists.txt
@@ -1,10 +1,3 @@
-#
-# Copyright (c) 2020 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-#
-
-target_sources(app PRIVATE mdk_dongle_power_led.c)
-
 set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
   COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/../tools/uf2/utils/uf2conv.py
   -c 
diff --git a/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/Kconfig.board b/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/Kconfig.board
index 7d6d7f2d..be1ddd47 100644
--- a/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/Kconfig.board
+++ b/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/Kconfig.board
@@ -4,5 +4,5 @@
 #
 
 config BOARD_NRF52840_MDK_DONGLE
-	bool "NRF52840-MDK-dongle"
+	bool "NRF52840-MDK-DONGLE"
 	depends on SOC_NRF52840_QIAA
diff --git a/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/Kconfig.defconfig b/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/Kconfig.defconfig
index 8518ec51..eb15d5d4 100644
--- a/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/Kconfig.defconfig
+++ b/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/Kconfig.defconfig
@@ -6,7 +6,7 @@
 if BOARD_NRF52840_MDK_DONGLE
 
 config BOARD
-	default "nrf52840_mdk_DONGLE"
+	default "nrf52840_mdk_dongle"
 
 if USB
 
diff --git a/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/board.cmake b/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/board.cmake
index 0c5f98ca..b49b75cb 100644
--- a/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/board.cmake
+++ b/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/board.cmake
@@ -2,7 +2,3 @@
 # Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 #
-
-board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
-include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
diff --git a/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/nrf52840_mdk_dongle.dts b/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/nrf52840_mdk_dongle.dts
index 20ffc15c..d41dbc65 100644
--- a/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/nrf52840_mdk_dongle.dts
+++ b/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/nrf52840_mdk_dongle.dts
@@ -8,7 +8,7 @@
 
 / {
 	model = "nRF52840-MDK Dongle Dev Kit";
-	compatible = "nordic,pca10056-dk";
+	compatible = "makerdiary,nrf52840_mdk_dongle";
 
 	chosen {
 		zephyr,sram = &sram0;
@@ -78,10 +78,6 @@
 	status = "okay";
 };
 
-&gpiote {
-	status = "okay";
-};
-
 &gpio0 {
 	status = "okay";
 };
@@ -90,40 +86,6 @@
 	status = "okay";
 };
 
-&uart0 {
-	compatible = "nordic,nrf-uart";
-	current-speed = <115200>;
-	status = "okay";
-	tx-pin = <20>;
-	rx-pin = <19>;
-	rts-pin = <5>;
-	cts-pin = <7>;
-};
-
-&i2c0 {
-	compatible = "nordic,nrf-twi";
-	status = "okay";
-	sda-pin = <26>;
-	scl-pin = <27>;
-};
-
-&i2c1 {
-	compatible = "nordic,nrf-twi";
-	status = "okay";
-	sda-pin = <30>;
-	scl-pin = <31>;
-};
-
-&pwm0 {
-	status = "okay";
-	ch0-pin = <22>;
-	ch0-inverted;
-	ch1-pin = <23>;
-	ch1-inverted;
-	ch2-pin = <24>;
-	ch2-inverted;
-};
-
 &flash0 {
 	/*
 	 * For more information, see:
diff --git a/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/nrf52840_mdk_dongle.yaml b/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/nrf52840_mdk_dongle.yaml
index 6eb3819d..c0d67f62 100644
--- a/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/nrf52840_mdk_dongle.yaml
+++ b/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/nrf52840_mdk_dongle.yaml
@@ -1,5 +1,5 @@
-identifier: nrf52840_mdk
-name: nRF52840-MDK-dongle
+identifier: nrf52840_mdk_dongle
+name: nRF52840-mdk-dongle
 type: mcu
 arch: arm
 toolchain:
diff --git a/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/nrf52840_mdk_dongle_defconfig b/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/nrf52840_mdk_dongle_defconfig
index 2c623bbf..444994be 100644
--- a/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/nrf52840_mdk_dongle_defconfig
+++ b/keyboards/zmk-config/config/boards/arm/nrf52840_mdk_dongle/nrf52840_mdk_dongle_defconfig
@@ -12,3 +12,6 @@ CONFIG_ARM_MPU=y
 
 # enable GPIO
 CONFIG_GPIO=y
+
+# additional board options
+CONFIG_GPIO_AS_PINRESET=n