aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2021-03-21 20:52:20 +0100
committerDario Nieuwenhuis <[email protected]>2021-03-29 00:58:57 +0200
commit16bb6fd6ac34646f498424459b8eb6863635b119 (patch)
tree8f969b666bdf7f5a82c56998c8186caa9d51d0b3
parentf36cbe5e0cfa0a791d53ae6ddde40d69982867f4 (diff)
nrf: Specify `connected` bit in psel_bits
-rw-r--r--embassy-nrf/src/spim.rs21
1 files changed, 6 insertions, 15 deletions
diff --git a/embassy-nrf/src/spim.rs b/embassy-nrf/src/spim.rs
index 33005188a..f0c6ebe19 100644
--- a/embassy-nrf/src/spim.rs
+++ b/embassy-nrf/src/spim.rs
@@ -55,9 +55,9 @@ impl<'d, T: Instance> Spim<'d, T> {
55 let r = spim.regs(); 55 let r = spim.regs();
56 56
57 // Configure pins 57 // Configure pins
58 sck.conf().write(|w| w.dir().output()); 58 sck.conf().write(|w| w.dir().output().drive().h0h1());
59 mosi.conf().write(|w| w.dir().output()); 59 mosi.conf().write(|w| w.dir().output().drive().h0h1());
60 miso.conf().write(|w| w.input().connect()); 60 miso.conf().write(|w| w.input().connect().drive().h0h1());
61 61
62 match config.mode.polarity { 62 match config.mode.polarity {
63 Polarity::IdleHigh => { 63 Polarity::IdleHigh => {
@@ -71,18 +71,9 @@ impl<'d, T: Instance> Spim<'d, T> {
71 } 71 }
72 72
73 // Select pins. 73 // Select pins.
74 r.psel.sck.write(|w| { 74 r.psel.sck.write(|w| unsafe { w.bits(sck.psel_bits()) });
75 unsafe { w.bits(sck.psel_bits()) }; 75 r.psel.mosi.write(|w| unsafe { w.bits(mosi.psel_bits()) });
76 w.connect().connected() 76 r.psel.miso.write(|w| unsafe { w.bits(miso.psel_bits()) });
77 });
78 r.psel.mosi.write(|w| {
79 unsafe { w.bits(mosi.psel_bits()) };
80 w.connect().connected()
81 });
82 r.psel.miso.write(|w| {
83 unsafe { w.bits(miso.psel_bits()) };
84 w.connect().connected()
85 });
86 77
87 // Enable SPIM instance. 78 // Enable SPIM instance.
88 r.enable.write(|w| w.enable().enabled()); 79 r.enable.write(|w| w.enable().enabled());