Move `RGB_MATRIX_DRIVER` to data driven (#20350)

keyboards/1upkeyboards/super16/info.json

@@ -11,6 +11,9 @@
   "ws2812": {
     "pin": "D3"
   },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
   "matrix_pins": {
     "cols": ["D4", "C6", "F6", "F7"],
     "rows": ["D1", "D0", "F4", "F5"]

keyboards/1upkeyboards/super16/rules.mk

@@ -10,5 +10,4 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 AUDIO_ENABLE = no           # Audio output

keyboards/1upkeyboards/super16v2/info.json

@@ -11,6 +11,9 @@
     "ws2812": {
       "pin": "B5"
     },
+    "rgb_matrix": {
+      "driver": "WS2812"
+    },
     "matrix_pins": {
       "cols": ["D5", "D6", "C2", "D0"],
       "rows": ["D1", "D2", "D3", "D4"]

keyboards/1upkeyboards/super16v2/rules.mk

@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes

keyboards/25keys/zinc/info.json

@@ -7,6 +7,9 @@
     "pid": "0xEA3B",
     "device_version": "0.0.1"
    },
+   "rgb_matrix": {
+     "driver": "WS2812"
+   },
   "processor": "atmega32u4",
   "bootloader": "caterina"
 }

keyboards/25keys/zinc/rules.mk

@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 
 DEFAULT_FOLDER = 25keys/zinc/rev1
 

keyboards/3keyecosystem/2key2/info.json

@@ -8,6 +8,9 @@
         "pid": "0x3304",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["F4", "D7"],
         "rows": ["F6"]

keyboards/3keyecosystem/2key2/rules.mk

@@ -10,5 +10,4 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes		# Enable RGB matrix
-RGB_MATRIX_DRIVER = WS2812	# Select WS2812 driver for RGB matrix
 AUDIO_ENABLE = no           # Audio output

keyboards/4pplet/perk60_iso/rev_a/info.json

@@ -8,6 +8,9 @@
         "pid": "0x0009",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
     "matrix_pins": {
         "cols": ["A1", "B12", "B14", "A2", "A0", "A3", "A4"],
         "rows": ["C14", "C13", "B5", "B4", "B8", "A15", "B3", "B9", "A5", "A7"]

keyboards/4pplet/perk60_iso/rev_a/rules.mk

@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

keyboards/4pplet/unextended_std/rev_a/info.json

@@ -32,8 +32,10 @@
         "audio": false
     },
 
+    "ws2812": {
+        "pin": "A8"
+    },
     "rgblight": {
-        "pin": "A8",
         "led_count": 16,
         "animations": {
             "alternating": true,

keyboards/abatskeyboardclub/nayeon/info.json

@@ -24,6 +24,9 @@
         "pin": "GP19",
         "driver": "vendor"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040",
     "diode_direction": "COL2ROW",

keyboards/abatskeyboardclub/nayeon/rules.mk

@@ -1,3 +1,2 @@
 # RGB Matrix
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812

keyboards/acheron/apollo/87h/delta/info.json

@@ -7,6 +7,9 @@
     "ws2812": {
         "pin": "B15"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
         "rows": ["B3", "D2", "C12", "A6", "A5", "A4"]

keyboards/acheron/apollo/87h/delta/rules.mk

@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE

keyboards/acheron/apollo/87h/gamma/info.json

@@ -4,6 +4,9 @@
         "pid": "0x8774",
         "device_version": "0.0.3"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
     "matrix_pins": {
         "cols": ["B3", "A15", "A10", "A8", "B14", "B12", "B10", "B1", "B0", "A7", "A4", "A5", "A6", "C15", "A0", "A1"],
         "rows": ["C14", "C13", "B9", "B4", "A3", "A2"]

keyboards/acheron/apollo/87h/gamma/rules.mk

@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3741
 KEYBOARD_SHARED_EP = yes
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread

keyboards/acheron/apollo/87htsc/info.json

@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "B15"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
         "rows": ["B3", "D2", "C12", "A6", "A5", "A4"]

keyboards/acheron/apollo/87htsc/rules.mk

@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE

keyboards/acheron/apollo/88htsc/info.json

@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "B15"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
         "rows": ["B3", "D2", "C12", "A6", "A5", "A4"]

keyboards/acheron/apollo/88htsc/rules.mk

@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE

keyboards/adafruit/macropad/info.json

@@ -13,6 +13,9 @@
             {"pin_a": "GP18", "pin_b": "GP17"}
         ]
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "bootmagic": {
         "matrix": [1, 2]
     },

keyboards/adafruit/macropad/rules.mk

@@ -13,7 +13,6 @@ AUDIO_ENABLE = yes          # Audio output
 AUDIO_DRIVER = pwm_hardware
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 OLED_ENABLE = yes
 OLED_DRIVER = custom
 # Project specific files

keyboards/adm42/info.json

@@ -12,6 +12,9 @@
     "ws2812": {
         "pin": "B7"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "F0", "F1", "F4", "F5", "F6", "F7"],
         "rows": ["C7", "D5", "D3", "D2"]

keyboards/adm42/rev4/rules.mk

@@ -1,2 +1 @@
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812

keyboards/adpenrose/akemipad/info.json

@@ -10,6 +10,9 @@
     "ws2812": {
         "pin": "F4"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["D3", "D2", "F5", "F6", "B2"],
         "rows": ["D4", "D7", "E6", "B6", "B4", "B5"]

keyboards/adpenrose/akemipad/rules.mk

@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes          # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes

keyboards/aeboards/satellite/rev1/info.json

@@ -8,6 +8,9 @@
         "pid": "0x6553",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "diode_direction": "COL2ROW",

keyboards/aeboards/satellite/rev1/rules.mk

@@ -12,7 +12,6 @@ AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
 
 RGB_MATRIX_ENABLE = yes     # Enable RGB matrix effects.
-RGB_MATRIX_DRIVER = custom  # Enable RGB matrix effects.
 
 COMMON_VPATH += $(DRIVER_PATH)/issi
 

keyboards/aleblazer/zodiark/info.json

@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "B5"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
         "rows": ["C6", "D7", "E6", "B4", "F4"]

keyboards/aleblazer/zodiark/rules.mk

@@ -15,4 +15,3 @@ OLED_DRIVER = SSD1306    # Enable Support for SSD1306 or SH1106 OLED Displays; C
 ENCODER_ENABLE = yes
 SPLIT_KEYBOARD = yes
 LTO_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812

keyboards/annepro2/c15/info.json

@@ -3,5 +3,8 @@
     "usb": {
         "pid": "0xAC15"
     },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
     "community_layouts": ["60_ansi"]
 }

keyboards/annepro2/c15/rules.mk

@@ -32,7 +32,6 @@ WEAR_LEVELING_DRIVER = spi_flash
 
 # Custom RGB matrix handling
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = custom
 
 # Keys
 CUSTOM_MATRIX = lite

keyboards/annepro2/c18/info.json

@@ -3,5 +3,8 @@
     "usb": {
         "pid": "0xAC18"
     },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
     "community_layouts": ["60_ansi", "60_iso"]
 }

keyboards/annepro2/c18/rules.mk

@@ -32,7 +32,6 @@ WEAR_LEVELING_DRIVER = spi_flash
 
 # Custom RGB matrix handling
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = custom
 
 # Keys
 CUSTOM_MATRIX = lite

keyboards/atlantis/ak81_ve/info.json

@@ -7,6 +7,9 @@
         "pid": "0x0081",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["F0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "B7", "D3", "D2", "D1", "D0", "B3"],
         "rows": ["F1", "F7", "F6", "F5", "F4", "D5"]

keyboards/atlantis/ak81_ve/rules.mk

@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
 DYNAMIC_MACRO_ENABLE = yes
 ENCODER_ENABLE = yes

keyboards/axolstudio/yeti/hotswap/info.json

@@ -8,6 +8,9 @@
     "pid": "0x9F9E",
     "device_version": "0.0.1"
   },
+  "rgb_matrix": {
+    "driver": "IS31FL3733"
+  },
   "matrix_pins": {
     "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
     "rows": ["E6", "C6", "B4", "B5", "B6"]

keyboards/axolstudio/yeti/hotswap/rules.mk

@@ -10,6 +10,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 
 LTO_ENABLE = yes

keyboards/bandominedoni/info.json

@@ -8,6 +8,9 @@
         "pid": "0xF4B5",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["D1", "E6", "F7", "B1", "B3", "B2", "D0"],
         "rows": ["B5", "B4", "D7", "F6", "C6", "D4"]

keyboards/bandominedoni/rules.mk

@@ -14,6 +14,5 @@ MIDI_ENABLE = yes           # MIDI support
 ENCODER_ENABLE = yes        # encoder on mute button
 SPLIT_KEYBOARD = yes        # Enables split keyboard support
 RGB_MATRIX_ENABLE = no      # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
-RGB_MATRIX_DRIVER = WS2812  #
 
 LTO_ENABLE = yes

keyboards/bastardkb/charybdis/3x5/blackpill/info.json

@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "ws2812": {
         "pin": "A1",
         "driver": "pwm"

keyboards/bastardkb/charybdis/3x5/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
 

keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json

@@ -6,6 +6,9 @@
     "ws2812": {
         "pin": "D3"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["C7", "F0", "D7", "E6", "B4"],
         "rows": ["B7", "C6", "D4", "B5"]

keyboards/bastardkb/charybdis/3x5/v1/elitec/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
 
 # Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on
 # the trackball side).

keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json

@@ -6,6 +6,9 @@
     "ws2812": {
         "pin": "D3"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["F5", "B6", "D7", "E6", "B4"],
         "rows": ["F7", "C6", "D4", "B5"]

keyboards/bastardkb/charybdis/3x5/v2/elitec/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
 
 # Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on
 # the trackball side).

keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json

@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["GP28", "GP15", "GP6", "GP7", "GP8"],
         "rows": ["GP26", "GP5", "GP4", "GP9"]

keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk

@@ -19,7 +19,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
 

keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json

@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["GP28", "GP21", "GP6", "GP7", "GP8"],
         "rows": ["GP26", "GP5", "GP4", "GP9"]

keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk

@@ -19,7 +19,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
 

keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json

@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "ws2812": {
         "pin": "D3",
         "driver": "pwm"

keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk

@@ -17,7 +17,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
 

keyboards/bastardkb/charybdis/3x6/blackpill/info.json

@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "ws2812": {
         "pin": "A1",
         "driver": "pwm"

keyboards/bastardkb/charybdis/3x6/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
 

keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json

@@ -6,6 +6,9 @@
     "ws2812": {
         "pin": "D3"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["D5", "C7", "F0", "D7", "E6", "B4"],
         "rows": ["B7", "C6", "D4", "B5"]

keyboards/bastardkb/charybdis/3x6/v1/elitec/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
 

keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json

@@ -6,6 +6,9 @@
     "ws2812": {
         "pin": "D3"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
         "rows": ["F7", "C6", "D4", "B5"]

keyboards/bastardkb/charybdis/3x6/v2/elitec/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
 

keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json

@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
         "rows": ["GP26", "GP5", "GP4", "GP9"]

keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk

@@ -19,7 +19,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
 

keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json

@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
         "rows": ["GP26", "GP5", "GP4", "GP9"]

keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk

@@ -19,7 +19,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
 

keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json

@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "ws2812": {
         "pin": "D3",
         "driver": "pwm"

keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk

@@ -17,7 +17,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
 

keyboards/bastardkb/charybdis/4x6/blackpill/info.json

@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "ws2812": {
         "pin": "A1",
         "driver": "pwm"

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
 

keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json

@@ -6,6 +6,9 @@
     "ws2812": {
         "pin": "D3"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["D5", "C7", "F0", "D7", "E6", "B4"],
         "rows": ["F1", "B7", "C6", "D4", "B5"]

keyboards/bastardkb/charybdis/4x6/v1/elitec/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
 
 # Charybdis is a split 4x6 keyboard with a maximum of 5 thumb keys (3 on the
 # trackball side).

keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json

@@ -6,6 +6,9 @@
     "ws2812": {
         "pin": "D3"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
         "rows": ["F4", "F7", "C6", "D4", "B5"]

keyboards/bastardkb/charybdis/4x6/v2/elitec/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
 
 # Charybdis is a split 4x6 keyboard with a maximum of 5 thumb keys (3 on the
 # trackball side).

keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json

@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
         "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]

keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk

@@ -19,7 +19,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
 

keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json

@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
         "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]

keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk

@@ -19,7 +19,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
 

keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json

@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "ws2812": {
         "pin": "D3",
         "driver": "pwm"

keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk

@@ -17,7 +17,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
 

keyboards/bastardkb/dilemma/3x5_3/info.json

@@ -4,6 +4,9 @@
         "device_version": "2.0.0",
         "pid": "0x1835"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["GP8", "GP9", "GP7", "GP6", "GP28"],
         "rows": ["GP4", "GP5", "GP27", "GP26"]

keyboards/bastardkb/dilemma/3x5_3/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 = no     # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SERIAL_DRIVER = vendor
 

keyboards/bastardkb/scylla/blackpill/info.json

@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "ws2812": {
         "pin": "A1",
         "driver": "pwm"

keyboards/bastardkb/scylla/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  # RGB matrix driver support
 
 SPLIT_KEYBOARD = yes
 

keyboards/bastardkb/scylla/v1/elitec/info.json

@@ -6,6 +6,9 @@
     "ws2812": {
         "pin": "D2"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
         "rows": ["D7", "B5", "F7", "F6", "B6"]

keyboards/bastardkb/scylla/v1/elitec/rules.mk

@@ -15,6 +15,5 @@ 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 (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 
 SPLIT_KEYBOARD = yes

keyboards/bastardkb/scylla/v2/elitec/info.json

@@ -6,6 +6,9 @@
     "ws2812": {
         "pin": "D3"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
         "rows": ["F4", "F7", "C6", "D4", "B5"]

keyboards/bastardkb/scylla/v2/elitec/rules.mk

@@ -15,6 +15,5 @@ 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 (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 
 SPLIT_KEYBOARD = yes

keyboards/bastardkb/scylla/v2/splinky_2/info.json

@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
         "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]

keyboards/bastardkb/scylla/v2/splinky_2/rules.mk

@@ -19,7 +19,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
 

keyboards/bastardkb/scylla/v2/splinky_3/info.json

@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
         "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]

keyboards/bastardkb/scylla/v2/splinky_3/rules.mk

@@ -19,7 +19,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
 

keyboards/bastardkb/scylla/v2/stemcell/info.json

@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "ws2812": {
         "pin": "D3",
         "driver": "pwm"

keyboards/bastardkb/scylla/v2/stemcell/rules.mk

@@ -17,7 +17,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
 

keyboards/bastardkb/skeletyl/blackpill/info.json

@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "ws2812": {
         "pin": "A1",
         "driver": "pwm"

keyboards/bastardkb/skeletyl/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  # RGB matrix driver support
 
 SPLIT_KEYBOARD = yes
 

keyboards/bastardkb/skeletyl/v1/elitec/info.json

@@ -6,6 +6,9 @@
     "ws2812": {
         "pin": "D2"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["E6", "C6", "B1", "B3", "B2"],
         "rows": ["B5", "F7", "F6", "B6"]

keyboards/bastardkb/skeletyl/v1/elitec/rules.mk

@@ -15,6 +15,5 @@ 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 (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 
 SPLIT_KEYBOARD = yes

keyboards/bastardkb/skeletyl/v2/elitec/info.json

@@ -6,6 +6,9 @@
     "ws2812": {
         "pin": "D3"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["F5", "B6", "D7", "E6", "B4"],
         "rows": ["F7", "C6", "D4", "B5"]

keyboards/bastardkb/skeletyl/v2/elitec/rules.mk

@@ -15,6 +15,5 @@ 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 (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 
 SPLIT_KEYBOARD = yes

keyboards/bastardkb/skeletyl/v2/splinky_2/info.json

@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["GP28", "GP15", "GP6", "GP7", "GP8"],
         "rows": ["GP26", "GP5", "GP4", "GP9"]

keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk

@@ -19,7 +19,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
 

keyboards/bastardkb/skeletyl/v2/splinky_3/info.json

@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["GP28", "GP21", "GP6", "GP7", "GP8"],
         "rows": ["GP26", "GP5", "GP4", "GP9"]