Commit 9da134e2 authored by Linus Walleij's avatar Linus Walleij

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

Merge tag 'qcom-pinctrl-6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt into devel

Qualcomm pinctrl Devicetree bindings changes for v6.3

Set of cleanups and fixes for Qualcomm pin controller bindings, to match
existing DTS and correct the schema.
parents 91da7032 5b8c304c
...@@ -19,7 +19,9 @@ properties: ...@@ -19,7 +19,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -20,7 +20,9 @@ properties: ...@@ -20,7 +20,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -22,7 +22,9 @@ properties: ...@@ -22,7 +22,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -20,7 +20,9 @@ properties: ...@@ -20,7 +20,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
'#interrupt-cells': true '#interrupt-cells': true
gpio-controller: true gpio-controller: true
......
...@@ -20,7 +20,9 @@ properties: ...@@ -20,7 +20,9 @@ properties:
description: Specifies the base address and size of the TLMM register space description: Specifies the base address and size of the TLMM register space
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -20,7 +20,9 @@ properties: ...@@ -20,7 +20,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -22,7 +22,9 @@ properties: ...@@ -22,7 +22,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -20,7 +20,9 @@ properties: ...@@ -20,7 +20,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -19,7 +19,9 @@ properties: ...@@ -19,7 +19,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -20,7 +20,9 @@ properties: ...@@ -20,7 +20,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -20,7 +20,9 @@ properties: ...@@ -20,7 +20,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -20,7 +20,9 @@ properties: ...@@ -20,7 +20,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -22,7 +22,9 @@ properties: ...@@ -22,7 +22,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -20,7 +20,9 @@ properties: ...@@ -20,7 +20,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -20,7 +20,9 @@ properties: ...@@ -20,7 +20,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -74,7 +74,7 @@ patternProperties: ...@@ -74,7 +74,7 @@ patternProperties:
oneOf: oneOf:
- $ref: "#/$defs/qcom-pmic-mpp-state" - $ref: "#/$defs/qcom-pmic-mpp-state"
- patternProperties: - patternProperties:
"mpp": '-pins$':
$ref: "#/$defs/qcom-pmic-mpp-state" $ref: "#/$defs/qcom-pmic-mpp-state"
additionalProperties: false additionalProperties: false
...@@ -179,7 +179,7 @@ examples: ...@@ -179,7 +179,7 @@ examples:
}; };
default-state { default-state {
gpio-mpp { gpio-pins {
pins = "mpp1", "mpp2", "mpp3", "mpp4"; pins = "mpp1", "mpp2", "mpp3", "mpp4";
function = "digital"; function = "digital";
input-enable; input-enable;
......
...@@ -19,7 +19,9 @@ properties: ...@@ -19,7 +19,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -26,7 +26,9 @@ properties: ...@@ -26,7 +26,9 @@ properties:
- const: north - const: north
- const: east - const: east
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -26,7 +26,9 @@ properties: ...@@ -26,7 +26,9 @@ properties:
- const: north - const: north
- const: south - const: south
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -28,7 +28,9 @@ properties: ...@@ -28,7 +28,9 @@ properties:
- const: east - const: east
- const: south - const: south
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
'#interrupt-cells': true '#interrupt-cells': true
gpio-controller: true gpio-controller: true
......
...@@ -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-1]|1[0-8])$" pattern: "^gpio([0-9]|1[0-8])$"
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,
...@@ -94,14 +94,12 @@ $defs: ...@@ -94,14 +94,12 @@ $defs:
2: Lower Slew rate (slower edges) 2: Lower Slew rate (slower edges)
3: Reserved (No adjustments) 3: Reserved (No adjustments)
bias-bus-hold: true
bias-pull-down: true bias-pull-down: true
bias-pull-up: true bias-pull-up: true
bias-disable: true bias-disable: true
input-enable: true
output-high: true output-high: true
output-low: true output-low: true
required: required:
......
...@@ -22,7 +22,9 @@ properties: ...@@ -22,7 +22,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -31,7 +31,9 @@ properties: ...@@ -31,7 +31,9 @@ properties:
- const: center - const: center
- const: north - const: north
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -22,7 +22,9 @@ properties: ...@@ -22,7 +22,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -23,7 +23,9 @@ properties: ...@@ -23,7 +23,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
...@@ -48,6 +50,10 @@ patternProperties: ...@@ -48,6 +50,10 @@ patternProperties:
$ref: "#/$defs/qcom-sdm845-tlmm-state" $ref: "#/$defs/qcom-sdm845-tlmm-state"
additionalProperties: false additionalProperties: false
"-hog(-[0-9]+)?$":
required:
- gpio-hog
$defs: $defs:
qcom-sdm845-tlmm-state: qcom-sdm845-tlmm-state:
type: object type: object
...@@ -117,6 +123,7 @@ additionalProperties: false ...@@ -117,6 +123,7 @@ additionalProperties: false
examples: examples:
- | - |
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
pinctrl@3400000 { pinctrl@3400000 {
...@@ -130,6 +137,12 @@ examples: ...@@ -130,6 +137,12 @@ examples:
gpio-ranges = <&tlmm 0 0 151>; gpio-ranges = <&tlmm 0 0 151>;
wakeup-parent = <&pdc_intc>; wakeup-parent = <&pdc_intc>;
ap-suspend-l-hog {
gpio-hog;
gpios = <126 GPIO_ACTIVE_LOW>;
output-low;
};
cci0-default-state { cci0-default-state {
pins = "gpio17", "gpio18"; pins = "gpio17", "gpio18";
function = "cci_i2c"; function = "cci_i2c";
......
...@@ -20,7 +20,9 @@ properties: ...@@ -20,7 +20,9 @@ properties:
description: Specifies the base address and size of the TLMM register space description: Specifies the base address and size of the TLMM register space
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -19,7 +19,9 @@ properties: ...@@ -19,7 +19,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -26,7 +26,9 @@ properties: ...@@ -26,7 +26,9 @@ properties:
- const: south - const: south
- const: east - const: east
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -27,7 +27,9 @@ properties: ...@@ -27,7 +27,9 @@ properties:
- const: south - const: south
- const: east - const: east
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -22,11 +22,21 @@ properties: ...@@ -22,11 +22,21 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
minItems: 9
maxItems: 9
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
gpio-reserved-ranges: true
gpio-reserved-ranges:
minItems: 1
maxItems: 78
gpio-line-names:
maxItems: 156
"#gpio-cells": true "#gpio-cells": true
gpio-ranges: true gpio-ranges: true
wakeup-parent: true wakeup-parent: true
...@@ -61,7 +71,7 @@ $defs: ...@@ -61,7 +71,7 @@ $defs:
subnode. subnode.
items: items:
oneOf: oneOf:
- pattern: "^gpio([0-9]|[1-9][0-9]|1[0-4][0-9]|15[0-7])$" - pattern: "^gpio([0-9]|[1-9][0-9]|1[0-4][0-9]|15[0-5])$"
- 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
...@@ -118,7 +128,16 @@ examples: ...@@ -118,7 +128,16 @@ examples:
pinctrl@f100000 { pinctrl@f100000 {
compatible = "qcom,sm6350-tlmm"; compatible = "qcom,sm6350-tlmm";
reg = <0x0f100000 0x300000>; reg = <0x0f100000 0x300000>;
interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>;
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
......
...@@ -22,7 +22,9 @@ properties: ...@@ -22,7 +22,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -27,7 +27,9 @@ properties: ...@@ -27,7 +27,9 @@ properties:
- const: north - const: north
- const: south - const: south
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -25,7 +25,9 @@ properties: ...@@ -25,7 +25,9 @@ properties:
- const: south - const: south
- const: north - const: north
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -22,11 +22,20 @@ properties: ...@@ -22,11 +22,20 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
gpio-reserved-ranges: true
gpio-reserved-ranges:
minItems: 1
maxItems: 102
gpio-line-names:
maxItems: 203
"#gpio-cells": true "#gpio-cells": true
gpio-ranges: true gpio-ranges: true
wakeup-parent: true wakeup-parent: true
...@@ -61,7 +70,7 @@ $defs: ...@@ -61,7 +70,7 @@ $defs:
subnode. subnode.
items: items:
oneOf: oneOf:
- pattern: "^gpio([0-9]|[1-9][0-9]|1[0-9][0-9]|20[0-3])$" - pattern: "^gpio([0-9]|[1-9][0-9]|1[0-9][0-9]|20[0-2])$"
- 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
......
...@@ -22,7 +22,9 @@ properties: ...@@ -22,7 +22,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
interrupts: true interrupts:
maxItems: 1
interrupt-controller: true interrupt-controller: true
"#interrupt-cells": true "#interrupt-cells": true
gpio-controller: true gpio-controller: true
......
...@@ -16,8 +16,9 @@ description: ...@@ -16,8 +16,9 @@ description:
properties: properties:
interrupts: interrupts:
description: description:
Specifies the TLMM summary IRQ TLMM summary IRQ and dirconn interrupts.
maxItems: 1 minItems: 1
maxItems: 9
interrupt-controller: true interrupt-controller: true
......
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