sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Resolve ChangeLog conflict

Browse Source
This commit is contained in:
Gregory Nutt 2014-06-26 07:31:51 -06:00
commit 7bc244ec72
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -7522,6 +7522,8 @@
7.4 2014-xx-xx Gregory Nutt <gnutt@nuttx.org> 7.4 2014-xx-xx Gregory Nutt <gnutt@nuttx.org>
* arch/arm/src/stm32/stm32_i2c.c: Fix missing configuration of
GPIO pins in I2C driver. Fix from Alex D. (2014-6-25).
* NET: Fix an include file ordering problem when CONFIG_NET_STATISTICS=y. * NET: Fix an include file ordering problem when CONFIG_NET_STATISTICS=y.
(2014-6-26). (2014-6-26).

3
arch/arm/src/stm32/stm32_i2c.c
View File

@ -2036,6 +2036,9 @@ int up_i2creset(FAR struct i2c_dev_s * dev)
scl_gpio = MKI2C_OUTPUT(priv->config->scl_pin); scl_gpio = MKI2C_OUTPUT(priv->config->scl_pin);
sda_gpio = MKI2C_OUTPUT(priv->config->sda_pin); sda_gpio = MKI2C_OUTPUT(priv->config->sda_pin);
stm32_configgpio(scl_gpio);
stm32_configgpio(sda_gpio);
/* Let SDA go high */ /* Let SDA go high */
stm32_gpiowrite(sda_gpio, 1); stm32_gpiowrite(sda_gpio, 1);