diff options
| author | Evan Wilson <evan@oliodevices.com> | 2014-04-08 16:42:19 -0700 |
|---|---|---|
| committer | Evan Wilson <evan@oliodevices.com> | 2014-04-08 16:42:19 -0700 |
| commit | 41eda08688ee489c6073d325a2b8840c67cd6bac (patch) | |
| tree | 6eeb19767a6d61ce26da9a808ea861ccb78a2a6c | |
| parent | 28d07728d0de3a41e96bdcc7a6b2fd2b0336d005 (diff) | |
| download | olio-uboot-2014.01-H1-2013.10.tar.xz olio-uboot-2014.01-H1-2013.10.zip | |
Fixes for I2CH1-2013.10
| -rw-r--r-- | board/olio/h1/h1.c | 6 | ||||
| -rw-r--r-- | drivers/i2c/omap24xx_i2c.c | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/board/olio/h1/h1.c b/board/olio/h1/h1.c index c9350347f..cf41492c9 100644 --- a/board/olio/h1/h1.c +++ b/board/olio/h1/h1.c @@ -79,12 +79,6 @@ int misc_init_r(void) struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE; struct control_prog_io *prog_io_base = (struct control_prog_io *)OMAP34XX_CTRL_BASE; - /* Enable i2c2 pullup resisters */ - writel(~(PRG_I2C2_PULLUPRESX), &prog_io_base->io1); - printf("Olio H1\n"); - - //MUX_BEAGLE_XM(); - dieid_num_r(); return 0; diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c index 54e9b1586..a17ff576a 100644 --- a/drivers/i2c/omap24xx_i2c.c +++ b/drivers/i2c/omap24xx_i2c.c @@ -144,7 +144,6 @@ void i2c_init(int speed, int slaveadd) udelay(1000); flush_fifo(); writew(0xFFFF, &i2c_base->stat); - writew(0, &i2c_base->cnt); if (gd->flags & GD_FLG_RELOC) bus_initialized[current_bus] = 1; @@ -228,7 +227,6 @@ static int i2c_read_byte(u8 devaddr, u16 regoffset, u8 alen, u8 *value) read_exit: flush_fifo(); writew(0xFFFF, &i2c_base->stat); - writew(0, &i2c_base->cnt); return i2c_error; } @@ -309,8 +307,6 @@ int i2c_probe(uchar chip) probe_exit: flush_fifo(); - /* don't allow any more data in... we don't want it. */ - writew(0, &i2c_base->cnt); writew(0xFFFF, &i2c_base->stat); return res; } |