michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/pinmux: stm32: Rework pinmux macro definitions

Browse source 
Review pinmux macro definition to a more portable format,
in preparation for new remap information encoding on stm32f1 series.

Signed-off-by: Erwan Gouriou <erwan.gouriou@linaro.org>
This commit is contained in:
Erwan Gouriou 2021-11-19 09:34:39 +01:00 • committed by Anas Nashif
commit c35ed25a63
3 changed files with 60 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
include/dt-bindings/pinctrl/stm32-pinctrl.h
View file

@ -35,11 +35,34 @@
/**
* @brief Macro to generate pinmux int using port, pin number and mode arguments
* This is taken from Linux equivalent st,stm32f429-pinctrl binding
* This is inspired from Linux equivalent st,stm32f429-pinctrl binding
*/
#define PIN_NO(port, line) (((port) - 'A') * 0x10 + (line))
#define STM32_PINMUX(port, line, mode) (((PIN_NO(port, line)) << 8) | (STM32_ ## mode))
/**
* @brief Pin configuration configuration bit field.
*
* Fields:
*
* - mode [ 0 : 4 ]
* - line [ 5 : 8 ]
* - port [ 9 : 12 ]
*
* @param port Port ('A'..'K')
* @param line Pin (0..15)
* @param mode Mode (ANALOG, GPIO_IN, ALTERNATE).
*/
#define STM32_MODE_SHIFT 0U
#define STM32_MODE_MASK 0x1FU
#define STM32_LINE_SHIFT 5U
#define STM32_LINE_MASK 0xFU
#define STM32_PORT_SHIFT 9U
#define STM32_PORT_MASK 0xFU
#define STM32_PINMUX(port, line, mode) \
(((((port) - 'A') & STM32_PORT_MASK) << STM32_PORT_SHIFT) | \
(((line) & STM32_LINE_MASK) << STM32_LINE_SHIFT) | \
(((STM32_ ## mode) & STM32_MODE_MASK) << STM32_MODE_SHIFT))
/**
* @brief PIN configuration bitfield

33
include/dt-bindings/pinctrl/stm32f1-pinctrl.h
View file

@ -16,9 +16,36 @@
* This is adapted from Linux equivalent st,stm32f429-pinctrl binding
*/
#define PIN_NO(port, line) (((port) - 'A') * 0x10 + (line))
#define STM32F1_PINMUX(port, line, mode, remap) \
(((PIN_NO(port, line)) << 8) | (mode << 6) | (remap))
/**
* @brief Pin configuration configuration bit field.
*
* Fields:
*
* - mode [ 0 : 1 ]
* - line [ 2 : 5 ]
* - port [ 6 : 9 ]
* - remap [ 10 : 12 ]
*
* @param port Port ('A'..'K')
* @param line Pin (0..15)
* @param mode Pin mode (ANALOG, GPIO_IN, ALTERNATE).
* @param remap Pin remapping configuration (NO_REMAP, REMAP_1, ...)
*/
#define STM32_MODE_SHIFT 0U
#define STM32_MODE_MASK 0x3U
#define STM32_LINE_SHIFT 2U
#define STM32_LINE_MASK 0xFU
#define STM32_PORT_SHIFT 6U
#define STM32_PORT_MASK 0xFU
#define STM32_REMAP_SHIFT 10U
#define STM32_REMAP_MASK 0x1FU
#define STM32F1_PINMUX(port, line, mode, remap) \
(((((port) - 'A') & STM32_PORT_MASK) << STM32_PORT_SHIFT) | \
(((line) & STM32_LINE_MASK) << STM32_LINE_SHIFT) | \
(((mode) & STM32_MODE_MASK) << STM32_MODE_SHIFT) | \
(((remap) & STM32_REMAP_MASK) << STM32_REMAP_SHIFT))
/**
* @brief Pin modes