diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-01-03 19:57:57 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-01-03 19:57:57 +0100 |
| commit | f274fffbc28849848fd48379dbc83f10e1019270 (patch) | |
| tree | 85b4af88bffa611ad553570d92ccf6cffd6f20f4 /arch/arm | |
| parent | Merge tag 'sound-6.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/t... (diff) | |
| parent | pinctrl: mcp23s08: Fix sleeping in atomic context due to regmap locking (diff) | |
| download | linux-f274fffbc28849848fd48379dbc83f10e1019270.tar.xz linux-f274fffbc28849848fd48379dbc83f10e1019270.zip | |
Merge tag 'pinctrl-v6.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pin control fixes from Linus Walleij:
- A small Kconfig fixup for the i.MX.
In principle this could come in from the SoC tree but the bug was
introduced from the pin control tree so let's fix it from here.
- Fix a sleep in atomic context in the MCP23xxx GPIO expander by
disabling the regmap locking and using explicit mutex locks.
* tag 'pinctrl-v6.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
pinctrl: mcp23s08: Fix sleeping in atomic context due to regmap locking
ARM: imx: Re-introduce the PINCTRL selection
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index e4fe059cd861..dc47b2312127 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -6,6 +6,7 @@ menuconfig ARCH_MXC select CLKSRC_IMX_GPT select GENERIC_IRQ_CHIP select GPIOLIB + select PINCTRL select PM_OPP if PM select SOC_BUS select SRAM |