Commit 7dd3cae9 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

ARM: samsung: remove HAVE_S3C2410_WATCHDOG and use direct dependencies 



A separate Kconfig option HAVE_S3C2410_WATCHDOG for Samsung SoCs is not
really needed and the s3c24xx watchdog driver can depend on Samsung ARM
architectures instead.

The "HAVE_xxx_WATCHDOG" pattern of dependency is not popular and Samsung
platforms are here exceptions.  All others just depend on
CONFIG_ARCH_xxx.

This makes the code slightly smaller without any change in
functionality.

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 5b5858ef

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -503,7 +503,6 @@ config ARCH_S3C24XX 
	select GPIOLIB

	select GENERIC_IRQ_MULTI_HANDLER

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C_RTC if RTC_CLASS

	select NEED_MACH_IO_H

	select SAMSUNG_ATAGS

arch/arm/mach-exynos/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,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_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C_RTC if RTC_CLASS

	select PINCTRL

	select PINCTRL_EXYNOS

arch/arm/mach-s3c64xx/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ menuconfig ARCH_S3C64XX 
	select GPIO_SAMSUNG if ATAGS

	select GPIOLIB

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_TCM

	select PLAT_SAMSUNG

	select PM_GENERIC_DOMAINS if PM
@@ -165,7 +164,6 @@ config MACH_SMDK6410 
	bool "SMDK6410"

	depends on ATAGS

	select CPU_S3C6410

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select S3C64XX_SETUP_FB_24BPP

	select S3C64XX_SETUP_I2C1

	select S3C64XX_SETUP_IDE

arch/arm/mach-s5pv210/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ config ARCH_S5PV210 
	select COMMON_CLK_SAMSUNG

	select GPIOLIB

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C_RTC if RTC_CLASS

	select PINCTRL

	select PINCTRL_EXYNOS

arch/arm64/Kconfig.platforms

+0 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ config ARCH_EXYNOS 
	select EXYNOS_CHIPID

	select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS

	select EXYNOS_PMU

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C_RTC if RTC_CLASS

	select PINCTRL

	select PINCTRL_EXYNOS