Merged in mjkoch/nuttx (pull request #850)

I2C1 config on stm32f746g-disco. Typo in stm32f7/stm32_i2c.c

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Matthew Koch 2019-04-08 01:06:33 +00:00 committed by Gregory Nutt
parent 7d2bd2371f
commit f8495006a5
2 changed files with 8 additions and 1 deletions

View File

@ -271,7 +271,7 @@
# define INVALID_CLOCK_SOURCE
# endif
#endif
#ifdef CONFIG_STM32F7_I2C1
#ifdef CONFIG_STM32F7_I2C2
# if STM32_RCC_DCKCFGR2_I2C2SRC != RCC_DCKCFGR2_I2C2SEL_HSI
# warning "Clock Source STM32_RCC_DCKCFGR2_I2C2SRC must be HSI"
# define INVALID_CLOCK_SOURCE

View File

@ -348,6 +348,13 @@
#define GPIO_USART1_RX GPIO_USART1_RX_2
#define GPIO_USART1_TX GPIO_USART1_TX_1
/* I2C1 - the I2C1 bus is shared by audio (Cirrus WM8994),
* camera (DCMI SDA/SCL) and external connectors CN2 & Arduino D14/D15.
*/
#define GPIO_I2C1_SDA GPIO_I2C1_SDA_2
#define GPIO_I2C1_SCL GPIO_I2C1_SCL_2
/* I2C - There is a FT5336 TouchPanel on I2C3 using these pins: */
#define GPIO_I2C3_SCL GPIO_I2C3_SCL_2