From: Bjorn Andersson Date: Sun, 15 Dec 2013 06:44:33 +0000 (-0800) Subject: pinctrl: msm: Update Kconfig for PINCTRL_MSM8X74 X-Git-Tag: v3.14-rc1~144^2~36 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=376f413a7d98f02e8253cf9dd44935a7545fcb62;p=linux.git pinctrl: msm: Update Kconfig for PINCTRL_MSM8X74 Add GPIOLIB and OF as dependencies for PINCTRL_MSM8X74, to fix build errors from i386-randconfig. Also add help text and make the entries tristate, while touching these entries. Cc: Stephen Boyd Signed-off-by: Bjorn Andersson [Rebased on top of pin control development branch] Signed-off-by: Linus Walleij --- diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index ad58e7efe1d5..5c35d0db59e2 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -204,15 +204,18 @@ config PINCTRL_IMX28 select PINCTRL_MXS config PINCTRL_MSM - bool + tristate select PINMUX select PINCONF select GENERIC_PINCONF config PINCTRL_MSM8X74 - bool "Qualcomm 8x74 pin controller driver" - depends on OF && OF_IRQ + tristate "Qualcomm 8x74 pin controller driver" + depends on GPIOLIB && OF && OF_IRQ select PINCTRL_MSM + help + This is the pinctrl, pinmux, pinconf and gpiolib driver for the + Qualcomm TLMM block found in the Qualcomm 8974 platform. config PINCTRL_NOMADIK bool "Nomadik pin controller driver"