diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2020-01-17 08:59:29 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2020-01-17 08:59:29 +0100 |
| commit | 6a77de2596a8d02cbfe9cebe448d8575e4354c9a (patch) | |
| tree | 13e7621c147ef1415195213089ce3c2c94590bde /drivers/gpio/Kconfig | |
| parent | 59c324683400b41caa6d85b091e812ee3d5415c3 (diff) | |
| parent | b3a987b0264d3ddbb24293ebff10eddfc472f653 (diff) | |
| download | linux-6a77de2596a8d02cbfe9cebe448d8575e4354c9a.tar.gz linux-6a77de2596a8d02cbfe9cebe448d8575e4354c9a.tar.bz2 linux-6a77de2596a8d02cbfe9cebe448d8575e4354c9a.zip | |
Merge tag 'v5.5-rc6' into devel
Linux 5.5-rc6
Diffstat (limited to 'drivers/gpio/Kconfig')
| -rw-r--r-- | drivers/gpio/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index e8ca679ae1bb..d917f13c7727 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -559,8 +559,8 @@ config GPIO_TEGRA config GPIO_TEGRA186 tristate "NVIDIA Tegra186 GPIO support" - default ARCH_TEGRA_186_SOC - depends on ARCH_TEGRA_186_SOC || COMPILE_TEST + default ARCH_TEGRA_186_SOC || ARCH_TEGRA_194_SOC + depends on ARCH_TEGRA_186_SOC || ARCH_TEGRA_194_SOC || COMPILE_TEST depends on OF_GPIO select GPIOLIB_IRQCHIP select IRQ_DOMAIN_HIERARCHY @@ -1161,6 +1161,7 @@ config GPIO_MADERA config GPIO_MAX77620 tristate "GPIO support for PMIC MAX77620 and MAX20024" depends on MFD_MAX77620 + select GPIOLIB_IRQCHIP help GPIO driver for MAX77620 and MAX20024 PMIC from Maxim Semiconductor. MAX77620 PMIC has 8 pins that can be configured as GPIOs. The |