Switch the default logic to enable SOC_SAMSUNG and it's sub-configs to be enabled by default via "default y if ARCH_EXYNOS" versus being selected by the ARCH_EXYNOS config directly. This allows vendors to disable these configs if they wish and provides additional flexibility to modularize them in the presence of a generic kernel. There are no .config differences with this change. The configs SOC_SAMSUNG, EXYNOS_CHIPID, EXYNOS_PM_DOMAINS, and EXYNOS_PMU still remain enabled by default. Signed-off-by: Will McVicker <willmcvicker@xxxxxxxxxx> --- arch/arm64/Kconfig.platforms | 4 ---- drivers/soc/samsung/Kconfig | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 3a66ed43088d..6a006490c9b9 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -91,14 +91,10 @@ config ARCH_BRCMSTB config ARCH_EXYNOS bool "ARMv8 based Samsung Exynos SoC family" - select EXYNOS_CHIPID - select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS - select EXYNOS_PMU select HAVE_S3C_RTC if RTC_CLASS select PINCTRL select PINCTRL_EXYNOS select PM_GENERIC_DOMAINS if PM - select SOC_SAMSUNG help This enables support for ARMv8 based Samsung Exynos SoC family. diff --git a/drivers/soc/samsung/Kconfig b/drivers/soc/samsung/Kconfig index 5745d7e5908e..9402c02bc9de 100644 --- a/drivers/soc/samsung/Kconfig +++ b/drivers/soc/samsung/Kconfig @@ -4,6 +4,7 @@ # menuconfig SOC_SAMSUNG bool "Samsung SoC driver support" if COMPILE_TEST + default y if ARCH_EXYNOS if SOC_SAMSUNG @@ -15,6 +16,7 @@ config EXYNOS_ASV_ARM config EXYNOS_CHIPID bool "Exynos ChipID controller and ASV driver" if COMPILE_TEST depends on ARCH_EXYNOS || COMPILE_TEST + default y if ARCH_EXYNOS select EXYNOS_ASV_ARM if ARM && ARCH_EXYNOS select MFD_SYSCON select SOC_BUS @@ -24,6 +26,7 @@ config EXYNOS_CHIPID config EXYNOS_PMU bool "Exynos PMU controller driver" if COMPILE_TEST depends on ARCH_EXYNOS || ((ARM || ARM64) && COMPILE_TEST) + default y if ARCH_EXYNOS select EXYNOS_PMU_ARM_DRIVERS if ARM && ARCH_EXYNOS # There is no need to enable these drivers for ARMv8 @@ -34,6 +37,7 @@ config EXYNOS_PMU_ARM_DRIVERS config EXYNOS_PM_DOMAINS bool "Exynos PM domains" if COMPILE_TEST depends on (ARCH_EXYNOS && PM_GENERIC_DOMAINS) || COMPILE_TEST + default y if (ARCH_EXYNOS && PM_GENERIC_DOMAINS) config SAMSUNG_PM_DEBUG bool "Samsung PM Suspend debug" -- 2.33.0.464.g1972c5931b-goog
