Skip to content

Commit 9b08f83

Browse files
committed
Merge tag 'gpio-updates-for-v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull gpio updates from Bartosz Golaszewski: "Core GPIOLIB: - provide and add users for a macro allowing to iterate over accepted GPIO property names of consumer device nodes - remove legacy definitions that are no longer used - put legacy GPIO devres helpers together with the rest of the deprecated code - implement and use swnode_gpio_get_reference(): a wrapper simplifying the underlying calls to fwnode_property_get_reference_args() - use IS_ERR_OR_NULL() where it makes sense - replace of_find_property() with of_property_present() - simplify code with the scoped variant of OF-node children iterator Documentation: - update GPIO kerneldocs with Return sections - fix "Excess struct member description" warnings now being triggered with W=1 New drivers: - add support for Analog Devices ADP5585 Driver improvements: - add support for wake-on-GPIO to gpio-mpc8xxx - use GPIO_LOOKUP_IDX() in gpio-virtuser - use devm_clk_get_[optional_]enabled() where applicable in several drivers - replace OF-specific functions with provider-agnostic alternatives where possible - drop support for legacy platform data from gpio-ath79 and gpio-davinci - refactor gpio-stmpe - improve error reporting in gpio-pca953x - add support for reading the direction of pins for some models to gpio-vf610 DT bindings: - convert the bindings for nxp,lpc3220 to YAML - add gpio-reserved-ranges to gpio-davinci - simplify the GPIO hog schema - fix a GPIO hog issue in bindings for fcs,fxl6408 Other: - fix format specifiers in user-space tools - remove leftover files on make clean in tools/gpio/" * tag 'gpio-updates-for-v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: (54 commits) gpio: mpc8xxx: switch to using DEFINE_RUNTIME_DEV_PM_OPS() gpio: xilinx: Use helper function devm_clk_get_optional_enabled() gpio: mb86s7x: Use helper function devm_clk_get_optional_enabled() gpio: lpc18xx: Use helper function devm_clk_get_enabled() gpio: cadence: Use helper function devm_clk_get_enabled() gpio: sama5d2-piobu: convert comma to semicolon gpio: mpc8xxx: order headers alphabetically gpio: davinci: use devm_clk_get_enabled() gpio: davinci: drop platform data support gpio: stmpe: Sort headers gpio: stmpe: Make use of device properties gpio: stmpe: Utilise temporary variable for struct device gpio: stmpe: Remove unused 'dev' member of struct stmpe_gpio gpio: stmpe: Fix IRQ related error messages gpio: pch: kerneldoc fixes for excess members gpio: zynq: Simplify using devm_clk_get_enabled() gpio: mpc8xxx: Add wake on GPIO support gpio: syscon: fix excess struct member build warning gpio: stp-xway: Simplify using devm_clk_get_enabled() gpiolib: legacy: Consolidate devm_gpio_*() with other legacy APIs ...
2 parents cc52dc2 + 6b5e97c commit 9b08f83

Some content is hidden

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

50 files changed

+620
-632
lines changed

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,8 @@ properties:
3636
patternProperties:
3737
"^(hog-[0-9]+|.+-hog(-[0-9]+)?)$":
3838
type: object
39-
40-
properties:
41-
gpio-hog: true
42-
gpios: true
43-
output-high: true
44-
output-low: true
45-
line-name: true
46-
4739
required:
4840
- gpio-hog
49-
- gpios
50-
51-
additionalProperties: false
5241

5342
required:
5443
- compatible

Documentation/devicetree/bindings/gpio/fcs,fxl6408.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ properties:
2828

2929
patternProperties:
3030
"^(hog-[0-9]+|.+-hog(-[0-9]+)?)$":
31+
type: object
3132
required:
3233
- gpio-hog
3334

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,19 +85,8 @@ properties:
8585
patternProperties:
8686
"^(hog-[0-9]+|.+-hog(-[0-9]+)?)$":
8787
type: object
88-
properties:
89-
gpio-hog: true
90-
gpios: true
91-
input: true
92-
output-high: true
93-
output-low: true
94-
line-name: true
95-
9688
required:
9789
- gpio-hog
98-
- gpios
99-
100-
additionalProperties: false
10190

10291
required:
10392
- compatible

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ properties:
3232

3333
gpio-ranges: true
3434

35+
gpio-reserved-ranges: true
36+
3537
gpio-line-names:
3638
description: strings describing the names of each gpio line.
3739
minItems: 1

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -107,19 +107,8 @@ properties:
107107
patternProperties:
108108
"^(hog-[0-9]+|.+-hog(-[0-9]+)?)$":
109109
type: object
110-
properties:
111-
gpio-hog: true
112-
gpios: true
113-
input: true
114-
output-high: true
115-
output-low: true
116-
line-name: true
117-
118110
required:
119111
- gpio-hog
120-
- gpios
121-
122-
additionalProperties: false
123112

124113
required:
125114
- compatible

Documentation/devicetree/bindings/gpio/gpio_lpc32xx.txt

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

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,8 @@ properties:
4949
patternProperties:
5050
"^.+-hog(-[0-9]+)?$":
5151
type: object
52-
53-
additionalProperties: false
54-
55-
properties:
56-
gpio-hog: true
57-
gpios: true
58-
input: true
59-
output-high: true
60-
output-low: true
61-
line-name: true
62-
6352
required:
6453
- gpio-hog
65-
- gpios
6654

6755
allOf:
6856
- if:
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/gpio/nxp,lpc3220-gpio.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NXP LPC3220 SoC GPIO controller
8+
9+
maintainers:
10+
- Animesh Agarwal <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: nxp,lpc3220-gpio
15+
16+
reg:
17+
maxItems: 1
18+
19+
gpio-controller: true
20+
21+
'#gpio-cells':
22+
const: 3
23+
description: |
24+
1) bank:
25+
0: GPIO P0
26+
1: GPIO P1
27+
2: GPIO P2
28+
3: GPIO P3
29+
4: GPI P3
30+
5: GPO P3
31+
2) pin number
32+
3) flags:
33+
- bit 0 specifies polarity (0 for normal, 1 for inverted)
34+
35+
required:
36+
- compatible
37+
- reg
38+
- gpio-controller
39+
- '#gpio-cells'
40+
41+
additionalProperties: false
42+
43+
examples:
44+
- |
45+
gpio@40028000 {
46+
compatible = "nxp,lpc3220-gpio";
47+
reg = <0x40028000 0x1000>;
48+
gpio-controller;
49+
#gpio-cells = <3>; /* bank, pin, flags */
50+
};

Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,8 @@ properties:
5555
patternProperties:
5656
"^.+-hog(-[0-9]+)?$":
5757
type: object
58-
properties:
59-
gpio-hog: true
60-
gpios: true
61-
input: true
62-
output-high: true
63-
output-low: true
64-
line-name: true
65-
6658
required:
6759
- gpio-hog
68-
- gpios
69-
70-
additionalProperties: false
7160

7261
required:
7362
- compatible

arch/arm/mach-ep93xx/vision_ep9307.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ static int vision_lcd_setup(struct platform_device *pdev)
7676
{
7777
int err;
7878

79-
err = gpio_request_one(VISION_LCD_ENABLE, GPIOF_INIT_HIGH,
80-
dev_name(&pdev->dev));
79+
err = gpio_request_one(VISION_LCD_ENABLE, GPIOF_OUT_INIT_HIGH, dev_name(&pdev->dev));
8180
if (err)
8281
return err;
8382

@@ -293,8 +292,7 @@ static void __init vision_init_machine(void)
293292
* Request the gpio expander's interrupt gpio line now to prevent
294293
* the kernel from doing a WARN in gpiolib:gpio_ensure_requested().
295294
*/
296-
if (gpio_request_one(EP93XX_GPIO_LINE_F(7), GPIOF_DIR_IN,
297-
"pca9539:74"))
295+
if (gpio_request_one(EP93XX_GPIO_LINE_F(7), GPIOF_IN, "pca9539:74"))
298296
pr_warn("cannot request interrupt gpio for pca9539:74\n");
299297

300298
vision_i2c_info[1].irq = gpio_to_irq(EP93XX_GPIO_LINE_F(7));

0 commit comments

Comments
 (0)