From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 5 Aug 2020 19:56:27 +0000 (-0700)
Subject: Merge tag 'gpio-v5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux... 
X-Git-Tag: v5.15~3204
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1d8ce0e09301920454234a4096dee96a670a8e32;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'gpio-v5.9-1' of git://git./linux/kernel/git/linusw/linux-gpio

Pull GPIO updates from Linus Walleij:
 "This is the bulk of GPIO changes for the v5.9 kernel cycle.

  There is nothing too exciting in it, but a new macro that fixes a
  build failure on a minor ARM32 platform that appeared yesterday is
  part of it so we better merge it.

  Core changes:

   - Introduce the for_each_requested_gpio() macro to help in dependent
     code all over the place. Also patch a few locations to use it while
     we are at it.

   - Split out the sysfs code into its own file.

   - Split out the character device code into its own file, then make a
     set of refactorings and improvements to this code. We are setting
     the stage to revamp the userspace API a bit in the next cycle.

   - Fix a whole slew of kerneldoc that was wrong or missing.

  New drivers:

   - The PCA953x driver now supports the PCAL9535.

  Driver improvements:

   - A host of incremental modernizations and improvements to the
     PCA953x driver.

   - Incremental improvements to the Xilinx Zynq driver.

   - Some improvements to the GPIO aggregator driver.

   - I ran all over the place switching all threaded and other drivers
     requesting their own IRQ while using the core GPIO IRQ helpers to
     pass the GPIO irq chip as a template instead of calling the
     explicit set-up functions. Next merge window we may retire the old
     code altogether"

* tag 'gpio-v5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (97 commits)
  gpio: wcove: Request IRQ after all initialisation done
  gpio: crystalcove: Free IRQ on error path
  gpio: pca953x: Request IRQ after all initialisation done
  gpio: don't use same lockdep class for all devm_gpiochip_add_data users
  gpio: max732x: Use irqchip template
  gpio: stmpe: Move chip registration
  gpio: rcar: Use irqchip template
  gpio: regmap: fix type clash
  gpio: Correct kernel-doc inconsistency
  gpio: pci-idio-16: Use irqchip template
  gpio: pcie-idio-24: Use irqchip template
  gpio: 104-idio-16: Use irqchip template
  gpio: 104-idi-48: Use irqchip template
  gpio: 104-dio-48e: Use irqchip template
  gpio: ws16c48: Use irqchip template
  gpio: omap: improve coding style for pin config flags
  gpio: dln2: Use irqchip template
  gpio: sch: Add a blank line between declaration and code
  gpio: sch: changed every 'unsigned' to 'unsigned int'
  gpio: ich: changed every 'unsigned' to 'unsigned int'
  ...
---

1d8ce0e09301920454234a4096dee96a670a8e32
diff --cc drivers/gpio/gpiolib-of.c
index e3e8851,2369857..bd31dd3
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@@ -25,8 -25,11 +25,11 @@@
  
  /**
   * of_gpio_spi_cs_get_count() - special GPIO counting for SPI
+  * @dev:    Consuming device
+  * @con_id: Function within the GPIO consumer
+  *
   * Some elder GPIO controllers need special quirks. Currently we handle
 - * the Freescale GPIO controller with bindings that doesn't use the
 + * the Freescale and PPC GPIO controller with bindings that doesn't use the
   * established "cs-gpios" for chip selects but instead rely on
   * "gpios" for the chip select lines. If we detect this, we redirect
   * the counting of "cs-gpios" to count "gpios" transparent to the