diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-13 08:16:44 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-13 08:16:44 +0100 |
| commit | 6134116686ea7ecd3e29db3ab40e4eac837680c3 (patch) | |
| tree | a04f202006c9f11d1fe53ecb945166e3022bae6b /drivers/i2c | |
| parent | e0093dcf236cdc1d4faef95189c9376ef6610ae7 (diff) | |
| parent | 836b99c81b9f17414cbbbfdf1c4d92acfc7106ff (diff) | |
| download | barebox-6134116686ea7ecd3e29db3ab40e4eac837680c3.tar.gz barebox-6134116686ea7ecd3e29db3ab40e4eac837680c3.tar.xz | |
Merge branch 'for-next/mvebu'
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-mv64xxx.c | 41 |
1 files changed, 18 insertions, 23 deletions
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index 9b9e6c953f..caece3b78e 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c @@ -270,6 +270,7 @@ mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data, u32 status) } /* FALLTHRU */ case STATUS_MAST_RD_DATA_ACK: /* 0x50 */ + udelay(2); if (status != STATUS_MAST_RD_DATA_ACK) drv_data->action = ACTION_CONTINUE; else { @@ -280,6 +281,7 @@ mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data, u32 status) if (drv_data->bytes_left == 1) drv_data->cntl_bits &= ~REG_CONTROL_ACK; + udelay(2); break; case STATUS_MAST_RD_DATA_NO_ACK: /* 0x58 */ @@ -318,6 +320,8 @@ static void mv64xxx_i2c_send_start(struct mv64xxx_i2c_data *drv_data) mv64xxx_i2c_prepare_for_io(drv_data, drv_data->msgs); mv64xxx_write(drv_data, drv_data->cntl_bits | REG_CONTROL_START, drv_data->reg_offsets.control); + + udelay(2); } static void @@ -333,7 +337,7 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data) mv64xxx_i2c_send_start(drv_data); if (drv_data->errata_delay) - udelay(5); + udelay(3); /* * We're never at the start of the message here, and by this @@ -349,6 +353,7 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data) break; case ACTION_SEND_ADDR_1: + udelay(2); mv64xxx_write(drv_data, drv_data->addr1, drv_data->reg_offsets.data); mv64xxx_write(drv_data, drv_data->cntl_bits, @@ -360,9 +365,11 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data) drv_data->reg_offsets.data); mv64xxx_write(drv_data, drv_data->cntl_bits, drv_data->reg_offsets.control); + udelay(2); break; case ACTION_SEND_DATA: + udelay(2); mv64xxx_write(drv_data, drv_data->msg->buf[drv_data->byte_posn++], drv_data->reg_offsets.data); mv64xxx_write(drv_data, drv_data->cntl_bits, @@ -383,8 +390,9 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data) mv64xxx_write(drv_data, drv_data->cntl_bits | REG_CONTROL_STOP, drv_data->reg_offsets.control); drv_data->block = false; + udelay(2); if (drv_data->errata_delay) - udelay(5); + udelay(3); break; @@ -406,26 +414,6 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data) } } -static void mv64xxx_i2c_intr(struct mv64xxx_i2c_data *drv_data) -{ - u32 status; - uint64_t start; - - start = get_time_ns(); - - while (mv64xxx_read(drv_data, drv_data->reg_offsets.control) & - REG_CONTROL_IFLG) { - status = mv64xxx_read(drv_data, drv_data->reg_offsets.status); - mv64xxx_i2c_fsm(drv_data, status); - mv64xxx_i2c_do_action(drv_data); - - if (is_timeout_non_interruptible(start, 3 * SECOND)) { - drv_data->rc = -EIO; - break; - } - } -} - /* ***************************************************************************** * @@ -436,8 +424,15 @@ static void mv64xxx_i2c_intr(struct mv64xxx_i2c_data *drv_data) static void mv64xxx_i2c_wait_for_completion(struct mv64xxx_i2c_data *drv_data) { + u32 status; do { - mv64xxx_i2c_intr(drv_data); + if (mv64xxx_read(drv_data, drv_data->reg_offsets.control) & + REG_CONTROL_IFLG) { + status = mv64xxx_read(drv_data, + drv_data->reg_offsets.status); + mv64xxx_i2c_fsm(drv_data, status); + mv64xxx_i2c_do_action(drv_data); + } if (drv_data->rc) { drv_data->state = STATE_IDLE; dev_err(&drv_data->adapter.dev, "I2C bus error\n"); |