Skip to content

Commit f016039

Browse files
committed
Merge tag 'gpio-updates-for-v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull gpio updates from Bartosz Golaszewski: "We have a single new driver, support for a bunch of new models, improvements in drivers and core gpiolib code as well device-tree bindings changes. Summary: New driver: - IMX System Controller Unit GPIOs GPIO core: - add fdinfo output for the GPIO character device file descriptors (allows user-space to determine which processes own which GPIO lines) - improvements to OF GPIO code - new quirk for Asus UM325UAZ in gpiolib-acpi - new quirk for Freescale SPI in gpiolib-of Driver improvements: - add a new macro that reduces the amount of boilerplate code in ISA drivers and use it in relevant drivers - support two new models in gpio-pca953x - support new model in gpio-f7188x - convert more drivers to use immutable irq chips - other minor tweaks Device-tree bindings: - add DT bindings for gpio-imx-scu - convert Xilinx GPIO bindings to YAML - reference the properties from the SPI peripheral device-tree bindings instead of providing custom ones in the GPIO controller document - add parsing of GPIO hog nodes to the DT bindings for gpio-mpfs-gpio - relax the node name requirements in gpio-stmpe - add new models for gpio-rcar and gpio-pxa95xx - add a new vendor prefix: Diodes (for Diodes, Inc.) Misc: - pulled in the immutable branch from the x86 platform drivers tree including support for a new simatic board that depends on GPIO changes" * tag 'gpio-updates-for-v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: (36 commits) gpio: tc3589x: Make irqchip immutable gpiolib: cdev: add fdinfo output for line request file descriptors gpio: twl4030: Reorder functions which allows to drop a forward declaraion gpiolib: fix OOB access in quirk callbacks gpiolib: of: factor out conversion from OF flags gpiolib: rework quirk handling in of_find_gpio() gpiolib: of: make Freescale SPI quirk similar to all others gpiolib: of: do not ignore requested index when applying quirks gpio: ws16c48: Ensure number of irq matches number of base gpio: 104-idio-16: Ensure number of irq matches number of base gpio: 104-idi-48: Ensure number of irq matches number of base gpio: 104-dio-48e: Ensure number of irq matches number of base counter: 104-quad-8: Ensure number of irq matches number of base isa: Introduce the module_isa_driver_with_irq helper macro gpio: pca953x: Add support for PCAL6534 gpio: pca953x: Swap if statements to save later complexity gpio: pca953x: Fix pca953x_gpio_set_pull_up_down() dt-bindings: gpio: pca95xx: add entry for pcal6534 and PI4IOE5V6534Q dt-bindings: vendor-prefixes: add Diodes gpio: mt7621: Switch to use platform_get_irq() function ...
2 parents 3002b7a + 3c92506 commit f016039

32 files changed

+873
-391
lines changed

Documentation/devicetree/bindings/firmware/fsl,scu.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ properties:
3030
Clock controller node that provides the clocks controlled by the SCU
3131
$ref: /schemas/clock/fsl,scu-clk.yaml
3232

33+
gpio:
34+
description:
35+
Control the GPIO PINs on SCU domain over the firmware APIs
36+
$ref: /schemas/gpio/fsl,imx8qxp-sc-gpio.yaml
37+
3338
ocotp:
3439
description:
3540
OCOTP controller node provided by the SCU

Documentation/devicetree/bindings/gpio/fairchild,74hc595.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ properties:
3333
description: GPIO connected to the OE (Output Enable) pin.
3434
maxItems: 1
3535

36-
spi-max-frequency: true
37-
3836
patternProperties:
3937
"^(hog-[0-9]+|.+-hog(-[0-9]+)?)$":
4038
type: object
@@ -59,7 +57,10 @@ required:
5957
- '#gpio-cells'
6058
- registers-number
6159

62-
additionalProperties: false
60+
allOf:
61+
- $ref: /schemas/spi/spi-peripheral-props.yaml#
62+
63+
unevaluatedProperties: false
6364

6465
examples:
6566
- |
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/gpio/fsl,imx8qxp-sc-gpio.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: GPIO driver over IMX SCU firmware API
8+
9+
maintainers:
10+
- Shenwei Wang <[email protected]>
11+
12+
description: |
13+
This module provides the standard interface to control the
14+
resource pins in SCU domain on i.MX8 platforms.
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- fsl,imx8qxp-sc-gpio
20+
21+
"#gpio-cells":
22+
const: 2
23+
24+
gpio-controller: true
25+
26+
required:
27+
- compatible
28+
- "#gpio-cells"
29+
- gpio-controller
30+
31+
additionalProperties: false
32+
33+
examples:
34+
- |
35+
gpio0: gpio {
36+
compatible = "fsl,imx8qxp-sc-gpio";
37+
gpio-controller;
38+
#gpio-cells = <2>;
39+
};

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

Lines changed: 53 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -15,52 +15,59 @@ description: |+
1515
1616
properties:
1717
compatible:
18-
enum:
19-
- exar,xra1202
20-
- maxim,max7310
21-
- maxim,max7312
22-
- maxim,max7313
23-
- maxim,max7315
24-
- maxim,max7319
25-
- maxim,max7320
26-
- maxim,max7321
27-
- maxim,max7322
28-
- maxim,max7323
29-
- maxim,max7324
30-
- maxim,max7325
31-
- maxim,max7326
32-
- maxim,max7327
33-
- nxp,pca6408
34-
- nxp,pca6416
35-
- nxp,pca9505
36-
- nxp,pca9506
37-
- nxp,pca9534
38-
- nxp,pca9535
39-
- nxp,pca9536
40-
- nxp,pca9537
41-
- nxp,pca9538
42-
- nxp,pca9539
43-
- nxp,pca9554
44-
- nxp,pca9555
45-
- nxp,pca9556
46-
- nxp,pca9557
47-
- nxp,pca9574
48-
- nxp,pca9575
49-
- nxp,pca9698
50-
- nxp,pcal6416
51-
- nxp,pcal6524
52-
- nxp,pcal9535
53-
- nxp,pcal9554b
54-
- nxp,pcal9555a
55-
- onnn,cat9554
56-
- onnn,pca9654
57-
- ti,pca6107
58-
- ti,pca9536
59-
- ti,tca6408
60-
- ti,tca6416
61-
- ti,tca6424
62-
- ti,tca9539
63-
- ti,tca9554
18+
oneOf:
19+
- items:
20+
- const: diodes,pi4ioe5v6534q
21+
- const: nxp,pcal6534
22+
- items:
23+
- enum:
24+
- exar,xra1202
25+
- maxim,max7310
26+
- maxim,max7312
27+
- maxim,max7313
28+
- maxim,max7315
29+
- maxim,max7319
30+
- maxim,max7320
31+
- maxim,max7321
32+
- maxim,max7322
33+
- maxim,max7323
34+
- maxim,max7324
35+
- maxim,max7325
36+
- maxim,max7326
37+
- maxim,max7327
38+
- nxp,pca6408
39+
- nxp,pca6416
40+
- nxp,pca9505
41+
- nxp,pca9506
42+
- nxp,pca9534
43+
- nxp,pca9535
44+
- nxp,pca9536
45+
- nxp,pca9537
46+
- nxp,pca9538
47+
- nxp,pca9539
48+
- nxp,pca9554
49+
- nxp,pca9555
50+
- nxp,pca9556
51+
- nxp,pca9557
52+
- nxp,pca9574
53+
- nxp,pca9575
54+
- nxp,pca9698
55+
- nxp,pcal6408
56+
- nxp,pcal6416
57+
- nxp,pcal6524
58+
- nxp,pcal6534
59+
- nxp,pcal9535
60+
- nxp,pcal9554b
61+
- nxp,pcal9555a
62+
- onnn,cat9554
63+
- onnn,pca9654
64+
- ti,pca6107
65+
- ti,pca9536
66+
- ti,tca6408
67+
- ti,tca6416
68+
- ti,tca6424
69+
- ti,tca9539
70+
- ti,tca9554
6471

6572
reg:
6673
maxItems: 1

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ Optional properties:
88
- st,norequest-mask: bitmask specifying which GPIOs should _not_ be requestable
99
due to different usage (e.g. touch, keypad)
1010

11-
Node name must be stmpe_gpio and should be child node of stmpe node to which it
12-
belongs.
11+
Node should be child node of stmpe node to which it belongs.
1312

1413
Example:
1514
stmpe_gpio {

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

Lines changed: 0 additions & 48 deletions
This file was deleted.

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,24 @@ properties:
4444

4545
gpio-controller: true
4646

47+
patternProperties:
48+
"^.+-hog(-[0-9]+)?$":
49+
type: object
50+
51+
additionalProperties: false
52+
53+
properties:
54+
gpio-hog: true
55+
gpios: true
56+
input: true
57+
output-high: true
58+
output-low: true
59+
line-name: true
60+
61+
required:
62+
- gpio-hog
63+
- gpios
64+
4765
required:
4866
- compatible
4967
- reg

Documentation/devicetree/bindings/gpio/renesas,rcar-gpio.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ properties:
5252
- enum:
5353
- renesas,gpio-r8a779a0 # R-Car V3U
5454
- renesas,gpio-r8a779f0 # R-Car S4-8
55+
- renesas,gpio-r8a779g0 # R-Car V4H
5556
- const: renesas,rcar-gen4-gpio # R-Car Gen4
5657

5758
reg:

0 commit comments

Comments
 (0)