drivers: pinctrl device interface (Linux-like) and STM32F0 driver

CMakeLists.txt

@@ -341,6 +341,13 @@ add_subdirectory(subsys)
 add_subdirectory(drivers)
 add_subdirectory(tests)
 
+# Add all generated zephyr sources in the same context as the zephyr library
+# is created. Assure all sub directories that might invoke code generation
+# are processed before.
+get_property(zephyr_generated_sources GLOBAL PROPERTY zephyr_generated_sources_property)
+set_source_files_properties(${zephyr_generated_sources} PROPERTIES GENERATED 1)
+target_sources(zephyr PRIVATE ${zephyr_generated_sources})
+
 set(syscall_macros_h ${ZEPHYR_BINARY_DIR}/include/generated/syscall_macros.h)
 
 add_custom_target(syscall_macros_h_target DEPENDS ${syscall_macros_h})

arch/arm/soc/st_stm32/stm32f0/CMakeLists.txt

@@ -1,3 +1,5 @@
 zephyr_include_directories(${ZEPHYR_BASE}/drivers)
 zephyr_sources(soc.c)
-zephyr_sources_ifdef(CONFIG_GPIO soc_gpio.c)
+if(!CONFIG_PINCTRL)
+zephyr_sources_ifdef(CONFIG_GPIO_STM32 soc_gpio.c)
+endif()

arch/arm/soc/st_stm32/stm32f0/Kconfig.defconfig.series

@@ -12,16 +12,9 @@ source "arch/arm/soc/st_stm32/stm32f0/Kconfig.defconfig.stm32f0*"
 config SOC_SERIES
 	default "stm32f0"
 
-if GPIO_STM32
-
-config GPIO_STM32_PORTD
-	default y
-
-config GPIO_STM32_PORTF
+config PINCTRL
 	default y
 
-endif # GPIO_STM32
-
 if I2C_STM32
 
 config I2C_STM32_V2

arch/arm/soc/st_stm32/stm32f0/dts.fixup

@@ -2,51 +2,6 @@
 
 #define CONFIG_NUM_IRQ_PRIO_BITS	        ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
 
-#define CONFIG_UART_STM32_USART_1_BASE_ADDRESS	ST_STM32_USART_40013800_BASE_ADDRESS
-#define CONFIG_UART_STM32_USART_1_BAUD_RATE	ST_STM32_USART_40013800_CURRENT_SPEED
-#define CONFIG_UART_STM32_USART_1_IRQ_PRI	ST_STM32_USART_40013800_IRQ_0_PRIORITY
-#define CONFIG_UART_STM32_USART_1_NAME		ST_STM32_USART_40013800_LABEL
-#define USART_1_IRQ				ST_STM32_USART_40013800_IRQ_0
-
-#define CONFIG_UART_STM32_USART_2_BASE_ADDRESS	ST_STM32_USART_40004400_BASE_ADDRESS
-#define CONFIG_UART_STM32_USART_2_BAUD_RATE	ST_STM32_USART_40004400_CURRENT_SPEED
-#define CONFIG_UART_STM32_USART_2_IRQ_PRI	ST_STM32_USART_40004400_IRQ_0_PRIORITY
-#define CONFIG_UART_STM32_USART_2_NAME		ST_STM32_USART_40004400_LABEL
-#define USART_2_IRQ				ST_STM32_USART_40004400_IRQ_0
-
-#define CONFIG_I2C_1_BASE_ADDRESS		ST_STM32_I2C_V2_40005400_BASE_ADDRESS
-#define CONFIG_I2C_1_COMBINED_IRQ_PRI		ST_STM32_I2C_V2_40005400_IRQ_COMBINED_PRIORITY
-#define CONFIG_I2C_1_NAME			ST_STM32_I2C_V2_40005400_LABEL
-#define CONFIG_I2C_1_COMBINED_IRQ		ST_STM32_I2C_V2_40005400_IRQ_COMBINED
-#define CONFIG_I2C_1_BITRATE			ST_STM32_I2C_V2_40005400_CLOCK_FREQUENCY
-
-#define CONFIG_I2C_2_BASE_ADDRESS		ST_STM32_I2C_V2_40005800_BASE_ADDRESS
-#define CONFIG_I2C_2_COMBINED_IRQ_PRI		ST_STM32_I2C_V2_40005800_IRQ_COMBINED_PRIORITY
-#define CONFIG_I2C_2_NAME			ST_STM32_I2C_V2_40005800_LABEL
-#define CONFIG_I2C_2_COMBINED_IRQ		ST_STM32_I2C_V2_40005800_IRQ_COMBINED
-#define CONFIG_I2C_2_BITRATE			ST_STM32_I2C_V2_40005800_CLOCK_FREQUENCY
-
-#define CONFIG_SPI_1_BASE_ADDRESS		ST_STM32_SPI_FIFO_40013000_BASE_ADDRESS
-#define CONFIG_SPI_1_IRQ_PRI			ST_STM32_SPI_FIFO_40013000_IRQ_0_PRIORITY
-#define CONFIG_SPI_1_NAME			ST_STM32_SPI_FIFO_40013000_LABEL
-#define CONFIG_SPI_1_IRQ			ST_STM32_SPI_FIFO_40013000_IRQ_0
-
-#define CONFIG_SPI_2_BASE_ADDRESS		ST_STM32_SPI_FIFO_40003800_BASE_ADDRESS
-#define CONFIG_SPI_2_IRQ_PRI			ST_STM32_SPI_FIFO_40003800_IRQ_0_PRIORITY
-#define CONFIG_SPI_2_NAME			ST_STM32_SPI_FIFO_40003800_LABEL
-#define CONFIG_SPI_2_IRQ			ST_STM32_SPI_FIFO_40003800_IRQ_0
-
-#define CONFIG_CAN_1_BASE_ADDRESS		ST_STM32_CAN_40006400_BASE_ADDRESS
-#define CONFIG_CAN_1_BUS_SPEED			ST_STM32_CAN_40006400_BUS_SPEED
-#define CONFIG_CAN_1_NAME			ST_STM32_CAN_40006400_LABEL
-#define CONFIG_CAN_1_IRQ			ST_STM32_CAN_40006400_IRQ_0
-#define CONFIG_CAN_1_IRQ_PRIORITY		ST_STM32_CAN_40006400_IRQ_0_PRIORITY
-#define CONFIG_CAN_1_SJW			ST_STM32_CAN_40006400_SJW
-#define CONFIG_CAN_1_PROP_SEG_PHASE_SEG1	ST_STM32_CAN_40006400_PROP_SEG_PHASE_SEG1
-#define CONFIG_CAN_1_PHASE_SEG2			ST_STM32_CAN_40006400_PHASE_SEG2
-#define CONFIG_CAN_1_CLOCK_BUS			ST_STM32_CAN_40006400_CLOCK_BUS
-#define CONFIG_CAN_1_CLOCK_BITS			ST_STM32_CAN_40006400_CLOCK_BITS
-
 #define FLASH_DEV_BASE_ADDRESS		        ST_STM32F0_FLASH_CONTROLLER_40022000_BASE_ADDRESS
 #define FLASH_DEV_NAME			        ST_STM32F0_FLASH_CONTROLLER_40022000_LABEL
 
@@ -56,31 +11,4 @@
 #define CONFIG_USB_NUM_BIDIR_ENDPOINTS		ST_STM32_USB_40005C00_NUM_BIDIR_ENDPOINTS
 #define CONFIG_USB_RAM_SIZE			ST_STM32_USB_40005C00_RAM_SIZE
 
-#define CONFIG_PWM_STM32_1_DEV_NAME             ST_STM32_PWM_40012C00_PWM_LABEL
-#define CONFIG_PWM_STM32_1_PRESCALER            ST_STM32_PWM_40012C00_PWM_ST_PRESCALER
-
-#define CONFIG_PWM_STM32_2_DEV_NAME             ST_STM32_PWM_40000000_PWM_LABEL
-#define CONFIG_PWM_STM32_2_PRESCALER            ST_STM32_PWM_40000000_PWM_ST_PRESCALER
-
-#define CONFIG_PWM_STM32_3_DEV_NAME             ST_STM32_PWM_40000400_PWM_LABEL
-#define CONFIG_PWM_STM32_3_PRESCALER            ST_STM32_PWM_40000400_PWM_ST_PRESCALER
-
-#define CONFIG_PWM_STM32_6_DEV_NAME             ST_STM32_PWM_40001000_PWM_LABEL
-#define CONFIG_PWM_STM32_6_PRESCALER            ST_STM32_PWM_40001000_PWM_ST_PRESCALER
-
-#define CONFIG_PWM_STM32_7_DEV_NAME             ST_STM32_PWM_40001400_PWM_LABEL
-#define CONFIG_PWM_STM32_7_PRESCALER            ST_STM32_PWM_40001400_PWM_ST_PRESCALER
-
-#define CONFIG_PWM_STM32_14_DEV_NAME            ST_STM32_PWM_40002000_PWM_LABEL
-#define CONFIG_PWM_STM32_14_PRESCALER           ST_STM32_PWM_40002000_PWM_ST_PRESCALER
-
-#define CONFIG_PWM_STM32_15_DEV_NAME            ST_STM32_PWM_40014000_PWM_LABEL
-#define CONFIG_PWM_STM32_15_PRESCALER           ST_STM32_PWM_40014000_PWM_ST_PRESCALER
-
-#define CONFIG_PWM_STM32_16_DEV_NAME            ST_STM32_PWM_40014400_PWM_LABEL
-#define CONFIG_PWM_STM32_16_PRESCALER           ST_STM32_PWM_40014400_PWM_ST_PRESCALER
-
-#define CONFIG_PWM_STM32_17_DEV_NAME            ST_STM32_PWM_40014800_PWM_LABEL
-#define CONFIG_PWM_STM32_17_PRESCALER           ST_STM32_PWM_40014800_PWM_ST_PRESCALER
-
 /* End of SoC Level DTS fixup file */

arch/arm/soc/st_stm32/stm32f0/soc.h

@@ -43,6 +43,19 @@
 #include <stm32f0xx_ll_system.h>
 #endif /* CONFIG_CLOCK_CONTROL_STM32_CUBE */
 
+#ifdef CONFIG_PINCTRL_STM32
+#include <stm32f0xx_ll_gpio.h>
+#include <stm32f0xx_ll_exti.h>
+#include <stm32f0xx_ll_system.h>
+#endif
+
+#ifdef CONFIG_GPIO_STM32
+#include <stm32f0xx_ll_bus.h>
+#include <stm32f0xx_ll_exti.h>
+#include <stm32f0xx_ll_gpio.h>
+#include <stm32f0xx_ll_system.h>
+#endif
+
 #ifdef CONFIG_IWDG_STM32
 #include <stm32f0xx_ll_iwdg.h>
 #endif

arch/arm/soc/st_stm32/stm32f1/dts.fixup

@@ -2,89 +2,10 @@
 
 #define CONFIG_NUM_IRQ_PRIO_BITS                ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
 
-#define CONFIG_UART_STM32_USART_1_BASE_ADDRESS   ST_STM32_USART_40013800_BASE_ADDRESS
-#define CONFIG_UART_STM32_USART_1_BAUD_RATE      ST_STM32_USART_40013800_CURRENT_SPEED
-#define CONFIG_UART_STM32_USART_1_IRQ_PRI        ST_STM32_USART_40013800_IRQ_0_PRIORITY
-#define CONFIG_UART_STM32_USART_1_NAME           ST_STM32_USART_40013800_LABEL
-#define USART_1_IRQ                              ST_STM32_USART_40013800_IRQ_0
-
-#define CONFIG_UART_STM32_USART_2_BASE_ADDRESS   ST_STM32_USART_40004400_BASE_ADDRESS
-#define CONFIG_UART_STM32_USART_2_BAUD_RATE      ST_STM32_USART_40004400_CURRENT_SPEED
-#define CONFIG_UART_STM32_USART_2_IRQ_PRI        ST_STM32_USART_40004400_IRQ_0_PRIORITY
-#define CONFIG_UART_STM32_USART_2_NAME           ST_STM32_USART_40004400_LABEL
-#define USART_2_IRQ                              ST_STM32_USART_40004400_IRQ_0
-
-#define CONFIG_UART_STM32_USART_3_BASE_ADDRESS   ST_STM32_USART_40004800_BASE_ADDRESS
-#define CONFIG_UART_STM32_USART_3_BAUD_RATE      ST_STM32_USART_40004800_CURRENT_SPEED
-#define CONFIG_UART_STM32_USART_3_IRQ_PRI        ST_STM32_USART_40004800_IRQ_0_PRIORITY
-#define CONFIG_UART_STM32_USART_3_NAME           ST_STM32_USART_40004800_LABEL
-#define USART_3_IRQ                              ST_STM32_USART_40004800_IRQ_0
-
-#define CONFIG_UART_STM32_PORT_4_BASE_ADDRESS   ST_STM32_UART_40004C00_BASE_ADDRESS
-#define CONFIG_UART_STM32_PORT_4_BAUD_RATE      ST_STM32_UART_40004C00_CURRENT_SPEED
-#define CONFIG_UART_STM32_PORT_4_IRQ_PRI        ST_STM32_UART_40004C00_IRQ_0_PRIORITY
-#define CONFIG_UART_STM32_PORT_4_NAME           ST_STM32_UART_40004C00_LABEL
-#define PORT_4_IRQ                              ST_STM32_UART_40004C00_IRQ_0
-
-#define CONFIG_I2C_1_BASE_ADDRESS               ST_STM32_I2C_V1_40005400_BASE_ADDRESS
-#define CONFIG_I2C_1_EVENT_IRQ_PRI              ST_STM32_I2C_V1_40005400_IRQ_EVENT_PRIORITY
-#define CONFIG_I2C_1_ERROR_IRQ_PRI              ST_STM32_I2C_V1_40005400_IRQ_ERROR_PRIORITY
-#define CONFIG_I2C_1_NAME                       ST_STM32_I2C_V1_40005400_LABEL
-#define CONFIG_I2C_1_EVENT_IRQ                  ST_STM32_I2C_V1_40005400_IRQ_EVENT
-#define CONFIG_I2C_1_ERROR_IRQ                  ST_STM32_I2C_V1_40005400_IRQ_ERROR
-#define CONFIG_I2C_1_BITRATE                    ST_STM32_I2C_V1_40005400_CLOCK_FREQUENCY
-
-#define CONFIG_I2C_2_BASE_ADDRESS               ST_STM32_I2C_V1_40005800_BASE_ADDRESS
-#define CONFIG_I2C_2_EVENT_IRQ_PRI              ST_STM32_I2C_V1_40005800_IRQ_EVENT_PRIORITY
-#define CONFIG_I2C_2_ERROR_IRQ_PRI              ST_STM32_I2C_V1_40005800_IRQ_ERROR_PRIORITY
-#define CONFIG_I2C_2_NAME                       ST_STM32_I2C_V1_40005800_LABEL
-#define CONFIG_I2C_2_EVENT_IRQ                  ST_STM32_I2C_V1_40005800_IRQ_EVENT
-#define CONFIG_I2C_2_ERROR_IRQ                  ST_STM32_I2C_V1_40005800_IRQ_ERROR
-#define CONFIG_I2C_2_BITRATE                    ST_STM32_I2C_V1_40005800_CLOCK_FREQUENCY
-
-#define CONFIG_SPI_1_BASE_ADDRESS		ST_STM32_SPI_40013000_BASE_ADDRESS
-#define CONFIG_SPI_1_IRQ_PRI			ST_STM32_SPI_40013000_IRQ_0_PRIORITY
-#define CONFIG_SPI_1_NAME			ST_STM32_SPI_40013000_LABEL
-#define CONFIG_SPI_1_IRQ			ST_STM32_SPI_40013000_IRQ_0
-
-#define CONFIG_SPI_2_BASE_ADDRESS		ST_STM32_SPI_40003800_BASE_ADDRESS
-#define CONFIG_SPI_2_IRQ_PRI			ST_STM32_SPI_40003800_IRQ_0_PRIORITY
-#define CONFIG_SPI_2_NAME			ST_STM32_SPI_40003800_LABEL
-#define CONFIG_SPI_2_IRQ			ST_STM32_SPI_40003800_IRQ_0
-
-#define CONFIG_SPI_3_BASE_ADDRESS		ST_STM32_SPI_40003C00_BASE_ADDRESS
-#define CONFIG_SPI_3_IRQ_PRI			ST_STM32_SPI_40003C00_IRQ_0_PRIORITY
-#define CONFIG_SPI_3_NAME			ST_STM32_SPI_40003C00_LABEL
-#define CONFIG_SPI_3_IRQ			ST_STM32_SPI_40003C00_IRQ_0
-
 #define CONFIG_USB_BASE_ADDRESS			ST_STM32_USB_40005C00_BASE_ADDRESS
 #define CONFIG_USB_IRQ				ST_STM32_USB_40005C00_IRQ_USB
 #define CONFIG_USB_IRQ_PRI			ST_STM32_USB_40005C00_IRQ_USB_PRIORITY
 #define CONFIG_USB_NUM_BIDIR_ENDPOINTS		ST_STM32_USB_40005C00_NUM_BIDIR_ENDPOINTS
 #define CONFIG_USB_RAM_SIZE			ST_STM32_USB_40005C00_RAM_SIZE
 
-#define CONFIG_PWM_STM32_1_DEV_NAME             ST_STM32_PWM_40012C00_PWM_LABEL
-#define CONFIG_PWM_STM32_1_PRESCALER            ST_STM32_PWM_40012C00_PWM_ST_PRESCALER
-
-#define CONFIG_PWM_STM32_2_DEV_NAME             ST_STM32_PWM_40000000_PWM_LABEL
-#define CONFIG_PWM_STM32_2_PRESCALER            ST_STM32_PWM_40000000_PWM_ST_PRESCALER
-
-#define CONFIG_PWM_STM32_3_DEV_NAME             ST_STM32_PWM_40000400_PWM_LABEL
-#define CONFIG_PWM_STM32_3_PRESCALER            ST_STM32_PWM_40000400_PWM_ST_PRESCALER
-
-#define CONFIG_PWM_STM32_4_DEV_NAME             ST_STM32_PWM_40000800_PWM_LABEL
-#define CONFIG_PWM_STM32_4_PRESCALER            ST_STM32_PWM_40000800_PWM_ST_PRESCALER
-
-#define CONFIG_PWM_STM32_5_DEV_NAME             ST_STM32_PWM_40000C00_PWM_LABEL
-#define CONFIG_PWM_STM32_5_PRESCALER            ST_STM32_PWM_40000C00_PWM_ST_PRESCALER
-
-#define CONFIG_PWM_STM32_6_DEV_NAME             ST_STM32_PWM_40001000_PWM_LABEL
-#define CONFIG_PWM_STM32_6_PRESCALER            ST_STM32_PWM_40001000_PWM_ST_PRESCALER
-
-#define CONFIG_PWM_STM32_7_DEV_NAME             ST_STM32_PWM_40001400_PWM_LABEL
-#define CONFIG_PWM_STM32_7_PRESCALER            ST_STM32_PWM_40001400_PWM_ST_PRESCALER
-
-#define CONFIG_PWM_STM32_8_DEV_NAME             ST_STM32_PWM_40013400_PWM_LABEL
-#define CONFIG_PWM_STM32_8_PRESCALER            ST_STM32_PWM_40013400_PWM_ST_PRESCALER
-
 /* End of SoC Level DTS fixup file */

arch/arm/soc/st_stm32/stm32f2/dts.fixup

@@ -2,42 +2,6 @@
 
 #define CONFIG_NUM_IRQ_PRIO_BITS		ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
 
-#define CONFIG_UART_STM32_USART_1_BASE_ADDRESS	ST_STM32_USART_40011000_BASE_ADDRESS
-#define CONFIG_UART_STM32_USART_1_BAUD_RATE	ST_STM32_USART_40011000_CURRENT_SPEED
-#define CONFIG_UART_STM32_USART_1_IRQ_PRI	ST_STM32_USART_40011000_IRQ_0_PRIORITY
-#define CONFIG_UART_STM32_USART_1_NAME		ST_STM32_USART_40011000_LABEL
-#define USART_1_IRQ				ST_STM32_USART_40011000_IRQ_0
-
-#define CONFIG_UART_STM32_USART_2_BASE_ADDRESS	ST_STM32_USART_40004400_BASE_ADDRESS
-#define CONFIG_UART_STM32_USART_2_BAUD_RATE	ST_STM32_USART_40004400_CURRENT_SPEED
-#define CONFIG_UART_STM32_USART_2_IRQ_PRI	ST_STM32_USART_40004400_IRQ_0_PRIORITY
-#define CONFIG_UART_STM32_USART_2_NAME		ST_STM32_USART_40004400_LABEL
-#define USART_2_IRQ				ST_STM32_USART_40004400_IRQ_0
-
-#define CONFIG_UART_STM32_USART_3_BASE_ADDRESS   ST_STM32_USART_40004800_BASE_ADDRESS
-#define CONFIG_UART_STM32_USART_3_BAUD_RATE      ST_STM32_USART_40004800_CURRENT_SPEED
-#define CONFIG_UART_STM32_USART_3_IRQ_PRI        ST_STM32_USART_40004800_IRQ_0_PRIORITY
-#define CONFIG_UART_STM32_USART_3_NAME           ST_STM32_USART_40004800_LABEL
-#define USART_3_IRQ                              ST_STM32_USART_40004800_IRQ_0
-
-#define CONFIG_UART_STM32_USART_6_NAME           ST_STM32_USART_40011400_LABEL
-#define CONFIG_UART_STM32_USART_6_BASE_ADDRESS   ST_STM32_USART_40011400_BASE_ADDRESS
-#define CONFIG_UART_STM32_USART_6_BAUD_RATE      ST_STM32_USART_40011400_CURRENT_SPEED
-#define CONFIG_UART_STM32_USART_6_IRQ_PRI        ST_STM32_USART_40011400_IRQ_0_PRIORITY
-#define USART_6_IRQ                              ST_STM32_USART_40011400_IRQ_0
-
-#define CONFIG_UART_STM32_UART_4_NAME		ST_STM32_UART_40004C00_LABEL
-#define CONFIG_UART_STM32_UART_4_BASE_ADDRESS	ST_STM32_UART_40004C00_BASE_ADDRESS
-#define CONFIG_UART_STM32_UART_4_BAUD_RATE	ST_STM32_UART_40004C00_CURRENT_SPEED
-#define CONFIG_UART_STM32_UART_4_IRQ_PRI	ST_STM32_UART_40004C00_IRQ_0_PRIORITY
-#define UART_4_IRQ				ST_STM32_UART_40004C00_IRQ_0
-
-#define CONFIG_UART_STM32_UART_5_NAME		ST_STM32_UART_40005000_LABEL
-#define CONFIG_UART_STM32_UART_5_BASE_ADDRESS	ST_STM32_UART_40005000_BASE_ADDRESS
-#define CONFIG_UART_STM32_UART_5_BAUD_RATE	ST_STM32_UART_40005000_CURRENT_SPEED
-#define CONFIG_UART_STM32_UART_5_IRQ_PRI	ST_STM32_UART_40005000_IRQ_0_PRIORITY
-#define UART_5_IRQ				ST_STM32_UART_40005000_IRQ_0
-
 #define CONFIG_USB_BASE_ADDRESS			ST_STM32_OTGFS_50000000_BASE_ADDRESS
 #define CONFIG_USB_IRQ				ST_STM32_OTGFS_50000000_IRQ_OTGFS
 #define CONFIG_USB_IRQ_PRI			ST_STM32_OTGFS_50000000_IRQ_OTGFS_PRIORITY