14 files changed, 22 insertions, 10 deletions
diff --git a/keyboards/kingly_keys/ave/config.h b/keyboards/kingly_keys/ave/config.h
index 22a7e65e04..af9ffae03d 100644
--- a/keyboards/kingly_keys/ave/config.h
+++ b/keyboards/kingly_keys/ave/config.h
@@ -17,7 +17,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN B7
 #if defined(RGBLIGHT_ENABLE)
 #    define RGBLED_NUM 2
 #    define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kingly_keys/ave/ortho/info.json b/keyboards/kingly_keys/ave/ortho/info.json
index 6950a84a44..0de5b82bdd 100644
--- a/keyboards/kingly_keys/ave/ortho/info.json
+++ b/keyboards/kingly_keys/ave/ortho/info.json
@@ -18,6 +18,9 @@
       {"pin_a": "B2", "pin_b": "B1"}
     ]
   },
+  "ws2812": {
+    "pin": "B7"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/kingly_keys/ave/staggered/info.json b/keyboards/kingly_keys/ave/staggered/info.json
index 4b2c92fd86..b975a4aa68 100644
--- a/keyboards/kingly_keys/ave/staggered/info.json
+++ b/keyboards/kingly_keys/ave/staggered/info.json
@@ -18,6 +18,9 @@
         {"pin_a": "B2", "pin_b": "B1"}
      ]
   },
+  "ws2812": {
+     "pin": "B7"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/kingly_keys/little_foot/config.h b/keyboards/kingly_keys/little_foot/config.h
index dea4456dd4..719f192955 100644
--- a/keyboards/kingly_keys/little_foot/config.h
+++ b/keyboards/kingly_keys/little_foot/config.h
@@ -25,7 +25,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN F4
 #define RGBLED_NUM 10    // Number of LEDs
 
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kingly_keys/little_foot/info.json b/keyboards/kingly_keys/little_foot/info.json
index d2206c066c..3b23bead52 100644
--- a/keyboards/kingly_keys/little_foot/info.json
+++ b/keyboards/kingly_keys/little_foot/info.json
@@ -8,6 +8,9 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "F4"
+  },
   "matrix_pins": {
     "cols": ["F5", "F7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"],
     "rows": ["F6", "B6", "B2", "B3", "B1"]
diff --git a/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h b/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h
index a8da1ae072..c2bd34ed27 100644
--- a/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h
+++ b/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h
@@ -1,7 +1,7 @@
 #undef RGBLED_NUM
 #define RGBLED_NUM 16
 
-#define RGB_DI_PIN F4
+#define WS2812_DI_PIN F4
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kingly_keys/romac_plus/config.h b/keyboards/kingly_keys/romac_plus/config.h
index 21095a7358..2d715dbe51 100644
--- a/keyboards/kingly_keys/romac_plus/config.h
+++ b/keyboards/kingly_keys/romac_plus/config.h
@@ -7,7 +7,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN F7
 #define RGBLED_NUM 4    // Number of LEDs
 
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kingly_keys/romac_plus/info.json b/keyboards/kingly_keys/romac_plus/info.json
index abaf8e99f4..96c097db5f 100644
--- a/keyboards/kingly_keys/romac_plus/info.json
+++ b/keyboards/kingly_keys/romac_plus/info.json
@@ -18,6 +18,9 @@
       {"pin_a": "B3", "pin_b": "B2"}
     ]
   },
+  "ws2812": {
+    "pin": "F7"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/kingly_keys/ropro/config.h b/keyboards/kingly_keys/ropro/config.h
index 67ac57d54c..3dba502238 100644
--- a/keyboards/kingly_keys/ropro/config.h
+++ b/keyboards/kingly_keys/ropro/config.h
@@ -22,9 +22,6 @@
  /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED --- DIN Pin Routed to VIA on main PCB marked "RGB" */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 18
 
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kingly_keys/ropro/info.json b/keyboards/kingly_keys/ropro/info.json
index 2afcd7dc59..51db685d50 100644
--- a/keyboards/kingly_keys/ropro/info.json
+++ b/keyboards/kingly_keys/ropro/info.json
@@ -18,6 +18,9 @@
       {"pin_a": "B7", "pin_b": "D5"}
     ]
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/kingly_keys/smd_milk/config.h b/keyboards/kingly_keys/smd_milk/config.h
index ada89746af..3982ef54e6 100644
--- a/keyboards/kingly_keys/smd_milk/config.h
+++ b/keyboards/kingly_keys/smd_milk/config.h
@@ -24,7 +24,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN B3
 #define RGBLED_NUM 4  // Number of LEDs
 
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kingly_keys/smd_milk/info.json b/keyboards/kingly_keys/smd_milk/info.json
index bf84afdccc..2fee4b2603 100644
--- a/keyboards/kingly_keys/smd_milk/info.json
+++ b/keyboards/kingly_keys/smd_milk/info.json
@@ -8,6 +8,9 @@
     "pid": "0xB195",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B3"
+  },
   "matrix_pins": {
     "cols": ["D3"],
     "rows": ["C5", "D2"]
diff --git a/keyboards/kingly_keys/soap/config.h b/keyboards/kingly_keys/soap/config.h
index ef8911b082..682f1a7531 100644
--- a/keyboards/kingly_keys/soap/config.h
+++ b/keyboards/kingly_keys/soap/config.h
@@ -20,8 +20,6 @@
  /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED --- DIN Pin Routed to VIA on main PCB marked "RGB" */
-#define RGB_DI_PIN B6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kingly_keys/soap/info.json b/keyboards/kingly_keys/soap/info.json
index 61deb7d6e0..b10260aa0b 100644
--- a/keyboards/kingly_keys/soap/info.json
+++ b/keyboards/kingly_keys/soap/info.json
@@ -8,6 +8,9 @@
     "pid": "0x0003",
     "device_version": "0.0.4"
   },
+  "ws2812": {
+    "pin": "B6"
+  },
   "matrix_pins": {
     "cols": ["F4", "F1", "F0", "D5"],
     "rows": ["C7", "C6"]