From fd6e9c6f5855ae3217be234d47ddc728e91f174f Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Thu, 15 Nov 2018 20:14:07 -0600 Subject: [PATCH] dts: i2c: cleanup CONFIG_I2C_x_IRQ_PRI The majority of cases of CONFIG_I2C_x_IRQ_PRI should be DT_I2C_x_IRQ_PRI. So go ahead and fix them up. Only the i2c_nios driver still uses Kconfig for getting priority. Signed-off-by: Kumar Gala --- boards/x86/up_squared/up_squared_dts_fixup.h | 16 ++++++++-------- boards/x86/up_squared/up_squared_sbl_dts_fixup.h | 16 ++++++++-------- drivers/i2c/i2c_atmel_sam3.c | 4 ++-- drivers/i2c/i2c_dw.c | 16 ++++++++-------- drivers/i2c/i2c_nrfx_twi.c | 2 +- drivers/i2c/i2c_nrfx_twim.c | 2 +- drivers/i2c/i2c_qmsi.c | 14 ++++++++++++-- drivers/i2c/i2c_sam_twi.c | 4 ++-- drivers/i2c/i2c_sam_twihs.c | 6 +++--- soc/arc/quark_se_c1000_ss/dts_fixup.h | 4 ++-- soc/arc/snps_emsk/dts_fixup.h | 4 ++-- soc/arm/atmel_sam/sam3x/dts_fixup.h | 4 ++-- soc/arm/atmel_sam/sam4s/dts_fixup.h | 4 ++-- soc/arm/atmel_sam/same70/dts_fixup.h | 6 +++--- soc/arm/nordic_nrf/nrf51/dts_fixup.h | 4 ++-- soc/arm/nordic_nrf/nrf52/dts_fixup.h | 4 ++-- soc/x86/intel_quark/quark_se/dts_fixup.h | 4 ++-- soc/xtensa/intel_s1000/dts_fixup.h | 2 +- 18 files changed, 63 insertions(+), 53 deletions(-) diff --git a/boards/x86/up_squared/up_squared_dts_fixup.h b/boards/x86/up_squared/up_squared_dts_fixup.h index 30bb80ca93e..ba2a0427142 100644 --- a/boards/x86/up_squared/up_squared_dts_fixup.h +++ b/boards/x86/up_squared/up_squared_dts_fixup.h @@ -25,56 +25,56 @@ #define CONFIG_I2C_0_NAME DT_SNPS_DESIGNWARE_I2C_91534000_LABEL #define DT_I2C_0_BASE_ADDR DT_SNPS_DESIGNWARE_I2C_91534000_BASE_ADDRESS #define DT_I2C_0_IRQ DT_SNPS_DESIGNWARE_I2C_91534000_IRQ_0 -#define CONFIG_I2C_0_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_91534000_IRQ_0_PRIORITY +#define DT_I2C_0_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_91534000_IRQ_0_PRIORITY #define DT_I2C_0_IRQ_FLAGS DT_SNPS_DESIGNWARE_I2C_91534000_IRQ_0_SENSE #define DT_I2C_0_BITRATE DT_SNPS_DESIGNWARE_I2C_91534000_CLOCK_FREQUENCY #define CONFIG_I2C_1_NAME DT_SNPS_DESIGNWARE_I2C_91532000_LABEL #define DT_I2C_1_BASE_ADDR DT_SNPS_DESIGNWARE_I2C_91532000_BASE_ADDRESS #define DT_I2C_1_IRQ DT_SNPS_DESIGNWARE_I2C_91532000_IRQ_0 -#define CONFIG_I2C_1_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_91532000_IRQ_0_PRIORITY +#define DT_I2C_1_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_91532000_IRQ_0_PRIORITY #define DT_I2C_1_IRQ_FLAGS DT_SNPS_DESIGNWARE_I2C_91532000_IRQ_0_SENSE #define DT_I2C_1_BITRATE DT_SNPS_DESIGNWARE_I2C_91532000_CLOCK_FREQUENCY #define CONFIG_I2C_2_NAME DT_SNPS_DESIGNWARE_I2C_91530000_LABEL #define DT_I2C_2_BASE_ADDR DT_SNPS_DESIGNWARE_I2C_91530000_BASE_ADDRESS #define DT_I2C_2_IRQ DT_SNPS_DESIGNWARE_I2C_91530000_IRQ_0 -#define CONFIG_I2C_2_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_91530000_IRQ_0_PRIORITY +#define DT_I2C_2_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_91530000_IRQ_0_PRIORITY #define DT_I2C_2_IRQ_FLAGS DT_SNPS_DESIGNWARE_I2C_91530000_IRQ_0_SENSE #define DT_I2C_2_BITRATE DT_SNPS_DESIGNWARE_I2C_91530000_CLOCK_FREQUENCY #define CONFIG_I2C_3_NAME DT_SNPS_DESIGNWARE_I2C_9152E000_LABEL #define DT_I2C_3_BASE_ADDR DT_SNPS_DESIGNWARE_I2C_9152E000_BASE_ADDRESS #define DT_I2C_3_IRQ DT_SNPS_DESIGNWARE_I2C_9152E000_IRQ_0 -#define CONFIG_I2C_3_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_9152E000_IRQ_0_PRIORITY +#define DT_I2C_3_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_9152E000_IRQ_0_PRIORITY #define DT_I2C_3_IRQ_FLAGS DT_SNPS_DESIGNWARE_I2C_9152E000_IRQ_0_SENSE #define DT_I2C_3_BITRATE DT_SNPS_DESIGNWARE_I2C_9152E000_CLOCK_FREQUENCY #define CONFIG_I2C_4_NAME DT_SNPS_DESIGNWARE_I2C_9152C000_LABEL #define DT_I2C_4_BASE_ADDR DT_SNPS_DESIGNWARE_I2C_9152C000_BASE_ADDRESS #define DT_I2C_4_IRQ DT_SNPS_DESIGNWARE_I2C_9152C000_IRQ_0 -#define CONFIG_I2C_4_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_9152C000_IRQ_0_PRIORITY +#define DT_I2C_4_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_9152C000_IRQ_0_PRIORITY #define DT_I2C_4_IRQ_FLAGS DT_SNPS_DESIGNWARE_I2C_9152C000_IRQ_0_SENSE #define DT_I2C_4_BITRATE DT_SNPS_DESIGNWARE_I2C_9152C000_CLOCK_FREQUENCY #define CONFIG_I2C_5_NAME DT_SNPS_DESIGNWARE_I2C_9152A000_LABEL #define DT_I2C_5_BASE_ADDR DT_SNPS_DESIGNWARE_I2C_9152A000_BASE_ADDRESS #define DT_I2C_5_IRQ DT_SNPS_DESIGNWARE_I2C_9152A000_IRQ_0 -#define CONFIG_I2C_5_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_9152A000_IRQ_0_PRIORITY +#define DT_I2C_5_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_9152A000_IRQ_0_PRIORITY #define DT_I2C_5_IRQ_FLAGS DT_SNPS_DESIGNWARE_I2C_9152A000_IRQ_0_SENSE #define DT_I2C_5_BITRATE DT_SNPS_DESIGNWARE_I2C_9152A000_CLOCK_FREQUENCY #define CONFIG_I2C_6_NAME DT_SNPS_DESIGNWARE_I2C_91528000_LABEL #define DT_I2C_6_BASE_ADDR DT_SNPS_DESIGNWARE_I2C_91528000_BASE_ADDRESS #define DT_I2C_6_IRQ DT_SNPS_DESIGNWARE_I2C_91528000_IRQ_0 -#define CONFIG_I2C_6_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_91528000_IRQ_0_PRIORITY +#define DT_I2C_6_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_91528000_IRQ_0_PRIORITY #define DT_I2C_6_IRQ_FLAGS DT_SNPS_DESIGNWARE_I2C_91528000_IRQ_0_SENSE #define DT_I2C_6_BITRATE DT_SNPS_DESIGNWARE_I2C_91528000_CLOCK_FREQUENCY #define CONFIG_I2C_7_NAME DT_SNPS_DESIGNWARE_I2C_91526000_LABEL #define DT_I2C_7_BASE_ADDR DT_SNPS_DESIGNWARE_I2C_91526000_BASE_ADDRESS #define DT_I2C_7_IRQ DT_SNPS_DESIGNWARE_I2C_91526000_IRQ_0 -#define CONFIG_I2C_7_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_91526000_IRQ_0_PRIORITY +#define DT_I2C_7_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_91526000_IRQ_0_PRIORITY #define DT_I2C_7_IRQ_FLAGS DT_SNPS_DESIGNWARE_I2C_91526000_IRQ_0_SENSE #define DT_I2C_7_BITRATE DT_SNPS_DESIGNWARE_I2C_91526000_CLOCK_FREQUENCY diff --git a/boards/x86/up_squared/up_squared_sbl_dts_fixup.h b/boards/x86/up_squared/up_squared_sbl_dts_fixup.h index 5780267d14d..fe03cf09a96 100644 --- a/boards/x86/up_squared/up_squared_sbl_dts_fixup.h +++ b/boards/x86/up_squared/up_squared_sbl_dts_fixup.h @@ -25,56 +25,56 @@ #define CONFIG_I2C_0_NAME DT_SNPS_DESIGNWARE_I2C_81444000_LABEL #define DT_I2C_0_BASE_ADDR DT_SNPS_DESIGNWARE_I2C_81444000_BASE_ADDRESS #define DT_I2C_0_IRQ DT_SNPS_DESIGNWARE_I2C_81444000_IRQ_0 -#define CONFIG_I2C_0_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_81444000_IRQ_0_PRIORITY +#define DT_I2C_0_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_81444000_IRQ_0_PRIORITY #define DT_I2C_0_IRQ_FLAGS DT_SNPS_DESIGNWARE_I2C_81444000_IRQ_0_SENSE #define DT_I2C_0_BITRATE DT_SNPS_DESIGNWARE_I2C_81444000_CLOCK_FREQUENCY #define CONFIG_I2C_1_NAME DT_SNPS_DESIGNWARE_I2C_81442000_LABEL #define DT_I2C_1_BASE_ADDR DT_SNPS_DESIGNWARE_I2C_81442000_BASE_ADDRESS #define DT_I2C_1_IRQ DT_SNPS_DESIGNWARE_I2C_81442000_IRQ_0 -#define CONFIG_I2C_1_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_81442000_IRQ_0_PRIORITY +#define DT_I2C_1_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_81442000_IRQ_0_PRIORITY #define DT_I2C_1_IRQ_FLAGS DT_SNPS_DESIGNWARE_I2C_81442000_IRQ_0_SENSE #define DT_I2C_1_BITRATE DT_SNPS_DESIGNWARE_I2C_81442000_CLOCK_FREQUENCY #define CONFIG_I2C_2_NAME DT_SNPS_DESIGNWARE_I2C_81440000_LABEL #define DT_I2C_2_BASE_ADDR DT_SNPS_DESIGNWARE_I2C_81440000_BASE_ADDRESS #define DT_I2C_2_IRQ DT_SNPS_DESIGNWARE_I2C_81440000_IRQ_0 -#define CONFIG_I2C_2_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_81440000_IRQ_0_PRIORITY +#define DT_I2C_2_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_81440000_IRQ_0_PRIORITY #define DT_I2C_2_IRQ_FLAGS DT_SNPS_DESIGNWARE_I2C_81440000_IRQ_0_SENSE #define DT_I2C_2_BITRATE DT_SNPS_DESIGNWARE_I2C_81440000_CLOCK_FREQUENCY #define CONFIG_I2C_3_NAME DT_SNPS_DESIGNWARE_I2C_8143E000_LABEL #define DT_I2C_3_BASE_ADDR DT_SNPS_DESIGNWARE_I2C_8143E000_BASE_ADDRESS #define DT_I2C_3_IRQ DT_SNPS_DESIGNWARE_I2C_8143E000_IRQ_0 -#define CONFIG_I2C_3_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_8143E000_IRQ_0_PRIORITY +#define DT_I2C_3_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_8143E000_IRQ_0_PRIORITY #define DT_I2C_3_IRQ_FLAGS DT_SNPS_DESIGNWARE_I2C_8143E000_IRQ_0_SENSE #define DT_I2C_3_BITRATE DT_SNPS_DESIGNWARE_I2C_8143E000_CLOCK_FREQUENCY #define CONFIG_I2C_4_NAME DT_SNPS_DESIGNWARE_I2C_8143C000_LABEL #define DT_I2C_4_BASE_ADDR DT_SNPS_DESIGNWARE_I2C_8143C000_BASE_ADDRESS #define DT_I2C_4_IRQ DT_SNPS_DESIGNWARE_I2C_8143C000_IRQ_0 -#define CONFIG_I2C_4_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_8143C000_IRQ_0_PRIORITY +#define DT_I2C_4_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_8143C000_IRQ_0_PRIORITY #define DT_I2C_4_IRQ_FLAGS DT_SNPS_DESIGNWARE_I2C_8143C000_IRQ_0_SENSE #define DT_I2C_4_BITRATE DT_SNPS_DESIGNWARE_I2C_8143C000_CLOCK_FREQUENCY #define CONFIG_I2C_5_NAME DT_SNPS_DESIGNWARE_I2C_8143A000_LABEL #define DT_I2C_5_BASE_ADDR DT_SNPS_DESIGNWARE_I2C_8143A000_BASE_ADDRESS #define DT_I2C_5_IRQ DT_SNPS_DESIGNWARE_I2C_8143A000_IRQ_0 -#define CONFIG_I2C_5_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_8143A000_IRQ_0_PRIORITY +#define DT_I2C_5_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_8143A000_IRQ_0_PRIORITY #define DT_I2C_5_IRQ_FLAGS DT_SNPS_DESIGNWARE_I2C_8143A000_IRQ_0_SENSE #define DT_I2C_5_BITRATE DT_SNPS_DESIGNWARE_I2C_8143A000_CLOCK_FREQUENCY #define CONFIG_I2C_6_NAME DT_SNPS_DESIGNWARE_I2C_81438000_LABEL #define DT_I2C_6_BASE_ADDR DT_SNPS_DESIGNWARE_I2C_81438000_BASE_ADDRESS #define DT_I2C_6_IRQ DT_SNPS_DESIGNWARE_I2C_81438000_IRQ_0 -#define CONFIG_I2C_6_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_81438000_IRQ_0_PRIORITY +#define DT_I2C_6_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_81438000_IRQ_0_PRIORITY #define DT_I2C_6_IRQ_FLAGS DT_SNPS_DESIGNWARE_I2C_81438000_IRQ_0_SENSE #define DT_I2C_6_BITRATE DT_SNPS_DESIGNWARE_I2C_81438000_CLOCK_FREQUENCY #define CONFIG_I2C_7_NAME DT_SNPS_DESIGNWARE_I2C_81436000_LABEL #define DT_I2C_7_BASE_ADDR DT_SNPS_DESIGNWARE_I2C_81436000_BASE_ADDRESS #define DT_I2C_7_IRQ DT_SNPS_DESIGNWARE_I2C_81436000_IRQ_0 -#define CONFIG_I2C_7_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_81436000_IRQ_0_PRIORITY +#define DT_I2C_7_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_81436000_IRQ_0_PRIORITY #define DT_I2C_7_IRQ_FLAGS DT_SNPS_DESIGNWARE_I2C_81436000_IRQ_0_SENSE #define DT_I2C_7_BITRATE DT_SNPS_DESIGNWARE_I2C_81436000_CLOCK_FREQUENCY diff --git a/drivers/i2c/i2c_atmel_sam3.c b/drivers/i2c/i2c_atmel_sam3.c index 468b8a7283f..251df61e433 100644 --- a/drivers/i2c/i2c_atmel_sam3.c +++ b/drivers/i2c/i2c_atmel_sam3.c @@ -618,7 +618,7 @@ static void config_func_0(struct device *dev) /* Enable clock for TWI0 controller */ PMC->PMC_PCER0 = (1 << ID_TWI0); - IRQ_CONNECT(TWI0_IRQn, CONFIG_I2C_0_IRQ_PRI, + IRQ_CONNECT(TWI0_IRQn, DT_I2C_0_IRQ_PRI, i2c_sam3_isr, DEVICE_GET(i2c_sam3_0), 0); irq_enable(TWI0_IRQn); } @@ -648,7 +648,7 @@ static void config_func_1(struct device *dev) /* Enable clock for TWI0 controller */ PMC->PMC_PCER0 = (1 << ID_TWI1); - IRQ_CONNECT(TWI1_IRQn, CONFIG_I2C_1_IRQ_PRI, + IRQ_CONNECT(TWI1_IRQn, DT_I2C_1_IRQ_PRI, i2c_sam3_isr, DEVICE_GET(i2c_sam3_1), 0); irq_enable(TWI1_IRQn); } diff --git a/drivers/i2c/i2c_dw.c b/drivers/i2c/i2c_dw.c index e44ec9426dc..51c632e9985 100644 --- a/drivers/i2c/i2c_dw.c +++ b/drivers/i2c/i2c_dw.c @@ -730,7 +730,7 @@ DEVICE_AND_API_INIT(i2c_0, CONFIG_I2C_0_NAME, &i2c_dw_initialize, static void i2c_config_0(struct device *port) { #if defined(CONFIG_I2C_DW_0_IRQ_DIRECT) - IRQ_CONNECT(DT_I2C_0_IRQ, CONFIG_I2C_0_IRQ_PRI, + IRQ_CONNECT(DT_I2C_0_IRQ, DT_I2C_0_IRQ_PRI, i2c_dw_isr, DEVICE_GET(i2c_0), DT_I2C_0_IRQ_FLAGS); irq_enable(DT_I2C_0_IRQ); #elif defined(CONFIG_I2C_DW_0_IRQ_SHARED) @@ -777,7 +777,7 @@ DEVICE_AND_API_INIT(i2c_1, CONFIG_I2C_1_NAME, &i2c_dw_initialize, static void i2c_config_1(struct device *port) { - IRQ_CONNECT(DT_I2C_1_IRQ, CONFIG_I2C_1_IRQ_PRI, + IRQ_CONNECT(DT_I2C_1_IRQ, DT_I2C_1_IRQ_PRI, i2c_dw_isr, DEVICE_GET(i2c_1), DT_I2C_1_IRQ_FLAGS); irq_enable(DT_I2C_1_IRQ); } @@ -815,7 +815,7 @@ DEVICE_AND_API_INIT(I2C_2, CONFIG_I2C_2_NAME, &i2c_dw_initialize, static void i2c_config_2(struct device *port) { - IRQ_CONNECT(DT_I2C_2_IRQ, CONFIG_I2C_2_IRQ_PRI, + IRQ_CONNECT(DT_I2C_2_IRQ, DT_I2C_2_IRQ_PRI, i2c_dw_isr, DEVICE_GET(I2C_2), DT_I2C_2_IRQ_FLAGS); irq_enable(DT_I2C_2_IRQ); } @@ -853,7 +853,7 @@ DEVICE_AND_API_INIT(I2C_3, CONFIG_I2C_3_NAME, &i2c_dw_initialize, static void i2c_config_3(struct device *port) { - IRQ_CONNECT(DT_I2C_3_IRQ, CONFIG_I2C_3_IRQ_PRI, + IRQ_CONNECT(DT_I2C_3_IRQ, DT_I2C_3_IRQ_PRI, i2c_dw_isr, DEVICE_GET(I2C_3), DT_I2C_3_IRQ_FLAGS); irq_enable(DT_I2C_3_IRQ); } @@ -891,7 +891,7 @@ DEVICE_AND_API_INIT(I2C_4, CONFIG_I2C_4_NAME, &i2c_dw_initialize, static void i2c_config_4(struct device *port) { - IRQ_CONNECT(DT_I2C_4_IRQ, CONFIG_I2C_4_IRQ_PRI, + IRQ_CONNECT(DT_I2C_4_IRQ, DT_I2C_4_IRQ_PRI, i2c_dw_isr, DEVICE_GET(I2C_4), DT_I2C_4_IRQ_FLAGS); irq_enable(DT_I2C_4_IRQ); } @@ -929,7 +929,7 @@ DEVICE_AND_API_INIT(I2C_5, CONFIG_I2C_5_NAME, &i2c_dw_initialize, static void i2c_config_5(struct device *port) { - IRQ_CONNECT(DT_I2C_5_IRQ, CONFIG_I2C_5_IRQ_PRI, + IRQ_CONNECT(DT_I2C_5_IRQ, DT_I2C_5_IRQ_PRI, i2c_dw_isr, DEVICE_GET(I2C_5), DT_I2C_5_IRQ_FLAGS); irq_enable(DT_I2C_5_IRQ); } @@ -967,7 +967,7 @@ DEVICE_AND_API_INIT(I2C_6, CONFIG_I2C_6_NAME, &i2c_dw_initialize, static void i2c_config_6(struct device *port) { - IRQ_CONNECT(DT_I2C_6_IRQ, CONFIG_I2C_6_IRQ_PRI, + IRQ_CONNECT(DT_I2C_6_IRQ, DT_I2C_6_IRQ_PRI, i2c_dw_isr, DEVICE_GET(I2C_6), DT_I2C_6_IRQ_FLAGS); irq_enable(DT_I2C_6_IRQ); } @@ -1005,7 +1005,7 @@ DEVICE_AND_API_INIT(I2C_7, CONFIG_I2C_7_NAME, &i2c_dw_initialize, static void i2c_config_7(struct device *port) { - IRQ_CONNECT(DT_I2C_7_IRQ, CONFIG_I2C_7_IRQ_PRI, + IRQ_CONNECT(DT_I2C_7_IRQ, DT_I2C_7_IRQ_PRI, i2c_dw_isr, DEVICE_GET(I2C_7), DT_I2C_7_IRQ_FLAGS); irq_enable(DT_I2C_7_IRQ); } diff --git a/drivers/i2c/i2c_nrfx_twi.c b/drivers/i2c/i2c_nrfx_twi.c index 9059e2672ca..bb468158c6a 100644 --- a/drivers/i2c/i2c_nrfx_twi.c +++ b/drivers/i2c/i2c_nrfx_twi.c @@ -140,7 +140,7 @@ static int init_twi(struct device *dev, const nrfx_twi_config_t *config) static int twi_##idx##_init(struct device *dev) \ { \ IRQ_CONNECT(DT_I2C_##idx##_IRQ, \ - CONFIG_I2C_##idx##_IRQ_PRI, \ + DT_I2C_##idx##_IRQ_PRI, \ nrfx_isr, nrfx_twi_##idx##_irq_handler, 0); \ const nrfx_twi_config_t config = { \ .scl = DT_I2C_##idx##_SCL_PIN, \ diff --git a/drivers/i2c/i2c_nrfx_twim.c b/drivers/i2c/i2c_nrfx_twim.c index 66be5f2d5f2..2da1b4a27af 100644 --- a/drivers/i2c/i2c_nrfx_twim.c +++ b/drivers/i2c/i2c_nrfx_twim.c @@ -141,7 +141,7 @@ static int init_twim(struct device *dev, const nrfx_twim_config_t *config) static int twim_##idx##_init(struct device *dev) \ { \ IRQ_CONNECT(DT_I2C_##idx##_IRQ, \ - CONFIG_I2C_##idx##_IRQ_PRI, \ + DT_I2C_##idx##_IRQ_PRI, \ nrfx_isr, nrfx_twim_##idx##_irq_handler, 0);\ const nrfx_twim_config_t config = { \ .scl = DT_I2C_##idx##_SCL_PIN, \ diff --git a/drivers/i2c/i2c_qmsi.c b/drivers/i2c/i2c_qmsi.c index 792b0ddf7b7..16099992545 100644 --- a/drivers/i2c/i2c_qmsi.c +++ b/drivers/i2c/i2c_qmsi.c @@ -257,6 +257,16 @@ static const struct i2c_driver_api api = { .transfer = i2c_qmsi_transfer, }; +/* Some SoCs have interrupt controllers w/o priority, in that case set + * it to 0 */ +#ifndef DT_I2C_0_IRQ_PRI +#define DT_I2C_0_IRQ_PRI 0 +#endif + +#ifndef DT_I2C_1_IRQ_PRI +#define DT_I2C_1_IRQ_PRI 0 +#endif + static int i2c_qmsi_init(struct device *dev) { struct i2c_qmsi_driver_data *driver_data = GET_DRIVER_DATA(dev); @@ -274,7 +284,7 @@ static int i2c_qmsi_init(struct device *dev) * to Lakemont core. */ IRQ_CONNECT(DT_I2C_0_IRQ, - CONFIG_I2C_0_IRQ_PRI, qm_i2c_0_irq_isr, NULL, + DT_I2C_0_IRQ_PRI, qm_i2c_0_irq_isr, NULL, DT_I2C_0_IRQ_FLAGS); irq_enable(DT_I2C_0_IRQ); QM_IR_UNMASK_INTERRUPTS( @@ -284,7 +294,7 @@ static int i2c_qmsi_init(struct device *dev) #ifdef CONFIG_I2C_1 case QM_I2C_1: IRQ_CONNECT(DT_I2C_1_IRQ, - CONFIG_I2C_1_IRQ_PRI, qm_i2c_1_irq_isr, NULL, + DT_I2C_1_IRQ_PRI, qm_i2c_1_irq_isr, NULL, DT_I2C_1_IRQ_FLAGS); irq_enable(DT_I2C_1_IRQ); QM_IR_UNMASK_INTERRUPTS( diff --git a/drivers/i2c/i2c_sam_twi.c b/drivers/i2c/i2c_sam_twi.c index 7b5ca58f8f6..3f7df012268 100644 --- a/drivers/i2c/i2c_sam_twi.c +++ b/drivers/i2c/i2c_sam_twi.c @@ -343,7 +343,7 @@ static struct device DEVICE_NAME_GET(i2c0_sam); static void i2c0_sam_irq_config(void) { - IRQ_CONNECT(DT_I2C_0_IRQ, CONFIG_I2C_0_IRQ_PRI, i2c_sam_twi_isr, + IRQ_CONNECT(DT_I2C_0_IRQ, DT_I2C_0_IRQ_PRI, i2c_sam_twi_isr, DEVICE_GET(i2c0_sam), 0); } @@ -373,7 +373,7 @@ static struct device DEVICE_NAME_GET(i2c1_sam); static void i2c1_sam_irq_config(void) { - IRQ_CONNECT(DT_I2C_1_IRQ, CONFIG_I2C_1_IRQ_PRI, i2c_sam_twi_isr, + IRQ_CONNECT(DT_I2C_1_IRQ, DT_I2C_1_IRQ_PRI, i2c_sam_twi_isr, DEVICE_GET(i2c1_sam), 0); } diff --git a/drivers/i2c/i2c_sam_twihs.c b/drivers/i2c/i2c_sam_twihs.c index 478503cd8e2..e0531aa9920 100644 --- a/drivers/i2c/i2c_sam_twihs.c +++ b/drivers/i2c/i2c_sam_twihs.c @@ -330,7 +330,7 @@ static struct device DEVICE_NAME_GET(i2c0_sam); static void i2c0_sam_irq_config(void) { - IRQ_CONNECT(DT_I2C_0_IRQ, CONFIG_I2C_0_IRQ_PRI, i2c_sam_twihs_isr, + IRQ_CONNECT(DT_I2C_0_IRQ, DT_I2C_0_IRQ_PRI, i2c_sam_twihs_isr, DEVICE_GET(i2c0_sam), 0); } @@ -360,7 +360,7 @@ static struct device DEVICE_NAME_GET(i2c1_sam); static void i2c1_sam_irq_config(void) { - IRQ_CONNECT(DT_I2C_1_IRQ, CONFIG_I2C_1_IRQ_PRI, i2c_sam_twihs_isr, + IRQ_CONNECT(DT_I2C_1_IRQ, DT_I2C_1_IRQ_PRI, i2c_sam_twihs_isr, DEVICE_GET(i2c1_sam), 0); } @@ -390,7 +390,7 @@ static struct device DEVICE_NAME_GET(i2c2_sam); static void i2c2_sam_irq_config(void) { - IRQ_CONNECT(DT_I2C_2_IRQ, CONFIG_I2C_2_IRQ_PRI, i2c_sam_twihs_isr, + IRQ_CONNECT(DT_I2C_2_IRQ, DT_I2C_2_IRQ_PRI, i2c_sam_twihs_isr, DEVICE_GET(i2c2_sam), 0); } diff --git a/soc/arc/quark_se_c1000_ss/dts_fixup.h b/soc/arc/quark_se_c1000_ss/dts_fixup.h index e5d8037fed4..eed25859c76 100644 --- a/soc/arc/quark_se_c1000_ss/dts_fixup.h +++ b/soc/arc/quark_se_c1000_ss/dts_fixup.h @@ -43,11 +43,11 @@ #define CONFIG_I2C_0_NAME DT_INTEL_QMSI_I2C_B0002800_LABEL #define DT_I2C_0_BITRATE DT_INTEL_QMSI_I2C_B0002800_CLOCK_FREQUENCY #define DT_I2C_0_IRQ DT_INTEL_QMSI_I2C_B0002800_IRQ_0 -#define CONFIG_I2C_0_IRQ_PRI DT_INTEL_QMSI_I2C_B0002800_IRQ_0_PRIORITY +#define DT_I2C_0_IRQ_PRI DT_INTEL_QMSI_I2C_B0002800_IRQ_0_PRIORITY #define CONFIG_I2C_1_NAME DT_INTEL_QMSI_I2C_B0002C00_LABEL #define DT_I2C_1_BITRATE DT_INTEL_QMSI_I2C_B0002C00_CLOCK_FREQUENCY #define DT_I2C_1_IRQ DT_INTEL_QMSI_I2C_B0002C00_IRQ_0 -#define CONFIG_I2C_1_IRQ_PRI DT_INTEL_QMSI_I2C_B0002C00_IRQ_0_PRIORITY +#define DT_I2C_1_IRQ_PRI DT_INTEL_QMSI_I2C_B0002C00_IRQ_0_PRIORITY #define CONFIG_RTC_0_NAME DT_INTEL_QMSI_RTC_B0000400_LABEL #define DT_RTC_0_IRQ DT_INTEL_QMSI_RTC_B0000400_IRQ_0 diff --git a/soc/arc/snps_emsk/dts_fixup.h b/soc/arc/snps_emsk/dts_fixup.h index 80856716c09..ccf3ba7e17f 100644 --- a/soc/arc/snps_emsk/dts_fixup.h +++ b/soc/arc/snps_emsk/dts_fixup.h @@ -38,7 +38,7 @@ #define DT_I2C_0_BASE_ADDR DT_SNPS_DESIGNWARE_I2C_F0004000_BASE_ADDRESS #define DT_I2C_0_BITRATE DT_SNPS_DESIGNWARE_I2C_F0004000_CLOCK_FREQUENCY #define DT_I2C_0_IRQ DT_SNPS_DESIGNWARE_I2C_F0004000_IRQ_0 -#define CONFIG_I2C_0_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_F0004000_IRQ_0_PRIORITY +#define DT_I2C_0_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_F0004000_IRQ_0_PRIORITY #define CONFIG_I2C_0_NAME DT_SNPS_DESIGNWARE_I2C_F0004000_LABEL #define DT_I2C_0_IRQ_FLAGS 0 @@ -46,7 +46,7 @@ #define DT_I2C_1_BASE_ADDR DT_SNPS_DESIGNWARE_I2C_F0005000_BASE_ADDRESS #define DT_I2C_1_BITRATE DT_SNPS_DESIGNWARE_I2C_F0005000_CLOCK_FREQUENCY #define DT_I2C_1_IRQ DT_SNPS_DESIGNWARE_I2C_F0005000_IRQ_0 -#define CONFIG_I2C_1_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_F0005000_IRQ_0_PRIORITY +#define DT_I2C_1_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_F0005000_IRQ_0_PRIORITY #define CONFIG_I2C_1_NAME DT_SNPS_DESIGNWARE_I2C_F0005000_LABEL #define DT_I2C_1_IRQ_FLAGS 0 diff --git a/soc/arm/atmel_sam/sam3x/dts_fixup.h b/soc/arm/atmel_sam/sam3x/dts_fixup.h index fc7ccd3d5be..36a74ce0a21 100644 --- a/soc/arm/atmel_sam/sam3x/dts_fixup.h +++ b/soc/arm/atmel_sam/sam3x/dts_fixup.h @@ -12,13 +12,13 @@ #define CONFIG_I2C_0_NAME DT_ATMEL_SAM_I2C_TWI_4008C000_LABEL #define DT_I2C_0_BITRATE DT_ATMEL_SAM_I2C_TWI_4008C000_CLOCK_FREQUENCY #define DT_I2C_0_IRQ DT_ATMEL_SAM_I2C_TWI_4008C000_IRQ_0 -#define CONFIG_I2C_0_IRQ_PRI DT_ATMEL_SAM_I2C_TWI_4008C000_IRQ_0_PRIORITY +#define DT_I2C_0_IRQ_PRI DT_ATMEL_SAM_I2C_TWI_4008C000_IRQ_0_PRIORITY #define DT_I2C_0_PERIPHERAL_ID DT_ATMEL_SAM_I2C_TWI_4008C000_PERIPHERAL_ID #define DT_I2C_1_BASE_ADDRESS DT_ATMEL_SAM_I2C_TWI_40090000_BASE_ADDRESS #define CONFIG_I2C_1_NAME DT_ATMEL_SAM_I2C_TWI_40090000_LABEL #define DT_I2C_1_BITRATE DT_ATMEL_SAM_I2C_TWI_40090000_CLOCK_FREQUENCY #define DT_I2C_1_IRQ DT_ATMEL_SAM_I2C_TWI_40090000_IRQ_0 -#define CONFIG_I2C_1_IRQ_PRI DT_ATMEL_SAM_I2C_TWI_40090000_IRQ_0_PRIORITY +#define DT_I2C_1_IRQ_PRI DT_ATMEL_SAM_I2C_TWI_40090000_IRQ_0_PRIORITY #define DT_I2C_1_PERIPHERAL_ID DT_ATMEL_SAM_I2C_TWI_40090000_PERIPHERAL_ID #define DT_UART_SAM_PORT_0_NAME DT_ATMEL_SAM_UART_400E0800_LABEL diff --git a/soc/arm/atmel_sam/sam4s/dts_fixup.h b/soc/arm/atmel_sam/sam4s/dts_fixup.h index 1201aa39d44..6701696eedd 100644 --- a/soc/arm/atmel_sam/sam4s/dts_fixup.h +++ b/soc/arm/atmel_sam/sam4s/dts_fixup.h @@ -28,13 +28,13 @@ #define CONFIG_I2C_0_NAME DT_ATMEL_SAM_I2C_TWI_40018000_LABEL #define DT_I2C_0_BITRATE DT_ATMEL_SAM_I2C_TWI_40018000_CLOCK_FREQUENCY #define DT_I2C_0_IRQ DT_ATMEL_SAM_I2C_TWI_40018000_IRQ_0 -#define CONFIG_I2C_0_IRQ_PRI DT_ATMEL_SAM_I2C_TWI_40018000_IRQ_0_PRIORITY +#define DT_I2C_0_IRQ_PRI DT_ATMEL_SAM_I2C_TWI_40018000_IRQ_0_PRIORITY #define DT_I2C_0_PERIPHERAL_ID DT_ATMEL_SAM_I2C_TWI_40018000_PERIPHERAL_ID #define DT_I2C_1_BASE_ADDRESS DT_ATMEL_SAM_I2C_TWI_4001C000_BASE_ADDRESS #define CONFIG_I2C_1_NAME DT_ATMEL_SAM_I2C_TWI_4001C000_LABEL #define DT_I2C_1_BITRATE DT_ATMEL_SAM_I2C_TWI_4001C000_CLOCK_FREQUENCY #define DT_I2C_1_IRQ DT_ATMEL_SAM_I2C_TWI_4001C000_IRQ_0 -#define CONFIG_I2C_1_IRQ_PRI DT_ATMEL_SAM_I2C_TWI_4001C000_IRQ_0_PRIORITY +#define DT_I2C_1_IRQ_PRI DT_ATMEL_SAM_I2C_TWI_4001C000_IRQ_0_PRIORITY #define DT_I2C_1_PERIPHERAL_ID DT_ATMEL_SAM_I2C_TWI_4001C000_PERIPHERAL_ID #define DT_UART_SAM_PORT_0_NAME DT_ATMEL_SAM_UART_400E0600_LABEL diff --git a/soc/arm/atmel_sam/same70/dts_fixup.h b/soc/arm/atmel_sam/same70/dts_fixup.h index bf872efe879..5f261d4dc68 100644 --- a/soc/arm/atmel_sam/same70/dts_fixup.h +++ b/soc/arm/atmel_sam/same70/dts_fixup.h @@ -38,21 +38,21 @@ #define CONFIG_I2C_0_NAME DT_ATMEL_SAM_I2C_TWIHS_40018000_LABEL #define DT_I2C_0_BITRATE DT_ATMEL_SAM_I2C_TWIHS_40018000_CLOCK_FREQUENCY #define DT_I2C_0_IRQ DT_ATMEL_SAM_I2C_TWIHS_40018000_IRQ_0 -#define CONFIG_I2C_0_IRQ_PRI DT_ATMEL_SAM_I2C_TWIHS_40018000_IRQ_0_PRIORITY +#define DT_I2C_0_IRQ_PRI DT_ATMEL_SAM_I2C_TWIHS_40018000_IRQ_0_PRIORITY #define DT_I2C_0_PERIPHERAL_ID DT_ATMEL_SAM_I2C_TWIHS_40018000_PERIPHERAL_ID #define DT_I2C_1_BASE_ADDRESS DT_ATMEL_SAM_I2C_TWIHS_4001C000_BASE_ADDRESS #define CONFIG_I2C_1_NAME DT_ATMEL_SAM_I2C_TWIHS_4001C000_LABEL #define DT_I2C_1_BITRATE DT_ATMEL_SAM_I2C_TWIHS_4001C000_CLOCK_FREQUENCY #define DT_I2C_1_IRQ DT_ATMEL_SAM_I2C_TWIHS_4001C000_IRQ_0 -#define CONFIG_I2C_1_IRQ_PRI DT_ATMEL_SAM_I2C_TWIHS_4001C000_IRQ_0_PRIORITY +#define DT_I2C_1_IRQ_PRI DT_ATMEL_SAM_I2C_TWIHS_4001C000_IRQ_0_PRIORITY #define DT_I2C_1_PERIPHERAL_ID DT_ATMEL_SAM_I2C_TWIHS_4001C000_PERIPHERAL_ID #define DT_I2C_2_BASE_ADDRESS DT_ATMEL_SAM_I2C_TWIHS_40060000_BASE_ADDRESS #define CONFIG_I2C_2_NAME DT_ATMEL_SAM_I2C_TWIHS_40060000_LABEL #define DT_I2C_2_BITRATE DT_ATMEL_SAM_I2C_TWIHS_40060000_CLOCK_FREQUENCY #define DT_I2C_2_IRQ DT_ATMEL_SAM_I2C_TWIHS_40060000_IRQ_0 -#define CONFIG_I2C_2_IRQ_PRI DT_ATMEL_SAM_I2C_TWIHS_40060000_IRQ_0_PRIORITY +#define DT_I2C_2_IRQ_PRI DT_ATMEL_SAM_I2C_TWIHS_40060000_IRQ_0_PRIORITY #define DT_I2C_2_PERIPHERAL_ID DT_ATMEL_SAM_I2C_TWIHS_40060000_PERIPHERAL_ID #define DT_SPI_0_BASE_ADDRESS DT_ATMEL_SAM_SPI_40008000_BASE_ADDRESS diff --git a/soc/arm/nordic_nrf/nrf51/dts_fixup.h b/soc/arm/nordic_nrf/nrf51/dts_fixup.h index b802f4e8e2e..233f9a01cf8 100644 --- a/soc/arm/nordic_nrf/nrf51/dts_fixup.h +++ b/soc/arm/nordic_nrf/nrf51/dts_fixup.h @@ -29,7 +29,7 @@ #define DT_I2C_0_BASE_ADDR DT_NORDIC_NRF_I2C_40003000_BASE_ADDRESS #define CONFIG_I2C_0_NAME DT_NORDIC_NRF_I2C_40003000_LABEL #define DT_I2C_0_BITRATE DT_NORDIC_NRF_I2C_40003000_CLOCK_FREQUENCY -#define CONFIG_I2C_0_IRQ_PRI DT_NORDIC_NRF_I2C_40003000_IRQ_0_PRIORITY +#define DT_I2C_0_IRQ_PRI DT_NORDIC_NRF_I2C_40003000_IRQ_0_PRIORITY #define DT_I2C_0_IRQ DT_NORDIC_NRF_I2C_40003000_IRQ_0 #define DT_I2C_0_SDA_PIN DT_NORDIC_NRF_I2C_40003000_SDA_PIN #define DT_I2C_0_SCL_PIN DT_NORDIC_NRF_I2C_40003000_SCL_PIN @@ -37,7 +37,7 @@ #define DT_I2C_1_BASE_ADDR DT_NORDIC_NRF_I2C_40004000_BASE_ADDRESS #define CONFIG_I2C_1_NAME DT_NORDIC_NRF_I2C_40004000_LABEL #define DT_I2C_1_BITRATE DT_NORDIC_NRF_I2C_40004000_CLOCK_FREQUENCY -#define CONFIG_I2C_1_IRQ_PRI DT_NORDIC_NRF_I2C_40004000_IRQ_0_PRIORITY +#define DT_I2C_1_IRQ_PRI DT_NORDIC_NRF_I2C_40004000_IRQ_0_PRIORITY #define DT_I2C_1_IRQ DT_NORDIC_NRF_I2C_40004000_IRQ_0 #define DT_I2C_1_SDA_PIN DT_NORDIC_NRF_I2C_40004000_SDA_PIN #define DT_I2C_1_SCL_PIN DT_NORDIC_NRF_I2C_40004000_SCL_PIN diff --git a/soc/arm/nordic_nrf/nrf52/dts_fixup.h b/soc/arm/nordic_nrf/nrf52/dts_fixup.h index fcacdbacbe9..abfef0a4c06 100644 --- a/soc/arm/nordic_nrf/nrf52/dts_fixup.h +++ b/soc/arm/nordic_nrf/nrf52/dts_fixup.h @@ -62,7 +62,7 @@ #define DT_I2C_0_BASE_ADDR DT_NORDIC_NRF_I2C_40003000_BASE_ADDRESS #define CONFIG_I2C_0_NAME DT_NORDIC_NRF_I2C_40003000_LABEL #define DT_I2C_0_BITRATE DT_NORDIC_NRF_I2C_40003000_CLOCK_FREQUENCY -#define CONFIG_I2C_0_IRQ_PRI DT_NORDIC_NRF_I2C_40003000_IRQ_0_PRIORITY +#define DT_I2C_0_IRQ_PRI DT_NORDIC_NRF_I2C_40003000_IRQ_0_PRIORITY #define DT_I2C_0_IRQ DT_NORDIC_NRF_I2C_40003000_IRQ_0 #define DT_I2C_0_SDA_PIN DT_NORDIC_NRF_I2C_40003000_SDA_PIN #define DT_I2C_0_SCL_PIN DT_NORDIC_NRF_I2C_40003000_SCL_PIN @@ -70,7 +70,7 @@ #define DT_I2C_1_BASE_ADDR DT_NORDIC_NRF_I2C_40004000_BASE_ADDRESS #define CONFIG_I2C_1_NAME DT_NORDIC_NRF_I2C_40004000_LABEL #define DT_I2C_1_BITRATE DT_NORDIC_NRF_I2C_40004000_CLOCK_FREQUENCY -#define CONFIG_I2C_1_IRQ_PRI DT_NORDIC_NRF_I2C_40004000_IRQ_0_PRIORITY +#define DT_I2C_1_IRQ_PRI DT_NORDIC_NRF_I2C_40004000_IRQ_0_PRIORITY #define DT_I2C_1_IRQ DT_NORDIC_NRF_I2C_40004000_IRQ_0 #define DT_I2C_1_SDA_PIN DT_NORDIC_NRF_I2C_40004000_SDA_PIN #define DT_I2C_1_SCL_PIN DT_NORDIC_NRF_I2C_40004000_SCL_PIN diff --git a/soc/x86/intel_quark/quark_se/dts_fixup.h b/soc/x86/intel_quark/quark_se/dts_fixup.h index f3dddff8945..0cd1a02a83b 100644 --- a/soc/x86/intel_quark/quark_se/dts_fixup.h +++ b/soc/x86/intel_quark/quark_se/dts_fixup.h @@ -25,12 +25,12 @@ #define CONFIG_I2C_0_NAME DT_INTEL_QMSI_I2C_B0002800_LABEL #define DT_I2C_0_BITRATE DT_INTEL_QMSI_I2C_B0002800_CLOCK_FREQUENCY #define DT_I2C_0_IRQ DT_INTEL_QMSI_I2C_B0002800_IRQ_0 -#define CONFIG_I2C_0_IRQ_PRI DT_INTEL_QMSI_I2C_B0002800_IRQ_0_PRIORITY +#define DT_I2C_0_IRQ_PRI DT_INTEL_QMSI_I2C_B0002800_IRQ_0_PRIORITY #define DT_I2C_0_IRQ_FLAGS DT_INTEL_QMSI_I2C_B0002800_IRQ_0_SENSE #define CONFIG_I2C_1_NAME DT_INTEL_QMSI_I2C_B0002C00_LABEL #define DT_I2C_1_BITRATE DT_INTEL_QMSI_I2C_B0002C00_CLOCK_FREQUENCY #define DT_I2C_1_IRQ DT_INTEL_QMSI_I2C_B0002C00_IRQ_0 -#define CONFIG_I2C_1_IRQ_PRI DT_INTEL_QMSI_I2C_B0002C00_IRQ_0_PRIORITY +#define DT_I2C_1_IRQ_PRI DT_INTEL_QMSI_I2C_B0002C00_IRQ_0_PRIORITY #define DT_I2C_1_IRQ_FLAGS DT_INTEL_QMSI_I2C_B0002C00_IRQ_0_SENSE #define DT_GPIO_QMSI_0_NAME DT_INTEL_QMSI_GPIO_B0000C00_LABEL diff --git a/soc/xtensa/intel_s1000/dts_fixup.h b/soc/xtensa/intel_s1000/dts_fixup.h index dc2a1ede534..134e6e43d42 100644 --- a/soc/xtensa/intel_s1000/dts_fixup.h +++ b/soc/xtensa/intel_s1000/dts_fixup.h @@ -45,7 +45,7 @@ (DT_INTEL_CAVS_INTC_78800_IRQ_0 << 0)) #define DT_I2C_0_IRQ_FLAGS DT_SNPS_DESIGNWARE_I2C_80400_IRQ_0_SENSE -#define CONFIG_I2C_0_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_80400_IRQ_0_PRIORITY +#define DT_I2C_0_IRQ_PRI DT_SNPS_DESIGNWARE_I2C_80400_IRQ_0_PRIORITY #define DT_SPI_0_BASE_ADDRESS DT_SNPS_DESIGNWARE_SPI_E000_BASE_ADDRESS #define CONFIG_SPI_0_NAME DT_SNPS_DESIGNWARE_SPI_E000_LABEL