Merge pull request #1718 from copterust/stm32-spi-set-freq-in-config

Move frequency to SPI config

embassy-stm32/src/i2s.rs

@@ -165,7 +165,9 @@ impl<'d, T: Instance, Tx, Rx> I2S<'d, T, Tx, Rx> {
         mck.set_as_af(mck.af_num(), AFType::OutputPushPull);
         mck.set_speed(crate::gpio::Speed::VeryHigh);
 
-        let spi = Spi::new_internal(peri, txdma, rxdma, freq, SpiConfig::default());
+        let mut spi_cfg = SpiConfig::default();
+        spi_cfg.frequency = freq;
+        let spi = Spi::new_internal(peri, txdma, rxdma, spi_cfg);
 
         #[cfg(all(rcc_f4, not(stm32f410)))]
         let pclk = unsafe { get_freqs() }.plli2s.unwrap();

embassy-stm32/src/spi/mod.rs

@@ -36,6 +36,7 @@ pub enum BitOrder {
 pub struct Config {
     pub mode: Mode,
     pub bit_order: BitOrder,
+    pub frequency: Hertz,
 }
 
 impl Default for Config {
@@ -43,6 +44,7 @@ impl Default for Config {
         Self {
             mode: MODE_0,
             bit_order: BitOrder::MsbFirst,
+            frequency: Hertz(1_000_000),
         }
     }
 }
@@ -88,7 +90,6 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
         miso: impl Peripheral<P = impl MisoPin<T>> + 'd,
         txdma: impl Peripheral<P = Tx> + 'd,
         rxdma: impl Peripheral<P = Rx> + 'd,
-        freq: Hertz,
         config: Config,
     ) -> Self {
         into_ref!(peri, sck, mosi, miso);
@@ -112,7 +113,6 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
             Some(miso.map_into()),
             txdma,
             rxdma,
-            freq,
             config,
         )
     }
@@ -123,7 +123,6 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
         miso: impl Peripheral<P = impl MisoPin<T>> + 'd,
         txdma: impl Peripheral<P = Tx> + 'd, // TODO remove
         rxdma: impl Peripheral<P = Rx> + 'd,
-        freq: Hertz,
         config: Config,
     ) -> Self {
         into_ref!(sck, miso);
@@ -139,7 +138,6 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
             Some(miso.map_into()),
             txdma,
             rxdma,
-            freq,
             config,
         )
     }
@@ -150,7 +148,6 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
         mosi: impl Peripheral<P = impl MosiPin<T>> + 'd,
         txdma: impl Peripheral<P = Tx> + 'd,
         rxdma: impl Peripheral<P = Rx> + 'd, // TODO remove
-        freq: Hertz,
         config: Config,
     ) -> Self {
         into_ref!(sck, mosi);
@@ -166,7 +163,6 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
             None,
             txdma,
             rxdma,
-            freq,
             config,
         )
     }
@@ -176,14 +172,13 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
         mosi: impl Peripheral<P = impl MosiPin<T>> + 'd,
         txdma: impl Peripheral<P = Tx> + 'd,
         rxdma: impl Peripheral<P = Rx> + 'd, // TODO: remove
-        freq: Hertz,
         config: Config,
     ) -> Self {
         into_ref!(mosi);
         mosi.set_as_af_pull(mosi.af_num(), AFType::OutputPushPull, Pull::Down);
         mosi.set_speed(crate::gpio::Speed::Medium);
 
-        Self::new_inner(peri, None, Some(mosi.map_into()), None, txdma, rxdma, freq, config)
+        Self::new_inner(peri, None, Some(mosi.map_into()), None, txdma, rxdma, config)
     }
 
     #[cfg(stm32wl)]
@@ -201,7 +196,8 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
         let mut config = Config::default();
         config.mode = MODE_0;
         config.bit_order = BitOrder::MsbFirst;
-        Self::new_inner(peri, None, None, None, txdma, rxdma, freq, config)
+        config.frequency = freq;
+        Self::new_inner(peri, None, None, None, txdma, rxdma, config)
     }
 
     #[allow(dead_code)]
@@ -209,10 +205,9 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
         peri: impl Peripheral<P = T> + 'd,
         txdma: impl Peripheral<P = Tx> + 'd,
         rxdma: impl Peripheral<P = Rx> + 'd,
-        freq: Hertz,
         config: Config,
     ) -> Self {
-        Self::new_inner(peri, None, None, None, txdma, rxdma, freq, config)
+        Self::new_inner(peri, None, None, None, txdma, rxdma, config)
     }
 
     fn new_inner(
@@ -222,12 +217,12 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
         miso: Option<PeripheralRef<'d, AnyPin>>,
         txdma: impl Peripheral<P = Tx> + 'd,
         rxdma: impl Peripheral<P = Rx> + 'd,
-        freq: Hertz,
         config: Config,
     ) -> Self {
         into_ref!(peri, txdma, rxdma);
 
         let pclk = T::frequency();
+        let freq = config.frequency;
         let br = compute_baud_rate(pclk, freq.into());
 
         let cpha = config.raw_phase();
@@ -334,19 +329,29 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
 
         let lsbfirst = config.raw_byte_order();
 
+        let pclk = T::frequency();
+        let freq = config.frequency;
+        let br = compute_baud_rate(pclk, freq.into());
+
         #[cfg(any(spi_v1, spi_f1, spi_v2))]
         T::REGS.cr1().modify(|w| {
             w.set_cpha(cpha);
             w.set_cpol(cpol);
+            w.set_br(br);
             w.set_lsbfirst(lsbfirst);
         });
 
         #[cfg(any(spi_v3, spi_v4, spi_v5))]
-        T::REGS.cfg2().modify(|w| {
+        {
-            w.set_cpha(cpha);
+            T::REGS.cfg2().modify(|w| {
-            w.set_cpol(cpol);
+                w.set_cpha(cpha);
-            w.set_lsbfirst(lsbfirst);
+                w.set_cpol(cpol);
-        });
+                w.set_lsbfirst(lsbfirst);
+            });
+            T::REGS.cfg1().modify(|w| {
+                w.set_mbr(br);
+            });
+        }
     }
 
     pub fn get_current_config(&self) -> Config {
@@ -354,6 +359,9 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
         let cfg = T::REGS.cr1().read();
         #[cfg(any(spi_v3, spi_v4, spi_v5))]
         let cfg = T::REGS.cfg2().read();
+        #[cfg(any(spi_v3, spi_v4, spi_v5))]
+        let cfg1 = T::REGS.cfg1().read();
+
         let polarity = if cfg.cpol() == vals::Cpol::IDLELOW {
             Polarity::IdleLow
         } else {
@@ -371,9 +379,18 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
             BitOrder::MsbFirst
         };
 
+        #[cfg(any(spi_v1, spi_f1, spi_v2))]
+        let br = cfg.br();
+        #[cfg(any(spi_v3, spi_v4, spi_v5))]
+        let br = cfg1.mbr();
+
+        let pclk = T::frequency();
+        let frequency = compute_frequency(pclk, br);
+
         Config {
             mode: Mode { polarity, phase },
             bit_order,
+            frequency,
         }
     }
 
@@ -653,6 +670,21 @@ fn compute_baud_rate(clocks: Hertz, freq: Hertz) -> Br {
     Br::from_bits(val)
 }
 
+fn compute_frequency(clocks: Hertz, br: Br) -> Hertz {
+    let div: u16 = match br {
+        Br::DIV2 => 2,
+        Br::DIV4 => 4,
+        Br::DIV8 => 8,
+        Br::DIV16 => 16,
+        Br::DIV32 => 32,
+        Br::DIV64 => 64,
+        Br::DIV128 => 128,
+        Br::DIV256 => 256,
+    };
+
+    clocks / div
+}
+
 trait RegsExt {
     fn tx_ptr<W>(&self) -> *mut W;
     fn rx_ptr<W>(&self) -> *mut W;

examples/stm32f3/src/bin/spi_dma.rs

@@ -17,16 +17,10 @@ async fn main(_spawner: Spawner) {
     let p = embassy_stm32::init(Default::default());
     info!("Hello World!");
 
-    let mut spi = Spi::new(
+    let mut spi_config = Config::default();
-        p.SPI1,
+    spi_config.frequency = Hertz(1_000_000);
-        p.PB3,
+
-        p.PB5,
+    let mut spi = Spi::new(p.SPI1, p.PB3, p.PB5, p.PB4, p.DMA1_CH3, p.DMA1_CH2, spi_config);
-        p.PB4,
-        p.DMA1_CH3,
-        p.DMA1_CH2,
-        Hertz(1_000_000),
-        Config::default(),
-    );
 
     for n in 0u32.. {
         let mut write: String<128> = String::new();

examples/stm32f4/src/bin/spi.rs

@@ -16,16 +16,10 @@ fn main() -> ! {
 
     let p = embassy_stm32::init(Default::default());
 
-    let mut spi = Spi::new(
+    let mut spi_config = Config::default();
-        p.SPI3,
+    spi_config.frequency = Hertz(1_000_000);
-        p.PC10,
+
-        p.PC12,
+    let mut spi = Spi::new(p.SPI3, p.PC10, p.PC12, p.PC11, NoDma, NoDma, spi_config);
-        p.PC11,
-        NoDma,
-        NoDma,
-        Hertz(1_000_000),
-        Config::default(),
-    );
 
     let mut cs = Output::new(p.PE0, Level::High, Speed::VeryHigh);
 

examples/stm32f4/src/bin/spi_dma.rs

@@ -17,16 +17,10 @@ async fn main(_spawner: Spawner) {
     let p = embassy_stm32::init(Default::default());
     info!("Hello World!");
 
-    let mut spi = Spi::new(
+    let mut spi_config = Config::default();
-        p.SPI1,
+    spi_config.frequency = Hertz(1_000_000);
-        p.PB3,
+
-        p.PB5,
+    let mut spi = Spi::new(p.SPI1, p.PB3, p.PB5, p.PB4, p.DMA2_CH3, p.DMA2_CH2, spi_config);
-        p.PB4,
-        p.DMA2_CH3,
-        p.DMA2_CH2,
-        Hertz(1_000_000),
-        Config::default(),
-    );
 
     for n in 0u32.. {
         let mut write: String<128> = String::new();

examples/stm32g0/src/bin/spi_neopixel.rs

@@ -76,7 +76,9 @@ async fn main(_spawner: Spawner) {
     let p = embassy_stm32::init(Default::default());
     info!("Start test using spi as neopixel driver");
 
-    let mut spi = Spi::new_txonly_nosck(p.SPI1, p.PB5, p.DMA1_CH3, NoDma, Hertz(4_000_000), Config::default());
+    let mut config = Config::default();
+    config.frequency = Hertz(4_000_000);
+    let mut spi = Spi::new_txonly_nosck(p.SPI1, p.PB5, p.DMA1_CH3, NoDma, config);
 
     let mut neopixels = Ws2812::new();
 

examples/stm32h7/src/bin/spi.rs

@@ -43,16 +43,10 @@ fn main() -> ! {
     config.rcc.pll1.q_ck = Some(mhz(100));
     let p = embassy_stm32::init(config);
 
-    let spi = spi::Spi::new(
+    let mut spi_config = spi::Config::default();
-        p.SPI3,
+    spi_config.frequency = mhz(1);
-        p.PB3,
+
-        p.PB5,
+    let spi = spi::Spi::new(p.SPI3, p.PB3, p.PB5, p.PB4, NoDma, NoDma, spi_config);
-        p.PB4,
-        NoDma,
-        NoDma,
-        mhz(1),
-        spi::Config::default(),
-    );
 
     let executor = EXECUTOR.init(Executor::new());
 

examples/stm32h7/src/bin/spi_dma.rs

@@ -39,16 +39,10 @@ fn main() -> ! {
     config.rcc.pll1.q_ck = Some(mhz(100));
     let p = embassy_stm32::init(config);
 
-    let spi = spi::Spi::new(
+    let mut spi_config = spi::Config::default();
-        p.SPI3,
+    spi_config.frequency = mhz(1);
-        p.PB3,
+
-        p.PB5,
+    let spi = spi::Spi::new(p.SPI3, p.PB3, p.PB5, p.PB4, p.DMA1_CH3, p.DMA1_CH4, spi_config);
-        p.PB4,
-        p.DMA1_CH3,
-        p.DMA1_CH4,
-        mhz(1),
-        spi::Config::default(),
-    );
 
     let executor = EXECUTOR.init(Executor::new());
 

examples/stm32l0/src/bin/lora_cad.rs

@@ -27,17 +27,11 @@ async fn main(_spawner: Spawner) {
     config.rcc.enable_hsi48 = true;
     let p = embassy_stm32::init(config);
 
+    let mut spi_config = spi::Config::default();
+    spi_config.frequency = khz(200);
+
     // SPI for sx1276
-    let spi = spi::Spi::new(
+    let spi = spi::Spi::new(p.SPI1, p.PB3, p.PA7, p.PA6, p.DMA1_CH3, p.DMA1_CH2, spi_config);
-        p.SPI1,
-        p.PB3,
-        p.PA7,
-        p.PA6,
-        p.DMA1_CH3,
-        p.DMA1_CH2,
-        khz(200),
-        spi::Config::default(),
-    );
 
     let nss = Output::new(p.PA15.degrade(), Level::High, Speed::Low);
     let reset = Output::new(p.PC0.degrade(), Level::High, Speed::Low);

examples/stm32l0/src/bin/lora_lorawan.rs

@@ -32,17 +32,11 @@ async fn main(_spawner: Spawner) {
     config.rcc.enable_hsi48 = true;
     let p = embassy_stm32::init(config);
 
+    let mut spi_config = spi::Config::default();
+    spi_config.frequency = khz(200);
+
     // SPI for sx1276
-    let spi = spi::Spi::new(
+    let spi = spi::Spi::new(p.SPI1, p.PB3, p.PA7, p.PA6, p.DMA1_CH3, p.DMA1_CH2, spi_config);
-        p.SPI1,
-        p.PB3,
-        p.PA7,
-        p.PA6,
-        p.DMA1_CH3,
-        p.DMA1_CH2,
-        khz(200),
-        spi::Config::default(),
-    );
 
     let nss = Output::new(p.PA15.degrade(), Level::High, Speed::Low);
     let reset = Output::new(p.PC0.degrade(), Level::High, Speed::Low);

examples/stm32l0/src/bin/lora_p2p_receive.rs

@@ -27,17 +27,11 @@ async fn main(_spawner: Spawner) {
     config.rcc.enable_hsi48 = true;
     let p = embassy_stm32::init(config);
 
+    let mut spi_config = spi::Config::default();
+    spi_config.frequency = khz(200);
+
     // SPI for sx1276
-    let spi = spi::Spi::new(
+    let spi = spi::Spi::new(p.SPI1, p.PB3, p.PA7, p.PA6, p.DMA1_CH3, p.DMA1_CH2, spi_config);
-        p.SPI1,
-        p.PB3,
-        p.PA7,
-        p.PA6,
-        p.DMA1_CH3,
-        p.DMA1_CH2,
-        khz(200),
-        spi::Config::default(),
-    );
 
     let nss = Output::new(p.PA15.degrade(), Level::High, Speed::Low);
     let reset = Output::new(p.PC0.degrade(), Level::High, Speed::Low);

examples/stm32l0/src/bin/lora_p2p_send.rs

@@ -27,17 +27,11 @@ async fn main(_spawner: Spawner) {
     config.rcc.enable_hsi48 = true;
     let p = embassy_stm32::init(config);
 
+    let mut spi_config = spi::Config::default();
+    spi_config.frequency = khz(200);
+
     // SPI for sx1276
-    let spi = spi::Spi::new(
+    let spi = spi::Spi::new(p.SPI1, p.PB3, p.PA7, p.PA6, p.DMA1_CH3, p.DMA1_CH2, spi_config);
-        p.SPI1,
-        p.PB3,
-        p.PA7,
-        p.PA6,
-        p.DMA1_CH3,
-        p.DMA1_CH2,
-        khz(200),
-        spi::Config::default(),
-    );
 
     let nss = Output::new(p.PA15.degrade(), Level::High, Speed::Low);
     let reset = Output::new(p.PC0.degrade(), Level::High, Speed::Low);

examples/stm32l0/src/bin/spi.rs

@@ -15,16 +15,10 @@ async fn main(_spawner: Spawner) {
     let p = embassy_stm32::init(Default::default());
     info!("Hello World, folks!");
 
-    let mut spi = Spi::new(
+    let mut spi_config = Config::default();
-        p.SPI1,
+    spi_config.frequency = Hertz(1_000_000);
-        p.PB3,
+
-        p.PA7,
+    let mut spi = Spi::new(p.SPI1, p.PB3, p.PA7, p.PA6, NoDma, NoDma, spi_config);
-        p.PA6,
-        NoDma,
-        NoDma,
-        Hertz(1_000_000),
-        Config::default(),
-    );
 
     let mut cs = Output::new(p.PA15, Level::High, Speed::VeryHigh);
 

examples/stm32l1/src/bin/spi.rs

@@ -15,16 +15,10 @@ async fn main(_spawner: Spawner) {
     let p = embassy_stm32::init(Default::default());
     info!("Hello World, folks!");
 
-    let mut spi = Spi::new(
+    let mut spi_config = Config::default();
-        p.SPI1,
+    spi_config.frequency = Hertz(1_000_000);
-        p.PA5,
+
-        p.PA7,
+    let mut spi = Spi::new(p.SPI1, p.PA5, p.PA7, p.PA6, NoDma, NoDma, spi_config);
-        p.PA6,
-        NoDma,
-        NoDma,
-        Hertz(1_000_000),
-        Config::default(),
-    );
 
     let mut cs = Output::new(p.PA4, Level::High, Speed::VeryHigh);
 

examples/stm32l4/src/bin/spi.rs

@@ -15,16 +15,10 @@ fn main() -> ! {
 
     let p = embassy_stm32::init(Default::default());
 
-    let mut spi = Spi::new(
+    let mut spi_config = Config::default();
-        p.SPI3,
+    spi_config.frequency = Hertz(1_000_000);
-        p.PC10,
+
-        p.PC12,
+    let mut spi = Spi::new(p.SPI3, p.PC10, p.PC12, p.PC11, NoDma, NoDma, spi_config);
-        p.PC11,
-        NoDma,
-        NoDma,
-        Hertz(1_000_000),
-        Config::default(),
-    );
 
     let mut cs = Output::new(p.PE0, Level::High, Speed::VeryHigh);
 

examples/stm32l4/src/bin/spi_blocking_async.rs

@@ -17,16 +17,10 @@ async fn main(_spawner: Spawner) {
     let p = embassy_stm32::init(Default::default());
     info!("Hello World!");
 
-    let spi = Spi::new(
+    let mut spi_config = Config::default();
-        p.SPI3,
+    spi_config.frequency = Hertz(1_000_000);
-        p.PC10,
+
-        p.PC12,
+    let spi = Spi::new(p.SPI3, p.PC10, p.PC12, p.PC11, NoDma, NoDma, spi_config);
-        p.PC11,
-        NoDma,
-        NoDma,
-        Hertz(1_000_000),
-        Config::default(),
-    );
 
     let mut spi = BlockingAsync::new(spi);
 

examples/stm32l4/src/bin/spi_dma.rs

@@ -14,16 +14,10 @@ async fn main(_spawner: Spawner) {
     let p = embassy_stm32::init(Default::default());
     info!("Hello World!");
 
-    let mut spi = Spi::new(
+    let mut spi_config = Config::default();
-        p.SPI3,
+    spi_config.frequency = Hertz(1_000_000);
-        p.PC10,
+
-        p.PC12,
+    let mut spi = Spi::new(p.SPI3, p.PC10, p.PC12, p.PC11, p.DMA1_CH1, p.DMA1_CH2, spi_config);
-        p.PC11,
-        p.DMA1_CH1,
-        p.DMA1_CH2,
-        Hertz(1_000_000),
-        Config::default(),
-    );
 
     // These are the pins for the Inventek eS-Wifi SPI Wifi Adapter.
 

tests/stm32/src/bin/spi.rs

@@ -35,15 +35,14 @@ async fn main(_spawner: Spawner) {
     #[cfg(feature = "stm32c031c6")]
     let (spi, sck, mosi, miso) = (p.SPI1, p.PA5, p.PA7, p.PA6);
 
+    let mut spi_config = spi::Config::default();
+    spi_config.frequency = Hertz(1_000_000);
+
     let mut spi = Spi::new(
-        spi,
+        spi, sck,  // Arduino D13
-        sck,  // Arduino D13
         mosi, // Arduino D11
         miso, // Arduino D12
-        NoDma,
+        NoDma, NoDma, spi_config,
-        NoDma,
-        Hertz(1_000_000),
-        spi::Config::default(),
     );
 
     let data: [u8; 9] = [0x00, 0xFF, 0xAA, 0x55, 0xC0, 0xFF, 0xEE, 0xC0, 0xDE];

tests/stm32/src/bin/spi_dma.rs

@@ -34,15 +34,14 @@ async fn main(_spawner: Spawner) {
     #[cfg(feature = "stm32c031c6")]
     let (spi, sck, mosi, miso, tx_dma, rx_dma) = (p.SPI1, p.PA5, p.PA7, p.PA6, p.DMA1_CH1, p.DMA1_CH2);
 
+    let mut spi_config = spi::Config::default();
+    spi_config.frequency = Hertz(1_000_000);
+
     let mut spi = Spi::new(
-        spi,
+        spi, sck,  // Arduino D13
-        sck,  // Arduino D13
         mosi, // Arduino D11
         miso, // Arduino D12
-        tx_dma,
+        tx_dma, rx_dma, spi_config,
-        rx_dma,
-        Hertz(1_000_000),
-        spi::Config::default(),
     );
 
     let data: [u8; 9] = [0x00, 0xFF, 0xAA, 0x55, 0xC0, 0xFF, 0xEE, 0xC0, 0xDE];