diff --git a/drivers/adc/Kconfig b/drivers/adc/Kconfig index 88e232cfec9..71ac55ab411 100644 --- a/drivers/adc/Kconfig +++ b/drivers/adc/Kconfig @@ -44,19 +44,9 @@ config ADC_INIT_PRIORITY config ADC_0 bool "Enable ADC 0" -config ADC_0_NAME - string "ADC 0 Driver's name" - depends on ADC_0 && !HAS_DTS_ADC - default "ADC_0" - config ADC_1 bool "Enable ADC 1" -config ADC_1_NAME - string "ADC 1 Driver's name" - depends on ADC_1 && !HAS_DTS_ADC - default "ADC_1" - source "drivers/adc/Kconfig.dw" source "drivers/adc/Kconfig.mcux" diff --git a/drivers/adc/adc_dw.c b/drivers/adc/adc_dw.c index 4f445029773..dda51dc0c93 100644 --- a/drivers/adc/adc_dw.c +++ b/drivers/adc/adc_dw.c @@ -500,7 +500,7 @@ const static struct adc_config adc_config_dev = { .config_func = adc_config_irq, }; -DEVICE_AND_API_INIT(adc_dw, CONFIG_ADC_0_NAME, &adc_dw_init, +DEVICE_AND_API_INIT(adc_dw, DT_ADC_0_NAME, &adc_dw_init, &adc_info_dev, &adc_config_dev, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &api_funcs); diff --git a/drivers/adc/adc_intel_quark_d2000.c b/drivers/adc/adc_intel_quark_d2000.c index 930c1747842..f1d8c7a5b07 100644 --- a/drivers/adc/adc_intel_quark_d2000.c +++ b/drivers/adc/adc_intel_quark_d2000.c @@ -485,7 +485,7 @@ static const struct adc_quark_d2000_config adc_quark_d2000_config_0 = { .config_func = adc_quark_d2000_config_func_0, }; -DEVICE_AND_API_INIT(adc_quark_d2000_0, CONFIG_ADC_0_NAME, +DEVICE_AND_API_INIT(adc_quark_d2000_0, DT_ADC_0_NAME, &adc_quark_d2000_init, &adc_quark_d2000_data_0, &adc_quark_d2000_config_0, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, diff --git a/drivers/adc/adc_mcux_adc16.c b/drivers/adc/adc_mcux_adc16.c index 76d320cf616..019918b26fe 100644 --- a/drivers/adc/adc_mcux_adc16.c +++ b/drivers/adc/adc_mcux_adc16.c @@ -233,7 +233,7 @@ static struct mcux_adc16_data mcux_adc16_data_0 = { ADC_CONTEXT_INIT_SYNC(mcux_adc16_data_0, ctx), }; -DEVICE_AND_API_INIT(mcux_adc16_0, CONFIG_ADC_0_NAME, &mcux_adc16_init, +DEVICE_AND_API_INIT(mcux_adc16_0, DT_ADC_0_NAME, &mcux_adc16_init, &mcux_adc16_data_0, &mcux_adc16_config_0, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &mcux_adc16_driver_api); @@ -261,7 +261,7 @@ static struct mcux_adc16_data mcux_adc16_data_1 = { ADC_CONTEXT_INIT_SYNC(mcux_adc16_data_1, ctx), }; -DEVICE_AND_API_INIT(mcux_adc16_1, CONFIG_ADC_1_NAME, &mcux_adc16_init, +DEVICE_AND_API_INIT(mcux_adc16_1, DT_ADC_1_NAME, &mcux_adc16_init, &mcux_adc16_data_1, &mcux_adc16_config_1, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &mcux_adc16_driver_api); diff --git a/drivers/adc/adc_sam_afec.c b/drivers/adc/adc_sam_afec.c index 04a5b0202c8..009c1b3fb8c 100644 --- a/drivers/adc/adc_sam_afec.c +++ b/drivers/adc/adc_sam_afec.c @@ -357,7 +357,7 @@ static struct adc_sam_data adc0_sam_data = { ADC_CONTEXT_INIT_SYNC(adc0_sam_data, ctx), }; -DEVICE_AND_API_INIT(adc0_sam, CONFIG_ADC_0_NAME, adc_sam_init, +DEVICE_AND_API_INIT(adc0_sam, DT_ADC_0_NAME, adc_sam_init, &adc0_sam_data, &adc0_sam_cfg, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &adc_sam_api); @@ -386,7 +386,7 @@ static struct adc_sam_data adc1_sam_data = { ADC_CONTEXT_INIT_SYNC(adc1_sam_data, ctx), }; -DEVICE_AND_API_INIT(adc1_sam, CONFIG_ADC_1_NAME, adc_sam_init, +DEVICE_AND_API_INIT(adc1_sam, DT_ADC_1_NAME, adc_sam_init, &adc1_sam_data, &adc1_sam_cfg, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &adc_sam_api); diff --git a/soc/arc/quark_se_c1000_ss/dts_fixup.h b/soc/arc/quark_se_c1000_ss/dts_fixup.h index 727fc78cd8d..fabb23f1f23 100644 --- a/soc/arc/quark_se_c1000_ss/dts_fixup.h +++ b/soc/arc/quark_se_c1000_ss/dts_fixup.h @@ -71,7 +71,7 @@ #define DT_ADC_0_IRQ DT_SNPS_DW_ADC_80015000_IRQ_NORMAL #define DT_ADC_IRQ_ERR DT_SNPS_DW_ADC_80015000_IRQ_ERROR #define DT_ADC_0_IRQ_PRI DT_SNPS_DW_ADC_80015000_IRQ_0_PRIORITY -#define CONFIG_ADC_0_NAME DT_SNPS_DW_ADC_80015000_LABEL +#define DT_ADC_0_NAME DT_SNPS_DW_ADC_80015000_LABEL #define DT_ADC_0_BASE_ADDRESS DT_SNPS_DW_ADC_80015000_BASE_ADDRESS #define DT_SPI_0_BASE_ADDRESS DT_SNPS_DESIGNWARE_SPI_80010000_BASE_ADDRESS diff --git a/soc/arm/atmel_sam/same70/dts_fixup.h b/soc/arm/atmel_sam/same70/dts_fixup.h index 56691d44061..75d4db54977 100644 --- a/soc/arm/atmel_sam/same70/dts_fixup.h +++ b/soc/arm/atmel_sam/same70/dts_fixup.h @@ -106,13 +106,13 @@ #define DT_ADC_0_BASE_ADDRESS DT_ATMEL_SAM_AFEC_4003C000_BASE_ADDRESS #define DT_ADC_0_IRQ DT_ATMEL_SAM_AFEC_4003C000_IRQ_0 #define DT_ADC_0_IRQ_PRI DT_ATMEL_SAM_AFEC_4003C000_IRQ_0_PRIORITY -#define CONFIG_ADC_0_NAME DT_ATMEL_SAM_AFEC_4003C000_LABEL +#define DT_ADC_0_NAME DT_ATMEL_SAM_AFEC_4003C000_LABEL #define DT_ADC_0_PERIPHERAL_ID DT_ATMEL_SAM_AFEC_4003C000_PERIPHERAL_ID #define DT_ADC_1_BASE_ADDRESS DT_ATMEL_SAM_AFEC_40064000_BASE_ADDRESS #define DT_ADC_1_IRQ DT_ATMEL_SAM_AFEC_40064000_IRQ_0 #define DT_ADC_1_IRQ_PRI DT_ATMEL_SAM_AFEC_40064000_IRQ_0_PRIORITY -#define CONFIG_ADC_1_NAME DT_ATMEL_SAM_AFEC_40064000_LABEL +#define DT_ADC_1_NAME DT_ATMEL_SAM_AFEC_40064000_LABEL #define DT_ADC_1_PERIPHERAL_ID DT_ATMEL_SAM_AFEC_40064000_PERIPHERAL_ID diff --git a/soc/arm/nxp_kinetis/k6x/dts_fixup.h b/soc/arm/nxp_kinetis/k6x/dts_fixup.h index 3550ed16196..ac42f279f08 100644 --- a/soc/arm/nxp_kinetis/k6x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/k6x/dts_fixup.h @@ -58,12 +58,12 @@ #define DT_ADC_0_BASE_ADDRESS DT_NXP_KINETIS_ADC16_4003B000_BASE_ADDRESS #define DT_ADC_0_IRQ DT_NXP_KINETIS_ADC16_4003B000_IRQ_0 #define DT_ADC_0_IRQ_PRI DT_NXP_KINETIS_ADC16_4003B000_IRQ_0_PRIORITY -#define CONFIG_ADC_0_NAME DT_NXP_KINETIS_ADC16_4003B000_LABEL +#define DT_ADC_0_NAME DT_NXP_KINETIS_ADC16_4003B000_LABEL #define DT_ADC_1_BASE_ADDRESS DT_NXP_KINETIS_ADC16_400BB000_BASE_ADDRESS #define DT_ADC_1_IRQ DT_NXP_KINETIS_ADC16_400BB000_IRQ_0 #define DT_ADC_1_IRQ_PRI DT_NXP_KINETIS_ADC16_400BB000_IRQ_0_PRIORITY -#define CONFIG_ADC_1_NAME DT_NXP_KINETIS_ADC16_400BB000_LABEL +#define DT_ADC_1_NAME DT_NXP_KINETIS_ADC16_400BB000_LABEL #define DT_FTM_3_BASE_ADDRESS DT_NXP_KINETIS_FTM_400B9000_BASE_ADDRESS #define DT_FTM_3_IRQ DT_NXP_KINETIS_FTM_400B9000_IRQ_0 diff --git a/soc/arm/nxp_kinetis/kl2x/dts_fixup.h b/soc/arm/nxp_kinetis/kl2x/dts_fixup.h index 4276e29dc00..e64ef958b04 100644 --- a/soc/arm/nxp_kinetis/kl2x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/kl2x/dts_fixup.h @@ -7,7 +7,7 @@ #define DT_ADC_0_BASE_ADDRESS DT_NXP_KINETIS_ADC16_4003B000_BASE_ADDRESS #define DT_ADC_0_IRQ DT_NXP_KINETIS_ADC16_4003B000_IRQ_0 #define DT_ADC_0_IRQ_PRI DT_NXP_KINETIS_ADC16_4003B000_IRQ_0_PRIORITY -#define CONFIG_ADC_0_NAME DT_NXP_KINETIS_ADC16_4003B000_LABEL +#define DT_ADC_0_NAME DT_NXP_KINETIS_ADC16_4003B000_LABEL #define DT_SIM_BASE_ADDRESS DT_NXP_KINETIS_SIM_40047000_BASE_ADDRESS #define DT_SIM_NAME DT_NXP_KINETIS_SIM_40047000_LABEL diff --git a/soc/arm/nxp_kinetis/kwx/dts_fixup.h b/soc/arm/nxp_kinetis/kwx/dts_fixup.h index 0e246a05985..c7711cdd548 100644 --- a/soc/arm/nxp_kinetis/kwx/dts_fixup.h +++ b/soc/arm/nxp_kinetis/kwx/dts_fixup.h @@ -3,7 +3,7 @@ #define DT_ADC_0_BASE_ADDRESS DT_NXP_KINETIS_ADC16_4003B000_BASE_ADDRESS #define DT_ADC_0_IRQ DT_NXP_KINETIS_ADC16_4003B000_IRQ_0 #define DT_ADC_0_IRQ_PRI DT_NXP_KINETIS_ADC16_4003B000_IRQ_0_PRIORITY -#define CONFIG_ADC_0_NAME DT_NXP_KINETIS_ADC16_4003B000_LABEL +#define DT_ADC_0_NAME DT_NXP_KINETIS_ADC16_4003B000_LABEL #define CONFIG_I2C_0_NAME DT_NXP_KINETIS_I2C_40066000_LABEL #define DT_I2C_MCUX_0_BASE_ADDRESS DT_NXP_KINETIS_I2C_40066000_BASE_ADDRESS diff --git a/soc/x86/intel_quark/quark_d2000/dts_fixup.h b/soc/x86/intel_quark/quark_d2000/dts_fixup.h index ce812342a4a..bb4c166d81b 100644 --- a/soc/x86/intel_quark/quark_d2000/dts_fixup.h +++ b/soc/x86/intel_quark/quark_d2000/dts_fixup.h @@ -29,7 +29,7 @@ #define DT_RTC_0_IRQ DT_INTEL_QMSI_RTC_B0000400_IRQ_0 #define DT_RTC_0_IRQ_FLAGS DT_INTEL_QMSI_RTC_B0000400_IRQ_0_SENSE -#define CONFIG_ADC_0_NAME DT_INTEL_QUARK_D2000_ADC_B0004000_LABEL +#define DT_ADC_0_NAME DT_INTEL_QUARK_D2000_ADC_B0004000_LABEL #define DT_ADC_0_BASE_ADDRESS DT_INTEL_QUARK_D2000_ADC_B0004000_BASE_ADDRESS #define DT_ADC_0_IRQ DT_INTEL_QUARK_D2000_ADC_B0004000_IRQ_0 #define DT_ADC_0_IRQ_FLAGS DT_INTEL_QUARK_D2000_ADC_B0004000_IRQ_0_SENSE diff --git a/tests/drivers/adc/adc_api/src/test_adc.c b/tests/drivers/adc/adc_api/src/test_adc.c index 188504b4f85..7ebc197b9f5 100644 --- a/tests/drivers/adc/adc_api/src/test_adc.c +++ b/tests/drivers/adc/adc_api/src/test_adc.c @@ -46,7 +46,7 @@ #elif defined(CONFIG_BOARD_FRDM_K64F) -#define ADC_DEVICE_NAME CONFIG_ADC_1_NAME +#define ADC_DEVICE_NAME DT_ADC_1_NAME #define ADC_RESOLUTION 12 #define ADC_GAIN ADC_GAIN_1 #define ADC_REFERENCE ADC_REF_INTERNAL @@ -56,7 +56,7 @@ #elif defined(CONFIG_BOARD_FRDM_KL25Z) -#define ADC_DEVICE_NAME CONFIG_ADC_0_NAME +#define ADC_DEVICE_NAME DT_ADC_0_NAME #define ADC_RESOLUTION 12 #define ADC_GAIN ADC_GAIN_1 #define ADC_REFERENCE ADC_REF_INTERNAL @@ -66,7 +66,7 @@ #elif defined(CONFIG_BOARD_FRDM_KW41Z) -#define ADC_DEVICE_NAME CONFIG_ADC_0_NAME +#define ADC_DEVICE_NAME DT_ADC_0_NAME #define ADC_RESOLUTION 12 #define ADC_GAIN ADC_GAIN_1 #define ADC_REFERENCE ADC_REF_INTERNAL @@ -76,7 +76,7 @@ #elif defined(CONFIG_BOARD_HEXIWEAR_K64) -#define ADC_DEVICE_NAME CONFIG_ADC_0_NAME +#define ADC_DEVICE_NAME DT_ADC_0_NAME #define ADC_RESOLUTION 12 #define ADC_GAIN ADC_GAIN_1 #define ADC_REFERENCE ADC_REF_INTERNAL @@ -86,7 +86,7 @@ #elif defined(CONFIG_BOARD_HEXIWEAR_KW40Z) -#define ADC_DEVICE_NAME CONFIG_ADC_0_NAME +#define ADC_DEVICE_NAME DT_ADC_0_NAME #define ADC_RESOLUTION 12 #define ADC_GAIN ADC_GAIN_1 #define ADC_REFERENCE ADC_REF_INTERNAL @@ -96,7 +96,7 @@ #elif defined(CONFIG_BOARD_SAM_E70_XPLAINED) -#define ADC_DEVICE_NAME CONFIG_ADC_0_NAME +#define ADC_DEVICE_NAME DT_ADC_0_NAME #define ADC_RESOLUTION 12 #define ADC_GAIN ADC_GAIN_1 #define ADC_REFERENCE ADC_REF_EXTERNAL0 @@ -106,7 +106,7 @@ #elif defined(CONFIG_BOARD_QUARK_SE_C1000_DEVBOARD_SS) || \ defined(CONFIG_BOARD_ARDUINO_101_SSS) -#define ADC_DEVICE_NAME CONFIG_ADC_0_NAME +#define ADC_DEVICE_NAME DT_ADC_0_NAME #define ADC_RESOLUTION 10 #define ADC_GAIN ADC_GAIN_1 #define ADC_REFERENCE ADC_REF_INTERNAL @@ -115,7 +115,7 @@ #define ADC_2ND_CHANNEL_ID 11 #elif defined(CONFIG_BOARD_QUARK_D2000_CRB) -#define ADC_DEVICE_NAME CONFIG_ADC_0_NAME +#define ADC_DEVICE_NAME DT_ADC_0_NAME #define ADC_RESOLUTION 10 #define ADC_GAIN ADC_GAIN_1 #define ADC_REFERENCE ADC_REF_INTERNAL