Skip to content

Commit d5176cd

Browse files
committed
Merge tag 'pinctrl-v6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pin control updates from Linus Walleij: "Nothing special, notably a lot of new Qualcomm hardware is supported, a RISC-V reference SoC and then some cleanups both in code and device tree bindings. Core changes: - Add PINCTRL_PINFUNCTION() macro and use it in several drivers New drivers: - New driver for the StarFive JH7110 SoC "sys" and "aon" (always-on) pin controllers. (RISC-V.) - New subdriver for the Qualcomm QDU1000/QRU1000 SoC pin controller - New subdrivers for the Qualcomm SM8550 SoC and LPASS pin controllers - New subdriver for the Qualcomm SA8775P SoC pin controller - New subdriver for the Qualcomm IPQ5332 SoC pin controller - New (trivial) support for Qualcomm PM8550 and PMR735D PMIC pin control - New subdriver for the Mediatek MT7981 SoC pin controller Improvements: - Several cleanups and refactorings to the Intel drivers - Add 4KOhm bias support to the Intel driver - Use the NOIRQ_SYSTEM_SLEEP_PM_OPS for the AT91 driver - Support general purpose clocks in the Qualcomm MSM8226 SoC - Several conversions to use the new I2C .probe_new() call - Massive clean-up of the Qualcomm Device Tree YAML schemas - Add VIN[45] pins, groups and functions to the Renesas r8a77950 SoC driver" * tag 'pinctrl-v6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (118 commits) pinctrl: qcom: Add support for i2c specific pull feature pinctrl: starfive: Add StarFive JH7110 aon controller driver pinctrl: starfive: Add StarFive JH7110 sys controller driver dt-bindings: pinctrl: Add StarFive JH7110 aon pinctrl dt-bindings: pinctrl: Add StarFive JH7110 sys pinctrl pinctrl: add mt7981 pinctrl driver dt-bindings: pinctrl: add bindings for MT7981 SoC dt-bindings: pinctrl: rockchip,pinctrl: mark gpio sub nodes of pinctrl as deprecated pinctrl: qcom: Introduce IPQ5332 TLMM driver dt-bindings: pinctrl: qcom: add IPQ5332 pinctrl dt-bindings: pinctrl: qcom: lpass-lpi: correct GPIO name pattern pinctrl: qcom: pinctrl-sm8550-lpass-lpi: add SM8550 LPASS dt-bindings: pinctrl: qcom,sm8550-lpass-lpi-pinctrl: add SM8550 LPASS pinctrl: at91: use devm_kasprintf() to avoid potential leaks dt-bindings: pinctrl: qcom: correct gpio-ranges in examples dt-bindings: pinctrl: qcom,msm8994: correct number of GPIOs dt-bindings: pinctrl: qcom,sdx55: correct GPIO name pattern dt-bindings: pinctrl: qcom,msm8953: correct GPIO name pattern dt-bindings: pinctrl: qcom,sm6375: correct GPIO name pattern and example dt-bindings: pinctrl: qcom,msm8909: correct GPIO name pattern and example ...
2 parents 17bbc46 + 099f37a commit d5176cd

File tree

147 files changed

+12945
-1355
lines changed

Some content is hidden

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

147 files changed

+12945
-1355
lines changed

Documentation/devicetree/bindings/pinctrl/fsl,imx8mm-pinctrl.yaml renamed to Documentation/devicetree/bindings/pinctrl/fsl,imx8m-pinctrl.yaml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
# SPDX-License-Identifier: GPL-2.0
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/pinctrl/fsl,imx8mm-pinctrl.yaml#
4+
$id: http://devicetree.org/schemas/pinctrl/fsl,imx8m-pinctrl.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Freescale IMX8MM IOMUX Controller
7+
title: Freescale IMX8M IOMUX Controller
88

99
maintainers:
10-
- Anson Huang <Anson.Huang@nxp.com>
10+
- Peng Fan <peng.fan@nxp.com>
1111

1212
description:
1313
Please refer to fsl,imx-pinctrl.txt and pinctrl-bindings.txt in this directory
1414
for common binding part and usage.
1515

1616
properties:
1717
compatible:
18-
const: fsl,imx8mm-iomuxc
18+
enum:
19+
- fsl,imx8mm-iomuxc
20+
- fsl,imx8mn-iomuxc
21+
- fsl,imx8mp-iomuxc
22+
- fsl,imx8mq-iomuxc
1923

2024
reg:
2125
maxItems: 1
@@ -34,9 +38,10 @@ patternProperties:
3438
each entry consists of 6 integers and represents the mux and config
3539
setting for one pin. The first 5 integers <mux_reg conf_reg input_reg
3640
mux_val input_val> are specified using a PIN_FUNC_ID macro, which can
37-
be found in <arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h>. The last
38-
integer CONFIG is the pad setting value like pull-up on this pin. Please
39-
refer to i.MX8M Mini Reference Manual for detailed CONFIG settings.
41+
be found in <arch/arm64/boot/dts/freescale/imx8m[m,n,p,q]-pinfunc.h>.
42+
The last integer CONFIG is the pad setting value like pull-up on this
43+
pin. Please refer to i.MX8M Mini/Nano/Plus/Quad Reference Manual for
44+
detailed CONFIG settings.
4045
$ref: /schemas/types.yaml#/definitions/uint32-matrix
4146
items:
4247
items:
@@ -51,7 +56,8 @@ patternProperties:
5156
- description: |
5257
"input_val" indicates the select input value to be applied.
5358
- description: |
54-
"pad_setting" indicates the pad configuration value to be applied.
59+
"pad_setting" indicates the pad configuration value to be
60+
applied.
5561
5662
required:
5763
- fsl,pins

Documentation/devicetree/bindings/pinctrl/fsl,imx8mn-pinctrl.yaml

Lines changed: 0 additions & 84 deletions
This file was deleted.

Documentation/devicetree/bindings/pinctrl/fsl,imx8mp-pinctrl.yaml

Lines changed: 0 additions & 84 deletions
This file was deleted.

Documentation/devicetree/bindings/pinctrl/fsl,imx8mq-pinctrl.yaml

Lines changed: 0 additions & 84 deletions
This file was deleted.

Documentation/devicetree/bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ allOf:
7070
- $ref: "pinctrl.yaml#"
7171

7272
patternProperties:
73-
'-[0-9]+$':
73+
'pins$':
7474
type: object
7575
additionalProperties: false
7676
patternProperties:
77-
'pins':
77+
'(^pins|pins?$)':
7878
type: object
7979
additionalProperties: false
8080
description: |
@@ -158,23 +158,23 @@ examples:
158158
<GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
159159
<GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
160160
161-
i2c0_pins_a: i2c0-0 {
161+
i2c0_pins_a: i2c0-pins {
162162
pins1 {
163163
pinmux = <MT8135_PIN_100_SDA0__FUNC_SDA0>,
164164
<MT8135_PIN_101_SCL0__FUNC_SCL0>;
165165
bias-disable;
166166
};
167167
};
168168
169-
i2c1_pins_a: i2c1-0 {
169+
i2c1_pins_a: i2c1-pins {
170170
pins {
171171
pinmux = <MT8135_PIN_195_SDA1__FUNC_SDA1>,
172172
<MT8135_PIN_196_SCL1__FUNC_SCL1>;
173173
bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
174174
};
175175
};
176176
177-
i2c2_pins_a: i2c2-0 {
177+
i2c2_pins_a: i2c2-pins {
178178
pins1 {
179179
pinmux = <MT8135_PIN_193_SDA2__FUNC_SDA2>;
180180
bias-pull-down;
@@ -186,7 +186,7 @@ examples:
186186
};
187187
};
188188
189-
i2c3_pins_a: i2c3-0 {
189+
i2c3_pins_a: i2c3-pins {
190190
pins1 {
191191
pinmux = <MT8135_PIN_40_DAC_CLK__FUNC_GPIO40>,
192192
<MT8135_PIN_41_DAC_WS__FUNC_GPIO41>;

Documentation/devicetree/bindings/pinctrl/mediatek,mt7622-pinctrl.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ then:
6161
- "#interrupt-cells"
6262

6363
patternProperties:
64-
'-[0-9]+$':
64+
'-pins(-[a-z]+)?$':
6565
type: object
6666
additionalProperties: false
6767
patternProperties:
68-
'mux':
68+
'^mux(-|$)':
6969
type: object
7070
additionalProperties: false
7171
description: |
@@ -244,7 +244,7 @@ patternProperties:
244244
groups:
245245
enum: [wf0_2g, wf0_5g]
246246

247-
'conf':
247+
'^conf(-|$)':
248248
type: object
249249
additionalProperties: false
250250
description: |
@@ -348,7 +348,7 @@ examples:
348348
gpio-controller;
349349
#gpio-cells = <2>;
350350
351-
pinctrl_eth_default: eth-0 {
351+
pinctrl_eth_default: eth-pins {
352352
mux-mdio {
353353
groups = "mdc_mdio";
354354
function = "eth";

0 commit comments

Comments
 (0)