From 0c9b537edf4226adf96ea5765954233d7e14035b Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Thu, 27 Feb 2020 11:27:43 +0100 Subject: [PATCH] drivers: adc: adc_stm32: convert to DT_INST defines Convert driver to use DT_INST_ defines. Signed-off-by: Erwan Gouriou --- drivers/adc/adc_stm32.c | 20 +++++++++++--------- soc/arm/st_stm32/stm32f0/dts_fixup.h | 7 ------- soc/arm/st_stm32/stm32f1/dts_fixup.h | 7 ------- soc/arm/st_stm32/stm32f2/dts_fixup.h | 7 ------- soc/arm/st_stm32/stm32f3/dts_fixup.h | 7 ------- soc/arm/st_stm32/stm32f4/dts_fixup.h | 7 ------- soc/arm/st_stm32/stm32f7/dts_fixup.h | 7 ------- soc/arm/st_stm32/stm32l0/dts_fixup.h | 7 ------- soc/arm/st_stm32/stm32l4/dts_fixup.h | 7 ------- soc/arm/st_stm32/stm32wb/dts_fixup.h | 7 ------- 10 files changed, 11 insertions(+), 72 deletions(-) diff --git a/drivers/adc/adc_stm32.c b/drivers/adc/adc_stm32.c index b8fe51d2c62..9558ccdefaa 100644 --- a/drivers/adc/adc_stm32.c +++ b/drivers/adc/adc_stm32.c @@ -635,11 +635,11 @@ static const struct adc_driver_api api_stm32_driver_api = { static void adc_stm32_cfg_func_##index(void); \ \ static const struct adc_stm32_cfg adc_stm32_cfg_##index = { \ - .base = (ADC_TypeDef *)DT_ADC_##index##_BASE_ADDRESS, \ + .base = (ADC_TypeDef *)DT_INST_##index##_ST_STM32_ADC_BASE_ADDRESS,\ .irq_cfg_func = adc_stm32_cfg_func_##index, \ .pclken = { \ - .enr = DT_ADC_##index##_CLOCK_BITS, \ - .bus = DT_ADC_##index##_CLOCK_BUS, \ + .enr = DT_INST_##index##_ST_STM32_ADC_CLOCK_BITS, \ + .bus = DT_INST_##index##_ST_STM32_ADC_CLOCK_BUS, \ }, \ }; \ static struct adc_stm32_data adc_stm32_data_##index = { \ @@ -648,18 +648,20 @@ static struct adc_stm32_data adc_stm32_data_##index = { \ ADC_CONTEXT_INIT_SYNC(adc_stm32_data_##index, ctx), \ }; \ \ -DEVICE_AND_API_INIT(adc_##index, DT_ADC_##index##_NAME, &adc_stm32_init,\ +DEVICE_AND_API_INIT(adc_##index, DT_INST_##index##_ST_STM32_ADC_LABEL, \ + &adc_stm32_init, \ &adc_stm32_data_##index, &adc_stm32_cfg_##index, \ POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ &api_stm32_driver_api); \ \ static void adc_stm32_cfg_func_##index(void) \ { \ - IRQ_CONNECT(DT_ADC_##index##_IRQ, DT_ADC_##index##_IRQ_PRI, \ + IRQ_CONNECT(DT_INST_##index##_ST_STM32_ADC_IRQ_0, \ + DT_INST_##index##_ST_STM32_ADC_IRQ_0_PRIORITY, \ adc_stm32_isr, DEVICE_GET(adc_##index), 0); \ - irq_enable(DT_ADC_##index##_IRQ); \ + irq_enable(DT_INST_##index##_ST_STM32_ADC_IRQ_0); \ } -#ifdef CONFIG_ADC_1 -STM32_ADC_INIT(1) -#endif /* CONFIG_ADC_1 */ +#ifdef DT_INST_0_ST_STM32_ADC +STM32_ADC_INIT(0); +#endif /* DT_INST_0_ST_STM32_ADC */ diff --git a/soc/arm/st_stm32/stm32f0/dts_fixup.h b/soc/arm/st_stm32/stm32f0/dts_fixup.h index bf654fa70a9..af3c5034532 100644 --- a/soc/arm/st_stm32/stm32f0/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f0/dts_fixup.h @@ -190,11 +190,4 @@ #define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL -#define DT_ADC_1_BASE_ADDRESS DT_ST_STM32_ADC_40012400_BASE_ADDRESS -#define DT_ADC_1_IRQ DT_ST_STM32_ADC_40012400_IRQ_0 -#define DT_ADC_1_IRQ_PRI DT_ST_STM32_ADC_40012400_IRQ_0_PRIORITY -#define DT_ADC_1_NAME DT_ST_STM32_ADC_40012400_LABEL -#define DT_ADC_1_CLOCK_BITS DT_ST_STM32_ADC_40012400_CLOCK_BITS_0 -#define DT_ADC_1_CLOCK_BUS DT_ST_STM32_ADC_40012400_CLOCK_BUS_0 - /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/st_stm32/stm32f1/dts_fixup.h b/soc/arm/st_stm32/stm32f1/dts_fixup.h index 0b71f2ec8c7..e8ce64827b2 100644 --- a/soc/arm/st_stm32/stm32f1/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f1/dts_fixup.h @@ -211,13 +211,6 @@ #define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL -#define DT_ADC_1_BASE_ADDRESS DT_ST_STM32_ADC_40012400_BASE_ADDRESS -#define DT_ADC_1_IRQ DT_ST_STM32_ADC_40012400_IRQ_0 -#define DT_ADC_1_IRQ_PRI DT_ST_STM32_ADC_40012400_IRQ_0_PRIORITY -#define DT_ADC_1_NAME DT_ST_STM32_ADC_40012400_LABEL -#define DT_ADC_1_CLOCK_BITS DT_ST_STM32_ADC_40012400_CLOCK_BITS_0 -#define DT_ADC_1_CLOCK_BUS DT_ST_STM32_ADC_40012400_CLOCK_BUS_0 - #define DT_CAN_1_BASE_ADDRESS DT_ST_STM32_CAN_40006400_BASE_ADDRESS #define DT_CAN_1_BUS_SPEED DT_ST_STM32_CAN_40006400_BUS_SPEED #define DT_CAN_1_NAME DT_ST_STM32_CAN_40006400_LABEL diff --git a/soc/arm/st_stm32/stm32f2/dts_fixup.h b/soc/arm/st_stm32/stm32f2/dts_fixup.h index acc7f53cd8c..9887a860872 100644 --- a/soc/arm/st_stm32/stm32f2/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f2/dts_fixup.h @@ -150,11 +150,4 @@ #define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL -#define DT_ADC_1_BASE_ADDRESS DT_ST_STM32_ADC_40012000_BASE_ADDRESS -#define DT_ADC_1_IRQ DT_ST_STM32_ADC_40012000_IRQ_0 -#define DT_ADC_1_IRQ_PRI DT_ST_STM32_ADC_40012000_IRQ_0_PRIORITY -#define DT_ADC_1_NAME DT_ST_STM32_ADC_40012000_LABEL -#define DT_ADC_1_CLOCK_BITS DT_ST_STM32_ADC_40012000_CLOCK_BITS_0 -#define DT_ADC_1_CLOCK_BUS DT_ST_STM32_ADC_40012000_CLOCK_BUS_0 - /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/st_stm32/stm32f3/dts_fixup.h b/soc/arm/st_stm32/stm32f3/dts_fixup.h index 209352530f7..da4a173cc3f 100644 --- a/soc/arm/st_stm32/stm32f3/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f3/dts_fixup.h @@ -265,13 +265,6 @@ #define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL -#define DT_ADC_1_BASE_ADDRESS DT_ST_STM32_ADC_50000000_BASE_ADDRESS -#define DT_ADC_1_IRQ DT_ST_STM32_ADC_50000000_IRQ_0 -#define DT_ADC_1_IRQ_PRI DT_ST_STM32_ADC_50000000_IRQ_0_PRIORITY -#define DT_ADC_1_NAME DT_ST_STM32_ADC_50000000_LABEL -#define DT_ADC_1_CLOCK_BITS DT_ST_STM32_ADC_50000000_CLOCK_BITS_0 -#define DT_ADC_1_CLOCK_BUS DT_ST_STM32_ADC_50000000_CLOCK_BUS_0 - #define DT_CAN_1_BASE_ADDRESS DT_ST_STM32_CAN_40006400_BASE_ADDRESS #define DT_CAN_1_BUS_SPEED DT_ST_STM32_CAN_40006400_BUS_SPEED #define DT_CAN_1_NAME DT_ST_STM32_CAN_40006400_LABEL diff --git a/soc/arm/st_stm32/stm32f4/dts_fixup.h b/soc/arm/st_stm32/stm32f4/dts_fixup.h index b80ff1584f1..9b7526a05f5 100644 --- a/soc/arm/st_stm32/stm32f4/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f4/dts_fixup.h @@ -494,13 +494,6 @@ #define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL -#define DT_ADC_1_BASE_ADDRESS DT_ST_STM32_ADC_40012000_BASE_ADDRESS -#define DT_ADC_1_IRQ DT_ST_STM32_ADC_40012000_IRQ_0 -#define DT_ADC_1_IRQ_PRI DT_ST_STM32_ADC_40012000_IRQ_0_PRIORITY -#define DT_ADC_1_NAME DT_ST_STM32_ADC_40012000_LABEL -#define DT_ADC_1_CLOCK_BITS DT_ST_STM32_ADC_40012000_CLOCK_BITS_0 -#define DT_ADC_1_CLOCK_BUS DT_ST_STM32_ADC_40012000_CLOCK_BUS_0 - #define DT_CAN_1_BASE_ADDRESS DT_ST_STM32_CAN_40006400_BASE_ADDRESS #define DT_CAN_1_BUS_SPEED DT_ST_STM32_CAN_40006400_BUS_SPEED #define DT_CAN_1_NAME DT_ST_STM32_CAN_40006400_LABEL diff --git a/soc/arm/st_stm32/stm32f7/dts_fixup.h b/soc/arm/st_stm32/stm32f7/dts_fixup.h index 10dae5e3b99..3f597c91a86 100644 --- a/soc/arm/st_stm32/stm32f7/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f7/dts_fixup.h @@ -392,11 +392,4 @@ #define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL -#define DT_ADC_1_BASE_ADDRESS DT_ST_STM32_ADC_40012000_BASE_ADDRESS -#define DT_ADC_1_IRQ DT_ST_STM32_ADC_40012000_IRQ_0 -#define DT_ADC_1_IRQ_PRI DT_ST_STM32_ADC_40012000_IRQ_0_PRIORITY -#define DT_ADC_1_NAME DT_ST_STM32_ADC_40012000_LABEL -#define DT_ADC_1_CLOCK_BITS DT_ST_STM32_ADC_40012000_CLOCK_BITS_0 -#define DT_ADC_1_CLOCK_BUS DT_ST_STM32_ADC_40012000_CLOCK_BUS_0 - /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/st_stm32/stm32l0/dts_fixup.h b/soc/arm/st_stm32/stm32l0/dts_fixup.h index 0348288e31e..d12402c9bce 100644 --- a/soc/arm/st_stm32/stm32l0/dts_fixup.h +++ b/soc/arm/st_stm32/stm32l0/dts_fixup.h @@ -135,11 +135,4 @@ #define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL -#define DT_ADC_1_BASE_ADDRESS DT_ST_STM32_ADC_40012400_BASE_ADDRESS -#define DT_ADC_1_IRQ DT_ST_STM32_ADC_40012400_IRQ_0 -#define DT_ADC_1_IRQ_PRI DT_ST_STM32_ADC_40012400_IRQ_0_PRIORITY -#define DT_ADC_1_NAME DT_ST_STM32_ADC_40012400_LABEL -#define DT_ADC_1_CLOCK_BITS DT_ST_STM32_ADC_40012400_CLOCK_BITS_0 -#define DT_ADC_1_CLOCK_BUS DT_ST_STM32_ADC_40012400_CLOCK_BUS_0 - /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/st_stm32/stm32l4/dts_fixup.h b/soc/arm/st_stm32/stm32l4/dts_fixup.h index 1990ecd6a7d..d6f333a4f03 100644 --- a/soc/arm/st_stm32/stm32l4/dts_fixup.h +++ b/soc/arm/st_stm32/stm32l4/dts_fixup.h @@ -314,13 +314,6 @@ #define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL -#define DT_ADC_1_BASE_ADDRESS DT_ST_STM32_ADC_50040000_BASE_ADDRESS -#define DT_ADC_1_IRQ DT_ST_STM32_ADC_50040000_IRQ_0 -#define DT_ADC_1_IRQ_PRI DT_ST_STM32_ADC_50040000_IRQ_0_PRIORITY -#define DT_ADC_1_NAME DT_ST_STM32_ADC_50040000_LABEL -#define DT_ADC_1_CLOCK_BITS DT_ST_STM32_ADC_50040000_CLOCK_BITS_0 -#define DT_ADC_1_CLOCK_BUS DT_ST_STM32_ADC_50040000_CLOCK_BUS_0 - #define DT_LPTIM_1_BASE_ADDRESS DT_ST_STM32_TIMERS_40007C00_BASE_ADDRESS #define DT_LPTIM_1_IRQ DT_ST_STM32_TIMERS_40007C00_IRQ_0 #define DT_LPTIM_1_IRQ_PRI DT_ST_STM32_TIMERS_40007C00_IRQ_0_PRIORITY diff --git a/soc/arm/st_stm32/stm32wb/dts_fixup.h b/soc/arm/st_stm32/stm32wb/dts_fixup.h index c922bc826d9..fcb2f23ba69 100644 --- a/soc/arm/st_stm32/stm32wb/dts_fixup.h +++ b/soc/arm/st_stm32/stm32wb/dts_fixup.h @@ -148,13 +148,6 @@ #define DT_TIM_STM32_17_CLOCK_BITS DT_ST_STM32_TIMERS_40014800_CLOCK_BITS #define DT_TIM_STM32_17_CLOCK_BUS DT_ST_STM32_TIMERS_40014800_CLOCK_BUS -#define DT_ADC_1_BASE_ADDRESS DT_ST_STM32_ADC_50040000_BASE_ADDRESS -#define DT_ADC_1_IRQ DT_ST_STM32_ADC_50040000_IRQ_0 -#define DT_ADC_1_IRQ_PRI DT_ST_STM32_ADC_50040000_IRQ_0_PRIORITY -#define DT_ADC_1_NAME DT_ST_STM32_ADC_50040000_LABEL -#define DT_ADC_1_CLOCK_BITS DT_ST_STM32_ADC_50040000_CLOCK_BITS_0 -#define DT_ADC_1_CLOCK_BUS DT_ST_STM32_ADC_50040000_CLOCK_BUS_0 - #define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL #define DT_LPTIM_1_BASE_ADDRESS DT_ST_STM32_TIMERS_40007C00_BASE_ADDRESS