[mynewt-core] 01/02: stm32: Add 4th I2C peripheral

[je...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git

commit f7d2de84b51a0d344cdd34bbb94590fbcbbd912f
Author: Jerzy Kasenberg <je...@codecoup.pl>
AuthorDate: Thu Dec 16 12:01:01 2021 +0100

    stm32: Add 4th I2C peripheral
    
    Four I2C peripherals are sometime present.
    Limited pin assignments in STM MCUs calls for
    separate configuration even when only one
    I2C is used.
---
 hw/mcu/stm/stm32_common/src/hal_i2c.c      | 20 ++++++++++++++++++--
 hw/mcu/stm/stm32_common/src/stm32_periph.c |  7 +++++++
 hw/mcu/stm/stm32_common/syscfg.yml         |  9 +++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/hw/mcu/stm/stm32_common/src/hal_i2c.c b/hw/mcu/stm/stm32_common/src/hal_i2c.c
index e59da38..cacf29c 100644
--- a/hw/mcu/stm/stm32_common/src/hal_i2c.c
+++ b/hw/mcu/stm/stm32_common/src/hal_i2c.c
@@ -28,7 +28,15 @@
 
 #include <mcu/stm32_hal.h>
 
+#if MYNEWT_VAL(I2C_3)
+#define HAL_I2C_MAX_DEVS    4
+#elif MYNEWT_VAL(I2C_2)
 #define HAL_I2C_MAX_DEVS    3
+#elif MYNEWT_VAL(I2C_1)
+#define HAL_I2C_MAX_DEVS    2
+#else
+#define HAL_I2C_MAX_DEVS    1
+#endif
 
 #define I2C_ADDRESS         0xae
 
@@ -52,6 +60,9 @@ static struct stm32_hal_i2c i2c1;
 #if MYNEWT_VAL(I2C_2)
 static struct stm32_hal_i2c i2c2;
 #endif
+#if MYNEWT_VAL(I2C_3)
+static struct stm32_hal_i2c i2c3;
+#endif
 
 static struct stm32_hal_i2c *hal_i2c_devs[HAL_I2C_MAX_DEVS] = {
 #if MYNEWT_VAL(I2C_0)
@@ -61,12 +72,17 @@ static struct stm32_hal_i2c *hal_i2c_devs[HAL_I2C_MAX_DEVS] = {
 #endif
 #if MYNEWT_VAL(I2C_1)
     &i2c1,
-#else
+#elif HAL_I2C_MAX_DEVS > 2
     NULL,
 #endif
 #if MYNEWT_VAL(I2C_2)
     &i2c2,
-#else
+#elif HAL_I2C_MAX_DEVS > 3
+    NULL,
+#endif
+#if MYNEWT_VAL(I2C_3)
+    &i2c3,
+#elif HAL_I2C_MAX_DEVS > 4
     NULL,
 #endif
 };
diff --git a/hw/mcu/stm/stm32_common/src/stm32_periph.c b/hw/mcu/stm/stm32_common/src/stm32_periph.c
index 172c16c..2ed29cd 100644
--- a/hw/mcu/stm/stm32_common/src/stm32_periph.c
+++ b/hw/mcu/stm/stm32_common/src/stm32_periph.c
@@ -154,6 +154,9 @@ extern const struct stm32_hal_i2c_cfg os_bsp_i2c1_cfg;
 #if MYNEWT_VAL(I2C_2)
 extern const struct stm32_hal_i2c_cfg os_bsp_i2c2_cfg;
 #endif
+#if MYNEWT_VAL(I2C_3)
+extern const struct stm32_hal_i2c_cfg os_bsp_i2c3_cfg;
+#endif
 
 #if MYNEWT_VAL(BUS_DRIVER_PRESENT)
 
@@ -498,6 +501,10 @@ stm32_periph_create_i2c(void)
     rc = hal_i2c_init(2, (void *)&os_bsp_i2c2_cfg);
     assert(rc == 0);
 #endif
+#if MYNEWT_VAL(I2C_3)
+    rc = hal_i2c_init(3, (void *)&os_bsp_i2c3_cfg);
+    assert(rc == 0);
+#endif
 }
 
 #if MYNEWT_VAL(BUS_DRIVER_PRESENT)
diff --git a/hw/mcu/stm/stm32_common/syscfg.yml b/hw/mcu/stm/stm32_common/syscfg.yml
index 3ecb73e..a157faf 100644
--- a/hw/mcu/stm/stm32_common/syscfg.yml
+++ b/hw/mcu/stm/stm32_common/syscfg.yml
@@ -396,6 +396,15 @@ syscfg.defs:
     I2C_2_PIN_SDA:
         description: 'SDA pin for I2C_2'
         value: -1
+    I2C_3:
+        description: 'I2C (TWI) interface 3'
+        value:  0
+    I2C_3_PIN_SCL:
+        description: 'SCL pin for I2C_3'
+        value: -1
+    I2C_3_PIN_SDA:
+        description: 'SDA pin for I2C_3'
+        value: -1
 
     TRNG:
         description: 'True Random Number Generator (RNG)'