OSDN Git Service

Merge tag 'gpio-v5.1-updates-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Walleij <linus.walleij@linaro.org>
Sun, 17 Feb 2019 20:59:33 +0000 (21:59 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Sun, 17 Feb 2019 20:59:33 +0000 (21:59 +0100)
gpio updates for v5.1

- support for a new variant of pca953x
- documentation fix from Wolfram
- some tegra186 name changes
- two minor fixes for madera and altera-a10sr

1  2 
drivers/gpio/gpio-eic-sprd.c
drivers/gpio/gpio-pca953x.c
drivers/gpio/gpio-pcf857x.c
drivers/gpio/gpiolib-acpi.c
drivers/gpio/gpiolib.c

Simple merge
Simple merge
@@@ -380,8 -390,9 +378,8 @@@ static int pcf857x_probe(struct i2c_cli
                if (status)
                        goto fail;
  
-               gpiochip_set_nested_irqchip(&gpio->chip, &pcf857x_irq_chip,
+               gpiochip_set_nested_irqchip(&gpio->chip, &gpio->irqchip,
                                            client->irq);
 -              gpio->irq_parent = client->irq;
        }
  
        /* Let platform code set up the GPIOs and their users.
Simple merge
Simple merge