Switching the default config logic of PINCTRL_EXYNOS to use "default y if ARCH_EXYNOS" versus having ARCH_EXYNOS directly select the config. This gives vendors the flexibility to disable the config or modularize it in the presence of a generic kernel. Verified this change doesn't effect the .config. Signed-off-by: Will McVicker <willmcvicker@xxxxxxxxxx> --- arch/arm64/Kconfig.platforms | 1 - drivers/pinctrl/samsung/Kconfig | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 6a006490c9b9..a884e5da8b0f 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -93,7 +93,6 @@ config ARCH_EXYNOS bool "ARMv8 based Samsung Exynos SoC family" select HAVE_S3C_RTC if RTC_CLASS select PINCTRL - select PINCTRL_EXYNOS select PM_GENERIC_DOMAINS if PM help This enables support for ARMv8 based Samsung Exynos SoC family. diff --git a/drivers/pinctrl/samsung/Kconfig b/drivers/pinctrl/samsung/Kconfig index dfd805e76862..483acb8ac1f6 100644 --- a/drivers/pinctrl/samsung/Kconfig +++ b/drivers/pinctrl/samsung/Kconfig @@ -12,6 +12,7 @@ config PINCTRL_EXYNOS bool "Pinctrl common driver part for Samsung Exynos SoCs" depends on OF_GPIO depends on ARCH_EXYNOS || ARCH_S5PV210 || COMPILE_TEST + default y if ARCH_EXYNOS select PINCTRL_SAMSUNG select PINCTRL_EXYNOS_ARM if ARM && (ARCH_EXYNOS || ARCH_S5PV210) select PINCTRL_EXYNOS_ARM64 if ARM64 && ARCH_EXYNOS -- 2.33.0.464.g1972c5931b-goog