Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8653d9f authored by Banajit Goswami's avatar Banajit Goswami Committed by Kukjin Kim
Browse files

ARM: SAMSUNG: Make WDT driver dependency SoC specific instead of machine specific 



This patch moves the dependency of watchdog timer driver from MACH_XXX(board)
to ARCH_XXX(SoC). This will enable all machines using Samsung S3C64XX and S5P
SoCs to use the WDT driver by default.

Signed-off-by: default avatarBanajit Goswami <banajit.g@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>

Conflicts:

	arch/arm/Kconfig
	arch/arm/mach-s3c64xx/Kconfig
	arch/arm/mach-s5p6442/Kconfig
	arch/arm/mach-s5pc100/Kconfig
parent 88eb7156

arch/arm/Kconfig

+5 −0
Original line number Original line Diff line number Diff line
@@ -665,6 +665,7 @@ config ARCH_S3C64XX 
	select USB_ARCH_HAS_OHCI

	select USB_ARCH_HAS_OHCI

	select SAMSUNG_GPIOLIB_4BIT

	select SAMSUNG_GPIOLIB_4BIT

	select HAVE_S3C2410_I2C

	select HAVE_S3C2410_I2C

	select HAVE_S3C2410_WATCHDOG

	help

	help

	  Samsung S3C64XX series based systems

	  Samsung S3C64XX series based systems
@@ -673,6 +674,7 @@ config ARCH_S5P6440 
	select CPU_V6

	select CPU_V6

	select GENERIC_GPIO

	select GENERIC_GPIO

	select HAVE_CLK

	select HAVE_CLK

	select HAVE_S3C2410_WATCHDOG

	select ARCH_USES_GETTIMEOFFSET

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_I2C

	select HAVE_S3C2410_I2C

	select HAVE_S3C_RTC

	select HAVE_S3C_RTC
@@ -685,6 +687,7 @@ config ARCH_S5P6442 
	select GENERIC_GPIO

	select GENERIC_GPIO

	select HAVE_CLK

	select HAVE_CLK

	select ARCH_USES_GETTIMEOFFSET

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_WATCHDOG

	help

	help

	  Samsung S5P6442 CPU based systems

	  Samsung S5P6442 CPU based systems
@@ -697,6 +700,7 @@ config ARCH_S5PC100 
	select ARCH_USES_GETTIMEOFFSET

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_I2C

	select HAVE_S3C2410_I2C

	select HAVE_S3C_RTC

	select HAVE_S3C_RTC

	select HAVE_S3C2410_WATCHDOG

	help

	help

	  Samsung S5PC100 series based systems

	  Samsung S5PC100 series based systems
@@ -709,6 +713,7 @@ config ARCH_S5PV210 
	select ARCH_USES_GETTIMEOFFSET

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_I2C

	select HAVE_S3C2410_I2C

	select HAVE_S3C_RTC

	select HAVE_S3C_RTC

	select HAVE_S3C2410_WATCHDOG

	help

	help

	  Samsung S5PV210/S5PC110 series based systems

	  Samsung S5PV210/S5PC110 series based systems

arch/arm/mach-s5p6440/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ config MACH_SMDK6440 
	select SAMSUNG_DEV_TS

	select SAMSUNG_DEV_TS

	select SAMSUNG_DEV_ADC

	select SAMSUNG_DEV_ADC

	select S3C_DEV_WDT

	select S3C_DEV_WDT

	select HAVE_S3C2410_WATCHDOG

	help

	help

	  Machine support for the Samsung SMDK6440

	  Machine support for the Samsung SMDK6440

arch/arm/mach-s5p6442/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ config CPU_S5P6442 
config MACH_SMDK6442

config MACH_SMDK6442

	bool "SMDK6442"

	bool "SMDK6442"

	select CPU_S5P6442

	select CPU_S5P6442

	select S3C_DEV_WDT

	help

	help

	  Machine support for Samsung SMDK6442

	  Machine support for Samsung SMDK6442

arch/arm/mach-s5pc100/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,7 @@ config MACH_SMDKC100 
	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC1

	select S3C_DEV_HSMMC1

	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC2

	select S3C_DEV_WDT

	select S5PC100_SETUP_FB_24BPP

	select S5PC100_SETUP_FB_24BPP

	select S5PC100_SETUP_I2C1

	select S5PC100_SETUP_I2C1

	select S5PC100_SETUP_SDHCI

	select S5PC100_SETUP_SDHCI

arch/arm/mach-s5pv210/Kconfig

+0 −2
Original line number Original line Diff line number Diff line
@@ -74,7 +74,6 @@ config MACH_SMDKV210 
	select SAMSUNG_DEV_ADC

	select SAMSUNG_DEV_ADC

	select SAMSUNG_DEV_TS

	select SAMSUNG_DEV_TS

	select S3C_DEV_WDT

	select S3C_DEV_WDT

	select HAVE_S3C2410_WATCHDOG

	help

	help

	  Machine support for Samsung SMDKV210

	  Machine support for Samsung SMDKV210
@@ -83,7 +82,6 @@ config MACH_SMDKC110 
	select CPU_S5PV210

	select CPU_S5PV210

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_SPARSEMEM_ENABLE

	select S3C_DEV_WDT

	select S3C_DEV_WDT

	select HAVE_S3C2410_WATCHDOG

	help

	help

	  Machine support for Samsung SMDKC110

	  Machine support for Samsung SMDKC110

	  S5PC110(MCP) is one of package option of S5PV210

	  S5PC110(MCP) is one of package option of S5PV210