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

Commit 33bf3327 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: SAMSUNG: move hr timer for common s5p into plat-samsung 



Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 8eadcf74

arch/arm/plat-s5p/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -23,12 +23,6 @@ config PLAT_S5P 
	help

	  Base platform code for Samsung's S5P series SoC.



config S5P_HRT

	bool

	select SAMSUNG_DEV_PWM

	help

	  Use the High Resolution timer support



config S5P_DEV_UART

	def_bool y

	depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210)

arch/arm/plat-s5p/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -10,10 +10,6 @@ obj-m := 
obj-n				:= dummy.o

obj-				:=



# Core files



obj-$(CONFIG_S5P_HRT) 		+= s5p-time.o



# devices



obj-$(CONFIG_S5P_DEV_UART)	+= dev-uart.o

arch/arm/plat-samsung/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -50,6 +50,14 @@ config S3C_LOWLEVEL_UART_PORT 
	  this configuration should be between zero and two. The port

	  must have been initialised by the boot-loader before use.



# timer options



config S5P_HRT

	bool

	select SAMSUNG_DEV_PWM

	help

	  Use the High Resolution timer support



# clock options



config SAMSUNG_CLKSRC

arch/arm/plat-samsung/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ obj- := 


obj-y				+= init.o cpu.o

obj-$(CONFIG_ARCH_USES_GETTIMEOFFSET)   += time.o

obj-$(CONFIG_S5P_HRT) 		+= s5p-time.o



obj-y				+= clock.o

obj-y				+= pwm-clock.o

arch/arm/plat-s5p/s5p-time.c→arch/arm/plat-samsung/s5p-time.c

+1 −2
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-s5p/s5p-time.c

 *

/*

 * Copyright (c) 2011 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com/

 *