Move `RGB_MATRIX_DRIVER` to data driven (#20350)

34 files changed, 51 insertions, 17 deletions

diff --git a/keyboards/kprepublic/bm40hsrgb/info.json b/keyboards/kprepublic/bm40hsrgb/info.json
index 02c02cf6a5..cf58efba9f 100644
--- a/keyboards/kprepublic/bm40hsrgb/info.json
+++ b/keyboards/kprepublic/bm40hsrgb/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "E2"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "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/bm40hsrgb/rules.mk b/keyboards/kprepublic/bm40hsrgb/rules.mk
index 9690e3e495..7e0de4a3e8 100755
--- a/keyboards/kprepublic/bm40hsrgb/rules.mk
+++ b/keyboards/kprepublic/bm40hsrgb/rules.mk
@@ -10,6 +10,5 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 LAYOUTS_HAS_RGB = yes
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/info.json b/keyboards/kprepublic/bm60hsrgb/rev1/info.json
index 5b28d04f14..a7a93f60bf 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "E2"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "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/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk
index cb6e15ad0a..4e7e766dda 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no            # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
index 4c0f4e11af..8ef6f2598c 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "F0"
     },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
     "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/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
index d1baac82c4..534a21dbf3 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 NO_USB_STARTUP_CHECK = no
 LTO_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = custom
 WS2812_DRIVER_REQUIRED = yes
 
 COMMON_VPATH += $(DRIVER_PATH)/led/issi
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
index 4554cd6bf8..5db6750d85 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "E2"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "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/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk
index 8164eaacdb..6cd530668c 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no            # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
 ENCODER_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
index 4dadcc450c..dde62eea4c 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "F0"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
     "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/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk
index 858a74bdf0..a4b968313c 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 ENCODER_ENABLE = yes
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
index 5511d3d00b..0148d1ef53 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "E2"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "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/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk
index 0459a2ad6b..bb8155a9b8 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
index 9699a7d3c3..4fd7bc002a 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "F0"
     },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
     "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/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk
index fde42415fe..b6b9ff1110 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk
@@ -18,7 +18,6 @@ RGB_MATRIX_ENABLE = yes
 # The custom RGB Matrix driver combines IS31FL3733 and WS2812; things that are
 # normally done by common_features.mk for both of these drivers need to be done
 # here manually.
-RGB_MATRIX_DRIVER = custom
 COMMON_VPATH += $(DRIVER_PATH)/led/issi
 SRC += is31fl3733.c
 QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
index 230f141f22..cc41dbe8bd 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "E2"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "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/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk
index a1fe09e1fd..7b60a21412 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
index 4320fb9295..a85b20cd5f 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "F0"
     },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
     "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/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk
index 98b66d638e..5db18e7cfa 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk
@@ -17,7 +17,6 @@ RGB_MATRIX_ENABLE = yes
 # The custom RGB Matrix driver combines IS31FL3733 and WS2812; things that are
 # normally done by common_features.mk for both of these drivers need to be done
 # here manually.
-RGB_MATRIX_DRIVER = custom
 COMMON_VPATH += $(DRIVER_PATH)/led/issi
 SRC += is31fl3733.c
 QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/info.json b/keyboards/kprepublic/bm65hsrgb/rev1/info.json
index c5f617d281..d88f3b8177 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "E2"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "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/rev1/rules.mk b/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk
index bd6310d859..5bdc9f5d4a 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
index 97b0acfbd4..dc5c2235a8 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "E2"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "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/rules.mk b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk
index bd6310d859..5bdc9f5d4a 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/info.json b/keyboards/kprepublic/bm68hsrgb/rev1/info.json
index 3a1c8ff16c..a965121f64 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "E2"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "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/rules.mk b/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk
index bd6310d859..5bdc9f5d4a 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/info.json b/keyboards/kprepublic/bm68hsrgb/rev2/info.json
index 9f2cc9266d..7e4623804b 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "E2"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
     "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/bm68hsrgb/rev2/rules.mk b/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk
index 9072e268b9..0dba15144c 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3741
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm80hsrgb/info.json b/keyboards/kprepublic/bm80hsrgb/info.json
index 93ca1c86d8..d3989e3615 100644
--- a/keyboards/kprepublic/bm80hsrgb/info.json
+++ b/keyboards/kprepublic/bm80hsrgb/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "E2"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "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/bm80hsrgb/rules.mk b/keyboards/kprepublic/bm80hsrgb/rules.mk
index bd6310d859..5bdc9f5d4a 100644
--- a/keyboards/kprepublic/bm80hsrgb/rules.mk
+++ b/keyboards/kprepublic/bm80hsrgb/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm80v2/info.json b/keyboards/kprepublic/bm80v2/info.json
index 08c71f20c0..cbad2ee816 100644
--- a/keyboards/kprepublic/bm80v2/info.json
+++ b/keyboards/kprepublic/bm80v2/info.json
@@ -8,6 +8,9 @@
         "pid": "0x1141",
         "device_version": "0.0.2"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
     "matrix_pins": {
         "cols": ["E6", "F0", "F1", "F4", "D7", "D6", "B7", "B1", "B0", "B2", "B3", "D3", "D5", "D4", "D2", "B4", "B5"],
         "rows": ["C7", "C6", "B6", "F5", "F7", "F6"]
diff --git a/keyboards/kprepublic/bm80v2/rules.mk b/keyboards/kprepublic/bm80v2/rules.mk
index 0288e3a9b0..ab9a06f5b2 100644
--- a/keyboards/kprepublic/bm80v2/rules.mk
+++ b/keyboards/kprepublic/bm80v2/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm80v2_iso/info.json b/keyboards/kprepublic/bm80v2_iso/info.json
index 3811a88e74..064af02128 100644
--- a/keyboards/kprepublic/bm80v2_iso/info.json
+++ b/keyboards/kprepublic/bm80v2_iso/info.json
@@ -8,6 +8,9 @@
         "pid": "0x1142",
         "device_version": "0.0.2"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
     "matrix_pins": {
         "cols": ["E6", "F0", "F1", "F4", "D7", "D6", "B7", "B1", "B0", "B2", "B3", "D3", "D5", "D4", "D2", "B4", "B5"],
         "rows": ["C7", "C6", "B6", "F5", "F7", "F6"]
diff --git a/keyboards/kprepublic/bm80v2_iso/rules.mk b/keyboards/kprepublic/bm80v2_iso/rules.mk
index dfbbfb974d..e74a388dc0 100644
--- a/keyboards/kprepublic/bm80v2_iso/rules.mk
+++ b/keyboards/kprepublic/bm80v2_iso/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 RGB_MATRIX_ENABLE = yes         # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm980hsrgb/info.json b/keyboards/kprepublic/bm980hsrgb/info.json
index 7993c49e30..46ab7e42aa 100644
--- a/keyboards/kprepublic/bm980hsrgb/info.json
+++ b/keyboards/kprepublic/bm980hsrgb/info.json
@@ -8,6 +8,9 @@
         "pid": "0xEF61",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "E6", "F0", "F1", "F4", "F5", "D6"],
         "rows": ["D4", "B6", "B5", "B4", "F7", "F6", "D7"]
diff --git a/keyboards/kprepublic/bm980hsrgb/rules.mk b/keyboards/kprepublic/bm980hsrgb/rules.mk
index 41d2efeaa8..84a2d5cbe6 100644
--- a/keyboards/kprepublic/bm980hsrgb/rules.mk
+++ b/keyboards/kprepublic/bm980hsrgb/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 LTO_ENABLE = yes