From 4c516849183ae7852058fa6ac72e6982383fbadd Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 29 Jan 2019 16:06:34 -0600 Subject: [PATCH] drivers: i2c: dw: Convert to new DT__ defines Convert designware i2c driver to use new defines so we can remove the dts_fixup.h code for it. Signed-off-by: Kumar Gala --- boards/x86/up_squared/dts_fixup.h | 112 ------------------ drivers/i2c/i2c_dw.c | 120 ++++++++++++-------- soc/arc/snps_emsk/dts_fixup.h | 20 ---- soc/x86/intel_quark/quark_x1000/dts_fixup.h | 6 - soc/xtensa/intel_s1000/dts_fixup.h | 7 -- 5 files changed, 72 insertions(+), 193 deletions(-) diff --git a/boards/x86/up_squared/dts_fixup.h b/boards/x86/up_squared/dts_fixup.h index 4013b0d13fa..7e33e3cbe0c 100644 --- a/boards/x86/up_squared/dts_fixup.h +++ b/boards/x86/up_squared/dts_fixup.h @@ -24,62 +24,6 @@ #define DT_UART_NS16550_PORT_1_IRQ_FLAGS DT_NS16550_81432000_IRQ_0_SENSE #define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_81432000_CLOCK_FREQUENCY -#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 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 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 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 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 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 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 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 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 - #else #define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_91524000_BASE_ADDRESS @@ -98,62 +42,6 @@ #define DT_UART_NS16550_PORT_1_IRQ_FLAGS DT_NS16550_91522000_IRQ_0_SENSE #define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_91522000_CLOCK_FREQUENCY -#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 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 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 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 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 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 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 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 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 - #endif /* End of Board Level DTS fixup file */ diff --git a/drivers/i2c/i2c_dw.c b/drivers/i2c/i2c_dw.c index 03cf8498969..135b4cc45f3 100644 --- a/drivers/i2c/i2c_dw.c +++ b/drivers/i2c/i2c_dw.c @@ -706,11 +706,11 @@ static const struct i2c_dw_rom_config i2c_config_dw_0 = { #ifdef CONFIG_GPIO_DW_0_IRQ_SHARED .shared_irq_dev_name = CONFIG_I2C_DW_0_IRQ_SHARED_NAME, #endif - .bitrate = DT_I2C_0_BITRATE, + .bitrate = DT_SNPS_DESIGNWARE_I2C_0_CLOCK_FREQUENCY, }; static struct i2c_dw_dev_config i2c_0_runtime = { - .base_address = DT_I2C_0_BASE_ADDR, + .base_address = DT_SNPS_DESIGNWARE_I2C_0_BASE_ADDRESS, #if CONFIG_PCI .pci_dev.class_type = I2C_DW_0_PCI_CLASS, .pci_dev.bus = I2C_DW_0_PCI_BUS, @@ -722,17 +722,20 @@ static struct i2c_dw_dev_config i2c_0_runtime = { #endif }; -DEVICE_AND_API_INIT(i2c_0, CONFIG_I2C_0_NAME, &i2c_dw_initialize, +DEVICE_AND_API_INIT(i2c_0, DT_SNPS_DESIGNWARE_I2C_0_LABEL, &i2c_dw_initialize, &i2c_0_runtime, &i2c_config_dw_0, POST_KERNEL, CONFIG_I2C_INIT_PRIORITY, &funcs); +#ifndef DT_SNPS_DESIGNWARE_I2C_0_IRQ_0_SENSE +#define DT_SNPS_DESIGNWARE_I2C_0_IRQ_0_SENSE 0 +#endif static void i2c_config_0(struct device *port) { #if defined(CONFIG_I2C_DW_0_IRQ_DIRECT) - 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); + IRQ_CONNECT(DT_SNPS_DESIGNWARE_I2C_0_IRQ_0, DT_SNPS_DESIGNWARE_I2C_0_IRQ_0_PRIORITY, + i2c_dw_isr, DEVICE_GET(i2c_0), DT_SNPS_DESIGNWARE_I2C_0_IRQ_0_SENSE); + irq_enable(DT_SNPS_DESIGNWARE_I2C_0_IRQ_0); #elif defined(CONFIG_I2C_DW_0_IRQ_SHARED) const struct i2c_dw_rom_config * const config = port->config->config_info; @@ -754,11 +757,11 @@ static void i2c_config_1(struct device *port); static const struct i2c_dw_rom_config i2c_config_dw_1 = { .config_func = i2c_config_1, - .bitrate = DT_I2C_1_BITRATE, + .bitrate = DT_SNPS_DESIGNWARE_I2C_1_CLOCK_FREQUENCY, }; static struct i2c_dw_dev_config i2c_1_runtime = { - .base_address = DT_I2C_1_BASE_ADDR, + .base_address = DT_SNPS_DESIGNWARE_I2C_1_BASE_ADDRESS, #if CONFIG_PCI .pci_dev.class_type = I2C_DW_1_PCI_CLASS, .pci_dev.bus = I2C_DW_1_PCI_BUS, @@ -770,16 +773,19 @@ static struct i2c_dw_dev_config i2c_1_runtime = { #endif }; -DEVICE_AND_API_INIT(i2c_1, CONFIG_I2C_1_NAME, &i2c_dw_initialize, +DEVICE_AND_API_INIT(i2c_1, DT_SNPS_DESIGNWARE_I2C_1_LABEL, &i2c_dw_initialize, &i2c_1_runtime, &i2c_config_dw_1, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &funcs); +#ifndef DT_SNPS_DESIGNWARE_I2C_1_IRQ_0_SENSE +#define DT_SNPS_DESIGNWARE_I2C_1_IRQ_0_SENSE 0 +#endif static void i2c_config_1(struct device *port) { - 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); + IRQ_CONNECT(DT_SNPS_DESIGNWARE_I2C_1_IRQ_0, DT_SNPS_DESIGNWARE_I2C_1_IRQ_0_PRIORITY, + i2c_dw_isr, DEVICE_GET(i2c_1), DT_SNPS_DESIGNWARE_I2C_1_IRQ_0_SENSE); + irq_enable(DT_SNPS_DESIGNWARE_I2C_1_IRQ_0); } #endif /* CONFIG_I2C_1 */ @@ -792,11 +798,11 @@ static void i2c_config_2(struct device *port); static const struct i2c_dw_rom_config i2c_config_dw_2 = { .config_func = i2c_config_2, - .bitrate = DT_I2C_2_BITRATE, + .bitrate = DT_SNPS_DESIGNWARE_I2C_2_CLOCK_FREQUENCY, }; static struct i2c_dw_dev_config I2C_2_runtime = { - .base_address = DT_I2C_2_BASE_ADDR, + .base_address = DT_SNPS_DESIGNWARE_I2C_2_BASE_ADDRESS, #if CONFIG_PCI .pci_dev.class_type = I2C_DW_2_PCI_CLASS, .pci_dev.bus = I2C_DW_2_PCI_BUS, @@ -808,16 +814,19 @@ static struct i2c_dw_dev_config I2C_2_runtime = { #endif }; -DEVICE_AND_API_INIT(I2C_2, CONFIG_I2C_2_NAME, &i2c_dw_initialize, +DEVICE_AND_API_INIT(I2C_2, DT_SNPS_DESIGNWARE_I2C_2_LABEL, &i2c_dw_initialize, &I2C_2_runtime, &i2c_config_dw_2, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &funcs); +#ifndef DT_SNPS_DESIGNWARE_I2C_2_IRQ_0_SENSE +#define DT_SNPS_DESIGNWARE_I2C_2_IRQ_0_SENSE 0 +#endif static void i2c_config_2(struct device *port) { - 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); + IRQ_CONNECT(DT_SNPS_DESIGNWARE_I2C_2_IRQ_0, DT_SNPS_DESIGNWARE_I2C_2_IRQ_0_PRIORITY, + i2c_dw_isr, DEVICE_GET(I2C_2), DT_SNPS_DESIGNWARE_I2C_2_IRQ_0_SENSE); + irq_enable(DT_SNPS_DESIGNWARE_I2C_2_IRQ_0); } #endif /* CONFIG_I2C_2 */ @@ -830,11 +839,11 @@ static void i2c_config_3(struct device *port); static const struct i2c_dw_rom_config i2c_config_dw_3 = { .config_func = i2c_config_3, - .bitrate = DT_I2C_3_BITRATE, + .bitrate = DT_SNPS_DESIGNWARE_I2C_3_CLOCK_FREQUENCY, }; static struct i2c_dw_dev_config I2C_3_runtime = { - .base_address = DT_I2C_3_BASE_ADDR, + .base_address = DT_SNPS_DESIGNWARE_I2C_3_BASE_ADDRESS, #if CONFIG_PCI .pci_dev.class_type = I2C_DW_3_PCI_CLASS, .pci_dev.bus = I2C_DW_3_PCI_BUS, @@ -846,16 +855,19 @@ static struct i2c_dw_dev_config I2C_3_runtime = { #endif }; -DEVICE_AND_API_INIT(I2C_3, CONFIG_I2C_3_NAME, &i2c_dw_initialize, +DEVICE_AND_API_INIT(I2C_3, DT_SNPS_DESIGNWARE_I2C_3_LABEL, &i2c_dw_initialize, &I2C_3_runtime, &i2c_config_dw_3, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &funcs); +#ifndef DT_SNPS_DESIGNWARE_I2C_3_IRQ_0_SENSE +#define DT_SNPS_DESIGNWARE_I2C_3_IRQ_0_SENSE 0 +#endif static void i2c_config_3(struct device *port) { - 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); + IRQ_CONNECT(DT_SNPS_DESIGNWARE_I2C_3_IRQ_0, DT_SNPS_DESIGNWARE_I2C_3_IRQ_0_PRIORITY, + i2c_dw_isr, DEVICE_GET(I2C_3), DT_SNPS_DESIGNWARE_I2C_3_IRQ_0_SENSE); + irq_enable(DT_SNPS_DESIGNWARE_I2C_3_IRQ_0); } #endif /* CONFIG_I2C_3 */ @@ -868,11 +880,11 @@ static void i2c_config_4(struct device *port); static const struct i2c_dw_rom_config i2c_config_dw_4 = { .config_func = i2c_config_4, - .bitrate = DT_I2C_4_BITRATE, + .bitrate = DT_SNPS_DESIGNWARE_I2C_4_CLOCK_FREQUENCY, }; static struct i2c_dw_dev_config I2C_4_runtime = { - .base_address = DT_I2C_4_BASE_ADDR, + .base_address = DT_SNPS_DESIGNWARE_I2C_4_BASE_ADDRESS, #if CONFIG_PCI .pci_dev.class_type = I2C_DW_4_PCI_CLASS, .pci_dev.bus = I2C_DW_4_PCI_BUS, @@ -884,16 +896,19 @@ static struct i2c_dw_dev_config I2C_4_runtime = { #endif }; -DEVICE_AND_API_INIT(I2C_4, CONFIG_I2C_4_NAME, &i2c_dw_initialize, +DEVICE_AND_API_INIT(I2C_4, DT_SNPS_DESIGNWARE_I2C_4_LABEL, &i2c_dw_initialize, &I2C_4_runtime, &i2c_config_dw_4, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &funcs); +#ifndef DT_SNPS_DESIGNWARE_I2C_4_IRQ_0_SENSE +#define DT_SNPS_DESIGNWARE_I2C_4_IRQ_0_SENSE 0 +#endif static void i2c_config_4(struct device *port) { - 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); + IRQ_CONNECT(DT_SNPS_DESIGNWARE_I2C_4_IRQ_0, DT_SNPS_DESIGNWARE_I2C_4_IRQ_0_PRIORITY, + i2c_dw_isr, DEVICE_GET(I2C_4), DT_SNPS_DESIGNWARE_I2C_4_IRQ_0_SENSE); + irq_enable(DT_SNPS_DESIGNWARE_I2C_4_IRQ_0); } #endif /* CONFIG_I2C_4 */ @@ -906,11 +921,11 @@ static void i2c_config_5(struct device *port); static const struct i2c_dw_rom_config i2c_config_dw_5 = { .config_func = i2c_config_5, - .bitrate = DT_I2C_5_BITRATE, + .bitrate = DT_SNPS_DESIGNWARE_I2C_5_CLOCK_FREQUENCY, }; static struct i2c_dw_dev_config I2C_5_runtime = { - .base_address = DT_I2C_5_BASE_ADDR, + .base_address = DT_SNPS_DESIGNWARE_I2C_5_BASE_ADDRESS, #if CONFIG_PCI .pci_dev.class_type = I2C_DW_5_PCI_CLASS, .pci_dev.bus = I2C_DW_5_PCI_BUS, @@ -922,16 +937,19 @@ static struct i2c_dw_dev_config I2C_5_runtime = { #endif }; -DEVICE_AND_API_INIT(I2C_5, CONFIG_I2C_5_NAME, &i2c_dw_initialize, +DEVICE_AND_API_INIT(I2C_5, DT_SNPS_DESIGNWARE_I2C_5_LABEL, &i2c_dw_initialize, &I2C_5_runtime, &i2c_config_dw_5, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &funcs); +#ifndef DT_SNPS_DESIGNWARE_I2C_5_IRQ_0_SENSE +#define DT_SNPS_DESIGNWARE_I2C_5_IRQ_0_SENSE 0 +#endif static void i2c_config_5(struct device *port) { - 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); + IRQ_CONNECT(DT_SNPS_DESIGNWARE_I2C_5_IRQ_0, DT_SNPS_DESIGNWARE_I2C_5_IRQ_0_PRIORITY, + i2c_dw_isr, DEVICE_GET(I2C_5), DT_SNPS_DESIGNWARE_I2C_5_IRQ_0_SENSE); + irq_enable(DT_SNPS_DESIGNWARE_I2C_5_IRQ_0); } #endif /* CONFIG_I2C_5 */ @@ -944,11 +962,11 @@ static void i2c_config_6(struct device *port); static const struct i2c_dw_rom_config i2c_config_dw_6 = { .config_func = i2c_config_6, - .bitrate = DT_I2C_6_BITRATE, + .bitrate = DT_SNPS_DESIGNWARE_I2C_6_CLOCK_FREQUENCY, }; static struct i2c_dw_dev_config I2C_6_runtime = { - .base_address = DT_I2C_6_BASE_ADDR, + .base_address = DT_SNPS_DESIGNWARE_I2C_6_BASE_ADDRESS, #if CONFIG_PCI .pci_dev.class_type = I2C_DW_6_PCI_CLASS, .pci_dev.bus = I2C_DW_6_PCI_BUS, @@ -960,16 +978,19 @@ static struct i2c_dw_dev_config I2C_6_runtime = { #endif }; -DEVICE_AND_API_INIT(I2C_6, CONFIG_I2C_6_NAME, &i2c_dw_initialize, +DEVICE_AND_API_INIT(I2C_6, DT_SNPS_DESIGNWARE_I2C_6_LABEL, &i2c_dw_initialize, &I2C_6_runtime, &i2c_config_dw_6, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &funcs); +#ifndef DT_SNPS_DESIGNWARE_I2C_6_IRQ_0_SENSE +#define DT_SNPS_DESIGNWARE_I2C_6_IRQ_0_SENSE 0 +#endif static void i2c_config_6(struct device *port) { - 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); + IRQ_CONNECT(DT_SNPS_DESIGNWARE_I2C_6_IRQ_0, DT_SNPS_DESIGNWARE_I2C_6_IRQ_0_PRIORITY, + i2c_dw_isr, DEVICE_GET(I2C_6), DT_SNPS_DESIGNWARE_I2C_6_IRQ_0_SENSE); + irq_enable(DT_SNPS_DESIGNWARE_I2C_6_IRQ_0); } #endif /* CONFIG_I2C_6 */ @@ -982,11 +1003,11 @@ static void i2c_config_7(struct device *port); static const struct i2c_dw_rom_config i2c_config_dw_7 = { .config_func = i2c_config_7, - .bitrate = DT_I2C_7_BITRATE, + .bitrate = DT_SNPS_DESIGNWARE_I2C_7_CLOCK_FREQUENCY, }; static struct i2c_dw_dev_config I2C_7_runtime = { - .base_address = DT_I2C_7_BASE_ADDR, + .base_address = DT_SNPS_DESIGNWARE_I2C_7_BASE_ADDRESS, #if CONFIG_PCI .pci_dev.class_type = I2C_DW_7_PCI_CLASS, .pci_dev.bus = I2C_DW_7_PCI_BUS, @@ -998,16 +1019,19 @@ static struct i2c_dw_dev_config I2C_7_runtime = { #endif }; -DEVICE_AND_API_INIT(I2C_7, CONFIG_I2C_7_NAME, &i2c_dw_initialize, +DEVICE_AND_API_INIT(I2C_7, DT_SNPS_DESIGNWARE_I2C_7_LABEL, &i2c_dw_initialize, &I2C_7_runtime, &i2c_config_dw_7, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &funcs); +#ifndef DT_SNPS_DESIGNWARE_I2C_7_IRQ_0_SENSE +#define DT_SNPS_DESIGNWARE_I2C_7_IRQ_0_SENSE 0 +#endif static void i2c_config_7(struct device *port) { - 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); + IRQ_CONNECT(DT_SNPS_DESIGNWARE_I2C_7_IRQ_0, DT_SNPS_DESIGNWARE_I2C_7_IRQ_0_PRIORITY, + i2c_dw_isr, DEVICE_GET(I2C_7), DT_SNPS_DESIGNWARE_I2C_7_IRQ_0_SENSE); + irq_enable(DT_SNPS_DESIGNWARE_I2C_7_IRQ_0); } #endif /* CONFIG_I2C_7 */ diff --git a/soc/arc/snps_emsk/dts_fixup.h b/soc/arc/snps_emsk/dts_fixup.h index ea959feee3e..f74ef39ff7e 100644 --- a/soc/arc/snps_emsk/dts_fixup.h +++ b/soc/arc/snps_emsk/dts_fixup.h @@ -31,26 +31,6 @@ #define DT_UART_NS16550_PORT_2_NAME DT_NS16550_F000A000_LABEL #define DT_UART_NS16550_PORT_2_IRQ_PRI DT_NS16550_F000A000_IRQ_0_PRIORITY -/* - * I2C configuration - */ -/* I2C_0 is on Pmod2 connector */ -#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 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 - -/* I2C_1 is on Pmod4 connector */ -#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 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 - - /* * GPIO configuration */ diff --git a/soc/x86/intel_quark/quark_x1000/dts_fixup.h b/soc/x86/intel_quark/quark_x1000/dts_fixup.h index 7dee4016690..1924c81bb02 100644 --- a/soc/x86/intel_quark/quark_x1000/dts_fixup.h +++ b/soc/x86/intel_quark/quark_x1000/dts_fixup.h @@ -24,12 +24,6 @@ #define DT_IOAPIC_BASE_ADDRESS DT_INTEL_IOAPIC_FEC00000_BASE_ADDRESS -#define DT_I2C_0_IRQ DT_SNPS_DESIGNWARE_I2C_90007000_IRQ_0 -#define DT_I2C_0_IRQ_FLAGS DT_SNPS_DESIGNWARE_I2C_90007000_IRQ_0_SENSE -#define DT_I2C_0_BASE_ADDR DT_SNPS_DESIGNWARE_I2C_90007000_BASE_ADDRESS -#define CONFIG_I2C_0_NAME DT_SNPS_DESIGNWARE_I2C_90007000_LABEL -#define DT_I2C_0_BITRATE DT_SNPS_DESIGNWARE_I2C_90007000_CLOCK_FREQUENCY - #define DT_SPI_0_BASE_ADDRESS DT_INTEL_INTEL_SPI_90009000_BASE_ADDRESS #define DT_SPI_0_IRQ DT_INTEL_INTEL_SPI_90009000_IRQ_0 #define DT_SPI_0_IRQ_FLAGS DT_INTEL_INTEL_SPI_90009000_IRQ_0_SENSE diff --git a/soc/xtensa/intel_s1000/dts_fixup.h b/soc/xtensa/intel_s1000/dts_fixup.h index 85e4c0f44a2..fbdc5809aac 100644 --- a/soc/xtensa/intel_s1000/dts_fixup.h +++ b/soc/xtensa/intel_s1000/dts_fixup.h @@ -34,13 +34,6 @@ #define DT_DW_ICTL_IRQ_PRI DT_SNPS_DESIGNWARE_INTC_81800_IRQ_0_PRIORITY #define DT_DW_ICTL_IRQ_FLAGS DT_SNPS_DESIGNWARE_INTC_81800_IRQ_0_SENSE -#define DT_I2C_0_BASE_ADDR DT_SNPS_DESIGNWARE_I2C_80400_BASE_ADDRESS -#define DT_I2C_0_BITRATE DT_SNPS_DESIGNWARE_I2C_80400_CLOCK_FREQUENCY -#define CONFIG_I2C_0_NAME DT_SNPS_DESIGNWARE_I2C_80400_LABEL -#define DT_I2C_0_IRQ DT_SNPS_DESIGNWARE_I2C_80400_IRQ_0 -#define DT_I2C_0_IRQ_FLAGS DT_SNPS_DESIGNWARE_I2C_80400_IRQ_0_SENSE -#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 DT_SPI_0_NAME DT_SNPS_DESIGNWARE_SPI_E000_LABEL #define DT_SPI_0_IRQ DT_SNPS_DESIGNWARE_SPI_E000_IRQ_0