Commit e2aa19fa authored by Nathan Hintz's avatar Nathan Hintz Committed by John W. Linville

bcma: return the mips irq number in bcma_core_irq

The irq signal numbers that are send by the cpu are increased by 2 from
the number programmed into the mips core by bcma.
Return the irq number on which the irqs are send in bcma_core_irq() now.
Signed-off-by: default avatarNathan Hintz <nlhintz@hotmail.com>
Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1a2d5032
...@@ -62,7 +62,7 @@ static int __init uart8250_init_bcma(void) ...@@ -62,7 +62,7 @@ static int __init uart8250_init_bcma(void)
p->mapbase = (unsigned int) bcma_port->regs; p->mapbase = (unsigned int) bcma_port->regs;
p->membase = (void *) bcma_port->regs; p->membase = (void *) bcma_port->regs;
p->irq = bcma_port->irq + 2; p->irq = bcma_port->irq;
p->uartclk = bcma_port->baud_base; p->uartclk = bcma_port->baud_base;
p->regshift = bcma_port->reg_shift; p->regshift = bcma_port->reg_shift;
p->iotype = UPIO_MEM; p->iotype = UPIO_MEM;
......
...@@ -329,7 +329,7 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc) ...@@ -329,7 +329,7 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc)
return; return;
} }
irq = bcma_core_mips_irq(cc->core); irq = bcma_core_irq(cc->core);
/* Determine the registers of the UARTs */ /* Determine the registers of the UARTs */
cc->nr_serial_ports = (cc->capabilities & BCMA_CC_CAP_NRUART); cc->nr_serial_ports = (cc->capabilities & BCMA_CC_CAP_NRUART);
......
...@@ -85,7 +85,7 @@ static u32 bcma_core_mips_irqflag(struct bcma_device *dev) ...@@ -85,7 +85,7 @@ static u32 bcma_core_mips_irqflag(struct bcma_device *dev)
* If disabled, 5 is returned. * If disabled, 5 is returned.
* If not supported, 6 is returned. * If not supported, 6 is returned.
*/ */
unsigned int bcma_core_mips_irq(struct bcma_device *dev) static unsigned int bcma_core_mips_irq(struct bcma_device *dev)
{ {
struct bcma_device *mdev = dev->bus->drv_mips.core; struct bcma_device *mdev = dev->bus->drv_mips.core;
u32 irqflag; u32 irqflag;
...@@ -102,7 +102,13 @@ unsigned int bcma_core_mips_irq(struct bcma_device *dev) ...@@ -102,7 +102,13 @@ unsigned int bcma_core_mips_irq(struct bcma_device *dev)
return 5; return 5;
} }
EXPORT_SYMBOL(bcma_core_mips_irq);
unsigned int bcma_core_irq(struct bcma_device *dev)
{
unsigned int mips_irq = bcma_core_mips_irq(dev);
return mips_irq <= 4 ? mips_irq + 2 : 0;
}
EXPORT_SYMBOL(bcma_core_irq);
static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq) static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq)
{ {
...@@ -299,7 +305,7 @@ void bcma_core_mips_init(struct bcma_drv_mips *mcore) ...@@ -299,7 +305,7 @@ void bcma_core_mips_init(struct bcma_drv_mips *mcore)
break; break;
default: default:
list_for_each_entry(core, &bus->cores, list) { list_for_each_entry(core, &bus->cores, list) {
core->irq = bcma_core_mips_irq(core) + 2; core->irq = bcma_core_irq(core);
} }
bcma_err(bus, bcma_err(bus,
"Unknown device (0x%x) found, can not configure IRQs\n", "Unknown device (0x%x) found, can not configure IRQs\n",
......
...@@ -577,7 +577,7 @@ int bcma_core_pci_plat_dev_init(struct pci_dev *dev) ...@@ -577,7 +577,7 @@ int bcma_core_pci_plat_dev_init(struct pci_dev *dev)
pr_info("PCI: Fixing up device %s\n", pci_name(dev)); pr_info("PCI: Fixing up device %s\n", pci_name(dev));
/* Fix up interrupt lines */ /* Fix up interrupt lines */
dev->irq = bcma_core_mips_irq(pc_host->pdev->core) + 2; dev->irq = bcma_core_irq(pc_host->pdev->core);
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq); pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
return 0; return 0;
...@@ -596,6 +596,6 @@ int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev) ...@@ -596,6 +596,6 @@ int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev)
pc_host = container_of(dev->bus->ops, struct bcma_drv_pci_host, pc_host = container_of(dev->bus->ops, struct bcma_drv_pci_host,
pci_ops); pci_ops);
return bcma_core_mips_irq(pc_host->pdev->core) + 2; return bcma_core_irq(pc_host->pdev->core);
} }
EXPORT_SYMBOL(bcma_core_pci_pcibios_map_irq); EXPORT_SYMBOL(bcma_core_pci_pcibios_map_irq);
...@@ -48,6 +48,6 @@ static inline void bcma_core_mips_early_init(struct bcma_drv_mips *mcore) { } ...@@ -48,6 +48,6 @@ static inline void bcma_core_mips_early_init(struct bcma_drv_mips *mcore) { }
extern u32 bcma_cpu_clock(struct bcma_drv_mips *mcore); extern u32 bcma_cpu_clock(struct bcma_drv_mips *mcore);
extern unsigned int bcma_core_mips_irq(struct bcma_device *dev); extern unsigned int bcma_core_irq(struct bcma_device *core);
#endif /* LINUX_BCMA_DRIVER_MIPS_H_ */ #endif /* LINUX_BCMA_DRIVER_MIPS_H_ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment