|
@@ -311,24 +311,6 @@ static void pch_i2c_start(struct i2c_algo_pch_data *adap)
|
|
|
pch_setbit(adap->pch_base_address, PCH_I2CCTL, PCH_START);
|
|
|
}
|
|
|
|
|
|
-/**
|
|
|
- * pch_i2c_getack() - to confirm ACK/NACK
|
|
|
- * @adap: Pointer to struct i2c_algo_pch_data.
|
|
|
- */
|
|
|
-static s32 pch_i2c_getack(struct i2c_algo_pch_data *adap)
|
|
|
-{
|
|
|
- u32 reg_val;
|
|
|
- void __iomem *p = adap->pch_base_address;
|
|
|
- reg_val = ioread32(p + PCH_I2CSR) & PCH_GETACK;
|
|
|
-
|
|
|
- if (reg_val != 0) {
|
|
|
- pch_err(adap, "return%d\n", -EPROTO);
|
|
|
- return -EPROTO;
|
|
|
- }
|
|
|
-
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
/**
|
|
|
* pch_i2c_stop() - generate stop condition in normal mode.
|
|
|
* @adap: Pointer to struct i2c_algo_pch_data.
|
|
@@ -344,6 +326,7 @@ static void pch_i2c_stop(struct i2c_algo_pch_data *adap)
|
|
|
static int pch_i2c_wait_for_check_xfer(struct i2c_algo_pch_data *adap)
|
|
|
{
|
|
|
long ret;
|
|
|
+ void __iomem *p = adap->pch_base_address;
|
|
|
|
|
|
ret = wait_event_timeout(pch_event,
|
|
|
(adap->pch_event_flag != 0), msecs_to_jiffies(1000));
|
|
@@ -366,10 +349,9 @@ static int pch_i2c_wait_for_check_xfer(struct i2c_algo_pch_data *adap)
|
|
|
|
|
|
adap->pch_event_flag = 0;
|
|
|
|
|
|
- if (pch_i2c_getack(adap)) {
|
|
|
- pch_dbg(adap, "Receive NACK for slave address"
|
|
|
- "setting\n");
|
|
|
- return -EIO;
|
|
|
+ if (ioread32(p + PCH_I2CSR) & PCH_GETACK) {
|
|
|
+ pch_dbg(adap, "Receive NACK for slave address setting\n");
|
|
|
+ return -ENXIO;
|
|
|
}
|
|
|
|
|
|
return 0;
|