Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85eb92e8 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

bcma: make it possible to specify a IRQ num in bcma_core_irq() 



This moves bcma_core_irq() to main.c and add a extra parameter with a
number so that we can return different irq number for devices with more
than one.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6164c202

drivers/bcma/driver_chipcommon.c

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc) 
		return;

	}



	irq = bcma_core_irq(cc->core);

	irq = bcma_core_irq(cc->core, 0);



	/* Determine the registers of the UARTs */

	cc->nr_serial_ports = (cc->capabilities & BCMA_CC_CAP_NRUART);

drivers/bcma/driver_gpio.c

+2 −2
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static int bcma_gpio_irq_domain_init(struct bcma_drv_cc *cc) 
					 handle_simple_irq);

	}



	hwirq = bcma_core_irq(cc->core);

	hwirq = bcma_core_irq(cc->core, 0);

	err = request_irq(hwirq, bcma_gpio_irq_handler, IRQF_SHARED, "gpio",

			  cc);

	if (err)
@@ -183,7 +183,7 @@ static void bcma_gpio_irq_domain_exit(struct bcma_drv_cc *cc) 
		return;



	bcma_cc_mask32(cc, BCMA_CC_IRQMASK, ~BCMA_CC_IRQ_GPIO);

	free_irq(bcma_core_irq(cc->core), cc);

	free_irq(bcma_core_irq(cc->core, 0), cc);

	for (gpio = 0; gpio < chip->ngpio; gpio++) {

		int irq = irq_find_mapping(cc->irq_domain, gpio);

drivers/bcma/driver_mips.c

+2 −9
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static u32 bcma_core_mips_irqflag(struct bcma_device *dev) 
 * If disabled, 5 is returned.

 * If not supported, 6 is returned.

 */

static unsigned int bcma_core_mips_irq(struct bcma_device *dev)

unsigned int bcma_core_mips_irq(struct bcma_device *dev)

{

	struct bcma_device *mdev = dev->bus->drv_mips.core;

	u32 irqflag;
@@ -133,13 +133,6 @@ static unsigned int bcma_core_mips_irq(struct bcma_device *dev) 
	return 5;

}



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)

{

	unsigned int oldirq = bcma_core_mips_irq(dev);
@@ -423,7 +416,7 @@ void bcma_core_mips_init(struct bcma_drv_mips *mcore) 
		break;

	default:

		list_for_each_entry(core, &bus->cores, list) {

			core->irq = bcma_core_irq(core);

			core->irq = bcma_core_irq(core, 0);

		}

		bcma_err(bus,

			 "Unknown device (0x%x) found, can not configure IRQs\n",

drivers/bcma/driver_pci_host.c

+2 −2
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ int bcma_core_pci_plat_dev_init(struct pci_dev *dev) 
	pr_info("PCI: Fixing up device %s\n", pci_name(dev));



	/* Fix up interrupt lines */

	dev->irq = bcma_core_irq(pc_host->pdev->core);

	dev->irq = bcma_core_irq(pc_host->pdev->core, 0);

	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);



	readrq = pcie_get_readrq(dev);
@@ -617,6 +617,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,

			       pci_ops);

	return bcma_core_irq(pc_host->pdev->core);

	return bcma_core_irq(pc_host->pdev->core, 0);

}

EXPORT_SYMBOL(bcma_core_pci_pcibios_map_irq);

drivers/bcma/main.c

+22 −0
Original line number Diff line number Diff line
@@ -169,6 +169,28 @@ static void bcma_of_fill_device(struct platform_device *parent, 
}

#endif /* CONFIG_OF */



unsigned int bcma_core_irq(struct bcma_device *core, int num)

{

	struct bcma_bus *bus = core->bus;

	unsigned int mips_irq;



	switch (bus->hosttype) {

	case BCMA_HOSTTYPE_PCI:

		return bus->host_pci->irq;

	case BCMA_HOSTTYPE_SOC:

		if (bus->drv_mips.core && num == 0) {

			mips_irq = bcma_core_mips_irq(core);

			return mips_irq <= 4 ? mips_irq + 2 : 0;

		}

		break;

	case BCMA_HOSTTYPE_SDIO:

		return 0;

	}



	return 0;

}

EXPORT_SYMBOL(bcma_core_irq);



void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core)

{

	core->dev.release = bcma_release_core_dev;