Skip to content

Commit 37644ca

Browse files
committed
Merge tag 'gpio-updates-for-v6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull gpio updates from Bartosz Golaszewski: "Here are the updates for this merge window from the GPIO subsystem. We have more lines removed than added thanks to dropping of a driver for a platform that's no longer supported. Otherwise the changes are pretty straightforward: support for some new models, various improvements to existing drivers, some tweaks to the core library code and DT bindings updates. Summary: - remove gpio-vr41xx driver as the only platform using it got dropped too - add support for suspend/resume to gpio-davinci - improvements to the GPIO character device code - add support for disabling bias for in-kernel users (up until now only user-space could set it) - drop unused devm_gpio_free() - fix a refcount issue in gpiolib OF - use device match helpers where applicable - add support for a new model to gpio-rockchip - non-functional improvements in gpio-adp5588 - improve and simplify teardown in gpio-twl4030 and gpio-ucb1400 - modernize the gpio-74xx-mmio and gpio-adnp drivers - coding style improvements in gpio-xilinx, gpio-104-idi-48 - support new model (pca9571) in gpio-pca9570 - convert the DT bindings to YAML for gpio-mvebu and update the document - don't return error codes from remove() in gpio-brcmstb - add a library for the intel 8255 PPI interface and use it in drivers - reduce using magic numbers and improve code readability in several drivers - convert DT bindings to YAML for gpio-tpic2810 - add new models to DT bindings for gpio-frl-imx - Kconfig improvements - other minor tweaks and improvements" * tag 'gpio-updates-for-v6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: (52 commits) dt-bindings: gpio: fsl-imx-gpio: Add i.MXRT compatibles gpio: 74xx-mmio: Use bits instead of plain numbers for flags gpio: xilinx: add missing blank line after declarations MAINTAINERS: Update Intel 8255 GPIO driver file list gpio: gpio-mm: Implement and utilize register structures gpio: 104-idi-48: Implement and utilize register structures gpio: 104-dio-48e: Implement and utilize register structures gpio: i8255: Introduce the Intel 8255 interface library module gpio: 104-idio-16: Implement and utilize register structures gpio: ws16c48: Implement and utilize register structures gpio: remove VR41XX related gpio driver dt-bindings: gpio: add pull-disable flag gpiolib: acpi: support bias pull disable gpiolib: of: support bias pull disable gpiolib: add support for bias pull disable gpio: 74xx-mmio: use bits.h macros for all masks gpio: 74xx-mmio: Check MMIO_74XX_DIR_IN flag in mmio_74xx_dir_in() gpio: 74xx-mmio: Make use of device properties gpiolib: cdev: compile out HTE unless CONFIG_HTE selected gpiolib: cdev: consolidate edge detector configuration flags ...
2 parents 5f08481 + c4f0d16 commit 37644ca

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1197
-1452
lines changed

Documentation/devicetree/bindings/arm/marvell/ap80x-system-controller.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ mpp19 19 gpio, uart0(rxd), sdio(pw_off)
7272
GPIO:
7373
-----
7474
For common binding part and usage, refer to
75-
Documentation/devicetree/bindings/gpio/gpio-mvebu.txt.
75+
Documentation/devicetree/bindings/gpio/gpio-mvebu.yaml.
7676

7777
Required properties:
7878

Documentation/devicetree/bindings/arm/marvell/cp110-system-controller.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ GPIO:
156156
-----
157157

158158
For common binding part and usage, refer to
159-
Documentation/devicetree/bindings/gpio/gpio-mvebu.txt.
159+
Documentation/devicetree/bindings/gpio/gpio-mvebu.yaml.
160160

161161
Required properties:
162162

Documentation/devicetree/bindings/gpio/fsl-imx-gpio.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ properties:
3737
- fsl,imx8mp-gpio
3838
- fsl,imx8mq-gpio
3939
- fsl,imx8qxp-gpio
40+
- fsl,imxrt1050-gpio
41+
- fsl,imxrt1170-gpio
4042
- const: fsl,imx35-gpio
4143

4244
reg:

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

Lines changed: 0 additions & 93 deletions
This file was deleted.
Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/gpio/gpio-mvebu.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Marvell EBU GPIO controller
8+
9+
maintainers:
10+
- Thomas Petazzoni <[email protected]>
11+
- Andrew Lunn <[email protected]>
12+
13+
properties:
14+
compatible:
15+
oneOf:
16+
- enum:
17+
- marvell,armada-8k-gpio
18+
- marvell,orion-gpio
19+
20+
- items:
21+
- enum:
22+
- marvell,mv78200-gpio
23+
- marvell,armada-370-gpio
24+
- const: marvell,orion-gpio
25+
26+
- description: Deprecated binding
27+
items:
28+
- const: marvell,armadaxp-gpio
29+
- const: marvell,orion-gpio
30+
deprecated: true
31+
32+
reg:
33+
description: |
34+
Address and length of the register set for the device. Not used for
35+
marvell,armada-8k-gpio.
36+
37+
A second entry can be provided, for the PWM function using the GPIO Blink
38+
Counter on/off registers.
39+
minItems: 1
40+
maxItems: 2
41+
42+
reg-names:
43+
items:
44+
- const: gpio
45+
- const: pwm
46+
minItems: 1
47+
48+
offset:
49+
$ref: /schemas/types.yaml#/definitions/uint32
50+
description: Offset in the register map for the gpio registers (in bytes)
51+
52+
interrupts:
53+
description: |
54+
The list of interrupts that are used for all the pins managed by this
55+
GPIO bank. There can be more than one interrupt (example: 1 interrupt
56+
per 8 pins on Armada XP, which means 4 interrupts per bank of 32
57+
GPIOs).
58+
minItems: 1
59+
maxItems: 4
60+
61+
interrupt-controller: true
62+
63+
"#interrupt-cells":
64+
const: 2
65+
66+
gpio-controller: true
67+
68+
ngpios:
69+
minimum: 1
70+
maximum: 32
71+
72+
"#gpio-cells":
73+
const: 2
74+
75+
marvell,pwm-offset:
76+
$ref: /schemas/types.yaml#/definitions/uint32
77+
description: Offset in the register map for the pwm registers (in bytes)
78+
79+
"#pwm-cells":
80+
description:
81+
The first cell is the GPIO line number. The second cell is the period
82+
in nanoseconds.
83+
const: 2
84+
85+
clocks:
86+
description:
87+
Clock(s) used for PWM function.
88+
items:
89+
- description: Core clock
90+
- description: AXI bus clock
91+
minItems: 1
92+
93+
clock-names:
94+
items:
95+
- const: core
96+
- const: axi
97+
minItems: 1
98+
99+
required:
100+
- compatible
101+
- gpio-controller
102+
- ngpios
103+
- "#gpio-cells"
104+
105+
allOf:
106+
- if:
107+
properties:
108+
compatible:
109+
contains:
110+
const: marvell,armada-8k-gpio
111+
then:
112+
required:
113+
- offset
114+
else:
115+
required:
116+
- reg
117+
118+
unevaluatedProperties: true
119+
120+
examples:
121+
- |
122+
gpio@d0018100 {
123+
compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio";
124+
reg = <0xd0018100 0x40>, <0xd0018800 0x30>;
125+
ngpios = <32>;
126+
gpio-controller;
127+
#gpio-cells = <2>;
128+
interrupt-controller;
129+
#interrupt-cells = <2>;
130+
interrupts = <16>, <17>, <18>, <19>;
131+
};
132+
133+
- |
134+
gpio@18140 {
135+
compatible = "marvell,armada-370-gpio", "marvell,orion-gpio";
136+
reg = <0x18140 0x40>, <0x181c8 0x08>;
137+
reg-names = "gpio", "pwm";
138+
ngpios = <17>;
139+
gpio-controller;
140+
#gpio-cells = <2>;
141+
#pwm-cells = <2>;
142+
interrupt-controller;
143+
#interrupt-cells = <2>;
144+
interrupts = <87>, <88>, <89>;
145+
clocks = <&coreclk 0>;
146+
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ properties:
1313
compatible:
1414
enum:
1515
- nxp,pca9570
16+
- nxp,pca9571
1617

1718
reg:
1819
maxItems: 1

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

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/gpio/gpio-tpic2810.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: TPIC2810 GPIO controller bindings
8+
9+
maintainers:
10+
- Aswath Govindraju <[email protected]>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- ti,tpic2810
16+
17+
reg:
18+
maxItems: 1
19+
20+
gpio-controller: true
21+
22+
"#gpio-cells":
23+
const: 2
24+
25+
gpio-line-names:
26+
minItems: 1
27+
maxItems: 32
28+
29+
required:
30+
- compatible
31+
- reg
32+
- gpio-controller
33+
- "#gpio-cells"
34+
35+
additionalProperties: false
36+
37+
examples:
38+
- |
39+
#include <dt-bindings/gpio/gpio.h>
40+
41+
i2c {
42+
#address-cells = <1>;
43+
#size-cells = <0>;
44+
gpio@60 {
45+
compatible = "ti,tpic2810";
46+
reg = <0x60>;
47+
gpio-controller;
48+
#gpio-cells = <2>;
49+
gpio-line-names = "LED A", "LED B", "LED C";
50+
};
51+
};

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,9 @@ properties:
4848
- renesas,gpio-r8a77995 # R-Car D3
4949
- const: renesas,rcar-gen3-gpio # R-Car Gen3 or RZ/G2
5050

51-
- items:
52-
- const: renesas,gpio-r8a779a0 # R-Car V3U
53-
5451
- items:
5552
- enum:
53+
- renesas,gpio-r8a779a0 # R-Car V3U
5654
- renesas,gpio-r8a779f0 # R-Car S4-8
5755
- const: renesas,rcar-gen4-gpio # R-Car Gen4
5856

Documentation/devicetree/bindings/gpio/rockchip,gpio-bank.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ properties:
2727
- description: APB interface clock source
2828
- description: GPIO debounce reference clock source
2929

30+
gpio-ranges: true
31+
3032
gpio-controller: true
3133

3234
gpio-line-names: true

0 commit comments

Comments
 (0)