Remove the frequency argument for i2c, move to using RccPeripheral.

4 files changed, 8 insertions, 5 deletions

diff --git a/embassy-stm32/src/i2c/mod.rs b/embassy-stm32/src/i2c/mod.rs
index c108a0a87..d2da8c310 100644
--- a/embassy-stm32/src/i2c/mod.rs
+++ b/embassy-stm32/src/i2c/mod.rs
@@ -17,8 +17,9 @@ pub enum Error {
 
 pub(crate) mod sealed {
     use crate::gpio::Pin;
+    use crate::rcc::RccPeripheral;
 
-    pub trait Instance {
+    pub trait Instance: RccPeripheral {
         fn regs() -> &'static crate::pac::i2c::I2c;
     }
 
diff --git a/embassy-stm32/src/i2c/v1.rs b/embassy-stm32/src/i2c/v1.rs
index 91bc37db3..62435e8a3 100644
--- a/embassy-stm32/src/i2c/v1.rs
+++ b/embassy-stm32/src/i2c/v1.rs
@@ -22,13 +22,14 @@ impl<'d, T: Instance> I2c<'d, T> {
         _peri: impl Unborrow<Target = T> + 'd,
         scl: impl Unborrow<Target = impl SclPin<T>>,
         sda: impl Unborrow<Target = impl SdaPin<T>>,
-        freq: F,
     ) -> Self
     where
         F: Into<Hertz>,
     {
         unborrow!(scl, sda);
 
+        T::enable();
+
         unsafe {
             Self::configure_pin(scl.block(), scl.pin() as _, scl.af_num());
             Self::configure_pin(sda.block(), sda.pin() as _, sda.af_num());
@@ -41,7 +42,7 @@ impl<'d, T: Instance> I2c<'d, T> {
             });
         }
 
-        let timings = Timings::new(pclk, freq.into());
+        let timings = Timings::new(pclk, T::frequency().into());
 
         unsafe {
             T::regs().cr2().modify(|reg| {
diff --git a/embassy-stm32/src/i2c/v2.rs b/embassy-stm32/src/i2c/v2.rs
index 03ad29f13..7747857b0 100644
--- a/embassy-stm32/src/i2c/v2.rs
+++ b/embassy-stm32/src/i2c/v2.rs
@@ -22,13 +22,14 @@ impl<'d, T: Instance> I2c<'d, T> {
         _peri: impl Unborrow<Target = T> + 'd,
         scl: impl Unborrow<Target = impl SclPin<T>>,
         sda: impl Unborrow<Target = impl SdaPin<T>>,
-        freq: F,
     ) -> Self
     where
         F: Into<Hertz>,
     {
         unborrow!(scl, sda);
 
+        T::enable();
+
         unsafe {
             Self::configure_pin(scl.block(), scl.pin() as _, scl.af_num());
             Self::configure_pin(sda.block(), sda.pin() as _, sda.af_num());
@@ -41,7 +42,7 @@ impl<'d, T: Instance> I2c<'d, T> {
             });
         }
 
-        let timings = Timings::new(pclk, freq.into());
+        let timings = Timings::new(pclk, T::frequency().into());
 
         unsafe {
             T::regs().timingr().write(|reg| {
diff --git a/stm32-data b/stm32-data
-Subproject 0877c27cb1332237e65d74700b7bfb768996ca6
+Subproject d7caa63b0091f38af6657ec86b868bfa2e8a7b5