rtc: s3c: remove HAVE_S3C_RTC in favor of direct dependencies

The config HAVE_S3C_RTC is not really needed since we can simply just
add the dependencies directly to RTC_DRV_S3C. Also, one less config to
keep track of!

Signed-off-by: Will McVicker <willmcvicker@google.com>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20211013212256.3425889-1-willmcvicker@google.com
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index fc196421b2cedb5ecf92eaeff32bcd907a2399d8..5ed6b5de981e2b9106bafdb4e73d70f874365073 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -475,7 +475,6 @@ config ARCH_S3C24XX
        select GPIOLIB
        select GENERIC_IRQ_MULTI_HANDLER
        select HAVE_S3C2410_I2C if I2C
-       select HAVE_S3C_RTC if RTC_CLASS
        select NEED_MACH_IO_H
        select S3C2410_WATCHDOG
        select SAMSUNG_ATAGS

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 30f930e20599bdfaf70a40be4b48d799eabd05c8..dd1ae5571f43172aa328cd38dbfe91308bbf6011 100644 (file)
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -21,7 +21,6 @@ menuconfig ARCH_EXYNOS
        select HAVE_ARM_ARCH_TIMER if ARCH_EXYNOS5
        select HAVE_ARM_SCU if SMP
        select HAVE_S3C2410_I2C if I2C
-       select HAVE_S3C_RTC if RTC_CLASS
        select PINCTRL
        select PINCTRL_EXYNOS
        select PM_GENERIC_DOMAINS if PM

diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index d644b45bc29d05a1800f991921dc676ed7dfff4f..5a96099af9913c1ad59979ffe529c6d291760b03 100644 (file)
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -13,7 +13,6 @@ config ARCH_S5PV210
        select COMMON_CLK_SAMSUNG
        select GPIOLIB
        select HAVE_S3C2410_I2C if I2C
-       select HAVE_S3C_RTC if RTC_CLASS
        select PINCTRL
        select PINCTRL_EXYNOS
        select SOC_SAMSUNG

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 90c5cf4856e1604e40dd58abf8e3e712dc27da0c..d5f0f4cdf09381115a723472219709f65b8eeed0 100644 (file)
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -94,7 +94,6 @@ config ARCH_EXYNOS
        select COMMON_CLK_SAMSUNG
        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

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index e1bc5214494e23ede40dcadca5b5d2cbcebcfe35..7208eeb8459ac23299ea974e42329b4d15df688e 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -1404,16 +1404,10 @@ config RTC_DRV_OMAP
          This driver can also be built as a module, if so, module
          will be called rtc-omap.
 
-config HAVE_S3C_RTC
-       bool
-       help
-         This will include RTC support for Samsung SoCs. If
-         you want to include RTC support for any machine, kindly
-         select this in the respective mach-XXXX/Kconfig file.
-
 config RTC_DRV_S3C
        tristate "Samsung S3C series SoC RTC"
-       depends on ARCH_S3C64XX || HAVE_S3C_RTC || COMPILE_TEST
+       depends on ARCH_EXYNOS || ARCH_S3C64XX || ARCH_S3C24XX || ARCH_S5PV210 || \
+                  COMPILE_TEST
        help
          RTC (Realtime Clock) driver for the clock inbuilt into the
          Samsung S3C24XX series of SoCs. This can provide periodic