hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Krzysztof Kozlowski 2020-08-04 21:26:47 +02:00
parent 5b5858ef45
commit 7dd3cae90d
6 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/Kconfig
View File

@ -503,7 +503,6 @@ config ARCH_S3C24XX
select GPIOLIB select GPIOLIB
select GENERIC_IRQ_MULTI_HANDLER select GENERIC_IRQ_MULTI_HANDLER
select HAVE_S3C2410_I2C if I2C select HAVE_S3C2410_I2C if I2C
select HAVE_S3C2410_WATCHDOG if WATCHDOG
select HAVE_S3C_RTC if RTC_CLASS select HAVE_S3C_RTC if RTC_CLASS
select NEED_MACH_IO_H select NEED_MACH_IO_H
select SAMSUNG_ATAGS select SAMSUNG_ATAGS

1
arch/arm/mach-exynos/Kconfig
View File

@ -24,7 +24,6 @@ menuconfig ARCH_EXYNOS
select HAVE_ARM_ARCH_TIMER if ARCH_EXYNOS5 select HAVE_ARM_ARCH_TIMER if ARCH_EXYNOS5
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_S3C2410_I2C if I2C select HAVE_S3C2410_I2C if I2C
select HAVE_S3C2410_WATCHDOG if WATCHDOG
select HAVE_S3C_RTC if RTC_CLASS select HAVE_S3C_RTC if RTC_CLASS
select PINCTRL select PINCTRL
select PINCTRL_EXYNOS select PINCTRL_EXYNOS

2
arch/arm/mach-s3c64xx/Kconfig
View File

@ -13,7 +13,6 @@ menuconfig ARCH_S3C64XX
select GPIO_SAMSUNG if ATAGS select GPIO_SAMSUNG if ATAGS
select GPIOLIB select GPIOLIB
select HAVE_S3C2410_I2C if I2C select HAVE_S3C2410_I2C if I2C
select HAVE_S3C2410_WATCHDOG if WATCHDOG
select HAVE_TCM select HAVE_TCM
select PLAT_SAMSUNG select PLAT_SAMSUNG
select PM_GENERIC_DOMAINS if PM select PM_GENERIC_DOMAINS if PM
@ -165,7 +164,6 @@ config MACH_SMDK6410
bool "SMDK6410" bool "SMDK6410"
depends on ATAGS depends on ATAGS
select CPU_S3C6410 select CPU_S3C6410
select HAVE_S3C2410_WATCHDOG if WATCHDOG
select S3C64XX_SETUP_FB_24BPP select S3C64XX_SETUP_FB_24BPP
select S3C64XX_SETUP_I2C1 select S3C64XX_SETUP_I2C1
select S3C64XX_SETUP_IDE select S3C64XX_SETUP_IDE

1
arch/arm/mach-s5pv210/Kconfig
View File

@ -14,7 +14,6 @@ config ARCH_S5PV210
select COMMON_CLK_SAMSUNG select COMMON_CLK_SAMSUNG
select GPIOLIB select GPIOLIB
select HAVE_S3C2410_I2C if I2C select HAVE_S3C2410_I2C if I2C
select HAVE_S3C2410_WATCHDOG if WATCHDOG
select HAVE_S3C_RTC if RTC_CLASS select HAVE_S3C_RTC if RTC_CLASS
select PINCTRL select PINCTRL
select PINCTRL_EXYNOS select PINCTRL_EXYNOS

1
arch/arm64/Kconfig.platforms
View File

@ -80,7 +80,6 @@ config ARCH_EXYNOS
select EXYNOS_CHIPID select EXYNOS_CHIPID
select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS
select EXYNOS_PMU select EXYNOS_PMU
select HAVE_S3C2410_WATCHDOG if WATCHDOG
select HAVE_S3C_RTC if RTC_CLASS select HAVE_S3C_RTC if RTC_CLASS
select PINCTRL select PINCTRL
select PINCTRL_EXYNOS select PINCTRL_EXYNOS

10
drivers/watchdog/Kconfig
View File

@ -478,16 +478,10 @@ config IXP4XX_WATCHDOG
Say N if you are unsure. Say N if you are unsure.
config HAVE_S3C2410_WATCHDOG
bool
help
This will include watchdog timer support for Samsung SoCs. If
you want to include watchdog support for any machine, kindly
select this in the respective mach-XXXX/Kconfig file.
config S3C2410_WATCHDOG config S3C2410_WATCHDOG
tristate "S3C2410 Watchdog" tristate "S3C2410 Watchdog"
depends on HAVE_S3C2410_WATCHDOG || COMPILE_TEST depends on ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || \
COMPILE_TEST
select WATCHDOG_CORE select WATCHDOG_CORE
select MFD_SYSCON if ARCH_EXYNOS select MFD_SYSCON if ARCH_EXYNOS
help help