From d4983db515546c4bb75e8b73a720b75482f7df1d Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 21 Nov 2018 10:24:00 -0600 Subject: [PATCH] dts: adc: cleanup CONFIG_ADC_x_IRQ_PRI All of the cases of CONFIG_ADC_x_IRQ_PRI should be DT_ADC_x_IRQ_PRI. So go ahead and fix them up. Signed-off-by: Kumar Gala --- drivers/adc/Kconfig | 10 ---------- drivers/adc/adc_dw.c | 4 ++-- drivers/adc/adc_mcux_adc16.c | 4 ++-- drivers/adc/adc_sam_afec.c | 4 ++-- soc/arc/quark_se_c1000_ss/dts_fixup.h | 2 +- soc/arm/atmel_sam/same70/dts_fixup.h | 4 ++-- soc/arm/nxp_kinetis/k6x/dts_fixup.h | 4 ++-- soc/arm/nxp_kinetis/kl2x/dts_fixup.h | 2 +- soc/arm/nxp_kinetis/kwx/dts_fixup.h | 2 +- 9 files changed, 13 insertions(+), 23 deletions(-) diff --git a/drivers/adc/Kconfig b/drivers/adc/Kconfig index 0122427cd38..88e232cfec9 100644 --- a/drivers/adc/Kconfig +++ b/drivers/adc/Kconfig @@ -49,11 +49,6 @@ config ADC_0_NAME depends on ADC_0 && !HAS_DTS_ADC default "ADC_0" -config ADC_0_IRQ_PRI - int "ADC 0 interrupt priority" - depends on ADC_0 && !HAS_DTS_ADC - default 2 - config ADC_1 bool "Enable ADC 1" @@ -62,11 +57,6 @@ config ADC_1_NAME depends on ADC_1 && !HAS_DTS_ADC default "ADC_1" -config ADC_1_IRQ_PRI - int "ADC 1 interrupt priority" - depends on ADC_1 && !HAS_DTS_ADC - default 2 - 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 586ce9b40ff..4f445029773 100644 --- a/drivers/adc/adc_dw.c +++ b/drivers/adc/adc_dw.c @@ -507,11 +507,11 @@ DEVICE_AND_API_INIT(adc_dw, CONFIG_ADC_0_NAME, &adc_dw_init, static void adc_config_irq(void) { - IRQ_CONNECT(DT_ADC_0_IRQ, CONFIG_ADC_0_IRQ_PRI, adc_dw_rx_isr, + IRQ_CONNECT(DT_ADC_0_IRQ, DT_ADC_0_IRQ_PRI, adc_dw_rx_isr, DEVICE_GET(adc_dw), 0); irq_enable(DT_ADC_0_IRQ); - IRQ_CONNECT(DT_ADC_IRQ_ERR, CONFIG_ADC_0_IRQ_PRI, + IRQ_CONNECT(DT_ADC_IRQ_ERR, DT_ADC_0_IRQ_PRI, adc_dw_err_isr, DEVICE_GET(adc_dw), 0); irq_enable(DT_ADC_IRQ_ERR); } diff --git a/drivers/adc/adc_mcux_adc16.c b/drivers/adc/adc_mcux_adc16.c index c221625a100..76d320cf616 100644 --- a/drivers/adc/adc_mcux_adc16.c +++ b/drivers/adc/adc_mcux_adc16.c @@ -240,7 +240,7 @@ DEVICE_AND_API_INIT(mcux_adc16_0, CONFIG_ADC_0_NAME, &mcux_adc16_init, static void mcux_adc16_config_func_0(struct device *dev) { - IRQ_CONNECT(DT_ADC_0_IRQ, CONFIG_ADC_0_IRQ_PRI, + IRQ_CONNECT(DT_ADC_0_IRQ, DT_ADC_0_IRQ_PRI, mcux_adc16_isr, DEVICE_GET(mcux_adc16_0), 0); irq_enable(DT_ADC_0_IRQ); @@ -268,7 +268,7 @@ DEVICE_AND_API_INIT(mcux_adc16_1, CONFIG_ADC_1_NAME, &mcux_adc16_init, static void mcux_adc16_config_func_1(struct device *dev) { - IRQ_CONNECT(DT_ADC_1_IRQ, CONFIG_ADC_1_IRQ_PRI, + IRQ_CONNECT(DT_ADC_1_IRQ, DT_ADC_1_IRQ_PRI, mcux_adc16_isr, DEVICE_GET(mcux_adc16_1), 0); irq_enable(DT_ADC_1_IRQ); diff --git a/drivers/adc/adc_sam_afec.c b/drivers/adc/adc_sam_afec.c index 056af0a4cab..04a5b0202c8 100644 --- a/drivers/adc/adc_sam_afec.c +++ b/drivers/adc/adc_sam_afec.c @@ -363,7 +363,7 @@ DEVICE_AND_API_INIT(adc0_sam, CONFIG_ADC_0_NAME, adc_sam_init, static void adc0_sam_cfg_func(struct device *dev) { - IRQ_CONNECT(DT_ADC_0_IRQ, CONFIG_ADC_0_IRQ_PRI, adc_sam_isr, + IRQ_CONNECT(DT_ADC_0_IRQ, DT_ADC_0_IRQ_PRI, adc_sam_isr, DEVICE_GET(adc0_sam), 0); irq_enable(DT_ADC_0_IRQ); } @@ -392,7 +392,7 @@ DEVICE_AND_API_INIT(adc1_sam, CONFIG_ADC_1_NAME, adc_sam_init, static void adc1_sam_cfg_func(struct device *dev) { - IRQ_CONNECT(DT_ADC_1_IRQ, CONFIG_ADC_1_IRQ_PRI, adc_sam_isr, + IRQ_CONNECT(DT_ADC_1_IRQ, DT_ADC_1_IRQ_PRI, adc_sam_isr, DEVICE_GET(adc1_sam), 0); irq_enable(DT_ADC_1_IRQ); } diff --git a/soc/arc/quark_se_c1000_ss/dts_fixup.h b/soc/arc/quark_se_c1000_ss/dts_fixup.h index 82d4d21c2e2..727fc78cd8d 100644 --- a/soc/arc/quark_se_c1000_ss/dts_fixup.h +++ b/soc/arc/quark_se_c1000_ss/dts_fixup.h @@ -70,7 +70,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 CONFIG_ADC_0_IRQ_PRI DT_SNPS_DW_ADC_80015000_IRQ_0_PRIORITY +#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_BASE_ADDRESS DT_SNPS_DW_ADC_80015000_BASE_ADDRESS diff --git a/soc/arm/atmel_sam/same70/dts_fixup.h b/soc/arm/atmel_sam/same70/dts_fixup.h index c9309925c4f..56691d44061 100644 --- a/soc/arm/atmel_sam/same70/dts_fixup.h +++ b/soc/arm/atmel_sam/same70/dts_fixup.h @@ -105,13 +105,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 CONFIG_ADC_0_IRQ_PRI DT_ATMEL_SAM_AFEC_4003C000_IRQ_0_PRIORITY +#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_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 CONFIG_ADC_1_IRQ_PRI DT_ATMEL_SAM_AFEC_40064000_IRQ_0_PRIORITY +#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_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 4affaf6ac5f..3550ed16196 100644 --- a/soc/arm/nxp_kinetis/k6x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/k6x/dts_fixup.h @@ -57,12 +57,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 CONFIG_ADC_0_IRQ_PRI DT_NXP_KINETIS_ADC16_4003B000_IRQ_0_PRIORITY +#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_1_BASE_ADDRESS DT_NXP_KINETIS_ADC16_400BB000_BASE_ADDRESS #define DT_ADC_1_IRQ DT_NXP_KINETIS_ADC16_400BB000_IRQ_0 -#define CONFIG_ADC_1_IRQ_PRI DT_NXP_KINETIS_ADC16_400BB000_IRQ_0_PRIORITY +#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_FTM_3_BASE_ADDRESS DT_NXP_KINETIS_FTM_400B9000_BASE_ADDRESS diff --git a/soc/arm/nxp_kinetis/kl2x/dts_fixup.h b/soc/arm/nxp_kinetis/kl2x/dts_fixup.h index 3affdf9b715..4276e29dc00 100644 --- a/soc/arm/nxp_kinetis/kl2x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/kl2x/dts_fixup.h @@ -6,7 +6,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 CONFIG_ADC_0_IRQ_PRI DT_NXP_KINETIS_ADC16_4003B000_IRQ_0_PRIORITY +#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_SIM_BASE_ADDRESS DT_NXP_KINETIS_SIM_40047000_BASE_ADDRESS diff --git a/soc/arm/nxp_kinetis/kwx/dts_fixup.h b/soc/arm/nxp_kinetis/kwx/dts_fixup.h index 5c09b4162bf..0e246a05985 100644 --- a/soc/arm/nxp_kinetis/kwx/dts_fixup.h +++ b/soc/arm/nxp_kinetis/kwx/dts_fixup.h @@ -2,7 +2,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 CONFIG_ADC_0_IRQ_PRI DT_NXP_KINETIS_ADC16_4003B000_IRQ_0_PRIORITY +#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 CONFIG_I2C_0_NAME DT_NXP_KINETIS_I2C_40066000_LABEL