aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-designware-master.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/i2c/busses/i2c-designware-master.c')
-rw-r--r--drivers/i2c/busses/i2c-designware-master.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c
index 0cdba29ae0a9..27436a937492 100644
--- a/drivers/i2c/busses/i2c-designware-master.c
+++ b/drivers/i2c/busses/i2c-designware-master.c
@@ -81,7 +81,7 @@ static int i2c_dw_init_master(struct dw_i2c_dev *dev)
81 comp_param1 = dw_readl(dev, DW_IC_COMP_PARAM_1); 81 comp_param1 = dw_readl(dev, DW_IC_COMP_PARAM_1);
82 82
83 /* Disable the adapter */ 83 /* Disable the adapter */
84 __i2c_dw_enable_and_wait(dev, false); 84 __i2c_dw_disable(dev);
85 85
86 /* Set standard and fast speed deviders for high/low periods */ 86 /* Set standard and fast speed deviders for high/low periods */
87 87
@@ -180,7 +180,7 @@ static void i2c_dw_xfer_init(struct dw_i2c_dev *dev)
180 u32 ic_con, ic_tar = 0; 180 u32 ic_con, ic_tar = 0;
181 181
182 /* Disable the adapter */ 182 /* Disable the adapter */
183 __i2c_dw_enable_and_wait(dev, false); 183 __i2c_dw_disable(dev);
184 184
185 /* If the slave address is ten bit address, enable 10BITADDR */ 185 /* If the slave address is ten bit address, enable 10BITADDR */
186 ic_con = dw_readl(dev, DW_IC_CON); 186 ic_con = dw_readl(dev, DW_IC_CON);
@@ -209,7 +209,7 @@ static void i2c_dw_xfer_init(struct dw_i2c_dev *dev)
209 i2c_dw_disable_int(dev); 209 i2c_dw_disable_int(dev);
210 210
211 /* Enable the adapter */ 211 /* Enable the adapter */
212 __i2c_dw_enable(dev, true); 212 __i2c_dw_enable(dev);
213 213
214 /* Dummy read to avoid the register getting stuck on Bay Trail */ 214 /* Dummy read to avoid the register getting stuck on Bay Trail */
215 dw_readl(dev, DW_IC_ENABLE_STATUS); 215 dw_readl(dev, DW_IC_ENABLE_STATUS);
@@ -462,7 +462,7 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
462 * additional interrupts are a hardware bug or this driver doesn't 462 * additional interrupts are a hardware bug or this driver doesn't
463 * handle them correctly yet. 463 * handle them correctly yet.
464 */ 464 */
465 __i2c_dw_enable(dev, false); 465 __i2c_dw_disable_nowait(dev);
466 466
467 if (dev->msg_err) { 467 if (dev->msg_err) {
468 ret = dev->msg_err; 468 ret = dev->msg_err;