summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2023-11-22 21:37:32 +0000
committerGitHub <noreply@github.com>2023-11-22 21:37:32 +0000
commitb35bac6afbadc88cf6e8e3d1c8cc7494a510bb60 (patch)
treee1f4ba12aea2fff946f2d0096d86137f64f5382b
parenta0a6820c1b46d04bc146e0723fd47265e6afe67f (diff)
Remove unnecessary driver counts (#22435)
-rw-r--r--keyboards/4pplet/perk60_iso/rev_a/config.h1
-rw-r--r--keyboards/abko/ak84bt/config.h1
-rw-r--r--keyboards/acheron/apollo/87h/gamma/config.h1
-rw-r--r--keyboards/aeboards/satellite/rev1/config.h1
-rw-r--r--keyboards/akko/5108/config.h1
-rw-r--r--keyboards/akko/acr87/config.h1
-rw-r--r--keyboards/akko/top40/config.h1
-rw-r--r--keyboards/axolstudio/yeti/hotswap/config.h1
-rw-r--r--keyboards/canary/canary60rgb/v1/config.h1
-rw-r--r--keyboards/chosfox/cf81/config.h1
-rw-r--r--keyboards/clueboard/66_hotswap/gen1/config.h1
-rw-r--r--keyboards/darkproject/kd87a_bfg_edition/config.h1
-rw-r--r--keyboards/dp60/config.h1
-rw-r--r--keyboards/drop/alt/v2/config.h1
-rw-r--r--keyboards/drop/cstm80/config.h1
-rw-r--r--keyboards/drop/ctrl/v2/config.h1
-rw-r--r--keyboards/drop/sense75/config.h1
-rw-r--r--keyboards/drop/shift/v2/config.h1
-rw-r--r--keyboards/durgod/dgk6x/config.h1
-rw-r--r--keyboards/dztech/dz60rgb/v1/config.h1
-rw-r--r--keyboards/dztech/dz60rgb/v2/config.h1
-rw-r--r--keyboards/dztech/dz60rgb/v2_1/config.h1
-rw-r--r--keyboards/dztech/dz60rgb_ansi/v1/config.h1
-rw-r--r--keyboards/dztech/dz60rgb_ansi/v2/config.h1
-rw-r--r--keyboards/dztech/dz60rgb_ansi/v2_1/config.h1
-rw-r--r--keyboards/dztech/dz60rgb_wkl/v1/config.h1
-rw-r--r--keyboards/dztech/dz60rgb_wkl/v2/config.h1
-rw-r--r--keyboards/dztech/dz60rgb_wkl/v2_1/config.h1
-rw-r--r--keyboards/dztech/dz64rgb/config.h1
-rw-r--r--keyboards/dztech/dz65rgb/v1/config.h1
-rw-r--r--keyboards/dztech/dz65rgb/v2/config.h1
-rwxr-xr-xkeyboards/dztech/dz65rgb/v3/config.h1
-rw-r--r--keyboards/dztech/tofu/ii/v1/config.h1
-rw-r--r--keyboards/dztech/tofu/jr/v1/config.h1
-rw-r--r--keyboards/ergodox_ez/config.h1
-rw-r--r--keyboards/evyd13/atom47/rev5/config.h1
-rw-r--r--keyboards/exclusive/e6_rgb/config.h1
-rwxr-xr-xkeyboards/fallacy/config.h1
-rw-r--r--keyboards/feker/ik75/config.h1
-rw-r--r--keyboards/ferris/0_2/bling/config.h1
-rwxr-xr-xkeyboards/flashquark/horizon_z/config.h1
-rw-r--r--keyboards/frooastboard/walnut/config.h1
-rw-r--r--keyboards/geekboards/tester/config.h1
-rwxr-xr-xkeyboards/gizmo_engineering/gk6/config.h1
-rw-r--r--keyboards/gmmk/gmmk2/p65/config.h1
-rw-r--r--keyboards/gmmk/gmmk2/p96/config.h1
-rw-r--r--keyboards/gmmk/numpad/config.h2
-rw-r--r--keyboards/gmmk/pro/config.h2
-rw-r--r--keyboards/handwired/orbweaver/config.h1
-rw-r--r--keyboards/hs60/v1/config.h1
-rw-r--r--keyboards/hs60/v2/ansi/config.h1
-rw-r--r--keyboards/hs60/v2/hhkb/config.h1
-rw-r--r--keyboards/hs60/v2/iso/config.h1
-rw-r--r--keyboards/ilumkb/simpler61/config.h1
-rw-r--r--keyboards/ilumkb/simpler64/config.h1
-rw-r--r--keyboards/inett_studio/sqx/hotswap/config.h1
-rw-r--r--keyboards/inett_studio/sqx/universal/config.h1
-rw-r--r--keyboards/inland/kb83/config.h1
-rw-r--r--keyboards/inland/mk47/config.h1
-rw-r--r--keyboards/inland/v83p/config.h1
-rw-r--r--keyboards/input_club/ergodox_infinity/config.h1
-rw-r--r--keyboards/input_club/infinity60/led/config.h1
-rw-r--r--keyboards/input_club/whitefox/config.h1
-rw-r--r--keyboards/jukaie/jk01/config.h1
-rw-r--r--keyboards/kbdcraft/adam64/config.h1
-rw-r--r--keyboards/kbdfans/bella/rgb/config.h1
-rw-r--r--keyboards/kbdfans/bella/rgb_iso/config.h1
-rw-r--r--keyboards/kbdfans/boop65/rgb/config.h1
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/v1/config.h1
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/v2/config.h1
-rwxr-xr-xkeyboards/kbdfans/kbd67/mkiirgb/v3/config.h1
-rw-r--r--keyboards/kbdfans/kbdmini/config.h1
-rwxr-xr-xkeyboards/kbdfans/maja/config.h1
-rwxr-xr-xkeyboards/keebwerk/mega/ansi/config.h1
-rw-r--r--keyboards/keychron/c1_pro/ansi/rgb/config.h1
-rw-r--r--keyboards/keychron/c1_pro/ansi/white/config.h1
-rw-r--r--keyboards/keychron/c2_pro/ansi/rgb/config.h1
-rw-r--r--keyboards/keychron/c2_pro/ansi/white/config.h1
-rw-r--r--keyboards/keychron/q0/base/config.h1
-rw-r--r--keyboards/keychron/q0/plus/config.h1
-rw-r--r--keyboards/keychron/q10/config.h1
-rwxr-xr-xkeyboards/keychron/q11/config.h1
-rw-r--r--keyboards/keychron/q12/config.h1
-rw-r--r--keyboards/keychron/q1v1/config.h1
-rw-r--r--keyboards/keychron/q1v2/config.h1
-rw-r--r--keyboards/keychron/q2/config.h1
-rw-r--r--keyboards/keychron/q3/config.h1
-rw-r--r--keyboards/keychron/q4/ansi/v1/config.h1
-rw-r--r--keyboards/keychron/q4/ansi/v2/config.h1
-rw-r--r--keyboards/keychron/q4/iso/config.h1
-rw-r--r--keyboards/keychron/q5/config.h1
-rw-r--r--keyboards/keychron/q6/config.h1
-rw-r--r--keyboards/keychron/q60/config.h1
-rw-r--r--keyboards/keychron/q65/config.h1
-rw-r--r--keyboards/keychron/q7/config.h1
-rw-r--r--keyboards/keychron/q8/config.h1
-rw-r--r--keyboards/keychron/q9/config.h1
-rwxr-xr-xkeyboards/keychron/q9_plus/config.h1
-rw-r--r--keyboards/keychron/s1/ansi/rgb/config.h1
-rw-r--r--keyboards/keychron/s1/ansi/white/config.h1
-rw-r--r--keyboards/keychron/v1/config.h1
-rw-r--r--keyboards/keychron/v10/config.h1
-rw-r--r--keyboards/keychron/v2/config.h1
-rw-r--r--keyboards/keychron/v3/config.h1
-rw-r--r--keyboards/keychron/v4/config.h1
-rw-r--r--keyboards/keychron/v5/config.h1
-rw-r--r--keyboards/keychron/v6/config.h1
-rw-r--r--keyboards/keychron/v7/config.h1
-rw-r--r--keyboards/keychron/v8/config.h1
-rwxr-xr-xkeyboards/kprepublic/bm40hsrgb/rev2/config.h1
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev2/config.h1
-rw-r--r--keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h1
-rw-r--r--keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h1
-rw-r--r--keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h1
-rw-r--r--keyboards/kprepublic/bm68hsrgb/rev2/config.h1
-rw-r--r--keyboards/kprepublic/bm80v2/config.h1
-rw-r--r--keyboards/kprepublic/bm80v2_iso/config.h1
-rw-r--r--keyboards/kprepublic/cstc40/config.h1
-rw-r--r--keyboards/latincompass/latin17rgb/config.h1
-rw-r--r--keyboards/latincompass/latin60rgb/config.h1
-rw-r--r--keyboards/latincompass/latin6rgb/config.h1
-rw-r--r--keyboards/matrix/m20add/config.h1
-rw-r--r--keyboards/matrix/noah/config.h1
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev2/config.h1
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/config.h1
-rw-r--r--keyboards/mechlovin/delphine/rgb_led/config.h1
-rw-r--r--keyboards/mechlovin/hannah60rgb/rev2/config.h1
-rw-r--r--keyboards/mechlovin/infinity87/rgb_rev1/config.h1
-rw-r--r--keyboards/mechlovin/olly/octagon/config.h1
-rw-r--r--keyboards/mechlovin/zed65/mono_led/config.h1
-rwxr-xr-xkeyboards/melgeek/mach80/config.h1
-rw-r--r--keyboards/melgeek/mj61/config.h1
-rw-r--r--keyboards/melgeek/mj63/config.h1
-rw-r--r--keyboards/melgeek/mj64/config.h1
-rw-r--r--keyboards/melgeek/mj65/config.h1
-rwxr-xr-xkeyboards/melgeek/mojo68/config.h1
-rw-r--r--keyboards/melgeek/mojo75/config.h1
-rwxr-xr-xkeyboards/melgeek/tegic/config.h1
-rw-r--r--keyboards/melgeek/z70ultra/config.h1
-rw-r--r--keyboards/miller/gm862/config.h1
-rw-r--r--keyboards/monsgeek/m1/config.h1
-rw-r--r--keyboards/monsgeek/m3/config.h1
-rw-r--r--keyboards/monsgeek/m5/config.h1
-rw-r--r--keyboards/monsgeek/m6/config.h1
-rw-r--r--keyboards/moonlander/config.h1
-rw-r--r--keyboards/mt/mt64rgb/config.h1
-rw-r--r--keyboards/mt/mt84/config.h3
-rw-r--r--keyboards/neson_design/700e/config.h1
-rw-r--r--keyboards/neson_design/n6/config.h1
-rwxr-xr-xkeyboards/novelkeys/nk65/config.h1
-rwxr-xr-xkeyboards/novelkeys/nk87/config.h1
-rw-r--r--keyboards/opendeck/32/rev1/config.h1
-rw-r--r--keyboards/owlab/voice65/hotswap/config.h1
-rw-r--r--keyboards/owlab/voice65/soldered/config.h1
-rw-r--r--keyboards/phentech/rpk_001/config.h1
-rw-r--r--keyboards/planck/ez/config.h1
-rw-r--r--keyboards/planck/light/config.h1
-rw-r--r--keyboards/playkbtw/pk64rgb/config.h1
-rw-r--r--keyboards/projectd/65/projectd_65_ansi/config.h1
-rw-r--r--keyboards/projectd/75/ansi/config.h1
-rw-r--r--keyboards/qwertykeys/qk100/ansi/config.h1
-rw-r--r--keyboards/redragon/k667/config.h1
-rw-r--r--keyboards/skyloong/gk61/pro/config.h2
-rw-r--r--keyboards/skyloong/gk61/pro_48/config.h2
-rw-r--r--keyboards/skyloong/gk61/v1/config.h1
-rw-r--r--keyboards/smallkeyboard/config.h1
-rwxr-xr-xkeyboards/spaceholdings/nebula12/config.h1
-rwxr-xr-xkeyboards/spaceholdings/nebula68/config.h1
-rw-r--r--keyboards/teleport/native/config.h1
-rw-r--r--keyboards/terrazzo/config.h1
-rw-r--r--keyboards/tkc/portico/config.h2
-rw-r--r--keyboards/tkc/portico68v2/config.h1
-rw-r--r--keyboards/tkc/portico75/config.h2
-rw-r--r--keyboards/wilba_tech/rama_works_kara/config.h1
-rw-r--r--keyboards/wilba_tech/rama_works_koyu/config.h1
-rw-r--r--keyboards/wilba_tech/rama_works_m10_c/config.h1
-rw-r--r--keyboards/wilba_tech/rama_works_m50_a/config.h1
-rw-r--r--keyboards/wilba_tech/rama_works_m60_a/config.h1
-rw-r--r--keyboards/wilba_tech/rama_works_m65_b/config.h1
-rw-r--r--keyboards/wilba_tech/rama_works_m65_bx/config.h1
-rw-r--r--keyboards/wilba_tech/rama_works_u80_a/config.h1
-rw-r--r--keyboards/wilba_tech/wt60_a/config.h1
-rw-r--r--keyboards/wilba_tech/wt60_b/config.h1
-rw-r--r--keyboards/wilba_tech/wt60_bx/config.h1
-rw-r--r--keyboards/wilba_tech/wt60_c/config.h1
-rw-r--r--keyboards/wilba_tech/wt65_a/config.h1
-rw-r--r--keyboards/wilba_tech/wt65_b/config.h1
-rw-r--r--keyboards/wilba_tech/wt75_a/config.h1
-rw-r--r--keyboards/wilba_tech/wt75_b/config.h1
-rw-r--r--keyboards/wilba_tech/wt75_c/config.h1
-rw-r--r--keyboards/wilba_tech/wt80_a/config.h1
-rw-r--r--keyboards/wilba_tech/zeal60/config.h1
-rw-r--r--keyboards/wilba_tech/zeal65/config.h1
-rw-r--r--keyboards/xbows/knight/config.h1
-rw-r--r--keyboards/xbows/knight_plus/config.h1
-rw-r--r--keyboards/xbows/nature/config.h1
-rw-r--r--keyboards/xbows/numpad/config.h1
-rw-r--r--keyboards/xbows/ranger/config.h1
-rw-r--r--keyboards/xbows/woody/config.h1
-rw-r--r--keyboards/xelus/dawn60/rev1/config.h1
-rw-r--r--keyboards/xelus/dawn60/rev1_qmk/config.h1
-rw-r--r--keyboards/xelus/pachi/rgb/rev1/config.h1
-rw-r--r--keyboards/xelus/pachi/rgb/rev2/config.h1
203 files changed, 0 insertions, 211 deletions
diff --git a/keyboards/4pplet/perk60_iso/rev_a/config.h b/keyboards/4pplet/perk60_iso/rev_a/config.h
index c017363651..efad0a1718 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/config.h
+++ b/keyboards/4pplet/perk60_iso/rev_a/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
22#define LOCKING_RESYNC_ENABLE 22#define LOCKING_RESYNC_ENABLE
23 23
24#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 24#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
25#define IS31FL3733_DRIVER_COUNT 1
26#define RGB_MATRIX_LED_COUNT 62 25#define RGB_MATRIX_LED_COUNT 62
27#define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ 26#define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ
28 27
diff --git a/keyboards/abko/ak84bt/config.h b/keyboards/abko/ak84bt/config.h
index c599c8ca90..0a7f31bf7d 100644
--- a/keyboards/abko/ak84bt/config.h
+++ b/keyboards/abko/ak84bt/config.h
@@ -20,7 +20,6 @@
20#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 20#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
21#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_VCC 21#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_VCC
22 22
23#define IS31FL3733_DRIVER_COUNT 2
24#define DRIVER_1_LED_TOTAL 45 23#define DRIVER_1_LED_TOTAL 45
25#define DRIVER_2_LED_TOTAL 45 24#define DRIVER_2_LED_TOTAL 45
26 25
diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h
index 151239ba33..37c0aaef64 100644
--- a/keyboards/acheron/apollo/87h/gamma/config.h
+++ b/keyboards/acheron/apollo/87h/gamma/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
27// RGB Matrix defines 27// RGB Matrix defines
28#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 28#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
29 29
30#define IS31FL3741_DRIVER_COUNT 1
31#define DRIVER_1_LED_TOTAL 87 30#define DRIVER_1_LED_TOTAL 87
32#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL 31#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
33 32
diff --git a/keyboards/aeboards/satellite/rev1/config.h b/keyboards/aeboards/satellite/rev1/config.h
index 7a06288394..429bc2af54 100644
--- a/keyboards/aeboards/satellite/rev1/config.h
+++ b/keyboards/aeboards/satellite/rev1/config.h
@@ -20,7 +20,6 @@
20#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 20#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
21#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 21#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
22 22
23#define IS31FL3731_DRIVER_COUNT 2
24#define DRIVER_1_LED_TOTAL 36 23#define DRIVER_1_LED_TOTAL 36
25#define DRIVER_2_LED_TOTAL 36 24#define DRIVER_2_LED_TOTAL 36
26#define IS31FL3731_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 25#define IS31FL3731_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/akko/5108/config.h b/keyboards/akko/5108/config.h
index b86387cba6..7154ce44d2 100644
--- a/keyboards/akko/5108/config.h
+++ b/keyboards/akko/5108/config.h
@@ -34,7 +34,6 @@
34#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 34#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
35 35
36/* I2C Config for LED Driver */ 36/* I2C Config for LED Driver */
37#define SNLED27351_DRIVER_COUNT 2
38#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 37#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
39#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO 38#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO
40#define I2C1_SCL_PAL_MODE 4 39#define I2C1_SCL_PAL_MODE 4
diff --git a/keyboards/akko/acr87/config.h b/keyboards/akko/acr87/config.h
index af35a5aa24..4c1fb9afa1 100644
--- a/keyboards/akko/acr87/config.h
+++ b/keyboards/akko/acr87/config.h
@@ -31,7 +31,6 @@
31#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 31#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
32 32
33/* I2C Config for LED Driver */ 33/* I2C Config for LED Driver */
34#define SNLED27351_DRIVER_COUNT 3
35#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 34#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
36#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO 35#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO
37#define SNLED27351_I2C_ADDRESS_3 SNLED27351_I2C_ADDRESS_SDA 36#define SNLED27351_I2C_ADDRESS_3 SNLED27351_I2C_ADDRESS_SDA
diff --git a/keyboards/akko/top40/config.h b/keyboards/akko/top40/config.h
index b19641348c..1d601a189c 100644
--- a/keyboards/akko/top40/config.h
+++ b/keyboards/akko/top40/config.h
@@ -31,7 +31,6 @@
31#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 31#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
32 32
33/* I2C Config for LED Driver */ 33/* I2C Config for LED Driver */
34#define SNLED27351_DRIVER_COUNT 2
35#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 34#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
36#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO 35#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO
37#define I2C1_SCL_PAL_MODE 4 36#define I2C1_SCL_PAL_MODE 4
diff --git a/keyboards/axolstudio/yeti/hotswap/config.h b/keyboards/axolstudio/yeti/hotswap/config.h
index 51be648900..02077e05a7 100644
--- a/keyboards/axolstudio/yeti/hotswap/config.h
+++ b/keyboards/axolstudio/yeti/hotswap/config.h
@@ -62,6 +62,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
62# define RGB_MATRIX_LED_FLUSH_LIMIT 16 // 16 is equivalent to limiting to 60fps 62# define RGB_MATRIX_LED_FLUSH_LIMIT 16 // 16 is equivalent to limiting to 60fps
63# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended 63# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
64# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 64# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
65# define IS31FL3733_DRIVER_COUNT 1
66# define RGB_MATRIX_LED_COUNT 64 65# define RGB_MATRIX_LED_COUNT 64
67#endif 66#endif
diff --git a/keyboards/canary/canary60rgb/v1/config.h b/keyboards/canary/canary60rgb/v1/config.h
index ebedfd6688..ab5c817000 100644
--- a/keyboards/canary/canary60rgb/v1/config.h
+++ b/keyboards/canary/canary60rgb/v1/config.h
@@ -34,6 +34,5 @@
34# define DISABLE_RGB_MATRIX_SOLID_SPLASH 34# define DISABLE_RGB_MATRIX_SOLID_SPLASH
35# define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH 35# define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
36# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 36# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
37# define IS31FL3733_DRIVER_COUNT 1
38# define RGB_MATRIX_LED_COUNT 63 37# define RGB_MATRIX_LED_COUNT 63
39#endif 38#endif
diff --git a/keyboards/chosfox/cf81/config.h b/keyboards/chosfox/cf81/config.h
index d6d0c8b252..ae0d87d935 100644
--- a/keyboards/chosfox/cf81/config.h
+++ b/keyboards/chosfox/cf81/config.h
@@ -31,7 +31,6 @@
31#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 31#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
32 32
33/* I2C Config for LED Driver */ 33/* I2C Config for LED Driver */
34#define SNLED27351_DRIVER_COUNT 2
35#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 34#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
36#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO 35#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO
37#define I2C1_OPMODE OPMODE_I2C 36#define I2C1_OPMODE OPMODE_I2C
diff --git a/keyboards/clueboard/66_hotswap/gen1/config.h b/keyboards/clueboard/66_hotswap/gen1/config.h
index 1165fe79ac..922426e87b 100644
--- a/keyboards/clueboard/66_hotswap/gen1/config.h
+++ b/keyboards/clueboard/66_hotswap/gen1/config.h
@@ -37,7 +37,6 @@
37#define I2C1_SCL_PIN B8 37#define I2C1_SCL_PIN B8
38#define I2C1_SDA_PIN B9 38#define I2C1_SDA_PIN B9
39 39
40#define IS31FL3731_DRIVER_COUNT 1
41#define LED_MATRIX_LED_COUNT 71 40#define LED_MATRIX_LED_COUNT 71
42 41
43// LED Matrix Animation modes. Explicitly enabled 42// LED Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/darkproject/kd87a_bfg_edition/config.h b/keyboards/darkproject/kd87a_bfg_edition/config.h
index a7498186b4..4ac83ab9f6 100644
--- a/keyboards/darkproject/kd87a_bfg_edition/config.h
+++ b/keyboards/darkproject/kd87a_bfg_edition/config.h
@@ -37,7 +37,6 @@
37#define DRIVER_1_EN C13 37#define DRIVER_1_EN C13
38#define DRIVER_2_EN C13 38#define DRIVER_2_EN C13
39 39
40#define DRIVER_COUNT 2
41#define DRIVER_1_LED_TOTAL 68 40#define DRIVER_1_LED_TOTAL 68
42#define DRIVER_2_LED_TOTAL 54 41#define DRIVER_2_LED_TOTAL 54
43#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 42#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/dp60/config.h b/keyboards/dp60/config.h
index 7d5288b9e6..3c65d94736 100644
--- a/keyboards/dp60/config.h
+++ b/keyboards/dp60/config.h
@@ -35,7 +35,6 @@
35//rgb matrix setting 35//rgb matrix setting
36#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 36#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
37#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC 37#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
38#define IS31FL3731_DRIVER_COUNT 2
39#define DRIVER_1_LED_TOTAL 36 38#define DRIVER_1_LED_TOTAL 36
40#define DRIVER_2_LED_TOTAL 36 39#define DRIVER_2_LED_TOTAL 36
41#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 40#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/drop/alt/v2/config.h b/keyboards/drop/alt/v2/config.h
index 1ab3584355..2dfae36a49 100644
--- a/keyboards/drop/alt/v2/config.h
+++ b/keyboards/drop/alt/v2/config.h
@@ -16,7 +16,6 @@
16 16
17#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_VCC 17#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_VCC
18#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_VCC_VCC 18#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_VCC_VCC
19#define IS31FL3733_DRIVER_COUNT 2
20#define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ 19#define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ
21 20
22#define RGB_MATRIX_CYCLE_ZONES_ENABLE 21#define RGB_MATRIX_CYCLE_ZONES_ENABLE
diff --git a/keyboards/drop/cstm80/config.h b/keyboards/drop/cstm80/config.h
index 0f92c88855..3b3f6ae6b7 100644
--- a/keyboards/drop/cstm80/config.h
+++ b/keyboards/drop/cstm80/config.h
@@ -11,7 +11,6 @@
11 11
12#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 12#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
13#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_VCC_VCC 13#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_VCC_VCC
14#define IS31FL3733_DRIVER_COUNT 2
15#define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ 14#define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ
16 15
17#define RGB_MATRIX_CAPS_LOCK_INDEX 48 16#define RGB_MATRIX_CAPS_LOCK_INDEX 48
diff --git a/keyboards/drop/ctrl/v2/config.h b/keyboards/drop/ctrl/v2/config.h
index e3e6a55b46..c0a259492b 100644
--- a/keyboards/drop/ctrl/v2/config.h
+++ b/keyboards/drop/ctrl/v2/config.h
@@ -16,7 +16,6 @@
16 16
17#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_VCC 17#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_VCC
18#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_VCC_VCC 18#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_VCC_VCC
19#define IS31FL3733_DRIVER_COUNT 2
20#define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ 19#define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ
21 20
22#define RGB_MATRIX_CYCLE_ZONES_ENABLE 21#define RGB_MATRIX_CYCLE_ZONES_ENABLE
diff --git a/keyboards/drop/sense75/config.h b/keyboards/drop/sense75/config.h
index 1bb878a441..448d223d48 100644
--- a/keyboards/drop/sense75/config.h
+++ b/keyboards/drop/sense75/config.h
@@ -11,7 +11,6 @@
11 11
12#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 12#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
13#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_VCC_VCC 13#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_VCC_VCC
14#define IS31FL3733_DRIVER_COUNT 2
15#define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ 14#define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ
16 15
17#define RGB_MATRIX_CYCLE_ZONES_ENABLE 16#define RGB_MATRIX_CYCLE_ZONES_ENABLE
diff --git a/keyboards/drop/shift/v2/config.h b/keyboards/drop/shift/v2/config.h
index 50d6ab5403..e912e3805f 100644
--- a/keyboards/drop/shift/v2/config.h
+++ b/keyboards/drop/shift/v2/config.h
@@ -17,7 +17,6 @@
17#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_VCC 17#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_VCC
18#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_VCC_VCC 18#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_VCC_VCC
19#define IS31FL3733_I2C_ADDRESS_3 IS31FL3733_I2C_ADDRESS_GND_GND 19#define IS31FL3733_I2C_ADDRESS_3 IS31FL3733_I2C_ADDRESS_GND_GND
20#define IS31FL3733_DRIVER_COUNT 3
21#define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ 20#define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ
22 21
23#define RGB_MATRIX_CYCLE_ZONES_ENABLE 22#define RGB_MATRIX_CYCLE_ZONES_ENABLE
diff --git a/keyboards/durgod/dgk6x/config.h b/keyboards/durgod/dgk6x/config.h
index 6af420589c..7c85f977ba 100644
--- a/keyboards/durgod/dgk6x/config.h
+++ b/keyboards/durgod/dgk6x/config.h
@@ -37,7 +37,6 @@
37#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 37#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
38#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_VCC 38#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_VCC
39 39
40#define IS31FL3733_DRIVER_COUNT 2
41#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 40#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
42 41
43/* I2C Alternate function settings */ 42/* I2C Alternate function settings */
diff --git a/keyboards/dztech/dz60rgb/v1/config.h b/keyboards/dztech/dz60rgb/v1/config.h
index 56eb23e52b..af72678922 100644
--- a/keyboards/dztech/dz60rgb/v1/config.h
+++ b/keyboards/dztech/dz60rgb/v1/config.h
@@ -56,6 +56,5 @@
56 56
57# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 57# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
58# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 58# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
59# define IS31FL3733_DRIVER_COUNT 1
60# define RGB_MATRIX_LED_COUNT 63 59# define RGB_MATRIX_LED_COUNT 63
61#endif 60#endif
diff --git a/keyboards/dztech/dz60rgb/v2/config.h b/keyboards/dztech/dz60rgb/v2/config.h
index 6af87a6826..2470e7b3f9 100644
--- a/keyboards/dztech/dz60rgb/v2/config.h
+++ b/keyboards/dztech/dz60rgb/v2/config.h
@@ -54,6 +54,5 @@
54// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH 54// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
55 55
56# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 56# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
57# define IS31FL3733_DRIVER_COUNT 1
58# define RGB_MATRIX_LED_COUNT 63 57# define RGB_MATRIX_LED_COUNT 63
59#endif 58#endif
diff --git a/keyboards/dztech/dz60rgb/v2_1/config.h b/keyboards/dztech/dz60rgb/v2_1/config.h
index 47f4a73e2a..05cfa7d4e1 100644
--- a/keyboards/dztech/dz60rgb/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb/v2_1/config.h
@@ -70,6 +70,5 @@
70// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH 70// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
71 71
72# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 72# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
73# define IS31FL3733_DRIVER_COUNT 1
74# define RGB_MATRIX_LED_COUNT 63 73# define RGB_MATRIX_LED_COUNT 63
75#endif 74#endif
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/config.h b/keyboards/dztech/dz60rgb_ansi/v1/config.h
index 7b9ecc6532..674871ec49 100644
--- a/keyboards/dztech/dz60rgb_ansi/v1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v1/config.h
@@ -56,6 +56,5 @@
56 56
57# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 57# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
58# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 58# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
59# define IS31FL3733_DRIVER_COUNT 1
60# define RGB_MATRIX_LED_COUNT 61 59# define RGB_MATRIX_LED_COUNT 61
61#endif 60#endif
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/config.h b/keyboards/dztech/dz60rgb_ansi/v2/config.h
index bda53e59bd..0b458818bc 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v2/config.h
@@ -54,6 +54,5 @@
54// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH 54// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
55 55
56# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 56# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
57# define IS31FL3733_DRIVER_COUNT 1
58# define RGB_MATRIX_LED_COUNT 61 57# define RGB_MATRIX_LED_COUNT 61
59#endif 58#endif
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
index e5261408d4..75ccef8193 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
@@ -70,6 +70,5 @@
70// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH 70// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
71 71
72# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 72# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
73# define IS31FL3733_DRIVER_COUNT 1
74# define RGB_MATRIX_LED_COUNT 61 73# define RGB_MATRIX_LED_COUNT 61
75#endif 74#endif
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/config.h b/keyboards/dztech/dz60rgb_wkl/v1/config.h
index c4fa73ef30..ac79efd26c 100644
--- a/keyboards/dztech/dz60rgb_wkl/v1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v1/config.h
@@ -56,6 +56,5 @@
56 56
57# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 57# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
58# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 58# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
59# define IS31FL3733_DRIVER_COUNT 1
60# define RGB_MATRIX_LED_COUNT 62 59# define RGB_MATRIX_LED_COUNT 62
61#endif 60#endif
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/config.h b/keyboards/dztech/dz60rgb_wkl/v2/config.h
index fb6463f2d8..a341a18e0d 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2/config.h
@@ -51,6 +51,5 @@
51// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH 51// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
52 52
53# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 53# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
54# define IS31FL3733_DRIVER_COUNT 1
55# define RGB_MATRIX_LED_COUNT 62 54# define RGB_MATRIX_LED_COUNT 62
56#endif 55#endif
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
index e69fcae0aa..13169e21f5 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
@@ -70,6 +70,5 @@
70// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH 70// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
71 71
72# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 72# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
73# define IS31FL3733_DRIVER_COUNT 1
74# define RGB_MATRIX_LED_COUNT 62 73# define RGB_MATRIX_LED_COUNT 62
75#endif 74#endif
diff --git a/keyboards/dztech/dz64rgb/config.h b/keyboards/dztech/dz64rgb/config.h
index 25e7e110fd..edfc7b7171 100644
--- a/keyboards/dztech/dz64rgb/config.h
+++ b/keyboards/dztech/dz64rgb/config.h
@@ -49,7 +49,6 @@
49#define ENABLE_RGB_MATRIX_TYPING_HEATMAP 49#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
50#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 50#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
51#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 51#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
52#define IS31FL3733_DRIVER_COUNT 1
53#define RGB_MATRIX_LED_COUNT 64 52#define RGB_MATRIX_LED_COUNT 64
54#endif 53#endif
55#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 54#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/dztech/dz65rgb/v1/config.h b/keyboards/dztech/dz65rgb/v1/config.h
index d8d255ff5c..b9203346dd 100644
--- a/keyboards/dztech/dz65rgb/v1/config.h
+++ b/keyboards/dztech/dz65rgb/v1/config.h
@@ -72,7 +72,6 @@
72# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 72# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
73# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 73# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
74# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC 74# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
75# define IS31FL3731_DRIVER_COUNT 2
76# define DRIVER_1_LED_TOTAL 35 75# define DRIVER_1_LED_TOTAL 35
77# define DRIVER_2_LED_TOTAL 33 76# define DRIVER_2_LED_TOTAL 33
78# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 77# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/dztech/dz65rgb/v2/config.h b/keyboards/dztech/dz65rgb/v2/config.h
index f24beacd80..600687c245 100644
--- a/keyboards/dztech/dz65rgb/v2/config.h
+++ b/keyboards/dztech/dz65rgb/v2/config.h
@@ -72,7 +72,6 @@
72# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 72# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
73# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 73# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
74# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC 74# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
75# define IS31FL3731_DRIVER_COUNT 2
76# define DRIVER_1_LED_TOTAL 35 75# define DRIVER_1_LED_TOTAL 35
77# define DRIVER_2_LED_TOTAL 33 76# define DRIVER_2_LED_TOTAL 33
78# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 77# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/dztech/dz65rgb/v3/config.h b/keyboards/dztech/dz65rgb/v3/config.h
index 5d75a7f2da..1398a378f8 100755
--- a/keyboards/dztech/dz65rgb/v3/config.h
+++ b/keyboards/dztech/dz65rgb/v3/config.h
@@ -73,7 +73,6 @@
73 73
74# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 74# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
75# define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 75# define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
76# define IS31FL3741_DRIVER_COUNT 1
77# define RGB_MATRIX_LED_COUNT 68 76# define RGB_MATRIX_LED_COUNT 68
78# define DRIVER_INDICATOR_LED_TOTAL 0 77# define DRIVER_INDICATOR_LED_TOTAL 0
79#endif 78#endif
diff --git a/keyboards/dztech/tofu/ii/v1/config.h b/keyboards/dztech/tofu/ii/v1/config.h
index 3eefdf7cb2..36741e1168 100644
--- a/keyboards/dztech/tofu/ii/v1/config.h
+++ b/keyboards/dztech/tofu/ii/v1/config.h
@@ -81,7 +81,6 @@
81# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 81# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
82# define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND 82# define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
83# define IS31FL3737_I2C_ADDRESS_2 IS31FL3737_I2C_ADDRESS_VCC 83# define IS31FL3737_I2C_ADDRESS_2 IS31FL3737_I2C_ADDRESS_VCC
84# define IS31FL3737_DRIVER_COUNT 2
85# define DRIVER_1_LED_TOTAL 46 84# define DRIVER_1_LED_TOTAL 46
86# define DRIVER_2_LED_TOTAL 20 85# define DRIVER_2_LED_TOTAL 20
87# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 86# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/dztech/tofu/jr/v1/config.h b/keyboards/dztech/tofu/jr/v1/config.h
index f3a16eeefe..74e5ed0848 100644
--- a/keyboards/dztech/tofu/jr/v1/config.h
+++ b/keyboards/dztech/tofu/jr/v1/config.h
@@ -81,7 +81,6 @@
81# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 81# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
82# define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND 82# define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
83# define IS31FL3737_I2C_ADDRESS_2 IS31FL3737_I2C_ADDRESS_VCC 83# define IS31FL3737_I2C_ADDRESS_2 IS31FL3737_I2C_ADDRESS_VCC
84# define IS31FL3737_DRIVER_COUNT 2
85# define DRIVER_1_LED_TOTAL 48 84# define DRIVER_1_LED_TOTAL 48
86# define DRIVER_2_LED_TOTAL 20 85# define DRIVER_2_LED_TOTAL 20
87# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 86# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
index 3266c9db0e..af1e14c49f 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -93,7 +93,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
93// RGB backlight 93// RGB backlight
94#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 94#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
95#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC 95#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
96#define IS31FL3731_DRIVER_COUNT 2
97#define DRIVER_1_LED_TOTAL 24 96#define DRIVER_1_LED_TOTAL 24
98#define DRIVER_2_LED_TOTAL 24 97#define DRIVER_2_LED_TOTAL 24
99#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 98#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/evyd13/atom47/rev5/config.h b/keyboards/evyd13/atom47/rev5/config.h
index 37e267acf1..53bbf4f51b 100644
--- a/keyboards/evyd13/atom47/rev5/config.h
+++ b/keyboards/evyd13/atom47/rev5/config.h
@@ -39,7 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
39//#define NO_ACTION_ONESHOT 39//#define NO_ACTION_ONESHOT
40 40
41#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 41#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
42#define IS31FL3733_DRIVER_COUNT 1
43#define RGB_MATRIX_LED_COUNT 64 42#define RGB_MATRIX_LED_COUNT 64
44 43
45// RGB Matrix Animation modes. Explicitly enabled 44// RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/exclusive/e6_rgb/config.h b/keyboards/exclusive/e6_rgb/config.h
index 1f98a327a8..62eb2320f7 100644
--- a/keyboards/exclusive/e6_rgb/config.h
+++ b/keyboards/exclusive/e6_rgb/config.h
@@ -6,5 +6,4 @@
6 6
7#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 7#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
8 8
9#define IS31FL3733_DRIVER_COUNT 1
10#define RGB_MATRIX_LED_COUNT 63 9#define RGB_MATRIX_LED_COUNT 63
diff --git a/keyboards/fallacy/config.h b/keyboards/fallacy/config.h
index 65cea1d5c1..14df31805d 100755
--- a/keyboards/fallacy/config.h
+++ b/keyboards/fallacy/config.h
@@ -19,7 +19,6 @@
19 * Using the default defines here, but using a custom implementation 19 * Using the default defines here, but using a custom implementation
20 */ 20 */
21#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 21#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
22#define IS31FL3731_DRIVER_COUNT 1
23#define IS31FL3731_LED_COUNT 3 22#define IS31FL3731_LED_COUNT 3
24 23
25/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap 24/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
diff --git a/keyboards/feker/ik75/config.h b/keyboards/feker/ik75/config.h
index 41056f09d6..aed1907803 100644
--- a/keyboards/feker/ik75/config.h
+++ b/keyboards/feker/ik75/config.h
@@ -27,7 +27,6 @@
27 /* RGB Matrix config */ 27 /* RGB Matrix config */
28 #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_VCC_VCC 28 #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_VCC_VCC
29 #define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_GND 29 #define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_GND
30 #define IS31FL3733_DRIVER_COUNT 2
31 #define DRIVER_1_LED_TOTAL 63 30 #define DRIVER_1_LED_TOTAL 63
32 #define DRIVER_2_LED_TOTAL 64 31 #define DRIVER_2_LED_TOTAL 64
33 32
diff --git a/keyboards/ferris/0_2/bling/config.h b/keyboards/ferris/0_2/bling/config.h
index 021c5750e2..64e7a6de2d 100644
--- a/keyboards/ferris/0_2/bling/config.h
+++ b/keyboards/ferris/0_2/bling/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
20/* LED Drivers */ 20/* LED Drivers */
21#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 21#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
22#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL 22#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL
23#define IS31FL3731_DRIVER_COUNT 2
24#define DRIVER_1_LED_TOTAL 7 23#define DRIVER_1_LED_TOTAL 7
25#define DRIVER_2_LED_TOTAL 7 24#define DRIVER_2_LED_TOTAL 7
26#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 25#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/flashquark/horizon_z/config.h b/keyboards/flashquark/horizon_z/config.h
index 07a827bbf6..ddeafe578d 100755
--- a/keyboards/flashquark/horizon_z/config.h
+++ b/keyboards/flashquark/horizon_z/config.h
@@ -73,6 +73,5 @@
73// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH 73// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
74 74
75# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 75# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
76# define IS31FL3733_DRIVER_COUNT 1
77# define RGB_MATRIX_LED_COUNT 62 76# define RGB_MATRIX_LED_COUNT 62
78#endif 77#endif
diff --git a/keyboards/frooastboard/walnut/config.h b/keyboards/frooastboard/walnut/config.h
index 08dfd3d842..0f163f1e3d 100644
--- a/keyboards/frooastboard/walnut/config.h
+++ b/keyboards/frooastboard/walnut/config.h
@@ -4,7 +4,6 @@
4#pragma once 4#pragma once
5 5
6#define IS31FL3737_PWM_FREQUENCY IS31FL3737_PWM_FREQUENCY_26K7_HZ 6#define IS31FL3737_PWM_FREQUENCY IS31FL3737_PWM_FREQUENCY_26K7_HZ
7#define IS31FL3737_DRIVER_COUNT 1
8#define RGB_MATRIX_LED_COUNT 48 7#define RGB_MATRIX_LED_COUNT 48
9#define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND 8#define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
10 9
diff --git a/keyboards/geekboards/tester/config.h b/keyboards/geekboards/tester/config.h
index 440384949e..c71ee9f351 100644
--- a/keyboards/geekboards/tester/config.h
+++ b/keyboards/geekboards/tester/config.h
@@ -57,7 +57,6 @@
57 57
58# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 58# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
59# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL 59# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL
60# define IS31FL3731_DRIVER_COUNT 2
61# define DRIVER_1_LED_TOTAL 8 60# define DRIVER_1_LED_TOTAL 8
62# define DRIVER_2_LED_TOTAL 0 61# define DRIVER_2_LED_TOTAL 0
63# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 62# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/gizmo_engineering/gk6/config.h b/keyboards/gizmo_engineering/gk6/config.h
index a6bf747adf..c405eeaf0a 100755
--- a/keyboards/gizmo_engineering/gk6/config.h
+++ b/keyboards/gizmo_engineering/gk6/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
21#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 21#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
22#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC 22#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
23 23
24#define IS31FL3731_DRIVER_COUNT 2
25#define DRIVER_1_LED_TOTAL 32 24#define DRIVER_1_LED_TOTAL 32
26#define DRIVER_2_LED_TOTAL 32 25#define DRIVER_2_LED_TOTAL 32
27#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 26#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/gmmk/gmmk2/p65/config.h b/keyboards/gmmk/gmmk2/p65/config.h
index 66986293cb..ce9ff69433 100644
--- a/keyboards/gmmk/gmmk2/p65/config.h
+++ b/keyboards/gmmk/gmmk2/p65/config.h
@@ -34,7 +34,6 @@
34#define AW20216S_EN_PIN_1 C13 34#define AW20216S_EN_PIN_1 C13
35#define AW20216S_EN_PIN_2 C13 35#define AW20216S_EN_PIN_2 C13
36 36
37#define AW20216S_DRIVER_COUNT 2
38#define DRIVER_1_LED_TOTAL 54 37#define DRIVER_1_LED_TOTAL 54
39#define DRIVER_2_LED_TOTAL 34 38#define DRIVER_2_LED_TOTAL 34
40#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 39#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/gmmk/gmmk2/p96/config.h b/keyboards/gmmk/gmmk2/p96/config.h
index 03e37f3088..fb21c571f5 100644
--- a/keyboards/gmmk/gmmk2/p96/config.h
+++ b/keyboards/gmmk/gmmk2/p96/config.h
@@ -37,7 +37,6 @@
37#define AW20216S_EN_PIN_1 C13 37#define AW20216S_EN_PIN_1 C13
38#define AW20216S_EN_PIN_2 C13 38#define AW20216S_EN_PIN_2 C13
39 39
40#define AW20216S_DRIVER_COUNT 2
41#define DRIVER_1_LED_TOTAL 66 40#define DRIVER_1_LED_TOTAL 66
42#define DRIVER_2_LED_TOTAL 54 41#define DRIVER_2_LED_TOTAL 54
43#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 42#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/gmmk/numpad/config.h b/keyboards/gmmk/numpad/config.h
index d263ff4abf..3627ab503c 100644
--- a/keyboards/gmmk/numpad/config.h
+++ b/keyboards/gmmk/numpad/config.h
@@ -32,8 +32,6 @@
32#define AW20216S_EN_PIN_1 A15 32#define AW20216S_EN_PIN_1 A15
33#define AW20216S_PW_EN_PIN_1 B13 33#define AW20216S_PW_EN_PIN_1 B13
34 34
35#define AW20216S_DRIVER_COUNT 1
36
37#define RGB_MATRIX_LED_COUNT 31 35#define RGB_MATRIX_LED_COUNT 31
38 36
39#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B6 37#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B6
diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h
index c1772fec85..995dd95ec8 100644
--- a/keyboards/gmmk/pro/config.h
+++ b/keyboards/gmmk/pro/config.h
@@ -31,8 +31,6 @@
31#define AW20216S_EN_PIN_1 C13 31#define AW20216S_EN_PIN_1 C13
32#define AW20216S_EN_PIN_2 C13 32#define AW20216S_EN_PIN_2 C13
33 33
34#define AW20216S_DRIVER_COUNT 2
35
36#define RGB_DISABLE_WHEN_USB_SUSPENDED 34#define RGB_DISABLE_WHEN_USB_SUSPENDED
37 35
38// RGB Matrix Animation modes. Explicitly enabled 36// RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/handwired/orbweaver/config.h b/keyboards/handwired/orbweaver/config.h
index 0004beb63b..6a6670a6f6 100644
--- a/keyboards/handwired/orbweaver/config.h
+++ b/keyboards/handwired/orbweaver/config.h
@@ -17,7 +17,6 @@
17 17
18#pragma once 18#pragma once
19 19
20#define IS31FL3731_DRIVER_COUNT 1
21#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 20#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
22#define RGB_MATRIX_LED_COUNT 20 21#define RGB_MATRIX_LED_COUNT 20
23#define I2C1_CLOCK_SPEED 100000 22#define I2C1_CLOCK_SPEED 100000
diff --git a/keyboards/hs60/v1/config.h b/keyboards/hs60/v1/config.h
index b1b7669d4d..c864464390 100644
--- a/keyboards/hs60/v1/config.h
+++ b/keyboards/hs60/v1/config.h
@@ -44,7 +44,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
44#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 44#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
45#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL 45#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL
46 46
47#define IS31FL3731_DRIVER_COUNT 2
48#define DRIVER_1_LED_TOTAL 30 47#define DRIVER_1_LED_TOTAL 30
49 48
50#ifdef HS60_ANSI 49#ifdef HS60_ANSI
diff --git a/keyboards/hs60/v2/ansi/config.h b/keyboards/hs60/v2/ansi/config.h
index e4dc24dc33..e96c36313c 100644
--- a/keyboards/hs60/v2/ansi/config.h
+++ b/keyboards/hs60/v2/ansi/config.h
@@ -54,7 +54,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
54#define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 } 54#define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 }
55 55
56#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 56#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
57#define IS31FL3733_DRIVER_COUNT 1
58#define IS31FL3733_LED_COUNT 64 57#define IS31FL3733_LED_COUNT 64
59 58
60// These define which keys in the matrix are alphas/mods 59// These define which keys in the matrix are alphas/mods
diff --git a/keyboards/hs60/v2/hhkb/config.h b/keyboards/hs60/v2/hhkb/config.h
index 029e1ebb18..6a6fa375bc 100644
--- a/keyboards/hs60/v2/hhkb/config.h
+++ b/keyboards/hs60/v2/hhkb/config.h
@@ -54,7 +54,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
54#define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 } 54#define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 }
55 55
56#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 56#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
57#define IS31FL3733_DRIVER_COUNT 1
58#define IS31FL3733_LED_COUNT 64 57#define IS31FL3733_LED_COUNT 64
59 58
60// These define which keys in the matrix are alphas/mods 59// These define which keys in the matrix are alphas/mods
diff --git a/keyboards/hs60/v2/iso/config.h b/keyboards/hs60/v2/iso/config.h
index 52cada51a6..5f1a55b1d1 100644
--- a/keyboards/hs60/v2/iso/config.h
+++ b/keyboards/hs60/v2/iso/config.h
@@ -51,7 +51,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
51#define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 } 51#define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 }
52 52
53#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 53#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
54#define IS31FL3733_DRIVER_COUNT 1
55#define IS31FL3733_LED_COUNT 64 54#define IS31FL3733_LED_COUNT 64
56 55
57// These define which keys in the matrix are alphas/mods 56// These define which keys in the matrix are alphas/mods
diff --git a/keyboards/ilumkb/simpler61/config.h b/keyboards/ilumkb/simpler61/config.h
index e1b701dffe..7978b495de 100644
--- a/keyboards/ilumkb/simpler61/config.h
+++ b/keyboards/ilumkb/simpler61/config.h
@@ -22,7 +22,6 @@
22#define RGB_MATRIX_LED_FLUSH_LIMIT 26 22#define RGB_MATRIX_LED_FLUSH_LIMIT 26
23#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 23#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
24#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 24#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
25#define IS31FL3741_DRIVER_COUNT 1
26#define DRIVER_1_LED_TOTAL 61 25#define DRIVER_1_LED_TOTAL 61
27#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL 26#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
28#define DRIVER_INDICATOR_LED_TOTAL 0 27#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/ilumkb/simpler64/config.h b/keyboards/ilumkb/simpler64/config.h
index 95611e3f49..09dc7dc80f 100644
--- a/keyboards/ilumkb/simpler64/config.h
+++ b/keyboards/ilumkb/simpler64/config.h
@@ -22,7 +22,6 @@
22#define RGB_MATRIX_LED_FLUSH_LIMIT 26 22#define RGB_MATRIX_LED_FLUSH_LIMIT 26
23#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 23#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
24#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 24#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
25#define IS31FL3741_DRIVER_COUNT 1
26#define DRIVER_1_LED_TOTAL 64 25#define DRIVER_1_LED_TOTAL 64
27#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL 26#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
28#define DRIVER_INDICATOR_LED_TOTAL 0 27#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/inett_studio/sqx/hotswap/config.h b/keyboards/inett_studio/sqx/hotswap/config.h
index dc1df2c2f6..a53a2132fa 100644
--- a/keyboards/inett_studio/sqx/hotswap/config.h
+++ b/keyboards/inett_studio/sqx/hotswap/config.h
@@ -34,7 +34,6 @@
34#define DRIVER_2_LED_TOTAL 31 34#define DRIVER_2_LED_TOTAL 31
35#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 35#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
36#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC 36#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
37#define IS31FL3731_DRIVER_COUNT 2
38#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 37#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
39 38
40#if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE) 39#if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE)
diff --git a/keyboards/inett_studio/sqx/universal/config.h b/keyboards/inett_studio/sqx/universal/config.h
index 620811025b..dd123bd7a9 100644
--- a/keyboards/inett_studio/sqx/universal/config.h
+++ b/keyboards/inett_studio/sqx/universal/config.h
@@ -34,7 +34,6 @@
34#define DRIVER_2_LED_TOTAL 36 34#define DRIVER_2_LED_TOTAL 36
35#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 35#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
36#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC 36#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
37#define IS31FL3731_DRIVER_COUNT 2
38#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 37#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
39 38
40#if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE) 39#if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE)
diff --git a/keyboards/inland/kb83/config.h b/keyboards/inland/kb83/config.h
index f9c080dccf..be26cf869c 100644
--- a/keyboards/inland/kb83/config.h
+++ b/keyboards/inland/kb83/config.h
@@ -33,7 +33,6 @@
33#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 33#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
34 34
35/* I2C Config for LED Driver */ 35/* I2C Config for LED Driver */
36#define SNLED27351_DRIVER_COUNT 2
37#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 36#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
38#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO 37#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO
39#define I2C1_SDA_PIN B7 38#define I2C1_SDA_PIN B7
diff --git a/keyboards/inland/mk47/config.h b/keyboards/inland/mk47/config.h
index e163747e31..e5026bd0e7 100644
--- a/keyboards/inland/mk47/config.h
+++ b/keyboards/inland/mk47/config.h
@@ -25,7 +25,6 @@
25#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 25#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
26 26
27/* I2C Config for LED Driver */ 27/* I2C Config for LED Driver */
28#define SNLED27351_DRIVER_COUNT 1
29#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 28#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
30 29
31/* WB32 MCU has no default definition */ 30/* WB32 MCU has no default definition */
diff --git a/keyboards/inland/v83p/config.h b/keyboards/inland/v83p/config.h
index c1e9f4825e..c39cb6421f 100644
--- a/keyboards/inland/v83p/config.h
+++ b/keyboards/inland/v83p/config.h
@@ -5,7 +5,6 @@
5#define ENCODER_DEFAULT_POS 0x3 5#define ENCODER_DEFAULT_POS 0x3
6 6
7/* I2C Config for LED Driver */ 7/* I2C Config for LED Driver */
8#define SNLED27351_DRIVER_COUNT 2
9#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 8#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
10#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO 9#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO
11#define I2C1_SDA_PIN B7 10#define I2C1_SDA_PIN B7
diff --git a/keyboards/input_club/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h
index 0f9b239466..3757ca3d60 100644
--- a/keyboards/input_club/ergodox_infinity/config.h
+++ b/keyboards/input_club/ergodox_infinity/config.h
@@ -44,7 +44,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
44 44
45/* LED matrix driver */ 45/* LED matrix driver */
46#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 46#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
47#define IS31FL3731_DRIVER_COUNT 1
48#define LED_MATRIX_LED_COUNT 76 47#define LED_MATRIX_LED_COUNT 76
49#define LED_MATRIX_SPLIT { 38, 38 } 48#define LED_MATRIX_SPLIT { 38, 38 }
50#define LED_DISABLE_WHEN_USB_SUSPENDED 49#define LED_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/input_club/infinity60/led/config.h b/keyboards/input_club/infinity60/led/config.h
index b783ce0287..293b192d60 100644
--- a/keyboards/input_club/infinity60/led/config.h
+++ b/keyboards/input_club/infinity60/led/config.h
@@ -5,7 +5,6 @@
5 5
6#define LED_MATRIX_LED_COUNT 63 6#define LED_MATRIX_LED_COUNT 63
7 7
8#define IS31FL3731_DRIVER_COUNT 1
9#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 8#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
10 9
11#define I2C1_CLOCK_SPEED 400000 10#define I2C1_CLOCK_SPEED 400000
diff --git a/keyboards/input_club/whitefox/config.h b/keyboards/input_club/whitefox/config.h
index 8993c2c760..2d6affe84a 100644
--- a/keyboards/input_club/whitefox/config.h
+++ b/keyboards/input_club/whitefox/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
22 22
23/* LED matrix driver */ 23/* LED matrix driver */
24#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 24#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
25#define IS31FL3731_DRIVER_COUNT 1
26#define LED_MATRIX_LED_COUNT 71 25#define LED_MATRIX_LED_COUNT 71
27#define LED_DISABLE_WHEN_USB_SUSPENDED 26#define LED_DISABLE_WHEN_USB_SUSPENDED
28 27
diff --git a/keyboards/jukaie/jk01/config.h b/keyboards/jukaie/jk01/config.h
index e83415f5ba..62c709a917 100644
--- a/keyboards/jukaie/jk01/config.h
+++ b/keyboards/jukaie/jk01/config.h
@@ -37,7 +37,6 @@
37#define DRIVER_1_EN C13 37#define DRIVER_1_EN C13
38#define DRIVER_2_EN C13 38#define DRIVER_2_EN C13
39 39
40#define DRIVER_COUNT 2
41#define DRIVER_1_LED_TOTAL 66 40#define DRIVER_1_LED_TOTAL 66
42#define DRIVER_2_LED_TOTAL 19 41#define DRIVER_2_LED_TOTAL 19
43#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 42#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/kbdcraft/adam64/config.h b/keyboards/kbdcraft/adam64/config.h
index 11ddc53a6f..511eb7f8ab 100644
--- a/keyboards/kbdcraft/adam64/config.h
+++ b/keyboards/kbdcraft/adam64/config.h
@@ -23,7 +23,6 @@
23#define I2C1_CLOCK_SPEED 400000 23#define I2C1_CLOCK_SPEED 400000
24#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_16_9 24#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_16_9
25 25
26#define IS31FL3741_DRIVER_COUNT 1
27#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 26#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
28#define RGB_MATRIX_LED_COUNT 64 27#define RGB_MATRIX_LED_COUNT 64
29 28
diff --git a/keyboards/kbdfans/bella/rgb/config.h b/keyboards/kbdfans/bella/rgb/config.h
index c2ddea45eb..754f4e1eb8 100644
--- a/keyboards/kbdfans/bella/rgb/config.h
+++ b/keyboards/kbdfans/bella/rgb/config.h
@@ -72,7 +72,6 @@
72//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR 72//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
73#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 73#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
74#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 74#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
75#define IS31FL3741_DRIVER_COUNT 1
76#define RGB_MATRIX_LED_COUNT 108 75#define RGB_MATRIX_LED_COUNT 108
77#define DRIVER_INDICATOR_LED_TOTAL 0 76#define DRIVER_INDICATOR_LED_TOTAL 0
78#endif 77#endif
diff --git a/keyboards/kbdfans/bella/rgb_iso/config.h b/keyboards/kbdfans/bella/rgb_iso/config.h
index 08d386d609..48284a5160 100644
--- a/keyboards/kbdfans/bella/rgb_iso/config.h
+++ b/keyboards/kbdfans/bella/rgb_iso/config.h
@@ -72,7 +72,6 @@
72//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR 72//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
73#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 73#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
74#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 74#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
75#define IS31FL3741_DRIVER_COUNT 1
76#define RGB_MATRIX_LED_COUNT 109 75#define RGB_MATRIX_LED_COUNT 109
77#define DRIVER_INDICATOR_LED_TOTAL 0 76#define DRIVER_INDICATOR_LED_TOTAL 0
78#endif 77#endif
diff --git a/keyboards/kbdfans/boop65/rgb/config.h b/keyboards/kbdfans/boop65/rgb/config.h
index 1e94d13d63..e37e2d1763 100644
--- a/keyboards/kbdfans/boop65/rgb/config.h
+++ b/keyboards/kbdfans/boop65/rgb/config.h
@@ -27,7 +27,6 @@
27# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set 27# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
28# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 28# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
29# define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 29# define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
30# define IS31FL3741_DRIVER_COUNT 1
31# define RGB_MATRIX_LED_COUNT 83 30# define RGB_MATRIX_LED_COUNT 83
32# define DRIVER_INDICATOR_LED_TOTAL 0 31# define DRIVER_INDICATOR_LED_TOTAL 0
33#define ENABLE_RGB_MATRIX_ALPHAS_MODS 32#define ENABLE_RGB_MATRIX_ALPHAS_MODS
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
index af73108f23..51b88510e5 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
@@ -57,7 +57,6 @@
57#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 57#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
58#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 58#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
59#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC 59#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
60#define IS31FL3731_DRIVER_COUNT 2
61#define DRIVER_1_LED_TOTAL 35 60#define DRIVER_1_LED_TOTAL 35
62#define DRIVER_2_LED_TOTAL 32 61#define DRIVER_2_LED_TOTAL 32
63#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 62#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
index 28b533a35d..bba655107d 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
@@ -57,7 +57,6 @@
57# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 57# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
58# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 58# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
59# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC 59# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
60# define IS31FL3731_DRIVER_COUNT 2
61# define DRIVER_1_LED_TOTAL 35 60# define DRIVER_1_LED_TOTAL 35
62# define DRIVER_2_LED_TOTAL 32 61# define DRIVER_2_LED_TOTAL 32
63# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 62# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
index 1b54895354..8dd12678ee 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
@@ -73,7 +73,6 @@
73#define RGB_MATRIX_LED_FLUSH_LIMIT 26 73#define RGB_MATRIX_LED_FLUSH_LIMIT 26
74#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 74#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
75#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 75#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
76#define IS31FL3741_DRIVER_COUNT 1
77#define RGB_MATRIX_LED_COUNT 67 76#define RGB_MATRIX_LED_COUNT 67
78#define DRIVER_INDICATOR_LED_TOTAL 0 77#define DRIVER_INDICATOR_LED_TOTAL 0
79#endif 78#endif
diff --git a/keyboards/kbdfans/kbdmini/config.h b/keyboards/kbdfans/kbdmini/config.h
index 768799c27a..be985880d0 100644
--- a/keyboards/kbdfans/kbdmini/config.h
+++ b/keyboards/kbdfans/kbdmini/config.h
@@ -54,6 +54,5 @@
54// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH 54// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
55 55
56#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 56#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
57#define IS31FL3733_DRIVER_COUNT 1
58#define RGB_MATRIX_LED_COUNT 52 57#define RGB_MATRIX_LED_COUNT 52
59#endif 58#endif
diff --git a/keyboards/kbdfans/maja/config.h b/keyboards/kbdfans/maja/config.h
index f996b4eb70..e07c5adf93 100755
--- a/keyboards/kbdfans/maja/config.h
+++ b/keyboards/kbdfans/maja/config.h
@@ -56,7 +56,6 @@
56#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 56#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
57#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 57#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
58#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 58#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
59#define IS31FL3731_DRIVER_COUNT 2
60#define DRIVER_1_LED_TOTAL 36 59#define DRIVER_1_LED_TOTAL 36
61#define DRIVER_2_LED_TOTAL 31 60#define DRIVER_2_LED_TOTAL 31
62#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 61#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/keebwerk/mega/ansi/config.h b/keyboards/keebwerk/mega/ansi/config.h
index c3b90cc2ca..8a110a91dc 100755
--- a/keyboards/keebwerk/mega/ansi/config.h
+++ b/keyboards/keebwerk/mega/ansi/config.h
@@ -52,7 +52,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
52 52
53#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 53#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
54#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_SDA 54#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_SDA
55#define IS31FL3733_DRIVER_COUNT 2
56#define IS31FL3733_LED_COUNT 128 55#define IS31FL3733_LED_COUNT 128
57 56
58// These define which keys in the matrix are alphas/mods 57// These define which keys in the matrix are alphas/mods
diff --git a/keyboards/keychron/c1_pro/ansi/rgb/config.h b/keyboards/keychron/c1_pro/ansi/rgb/config.h
index c3b52c5f24..a88319a63d 100644
--- a/keyboards/keychron/c1_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/c1_pro/ansi/rgb/config.h
@@ -20,7 +20,6 @@
20// #define MATRIX_UNSELECT_DRIVE_HIGH 20// #define MATRIX_UNSELECT_DRIVE_HIGH
21 21
22/* RGB Matrix Driver Configuration */ 22/* RGB Matrix Driver Configuration */
23#define SNLED27351_DRIVER_COUNT 2
24#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 23#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
25#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 24#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
26 25
diff --git a/keyboards/keychron/c1_pro/ansi/white/config.h b/keyboards/keychron/c1_pro/ansi/white/config.h
index 8c9cadf271..a8a836c5dd 100644
--- a/keyboards/keychron/c1_pro/ansi/white/config.h
+++ b/keyboards/keychron/c1_pro/ansi/white/config.h
@@ -20,7 +20,6 @@
20// #define MATRIX_UNSELECT_DRIVE_HIGH 20// #define MATRIX_UNSELECT_DRIVE_HIGH
21 21
22/* LED Matrix Driver Configuration */ 22/* LED Matrix Driver Configuration */
23#define SNLED27351_DRIVER_COUNT 1
24#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 23#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
25 24
26/* LED Matrix Configuration */ 25/* LED Matrix Configuration */
diff --git a/keyboards/keychron/c2_pro/ansi/rgb/config.h b/keyboards/keychron/c2_pro/ansi/rgb/config.h
index 25be9ae686..47b47b920d 100644
--- a/keyboards/keychron/c2_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/c2_pro/ansi/rgb/config.h
@@ -17,7 +17,6 @@
17#pragma once 17#pragma once
18 18
19/* RGB Matrix Driver Configuration */ 19/* RGB Matrix Driver Configuration */
20#define SNLED27351_DRIVER_COUNT 2
21#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 20#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
22#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 21#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
23 22
diff --git a/keyboards/keychron/c2_pro/ansi/white/config.h b/keyboards/keychron/c2_pro/ansi/white/config.h
index 9e09bf40ea..26c812ffef 100644
--- a/keyboards/keychron/c2_pro/ansi/white/config.h
+++ b/keyboards/keychron/c2_pro/ansi/white/config.h
@@ -17,7 +17,6 @@
17#pragma once 17#pragma once
18 18
19/* LED Matrix Driver Configuration */ 19/* LED Matrix Driver Configuration */
20#define SNLED27351_DRIVER_COUNT 1
21#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 20#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
22 21
23/* Set LED driver current */ 22/* Set LED driver current */
diff --git a/keyboards/keychron/q0/base/config.h b/keyboards/keychron/q0/base/config.h
index 82dd796660..1d6c1a6757 100644
--- a/keyboards/keychron/q0/base/config.h
+++ b/keyboards/keychron/q0/base/config.h
@@ -17,7 +17,6 @@
17#pragma once 17#pragma once
18 18
19/* RGB Matrix Driver Configuration */ 19/* RGB Matrix Driver Configuration */
20#define SNLED27351_DRIVER_COUNT 1
21#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 20#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
22 21
23/* RGB Matrix Configuration */ 22/* RGB Matrix Configuration */
diff --git a/keyboards/keychron/q0/plus/config.h b/keyboards/keychron/q0/plus/config.h
index 524a73c54d..01320b1f31 100644
--- a/keyboards/keychron/q0/plus/config.h
+++ b/keyboards/keychron/q0/plus/config.h
@@ -17,7 +17,6 @@
17#pragma once 17#pragma once
18 18
19/* RGB Matrix Driver Configuration */ 19/* RGB Matrix Driver Configuration */
20#define SNLED27351_DRIVER_COUNT 1
21#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 20#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
22 21
23/* RGB Matrix Configuration */ 22/* RGB Matrix Configuration */
diff --git a/keyboards/keychron/q10/config.h b/keyboards/keychron/q10/config.h
index 93941c3f19..eb3a56e9ad 100644
--- a/keyboards/keychron/q10/config.h
+++ b/keyboards/keychron/q10/config.h
@@ -30,7 +30,6 @@
30#define DIODE_DIRECTION ROW2COL 30#define DIODE_DIRECTION ROW2COL
31 31
32/* RGB Matrix Driver Configuration */ 32/* RGB Matrix Driver Configuration */
33#define SNLED27351_DRIVER_COUNT 2
34#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 33#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
35#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 34#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
36 35
diff --git a/keyboards/keychron/q11/config.h b/keyboards/keychron/q11/config.h
index 47a0d1ab2e..0d6b9c9c48 100755
--- a/keyboards/keychron/q11/config.h
+++ b/keyboards/keychron/q11/config.h
@@ -27,7 +27,6 @@
27#define MATRIX_MASKED // actual mask is defined by `matrix_mask` in `q11.c` 27#define MATRIX_MASKED // actual mask is defined by `matrix_mask` in `q11.c`
28 28
29/* RGB Matrix Driver Configuration */ 29/* RGB Matrix Driver Configuration */
30#define SNLED27351_DRIVER_COUNT 1
31#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 30#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
32 31
33/* Increase I2C speed to 1000 KHz */ 32/* Increase I2C speed to 1000 KHz */
diff --git a/keyboards/keychron/q12/config.h b/keyboards/keychron/q12/config.h
index dde7268405..cc24578c16 100644
--- a/keyboards/keychron/q12/config.h
+++ b/keyboards/keychron/q12/config.h
@@ -26,7 +26,6 @@
26#define DIODE_DIRECTION ROW2COL 26#define DIODE_DIRECTION ROW2COL
27 27
28/* RGB Matrix Driver Configuration */ 28/* RGB Matrix Driver Configuration */
29#define SNLED27351_DRIVER_COUNT 2
30#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 29#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
31#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 30#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
32 31
diff --git a/keyboards/keychron/q1v1/config.h b/keyboards/keychron/q1v1/config.h
index b758d438ff..ec1bcc5794 100644
--- a/keyboards/keychron/q1v1/config.h
+++ b/keyboards/keychron/q1v1/config.h
@@ -17,7 +17,6 @@
17#pragma once 17#pragma once
18 18
19/* RGB Matrix Driver Configuration */ 19/* RGB Matrix Driver Configuration */
20#define IS31FL3733_DRIVER_COUNT 2
21#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 20#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
22#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_VCC 21#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_VCC
23 22
diff --git a/keyboards/keychron/q1v2/config.h b/keyboards/keychron/q1v2/config.h
index b3edfbbad8..5e2a7eaa54 100644
--- a/keyboards/keychron/q1v2/config.h
+++ b/keyboards/keychron/q1v2/config.h
@@ -17,7 +17,6 @@
17#pragma once 17#pragma once
18 18
19/* RGB Matrix Driver Configuration */ 19/* RGB Matrix Driver Configuration */
20#define SNLED27351_DRIVER_COUNT 2
21#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 20#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
22#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 21#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
23 22
diff --git a/keyboards/keychron/q2/config.h b/keyboards/keychron/q2/config.h
index 486ce668b0..831612326b 100644
--- a/keyboards/keychron/q2/config.h
+++ b/keyboards/keychron/q2/config.h
@@ -22,7 +22,6 @@
22#define DIP_SWITCH_MATRIX_GRID { {4, 4} } 22#define DIP_SWITCH_MATRIX_GRID { {4, 4} }
23 23
24/* RGB Matrix Driver Configuration */ 24/* RGB Matrix Driver Configuration */
25#define SNLED27351_DRIVER_COUNT 2
26#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 25#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
27#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 26#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
28 27
diff --git a/keyboards/keychron/q3/config.h b/keyboards/keychron/q3/config.h
index 9558ecc211..f93da42353 100644
--- a/keyboards/keychron/q3/config.h
+++ b/keyboards/keychron/q3/config.h
@@ -17,7 +17,6 @@
17#pragma once 17#pragma once
18 18
19/* RGB Matrix Driver Configuration */ 19/* RGB Matrix Driver Configuration */
20#define SNLED27351_DRIVER_COUNT 2
21#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 20#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
22#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 21#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
23 22
diff --git a/keyboards/keychron/q4/ansi/v1/config.h b/keyboards/keychron/q4/ansi/v1/config.h
index be3324cb27..2f437c72c6 100644
--- a/keyboards/keychron/q4/ansi/v1/config.h
+++ b/keyboards/keychron/q4/ansi/v1/config.h
@@ -17,7 +17,6 @@
17#pragma once 17#pragma once
18 18
19/* RGB Matrix Driver Configuration */ 19/* RGB Matrix Driver Configuration */
20#define SNLED27351_DRIVER_COUNT 2
21#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 20#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
22#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 21#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
23 22
diff --git a/keyboards/keychron/q4/ansi/v2/config.h b/keyboards/keychron/q4/ansi/v2/config.h
index 82b534c699..029e7727a8 100644
--- a/keyboards/keychron/q4/ansi/v2/config.h
+++ b/keyboards/keychron/q4/ansi/v2/config.h
@@ -17,7 +17,6 @@
17#pragma once 17#pragma once
18 18
19/* RGB Matrix Driver Configuration */ 19/* RGB Matrix Driver Configuration */
20#define SNLED27351_DRIVER_COUNT 1
21#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 20#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
22 21
23/* RGB Matrix Configuration */ 22/* RGB Matrix Configuration */
diff --git a/keyboards/keychron/q4/iso/config.h b/keyboards/keychron/q4/iso/config.h
index 3f3b6f653d..8231b9eba8 100644
--- a/keyboards/keychron/q4/iso/config.h
+++ b/keyboards/keychron/q4/iso/config.h
@@ -17,7 +17,6 @@
17#pragma once 17#pragma once
18 18
19/* RGB Matrix Driver Configuration */ 19/* RGB Matrix Driver Configuration */
20#define SNLED27351_DRIVER_COUNT 1
21#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 20#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
22 21
23/* RGB Matrix Configuration */ 22/* RGB Matrix Configuration */
diff --git a/keyboards/keychron/q5/config.h b/keyboards/keychron/q5/config.h
index 89513dcaf8..0640331997 100644
--- a/keyboards/keychron/q5/config.h
+++ b/keyboards/keychron/q5/config.h
@@ -30,7 +30,6 @@
30#define DIODE_DIRECTION ROW2COL 30#define DIODE_DIRECTION ROW2COL
31 31
32/* RGB Matrix Driver Configuration */ 32/* RGB Matrix Driver Configuration */
33#define SNLED27351_DRIVER_COUNT 2
34#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 33#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
35#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 34#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
36 35
diff --git a/keyboards/keychron/q6/config.h b/keyboards/keychron/q6/config.h
index bf35a5a0f2..2edceb09d7 100644
--- a/keyboards/keychron/q6/config.h
+++ b/keyboards/keychron/q6/config.h
@@ -24,7 +24,6 @@
24#define DIODE_DIRECTION ROW2COL 24#define DIODE_DIRECTION ROW2COL
25 25
26/* RGB Matrix Driver Configuration */ 26/* RGB Matrix Driver Configuration */
27#define SNLED27351_DRIVER_COUNT 2
28#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 27#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
29#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 28#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
30 29
diff --git a/keyboards/keychron/q60/config.h b/keyboards/keychron/q60/config.h
index fe44486803..6b6c3c5f48 100644
--- a/keyboards/keychron/q60/config.h
+++ b/keyboards/keychron/q60/config.h
@@ -17,7 +17,6 @@
17#pragma once 17#pragma once
18 18
19/* RGB Matrix Driver Configuration */ 19/* RGB Matrix Driver Configuration */
20#define SNLED27351_DRIVER_COUNT 1
21#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 20#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
22 21
23/* Increase I2C speed to 1000 KHz */ 22/* Increase I2C speed to 1000 KHz */
diff --git a/keyboards/keychron/q65/config.h b/keyboards/keychron/q65/config.h
index 8d5f360826..84c4e9fc17 100644
--- a/keyboards/keychron/q65/config.h
+++ b/keyboards/keychron/q65/config.h
@@ -26,7 +26,6 @@
26 { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, A2, A3, A4, A5, A6, A7, B0, B1 } 26 { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, A2, A3, A4, A5, A6, A7, B0, B1 }
27 27
28/* RGB Matrix Driver Configuration */ 28/* RGB Matrix Driver Configuration */
29#define SNLED27351_DRIVER_COUNT 2
30#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 29#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
31#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 30#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
32 31
diff --git a/keyboards/keychron/q7/config.h b/keyboards/keychron/q7/config.h
index 4bf7d82096..4794c80011 100644
--- a/keyboards/keychron/q7/config.h
+++ b/keyboards/keychron/q7/config.h
@@ -17,7 +17,6 @@
17#pragma once 17#pragma once
18 18
19/* RGB Matrix Driver Configuration */ 19/* RGB Matrix Driver Configuration */
20#define SNLED27351_DRIVER_COUNT 2
21#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 20#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
22#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 21#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
23 22
diff --git a/keyboards/keychron/q8/config.h b/keyboards/keychron/q8/config.h
index abb1c6a970..7ecbf40b23 100644
--- a/keyboards/keychron/q8/config.h
+++ b/keyboards/keychron/q8/config.h
@@ -20,7 +20,6 @@
20// #define MATRIX_UNSELECT_DRIVE_HIGH 20// #define MATRIX_UNSELECT_DRIVE_HIGH
21 21
22/* RGB Matrix Driver Configuration */ 22/* RGB Matrix Driver Configuration */
23#define SNLED27351_DRIVER_COUNT 2
24#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 23#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
25#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 24#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
26 25
diff --git a/keyboards/keychron/q9/config.h b/keyboards/keychron/q9/config.h
index 24ce821942..4226980d3e 100644
--- a/keyboards/keychron/q9/config.h
+++ b/keyboards/keychron/q9/config.h
@@ -23,7 +23,6 @@
23#define DIP_SWITCH_MATRIX_GRID { { 3, 4 } } 23#define DIP_SWITCH_MATRIX_GRID { { 3, 4 } }
24 24
25/* RGB Matrix Driver Configuration */ 25/* RGB Matrix Driver Configuration */
26#define SNLED27351_DRIVER_COUNT 1
27#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 26#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
28 27
29/* Increase I2C speed to 1000 KHz */ 28/* Increase I2C speed to 1000 KHz */
diff --git a/keyboards/keychron/q9_plus/config.h b/keyboards/keychron/q9_plus/config.h
index 37599e6fdb..c9ef05b613 100755
--- a/keyboards/keychron/q9_plus/config.h
+++ b/keyboards/keychron/q9_plus/config.h
@@ -23,7 +23,6 @@
23#define DIP_SWITCH_MATRIX_GRID {{ 3, 4 }} 23#define DIP_SWITCH_MATRIX_GRID {{ 3, 4 }}
24 24
25/* RGB Matrix Driver Configuration */ 25/* RGB Matrix Driver Configuration */
26#define SNLED27351_DRIVER_COUNT 1
27#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 26#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
28 27
29/* Increase I2C speed to 1000 KHz */ 28/* Increase I2C speed to 1000 KHz */
diff --git a/keyboards/keychron/s1/ansi/rgb/config.h b/keyboards/keychron/s1/ansi/rgb/config.h
index 6036551690..647a877a4c 100644
--- a/keyboards/keychron/s1/ansi/rgb/config.h
+++ b/keyboards/keychron/s1/ansi/rgb/config.h
@@ -17,7 +17,6 @@
17#pragma once 17#pragma once
18 18
19/* RGB Matrix Driver Configuration */ 19/* RGB Matrix Driver Configuration */
20#define SNLED27351_DRIVER_COUNT 2
21#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 20#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
22#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 21#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
23#define DRIVER_1_LED_TOTAL 46 22#define DRIVER_1_LED_TOTAL 46
diff --git a/keyboards/keychron/s1/ansi/white/config.h b/keyboards/keychron/s1/ansi/white/config.h
index 5eb66e549a..fbe02caeb1 100644
--- a/keyboards/keychron/s1/ansi/white/config.h
+++ b/keyboards/keychron/s1/ansi/white/config.h
@@ -17,7 +17,6 @@
17#pragma once 17#pragma once
18 18
19/* LED Matrix Driver Configuration */ 19/* LED Matrix Driver Configuration */
20#define SNLED27351_DRIVER_COUNT 1
21#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 20#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
22#define DRIVER_1_LED_TOTAL 84 21#define DRIVER_1_LED_TOTAL 84
23#define LED_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL 22#define LED_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
diff --git a/keyboards/keychron/v1/config.h b/keyboards/keychron/v1/config.h
index 3fa164fa68..e5b6805859 100644
--- a/keyboards/keychron/v1/config.h
+++ b/keyboards/keychron/v1/config.h
@@ -32,7 +32,6 @@
32#define DIP_SWITCH_MATRIX_GRID { {5,4} } 32#define DIP_SWITCH_MATRIX_GRID { {5,4} }
33 33
34/* RGB Matrix Driver Configuration */ 34/* RGB Matrix Driver Configuration */
35#define SNLED27351_DRIVER_COUNT 2
36#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 35#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
37#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 36#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
38 37
diff --git a/keyboards/keychron/v10/config.h b/keyboards/keychron/v10/config.h
index 502f06ce83..d643049c03 100644
--- a/keyboards/keychron/v10/config.h
+++ b/keyboards/keychron/v10/config.h
@@ -31,7 +31,6 @@
31#define DIODE_DIRECTION ROW2COL 31#define DIODE_DIRECTION ROW2COL
32 32
33/* RGB Matrix Driver Configuration */ 33/* RGB Matrix Driver Configuration */
34#define SNLED27351_DRIVER_COUNT 2
35#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 34#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
36#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 35#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
37 36
diff --git a/keyboards/keychron/v2/config.h b/keyboards/keychron/v2/config.h
index 8f94b84235..7efbf8c549 100644
--- a/keyboards/keychron/v2/config.h
+++ b/keyboards/keychron/v2/config.h
@@ -20,7 +20,6 @@
20// #define MATRIX_UNSELECT_DRIVE_HIGH 20// #define MATRIX_UNSELECT_DRIVE_HIGH
21 21
22/* RGB Matrix Driver Configuration */ 22/* RGB Matrix Driver Configuration */
23#define SNLED27351_DRIVER_COUNT 2
24#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 23#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
25#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 24#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
26 25
diff --git a/keyboards/keychron/v3/config.h b/keyboards/keychron/v3/config.h
index 4f3e47f3fe..d3e02d8f81 100644
--- a/keyboards/keychron/v3/config.h
+++ b/keyboards/keychron/v3/config.h
@@ -20,7 +20,6 @@
20#define DIODE_DIRECTION ROW2COL 20#define DIODE_DIRECTION ROW2COL
21 21
22/* RGB Matrix Driver Configuration */ 22/* RGB Matrix Driver Configuration */
23#define SNLED27351_DRIVER_COUNT 2
24#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 23#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
25#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 24#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
26 25
diff --git a/keyboards/keychron/v4/config.h b/keyboards/keychron/v4/config.h
index 02bf981e4d..8325317c27 100644
--- a/keyboards/keychron/v4/config.h
+++ b/keyboards/keychron/v4/config.h
@@ -17,7 +17,6 @@
17#pragma once 17#pragma once
18 18
19/* RGB Matrix Driver Configuration */ 19/* RGB Matrix Driver Configuration */
20#define SNLED27351_DRIVER_COUNT 1
21#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 20#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
22 21
23/* Increase I2C speed to 1000 KHz */ 22/* Increase I2C speed to 1000 KHz */
diff --git a/keyboards/keychron/v5/config.h b/keyboards/keychron/v5/config.h
index 0ffc314144..8c4128a43e 100644
--- a/keyboards/keychron/v5/config.h
+++ b/keyboards/keychron/v5/config.h
@@ -26,7 +26,6 @@
26#define DIODE_DIRECTION ROW2COL 26#define DIODE_DIRECTION ROW2COL
27 27
28/* RGB Matrix Driver Configuration */ 28/* RGB Matrix Driver Configuration */
29#define SNLED27351_DRIVER_COUNT 2
30#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 29#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
31#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 30#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
32 31
diff --git a/keyboards/keychron/v6/config.h b/keyboards/keychron/v6/config.h
index 420b36a8c9..eb2296a172 100644
--- a/keyboards/keychron/v6/config.h
+++ b/keyboards/keychron/v6/config.h
@@ -20,7 +20,6 @@
20#define DIODE_DIRECTION ROW2COL 20#define DIODE_DIRECTION ROW2COL
21 21
22/* RGB Matrix Driver Configuration */ 22/* RGB Matrix Driver Configuration */
23#define SNLED27351_DRIVER_COUNT 2
24#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 23#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
25#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 24#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
26 25
diff --git a/keyboards/keychron/v7/config.h b/keyboards/keychron/v7/config.h
index 933211dee2..cff96774e3 100644
--- a/keyboards/keychron/v7/config.h
+++ b/keyboards/keychron/v7/config.h
@@ -17,7 +17,6 @@
17#pragma once 17#pragma once
18 18
19/* RGB Matrix Driver Configuration */ 19/* RGB Matrix Driver Configuration */
20#define SNLED27351_DRIVER_COUNT 2
21#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 20#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
22#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 21#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
23 22
diff --git a/keyboards/keychron/v8/config.h b/keyboards/keychron/v8/config.h
index 88161444e1..3a860e8eb6 100644
--- a/keyboards/keychron/v8/config.h
+++ b/keyboards/keychron/v8/config.h
@@ -20,7 +20,6 @@
20// #define MATRIX_UNSELECT_DRIVE_HIGH 20// #define MATRIX_UNSELECT_DRIVE_HIGH
21 21
22/* RGB Matrix Driver Configuration */ 22/* RGB Matrix Driver Configuration */
23#define SNLED27351_DRIVER_COUNT 2
24#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO 23#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
25#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND 24#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
26 25
diff --git a/keyboards/kprepublic/bm40hsrgb/rev2/config.h b/keyboards/kprepublic/bm40hsrgb/rev2/config.h
index 5924f37691..1cd3f7a6d3 100755
--- a/keyboards/kprepublic/bm40hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/rev2/config.h
@@ -15,7 +15,6 @@
15 */ 15 */
16#pragma once 16#pragma once
17 17
18#define IS31FL3733_DRIVER_COUNT 1
19#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 18#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
20#define RGB_MATRIX_LED_COUNT 47 19#define RGB_MATRIX_LED_COUNT 47
21#define RGB_MATRIX_KEYPRESSES 20#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
index 8d194f5ccb..e4089e9fd5 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
@@ -64,7 +64,6 @@
64#define ENABLE_RGB_MATRIX_SOLID_SPLASH 64#define ENABLE_RGB_MATRIX_SOLID_SPLASH
65#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH 65#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
66 66
67#define IS31FL3733_DRIVER_COUNT 1
68#define DRIVER_1_LED_TOTAL 63 67#define DRIVER_1_LED_TOTAL 63
69//#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL 68//#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
70 69
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
index 53ef0bc53f..eb1b76382b 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
@@ -19,7 +19,6 @@
19 19
20# define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended 20# define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
21# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 21# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
22# define IS31FL3733_DRIVER_COUNT 1
23# define DRIVER_1_LED_TOTAL 63 22# define DRIVER_1_LED_TOTAL 63
24# define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL 23# define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
25 24
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
index b22c384460..00d55f8ee0 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
@@ -27,7 +27,6 @@
27# define DISABLE_RGB_MATRIX_RAINDROPS 27# define DISABLE_RGB_MATRIX_RAINDROPS
28# define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS 28# define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
29# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 29# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
30# define IS31FL3733_DRIVER_COUNT 1
31# define DRIVER_1_LED_TOTAL 64 30# define DRIVER_1_LED_TOTAL 64
32 31
33 32
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
index 57cb40dc24..a877e182a6 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
@@ -77,7 +77,6 @@
77// are compiled unconditionally). 77// are compiled unconditionally).
78 78
79// Configure the IS31FL3733 driver for per-key RGB LEDs 79// Configure the IS31FL3733 driver for per-key RGB LEDs
80#define IS31FL3733_DRIVER_COUNT 1
81#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 80#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
82#define DRIVER_1_LED_TOTAL 61 81#define DRIVER_1_LED_TOTAL 61
83 82
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/config.h b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
index 2528a71033..078085779b 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
@@ -20,7 +20,6 @@
20 20
21#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 21#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
22 22
23#define IS31FL3741_DRIVER_COUNT 1
24#define DRIVER_1_LED_TOTAL 68 23#define DRIVER_1_LED_TOTAL 68
25#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL 24#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
26#define DRIVER_INDICATOR_LED_TOTAL 0 25#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/kprepublic/bm80v2/config.h b/keyboards/kprepublic/bm80v2/config.h
index 0872ba2050..91ad6350e0 100644
--- a/keyboards/kprepublic/bm80v2/config.h
+++ b/keyboards/kprepublic/bm80v2/config.h
@@ -54,7 +54,6 @@
54#define ENABLE_RGB_MATRIX_SOLID_SPLASH 54#define ENABLE_RGB_MATRIX_SOLID_SPLASH
55#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH 55#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
56#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 56#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
57#define IS31FL3741_DRIVER_COUNT 1
58#define DRIVER_1_LED_TOTAL 87 57#define DRIVER_1_LED_TOTAL 87
59#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL 58#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
60 59
diff --git a/keyboards/kprepublic/bm80v2_iso/config.h b/keyboards/kprepublic/bm80v2_iso/config.h
index 6410490e4e..a086185993 100644
--- a/keyboards/kprepublic/bm80v2_iso/config.h
+++ b/keyboards/kprepublic/bm80v2_iso/config.h
@@ -55,7 +55,6 @@
55#define ENABLE_RGB_MATRIX_SOLID_SPLASH 55#define ENABLE_RGB_MATRIX_SOLID_SPLASH
56#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH 56#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
57#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 57#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
58#define IS31FL3741_DRIVER_COUNT 1
59#define DRIVER_1_LED_TOTAL 88 58#define DRIVER_1_LED_TOTAL 88
60#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL 59#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
61 60
diff --git a/keyboards/kprepublic/cstc40/config.h b/keyboards/kprepublic/cstc40/config.h
index c430986895..75ddd104ae 100644
--- a/keyboards/kprepublic/cstc40/config.h
+++ b/keyboards/kprepublic/cstc40/config.h
@@ -6,7 +6,6 @@
6#define I2C1_SDA_PIN B9 6#define I2C1_SDA_PIN B9
7#define I2C1_SCL_PIN B8 7#define I2C1_SCL_PIN B8
8#define DRIVER_ADDR_1 0b1010000 8#define DRIVER_ADDR_1 0b1010000
9#define DRIVER_COUNT 1
10#define RGB_MATRIX_LED_COUNT 47 9#define RGB_MATRIX_LED_COUNT 47
11 10
12#define RGB_MATRIX_FRAMEBUFFER_EFFECTS 11#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/latincompass/latin17rgb/config.h b/keyboards/latincompass/latin17rgb/config.h
index 338581a2c2..fbeb499c4e 100644
--- a/keyboards/latincompass/latin17rgb/config.h
+++ b/keyboards/latincompass/latin17rgb/config.h
@@ -72,7 +72,6 @@
72# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 72# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
73# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 73# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
74 74
75# define IS31FL3731_DRIVER_COUNT 2
76# define DRIVER_1_LED_TOTAL 25 75# define DRIVER_1_LED_TOTAL 25
77# define DRIVER_2_LED_TOTAL 24 76# define DRIVER_2_LED_TOTAL 24
78# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 77# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/latincompass/latin60rgb/config.h b/keyboards/latincompass/latin60rgb/config.h
index 8f25223853..a25d3b0696 100644
--- a/keyboards/latincompass/latin60rgb/config.h
+++ b/keyboards/latincompass/latin60rgb/config.h
@@ -68,6 +68,5 @@
68// # define ENABLE_RGB_MATRIX_SOLID_SPLASH 68// # define ENABLE_RGB_MATRIX_SOLID_SPLASH
69// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH 69// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
70# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 70# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
71# define IS31FL3733_DRIVER_COUNT 1
72# define RGB_MATRIX_LED_COUNT 60 71# define RGB_MATRIX_LED_COUNT 60
73#endif 72#endif
diff --git a/keyboards/latincompass/latin6rgb/config.h b/keyboards/latincompass/latin6rgb/config.h
index dc164fd8a2..584e39a327 100644
--- a/keyboards/latincompass/latin6rgb/config.h
+++ b/keyboards/latincompass/latin6rgb/config.h
@@ -72,7 +72,6 @@
72 72
73#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 73#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
74 74
75#define IS31FL3731_DRIVER_COUNT 1
76#define RGB_MATRIX_LED_COUNT 6 75#define RGB_MATRIX_LED_COUNT 6
77#endif 76#endif
78 77
diff --git a/keyboards/matrix/m20add/config.h b/keyboards/matrix/m20add/config.h
index 51b050ca7c..f79cbb123b 100644
--- a/keyboards/matrix/m20add/config.h
+++ b/keyboards/matrix/m20add/config.h
@@ -79,5 +79,4 @@
79#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 79#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
80 80
81#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 81#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
82#define IS31FL3731_DRIVER_COUNT 1
83#define IS31FL3731_LED_COUNT 20 82#define IS31FL3731_LED_COUNT 20
diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h
index 8829345322..a4d4c5a36a 100644
--- a/keyboards/matrix/noah/config.h
+++ b/keyboards/matrix/noah/config.h
@@ -21,7 +21,6 @@
21// rgb matrix setting 21// rgb matrix setting
22#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 22#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
23#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 23#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
24#define IS31FL3731_DRIVER_COUNT 2
25#define DRIVER_1_LED_TOTAL 36 24#define DRIVER_1_LED_TOTAL 36
26#define DRIVER_2_LED_TOTAL 36 25#define DRIVER_2_LED_TOTAL 36
27#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 26#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
index ec29cdc48e..6bdd06aba8 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
@@ -3,7 +3,6 @@
3//rgb matrix setting 3//rgb matrix setting
4#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 4#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
5#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 5#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
6#define IS31FL3731_DRIVER_COUNT 2
7#define DRIVER_1_LED_TOTAL 32 6#define DRIVER_1_LED_TOTAL 32
8#define DRIVER_2_LED_TOTAL 36 7#define DRIVER_2_LED_TOTAL 36
9#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 8#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
index 48f585e765..ba93133857 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
23#ifdef RGB_MATRIX_ENABLE 23#ifdef RGB_MATRIX_ENABLE
24//rgb matrix setting 24//rgb matrix setting
25#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_SDA 25#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_SDA
26#define IS31FL3741_DRIVER_COUNT 1
27#define RGB_MATRIX_LED_COUNT 66 26#define RGB_MATRIX_LED_COUNT 66
28 27
29#define RGB_MATRIX_KEYPRESSES // reacts to keypresses 28#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
diff --git a/keyboards/mechlovin/delphine/rgb_led/config.h b/keyboards/mechlovin/delphine/rgb_led/config.h
index 23a5042458..60dc290bfb 100644
--- a/keyboards/mechlovin/delphine/rgb_led/config.h
+++ b/keyboards/mechlovin/delphine/rgb_led/config.h
@@ -2,7 +2,6 @@
2 2
3//rgb matrix setting 3//rgb matrix setting
4#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_SDA 4#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_SDA
5#define IS31FL3731_DRIVER_COUNT 1
6#define RGB_MATRIX_LED_COUNT 25 5#define RGB_MATRIX_LED_COUNT 25
7#define RGB_MATRIX_KEYPRESSES // reacts to keypresses 6#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
8#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) 7#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/config.h b/keyboards/mechlovin/hannah60rgb/rev2/config.h
index 362acc114e..4a4f4c7556 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/config.h
+++ b/keyboards/mechlovin/hannah60rgb/rev2/config.h
@@ -3,7 +3,6 @@
3//rgb matrix setting 3//rgb matrix setting
4#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 4#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
5#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 5#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
6#define IS31FL3731_DRIVER_COUNT 2
7#define DRIVER_1_LED_TOTAL 44 6#define DRIVER_1_LED_TOTAL 44
8#define DRIVER_2_LED_TOTAL 34 7#define DRIVER_2_LED_TOTAL 34
9#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 8#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/config.h b/keyboards/mechlovin/infinity87/rgb_rev1/config.h
index 5f994b3a71..6e73aba5d9 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/config.h
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/config.h
@@ -74,6 +74,5 @@
74#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 74#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
75//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE 75//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
76#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_SDA 76#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_SDA
77#define IS31FL3741_DRIVER_COUNT 1
78#define RGB_MATRIX_LED_COUNT 91 77#define RGB_MATRIX_LED_COUNT 91
79#define DRIVER_INDICATOR_LED_TOTAL 0 78#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/mechlovin/olly/octagon/config.h b/keyboards/mechlovin/olly/octagon/config.h
index 9481d8f193..88918506eb 100644
--- a/keyboards/mechlovin/olly/octagon/config.h
+++ b/keyboards/mechlovin/olly/octagon/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
22#define I2C_DRIVER I2CD2 22#define I2C_DRIVER I2CD2
23#define I2C1_SCL_PIN B10 23#define I2C1_SCL_PIN B10
24#define I2C1_SDA_PIN B11 24#define I2C1_SDA_PIN B11
25#define IS31FL3731_DRIVER_COUNT 1
26#define LED_MATRIX_LED_COUNT 94 25#define LED_MATRIX_LED_COUNT 94
27#define LED_MATRIX_KEYPRESSES // reacts to keypresses 26#define LED_MATRIX_KEYPRESSES // reacts to keypresses
28#define LED_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) 27#define LED_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
diff --git a/keyboards/mechlovin/zed65/mono_led/config.h b/keyboards/mechlovin/zed65/mono_led/config.h
index b5d737641b..811841d7fe 100644
--- a/keyboards/mechlovin/zed65/mono_led/config.h
+++ b/keyboards/mechlovin/zed65/mono_led/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
22#define I2C_DRIVER I2CD2 22#define I2C_DRIVER I2CD2
23#define I2C1_SCL_PIN B10 23#define I2C1_SCL_PIN B10
24#define I2C1_SDA_PIN B11 24#define I2C1_SDA_PIN B11
25#define IS31FL3731_DRIVER_COUNT 1
26#define LED_MATRIX_LED_COUNT 70 25#define LED_MATRIX_LED_COUNT 70
27#define LED_MATRIX_KEYPRESSES // reacts to keypresses 26#define LED_MATRIX_KEYPRESSES // reacts to keypresses
28#define LED_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) 27#define LED_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
diff --git a/keyboards/melgeek/mach80/config.h b/keyboards/melgeek/mach80/config.h
index 41369e503d..cc4d7bc6bf 100755
--- a/keyboards/melgeek/mach80/config.h
+++ b/keyboards/melgeek/mach80/config.h
@@ -26,7 +26,6 @@
26//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR 26//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
27#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 27#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
28#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 28#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
29#define IS31FL3741_DRIVER_COUNT 1
30 29
31#define ENABLE_RGB_MATRIX_ALPHAS_MODS 30#define ENABLE_RGB_MATRIX_ALPHAS_MODS
32#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN 31#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/melgeek/mj61/config.h b/keyboards/melgeek/mj61/config.h
index 2033876e00..704699ece9 100644
--- a/keyboards/melgeek/mj61/config.h
+++ b/keyboards/melgeek/mj61/config.h
@@ -71,4 +71,3 @@
71//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR 71//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
72#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 72#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
73#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 73#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
74#define IS31FL3741_DRIVER_COUNT 1
diff --git a/keyboards/melgeek/mj63/config.h b/keyboards/melgeek/mj63/config.h
index 2033876e00..704699ece9 100644
--- a/keyboards/melgeek/mj63/config.h
+++ b/keyboards/melgeek/mj63/config.h
@@ -71,4 +71,3 @@
71//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR 71//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
72#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 72#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
73#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 73#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
74#define IS31FL3741_DRIVER_COUNT 1
diff --git a/keyboards/melgeek/mj64/config.h b/keyboards/melgeek/mj64/config.h
index 2033876e00..704699ece9 100644
--- a/keyboards/melgeek/mj64/config.h
+++ b/keyboards/melgeek/mj64/config.h
@@ -71,4 +71,3 @@
71//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR 71//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
72#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 72#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
73#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 73#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
74#define IS31FL3741_DRIVER_COUNT 1
diff --git a/keyboards/melgeek/mj65/config.h b/keyboards/melgeek/mj65/config.h
index 2033876e00..704699ece9 100644
--- a/keyboards/melgeek/mj65/config.h
+++ b/keyboards/melgeek/mj65/config.h
@@ -71,4 +71,3 @@
71//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR 71//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
72#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 72#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
73#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 73#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
74#define IS31FL3741_DRIVER_COUNT 1
diff --git a/keyboards/melgeek/mojo68/config.h b/keyboards/melgeek/mojo68/config.h
index cd721cb342..e661efb2a9 100755
--- a/keyboards/melgeek/mojo68/config.h
+++ b/keyboards/melgeek/mojo68/config.h
@@ -70,4 +70,3 @@
70//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR 70//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
71#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 71#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
72#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 72#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
73#define IS31FL3741_DRIVER_COUNT 1
diff --git a/keyboards/melgeek/mojo75/config.h b/keyboards/melgeek/mojo75/config.h
index 8ec9906bcc..a4e89e5a90 100644
--- a/keyboards/melgeek/mojo75/config.h
+++ b/keyboards/melgeek/mojo75/config.h
@@ -72,4 +72,3 @@
72#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 72#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
73//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE 73//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
74#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 74#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
75#define IS31FL3741_DRIVER_COUNT 1
diff --git a/keyboards/melgeek/tegic/config.h b/keyboards/melgeek/tegic/config.h
index f1cc7fcc4b..723706d610 100755
--- a/keyboards/melgeek/tegic/config.h
+++ b/keyboards/melgeek/tegic/config.h
@@ -23,7 +23,6 @@
23//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR 23//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
24#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 24#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
25#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 25#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
26#define IS31FL3741_DRIVER_COUNT 1
27 26
28#define ENABLE_RGB_MATRIX_ALPHAS_MODS 27#define ENABLE_RGB_MATRIX_ALPHAS_MODS
29#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN 28#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/melgeek/z70ultra/config.h b/keyboards/melgeek/z70ultra/config.h
index 6fb7ad6bf2..d78cbab672 100644
--- a/keyboards/melgeek/z70ultra/config.h
+++ b/keyboards/melgeek/z70ultra/config.h
@@ -71,6 +71,5 @@
71//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR 71//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
72#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL 72#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
73#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 73#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
74#define IS31FL3741_DRIVER_COUNT 1
75#define RGB_MATRIX_LED_COUNT 69 74#define RGB_MATRIX_LED_COUNT 69
76#define DRIVER_INDICATOR_LED_TOTAL 6 75#define DRIVER_INDICATOR_LED_TOTAL 6
diff --git a/keyboards/miller/gm862/config.h b/keyboards/miller/gm862/config.h
index 002ba4fe11..2bda7f75bb 100644
--- a/keyboards/miller/gm862/config.h
+++ b/keyboards/miller/gm862/config.h
@@ -54,6 +54,5 @@
54// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH 54// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
55 55
56# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 56# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
57# define IS31FL3733_DRIVER_COUNT 1
58# define RGB_MATRIX_LED_COUNT 62 57# define RGB_MATRIX_LED_COUNT 62
59#endif 58#endif
diff --git a/keyboards/monsgeek/m1/config.h b/keyboards/monsgeek/m1/config.h
index 9ef10dac14..3963f1fbae 100644
--- a/keyboards/monsgeek/m1/config.h
+++ b/keyboards/monsgeek/m1/config.h
@@ -33,7 +33,6 @@
33#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 33#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
34 34
35/* I2C Config for LED Driver */ 35/* I2C Config for LED Driver */
36#define SNLED27351_DRIVER_COUNT 2
37#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 36#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
38#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO 37#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO
39#define I2C1_OPMODE OPMODE_I2C 38#define I2C1_OPMODE OPMODE_I2C
diff --git a/keyboards/monsgeek/m3/config.h b/keyboards/monsgeek/m3/config.h
index 41c9ea3cea..02c0fc6abc 100644
--- a/keyboards/monsgeek/m3/config.h
+++ b/keyboards/monsgeek/m3/config.h
@@ -35,7 +35,6 @@
35#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 35#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
36 36
37/* I2C Config for LED Driver */ 37/* I2C Config for LED Driver */
38#define SNLED27351_DRIVER_COUNT 2
39#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 38#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
40#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO 39#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO
41#define I2C1_OPMODE OPMODE_I2C 40#define I2C1_OPMODE OPMODE_I2C
diff --git a/keyboards/monsgeek/m5/config.h b/keyboards/monsgeek/m5/config.h
index b60db6aff7..20c69b34f1 100644
--- a/keyboards/monsgeek/m5/config.h
+++ b/keyboards/monsgeek/m5/config.h
@@ -34,7 +34,6 @@
34#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 34#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
35 35
36/* I2C Config for LED Driver */ 36/* I2C Config for LED Driver */
37#define SNLED27351_DRIVER_COUNT 2
38#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 37#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
39#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO 38#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO
40#define I2C1_OPMODE OPMODE_I2C 39#define I2C1_OPMODE OPMODE_I2C
diff --git a/keyboards/monsgeek/m6/config.h b/keyboards/monsgeek/m6/config.h
index e2b3e995a3..f01b8abb68 100644
--- a/keyboards/monsgeek/m6/config.h
+++ b/keyboards/monsgeek/m6/config.h
@@ -31,7 +31,6 @@
31#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 31#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
32 32
33/* I2C Config for LED Driver */ 33/* I2C Config for LED Driver */
34#define SNLED27351_DRIVER_COUNT 2
35#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 34#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
36#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO 35#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO
37#define I2C1_SCL_PAL_MODE 4 36#define I2C1_SCL_PAL_MODE 4
diff --git a/keyboards/moonlander/config.h b/keyboards/moonlander/config.h
index 45f03da963..3ceb45f54d 100644
--- a/keyboards/moonlander/config.h
+++ b/keyboards/moonlander/config.h
@@ -68,7 +68,6 @@
68#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 68#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
69#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC 69#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
70 70
71#define IS31FL3731_DRIVER_COUNT 2
72#define DRIVER_1_LED_TOTAL 36 71#define DRIVER_1_LED_TOTAL 36
73#define DRIVER_2_LED_TOTAL 36 72#define DRIVER_2_LED_TOTAL 36
74#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 73#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/mt/mt64rgb/config.h b/keyboards/mt/mt64rgb/config.h
index 2d6bfa06d9..eff38f91cc 100644
--- a/keyboards/mt/mt64rgb/config.h
+++ b/keyboards/mt/mt64rgb/config.h
@@ -24,7 +24,6 @@
24#define RGB_MATRIX_LED_FLUSH_LIMIT 26 24#define RGB_MATRIX_LED_FLUSH_LIMIT 26
25#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 25#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
26 26
27#define IS31FL3733_DRIVER_COUNT 1
28#define RGB_MATRIX_LED_COUNT 64 27#define RGB_MATRIX_LED_COUNT 64
29 28
30 29
diff --git a/keyboards/mt/mt84/config.h b/keyboards/mt/mt84/config.h
index e07ec1a6d0..34ec1be86a 100644
--- a/keyboards/mt/mt84/config.h
+++ b/keyboards/mt/mt84/config.h
@@ -25,9 +25,6 @@
25 #define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND 25 #define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
26 #define IS31FL3737_I2C_ADDRESS_2 IS31FL3737_I2C_ADDRESS_VCC 26 #define IS31FL3737_I2C_ADDRESS_2 IS31FL3737_I2C_ADDRESS_VCC
27 27
28
29
30 #define IS31FL3737_DRIVER_COUNT 2
31 #define DRIVER_1_LED_TOTAL 44 28 #define DRIVER_1_LED_TOTAL 44
32 #define DRIVER_2_LED_TOTAL 40 29 #define DRIVER_2_LED_TOTAL 40
33 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 30 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h
index 4cecb6165a..2fdcead121 100644
--- a/keyboards/neson_design/700e/config.h
+++ b/keyboards/neson_design/700e/config.h
@@ -34,7 +34,6 @@
34#define DRIVER_2_LED_TOTAL 32 34#define DRIVER_2_LED_TOTAL 32
35#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 35#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
36#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC 36#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
37#define IS31FL3731_DRIVER_COUNT 2
38#define IS31FL3731_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL) 37#define IS31FL3731_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
39 38
40#define USB_SUSPEND_WAKEUP_DELAY 1000 39#define USB_SUSPEND_WAKEUP_DELAY 1000
diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h
index 847b26eb25..22c12dfb97 100644
--- a/keyboards/neson_design/n6/config.h
+++ b/keyboards/neson_design/n6/config.h
@@ -34,5 +34,4 @@
34#define DRIVER_2_LED_TOTAL 32 34#define DRIVER_2_LED_TOTAL 32
35#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 35#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
36#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC 36#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
37#define IS31FL3731_DRIVER_COUNT 2
38#define IS31FL3731_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL) 37#define IS31FL3731_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
diff --git a/keyboards/novelkeys/nk65/config.h b/keyboards/novelkeys/nk65/config.h
index bbba5cd7d8..97350e34b4 100755
--- a/keyboards/novelkeys/nk65/config.h
+++ b/keyboards/novelkeys/nk65/config.h
@@ -52,7 +52,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
52 52
53#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 53#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
54#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_SDA 54#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_SDA
55#define IS31FL3733_DRIVER_COUNT 2
56#define IS31FL3733_LED_COUNT 128 55#define IS31FL3733_LED_COUNT 128
57 56
58// These define which keys in the matrix are alphas/mods 57// These define which keys in the matrix are alphas/mods
diff --git a/keyboards/novelkeys/nk87/config.h b/keyboards/novelkeys/nk87/config.h
index 41ecb8a8e3..ff9e05cbad 100755
--- a/keyboards/novelkeys/nk87/config.h
+++ b/keyboards/novelkeys/nk87/config.h
@@ -52,7 +52,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
52 52
53#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 53#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
54#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_SDA 54#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_SDA
55#define IS31FL3733_DRIVER_COUNT 2
56#define IS31FL3733_LED_COUNT 128 55#define IS31FL3733_LED_COUNT 128
57 56
58// These define which keys in the matrix are alphas/mods 57// These define which keys in the matrix are alphas/mods
diff --git a/keyboards/opendeck/32/rev1/config.h b/keyboards/opendeck/32/rev1/config.h
index 1a84624b76..d5e824fdfb 100644
--- a/keyboards/opendeck/32/rev1/config.h
+++ b/keyboards/opendeck/32/rev1/config.h
@@ -17,7 +17,6 @@
17 17
18// RGB matrix 18// RGB matrix
19#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 19#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
20#define IS31FL3731_DRIVER_COUNT 1
21#define RGB_MATRIX_LED_COUNT (4 * 8 * 3) 20#define RGB_MATRIX_LED_COUNT (4 * 8 * 3)
22#define RGB_DISABLE_WHEN_USB_SUSPENDED 21#define RGB_DISABLE_WHEN_USB_SUSPENDED
23#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_SPIRAL 22#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_SPIRAL
diff --git a/keyboards/owlab/voice65/hotswap/config.h b/keyboards/owlab/voice65/hotswap/config.h
index d274892453..8599c084d2 100644
--- a/keyboards/owlab/voice65/hotswap/config.h
+++ b/keyboards/owlab/voice65/hotswap/config.h
@@ -30,7 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
30# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 30# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
31# define RGB_MATRIX_DEFAULT_VAL 128 31# define RGB_MATRIX_DEFAULT_VAL 128
32# define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 32# define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
33# define IS31FL3741_DRIVER_COUNT 1
34# define RGB_MATRIX_LED_COUNT 67 33# define RGB_MATRIX_LED_COUNT 67
35// RGB Matrix Animation modes. Explicitly enabled 34// RGB Matrix Animation modes. Explicitly enabled
36// For full list of effects, see: 35// For full list of effects, see:
diff --git a/keyboards/owlab/voice65/soldered/config.h b/keyboards/owlab/voice65/soldered/config.h
index 679463d515..9533e00a02 100644
--- a/keyboards/owlab/voice65/soldered/config.h
+++ b/keyboards/owlab/voice65/soldered/config.h
@@ -30,7 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
30# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 30# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
31# define RGB_MATRIX_DEFAULT_VAL 128 31# define RGB_MATRIX_DEFAULT_VAL 128
32# define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 32# define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
33# define IS31FL3741_DRIVER_COUNT 1
34# define RGB_MATRIX_LED_COUNT 71 33# define RGB_MATRIX_LED_COUNT 71
35 34
36// RGB Matrix Animation modes. Explicitly enabled 35// RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/phentech/rpk_001/config.h b/keyboards/phentech/rpk_001/config.h
index f513dd2684..baa207f065 100644
--- a/keyboards/phentech/rpk_001/config.h
+++ b/keyboards/phentech/rpk_001/config.h
@@ -6,7 +6,6 @@
6/* RGB Config */ 6/* RGB Config */
7#define DRIVER_1_CS B6 7#define DRIVER_1_CS B6
8#define DRIVER_1_EN B7 8#define DRIVER_1_EN B7
9#define DRIVER_COUNT 1
10#define RGB_MATRIX_LED_COUNT 67 9#define RGB_MATRIX_LED_COUNT 67
11 10
12/* SPI Config */ 11/* SPI Config */
diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h
index f8804c4d6e..93d0823714 100644
--- a/keyboards/planck/ez/config.h
+++ b/keyboards/planck/ez/config.h
@@ -52,7 +52,6 @@
52 52
53#define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND 53#define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
54 54
55#define IS31FL3737_DRIVER_COUNT 1
56#define RGB_MATRIX_LED_COUNT 47 55#define RGB_MATRIX_LED_COUNT 47
57 56
58#define RGB_MATRIX_KEYPRESSES 57#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/planck/light/config.h b/keyboards/planck/light/config.h
index 1b8fecc8a3..6d12061b51 100644
--- a/keyboards/planck/light/config.h
+++ b/keyboards/planck/light/config.h
@@ -10,7 +10,6 @@
10#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 10#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
11#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 11#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
12 12
13#define IS31FL3731_DRIVER_COUNT 2
14#define DRIVER_1_LED_TOTAL 25 13#define DRIVER_1_LED_TOTAL 25
15#define DRIVER_2_LED_TOTAL 24 14#define DRIVER_2_LED_TOTAL 24
16#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 15#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/playkbtw/pk64rgb/config.h b/keyboards/playkbtw/pk64rgb/config.h
index 59c3f6ab1d..67e42e44a9 100644
--- a/keyboards/playkbtw/pk64rgb/config.h
+++ b/keyboards/playkbtw/pk64rgb/config.h
@@ -24,7 +24,6 @@
24 #define RGB_MATRIX_LED_PROCESS_LIMIT 20 24 #define RGB_MATRIX_LED_PROCESS_LIMIT 20
25 #define RGB_MATRIX_LED_FLUSH_LIMIT 26 25 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
26 #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 26 #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
27 #define IS31FL3733_DRIVER_COUNT 1
28 #define RGB_MATRIX_LED_COUNT 64 27 #define RGB_MATRIX_LED_COUNT 64
29 28
30 29
diff --git a/keyboards/projectd/65/projectd_65_ansi/config.h b/keyboards/projectd/65/projectd_65_ansi/config.h
index 23540640ad..8b162a2149 100644
--- a/keyboards/projectd/65/projectd_65_ansi/config.h
+++ b/keyboards/projectd/65/projectd_65_ansi/config.h
@@ -35,5 +35,4 @@
35#define AW20216S_CS_PIN_1 A15 35#define AW20216S_CS_PIN_1 A15
36#define AW20216S_EN_PIN_1 C13 36#define AW20216S_EN_PIN_1 C13
37 37
38#define AW20216S_DRIVER_COUNT 1
39#define RGB_MATRIX_LED_COUNT 71 38#define RGB_MATRIX_LED_COUNT 71
diff --git a/keyboards/projectd/75/ansi/config.h b/keyboards/projectd/75/ansi/config.h
index c27da26a6f..3b685c09b8 100644
--- a/keyboards/projectd/75/ansi/config.h
+++ b/keyboards/projectd/75/ansi/config.h
@@ -37,7 +37,6 @@
37#define DRIVER_1_EN C13 37#define DRIVER_1_EN C13
38#define DRIVER_2_EN C13 38#define DRIVER_2_EN C13
39 39
40#define DRIVER_COUNT 2
41#define DRIVER_1_LED_TOTAL 70 40#define DRIVER_1_LED_TOTAL 70
42#define DRIVER_2_LED_TOTAL 17 41#define DRIVER_2_LED_TOTAL 17
43#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 42#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/qwertykeys/qk100/ansi/config.h b/keyboards/qwertykeys/qk100/ansi/config.h
index 6d0401a3dc..82766b8834 100644
--- a/keyboards/qwertykeys/qk100/ansi/config.h
+++ b/keyboards/qwertykeys/qk100/ansi/config.h
@@ -39,5 +39,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
39# define RGB_MATRIX_LED_FLUSH_LIMIT 26 39# define RGB_MATRIX_LED_FLUSH_LIMIT 26
40# define RGB_MATRIX_STARTUP_VAL 128 40# define RGB_MATRIX_STARTUP_VAL 128
41# define DRIVER_ADDR_1 0b0110000 41# define DRIVER_ADDR_1 0b0110000
42# define DRIVER_COUNT 1
43# define RGB_MATRIX_LED_COUNT 101 \ No newline at end of file 42# define RGB_MATRIX_LED_COUNT 101 \ No newline at end of file
diff --git a/keyboards/redragon/k667/config.h b/keyboards/redragon/k667/config.h
index 7fec873187..33e26c4a39 100644
--- a/keyboards/redragon/k667/config.h
+++ b/keyboards/redragon/k667/config.h
@@ -20,7 +20,6 @@
20#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 20#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
21#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_VCC 21#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_VCC
22 22
23#define IS31FL3733_DRIVER_COUNT 2
24#define DRIVER_1_LED_TOTAL 45 23#define DRIVER_1_LED_TOTAL 45
25#define DRIVER_2_LED_TOTAL 45 24#define DRIVER_2_LED_TOTAL 45
26 25
diff --git a/keyboards/skyloong/gk61/pro/config.h b/keyboards/skyloong/gk61/pro/config.h
index 4d180bb662..8e9b5f9258 100644
--- a/keyboards/skyloong/gk61/pro/config.h
+++ b/keyboards/skyloong/gk61/pro/config.h
@@ -3,8 +3,6 @@
3 3
4#pragma once 4#pragma once
5 5
6
7#define DRIVER_COUNT 1
8#define RGB_MATRIX_LED_COUNT 64 6#define RGB_MATRIX_LED_COUNT 64
9#define CAPS_LOCK_INDEX 28 7#define CAPS_LOCK_INDEX 28
10#define WIN_MOD_INDEX 16 8#define WIN_MOD_INDEX 16
diff --git a/keyboards/skyloong/gk61/pro_48/config.h b/keyboards/skyloong/gk61/pro_48/config.h
index dc31521627..df94455a9e 100644
--- a/keyboards/skyloong/gk61/pro_48/config.h
+++ b/keyboards/skyloong/gk61/pro_48/config.h
@@ -3,8 +3,6 @@
3 3
4#pragma once 4#pragma once
5 5
6
7#define DRIVER_COUNT 1
8#define RGB_MATRIX_LED_COUNT 64 6#define RGB_MATRIX_LED_COUNT 64
9#define CAPS_LOCK_INDEX 28 7#define CAPS_LOCK_INDEX 28
10#define WIN_MOD_INDEX 16 8#define WIN_MOD_INDEX 16
diff --git a/keyboards/skyloong/gk61/v1/config.h b/keyboards/skyloong/gk61/v1/config.h
index c274ffa1fb..bd9cab743f 100644
--- a/keyboards/skyloong/gk61/v1/config.h
+++ b/keyboards/skyloong/gk61/v1/config.h
@@ -17,7 +17,6 @@
17 17
18#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND 18#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
19 19
20#define SNLED27351_DRIVER_COUNT 1
21#define RGB_MATRIX_LED_COUNT 64 20#define RGB_MATRIX_LED_COUNT 64
22 21
23#define RGB_MATRIX_FRAMEBUFFER_EFFECTS //Enable frame effects 22#define RGB_MATRIX_FRAMEBUFFER_EFFECTS //Enable frame effects
diff --git a/keyboards/smallkeyboard/config.h b/keyboards/smallkeyboard/config.h
index 71868ee7ed..d98a2b6ef2 100644
--- a/keyboards/smallkeyboard/config.h
+++ b/keyboards/smallkeyboard/config.h
@@ -68,6 +68,5 @@
68 68
69#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 69#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
70 70
71#define IS31FL3731_DRIVER_COUNT 1
72#define RGB_MATRIX_LED_COUNT 6 71#define RGB_MATRIX_LED_COUNT 6
73#endif 72#endif
diff --git a/keyboards/spaceholdings/nebula12/config.h b/keyboards/spaceholdings/nebula12/config.h
index 512b775136..c88b219b09 100755
--- a/keyboards/spaceholdings/nebula12/config.h
+++ b/keyboards/spaceholdings/nebula12/config.h
@@ -74,7 +74,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
74#define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 } 74#define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 }
75 75
76#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 76#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
77#define IS31FL3731_DRIVER_COUNT 1
78#define IS31FL3731_LED_COUNT 16 77#define IS31FL3731_LED_COUNT 16
79 78
80// These define which keys in the matrix are alphas/mods 79// These define which keys in the matrix are alphas/mods
diff --git a/keyboards/spaceholdings/nebula68/config.h b/keyboards/spaceholdings/nebula68/config.h
index 1ad24d364c..1b2441556b 100755
--- a/keyboards/spaceholdings/nebula68/config.h
+++ b/keyboards/spaceholdings/nebula68/config.h
@@ -58,7 +58,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
58 58
59#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 59#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
60#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_SDA 60#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_SDA
61#define IS31FL3733_DRIVER_COUNT 2
62#define IS31FL3733_LED_COUNT 128 61#define IS31FL3733_LED_COUNT 128
63 62
64// These define which keys in the matrix are alphas/mods 63// These define which keys in the matrix are alphas/mods
diff --git a/keyboards/teleport/native/config.h b/keyboards/teleport/native/config.h
index d9f3b8a303..99c82df12e 100644
--- a/keyboards/teleport/native/config.h
+++ b/keyboards/teleport/native/config.h
@@ -29,7 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
29 29
30 30
31/* RGB Matrix driver config */ 31/* RGB Matrix driver config */
32#define IS31FL3733_DRIVER_COUNT 2
33#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND 32#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
34#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_VCC 33#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_VCC
35#define DRIVER_1_LED_TOTAL 46 34#define DRIVER_1_LED_TOTAL 46
diff --git a/keyboards/terrazzo/config.h b/keyboards/terrazzo/config.h
index a1062de020..d2e76f1de0 100644
--- a/keyboards/terrazzo/config.h
+++ b/keyboards/terrazzo/config.h
@@ -18,7 +18,6 @@
18#ifdef LED_MATRIX_ENABLE 18#ifdef LED_MATRIX_ENABLE
19 19
20#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 20#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
21#define IS31FL3731_DRIVER_COUNT 1
22#define LED_MATRIX_LED_COUNT 105 21#define LED_MATRIX_LED_COUNT 105
23#define LED_MATRIX_ROWS 15 22#define LED_MATRIX_ROWS 15
24#define LED_MATRIX_COLS 7 23#define LED_MATRIX_COLS 7
diff --git a/keyboards/tkc/portico/config.h b/keyboards/tkc/portico/config.h
index 2a1056b4a5..265e0abbc3 100644
--- a/keyboards/tkc/portico/config.h
+++ b/keyboards/tkc/portico/config.h
@@ -41,7 +41,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
41# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 41# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
42# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 42# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
43# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC 43# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
44# define IS31FL3731_DRIVER_COUNT 2
45# define DRIVER_1_LED_TOTAL 36 44# define DRIVER_1_LED_TOTAL 36
46# define DRIVER_2_LED_TOTAL 31 45# define DRIVER_2_LED_TOTAL 31
47# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 46# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
@@ -50,7 +49,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
50// IS31FL3731 driver 49// IS31FL3731 driver
51#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 50#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
52#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC 51#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
53#define IS31FL3731_DRIVER_COUNT 2
54#define IS31FL3731_LED_COUNT 67 52#define IS31FL3731_LED_COUNT 67
55 53
56#define RGB_BACKLIGHT_ENABLED 1 54#define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/tkc/portico68v2/config.h b/keyboards/tkc/portico68v2/config.h
index fdd38e3133..2c8ecf806d 100644
--- a/keyboards/tkc/portico68v2/config.h
+++ b/keyboards/tkc/portico68v2/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
18#pragma once 18#pragma once
19 19
20#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 20#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
21#define IS31FL3741_DRIVER_COUNT 1
22#define DRIVER_1_LED_TOTAL 82 21#define DRIVER_1_LED_TOTAL 82
23#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL 22#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
24#define DRIVER_INDICATOR_LED_TOTAL 0 23#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/tkc/portico75/config.h b/keyboards/tkc/portico75/config.h
index 3a9b50baca..8146141bf0 100644
--- a/keyboards/tkc/portico75/config.h
+++ b/keyboards/tkc/portico75/config.h
@@ -73,14 +73,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
73 73
74# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 74# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
75# define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 75# define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
76# define IS31FL3741_DRIVER_COUNT 1
77# define DRIVER_1_LED_TOTAL 98 76# define DRIVER_1_LED_TOTAL 98
78# define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL 77# define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
79# define DRIVER_INDICATOR_LED_TOTAL 0 78# define DRIVER_INDICATOR_LED_TOTAL 0
80#else 79#else
81// WT_RGB IS31FL3741 driver code 80// WT_RGB IS31FL3741 driver code
82# define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 81# define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
83# define IS31FL3741_DRIVER_COUNT 1
84# define IS31FL3741_LED_COUNT 98 82# define IS31FL3741_LED_COUNT 98
85 83
86# define RGB_BACKLIGHT_ENABLED 1 84# define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/wilba_tech/rama_works_kara/config.h b/keyboards/wilba_tech/rama_works_kara/config.h
index 09aac7a552..ba02ba652a 100644
--- a/keyboards/wilba_tech/rama_works_kara/config.h
+++ b/keyboards/wilba_tech/rama_works_kara/config.h
@@ -18,7 +18,6 @@
18// IS31FL3731 driver 18// IS31FL3731 driver
19#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 19#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
20#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 20#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
21#define IS31FL3731_DRIVER_COUNT 2
22#define IS31FL3731_LED_COUNT 72 21#define IS31FL3731_LED_COUNT 72
23 22
24// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap 23// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
diff --git a/keyboards/wilba_tech/rama_works_koyu/config.h b/keyboards/wilba_tech/rama_works_koyu/config.h
index 512cff857b..1d57ac9e55 100644
--- a/keyboards/wilba_tech/rama_works_koyu/config.h
+++ b/keyboards/wilba_tech/rama_works_koyu/config.h
@@ -18,7 +18,6 @@
18// IS31FL3731 driver 18// IS31FL3731 driver
19#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 19#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
20#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 20#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
21#define IS31FL3731_DRIVER_COUNT 2
22#define IS31FL3731_LED_COUNT 72 21#define IS31FL3731_LED_COUNT 72
23 22
24// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap 23// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
diff --git a/keyboards/wilba_tech/rama_works_m10_c/config.h b/keyboards/wilba_tech/rama_works_m10_c/config.h
index 1e0d943b96..736506a493 100644
--- a/keyboards/wilba_tech/rama_works_m10_c/config.h
+++ b/keyboards/wilba_tech/rama_works_m10_c/config.h
@@ -22,7 +22,6 @@
22 22
23// IS31FL3731 driver 23// IS31FL3731 driver
24#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 24#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
25#define IS31FL3731_DRIVER_COUNT 1
26#define IS31FL3731_LED_COUNT 12 25#define IS31FL3731_LED_COUNT 12
27 26
28// Enable WT RGB backlight 27// Enable WT RGB backlight
diff --git a/keyboards/wilba_tech/rama_works_m50_a/config.h b/keyboards/wilba_tech/rama_works_m50_a/config.h
index 98149ffa14..bad8f7f346 100644
--- a/keyboards/wilba_tech/rama_works_m50_a/config.h
+++ b/keyboards/wilba_tech/rama_works_m50_a/config.h
@@ -23,7 +23,6 @@
23// IS31FL3731 driver 23// IS31FL3731 driver
24#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 24#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
25#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 25#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
26#define IS31FL3731_DRIVER_COUNT 2
27#define IS31FL3731_LED_COUNT 72 26#define IS31FL3731_LED_COUNT 72
28 27
29// Enable WT RGB backlight 28// Enable WT RGB backlight
diff --git a/keyboards/wilba_tech/rama_works_m60_a/config.h b/keyboards/wilba_tech/rama_works_m60_a/config.h
index c291ba2db3..7af0f156c8 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/config.h
+++ b/keyboards/wilba_tech/rama_works_m60_a/config.h
@@ -18,7 +18,6 @@
18// IS31FL3731 driver 18// IS31FL3731 driver
19#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 19#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
20#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 20#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
21#define IS31FL3731_DRIVER_COUNT 2
22#define IS31FL3731_LED_COUNT 72 21#define IS31FL3731_LED_COUNT 72
23 22
24// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap 23// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
diff --git a/keyboards/wilba_tech/rama_works_m65_b/config.h b/keyboards/wilba_tech/rama_works_m65_b/config.h
index 9807fbc874..0f3f228cda 100644
--- a/keyboards/wilba_tech/rama_works_m65_b/config.h
+++ b/keyboards/wilba_tech/rama_works_m65_b/config.h
@@ -23,7 +23,6 @@
23// IS31FL3731 driver 23// IS31FL3731 driver
24#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 24#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
25#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 25#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
26#define IS31FL3731_DRIVER_COUNT 2
27#define IS31FL3731_LED_COUNT 72 26#define IS31FL3731_LED_COUNT 72
28 27
29// Enable WT RGB backlight 28// Enable WT RGB backlight
diff --git a/keyboards/wilba_tech/rama_works_m65_bx/config.h b/keyboards/wilba_tech/rama_works_m65_bx/config.h
index 64da89ff9e..ed0d79aba3 100644
--- a/keyboards/wilba_tech/rama_works_m65_bx/config.h
+++ b/keyboards/wilba_tech/rama_works_m65_bx/config.h
@@ -23,7 +23,6 @@
23// IS31FL3731 driver 23// IS31FL3731 driver
24#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 24#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
25#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 25#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
26#define IS31FL3731_DRIVER_COUNT 2
27#define IS31FL3731_LED_COUNT 72 26#define IS31FL3731_LED_COUNT 72
28 27
29// Enable WT RGB backlight 28// Enable WT RGB backlight
diff --git a/keyboards/wilba_tech/rama_works_u80_a/config.h b/keyboards/wilba_tech/rama_works_u80_a/config.h
index 2a0da80fed..ddbbcfba9b 100644
--- a/keyboards/wilba_tech/rama_works_u80_a/config.h
+++ b/keyboards/wilba_tech/rama_works_u80_a/config.h
@@ -41,7 +41,6 @@
41#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 41#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
42#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 42#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
43#define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SCL 43#define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SCL
44#define IS31FL3731_DRIVER_COUNT 3
45#define IS31FL3731_LED_COUNT 108 44#define IS31FL3731_LED_COUNT 108
46 45
47#define RGB_BACKLIGHT_ENABLED 1 46#define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/wilba_tech/wt60_a/config.h b/keyboards/wilba_tech/wt60_a/config.h
index 25a6f25a1c..4dec42b21d 100644
--- a/keyboards/wilba_tech/wt60_a/config.h
+++ b/keyboards/wilba_tech/wt60_a/config.h
@@ -63,5 +63,4 @@
63#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 7 63#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 7
64 64
65#define IS31FL3736_I2C_ADDRESS_1 IS31FL3736_I2C_ADDRESS_GND_GND 65#define IS31FL3736_I2C_ADDRESS_1 IS31FL3736_I2C_ADDRESS_GND_GND
66#define IS31FL3736_DRIVER_COUNT 1
67#define IS31FL3736_LED_COUNT 96 66#define IS31FL3736_LED_COUNT 96
diff --git a/keyboards/wilba_tech/wt60_b/config.h b/keyboards/wilba_tech/wt60_b/config.h
index 926136f332..3a9808dfc5 100644
--- a/keyboards/wilba_tech/wt60_b/config.h
+++ b/keyboards/wilba_tech/wt60_b/config.h
@@ -25,7 +25,6 @@
25// IS31FL3731 driver 25// IS31FL3731 driver
26#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 26#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
27#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 27#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
28#define IS31FL3731_DRIVER_COUNT 2
29#define IS31FL3731_LED_COUNT 72 28#define IS31FL3731_LED_COUNT 72
30 29
31#define RGB_BACKLIGHT_ENABLED 1 30#define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/wilba_tech/wt60_bx/config.h b/keyboards/wilba_tech/wt60_bx/config.h
index 85ab052437..1a722e2a2c 100644
--- a/keyboards/wilba_tech/wt60_bx/config.h
+++ b/keyboards/wilba_tech/wt60_bx/config.h
@@ -25,7 +25,6 @@
25// IS31FL3731 driver 25// IS31FL3731 driver
26#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 26#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
27#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 27#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
28#define IS31FL3731_DRIVER_COUNT 2
29#define IS31FL3731_LED_COUNT 72 28#define IS31FL3731_LED_COUNT 72
30 29
31#define RGB_BACKLIGHT_ENABLED 1 30#define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/wilba_tech/wt60_c/config.h b/keyboards/wilba_tech/wt60_c/config.h
index ca7366bc32..97a6790fff 100644
--- a/keyboards/wilba_tech/wt60_c/config.h
+++ b/keyboards/wilba_tech/wt60_c/config.h
@@ -25,7 +25,6 @@
25// IS31FL3731 driver 25// IS31FL3731 driver
26#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 26#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
27#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 27#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
28#define IS31FL3731_DRIVER_COUNT 2
29#define IS31FL3731_LED_COUNT 72 28#define IS31FL3731_LED_COUNT 72
30 29
31#define RGB_BACKLIGHT_ENABLED 1 30#define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/wilba_tech/wt65_a/config.h b/keyboards/wilba_tech/wt65_a/config.h
index 88f28ac844..9135642f59 100644
--- a/keyboards/wilba_tech/wt65_a/config.h
+++ b/keyboards/wilba_tech/wt65_a/config.h
@@ -63,5 +63,4 @@
63#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 7 63#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 7
64 64
65#define IS31FL3736_I2C_ADDRESS_1 IS31FL3736_I2C_ADDRESS_GND_GND 65#define IS31FL3736_I2C_ADDRESS_1 IS31FL3736_I2C_ADDRESS_GND_GND
66#define IS31FL3736_DRIVER_COUNT 1
67#define IS31FL3736_LED_COUNT 96 66#define IS31FL3736_LED_COUNT 96
diff --git a/keyboards/wilba_tech/wt65_b/config.h b/keyboards/wilba_tech/wt65_b/config.h
index 164caecd00..5f3671004d 100644
--- a/keyboards/wilba_tech/wt65_b/config.h
+++ b/keyboards/wilba_tech/wt65_b/config.h
@@ -63,5 +63,4 @@
63#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 7 63#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 7
64 64
65#define IS31FL3736_I2C_ADDRESS_1 IS31FL3736_I2C_ADDRESS_GND_GND 65#define IS31FL3736_I2C_ADDRESS_1 IS31FL3736_I2C_ADDRESS_GND_GND
66#define IS31FL3736_DRIVER_COUNT 1
67#define IS31FL3736_LED_COUNT 96 66#define IS31FL3736_LED_COUNT 96
diff --git a/keyboards/wilba_tech/wt75_a/config.h b/keyboards/wilba_tech/wt75_a/config.h
index a8185a6807..9dbe040508 100644
--- a/keyboards/wilba_tech/wt75_a/config.h
+++ b/keyboards/wilba_tech/wt75_a/config.h
@@ -63,5 +63,4 @@
63#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 7 63#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 7
64 64
65#define IS31FL3736_I2C_ADDRESS_1 IS31FL3736_I2C_ADDRESS_GND_GND 65#define IS31FL3736_I2C_ADDRESS_1 IS31FL3736_I2C_ADDRESS_GND_GND
66#define IS31FL3736_DRIVER_COUNT 1
67#define IS31FL3736_LED_COUNT 96 66#define IS31FL3736_LED_COUNT 96
diff --git a/keyboards/wilba_tech/wt75_b/config.h b/keyboards/wilba_tech/wt75_b/config.h
index 4834251691..9a9db88ab1 100644
--- a/keyboards/wilba_tech/wt75_b/config.h
+++ b/keyboards/wilba_tech/wt75_b/config.h
@@ -63,5 +63,4 @@
63#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 7 63#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 7
64 64
65#define IS31FL3736_I2C_ADDRESS_1 IS31FL3736_I2C_ADDRESS_GND_GND 65#define IS31FL3736_I2C_ADDRESS_1 IS31FL3736_I2C_ADDRESS_GND_GND
66#define IS31FL3736_DRIVER_COUNT 1
67#define IS31FL3736_LED_COUNT 96 66#define IS31FL3736_LED_COUNT 96
diff --git a/keyboards/wilba_tech/wt75_c/config.h b/keyboards/wilba_tech/wt75_c/config.h
index d1e81992f5..d2164ceea0 100644
--- a/keyboards/wilba_tech/wt75_c/config.h
+++ b/keyboards/wilba_tech/wt75_c/config.h
@@ -63,5 +63,4 @@
63#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 7 63#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 7
64 64
65#define IS31FL3736_I2C_ADDRESS_1 IS31FL3736_I2C_ADDRESS_GND_GND 65#define IS31FL3736_I2C_ADDRESS_1 IS31FL3736_I2C_ADDRESS_GND_GND
66#define IS31FL3736_DRIVER_COUNT 1
67#define IS31FL3736_LED_COUNT 96 66#define IS31FL3736_LED_COUNT 96
diff --git a/keyboards/wilba_tech/wt80_a/config.h b/keyboards/wilba_tech/wt80_a/config.h
index c6594c1689..bda91f562c 100644
--- a/keyboards/wilba_tech/wt80_a/config.h
+++ b/keyboards/wilba_tech/wt80_a/config.h
@@ -63,5 +63,4 @@
63#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 7 63#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 7
64 64
65#define IS31FL3736_I2C_ADDRESS_1 IS31FL3736_I2C_ADDRESS_GND_GND 65#define IS31FL3736_I2C_ADDRESS_1 IS31FL3736_I2C_ADDRESS_GND_GND
66#define IS31FL3736_DRIVER_COUNT 1
67#define IS31FL3736_LED_COUNT 96 66#define IS31FL3736_LED_COUNT 96
diff --git a/keyboards/wilba_tech/zeal60/config.h b/keyboards/wilba_tech/zeal60/config.h
index 830dd6d78a..225c878b20 100644
--- a/keyboards/wilba_tech/zeal60/config.h
+++ b/keyboards/wilba_tech/zeal60/config.h
@@ -18,7 +18,6 @@
18// IS31FL3731 driver 18// IS31FL3731 driver
19#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 19#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
20#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 20#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
21#define IS31FL3731_DRIVER_COUNT 2
22#define IS31FL3731_LED_COUNT 72 21#define IS31FL3731_LED_COUNT 72
23 22
24// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap 23// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
diff --git a/keyboards/wilba_tech/zeal65/config.h b/keyboards/wilba_tech/zeal65/config.h
index a7d1b81f84..71977f4090 100644
--- a/keyboards/wilba_tech/zeal65/config.h
+++ b/keyboards/wilba_tech/zeal65/config.h
@@ -18,7 +18,6 @@
18// IS31FL3731 driver 18// IS31FL3731 driver
19#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 19#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
20#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 20#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
21#define IS31FL3731_DRIVER_COUNT 2
22#define IS31FL3731_LED_COUNT 72 21#define IS31FL3731_LED_COUNT 72
23 22
24// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap 23// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
diff --git a/keyboards/xbows/knight/config.h b/keyboards/xbows/knight/config.h
index 21b3ff6946..d28ca9eac4 100644
--- a/keyboards/xbows/knight/config.h
+++ b/keyboards/xbows/knight/config.h
@@ -50,7 +50,6 @@
50# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 50# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
51# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 51# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
52# define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SCL 52# define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SCL
53# define IS31FL3731_DRIVER_COUNT 3
54# define DRIVER_1_LED_TOTAL 36 53# define DRIVER_1_LED_TOTAL 36
55# define DRIVER_2_LED_TOTAL 35 54# define DRIVER_2_LED_TOTAL 35
56# define DRIVER_3_LED_TOTAL 15 55# define DRIVER_3_LED_TOTAL 15
diff --git a/keyboards/xbows/knight_plus/config.h b/keyboards/xbows/knight_plus/config.h
index 91d69d9408..433d8d994f 100644
--- a/keyboards/xbows/knight_plus/config.h
+++ b/keyboards/xbows/knight_plus/config.h
@@ -50,7 +50,6 @@
50# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 50# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
51# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 51# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
52# define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SCL 52# define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SCL
53# define IS31FL3731_DRIVER_COUNT 3
54# define DRIVER_1_LED_TOTAL 36 53# define DRIVER_1_LED_TOTAL 36
55# define DRIVER_2_LED_TOTAL 35 54# define DRIVER_2_LED_TOTAL 35
56# define DRIVER_3_LED_TOTAL 15 55# define DRIVER_3_LED_TOTAL 15
diff --git a/keyboards/xbows/nature/config.h b/keyboards/xbows/nature/config.h
index 4e8270ea89..1710e17c2f 100644
--- a/keyboards/xbows/nature/config.h
+++ b/keyboards/xbows/nature/config.h
@@ -52,7 +52,6 @@
52# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 52# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
53# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 53# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
54# define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SCL 54# define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SCL
55# define IS31FL3731_DRIVER_COUNT 3
56# define DRIVER_1_LED_TOTAL 36 55# define DRIVER_1_LED_TOTAL 36
57# define DRIVER_2_LED_TOTAL 36 56# define DRIVER_2_LED_TOTAL 36
58# define DRIVER_3_LED_TOTAL 15 57# define DRIVER_3_LED_TOTAL 15
diff --git a/keyboards/xbows/numpad/config.h b/keyboards/xbows/numpad/config.h
index 5beb35aa1b..df025a850d 100644
--- a/keyboards/xbows/numpad/config.h
+++ b/keyboards/xbows/numpad/config.h
@@ -48,6 +48,5 @@
48# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Hue & value pulse away from multiple key hits then fades value out 48# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Hue & value pulse away from multiple key hits then fades value out
49 49
50# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_VCC 50# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_VCC
51# define IS31FL3731_DRIVER_COUNT 1
52# define RGB_MATRIX_LED_COUNT 22 51# define RGB_MATRIX_LED_COUNT 22
53#endif 52#endif
diff --git a/keyboards/xbows/ranger/config.h b/keyboards/xbows/ranger/config.h
index 49d889b920..92bcfa492c 100644
--- a/keyboards/xbows/ranger/config.h
+++ b/keyboards/xbows/ranger/config.h
@@ -49,7 +49,6 @@
49# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 49# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
50# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL 50# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL
51# define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SDA 51# define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SDA
52# define IS31FL3731_DRIVER_COUNT 3
53# define DRIVER_1_LED_TOTAL 36 52# define DRIVER_1_LED_TOTAL 36
54# define DRIVER_2_LED_TOTAL 36 53# define DRIVER_2_LED_TOTAL 36
55# define DRIVER_3_LED_TOTAL 15 54# define DRIVER_3_LED_TOTAL 15
diff --git a/keyboards/xbows/woody/config.h b/keyboards/xbows/woody/config.h
index dc86093694..7d06b7abda 100644
--- a/keyboards/xbows/woody/config.h
+++ b/keyboards/xbows/woody/config.h
@@ -58,7 +58,6 @@
58 58
59# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 59# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
60# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 60# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
61# define IS31FL3731_DRIVER_COUNT 2
62# define DRIVER_1_LED_TOTAL 35 61# define DRIVER_1_LED_TOTAL 35
63# define DRIVER_2_LED_TOTAL 32 62# define DRIVER_2_LED_TOTAL 32
64# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 63# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/xelus/dawn60/rev1/config.h b/keyboards/xelus/dawn60/rev1/config.h
index a2a127f0a4..2552942635 100644
--- a/keyboards/xelus/dawn60/rev1/config.h
+++ b/keyboards/xelus/dawn60/rev1/config.h
@@ -18,7 +18,6 @@
18// IS31FL3731 driver 18// IS31FL3731 driver
19#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 19#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
20#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 20#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
21#define IS31FL3731_DRIVER_COUNT 2
22#define IS31FL3731_LED_COUNT 64 21#define IS31FL3731_LED_COUNT 64
23 22
24// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap 23// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
diff --git a/keyboards/xelus/dawn60/rev1_qmk/config.h b/keyboards/xelus/dawn60/rev1_qmk/config.h
index e0ffe30843..4e6d418f21 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/config.h
+++ b/keyboards/xelus/dawn60/rev1_qmk/config.h
@@ -27,7 +27,6 @@
27#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 27#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
28#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA 28#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
29 29
30#define IS31FL3731_DRIVER_COUNT 2
31#define DRIVER_1_LED_TOTAL 32 30#define DRIVER_1_LED_TOTAL 32
32#define DRIVER_2_LED_TOTAL 32 31#define DRIVER_2_LED_TOTAL 32
33#define IS31FL3731_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) 32#define IS31FL3731_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/xelus/pachi/rgb/rev1/config.h b/keyboards/xelus/pachi/rgb/rev1/config.h
index 8d86a977c1..e12b1af443 100644
--- a/keyboards/xelus/pachi/rgb/rev1/config.h
+++ b/keyboards/xelus/pachi/rgb/rev1/config.h
@@ -39,7 +39,6 @@
39// RGB Matrix defines 39// RGB Matrix defines
40#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 40#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
41 41
42#define IS31FL3741_DRIVER_COUNT 1
43#define DRIVER_1_LED_TOTAL 117 42#define DRIVER_1_LED_TOTAL 117
44#define IS31FL3741_LED_COUNT DRIVER_1_LED_TOTAL 43#define IS31FL3741_LED_COUNT DRIVER_1_LED_TOTAL
45 44
diff --git a/keyboards/xelus/pachi/rgb/rev2/config.h b/keyboards/xelus/pachi/rgb/rev2/config.h
index 0afc9e2a43..f852602705 100644
--- a/keyboards/xelus/pachi/rgb/rev2/config.h
+++ b/keyboards/xelus/pachi/rgb/rev2/config.h
@@ -39,7 +39,6 @@
39// RGB Matrix defines 39// RGB Matrix defines
40#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND 40#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
41 41
42#define IS31FL3741_DRIVER_COUNT 1
43#define DRIVER_1_LED_TOTAL 117 42#define DRIVER_1_LED_TOTAL 117
44#define IS31FL3741_LED_COUNT DRIVER_1_LED_TOTAL 43#define IS31FL3741_LED_COUNT DRIVER_1_LED_TOTAL
45 44