forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'pinctrl-v5.19-1' of git://git.kernel.org/pub/scm/linux/ker…
…nel/git/linusw/linux-pinctrl
Pull pin control updates from Linus Walleij:
"Pretty big this time. Mostly due to (nice) Renesas refactorings.
Core changes:
- New helpers from Andy such as for_each_gpiochip_node() affecting
both GPIO and pin control, improving a bunch of drivers in the
process.
- Pulled in Marc Zyngiers work to make IRQ chips immutable, and
started to apply fixups on top.
New drivers:
- New driver for Marvell MVEBU 98DX2530.
- New driver for Mediatek MT8195.
- Support Qualcomm PMX65 and PM6125.
- New driver for Qualcomm SC7280 LPASS pin control.
- New driver for Rockchip RK3588.
- New driver for NXP Freescale i.MXRT1170.
- New driver for Mediatek MT6795 Helio X10.
Improvements:
- Several Aspeed G6 cleanups and non-critical fixes.
- Thorought refactoring of some of the ever improving Renesas
drivers.
- Clean up Mediatek MT8192 bindings a bit.
- PWM output and clock monitoring in the Ocelot LAN966x driver.
- Thorough refactoring and cleanup of the Ralink drivers such as
RT2880, RT3883, RT305X, MT7620, MT7621, MT7628 splitting these into
proper sub-drivers"
* tag 'pinctrl-v5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (161 commits)
pinctrl: apple: Use a raw spinlock for the regmap
pinctrl: berlin: bg4ct: Use devm_platform_*ioremap_resource() APIs
pinctrl: intel: Fix kernel doc format, i.e. add return sections
dt-bindings: pinctrl: qcom: Drop 'maxItems' on 'wakeup-parent'
pinctrl: starfive: Make the irqchip immutable
pinctrl: mediatek: Add pinctrl driver for MT6795 Helio X10
dt-bindings: pinctrl: Add MediaTek MT6795 pinctrl bindings
pinctrl: freescale: Add i.MXRT1170 pinctrl driver support
dt-bindings: pinctrl: add i.MXRT1170 pinctrl Documentation
dt-bindings: pinctrl: rockchip: increase max amount of device functions
dt-bindings: pinctrl: qcom,pmic-gpio: add 'gpio-reserved-ranges'
dt-bindings: pinctrl: qcom,pmic-gpio: add 'input-disable'
dt-bindings: pinctrl: qcom,pmic-gpio: describe gpio-line-names
dt-bindings: pinctrl: qcom,pmic-gpio: fix matching pin config
dt-bindings: pinctrl: qcom,pmic-gpio: document PM8150L and PMM8155AU
pinctrl: qcom: spmi-gpio: Add pm6125 compatible
dt-bindings: pinctrl: qcom-pmic-gpio: Add pm6125 compatible
pinctrl: intel: Drop unused irqchip member in struct intel_pinctrl
pinctrl: intel: make irq_chip immutable
pinctrl: cherryview: Use GPIO chip pointer in chv_gpio_irq_mask_unmask()
...- Loading branch information
Showing
129 changed files
with
9,115 additions
and
4,211 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 0 additions & 87 deletions
87
Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt
This file was deleted.
Oops, something went wrong.
113 changes: 113 additions & 0 deletions
113
Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| # SPDX-License-Identifier: GPL-2.0 | ||
| %YAML 1.2 | ||
| --- | ||
| $id: http://devicetree.org/schemas/pinctrl/fsl,imx7d-pinctrl.yaml# | ||
| $schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
|
||
| title: Freescale IMX7D IOMUX Controller | ||
|
|
||
| maintainers: | ||
| - Dong Aisheng <aisheng.dong@nxp.com> | ||
|
|
||
| description: | ||
| Please refer to fsl,imx-pinctrl.txt and pinctrl-bindings.txt in this directory | ||
| for common binding part and usage. | ||
|
|
||
| properties: | ||
| compatible: | ||
| oneOf: | ||
| - enum: | ||
| - fsl,imx7d-iomuxc | ||
| - fsl,imx7d-iomuxc-lpsr | ||
|
|
||
| reg: | ||
| maxItems: 1 | ||
|
|
||
| fsl,input-sel: | ||
| description: | ||
| phandle for main iomuxc controller which shares the input select | ||
| register for daisy chain settings. | ||
| $ref: /schemas/types.yaml#/definitions/phandle | ||
|
|
||
| # Client device subnode's properties | ||
| patternProperties: | ||
| 'grp$': | ||
| type: object | ||
| description: | ||
| Pinctrl node's client devices use subnodes for desired pin configuration. | ||
| Client device subnodes use below standard properties. | ||
|
|
||
| properties: | ||
| fsl,pins: | ||
| description: | ||
| each entry consists of 6 integers and represents the mux and config | ||
| setting for one pin. The first 5 integers <mux_reg conf_reg input_reg | ||
| mux_val input_val> are specified using a PIN_FUNC_ID macro, which can | ||
| be found in <arch/arm/boot/dts/imx7d-pinfunc.h>. The last integer | ||
| CONFIG is the pad setting value like pull-up on this pin. Please | ||
| refer to i.MX7D Reference Manual for detailed CONFIG settings. | ||
| $ref: /schemas/types.yaml#/definitions/uint32-matrix | ||
| items: | ||
| items: | ||
| - description: | | ||
| "mux_reg" indicates the offset of mux register. | ||
| - description: | | ||
| "conf_reg" indicates the offset of pad configuration register. | ||
| - description: | | ||
| "input_reg" indicates the offset of select input register. | ||
| - description: | | ||
| "mux_val" indicates the mux value to be applied. | ||
| - description: | | ||
| "input_val" indicates the select input value to be applied. | ||
| - description: | | ||
| "pad_setting" indicates the pad configuration value to be applied. | ||
| required: | ||
| - fsl,pins | ||
|
|
||
| additionalProperties: false | ||
|
|
||
| allOf: | ||
| - $ref: "pinctrl.yaml#" | ||
|
|
||
| required: | ||
| - compatible | ||
| - reg | ||
|
|
||
| if: | ||
| properties: | ||
| compatible: | ||
| contains: | ||
| enum: | ||
| - fsl,imx7d-iomuxc-lpsr | ||
|
|
||
| then: | ||
| required: | ||
| - fsl,input-sel | ||
|
|
||
| additionalProperties: false | ||
|
|
||
| examples: | ||
| - | | ||
| iomuxc: pinctrl@30330000 { | ||
| compatible = "fsl,imx7d-iomuxc"; | ||
| reg = <0x30330000 0x10000>; | ||
| pinctrl_uart5: uart5grp { | ||
| fsl,pins = | ||
| <0x0160 0x03D0 0x0714 0x1 0x0 0x7e>, | ||
| <0x0164 0x03D4 0x0000 0x1 0x0 0x76>; | ||
| }; | ||
| }; | ||
| - | | ||
| iomuxc_lpsr: pinctrl@302c0000 { | ||
| compatible = "fsl,imx7d-iomuxc-lpsr"; | ||
| reg = <0x302c0000 0x10000>; | ||
| fsl,input-sel = <&iomuxc>; | ||
| pinctrl_gpio_lpsr: gpio1-grp { | ||
| fsl,pins = | ||
| <0x0008 0x0038 0x0000 0x0 0x0 0x59>, | ||
| <0x000C 0x003C 0x0000 0x0 0x0 0x59>; | ||
| }; | ||
| }; |
77 changes: 77 additions & 0 deletions
77
Documentation/devicetree/bindings/pinctrl/fsl,imxrt1170.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
| %YAML 1.2 | ||
| --- | ||
| $id: http://devicetree.org/schemas/pinctrl/fsl,imxrt1170.yaml# | ||
| $schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
|
||
| title: Freescale i.MXRT1170 IOMUX Controller | ||
|
|
||
| maintainers: | ||
| - Giulio Benetti <giulio.benetti@benettiengineering.com> | ||
| - Jesse Taube <Mr.Bossman075@gmail.com> | ||
|
|
||
| description: | ||
| Please refer to fsl,imx-pinctrl.txt and pinctrl-bindings.txt in this directory | ||
| for common binding part and usage. | ||
|
|
||
| properties: | ||
| compatible: | ||
| const: fsl,imxrt1170-iomuxc | ||
|
|
||
| reg: | ||
| maxItems: 1 | ||
|
|
||
| # Client device subnode's properties | ||
| patternProperties: | ||
| 'grp$': | ||
| type: object | ||
| description: | ||
| Pinctrl node's client devices use subnodes for desired pin configuration. | ||
| Client device subnodes use below standard properties. | ||
|
|
||
| properties: | ||
| fsl,pins: | ||
| description: | ||
| each entry consists of 6 integers and represents the mux and config | ||
| setting for one pin. The first 5 integers <mux_reg conf_reg input_reg | ||
| mux_val input_val> are specified using a PIN_FUNC_ID macro, which can | ||
| be found in <arch/arm/boot/dts/imxrt1170-pinfunc.h>. The last | ||
| integer CONFIG is the pad setting value like pull-up on this pin. Please | ||
| refer to i.MXRT1170 Reference Manual for detailed CONFIG settings. | ||
| $ref: /schemas/types.yaml#/definitions/uint32-matrix | ||
| items: | ||
| items: | ||
| - description: | | ||
| "mux_reg" indicates the offset of mux register. | ||
| - description: | | ||
| "conf_reg" indicates the offset of pad configuration register. | ||
| - description: | | ||
| "input_reg" indicates the offset of select input register. | ||
| - description: | | ||
| "mux_val" indicates the mux value to be applied. | ||
| - description: | | ||
| "input_val" indicates the select input value to be applied. | ||
| - description: | | ||
| "pad_setting" indicates the pad configuration value to be applied. | ||
| required: | ||
| - fsl,pins | ||
|
|
||
| additionalProperties: false | ||
|
|
||
| required: | ||
| - compatible | ||
| - reg | ||
|
|
||
| additionalProperties: false | ||
|
|
||
| examples: | ||
| - | | ||
| iomuxc: iomuxc@400e8000 { | ||
| compatible = "fsl,imxrt1170-iomuxc"; | ||
| reg = <0x400e8000 0x4000>; | ||
| pinctrl_lpuart1: lpuart1grp { | ||
| fsl,pins = | ||
| <0x16C 0x3B0 0x620 0x0 0x0 0xf1>, | ||
| <0x170 0x3B4 0x61C 0x0 0x0 0xf1>; | ||
| }; | ||
| }; |
Oops, something went wrong.