LailaTheElf/embassy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed redundant HSI48 configuration

Browse Source
This commit is contained in:
Barnaby Walters 2024-02-16 20:32:35 +01:00
parent 32e4c93954
commit ae74833999
2 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
embassy-stm32/src/rcc/g4.rs
View File

@ -3,8 +3,9 @@ use stm32_metapac::rcc::vals::{Adcsel, Sw};
use stm32_metapac::FLASH; use stm32_metapac::FLASH;
pub use crate::pac::rcc::vals::{ pub use crate::pac::rcc::vals::{
Adcsel as AdcClockSource, Clk48sel, Fdcansel as FdCanClockSource, Hpre as AHBPrescaler, Pllm as PllPreDiv, Adcsel as AdcClockSource, Clk48sel as Clk48Src, Fdcansel as FdCanClockSource, Hpre as AHBPrescaler,
Plln as PllMul, Pllp as PllPDiv, Pllq as PllQDiv, Pllr as PllRDiv, Pllsrc, Ppre as APBPrescaler, Sw as Sysclk, Pllm as PllPreDiv, Plln as PllMul, Pllp as PllPDiv, Pllq as PllQDiv, Pllr as PllRDiv, Pllsrc, Ppre as APBPrescaler,
Sw as Sysclk,
}; };
use crate::pac::{PWR, RCC}; use crate::pac::{PWR, RCC};
use crate::time::Hertz; use crate::time::Hertz;
@ -53,17 +54,6 @@ pub struct Pll {
pub divr: Option<PllRDiv>, pub divr: Option<PllRDiv>,
} }
/// Sets the source for the 48MHz clock to the USB and RNG peripherals.
pub enum Clock48MhzSrc {
/// Use the High Speed Internal Oscillator. For USB usage, the CRS must be used to calibrate the
/// oscillator to comply with the USB specification for oscillator tolerance.
Hsi48(super::Hsi48Config),
/// Use the PLLQ output. The PLL must be configured to output a 48MHz clock. For USB usage the
/// PLL needs to be using the HSE source to comply with the USB specification for oscillator
/// tolerance.
PllQ,
}
/// Clocks configutation /// Clocks configutation
#[non_exhaustive] #[non_exhaustive]
pub struct Config { pub struct Config {
@ -82,7 +72,7 @@ pub struct Config {
pub low_power_run: bool, pub low_power_run: bool,
/// Sets the clock source for the 48MHz clock used by the USB and RNG peripherals. /// Sets the clock source for the 48MHz clock used by the USB and RNG peripherals.
pub clk48_src: Option<Clock48MhzSrc>, pub clk48_src: Clk48Src,
pub ls: super::LsConfig, pub ls: super::LsConfig,
@ -106,7 +96,7 @@ impl Default for Config {
apb1_pre: APBPrescaler::DIV1, apb1_pre: APBPrescaler::DIV1,
apb2_pre: APBPrescaler::DIV1, apb2_pre: APBPrescaler::DIV1,
low_power_run: false, low_power_run: false,
clk48_src: Some(Clock48MhzSrc::Hsi48(Default::default())), clk48_src: Clk48Src::HSI48,
ls: Default::default(), ls: Default::default(),
adc12_clock_source: Adcsel::DISABLE, adc12_clock_source: Adcsel::DISABLE,
adc345_clock_source: Adcsel::DISABLE, adc345_clock_source: Adcsel::DISABLE,
@ -283,19 +273,17 @@ pub(crate) unsafe fn init(config: Config) {
}; };
// Setup the 48 MHz clock if needed // Setup the 48 MHz clock if needed
if let Some(clock_48mhz_src) = config.clk48_src { {
let source = match clock_48mhz_src { let source = match config.clk48_src {
Clock48MhzSrc::PllQ => { Clk48Src::PLL1_Q => {
// Make sure the PLLQ is enabled and running at 48Mhz // Make sure the PLLQ is enabled and running at 48Mhz
let pllq_freq = pll_freq.as_ref().and_then(|f| f.pll_q); let pllq_freq = pll_freq.as_ref().and_then(|f| f.pll_q);
assert!(pllq_freq.is_some() && pllq_freq.unwrap().0 == 48_000_000); assert!(pllq_freq.is_some() && pllq_freq.unwrap().0 == 48_000_000);
crate::pac::rcc::vals::Clk48sel::PLL1_Q crate::pac::rcc::vals::Clk48sel::PLL1_Q
} }
Clock48MhzSrc::Hsi48(config) => { Clk48Src::HSI48 => crate::pac::rcc::vals::Clk48sel::HSI48,
super::init_hsi48(config); _ => unreachable!(),
crate::pac::rcc::vals::Clk48sel::HSI48
}
}; };
RCC.ccipr().modify(|w| w.set_clk48sel(source)); RCC.ccipr().modify(|w| w.set_clk48sel(source));

7
examples/stm32g4/src/bin/usb_serial.rs
View File

@ -4,7 +4,7 @@
use defmt::{panic, *}; use defmt::{panic, *};
use embassy_executor::Spawner; use embassy_executor::Spawner;
use embassy_stm32::rcc::{ use embassy_stm32::rcc::{
Clock48MhzSrc, Hse, HseMode, Hsi48Config, Pll, PllMul, PllPreDiv, PllQDiv, PllRDiv, Pllsrc, Sysclk, Clk48Src, Hse, HseMode, Hsi48Config, Pll, PllMul, PllPreDiv, PllQDiv, PllRDiv, Pllsrc, Sysclk,
}; };
use embassy_stm32::time::Hertz; use embassy_stm32::time::Hertz;
use embassy_stm32::usb::{self, Driver, Instance}; use embassy_stm32::usb::{self, Driver, Instance};
@ -47,9 +47,10 @@ async fn main(_spawner: Spawner) {
if USE_HSI48 { if USE_HSI48 {
// Sets up the Clock Recovery System (CRS) to use the USB SOF to trim the HSI48 oscillator. // Sets up the Clock Recovery System (CRS) to use the USB SOF to trim the HSI48 oscillator.
config.rcc.clk48_src = Some(Clock48MhzSrc::Hsi48(Hsi48Config { sync_from_usb: true })); config.rcc.hsi48 = Some(Hsi48Config { sync_from_usb: true });
config.rcc.clk48_src = Clk48Src::HSI48;
} else { } else {
config.rcc.clk48_src = Some(Clock48MhzSrc::PllQ); config.rcc.clk48_src = Clk48Src::PLL1_Q;
} }
let p = embassy_stm32::init(config); let p = embassy_stm32::init(config);