Skip to content

Commit b67b381

Browse files
author
Linus Walleij
committed
Merge tag 'qcom-pinctrl-6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt into devel
Qualcomm pinctrl Devicetree bindings changes for v6.4 Cleanup and improvement of the bindings to use "unevaluatedProperties" instead of "additionalProperties", which allows to accept all the properties already parsed by referenced common qcom,tlmm-common.yaml schema. That common qcom,tlmm-common.yaml binding is going to remove "input-enable" property, thus using "unevaluatedProperties" allows such change to propagate to other bindings automatically.
2 parents 86169e6 + 152674a commit b67b381

36 files changed

Lines changed: 36 additions & 362 deletions

Documentation/devicetree/bindings/pinctrl/qcom,ipq5332-tlmm.yaml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ $defs:
5656
Pinctrl node's client devices use subnodes for desired pin configuration.
5757
Client device subnodes use below standard properties.
5858
$ref: qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state
59+
unevaluatedProperties: false
5960

6061
properties:
6162
pins:
@@ -92,19 +93,9 @@ $defs:
9293
rx1, sdc_data, sdc_clk, sdc_cmd, tsens_max, wci_txd, wci_rxd,
9394
wsi_clk, wsi_clk3, wsi_data, wsi_data3, wsis_reset, xfem ]
9495

95-
bias-pull-down: true
96-
bias-pull-up: true
97-
bias-disable: true
98-
drive-strength: true
99-
input-enable: true
100-
output-high: true
101-
output-low: true
102-
10396
required:
10497
- pins
10598

106-
additionalProperties: false
107-
10899
required:
109100
- compatible
110101
- reg

Documentation/devicetree/bindings/pinctrl/qcom,ipq6018-pinctrl.yaml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ $defs:
4343
Pinctrl node's client devices use subnodes for desired pin configuration.
4444
Client device subnodes use below standard properties.
4545
$ref: qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state
46+
unevaluatedProperties: false
4647

4748
properties:
4849
pins:
@@ -89,18 +90,9 @@ $defs:
8990
sd_write, sec_mi2s, smb_int, ssbi_wtr0, ssbi_wtr1, uim1, uim2,
9091
uim3, uim_batt, wcss_bt, wcss_fm, wcss_wlan, webcam1_rst ]
9192

92-
bias-pull-down: true
93-
bias-pull-up: true
94-
bias-disable: true
95-
drive-strength: true
96-
output-high: true
97-
output-low: true
98-
9993
required:
10094
- pins
10195

102-
additionalProperties: false
103-
10496
allOf:
10597
- $ref: /schemas/pinctrl/qcom,tlmm-common.yaml#
10698

Documentation/devicetree/bindings/pinctrl/qcom,ipq8074-pinctrl.yaml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ $defs:
5353
Pinctrl node's client devices use subnodes for desired pin configuration.
5454
Client device subnodes use below standard properties.
5555
$ref: qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state
56+
unevaluatedProperties: false
5657

5758
properties:
5859
pins:
@@ -92,19 +93,9 @@ $defs:
9293
qdss_tracedata_b, qpic, rx0, rx1, rx2, sd_card, sd_write,
9394
tsens_max, wci2a, wci2b, wci2c, wci2d ]
9495

95-
bias-pull-down: true
96-
bias-pull-up: true
97-
bias-disable: true
98-
drive-strength: true
99-
input-enable: true
100-
output-high: true
101-
output-low: true
102-
10396
required:
10497
- pins
10598

106-
additionalProperties: false
107-
10899
allOf:
109100
- $ref: /schemas/pinctrl/qcom,tlmm-common.yaml#
110101

Documentation/devicetree/bindings/pinctrl/qcom,mdm9607-tlmm.yaml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ $defs:
5454
Pinctrl node's client devices use subnodes for desired pin configuration.
5555
Client device subnodes use below standard properties.
5656
$ref: qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state
57+
unevaluatedProperties: false
5758

5859
properties:
5960
pins:
@@ -105,19 +106,9 @@ $defs:
105106
uim1_clk, uim1_data, uim1_present, uim1_reset, uim2_clk,
106107
uim2_data, uim2_present, uim2_reset, uim_batt, wlan_en1, ]
107108

108-
bias-disable: true
109-
bias-pull-down: true
110-
bias-pull-up: true
111-
drive-strength: true
112-
input-enable: true
113-
output-high: true
114-
output-low: true
115-
116109
required:
117110
- pins
118111

119-
additionalProperties: false
120-
121112
examples:
122113
- |
123114
#include <dt-bindings/interrupt-controller/arm-gic.h>

Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.yaml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ $defs:
5151
Pinctrl node's client devices use subnodes for desired pin configuration.
5252
Client device subnodes use below standard properties.
5353
$ref: qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state
54+
unevaluatedProperties: false
5455

5556
properties:
5657
pins:
@@ -70,19 +71,9 @@ $defs:
7071
enum: [ gpio, gsbi2_i2c, gsbi3, gsbi4, gsbi5_i2c, gsbi5_uart,
7172
sdc2, ebi2_lcdc, ps_hold, prim_audio, sec_audio, cdc_mclk, ]
7273

73-
bias-disable: true
74-
bias-pull-down: true
75-
bias-pull-up: true
76-
drive-strength: true
77-
output-high: true
78-
output-low: true
79-
input-enable: true
80-
8174
required:
8275
- pins
8376

84-
additionalProperties: false
85-
8677
examples:
8778
- |
8879
#include <dt-bindings/interrupt-controller/arm-gic.h>

Documentation/devicetree/bindings/pinctrl/qcom,msm8226-pinctrl.yaml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ $defs:
4848
Pinctrl node's client devices use subnodes for desired pin configuration.
4949
Client device subnodes use below standard properties.
5050
$ref: qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state
51+
unevaluatedProperties: false
5152

5253
properties:
5354
pins:
@@ -71,19 +72,9 @@ $defs:
7172
blsp_uart3, blsp_uart4, blsp_uart5, cam_mclk0, cam_mclk1,
7273
gp0_clk, gp1_clk, sdc3, wlan ]
7374

74-
bias-pull-down: true
75-
bias-pull-up: true
76-
bias-disable: true
77-
drive-strength: true
78-
input-enable: true
79-
output-high: true
80-
output-low: true
81-
8275
required:
8376
- pins
8477

85-
additionalProperties: false
86-
8778
allOf:
8879
- $ref: /schemas/pinctrl/qcom,tlmm-common.yaml#
8980

Documentation/devicetree/bindings/pinctrl/qcom,msm8660-pinctrl.yaml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ $defs:
5353
Pinctrl node's client devices use subnodes for desired pin configuration.
5454
Client device subnodes use below standard properties.
5555
$ref: qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state
56+
unevaluatedProperties: false
5657

5758
properties:
5859
pins:
@@ -81,20 +82,9 @@ $defs:
8182
sdc5, tsif1, tsif2, usb_fs1, usb_fs1_oe_n, usb_fs2,
8283
usb_fs2_oe_n, vfe, vsens_alarm, ebi2, ebi2cs ]
8384

84-
85-
bias-pull-down: true
86-
bias-pull-up: true
87-
bias-disable: true
88-
drive-strength: true
89-
input-enable: true
90-
output-high: true
91-
output-low: true
92-
9385
required:
9486
- pins
9587

96-
additionalProperties: false
97-
9888
allOf:
9989
- $ref: /schemas/pinctrl/qcom,tlmm-common.yaml#
10090

Documentation/devicetree/bindings/pinctrl/qcom,msm8909-tlmm.yaml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ $defs:
5555
Pinctrl node's client devices use subnodes for desired pin configuration.
5656
Client device subnodes use below standard properties.
5757
$ref: qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state
58+
unevaluatedProperties: false
5859

5960
properties:
6061
pins:
@@ -104,19 +105,9 @@ $defs:
104105
uim3_clk, uim3_data, uim3_present, uim3_reset, uim_batt,
105106
wcss_bt, wcss_fm, wcss_wlan ]
106107

107-
bias-disable: true
108-
bias-pull-down: true
109-
bias-pull-up: true
110-
drive-strength: true
111-
input-enable: true
112-
output-high: true
113-
output-low: true
114-
115108
required:
116109
- pins
117110

118-
additionalProperties: false
119-
120111
examples:
121112
- |
122113
#include <dt-bindings/interrupt-controller/arm-gic.h>

Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.yaml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ $defs:
5353
Pinctrl node's client devices use subnodes for desired pin configuration.
5454
Client device subnodes use below standard properties.
5555
$ref: qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state
56+
unevaluatedProperties: false
5657

5758
properties:
5859
pins:
@@ -103,19 +104,9 @@ $defs:
103104
uim1, uim2, uim3, uim_batt, wcss_bt, wcss_fm, wcss_wlan,
104105
webcam1_rst ]
105106

106-
bias-pull-down: true
107-
bias-pull-up: true
108-
bias-disable: true
109-
drive-strength: true
110-
input-enable: true
111-
output-high: true
112-
output-low: true
113-
114107
required:
115108
- pins
116109

117-
additionalProperties: false
118-
119110
allOf:
120111
- $ref: /schemas/pinctrl/qcom,tlmm-common.yaml#
121112

Documentation/devicetree/bindings/pinctrl/qcom,msm8953-pinctrl.yaml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ $defs:
4545
Pinctrl node's client devices use subnodes for desired pin configuration.
4646
Client device subnodes use below standard properties.
4747
$ref: qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state
48+
unevaluatedProperties: false
4849

4950
properties:
5051
pins:
@@ -106,18 +107,9 @@ $defs:
106107
uim_batt, us_emitter, us_euro, wcss_bt, wcss_fm, wcss_wlan,
107108
wcss_wlan0, wcss_wlan1, wcss_wlan2, wsa_en, wsa_io, wsa_irq ]
108109

109-
bias-pull-down: true
110-
bias-pull-up: true
111-
bias-disable: true
112-
drive-strength: true
113-
output-high: true
114-
output-low: true
115-
116110
required:
117111
- pins
118112

119-
additionalProperties: false
120-
121113
allOf:
122114
- $ref: /schemas/pinctrl/qcom,tlmm-common.yaml#
123115

0 commit comments

Comments
 (0)