Commit a409ed15 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  Core changes:

   - Retired the old set-up function for GPIO IRQ chips. All chips now
     use the template struct gpio_irq_chip and pass that to the core to
     be set up alongside the gpio_chip. We can finally get rid of the
     old cruft.

   - Some refactoring and clean up of the core code.

   - Support edge event timestamps to be stamped using REALTIME (wall
     clock) timestamps. We have found solid use cases for this, so we
     support it.

  New drivers:

   - MStar MSC313 GPIO driver.

   - HiSilicon GPIO driver.

  Driver improvements:

   - The PCA953x driver now also supports the NXP PCAL9554B/C chips.

   - The mockup driver can now be probed from the device tree which is
     pretty useful for virtual prototyping of devices.

   - The Rcar driver now supports .get_multiple()

   - The MXC driver dropped some legacy and became a pure device tree
     client.

   - The Exar driver was moved over to the IDA interface for
     enumerating, and also switched over to using regmap for register
     access"

* tag 'gpio-v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (87 commits)
  MAINTAINERS: Remove reference to non-existing file
  gpio: hisi: Do not require ACPI for COMPILE_TEST
  MAINTAINERS: Add maintainer for HiSilicon GPIO driver
  gpio: gpio-hisi: Add HiSilicon GPIO support
  gpio: cs5535: Simplify the return expression of cs5535_gpio_probe()
  gpiolib: irq hooks: fix recursion in gpiochip_irq_unmask
  dt-bindings: mt7621-gpio: convert bindings to YAML format
  gpiolib: cdev: Flag invalid GPIOs as used
  gpio: put virtual gpio device into their own submenu
  drivers: gpio: amd8111: use SPDX-License-Identifier
  drivers: gpio: amd8111: prefer dev_err()/dev_info() over raw printk
  drivers: gpio: bt8xx: prefer dev_err()/dev_warn() over of raw printk
  gpio: Add TODO item for debugfs interface
  gpio: just plain warning when nonexisting gpio requested
  tools: gpio: add option to report wall-clock time to gpio-event-mon
  tools: gpio: add support for reporting realtime event clock to lsgpio
  gpiolib: cdev: allow edge event timestamps to be configured as REALTIME
  gpio: msc313: MStar MSC313 GPIO driver
  dt-bindings: gpio: Binding for MStar MSC313 GPIO controller
  dt-bindings: gpio: Add a binding header for the MSC313 GPIO driver
  ...
parents 345b17ac 7ac55488

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

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ properties: 
      - nxp,pcal6416

      - nxp,pcal6524

      - nxp,pcal9535

      - nxp,pcal9554b

      - nxp,pcal9555a

      - onnn,cat9554

      - onnn,pca9654

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

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Required properties: 
- gpio-controller : Marks the device node as a GPIO controller.



Optional properties:

- clocks : Input clock specifier. Refer to common clock bindings.

- interrupts : Interrupt mapping for GPIO IRQ.

- xlnx,all-inputs : if n-th bit is setup, GPIO-n is input

- xlnx,dout-default : if n-th bit is 1, GPIO-n default value is 1
@@ -29,6 +30,7 @@ Example: 
gpio: gpio@40000000 {

	#gpio-cells = <2>;

	compatible = "xlnx,xps-gpio-1.00.a";

	clocks = <&clkc25>;

	gpio-controller ;

	interrupt-parent = <&microblaze_0_intc>;

	interrupts = < 6 2 >;

Documentation/devicetree/bindings/gpio/mediatek,mt7621-gpio.txt

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
Mediatek MT7621 SoC GPIO controller bindings



The IP core used inside these SoCs has 3 banks of 32 GPIOs each.

The registers of all the banks are interwoven inside one single IO range.

We load one GPIO controller instance per bank. Also the GPIO controller can receive

interrupts on any of the GPIOs, either edge or level. It then interrupts the CPU

using GIC INT12.



Required properties for the top level node:

- #gpio-cells : Should be two. The first cell is the GPIO pin number and the

   second cell specifies GPIO flags, as defined in <dt-bindings/gpio/gpio.h>.

   Only the GPIO_ACTIVE_HIGH and GPIO_ACTIVE_LOW flags are supported.

- #interrupt-cells : Specifies the number of cells needed to encode an

   interrupt. Should be 2. The first cell defines the interrupt number,

   the second encodes the trigger flags encoded as described in

   Documentation/devicetree/bindings/interrupt-controller/interrupts.txt

- compatible:

  - "mediatek,mt7621-gpio" for Mediatek controllers

- reg : Physical base address and length of the controller's registers

- interrupt-parent : phandle of the parent interrupt controller.

- interrupts : Interrupt specifier for the controllers interrupt.

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

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



Example:

	gpio@600 {

		#gpio-cells = <2>;

		#interrupt-cells = <2>;

		compatible = "mediatek,mt7621-gpio";

		gpio-controller;

		interrupt-controller;

		reg = <0x600 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <GIC_SHARED 12 IRQ_TYPE_LEVEL_HIGH>;

	};

Documentation/devicetree/bindings/gpio/mediatek,mt7621-gpio.yaml

0 → 100644
+72 −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/mediatek,mt7621-gpio.yaml#

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



title: Mediatek MT7621 SoC GPIO controller



maintainers:

  - Sergio Paracuellos <sergio.paracuellos@gmail.com>



description: |

  The IP core used inside these SoCs has 3 banks of 32 GPIOs each.

  The registers of all the banks are interwoven inside one single IO range.

  We load one GPIO controller instance per bank. Also the GPIO controller can receive

  interrupts on any of the GPIOs, either edge or level. It then interrupts the CPU

  using GIC INT12.



properties:

  $nodename:

    pattern: "^gpio@[0-9a-f]+$"



  compatible:

    const: mediatek,mt7621-gpio



  reg:

    maxItems: 1



  "#gpio-cells":

    const: 2



  gpio-controller: true

  gpio-ranges: true



  interrupt-controller: true



  "#interrupt-cells":

    const: 2



  interrupts:

    maxItems: 1



required:

  - compatible

  - reg

  - "#gpio-cells"

  - gpio-controller

  - gpio-ranges

  - interrupt-controller

  - "#interrupt-cells"

  - interrupts



additionalProperties: false



examples:

  - |

    #include <dt-bindings/gpio/gpio.h>

    #include <dt-bindings/interrupt-controller/mips-gic.h>



    gpio@600 {

      compatible = "mediatek,mt7621-gpio";

      reg = <0x600 0x100>;

      #gpio-cells = <2>;

      gpio-controller;

      gpio-ranges = <&pinctrl 0 0 95>;

      interrupt-controller;

      #interrupt-cells = <2>;

      interrupt-parent = <&gic>;

      interrupts = <GIC_SHARED 12 IRQ_TYPE_LEVEL_HIGH>;

    };



...

Documentation/devicetree/bindings/gpio/mstar,msc313-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/mstar,msc313-gpio.yaml#

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



title: MStar/SigmaStar GPIO controller



maintainers:

  - Daniel Palmer <daniel@thingy.jp>



properties:

  $nodename:

    pattern: "^gpio@[0-9a-f]+$"



  compatible:

    const: mstar,msc313-gpio



  reg:

    maxItems: 1



  gpio-controller: true



  "#gpio-cells":

    const: 2



  gpio-ranges: true



  interrupt-controller: true



  "#interrupt-cells":

    const: 2



required:

  - compatible

  - reg

  - gpio-controller

  - "#gpio-cells"

  - interrupt-controller

  - "#interrupt-cells"



additionalProperties: false



examples:

  - |

    #include <dt-bindings/gpio/msc313-gpio.h>



    gpio: gpio@207800 {

      compatible = "mstar,msc313e-gpio";

      #gpio-cells = <2>;

      reg = <0x207800 0x200>;

      gpio-controller;

      gpio-ranges = <&pinctrl 0 36 22>,

                    <&pinctrl 22 63 4>,

                    <&pinctrl 26 68 6>;

      #interrupt-cells = <2>;

      interrupt-controller;

      interrupt-parent = <&intc_fiq>;

    };

CRA Git | Maintained and supported by SUSTech CRA and CCSE