3 files changed, 12 insertions, 9 deletions
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
index e37df487fd..68901305c4 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
@@ -19,17 +19,10 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { B15, A2, B8, A8, B9 }
-#define MATRIX_COL_PINS \
-    { B0, B1, B10, B3, B4, B5 }
-
 /* Handedness. */
 #define SPLIT_HAND_PIN A3 // High -> left, Low -> right.
 
 /* RGB settings. */
-#define RGB_DI_PIN A1
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
index ec2b0cbad0..c6bff84bf5 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
@@ -3,6 +3,18 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "ws2812": {
+        "pin": "A1",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
+        "rows": ["B15", "A2", "B8", "A8", "B9"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F411"
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
index f9e94a34df..8ac0939d01 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported.
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default.
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default.
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
@@ -25,7 +24,6 @@ MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
 KEYBOARD_SHARED_EP = yes
 
 EEPROM_DRIVER = spi
-WS2812_DRIVER = pwm
 SERIAL_DRIVER = usart
 
 DEBOUNCE_TYPE = asym_eager_defer_pk