michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards: stm23: Move IS pinmux to new DT API

Browse source 
Convert the board and clean up I2S driver from these symbols

Signed-off-by: Erwan Gouriou <erwan.gouriou@linaro.org>
This commit is contained in:
Erwan Gouriou 2020-04-29 16:56:35 +02:00 • committed by Kumar Gala
commit 7d1fc6d08c
6 changed files with 9 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

3
boards/arm/96b_argonkey/Kconfig.defconfig
View file

@ -26,9 +26,6 @@ config I2S_STM32_PLLI2S_PLLN
config I2S_STM32_PLLI2S_PLLR
default 3
config I2S_5
default y
endif # I2S
if LSM6DSL

4
boards/arm/96b_argonkey/pinmux.c
View file

@ -50,10 +50,10 @@ static const struct pin_config pinconf[] = {
{STM32_PIN_PB14, STM32F4_PINMUX_FUNC_PB14_SPI2_MISO},
{STM32_PIN_PB15, STM32F4_PINMUX_FUNC_PB15_SPI2_MOSI},
#endif
#ifdef CONFIG_I2S_5
#if DT_HAS_NODE(DT_NODELABEL(i2s5))
{STM32_PIN_PB0, STM32F4_PINMUX_FUNC_PB0_I2S5_CK},
{STM32_PIN_PB8, STM32F4_PINMUX_FUNC_PB8_I2S5_SD},
#endif /* CONFIG_I2S_5 */
#endif
};
static int pinmux_stm32_init(struct device *port)

3
boards/arm/96b_stm32_sensor_mez/Kconfig.defconfig
View file

@ -26,9 +26,6 @@ config I2S_STM32_PLLI2S_PLLN
config I2S_STM32_PLLI2S_PLLR
default 3
config I2S_2
default y
endif # I2S
config SPI_STM32_INTERRUPT

4
boards/arm/96b_stm32_sensor_mez/pinmux.c
View file

@ -68,10 +68,10 @@ static const struct pin_config pinconf[] = {
{STM32_PIN_PE13, STM32F4_PINMUX_FUNC_PE13_SPI4_MISO},
{STM32_PIN_PE14, STM32F4_PINMUX_FUNC_PE14_SPI4_MOSI},
#endif
#ifdef CONFIG_I2S_2
#if DT_HAS_NODE(DT_NODELABEL(i2s2))
{STM32_PIN_PC7, STM32F4_PINMUX_FUNC_PC7_I2S2_CK},
{STM32_PIN_PC1, STM32F4_PINMUX_FUNC_PC1_I2S2_SD},
#endif /* CONFIG_I2S_2 */
#endif
#ifdef CONFIG_PWM_STM32_3
{ STM32_PIN_PB4, STM32F4_PINMUX_FUNC_PB4_PWM3_CH1 },
{ STM32_PIN_PC8, STM32F4_PINMUX_FUNC_PC8_PWM3_CH3 },

25
drivers/i2s/Kconfig.stm32
View file

@ -61,29 +61,4 @@ config I2S_STM32_PLLI2S_PLLR
frequency is less than or equal to 192MHz.
Allowed values: 2-7
config I2S_1
bool "I2S port 1"
help
Enable I2S controller port 1.
config I2S_2
bool "I2S port 2"
help
Enable I2S controller port 2.
config I2S_3
bool "I2S port 3"
help
Enable I2S controller port 3.
config I2S_4
bool "I2S port 4"
help
Enable I2S controller port 4.
config I2S_5
bool "I2S port 5"
help
Enable I2S controller port 5.
endif # I2S_STM32

10
drivers/i2s/i2s_ll_stm32.c
View file

@ -920,20 +920,20 @@ static void i2s_stm32_irq_config_func_##index(struct device *dev) \
#if DT_HAS_NODE(DT_NODELABEL(i2s1))
I2S_INIT(1, 2)
#endif /* CONFIG_I2S_1 */
#endif
#if DT_HAS_NODE(DT_NODELABEL(i2s2))
I2S_INIT(2, 1)
#endif /* CONFIG_I2S_2 */
#endif
#if DT_HAS_NODE(DT_NODELABEL(i2s3))
I2S_INIT(3, 1)
#endif /* CONFIG_I2S_3 */
#endif
#if DT_HAS_NODE(DT_NODELABEL(i2s4))
I2S_INIT(4, 2)
#endif /* CONFIG_I2S_4 */
#endif
#if DT_HAS_NODE(DT_NODELABEL(i2s5))
I2S_INIT(5, 2)
#endif /* CONFIG_I2S_5 */
#endif