16 files changed, 10 insertions, 9 deletions
diff --git a/keyboards/yandrstudio/buff67v3/config.h b/keyboards/yandrstudio/buff67v3/config.h
index 22610f4518..677e41a00d 100644
--- a/keyboards/yandrstudio/buff67v3/config.h
+++ b/keyboards/yandrstudio/buff67v3/config.h
@@ -17,7 +17,6 @@
 
 #ifdef RGBLIGHT_ENABLE
 
-#    define RGB_DI_PIN B4
 #    define RGBLED_NUM 1
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/yandrstudio/buff67v3/info.json b/keyboards/yandrstudio/buff67v3/info.json
index e426da7dcf..34702641a8 100644
--- a/keyboards/yandrstudio/buff67v3/info.json
+++ b/keyboards/yandrstudio/buff67v3/info.json
@@ -7,6 +7,7 @@
         "device_version": "1.0.0"
     },
     "ws2812": {
+        "pin": "B4",
         "driver": "pwm"
     },
     "matrix_pins": {
diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h
index 878ac47bbc..110f0d096c 100644
--- a/keyboards/yandrstudio/eau_r2/config.h
+++ b/keyboards/yandrstudio/eau_r2/config.h
@@ -17,7 +17,6 @@
 
 #ifdef RGBLIGHT_ENABLE
 
-#    define RGB_DI_PIN A8
 #    define RGBLED_NUM 12
 #    define RGBLIGHT_SLEEP
 #    define RGBLIGHT_VAL_STEP 5
diff --git a/keyboards/yandrstudio/eau_r2/info.json b/keyboards/yandrstudio/eau_r2/info.json
index 4865cecb0b..bdf9be5f1e 100644
--- a/keyboards/yandrstudio/eau_r2/info.json
+++ b/keyboards/yandrstudio/eau_r2/info.json
@@ -11,6 +11,9 @@
         "rows": ["A3", "B9", "B8", "A4", "C14", "C13"]
     },
     "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "A8"
+    },
     "debounce": 8,
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/yandrstudio/nightstar75/config.h b/keyboards/yandrstudio/nightstar75/config.h
index 0c091e17af..573fa12151 100644
--- a/keyboards/yandrstudio/nightstar75/config.h
+++ b/keyboards/yandrstudio/nightstar75/config.h
@@ -17,7 +17,6 @@
 
 #ifdef RGBLIGHT_ENABLE
 
-#    define RGB_DI_PIN A7
 #    define RGBLED_NUM 4
 #    define RGBLIGHT_LIMIT_VAL 180
 
diff --git a/keyboards/yandrstudio/nightstar75/info.json b/keyboards/yandrstudio/nightstar75/info.json
index c050822531..899e4a7576 100644
--- a/keyboards/yandrstudio/nightstar75/info.json
+++ b/keyboards/yandrstudio/nightstar75/info.json
@@ -7,6 +7,7 @@
         "device_version": "1.0.0"
     },
     "ws2812": {
+        "pin": "A7",
         "driver": "pwm"
     },
     "matrix_pins": {
diff --git a/keyboards/yandrstudio/nz64/config.h b/keyboards/yandrstudio/nz64/config.h
index b3bb28e7ae..5e4cdaaea0 100644
--- a/keyboards/yandrstudio/nz64/config.h
+++ b/keyboards/yandrstudio/nz64/config.h
@@ -20,7 +20,6 @@
 
 /* RGB Matrix */
 #ifdef RGB_MATRIX_ENABLE
-#   define RGB_DI_PIN A7
 #   define RGBLED_NUM 82
 #   define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
@@ -88,7 +87,6 @@
 
 
 #ifdef RGBLIGHT_ENABLE
-#   define RGB_DI_PIN A7
 #   define RGBLED_NUM 82
 #   define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
diff --git a/keyboards/yandrstudio/nz64/info.json b/keyboards/yandrstudio/nz64/info.json
index ff5ad4d5a0..9ae46559d5 100644
--- a/keyboards/yandrstudio/nz64/info.json
+++ b/keyboards/yandrstudio/nz64/info.json
@@ -5,6 +5,7 @@
         "device_version": "1.0.0"
     },
     "ws2812": {
+        "pin": "A7",
         "driver": "pwm"
     },
     "matrix_pins": {
diff --git a/keyboards/yandrstudio/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h
index 9a23a64ae2..860ee45381 100644
--- a/keyboards/yandrstudio/nz67v2/config.h
+++ b/keyboards/yandrstudio/nz67v2/config.h
@@ -21,7 +21,6 @@
 /* RGB Matrix */
 #ifdef RGB_MATRIX_ENABLE
 
-#    define RGB_DI_PIN B5
 #    define RGBLED_NUM 86
 #    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
diff --git a/keyboards/yandrstudio/nz67v2/info.json b/keyboards/yandrstudio/nz67v2/info.json
index 02e40aefe6..b9355552d6 100644
--- a/keyboards/yandrstudio/nz67v2/info.json
+++ b/keyboards/yandrstudio/nz67v2/info.json
@@ -7,6 +7,7 @@
         "device_version": "1.0.0"
     },
     "ws2812": {
+        "pin": "B5",
         "driver": "pwm"
     },
     "matrix_pins": {
diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h
index 84c1c2ae8f..373b5bcbf9 100644
--- a/keyboards/yandrstudio/tg67/config.h
+++ b/keyboards/yandrstudio/tg67/config.h
@@ -18,7 +18,6 @@
 /* RGB Matrix */
 #ifdef RGB_MATRIX_ENABLE
 
-#    define RGB_DI_PIN A7
 #    define RGBLED_NUM 69
 #    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
diff --git a/keyboards/yandrstudio/tg67/info.json b/keyboards/yandrstudio/tg67/info.json
index b18af48c53..677746d82e 100644
--- a/keyboards/yandrstudio/tg67/info.json
+++ b/keyboards/yandrstudio/tg67/info.json
@@ -7,6 +7,7 @@
         "device_version": "1.0.0"
     },
     "ws2812": {
+        "pin": "A7",
         "driver": "pwm"
     },
     "matrix_pins": {
diff --git a/keyboards/yandrstudio/yr6095/config.h b/keyboards/yandrstudio/yr6095/config.h
index 46c0d6005d..74c8f4adce 100644
--- a/keyboards/yandrstudio/yr6095/config.h
+++ b/keyboards/yandrstudio/yr6095/config.h
@@ -17,7 +17,6 @@
 
 #ifdef RGBLIGHT_ENABLE
 
-#    define RGB_DI_PIN B5
 #    define RGBLED_NUM 1
 
 #    define RGBLIGHT_LAYERS
diff --git a/keyboards/yandrstudio/yr6095/info.json b/keyboards/yandrstudio/yr6095/info.json
index ebf3bf70e6..023f71fc14 100644
--- a/keyboards/yandrstudio/yr6095/info.json
+++ b/keyboards/yandrstudio/yr6095/info.json
@@ -7,6 +7,7 @@
         "device_version": "1.0.0"
     },
     "ws2812": {
+        "pin": "B5",
         "driver": "pwm"
     },
     "matrix_pins": {
diff --git a/keyboards/yandrstudio/yr80/config.h b/keyboards/yandrstudio/yr80/config.h
index b5f122fdc8..0e8602dee9 100644
--- a/keyboards/yandrstudio/yr80/config.h
+++ b/keyboards/yandrstudio/yr80/config.h
@@ -18,7 +18,6 @@
 
 #ifdef RGBLIGHT_ENABLE
 
-#    define RGB_DI_PIN A7
 #    define RGBLED_NUM 1
 #    define DRIVER_LED_TOTAL RGBLED_NUM
 
diff --git a/keyboards/yandrstudio/yr80/info.json b/keyboards/yandrstudio/yr80/info.json
index 50b381885e..6d15acd3be 100644
--- a/keyboards/yandrstudio/yr80/info.json
+++ b/keyboards/yandrstudio/yr80/info.json
@@ -7,6 +7,7 @@
         "device_version": "1.0.0"
     },
     "ws2812": {
+        "pin": "A7",
         "driver": "pwm"
     },
     "diode_direction": "COL2ROW",