From 7cf52139e84dfaeeff05ae9a47b265ab538fc32f Mon Sep 17 00:00:00 2001 From: raiden00pl Date: Wed, 24 May 2023 10:33:01 +0200 Subject: [PATCH] boards/stm32f0l0g0: rework boards to not use CONFIG_STM32F0L0G0_USE_LEGACY_PINMAP=y Continuation to PR #8992 --- .../b-l072z-lrwan1/configs/adc/defconfig | 1 + .../b-l072z-lrwan1/configs/nsh/defconfig | 1 + .../configs/nxlines_oled/defconfig | 1 + .../b-l072z-lrwan1/configs/sx127x/defconfig | 1 + .../b-l072z-lrwan1/include/board.h | 47 +++++++++++++------ .../b-l072z-lrwan1/src/stm32_adc.c | 3 +- .../nucleo-f072rb/configs/nsh/defconfig | 1 + .../stm32f0l0g0/nucleo-f072rb/include/board.h | 24 ++++++---- .../nucleo-f091rc/configs/nsh/defconfig | 1 + .../nucleo-f091rc/configs/sx127x/defconfig | 1 + .../stm32f0l0g0/nucleo-f091rc/include/board.h | 23 +++++---- .../nucleo-g070rb/configs/nsh/defconfig | 1 + .../stm32f0l0g0/nucleo-g070rb/include/board.h | 42 ++++++++--------- .../nucleo-g071rb/configs/nsh/defconfig | 1 + .../stm32f0l0g0/nucleo-g071rb/include/board.h | 4 +- .../nucleo-l073rz/configs/nsh/defconfig | 1 + .../nucleo-l073rz/configs/sx127x/defconfig | 1 + .../stm32f0l0g0/nucleo-l073rz/include/board.h | 20 ++++---- .../stm32f051-discovery/configs/nsh/defconfig | 1 + .../stm32f051-discovery/include/board.h | 8 ++-- .../stm32f072-discovery/configs/nsh/defconfig | 1 + .../stm32f072-discovery/include/board.h | 8 ++-- .../stm32g071b-disco/configs/nsh/defconfig | 1 + .../stm32g071b-disco/configs/oled/defconfig | 1 + .../stm32g071b-disco/include/board.h | 14 +++--- .../stm32l0538-disco/configs/nsh/defconfig | 1 + .../stm32l0538-disco/include/board.h | 16 +++---- 27 files changed, 135 insertions(+), 90 deletions(-) diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig index d1e25d4790b..3d55552aaf1 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig @@ -7,6 +7,7 @@ # # CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set +# CONFIG_STM32F0G0L0_USE_LEGACY_PINMAP is not set CONFIG_ADC=y CONFIG_ANALOG=y CONFIG_ARCH="arm" diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig index e1073dbd9b4..5133abaa9d4 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig @@ -7,6 +7,7 @@ # # CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set +# CONFIG_STM32F0G0L0_USE_LEGACY_PINMAP is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="b-l072z-lrwan1" CONFIG_ARCH_BOARD_B_L072Z_LRWAN1=y diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig index 3c2fd9b7b70..20a625d7614 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig @@ -9,6 +9,7 @@ # CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NX_DISABLE_1BPP is not set +# CONFIG_STM32F0G0L0_USE_LEGACY_PINMAP is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="b-l072z-lrwan1" CONFIG_ARCH_BOARD_B_L072Z_LRWAN1=y diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig index 1a1abc6103c..2175a346cba 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig @@ -7,6 +7,7 @@ # # CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set +# CONFIG_STM32F0G0L0_USE_LEGACY_PINMAP is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="b-l072z-lrwan1" CONFIG_ARCH_BOARD_B_L072Z_LRWAN1=y diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/include/board.h b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/include/board.h index 2540d660511..b9073b07dc4 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/include/board.h +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/include/board.h @@ -202,43 +202,62 @@ * */ +/* ADC */ + +#define GPIO_ADC1_IN0 (GPIO_ADC1_IN0_0) /* PA0 */ +#define GPIO_ADC1_IN1 (GPIO_ADC1_IN1_0) /* PA1 */ +#define GPIO_ADC1_IN2 (GPIO_ADC1_IN2_0) /* PA2 */ +#define GPIO_ADC1_IN3 (GPIO_ADC1_IN3_0) /* PA3 */ +#define GPIO_ADC1_IN4 (GPIO_ADC1_IN4_0) /* PA4 */ +#define GPIO_ADC1_IN5 (GPIO_ADC1_IN5_0) /* PA5 */ +#define GPIO_ADC1_IN6 (GPIO_ADC1_IN6_0) /* PA6 */ +#define GPIO_ADC1_IN7 (GPIO_ADC1_IN7_0) /* PA7 */ +#define GPIO_ADC1_IN8 (GPIO_ADC1_IN8_0) /* PB0 */ +#define GPIO_ADC1_IN9 (GPIO_ADC1_IN9_0) /* PB1 */ +#define GPIO_ADC1_IN10 (GPIO_ADC1_IN10_0) /* PC0 */ +#define GPIO_ADC1_IN11 (GPIO_ADC1_IN11_0) /* PC1 */ +#define GPIO_ADC1_IN12 (GPIO_ADC1_IN12_0) /* PC2 */ +#define GPIO_ADC1_IN13 (GPIO_ADC1_IN13_0) /* PC3 */ +#define GPIO_ADC1_IN14 (GPIO_ADC1_IN14_0) /* PC4 */ +#define GPIO_ADC1_IN15 (GPIO_ADC1_IN15_0) /* PC5 */ + /* USART */ /* USART1 */ -#define GPIO_USART1_RX GPIO_USART1_RX_1 /* PA10 */ -#define GPIO_USART1_TX GPIO_USART1_TX_1 /* PA9 */ +#define GPIO_USART1_RX (GPIO_USART1_RX_1|GPIO_SPEED_HIGH) /* PA10 */ +#define GPIO_USART1_TX (GPIO_USART1_TX_1|GPIO_SPEED_HIGH) /* PA9 */ /* By default the USART2 is connected to STLINK Virtual COM Port: * USART2_RX - PA3 * USART2_TX - PA2 */ -#define GPIO_USART2_RX GPIO_USART2_RX_1 /* PA3 */ -#define GPIO_USART2_TX GPIO_USART2_TX_1 /* PA2 */ +#define GPIO_USART2_RX (GPIO_USART2_RX_1|GPIO_SPEED_HIGH) /* PA3 */ +#define GPIO_USART2_TX (GPIO_USART2_TX_1|GPIO_SPEED_HIGH) /* PA2 */ /* SPI */ /* SPI1 is connected to SX1276 radio */ -#define GPIO_SPI1_MOSI GPIO_SPI1_MOSI_2 /* PA7 */ -#define GPIO_SPI1_MISO GPIO_SPI1_MISO_2 /* PA6 */ -#define GPIO_SPI1_SCK GPIO_SPI1_SCK_2 /* PB3 */ -#define GPIO_SPI1_NSS GPIO_SPI1_NSS_1 /* PA15 */ +#define GPIO_SPI1_MOSI (GPIO_SPI1_MOSI_2|GPIO_SPEED_MEDIUM) /* PA7 */ +#define GPIO_SPI1_MISO (GPIO_SPI1_MISO_2|GPIO_SPEED_MEDIUM) /* PA6 */ +#define GPIO_SPI1_SCK (GPIO_SPI1_SCK_2|GPIO_SPEED_MEDIUM) /* PB3 */ +#define GPIO_SPI1_NSS (GPIO_SPI1_NSS_1|GPIO_SPEED_MEDIUM) /* PA15 */ /* SPI2 */ -#define GPIO_SPI2_MOSI GPIO_SPI2_MOSI_1 /* PB15 */ -#define GPIO_SPI2_MISO GPIO_SPI2_MISO_1 /* PB14 */ -#define GPIO_SPI2_SCK GPIO_SPI2_SCK_3 /* PB13 */ -#define GPIO_SPI2_NSS GPIO_SPI2_NSS_1 /* PB12 */ +#define GPIO_SPI2_MOSI (GPIO_SPI2_MOSI_1|GPIO_SPEED_MEDIUM) /* PB15 */ +#define GPIO_SPI2_MISO (GPIO_SPI2_MISO_1|GPIO_SPEED_MEDIUM) /* PB14 */ +#define GPIO_SPI2_SCK (GPIO_SPI2_SCK_3|GPIO_SPEED_MEDIUM) /* PB13 */ +#define GPIO_SPI2_NSS (GPIO_SPI2_NSS_1|GPIO_SPEED_MEDIUM) /* PB12 */ /* I2C */ /* I2C1 */ -#define GPIO_I2C1_SDA GPIO_I2C1_SDA_2 /* PB9 */ -#define GPIO_I2C1_SCL GPIO_I2C1_SCL_2 /* PB8 */ +#define GPIO_I2C1_SDA (GPIO_I2C1_SDA_2|GPIO_SPEED_LOW) /* PB9 */ +#define GPIO_I2C1_SCL (GPIO_I2C1_SCL_2|GPIO_SPEED_LOW) /* PB8 */ /* DMA channels *************************************************************/ diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_adc.c b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_adc.c index 30260869ff2..d5545e9397b 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_adc.c +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_adc.c @@ -28,7 +28,8 @@ #include #include -#include +#include + #include #include "stm32.h" diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig index 8f9f4c5e80e..7c13cae0775 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig @@ -20,6 +20,7 @@ # CONFIG_NSH_DISABLE_EXIT is not set # CONFIG_NSH_DISABLE_HEXDUMP is not set # CONFIG_NSH_DISABLE_XD is not set +# CONFIG_STM32F0G0L0_USE_LEGACY_PINMAP is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f072rb" CONFIG_ARCH_BOARD_NUCLEO_F072RB=y diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/include/board.h b/boards/arm/stm32f0l0g0/nucleo-f072rb/include/board.h index 64f47aeb164..6c62b876e14 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f072rb/include/board.h +++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/include/board.h @@ -216,20 +216,26 @@ /* Alternate Pin Functions **************************************************/ -/* USART 1 */ +/* USART 1 + * PA9 - CN10 pin 21 + * PA10 - CN10 pin 33 + */ -#define GPIO_USART1_TX GPIO_USART1_TX_2 /* PA9 CN10 pin 21 */ -#define GPIO_USART1_RX GPIO_USART1_RX_2 /* PA10 CN10 pin 33 */ +#define GPIO_USART1_TX (GPIO_USART1_TX_2|GPIO_SPEED_HIGH) /* PA9 */ +#define GPIO_USART1_RX (GPIO_USART1_RX_2|GPIO_SPEED_HIGH) /* PA10 */ -/* USART 2 */ +/* USART 2 - St-Link VCOM */ -#define GPIO_USART2_TX GPIO_USART2_TX_3 /* PA2 St-Link VCOM */ -#define GPIO_USART2_RX GPIO_USART2_RX_3 /* PA3 St-Link VCOM */ +#define GPIO_USART2_TX (GPIO_USART2_TX_3|GPIO_SPEED_HIGH) /* PA2 */ +#define GPIO_USART2_RX (GPIO_USART2_RX_3|GPIO_SPEED_HIGH) /* PA3 */ -/* I2C1 */ +/* I2C1 + * PB8 - CN5 pin 10, D15 + * PB9 - CN5 pin 9, D14 + */ -#define GPIO_I2C1_SCL GPIO_I2C1_SCL_2 /* PB8 CN5 pin 10, D15 */ -#define GPIO_I2C1_SDA GPIO_I2C1_SDA_2 /* PB9 CN5 pin 9, D14 */ +#define GPIO_I2C1_SCL (GPIO_I2C1_SCL_2|GPIO_SPEED_LOW) /* PB8 */ +#define GPIO_I2C1_SDA (GPIO_I2C1_SDA_2|GPIO_SPEED_LOW) /* PB9 */ /* I2C2 */ diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig index 1b1a95c0f46..3ad53f383e5 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig @@ -20,6 +20,7 @@ # CONFIG_NSH_DISABLE_EXIT is not set # CONFIG_NSH_DISABLE_HEXDUMP is not set # CONFIG_NSH_DISABLE_XD is not set +# CONFIG_STM32F0G0L0_USE_LEGACY_PINMAP is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f091rc" CONFIG_ARCH_BOARD_NUCLEO_F091RC=y diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig index d6d2a7c329f..0d8c9a2ea77 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig @@ -7,6 +7,7 @@ # # CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set +# CONFIG_STM32F0G0L0_USE_LEGACY_PINMAP is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f091rc" CONFIG_ARCH_BOARD_NUCLEO_F091RC=y diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/include/board.h b/boards/arm/stm32f0l0g0/nucleo-f091rc/include/board.h index 82f44fdc4d1..e02f237dd58 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/include/board.h +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/include/board.h @@ -216,25 +216,28 @@ /* Alternate Pin Functions **************************************************/ -/* I2C */ +/* I2C + * PB8 - D15 + * PB9 - D14 + */ -#define GPIO_I2C1_SCL GPIO_I2C1_SCL_2 /* D15 - PB8 */ -#define GPIO_I2C1_SDA GPIO_I2C1_SDA_2 /* D14 - PB9 */ +#define GPIO_I2C1_SCL (GPIO_I2C1_SCL_2|GPIO_SPEED_LOW) /* PB8 */ +#define GPIO_I2C1_SDA (GPIO_I2C1_SDA_2|GPIO_SPEED_LOW) /* PB9 */ /* SPI */ -#define GPIO_SPI1_MISO GPIO_SPI1_MISO_1 /* D12 - PA6 */ -#define GPIO_SPI1_MOSI GPIO_SPI1_MOSI_1 /* D11 - PA7 */ -#define GPIO_SPI1_SCK GPIO_SPI1_SCK_1 /* D13 - PA5 */ +#define GPIO_SPI1_MISO (GPIO_SPI1_MISO_1|GPIO_SPEED_MEDIUM) /* D12 - PA6 */ +#define GPIO_SPI1_MOSI (GPIO_SPI1_MOSI_1|GPIO_SPEED_MEDIUM) /* D11 - PA7 */ +#define GPIO_SPI1_SCK (GPIO_SPI1_SCK_1|GPIO_SPEED_MEDIUM) /* D13 - PA5 */ /* USART 1 */ -#define GPIO_USART1_TX GPIO_USART1_TX_2 -#define GPIO_USART1_RX GPIO_USART1_RX_2 +#define GPIO_USART1_TX (GPIO_USART1_TX_2|GPIO_SPEED_HIGH) +#define GPIO_USART1_RX (GPIO_USART1_RX_2|GPIO_SPEED_HIGH) /* USART 2 */ -#define GPIO_USART2_TX GPIO_USART2_TX_3 -#define GPIO_USART2_RX GPIO_USART2_RX_3 +#define GPIO_USART2_TX (GPIO_USART2_TX_3|GPIO_SPEED_HIGH) +#define GPIO_USART2_RX (GPIO_USART2_RX_3|GPIO_SPEED_HIGH) #endif /* __BOARDS_ARM_STM32F0L0G0_NUCLEO_F091RC_INCLUDE_BOARD_H */ diff --git a/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig index f2764d0fd71..99024812e56 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig @@ -7,6 +7,7 @@ # # CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set +# CONFIG_STM32F0G0L0_USE_LEGACY_PINMAP is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-g070rb" CONFIG_ARCH_BOARD_NUCLEO_G070RB=y diff --git a/boards/arm/stm32f0l0g0/nucleo-g070rb/include/board.h b/boards/arm/stm32f0l0g0/nucleo-g070rb/include/board.h index 00b78131aec..7a6df83566c 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g070rb/include/board.h +++ b/boards/arm/stm32f0l0g0/nucleo-g070rb/include/board.h @@ -197,33 +197,33 @@ /* I2C */ -#define GPIO_I2C1_SCL GPIO_I2C1_SCL_3 /* PB8 */ -#define GPIO_I2C1_SDA GPIO_I2C1_SDA_3 /* PB9 */ +#define GPIO_I2C1_SCL (GPIO_I2C1_SCL_3|GPIO_SPEED_LOW) /* PB8 */ +#define GPIO_I2C1_SDA (GPIO_I2C1_SDA_3|GPIO_SPEED_LOW) /* PB9 */ /* TIM */ -#define GPIO_TIM1_CH1OUT GPIO_TIM1_CH1OUT_1 /* PA8 */ -#define GPIO_TIM1_CH2OUT GPIO_TIM1_CH2OUT_2 /* PB3 */ -#define GPIO_TIM1_CH3OUT GPIO_TIM1_CH3OUT_2 /* PB6 */ -#define GPIO_TIM1_CH4OUT GPIO_TIM1_CH4OUT_1 /* PA11 */ -#define GPIO_TIM1_CH1NOUT GPIO_TIM1_CH1NOUT_2 /* PB13 */ -#define GPIO_TIM1_CH2NOUT GPIO_TIM1_CH2NOUT_2 /* PB14 */ -#define GPIO_TIM1_CH3NOUT GPIO_TIM1_CH3NOUT_2 /* PB15 */ +#define GPIO_TIM1_CH1OUT (GPIO_TIM1_CH1OUT_1|GPIO_SPEED_LOW) /* PA8 */ +#define GPIO_TIM1_CH2OUT (GPIO_TIM1_CH2OUT_2|GPIO_SPEED_LOW) /* PB3 */ +#define GPIO_TIM1_CH3OUT (GPIO_TIM1_CH3OUT_2|GPIO_SPEED_LOW) /* PB6 */ +#define GPIO_TIM1_CH4OUT (GPIO_TIM1_CH4OUT_1|GPIO_SPEED_LOW) /* PA11 */ +#define GPIO_TIM1_CH1NOUT (GPIO_TIM1_CH1NOUT_2|GPIO_SPEED_LOW) /* PB13 */ +#define GPIO_TIM1_CH2NOUT (GPIO_TIM1_CH2NOUT_2|GPIO_SPEED_LOW) /* PB14 */ +#define GPIO_TIM1_CH3NOUT (GPIO_TIM1_CH3NOUT_2|GPIO_SPEED_LOW) /* PB15 */ -#define GPIO_TIM3_CH1OUT GPIO_TIM3_CH1OUT_2 /* PB4 */ -#define GPIO_TIM3_CH2OUT GPIO_TIM3_CH2OUT_2 /* PB5 */ -#define GPIO_TIM3_CH3OUT GPIO_TIM3_CH3OUT_1 /* PB0 */ -#define GPIO_TIM3_CH4OUT GPIO_TIM3_CH4OUT_1 /* PB1 */ +#define GPIO_TIM3_CH1OUT (GPIO_TIM3_CH1OUT_2|GPIO_SPEED_LOW) /* PB4 */ +#define GPIO_TIM3_CH2OUT (GPIO_TIM3_CH2OUT_2|GPIO_SPEED_LOW) /* PB5 */ +#define GPIO_TIM3_CH3OUT (GPIO_TIM3_CH3OUT_1|GPIO_SPEED_LOW) /* PB0 */ +#define GPIO_TIM3_CH4OUT (GPIO_TIM3_CH4OUT_1|GPIO_SPEED_LOW) /* PB1 */ -#define GPIO_TIM14_CH1OUT GPIO_TIM14_CH1OUT_2 /* PA7 */ +#define GPIO_TIM14_CH1OUT (GPIO_TIM14_CH1OUT_2|GPIO_SPEED_LOW) /* PA7 */ -#define GPIO_TIM15_CH1OUT GPIO_TIM15_CH1OUT_3 /* PC1 */ -#define GPIO_TIM15_CH2OUT GPIO_TIM15_CH2OUT_3 /* PC2 */ -#define GPIO_TIM15_CH1NOUT GPIO_TIM15_CH1NOUT_1 /* PA1 */ +#define GPIO_TIM15_CH1OUT (GPIO_TIM15_CH1OUT_3|GPIO_SPEED_LOW) /* PC1 */ +#define GPIO_TIM15_CH2OUT (GPIO_TIM15_CH2OUT_3|GPIO_SPEED_LOW) /* PC2 */ +#define GPIO_TIM15_CH1NOUT (GPIO_TIM15_CH1NOUT_1|GPIO_SPEED_LOW) /* PA1 */ -#define GPIO_TIM16_CH1OUT GPIO_TIM16_CH1OUT_3 /* PD0 */ +#define GPIO_TIM16_CH1OUT (GPIO_TIM16_CH1OUT_3|GPIO_SPEED_LOW) /* PD0 */ -#define GPIO_TIM17_CH1OUT GPIO_TIM17_CH1OUT_2 /* PD1 */ +#define GPIO_TIM17_CH1OUT (GPIO_TIM17_CH1OUT_2|GPIO_SPEED_LOW) /* PD1 */ /* USART */ @@ -232,8 +232,8 @@ * USART2_TX - PA2 */ -#define GPIO_USART2_RX GPIO_USART2_RX_1 /* PA3 */ -#define GPIO_USART2_TX GPIO_USART2_TX_1 /* PA2 */ +#define GPIO_USART2_RX (GPIO_USART2_RX_1|GPIO_SPEED_HIGH) /* PA3 */ +#define GPIO_USART2_TX (GPIO_USART2_TX_1|GPIO_SPEED_HIGH) /* PA2 */ /* DMA channels *************************************************************/ diff --git a/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig index 50b9cc31699..ee6ae0195ef 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig @@ -7,6 +7,7 @@ # # CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set +# CONFIG_STM32F0G0L0_USE_LEGACY_PINMAP is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-g071rb" CONFIG_ARCH_BOARD_NUCLEO_G071RB=y diff --git a/boards/arm/stm32f0l0g0/nucleo-g071rb/include/board.h b/boards/arm/stm32f0l0g0/nucleo-g071rb/include/board.h index 67bbbbf95b4..fea12da1f5f 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g071rb/include/board.h +++ b/boards/arm/stm32f0l0g0/nucleo-g071rb/include/board.h @@ -196,8 +196,8 @@ * USART2_TX - PA2 */ -#define GPIO_USART2_RX GPIO_USART2_RX_1 /* PA3 */ -#define GPIO_USART2_TX GPIO_USART2_TX_1 /* PA2 */ +#define GPIO_USART2_RX (GPIO_USART2_RX_1|GPIO_SPEED_HIGH) /* PA3 */ +#define GPIO_USART2_TX (GPIO_USART2_TX_1|GPIO_SPEED_HIGH) /* PA2 */ /* DMA channels *************************************************************/ diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig index d5f49ac9673..b955eb3a281 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig @@ -7,6 +7,7 @@ # # CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set +# CONFIG_STM32F0G0L0_USE_LEGACY_PINMAP is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-l073rz" CONFIG_ARCH_BOARD_NUCLEO_L073RZ=y diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig index 5079db41da6..fdaf1bfd515 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig @@ -7,6 +7,7 @@ # # CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set +# CONFIG_STM32F0G0L0_USE_LEGACY_PINMAP is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-l073rz" CONFIG_ARCH_BOARD_NUCLEO_L073RZ=y diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/include/board.h b/boards/arm/stm32f0l0g0/nucleo-l073rz/include/board.h index 2a7629db65a..76f226e0f36 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/include/board.h +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/include/board.h @@ -167,20 +167,20 @@ /* I2C */ -#define GPIO_I2C1_SCL GPIO_I2C1_SCL_2 /* D15 - PB8 */ -#define GPIO_I2C1_SDA GPIO_I2C1_SDA_2 /* D14 - PB9 */ +#define GPIO_I2C1_SCL (GPIO_I2C1_SCL_2|GPIO_SPEED_LOW) /* D15 - PB8 */ +#define GPIO_I2C1_SDA (GPIO_I2C1_SDA_2|GPIO_SPEED_LOW) /* D14 - PB9 */ /* SPI1 */ -#define GPIO_SPI1_MISO GPIO_SPI1_MISO_2 /* D12 - PA6 */ -#define GPIO_SPI1_MOSI GPIO_SPI1_MOSI_2 /* D11 - PA7 */ -#define GPIO_SPI1_SCK GPIO_SPI1_SCK_1 /* D13 - PA5 */ +#define GPIO_SPI1_MISO (GPIO_SPI1_MISO_2|GPIO_SPEED_MEDIUM) /* D12 - PA6 */ +#define GPIO_SPI1_MOSI (GPIO_SPI1_MOSI_2|GPIO_SPEED_MEDIUM) /* D11 - PA7 */ +#define GPIO_SPI1_SCK (GPIO_SPI1_SCK_1|GPIO_SPEED_MEDIUM) /* D13 - PA5 */ /* SPI2 */ -#define GPIO_SPI2_MISO GPIO_SPI2_MISO_1 /* PB14 */ -#define GPIO_SPI2_MOSI GPIO_SPI2_MOSI_1 /* PB15 */ -#define GPIO_SPI2_SCK GPIO_SPI2_SCK_1 /* PB10 */ +#define GPIO_SPI2_MISO (GPIO_SPI2_MISO_1|GPIO_SPEED_MEDIUM) /* PB14 */ +#define GPIO_SPI2_MOSI (GPIO_SPI2_MOSI_1|GPIO_SPEED_MEDIUM) /* PB15 */ +#define GPIO_SPI2_SCK (GPIO_SPI2_SCK_1|GPIO_SPEED_MEDIUM) /* PB10 */ /* USART */ @@ -189,8 +189,8 @@ * USART2_TX - PA2 */ -#define GPIO_USART2_RX GPIO_USART2_RX_1 /* PA3 */ -#define GPIO_USART2_TX GPIO_USART2_TX_1 /* PA2 */ +#define GPIO_USART2_RX (GPIO_USART2_RX_1|GPIO_SPEED_HIGH) /* PA3 */ +#define GPIO_USART2_TX (GPIO_USART2_TX_1|GPIO_SPEED_HIGH) /* PA2 */ /* DMA channels *************************************************************/ diff --git a/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig index b14fb027f68..495d69c12e2 100644 --- a/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_DISABLE_HEXDUMP is not set # CONFIG_NSH_DISABLE_PS is not set # CONFIG_NSH_DISABLE_XD is not set +# CONFIG_STM32F0G0L0_USE_LEGACY_PINMAP is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f051-discovery" CONFIG_ARCH_BOARD_STM32F051_DISCOVERY=y diff --git a/boards/arm/stm32f0l0g0/stm32f051-discovery/include/board.h b/boards/arm/stm32f0l0g0/stm32f051-discovery/include/board.h index 2331131ce66..6142cf39591 100644 --- a/boards/arm/stm32f0l0g0/stm32f051-discovery/include/board.h +++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/include/board.h @@ -228,12 +228,12 @@ /* USART 1 */ -#define GPIO_USART1_TX GPIO_USART1_TX_1 -#define GPIO_USART1_RX GPIO_USART1_RX_1 +#define GPIO_USART1_TX (GPIO_USART1_TX_1|GPIO_SPEED_HIGH) +#define GPIO_USART1_RX (GPIO_USART1_RX_1|GPIO_SPEED_HIGH) /* I2C pins definition */ -#define GPIO_I2C1_SCL GPIO_I2C1_SCL_1 -#define GPIO_I2C1_SDA GPIO_I2C1_SDA_1 +#define GPIO_I2C1_SCL (GPIO_I2C1_SCL_1|GPIO_SPEED_LOW) +#define GPIO_I2C1_SDA (GPIO_I2C1_SDA_1|GPIO_SPEED_LOW) #endif /* __BOARDS_ARM_STM32F0L0G0_STM32F051_DISCOVERY_INCLUDE_BOARD_H */ diff --git a/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig index 9bc9ab0aff7..b33efa3a271 100644 --- a/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig @@ -11,6 +11,7 @@ # CONFIG_NSH_DISABLE_HEXDUMP is not set # CONFIG_NSH_DISABLE_PS is not set # CONFIG_NSH_DISABLE_XD is not set +# CONFIG_STM32F0G0L0_USE_LEGACY_PINMAP is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f072-discovery" CONFIG_ARCH_BOARD_STM32F072_DISCOVERY=y diff --git a/boards/arm/stm32f0l0g0/stm32f072-discovery/include/board.h b/boards/arm/stm32f0l0g0/stm32f072-discovery/include/board.h index dab7547deb2..ffeeaa1943a 100644 --- a/boards/arm/stm32f0l0g0/stm32f072-discovery/include/board.h +++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/include/board.h @@ -233,12 +233,12 @@ /* USART 1 */ -#define GPIO_USART1_TX GPIO_USART1_TX_1 -#define GPIO_USART1_RX GPIO_USART1_RX_1 +#define GPIO_USART1_TX (GPIO_USART1_TX_1|GPIO_SPEED_HIGH) +#define GPIO_USART1_RX (GPIO_USART1_RX_1|GPIO_SPEED_HIGH) /* I2C pins definition */ -#define GPIO_I2C1_SCL GPIO_I2C1_SCL_1 -#define GPIO_I2C1_SDA GPIO_I2C1_SDA_1 +#define GPIO_I2C1_SCL (GPIO_I2C1_SCL_1|GPIO_SPEED_LOW) +#define GPIO_I2C1_SDA (GPIO_I2C1_SDA_1|GPIO_SPEED_LOW) #endif /* __BOARDS_ARM_STM32F0L0G0_STM32F072_DISCOVERY_INCLUDE_BOARD_H */ diff --git a/boards/arm/stm32f0l0g0/stm32g071b-disco/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/stm32g071b-disco/configs/nsh/defconfig index fdf3d5102de..4e5fcc99fb4 100644 --- a/boards/arm/stm32f0l0g0/stm32g071b-disco/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/stm32g071b-disco/configs/nsh/defconfig @@ -8,6 +8,7 @@ # CONFIG_ARCH_LEDS is not set # CONFIG_LIBC_LONG_LONG is not set # CONFIG_NSH_ARGCAT is not set +# CONFIG_STM32F0G0L0_USE_LEGACY_PINMAP is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32g071b-disco" CONFIG_ARCH_BOARD_STM32G071B_DISCO=y diff --git a/boards/arm/stm32f0l0g0/stm32g071b-disco/configs/oled/defconfig b/boards/arm/stm32f0l0g0/stm32g071b-disco/configs/oled/defconfig index 173abc2a1ef..03e7b0a42db 100644 --- a/boards/arm/stm32f0l0g0/stm32g071b-disco/configs/oled/defconfig +++ b/boards/arm/stm32f0l0g0/stm32g071b-disco/configs/oled/defconfig @@ -9,6 +9,7 @@ # CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS is not set # CONFIG_NSH_ARGCAT is not set # CONFIG_NX_DISABLE_1BPP is not set +# CONFIG_STM32F0G0L0_USE_LEGACY_PINMAP is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32g071b-disco" CONFIG_ARCH_BOARD_COMMON=y diff --git a/boards/arm/stm32f0l0g0/stm32g071b-disco/include/board.h b/boards/arm/stm32f0l0g0/stm32g071b-disco/include/board.h index 266184c7029..6c86ac6dc11 100644 --- a/boards/arm/stm32f0l0g0/stm32g071b-disco/include/board.h +++ b/boards/arm/stm32f0l0g0/stm32g071b-disco/include/board.h @@ -154,16 +154,16 @@ * USART3_TX - PC10 */ -#define GPIO_USART3_RX GPIO_USART3_RX_6 /* PC11 */ -#define GPIO_USART3_TX GPIO_USART3_TX_6 /* PC10 */ +#define GPIO_USART3_RX (GPIO_USART3_RX_6|GPIO_SPEED_HIGH) /* PC11 */ +#define GPIO_USART3_TX (GPIO_USART3_TX_6|GPIO_SPEED_HIGH) /* PC10 */ /* I2C1 * I2C1_SCL - PB6 * I2C1_SDA - PB7 */ -#define GPIO_I2C1_SCL GPIO_I2C1_SCL_2 /* PB6 */ -#define GPIO_I2C1_SDA GPIO_I2C1_SDA_2 /* PB7 */ +#define GPIO_I2C1_SCL (GPIO_I2C1_SCL_2|GPIO_SPEED_LOW) /* PB6 */ +#define GPIO_I2C1_SDA (GPIO_I2C1_SDA_2|GPIO_SPEED_LOW) /* PB7 */ /* SPI1 - OLED display * SPI1_MISO - not used @@ -171,8 +171,8 @@ * SPI1_SCK - PA1 */ -#define GPIO_SPI1_MISO 0 /* Not used - simplex tx */ -#define GPIO_SPI1_MOSI GPIO_SPI1_MOSI_1 /* PA2 */ -#define GPIO_SPI1_SCK GPIO_SPI1_SCK_1 /* PA1 */ +#define GPIO_SPI1_MISO (0) /* Not used - simplex tx */ +#define GPIO_SPI1_MOSI (GPIO_SPI1_MOSI_1|GPIO_SPEED_MEDIUM) /* PA2 */ +#define GPIO_SPI1_SCK (GPIO_SPI1_SCK_1|GPIO_SPEED_MEDIUM) /* PA1 */ #endif /* __BOARDS_ARM_STM32F0L0G0_STM32G071B_DISCO_INCLUDE_BOARD_H */ diff --git a/boards/arm/stm32f0l0g0/stm32l0538-disco/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/stm32l0538-disco/configs/nsh/defconfig index c0fafdb6599..7ed505fdd36 100644 --- a/boards/arm/stm32f0l0g0/stm32l0538-disco/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/stm32l0538-disco/configs/nsh/defconfig @@ -6,6 +6,7 @@ # modifications. # # CONFIG_LIBC_LONG_LONG is not set +# CONFIG_STM32F0G0L0_USE_LEGACY_PINMAP is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32l0538-disco" CONFIG_ARCH_BOARD_STM32L0538_DISCO=y diff --git a/boards/arm/stm32f0l0g0/stm32l0538-disco/include/board.h b/boards/arm/stm32f0l0g0/stm32l0538-disco/include/board.h index c21ae58ad17..4ca871a46a7 100644 --- a/boards/arm/stm32f0l0g0/stm32l0538-disco/include/board.h +++ b/boards/arm/stm32f0l0g0/stm32l0538-disco/include/board.h @@ -167,8 +167,8 @@ * USART1_TX - PA9 */ -#define GPIO_USART1_RX GPIO_USART1_RX_1 /* PA10 */ -#define GPIO_USART1_TX GPIO_USART1_TX_1 /* PA9 */ +#define GPIO_USART1_RX (GPIO_USART1_RX_1|GPIO_SPEED_HIGH) /* PA10 */ +#define GPIO_USART1_TX (GPIO_USART1_TX_1|GPIO_SPEED_HIGH) /* PA9 */ /* SPI1 - E-papper display: * SPI1_MISO - not used @@ -176,9 +176,9 @@ * SPI1_SCK - PB3 */ -#undef GPIO_SPI1_MISO /* Not used */ -#define GPIO_SPI1_MOSI GPIO_SPI1_MOSI_3 /* PB5 */ -#define GPIO_SPI1_SCK GPIO_SPI1_SCK_2 /* PB3 */ +#undef GPIO_SPI1_MISO /* Not used */ +#define GPIO_SPI1_MOSI (GPIO_SPI1_MOSI_3|GPIO_SPEED_MEDIUM) /* PB5 */ +#define GPIO_SPI1_SCK (GPIO_SPI1_SCK_2|GPIO_SPEED_MEDIUM) /* PB3 */ /* SPI2 - NFC connector: * SPI2_MISO - PB14 @@ -186,8 +186,8 @@ * SPI2_SCK - PB13 */ -#define GPIO_SPI2_MISO GPIO_SPI2_MISO_1 /* PB14 */ -#define GPIO_SPI2_MOSI GPIO_SPI2_MOSI_1 /* PB15 */ -#define GPIO_SPI2_SCK GPIO_SPI2_SCK_3 /* PB13 */ +#define GPIO_SPI2_MISO (GPIO_SPI2_MISO_1|GPIO_SPEED_MEDIUM) /* PB14 */ +#define GPIO_SPI2_MOSI (GPIO_SPI2_MOSI_1|GPIO_SPEED_MEDIUM) /* PB15 */ +#define GPIO_SPI2_SCK (GPIO_SPI2_SCK_3|GPIO_SPEED_MEDIUM) /* PB13 */ #endif /* __BOARDS_ARM_STM32F0L0G0_STM32L0538_DISCO_INCLUDE_BOARD_H */