occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

Firmware: set CLK_SEL in io_expander init 

io_expander init: set initial out_target instead of 0x00
io_expander0: gate CLK_SEL direction & output
This commit is contained in:
morgan 2024-05-24 10:59:10 +08:00 committed by Sébastien Bourdeauducq
parent 0d78e65f7a
commit 5971d9e958
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
artiq/firmware/libboard_misoc/io_expander.rs
View File

@ -10,6 +10,25 @@ struct Registers {
gpiob: u8, // Output Port 1 gpiob: u8, // Output Port 1
} }
#[cfg(has_si549)]
const IODIR_CLK_SEL: u8 = 0x80; // out
#[cfg(has_si5324)]
const IODIR_CLK_SEL: u8 = 0x00; // in
#[cfg(has_si549)]
const CLK_SEL_OUT: u8 = 1 << 7;
#[cfg(has_si5324)]
const CLK_SEL_OUT: u8 = 0;
const IODIR0 : [u8; 2] = [
0xFF,
0xFF & !IODIR_CLK_SEL
];
const OUT_TAR0 : [u8; 2] = [
0,
CLK_SEL_OUT
];
pub struct IoExpander { pub struct IoExpander {
busno: u8, busno: u8,
port: u8, port: u8,
@ -34,9 +53,9 @@ impl IoExpander {
port: 11, port: 11,
address: 0x40, address: 0x40,
virtual_led_mapping: &VIRTUAL_LED_MAPPING0, virtual_led_mapping: &VIRTUAL_LED_MAPPING0,
iodir: [0xff; 2], iodir: IODIR0,
out_current: [0; 2], out_current: [0; 2],
out_target: [0; 2], out_target: OUT_TAR0,
registers: Registers { registers: Registers {
iodira: 0x00, iodira: 0x00,
iodirb: 0x01, iodirb: 0x01,
@ -153,10 +172,10 @@ impl IoExpander {
} }
self.update_iodir()?; self.update_iodir()?;
self.out_current[0] = 0x00; self.write(self.registers.gpioa, self.out_target[0])?;
self.write(self.registers.gpioa, 0x00)?; self.out_current[0] = self.out_target[0];
self.out_current[1] = 0x00; self.write(self.registers.gpiob, self.out_target[1])?;
self.write(self.registers.gpiob, 0x00)?; self.out_current[1] = self.out_target[1];
Ok(()) Ok(())
} }