1 files changed, 0 insertions, 86 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch b/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch
deleted file mode 100644
index 073ac42051..0000000000
--- a/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- a/include/linux/bcma/bcma_driver_mips.h
-+++ b/include/linux/bcma/bcma_driver_mips.h
-@@ -48,6 +48,6 @@ static inline void bcma_core_mips_early_
- 
- 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_ */
---- a/drivers/bcma/driver_chipcommon.c
-+++ b/drivers/bcma/driver_chipcommon.c
-@@ -332,7 +332,7 @@ void bcma_chipco_serial_init(struct bcma
- 		return;
- 	}
- 
--	irq = bcma_core_mips_irq(cc->core);
-+	irq = bcma_core_irq(cc->core);
- 
- 	/* Determine the registers of the UARTs */
- 	cc->nr_serial_ports = (cc->capabilities & BCMA_CC_CAP_NRUART);
---- a/drivers/bcma/driver_mips.c
-+++ b/drivers/bcma/driver_mips.c
-@@ -86,7 +86,7 @@ static u32 bcma_core_mips_irqflag(struct
-  * If disabled, 5 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;
- 	u32 irqflag;
-@@ -103,7 +103,13 @@ unsigned int bcma_core_mips_irq(struct b
- 
- 	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)
- {
-@@ -316,7 +322,7 @@ void bcma_core_mips_init(struct bcma_drv
- 		break;
- 	default:
- 		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,
- 			 "Unknown device (0x%x) found, can not configure IRQs\n",
---- a/drivers/bcma/driver_pci_host.c
-+++ b/drivers/bcma/driver_pci_host.c
-@@ -577,7 +577,7 @@ int bcma_core_pci_plat_dev_init(struct p
- 	pr_info("PCI: Fixing up device %s\n", pci_name(dev));
- 
- 	/* 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);
- 
- 	return 0;
-@@ -596,6 +596,6 @@ int bcma_core_pci_pcibios_map_irq(const 
- 
- 	pc_host = container_of(dev->bus->ops, struct bcma_drv_pci_host,
- 			       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);
---- a/arch/mips/bcm47xx/serial.c
-+++ b/arch/mips/bcm47xx/serial.c
-@@ -62,7 +62,7 @@ static int __init uart8250_init_bcma(voi
- 
- 		p->mapbase = (unsigned int) 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->regshift = bcma_port->reg_shift;
- 		p->iotype = UPIO_MEM;