From ce1adce69621378d5200d41d8ff0f15368c9161f Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 23 Jul 2024 12:12:52 +0100
Subject: [PATCH] Migrate split.soft_serial_pin to split.serial.pin O-Z
 (#24146)

Migrate split.soft_serial_pin to split.serial.pin
---
 keyboards/omkbd/ergodash/mini/keyboard.json                 | 4 +++-
 keyboards/omkbd/ergodash/rev1/keyboard.json                 | 4 +++-
 keyboards/omkbd/runner3680/3x6/keyboard.json                | 4 +++-
 keyboards/omkbd/runner3680/3x7/keyboard.json                | 4 +++-
 keyboards/omkbd/runner3680/3x8/keyboard.json                | 4 +++-
 keyboards/omkbd/runner3680/4x6/keyboard.json                | 4 +++-
 keyboards/omkbd/runner3680/4x7/keyboard.json                | 4 +++-
 keyboards/omkbd/runner3680/4x8/keyboard.json                | 4 +++-
 keyboards/omkbd/runner3680/5x6/keyboard.json                | 4 +++-
 keyboards/omkbd/runner3680/5x6_5x8/keyboard.json            | 4 +++-
 keyboards/omkbd/runner3680/5x7/keyboard.json                | 4 +++-
 keyboards/omkbd/runner3680/5x8/keyboard.json                | 4 +++-
 keyboards/orthodox/rev1/keyboard.json                       | 4 +++-
 keyboards/orthodox/rev3/keyboard.json                       | 4 +++-
 keyboards/orthodox/rev3_teensy/keyboard.json                | 4 +++-
 keyboards/orthograph/keyboard.json                          | 4 +++-
 keyboards/phoenix/keyboard.json                             | 6 +++---
 keyboards/pinky/3/keyboard.json                             | 4 +++-
 keyboards/pinky/4/keyboard.json                             | 4 +++-
 keyboards/pisces/keyboard.json                              | 4 +++-
 keyboards/pluckey/keyboard.json                             | 4 +++-
 keyboards/pteron36/keyboard.json                            | 4 +++-
 keyboards/quokka/keyboard.json                              | 4 ++--
 keyboards/qwertyydox/rev1/keyboard.json                     | 4 +++-
 keyboards/rainkeebs/trailmix/keyboard.json                  | 4 +++-
 keyboards/recompile_keys/choco60/rev1/keyboard.json         | 4 +++-
 keyboards/recompile_keys/choco60/rev2/keyboard.json         | 4 +++-
 keyboards/recompile_keys/cocoa40/keyboard.json              | 4 +++-
 keyboards/redox/rev1/base/keyboard.json                     | 4 +++-
 keyboards/redox_media/keyboard.json                         | 4 +++-
 keyboards/rgbkb/mun/rev1/keyboard.json                      | 4 ++--
 keyboards/rgbkb/sol/rev1/keyboard.json                      | 4 +++-
 keyboards/rgbkb/sol/rev2/keyboard.json                      | 4 +++-
 keyboards/rgbkb/sol3/rev1/keyboard.json                     | 4 ++--
 keyboards/rgbkb/zen/rev1/keyboard.json                      | 4 +++-
 keyboards/rgbkb/zen/rev2/keyboard.json                      | 4 +++-
 keyboards/rgbkb/zygomorph/rev1/keyboard.json                | 4 +++-
 keyboards/rura66/rev1/keyboard.json                         | 4 +++-
 keyboards/salicylic_acid3/7skb/rev1/keyboard.json           | 4 +++-
 keyboards/salicylic_acid3/7splus/keyboard.json              | 4 +++-
 keyboards/salicylic_acid3/ajisai74/keyboard.json            | 4 +++-
 keyboards/salicylic_acid3/ergoarrows/keyboard.json          | 4 +++-
 keyboards/salicylic_acid3/guide68/keyboard.json             | 4 +++-
 keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json      | 4 +++-
 keyboards/salicylic_acid3/naked48/rev1/keyboard.json        | 4 +++-
 keyboards/salicylic_acid3/naked60/rev1/keyboard.json        | 4 +++-
 keyboards/salicylic_acid3/naked64/rev1/keyboard.json        | 4 +++-
 keyboards/salicylic_acid3/nknl7en/keyboard.json             | 4 +++-
 keyboards/salicylic_acid3/nknl7jp/keyboard.json             | 4 +++-
 keyboards/scatter42/keyboard.json                           | 4 +++-
 keyboards/sekigon/grs_70ec/keyboard.json                    | 4 +++-
 keyboards/silverbullet44/keyboard.json                      | 4 +++-
 .../sleepy_craft_studios/sleepy_keeb_split/keyboard.json    | 4 +++-
 keyboards/sofle/info.json                                   | 4 +++-
 keyboards/sofle_choc/keyboard.json                          | 4 +++-
 keyboards/spacetime/info.json                               | 4 +++-
 keyboards/sparrow62/keyboard.json                           | 4 +++-
 keyboards/spleeb/keyboard.json                              | 4 ++--
 keyboards/split67/keyboard.json                             | 4 +++-
 keyboards/splitkb/aurora/corne/rev1/keyboard.json           | 4 +++-
 keyboards/splitkb/aurora/helix/rev1/keyboard.json           | 4 +++-
 keyboards/splitkb/aurora/lily58/rev1/keyboard.json          | 4 +++-
 keyboards/splitkb/aurora/sofle_v2/rev1/keyboard.json        | 4 +++-
 keyboards/splitkb/aurora/sweep/rev1/keyboard.json           | 4 +++-
 keyboards/splitkb/kyria/rev1/base/keyboard.json             | 4 +++-
 keyboards/splitkb/kyria/rev2/base/keyboard.json             | 4 +++-
 keyboards/splitkb/kyria/rev3/keyboard.json                  | 4 +++-
 keyboards/supersplit/keyboard.json                          | 4 +++-
 keyboards/takashicompany/compacx/keyboard.json              | 4 +++-
 keyboards/takashicompany/dogtag/keyboard.json               | 4 +++-
 keyboards/takashicompany/heavy_left/keyboard.json           | 4 +++-
 keyboards/takashicompany/minidivide/keyboard.json           | 4 +++-
 keyboards/takashicompany/minidivide_max/keyboard.json       | 4 +++-
 keyboards/takashiski/hecomi/alpha/keyboard.json             | 4 +++-
 keyboards/takashiski/otaku_split/rev0/keyboard.json         | 4 +++-
 keyboards/takashiski/otaku_split/rev1/keyboard.json         | 4 +++-
 keyboards/tkw/grandiceps/info.json                          | 4 ++--
 keyboards/tweetydabird/lotus58/elite_c/keyboard.json        | 6 ++++--
 keyboards/tweetydabird/lotus58/nanoboot/keyboard.json       | 6 ++++--
 keyboards/tweetydabird/lotus58/promicro/keyboard.json       | 6 ++++--
 keyboards/tweetydabird/lotus58/rp2040_ce/keyboard.json      | 4 ++--
 keyboards/tzarc/djinn/rev1/keyboard.json                    | 4 +++-
 keyboards/unikeyboard/diverge3/keyboard.json                | 4 +++-
 keyboards/unikeyboard/divergetm2/keyboard.json              | 4 +++-
 keyboards/uzu42/rev1/keyboard.json                          | 4 +++-
 keyboards/vitamins_included/rev1/keyboard.json              | 4 +++-
 keyboards/vitamins_included/rev2/keyboard.json              | 4 +++-
 keyboards/waterfowl/keyboard.json                           | 4 +++-
 keyboards/xenon/keyboard.json                               | 4 +++-
 keyboards/yoichiro/lunakey_mini/keyboard.json               | 4 +++-
 keyboards/yosino58/rev1/keyboard.json                       | 4 +++-
 keyboards/yushakobo/ergo68/keyboard.json                    | 6 ++++--
 keyboards/yushakobo/navpad/10_helix_r/keyboard.json         | 4 +++-
 keyboards/zigotica/z34/keyboard.json                        | 4 +++-
 keyboards/zvecr/split_blackpill/keyboard.json               | 4 ++--
 95 files changed, 282 insertions(+), 108 deletions(-)

diff --git a/keyboards/omkbd/ergodash/mini/keyboard.json b/keyboards/omkbd/ergodash/mini/keyboard.json
index 6286b73b90dc..7c15c4f6f76d 100644
--- a/keyboards/omkbd/ergodash/mini/keyboard.json
+++ b/keyboards/omkbd/ergodash/mini/keyboard.json
@@ -30,7 +30,9 @@
         "levels": 7
     },
     "split": {
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/ergodash/rev1/keyboard.json b/keyboards/omkbd/ergodash/rev1/keyboard.json
index fb4a1c22549a..6a61950ba6ea 100644
--- a/keyboards/omkbd/ergodash/rev1/keyboard.json
+++ b/keyboards/omkbd/ergodash/rev1/keyboard.json
@@ -30,7 +30,9 @@
         "levels": 7
     },
     "split": {
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/runner3680/3x6/keyboard.json b/keyboards/omkbd/runner3680/3x6/keyboard.json
index 3e1ab5ba824c..44c5ce35a035 100644
--- a/keyboards/omkbd/runner3680/3x6/keyboard.json
+++ b/keyboards/omkbd/runner3680/3x6/keyboard.json
@@ -20,7 +20,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/runner3680/3x7/keyboard.json b/keyboards/omkbd/runner3680/3x7/keyboard.json
index 496be949256f..8a4c55ca7134 100644
--- a/keyboards/omkbd/runner3680/3x7/keyboard.json
+++ b/keyboards/omkbd/runner3680/3x7/keyboard.json
@@ -20,7 +20,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/runner3680/3x8/keyboard.json b/keyboards/omkbd/runner3680/3x8/keyboard.json
index 80719fd0e473..11fe738a8a3b 100644
--- a/keyboards/omkbd/runner3680/3x8/keyboard.json
+++ b/keyboards/omkbd/runner3680/3x8/keyboard.json
@@ -20,7 +20,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/runner3680/4x6/keyboard.json b/keyboards/omkbd/runner3680/4x6/keyboard.json
index f9d3146a7852..2449f3431e3c 100644
--- a/keyboards/omkbd/runner3680/4x6/keyboard.json
+++ b/keyboards/omkbd/runner3680/4x6/keyboard.json
@@ -20,7 +20,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/runner3680/4x7/keyboard.json b/keyboards/omkbd/runner3680/4x7/keyboard.json
index 120e254e5cc5..01acfad1e732 100644
--- a/keyboards/omkbd/runner3680/4x7/keyboard.json
+++ b/keyboards/omkbd/runner3680/4x7/keyboard.json
@@ -20,7 +20,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/runner3680/4x8/keyboard.json b/keyboards/omkbd/runner3680/4x8/keyboard.json
index e0b91088da0c..748fc0550815 100644
--- a/keyboards/omkbd/runner3680/4x8/keyboard.json
+++ b/keyboards/omkbd/runner3680/4x8/keyboard.json
@@ -20,7 +20,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/runner3680/5x6/keyboard.json b/keyboards/omkbd/runner3680/5x6/keyboard.json
index c06bff537fbd..9b043c7e1991 100644
--- a/keyboards/omkbd/runner3680/5x6/keyboard.json
+++ b/keyboards/omkbd/runner3680/5x6/keyboard.json
@@ -20,7 +20,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json b/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json
index 4c359b27ebd5..b8a361f1b261 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json
+++ b/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json
@@ -24,7 +24,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/runner3680/5x7/keyboard.json b/keyboards/omkbd/runner3680/5x7/keyboard.json
index 55936eb9d362..41df79777031 100644
--- a/keyboards/omkbd/runner3680/5x7/keyboard.json
+++ b/keyboards/omkbd/runner3680/5x7/keyboard.json
@@ -20,7 +20,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/runner3680/5x8/keyboard.json b/keyboards/omkbd/runner3680/5x8/keyboard.json
index 9e96e69bbb81..04294371d744 100644
--- a/keyboards/omkbd/runner3680/5x8/keyboard.json
+++ b/keyboards/omkbd/runner3680/5x8/keyboard.json
@@ -20,7 +20,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/orthodox/rev1/keyboard.json b/keyboards/orthodox/rev1/keyboard.json
index 042187b8bf0f..0444009f2bd5 100644
--- a/keyboards/orthodox/rev1/keyboard.json
+++ b/keyboards/orthodox/rev1/keyboard.json
@@ -13,7 +13,9 @@
   },
   "diode_direction": "COL2ROW",
   "split": {
-    "soft_serial_pin": "D0"
+    "serial": {
+      "pin": "D0"
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
diff --git a/keyboards/orthodox/rev3/keyboard.json b/keyboards/orthodox/rev3/keyboard.json
index e2b3abd34d06..61d8281f55ad 100644
--- a/keyboards/orthodox/rev3/keyboard.json
+++ b/keyboards/orthodox/rev3/keyboard.json
@@ -13,7 +13,9 @@
   },
   "diode_direction": "COL2ROW",
   "split": {
-    "soft_serial_pin": "D0"
+    "serial": {
+      "pin": "D0"
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
diff --git a/keyboards/orthodox/rev3_teensy/keyboard.json b/keyboards/orthodox/rev3_teensy/keyboard.json
index 345ff58145ea..fd77ba7ae581 100644
--- a/keyboards/orthodox/rev3_teensy/keyboard.json
+++ b/keyboards/orthodox/rev3_teensy/keyboard.json
@@ -13,7 +13,9 @@
   },
   "diode_direction": "COL2ROW",
   "split": {
-    "soft_serial_pin": "D0"
+    "serial": {
+      "pin": "D0"
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "halfkay",
diff --git a/keyboards/orthograph/keyboard.json b/keyboards/orthograph/keyboard.json
index ad37b0c723c9..a3fbf634e52f 100644
--- a/keyboards/orthograph/keyboard.json
+++ b/keyboards/orthograph/keyboard.json
@@ -30,7 +30,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "E6",
+        "serial": {
+            "pin": "E6"
+        },
         "transport": {
             "sync_matrix_state": true
         },
diff --git a/keyboards/phoenix/keyboard.json b/keyboards/phoenix/keyboard.json
index ff13389245d6..f3eb6a8d5544 100644
--- a/keyboards/phoenix/keyboard.json
+++ b/keyboards/phoenix/keyboard.json
@@ -34,9 +34,9 @@
             "pin": "B9"
         },
         "serial": {
-            "driver": "usart"
-        },
-        "soft_serial_pin": "A9"
+            "driver": "usart",
+            "pin": "A9"
+        }
     },
     "processor": "STM32F401",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/pinky/3/keyboard.json b/keyboards/pinky/3/keyboard.json
index 770d368399d3..32e1f893e57d 100644
--- a/keyboards/pinky/3/keyboard.json
+++ b/keyboards/pinky/3/keyboard.json
@@ -14,7 +14,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/pinky/4/keyboard.json b/keyboards/pinky/4/keyboard.json
index 01e44a647b36..20f86e3f38c8 100644
--- a/keyboards/pinky/4/keyboard.json
+++ b/keyboards/pinky/4/keyboard.json
@@ -14,7 +14,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/pisces/keyboard.json b/keyboards/pisces/keyboard.json
index afdddfaf4d17..1601cbc3a99f 100644
--- a/keyboards/pisces/keyboard.json
+++ b/keyboards/pisces/keyboard.json
@@ -29,7 +29,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/pluckey/keyboard.json b/keyboards/pluckey/keyboard.json
index 9517bf54b488..57f6b2467f93 100644
--- a/keyboards/pluckey/keyboard.json
+++ b/keyboards/pluckey/keyboard.json
@@ -35,13 +35,15 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
         "encoder": {
             "right": {
                 "rotary": [
                     {"pin_a": "B2", "pin_b": "B3", "resolution": 2}
                 ]
             }
+        },
+        "serial": {
+            "pin": "D2"
         }
     },
     "processor": "atmega32u4",
diff --git a/keyboards/pteron36/keyboard.json b/keyboards/pteron36/keyboard.json
index abd94d599af9..2000593e6281 100644
--- a/keyboards/pteron36/keyboard.json
+++ b/keyboards/pteron36/keyboard.json
@@ -40,13 +40,15 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D3",
         "encoder": {
             "right": {
                 "rotary": [
                     {"pin_a": "F4", "pin_b": "F5"}
                 ]
             }
+        },
+        "serial": {
+            "pin": "D3"
         }
     },
     "rgblight": {
diff --git a/keyboards/quokka/keyboard.json b/keyboards/quokka/keyboard.json
index a92a113f3ee6..b04f569c8c0c 100644
--- a/keyboards/quokka/keyboard.json
+++ b/keyboards/quokka/keyboard.json
@@ -66,9 +66,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "GP0",
         "serial": {
-            "driver": "vendor"
+            "driver": "vendor",
+            "pin": "GP0"
         }
     },
     "url": "https://github.com/dlford/quokka",
diff --git a/keyboards/qwertyydox/rev1/keyboard.json b/keyboards/qwertyydox/rev1/keyboard.json
index f2a335aa027b..24284ff8c02e 100644
--- a/keyboards/qwertyydox/rev1/keyboard.json
+++ b/keyboards/qwertyydox/rev1/keyboard.json
@@ -40,7 +40,9 @@
   "diode_direction": "COL2ROW",
   "split": {
     "enabled": true,
-    "soft_serial_pin": "D0"
+    "serial": {
+      "pin": "D0"
+    }
   },
   "qmk": {
     "locking": {
diff --git a/keyboards/rainkeebs/trailmix/keyboard.json b/keyboards/rainkeebs/trailmix/keyboard.json
index 7b3cfdfcdd3e..b871a8c9afce 100644
--- a/keyboards/rainkeebs/trailmix/keyboard.json
+++ b/keyboards/rainkeebs/trailmix/keyboard.json
@@ -30,7 +30,9 @@
                 ]
             }
         },
-        "soft_serial_pin": "D3"
+        "serial": {
+            "pin": "D3"
+        }
     },
     "url": "https://www.rainkeebs.mx",
     "usb": {
diff --git a/keyboards/recompile_keys/choco60/rev1/keyboard.json b/keyboards/recompile_keys/choco60/rev1/keyboard.json
index 150037acee02..4e5a8903bd43 100644
--- a/keyboards/recompile_keys/choco60/rev1/keyboard.json
+++ b/keyboards/recompile_keys/choco60/rev1/keyboard.json
@@ -15,7 +15,9 @@
         "handedness": {
             "pin": "D0"
         },
-        "soft_serial_pin": "D3"
+        "serial": {
+            "pin": "D3"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina"
diff --git a/keyboards/recompile_keys/choco60/rev2/keyboard.json b/keyboards/recompile_keys/choco60/rev2/keyboard.json
index 47c5a0beb9b6..84ca0bd9a111 100644
--- a/keyboards/recompile_keys/choco60/rev2/keyboard.json
+++ b/keyboards/recompile_keys/choco60/rev2/keyboard.json
@@ -15,7 +15,9 @@
         "handedness": {
             "pin": "D1"
         },
-        "soft_serial_pin": "D0",
+        "serial": {
+            "pin": "D0"
+        },
         "matrix_pins": {
             "right": {
                 "cols": ["C7", "B7", "B6", "B5", "B4", "B3", "B2", "C6", "D4"],
diff --git a/keyboards/recompile_keys/cocoa40/keyboard.json b/keyboards/recompile_keys/cocoa40/keyboard.json
index 465cd395c7df..45f0cba2ffcb 100644
--- a/keyboards/recompile_keys/cocoa40/keyboard.json
+++ b/keyboards/recompile_keys/cocoa40/keyboard.json
@@ -26,7 +26,9 @@
         "handedness": {
             "pin": "D3"
         },
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/redox/rev1/base/keyboard.json b/keyboards/redox/rev1/base/keyboard.json
index a4a3f3fe96e7..e6fa9fc69240 100644
--- a/keyboards/redox/rev1/base/keyboard.json
+++ b/keyboards/redox/rev1/base/keyboard.json
@@ -8,7 +8,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "ws2812": {
         "pin": "D3"
diff --git a/keyboards/redox_media/keyboard.json b/keyboards/redox_media/keyboard.json
index baf1cfeb4347..83057da79ff8 100644
--- a/keyboards/redox_media/keyboard.json
+++ b/keyboards/redox_media/keyboard.json
@@ -33,7 +33,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/rgbkb/mun/rev1/keyboard.json b/keyboards/rgbkb/mun/rev1/keyboard.json
index 7eae34c18f2a..ec02a2f2dd55 100644
--- a/keyboards/rgbkb/mun/rev1/keyboard.json
+++ b/keyboards/rgbkb/mun/rev1/keyboard.json
@@ -115,7 +115,6 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "A9",
         "transport": {
             "sync": {
                 "indicators": true,
@@ -124,7 +123,8 @@
             }
         },
         "serial": {
-            "driver": "usart"
+            "driver": "usart",
+            "pin": "A9"
         }
     },
     "processor": "STM32F303",
diff --git a/keyboards/rgbkb/sol/rev1/keyboard.json b/keyboards/rgbkb/sol/rev1/keyboard.json
index 9607e7625953..38932a78e1f4 100644
--- a/keyboards/rgbkb/sol/rev1/keyboard.json
+++ b/keyboards/rgbkb/sol/rev1/keyboard.json
@@ -92,7 +92,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D3"
+        "serial": {
+            "pin": "D3"
+        }
     },
     "tapping": {
         "term": 150
diff --git a/keyboards/rgbkb/sol/rev2/keyboard.json b/keyboards/rgbkb/sol/rev2/keyboard.json
index 1a5ca12ed959..b6bad358e3ca 100644
--- a/keyboards/rgbkb/sol/rev2/keyboard.json
+++ b/keyboards/rgbkb/sol/rev2/keyboard.json
@@ -90,7 +90,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D3"
+        "serial": {
+            "pin": "D3"
+        }
     },
     "tapping": {
         "term": 150
diff --git a/keyboards/rgbkb/sol3/rev1/keyboard.json b/keyboards/rgbkb/sol3/rev1/keyboard.json
index edf70636e7d3..a81ea7bc2123 100644
--- a/keyboards/rgbkb/sol3/rev1/keyboard.json
+++ b/keyboards/rgbkb/sol3/rev1/keyboard.json
@@ -130,7 +130,6 @@
                 "pins": ["A14", "B0"]
             }
         },
-        "soft_serial_pin": "A9",
         "encoder": {
             "right": {
                 "rotary": [
@@ -150,7 +149,8 @@
             }
         },
         "serial": {
-            "driver": "usart"
+            "driver": "usart",
+            "pin": "A9"
         },
         "transport": {
             "sync": {
diff --git a/keyboards/rgbkb/zen/rev1/keyboard.json b/keyboards/rgbkb/zen/rev1/keyboard.json
index 8e192d9dfd70..91d127de5834 100644
--- a/keyboards/rgbkb/zen/rev1/keyboard.json
+++ b/keyboards/rgbkb/zen/rev1/keyboard.json
@@ -29,7 +29,9 @@
   "diode_direction": "COL2ROW",
   "split": {
     "enabled": true,
-    "soft_serial_pin": "D0"
+    "serial": {
+      "pin": "D0"
+    }
   },
   "rgblight": {
     "led_count": 16
diff --git a/keyboards/rgbkb/zen/rev2/keyboard.json b/keyboards/rgbkb/zen/rev2/keyboard.json
index 9079185b26d7..b59af6dfdd69 100644
--- a/keyboards/rgbkb/zen/rev2/keyboard.json
+++ b/keyboards/rgbkb/zen/rev2/keyboard.json
@@ -35,7 +35,9 @@
     },
     "split": {
       "enabled": true,
-      "soft_serial_pin": "D3"
+      "serial": {
+        "pin": "D3"
+      }
     },
     "rgblight": {
       "led_count": 34,
diff --git a/keyboards/rgbkb/zygomorph/rev1/keyboard.json b/keyboards/rgbkb/zygomorph/rev1/keyboard.json
index fc92e0746d32..21b9648431a1 100644
--- a/keyboards/rgbkb/zygomorph/rev1/keyboard.json
+++ b/keyboards/rgbkb/zygomorph/rev1/keyboard.json
@@ -93,7 +93,9 @@
     },
     "split": {
       "enabled": true,
-      "soft_serial_pin": "D3"
+      "serial": {
+        "pin": "D3"
+      }
     },
     "rgblight": {
       "split_count": [30, 30],
diff --git a/keyboards/rura66/rev1/keyboard.json b/keyboards/rura66/rev1/keyboard.json
index 43f657839409..cb9ad6f29a5f 100644
--- a/keyboards/rura66/rev1/keyboard.json
+++ b/keyboards/rura66/rev1/keyboard.json
@@ -48,7 +48,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "ws2812": {
         "pin": "D3"
diff --git a/keyboards/salicylic_acid3/7skb/rev1/keyboard.json b/keyboards/salicylic_acid3/7skb/rev1/keyboard.json
index 864e1835fdfc..4a338811eae9 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/7skb/rev1/keyboard.json
@@ -32,7 +32,9 @@
         "handedness": {
             "pin": "B6"
         },
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "rgblight": {
         "hue_steps": 10,
diff --git a/keyboards/salicylic_acid3/7splus/keyboard.json b/keyboards/salicylic_acid3/7splus/keyboard.json
index c33d00d867f4..d04b8ad45bca 100644
--- a/keyboards/salicylic_acid3/7splus/keyboard.json
+++ b/keyboards/salicylic_acid3/7splus/keyboard.json
@@ -33,7 +33,9 @@
         "handedness": {
             "pin": "B6"
         },
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "rgblight": {
         "hue_steps": 10,
diff --git a/keyboards/salicylic_acid3/ajisai74/keyboard.json b/keyboards/salicylic_acid3/ajisai74/keyboard.json
index 41abc9c6234f..62d475d9df4d 100644
--- a/keyboards/salicylic_acid3/ajisai74/keyboard.json
+++ b/keyboards/salicylic_acid3/ajisai74/keyboard.json
@@ -32,7 +32,9 @@
         "handedness": {
             "pin": "B6"
         },
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/salicylic_acid3/ergoarrows/keyboard.json b/keyboards/salicylic_acid3/ergoarrows/keyboard.json
index 41cb0da90f9e..122d2e0ee676 100644
--- a/keyboards/salicylic_acid3/ergoarrows/keyboard.json
+++ b/keyboards/salicylic_acid3/ergoarrows/keyboard.json
@@ -33,7 +33,9 @@
         "handedness": {
             "pin": "B6"
         },
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "rgblight": {
         "hue_steps": 10,
diff --git a/keyboards/salicylic_acid3/guide68/keyboard.json b/keyboards/salicylic_acid3/guide68/keyboard.json
index 629afac8f778..f32db9646dc9 100644
--- a/keyboards/salicylic_acid3/guide68/keyboard.json
+++ b/keyboards/salicylic_acid3/guide68/keyboard.json
@@ -54,7 +54,9 @@
         "transport": {
             "protocol": "serial"
         },
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json b/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json
index d17e0fd3bcab..e4525ecf745f 100644
--- a/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json
@@ -32,7 +32,9 @@
         "handedness": {
             "pin": "B6"
         },
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "rgblight": {
         "hue_steps": 10,
diff --git a/keyboards/salicylic_acid3/naked48/rev1/keyboard.json b/keyboards/salicylic_acid3/naked48/rev1/keyboard.json
index 2786f50a03f8..3bac1d8864ae 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/naked48/rev1/keyboard.json
@@ -31,7 +31,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "matrix_pins": {
             "right": {
                 "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B4", "B5", "B2", "B2"],
diff --git a/keyboards/salicylic_acid3/naked60/rev1/keyboard.json b/keyboards/salicylic_acid3/naked60/rev1/keyboard.json
index 52a503c94001..5037414c3d7f 100644
--- a/keyboards/salicylic_acid3/naked60/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/naked60/rev1/keyboard.json
@@ -27,7 +27,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "matrix_pins": {
             "right": {
                 "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B4", "B5", "B2", "B2"],
diff --git a/keyboards/salicylic_acid3/naked64/rev1/keyboard.json b/keyboards/salicylic_acid3/naked64/rev1/keyboard.json
index 6cc689765974..688edf53d308 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/naked64/rev1/keyboard.json
@@ -29,7 +29,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "matrix_pins": {
             "right": {
                 "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
diff --git a/keyboards/salicylic_acid3/nknl7en/keyboard.json b/keyboards/salicylic_acid3/nknl7en/keyboard.json
index c41be4537689..554430f6c4ec 100644
--- a/keyboards/salicylic_acid3/nknl7en/keyboard.json
+++ b/keyboards/salicylic_acid3/nknl7en/keyboard.json
@@ -33,7 +33,9 @@
         "handedness": {
             "pin": "B6"
         },
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "rgblight": {
         "hue_steps": 10,
diff --git a/keyboards/salicylic_acid3/nknl7jp/keyboard.json b/keyboards/salicylic_acid3/nknl7jp/keyboard.json
index 2fab8e8f7eae..b8a9196f88dc 100644
--- a/keyboards/salicylic_acid3/nknl7jp/keyboard.json
+++ b/keyboards/salicylic_acid3/nknl7jp/keyboard.json
@@ -33,7 +33,9 @@
         "handedness": {
             "pin": "B6"
         },
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "rgblight": {
         "hue_steps": 10,
diff --git a/keyboards/scatter42/keyboard.json b/keyboards/scatter42/keyboard.json
index 63aaaa46b2c8..7bb7a63ffe6b 100644
--- a/keyboards/scatter42/keyboard.json
+++ b/keyboards/scatter42/keyboard.json
@@ -29,7 +29,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/sekigon/grs_70ec/keyboard.json b/keyboards/sekigon/grs_70ec/keyboard.json
index fbea73fb9966..7b3573c768ea 100644
--- a/keyboards/sekigon/grs_70ec/keyboard.json
+++ b/keyboards/sekigon/grs_70ec/keyboard.json
@@ -23,7 +23,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D3"
+        "serial": {
+            "pin": "D3"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/silverbullet44/keyboard.json b/keyboards/silverbullet44/keyboard.json
index a58aed88206c..69c291a1ccd2 100644
--- a/keyboards/silverbullet44/keyboard.json
+++ b/keyboards/silverbullet44/keyboard.json
@@ -56,7 +56,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/sleepy_craft_studios/sleepy_keeb_split/keyboard.json b/keyboards/sleepy_craft_studios/sleepy_keeb_split/keyboard.json
index c645bfbaff53..d95f0f20be08 100644
--- a/keyboards/sleepy_craft_studios/sleepy_keeb_split/keyboard.json
+++ b/keyboards/sleepy_craft_studios/sleepy_keeb_split/keyboard.json
@@ -29,7 +29,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "usb_detect": {
             "enabled": true
         }
diff --git a/keyboards/sofle/info.json b/keyboards/sofle/info.json
index 91fdfd38be1d..b785d7e7b6ea 100644
--- a/keyboards/sofle/info.json
+++ b/keyboards/sofle/info.json
@@ -20,7 +20,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "transport": {
             "sync": {
                 "matrix_state": true
diff --git a/keyboards/sofle_choc/keyboard.json b/keyboards/sofle_choc/keyboard.json
index c4d9822371b8..0a25985d4f9a 100644
--- a/keyboards/sofle_choc/keyboard.json
+++ b/keyboards/sofle_choc/keyboard.json
@@ -118,7 +118,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "encoder": {
             "right": {
                 "rotary": [
diff --git a/keyboards/spacetime/info.json b/keyboards/spacetime/info.json
index 1e04608349b1..4e3682a8c2cd 100644
--- a/keyboards/spacetime/info.json
+++ b/keyboards/spacetime/info.json
@@ -29,7 +29,9 @@
   "diode_direction": "COL2ROW",
   "split": {
     "enabled": true,
-    "soft_serial_pin": "D0"
+    "serial": {
+      "pin": "D0"
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
diff --git a/keyboards/sparrow62/keyboard.json b/keyboards/sparrow62/keyboard.json
index 6f5ebd540fb9..96447b6a3617 100644
--- a/keyboards/sparrow62/keyboard.json
+++ b/keyboards/sparrow62/keyboard.json
@@ -32,7 +32,9 @@
         "handedness": {
             "pin": "F4"
         },
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/spleeb/keyboard.json b/keyboards/spleeb/keyboard.json
index 4d137ef10dc7..56b0bc83b042 100644
--- a/keyboards/spleeb/keyboard.json
+++ b/keyboards/spleeb/keyboard.json
@@ -29,7 +29,6 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "GP1",
         "encoder": {
             "right": {
                 "rotary": [
@@ -45,7 +44,8 @@
             }
         },
         "serial": {
-            "driver": "vendor"
+            "driver": "vendor",
+            "pin": "GP1"
         }
     },
     "url": "https://github.com/chrishoage/spleeb",
diff --git a/keyboards/split67/keyboard.json b/keyboards/split67/keyboard.json
index f9a3632c01ff..46b571420a0d 100644
--- a/keyboards/split67/keyboard.json
+++ b/keyboards/split67/keyboard.json
@@ -33,7 +33,9 @@
                 "rows": ["D4", "C6", "D7", "E6", "B4"]
             }
         },
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "url": "",
     "usb": {
diff --git a/keyboards/splitkb/aurora/corne/rev1/keyboard.json b/keyboards/splitkb/aurora/corne/rev1/keyboard.json
index cf3516f34fd9..40983ec28d54 100644
--- a/keyboards/splitkb/aurora/corne/rev1/keyboard.json
+++ b/keyboards/splitkb/aurora/corne/rev1/keyboard.json
@@ -82,7 +82,6 @@
         "bootmagic": {
             "matrix": [4, 5]
         },
-        "soft_serial_pin": "D2",
         "matrix_pins": {
             "right": {
                 "rows": ["B1", "B3", "B2", "B6"],
@@ -99,6 +98,9 @@
         "handedness": {
             "pin": "F4"
         },
+        "serial": {
+            "pin": "D2"
+        },
         "transport": {
             "sync": {
                 "matrix_state": true
diff --git a/keyboards/splitkb/aurora/helix/rev1/keyboard.json b/keyboards/splitkb/aurora/helix/rev1/keyboard.json
index 1844e5951efc..0c3569f26c8f 100644
--- a/keyboards/splitkb/aurora/helix/rev1/keyboard.json
+++ b/keyboards/splitkb/aurora/helix/rev1/keyboard.json
@@ -127,7 +127,9 @@
                 "rows": ["F4", "F5", "F6", "F7", "B1"]
             }
         },
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "usb": {
         "pid": "0xB4C4"
diff --git a/keyboards/splitkb/aurora/lily58/rev1/keyboard.json b/keyboards/splitkb/aurora/lily58/rev1/keyboard.json
index 1284fc231989..60645f9deb48 100644
--- a/keyboards/splitkb/aurora/lily58/rev1/keyboard.json
+++ b/keyboards/splitkb/aurora/lily58/rev1/keyboard.json
@@ -93,7 +93,6 @@
         "bootmagic": {
             "matrix": [5, 0]
         },
-        "soft_serial_pin": "D2",
         "matrix_pins": {
             "right": {
                 "rows": ["F4", "D4", "B3", "B2", "B6"],
@@ -110,6 +109,9 @@
         "handedness": {
             "pin": "F5"
         },
+        "serial": {
+            "pin": "D2"
+        },
         "transport": {
             "sync": {
                 "matrix_state": true
diff --git a/keyboards/splitkb/aurora/sofle_v2/rev1/keyboard.json b/keyboards/splitkb/aurora/sofle_v2/rev1/keyboard.json
index 8b702c40011d..6c72888b1014 100644
--- a/keyboards/splitkb/aurora/sofle_v2/rev1/keyboard.json
+++ b/keyboards/splitkb/aurora/sofle_v2/rev1/keyboard.json
@@ -121,7 +121,9 @@
                 "rows": ["B3", "B1", "F7", "F6", "F5"]
             }
         },
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "usb": {
         "pid": "0xEC32"
diff --git a/keyboards/splitkb/aurora/sweep/rev1/keyboard.json b/keyboards/splitkb/aurora/sweep/rev1/keyboard.json
index eb62369603d3..e90995b20710 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/keyboard.json
+++ b/keyboards/splitkb/aurora/sweep/rev1/keyboard.json
@@ -78,7 +78,6 @@
         "bootmagic": {
             "matrix": [4, 4]
         },
-        "soft_serial_pin": "D2",
         "matrix_pins": {
             "right": {
                 "rows": ["B1", "F7", "F6", "B3"],
@@ -96,6 +95,9 @@
         "handedness": {
             "pin": "F4"
         },
+        "serial": {
+            "pin": "D2"
+        },
         "transport": {
             "sync": {
                 "matrix_state": true
diff --git a/keyboards/splitkb/kyria/rev1/base/keyboard.json b/keyboards/splitkb/kyria/rev1/base/keyboard.json
index df92d71ad13f..9cb4485c44e7 100644
--- a/keyboards/splitkb/kyria/rev1/base/keyboard.json
+++ b/keyboards/splitkb/kyria/rev1/base/keyboard.json
@@ -11,7 +11,9 @@
         ]
     },
     "split": {
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "encoder": {
             "right": {
                 "rotary": [
diff --git a/keyboards/splitkb/kyria/rev2/base/keyboard.json b/keyboards/splitkb/kyria/rev2/base/keyboard.json
index 8de0f335cc57..49428ca30a1d 100644
--- a/keyboards/splitkb/kyria/rev2/base/keyboard.json
+++ b/keyboards/splitkb/kyria/rev2/base/keyboard.json
@@ -14,7 +14,9 @@
         "handedness": {
             "matrix_grid": ["E6", "B3"]
         },
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "encoder": {
             "right": {
                 "rotary": [
diff --git a/keyboards/splitkb/kyria/rev3/keyboard.json b/keyboards/splitkb/kyria/rev3/keyboard.json
index a2f21826e8d9..580aa821dbeb 100644
--- a/keyboards/splitkb/kyria/rev3/keyboard.json
+++ b/keyboards/splitkb/kyria/rev3/keyboard.json
@@ -95,7 +95,6 @@
         "bootmagic": {
             "matrix": [4, 6]
         },
-        "soft_serial_pin": "D2",
         "matrix_pins": {
             "right": {
                 "rows": ["F6", "F7", "B1", "B3"],
@@ -112,6 +111,9 @@
         "handedness": {
             "pin": "B5"
         },
+        "serial": {
+            "pin": "D2"
+        },
         "transport": {
             "sync": {
                 "matrix_state": true
diff --git a/keyboards/supersplit/keyboard.json b/keyboards/supersplit/keyboard.json
index 6748321ff376..3950d2bbcea9 100644
--- a/keyboards/supersplit/keyboard.json
+++ b/keyboards/supersplit/keyboard.json
@@ -25,7 +25,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "layouts": {
         "LAYOUT_split_6x4_9": {
diff --git a/keyboards/takashicompany/compacx/keyboard.json b/keyboards/takashicompany/compacx/keyboard.json
index b4460cce7704..71d6d2ec74ca 100644
--- a/keyboards/takashicompany/compacx/keyboard.json
+++ b/keyboards/takashicompany/compacx/keyboard.json
@@ -60,7 +60,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/takashicompany/dogtag/keyboard.json b/keyboards/takashicompany/dogtag/keyboard.json
index 675b8e6bd256..af8d2119d42f 100644
--- a/keyboards/takashicompany/dogtag/keyboard.json
+++ b/keyboards/takashicompany/dogtag/keyboard.json
@@ -30,7 +30,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "matrix_pins": {
             "right": {
                 "cols": ["B1", "F7", "F6", "F5", "F4"],
diff --git a/keyboards/takashicompany/heavy_left/keyboard.json b/keyboards/takashicompany/heavy_left/keyboard.json
index 3109e1ad83f1..5eb159601052 100644
--- a/keyboards/takashicompany/heavy_left/keyboard.json
+++ b/keyboards/takashicompany/heavy_left/keyboard.json
@@ -45,7 +45,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "development_board": "promicro",
     "layouts": {
diff --git a/keyboards/takashicompany/minidivide/keyboard.json b/keyboards/takashicompany/minidivide/keyboard.json
index 2234cd9b39e6..4ae089fbeee6 100644
--- a/keyboards/takashicompany/minidivide/keyboard.json
+++ b/keyboards/takashicompany/minidivide/keyboard.json
@@ -47,7 +47,9 @@
                 "rows": ["F4", "F5", "F6", "F7"]
             }
         },
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "url": "",
     "usb": {
diff --git a/keyboards/takashicompany/minidivide_max/keyboard.json b/keyboards/takashicompany/minidivide_max/keyboard.json
index 32e67e944d80..54f9dbaf7807 100644
--- a/keyboards/takashicompany/minidivide_max/keyboard.json
+++ b/keyboards/takashicompany/minidivide_max/keyboard.json
@@ -45,7 +45,9 @@
                 "rows": ["F4", "F5", "F6", "F7", "B1"]
             }
         },
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "url": "",
     "usb": {
diff --git a/keyboards/takashiski/hecomi/alpha/keyboard.json b/keyboards/takashiski/hecomi/alpha/keyboard.json
index 0a6bf513f0c0..edb920c82d2f 100644
--- a/keyboards/takashiski/hecomi/alpha/keyboard.json
+++ b/keyboards/takashiski/hecomi/alpha/keyboard.json
@@ -30,7 +30,9 @@
   "diode_direction": "COL2ROW",
   "split": {
     "enabled": true,
-    "soft_serial_pin": "D1"
+    "serial": {
+      "pin": "D1"
+    }
   },
   "rgblight": {
     "saturation_steps": 8,
diff --git a/keyboards/takashiski/otaku_split/rev0/keyboard.json b/keyboards/takashiski/otaku_split/rev0/keyboard.json
index e8e3b35d6233..193254aa1a63 100644
--- a/keyboards/takashiski/otaku_split/rev0/keyboard.json
+++ b/keyboards/takashiski/otaku_split/rev0/keyboard.json
@@ -29,7 +29,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/takashiski/otaku_split/rev1/keyboard.json b/keyboards/takashiski/otaku_split/rev1/keyboard.json
index d4195b5a9086..16f0cb8ccfcd 100644
--- a/keyboards/takashiski/otaku_split/rev1/keyboard.json
+++ b/keyboards/takashiski/otaku_split/rev1/keyboard.json
@@ -32,7 +32,9 @@
         "handedness": {
             "pin": "D2"
         },
-        "soft_serial_pin": "D0",
+        "serial": {
+            "pin": "D0"
+        },
         "matrix_pins": {
             "right": {
                 "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json
index c2a198835f41..9804559a2b63 100644
--- a/keyboards/tkw/grandiceps/info.json
+++ b/keyboards/tkw/grandiceps/info.json
@@ -52,7 +52,6 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "A15",
         "matrix_pins": {
             "right": {
                 "cols": ["B0", "A7", "A3", "A5", "A4", "A2"],
@@ -60,7 +59,8 @@
             }
         },
         "serial": {
-            "driver": "usart"
+            "driver": "usart",
+            "pin": "A15"
         }
     },
     "qmk": {
diff --git a/keyboards/tweetydabird/lotus58/elite_c/keyboard.json b/keyboards/tweetydabird/lotus58/elite_c/keyboard.json
index af1a9f913c5b..2a4c4a21bc9c 100644
--- a/keyboards/tweetydabird/lotus58/elite_c/keyboard.json
+++ b/keyboards/tweetydabird/lotus58/elite_c/keyboard.json
@@ -24,9 +24,11 @@
         "handedness": {
             "pin": "B5"
         },
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        }
     },
     "ws2812": {
         "pin": "D3"
-    },
+    }
 }
diff --git a/keyboards/tweetydabird/lotus58/nanoboot/keyboard.json b/keyboards/tweetydabird/lotus58/nanoboot/keyboard.json
index e7586e6f2f2e..85f37a265cd7 100644
--- a/keyboards/tweetydabird/lotus58/nanoboot/keyboard.json
+++ b/keyboards/tweetydabird/lotus58/nanoboot/keyboard.json
@@ -24,9 +24,11 @@
         "handedness": {
             "pin": "B5"
         },
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        }
     },
     "ws2812": {
         "pin": "D3"
-    },
+    }
 }
diff --git a/keyboards/tweetydabird/lotus58/promicro/keyboard.json b/keyboards/tweetydabird/lotus58/promicro/keyboard.json
index 62ee0355ef89..83532c8ee2ab 100644
--- a/keyboards/tweetydabird/lotus58/promicro/keyboard.json
+++ b/keyboards/tweetydabird/lotus58/promicro/keyboard.json
@@ -23,9 +23,11 @@
         "handedness": {
             "pin": "B5"
         },
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        }
     },
     "ws2812": {
         "pin": "D3"
-    },
+    }
 }
diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/keyboard.json b/keyboards/tweetydabird/lotus58/rp2040_ce/keyboard.json
index 24f27c276a64..07fb343974df 100644
--- a/keyboards/tweetydabird/lotus58/rp2040_ce/keyboard.json
+++ b/keyboards/tweetydabird/lotus58/rp2040_ce/keyboard.json
@@ -18,9 +18,9 @@
             }
         },
         "serial": {
-            "driver": "vendor"
+            "driver": "vendor",
+            "pin": "GP1"
         },
-        "soft_serial_pin": "GP1",
         "handedness": {
             "pin": "GP9"
         }
diff --git a/keyboards/tzarc/djinn/rev1/keyboard.json b/keyboards/tzarc/djinn/rev1/keyboard.json
index b6ee5acba1fc..8ae4f0c553df 100644
--- a/keyboards/tzarc/djinn/rev1/keyboard.json
+++ b/keyboards/tzarc/djinn/rev1/keyboard.json
@@ -6,10 +6,12 @@
     "max_brightness": 144
   },
   "split": {
-    "soft_serial_pin": "B9",
     "handedness": {
       "pin": "B11"
     },
+    "serial": {
+      "pin": "B9"
+    },
     "usb_detect": {
       "enabled": true
     }
diff --git a/keyboards/unikeyboard/diverge3/keyboard.json b/keyboards/unikeyboard/diverge3/keyboard.json
index 36f056187b84..767f44b198ba 100644
--- a/keyboards/unikeyboard/diverge3/keyboard.json
+++ b/keyboards/unikeyboard/diverge3/keyboard.json
@@ -35,7 +35,9 @@
   },
   "split": {
     "enabled": true,
-    "soft_serial_pin": "D0"
+    "serial": {
+      "pin": "D0"
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
diff --git a/keyboards/unikeyboard/divergetm2/keyboard.json b/keyboards/unikeyboard/divergetm2/keyboard.json
index b2db7a19db1e..09d481149c9c 100644
--- a/keyboards/unikeyboard/divergetm2/keyboard.json
+++ b/keyboards/unikeyboard/divergetm2/keyboard.json
@@ -29,7 +29,9 @@
     "diode_direction": "ROW2COL",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/uzu42/rev1/keyboard.json b/keyboards/uzu42/rev1/keyboard.json
index 71d9f424cc8b..f96327daead9 100644
--- a/keyboards/uzu42/rev1/keyboard.json
+++ b/keyboards/uzu42/rev1/keyboard.json
@@ -22,7 +22,9 @@
   "diode_direction": "COL2ROW",
   "split": {
     "enabled": true,
-    "soft_serial_pin": "D2"
+    "serial": {
+      "pin": "D2"
+    }
   },
   "ws2812": {
     "pin": "D3"
diff --git a/keyboards/vitamins_included/rev1/keyboard.json b/keyboards/vitamins_included/rev1/keyboard.json
index dc55407b6af0..309b065e1ba3 100644
--- a/keyboards/vitamins_included/rev1/keyboard.json
+++ b/keyboards/vitamins_included/rev1/keyboard.json
@@ -15,7 +15,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "rgblight": {
         "led_count": 16,
diff --git a/keyboards/vitamins_included/rev2/keyboard.json b/keyboards/vitamins_included/rev2/keyboard.json
index bead42525280..5a2898d85c2c 100644
--- a/keyboards/vitamins_included/rev2/keyboard.json
+++ b/keyboards/vitamins_included/rev2/keyboard.json
@@ -18,7 +18,9 @@
         "handedness": {
             "pin": "B4"
         },
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "rgblight": {
         "led_count": 12,
diff --git a/keyboards/waterfowl/keyboard.json b/keyboards/waterfowl/keyboard.json
index a17831304263..73f62a77eb3a 100644
--- a/keyboards/waterfowl/keyboard.json
+++ b/keyboards/waterfowl/keyboard.json
@@ -29,7 +29,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "transport": {
             "sync": {
                 "modifiers": true,
diff --git a/keyboards/xenon/keyboard.json b/keyboards/xenon/keyboard.json
index 7f78988525a0..0229f73ebd2f 100644
--- a/keyboards/xenon/keyboard.json
+++ b/keyboards/xenon/keyboard.json
@@ -35,7 +35,9 @@
   },
   "split": {
     "enabled": true,
-    "soft_serial_pin": "D2"
+    "serial": {
+      "pin": "D2"
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
diff --git a/keyboards/yoichiro/lunakey_mini/keyboard.json b/keyboards/yoichiro/lunakey_mini/keyboard.json
index e31f09c285e9..177b3afaa6a1 100644
--- a/keyboards/yoichiro/lunakey_mini/keyboard.json
+++ b/keyboards/yoichiro/lunakey_mini/keyboard.json
@@ -25,7 +25,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "rgblight": {
         "saturation_steps": 8,
diff --git a/keyboards/yosino58/rev1/keyboard.json b/keyboards/yosino58/rev1/keyboard.json
index 2e50450a272e..ffc1a5d8271f 100644
--- a/keyboards/yosino58/rev1/keyboard.json
+++ b/keyboards/yosino58/rev1/keyboard.json
@@ -15,7 +15,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "rgblight": {
         "led_count": 12
diff --git a/keyboards/yushakobo/ergo68/keyboard.json b/keyboards/yushakobo/ergo68/keyboard.json
index c4a143cb73c0..bc61e979b740 100644
--- a/keyboards/yushakobo/ergo68/keyboard.json
+++ b/keyboards/yushakobo/ergo68/keyboard.json
@@ -127,14 +127,16 @@
         "handedness": {
             "pin": "B6"
         },
+        "serial": {
+            "pin": "D0"
+        },
         "transport": {
             "sync": {
                 "indicators": true,
                 "layer_state": true,
                 "matrix_state": true
             }
-        },
-        "soft_serial_pin": "D0"
+        }
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/yushakobo/navpad/10_helix_r/keyboard.json b/keyboards/yushakobo/navpad/10_helix_r/keyboard.json
index 81854128da5d..e91f96f0ace8 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/keyboard.json
+++ b/keyboards/yushakobo/navpad/10_helix_r/keyboard.json
@@ -28,7 +28,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "encoder": {
             "right": {
                 "rotary": [
diff --git a/keyboards/zigotica/z34/keyboard.json b/keyboards/zigotica/z34/keyboard.json
index c08934360e4e..0a96fa00916b 100644
--- a/keyboards/zigotica/z34/keyboard.json
+++ b/keyboards/zigotica/z34/keyboard.json
@@ -32,7 +32,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "matrix_pins": {
             "right": {
                 "direct": [
diff --git a/keyboards/zvecr/split_blackpill/keyboard.json b/keyboards/zvecr/split_blackpill/keyboard.json
index f5bc458d73a6..d22914d3bd07 100644
--- a/keyboards/zvecr/split_blackpill/keyboard.json
+++ b/keyboards/zvecr/split_blackpill/keyboard.json
@@ -27,9 +27,9 @@
             "pin": "B3"
         },
         "serial": {
-            "driver": "usart"
+            "driver": "usart",
+            "pin": "B6"
         },
-        "soft_serial_pin": "B6",
         "bootmagic": {
             "matrix": [4, 0]
         },