* [PATCH v4 0/7] i2c: designware: add i2c gpio recovery option
@ 2017-10-31 7:33 ` Phil Reid
0 siblings, 0 replies; 26+ messages in thread
From: Phil Reid @ 2017-10-31 7:33 UTC (permalink / raw)
To: linux-arm-kernel
Changes from V3:
- rebase on i2c/for-next
- Add patches to convert other drivers using gpio recover to gpiod
- Remove legacy gpio
- Address minor issues raised in review and add acks received so far
Changes from V2:
- Rebase on https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git/
i2c/for-next
No intentional changes, but needed to move i2c_dw_plat_prepare_clk to common
for the master recovery functions to use. which is included as two additional
patches.
Changes from V1:
- In review Andy suggested change the i2c core to use the gpiod
I've added a patch that allows the gradual switching of drivers
to using gpiod interface. The old interface is preserved so
that changes can be made incrementally.
- I've update Tim's patch for the designware driver to use the new
interface. Tweaked a couple of things to his patch and fixed
up things Andy id in last review.
The core changes in p1 don't require the get/set scl/sda functions.
Hopefully I've done the right thing with preserving authorship and
signoff.
Phil Reid (6):
i2c: Switch to using gpiod interface for gpio bus recovery
i2c: designware: move i2c_dw_plat_prepare_clk to common
i2c: designware: rename i2c_dw_plat_prepare_clk to i2c_dw_prepare_clk
i2c: imx: switch to using gpiod for bus recovery gpios
i2c: davinci: switch to using gpiod for bus recovery gpios
i2c: remove legacy integer scl/sda gpio for recovery
Tim Sander (1):
i2c: designware: add i2c gpio recovery option
drivers/i2c/busses/i2c-davinci.c | 20 +++++--
drivers/i2c/busses/i2c-designware-common.c | 19 ++++++-
drivers/i2c/busses/i2c-designware-core.h | 2 +
drivers/i2c/busses/i2c-designware-master.c | 57 ++++++++++++++++++++
drivers/i2c/busses/i2c-designware-platdrv.c | 18 ++-----
drivers/i2c/busses/i2c-imx.c | 18 +++----
drivers/i2c/i2c-core-base.c | 83 ++++-------------------------
include/linux/i2c.h | 11 ++--
8 files changed, 120 insertions(+), 108 deletions(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v4 1/7] i2c: Switch to using gpiod interface for gpio bus recovery
2017-10-31 7:33 ` Phil Reid
@ 2017-10-31 7:33 ` Phil Reid
-1 siblings, 0 replies; 26+ messages in thread
From: Phil Reid @ 2017-10-31 7:33 UTC (permalink / raw)
To: nsekhar, khilman, wsa, jarkko.nikula, andriy.shevchenko,
mika.westerberg, preid, linux-arm-kernel, linux-i2c, fntoth
Currently the i2c gpio recovery code uses gpio integer interface
instead of the gpiod. This change switch the core code to use
the gpiod while still retaining compatibility with the gpio integer
interface. This will allow individual driver to be updated and tested
individual to switch to using the gpiod interface.
Signed-off-by: Phil Reid <preid@electromag.com.au>
---
drivers/i2c/i2c-core-base.c | 21 +++++++++++++++++----
include/linux/i2c.h | 2 ++
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index db6558e..29c8e6d 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -133,17 +133,17 @@ static int i2c_device_uevent(struct device *dev, struct kobj_uevent_env *env)
/* i2c bus recovery routines */
static int get_scl_gpio_value(struct i2c_adapter *adap)
{
- return gpio_get_value(adap->bus_recovery_info->scl_gpio);
+ return gpiod_get_value_cansleep(adap->bus_recovery_info->scl_gpiod);
}
static void set_scl_gpio_value(struct i2c_adapter *adap, int val)
{
- gpio_set_value(adap->bus_recovery_info->scl_gpio, val);
+ gpiod_set_value_cansleep(adap->bus_recovery_info->scl_gpiod, val);
}
static int get_sda_gpio_value(struct i2c_adapter *adap)
{
- return gpio_get_value(adap->bus_recovery_info->sda_gpio);
+ return gpiod_get_value_cansleep(adap->bus_recovery_info->sda_gpiod);
}
static int i2c_get_gpios_for_recovery(struct i2c_adapter *adap)
@@ -158,6 +158,7 @@ static int i2c_get_gpios_for_recovery(struct i2c_adapter *adap)
dev_warn(dev, "Can't get SCL gpio: %d\n", bri->scl_gpio);
return ret;
}
+ bri->scl_gpiod = gpio_to_desc(bri->scl_gpio);
if (bri->get_sda) {
if (gpio_request_one(bri->sda_gpio, GPIOF_IN, "i2c-sda")) {
@@ -166,6 +167,7 @@ static int i2c_get_gpios_for_recovery(struct i2c_adapter *adap)
bri->sda_gpio);
bri->get_sda = NULL;
}
+ bri->sda_gpiod = gpio_to_desc(bri->sda_gpio);
}
return ret;
@@ -175,10 +177,13 @@ static void i2c_put_gpios_for_recovery(struct i2c_adapter *adap)
{
struct i2c_bus_recovery_info *bri = adap->bus_recovery_info;
- if (bri->get_sda)
+ if (bri->get_sda) {
gpio_free(bri->sda_gpio);
+ bri->sda_gpiod = NULL;
+ }
gpio_free(bri->scl_gpio);
+ bri->scl_gpiod = NULL;
}
/*
@@ -276,6 +281,14 @@ static void i2c_init_recovery(struct i2c_adapter *adap)
goto err;
}
+ if (bri->scl_gpiod && bri->recover_bus == i2c_generic_scl_recovery) {
+ bri->get_scl = get_scl_gpio_value;
+ bri->set_scl = set_scl_gpio_value;
+ if (bri->sda_gpiod)
+ bri->get_sda = get_sda_gpio_value;
+ return;
+ }
+
/* Generic GPIO recovery */
if (bri->recover_bus == i2c_generic_gpio_recovery) {
if (!gpio_is_valid(bri->scl_gpio)) {
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 0f77440..ea31cb3 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -513,6 +513,8 @@ struct i2c_bus_recovery_info {
/* gpio recovery */
int scl_gpio;
int sda_gpio;
+ struct gpio_desc *scl_gpiod;
+ struct gpio_desc *sda_gpiod;
};
int i2c_recover_bus(struct i2c_adapter *adap);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v4 1/7] i2c: Switch to using gpiod interface for gpio bus recovery
@ 2017-10-31 7:33 ` Phil Reid
0 siblings, 0 replies; 26+ messages in thread
From: Phil Reid @ 2017-10-31 7:33 UTC (permalink / raw)
To: linux-arm-kernel
Currently the i2c gpio recovery code uses gpio integer interface
instead of the gpiod. This change switch the core code to use
the gpiod while still retaining compatibility with the gpio integer
interface. This will allow individual driver to be updated and tested
individual to switch to using the gpiod interface.
Signed-off-by: Phil Reid <preid@electromag.com.au>
---
drivers/i2c/i2c-core-base.c | 21 +++++++++++++++++----
include/linux/i2c.h | 2 ++
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index db6558e..29c8e6d 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -133,17 +133,17 @@ static int i2c_device_uevent(struct device *dev, struct kobj_uevent_env *env)
/* i2c bus recovery routines */
static int get_scl_gpio_value(struct i2c_adapter *adap)
{
- return gpio_get_value(adap->bus_recovery_info->scl_gpio);
+ return gpiod_get_value_cansleep(adap->bus_recovery_info->scl_gpiod);
}
static void set_scl_gpio_value(struct i2c_adapter *adap, int val)
{
- gpio_set_value(adap->bus_recovery_info->scl_gpio, val);
+ gpiod_set_value_cansleep(adap->bus_recovery_info->scl_gpiod, val);
}
static int get_sda_gpio_value(struct i2c_adapter *adap)
{
- return gpio_get_value(adap->bus_recovery_info->sda_gpio);
+ return gpiod_get_value_cansleep(adap->bus_recovery_info->sda_gpiod);
}
static int i2c_get_gpios_for_recovery(struct i2c_adapter *adap)
@@ -158,6 +158,7 @@ static int i2c_get_gpios_for_recovery(struct i2c_adapter *adap)
dev_warn(dev, "Can't get SCL gpio: %d\n", bri->scl_gpio);
return ret;
}
+ bri->scl_gpiod = gpio_to_desc(bri->scl_gpio);
if (bri->get_sda) {
if (gpio_request_one(bri->sda_gpio, GPIOF_IN, "i2c-sda")) {
@@ -166,6 +167,7 @@ static int i2c_get_gpios_for_recovery(struct i2c_adapter *adap)
bri->sda_gpio);
bri->get_sda = NULL;
}
+ bri->sda_gpiod = gpio_to_desc(bri->sda_gpio);
}
return ret;
@@ -175,10 +177,13 @@ static void i2c_put_gpios_for_recovery(struct i2c_adapter *adap)
{
struct i2c_bus_recovery_info *bri = adap->bus_recovery_info;
- if (bri->get_sda)
+ if (bri->get_sda) {
gpio_free(bri->sda_gpio);
+ bri->sda_gpiod = NULL;
+ }
gpio_free(bri->scl_gpio);
+ bri->scl_gpiod = NULL;
}
/*
@@ -276,6 +281,14 @@ static void i2c_init_recovery(struct i2c_adapter *adap)
goto err;
}
+ if (bri->scl_gpiod && bri->recover_bus == i2c_generic_scl_recovery) {
+ bri->get_scl = get_scl_gpio_value;
+ bri->set_scl = set_scl_gpio_value;
+ if (bri->sda_gpiod)
+ bri->get_sda = get_sda_gpio_value;
+ return;
+ }
+
/* Generic GPIO recovery */
if (bri->recover_bus == i2c_generic_gpio_recovery) {
if (!gpio_is_valid(bri->scl_gpio)) {
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 0f77440..ea31cb3 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -513,6 +513,8 @@ struct i2c_bus_recovery_info {
/* gpio recovery */
int scl_gpio;
int sda_gpio;
+ struct gpio_desc *scl_gpiod;
+ struct gpio_desc *sda_gpiod;
};
int i2c_recover_bus(struct i2c_adapter *adap);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v4 1/7] i2c: Switch to using gpiod interface for gpio bus recovery
2017-10-31 7:33 ` Phil Reid
@ 2017-11-01 16:23 ` Jarkko Nikula
-1 siblings, 0 replies; 26+ messages in thread
From: Jarkko Nikula @ 2017-11-01 16:23 UTC (permalink / raw)
To: Phil Reid, nsekhar, khilman, wsa, andriy.shevchenko,
mika.westerberg, linux-arm-kernel, linux-i2c, fntoth
On 10/31/2017 09:33 AM, Phil Reid wrote:
> Currently the i2c gpio recovery code uses gpio integer interface
> instead of the gpiod. This change switch the core code to use
> the gpiod while still retaining compatibility with the gpio integer
> interface. This will allow individual driver to be updated and tested
> individual to switch to using the gpiod interface.
>
> Signed-off-by: Phil Reid <preid@electromag.com.au>
> ---
> drivers/i2c/i2c-core-base.c | 21 +++++++++++++++++----
> include/linux/i2c.h | 2 ++
> 2 files changed, 19 insertions(+), 4 deletions(-)
>
Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v4 1/7] i2c: Switch to using gpiod interface for gpio bus recovery
@ 2017-11-01 16:23 ` Jarkko Nikula
0 siblings, 0 replies; 26+ messages in thread
From: Jarkko Nikula @ 2017-11-01 16:23 UTC (permalink / raw)
To: linux-arm-kernel
On 10/31/2017 09:33 AM, Phil Reid wrote:
> Currently the i2c gpio recovery code uses gpio integer interface
> instead of the gpiod. This change switch the core code to use
> the gpiod while still retaining compatibility with the gpio integer
> interface. This will allow individual driver to be updated and tested
> individual to switch to using the gpiod interface.
>
> Signed-off-by: Phil Reid <preid@electromag.com.au>
> ---
> drivers/i2c/i2c-core-base.c | 21 +++++++++++++++++----
> include/linux/i2c.h | 2 ++
> 2 files changed, 19 insertions(+), 4 deletions(-)
>
Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v4 2/7] i2c: designware: move i2c_dw_plat_prepare_clk to common
2017-10-31 7:33 ` Phil Reid
@ 2017-10-31 7:33 ` Phil Reid
-1 siblings, 0 replies; 26+ messages in thread
From: Phil Reid @ 2017-10-31 7:33 UTC (permalink / raw)
To: nsekhar, khilman, wsa, jarkko.nikula, andriy.shevchenko,
mika.westerberg, preid, linux-arm-kernel, linux-i2c, fntoth
Move the i2c_dw_plat_prepare_clk funciton to common file in preparation
for its use also by the master driver.
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Phil Reid <preid@electromag.com.au>
---
drivers/i2c/busses/i2c-designware-common.c | 13 +++++++++++++
drivers/i2c/busses/i2c-designware-core.h | 1 +
drivers/i2c/busses/i2c-designware-platdrv.c | 12 ------------
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c
index d1a6937..b79f342 100644
--- a/drivers/i2c/busses/i2c-designware-common.c
+++ b/drivers/i2c/busses/i2c-designware-common.c
@@ -21,6 +21,7 @@
* ----------------------------------------------------------------------------
*
*/
+#include <linux/clk.h>
#include <linux/delay.h>
#include <linux/export.h>
#include <linux/errno.h>
@@ -185,6 +186,18 @@ unsigned long i2c_dw_clk_rate(struct dw_i2c_dev *dev)
return dev->get_clk_rate_khz(dev);
}
+int i2c_dw_plat_prepare_clk(struct dw_i2c_dev *i_dev, bool prepare)
+{
+ if (IS_ERR(i_dev->clk))
+ return PTR_ERR(i_dev->clk);
+
+ if (prepare)
+ return clk_prepare_enable(i_dev->clk);
+
+ clk_disable_unprepare(i_dev->clk);
+ return 0;
+}
+
int i2c_dw_acquire_lock(struct dw_i2c_dev *dev)
{
int ret;
diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h
index 21bf619..e80a14c 100644
--- a/drivers/i2c/busses/i2c-designware-core.h
+++ b/drivers/i2c/busses/i2c-designware-core.h
@@ -301,6 +301,7 @@ struct dw_i2c_dev {
void __i2c_dw_enable(struct dw_i2c_dev *dev, bool enable);
void __i2c_dw_enable_and_wait(struct dw_i2c_dev *dev, bool enable);
unsigned long i2c_dw_clk_rate(struct dw_i2c_dev *dev);
+int i2c_dw_plat_prepare_clk(struct dw_i2c_dev *i_dev, bool prepare);
int i2c_dw_acquire_lock(struct dw_i2c_dev *dev);
void i2c_dw_release_lock(struct dw_i2c_dev *dev);
int i2c_dw_wait_bus_not_busy(struct dw_i2c_dev *dev);
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index 58add69..a5fd0ee 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -214,18 +214,6 @@ static void i2c_dw_configure_slave(struct dw_i2c_dev *dev)
}
}
-static int i2c_dw_plat_prepare_clk(struct dw_i2c_dev *i_dev, bool prepare)
-{
- if (IS_ERR(i_dev->clk))
- return PTR_ERR(i_dev->clk);
-
- if (prepare)
- return clk_prepare_enable(i_dev->clk);
-
- clk_disable_unprepare(i_dev->clk);
- return 0;
-}
-
static void dw_i2c_set_fifo_size(struct dw_i2c_dev *dev, int id)
{
u32 param, tx_fifo_depth, rx_fifo_depth;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v4 2/7] i2c: designware: move i2c_dw_plat_prepare_clk to common
@ 2017-10-31 7:33 ` Phil Reid
0 siblings, 0 replies; 26+ messages in thread
From: Phil Reid @ 2017-10-31 7:33 UTC (permalink / raw)
To: linux-arm-kernel
Move the i2c_dw_plat_prepare_clk funciton to common file in preparation
for its use also by the master driver.
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Phil Reid <preid@electromag.com.au>
---
drivers/i2c/busses/i2c-designware-common.c | 13 +++++++++++++
drivers/i2c/busses/i2c-designware-core.h | 1 +
drivers/i2c/busses/i2c-designware-platdrv.c | 12 ------------
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c
index d1a6937..b79f342 100644
--- a/drivers/i2c/busses/i2c-designware-common.c
+++ b/drivers/i2c/busses/i2c-designware-common.c
@@ -21,6 +21,7 @@
* ----------------------------------------------------------------------------
*
*/
+#include <linux/clk.h>
#include <linux/delay.h>
#include <linux/export.h>
#include <linux/errno.h>
@@ -185,6 +186,18 @@ unsigned long i2c_dw_clk_rate(struct dw_i2c_dev *dev)
return dev->get_clk_rate_khz(dev);
}
+int i2c_dw_plat_prepare_clk(struct dw_i2c_dev *i_dev, bool prepare)
+{
+ if (IS_ERR(i_dev->clk))
+ return PTR_ERR(i_dev->clk);
+
+ if (prepare)
+ return clk_prepare_enable(i_dev->clk);
+
+ clk_disable_unprepare(i_dev->clk);
+ return 0;
+}
+
int i2c_dw_acquire_lock(struct dw_i2c_dev *dev)
{
int ret;
diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h
index 21bf619..e80a14c 100644
--- a/drivers/i2c/busses/i2c-designware-core.h
+++ b/drivers/i2c/busses/i2c-designware-core.h
@@ -301,6 +301,7 @@ struct dw_i2c_dev {
void __i2c_dw_enable(struct dw_i2c_dev *dev, bool enable);
void __i2c_dw_enable_and_wait(struct dw_i2c_dev *dev, bool enable);
unsigned long i2c_dw_clk_rate(struct dw_i2c_dev *dev);
+int i2c_dw_plat_prepare_clk(struct dw_i2c_dev *i_dev, bool prepare);
int i2c_dw_acquire_lock(struct dw_i2c_dev *dev);
void i2c_dw_release_lock(struct dw_i2c_dev *dev);
int i2c_dw_wait_bus_not_busy(struct dw_i2c_dev *dev);
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index 58add69..a5fd0ee 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -214,18 +214,6 @@ static void i2c_dw_configure_slave(struct dw_i2c_dev *dev)
}
}
-static int i2c_dw_plat_prepare_clk(struct dw_i2c_dev *i_dev, bool prepare)
-{
- if (IS_ERR(i_dev->clk))
- return PTR_ERR(i_dev->clk);
-
- if (prepare)
- return clk_prepare_enable(i_dev->clk);
-
- clk_disable_unprepare(i_dev->clk);
- return 0;
-}
-
static void dw_i2c_set_fifo_size(struct dw_i2c_dev *dev, int id)
{
u32 param, tx_fifo_depth, rx_fifo_depth;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v4 3/7] i2c: designware: rename i2c_dw_plat_prepare_clk to i2c_dw_prepare_clk
2017-10-31 7:33 ` Phil Reid
@ 2017-10-31 7:33 ` Phil Reid
-1 siblings, 0 replies; 26+ messages in thread
From: Phil Reid @ 2017-10-31 7:33 UTC (permalink / raw)
To: nsekhar, khilman, wsa, jarkko.nikula, andriy.shevchenko,
mika.westerberg, preid, linux-arm-kernel, linux-i2c, fntoth
For consistency with the reset of the file rename function and parameter to
be consistent with the reset of the common file.
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Phil Reid <preid@electromag.com.au>
---
drivers/i2c/busses/i2c-designware-common.c | 10 +++++-----
drivers/i2c/busses/i2c-designware-core.h | 2 +-
drivers/i2c/busses/i2c-designware-platdrv.c | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c
index b79f342..3d684c6 100644
--- a/drivers/i2c/busses/i2c-designware-common.c
+++ b/drivers/i2c/busses/i2c-designware-common.c
@@ -186,15 +186,15 @@ unsigned long i2c_dw_clk_rate(struct dw_i2c_dev *dev)
return dev->get_clk_rate_khz(dev);
}
-int i2c_dw_plat_prepare_clk(struct dw_i2c_dev *i_dev, bool prepare)
+int i2c_dw_prepare_clk(struct dw_i2c_dev *dev, bool prepare)
{
- if (IS_ERR(i_dev->clk))
- return PTR_ERR(i_dev->clk);
+ if (IS_ERR(dev->clk))
+ return PTR_ERR(dev->clk);
if (prepare)
- return clk_prepare_enable(i_dev->clk);
+ return clk_prepare_enable(dev->clk);
- clk_disable_unprepare(i_dev->clk);
+ clk_disable_unprepare(dev->clk);
return 0;
}
diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h
index e80a14c..33c6c8f 100644
--- a/drivers/i2c/busses/i2c-designware-core.h
+++ b/drivers/i2c/busses/i2c-designware-core.h
@@ -301,7 +301,7 @@ struct dw_i2c_dev {
void __i2c_dw_enable(struct dw_i2c_dev *dev, bool enable);
void __i2c_dw_enable_and_wait(struct dw_i2c_dev *dev, bool enable);
unsigned long i2c_dw_clk_rate(struct dw_i2c_dev *dev);
-int i2c_dw_plat_prepare_clk(struct dw_i2c_dev *i_dev, bool prepare);
+int i2c_dw_prepare_clk(struct dw_i2c_dev *dev, bool prepare);
int i2c_dw_acquire_lock(struct dw_i2c_dev *dev);
void i2c_dw_release_lock(struct dw_i2c_dev *dev);
int i2c_dw_wait_bus_not_busy(struct dw_i2c_dev *dev);
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index a5fd0ee..9c5f649 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -343,7 +343,7 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
i2c_dw_configure_master(dev);
dev->clk = devm_clk_get(&pdev->dev, NULL);
- if (!i2c_dw_plat_prepare_clk(dev, true)) {
+ if (!i2c_dw_prepare_clk(dev, true)) {
dev->get_clk_rate_khz = i2c_dw_get_clk_rate_khz;
if (!dev->sda_hold_time && ht)
@@ -447,7 +447,7 @@ static int dw_i2c_plat_suspend(struct device *dev)
}
i_dev->disable(i_dev);
- i2c_dw_plat_prepare_clk(i_dev, false);
+ i2c_dw_prepare_clk(i_dev, false);
i_dev->suspended = true;
@@ -466,7 +466,7 @@ static int dw_i2c_plat_resume(struct device *dev)
return 0;
}
- i2c_dw_plat_prepare_clk(i_dev, true);
+ i2c_dw_prepare_clk(i_dev, true);
i_dev->init(i_dev);
i_dev->suspended = false;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v4 3/7] i2c: designware: rename i2c_dw_plat_prepare_clk to i2c_dw_prepare_clk
@ 2017-10-31 7:33 ` Phil Reid
0 siblings, 0 replies; 26+ messages in thread
From: Phil Reid @ 2017-10-31 7:33 UTC (permalink / raw)
To: linux-arm-kernel
For consistency with the reset of the file rename function and parameter to
be consistent with the reset of the common file.
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Phil Reid <preid@electromag.com.au>
---
drivers/i2c/busses/i2c-designware-common.c | 10 +++++-----
drivers/i2c/busses/i2c-designware-core.h | 2 +-
drivers/i2c/busses/i2c-designware-platdrv.c | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c
index b79f342..3d684c6 100644
--- a/drivers/i2c/busses/i2c-designware-common.c
+++ b/drivers/i2c/busses/i2c-designware-common.c
@@ -186,15 +186,15 @@ unsigned long i2c_dw_clk_rate(struct dw_i2c_dev *dev)
return dev->get_clk_rate_khz(dev);
}
-int i2c_dw_plat_prepare_clk(struct dw_i2c_dev *i_dev, bool prepare)
+int i2c_dw_prepare_clk(struct dw_i2c_dev *dev, bool prepare)
{
- if (IS_ERR(i_dev->clk))
- return PTR_ERR(i_dev->clk);
+ if (IS_ERR(dev->clk))
+ return PTR_ERR(dev->clk);
if (prepare)
- return clk_prepare_enable(i_dev->clk);
+ return clk_prepare_enable(dev->clk);
- clk_disable_unprepare(i_dev->clk);
+ clk_disable_unprepare(dev->clk);
return 0;
}
diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h
index e80a14c..33c6c8f 100644
--- a/drivers/i2c/busses/i2c-designware-core.h
+++ b/drivers/i2c/busses/i2c-designware-core.h
@@ -301,7 +301,7 @@ struct dw_i2c_dev {
void __i2c_dw_enable(struct dw_i2c_dev *dev, bool enable);
void __i2c_dw_enable_and_wait(struct dw_i2c_dev *dev, bool enable);
unsigned long i2c_dw_clk_rate(struct dw_i2c_dev *dev);
-int i2c_dw_plat_prepare_clk(struct dw_i2c_dev *i_dev, bool prepare);
+int i2c_dw_prepare_clk(struct dw_i2c_dev *dev, bool prepare);
int i2c_dw_acquire_lock(struct dw_i2c_dev *dev);
void i2c_dw_release_lock(struct dw_i2c_dev *dev);
int i2c_dw_wait_bus_not_busy(struct dw_i2c_dev *dev);
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index a5fd0ee..9c5f649 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -343,7 +343,7 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
i2c_dw_configure_master(dev);
dev->clk = devm_clk_get(&pdev->dev, NULL);
- if (!i2c_dw_plat_prepare_clk(dev, true)) {
+ if (!i2c_dw_prepare_clk(dev, true)) {
dev->get_clk_rate_khz = i2c_dw_get_clk_rate_khz;
if (!dev->sda_hold_time && ht)
@@ -447,7 +447,7 @@ static int dw_i2c_plat_suspend(struct device *dev)
}
i_dev->disable(i_dev);
- i2c_dw_plat_prepare_clk(i_dev, false);
+ i2c_dw_prepare_clk(i_dev, false);
i_dev->suspended = true;
@@ -466,7 +466,7 @@ static int dw_i2c_plat_resume(struct device *dev)
return 0;
}
- i2c_dw_plat_prepare_clk(i_dev, true);
+ i2c_dw_prepare_clk(i_dev, true);
i_dev->init(i_dev);
i_dev->suspended = false;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v4 3/7] i2c: designware: rename i2c_dw_plat_prepare_clk to i2c_dw_prepare_clk
2017-10-31 7:33 ` Phil Reid
@ 2017-10-31 10:10 ` Andy Shevchenko
-1 siblings, 0 replies; 26+ messages in thread
From: Andy Shevchenko @ 2017-10-31 10:10 UTC (permalink / raw)
To: Phil Reid, nsekhar, khilman, wsa, jarkko.nikula, mika.westerberg,
linux-arm-kernel, linux-i2c, fntoth
On Tue, 2017-10-31 at 15:33 +0800, Phil Reid wrote:
> For consistency with the reset of the file rename function and
reset -> rest ?
> parameter to
> be consistent with the reset of the common file.
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v4 3/7] i2c: designware: rename i2c_dw_plat_prepare_clk to i2c_dw_prepare_clk
@ 2017-10-31 10:10 ` Andy Shevchenko
0 siblings, 0 replies; 26+ messages in thread
From: Andy Shevchenko @ 2017-10-31 10:10 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 2017-10-31 at 15:33 +0800, Phil Reid wrote:
> For consistency with the reset of the file rename function and
reset -> rest ?
> parameter to
> be consistent with the reset of the common file.
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v4 4/7] i2c: designware: add i2c gpio recovery option
2017-10-31 7:33 ` Phil Reid
@ 2017-10-31 7:33 ` Phil Reid
-1 siblings, 0 replies; 26+ messages in thread
From: Phil Reid @ 2017-10-31 7:33 UTC (permalink / raw)
To: nsekhar, khilman, wsa, jarkko.nikula, andriy.shevchenko,
mika.westerberg, preid, linux-arm-kernel, linux-i2c, fntoth
Cc: Tim Sander
From: Tim Sander <tim@krieglstein.org>
This patch contains much input from Phil Reid and has been tested
on Intel/Altera Cyclone V SOC Hardware with Altera GPIO's for the
SCL and SDA GPIO's.
Signed-off-by: Tim Sander <tim@krieglstein.org>
Signed-off-by: Phil Reid <preid@electromag.com.au>
---
drivers/i2c/busses/i2c-designware-common.c | 6 +++-
drivers/i2c/busses/i2c-designware-core.h | 1 +
drivers/i2c/busses/i2c-designware-master.c | 57 ++++++++++++++++++++++++++++++
3 files changed, 63 insertions(+), 1 deletion(-)
diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c
index 3d684c6..6b82809 100644
--- a/drivers/i2c/busses/i2c-designware-common.c
+++ b/drivers/i2c/busses/i2c-designware-common.c
@@ -230,7 +230,11 @@ int i2c_dw_wait_bus_not_busy(struct dw_i2c_dev *dev)
while (dw_readl(dev, DW_IC_STATUS) & DW_IC_STATUS_ACTIVITY) {
if (timeout <= 0) {
dev_warn(dev->dev, "timeout waiting for bus ready\n");
- return -ETIMEDOUT;
+ i2c_recover_bus(&dev->adapter);
+
+ if (dw_readl(dev, DW_IC_STATUS) & DW_IC_STATUS_ACTIVITY)
+ return -ETIMEDOUT;
+ return 0;
}
timeout--;
usleep_range(1000, 1100);
diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h
index 33c6c8f..d58a336 100644
--- a/drivers/i2c/busses/i2c-designware-core.h
+++ b/drivers/i2c/busses/i2c-designware-core.h
@@ -286,6 +286,7 @@ struct dw_i2c_dev {
void (*disable_int)(struct dw_i2c_dev *dev);
int (*init)(struct dw_i2c_dev *dev);
int mode;
+ struct i2c_bus_recovery_info rinfo;
};
#define ACCESS_SWAP 0x00000001
diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c
index 418c233..ae69188 100644
--- a/drivers/i2c/busses/i2c-designware-master.c
+++ b/drivers/i2c/busses/i2c-designware-master.c
@@ -25,11 +25,13 @@
#include <linux/err.h>
#include <linux/errno.h>
#include <linux/export.h>
+#include <linux/gpio/consumer.h>
#include <linux/i2c.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/pm_runtime.h>
+#include <linux/reset.h>
#include "i2c-designware-core.h"
@@ -443,6 +445,7 @@ static void i2c_dw_xfer_init(struct dw_i2c_dev *dev)
if (!wait_for_completion_timeout(&dev->cmd_complete, adap->timeout)) {
dev_err(dev->dev, "controller timed out\n");
/* i2c_dw_init implicitly disables the adapter */
+ i2c_recover_bus(&dev->adapter);
i2c_dw_init_master(dev);
ret = -ETIMEDOUT;
goto done;
@@ -613,6 +616,56 @@ static irqreturn_t i2c_dw_isr(int this_irq, void *dev_id)
return IRQ_HANDLED;
}
+static void i2c_dw_prepare_recovery(struct i2c_adapter *adap)
+{
+ struct dw_i2c_dev *dev = i2c_get_adapdata(adap);
+
+ i2c_dw_disable(dev);
+ reset_control_assert(dev->rst);
+ i2c_dw_prepare_clk(dev, false);
+}
+
+static void i2c_dw_unprepare_recovery(struct i2c_adapter *adap)
+{
+ struct dw_i2c_dev *dev = i2c_get_adapdata(adap);
+
+ i2c_dw_prepare_clk(dev, true);
+ reset_control_deassert(dev->rst);
+ i2c_dw_init_master(dev);
+}
+
+static int i2c_dw_init_recovery_info(struct dw_i2c_dev *dev)
+{
+ struct i2c_bus_recovery_info *rinfo = &dev->rinfo;
+ struct i2c_adapter *adap = &dev->adapter;
+ struct gpio_desc *gpio;
+ int r;
+
+ gpio = devm_gpiod_get(dev->dev, "scl", GPIOD_OUT_HIGH);
+ if (IS_ERR(gpio)) {
+ r = PTR_ERR(gpio);
+ if (r == -ENOENT)
+ return 0;
+ return r;
+ }
+ rinfo->scl_gpiod = gpio;
+
+ gpio = devm_gpiod_get_optional(dev->dev, "sda", GPIOD_IN);
+ if (IS_ERR(gpio))
+ return PTR_ERR(gpio);
+ rinfo->sda_gpiod = gpio;
+
+ rinfo->recover_bus = i2c_generic_scl_recovery;
+ rinfo->prepare_recovery = i2c_dw_prepare_recovery;
+ rinfo->unprepare_recovery = i2c_dw_unprepare_recovery;
+ adap->bus_recovery_info = rinfo;
+
+ dev_info(dev->dev, "running with gpio recovery mode! scl%s",
+ rinfo->sda_gpiod ? ",sda" : "");
+
+ return 0;
+}
+
int i2c_dw_probe(struct dw_i2c_dev *dev)
{
struct i2c_adapter *adap = &dev->adapter;
@@ -652,6 +705,10 @@ int i2c_dw_probe(struct dw_i2c_dev *dev)
return ret;
}
+ ret = i2c_dw_init_recovery_info(dev);
+ if (ret)
+ return ret;
+
/*
* Increment PM usage count during adapter registration in order to
* avoid possible spurious runtime suspend when adapter device is
--
1.8.3.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v4 4/7] i2c: designware: add i2c gpio recovery option
@ 2017-10-31 7:33 ` Phil Reid
0 siblings, 0 replies; 26+ messages in thread
From: Phil Reid @ 2017-10-31 7:33 UTC (permalink / raw)
To: linux-arm-kernel
From: Tim Sander <tim@krieglstein.org>
This patch contains much input from Phil Reid and has been tested
on Intel/Altera Cyclone V SOC Hardware with Altera GPIO's for the
SCL and SDA GPIO's.
Signed-off-by: Tim Sander <tim@krieglstein.org>
Signed-off-by: Phil Reid <preid@electromag.com.au>
---
drivers/i2c/busses/i2c-designware-common.c | 6 +++-
drivers/i2c/busses/i2c-designware-core.h | 1 +
drivers/i2c/busses/i2c-designware-master.c | 57 ++++++++++++++++++++++++++++++
3 files changed, 63 insertions(+), 1 deletion(-)
diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c
index 3d684c6..6b82809 100644
--- a/drivers/i2c/busses/i2c-designware-common.c
+++ b/drivers/i2c/busses/i2c-designware-common.c
@@ -230,7 +230,11 @@ int i2c_dw_wait_bus_not_busy(struct dw_i2c_dev *dev)
while (dw_readl(dev, DW_IC_STATUS) & DW_IC_STATUS_ACTIVITY) {
if (timeout <= 0) {
dev_warn(dev->dev, "timeout waiting for bus ready\n");
- return -ETIMEDOUT;
+ i2c_recover_bus(&dev->adapter);
+
+ if (dw_readl(dev, DW_IC_STATUS) & DW_IC_STATUS_ACTIVITY)
+ return -ETIMEDOUT;
+ return 0;
}
timeout--;
usleep_range(1000, 1100);
diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h
index 33c6c8f..d58a336 100644
--- a/drivers/i2c/busses/i2c-designware-core.h
+++ b/drivers/i2c/busses/i2c-designware-core.h
@@ -286,6 +286,7 @@ struct dw_i2c_dev {
void (*disable_int)(struct dw_i2c_dev *dev);
int (*init)(struct dw_i2c_dev *dev);
int mode;
+ struct i2c_bus_recovery_info rinfo;
};
#define ACCESS_SWAP 0x00000001
diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c
index 418c233..ae69188 100644
--- a/drivers/i2c/busses/i2c-designware-master.c
+++ b/drivers/i2c/busses/i2c-designware-master.c
@@ -25,11 +25,13 @@
#include <linux/err.h>
#include <linux/errno.h>
#include <linux/export.h>
+#include <linux/gpio/consumer.h>
#include <linux/i2c.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/pm_runtime.h>
+#include <linux/reset.h>
#include "i2c-designware-core.h"
@@ -443,6 +445,7 @@ static void i2c_dw_xfer_init(struct dw_i2c_dev *dev)
if (!wait_for_completion_timeout(&dev->cmd_complete, adap->timeout)) {
dev_err(dev->dev, "controller timed out\n");
/* i2c_dw_init implicitly disables the adapter */
+ i2c_recover_bus(&dev->adapter);
i2c_dw_init_master(dev);
ret = -ETIMEDOUT;
goto done;
@@ -613,6 +616,56 @@ static irqreturn_t i2c_dw_isr(int this_irq, void *dev_id)
return IRQ_HANDLED;
}
+static void i2c_dw_prepare_recovery(struct i2c_adapter *adap)
+{
+ struct dw_i2c_dev *dev = i2c_get_adapdata(adap);
+
+ i2c_dw_disable(dev);
+ reset_control_assert(dev->rst);
+ i2c_dw_prepare_clk(dev, false);
+}
+
+static void i2c_dw_unprepare_recovery(struct i2c_adapter *adap)
+{
+ struct dw_i2c_dev *dev = i2c_get_adapdata(adap);
+
+ i2c_dw_prepare_clk(dev, true);
+ reset_control_deassert(dev->rst);
+ i2c_dw_init_master(dev);
+}
+
+static int i2c_dw_init_recovery_info(struct dw_i2c_dev *dev)
+{
+ struct i2c_bus_recovery_info *rinfo = &dev->rinfo;
+ struct i2c_adapter *adap = &dev->adapter;
+ struct gpio_desc *gpio;
+ int r;
+
+ gpio = devm_gpiod_get(dev->dev, "scl", GPIOD_OUT_HIGH);
+ if (IS_ERR(gpio)) {
+ r = PTR_ERR(gpio);
+ if (r == -ENOENT)
+ return 0;
+ return r;
+ }
+ rinfo->scl_gpiod = gpio;
+
+ gpio = devm_gpiod_get_optional(dev->dev, "sda", GPIOD_IN);
+ if (IS_ERR(gpio))
+ return PTR_ERR(gpio);
+ rinfo->sda_gpiod = gpio;
+
+ rinfo->recover_bus = i2c_generic_scl_recovery;
+ rinfo->prepare_recovery = i2c_dw_prepare_recovery;
+ rinfo->unprepare_recovery = i2c_dw_unprepare_recovery;
+ adap->bus_recovery_info = rinfo;
+
+ dev_info(dev->dev, "running with gpio recovery mode! scl%s",
+ rinfo->sda_gpiod ? ",sda" : "");
+
+ return 0;
+}
+
int i2c_dw_probe(struct dw_i2c_dev *dev)
{
struct i2c_adapter *adap = &dev->adapter;
@@ -652,6 +705,10 @@ int i2c_dw_probe(struct dw_i2c_dev *dev)
return ret;
}
+ ret = i2c_dw_init_recovery_info(dev);
+ if (ret)
+ return ret;
+
/*
* Increment PM usage count during adapter registration in order to
* avoid possible spurious runtime suspend when adapter device is
--
1.8.3.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v4 4/7] i2c: designware: add i2c gpio recovery option
2017-10-31 7:33 ` Phil Reid
@ 2017-11-01 16:22 ` Jarkko Nikula
-1 siblings, 0 replies; 26+ messages in thread
From: Jarkko Nikula @ 2017-11-01 16:22 UTC (permalink / raw)
To: Phil Reid, nsekhar, khilman, wsa, andriy.shevchenko,
mika.westerberg, linux-arm-kernel, linux-i2c, fntoth
Cc: Tim Sander
On 10/31/2017 09:33 AM, Phil Reid wrote:
> From: Tim Sander <tim@krieglstein.org>
>
> This patch contains much input from Phil Reid and has been tested
> on Intel/Altera Cyclone V SOC Hardware with Altera GPIO's for the
> SCL and SDA GPIO's.
>
> Signed-off-by: Tim Sander <tim@krieglstein.org>
> Signed-off-by: Phil Reid <preid@electromag.com.au>
> ---
> drivers/i2c/busses/i2c-designware-common.c | 6 +++-
> drivers/i2c/busses/i2c-designware-core.h | 1 +
> drivers/i2c/busses/i2c-designware-master.c | 57 ++++++++++++++++++++++++++++++
> 3 files changed, 63 insertions(+), 1 deletion(-)
>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v4 4/7] i2c: designware: add i2c gpio recovery option
@ 2017-11-01 16:22 ` Jarkko Nikula
0 siblings, 0 replies; 26+ messages in thread
From: Jarkko Nikula @ 2017-11-01 16:22 UTC (permalink / raw)
To: linux-arm-kernel
On 10/31/2017 09:33 AM, Phil Reid wrote:
> From: Tim Sander <tim@krieglstein.org>
>
> This patch contains much input from Phil Reid and has been tested
> on Intel/Altera Cyclone V SOC Hardware with Altera GPIO's for the
> SCL and SDA GPIO's.
>
> Signed-off-by: Tim Sander <tim@krieglstein.org>
> Signed-off-by: Phil Reid <preid@electromag.com.au>
> ---
> drivers/i2c/busses/i2c-designware-common.c | 6 +++-
> drivers/i2c/busses/i2c-designware-core.h | 1 +
> drivers/i2c/busses/i2c-designware-master.c | 57 ++++++++++++++++++++++++++++++
> 3 files changed, 63 insertions(+), 1 deletion(-)
>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v4 5/7] i2c: imx: switch to using gpiod for bus recovery gpios
2017-10-31 7:33 ` Phil Reid
@ 2017-10-31 7:33 ` Phil Reid
-1 siblings, 0 replies; 26+ messages in thread
From: Phil Reid @ 2017-10-31 7:33 UTC (permalink / raw)
To: nsekhar, khilman, wsa, jarkko.nikula, andriy.shevchenko,
mika.westerberg, preid, linux-arm-kernel, linux-i2c, fntoth
Change the driver to use the gpio descriptors for the bus recovery
information instead of the deprecated integer interface.
Signed-off-by: Phil Reid <preid@electromag.com.au>
---
drivers/i2c/busses/i2c-imx.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index f96830f..c4cf265 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -1006,26 +1006,26 @@ static int i2c_imx_init_recovery_info(struct imx_i2c_struct *i2c_imx,
PINCTRL_STATE_DEFAULT);
i2c_imx->pinctrl_pins_gpio = pinctrl_lookup_state(i2c_imx->pinctrl,
"gpio");
- rinfo->sda_gpio = of_get_named_gpio(pdev->dev.of_node, "sda-gpios", 0);
- rinfo->scl_gpio = of_get_named_gpio(pdev->dev.of_node, "scl-gpios", 0);
+ rinfo->sda_gpiod = devm_gpiod_get(&pdev->dev, "sda", GPIOD_OUT_HIGH);
+ rinfo->scl_gpiod = devm_gpiod_get(&pdev->dev, "scl", GPIOD_IN);
- if (rinfo->sda_gpio == -EPROBE_DEFER ||
- rinfo->scl_gpio == -EPROBE_DEFER) {
+ if (PTR_ERR(rinfo->sda_gpiod) == -EPROBE_DEFER ||
+ PTR_ERR(rinfo->scl_gpiod) == -EPROBE_DEFER) {
return -EPROBE_DEFER;
- } else if (!gpio_is_valid(rinfo->sda_gpio) ||
- !gpio_is_valid(rinfo->scl_gpio) ||
+ } else if (IS_ERR(rinfo->sda_gpiod) ||
+ IS_ERR(rinfo->scl_gpiod) ||
IS_ERR(i2c_imx->pinctrl_pins_default) ||
IS_ERR(i2c_imx->pinctrl_pins_gpio)) {
dev_dbg(&pdev->dev, "recovery information incomplete\n");
return 0;
}
- dev_dbg(&pdev->dev, "using scl-gpio %d and sda-gpio %d for recovery\n",
- rinfo->scl_gpio, rinfo->sda_gpio);
+ dev_dbg(&pdev->dev, "using scl%s for recovery\n",
+ rinfo->sda_gpiod ? ",sda" : "");
rinfo->prepare_recovery = i2c_imx_prepare_recovery;
rinfo->unprepare_recovery = i2c_imx_unprepare_recovery;
- rinfo->recover_bus = i2c_generic_gpio_recovery;
+ rinfo->recover_bus = i2c_generic_scl_recovery;
i2c_imx->adapter.bus_recovery_info = rinfo;
return 0;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v4 5/7] i2c: imx: switch to using gpiod for bus recovery gpios
@ 2017-10-31 7:33 ` Phil Reid
0 siblings, 0 replies; 26+ messages in thread
From: Phil Reid @ 2017-10-31 7:33 UTC (permalink / raw)
To: linux-arm-kernel
Change the driver to use the gpio descriptors for the bus recovery
information instead of the deprecated integer interface.
Signed-off-by: Phil Reid <preid@electromag.com.au>
---
drivers/i2c/busses/i2c-imx.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index f96830f..c4cf265 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -1006,26 +1006,26 @@ static int i2c_imx_init_recovery_info(struct imx_i2c_struct *i2c_imx,
PINCTRL_STATE_DEFAULT);
i2c_imx->pinctrl_pins_gpio = pinctrl_lookup_state(i2c_imx->pinctrl,
"gpio");
- rinfo->sda_gpio = of_get_named_gpio(pdev->dev.of_node, "sda-gpios", 0);
- rinfo->scl_gpio = of_get_named_gpio(pdev->dev.of_node, "scl-gpios", 0);
+ rinfo->sda_gpiod = devm_gpiod_get(&pdev->dev, "sda", GPIOD_OUT_HIGH);
+ rinfo->scl_gpiod = devm_gpiod_get(&pdev->dev, "scl", GPIOD_IN);
- if (rinfo->sda_gpio == -EPROBE_DEFER ||
- rinfo->scl_gpio == -EPROBE_DEFER) {
+ if (PTR_ERR(rinfo->sda_gpiod) == -EPROBE_DEFER ||
+ PTR_ERR(rinfo->scl_gpiod) == -EPROBE_DEFER) {
return -EPROBE_DEFER;
- } else if (!gpio_is_valid(rinfo->sda_gpio) ||
- !gpio_is_valid(rinfo->scl_gpio) ||
+ } else if (IS_ERR(rinfo->sda_gpiod) ||
+ IS_ERR(rinfo->scl_gpiod) ||
IS_ERR(i2c_imx->pinctrl_pins_default) ||
IS_ERR(i2c_imx->pinctrl_pins_gpio)) {
dev_dbg(&pdev->dev, "recovery information incomplete\n");
return 0;
}
- dev_dbg(&pdev->dev, "using scl-gpio %d and sda-gpio %d for recovery\n",
- rinfo->scl_gpio, rinfo->sda_gpio);
+ dev_dbg(&pdev->dev, "using scl%s for recovery\n",
+ rinfo->sda_gpiod ? ",sda" : "");
rinfo->prepare_recovery = i2c_imx_prepare_recovery;
rinfo->unprepare_recovery = i2c_imx_unprepare_recovery;
- rinfo->recover_bus = i2c_generic_gpio_recovery;
+ rinfo->recover_bus = i2c_generic_scl_recovery;
i2c_imx->adapter.bus_recovery_info = rinfo;
return 0;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v4 6/7] i2c: davinci: switch to using gpiod for bus recovery gpios
2017-10-31 7:33 ` Phil Reid
@ 2017-10-31 7:33 ` Phil Reid
-1 siblings, 0 replies; 26+ messages in thread
From: Phil Reid @ 2017-10-31 7:33 UTC (permalink / raw)
To: nsekhar, khilman, wsa, jarkko.nikula, andriy.shevchenko,
mika.westerberg, preid, linux-arm-kernel, linux-i2c, fntoth
Change the driver to use the gpio descriptors for the bus recovery
information instead of the deprecated integer interface.
Signed-off-by: Phil Reid <preid@electromag.com.au>
---
drivers/i2c/busses/i2c-davinci.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
index 2ead9b9..2afb12a 100644
--- a/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@ -294,7 +294,7 @@ static int i2c_davinci_init(struct davinci_i2c_dev *dev)
}
/*
- * This routine does i2c bus recovery by using i2c_generic_gpio_recovery
+ * This routine does i2c bus recovery by using i2c_generic_scl_recovery
* which is provided by I2C Bus recovery infrastructure.
*/
static void davinci_i2c_prepare_recovery(struct i2c_adapter *adap)
@@ -316,7 +316,7 @@ static void davinci_i2c_unprepare_recovery(struct i2c_adapter *adap)
}
static struct i2c_bus_recovery_info davinci_i2c_gpio_recovery_info = {
- .recover_bus = i2c_generic_gpio_recovery,
+ .recover_bus = i2c_generic_scl_recovery,
.prepare_recovery = davinci_i2c_prepare_recovery,
.unprepare_recovery = davinci_i2c_unprepare_recovery,
};
@@ -769,6 +769,7 @@ static int davinci_i2c_probe(struct platform_device *pdev)
struct davinci_i2c_dev *dev;
struct i2c_adapter *adap;
struct resource *mem;
+ struct i2c_bus_recovery_info *rinfo;
int r, irq;
irq = platform_get_irq(pdev, 0);
@@ -869,9 +870,18 @@ static int davinci_i2c_probe(struct platform_device *pdev)
if (dev->pdata->has_pfunc)
adap->bus_recovery_info = &davinci_i2c_scl_recovery_info;
else if (dev->pdata->scl_pin) {
- adap->bus_recovery_info = &davinci_i2c_gpio_recovery_info;
- adap->bus_recovery_info->scl_gpio = dev->pdata->scl_pin;
- adap->bus_recovery_info->sda_gpio = dev->pdata->sda_pin;
+ rinfo = &davinci_i2c_gpio_recovery_info;
+ adap->bus_recovery_info = rinfo;
+ r = gpio_request_one(dev->pdata->scl_pin, GPIOF_OPEN_DRAIN |
+ GPIOF_OUT_INIT_HIGH, "i2c-scl");
+ if (r)
+ goto err_unuse_clocks;
+ rinfo->scl_gpiod = gpio_to_desc(dev->pdata->scl_pin);
+
+ r = gpio_request_one(dev->pdata->sda_pin, GPIOF_IN, "i2c-sda");
+ if (r)
+ goto err_unuse_clocks;
+ rinfo->sda_gpiod = gpio_to_desc(dev->pdata->scl_pin);
}
adap->nr = pdev->id;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v4 6/7] i2c: davinci: switch to using gpiod for bus recovery gpios
@ 2017-10-31 7:33 ` Phil Reid
0 siblings, 0 replies; 26+ messages in thread
From: Phil Reid @ 2017-10-31 7:33 UTC (permalink / raw)
To: linux-arm-kernel
Change the driver to use the gpio descriptors for the bus recovery
information instead of the deprecated integer interface.
Signed-off-by: Phil Reid <preid@electromag.com.au>
---
drivers/i2c/busses/i2c-davinci.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
index 2ead9b9..2afb12a 100644
--- a/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@ -294,7 +294,7 @@ static int i2c_davinci_init(struct davinci_i2c_dev *dev)
}
/*
- * This routine does i2c bus recovery by using i2c_generic_gpio_recovery
+ * This routine does i2c bus recovery by using i2c_generic_scl_recovery
* which is provided by I2C Bus recovery infrastructure.
*/
static void davinci_i2c_prepare_recovery(struct i2c_adapter *adap)
@@ -316,7 +316,7 @@ static void davinci_i2c_unprepare_recovery(struct i2c_adapter *adap)
}
static struct i2c_bus_recovery_info davinci_i2c_gpio_recovery_info = {
- .recover_bus = i2c_generic_gpio_recovery,
+ .recover_bus = i2c_generic_scl_recovery,
.prepare_recovery = davinci_i2c_prepare_recovery,
.unprepare_recovery = davinci_i2c_unprepare_recovery,
};
@@ -769,6 +769,7 @@ static int davinci_i2c_probe(struct platform_device *pdev)
struct davinci_i2c_dev *dev;
struct i2c_adapter *adap;
struct resource *mem;
+ struct i2c_bus_recovery_info *rinfo;
int r, irq;
irq = platform_get_irq(pdev, 0);
@@ -869,9 +870,18 @@ static int davinci_i2c_probe(struct platform_device *pdev)
if (dev->pdata->has_pfunc)
adap->bus_recovery_info = &davinci_i2c_scl_recovery_info;
else if (dev->pdata->scl_pin) {
- adap->bus_recovery_info = &davinci_i2c_gpio_recovery_info;
- adap->bus_recovery_info->scl_gpio = dev->pdata->scl_pin;
- adap->bus_recovery_info->sda_gpio = dev->pdata->sda_pin;
+ rinfo = &davinci_i2c_gpio_recovery_info;
+ adap->bus_recovery_info = rinfo;
+ r = gpio_request_one(dev->pdata->scl_pin, GPIOF_OPEN_DRAIN |
+ GPIOF_OUT_INIT_HIGH, "i2c-scl");
+ if (r)
+ goto err_unuse_clocks;
+ rinfo->scl_gpiod = gpio_to_desc(dev->pdata->scl_pin);
+
+ r = gpio_request_one(dev->pdata->sda_pin, GPIOF_IN, "i2c-sda");
+ if (r)
+ goto err_unuse_clocks;
+ rinfo->sda_gpiod = gpio_to_desc(dev->pdata->scl_pin);
}
adap->nr = pdev->id;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v4 7/7] i2c: remove legacy integer scl/sda gpio for recovery
2017-10-31 7:33 ` Phil Reid
@ 2017-10-31 7:33 ` Phil Reid
-1 siblings, 0 replies; 26+ messages in thread
From: Phil Reid @ 2017-10-31 7:33 UTC (permalink / raw)
To: nsekhar, khilman, wsa, jarkko.nikula, andriy.shevchenko,
mika.westerberg, preid, linux-arm-kernel, linux-i2c, fntoth
Remove all reference to code related to using integer based ids for
scl/sda gpio for bus recovery. All in tree drivers are now using the
gpio descriptors to specific the required gpios.
Signed-off-by: Phil Reid <preid@electromag.com.au>
---
drivers/i2c/i2c-core-base.c | 78 ++-------------------------------------------
include/linux/i2c.h | 9 ++----
2 files changed, 5 insertions(+), 82 deletions(-)
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 29c8e6d..d286c30 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -146,46 +146,6 @@ static int get_sda_gpio_value(struct i2c_adapter *adap)
return gpiod_get_value_cansleep(adap->bus_recovery_info->sda_gpiod);
}
-static int i2c_get_gpios_for_recovery(struct i2c_adapter *adap)
-{
- struct i2c_bus_recovery_info *bri = adap->bus_recovery_info;
- struct device *dev = &adap->dev;
- int ret = 0;
-
- ret = gpio_request_one(bri->scl_gpio, GPIOF_OPEN_DRAIN |
- GPIOF_OUT_INIT_HIGH, "i2c-scl");
- if (ret) {
- dev_warn(dev, "Can't get SCL gpio: %d\n", bri->scl_gpio);
- return ret;
- }
- bri->scl_gpiod = gpio_to_desc(bri->scl_gpio);
-
- if (bri->get_sda) {
- if (gpio_request_one(bri->sda_gpio, GPIOF_IN, "i2c-sda")) {
- /* work without SDA polling */
- dev_warn(dev, "Can't get SDA gpio: %d. Not using SDA polling\n",
- bri->sda_gpio);
- bri->get_sda = NULL;
- }
- bri->sda_gpiod = gpio_to_desc(bri->sda_gpio);
- }
-
- return ret;
-}
-
-static void i2c_put_gpios_for_recovery(struct i2c_adapter *adap)
-{
- struct i2c_bus_recovery_info *bri = adap->bus_recovery_info;
-
- if (bri->get_sda) {
- gpio_free(bri->sda_gpio);
- bri->sda_gpiod = NULL;
- }
-
- gpio_free(bri->scl_gpio);
- bri->scl_gpiod = NULL;
-}
-
/*
* We are generating clock pulses. ndelay() determines durating of clk pulses.
* We will generate clock with rate 100 KHz and so duration of both clock levels
@@ -194,7 +154,7 @@ static void i2c_put_gpios_for_recovery(struct i2c_adapter *adap)
#define RECOVERY_NDELAY 5000
#define RECOVERY_CLK_CNT 9
-static int i2c_generic_recovery(struct i2c_adapter *adap)
+int i2c_generic_scl_recovery(struct i2c_adapter *adap)
{
struct i2c_bus_recovery_info *bri = adap->bus_recovery_info;
int i = 0, val = 1, ret = 0;
@@ -236,28 +196,8 @@ static int i2c_generic_recovery(struct i2c_adapter *adap)
return ret;
}
-
-int i2c_generic_scl_recovery(struct i2c_adapter *adap)
-{
- return i2c_generic_recovery(adap);
-}
EXPORT_SYMBOL_GPL(i2c_generic_scl_recovery);
-int i2c_generic_gpio_recovery(struct i2c_adapter *adap)
-{
- int ret;
-
- ret = i2c_get_gpios_for_recovery(adap);
- if (ret)
- return ret;
-
- ret = i2c_generic_recovery(adap);
- i2c_put_gpios_for_recovery(adap);
-
- return ret;
-}
-EXPORT_SYMBOL_GPL(i2c_generic_gpio_recovery);
-
int i2c_recover_bus(struct i2c_adapter *adap)
{
if (!adap->bus_recovery_info)
@@ -289,21 +229,7 @@ static void i2c_init_recovery(struct i2c_adapter *adap)
return;
}
- /* Generic GPIO recovery */
- if (bri->recover_bus == i2c_generic_gpio_recovery) {
- if (!gpio_is_valid(bri->scl_gpio)) {
- err_str = "invalid SCL gpio";
- goto err;
- }
-
- if (gpio_is_valid(bri->sda_gpio))
- bri->get_sda = get_sda_gpio_value;
- else
- bri->get_sda = NULL;
-
- bri->get_scl = get_scl_gpio_value;
- bri->set_scl = set_scl_gpio_value;
- } else if (bri->recover_bus == i2c_generic_scl_recovery) {
+ if (bri->recover_bus == i2c_generic_scl_recovery) {
/* Generic SCL recovery */
if (!bri->set_scl || !bri->get_scl) {
err_str = "no {get|set}_scl() found";
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index ea31cb3..8597eac 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -485,7 +485,7 @@ struct i2c_timings {
/**
* struct i2c_bus_recovery_info - I2C bus recovery information
* @recover_bus: Recover routine. Either pass driver's recover_bus() routine, or
- * i2c_generic_scl_recovery() or i2c_generic_gpio_recovery().
+ * i2c_generic_scl_recovery().
* @get_scl: This gets current value of SCL line. Mandatory for generic SCL
* recovery. Used internally for generic GPIO recovery.
* @set_scl: This sets/clears SCL line. Mandatory for generic SCL recovery. Used
@@ -497,8 +497,8 @@ struct i2c_timings {
* configure padmux here for SDA/SCL line or something else they want.
* @unprepare_recovery: This will be called after completing recovery. Platform
* may configure padmux here for SDA/SCL line or something else they want.
- * @scl_gpio: gpio number of the SCL line. Only required for GPIO recovery.
- * @sda_gpio: gpio number of the SDA line. Only required for GPIO recovery.
+ * @scl_gpiod: gpiod of the SCL line. Only required for GPIO recovery.
+ * @sda_gpiod: gpiod of the SDA line. Only required for GPIO recovery.
*/
struct i2c_bus_recovery_info {
int (*recover_bus)(struct i2c_adapter *);
@@ -511,8 +511,6 @@ struct i2c_bus_recovery_info {
void (*unprepare_recovery)(struct i2c_adapter *);
/* gpio recovery */
- int scl_gpio;
- int sda_gpio;
struct gpio_desc *scl_gpiod;
struct gpio_desc *sda_gpiod;
};
@@ -520,7 +518,6 @@ struct i2c_bus_recovery_info {
int i2c_recover_bus(struct i2c_adapter *adap);
/* Generic recovery routines */
-int i2c_generic_gpio_recovery(struct i2c_adapter *adap);
int i2c_generic_scl_recovery(struct i2c_adapter *adap);
/**
--
1.8.3.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v4 7/7] i2c: remove legacy integer scl/sda gpio for recovery
@ 2017-10-31 7:33 ` Phil Reid
0 siblings, 0 replies; 26+ messages in thread
From: Phil Reid @ 2017-10-31 7:33 UTC (permalink / raw)
To: linux-arm-kernel
Remove all reference to code related to using integer based ids for
scl/sda gpio for bus recovery. All in tree drivers are now using the
gpio descriptors to specific the required gpios.
Signed-off-by: Phil Reid <preid@electromag.com.au>
---
drivers/i2c/i2c-core-base.c | 78 ++-------------------------------------------
include/linux/i2c.h | 9 ++----
2 files changed, 5 insertions(+), 82 deletions(-)
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 29c8e6d..d286c30 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -146,46 +146,6 @@ static int get_sda_gpio_value(struct i2c_adapter *adap)
return gpiod_get_value_cansleep(adap->bus_recovery_info->sda_gpiod);
}
-static int i2c_get_gpios_for_recovery(struct i2c_adapter *adap)
-{
- struct i2c_bus_recovery_info *bri = adap->bus_recovery_info;
- struct device *dev = &adap->dev;
- int ret = 0;
-
- ret = gpio_request_one(bri->scl_gpio, GPIOF_OPEN_DRAIN |
- GPIOF_OUT_INIT_HIGH, "i2c-scl");
- if (ret) {
- dev_warn(dev, "Can't get SCL gpio: %d\n", bri->scl_gpio);
- return ret;
- }
- bri->scl_gpiod = gpio_to_desc(bri->scl_gpio);
-
- if (bri->get_sda) {
- if (gpio_request_one(bri->sda_gpio, GPIOF_IN, "i2c-sda")) {
- /* work without SDA polling */
- dev_warn(dev, "Can't get SDA gpio: %d. Not using SDA polling\n",
- bri->sda_gpio);
- bri->get_sda = NULL;
- }
- bri->sda_gpiod = gpio_to_desc(bri->sda_gpio);
- }
-
- return ret;
-}
-
-static void i2c_put_gpios_for_recovery(struct i2c_adapter *adap)
-{
- struct i2c_bus_recovery_info *bri = adap->bus_recovery_info;
-
- if (bri->get_sda) {
- gpio_free(bri->sda_gpio);
- bri->sda_gpiod = NULL;
- }
-
- gpio_free(bri->scl_gpio);
- bri->scl_gpiod = NULL;
-}
-
/*
* We are generating clock pulses. ndelay() determines durating of clk pulses.
* We will generate clock with rate 100 KHz and so duration of both clock levels
@@ -194,7 +154,7 @@ static void i2c_put_gpios_for_recovery(struct i2c_adapter *adap)
#define RECOVERY_NDELAY 5000
#define RECOVERY_CLK_CNT 9
-static int i2c_generic_recovery(struct i2c_adapter *adap)
+int i2c_generic_scl_recovery(struct i2c_adapter *adap)
{
struct i2c_bus_recovery_info *bri = adap->bus_recovery_info;
int i = 0, val = 1, ret = 0;
@@ -236,28 +196,8 @@ static int i2c_generic_recovery(struct i2c_adapter *adap)
return ret;
}
-
-int i2c_generic_scl_recovery(struct i2c_adapter *adap)
-{
- return i2c_generic_recovery(adap);
-}
EXPORT_SYMBOL_GPL(i2c_generic_scl_recovery);
-int i2c_generic_gpio_recovery(struct i2c_adapter *adap)
-{
- int ret;
-
- ret = i2c_get_gpios_for_recovery(adap);
- if (ret)
- return ret;
-
- ret = i2c_generic_recovery(adap);
- i2c_put_gpios_for_recovery(adap);
-
- return ret;
-}
-EXPORT_SYMBOL_GPL(i2c_generic_gpio_recovery);
-
int i2c_recover_bus(struct i2c_adapter *adap)
{
if (!adap->bus_recovery_info)
@@ -289,21 +229,7 @@ static void i2c_init_recovery(struct i2c_adapter *adap)
return;
}
- /* Generic GPIO recovery */
- if (bri->recover_bus == i2c_generic_gpio_recovery) {
- if (!gpio_is_valid(bri->scl_gpio)) {
- err_str = "invalid SCL gpio";
- goto err;
- }
-
- if (gpio_is_valid(bri->sda_gpio))
- bri->get_sda = get_sda_gpio_value;
- else
- bri->get_sda = NULL;
-
- bri->get_scl = get_scl_gpio_value;
- bri->set_scl = set_scl_gpio_value;
- } else if (bri->recover_bus == i2c_generic_scl_recovery) {
+ if (bri->recover_bus == i2c_generic_scl_recovery) {
/* Generic SCL recovery */
if (!bri->set_scl || !bri->get_scl) {
err_str = "no {get|set}_scl() found";
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index ea31cb3..8597eac 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -485,7 +485,7 @@ struct i2c_timings {
/**
* struct i2c_bus_recovery_info - I2C bus recovery information
* @recover_bus: Recover routine. Either pass driver's recover_bus() routine, or
- * i2c_generic_scl_recovery() or i2c_generic_gpio_recovery().
+ * i2c_generic_scl_recovery().
* @get_scl: This gets current value of SCL line. Mandatory for generic SCL
* recovery. Used internally for generic GPIO recovery.
* @set_scl: This sets/clears SCL line. Mandatory for generic SCL recovery. Used
@@ -497,8 +497,8 @@ struct i2c_timings {
* configure padmux here for SDA/SCL line or something else they want.
* @unprepare_recovery: This will be called after completing recovery. Platform
* may configure padmux here for SDA/SCL line or something else they want.
- * @scl_gpio: gpio number of the SCL line. Only required for GPIO recovery.
- * @sda_gpio: gpio number of the SDA line. Only required for GPIO recovery.
+ * @scl_gpiod: gpiod of the SCL line. Only required for GPIO recovery.
+ * @sda_gpiod: gpiod of the SDA line. Only required for GPIO recovery.
*/
struct i2c_bus_recovery_info {
int (*recover_bus)(struct i2c_adapter *);
@@ -511,8 +511,6 @@ struct i2c_bus_recovery_info {
void (*unprepare_recovery)(struct i2c_adapter *);
/* gpio recovery */
- int scl_gpio;
- int sda_gpio;
struct gpio_desc *scl_gpiod;
struct gpio_desc *sda_gpiod;
};
@@ -520,7 +518,6 @@ struct i2c_bus_recovery_info {
int i2c_recover_bus(struct i2c_adapter *adap);
/* Generic recovery routines */
-int i2c_generic_gpio_recovery(struct i2c_adapter *adap);
int i2c_generic_scl_recovery(struct i2c_adapter *adap);
/**
--
1.8.3.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v4 7/7] i2c: remove legacy integer scl/sda gpio for recovery
2017-10-31 7:33 ` Phil Reid
@ 2017-10-31 10:19 ` Andy Shevchenko
-1 siblings, 0 replies; 26+ messages in thread
From: Andy Shevchenko @ 2017-10-31 10:19 UTC (permalink / raw)
To: Phil Reid, nsekhar, khilman, wsa, jarkko.nikula, mika.westerberg,
linux-arm-kernel, linux-i2c, fntoth
On Tue, 2017-10-31 at 15:33 +0800, Phil Reid wrote:
> Remove all reference to code related to using integer based ids for
> scl/sda gpio for bus recovery. All in tree drivers are now using the
> gpio descriptors to specific the required gpios.
> - * @scl_gpio: gpio number of the SCL line. Only required for GPIO
> recovery.
> - * @sda_gpio: gpio number of the SDA line. Only required for GPIO
> recovery.
> + * @scl_gpiod: gpiod of the SCL line. Only required for GPIO
> recovery.
> + * @sda_gpiod: gpiod of the SDA line. Only required for GPIO
> recovery.
Ah, missed comment here.
0day kbuild bot now warns if we add field w/o kernel doc description.
I would suggest to add the descriptions in the same patch which brings
new fields and here just remove old ones.
> /* gpio recovery */
> - int scl_gpio;
> - int sda_gpio;
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v4 7/7] i2c: remove legacy integer scl/sda gpio for recovery
@ 2017-10-31 10:19 ` Andy Shevchenko
0 siblings, 0 replies; 26+ messages in thread
From: Andy Shevchenko @ 2017-10-31 10:19 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 2017-10-31 at 15:33 +0800, Phil Reid wrote:
> Remove all reference to code related to using integer based ids for
> scl/sda gpio for bus recovery. All in tree drivers are now using the
> gpio descriptors to specific the required gpios.
> - * @scl_gpio: gpio number of the SCL line. Only required for GPIO
> recovery.
> - * @sda_gpio: gpio number of the SDA line. Only required for GPIO
> recovery.
> + * @scl_gpiod: gpiod of the SCL line. Only required for GPIO
> recovery.
> + * @sda_gpiod: gpiod of the SDA line. Only required for GPIO
> recovery.
Ah, missed comment here.
0day kbuild bot now warns if we add field w/o kernel doc description.
I would suggest to add the descriptions in the same patch which brings
new fields and here just remove old ones.
> /* gpio recovery */
> - int scl_gpio;
> - int sda_gpio;
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v4 0/7] i2c: designware: add i2c gpio recovery option
2017-10-31 7:33 ` Phil Reid
@ 2017-10-31 10:17 ` Andy Shevchenko
-1 siblings, 0 replies; 26+ messages in thread
From: Andy Shevchenko @ 2017-10-31 10:17 UTC (permalink / raw)
To: Phil Reid, nsekhar, khilman, wsa, jarkko.nikula, mika.westerberg,
linux-arm-kernel, linux-i2c, fntoth
On Tue, 2017-10-31 at 15:33 +0800, Phil Reid wrote:
> Changes from V3:
> - rebase on i2c/for-next
> - Add patches to convert other drivers using gpio recover to gpiod
> - Remove legacy gpio
> - Address minor issues raised in review and add acks received so far
>
> Changes from V2:
> - Rebase on https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.
> git/
> i2c/for-next
> No intentional changes, but needed to move i2c_dw_plat_prepare_clk
> to common
> for the master recovery functions to use. which is included as two
> additional
> patches.
>
> Changes from V1:
> - In review Andy suggested change the i2c core to use the gpiod
> I've added a patch that allows the gradual switching of drivers
> to using gpiod interface. The old interface is preserved so
> that changes can be made incrementally.
> - I've update Tim's patch for the designware driver to use the new
> interface. Tweaked a couple of things to his patch and fixed
> up things Andy id in last review.
> The core changes in p1 don't require the get/set scl/sda functions.
> Hopefully I've done the right thing with preserving authorship and
> signoff.
I like the series (esp. last patch), I hope Jarkko would be able to
check (and test on DW I2C) this as well.
No objections from me:
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
P.Ṡ. One minor comment is a naming of new function. Legacy one uses
_gpio_ as pointer to mechanism of recovery, the new one uses plain _scl_
which might be not so obvious. Unfortunately I have no (good)
alternatives to propose (perhaps _gpiod_ ?), thus leave this to Jarkko
and Wolfram.
>
>
> Phil Reid (6):
> i2c: Switch to using gpiod interface for gpio bus recovery
> i2c: designware: move i2c_dw_plat_prepare_clk to common
> i2c: designware: rename i2c_dw_plat_prepare_clk to
> i2c_dw_prepare_clk
> i2c: imx: switch to using gpiod for bus recovery gpios
> i2c: davinci: switch to using gpiod for bus recovery gpios
> i2c: remove legacy integer scl/sda gpio for recovery
>
> Tim Sander (1):
> i2c: designware: add i2c gpio recovery option
>
> drivers/i2c/busses/i2c-davinci.c | 20 +++++--
> drivers/i2c/busses/i2c-designware-common.c | 19 ++++++-
> drivers/i2c/busses/i2c-designware-core.h | 2 +
> drivers/i2c/busses/i2c-designware-master.c | 57 ++++++++++++++++++++
> drivers/i2c/busses/i2c-designware-platdrv.c | 18 ++-----
> drivers/i2c/busses/i2c-imx.c | 18 +++----
> drivers/i2c/i2c-core-base.c | 83 ++++--------------
> -----------
> include/linux/i2c.h | 11 ++--
> 8 files changed, 120 insertions(+), 108 deletions(-)
>
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v4 0/7] i2c: designware: add i2c gpio recovery option
@ 2017-10-31 10:17 ` Andy Shevchenko
0 siblings, 0 replies; 26+ messages in thread
From: Andy Shevchenko @ 2017-10-31 10:17 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 2017-10-31 at 15:33 +0800, Phil Reid wrote:
> Changes from V3:
> - rebase on i2c/for-next
> - Add patches to convert other drivers using gpio recover to gpiod
> - Remove legacy gpio
> - Address minor issues raised in review and add acks received so far
>
> Changes from V2:
> - Rebase on https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.
> git/
> i2c/for-next
> No intentional changes, but needed to move i2c_dw_plat_prepare_clk
> to common
> for the master recovery functions to use. which is included as two
> additional
> patches.
>
> Changes from V1:
> - In review Andy suggested change the i2c core to use the gpiod
> I've added a patch that allows the gradual switching of drivers
> to using gpiod interface. The old interface is preserved so
> that changes can be made incrementally.
> - I've update Tim's patch for the designware driver to use the new
> interface. Tweaked a couple of things to his patch and fixed
> up things Andy id in last review.
> The core changes in p1 don't require the get/set scl/sda functions.
> Hopefully I've done the right thing with preserving authorship and
> signoff.
I like the series (esp. last patch), I hope Jarkko would be able to
check (and test on DW I2C) this as well.
No objections from me:
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
P.?. One minor comment is a naming of new function. Legacy one uses
_gpio_ as pointer to mechanism of recovery, the new one uses plain _scl_
which might be not so obvious. Unfortunately I have no (good)
alternatives to propose (perhaps _gpiod_ ?), thus leave this to Jarkko
and Wolfram.
>
>
> Phil Reid (6):
> i2c: Switch to using gpiod interface for gpio bus recovery
> i2c: designware: move i2c_dw_plat_prepare_clk to common
> i2c: designware: rename i2c_dw_plat_prepare_clk to
> i2c_dw_prepare_clk
> i2c: imx: switch to using gpiod for bus recovery gpios
> i2c: davinci: switch to using gpiod for bus recovery gpios
> i2c: remove legacy integer scl/sda gpio for recovery
>
> Tim Sander (1):
> i2c: designware: add i2c gpio recovery option
>
> drivers/i2c/busses/i2c-davinci.c | 20 +++++--
> drivers/i2c/busses/i2c-designware-common.c | 19 ++++++-
> drivers/i2c/busses/i2c-designware-core.h | 2 +
> drivers/i2c/busses/i2c-designware-master.c | 57 ++++++++++++++++++++
> drivers/i2c/busses/i2c-designware-platdrv.c | 18 ++-----
> drivers/i2c/busses/i2c-imx.c | 18 +++----
> drivers/i2c/i2c-core-base.c | 83 ++++--------------
> -----------
> include/linux/i2c.h | 11 ++--
> 8 files changed, 120 insertions(+), 108 deletions(-)
>
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 26+ messages in thread