sravan/system76-firmware-open
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow different address on smlink

Browse Source
This commit is contained in:
Jeremy Soller
2020-12-02 13:30:09 -07:00
parent 3012495c77
commit 5e40c0a7f7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
usb4/src/main.rs
View File

@@ -410,8 +410,8 @@ unsafe fn flash_retimer(retimer: &mut Retimer) -> Result<(), String> {
Ok(()) Ok(())
} }
unsafe fn retimer_access(i2c: I2CBitbang) -> i32 { unsafe fn retimer_access(i2c: I2CBitbang, address: u8) -> i32 {
let mut retimer = Retimer::new(i2c, 0x40); let mut retimer = Retimer::new(i2c, address);
match flash_retimer(&mut retimer) { match flash_retimer(&mut retimer) {
Ok(()) => 0, Ok(()) => 0,
Err(err) => { Err(err) => {
@@ -423,16 +423,16 @@ unsafe fn retimer_access(i2c: I2CBitbang) -> i32 {
unsafe fn i2c_access(sideband: Rc<Sideband>) -> i32 { unsafe fn i2c_access(sideband: Rc<Sideband>) -> i32 {
let smlink = false; let smlink = false;
let i2c = if smlink { let (i2c, address) = if smlink {
let sml0clk = Gpio::new(sideband.clone(), 0x6A, 0x06); // GPP_C3 let sml0clk = Gpio::new(sideband.clone(), 0x6A, 0x06); // GPP_C3
let sml0data = Gpio::new(sideband.clone(), 0x6A, 0x08); // GPP_C4 let sml0data = Gpio::new(sideband.clone(), 0x6A, 0x08); // GPP_C4
I2CBitbang::new(sml0clk, sml0data) (I2CBitbang::new(sml0clk, sml0data), 0x40)
} else { } else {
let i2c1_scl = Gpio::new(sideband.clone(), 0x6A, 0x26); // GPP_C19 let i2c1_scl = Gpio::new(sideband.clone(), 0x6A, 0x26); // GPP_C19
let i2c1_sda = Gpio::new(sideband.clone(), 0x6A, 0x24); // GPP_C18 let i2c1_sda = Gpio::new(sideband.clone(), 0x6A, 0x24); // GPP_C18
I2CBitbang::new(i2c1_scl, i2c1_sda) (I2CBitbang::new(i2c1_scl, i2c1_sda), 0x40)
}; };
retimer_access(i2c) retimer_access(i2c, address)
} }
unsafe fn i2c_enable(sideband: Rc<Sideband>) -> i32 { unsafe fn i2c_enable(sideband: Rc<Sideband>) -> i32 {