gpio: handle also nested irqchips in the chained handler set-up (3f97d5fc) · Commits · 戴 / test

Documentation/gpio/driver.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,8 @@ symbol:
		* gpiochip_set_chained_irqchip(): sets up a chained irq handler for a
		gpio_chip from a parent IRQ and passes the struct gpio_chip* as handler
		data. (Notice handler data, since the irqchip data is likely used by the
		parent irqchip!) This is for the chained type of chip.
		parent irqchip!) This is for the chained type of chip. This is also used
		to set up a nested irqchip if NULL is passed as handler.

		To use the helpers please keep the following in mind:

drivers/gpio/gpio-stmpe.c

+12 −6

Original line number	Diff line number	Diff line
		@@ -308,6 +308,12 @@ static int stmpe_gpio_probe(struct platform_device *pdev)
		if (ret)
		goto out_free;

		ret = gpiochip_add(&stmpe_gpio->chip);
		if (ret) {
		dev_err(&pdev->dev, "unable to add gpiochip: %d\n", ret);
		goto out_disable;
		}

		if (irq > 0) {
		ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
		stmpe_gpio_irq, IRQF_ONESHOT,
		@@ -324,14 +330,13 @@ static int stmpe_gpio_probe(struct platform_device *pdev)
		if (ret) {
		dev_err(&pdev->dev,
		"could not connect irqchip to gpiochip\n");
		return ret;
		}
		goto out_disable;
		}

		ret = gpiochip_add(&stmpe_gpio->chip);
		if (ret) {
		dev_err(&pdev->dev, "unable to add gpiochip: %d\n", ret);
		goto out_disable;
		gpiochip_set_chained_irqchip(&stmpe_gpio->chip,
		&stmpe_gpio_irq_chip,
		irq,
		NULL);
		}

		if (pdata && pdata->setup)
		@@ -343,6 +348,7 @@ static int stmpe_gpio_probe(struct platform_device *pdev)

		out_disable:
		stmpe_disable(stmpe, STMPE_BLOCK_GPIO);
		gpiochip_remove(&stmpe_gpio->chip);
		out_free:
		kfree(stmpe_gpio);
		return ret;

drivers/gpio/gpio-tc3589x.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -300,6 +300,11 @@ static int tc3589x_gpio_probe(struct platform_device *pdev)
		return ret;
		}

		gpiochip_set_chained_irqchip(&tc3589x_gpio->chip,
		&tc3589x_gpio_irq_chip,
		irq,
		NULL);

		if (pdata && pdata->setup)
		pdata->setup(tc3589x, tc3589x_gpio->chip.base);

drivers/gpio/gpiolib.c

+19 −15

Original line number	Diff line number	Diff line
		@@ -385,13 +385,14 @@ static struct gpio_chip find_chip_by_name(const char name)
		*/

		/**
		* gpiochip_add_chained_irqchip() - adds a chained irqchip to a gpiochip
		* @gpiochip: the gpiochip to add the irqchip to
		* @irqchip: the irqchip to add to the gpiochip
		* gpiochip_set_chained_irqchip() - sets a chained irqchip to a gpiochip
		* @gpiochip: the gpiochip to set the irqchip chain to
		* @irqchip: the irqchip to chain to the gpiochip
		* @parent_irq: the irq number corresponding to the parent IRQ for this
		* chained irqchip
		* @parent_handler: the parent interrupt handler for the accumulated IRQ
		* coming out of the gpiochip
		* coming out of the gpiochip. If the interrupt is nested rather than
		* cascaded, pass NULL in this handler argument
		*/
		void gpiochip_set_chained_irqchip(struct gpio_chip *gpiochip,
		struct irq_chip *irqchip,
		@@ -400,23 +401,26 @@ void gpiochip_set_chained_irqchip(struct gpio_chip *gpiochip,
		{
		unsigned int offset;

		if (gpiochip->can_sleep) {
		chip_err(gpiochip, "you cannot have chained interrupts on a chip that may sleep\n");
		return;
		}
		if (!gpiochip->irqdomain) {
		chip_err(gpiochip, "called %s before setting up irqchip\n",
		__func__);
		return;
		}

		if (parent_handler) {
		if (gpiochip->can_sleep) {
		chip_err(gpiochip,
		"you cannot have chained interrupts on a "
		"chip that may sleep\n");
		return;
		}
		irq_set_chained_handler(parent_irq, parent_handler);

		/*
		* The parent irqchip is already using the chip_data for this
		* irqchip, so our callbacks simply use the handler_data.
		*/
		irq_set_handler_data(parent_irq, gpiochip);
		}

		/* Set the parent IRQ for all affected IRQs */
		for (offset = 0; offset < gpiochip->ngpio; offset++)

Admin message