Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[karo-tx-linux.git] / drivers / gpio / gpio-arizona.c

diff --git a/drivers/gpio/gpio-arizona.c b/drivers/gpio/gpio-arizona.c
index fa8b6a762761412a84901e7629b23270b66ac2ec..29bdff558981306c4f9c78419a5bafa723536900 100644 (file)
--- a/drivers/gpio/gpio-arizona.c
+++ b/drivers/gpio/gpio-arizona.c
@@ -91,7 +91,7 @@ static struct gpio_chip template_chip = {
        .get                    = arizona_gpio_get,
        .direction_output       = arizona_gpio_direction_out,
        .set                    = arizona_gpio_set,
-       .can_sleep              = 1,
+       .can_sleep              = true,
 };
 
 static int arizona_gpio_probe(struct platform_device *pdev)
@@ -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: