Skip to content

Commit 1ec033f

Browse files
committed
Merge tag 'qcom-pinctrl-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt into devel
Qualcomm pinctrl Devicetree bindings changes for v6.3, part two Several minor cleanups and fixes on Qualcomm pin controller Devicetree bindings - add missing input-disable, correct GPIO pin name patterns in bindings, correct number of GPIOs in gpio-ranges property.
2 parents 6c83b2d + 315dffb commit 1ec033f

12 files changed

+17
-16
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ $defs:
5656
subnode.
5757
items:
5858
oneOf:
59-
- pattern: "^gpio([0-9]|[1-9][0-9]|1[0-1][0-6])$"
59+
- pattern: "^gpio([0-9]|[1-9][0-9]|10[0-9]|11[0-6])$"
6060
- enum: [ sdc1_clk, sdc1_cmd, sdc1_data, sdc2_clk, sdc2_cmd, sdc2_data ]
6161
minItems: 1
6262
maxItems: 36

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ $defs:
6363
subnode.
6464
items:
6565
oneOf:
66-
- pattern: "^gpio([0-9]|[1-9][0-9]|10[0-9]|11[0-7])$"
66+
- pattern: "^gpio([0-9]|[1-9][0-9]|10[0-9]|11[0-2])$"
6767
- enum: [ sdc1_clk, sdc1_cmd, sdc1_data, sdc2_clk, sdc2_cmd,
6868
sdc2_data, qdsd_clk, qdsd_cmd, qdsd_data0, qdsd_data1,
6969
qdsd_data2, qdsd_data3 ]
@@ -127,7 +127,7 @@ examples:
127127
interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
128128
gpio-controller;
129129
#gpio-cells = <2>;
130-
gpio-ranges = <&tlmm 0 0 117>;
130+
gpio-ranges = <&tlmm 0 0 113>;
131131
interrupt-controller;
132132
#interrupt-cells = <2>;
133133

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ $defs:
5353
subnode.
5454
items:
5555
oneOf:
56-
- pattern: "^gpio([0-9]|[1-9][0-9]|1[0-7][0-9])$"
56+
- pattern: "^gpio([0-9]|[1-9][0-9]|1[0-3][0-9]|14[01])$"
5757
- enum: [ sdc1_clk, sdc1_cmd, sdc1_data, sdc1_rclk, sdc2_clk,
5858
sdc2_cmd, sdc2_data, qdsd_clk, qdsd_cmd, qdsd_data0,
5959
qdsd_data1, qdsd_data2, qdsd_data3 ]

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ properties:
3434

3535
gpio-reserved-ranges:
3636
minItems: 1
37-
maxItems: 75
37+
maxItems: 73
3838

3939
gpio-line-names:
40-
maxItems: 150
40+
maxItems: 146
4141

4242
patternProperties:
4343
"-state$":
@@ -63,7 +63,7 @@ $defs:
6363
subnode.
6464
items:
6565
oneOf:
66-
- pattern: "^gpio([0-9]|[1-9][0-9]|1[0-4][0-9])$"
66+
- pattern: "^gpio([0-9]|[1-9][0-9]|1[0-3][0-9]|14[0-5])$"
6767
- enum: [ sdc1_clk, sdc1_cmd, sdc1_data, sdc1_rclk, sdc2_clk,
6868
sdc2_cmd, sdc2_data, sdc3_clk, sdc3_cmd, sdc3_data ]
6969
minItems: 1

Documentation/devicetree/bindings/pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ $defs:
5959
subnode.
6060
items:
6161
oneOf:
62-
- pattern: "^gpio([0-9]|[1-9][0-9])$"
62+
- pattern: "^gpio([0-9]|1[0-4])$"
6363
minItems: 1
6464
maxItems: 15
6565

Documentation/devicetree/bindings/pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ examples:
134134
clock-names = "core", "audio";
135135
gpio-controller;
136136
#gpio-cells = <2>;
137-
gpio-ranges = <&lpi_tlmm 0 0 18>;
137+
gpio-ranges = <&lpi_tlmm 0 0 19>;
138138
139139
dmic01-state {
140140
dmic01-clk-pins {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ $defs:
5555
List of gpio pins affected by the properties specified in this subnode.
5656
items:
5757
oneOf:
58-
- pattern: "^gpio([0-9]|[1-9][0-9]|1[0-1][0-6])$"
58+
- pattern: "^gpio([0-9]|[1-9][0-9]|10[0-7])$"
5959
- enum: [ sdc1_clk, sdc1_cmd, sdc1_data, sdc2_clk, sdc2_cmd, sdc2_data ]
6060
minItems: 1
6161
maxItems: 36

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ $defs:
6363
subnode.
6464
items:
6565
oneOf:
66-
- pattern: "^gpio([0-9]|[1-9][0-9]|1[0-4][0-9]|15[0-6])$"
66+
- pattern: "^gpio([0-9]|[1-9][0-9]|1[0-4][0-9]|15[0-5])$"
6767
- enum: [ ufs_reset, sdc1_clk, sdc1_cmd, sdc1_data, sdc2_clk,
6868
sdc2_cmd, sdc2_data ]
6969
minItems: 1
@@ -134,7 +134,7 @@ examples:
134134
#gpio-cells = <2>;
135135
interrupt-controller;
136136
#interrupt-cells = <2>;
137-
gpio-ranges = <&tlmm 0 0 157>;
137+
gpio-ranges = <&tlmm 0 0 157>; /* GPIOs + ufs_reset */
138138
139139
gpio-wo-subnode-state {
140140
pins = "gpio1";

Documentation/devicetree/bindings/pinctrl/qcom,sm8250-lpass-lpi-pinctrl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ $defs:
6464
subnode.
6565
items:
6666
oneOf:
67-
- pattern: "^gpio([0-9]|[1-9][0-9])$"
67+
- pattern: "^gpio([0-9]|1[0-3])$"
6868
minItems: 1
6969
maxItems: 14
7070

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,6 @@ examples:
131131
#gpio-cells = <2>;
132132
interrupt-controller;
133133
#interrupt-cells = <2>;
134-
gpio-ranges = <&tlmm 0 0 180>;
134+
gpio-ranges = <&tlmm 0 0 181>; /* GPIOs + ufs_reset */
135135
wakeup-parent = <&pdc>;
136136
};

0 commit comments

Comments
 (0)