Rename `DRIVER_ADDR_n` defines (#22200)

Co-authored-by: Nick Brassel <nick@tzarc.org>

42 files changed, 74 insertions, 75 deletions

diff --git a/keyboards/keychron/c1_pro/ansi/rgb/config.h b/keyboards/keychron/c1_pro/ansi/rgb/config.h
index f2779f2bb9..ce9d46cad2 100644
--- a/keyboards/keychron/c1_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/c1_pro/ansi/rgb/config.h
@@ -21,8 +21,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 49
diff --git a/keyboards/keychron/c1_pro/ansi/white/config.h b/keyboards/keychron/c1_pro/ansi/white/config.h
index 430cb68a8e..17c415153b 100644
--- a/keyboards/keychron/c1_pro/ansi/white/config.h
+++ b/keyboards/keychron/c1_pro/ansi/white/config.h
@@ -21,7 +21,7 @@
 
 /* LED Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 1
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 
 /* LED Matrix Configuration */
 #define LED_MATRIX_LED_COUNT 90
diff --git a/keyboards/keychron/c2_pro/ansi/rgb/config.h b/keyboards/keychron/c2_pro/ansi/rgb/config.h
index 673e8e438e..25be9ae686 100644
--- a/keyboards/keychron/c2_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/c2_pro/ansi/rgb/config.h
@@ -18,8 +18,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* Set LED driver current */
 #define SNLED27351_CURRENT_TUNE \
diff --git a/keyboards/keychron/c2_pro/ansi/white/config.h b/keyboards/keychron/c2_pro/ansi/white/config.h
index 9945901527..9e09bf40ea 100644
--- a/keyboards/keychron/c2_pro/ansi/white/config.h
+++ b/keyboards/keychron/c2_pro/ansi/white/config.h
@@ -18,7 +18,7 @@
 
 /* LED Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 1
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 
 /* Set LED driver current */
 #define SNLED27351_CURRENT_TUNE \
diff --git a/keyboards/keychron/q0/base/config.h b/keyboards/keychron/q0/base/config.h
index 566f808762..82dd796660 100644
--- a/keyboards/keychron/q0/base/config.h
+++ b/keyboards/keychron/q0/base/config.h
@@ -18,7 +18,7 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 1
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 
 /* RGB Matrix Configuration */
 #define RGB_MATRIX_LED_COUNT 21
diff --git a/keyboards/keychron/q0/plus/config.h b/keyboards/keychron/q0/plus/config.h
index 1c47234f12..a27ec9cfa6 100644
--- a/keyboards/keychron/q0/plus/config.h
+++ b/keyboards/keychron/q0/plus/config.h
@@ -18,7 +18,7 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 1
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
 
 /* RGB Matrix Configuration */
 #define RGB_MATRIX_LED_COUNT 26
diff --git a/keyboards/keychron/q10/config.h b/keyboards/keychron/q10/config.h
index b31322464e..645eb054d4 100644
--- a/keyboards/keychron/q10/config.h
+++ b/keyboards/keychron/q10/config.h
@@ -31,8 +31,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
diff --git a/keyboards/keychron/q11/config.h b/keyboards/keychron/q11/config.h
index 6880ee7c2d..47a0d1ab2e 100755
--- a/keyboards/keychron/q11/config.h
+++ b/keyboards/keychron/q11/config.h
@@ -28,7 +28,7 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 1
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
diff --git a/keyboards/keychron/q12/config.h b/keyboards/keychron/q12/config.h
index 1114c966aa..dde7268405 100644
--- a/keyboards/keychron/q12/config.h
+++ b/keyboards/keychron/q12/config.h
@@ -27,8 +27,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
diff --git a/keyboards/keychron/q1v1/config.h b/keyboards/keychron/q1v1/config.h
index 93452f86fd..b758d438ff 100644
--- a/keyboards/keychron/q1v1/config.h
+++ b/keyboards/keychron/q1v1/config.h
@@ -18,8 +18,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define IS31FL3733_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#define DRIVER_ADDR_2 IS31FL3733_I2C_ADDRESS_GND_VCC
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_VCC
 
 /* DIP switch */
 #define DIP_SWITCH_MATRIX_GRID  { {0,1} }
diff --git a/keyboards/keychron/q1v2/ansi/ansi.c b/keyboards/keychron/q1v2/ansi/ansi.c
index ea6c6278d1..3b80c9d5c4 100644
--- a/keyboards/keychron/q1v2/ansi/ansi.c
+++ b/keyboards/keychron/q1v2/ansi/ansi.c
@@ -18,8 +18,8 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
-/* Refer to CKLED2001 manual for these locations
+const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
diff --git a/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c
index ea6c6278d1..3b80c9d5c4 100644
--- a/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c
@@ -18,8 +18,8 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
-/* Refer to CKLED2001 manual for these locations
+const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
diff --git a/keyboards/keychron/q1v2/config.h b/keyboards/keychron/q1v2/config.h
index e2d331c1ac..d66e78b030 100644
--- a/keyboards/keychron/q1v2/config.h
+++ b/keyboards/keychron/q1v2/config.h
@@ -17,9 +17,9 @@
 #pragma once
 
 /* RGB Matrix Driver Configuration */
-#define DRIVER_COUNT 2
-#define DRIVER_ADDR_1 0b1110111
-#define DRIVER_ADDR_2 0b1110100
+#define SNLED27351_DRIVER_COUNT 2
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
@@ -44,10 +44,9 @@
 #define WEAR_LEVELING_LOGICAL_SIZE 2048
 #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
 
-/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in CKLED2001.h) */
-#define PHASE_CHANNEL MSKPHASE_9CHANNEL
+#define SNLED27351_PHASE_CHANNEL SNLED27351_MSKPHASE_9CHANNEL
 /* Set LED driver current */
-#define CKLED2001_CURRENT_TUNE \
+#define SNLED27351_CURRENT_TUNE \
     { 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50 }
 
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/keychron/q1v2/info.json b/keyboards/keychron/q1v2/info.json
index c4a75f0283..b40c41c760 100644
--- a/keyboards/keychron/q1v2/info.json
+++ b/keyboards/keychron/q1v2/info.json
@@ -30,7 +30,7 @@
     },
     "diode_direction": "ROW2COL",
     "rgb_matrix": {
-        "driver": "ckled2001",
+        "driver": "snled27351",
         "animations": {
             "band_spiral_val": true,
             "breathing": true,
diff --git a/keyboards/keychron/q1v2/iso/iso.c b/keyboards/keychron/q1v2/iso/iso.c
index eae39c8d61..d879e55083 100644
--- a/keyboards/keychron/q1v2/iso/iso.c
+++ b/keyboards/keychron/q1v2/iso/iso.c
@@ -18,8 +18,8 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
-/* Refer to CKLED2001 manual for these locations
+const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
diff --git a/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c b/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c
index eae39c8d61..d879e55083 100644
--- a/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c
@@ -18,8 +18,8 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
-/* Refer to CKLED2001 manual for these locations
+const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
diff --git a/keyboards/keychron/q1v2/jis/jis.c b/keyboards/keychron/q1v2/jis/jis.c
index 6bfcbad3e4..e8c0112649 100644
--- a/keyboards/keychron/q1v2/jis/jis.c
+++ b/keyboards/keychron/q1v2/jis/jis.c
@@ -18,8 +18,8 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
-/* Refer to CKLED2001 manual for these locations
+const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
diff --git a/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c b/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c
index 6bfcbad3e4..e8c0112649 100644
--- a/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c
@@ -18,8 +18,8 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
-/* Refer to CKLED2001 manual for these locations
+const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
diff --git a/keyboards/keychron/q2/config.h b/keyboards/keychron/q2/config.h
index 9b17851400..e6bb40fedf 100644
--- a/keyboards/keychron/q2/config.h
+++ b/keyboards/keychron/q2/config.h
@@ -23,8 +23,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 #define SNLED27351_PHASE_CHANNEL SNLED27351_MSKPHASE_9CHANNEL
 
diff --git a/keyboards/keychron/q3/config.h b/keyboards/keychron/q3/config.h
index 035aea2bb3..a3cf5eafb7 100644
--- a/keyboards/keychron/q3/config.h
+++ b/keyboards/keychron/q3/config.h
@@ -18,8 +18,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
diff --git a/keyboards/keychron/q4/ansi/v1/config.h b/keyboards/keychron/q4/ansi/v1/config.h
index 2d19c55a66..4c3df271dd 100644
--- a/keyboards/keychron/q4/ansi/v1/config.h
+++ b/keyboards/keychron/q4/ansi/v1/config.h
@@ -18,8 +18,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* RGB Matrix Configuration */
 #define RGB_MATRIX_LED_COUNT 61
diff --git a/keyboards/keychron/q4/ansi/v2/config.h b/keyboards/keychron/q4/ansi/v2/config.h
index 87b8eb401f..82b534c699 100644
--- a/keyboards/keychron/q4/ansi/v2/config.h
+++ b/keyboards/keychron/q4/ansi/v2/config.h
@@ -18,7 +18,7 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 1
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 
 /* RGB Matrix Configuration */
 #define RGB_MATRIX_LED_COUNT 61
diff --git a/keyboards/keychron/q4/iso/config.h b/keyboards/keychron/q4/iso/config.h
index da84fed852..3f3b6f653d 100644
--- a/keyboards/keychron/q4/iso/config.h
+++ b/keyboards/keychron/q4/iso/config.h
@@ -18,7 +18,7 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 1
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 
 /* RGB Matrix Configuration */
 #define RGB_MATRIX_LED_COUNT 62
diff --git a/keyboards/keychron/q5/config.h b/keyboards/keychron/q5/config.h
index 49216fba1f..89513dcaf8 100644
--- a/keyboards/keychron/q5/config.h
+++ b/keyboards/keychron/q5/config.h
@@ -31,8 +31,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 #define SNLED27351_CURRENT_TUNE \
     { 0xB6, 0xB6, 0x56, 0xB6, 0xB6, 0x56, 0xB6, 0xB6, 0x56, 0xB6, 0xB6, 0x56 }
diff --git a/keyboards/keychron/q6/config.h b/keyboards/keychron/q6/config.h
index 8b26545724..bf35a5a0f2 100644
--- a/keyboards/keychron/q6/config.h
+++ b/keyboards/keychron/q6/config.h
@@ -25,8 +25,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 #define SNLED27351_CURRENT_TUNE \
     { 0xA4, 0xA4, 0x52, 0xA4, 0xA4, 0x52, 0xA4, 0xA4, 0x52, 0xA4, 0xA4, 0x52 }
diff --git a/keyboards/keychron/q60/config.h b/keyboards/keychron/q60/config.h
index 9816ff3479..fe44486803 100644
--- a/keyboards/keychron/q60/config.h
+++ b/keyboards/keychron/q60/config.h
@@ -18,7 +18,7 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 1
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
diff --git a/keyboards/keychron/q65/config.h b/keyboards/keychron/q65/config.h
index 43b7ef9b04..7ff53820d9 100644
--- a/keyboards/keychron/q65/config.h
+++ b/keyboards/keychron/q65/config.h
@@ -27,8 +27,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
diff --git a/keyboards/keychron/q7/config.h b/keyboards/keychron/q7/config.h
index 9593196149..688f057d31 100644
--- a/keyboards/keychron/q7/config.h
+++ b/keyboards/keychron/q7/config.h
@@ -18,8 +18,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
diff --git a/keyboards/keychron/q8/config.h b/keyboards/keychron/q8/config.h
index 7b23723f99..eb746a2083 100644
--- a/keyboards/keychron/q8/config.h
+++ b/keyboards/keychron/q8/config.h
@@ -21,8 +21,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
diff --git a/keyboards/keychron/q9/config.h b/keyboards/keychron/q9/config.h
index e423d962e0..24ce821942 100644
--- a/keyboards/keychron/q9/config.h
+++ b/keyboards/keychron/q9/config.h
@@ -24,7 +24,7 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 1
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
diff --git a/keyboards/keychron/q9_plus/config.h b/keyboards/keychron/q9_plus/config.h
index 8416de0d6a..37599e6fdb 100755
--- a/keyboards/keychron/q9_plus/config.h
+++ b/keyboards/keychron/q9_plus/config.h
@@ -24,7 +24,7 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 1
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
diff --git a/keyboards/keychron/s1/ansi/rgb/config.h b/keyboards/keychron/s1/ansi/rgb/config.h
index 21569bd07c..1fa0623ac4 100644
--- a/keyboards/keychron/s1/ansi/rgb/config.h
+++ b/keyboards/keychron/s1/ansi/rgb/config.h
@@ -18,8 +18,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 #define DRIVER_1_LED_TOTAL 46
 #define DRIVER_2_LED_TOTAL 38
 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/keychron/s1/ansi/white/config.h b/keyboards/keychron/s1/ansi/white/config.h
index 0ee5470f69..ad612700b0 100644
--- a/keyboards/keychron/s1/ansi/white/config.h
+++ b/keyboards/keychron/s1/ansi/white/config.h
@@ -18,7 +18,7 @@
 
 /* LED Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 1
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 #define DRIVER_1_LED_TOTAL 84
 #define LED_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
 
diff --git a/keyboards/keychron/v1/config.h b/keyboards/keychron/v1/config.h
index e08a27f1c3..713ca1157e 100644
--- a/keyboards/keychron/v1/config.h
+++ b/keyboards/keychron/v1/config.h
@@ -33,8 +33,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
diff --git a/keyboards/keychron/v10/config.h b/keyboards/keychron/v10/config.h
index e711b753dd..2848f2ce8f 100644
--- a/keyboards/keychron/v10/config.h
+++ b/keyboards/keychron/v10/config.h
@@ -32,8 +32,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
diff --git a/keyboards/keychron/v2/config.h b/keyboards/keychron/v2/config.h
index 8ac0bea5f0..fa3c794edc 100644
--- a/keyboards/keychron/v2/config.h
+++ b/keyboards/keychron/v2/config.h
@@ -21,8 +21,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
diff --git a/keyboards/keychron/v3/config.h b/keyboards/keychron/v3/config.h
index a6a6394ffd..53f81c87fb 100644
--- a/keyboards/keychron/v3/config.h
+++ b/keyboards/keychron/v3/config.h
@@ -21,8 +21,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
diff --git a/keyboards/keychron/v4/config.h b/keyboards/keychron/v4/config.h
index fb0b2cd276..02bf981e4d 100644
--- a/keyboards/keychron/v4/config.h
+++ b/keyboards/keychron/v4/config.h
@@ -18,7 +18,7 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 1
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
diff --git a/keyboards/keychron/v5/config.h b/keyboards/keychron/v5/config.h
index bca7f6d1cf..0ffc314144 100644
--- a/keyboards/keychron/v5/config.h
+++ b/keyboards/keychron/v5/config.h
@@ -27,8 +27,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
diff --git a/keyboards/keychron/v6/config.h b/keyboards/keychron/v6/config.h
index 2ff53f2a67..420b36a8c9 100644
--- a/keyboards/keychron/v6/config.h
+++ b/keyboards/keychron/v6/config.h
@@ -21,8 +21,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
diff --git a/keyboards/keychron/v7/config.h b/keyboards/keychron/v7/config.h
index e66866a33c..dd0ce2f3c4 100644
--- a/keyboards/keychron/v7/config.h
+++ b/keyboards/keychron/v7/config.h
@@ -18,8 +18,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
diff --git a/keyboards/keychron/v8/config.h b/keyboards/keychron/v8/config.h
index ed4d98799a..ae0c8ead05 100644
--- a/keyboards/keychron/v8/config.h
+++ b/keyboards/keychron/v8/config.h
@@ -21,8 +21,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U