Commit 1ec033f0 authored by Linus Walleij's avatar Linus Walleij

Merge tag 'qcom-pinctrl-6.3-2' of...

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.
parents 6c83b2d9 315dffb8
...@@ -56,7 +56,7 @@ $defs: ...@@ -56,7 +56,7 @@ $defs:
subnode. subnode.
items: items:
oneOf: oneOf:
- pattern: "^gpio([0-9]|[1-9][0-9]|1[0-1][0-6])$" - pattern: "^gpio([0-9]|[1-9][0-9]|10[0-9]|11[0-6])$"
- enum: [ sdc1_clk, sdc1_cmd, sdc1_data, sdc2_clk, sdc2_cmd, sdc2_data ] - enum: [ sdc1_clk, sdc1_cmd, sdc1_data, sdc2_clk, sdc2_cmd, sdc2_data ]
minItems: 1 minItems: 1
maxItems: 36 maxItems: 36
......
...@@ -63,7 +63,7 @@ $defs: ...@@ -63,7 +63,7 @@ $defs:
subnode. subnode.
items: items:
oneOf: oneOf:
- pattern: "^gpio([0-9]|[1-9][0-9]|10[0-9]|11[0-7])$" - pattern: "^gpio([0-9]|[1-9][0-9]|10[0-9]|11[0-2])$"
- enum: [ sdc1_clk, sdc1_cmd, sdc1_data, sdc2_clk, sdc2_cmd, - enum: [ sdc1_clk, sdc1_cmd, sdc1_data, sdc2_clk, sdc2_cmd,
sdc2_data, qdsd_clk, qdsd_cmd, qdsd_data0, qdsd_data1, sdc2_data, qdsd_clk, qdsd_cmd, qdsd_data0, qdsd_data1,
qdsd_data2, qdsd_data3 ] qdsd_data2, qdsd_data3 ]
...@@ -127,7 +127,7 @@ examples: ...@@ -127,7 +127,7 @@ examples:
interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-ranges = <&tlmm 0 0 117>; gpio-ranges = <&tlmm 0 0 113>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
......
...@@ -53,7 +53,7 @@ $defs: ...@@ -53,7 +53,7 @@ $defs:
subnode. subnode.
items: items:
oneOf: oneOf:
- pattern: "^gpio([0-9]|[1-9][0-9]|1[0-7][0-9])$" - pattern: "^gpio([0-9]|[1-9][0-9]|1[0-3][0-9]|14[01])$"
- enum: [ sdc1_clk, sdc1_cmd, sdc1_data, sdc1_rclk, sdc2_clk, - enum: [ sdc1_clk, sdc1_cmd, sdc1_data, sdc1_rclk, sdc2_clk,
sdc2_cmd, sdc2_data, qdsd_clk, qdsd_cmd, qdsd_data0, sdc2_cmd, sdc2_data, qdsd_clk, qdsd_cmd, qdsd_data0,
qdsd_data1, qdsd_data2, qdsd_data3 ] qdsd_data1, qdsd_data2, qdsd_data3 ]
......
...@@ -34,10 +34,10 @@ properties: ...@@ -34,10 +34,10 @@ properties:
gpio-reserved-ranges: gpio-reserved-ranges:
minItems: 1 minItems: 1
maxItems: 75 maxItems: 73
gpio-line-names: gpio-line-names:
maxItems: 150 maxItems: 146
patternProperties: patternProperties:
"-state$": "-state$":
...@@ -63,7 +63,7 @@ $defs: ...@@ -63,7 +63,7 @@ $defs:
subnode. subnode.
items: items:
oneOf: oneOf:
- pattern: "^gpio([0-9]|[1-9][0-9]|1[0-4][0-9])$" - pattern: "^gpio([0-9]|[1-9][0-9]|1[0-3][0-9]|14[0-5])$"
- enum: [ sdc1_clk, sdc1_cmd, sdc1_data, sdc1_rclk, sdc2_clk, - enum: [ sdc1_clk, sdc1_cmd, sdc1_data, sdc1_rclk, sdc2_clk,
sdc2_cmd, sdc2_data, sdc3_clk, sdc3_cmd, sdc3_data ] sdc2_cmd, sdc2_data, sdc3_clk, sdc3_cmd, sdc3_data ]
minItems: 1 minItems: 1
......
...@@ -59,7 +59,7 @@ $defs: ...@@ -59,7 +59,7 @@ $defs:
subnode. subnode.
items: items:
oneOf: oneOf:
- pattern: "^gpio([0-9]|[1-9][0-9])$" - pattern: "^gpio([0-9]|1[0-4])$"
minItems: 1 minItems: 1
maxItems: 15 maxItems: 15
......
...@@ -134,7 +134,7 @@ examples: ...@@ -134,7 +134,7 @@ examples:
clock-names = "core", "audio"; clock-names = "core", "audio";
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-ranges = <&lpi_tlmm 0 0 18>; gpio-ranges = <&lpi_tlmm 0 0 19>;
dmic01-state { dmic01-state {
dmic01-clk-pins { dmic01-clk-pins {
......
...@@ -55,7 +55,7 @@ $defs: ...@@ -55,7 +55,7 @@ $defs:
List of gpio pins affected by the properties specified in this subnode. List of gpio pins affected by the properties specified in this subnode.
items: items:
oneOf: oneOf:
- pattern: "^gpio([0-9]|[1-9][0-9]|1[0-1][0-6])$" - pattern: "^gpio([0-9]|[1-9][0-9]|10[0-7])$"
- enum: [ sdc1_clk, sdc1_cmd, sdc1_data, sdc2_clk, sdc2_cmd, sdc2_data ] - enum: [ sdc1_clk, sdc1_cmd, sdc1_data, sdc2_clk, sdc2_cmd, sdc2_data ]
minItems: 1 minItems: 1
maxItems: 36 maxItems: 36
......
...@@ -63,7 +63,7 @@ $defs: ...@@ -63,7 +63,7 @@ $defs:
subnode. subnode.
items: items:
oneOf: oneOf:
- pattern: "^gpio([0-9]|[1-9][0-9]|1[0-4][0-9]|15[0-6])$" - pattern: "^gpio([0-9]|[1-9][0-9]|1[0-4][0-9]|15[0-5])$"
- enum: [ ufs_reset, sdc1_clk, sdc1_cmd, sdc1_data, sdc2_clk, - enum: [ ufs_reset, sdc1_clk, sdc1_cmd, sdc1_data, sdc2_clk,
sdc2_cmd, sdc2_data ] sdc2_cmd, sdc2_data ]
minItems: 1 minItems: 1
...@@ -134,7 +134,7 @@ examples: ...@@ -134,7 +134,7 @@ examples:
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
gpio-ranges = <&tlmm 0 0 157>; gpio-ranges = <&tlmm 0 0 157>; /* GPIOs + ufs_reset */
gpio-wo-subnode-state { gpio-wo-subnode-state {
pins = "gpio1"; pins = "gpio1";
......
...@@ -64,7 +64,7 @@ $defs: ...@@ -64,7 +64,7 @@ $defs:
subnode. subnode.
items: items:
oneOf: oneOf:
- pattern: "^gpio([0-9]|[1-9][0-9])$" - pattern: "^gpio([0-9]|1[0-3])$"
minItems: 1 minItems: 1
maxItems: 14 maxItems: 14
......
...@@ -131,6 +131,6 @@ examples: ...@@ -131,6 +131,6 @@ examples:
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
gpio-ranges = <&tlmm 0 0 180>; gpio-ranges = <&tlmm 0 0 181>; /* GPIOs + ufs_reset */
wakeup-parent = <&pdc>; wakeup-parent = <&pdc>;
}; };
...@@ -109,6 +109,7 @@ $defs: ...@@ -109,6 +109,7 @@ $defs:
bias-pull-down: true bias-pull-down: true
bias-pull-up: true bias-pull-up: true
drive-strength: true drive-strength: true
input-disable: true
input-enable: true input-enable: true
output-high: true output-high: true
output-low: true output-low: true
...@@ -129,7 +130,7 @@ examples: ...@@ -129,7 +130,7 @@ examples:
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
gpio-ranges = <&tlmm 0 0 203>; gpio-ranges = <&tlmm 0 0 204>; /* GPIOs + ufs_reset */
gpio-wo-subnode-state { gpio-wo-subnode-state {
pins = "gpio1"; pins = "gpio1";
......
...@@ -65,7 +65,7 @@ $defs: ...@@ -65,7 +65,7 @@ $defs:
List of gpio pins affected by the properties specified in this List of gpio pins affected by the properties specified in this
subnode. subnode.
items: items:
pattern: "^gpio([0-9]|[1-2][0-9])$" pattern: "^gpio([0-9]|1[0-9]|2[0-2])$"
function: function:
enum: [ swr_tx_clk, swr_tx_data, swr_rx_clk, swr_rx_data, enum: [ swr_tx_clk, swr_tx_data, swr_rx_clk, swr_rx_data,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment