Commit 3ac5f9db authored by Sam Protsenko's avatar Sam Protsenko Committed by Krzysztof Kozlowski
Browse files

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 d96890fc ("rtc: s3c: remove HAVE_S3C_RTC in favor of
    direct dependencies")
  - commit 7dd3cae9 ("ARM: samsung: remove HAVE_S3C2410_WATCHDOG and
    use direct dependencies")

Signed-off-by: default avatarSam Protsenko <semen.protsenko@linaro.org>
Link: https://lore.kernel.org/r/20211121150558.21801-2-semen.protsenko@linaro.org


Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
parent 7f9ec9b5

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-exynos/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-s3c/Kconfig.s3c64xx

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-s5pv210/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/i2c/busses/Kconfig

+2 −8
Original line number Diff line number Diff line
@@ -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).