Skip to content

Commit 90b0c2b

Browse files
torvaldstorvalds
committed
Merge tag 'pinctrl-v6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pin control updates from Linus Walleij: "No pin control core changes this time. New drivers: - Realtek RTD family pin control driver and RTD1619B, RTD1319D and RTD1315E subdrivers - Nuvoton NPCM8xx combined pin control and GPIO driver - Amlogic T7 pin control driver - Renesas RZ/G3S pin control driver Improvements: - A number of additional UART groups added to the Mediatek MT7981 driver - MPM pin maps added for Qualcomm MSM8996, SM6115, SM6125 and SDM660 - Extra GPIO banks for the Sunxi H616 - MLSP I2C6 function support in Qualcomm MSM8226 - Some __counted_by() annotations for dynamic arrays - Ongoing work to make remove() return void - LSBC groups and functions in the Renesas R8A7778" * tag 'pinctrl-v6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (110 commits) pinctrl: Use device_get_match_data() dt-bindings: pinctrl: qcom,sa8775p-tlmm: add missing wakeup-parent dt-bindings: pinctrl: nuvoton,npcm845: Add missing additionalProperties on gpio child nodes dt-bindings: pinctrl: brcm: Ensure all child node properties are documented pinctrl: renesas: rzn1: Convert to platform remove callback returning void pinctrl: renesas: rzg2l: Add RZ/G3S support dt-bindings: pinctrl: renesas: Document RZ/G3S SoC pinctrl: renesas: rzg2l: Add support for different DS values on different groups pinctrl: renesas: rzg2l: Move DS and OI to SoC-specific configuration pinctrl: renesas: rzg2l: Adapt function number for RZ/G3S pinctrl: renesas: rzg2l: Adapt for different SD/PWPR register offsets pinctrl: renesas: rzg2l: Index all registers based on port offset pinctrl: renesas: rzg2l: Add validation of GPIO pin in rzg2l_gpio_request() pinctrl: renesas: r8a7778: Add LBSC pins, groups, and functions pinctrl: intel: fetch community only when we need it pinctrl: cherryview: reduce scope of PIN_CONFIG_BIAS_HIGH_IMPEDANCE case pinctrl: cherryview: Convert to platform remove callback returning void pinctrl: sprd-sc9860: Convert to platform remove callback returning void pinctrl: qcom/msm: Convert to platform remove callback returning void pinctrl: qcom/lpi: Convert to platform remove callback returning void ...
2 parents be47c8e + 63bffc2 commit 90b0c2b

175 files changed

Lines changed: 12226 additions & 952 deletions

File tree

Some content is hidden

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

‎Documentation/devicetree/bindings/mfd/brcm,bcm63268-gpio-sysctl.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -148,47 +148,47 @@ examples:
148148
149149
pinctrl_nand: nand-pins {
150150
function = "nand";
151-
group = "nand_grp";
151+
pins = "nand_grp";
152152
};
153153
154154
pinctrl_gpio35_alt: gpio35_alt-pins {
155155
function = "gpio35_alt";
156-
pin = "gpio35";
156+
pins = "gpio35";
157157
};
158158
159159
pinctrl_dectpd: dectpd-pins {
160160
function = "dectpd";
161-
group = "dectpd_grp";
161+
pins = "dectpd_grp";
162162
};
163163
164164
pinctrl_vdsl_phy_override_0: vdsl_phy_override_0-pins {
165165
function = "vdsl_phy_override_0";
166-
group = "vdsl_phy_override_0_grp";
166+
pins = "vdsl_phy_override_0_grp";
167167
};
168168
169169
pinctrl_vdsl_phy_override_1: vdsl_phy_override_1-pins {
170170
function = "vdsl_phy_override_1";
171-
group = "vdsl_phy_override_1_grp";
171+
pins = "vdsl_phy_override_1_grp";
172172
};
173173
174174
pinctrl_vdsl_phy_override_2: vdsl_phy_override_2-pins {
175175
function = "vdsl_phy_override_2";
176-
group = "vdsl_phy_override_2_grp";
176+
pins = "vdsl_phy_override_2_grp";
177177
};
178178
179179
pinctrl_vdsl_phy_override_3: vdsl_phy_override_3-pins {
180180
function = "vdsl_phy_override_3";
181-
group = "vdsl_phy_override_3_grp";
181+
pins = "vdsl_phy_override_3_grp";
182182
};
183183
184184
pinctrl_dsl_gpio8: dsl_gpio8-pins {
185185
function = "dsl_gpio8";
186-
group = "dsl_gpio8";
186+
pins = "dsl_gpio8";
187187
};
188188
189189
pinctrl_dsl_gpio9: dsl_gpio9-pins {
190190
function = "dsl_gpio9";
191-
group = "dsl_gpio9";
191+
pins = "dsl_gpio9";
192192
};
193193
};
194194
};

‎Documentation/devicetree/bindings/mfd/brcm,bcm6362-gpio-sysctl.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ examples:
230230
231231
pinctrl_nand: nand-pins {
232232
function = "nand";
233-
group = "nand_grp";
233+
pins = "nand_grp";
234234
};
235235
};
236236
};

‎Documentation/devicetree/bindings/mfd/brcm,bcm6368-gpio-sysctl.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ examples:
240240
241241
pinctrl_uart1: uart1-pins {
242242
function = "uart1";
243-
group = "uart1_grp";
243+
pins = "uart1_grp";
244244
};
245245
};
246246
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ properties:
1616
compatible:
1717
enum:
1818
- amlogic,c3-periphs-pinctrl
19+
- amlogic,t7-periphs-pinctrl
1920
- amlogic,meson-a1-periphs-pinctrl
2021
- amlogic,meson-s4-periphs-pinctrl
2122

‎Documentation/devicetree/bindings/pinctrl/brcm,bcm6318-pinctrl.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ patternProperties:
2424
'-pins$':
2525
type: object
2626
$ref: pinmux-node.yaml#
27+
additionalProperties: false
2728

2829
properties:
2930
function:
@@ -37,6 +38,10 @@ patternProperties:
3738
enum: [ gpio0, gpio1, gpio2, gpio3, gpio4, gpio5, gpio6, gpio7,
3839
gpio8, gpio9, gpio10, gpio11, gpio12, gpio13, gpio40 ]
3940

41+
patternProperties:
42+
'-pins$':
43+
$ref: '#/patternProperties/-pins$'
44+
4045
allOf:
4146
- $ref: pinctrl.yaml#
4247

‎Documentation/devicetree/bindings/pinctrl/brcm,bcm63268-pinctrl.yaml‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ patternProperties:
2424
'-pins$':
2525
type: object
2626
$ref: pinmux-node.yaml#
27+
unevaluatedProperties: false
2728

2829
properties:
2930
function:
@@ -36,11 +37,15 @@ patternProperties:
3637

3738
pins:
3839
enum: [ gpio0, gpio1, gpio16, gpio17, gpio8, gpio9, gpio18, gpio19,
39-
gpio22, gpio23, gpio30, gpio31, nand_grp, gpio35
40+
gpio22, gpio23, gpio30, gpio31, nand_grp, gpio35,
4041
dectpd_grp, vdsl_phy_override_0_grp,
4142
vdsl_phy_override_1_grp, vdsl_phy_override_2_grp,
4243
vdsl_phy_override_3_grp, dsl_gpio8, dsl_gpio9 ]
4344

45+
patternProperties:
46+
'-pins$':
47+
$ref: '#/patternProperties/-pins$'
48+
4449
allOf:
4550
- $ref: pinctrl.yaml#
4651

@@ -122,46 +127,46 @@ examples:
122127
123128
pinctrl_nand: nand-pins {
124129
function = "nand";
125-
group = "nand_grp";
130+
pins = "nand_grp";
126131
};
127132
128133
pinctrl_gpio35_alt: gpio35_alt-pins {
129134
function = "gpio35_alt";
130-
pin = "gpio35";
135+
pins = "gpio35";
131136
};
132137
133138
pinctrl_dectpd: dectpd-pins {
134139
function = "dectpd";
135-
group = "dectpd_grp";
140+
pins = "dectpd_grp";
136141
};
137142
138143
pinctrl_vdsl_phy_override_0: vdsl_phy_override_0-pins {
139144
function = "vdsl_phy_override_0";
140-
group = "vdsl_phy_override_0_grp";
145+
pins = "vdsl_phy_override_0_grp";
141146
};
142147
143148
pinctrl_vdsl_phy_override_1: vdsl_phy_override_1-pins {
144149
function = "vdsl_phy_override_1";
145-
group = "vdsl_phy_override_1_grp";
150+
pins = "vdsl_phy_override_1_grp";
146151
};
147152
148153
pinctrl_vdsl_phy_override_2: vdsl_phy_override_2-pins {
149154
function = "vdsl_phy_override_2";
150-
group = "vdsl_phy_override_2_grp";
155+
pins = "vdsl_phy_override_2_grp";
151156
};
152157
153158
pinctrl_vdsl_phy_override_3: vdsl_phy_override_3-pins {
154159
function = "vdsl_phy_override_3";
155-
group = "vdsl_phy_override_3_grp";
160+
pins = "vdsl_phy_override_3_grp";
156161
};
157162
158163
pinctrl_dsl_gpio8: dsl_gpio8-pins {
159164
function = "dsl_gpio8";
160-
group = "dsl_gpio8";
165+
pins = "dsl_gpio8";
161166
};
162167
163168
pinctrl_dsl_gpio9: dsl_gpio9-pins {
164169
function = "dsl_gpio9";
165-
group = "dsl_gpio9";
170+
pins = "dsl_gpio9";
166171
};
167172
};

‎Documentation/devicetree/bindings/pinctrl/brcm,bcm6328-pinctrl.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ patternProperties:
2424
'-pins$':
2525
type: object
2626
$ref: pinmux-node.yaml#
27+
unevaluatedProperties: false
2728

2829
properties:
2930
function:
@@ -36,6 +37,10 @@ patternProperties:
3637
gpio20, gpio25, gpio26, gpio27, gpio28, hsspi_cs1,
3738
usb_port1 ]
3839

40+
patternProperties:
41+
'-pins$':
42+
$ref: '#/patternProperties/-pins$'
43+
3944
allOf:
4045
- $ref: pinctrl.yaml#
4146

‎Documentation/devicetree/bindings/pinctrl/brcm,bcm6358-pinctrl.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,16 @@ patternProperties:
2424
'-pins$':
2525
type: object
2626
$ref: pinmux-node.yaml#
27+
unevaluatedProperties: false
2728

2829
properties:
2930
function:
3031
enum: [ ebi_cs, uart1, serial_led, legacy_led, led, spi_cs, utopia,
3132
pwm_syn_clk, sys_irq ]
3233

33-
pins:
34+
groups:
3435
enum: [ ebi_cs_grp, uart1_grp, serial_led_grp, legacy_led_grp,
35-
led_grp, spi_cs_grp, utopia_grp, pwm_syn_clk, sys_irq_grp ]
36+
led_grp, spi_cs_grp, utopia_grp, pwm_syn_clk_grp, sys_irq_grp ]
3637

3738
allOf:
3839
- $ref: pinctrl.yaml#

‎Documentation/devicetree/bindings/pinctrl/brcm,bcm6362-pinctrl.yaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ patternProperties:
2424
'-pins$':
2525
type: object
2626
$ref: pinmux-node.yaml#
27+
unevaluatedProperties: false
2728

2829
properties:
2930
function:
@@ -41,6 +42,10 @@ patternProperties:
4142
gpio15, gpio16, gpio17, gpio18, gpio19, gpio20, gpio21,
4243
gpio22, gpio23, gpio24, gpio25, gpio26, gpio27, nand_grp ]
4344

45+
patternProperties:
46+
'-pins$':
47+
$ref: '#/patternProperties/-pins$'
48+
4449
allOf:
4550
- $ref: pinctrl.yaml#
4651

@@ -204,6 +209,6 @@ examples:
204209
205210
pinctrl_nand: nand-pins {
206211
function = "nand";
207-
group = "nand_grp";
212+
pins = "nand_grp";
208213
};
209214
};

‎Documentation/devicetree/bindings/pinctrl/brcm,bcm6368-pinctrl.yaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ patternProperties:
2424
'-pins$':
2525
type: object
2626
$ref: pinmux-node.yaml#
27+
unevaluatedProperties: false
2728

2829
properties:
2930
function:
@@ -42,6 +43,10 @@ patternProperties:
4243
gpio24, gpio25, gpio26, gpio27, gpio28, gpio29, gpio30,
4344
gpio31, uart1_grp ]
4445

46+
patternProperties:
47+
'-pins$':
48+
$ref: '#/patternProperties/-pins$'
49+
4550
allOf:
4651
- $ref: pinctrl.yaml#
4752

@@ -215,6 +220,6 @@ examples:
215220
216221
pinctrl_uart1: uart1-pins {
217222
function = "uart1";
218-
group = "uart1_grp";
223+
pins = "uart1_grp";
219224
};
220225
};

0 commit comments

Comments
 (0)