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

Commit 0b39580a authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "irqdomain: add bus token DOMAIN_BUS_WAKEUP"

parents 4941b369 bb8e854f

drivers/gpio/gpiolib.c

+11 −4
Original line number Diff line number Diff line
@@ -1883,7 +1883,9 @@ static int gpiochip_add_irqchip(struct gpio_chip *gpiochip, 
		type = IRQ_TYPE_NONE;

	}



	if (!gpiochip->to_irq)

		gpiochip->to_irq = gpiochip_to_irq;



	gpiochip->irq.default_type = type;

	gpiochip->irq.lock_key = lock_key;

	gpiochip->irq.request_key = request_key;
@@ -1893,6 +1895,11 @@ static int gpiochip_add_irqchip(struct gpio_chip *gpiochip, 
	else

		ops = &gpiochip_domain_ops;



	if (gpiochip->irq.parent_domain)

		gpiochip->irq.domain = irq_domain_add_hierarchy(gpiochip->irq.parent_domain,

								0, gpiochip->ngpio,

								np, ops, gpiochip);

	else

		gpiochip->irq.domain = irq_domain_add_simple(np, gpiochip->ngpio,

							     gpiochip->irq.first,

							     ops, gpiochip);

include/linux/gpio/driver.h

+6 −0
Original line number Diff line number Diff line
@@ -47,6 +47,12 @@ struct gpio_irq_chip { 
	 */

	const struct irq_domain_ops *domain_ops;



	/**

	 * @parent_domain:

	 *

	 */

	struct irq_domain *parent_domain;



	/**

	 * @handler:

	 *

include/linux/irqdomain.h

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ enum irq_domain_bus_token { 
	DOMAIN_BUS_NEXUS,

	DOMAIN_BUS_IPI,

	DOMAIN_BUS_FSL_MC_MSI,

	DOMAIN_BUS_WAKEUP,

};



/**