Skip to content

Commit 348551d

Browse files
torvaldstorvalds
committed
Merge tag 'pinctrl-v6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pin control updates from Linus Walleij: "Mostly drivers! Nothing special: some new Qualcomm chips as usual, and the new NXP S32 and nVidia BlueField-3. Core changes: - Make a lot of pin controllers with GPIO and irqchips immutable, i.e. not living structs, but const structs. This is driving a changed initiated by the irqchip maintainers. New drivers: - New driver for the NXP S32 SoC pin controller - As part of a thorough cleanup and restructuring of the Ralink/Mediatek drivers, the Ralink MIPS pin control drivers were folded into the Mediatek directory and the family is renamed "mtmips". The Ralink chips live on as Mediatek MIPS family where new variants can be added. As part of this work also the device tree bindings were reworked. - New subdriver for the Qualcomm SM7150 SoC. - New subdriver for the Qualcomm IPQ9574 SoC. - New driver for the nVidia BlueField-3 SoC. - Support for the Qualcomm PMM8654AU mixed signal circuit GPIO. - Support for the Qualcomm PMI632 mixed signal circuit GPIO. Improvements: - Add some missing pins and generic cleanups on the Renesas r8a779g0 and r8a779g0 pin controllers. Generic Renesas extension for power source selection on several SoCs. - Misc cleanups for the Atmel AT91 and AT91-PIO4 pin controllers - Make the GPIO mode work on the Qualcomm SM8550-lpass-lpi driver. - Several device tree binding cleanups as the binding YAML syntax is solidifying" * tag 'pinctrl-v6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (153 commits) pinctrl-bcm2835.c: fix race condition when setting gpio dir dt-bindings: pinctrl: qcom,sm8150: Drop duplicate function value "atest_usb2" dt-bindings: pinctrl: qcom: Add few missing functions pinctrl: qcom: spmi-gpio: Add PMI632 support dt-bindings: pinctrl: qcom,pmic-gpio: add PMI632 pinctrl: wpcm450: select MFD_SYSCON pinctrl: qcom ssbi-gpio: Convert to immutable irq_chip pinctrl: qcom ssbi-mpp: Convert to immutable irq_chip pinctrl: qcom spmi-mpp: Convert to immutable irq_chip pinctrl: plgpio: Convert to immutable irq_chip pinctrl: pistachio: Convert to immutable irq_chip pinctrl: pic32: Convert to immutable irq_chip pinctrl: sx150x: Convert to immutable irq_chip pinctrl: stmfx: Convert to immutable irq_chip pinctrl: st: Convert to immutable irq_chip pinctrl: mcp23s08: Convert to immutable irq_chip pinctrl: equilibrium: Convert to immutable irq_chip pinctrl: npcm7xx: Convert to immutable irq_chip pinctrl: armada-37xx: Convert to immutable irq_chip pinctrl: nsp: Convert to immutable irq_chip ...
2 parents 7df047b + b7badd7 commit 348551d

File tree

222 files changed

+8933
-10668
lines changed

Some content is hidden

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

222 files changed

+8933
-10668
lines changed

‎Documentation/devicetree/bindings/gpio/nxp,pcf8575.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ properties:
3939
reg:
4040
maxItems: 1
4141

42+
gpio-line-names:
43+
minItems: 1
44+
maxItems: 16
45+
4246
gpio-controller: true
4347

4448
'#gpio-cells':

‎Documentation/devicetree/bindings/pinctrl/actions,s500-pinctrl.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ patternProperties:
185185
additionalProperties: false
186186

187187
allOf:
188-
- $ref: "pinctrl.yaml#"
188+
- $ref: pinctrl.yaml#
189189

190190
required:
191191
- compatible

‎Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ allOf:
142142
# boards are defining it at the moment so it would generate a lot of
143143
# warnings.
144144

145-
- $ref: "pinctrl.yaml#"
145+
- $ref: pinctrl.yaml#
146146
- if:
147147
not:
148148
properties:

‎Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-a1.yaml‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/pinctrl/amlogic,meson-pinctrl-a1.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Amlogic Meson A1 pinmux controller
8+
9+
maintainers:
10+
- Neil Armstrong <neil.armstrong@linaro.org>
11+
12+
allOf:
13+
- $ref: amlogic,meson-pinctrl-common.yaml#
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- amlogic,meson-a1-periphs-pinctrl
19+
- amlogic,meson-s4-periphs-pinctrl
20+
21+
required:
22+
- compatible
23+
24+
patternProperties:
25+
"^bank@[0-9a-z]+$":
26+
$ref: amlogic,meson-pinctrl-common.yaml#/$defs/meson-gpio
27+
28+
unevaluatedProperties: false
29+
30+
properties:
31+
reg:
32+
maxItems: 2
33+
34+
reg-names:
35+
items:
36+
- const: mux
37+
- const: gpio
38+
39+
unevaluatedProperties:
40+
type: object
41+
$ref: amlogic,meson-pinctrl-common.yaml#/$defs/meson-pins
42+
43+
examples:
44+
- |
45+
periphs_pinctrl: pinctrl {
46+
compatible = "amlogic,meson-a1-periphs-pinctrl";
47+
#address-cells = <1>;
48+
#size-cells = <1>;
49+
ranges;
50+
51+
bank@400 {
52+
reg = <0x0400 0x003c>,
53+
<0x0480 0x0118>;
54+
reg-names = "mux", "gpio";
55+
gpio-controller;
56+
#gpio-cells = <2>;
57+
gpio-ranges = <&periphs_pinctrl 0 0 62>;
58+
};
59+
60+
cec_ao_a_h_pins: cec_ao_a_h {
61+
mux {
62+
groups = "cec_ao_a_h";
63+
function = "cec_ao_a_h";
64+
bias-disable;
65+
};
66+
};
67+
};

‎Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-common.yaml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/pinctrl/amlogic,meson-pinctrl-common.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Amlogic Meson pinmux controller
8+
9+
maintainers:
10+
- Neil Armstrong <neil.armstrong@linaro.org>
11+
12+
allOf:
13+
- $ref: pinctrl.yaml#
14+
15+
properties:
16+
ranges: true
17+
18+
"#address-cells":
19+
enum: [1, 2]
20+
21+
"#size-cells":
22+
enum: [1, 2]
23+
24+
required:
25+
- ranges
26+
- "#address-cells"
27+
- "#size-cells"
28+
29+
additionalProperties: true
30+
31+
$defs:
32+
meson-gpio:
33+
type: object
34+
35+
properties:
36+
gpio-controller: true
37+
38+
"#gpio-cells":
39+
const: 2
40+
41+
gpio-ranges:
42+
maxItems: 1
43+
44+
required:
45+
- reg
46+
- reg-names
47+
- gpio-controller
48+
- "#gpio-cells"
49+
- gpio-ranges
50+
51+
meson-pins:
52+
type: object
53+
additionalProperties:
54+
type: object
55+
allOf:
56+
- $ref: pincfg-node.yaml#
57+
- $ref: pinmux-node.yaml#

‎Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-g12a-aobus.yaml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/pinctrl/amlogic,meson-pinctrl-g12a-aobus.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Amlogic Meson G12 AOBUS pinmux controller
8+
9+
maintainers:
10+
- Neil Armstrong <neil.armstrong@linaro.org>
11+
12+
allOf:
13+
- $ref: amlogic,meson-pinctrl-common.yaml#
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- amlogic,meson-g12a-aobus-pinctrl
19+
20+
required:
21+
- compatible
22+
23+
patternProperties:
24+
"^bank@[0-9a-z]+$":
25+
$ref: amlogic,meson-pinctrl-common.yaml#/$defs/meson-gpio
26+
27+
unevaluatedProperties: false
28+
29+
properties:
30+
reg:
31+
maxItems: 3
32+
33+
reg-names:
34+
items:
35+
- const: mux
36+
- const: ds
37+
- const: gpio
38+
39+
unevaluatedProperties:
40+
type: object
41+
$ref: amlogic,meson-pinctrl-common.yaml#/$defs/meson-pins
42+
43+
examples:
44+
- |
45+
ao_pinctrl: pinctrl {
46+
compatible = "amlogic,meson-g12a-aobus-pinctrl";
47+
#address-cells = <1>;
48+
#size-cells = <1>;
49+
ranges;
50+
51+
bank@14 {
52+
reg = <0x14 0x8>,
53+
<0x1c 0x8>,
54+
<0x24 0x14>;
55+
reg-names = "mux", "ds", "gpio";
56+
gpio-controller;
57+
#gpio-cells = <2>;
58+
gpio-ranges = <&ao_pinctrl 0 0 15>;
59+
};
60+
61+
cec_ao_a_h_pins: cec_ao_a_h {
62+
mux {
63+
groups = "cec_ao_a_h";
64+
function = "cec_ao_a_h";
65+
bias-disable;
66+
};
67+
};
68+
};

‎Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-g12a-periphs.yaml‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/pinctrl/amlogic,meson-pinctrl-g12a-periphs.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Amlogic Meson G12 PERIPHS pinmux controller
8+
9+
maintainers:
10+
- Neil Armstrong <neil.armstrong@linaro.org>
11+
12+
allOf:
13+
- $ref: amlogic,meson-pinctrl-common.yaml#
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- amlogic,meson-g12a-periphs-pinctrl
19+
20+
required:
21+
- compatible
22+
23+
patternProperties:
24+
"^bank@[0-9a-z]+$":
25+
$ref: amlogic,meson-pinctrl-common.yaml#/$defs/meson-gpio
26+
27+
unevaluatedProperties: false
28+
29+
properties:
30+
reg:
31+
maxItems: 5
32+
33+
reg-names:
34+
items:
35+
- const: gpio
36+
- const: pull
37+
- const: pull-enable
38+
- const: mux
39+
- const: ds
40+
41+
unevaluatedProperties:
42+
type: object
43+
$ref: amlogic,meson-pinctrl-common.yaml#/$defs/meson-pins
44+
45+
examples:
46+
- |
47+
periphs_pinctrl: pinctrl {
48+
compatible = "amlogic,meson-g12a-periphs-pinctrl";
49+
#address-cells = <1>;
50+
#size-cells = <1>;
51+
ranges;
52+
53+
bank@40 {
54+
reg = <0x40 0x4c>,
55+
<0xe8 0x18>,
56+
<0x120 0x18>,
57+
<0x2c0 0x40>,
58+
<0x340 0x1c>;
59+
reg-names = "gpio", "pull", "pull-enable", "mux", "ds";
60+
gpio-controller;
61+
#gpio-cells = <2>;
62+
gpio-ranges = <&periphs_pinctrl 0 0 86>;
63+
};
64+
65+
cec_ao_a_h_pins: cec_ao_a_h {
66+
mux {
67+
groups = "cec_ao_a_h";
68+
function = "cec_ao_a_h";
69+
bias-disable;
70+
};
71+
};
72+
};

‎Documentation/devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-aobus.yaml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/pinctrl/amlogic,meson8-pinctrl-aobus.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Amlogic Meson8 AOBUS pinmux controller
8+
9+
maintainers:
10+
- Neil Armstrong <neil.armstrong@linaro.org>
11+
12+
allOf:
13+
- $ref: amlogic,meson-pinctrl-common.yaml#
14+
15+
properties:
16+
compatible:
17+
oneOf:
18+
- enum:
19+
- amlogic,meson8-aobus-pinctrl
20+
- amlogic,meson8b-aobus-pinctrl
21+
- amlogic,meson-gxbb-aobus-pinctrl
22+
- amlogic,meson-gxl-aobus-pinctrl
23+
- amlogic,meson-axg-aobus-pinctrl
24+
- items:
25+
- const: amlogic,meson8m2-aobus-pinctrl
26+
- const: amlogic,meson8-aobus-pinctrl
27+
28+
required:
29+
- compatible
30+
31+
patternProperties:
32+
"^bank@[0-9a-z]+$":
33+
$ref: amlogic,meson-pinctrl-common.yaml#/$defs/meson-gpio
34+
35+
unevaluatedProperties: false
36+
37+
properties:
38+
reg:
39+
maxItems: 3
40+
41+
reg-names:
42+
items:
43+
- const: mux
44+
- const: pull
45+
- const: gpio
46+
47+
unevaluatedProperties:
48+
type: object
49+
$ref: amlogic,meson-pinctrl-common.yaml#/$defs/meson-pins
50+
51+
examples:
52+
- |
53+
pinctrl_aobus: pinctrl {
54+
compatible = "amlogic,meson8-aobus-pinctrl";
55+
#address-cells = <1>;
56+
#size-cells = <1>;
57+
ranges;
58+
59+
bank@14 {
60+
reg = <0x14 0x4>,
61+
<0x2c 0x4>,
62+
<0x24 0x8>;
63+
reg-names = "mux", "pull", "gpio";
64+
gpio-controller;
65+
#gpio-cells = <2>;
66+
gpio-ranges = <&pinctrl_aobus 0 0 16>;
67+
};
68+
69+
cec_ao_a_h_pins: cec_ao_a_h {
70+
mux {
71+
groups = "cec_ao_a_h";
72+
function = "cec_ao_a_h";
73+
bias-disable;
74+
};
75+
};
76+
};

0 commit comments

Comments
 (0)