Merge branch 'linus' into perf/urgent

[cascardo/linux.git] / drivers / gpio / gpio-arizona.c

diff --git a/drivers/gpio/gpio-arizona.c b/drivers/gpio/gpio-arizona.c
index fa8b6a7..dceb5dc 100644 (file)
--- a/drivers/gpio/gpio-arizona.c
+++ b/drivers/gpio/gpio-arizona.c
@@ -109,10 +109,14 @@ static int arizona_gpio_probe(struct platform_device *pdev)
        arizona_gpio->arizona = arizona;
        arizona_gpio->gpio_chip = template_chip;
        arizona_gpio->gpio_chip.dev = &pdev->dev;
+#ifdef CONFIG_OF_GPIO
+       arizona_gpio->gpio_chip.of_node = arizona->dev->of_node;
+#endif
 
        switch (arizona->type) {
        case WM5102:
        case WM5110:
+       case WM8997:
                arizona_gpio->gpio_chip.ngpio = 5;
                break;
        default: