stm32_i2c: handle pinctrl

Get pinctrl support from stm32_gpio.h into STM32 I2C driver.
When device tree content defines pins related to an I2C interface,
the I2C driver saves the pins configuration instances and set the
registered pins in the expected power mode at runtime.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>

1 files changed, 25 insertions, 2 deletions

diff --git a/core/drivers/stm32_i2c.c b/core/drivers/stm32_i2c.c
index c6257041..35fa505e 100644
--- a/core/drivers/stm32_i2c.c
+++ b/core/drivers/stm32_i2c.c
@@ -648,7 +648,9 @@ static int i2c_config_analog_filter(struct i2c_handle_s *hi2c,
 }
 
 int stm32_i2c_get_setup_from_fdt(void *fdt, int node,
-				 struct stm32_i2c_init_s *init)
+				 struct stm32_i2c_init_s *init,
+				 struct stm32_pinctrl **pinctrl,
+				 size_t *pinctrl_count)
 {
 	const fdt32_t *cuint = NULL;
 	struct dt_node_info info = { .status = 0 };
@@ -694,6 +696,24 @@ int stm32_i2c_get_setup_from_fdt(void *fdt, int node,
 		init->speed_mode = STM32_I2C_SPEED_DEFAULT;
 	}
 
+	count = stm32_pinctrl_fdt_get_pinctrl(fdt, node, NULL, 0);
+	if (count <= 0) {
+		*pinctrl = NULL;
+		*pinctrl_count = 0;
+		return count;
+	}
+
+	if (count > 2)
+		panic("Too many PINCTRLs found");
+
+	*pinctrl = calloc(count, sizeof(**pinctrl));
+	if (!*pinctrl)
+		panic();
+
+	*pinctrl_count = stm32_pinctrl_fdt_get_pinctrl(fdt, node,
+						       *pinctrl, count);
+	assert(*pinctrl_count == (unsigned int)count);
+
 	return 0;
 }
 
@@ -1381,8 +1401,10 @@ void stm32_i2c_resume(struct i2c_handle_s *hi2c)
 	    (hi2c->i2c_state != I2C_STATE_SUSPENDED))
 		panic();
 
+	stm32_pinctrl_load_active_cfg(hi2c->pinctrl, hi2c->pinctrl_count);
+
 	if (hi2c->i2c_state == I2C_STATE_RESET) {
-		/* This is no valid I2C configuration loaded yet */
+		/* There is no valid I2C configuration to be loaded yet */
 		return;
 	}
 
@@ -1400,6 +1422,7 @@ void stm32_i2c_suspend(struct i2c_handle_s *hi2c)
 		panic();
 
 	save_cfg(hi2c, &hi2c->sec_cfg);
+	stm32_pinctrl_load_standby_cfg(hi2c->pinctrl, hi2c->pinctrl_count);
 
 	hi2c->i2c_state = I2C_STATE_SUSPENDED;
 }