pinctrl-bcm2835: Fix cut-and-paste error in "pull" parsing

[mirror_ubuntu-bionic-kernel.git] / drivers / pinctrl / bcm / pinctrl-bcm2835.c

diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
index 75b0d8c8f05815583c07a8fd95f680164476e54b..08b1d93da9fedb36e1ae6ed3450221271f25998f 100644 (file)
--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
@@ -23,7 +23,7 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/err.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/irq.h>
@@ -337,14 +337,14 @@ static int bcm2835_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
 
 static int bcm2835_gpio_get(struct gpio_chip *chip, unsigned offset)
 {
-       struct bcm2835_pinctrl *pc = dev_get_drvdata(chip->dev);
+       struct bcm2835_pinctrl *pc = gpiochip_get_data(chip);
 
        return bcm2835_gpio_get_bit(pc, GPLEV0, offset);
 }
 
 static void bcm2835_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 {
-       struct bcm2835_pinctrl *pc = dev_get_drvdata(chip->dev);
+       struct bcm2835_pinctrl *pc = gpiochip_get_data(chip);
 
        bcm2835_gpio_set_bit(pc, value ? GPSET0 : GPCLR0, offset);
 }
@@ -358,7 +358,7 @@ static int bcm2835_gpio_direction_output(struct gpio_chip *chip,
 
 static int bcm2835_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
 {
-       struct bcm2835_pinctrl *pc = dev_get_drvdata(chip->dev);
+       struct bcm2835_pinctrl *pc = gpiochip_get_data(chip);
 
        return irq_linear_revmap(pc->irq_domain, offset);
 }
@@ -779,7 +779,7 @@ static int bcm2835_pctl_dt_node_to_map(struct pinctrl_dev *pctldev,
                }
                if (num_pulls) {
                        err = of_property_read_u32_index(np, "brcm,pull",
-                                       (num_funcs > 1) ? i : 0, &pull);
+                                       (num_pulls > 1) ? i : 0, &pull);
                        if (err)
                                goto out;
                        err = bcm2835_pctl_dt_node_to_map_pull(pc, np, pin,
@@ -964,7 +964,7 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev)
                return PTR_ERR(pc->base);
 
        pc->gpio_chip = bcm2835_gpio_chip;
-       pc->gpio_chip.dev = dev;
+       pc->gpio_chip.parent = dev;
        pc->gpio_chip.of_node = np;
 
        pc->irq_domain = irq_domain_add_linear(np, BCM2835_NUM_GPIOS,
@@ -1021,7 +1021,7 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev)
                }
        }
 
-       err = gpiochip_add(&pc->gpio_chip);
+       err = gpiochip_add_data(&pc->gpio_chip, pc);
        if (err) {
                dev_err(dev, "could not add GPIO chip\n");
                return err;