mirror of https://github.com/m-labs/artiq.git
hmc830: be explicit about SPI mode selection
This commit is contained in:
parent
a7720d05cd
commit
6fbe0d8ed8
|
@ -52,6 +52,8 @@ mod hmc830 {
|
||||||
fn spi_setup() {
|
fn spi_setup() {
|
||||||
unsafe {
|
unsafe {
|
||||||
while csr::converter_spi::idle_read() == 0 {}
|
while csr::converter_spi::idle_read() == 0 {}
|
||||||
|
// rising egde on CS since cs_polarity still 0
|
||||||
|
// selects "HMC Mode"
|
||||||
csr::converter_spi::offline_write(0);
|
csr::converter_spi::offline_write(0);
|
||||||
csr::converter_spi::end_write(1);
|
csr::converter_spi::end_write(1);
|
||||||
csr::converter_spi::cs_polarity_write(0b0001);
|
csr::converter_spi::cs_polarity_write(0b0001);
|
||||||
|
@ -62,30 +64,30 @@ mod hmc830 {
|
||||||
csr::converter_spi::div_write(16 - 2);
|
csr::converter_spi::div_write(16 - 2);
|
||||||
csr::converter_spi::cs_write(1 << csr::CONFIG_CONVERTER_SPI_HMC830_CS);
|
csr::converter_spi::cs_write(1 << csr::CONFIG_CONVERTER_SPI_HMC830_CS);
|
||||||
|
|
||||||
// do a dummy cycle with cs still high to ensure Open mode
|
// do a dummy cycle with cs still high to clear CS
|
||||||
// (rising CLK before rising CS)
|
|
||||||
csr::converter_spi::length_write(0);
|
csr::converter_spi::length_write(0);
|
||||||
csr::converter_spi::data_write(0);
|
csr::converter_spi::data_write(0);
|
||||||
while csr::converter_spi::writable_read() == 0 {}
|
while csr::converter_spi::writable_read() == 0 {}
|
||||||
|
|
||||||
csr::converter_spi::length_write(31 - 1);
|
csr::converter_spi::length_write(32 - 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn write(addr: u8, data: u32) {
|
fn write(addr: u8, data: u32) {
|
||||||
let cmd = (0 << 6) | addr;
|
let val = ((addr as u32) << 24) | data;
|
||||||
let val = ((cmd as u32) << 24) | data;
|
|
||||||
unsafe {
|
unsafe {
|
||||||
while csr::converter_spi::writable_read() == 0 {}
|
while csr::converter_spi::writable_read() == 0 {}
|
||||||
csr::converter_spi::data_write(val << 1);
|
csr::converter_spi::data_write(val << 1); // last clk cycle loads data
|
||||||
while csr::converter_spi::writable_read() == 0 {}
|
while csr::converter_spi::writable_read() == 0 {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read(addr: u8) -> u32 {
|
fn read(addr: u8) -> u32 {
|
||||||
write(addr, 0);
|
// SDO (miso/read bits) is technically CPHA=1, while SDI is CPHA=0
|
||||||
|
// trust that the 8.2ns+0.2ns/pF provide enough hold time on top of
|
||||||
|
// the SPI round trip delay and stick with CPHA=0
|
||||||
|
write((1 << 6) | addr, 0);
|
||||||
unsafe {
|
unsafe {
|
||||||
while csr::converter_spi::writable_read() == 0 {}
|
|
||||||
csr::converter_spi::data_read() & 0xffffff
|
csr::converter_spi::data_read() & 0xffffff
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue