10 files changed, 13 insertions, 5 deletions
diff --git a/keyboards/linworks/fave65h/config.h b/keyboards/linworks/fave65h/config.h
index 580504616a..2c8d4845b1 100644
--- a/keyboards/linworks/fave65h/config.h
+++ b/keyboards/linworks/fave65h/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Define RGB */
 #define RGBLED_NUM 67
 #define RGB_MATRIX_LED_COUNT 67
-#define RGB_DI_PIN B0
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/linworks/fave65h/info.json b/keyboards/linworks/fave65h/info.json
index ab777aa504..bc53e4cb0f 100644
--- a/keyboards/linworks/fave65h/info.json
+++ b/keyboards/linworks/fave65h/info.json
@@ -13,6 +13,9 @@
         "rows": ["D1", "D0", "D2", "D3", "D5"]
     },
     "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/linworks/fave84h/config.h b/keyboards/linworks/fave84h/config.h
index 516f30e96f..5ce329db0a 100644
--- a/keyboards/linworks/fave84h/config.h
+++ b/keyboards/linworks/fave84h/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGB_MATRIX_ENABLE
 
 #define RGB_MATRIX_LED_COUNT 126
-#define RGB_DI_PIN D2
 
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_KEYPRESSES 
diff --git a/keyboards/linworks/fave84h/info.json b/keyboards/linworks/fave84h/info.json
index 95df89fd4e..7d19a24cb1 100644
--- a/keyboards/linworks/fave84h/info.json
+++ b/keyboards/linworks/fave84h/info.json
@@ -15,6 +15,9 @@
         "rgb_matrix": true,
         "rgblight": false
     },
+    "ws2812": {
+        "pin": "D2"
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B0", "B7", "E6"],
         "rows": ["B1", "B2", "B3", "D3", "D1", "D0"]
diff --git a/keyboards/linworks/fave87/config.h b/keyboards/linworks/fave87/config.h
index b0d41d41df..fb227ca802 100644
--- a/keyboards/linworks/fave87/config.h
+++ b/keyboards/linworks/fave87/config.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define FORCE_NKRO
 
 /* Underglow */
-#define RGB_DI_PIN E2
 #define RGBLED_NUM 40
 #define RGBLIGHT_SLEEP // Turns LEDs off if the PC goes to sleep/shutdown
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/linworks/fave87/info.json b/keyboards/linworks/fave87/info.json
index 72649cc331..2694d09930 100644
--- a/keyboards/linworks/fave87/info.json
+++ b/keyboards/linworks/fave87/info.json
@@ -16,6 +16,9 @@
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["tkl_ansi", "tkl_iso"],
diff --git a/keyboards/linworks/fave87h/config.h b/keyboards/linworks/fave87h/config.h
index 8c842171fb..ef57446100 100644
--- a/keyboards/linworks/fave87h/config.h
+++ b/keyboards/linworks/fave87h/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Define RGB */
 #define RGBLED_NUM 87
 #define RGB_MATRIX_LED_COUNT 87
-#define RGB_DI_PIN D2
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/linworks/fave87h/info.json b/keyboards/linworks/fave87h/info.json
index ca4de53de9..e1d679d05c 100644
--- a/keyboards/linworks/fave87h/info.json
+++ b/keyboards/linworks/fave87h/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D2"
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B0", "B7", "E6"],
         "rows": ["B1", "B2", "B3", "D3", "D1", "D0"]
diff --git a/keyboards/linworks/whale75/config.h b/keyboards/linworks/whale75/config.h
index f6ba28fd80..66c5212371 100644
--- a/keyboards/linworks/whale75/config.h
+++ b/keyboards/linworks/whale75/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PWM_OUTPUT_FREQUENCY 1000 // Increases backlight PWM freq if compiled with an unmerged PR. Does no harm without it.
 
 /* Underglow */
-#define RGB_DI_PIN B9
 #define WS2812_EXTERNAL_PULLUP // This board uses a pull-up + 5 V tolerant GPIO in open drain config ro generate a 5 V signal
 #define RGBLED_NUM 18
 /* section for PWM WS2812 driver */
diff --git a/keyboards/linworks/whale75/info.json b/keyboards/linworks/whale75/info.json
index eae4cbea5d..c95cffb9c9 100644
--- a/keyboards/linworks/whale75/info.json
+++ b/keyboards/linworks/whale75/info.json
@@ -8,6 +8,7 @@
         "device_version": "0.0.1"
     },
     "ws2812": {
+        "pin": "B9",
         "driver": "pwm"
     },
     "matrix_pins": {