Re: [PATCH 1/5] i2c: octeon,thunderx: Fix set SCL recovery function

2016-09-21 Thread Wolfram Sang
On Wed, Sep 21, 2016 at 08:51:02AM +0200, Jan Glauber wrote:
> From: Dmitry Bazhenov 
> 
> The set SCL recovery function unconditionally pulls the SCL line low.
> Only pull SCL line low according to val parameter.
> 
> Signed-off-by: Dmitry Bazhenov 
> Signed-off-by: Jan Glauber 
> [Changed commit message]

Applied to for-next, thanks!

Minor nit: please only use "octeon:" if you change octeon-core.



signature.asc
Description: PGP signature


[PATCH 1/5] i2c: octeon,thunderx: Fix set SCL recovery function

2016-09-20 Thread Jan Glauber
From: Dmitry Bazhenov 

The set SCL recovery function unconditionally pulls the SCL line low.
Only pull SCL line low according to val parameter.

Signed-off-by: Dmitry Bazhenov 
Signed-off-by: Jan Glauber 
[Changed commit message]
---
 drivers/i2c/busses/i2c-octeon-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/i2c/busses/i2c-octeon-core.c 
b/drivers/i2c/busses/i2c-octeon-core.c
index f45ea5e..f322242 100644
--- a/drivers/i2c/busses/i2c-octeon-core.c
+++ b/drivers/i2c/busses/i2c-octeon-core.c
@@ -767,7 +767,7 @@ static void octeon_i2c_set_scl(struct i2c_adapter *adap, 
int val)
 {
struct octeon_i2c *i2c = i2c_get_adapdata(adap);
 
-   octeon_i2c_write_int(i2c, TWSI_INT_SCL_OVR);
+   octeon_i2c_write_int(i2c, val ? 0 : TWSI_INT_SCL_OVR);
 }
 
 static int octeon_i2c_get_sda(struct i2c_adapter *adap)
-- 
1.9.1