Commit 465f2bd4 authored by Mika Westerberg's avatar Mika Westerberg Committed by Grant Likely
Browse files

gpio/langwell: convert to use irq_domain 



irq_domain already provides a facility to translate from hardware IRQ
numbers to Linux IRQ numbers so use that instead of open-coding the logic
in the driver.

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 7b96c686

drivers/gpio/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ config GPIO_BT8XX 
config GPIO_LANGWELL

	bool "Intel Langwell/Penwell GPIO support"

	depends on PCI && X86

	select IRQ_DOMAIN

	help

	  Say Y here to support Intel Langwell/Penwell GPIO.

drivers/gpio/gpio-langwell.c

+29 −21
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <linux/gpio.h>

#include <linux/slab.h>

#include <linux/pm_runtime.h>

#include <linux/irqdomain.h>



/*

 * Langwell chip has 64 pins and thus there are 2 32bit registers to control
@@ -66,8 +67,8 @@ struct lnw_gpio { 
	struct gpio_chip		chip;

	void				*reg_base;

	spinlock_t			lock;

	unsigned			irq_base;

	struct pci_dev			*pdev;

	struct irq_domain		*domain;

};



static void __iomem *gpio_reg(struct gpio_chip *chip, unsigned offset,
@@ -176,13 +177,13 @@ static int lnw_gpio_direction_output(struct gpio_chip *chip, 
static int lnw_gpio_to_irq(struct gpio_chip *chip, unsigned offset)

{

	struct lnw_gpio *lnw = container_of(chip, struct lnw_gpio, chip);

	return lnw->irq_base + offset;

	return irq_create_mapping(lnw->domain, offset);

}



static int lnw_irq_type(struct irq_data *d, unsigned type)

{

	struct lnw_gpio *lnw = irq_data_get_irq_chip_data(d);

	u32 gpio = d->irq - lnw->irq_base;

	u32 gpio = irqd_to_hwirq(d);

	unsigned long flags;

	u32 value;

	void __iomem *grer = gpio_reg(&lnw->chip, gpio, GRER);
@@ -256,7 +257,8 @@ static void lnw_irq_handler(unsigned irq, struct irq_desc *desc) 
			pending &= ~mask;

			/* Clear before handling so we can't lose an edge */

			writel(mask, gedr);

			generic_handle_irq(lnw->irq_base + base + gpio);

			generic_handle_irq(irq_find_mapping(lnw->domain,

							    base + gpio));

		}

	}
@@ -281,6 +283,24 @@ static void lnw_irq_init_hw(struct lnw_gpio *lnw) 
	}

}



static int lnw_gpio_irq_map(struct irq_domain *d, unsigned int virq,

			    irq_hw_number_t hw)

{

	struct lnw_gpio *lnw = d->host_data;



	irq_set_chip_and_handler_name(virq, &lnw_irqchip, handle_simple_irq,

				      "demux");

	irq_set_chip_data(virq, lnw);

	irq_set_irq_type(virq, IRQ_TYPE_NONE);



	return 0;

}



static const struct irq_domain_ops lnw_gpio_irq_ops = {

	.map = lnw_gpio_irq_map,

	.xlate = irq_domain_xlate_twocell,

};



#ifdef CONFIG_PM

static int lnw_gpio_runtime_resume(struct device *dev)

{
@@ -318,10 +338,8 @@ static int __devinit lnw_gpio_probe(struct pci_dev *pdev, 
			const struct pci_device_id *id)

{

	void *base;

	int i;

	resource_size_t start, len;

	struct lnw_gpio *lnw;

	u32 irq_base;

	u32 gpio_base;

	int retval = 0;

	int ngpio = id->driver_data;
@@ -335,7 +353,7 @@ static int __devinit lnw_gpio_probe(struct pci_dev *pdev, 
		dev_err(&pdev->dev, "error requesting resources\n");

		goto err2;

	}

	/* get the irq_base from bar1 */

	/* get the gpio_base from bar1 */

	start = pci_resource_start(pdev, 1);

	len = pci_resource_len(pdev, 1);

	base = ioremap_nocache(start, len);
@@ -343,7 +361,6 @@ static int __devinit lnw_gpio_probe(struct pci_dev *pdev, 
		dev_err(&pdev->dev, "error mapping bar1\n");

		goto err3;

	}

	irq_base = *(u32 *)base;

	gpio_base = *((u32 *)base + 1);

	/* release the IO mapping, since we already get the info from bar1 */

	iounmap(base);
@@ -364,12 +381,10 @@ static int __devinit lnw_gpio_probe(struct pci_dev *pdev, 
		goto err3;

	}



	retval = irq_alloc_descs(-1, irq_base, ngpio, 0);

	if (retval < 0) {

		dev_err(&pdev->dev, "can't allocate IRQ descs\n");

	lnw->domain = irq_domain_add_linear(pdev->dev.of_node, ngpio,

					    &lnw_gpio_irq_ops, lnw);

	if (!lnw->domain)

		goto err3;

	}

	lnw->irq_base = retval;



	lnw->reg_base = base;

	lnw->chip.label = dev_name(&pdev->dev);
@@ -387,18 +402,13 @@ static int __devinit lnw_gpio_probe(struct pci_dev *pdev, 
	retval = gpiochip_add(&lnw->chip);

	if (retval) {

		dev_err(&pdev->dev, "langwell gpiochip_add error %d\n", retval);

		goto err4;

		goto err3;

	}



	lnw_irq_init_hw(lnw);



	irq_set_handler_data(pdev->irq, lnw);

	irq_set_chained_handler(pdev->irq, lnw_irq_handler);

	for (i = 0; i < lnw->chip.ngpio; i++) {

		irq_set_chip_and_handler_name(i + lnw->irq_base, &lnw_irqchip,

					      handle_simple_irq, "demux");

		irq_set_chip_data(i + lnw->irq_base, lnw);

	}



	spin_lock_init(&lnw->lock);
@@ -407,8 +417,6 @@ static int __devinit lnw_gpio_probe(struct pci_dev *pdev, 


	return 0;



err4:

	irq_free_descs(lnw->irq_base, ngpio);

err3:

	pci_release_regions(pdev);

err2: