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

Commit 3f8e8cee authored by Kumar Gala's avatar Kumar Gala
Browse files

clocksource: qcom: Move clocksource code out of mach-msm 



We intend to share the clocksource code for MSM platforms between legacy
and multiplatform supported qcom SoCs.

Acked-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarKumar Gala <galak@codeaurora.org>
parent 6a032dba

arch/arm/mach-msm/Kconfig

+5 −8
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ config ARCH_MSM8X60 
	select CPU_V7

	select HAVE_SMP

	select MSM_SCM if SMP

	select MSM_TIMER

	select CLKSRC_QCOM



config ARCH_MSM8960

	bool "Enable support for MSM8960"
@@ -29,7 +29,7 @@ config ARCH_MSM8960 
	select CPU_V7

	select HAVE_SMP

	select MSM_SCM if SMP

	select MSM_TIMER

	select CLKSRC_QCOM



config ARCH_MSM8974

	bool "Enable support for MSM8974"
@@ -54,7 +54,7 @@ config ARCH_MSM7X00A 
	select MACH_TROUT if !MACH_HALIBUT

	select MSM_PROC_COMM

	select MSM_SMD

	select MSM_TIMER

	select CLKSRC_QCOM

	select MSM_SMD_PKG3



config ARCH_MSM7X30
@@ -66,7 +66,7 @@ config ARCH_MSM7X30 
	select MSM_GPIOMUX

	select MSM_PROC_COMM

	select MSM_SMD

	select MSM_TIMER

	select CLKSRC_QCOM

	select MSM_VIC



config ARCH_QSD8X50
@@ -78,7 +78,7 @@ config ARCH_QSD8X50 
	select MSM_GPIOMUX

	select MSM_PROC_COMM

	select MSM_SMD

	select MSM_TIMER

	select CLKSRC_QCOM

	select MSM_VIC



endchoice
@@ -153,7 +153,4 @@ config MSM_GPIOMUX 
config MSM_SCM

	bool



config MSM_TIMER

	bool



endif

arch/arm/mach-msm/Makefile

+0 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_MSM_TIMER) += timer.o

obj-$(CONFIG_MSM_PROC_COMM) += clock.o



obj-$(CONFIG_MSM_VIC) += irq-vic.o

drivers/clocksource/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -140,3 +140,6 @@ config VF_PIT_TIMER 
	bool

	help

	  Support for Period Interrupt Timer on Freescale Vybrid Family SoCs.



config CLKSRC_QCOM

	bool

drivers/clocksource/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ obj-$(CONFIG_CLKSRC_EFM32) += time-efm32.o 
obj-$(CONFIG_CLKSRC_EXYNOS_MCT)	+= exynos_mct.o

obj-$(CONFIG_CLKSRC_SAMSUNG_PWM)	+= samsung_pwm_timer.o

obj-$(CONFIG_VF_PIT_TIMER)	+= vf_pit_timer.o

obj-$(CONFIG_CLKSRC_QCOM)	+= qcom-timer.o



obj-$(CONFIG_ARM_ARCH_TIMER)		+= arm_arch_timer.o

obj-$(CONFIG_ARM_GLOBAL_TIMER)		+= arm_global_timer.o

arch/arm/mach-msm/timer.c→drivers/clocksource/qcom-timer.c

+1 −5
Original line number Diff line number Diff line 
/*

 *

 * Copyright (C) 2007 Google, Inc.

 * Copyright (c) 2009-2012, The Linux Foundation. All rights reserved.

 * Copyright (c) 2009-2012,2014, The Linux Foundation. All rights reserved.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and
@@ -26,10 +26,6 @@ 
#include <linux/of_irq.h>

#include <linux/sched_clock.h>



#include <asm/mach/time.h>



#include "common.h"



#define TIMER_MATCH_VAL			0x0000

#define TIMER_COUNT_VAL			0x0004

#define TIMER_ENABLE			0x0008