adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

pinctrl_stm32: GPIO output info in Z_PINCTRL_STM32_PINCFG_INIT

Browse source 
Added information about pin output direction into
Z_PINCTRL_STM32_PINCFG_INIT if output_low or output_high is provided.
GPIO output flag is set in configuration struct and this will end up
being loaded into MODE register. Because of that it is no longer
required for pinctrl_configure_pins() to set MODE register value for
GPIO input/output.
Fixes #53141.

Signed-off-by: Lukasz Mazur <lukasz.mazur@hidglobal.com>
This commit is contained in:
Lukasz Mazur 2022-12-20 10:56:40 +01:00 committed by Carles Cufí
parent 8a52f9a835
commit f7ab9a8c52
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/pinctrl/pinctrl_stm32.c
View file

@ -236,13 +236,7 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
} else if (STM32_DT_PINMUX_FUNC(mux) == STM32_ANALOG) {
pin_cgf = STM32_MODER_ANALOG_MODE;
} else if (STM32_DT_PINMUX_FUNC(mux) == STM32_GPIO) {
uint32_t gpio_out = pins[i].pincfg &
(STM32_ODR_MASK << STM32_ODR_SHIFT);
if (gpio_out != 0) {
pin_cgf = pins[i].pincfg | STM32_MODER_OUTPUT_MODE;
} else {
pin_cgf = pins[i].pincfg | STM32_MODER_INPUT_MODE;
}
pin_cgf = pins[i].pincfg;
} else {
/* Not supported */
__ASSERT_NO_MSG(STM32_DT_PINMUX_FUNC(mux));

3
soc/arm/st_stm32/common/pinctrl_soc.h
View file

@ -53,6 +53,7 @@ typedef struct pinctrl_soc_pin {
#define STM32_OPEN_DRAIN 0x1
#define STM32_OUTPUT_LOW 0x0
#define STM32_OUTPUT_HIGH 0x1
#define STM32_GPIO_OUTPUT 0x1
#ifdef CONFIG_SOC_SERIES_STM32F1X
/**
@ -83,6 +84,8 @@ typedef struct pinctrl_soc_pin {
((STM32_OPEN_DRAIN * DT_PROP(node_id, drive_open_drain)) << STM32_OTYPER_SHIFT) | \
((STM32_OUTPUT_LOW * DT_PROP(node_id, output_low)) << STM32_ODR_SHIFT) | \
((STM32_OUTPUT_HIGH * DT_PROP(node_id, output_high)) << STM32_ODR_SHIFT) | \
((STM32_GPIO_OUTPUT * DT_PROP(node_id, output_low)) << STM32_MODER_SHIFT) | \
((STM32_GPIO_OUTPUT * DT_PROP(node_id, output_high)) << STM32_MODER_SHIFT) | \
(DT_ENUM_IDX(node_id, slew_rate) << STM32_OSPEEDR_SHIFT))
#endif /* CONFIG_SOC_SERIES_STM32F1X */