On 09/27/2012 08:13 AM, Linus Walleij wrote:
> From: Linus Walleij <[email protected]>
>
> This alters the Nomadik pinctrl driver to:
>
> - Call irqdomain_add_linear() for the DT case so we get
> all independent from IRQ numbers in this case.
> - Call irqdomain_add_simple() for the legacy case, which
> allocates the IRQ descriptors for the Nomadik pin controller
> dynamically.
>
> Cc: Lee Jones <[email protected]>
> Cc: Rob Herring <[email protected]>
> Signed-off-by: Linus Walleij <[email protected]>
> ---
> drivers/pinctrl/pinctrl-nomadik.c | 16 +++++++++++++---
> 1 file changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pinctrl/pinctrl-nomadik.c
> b/drivers/pinctrl/pinctrl-nomadik.c
> index e031c84..6aab107 100644
> --- a/drivers/pinctrl/pinctrl-nomadik.c
> +++ b/drivers/pinctrl/pinctrl-nomadik.c
> @@ -1286,9 +1286,19 @@ static int __devinit nmk_gpio_probe(struct
> platform_device *dev)
>
> platform_set_drvdata(dev, nmk_chip);
>
> - nmk_chip->domain = irq_domain_add_legacy(np, NMK_GPIO_PER_CHIP,
> -
> NOMADIK_GPIO_TO_IRQ(pdata->first_gpio),
> - 0, &nmk_gpio_irq_simple_ops,
> nmk_chip);
> + if (np) {
> + /* The DT case will just grab a set of IRQ numbers */
> + nmk_chip->domain = irq_domain_add_linear(np, NMK_GPIO_PER_CHIP,
> + &nmk_gpio_irq_simple_ops, nmk_chip);
irq_start = -1;
if (!np)
irq_start = NOMADIK_GPIO_TO_IRQ(pdata->first_gpio);
and then always call irq_domain_add_simple.
Rob
> + } else {
> + /* Non-DT legacy mode, use hardwired IRQ numbers */
> + int irq_start;
> +
> + irq_start = NOMADIK_GPIO_TO_IRQ(pdata->first_gpio);
> + nmk_chip->domain = irq_domain_add_simple(NULL,
> + NMK_GPIO_PER_CHIP, irq_start,
> + &nmk_gpio_irq_simple_ops, nmk_chip);
> + }
> if (!nmk_chip->domain) {
> dev_err(&dev->dev, "failed to create irqdomain\n");
> ret = -ENOSYS;
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
