Commit 5c63a9db authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Bartosz Golaszewski
Browse files

gpiolib: Reuse device's fwnode to create IRQ domain 



When IRQ domain is created for an ACPI case, the name of it becomes unknown-%d
since for now it utilizes of_node member only and doesn't consider fwnode case.
Convert IRQ domain creation code to utilize fwnode instead.

Before/After the change on Intel Galileo Gen 2 with two GPIO (IRQ) controllers:

  unknown-1	==>	\_SB.PCI0.GIP0.GPO
  unknown-2	==>	\_SB.NIO3

Due to the nature of this change we may also deduplicate the WARN():s
because in either case (DT or ACPI) the fwnode will be set correctly
and %pfw is an equivalent to what the current code prints as a prefix.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
parent 515321ac

drivers/gpio/gpiolib.c

+4 −11
Original line number Diff line number Diff line
@@ -1463,9 +1463,9 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc, 
				struct lock_class_key *lock_key,

				struct lock_class_key *request_key)

{

	struct fwnode_handle *fwnode = dev_fwnode(&gc->gpiodev->dev);

	struct irq_chip *irqchip = gc->irq.chip;

	const struct irq_domain_ops *ops = NULL;

	struct device_node *np;

	unsigned int type;

	unsigned int i;
@@ -1477,7 +1477,6 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc, 
		return -EINVAL;

	}



	np = gc->gpiodev->dev.of_node;

	type = gc->irq.default_type;



	/*
@@ -1485,16 +1484,10 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc, 
	 * used to configure the interrupts, as you may end up with

	 * conflicting triggers. Tell the user, and reset to NONE.

	 */

	if (WARN(np && type != IRQ_TYPE_NONE,

		 "%s: Ignoring %u default trigger\n", np->full_name, type))

	if (WARN(fwnode && type != IRQ_TYPE_NONE,

		 "%pfw: Ignoring %u default trigger\n", fwnode, type))

		type = IRQ_TYPE_NONE;



	if (has_acpi_companion(gc->parent) && type != IRQ_TYPE_NONE) {

		acpi_handle_warn(ACPI_HANDLE(gc->parent),

				 "Ignoring %u default trigger\n", type);

		type = IRQ_TYPE_NONE;

	}



	if (gc->to_irq)

		chip_warn(gc, "to_irq is redefined in %s and you shouldn't rely on it\n", __func__);
@@ -1515,7 +1508,7 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc, 


		if (!ops)

			ops = &gpiochip_domain_ops;

		gc->irq.domain = irq_domain_add_simple(np,

		gc->irq.domain = irq_domain_create_simple(fwnode,

			gc->ngpio,

			gc->irq.first,

			ops, gc);