shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk30: i2c: clk_disable(i2c->clk) when i2c-x is in idle state

Browse Source
This commit is contained in:
kfx
2012-06-06 15:39:58 +08:00
parent ca6a14f8ec
commit 05965ceb8b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/i2c/busses/i2c-rk30-adapter.c
View File

@@ -187,6 +187,7 @@ static void rk30_i2c_init_hw(struct rk30_i2c *i2c, unsigned long scl_rate)
{
i2c->scl_rate = 0;
rk30_i2c_set_clk(i2c, scl_rate);
clk_disable(i2c->clk);
return;
}
/* returns TRUE if we this is the last byte in the current message */
@@ -486,7 +487,8 @@ static int rk30_i2c_doxfer(struct rk30_i2c *i2c,
dev_err(i2c->dev, "addr[0x%02x] wait event timeout, state: %d, is_busy: %d, error: %d, complete_what: 0x%x\n",
msgs[0].addr, i2c->state, i2c->is_busy, i2c->error, i2c->complete_what);
i2c->state = STATE_IDLE;
if(i2c->error < 0) i2c->error = -ETIMEDOUT;
if((i2c->error < 0) || (i2c->is_busy != 0) || !(i2c->complete_what & (1 << STATE_STOP)))
i2c->error = -ETIMEDOUT;
rk30_i2c_send_stop(i2c);
}
@@ -512,6 +514,8 @@ static int rk30_i2c_xfer(struct i2c_adapter *adap,
unsigned long scl_rate;
struct rk30_i2c *i2c = (struct rk30_i2c *)adap->algo_data;
clk_enable(i2c->clk);
if(msgs[0].scl_rate <= 400000 && msgs[0].scl_rate >= 10000)
scl_rate = msgs[0].scl_rate;
else if(msgs[0].scl_rate > 400000){
@@ -538,6 +542,8 @@ static int rk30_i2c_xfer(struct i2c_adapter *adap,
wake_unlock(&i2c->idlelock[i2c->adap.nr]);
mutex_unlock(&i2c->m_lock);
}
clk_disable(i2c->clk);
return (ret < 0)?ret:num;
}