michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts: adc: cleanup CONFIG_ADC_x_IRQ_PRI

Browse source 
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 <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2018-11-21 10:24:00 -06:00 • committed by Anas Nashif
commit d4983db515
9 changed files with 13 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/adc/Kconfig
View file

@ -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"

4
drivers/adc/adc_dw.c
View file

@ -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);
}

4
drivers/adc/adc_mcux_adc16.c
View file

@ -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);

4
drivers/adc/adc_sam_afec.c
View file

@ -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);
}

2
soc/arc/quark_se_c1000_ss/dts_fixup.h
View file

@ -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

4
soc/arm/atmel_sam/same70/dts_fixup.h
View file

@ -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

4
soc/arm/nxp_kinetis/k6x/dts_fixup.h
View file

@ -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

2
soc/arm/nxp_kinetis/kl2x/dts_fixup.h
View file

@ -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

2
soc/arm/nxp_kinetis/kwx/dts_fixup.h
View file

@ -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