Commit 1334d2a3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-updates-for-v7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux 

Pull gpio updates from Bartosz Golaszewski:
 "For this merge window we have two new drivers: support for
  GPIO-signalled ACPI events on Intel platforms and a generic
  GPIO-over-pinctrl driver using the ARM SCMI protocol for
  controlling pins.

  Several things have been reworked in GPIO core: we unduplicated GPIO
  hog handling, reduced the number of SRCU locks and dereferences,
  improved support for software-node-based lookup and removed more
  legacy code after converting remaining users to modern alternatives.

  There's also a number of driver reworks and refactoring, documentation
  updates, some bug-fixes and new tests.

  GPIO core:
   - defer probe on software node lookups when the remote software node
     exists but has not been registered as a firmware node yet
   - unify GPIO hog handling by moving code duplicated in OF and ACPI
     modules into GPIO core and allow setting up hogs with software
     nodes
   - allow matching GPIO controllers by secondary firmware node if
     matching by primary does not succeed
   - demote deferral warnings to debug level as they are quite normal
     when using software nodes which don't support fw_devlink yet
   - disable the legacy GPIO character device uAPI v1 supprt in Kconfig
     by default
   - rework several core functions in preparation for the upcoming
     Revocable helper library for protecting resources against sudden
     removal, this reduces the number of SRCU dereferences in GPIO core
   - simplify file descriptor logic in GPIO character device code by
     using FD_PREPARE()
   - introduce a header defining symbols used by both GPIO consumers and
     providers to avoid having to include provider-specific headers from
     drivers which only consume GPIOs
   - replace snprintf() with strscpy() where formatting is not required

  New drivers:
   - add the gpio-by-pinctrl generic driver using the ARM SCMI protocol
     to control GPIOs (along with SCMI changes pulled from the pinctrl
     tree)
   - add a driver providing support for handling of platform events via
     GPIO-signalled ACPI events (used on Intel Nova Lake and later
     platforms)

  Driver changes:
   - extend the gpio-kempld driver with support for more recent models,
     interrupts and setting/getting multiple values at once
   - improve interrupt handling in gpio-brcmstb
   - add support for multi-SoC systems in gpio-tegra186
   - make sure we return correct values from the .get() callbacks in
     several GPIO drivers by normalizing any values other than 0, 1 or
     negative error numbers
   - use flexible arrays in several drivers to reduce the number of
     required memory allocations
   - simplify synchronous waiting for virtual drivers to probe and
     remove the dedicated, a bit overengineered helper library
     dev-sync-probe
   - remove unneeded Kconfig dependencies on OF_GPIO in several drivers
     and subsystems
   - convert the two remaining users of of_get_named_gpio() to using
     GPIO descriptors and remove the (no longer used) function along
     with the header that declares it
   - add missing includes in gpio-mmio
   - shrink and simplify code in gpio-max732x by using guard(mutex)
   - remove duplicated code handling the 'ngpios' property from
     gpio-ts4800, it's already handled in GPIO core
   - use correct variable type in gpio-aspeed
   - add support for a new model in gpio-realtek-otto
   - allow to specify the active-low setting of simulated hogs over the
     configfs interface (in addition to existing devicetree support) in
     gpio-sim

  Bug fixes:
   - clear the OF_POPULATED flag on hog nodes in GPIO chip remove path
     on OF systems
   - fix resource leaks in error path in gpiochip_add_data_with_key()
   - drop redundant device reference in gpio-mpsse

  Tests:
   - add selftests for use-after-free cases in GPIO character device
     code

  DT bindings:
   - add a DT binding document for SCMI based, gpio-over-pinctrl devices
   - fix interrupt description in microchip,mpfs-gpio
   - add new compatible for gpio-realtek-otto
   - describe the resets of the mpfs-gpio controller
   - fix maintainer's email in gpio-delay bindings
   - remove the binding document for cavium,thunder-8890 as the
     corresponding device is bound over PCI and not firmware nodes

  Documentation:
   - update the recommended way of converting legacy boards to using
     software nodes for GPIO description
   - describe GPIO line value semantics
   - misc updates to kerneldocs

  Misc:
   - convert OMAP1 ams-delta board to using GPIO hogs described with
     software nodes"

* tag 'gpio-updates-for-v7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: (79 commits)
  gpio: swnode: defer probe on references to unregistered software nodes
  dt-bindings: gpio: cavium,thunder-8890: Remove DT binding
  Documentation: gpio: update the preferred method for using software node lookup
  gpio: gpio-by-pinctrl: s/used to do/is used to do/
  gpio: aspeed: fix unsigned long int declaration
  gpio: rockchip: convert to dynamic GPIO base allocation
  gpio: remove dev-sync-probe
  gpio: virtuser: stop using dev-sync-probe
  gpio: aggregator: stop using dev-sync-probe
  gpio: sim: stop using dev-sync-probe
  gpio: Add Intel Nova Lake ACPI GPIO events driver
  gpiolib: Make deferral warnings debug messages
  gpiolib: fix hogs with multiple lines
  gpio: fix up CONFIG_OF dependencies
  gpio: gpio-by-pinctrl: add pinctrl based generic GPIO driver
  gpio: dt-bindings: Add GPIO on top of generic pin control
  firmware: arm_scmi: Allow PINCTRL_REQUEST to return EOPNOTSUPP
  pinctrl: scmi: ignore PIN_CONFIG_PERSIST_STATE
  pinctrl: scmi: Delete PIN_CONFIG_OUTPUT_IMPEDANCE_OHMS support
  pinctrl: scmi: Add SCMI_PIN_INPUT_VALUE
  ...
parents fbfb6bd9 ca13ab65

Documentation/devicetree/bindings/gpio/gpio-delay.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: GPIO delay controller



maintainers:

  - Alexander Stein <linux@ew.tq-group.com>

  - Alexander Stein <alexander.stein@ew.tq-group.com>



description: |

  This binding describes an electrical setup where setting an GPIO output

Documentation/devicetree/bindings/gpio/gpio-thunderx.txt

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
Cavium ThunderX/OCTEON-TX GPIO controller bindings



Required Properties:

- reg: The controller bus address.

- gpio-controller: Marks the device node as a GPIO controller.

- #gpio-cells: Must be 2.

  - First cell is the GPIO pin number relative to the controller.

  - Second cell is a standard generic flag bitfield as described in gpio.txt.



Optional Properties:

- compatible: "cavium,thunder-8890-gpio", unused as PCI driver binding is used.

- interrupt-controller: Marks the device node as an interrupt controller.

- #interrupt-cells: Must be present and have value of 2 if

                    "interrupt-controller" is present.

  - First cell is the GPIO pin number relative to the controller.

  - Second cell is triggering flags as defined in interrupts.txt.



Example:



gpio_6_0: gpio@6,0 {

	compatible = "cavium,thunder-8890-gpio";

	reg = <0x3000 0 0 0 0>; /*  DEVFN = 0x30 (6:0) */

	gpio-controller;

	#gpio-cells = <2>;

	interrupt-controller;

	#interrupt-cells = <2>;

};

Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml

+18 −9
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ properties: 
  clocks:

    maxItems: 1



  resets:

    maxItems: 1



  "#gpio-cells":

    const: 2
@@ -62,6 +65,11 @@ allOf: 
          contains:

            const: microchip,mpfs-gpio

    then:

      properties:

        ngpios:

          enum: [14, 24, 32]

        interrupts:

          minItems: 14

      required:

        - interrupts

        - "#interrupt-cells"
@@ -82,18 +90,19 @@ examples: 
        compatible = "microchip,mpfs-gpio";

        reg = <0x20122000 0x1000>;

        clocks = <&clkcfg 25>;

        interrupt-parent = <&plic>;

        interrupt-parent = <&irqmux>;

        gpio-controller;

        #gpio-cells = <2>;

        ngpios = <32>;

        interrupt-controller;

        #interrupt-cells = <2>;

        interrupts = <53>, <53>, <53>, <53>,

                     <53>, <53>, <53>, <53>,

                     <53>, <53>, <53>, <53>,

                     <53>, <53>, <53>, <53>,

                     <53>, <53>, <53>, <53>,

                     <53>, <53>, <53>, <53>,

                     <53>, <53>, <53>, <53>,

                     <53>, <53>, <53>, <53>;

        interrupts = <64>, <65>, <66>, <67>,

                     <68>, <69>, <70>, <71>,

                     <72>, <73>, <74>, <75>,

                     <76>, <77>, <78>, <79>,

                     <80>, <81>, <82>, <83>,

                     <84>, <85>, <86>, <87>,

                     <88>, <89>, <90>, <91>,

                     <92>, <93>, <94>, <95>;

    };

...

Documentation/devicetree/bindings/gpio/pin-control-gpio.yaml

0 → 100644
+59 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause

%YAML 1.2

---

$id: http://devicetree.org/schemas/gpio/pin-control-gpio.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Pin control based generic GPIO controller



description:

  The pin control-based GPIO will facilitate a pin controller's ability

  to drive electric lines high/low and other generic properties of a

  pin controller to perform general-purpose one-bit binary I/O.



maintainers:

  - Dan Carpenter <dan.carpenter@linaro.org>



properties:

  compatible:

    const: scmi-pinctrl-gpio



  gpio-controller: true



  "#gpio-cells":

    const: 2



  gpio-line-names: true



  gpio-ranges: true



  ngpios: true



patternProperties:

  "^.+-hog(-[0-9]+)?$":

    type: object



    required:

      - gpio-hog



required:

  - compatible

  - gpio-controller

  - "#gpio-cells"

  - gpio-ranges

  - ngpios



additionalProperties: false



examples:

  - |

    gpio {

        compatible = "scmi-pinctrl-gpio";

        gpio-controller;

        #gpio-cells = <2>;

        ngpios = <4>;

        gpio-line-names = "gpio_5_17", "gpio_5_20", "gpio_5_22", "gpio_2_1";

        gpio-ranges = <&scmi_pinctrl 0 30 4>;

        pinctrl-names = "default";

        pinctrl-0 = <&keys_pins>;

    };

Documentation/devicetree/bindings/gpio/realtek,otto-gpio.yaml

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ properties: 
          - realtek,rtl8390-gpio

          - realtek,rtl9300-gpio

          - realtek,rtl9310-gpio

          - realtek,rtl9607-gpio

      - const: realtek,otto-gpio



  reg: true