| From 82d1221dd8caae9115b1d283f41c00da8827638e Mon Sep 17 00:00:00 2001 |
| From: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Date: Tue, 9 Jan 2018 14:58:57 +0100 |
| Subject: [PATCH 0774/1795] i2c: ensure SDA is released in recovery if SDA is |
| controllable |
| |
| If we have a function to control SDA, we should ensure that SDA is not |
| held down by us. So, release the GPIO in this case. |
| |
| Tested-by: Phil Reid <preid@electromag.com.au> |
| Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Signed-off-by: Wolfram Sang <wsa@the-dreams.de> |
| (cherry picked from commit 72b08fcc15dc6a2d211880e4dc7cf5314e9ab750) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/i2c/i2c-core-base.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c |
| index 90aeeea84095..1b67768f01b2 100644 |
| --- a/drivers/i2c/i2c-core-base.c |
| +++ b/drivers/i2c/i2c-core-base.c |
| @@ -208,6 +208,8 @@ static int i2c_generic_recovery(struct i2c_adapter *adap) |
| bri->prepare_recovery(adap); |
| |
| bri->set_scl(adap, val); |
| + if (bri->set_sda) |
| + bri->set_sda(adap, 1); |
| ndelay(RECOVERY_NDELAY); |
| |
| /* |
| -- |
| 2.19.0 |
| |
