Merge tag 'gpio-v4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio

Pull GPIO updates from Linus Walleij:
 "Here is the bulk of GPIO changes for v4.5.

  Notably there are big refactorings mostly by myself, aimed at getting
  the gpio_chip into a shape that makes me believe I can proceed to
  preserve state for a proper userspace ABI (character device) that has
  already been proposed once, but resulted in the feedback that I need
  to go back and restructure stuff.  So I've been restructuring stuff.
  On the way I ran into brokenness (return code from the get_value()
  callback) and had to fix it.  Also, refactored generic GPIO to be
  simpler.

  Some of that is still waiting to trickle down from the subsystems all
  over the kernel that provide random gpio_chips, I've touched every
  single GPIO driver in the kernel now, oh man I didn't know I was
  responsible for so much...

  Apart from that we're churning along as usual.

  I took some effort to test and retest so it should merge nicely and we
  shook out a couple of bugs in -next.

  Infrastructural changes:

   - In struct gpio_chip, rename the .dev node to .parent to better
     reflect the fact that this is not the GPIO struct device
     abstraction.  We will add that soon so this would be totallt
     confusing.

   - It was noted that the driver .get_value() callbacks was sometimes
     reporting negative -ERR values to the gpiolib core, expecting them
     to be propagated to consumer gpiod_get_value() and gpio_get_value()
     calls.  This was not happening, so as there was a mess of drivers
     returning negative errors and some returning "anything else than
     zero" to indicate that a line was active.  As some would have bit
     31 set to indicate "line active" it clashed with negative error
     codes.  This is fixed by the largeish series clamping values in all
     drivers with !!value to [0,1] and then augmenting the code to
     propagate error codes to consumers.  (Includes some ACKed patches
     in other subsystems.)

   - Add a void *data pointer to struct gpio_chip.  The container_of()
     design pattern is indeed very nice, but we want to reform the
     struct gpio_chip to be a non-volative, stateless business, and keep
     states internal to the gpiolib to be able to hold on to the state
     when adding a proper userspace ABI (character device) further down
     the road.  To achieve this, drivers need a handle at the internal
     state that is not dependent on their struct gpio_chip() so we add
     gpiochip_add_data() and gpiochip_get_data() following the pattern
     of many other subsystems.  All the "use gpiochip data pointer"
     patches transforms drivers to this scheme.

   - The Generic GPIO chip header has been merged into the general
     <linux/gpio/driver.h> header, and the custom header for that
     removed.  Instead of having a separate mm_gpio_chip struct for
     these generic drivers, merge that into struct gpio_chip,
     simplifying the code and removing the need for separate and
     confusing includes.

  Misc improvements:

   - Stabilize the way GPIOs are looked up from the ACPI legacy
     specification.

   - Incremental driver features for PXA, PCA953X, Lantiq (patches from
     the OpenWRT community), RCAR, Zynq, PL061, 104-idi-48

  New drivers:

   - Add a GPIO chip to the ALSA SoC AC97 driver.

   - Add a new Broadcom NSP SoC driver (this lands in the pinctrl dir,
     but the branch is merged here too to account for infrastructural
     changes).

   - The sx150x driver now supports the sx1502"

* tag 'gpio-v4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (220 commits)
  gpio: generic: make bgpio_pdata always visible
  gpiolib: fix chip order in gpio list
  gpio: mpc8xxx: Do not use gpiochip_get_data() in mpc8xxx_gpio_save_regs()
  gpio: mm-lantiq: Do not use gpiochip_get_data() in ltq_mm_save_regs()
  gpio: brcmstb: Allow building driver for BMIPS_GENERIC
  gpio: brcmstb: Set endian flags for big-endian MIPS
  gpio: moxart: fix build regression
  gpio: xilinx: Do not use gpiochip_get_data() in xgpio_save_regs()
  leds: pca9532: use gpiochip data pointer
  leds: tca6507: use gpiochip data pointer
  hid: cp2112: use gpiochip data pointer
  bcma: gpio: use gpiochip data pointer
  avr32: gpio: use gpiochip data pointer
  video: fbdev: via: use gpiochip data pointer
  gpio: pch: Optimize pch_gpio_get()
  Revert "pinctrl: lantiq: Implement gpio_chip.to_irq"
  pinctrl: nsp-gpio: use gpiochip data pointer
  pinctrl: vt8500-wmt: use gpiochip data pointer
  pinctrl: exynos5440: use gpiochip data pointer
  pinctrl: at91-pio4: use gpiochip data pointer
  ...

2 files changed, 26 insertions, 36 deletions

diff --git a/drivers/pinctrl/sirf/pinctrl-atlas7.c b/drivers/pinctrl/sirf/pinctrl-atlas7.c
index 053d98e33944..beb024c31a5d 100644
--- a/drivers/pinctrl/sirf/pinctrl-atlas7.c
+++ b/drivers/pinctrl/sirf/pinctrl-atlas7.c
@@ -358,11 +358,6 @@ struct atlas7_gpio_chip {
         struct atlas7_gpio_bank banks[0];
 };
 
-static inline struct atlas7_gpio_chip *to_atlas7_gpio(struct gpio_chip *gc)
-{
-        return container_of(gc, struct atlas7_gpio_chip, chip);
-}
-
 /**
  * @dev: a pointer back to containing device
  * @virtbase: the offset to the controller in virtual memory
@@ -5642,7 +5637,7 @@ static int __atlas7_gpio_to_pin(struct atlas7_gpio_chip *a7gc, u32 gpio)
 static void atlas7_gpio_irq_ack(struct irq_data *d)
 {
         struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-        struct atlas7_gpio_chip *a7gc = to_atlas7_gpio(gc);
+        struct atlas7_gpio_chip *a7gc = gpiochip_get_data(gc);
         struct atlas7_gpio_bank *bank;
         void __iomem *ctrl_reg;
         u32 val, pin_in_bank;
@@ -5680,7 +5675,7 @@ static void __atlas7_gpio_irq_mask(struct atlas7_gpio_chip *a7gc, int idx)
 static void atlas7_gpio_irq_mask(struct irq_data *d)
 {
         struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-        struct atlas7_gpio_chip *a7gc = to_atlas7_gpio(gc);
+        struct atlas7_gpio_chip *a7gc = gpiochip_get_data(gc);
         unsigned long flags;
 
         spin_lock_irqsave(&a7gc->lock, flags);
@@ -5693,7 +5688,7 @@ static void atlas7_gpio_irq_mask(struct irq_data *d)
 static void atlas7_gpio_irq_unmask(struct irq_data *d)
 {
         struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-        struct atlas7_gpio_chip *a7gc = to_atlas7_gpio(gc);
+        struct atlas7_gpio_chip *a7gc = gpiochip_get_data(gc);
         struct atlas7_gpio_bank *bank;
         void __iomem *ctrl_reg;
         u32 val, pin_in_bank;
@@ -5717,7 +5712,7 @@ static int atlas7_gpio_irq_type(struct irq_data *d,
                                 unsigned int type)
 {
         struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-        struct atlas7_gpio_chip *a7gc = to_atlas7_gpio(gc);
+        struct atlas7_gpio_chip *a7gc = gpiochip_get_data(gc);
         struct atlas7_gpio_bank *bank;
         void __iomem *ctrl_reg;
         u32 val, pin_in_bank;
@@ -5786,7 +5781,7 @@ static struct irq_chip atlas7_gpio_irq_chip = {
 static void atlas7_gpio_handle_irq(struct irq_desc *desc)
 {
         struct gpio_chip *gc = irq_desc_get_handler_data(desc);
-        struct atlas7_gpio_chip *a7gc = to_atlas7_gpio(gc);
+        struct atlas7_gpio_chip *a7gc = gpiochip_get_data(gc);
         struct atlas7_gpio_bank *bank = NULL;
         u32 status, ctrl;
         int pin_in_bank = 0, idx;
@@ -5854,7 +5849,7 @@ static void __atlas7_gpio_set_input(struct atlas7_gpio_chip *a7gc,
 static int atlas7_gpio_request(struct gpio_chip *chip,
                                 unsigned int gpio)
 {
-        struct atlas7_gpio_chip *a7gc = to_atlas7_gpio(chip);
+        struct atlas7_gpio_chip *a7gc = gpiochip_get_data(chip);
         int ret;
         unsigned long flags;
 
@@ -5882,7 +5877,7 @@ static int atlas7_gpio_request(struct gpio_chip *chip,
 static void atlas7_gpio_free(struct gpio_chip *chip,
                                 unsigned int gpio)
 {
-        struct atlas7_gpio_chip *a7gc = to_atlas7_gpio(chip);
+        struct atlas7_gpio_chip *a7gc = gpiochip_get_data(chip);
         unsigned long flags;
 
         spin_lock_irqsave(&a7gc->lock, flags);
@@ -5898,7 +5893,7 @@ static void atlas7_gpio_free(struct gpio_chip *chip,
 static int atlas7_gpio_direction_input(struct gpio_chip *chip,
                                         unsigned int gpio)
 {
-        struct atlas7_gpio_chip *a7gc = to_atlas7_gpio(chip);
+        struct atlas7_gpio_chip *a7gc = gpiochip_get_data(chip);
         unsigned long flags;
 
         spin_lock_irqsave(&a7gc->lock, flags);
@@ -5935,7 +5930,7 @@ static void __atlas7_gpio_set_output(struct atlas7_gpio_chip *a7gc,
 static int atlas7_gpio_direction_output(struct gpio_chip *chip,
                                 unsigned int gpio, int value)
 {
-        struct atlas7_gpio_chip *a7gc = to_atlas7_gpio(chip);
+        struct atlas7_gpio_chip *a7gc = gpiochip_get_data(chip);
         unsigned long flags;
 
         spin_lock_irqsave(&a7gc->lock, flags);
@@ -5950,7 +5945,7 @@ static int atlas7_gpio_direction_output(struct gpio_chip *chip,
 static int atlas7_gpio_get_value(struct gpio_chip *chip,
                                         unsigned int gpio)
 {
-        struct atlas7_gpio_chip *a7gc = to_atlas7_gpio(chip);
+        struct atlas7_gpio_chip *a7gc = gpiochip_get_data(chip);
         struct atlas7_gpio_bank *bank;
         u32 val, pin_in_bank;
         unsigned long flags;
@@ -5970,7 +5965,7 @@ static int atlas7_gpio_get_value(struct gpio_chip *chip,
 static void atlas7_gpio_set_value(struct gpio_chip *chip,
                                 unsigned int gpio, int value)
 {
-        struct atlas7_gpio_chip *a7gc = to_atlas7_gpio(chip);
+        struct atlas7_gpio_chip *a7gc = gpiochip_get_data(chip);
         struct atlas7_gpio_bank *bank;
         void __iomem *ctrl_reg;
         u32 ctrl, pin_in_bank;
@@ -6054,10 +6049,10 @@ static int atlas7_gpio_probe(struct platform_device *pdev)
         chip->label = kstrdup(np->name, GFP_KERNEL);
         chip->of_node = np;
         chip->of_gpio_n_cells = 2;
-        chip->dev = &pdev->dev;
+        chip->parent = &pdev->dev;
 
         /* Add gpio chip to system */
-        ret = gpiochip_add(chip);
+        ret = gpiochip_add_data(chip, a7gc);
         if (ret) {
                 dev_err(&pdev->dev,
                 "%s: error in probe function with status %d\n",
diff --git a/drivers/pinctrl/sirf/pinctrl-sirf.c b/drivers/pinctrl/sirf/pinctrl-sirf.c
index edf40df05ec0..762c0c9c1278 100644
--- a/drivers/pinctrl/sirf/pinctrl-sirf.c
+++ b/drivers/pinctrl/sirf/pinctrl-sirf.c
@@ -403,11 +403,6 @@ static int __init sirfsoc_pinmux_init(void)
 }
 arch_initcall(sirfsoc_pinmux_init);
 
-static inline struct sirfsoc_gpio_chip *to_sirfsoc_gpio(struct gpio_chip *gc)
-{
-        return container_of(gc, struct sirfsoc_gpio_chip, chip.gc);
-}
-
 static inline struct sirfsoc_gpio_bank *
 sirfsoc_gpio_to_bank(struct sirfsoc_gpio_chip *sgpio, unsigned int offset)
 {
@@ -422,7 +417,7 @@ static inline int sirfsoc_gpio_to_bankoff(unsigned int offset)
 static void sirfsoc_gpio_irq_ack(struct irq_data *d)
 {
         struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-        struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(gc);
+        struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(gc);
         struct sirfsoc_gpio_bank *bank = sirfsoc_gpio_to_bank(sgpio, d->hwirq);
         int idx = sirfsoc_gpio_to_bankoff(d->hwirq);
         u32 val, offset;
@@ -461,7 +456,7 @@ static void __sirfsoc_gpio_irq_mask(struct sirfsoc_gpio_chip *sgpio,
 static void sirfsoc_gpio_irq_mask(struct irq_data *d)
 {
         struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-        struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(gc);
+        struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(gc);
         struct sirfsoc_gpio_bank *bank = sirfsoc_gpio_to_bank(sgpio, d->hwirq);
 
         __sirfsoc_gpio_irq_mask(sgpio, bank, d->hwirq % SIRFSOC_GPIO_BANK_SIZE);
@@ -470,7 +465,7 @@ static void sirfsoc_gpio_irq_mask(struct irq_data *d)
 static void sirfsoc_gpio_irq_unmask(struct irq_data *d)
 {
         struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-        struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(gc);
+        struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(gc);
         struct sirfsoc_gpio_bank *bank = sirfsoc_gpio_to_bank(sgpio, d->hwirq);
         int idx = sirfsoc_gpio_to_bankoff(d->hwirq);
         u32 val, offset;
@@ -491,7 +486,7 @@ static void sirfsoc_gpio_irq_unmask(struct irq_data *d)
 static int sirfsoc_gpio_irq_type(struct irq_data *d, unsigned type)
 {
         struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-        struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(gc);
+        struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(gc);
         struct sirfsoc_gpio_bank *bank = sirfsoc_gpio_to_bank(sgpio, d->hwirq);
         int idx = sirfsoc_gpio_to_bankoff(d->hwirq);
         u32 val, offset;
@@ -553,7 +548,7 @@ static void sirfsoc_gpio_handle_irq(struct irq_desc *desc)
 {
         unsigned int irq = irq_desc_get_irq(desc);
         struct gpio_chip *gc = irq_desc_get_handler_data(desc);
-        struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(gc);
+        struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(gc);
         struct sirfsoc_gpio_bank *bank;
         u32 status, ctrl;
         int idx = 0;
@@ -611,7 +606,7 @@ static inline void sirfsoc_gpio_set_input(struct sirfsoc_gpio_chip *sgpio,
 
 static int sirfsoc_gpio_request(struct gpio_chip *chip, unsigned offset)
 {
-        struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(chip);
+        struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(chip);
         struct sirfsoc_gpio_bank *bank = sirfsoc_gpio_to_bank(sgpio, offset);
         unsigned long flags;
 
@@ -634,7 +629,7 @@ static int sirfsoc_gpio_request(struct gpio_chip *chip, unsigned offset)
 
 static void sirfsoc_gpio_free(struct gpio_chip *chip, unsigned offset)
 {
-        struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(chip);
+        struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(chip);
         struct sirfsoc_gpio_bank *bank = sirfsoc_gpio_to_bank(sgpio, offset);
         unsigned long flags;
 
@@ -650,7 +645,7 @@ static void sirfsoc_gpio_free(struct gpio_chip *chip, unsigned offset)
 
 static int sirfsoc_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
 {
-        struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(chip);
+        struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(chip);
         struct sirfsoc_gpio_bank *bank = sirfsoc_gpio_to_bank(sgpio, gpio);
         int idx = sirfsoc_gpio_to_bankoff(gpio);
         unsigned long flags;
@@ -693,7 +688,7 @@ static inline void sirfsoc_gpio_set_output(struct sirfsoc_gpio_chip *sgpio,
 static int sirfsoc_gpio_direction_output(struct gpio_chip *chip,
         unsigned gpio, int value)
 {
-        struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(chip);
+        struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(chip);
         struct sirfsoc_gpio_bank *bank = sirfsoc_gpio_to_bank(sgpio, gpio);
         int idx = sirfsoc_gpio_to_bankoff(gpio);
         u32 offset;
@@ -712,7 +707,7 @@ static int sirfsoc_gpio_direction_output(struct gpio_chip *chip,
 
 static int sirfsoc_gpio_get_value(struct gpio_chip *chip, unsigned offset)
 {
-        struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(chip);
+        struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(chip);
         struct sirfsoc_gpio_bank *bank = sirfsoc_gpio_to_bank(sgpio, offset);
         u32 val;
         unsigned long flags;
@@ -729,7 +724,7 @@ static int sirfsoc_gpio_get_value(struct gpio_chip *chip, unsigned offset)
 static void sirfsoc_gpio_set_value(struct gpio_chip *chip, unsigned offset,
         int value)
 {
-        struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(chip);
+        struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(chip);
         struct sirfsoc_gpio_bank *bank = sirfsoc_gpio_to_bank(sgpio, offset);
         u32 ctrl;
         unsigned long flags;
@@ -815,10 +810,10 @@ static int sirfsoc_gpio_probe(struct device_node *np)
         sgpio->chip.gc.of_node = np;
         sgpio->chip.gc.of_xlate = sirfsoc_gpio_of_xlate;
         sgpio->chip.gc.of_gpio_n_cells = 2;
-        sgpio->chip.gc.dev = &pdev->dev;
+        sgpio->chip.gc.parent = &pdev->dev;
         sgpio->chip.regs = regs;
 
-        err = gpiochip_add(&sgpio->chip.gc);
+        err = gpiochip_add_data(&sgpio->chip.gc, sgpio);
         if (err) {
                 dev_err(&pdev->dev, "%s: error in probe function with status %d\n",
                         np->full_name, err);