From mboxrd@z Thu Jan 1 00:00:00 1970 From: lee.jones@linaro.org (Lee Jones) Date: Thu, 11 Oct 2012 16:15:53 +0100 Subject: [PATCH] pinctrl/nomadik: always use the simple irqdomain In-Reply-To: <1349966197-18777-1-git-send-email-linus.walleij@stericsson.com> References: <1349966197-18777-1-git-send-email-linus.walleij@stericsson.com> Message-ID: <20121011151553.GC15428@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org > From: Linus Walleij > > Since the simple irqdomain will fall back to a linear domain > if the first_irq provided is <= 0, just use this, just make > sure the first_irq is negative in the device tree case. > > Cc: Lee Jones > Cc: Rob Herring > Signed-off-by: Linus Walleij > --- > drivers/pinctrl/pinctrl-nomadik.c | 13 +++---------- > 1 file changed, 3 insertions(+), 10 deletions(-) > > diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c > index 992982c..a4a4247 100644 > --- a/drivers/pinctrl/pinctrl-nomadik.c > +++ b/drivers/pinctrl/pinctrl-nomadik.c > @@ -1277,6 +1277,7 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev) > struct clk *clk; > int secondary_irq; > void __iomem *base; > + int irq_start = -1; > int irq; > int ret; > > @@ -1380,19 +1381,11 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev) > > platform_set_drvdata(dev, 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); > - } else { > - /* Non-DT legacy mode, use hardwired IRQ numbers */ > - int irq_start; > - > + if (!np) > irq_start = NOMADIK_GPIO_TO_IRQ(pdata->first_gpio); > - nmk_chip->domain = irq_domain_add_simple(NULL, > + 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; Looks good: Acked-by: Lee Jones -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog