Merge tag 'pinctrl-v4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[sfrench/cifs-2.6.git] / arch / blackfin / Kconfig

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index af5369422032b1b81d2304ca0dd5e3abd39ae924..d9c2866ba618cedee6676e63bdd194bc244621fd 100644 (file)
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -321,11 +321,14 @@ config BF53x
 
 config GPIO_ADI
        def_bool y
+       depends on !PINCTRL
        depends on (BF51x || BF52x || BF53x || BF538 || BF539 || BF561)
 
-config PINCTRL
+config PINCTRL_BLACKFIN_ADI2
        def_bool y
-       depends on BF54x || BF60x
+       depends on (BF54x || BF60x)
+       select PINCTRL
+       select PINCTRL_ADI2
 
 config MEM_MT48LC64M4A2FB_7E
        bool