Commit c1b291e9 authored by Andy Shevchenko's avatar Andy Shevchenko
Browse files

gpio: dwapb: Unify ACPI enumeration checks in get_irq() and configure_irqs() 



Shared IRQ is only enabled for ACPI enumeration, there is no need
to have a special flag for that, since we simple can test if device
has been enumerated by ACPI. This unifies the checks in dwapb_get_irq()
and dwapb_configure_irqs().

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Acked-by: default avatarSerge Semin <fancer.lancer@gmail.com>
Tested-by: default avatarSerge Semin <fancer.lancer@gmail.com>
parent b3907521

drivers/gpio/gpio-dwapb.c

+12 −12
Original line number Diff line number Diff line
@@ -436,21 +436,17 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio, 
	pirq->irqchip.irq_set_wake = dwapb_irq_set_wake;

#endif



	if (!pp->irq_shared) {

		girq->num_parents = pirq->nr_irqs;

		girq->parents = pirq->irq;

		girq->parent_handler_data = gpio;

		girq->parent_handler = dwapb_irq_handler;

	} else {

		/* This will let us handle the parent IRQ in the driver */

	/*

	 * Intel ACPI-based platforms mostly have the DesignWare APB GPIO

	 * IRQ lane shared between several devices. In that case the parental

	 * IRQ has to be handled in the shared way so to be properly delivered

	 * to all the connected devices.

	 */

	if (has_acpi_companion(gpio->dev)) {

		girq->num_parents = 0;

		girq->parents = NULL;

		girq->parent_handler = NULL;



		/*

		 * Request a shared IRQ since where MFD would have devices

		 * using the same irq pin

		 */

		err = devm_request_irq(gpio->dev, pp->irq[0],

				       dwapb_irq_handler_mfd,

				       IRQF_SHARED, DWAPB_DRIVER_NAME, gpio);
@@ -458,6 +454,11 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio, 
			dev_err(gpio->dev, "error requesting IRQ\n");

			goto err_kfree_pirq;

		}

	} else {

		girq->num_parents = pirq->nr_irqs;

		girq->parents = pirq->irq;

		girq->parent_handler_data = gpio;

		girq->parent_handler = dwapb_irq_handler;

	}



	girq->chip = &pirq->irqchip;
@@ -581,7 +582,6 @@ static struct dwapb_platform_data *dwapb_gpio_get_pdata(struct device *dev) 
			pp->ngpio = DWAPB_MAX_GPIOS;

		}



		pp->irq_shared	= false;

		pp->gpio_base	= -1;



		/*

drivers/mfd/intel_quark_i2c_gpio.c

+0 −1
Original line number Diff line number Diff line
@@ -227,7 +227,6 @@ static int intel_quark_gpio_setup(struct pci_dev *pdev) 
	pdata->properties->ngpio	= INTEL_QUARK_MFD_NGPIO;

	pdata->properties->gpio_base	= INTEL_QUARK_MFD_GPIO_BASE;

	pdata->properties->irq[0]	= pci_irq_vector(pdev, 0);

	pdata->properties->irq_shared	= true;



	cell->platform_data = pdata;

	cell->pdata_size = sizeof(*pdata);

include/linux/platform_data/gpio-dwapb.h

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ struct dwapb_port_property { 
	unsigned int	ngpio;

	unsigned int	gpio_base;

	int		irq[DWAPB_MAX_GPIOS];

	bool		irq_shared;

};



struct dwapb_platform_data {