aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Lilleengen <[email protected]>2024-11-19 11:54:43 +0000
committerGitHub <[email protected]>2024-11-19 11:54:43 +0000
commit0f95c72e78e411e0fd10420ebee3c4bd323a210a (patch)
tree7ec71a41945327c0d2bc6bf1806daa605ecc8727
parent050d3d1a092eca69b14bd07cd5ca8496a0f09f2d (diff)
parent1e0b6eefb79d478216d81437ec41474cbe8408e6 (diff)
Merge pull request #3546 from plaes/fix-debug
nrf: Remove leftover info message and fix link to errata
-rw-r--r--embassy-nrf/src/gpio.rs1
-rwxr-xr-xembassy-nrf/src/qspi.rs2
2 files changed, 1 insertions, 2 deletions
diff --git a/embassy-nrf/src/gpio.rs b/embassy-nrf/src/gpio.rs
index d271dbcff..130339c15 100644
--- a/embassy-nrf/src/gpio.rs
+++ b/embassy-nrf/src/gpio.rs
@@ -350,7 +350,6 @@ impl<'d> Flex<'d> {
350 convert_drive(w, drive); 350 convert_drive(w, drive);
351 w.set_sense(vals::Sense::DISABLED); 351 w.set_sense(vals::Sense::DISABLED);
352 }); 352 });
353 info!("pin_cnf: {:08x}", self.pin.conf().read().0);
354 } 353 }
355 354
356 /// Put the pin into input + output mode. 355 /// Put the pin into input + output mode.
diff --git a/embassy-nrf/src/qspi.rs b/embassy-nrf/src/qspi.rs
index de9c268c1..255b43c33 100755
--- a/embassy-nrf/src/qspi.rs
+++ b/embassy-nrf/src/qspi.rs
@@ -546,7 +546,7 @@ impl<'d, T: Instance> Drop for Qspi<'d, T> {
546 // it seems events_ready is not generated in response to deactivate. nrfx doesn't wait for it. 546 // it seems events_ready is not generated in response to deactivate. nrfx doesn't wait for it.
547 r.tasks_deactivate().write_value(1); 547 r.tasks_deactivate().write_value(1);
548 548
549 // Workaround https://infocenter.nordicsemi.com/topic/errata_nRF52840_Rev1/ERR/nRF52840/Rev1/latest/anomaly_840_122.html?cp=4_0_1_2_1_7 549 // Workaround https://docs.nordicsemi.com/bundle/errata_nRF52840_Rev3/page/ERR/nRF52840/Rev3/latest/anomaly_840_122.html
550 // Note that the doc has 2 register writes, but the first one is really the write to tasks_deactivate, 550 // Note that the doc has 2 register writes, but the first one is really the write to tasks_deactivate,
551 // so we only do the second one here. 551 // so we only do the second one here.
552 unsafe { ptr::write_volatile(0x40029054 as *mut u32, 1) } 552 unsafe { ptr::write_volatile(0x40029054 as *mut u32, 1) }