summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorJan Luebbe <jluebbe@debian.org>2015-07-30 16:52:11 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2015-08-20 07:47:15 +0200
commitffcabbe125d31dcb4f25dbb8f29be7adcfcf408e (patch)
treed6f241a387f399e576730b1fe418607bc4b97f1a /drivers/i2c
parent4f32ba9fcbbdcbfdb6dec75fe70ba8998a82e3ca (diff)
downloadbarebox-ffcabbe125d31dcb4f25dbb8f29be7adcfcf408e.tar.gz
barebox-ffcabbe125d31dcb4f25dbb8f29be7adcfcf408e.tar.xz
i2c: gpio: add bus recovery support
Signed-off-by: Jan Luebbe <jluebbe@debian.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-gpio.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c
index b4a0ecdb20..9362ed181f 100644
--- a/drivers/i2c/busses/i2c-gpio.c
+++ b/drivers/i2c/busses/i2c-gpio.c
@@ -10,6 +10,7 @@
#include <common.h>
#include <driver.h>
+#include <malloc.h>
#include <i2c/i2c.h>
#include <i2c/i2c-algo-bit.h>
#include <i2c/i2c-gpio.h>
@@ -187,6 +188,13 @@ static int i2c_gpio_probe(struct device_d *dev)
adap->algo_data = bit_data;
adap->dev.parent = dev;
adap->dev.device_node = dev->device_node;
+ adap->bus_recovery_info = xzalloc(sizeof(*adap->bus_recovery_info));
+ adap->bus_recovery_info->scl_gpio = pdata->scl_pin;
+ adap->bus_recovery_info->sda_gpio = pdata->sda_pin;
+ adap->bus_recovery_info->get_sda = i2c_get_sda_gpio_value;
+ adap->bus_recovery_info->get_scl = i2c_get_scl_gpio_value;
+ adap->bus_recovery_info->set_scl = i2c_set_scl_gpio_value;
+ adap->bus_recovery_info->recover_bus = i2c_generic_scl_recovery;
adap->nr = dev->id;
ret = i2c_bit_add_numbered_bus(adap);
@@ -201,10 +209,12 @@ static int i2c_gpio_probe(struct device_d *dev)
return 0;
err_add_bus:
+ free(adap->bus_recovery_info);
gpio_free(pdata->scl_pin);
err_request_scl:
gpio_free(pdata->sda_pin);
err_request_sda:
+ free(priv);
return ret;
}