Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nRF52 spi: fix get_rate #1799

Merged
merged 1 commit into from
May 8, 2020
Merged

nRF52 spi: fix get_rate #1799

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 25 additions & 9 deletions chips/nrf52/src/spi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,22 @@ pub enum Frequency {
M8 = 0x80000000,
}

impl From<Frequency> for u32 {
fn from(freq: Frequency) -> u32 {
match freq {
impl Frequency {
pub fn from_register(reg: u32) -> Option<Frequency> {
niklasad1 marked this conversation as resolved.
Show resolved Hide resolved
match reg {
0x02000000 => Some(Frequency::K125),
0x04000000 => Some(Frequency::K250),
0x08000000 => Some(Frequency::K500),
0x10000000 => Some(Frequency::M1),
0x20000000 => Some(Frequency::M2),
0x40000000 => Some(Frequency::M4),
0x80000000 => Some(Frequency::M8),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

Shouldn't this have more fields?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I've stated this in my todos. However the highest frequencies only apply to the nRF52840. I can fix that in this PR too, or create another one for that.

_ => None,
}
}

pub fn into_spi_rate(&self) -> u32 {
match *self {
Frequency::K125 => 125_000,
Frequency::K250 => 250_000,
Frequency::K500 => 500_000,
Expand All @@ -202,10 +215,8 @@ impl From<Frequency> for u32 {
Frequency::M8 => 8_000_000,
}
}
}

impl From<u32> for Frequency {
fn from(freq: u32) -> Frequency {
pub fn from_spi_rate(freq: u32) -> Frequency {
lschuermann marked this conversation as resolved.
Show resolved Hide resolved
if freq < 250_000 {
Frequency::K125
} else if freq < 500_000 {
Expand Down Expand Up @@ -413,14 +424,19 @@ impl hil::spi::SpiMaster for SPIM {
// Returns the actual rate set
fn set_rate(&self, rate: u32) -> u32 {
niklasad1 marked this conversation as resolved.
Show resolved Hide resolved
debug_assert!(self.initialized.get());
let f = Frequency::from(rate);
let f = Frequency::from_spi_rate(rate);
self.registers.frequency.set(f as u32);
f.into()
f.into_spi_rate()
}

fn get_rate(&self) -> u32 {
debug_assert!(self.initialized.get());
self.registers.frequency.get().into()

// Reset value is a valid frequency (250kbps), so .expect
// should be safe here
let f = Frequency::from_register(self.registers.frequency.get())
.expect("nrf52 unknown spi rate");
f.into_spi_rate()
}

fn set_clock(&self, polarity: hil::spi::ClockPolarity) {
Expand Down