From 502c8c43a3939295659209a95e10b6c568acd0bf Mon Sep 17 00:00:00 2001
From: fauxpark <fauxpark@gmail.com>
Date: Thu, 15 Sep 2022 14:48:47 +1000
Subject: [PATCH 1/2] Add UART support for Kinetis boards

---
 platforms/chibios/drivers/uart.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/platforms/chibios/drivers/uart.c b/platforms/chibios/drivers/uart.c
index 396803f33b7d..a9db098f1b56 100644
--- a/platforms/chibios/drivers/uart.c
+++ b/platforms/chibios/drivers/uart.c
@@ -18,7 +18,9 @@
 
 #include "quantum.h"
 
-#if defined(WB32F3G71xx) || defined(WB32FQ95xx)
+#if defined(MCU_KINETIS)
+static SerialConfig serialConfig = {SERIAL_DEFAULT_BITRATE};
+#elif defined(WB32F3G71xx) || defined(WB32FQ95xx)
 static SerialConfig serialConfig = {SERIAL_DEFAULT_BITRATE, SD1_WRDLEN, SD1_STPBIT, SD1_PARITY, SD1_ATFLCT};
 #else
 static SerialConfig serialConfig = {SERIAL_DEFAULT_BITRATE, SD1_CR1, SD1_CR2, SD1_CR3};
@@ -30,9 +32,16 @@ void uart_init(uint32_t baud) {
     if (!is_initialised) {
         is_initialised = true;
 
+#if defined(MCU_KINETIS)
+        serialConfig.sc_speed = baud;
+#else
         serialConfig.speed = baud;
+#endif
 
-#if defined(USE_GPIOV1)
+#if defined(MCU_KINETIS)
+        palSetLineMode(SD1_TX_PIN, SD1_TX_PAL_MODE);
+        palSetLineMode(SD1_RX_PIN, SD1_RX_PAL_MODE);
+#elif defined(USE_GPIOV1)
         palSetLineMode(SD1_TX_PIN, PAL_MODE_ALTERNATE_OPENDRAIN);
         palSetLineMode(SD1_RX_PIN, PAL_MODE_ALTERNATE_OPENDRAIN);
 #else

From affc45355866e650e55286bf6439b7917651cc19 Mon Sep 17 00:00:00 2001
From: fauxpark <fauxpark@gmail.com>
Date: Fri, 16 Sep 2022 11:52:32 +1000
Subject: [PATCH 2/2] Default PAL mode for GPIOV1

---
 platforms/chibios/drivers/uart.c |  5 +---
 platforms/chibios/drivers/uart.h | 46 ++++++++++++++++++++++----------
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/platforms/chibios/drivers/uart.c b/platforms/chibios/drivers/uart.c
index a9db098f1b56..b16130d80b0c 100644
--- a/platforms/chibios/drivers/uart.c
+++ b/platforms/chibios/drivers/uart.c
@@ -38,12 +38,9 @@ void uart_init(uint32_t baud) {
         serialConfig.speed = baud;
 #endif
 
-#if defined(MCU_KINETIS)
+#if defined(USE_GPIOV1)
         palSetLineMode(SD1_TX_PIN, SD1_TX_PAL_MODE);
         palSetLineMode(SD1_RX_PIN, SD1_RX_PAL_MODE);
-#elif defined(USE_GPIOV1)
-        palSetLineMode(SD1_TX_PIN, PAL_MODE_ALTERNATE_OPENDRAIN);
-        palSetLineMode(SD1_RX_PIN, PAL_MODE_ALTERNATE_OPENDRAIN);
 #else
         palSetLineMode(SD1_TX_PIN, PAL_MODE_ALTERNATE(SD1_TX_PAL_MODE) | PAL_OUTPUT_TYPE_OPENDRAIN);
         palSetLineMode(SD1_RX_PIN, PAL_MODE_ALTERNATE(SD1_RX_PAL_MODE) | PAL_OUTPUT_TYPE_OPENDRAIN);
diff --git a/platforms/chibios/drivers/uart.h b/platforms/chibios/drivers/uart.h
index 603d51037b15..db9784027074 100644
--- a/platforms/chibios/drivers/uart.h
+++ b/platforms/chibios/drivers/uart.h
@@ -28,32 +28,50 @@
 #    define SD1_TX_PIN A9
 #endif
 
-#ifndef SD1_TX_PAL_MODE
-#    define SD1_TX_PAL_MODE 7
-#endif
-
 #ifndef SD1_RX_PIN
 #    define SD1_RX_PIN A10
 #endif
 
-#ifndef SD1_RX_PAL_MODE
-#    define SD1_RX_PAL_MODE 7
-#endif
-
 #ifndef SD1_CTS_PIN
 #    define SD1_CTS_PIN A11
 #endif
 
-#ifndef SD1_CTS_PAL_MODE
-#    define SD1_CTS_PAL_MODE 7
-#endif
-
 #ifndef SD1_RTS_PIN
 #    define SD1_RTS_PIN A12
 #endif
 
-#ifndef SD1_RTS_PAL_MODE
-#    define SD1_RTS_PAL_MODE 7
+#ifdef USE_GPIOV1
+#    ifndef SD1_TX_PAL_MODE
+#        define SD1_TX_PAL_MODE PAL_MODE_ALTERNATE_OPENDRAIN
+#    endif
+
+#    ifndef SD1_RX_PAL_MODE
+#        define SD1_RX_PAL_MODE PAL_MODE_ALTERNATE_OPENDRAIN
+#    endif
+
+#    ifndef SD1_CTS_PAL_MODE
+#        define SD1_CTS_PAL_MODE PAL_MODE_ALTERNATE_OPENDRAIN
+#    endif
+
+#    ifndef SD1_RTS_PAL_MODE
+#        define SD1_RTS_PAL_MODE PAL_MODE_ALTERNATE_OPENDRAIN
+#    endif
+#else
+#    ifndef SD1_TX_PAL_MODE
+#        define SD1_TX_PAL_MODE 7
+#    endif
+
+#    ifndef SD1_RX_PAL_MODE
+#        define SD1_RX_PAL_MODE 7
+#    endif
+
+#    ifndef SD1_CTS_PAL_MODE
+#        define SD1_CTS_PAL_MODE 7
+#    endif
+
+#    ifndef SD1_RTS_PAL_MODE
+#        define SD1_RTS_PAL_MODE 7
+#    endif
 #endif
 
 #ifndef SD1_CR1