Skip to content

Commit ac875df

Browse files
committed
pinctrl: samsung: fix missing GPIOLIB on ARM64 Exynos config
The Samsung pinctrl drivers depend on OF_GPIO, which is part of GPIOLIB. ARMv7 Exynos platform selects GPIOLIB and Samsung pinctrl drivers. ARMv8 Exynos selects only the latter leading to possible wrong configuration on ARMv8 build: WARNING: unmet direct dependencies detected for PINCTRL_EXYNOS Depends on [n]: PINCTRL [=y] && OF_GPIO [=n] && (ARCH_EXYNOS [=y] || ARCH_S5PV210 || COMPILE_TEST [=y]) Selected by [y]: - ARCH_EXYNOS [=y] Always select the GPIOLIB from the Samsung pinctrl drivers to fix the issue. This requires removing of OF_GPIO dependency (to avoid recursive dependency), so add dependency on OF for COMPILE_TEST cases. Reported-by: Necip Fazil Yildiran <[email protected]> Fixes: eed6b3e ("arm64: Split out platform options to separate Kconfig") Cc: <[email protected]> Signed-off-by: Krzysztof Kozlowski <[email protected]> Reviewed-by: Arnd Bergmann <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent abb860a commit ac875df

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

arch/arm/mach-exynos/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ menuconfig ARCH_EXYNOS
1717
select EXYNOS_PMU
1818
select EXYNOS_SROM
1919
select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS
20-
select GPIOLIB
2120
select HAVE_ARM_ARCH_TIMER if ARCH_EXYNOS5
2221
select HAVE_ARM_SCU if SMP
2322
select PINCTRL

drivers/pinctrl/samsung/Kconfig

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
#
55
config PINCTRL_SAMSUNG
66
bool
7-
depends on OF_GPIO
7+
select GPIOLIB
88
select PINMUX
99
select PINCONF
1010

1111
config PINCTRL_EXYNOS
1212
bool "Pinctrl common driver part for Samsung Exynos SoCs"
13-
depends on OF_GPIO
14-
depends on ARCH_EXYNOS || ARCH_S5PV210 || COMPILE_TEST
13+
depends on ARCH_EXYNOS || ARCH_S5PV210 || (COMPILE_TEST && OF)
1514
select PINCTRL_SAMSUNG
1615
select PINCTRL_EXYNOS_ARM if ARM && (ARCH_EXYNOS || ARCH_S5PV210)
1716
select PINCTRL_EXYNOS_ARM64 if ARM64 && ARCH_EXYNOS
@@ -26,12 +25,10 @@ config PINCTRL_EXYNOS_ARM64
2625

2726
config PINCTRL_S3C24XX
2827
bool "Samsung S3C24XX SoC pinctrl driver"
29-
depends on OF_GPIO
30-
depends on ARCH_S3C24XX || COMPILE_TEST
28+
depends on ARCH_S3C24XX || (COMPILE_TEST && OF)
3129
select PINCTRL_SAMSUNG
3230

3331
config PINCTRL_S3C64XX
3432
bool "Samsung S3C64XX SoC pinctrl driver"
35-
depends on OF_GPIO
36-
depends on ARCH_S3C64XX || COMPILE_TEST
33+
depends on ARCH_S3C64XX || (COMPILE_TEST && OF)
3734
select PINCTRL_SAMSUNG

0 commit comments

Comments
 (0)