Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303)

42 files changed, 61 insertions, 25 deletions

diff --git a/keyboards/kprepublic/bm16a/v1/info.json b/keyboards/kprepublic/bm16a/v1/info.json
index 6c700b37b8..9e99832b3e 100644
--- a/keyboards/kprepublic/bm16a/v1/info.json
+++ b/keyboards/kprepublic/bm16a/v1/info.json
@@ -31,7 +31,6 @@
         "levels": 5
     },
     "rgblight": {
-        "pin": "E2",
         "led_count": 4,
         "animations": {
             "breathing": true,
@@ -46,6 +45,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "community_layouts": ["ortho_4x4"],
     "layouts": {
         "LAYOUT_ortho_4x4": {
diff --git a/keyboards/kprepublic/bm16a/v2/config.h b/keyboards/kprepublic/bm16a/v2/config.h
index f4ac9e7a3b..4f8f76b6b8 100644
--- a/keyboards/kprepublic/bm16a/v2/config.h
+++ b/keyboards/kprepublic/bm16a/v2/config.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN B9
 #define RGB_MATRIX_LED_COUNT 16
 
 #define WS2812_PWM_DRIVER PWMD4
diff --git a/keyboards/kprepublic/bm16a/v2/info.json b/keyboards/kprepublic/bm16a/v2/info.json
index 927601c448..60d5034931 100644
--- a/keyboards/kprepublic/bm16a/v2/info.json
+++ b/keyboards/kprepublic/bm16a/v2/info.json
@@ -14,6 +14,7 @@
         "rgb_matrix": true
     },
     "ws2812": {
+        "pin": "B9",
         "driver": "pwm"
     },
     "matrix_pins": {
diff --git a/keyboards/kprepublic/bm16s/config.h b/keyboards/kprepublic/bm16s/config.h
index 26be1e8187..fb73fedb04 100755
--- a/keyboards/kprepublic/bm16s/config.h
+++ b/keyboards/kprepublic/bm16s/config.h
@@ -6,7 +6,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E2
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kprepublic/bm16s/info.json b/keyboards/kprepublic/bm16s/info.json
index 40d24a05d8..262ce39fba 100644
--- a/keyboards/kprepublic/bm16s/info.json
+++ b/keyboards/kprepublic/bm16s/info.json
@@ -8,6 +8,9 @@
       "pid": "0x016B",
       "device_version": "0.0.1"
     },
+    "ws2812": {
+      "pin": "E2"
+    },
     "matrix_pins": {
       "cols": ["F7", "F6", "D4", "D6"],
       "rows": ["D1", "D0", "D3", "D2"]
diff --git a/keyboards/kprepublic/bm40hsrgb/config.h b/keyboards/kprepublic/bm40hsrgb/config.h
index 60324e48b1..f6b358d2bb 100755
--- a/keyboards/kprepublic/bm40hsrgb/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/config.h
@@ -21,7 +21,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 53
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #    define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
diff --git a/keyboards/kprepublic/bm40hsrgb/info.json b/keyboards/kprepublic/bm40hsrgb/info.json
index 68a9803759..02c02cf6a5 100644
--- a/keyboards/kprepublic/bm40hsrgb/info.json
+++ b/keyboards/kprepublic/bm40hsrgb/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3430",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "matrix_pins": {
         "cols": ["B6", "C6", "B4", "D7", "D4", "D6", "C7", "F6", "F5", "F4", "F1", "F0"],
         "rows": ["B3", "B2", "E6", "B5"]
diff --git a/keyboards/kprepublic/bm43a/config.h b/keyboards/kprepublic/bm43a/config.h
index fc549b862d..d48bc690b1 100644
--- a/keyboards/kprepublic/bm43a/config.h
+++ b/keyboards/kprepublic/bm43a/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN E2
     #define RGBLED_NUM 10
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/kprepublic/bm43a/info.json b/keyboards/kprepublic/bm43a/info.json
index 9bb98c34ab..60d6373b30 100644
--- a/keyboards/kprepublic/bm43a/info.json
+++ b/keyboards/kprepublic/bm43a/info.json
@@ -17,6 +17,9 @@
         "pin": "B7",
         "levels": 5
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kprepublic/bm43hsrgb/config.h b/keyboards/kprepublic/bm43hsrgb/config.h
index 151488c516..3e8def8541 100755
--- a/keyboards/kprepublic/bm43hsrgb/config.h
+++ b/keyboards/kprepublic/bm43hsrgb/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN E2
     #define RGBLED_NUM 53
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/kprepublic/bm43hsrgb/info.json b/keyboards/kprepublic/bm43hsrgb/info.json
index c9f0fd458a..5e2fb50983 100755
--- a/keyboards/kprepublic/bm43hsrgb/info.json
+++ b/keyboards/kprepublic/bm43hsrgb/info.json
@@ -8,6 +8,9 @@
         "pid": "0x6061",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "matrix_pins": {
         "cols": ["C6", "D2", "D1", "D0", "D7", "D6", "D4", "D5", "D3", "B7", "B3", "B2"],
         "rows": ["E6", "B6", "B4", "B5"]
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/config.h b/keyboards/kprepublic/bm60hsrgb/rev1/config.h
index df94a6d357..8f4ab997f4 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 69
 #    define RGBLED_NUM 69
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/info.json b/keyboards/kprepublic/bm60hsrgb/rev1/info.json
index 4df7872080..5b28d04f14 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0xEF8C",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
         "rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
index bc48c2ec34..dcb7dfcd00 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
@@ -18,7 +18,6 @@
 //rgb light setting
 #define RGBLIGHT_LIMIT_VAL 150
 #define RGBLED_NUM          6
-#define RGB_DI_PIN          F0
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
index 9fe0adf4f4..4c0f4e11af 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
@@ -8,6 +8,9 @@
         "pid": "0x1121",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
     "matrix_pins": {
         "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
         "rows": ["E6", "D2", "D3", "D5", "F6"]
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
index bf7208c547..a11d579239 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 69
     #define RGBLED_NUM 69
     #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
index e90e82c48d..4554cd6bf8 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0xEF9C",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
         "rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
index c7426a407a..eada5a6c85 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
@@ -18,7 +18,6 @@
 //rgb light setting
 #define RGBLIGHT_LIMIT_VAL 150
 #define RGBLED_NUM          6
-#define RGB_DI_PIN          F0
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
index 579048eb09..4dadcc450c 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
@@ -8,6 +8,9 @@
         "pid": "0x1124",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
     "matrix_pins": {
         "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
         "rows": ["E6", "D2", "D3", "D5", "F6"]
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
index bbfeb14e39..62008d679a 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 70
 #    define RGBLED_NUM 70
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
index ab1e8a496b..5511d3d00b 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0xEF8C",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
         "rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
index c1beccdeab..29e89da4d4 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
@@ -20,7 +20,6 @@
 //rgb light setting
 #define RGBLIGHT_LIMIT_VAL 150
 #define RGBLED_NUM          6
-#define RGB_DI_PIN          F0
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
index 4433cc0cc8..9699a7d3c3 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
@@ -8,6 +8,9 @@
         "pid": "0x1123",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
     "matrix_pins": {
         "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
         "rows": ["E6", "D2", "D3", "D5", "F6"]
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
index 5382f10e8c..a831ee9a7d 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 67
     #define RGBLED_NUM 67
     #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
index 2714ccd654..230f141f22 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0xEF8D",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
         "rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
index 9a43993d23..ce593d1605 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
@@ -18,7 +18,6 @@
 //rgb light setting
 #define RGBLIGHT_LIMIT_VAL 150
 #define RGBLED_NUM          6
-#define RGB_DI_PIN          F0
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
index 9e99df16ad..4320fb9295 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
@@ -8,6 +8,9 @@
         "pid": "0x1122",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
     "matrix_pins": {
         "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
         "rows": ["E6", "D2", "D3", "D5", "F6"]
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/config.h b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
index 9bd8375e25..e2522723fc 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN E2
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT 73
     #define RGBLED_NUM 73
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/info.json b/keyboards/kprepublic/bm65hsrgb/rev1/info.json
index ff1251cd5d..c5f617d281 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0xEF6E",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
         "rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
index 501e7d6a52..5fb9ee0e98 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Force NKRO */
 #define FORCE_NKRO
 
-#define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 74
     #define RGBLED_NUM 74
     #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
index 89946b8f2a..97b0acfbd4 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0653",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
         "rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/config.h
index ee7d425a76..c7b27fab46 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN E2
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT 74
 #    define RGBLED_NUM 74
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/info.json b/keyboards/kprepublic/bm68hsrgb/rev1/info.json
index 35d2b1b6bf..3a1c8ff16c 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0xEF6F",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
         "rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/config.h b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
index 3f1d379135..2810b2096e 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
@@ -20,7 +20,6 @@
 
 #define RGBLIGHT_LIMIT_VAL 150
 #define RGBLED_NUM          6
-#define RGB_DI_PIN          E2
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/info.json b/keyboards/kprepublic/bm68hsrgb/rev2/info.json
index a8a2679ae3..9f2cc9266d 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/info.json
@@ -8,6 +8,9 @@
         "pid": "0x1131",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "B0", "B1", "B2", "B3", "E6", "B7", "D2", "D7", "B4", "B5", "B6", "C6", "C7"],
         "rows": ["D6", "D4", "D5", "D3", "F6"]
diff --git a/keyboards/kprepublic/bm80hsrgb/config.h b/keyboards/kprepublic/bm80hsrgb/config.h
index 8ae02d0c63..a9ba033fb0 100644
--- a/keyboards/kprepublic/bm80hsrgb/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN E2
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT 87
 
diff --git a/keyboards/kprepublic/bm80hsrgb/info.json b/keyboards/kprepublic/bm80hsrgb/info.json
index fa9b724724..93ca1c86d8 100644
--- a/keyboards/kprepublic/bm80hsrgb/info.json
+++ b/keyboards/kprepublic/bm80hsrgb/info.json
@@ -8,6 +8,9 @@
         "pid": "0xEF83",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "D7", "D6", "D4", "D5", "D3", "D2", "F5", "F6", "F7", "D1", "D0", "B4", "B5", "B6"],
         "rows": ["B3", "B2", "B1", "B0", "C6", "C7"]
diff --git a/keyboards/kprepublic/bm980hsrgb/config.h b/keyboards/kprepublic/bm980hsrgb/config.h
index fa4093651f..7ecc626803 100644
--- a/keyboards/kprepublic/bm980hsrgb/config.h
+++ b/keyboards/kprepublic/bm980hsrgb/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN B0
-
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT  98
 #    define RGBLED_NUM 98
diff --git a/keyboards/kprepublic/bm980hsrgb/info.json b/keyboards/kprepublic/bm980hsrgb/info.json
index 3856b0b681..7993c49e30 100644
--- a/keyboards/kprepublic/bm980hsrgb/info.json
+++ b/keyboards/kprepublic/bm980hsrgb/info.json
@@ -19,6 +19,9 @@
         "scroll_lock": "E2",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "B0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kprepublic/cospad/config.h b/keyboards/kprepublic/cospad/config.h
index 250391e5e0..f6154f76d4 100644
--- a/keyboards/kprepublic/cospad/config.h
+++ b/keyboards/kprepublic/cospad/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN F6
     #define RGBLED_NUM 4
 //   #define RGBLIGHT_HUE_STEP 8
 //   #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/kprepublic/cospad/info.json b/keyboards/kprepublic/cospad/info.json
index 1e93359aac..1814b50464 100644
--- a/keyboards/kprepublic/cospad/info.json
+++ b/keyboards/kprepublic/cospad/info.json
@@ -17,6 +17,9 @@
         "pin": "F7",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "indicators": {
         "num_lock": "B2",
         "on_state": 0
diff --git a/keyboards/kprepublic/jj50/config.h b/keyboards/kprepublic/jj50/config.h
index 0b5a4ea80e..3220fd6477 100644
--- a/keyboards/kprepublic/jj50/config.h
+++ b/keyboards/kprepublic/jj50/config.h
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN E2
 #define RGBLED_NUM 12
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD