11 files changed, 29 insertions, 27 deletions
diff --git a/keyboards/bastardkb/scylla/v2/elitec/config.h b/keyboards/bastardkb/scylla/v2/elitec/config.h
index e9691010ed..178bafa5cc 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/config.h
+++ b/keyboards/bastardkb/scylla/v2/elitec/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { F4, F7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
-    { F6, F5, B6, D7, E6, B4 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
diff --git a/keyboards/bastardkb/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/info.json
index 4674e238a6..f1db245dd0 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v2/elitec/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+        "rows": ["F4", "F7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/config.h b/keyboards/bastardkb/scylla/v2/splinky_2/config.h
index f65dcfb0b3..00f0dbf1f3 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/config.h
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { GP29, GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
-    { GP27, GP28, GP15, GP6, GP7, GP8 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/info.json b/keyboards/bastardkb/scylla/v2/splinky_2/info.json
index 6d3edbd0ee..dac13322b4 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/info.json
@@ -3,9 +3,17 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
+        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
+    "ws2812": {
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
index 8e2235ee9f..e60131bda0 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
@@ -24,4 +24,3 @@ RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
 
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/config.h b/keyboards/bastardkb/scylla/v2/splinky_3/config.h
index 09d5af43c8..ff5d7db4ff 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/config.h
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { GP29, GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
-    { GP27, GP28, GP21, GP6, GP7, GP8 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/info.json b/keyboards/bastardkb/scylla/v2/splinky_3/info.json
index 6d3edbd0ee..159b7df27a 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/info.json
@@ -3,9 +3,17 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
+        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
+    "ws2812": {
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
index 8e2235ee9f..e60131bda0 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
@@ -24,4 +24,3 @@ RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
 
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/config.h b/keyboards/bastardkb/scylla/v2/stemcell/config.h
index 5528531b91..4e5b142aa3 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/config.h
+++ b/keyboards/bastardkb/scylla/v2/stemcell/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { F4, F7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
-    { F6, F5, B6, D7, E6, B4 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json
index eccfea99f4..c648806b14 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/info.json
+++ b/keyboards/bastardkb/scylla/v2/stemcell/info.json
@@ -3,6 +3,14 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "ws2812": {
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+        "rows": ["F4", "F7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
index 70f7784de6..2c92eda3f9 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
@@ -22,6 +22,5 @@ RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
 
 SERIAL_DRIVER = usart
-WS2812_DRIVER = pwm
 
 DEBOUNCE_TYPE = asym_eager_defer_pk