| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| From: Todd Kjos <tkjos@google.com> |
| Date: Tue, 17 Sep 2019 16:19:15 -0700 |
| Subject: ANDROID: init: GKI: enable hidden configs for GPIO |
| |
| Add hidden configs to GKI_HACKS_TO_FIX so they are |
| enabled for loadable GPIO modules built out-of-tree |
| |
| Bug: 141266428 |
| Change-Id: Ie6e79921df67e86783f04cb869604c988656a034 |
| Signed-off-by: Todd Kjos <tkjos@google.com> |
| --- |
| init/Kconfig.gki | 10 ++++++++++ |
| 1 file changed, 10 insertions(+) |
| |
| diff --git a/init/Kconfig.gki b/init/Kconfig.gki |
| index bbd5fac69355..5df8c67123ef 100644 |
| --- a/init/Kconfig.gki |
| +++ b/init/Kconfig.gki |
| @@ -25,6 +25,15 @@ config GKI_HIDDEN_SND_SOC_CONFIGS |
| These are normally selected implicitely when a module |
| that relies on it is configured. |
| |
| +config GKI_HIDDEN_GPIO_CONFIGS |
| + bool "Hidden GPIO configs needed for GKI" |
| + select PINCTRL_SINGLE if (PINCTRL && OF && HAS_IOMEM) |
| + select GPIO_PL061 if (HAS_IOMEM && ARM_AMBA && GPIOLIB) |
| + help |
| + Dummy config option used to enable hidden GPIO configs. |
| + These are normally selected implicitely when a module |
| + that relies on it is configured. |
| + |
| # Atrocities needed for |
| # a) building GKI modules in separate tree, or |
| # b) building drivers that are not modularizable |
| @@ -37,6 +46,7 @@ config GKI_HACKS_TO_FIX |
| select GKI_HIDDEN_DRM_CONFIGS |
| select GKI_HIDDEN_REGMAP_CONFIGS |
| select GKI_HIDDEN_SND_SOC_CONFIGS |
| + select GKI_HIDDEN_GPIO_CONFIGS |
| help |
| Dummy config option used to enable core functionality used by |
| modules that may not be selectable in this config. |
