patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

drivers/pinmux: stm32f1: Update dt to gpio encoding function

Browse source 
Based on pinmux data encoded in dt bindings some stm32f1 post
processing is required to eventually fit into data structures
expected in gpio_stm32_configure function.

Signed-off-by: Erwan Gouriou <erwan.gouriou@linaro.org>
This commit is contained in:
Erwan Gouriou 2020-08-12 13:26:06 +02:00 committed by Kumar Gala
parent 0f95e31e7e
commit f100e2c09e
2 changed files with 84 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
drivers/pinmux/stm32/pinmux_stm32.c
View file

@ -127,7 +127,6 @@ static int stm32_pin_configure(uint32_t pin, uint32_t func, uint32_t altf)
void stm32_dt_pinctrl_configure(const struct soc_gpio_pinctrl *pinctrl,
size_t list_size)
{
#if !defined(CONFIG_SOC_SERIES_STM32F1X)
const struct device *clk;
uint32_t pin, mux;
uint32_t func = 0;
@ -138,6 +137,28 @@ void stm32_dt_pinctrl_configure(const struct soc_gpio_pinctrl *pinctrl,
for (int i = 0; i < list_size; i++) {
mux = pinctrl[i].pinmux;
#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl)
uint32_t pupd;
if (STM32_DT_PINMUX_FUNC(mux) == ALTERNATE) {
func = pinctrl[i].pincfg | STM32_MODE_OUTPUT |
STM32_CNF_ALT_FUNC;
} else if (STM32_DT_PINMUX_FUNC(mux) == ANALOG) {
func = pinctrl[i].pincfg | STM32_MODE_INPUT |
STM32_CNF_IN_ANALOG;
} else if (STM32_DT_PINMUX_FUNC(mux) == GPIO_IN) {
func = pinctrl[i].pincfg | STM32_MODE_INPUT;
pupd = func & (STM32_PUPD_MASK << STM32_PUPD_SHIFT);
if (pupd == STM32_PUPD_NO_PULL) {
func = func | STM32_CNF_IN_FLOAT;
} else {
func = func | STM32_CNF_IN_PUPD;
}
} else {
/* Not supported */
__ASSERT_NO_MSG(STM32_DT_PINMUX_FUNC(mux));
}
#else
if (STM32_DT_PINMUX_FUNC(mux) < ANALOG) {
func = pinctrl[i].pincfg | STM32_MODER_ALT_MODE;
} else if (STM32_DT_PINMUX_FUNC(mux) == ANALOG) {
@ -146,6 +167,7 @@ void stm32_dt_pinctrl_configure(const struct soc_gpio_pinctrl *pinctrl,
/* Not supported */
__ASSERT_NO_MSG(STM32_DT_PINMUX_FUNC(mux));
}
#endif /* DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl) */
pin = STM32PIN(STM32_DT_PINMUX_PORT(mux),
STM32_DT_PINMUX_LINE(mux));
@ -154,9 +176,43 @@ void stm32_dt_pinctrl_configure(const struct soc_gpio_pinctrl *pinctrl,
stm32_pin_configure(pin, func, STM32_DT_PINMUX_FUNC(mux));
}
#endif
}
#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl)
/**
* @brief Helper function to check provided pinctrl remap configuration (Pin
* remapping configuration should be the same on all pins)
*
* @param *pinctrl pointer to soc_gpio_pinctrl list
* @param list_size list size
*
* @return remap value on success, -EINVAL otherwise
*/
int stm32_dt_pinctrl_remap_check(const struct soc_gpio_pinctrl *pinctrl,
size_t list_size)
{
int remap;
uint32_t mux;
remap = STM32_DT_PINMUX_REMAP(pinctrl[0].pinmux);
for (int i = 1; i < list_size; i++) {
mux = pinctrl[i].pinmux;
remap = STM32_DT_PINMUX_REMAP(mux);
if (STM32_DT_PINMUX_REMAP(mux) != remap) {
remap = -EINVAL;
break;
}
}
return remap;
}
#endif /* DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl) */
/**
* @brief pin setup
*

28
drivers/pinmux/stm32/pinmux_stm32.h
View file

@ -14,11 +14,11 @@
#include <zephyr/types.h>
#include <stddef.h>
#include <drivers/clock_control.h>
#ifdef CONFIG_SOC_SERIES_STM32F1X
#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl)
#include <dt-bindings/pinctrl/stm32f1-pinctrl.h>
#else
#include <dt-bindings/pinctrl/stm32-pinctrl.h>
#endif /* CONFIG_SOC_SERIES_STM32F1X */
#endif /* DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl) */
#include "pinmux/pinmux.h"
/**
@ -48,9 +48,22 @@ struct soc_gpio_pinctrl {
* @brief helper to extract IO pin func from STM32_PINMUX() encoded
* value
*/
#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl)
#define STM32_DT_PINMUX_FUNC(__pin) \
(((__pin) >> 6) & 0x3)
#else
#define STM32_DT_PINMUX_FUNC(__pin) \
((__pin) & 0xff)
#endif
#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl)
/**
* @brief helper to extract IO pin remap from STM32_PINMUX() encoded
* value
*/
#define STM32_DT_PINMUX_REMAP(__pin) \
((__pin) & 0x1f)
#endif
/* pretend that array will cover pin functions */
typedef int stm32_pin_func_t;
@ -136,6 +149,17 @@ void stm32_setup_pins(const struct pin_config *pinconf,
void stm32_dt_pinctrl_configure(const struct soc_gpio_pinctrl *pinctrl,
size_t list_size);
/**
* @brief Helper function to check provided pinctrl remap configuration (Pin
* remapping configuration should be the same on all pins)
*
* @param *pinctrl pointer to soc_gpio_pinctrl list
* @param list_size provided list size
*
* @return remap value on success, -EINVAL otherwise
*/
int stm32_dt_pinctrl_remap_check(const struct soc_gpio_pinctrl *pinctrl,
size_t list_size);
/* common pinmux device name for all STM32 chips */
#define STM32_PINMUX_NAME "stm32-pinmux"