diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-14 15:31:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-14 15:31:27 -0400 |
| commit | c6ed444fd6fffaaf2e3857d926ed18bf3df81e8e (patch) | |
| tree | 7812f504102796cfd0abbf2ba17d99c9267bd8b7 | |
| parent | 3860cae64c0a2c3faeca5de92d5f8e37fddd340c (diff) | |
| parent | c2944a9a09a21b917fa86858f078e77115ca9d22 (diff) | |
Merge tag 'pinctrl-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pin control updates from Linus Walleij:
"This is the bulk of pin control changes for v4.19:
Core changes:
- Augment pinctrl_generic_add_group() and pinmux_generic_add_function()
to return the selector for the added group/function to the caller
and augment (hopefully) all drivers to handle this
New subdrivers:
- Qualcomm PM8998 and PM8005 are supported in the SPMI pin control
and GPIO driver
- Intel Ice Lake PCH (platform controller hub) support
- NXP (ex Freescale) i.MX8MQ support
- Berlin AS370 support
Improvements to drivers:
- Support interrupts on the Ocelot pin controller
- Add SPI pins to the Uniphier driver
- Define a GPIO compatible per SoC in the Tegra driver
- Push Tegra initialization down in the initlevels
- Support external wakeup interrupts on the Exynos
- Add generic clocks pins to the meson driver
- Add USB and HSCIF pins for some Renesas PFC chips
- Suspend/resume support in the armada-37xx
- Interrupt support for the Actions Semiconductor S900 also known as
"owl"
- Correct the pin ordering in Cedarfork
- Debugfs output for INTF in the mcp23s08 driver
- Avoid divisions in context save/restore in pinctrl-single
The rest is minor bug fixes or cleanups"
* tag 'pinctrl-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (69 commits)
pinctrl: nomadik: silence uninitialized variable warning
pinctrl: axp209: Fix NULL pointer dereference after allocation
pinctrl: samsung: Remove duplicated "wakeup" in printk
pinctrl: ocelot: add support for interrupt controller
pinctrl: intel: Don't shadow error code of gpiochip_lock_as_irq()
pinctrl: berlin: fix 'pctrl->functions' allocation in berlin_pinctrl_build_state
gpio: tegra: Move driver registration to subsys_init level
pinctrl: tegra: Move drivers registration to arch_init level
pinctrl: baytrail: actually print the apparently misconfigured pin
MAINTAINERS: Replace Heikki as maintainer of Intel pinctrl
pinctrl: freescale: off by one in imx1_pinconf_group_dbg_show()
pinctrl: uniphier: add spi pin-mux settings
pinctrl: cannonlake: Fix community ordering for H variant
pinctrl: tegra: define GPIO compatible node per SoC
pinctrl: intel: Do pin translation when lock IRQ
pinctrl: imx: off by one in imx_pinconf_group_dbg_show()
pinctrl: mediatek: include chained_irq.h header
pinctrl/amd: only handle irq if it is pending and unmasked
pinctrl/amd: fix gpio irq level in debugfs
pinctrl: stm32: add syscfg mask parameter
...
99 files changed, 2936 insertions, 302 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/actions,s900-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/actions,s900-pinctrl.txt index 8fb5a53775e8..81b58dddd3ed 100644 --- a/Documentation/devicetree/bindings/pinctrl/actions,s900-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/actions,s900-pinctrl.txt | |||
| @@ -19,6 +19,10 @@ Required Properties: | |||
| 19 | defines the interrupt number, the second encodes | 19 | defines the interrupt number, the second encodes |
| 20 | the trigger flags described in | 20 | the trigger flags described in |
| 21 | bindings/interrupt-controller/interrupts.txt | 21 | bindings/interrupt-controller/interrupts.txt |
| 22 | - interrupts: The interrupt outputs from the controller. There is one GPIO | ||
| 23 | interrupt per GPIO bank. The number of interrupts listed depends | ||
| 24 | on the number of GPIO banks on the SoC. The interrupts must be | ||
| 25 | ordered by bank, starting with bank 0. | ||
| 22 | 26 | ||
| 23 | Please refer to pinctrl-bindings.txt in this directory for details of the | 27 | Please refer to pinctrl-bindings.txt in this directory for details of the |
| 24 | common pinctrl bindings used by client devices, including the meaning of the | 28 | common pinctrl bindings used by client devices, including the meaning of the |
| @@ -180,6 +184,12 @@ Example: | |||
| 180 | #gpio-cells = <2>; | 184 | #gpio-cells = <2>; |
| 181 | interrupt-controller; | 185 | interrupt-controller; |
| 182 | #interrupt-cells = <2>; | 186 | #interrupt-cells = <2>; |
| 187 | interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>, | ||
| 188 | <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>, | ||
| 189 | <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>, | ||
| 190 | <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>, | ||
| 191 | <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>, | ||
| 192 | <GIC_SPI 16 | ||
