ARM: samsung: Remove HAVE_S3C2410_I2C and use direct dependencies

A separate Kconfig option HAVE_S3C2410_I2C for Samsung SoCs is not
really needed and the i2c-s3c24xx driver can depend on Samsung ARM
architectures instead. This also enables i2c-s3c2410 for arm64 Exynos
SoCs, which is required for example by Exynos850.

This is basically continuation of work made in following commits:
  - commit d96890fca9fd ("rtc: s3c: remove HAVE_S3C_RTC in favor of
    direct dependencies")
  - commit 7dd3cae90d85 ("ARM: samsung: remove HAVE_S3C2410_WATCHDOG and
    use direct dependencies")

Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Link: https://lore.kernel.org/r/20211121150558.21801-2-semen.protsenko@linaro.org
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f0f9e8bec83acfa6ca3108664f8f815e0715bd34..391f07c170962bda5e06906b5f32cb016bcb5fff 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -479,7 +479,6 @@ config ARCH_S3C24XX
        select GPIO_SAMSUNG
        select GPIOLIB
        select GENERIC_IRQ_MULTI_HANDLER
-       select HAVE_S3C2410_I2C if I2C
        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 dd1ae5571f43172aa328cd38dbfe91308bbf6011..f7d993628cb700f87b62108141da7658d03c17bf 100644 (file)
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -20,7 +20,6 @@ menuconfig ARCH_EXYNOS
        select GPIOLIB
        select HAVE_ARM_ARCH_TIMER if ARCH_EXYNOS5
        select HAVE_ARM_SCU if SMP
-       select HAVE_S3C2410_I2C if I2C
        select PINCTRL
        select PINCTRL_EXYNOS
        select PM_GENERIC_DOMAINS if PM

diff --git a/arch/arm/mach-s3c/Kconfig.s3c64xx b/arch/arm/mach-s3c/Kconfig.s3c64xx
index f3fcb570edf561006278c37fa69ebed31e4abbb8..af01675d8769bdc124f469efc574231180da7a1d 100644 (file)
--- a/arch/arm/mach-s3c/Kconfig.s3c64xx
+++ b/arch/arm/mach-s3c/Kconfig.s3c64xx
@@ -12,7 +12,6 @@ menuconfig ARCH_S3C64XX
        select COMMON_CLK_SAMSUNG
        select GPIO_SAMSUNG if ATAGS
        select GPIOLIB
-       select HAVE_S3C2410_I2C if I2C
        select HAVE_TCM
        select PLAT_SAMSUNG
        select PM_GENERIC_DOMAINS if PM

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

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index dce3928390176470e3b47c7b67e377b43eb158eb..c6b854a9e4761dee9b5323429e527ed6f7dabe69 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -963,16 +963,10 @@ config I2C_RK3X
          This driver can also be built as a module. If so, the module will
          be called i2c-rk3x.
 
-config HAVE_S3C2410_I2C
-       bool
-       help
-         This will include I2C support for Samsung SoCs. If you want to
-         include I2C support for any machine, kindly select this in the
-         respective Kconfig file.
-
 config I2C_S3C2410
        tristate "S3C/Exynos I2C Driver"
-       depends on HAVE_S3C2410_I2C || COMPILE_TEST
+       depends on ARCH_EXYNOS || ARCH_S3C24XX || ARCH_S3C64XX || \
+                  ARCH_S5PV210 || COMPILE_TEST
        help
          Say Y here to include support for I2C controller in the
          Samsung SoCs (S3C, S5Pv210, Exynos).