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

20 files changed, 30 insertions, 12 deletions

diff --git a/keyboards/xiudi/xd002/config.h b/keyboards/xiudi/xd002/config.h
index 19f01664b2..d442ee5762 100644
--- a/keyboards/xiudi/xd002/config.h
+++ b/keyboards/xiudi/xd002/config.h
@@ -16,7 +16,6 @@
 #pragma once
 
 #define RGBLED_NUM 2
-#define RGB_DI_PIN B2
 
 // Save as much space as we can...
 #define LAYER_STATE_8BIT
diff --git a/keyboards/xiudi/xd002/info.json b/keyboards/xiudi/xd002/info.json
index c160af5f85..c36199e06e 100644
--- a/keyboards/xiudi/xd002/info.json
+++ b/keyboards/xiudi/xd002/info.json
@@ -8,6 +8,9 @@
     "pid": "0x0202",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B2"
+  },
   "matrix_pins": {
     "direct": [
       ["B0", "B1"]
diff --git a/keyboards/xiudi/xd004/info.json b/keyboards/xiudi/xd004/info.json
index a404780eea..8be0117d40 100644
--- a/keyboards/xiudi/xd004/info.json
+++ b/keyboards/xiudi/xd004/info.json
@@ -11,6 +11,9 @@
         "pin": "D5",
         "levels": 6
     },
+    "ws2812": {
+        "pin": "C6"
+    },
     "processor": "atmega16u2",
     "bootloader": "atmel-dfu",
     "matrix_pins": {
diff --git a/keyboards/xiudi/xd004/v1/config.h b/keyboards/xiudi/xd004/v1/config.h
index 1e747adeaf..823ba86358 100644
--- a/keyboards/xiudi/xd004/v1/config.h
+++ b/keyboards/xiudi/xd004/v1/config.h
@@ -28,7 +28,6 @@ This will not be used, as RGBLIGHT_ENABLE is set to 'no' in rules.mk
 We do not have enough space in the flash for this at the moment, maybe
 further optimizations can be done on that side.
 */
-#define RGB_DI_PIN C6
 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
 #define RGBLED_NUM 2
diff --git a/keyboards/xiudi/xd60/rev2/config.h b/keyboards/xiudi/xd60/rev2/config.h
index adf33530e8..21efad0d81 100644
--- a/keyboards/xiudi/xd60/rev2/config.h
+++ b/keyboards/xiudi/xd60/rev2/config.h
@@ -18,9 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 /* RGB Underglow
- * F6 PIN for XD60v2 that has pre-soldered WS2812 LEDs
  */
-#define RGB_DI_PIN F6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/xiudi/xd60/rev2/info.json b/keyboards/xiudi/xd60/rev2/info.json
index eaf7f9f7e4..c45ef7af64 100644
--- a/keyboards/xiudi/xd60/rev2/info.json
+++ b/keyboards/xiudi/xd60/rev2/info.json
@@ -13,6 +13,9 @@
         "levels": 6,
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/xiudi/xd60/rev3/config.h b/keyboards/xiudi/xd60/rev3/config.h
index cb3c91b202..f8845d411f 100644
--- a/keyboards/xiudi/xd60/rev3/config.h
+++ b/keyboards/xiudi/xd60/rev3/config.h
@@ -18,9 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 /* RGB Underglow
- * F6 PIN for XD60v3 that has pre-soldered LEDs
  */
-#define RGB_DI_PIN F6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/xiudi/xd60/rev3/info.json b/keyboards/xiudi/xd60/rev3/info.json
index 66bcb7be81..68c97c0a9e 100644
--- a/keyboards/xiudi/xd60/rev3/info.json
+++ b/keyboards/xiudi/xd60/rev3/info.json
@@ -13,6 +13,9 @@
         "levels": 6,
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/xiudi/xd68/config.h b/keyboards/xiudi/xd68/config.h
index 8759e7ff2e..e62b98a12d 100644
--- a/keyboards/xiudi/xd68/config.h
+++ b/keyboards/xiudi/xd68/config.h
@@ -39,7 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 
 // ws2812 options
-#define RGB_DI_PIN F6 // pin the DI on the ws2812 is hooked-up to
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/xiudi/xd68/info.json b/keyboards/xiudi/xd68/info.json
index 77b5b04058..9a2fb81c5e 100644
--- a/keyboards/xiudi/xd68/info.json
+++ b/keyboards/xiudi/xd68/info.json
@@ -19,6 +19,9 @@
         "breathing": true,
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "indicators": {
         "caps_lock": "B2",
         "on_state": 0
diff --git a/keyboards/xiudi/xd75/config.h b/keyboards/xiudi/xd75/config.h
index 0824eae60e..f8938d2d9e 100644
--- a/keyboards/xiudi/xd75/config.h
+++ b/keyboards/xiudi/xd75/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 6
 #    define RGBLIGHT_HUE_STEP 12
 #    define RGBLIGHT_SAT_STEP 25
diff --git a/keyboards/xiudi/xd75/info.json b/keyboards/xiudi/xd75/info.json
index f78ff3c7a3..bc2e724214 100644
--- a/keyboards/xiudi/xd75/info.json
+++ b/keyboards/xiudi/xd75/info.json
@@ -18,6 +18,9 @@
         "levels": 6,
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_5x15"],
diff --git a/keyboards/xiudi/xd84/config.h b/keyboards/xiudi/xd84/config.h
index 344c5c6c2b..42cce6f1c0 100644
--- a/keyboards/xiudi/xd84/config.h
+++ b/keyboards/xiudi/xd84/config.h
@@ -21,7 +21,6 @@
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15
 
-#define RGB_DI_PIN C7
 #define RGBLED_NUM 7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/xiudi/xd84/info.json b/keyboards/xiudi/xd84/info.json
index 1280b621a9..f7bfaeaebd 100644
--- a/keyboards/xiudi/xd84/info.json
+++ b/keyboards/xiudi/xd84/info.json
@@ -17,6 +17,9 @@
         "caps_lock": "B6",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["75_ansi", "75_iso"],
diff --git a/keyboards/xiudi/xd84pro/config.h b/keyboards/xiudi/xd84pro/config.h
index ec27530f45..3c5bbfbdce 100644
--- a/keyboards/xiudi/xd84pro/config.h
+++ b/keyboards/xiudi/xd84pro/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN F6
     #define RGBLED_NUM 12
 //   #define RGBLIGHT_HUE_STEP 8
 //   #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/xiudi/xd84pro/info.json b/keyboards/xiudi/xd84pro/info.json
index 46f70c42c5..e905ff3e7e 100644
--- a/keyboards/xiudi/xd84pro/info.json
+++ b/keyboards/xiudi/xd84pro/info.json
@@ -22,6 +22,9 @@
         "caps_lock": "B2",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["75_ansi", "75_iso"],
diff --git a/keyboards/xiudi/xd87/config.h b/keyboards/xiudi/xd87/config.h
index a5020cc807..d89929e9c8 100644
--- a/keyboards/xiudi/xd87/config.h
+++ b/keyboards/xiudi/xd87/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN B7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/xiudi/xd87/info.json b/keyboards/xiudi/xd87/info.json
index 9bb0611182..5aa56a60e9 100644
--- a/keyboards/xiudi/xd87/info.json
+++ b/keyboards/xiudi/xd87/info.json
@@ -21,6 +21,9 @@
     "caps_lock": "E2",
     "on_state": 0
   },
+  "ws2812": {
+    "pin": "B7"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["tkl_ansi", "tkl_iso"],
diff --git a/keyboards/xiudi/xd96/config.h b/keyboards/xiudi/xd96/config.h
index 8e2a50511f..5fc09b0483 100644
--- a/keyboards/xiudi/xd96/config.h
+++ b/keyboards/xiudi/xd96/config.h
@@ -21,7 +21,6 @@
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 18
 
-#define RGB_DI_PIN C7
 #define RGBLED_NUM 16
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/xiudi/xd96/info.json b/keyboards/xiudi/xd96/info.json
index c5b667bb12..03b38f39ee 100644
--- a/keyboards/xiudi/xd96/info.json
+++ b/keyboards/xiudi/xd96/info.json
@@ -17,6 +17,9 @@
     "num_lock": "C6",
     "on_state": 0
   },
+  "ws2812": {
+    "pin": "C7"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {