Browse Source

ARM: S5P: Update defconfig for HRT support

This patch updates s5pv210_defconfig and s5p64x0_defconfig for
HRT support and CONFIG_S5P_HRT is used for its configuration.

Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Sangbeom Kim 14 years ago
parent
commit
9e65bbf213

+ 4 - 2
arch/arm/Kconfig

@@ -715,7 +715,8 @@ config ARCH_S5P64X0
 	select GENERIC_GPIO
 	select GENERIC_GPIO
 	select HAVE_CLK
 	select HAVE_CLK
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
-	select ARCH_USES_GETTIMEOFFSET
+	select GENERIC_CLOCKEVENTS
+	select HAVE_SCHED_CLOCK
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C_RTC if RTC_CLASS
 	select HAVE_S3C_RTC if RTC_CLASS
 	help
 	help
@@ -753,7 +754,8 @@ config ARCH_S5PV210
 	select HAVE_CLK
 	select HAVE_CLK
 	select ARM_L1_CACHE_SHIFT_6
 	select ARM_L1_CACHE_SHIFT_6
 	select ARCH_HAS_CPUFREQ
 	select ARCH_HAS_CPUFREQ
-	select ARCH_USES_GETTIMEOFFSET
+	select GENERIC_CLOCKEVENTS
+	select HAVE_SCHED_CLOCK
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C_RTC if RTC_CLASS
 	select HAVE_S3C_RTC if RTC_CLASS
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG

+ 2 - 0
arch/arm/configs/s5p64x0_defconfig

@@ -10,6 +10,8 @@ CONFIG_S3C_BOOT_ERROR_RESET=y
 CONFIG_S3C_LOWLEVEL_UART_PORT=1
 CONFIG_S3C_LOWLEVEL_UART_PORT=1
 CONFIG_MACH_SMDK6440=y
 CONFIG_MACH_SMDK6440=y
 CONFIG_MACH_SMDK6450=y
 CONFIG_MACH_SMDK6450=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_CPU_32v6K=y
 CONFIG_CPU_32v6K=y
 CONFIG_AEABI=y
 CONFIG_AEABI=y
 CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc"
 CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc"

+ 2 - 0
arch/arm/configs/s5pv210_defconfig

@@ -13,6 +13,8 @@ CONFIG_MACH_AQUILA=y
 CONFIG_MACH_GONI=y
 CONFIG_MACH_GONI=y
 CONFIG_MACH_SMDKC110=y
 CONFIG_MACH_SMDKC110=y
 CONFIG_MACH_SMDKV210=y
 CONFIG_MACH_SMDKV210=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_VMSPLIT_2G=y
 CONFIG_VMSPLIT_2G=y
 CONFIG_PREEMPT=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 CONFIG_AEABI=y

+ 2 - 0
arch/arm/mach-s5p64x0/Kconfig

@@ -10,12 +10,14 @@ if ARCH_S5P64X0
 config CPU_S5P6440
 config CPU_S5P6440
 	bool
 	bool
 	select S3C_PL330_DMA
 	select S3C_PL330_DMA
+	select S5P_HRT
 	help
 	help
 	  Enable S5P6440 CPU support
 	  Enable S5P6440 CPU support
 
 
 config CPU_S5P6450
 config CPU_S5P6450
 	bool
 	bool
 	select S3C_PL330_DMA
 	select S3C_PL330_DMA
+	select S5P_HRT
 	help
 	help
 	  Enable S5P6450 CPU support
 	  Enable S5P6450 CPU support
 
 

+ 1 - 0
arch/arm/mach-s5pv210/Kconfig

@@ -13,6 +13,7 @@ config CPU_S5PV210
 	bool
 	bool
 	select S3C_PL330_DMA
 	select S3C_PL330_DMA
 	select S5P_EXT_INT
 	select S5P_EXT_INT
+	select S5P_HRT
 	select S5PV210_PM if PM
 	select S5PV210_PM if PM
 	help
 	help
 	  Enable S5PV210 CPU support
 	  Enable S5PV210 CPU support

+ 5 - 0
arch/arm/plat-s5p/Kconfig

@@ -37,6 +37,11 @@ config S5P_GPIO_INT
 	help
 	help
 	  Common code for the GPIO interrupts (other than external interrupts.)
 	  Common code for the GPIO interrupts (other than external interrupts.)
 
 
+config S5P_HRT
+	bool
+	help
+	  Use the High Resolution timer support
+
 comment "System MMU"
 comment "System MMU"
 
 
 config S5P_SYSTEM_MMU
 config S5P_SYSTEM_MMU