i2c: Make deblock delay and SCL clock configurable
PATCH 1/4 i2c: Make deblock delay and SCL clock configurable
Make the delay between SCL line changes and the number of SCL clock changes configurable as a parameter of the deblock function. No functional change.
--- drivers/i2c/i2c-uclass.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/i2c/i2c-uclass.c +11 -10
@@ -502,34 +502,35 @@ static int i2c_gpio_get_pin(struct gpio_desc *pin) }static int i2c_deblock_gpio_loop (struct gpio_desc *sda_pin, -struct gpio_desc *scl_pin) +struct gpio_desc *scl_pin, +unsigned int scl_count, +unsigned int delay) { -int counter =9 ;int ret =0 ;i2c_gpio_set_pin (sda_pin,1 );i2c_gpio_set_pin (scl_pin,1 ); -udelay (5 ); +udelay (delay);/* Toggle SCL until slave release SDA */ -while (counter-- >=0 ) { +while (scl_count-- >=0 ) {i2c_gpio_set_pin (scl_pin,1 ); -udelay (5 ); +udelay (delay);i2c_gpio_set_pin (scl_pin,0 ); -udelay (5 ); +udelay (delay);if (i2c_gpio_get_pin (sda_pin))break ; }/* Then, send I2C stop */ i2c_gpio_set_pin (sda_pin,0 ); -udelay (5 ); +udelay (delay);i2c_gpio_set_pin (scl_pin,1 ); -udelay (5 ); +udelay (delay);i2c_gpio_set_pin (sda_pin,1 ); -udelay (5 ); +udelay (delay);if (!i2c_gpio_get_pin (sda_pin) || !i2c_gpio_get_pin (scl_pin)) ret = -EREMOTEIO ;
@@ -561,7 +562,7 @@ static int i2c_deblock_gpio(struct udevice *bus) goto out_no_pinctrl; } - ret0 =i2c_deblock_gpio_loop (&gpios[PIN_SDA ], &gpios[PIN_SCL ]); + ret0 =i2c_deblock_gpio_loop (&gpios[PIN_SDA ], &gpios[PIN_SCL ],9 ,5 ); ret =pinctrl_select_state (bus,"default" );if (ret) {
Signature · 1 line
2.24.1
PATCH 2/4 i2c: Export i2c_deblock_gpio_loop()
Export the i2c_deblock_gpio_loop() so it can be used in other places in U-Boot. In particular, this is useful in the GPIO I2C driver, which claims the SDA/SCL GPIOs and thus prevents the i2c_deblock() implementation from claiming the pins as GPIOs again.
--- drivers/i2c/i2c-uclass.c | 8 ++++---- include/i2c.h | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-)
drivers/i2c/i2c-uclass.c +4 -4
@@ -501,10 +501,10 @@ static int i2c_gpio_get_pin(struct gpio_desc *pin)return dm_gpio_get_value (pin); } -static int i2c_deblock_gpio_loop (struct gpio_desc *sda_pin, -struct gpio_desc *scl_pin, -unsigned int scl_count, -unsigned int delay) +int i2c_deblock_gpio_loop (struct gpio_desc *sda_pin, +struct gpio_desc *scl_pin, +unsigned int scl_count, +unsigned int delay) {int ret =0 ;
include/i2c.h +16 -0
@@ -330,6 +330,22 @@ uint i2c_get_chip_addr_offset_mask(struct udevice *dev);*/ int i2c_deblock (struct udevice *bus); +/** +* i2c_deblock_gpio_loop() - recover a bus from an unknown state by toggling SDA/SCL +* +* This is the inner logic used for toggling I2C SDA/SCL lines as GPIOs +* for deblocking the I2C bus. +* +* @sda_pin: SDA GPIO +* @scl_pin: SCL GPIO +* @scl_count: Number of SCL clock cycles generated to deblock SDA +* @delay: Delay between SCL clock line changes +* @return 0 if OK, -ve on error +*/ +struct gpio_desc ; +int i2c_deblock_gpio_loop (struct gpio_desc *sda_pin,struct gpio_desc *scl_pin, +unsigned int scl_count,unsigned int delay); +/** * struct dm_i2c_ops - driver operations for I2C uclass *
Signature · 1 line
2.24.1
PATCH 2/4 i2c: Export i2c_deblock_gpio_loop()
Hello Marek,
Am 07.02.2020 um 16:57 schrieb Marek Vasut:
Quoted 10 lines
Export the
i2c_deblock_gpio_loop()so it can be used in other places in U-Boot. In particular, this is useful in the GPIO I2C driver, which claims the SDA/SCL GPIOs and thus prevents thei2c_deblock()implementation from claiming the pins as GPIOs again.Signed-off-by Marek Vasut <[email protected]>--- drivers/i2c/i2c-uclass.c | 8 ++++---- include/i2c.h | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-)
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH 2/4 i2c: Export i2c_deblock_gpio_loop()
In reply to Marek VasutHello Marek,
Am 07.02.2020 um 16:57 schrieb Marek Vasut:
Quoted 10 lines
Export the
i2c_deblock_gpio_loop()so it can be used in other places in U-Boot. In particular, this is useful in the GPIO I2C driver, which claims the SDA/SCL GPIOs and thus prevents thei2c_deblock()implementation from claiming the pins as GPIOs again.Signed-off-by Marek Vasut <[email protected]>--- drivers/i2c/i2c-uclass.c | 8 ++++---- include/i2c.h | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-)
Applied to u-boot-i2c next, thanks!
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH 3/4 i2c: Add option to send start condition after deblocking
In reply to Marek VasutAdd option to send start condition after deblocking SDA.
--- drivers/i2c/i2c-uclass.c | 23 ++++++++++++++++++++--- include/i2c.h | 4 +++- 2 files changed, 23 insertions(+), 4 deletions(-)
drivers/i2c/i2c-uclass.c +20 -3
@@ -504,9 +504,10 @@ static int i2c_gpio_get_pin(struct gpio_desc *pin)int i2c_deblock_gpio_loop (struct gpio_desc *sda_pin,struct gpio_desc *scl_pin,unsigned int scl_count, +unsigned int start_count,unsigned int delay) { -int ret =0 ; +int i, ret = -EREMOTEIO ;i2c_gpio_set_pin (sda_pin,1 );i2c_gpio_set_pin (scl_pin,1 );
@@ -518,8 +519,24 @@ int i2c_deblock_gpio_loop(struct gpio_desc *sda_pin,udelay (delay);i2c_gpio_set_pin (scl_pin,0 );udelay (delay); -if (i2c_gpio_get_pin (sda_pin)) +if (i2c_gpio_get_pin (sda_pin)) { + ret =0 ;break ; + } + } + +if (!ret && start_count) { +for (i =0 ; i < start_count; i++) { +/* Send start condition */ +udelay (delay); +i2c_gpio_set_pin (sda_pin,1 ); +udelay (delay); +i2c_gpio_set_pin (scl_pin,1 ); +udelay (delay); +i2c_gpio_set_pin (sda_pin,0 ); +udelay (delay); +i2c_gpio_set_pin (scl_pin,0 ); + } }/* Then, send I2C stop */
@@ -562,7 +579,7 @@ static int i2c_deblock_gpio(struct udevice *bus) goto out_no_pinctrl; } - ret0 =i2c_deblock_gpio_loop (&gpios[PIN_SDA ], &gpios[PIN_SCL ],9 ,5 ); + ret0 =i2c_deblock_gpio_loop (&gpios[PIN_SDA ], &gpios[PIN_SCL ],9 ,0 ,5 ); ret =pinctrl_select_state (bus,"default" );if (ret) {
include/i2c.h +3 -1
@@ -339,12 +339,14 @@ int i2c_deblock(struct udevice *bus);* @sda_pin: SDA GPIO * @scl_pin: SCL GPIO * @scl_count: Number of SCL clock cycles generated to deblock SDA +* @start_count:Number of I2C start conditions sent after deblocking SDA * @delay: Delay between SCL clock line changes * @return 0 if OK, -ve on error */ struct gpio_desc ;int i2c_deblock_gpio_loop (struct gpio_desc *sda_pin,struct gpio_desc *scl_pin, -unsigned int scl_count,unsigned int delay); +unsigned int scl_count,unsigned int start_count, +unsigned int delay);/** * struct dm_i2c_ops - driver operations for I2C uclass
Signature · 1 line
2.24.1
PATCH 3/4 i2c: Add option to send start condition after deblocking
Hello Marek,
Am 07.02.2020 um 16:57 schrieb Marek Vasut:
Quoted 7 lines
Add option to send start condition after deblocking SDA.
Signed-off-by Marek Vasut <[email protected]>--- drivers/i2c/i2c-uclass.c | 23 ++++++++++++++++++++--- include/i2c.h | 4 +++- 2 files changed, 23 insertions(+), 4 deletions(-)
Quoted 56 lines
drivers/i2c/i2c-uclass.c +20
-3@@ -504,9 +504,10 @@ static int i2c_gpio_get_pin(struct gpio_desc *pin)int i2c_deblock_gpio_loop (struct gpio_desc *sda_pin,struct gpio_desc *scl_pin,unsigned int scl_count, +unsigned int start_count,unsigned int delay) { -int ret =0 ; +int i, ret = -EREMOTEIO ;i2c_gpio_set_pin (sda_pin,1 );i2c_gpio_set_pin (scl_pin,1 );@@ -518,8 +519,24 @@ int i2c_deblock_gpio_loop(struct gpio_desc *sda_pin,udelay (delay);i2c_gpio_set_pin (scl_pin,0 );udelay (delay); -if (i2c_gpio_get_pin (sda_pin)) +if (i2c_gpio_get_pin (sda_pin)) { + ret =0 ;break ; + } + } + +if (!ret && start_count) { +for (i =0 ; i < start_count; i++) { +/* Send start condition */ +udelay (delay); +i2c_gpio_set_pin (sda_pin,1 ); +udelay (delay); +i2c_gpio_set_pin (scl_pin,1 ); +udelay (delay); +i2c_gpio_set_pin (sda_pin,0 ); +udelay (delay); +i2c_gpio_set_pin (scl_pin,0 ); + } }/* Then, send I2C stop */ @@ -562,7 +579,7 @@ static int i2c_deblock_gpio(struct udevice *bus) goto out_no_pinctrl; } - ret0 =i2c_deblock_gpio_loop (&gpios[PIN_SDA ], &gpios[PIN_SCL ],9 ,5 ); + ret0 =i2c_deblock_gpio_loop (&gpios[PIN_SDA ], &gpios[PIN_SCL ],9 ,0 ,5 ); ret =pinctrl_select_state (bus,"default" );if (ret) {include/i2c.h +0
-0
include/i2c.h int i2c_deblock(struct udevice *bus); · line 342
Quoted 4 lines
include/i2c.h +1
-0@@ -339,12 +339,14 @@ int i2c_deblock(struct udevice *bus);* @sda_pin: SDA GPIO * @scl_pin: SCL GPIO * @scl_count: Number of SCL clock cycles generated to deblock SDA +* @start_count:Number of I2C start conditions sent after deblocking SDA
Is there a tab missing? If so I can add it, when applying this patch.
include/i2c.h int i2c_deblock(struct udevice *bus); · line 352
Quoted 12 lines
include/i2c.h +2
-1* @delay: Delay between SCL clock line changes * @return 0 if OK, -ve on error */ struct gpio_desc ;int i2c_deblock_gpio_loop (struct gpio_desc *sda_pin,struct gpio_desc *scl_pin, -unsigned int scl_count,unsigned int delay); +unsigned int scl_count,unsigned int start_count, +unsigned int delay);/** * struct dm_i2c_ops - driver operations for I2C uclass
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH 3/4 i2c: Add option to send start condition after deblocking
Quoted 1 line · Heiko Schocher
Hello Marek,
Hi,
Quoted 63 lines
Am 07.02.2020 um 16:57 schrieb Marek Vasut:
Quoted 7 lines
Add option to send start condition after deblocking SDA.
Signed-off-by Marek Vasut <[email protected]>---
?drivers/i2c/i2c-uclass.c| 23 ++++++++++++++++++++--- ?include/i2c.h??????????? |? 4 +++-
? 2 files changed, 23 insertions(+), 4 deletions(-)Reviewed-by Heiko Schocher <[email protected]>Quoted 52 lines
drivers/i2c/i2c-uclass.c +19
-2@@ -504,9 +504,10 @@ static int i2c_gpio_get_pin(struct gpio_desc *pin) ? int i2c_deblock_gpio_loop(struct gpio_desc *sda_pin, ??????????????? struct gpio_desc *scl_pin, ??????????????? unsigned int scl_count, +????????????? unsigned int start_count, ??????????????? unsigned int delay) ? { -??? int ret = 0; +??? int i, ret = -EREMOTEIO; ? ????? i2c_gpio_set_pin(sda_pin, 1); ????? i2c_gpio_set_pin(scl_pin, 1);@@ -518,8 +519,24 @@ int i2c_deblock_gpio_loop(struct gpio_desc *sda_pin, ????????? udelay(delay); ????????? i2c_gpio_set_pin(scl_pin, 0); ????????? udelay(delay); -??????? if (i2c_gpio_get_pin(sda_pin)) +??????? if (i2c_gpio_get_pin(sda_pin)) { +??????????? ret = 0; ????????????? break; +??????? } +??? } + +??? if (!ret && start_count) { +??????? for (i = 0; i < start_count; i++) { +??????????? /* Send start condition */ +??????????? udelay(delay); +??????????? i2c_gpio_set_pin(sda_pin, 1); +??????????? udelay(delay); +??????????? i2c_gpio_set_pin(scl_pin, 1); +??????????? udelay(delay); +??????????? i2c_gpio_set_pin(sda_pin, 0); +??????????? udelay(delay); +??????????? i2c_gpio_set_pin(scl_pin, 0); +??????? } ????? }? ????? /* Then, send I2C stop */
drivers/i2c/i2c-uclass.c +1
-0@@ -562,7 +579,7 @@ static int i2c_deblock_gpio(struct udevice *bus) ????????? goto out_no_pinctrl; ????? } ? -??? ret0 = i2c_deblock_gpio_loop(&gpios[PIN_SDA], &gpios[PIN_SCL],9 ,5 ); +??? ret0 = i2c_deblock_gpio_loop(&gpios[PIN_SDA], &gpios[PIN_SCL], 9,0 ,5 ); ? ????? ret = pinctrl_select_state(bus, "default");????? if (ret) {
include/i2c.h +0
-1--- a/include/i2c.h
Quoted 8 lines
Quoted 6 lines
+++
b/include/i2c.hinclude/i2c.h +0
-0@@ -339,12 +339,14 @@ int i2c_deblock(struct udevice *bus);?? * @sda_pin:??? SDA GPIO
?? * @scl_pin:??? SCL GPIO
?? * @scl_count:??? Number of SCL clock cycles generated to deblock SDA
+ * @start_count:Number of I2C start conditions sent after deblocking SDAIs there a tab missing? If so I can add it, when applying this patch.
Nope, if you add tab, the formatting starts to look real awful. You can add a space if you feel very inclined to do so, but it would still look ugly.
PATCH 3/4 i2c: Add option to send start condition after deblocking
In reply to Marek VasutHello Marek,
Am 07.02.2020 um 16:57 schrieb Marek Vasut:
Quoted 7 lines
Add option to send start condition after deblocking SDA.
Signed-off-by Marek Vasut <[email protected]>--- drivers/i2c/i2c-uclass.c | 23 ++++++++++++++++++++--- include/i2c.h | 4 +++- 2 files changed, 23 insertions(+), 4 deletions(-)
Applied to u-boot-i2c next, thanks!
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH 4/4 i2c: gpio: Run deblock sequence on probe
In reply to Marek VasutAdd deblock dequence for the I2C bus, needed on some devices. This sequence is issued once, when probing the driver, and is controlled by DT property, "i2c-gpio,deblock".
--- drivers/i2c/i2c-gpio.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/i2c/i2c-gpio.c +15 -0
@@ -305,6 +305,20 @@ static int i2c_gpio_set_bus_speed(struct udevice *dev, unsigned int speed_hz)return 0 ; } +static int i2c_gpio_drv_probe (struct udevice *dev) +{ +if (dev_read_bool (dev,"i2c-gpio,deblock" )) { +/* @200kHz 9 clocks = 44us, 62us is ok */ +const unsigned int DELAY_ABORT_SEQ =62 ; +struct i2c_gpio_bus *bus =dev_get_priv (dev); +return i2c_deblock_gpio_loop (&bus->gpios[PIN_SDA ], + &bus->gpios[PIN_SCL ], +16 ,5 ,DELAY_ABORT_SEQ ); + } + +return 0 ; +} +static int i2c_gpio_ofdata_to_platdata (struct udevice *dev) {struct i2c_gpio_bus *bus =dev_get_priv (dev);
@@ -341,6 +355,7 @@ U_BOOT_DRIVER(i2c_gpio) = { .name = "i2c-gpio", .id = UCLASS_I2C, .of_match = i2c_gpio_ids, + .probe = i2c_gpio_drv_probe, .ofdata_to_platdata = i2c_gpio_ofdata_to_platdata, .priv_auto_alloc_size = sizeof(struct i2c_gpio_bus), .ops = &i2c_gpio_ops,
Signature · 1 line
2.24.1
PATCH 4/4 i2c: gpio: Run deblock sequence on probe
Hello Marek,
Am 07.02.2020 um 16:57 schrieb Marek Vasut:
Quoted 8 lines
Add deblock dequence for the I2C bus, needed on some devices. This sequence is issued once, when probing the driver, and is controlled by DT property, "i2c-gpio,deblock".
Signed-off-by Marek Vasut <[email protected]>--- drivers/i2c/i2c-gpio.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
Nitpick: I see no entry in doc/device-tree-bindings/i2c/i2c-gpio.txt for the new dts binding ... please send a follow up patch which adds it, or a v2 for this one, thanks!
bye,
Heiko
Quoted 35 lines
drivers/i2c/i2c-gpio.c +15
-0@@ -305,6 +305,20 @@ static int i2c_gpio_set_bus_speed(struct udevice *dev, unsigned int speed_hz)return 0 ; } +static int i2c_gpio_drv_probe (struct udevice *dev) +{ +if (dev_read_bool (dev,"i2c-gpio,deblock" )) { +/* @200kHz 9 clocks = 44us, 62us is ok */ +const unsigned int DELAY_ABORT_SEQ =62 ; +struct i2c_gpio_bus *bus =dev_get_priv (dev); +return i2c_deblock_gpio_loop (&bus->gpios[PIN_SDA ], + &bus->gpios[PIN_SCL ], +16 ,5 ,DELAY_ABORT_SEQ ); + } + +return 0 ; +} +static int i2c_gpio_ofdata_to_platdata (struct udevice *dev) {struct i2c_gpio_bus *bus =dev_get_priv (dev);@@ -341,6 +355,7 @@ U_BOOT_DRIVER(i2c_gpio) = { .name = "i2c-gpio", .id = UCLASS_I2C, .of_match = i2c_gpio_ids, + .probe = i2c_gpio_drv_probe, .ofdata_to_platdata = i2c_gpio_ofdata_to_platdata, .priv_auto_alloc_size = sizeof(struct i2c_gpio_bus), .ops = &i2c_gpio_ops,
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH 4/4 i2c: gpio: Run deblock sequence on probe
Quoted 9 lines · Heiko Schocher
Hello Marek,
Am 07.02.2020 um 16:57 schrieb Marek Vasut:
Quoted 6 lines
Add deblock dequence for the I2C bus, needed on some devices. This sequence
is issued once, when probing the driver, and is controlled by DT property,
"i2c-gpio,deblock".
Quoted 8 lines
Quoted 4 lines
Signed-off-by Marek Vasut <[email protected]>---
?drivers/i2c/i2c-gpio.c| 15 +++++++++++++++
? 1 file changed, 15 insertions(+)Nitpick: I see no entry in
doc/device-tree-bindings/i2c/i2c-gpio.txtfor the new dts binding ... please send a follow up patch which adds it, or a v2 for this one, thanks!
Done in
[PATCH] doc: i2c: gpio: Document deblock sequence on probe
PATCH 4/4 i2c: gpio: Run deblock sequence on probe
In reply to Marek VasutHello Marek,
Am 07.02.2020 um 16:57 schrieb Marek Vasut:
Quoted 8 lines
Add deblock dequence for the I2C bus, needed on some devices. This sequence is issued once, when probing the driver, and is controlled by DT property, "i2c-gpio,deblock".
Signed-off-by Marek Vasut <[email protected]>--- drivers/i2c/i2c-gpio.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
Applied to u-boot-i2c next, thanks!
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH 1/4 i2c: Make deblock delay and SCL clock configurable
In reply to Marek VasutHello Marek,
Am 07.02.2020 um 16:57 schrieb Marek Vasut:
Quoted 8 lines
Make the delay between SCL line changes and the number of SCL clock changes configurable as a parameter of the deblock function. No functional change.
Signed-off-by Marek Vasut <[email protected]>--- drivers/i2c/i2c-uclass.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH 1/4 i2c: Make deblock delay and SCL clock configurable
In reply to Marek VasutHello Marek,
Am 07.02.2020 um 16:57 schrieb Marek Vasut:
Quoted 8 lines
Make the delay between SCL line changes and the number of SCL clock changes configurable as a parameter of the deblock function. No functional change.
Signed-off-by Marek Vasut <[email protected]>--- drivers/i2c/i2c-uclass.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
Applied to u-boot-i2c next, thanks!
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de