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

Commit f0fbe7bc authored by Thierry Reding's avatar Thierry Reding Committed by Linus Walleij
Browse files

gpio: Move irqdomain into struct gpio_irq_chip 



In order to consolidate the multiple ways to associate an IRQ chip with
a GPIO chip, move more fields into the new struct gpio_irq_chip.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Acked-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent da80ff81

Documentation/gpio/driver.txt

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ GPIO irqchips usually fall in one of two categories: 
	static irqreturn_t omap_gpio_irq_handler(int irq, void *gpiobank)

		unsigned long wa_lock_flags;

		raw_spin_lock_irqsave(&bank->wa_lock, wa_lock_flags);

		generic_handle_irq(irq_find_mapping(bank->chip.irqdomain, bit));

		generic_handle_irq(irq_find_mapping(bank->chip.irq.domain, bit));

		raw_spin_unlock_irqrestore(&bank->wa_lock, wa_lock_flags);



* GENERIC CHAINED GPIO irqchips: these are the same as "CHAINED GPIO irqchips",

drivers/bcma/driver_gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static irqreturn_t bcma_gpio_irq_handler(int irq, void *dev_id) 
		return IRQ_NONE;



	for_each_set_bit(gpio, &irqs, gc->ngpio)

		generic_handle_irq(irq_find_mapping(gc->irqdomain, gpio));

		generic_handle_irq(irq_find_mapping(gc->irq.domain, gpio));

	bcma_chipco_gpio_polarity(cc, irqs, val & irqs);



	return IRQ_HANDLED;

drivers/gpio/gpio-104-dio-48e.c

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ static irqreturn_t dio48e_irq_handler(int irq, void *dev_id) 
	unsigned long gpio;



	for_each_set_bit(gpio, &irq_mask, 2)

		generic_handle_irq(irq_find_mapping(chip->irqdomain,

		generic_handle_irq(irq_find_mapping(chip->irq.domain,

			19 + gpio*24));



	raw_spin_lock(&dio48egpio->lock);

drivers/gpio/gpio-104-idi-48.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static irqreturn_t idi_48_irq_handler(int irq, void *dev_id) 
		for_each_set_bit(bit_num, &irq_mask, 8) {

			gpio = bit_num + boundary * 8;



			generic_handle_irq(irq_find_mapping(chip->irqdomain,

			generic_handle_irq(irq_find_mapping(chip->irq.domain,

				gpio));

		}

	}

drivers/gpio/gpio-104-idio-16.c

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static irqreturn_t idio_16_irq_handler(int irq, void *dev_id) 
	int gpio;



	for_each_set_bit(gpio, &idio16gpio->irq_mask, chip->ngpio)

		generic_handle_irq(irq_find_mapping(chip->irqdomain, gpio));

		generic_handle_irq(irq_find_mapping(chip->irq.domain, gpio));



	raw_spin_lock(&idio16gpio->lock);