Commit aead3991 authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl: sirf: Pass irqchip when adding gpiochip 



We need to convert all old gpio irqchips to pass the irqchip
setup along when adding the gpio_chip. For more info see
drivers/gpio/TODO.

For chained irqchips this is a pretty straight-forward
conversion.

Cc: Barry Song <baohua@kernel.org>
Cc: Yuping Luo <yuping.luo@csr.com>
Cc: Rongjun Ying <rongjun.ying@csr.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20190913113530.5536-5-linus.walleij@linaro.org
parent de0221f6

drivers/pinctrl/sirf/pinctrl-sirf.c

+20 −23
Original line number Diff line number Diff line
@@ -785,6 +785,7 @@ static int sirfsoc_gpio_probe(struct device_node *np) 
	struct sirfsoc_gpio_bank *bank;

	void __iomem *regs;

	struct platform_device *pdev;

	struct gpio_irq_chip *girq;



	u32 pullups[SIRFSOC_GPIO_NO_OF_BANKS], pulldowns[SIRFSOC_GPIO_NO_OF_BANKS];
@@ -816,36 +817,33 @@ static int sirfsoc_gpio_probe(struct device_node *np) 
	sgpio->chip.gc.parent = &pdev->dev;

	sgpio->chip.regs = regs;



	err = gpiochip_add_data(&sgpio->chip.gc, sgpio);

	if (err) {

		dev_err(&pdev->dev, "%pOF: error in probe function with status %d\n",

			np, err);

		goto out;

	}



	err =  gpiochip_irqchip_add(&sgpio->chip.gc,

		&sirfsoc_irq_chip,

		0, handle_level_irq,

		IRQ_TYPE_NONE);

	if (err) {

		dev_err(&pdev->dev,

			"could not connect irqchip to gpiochip\n");

		goto out_banks;

	}



	girq = &sgpio->chip.gc.irq;

	girq->chip = &sirfsoc_irq_chip;

	girq->parent_handler = sirfsoc_gpio_handle_irq;

	girq->num_parents = SIRFSOC_GPIO_NO_OF_BANKS;

	girq->parents = devm_kcalloc(&pdev->dev, SIRFSOC_GPIO_NO_OF_BANKS,

				     sizeof(*girq->parents),

				     GFP_KERNEL);

	if (!girq->parents)

		return -ENOMEM;

	for (i = 0; i < SIRFSOC_GPIO_NO_OF_BANKS; i++) {

		bank = &sgpio->sgpio_bank[i];

		spin_lock_init(&bank->lock);

		bank->parent_irq = platform_get_irq(pdev, i);

		if (bank->parent_irq < 0) {

			err = bank->parent_irq;

			goto out_banks;

			goto out;

		}

		girq->parents[i] = bank->parent_irq;

	}

	girq->default_type = IRQ_TYPE_NONE;

	girq->handler = handle_level_irq;



		gpiochip_set_chained_irqchip(&sgpio->chip.gc,

			&sirfsoc_irq_chip,

			bank->parent_irq,

			sirfsoc_gpio_handle_irq);

	err = gpiochip_add_data(&sgpio->chip.gc, sgpio);

	if (err) {

		dev_err(&pdev->dev, "%pOF: error in probe function with status %d\n",

			np, err);

		goto out;

	}



	err = gpiochip_add_pin_range(&sgpio->chip.gc, dev_name(&pdev->dev),
@@ -867,7 +865,6 @@ static int sirfsoc_gpio_probe(struct device_node *np) 
	return 0;



out_no_range:

out_banks:

	gpiochip_remove(&sgpio->chip.gc);

out:

	iounmap(regs);

CRA Git | Maintained and supported by SUSTech CRA and CCSE