michaelh/zephyr
1
0
Fork 0
Code Releases Activity

i2c : re-naming interrupt_vector to irq_num

Browse source 
Changing the ROM struct's interrupt_vector to reflect
what the value is properly referencing.

Change-Id: Ifb284821e82e01123c51a848d694da19e442c1e8
Signed-off-by: Dan Kalowsky <daniel.kalowsky@intel.com>
This commit is contained in:
Dan Kalowsky 2015-11-17 11:51:36 -08:00 • committed by Anas Nashif
commit 2028db6399
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/i2c/i2c_dw.c
View file

@ -751,7 +751,7 @@ static inline int i2c_dw_pci_setup(struct device *dev)
#ifdef CONFIG_PCI_ENUMERATION #ifdef CONFIG_PCI_ENUMERATION
rom->base_address = rom->pci_dev.addr; rom->base_address = rom->pci_dev.addr;
rom->interrupt_vector = rom->pci_dev.irq; rom->irq_num = rom->pci_dev.irq;
#endif #endif
pci_enable_regs(&rom->pci_dev); pci_enable_regs(&rom->pci_dev);
@ -819,7 +819,7 @@ void i2c_config_0(struct device *port);
struct i2c_dw_rom_config i2c_config_dw_0 = { struct i2c_dw_rom_config i2c_config_dw_0 = {
.base_address = CONFIG_I2C_DW_0_BASE, .base_address = CONFIG_I2C_DW_0_BASE,
#ifdef CONFIG_I2C_DW_0_IRQ_DIRECT #ifdef CONFIG_I2C_DW_0_IRQ_DIRECT
.interrupt_vector = CONFIG_I2C_DW_0_IRQ, .irq_num = CONFIG_I2C_DW_0_IRQ,
#endif #endif
.config_func = i2c_config_0, .config_func = i2c_config_0,
@ -856,8 +856,8 @@ void i2c_config_0(struct device *port)
#if defined(CONFIG_I2C_DW_0_IRQ_DIRECT) #if defined(CONFIG_I2C_DW_0_IRQ_DIRECT)
ARG_UNUSED(shared_irq_dev); ARG_UNUSED(shared_irq_dev);
IRQ_CONFIG(i2c_dw_0, config->interrupt_vector, 0); IRQ_CONFIG(i2c_dw_0, config->irq_num, 0);
irq_enable(config->interrupt_vector); irq_enable(config->irq_num);
#elif defined(CONFIG_I2C_DW_0_IRQ_SHARED) #elif defined(CONFIG_I2C_DW_0_IRQ_SHARED)
ARG_UNUSED(config); ARG_UNUSED(config);
shared_irq_dev = device_get_binding(config->shared_irq_dev_name); shared_irq_dev = device_get_binding(config->shared_irq_dev_name);
@ -876,7 +876,7 @@ void i2c_config_1(struct device *port);
struct i2c_dw_rom_config i2c_config_dw_1 = { struct i2c_dw_rom_config i2c_config_dw_1 = {
.base_address = CONFIG_I2C_DW_1_BASE, .base_address = CONFIG_I2C_DW_1_BASE,
.interrupt_vector = CONFIG_I2C_DW_1_IRQ, .irq_num = CONFIG_I2C_DW_1_IRQ,
.config_func = i2c_config_1, .config_func = i2c_config_1,
}; };
@ -904,8 +904,8 @@ void i2c_config_1(struct device *port)
struct device *shared_irq_dev; struct device *shared_irq_dev;
ARG_UNUSED(shared_irq_dev); ARG_UNUSED(shared_irq_dev);
IRQ_CONFIG(i2c_dw_1, config->interrupt_vector, 0); IRQ_CONFIG(i2c_dw_1, config->irq_num, 0);
irq_enable(config->interrupt_vector); irq_enable(config->irq_num);
} }
#endif /* CONFIG_I2C_DW_1 */ #endif /* CONFIG_I2C_DW_1 */

2
drivers/i2c/i2c_dw.h
View file

@ -92,7 +92,7 @@ typedef void (*i2c_isr_cb_t)(struct device *port);
struct i2c_dw_rom_config { struct i2c_dw_rom_config {
uint32_t base_address; uint32_t base_address;
uint32_t interrupt_vector; uint32_t irq_num;
uint32_t interrupt_mask; uint32_t interrupt_mask;
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
struct pci_dev_info pci_dev; struct pci_dev_info pci_dev;