Merge remote-tracking branch 'origin/master' into develop

10 files changed, 0 insertions, 26 deletions

diff --git a/keyboards/aeboards/ext65/rev2/config.h b/keyboards/aeboards/ext65/rev2/config.h
index 9db2b3138b..541f07ee98 100644
--- a/keyboards/aeboards/ext65/rev2/config.h
+++ b/keyboards/aeboards/ext65/rev2/config.h
@@ -60,7 +60,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define I2C1_SCL_PAL_MODE 1
 #define I2C1_SDA_PAL_MODE 1
 
-#define I2C1_TIMINGR_PRESC 	0U
 #define I2C1_TIMINGR_SCLDEL 3U
 #define I2C1_TIMINGR_SDADEL 1U
 #define I2C1_TIMINGR_SCLH 	3U
diff --git a/keyboards/clueboard/66_hotswap/gen1/config.h b/keyboards/clueboard/66_hotswap/gen1/config.h
index 98d9728870..047a071421 100644
--- a/keyboards/clueboard/66_hotswap/gen1/config.h
+++ b/keyboards/clueboard/66_hotswap/gen1/config.h
@@ -106,7 +106,6 @@
 // 0b1110101 AD <-> SCL
 // 0b1110110 AD <-> SDA
 #define LED_DRIVER_ADDR_1 0b1110100
-#define I2C1_BANK GPIOB
 #define I2C1_SCL 8
 #define I2C1_SDA 9
 
diff --git a/keyboards/dekunukem/duckypad/config.h b/keyboards/dekunukem/duckypad/config.h
index 27806ab83d..9abfd0bd71 100644
--- a/keyboards/dekunukem/duckypad/config.h
+++ b/keyboards/dekunukem/duckypad/config.h
@@ -41,18 +41,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
 #define RGB_MATRIX_STARTUP_HUE 221
 
-#define I2C1_SCL_BANK GPIOB
 #define I2C1_SCL 8
-#define I2C1_SDA_BANK GPIOB
 #define I2C1_SDA 9
 
 #define I2C1_SCL_PAL_MODE 1
 #define I2C1_SDA_PAL_MODE 1
 
-#define I2C1_OPMODE OPMODE_I2C
-#define I2C1_CLOCK_SPEED 100000
-#define I2C1_DUTY_CYCLE STD_DUTY_CYCLE
-
 #define OLED_DISPLAY_ADDRESS 0x3C
 #define OLED_DISPLAY_128X64
 #define OLED_COM_PINS 0x12
diff --git a/keyboards/handwired/pill60/config.h b/keyboards/handwired/pill60/config.h
index d9940c77c2..16147e584b 100644
--- a/keyboards/handwired/pill60/config.h
+++ b/keyboards/handwired/pill60/config.h
@@ -44,10 +44,3 @@
 #define ENCODERS_PAD_B \
     { B8 }
 #define ENCODER_RESOLUTION 2
-
-/* OLED */
-#define I2C_DRIVER I2CD1
-#define I2C1_SCL_BANK GPIOB
-#define I2C1_SDA_BANK GPIOB
-#define I2C1_SCL 6
-#define I2C1_SDA 7
diff --git a/keyboards/handwired/riblee_f411/mcuconf.h b/keyboards/handwired/riblee_f411/mcuconf.h
index 51561d37ef..79a654f1a4 100644
--- a/keyboards/handwired/riblee_f411/mcuconf.h
+++ b/keyboards/handwired/riblee_f411/mcuconf.h
@@ -20,6 +20,3 @@
 
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
-
-#undef I2C_DRIVER
-#define I2C_DRIVER I2CD1
diff --git a/keyboards/matrix/m20add/config.h b/keyboards/matrix/m20add/config.h
index f404ef9ccd..3df5d78d55 100644
--- a/keyboards/matrix/m20add/config.h
+++ b/keyboards/matrix/m20add/config.h
@@ -82,7 +82,6 @@
 #define DEBOUNCE    5
 
 // i2c setting
-#define USE_I2CV1
 #define I2C1_SCL 8
 #define I2C1_SDA 9
 #define I2C1_CLOCK_SPEED 400000
diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h
index 8fa6bbb5cc..f41cad94ce 100644
--- a/keyboards/matrix/noah/config.h
+++ b/keyboards/matrix/noah/config.h
@@ -26,7 +26,6 @@
 #define DEBOUNCE    5
 
 // i2c setting
-#define USE_I2CV1
 #define I2C1_SCL 8
 #define I2C1_SDA 9
 #define I2C1_CLOCK_SPEED 400000
diff --git a/keyboards/xelus/kangaroo/config.h b/keyboards/xelus/kangaroo/config.h
index 0c3e6e291b..f6b17c24a3 100644
--- a/keyboards/xelus/kangaroo/config.h
+++ b/keyboards/xelus/kangaroo/config.h
@@ -49,7 +49,6 @@
 #define I2C1_SCL_PAL_MODE 1
 #define I2C1_SDA_PAL_MODE 1
 
-#define I2C1_TIMINGR_PRESC 	0U
 #define I2C1_TIMINGR_SCLDEL 3U
 #define I2C1_TIMINGR_SDADEL 1U
 #define I2C1_TIMINGR_SCLH 	3U
diff --git a/keyboards/xelus/valor_frl_tkl/config.h b/keyboards/xelus/valor_frl_tkl/config.h
index ff2ea6dd05..5319a95bae 100644
--- a/keyboards/xelus/valor_frl_tkl/config.h
+++ b/keyboards/xelus/valor_frl_tkl/config.h
@@ -53,7 +53,6 @@
 #define I2C1_SCL_PAL_MODE 1
 #define I2C1_SDA_PAL_MODE 1
 
-#define I2C1_TIMINGR_PRESC 	0U
 #define I2C1_TIMINGR_SCLDEL 3U
 #define I2C1_TIMINGR_SDADEL 1U
 #define I2C1_TIMINGR_SCLH 	3U
diff --git a/keyboards/zoo/wampus/config.h b/keyboards/zoo/wampus/config.h
index 1b67ac89a4..c3a13ec355 100644
--- a/keyboards/zoo/wampus/config.h
+++ b/keyboards/zoo/wampus/config.h
@@ -70,13 +70,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // OLED defines
 #define OLED_TIMEOUT 60000
-/* Both pins are in bank B */
-#define I2C1_SCL 6 // B6
-#define I2C1_SDA 7 // B7
 #define I2C1_SCL_PAL_MODE 1
 #define I2C1_SDA_PAL_MODE 1
 /* This configures the I2C clock to 400khz assuming a 48Mhz clock */
-#define I2C1_TIMINGR_PRESC 	0U
 #define I2C1_TIMINGR_SCLDEL 3U
 #define I2C1_TIMINGR_SDADEL 1U
 #define I2C1_TIMINGR_SCLH 	3U