Message ID | 1449480242-19380-2-git-send-email-rf@opensource.wolfsonmicro.com |
---|---|
State | New |
Headers | show |
On Mon, Dec 7, 2015 at 10:24 AM, Richard Fitzgerald <rf@opensource.wolfsonmicro.com> wrote: > The CS47L24 and WM1831 codecs only have two GPIO lines, but are > otherwise similar to the WM8280. > > Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com> > Acked-by: Linus Walleij <linus.walleij@linaro.org> OK I guess it should just be optimistically merged to the MFD tree where the dependency is (I guess?). Else I can take it once the MFD changes are upstream. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 11 Dec 2015, Linus Walleij wrote: > On Mon, Dec 7, 2015 at 10:24 AM, Richard Fitzgerald > <rf@opensource.wolfsonmicro.com> wrote: > > > The CS47L24 and WM1831 codecs only have two GPIO lines, but are > > otherwise similar to the WM8280. > > > > Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com> > > Acked-by: Linus Walleij <linus.walleij@linaro.org> > > OK I guess it should just be optimistically merged to the MFD > tree where the dependency is (I guess?). Else I can take it once the MFD > changes are upstream. I just applied it.
diff --git a/drivers/gpio/gpio-arizona.c b/drivers/gpio/gpio-arizona.c index 412d131..bb2a319 100644 --- a/drivers/gpio/gpio-arizona.c +++ b/drivers/gpio/gpio-arizona.c @@ -122,6 +122,10 @@ static int arizona_gpio_probe(struct platform_device *pdev) case WM1814: arizona_gpio->gpio_chip.ngpio = 5; break; + case WM1831: + case CS47L24: + arizona_gpio->gpio_chip.ngpio = 2; + break; default: dev_err(&pdev->dev, "Unknown chip variant %d\n", arizona->type);