altos: Reset i2c controller at boot time

[fw/altos] / src / stm / ao_i2c_stm.c

diff --git a/src/stm/ao_i2c_stm.c b/src/stm/ao_i2c_stm.c
index 763ae6cd5c0ec0fefa7074912c19bada14134175..c205706d37669390bfec37081031abfd6bd61b6f 100644 (file)
--- a/src/stm/ao_i2c_stm.c
+++ b/src/stm/ao_i2c_stm.c
@@ -250,10 +250,9 @@ ao_i2c_send(void *block, uint16_t len, uint8_t index, uint8_t stop)
        ao_alarm(1 + len);
        cli();
        while (!ao_dma_done[tx_dma_index])
-               if (ao_sleep(&ao_dma_done[tx_dma_index])) {
-                       printf ("send timeout\n");
+               if (ao_sleep(&ao_dma_done[tx_dma_index]))
                        break;
-               }
+       ao_clear_alarm();
        ao_dma_done_transfer(tx_dma_index);
        out_cr2("send enable isr", stm_i2c,
                AO_STM_I2C_CR2 | (1 << STM_I2C_CR2_ITEVTEN) | (1 << STM_I2C_CR2_ITERREN));
@@ -363,8 +362,12 @@ void
 ao_i2c_channel_init(uint8_t index)
 {
        struct stm_i2c  *stm_i2c = ao_i2c_stm_info[index].stm_i2c;
+       int i;
 
        /* Turn I2C off while configuring */
+       stm_i2c->cr1 = (1 << STM_I2C_CR1_SWRST);
+       for (i = 0; i < 100; i++)
+               asm("nop");
        stm_i2c->cr1 = 0;
        stm_i2c->cr2 = AO_STM_I2C_CR2;