[PATCH] omap: i2c: don't check bus state IP rev3.3 and earlier

2014-11-24 Thread Alexander Kochetkov
Commit 903c3859f77f9b0aace551da03267ef7a211dbc4 (i2c: omap: implement
workaround for handling invalid BB-bit values) introduce the error result
in boot test fault on OMAP3530 boards

The patch fix the error (disable i2c bus test for OMAP3530).

Signed-off-by: Alexander Kochetkov al.koc...@gmail.com
Fixes: 903c3859f77f9b0aace551da03267ef7a211dbc4
---
 drivers/i2c/busses/i2c-omap.c |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 5d92d0e..4563200 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -344,8 +344,10 @@ static int omap_i2c_reset(struct omap_i2c_dev *dev)
/* SYSC register is cleared by the reset; rewrite it */
omap_i2c_write_reg(dev, OMAP_I2C_SYSC_REG, sysc);
 
-   /* Schedule I2C-bus monitoring on the next transfer */
-   dev-bb_valid = 0;
+   if (dev-rev  OMAP_I2C_REV_ON_3430_3530) {
+   /* Schedule I2C-bus monitoring on the next transfer */
+   dev-bb_valid = 0;
+   }
}
 
return 0;
@@ -460,7 +462,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
dev-scllstate = scll;
dev-sclhstate = sclh;
 
-   if (dev-rev  OMAP_I2C_OMAP1_REV_2) {
+   if (dev-rev = OMAP_I2C_REV_ON_3430_3530) {
/* Not implemented */
dev-bb_valid = 1;
}
-- 
1.7.9.5

--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] omap: i2c: don't check bus state IP rev3.3 and earlier

2014-11-24 Thread Tony Lindgren
* Alexander Kochetkov al.koc...@gmail.com [141124 12:35]:
 Commit 903c3859f77f9b0aace551da03267ef7a211dbc4 (i2c: omap: implement
 workaround for handling invalid BB-bit values) introduce the error result
 in boot test fault on OMAP3530 boards
 
 The patch fix the error (disable i2c bus test for OMAP3530).

Maybe add Reported-by: credit for Kevin Hilman here?
Other than that, this fixes the problem for me:

Tested-by: Tony Lindgren t...@atomide.com
 
 Signed-off-by: Alexander Kochetkov al.koc...@gmail.com
 Fixes: 903c3859f77f9b0aace551da03267ef7a211dbc4
 ---
  drivers/i2c/busses/i2c-omap.c |8 +---
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
 index 5d92d0e..4563200 100644
 --- a/drivers/i2c/busses/i2c-omap.c
 +++ b/drivers/i2c/busses/i2c-omap.c
 @@ -344,8 +344,10 @@ static int omap_i2c_reset(struct omap_i2c_dev *dev)
   /* SYSC register is cleared by the reset; rewrite it */
   omap_i2c_write_reg(dev, OMAP_I2C_SYSC_REG, sysc);
  
 - /* Schedule I2C-bus monitoring on the next transfer */
 - dev-bb_valid = 0;
 + if (dev-rev  OMAP_I2C_REV_ON_3430_3530) {
 + /* Schedule I2C-bus monitoring on the next transfer */
 + dev-bb_valid = 0;
 + }
   }
  
   return 0;
 @@ -460,7 +462,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
   dev-scllstate = scll;
   dev-sclhstate = sclh;
  
 - if (dev-rev  OMAP_I2C_OMAP1_REV_2) {
 + if (dev-rev = OMAP_I2C_REV_ON_3430_3530) {
   /* Not implemented */
   dev-bb_valid = 1;
   }
 -- 
 1.7.9.5
 
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html