MLK-10808-4 imx: Move system counter driver to imx-common

Since the system counter driver will also be used by mx6ul, move
this timer driver to imx-common and rename it as syscounter.c

For mx6ul and mx7, configurations are used for choose the GPT timer
or system counter timer (default).

GPT timer:              CONFIG_GPT_TIMER
System counter timer:   CONFIG_SYSCOUNTER_TIMER

Signed-off-by: Ye.Li <B37916@freescale.com>

2 files changed, 1 insertions, 127 deletions

diff --git a/arch/arm/cpu/armv7/mx7/Makefile b/arch/arm/cpu/armv7/mx7/Makefile
index 2b09f5b..6c1764f 100644
--- a/arch/arm/cpu/armv7/mx7/Makefile
+++ b/arch/arm/cpu/armv7/mx7/Makefile
@@ -5,5 +5,5 @@
 #
 #
 
-obj-y	:= soc.o clock.o clock_slice.o timer.o
+obj-y	:= soc.o clock.o clock_slice.o
 obj-$(CONFIG_SECURE_BOOT)    += hab.o
diff --git a/arch/arm/cpu/armv7/mx7/timer.c b/arch/arm/cpu/armv7/mx7/timer.c
deleted file mode 100644
index fdbf1e8..0000000
--- a/arch/arm/cpu/armv7/mx7/timer.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2014-2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- *
- * The file use ls102xa/timer.c as a reference.
- */
-
-#include <common.h>
-#include <asm/io.h>
-#include <div64.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/arch/timer.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * This function is intended for SHORT delays only.
- * It will overflow at around 10 seconds @ 400MHz,
- * or 20 seconds @ 200MHz.
- */
-unsigned long usec2ticks(unsigned long usec)
-{
-	ulong ticks;
-
-	if (usec < 1000)
-		ticks = ((usec * (get_tbclk()/1000)) + 500) / 1000;
-	else
-		ticks = ((usec / 10) * (get_tbclk() / 100000));
-
-	return ticks;
-}
-
-static inline unsigned long long tick_to_time(unsigned long long tick)
-{
-	unsigned long freq;
-
-	asm volatile("mrc p15, 0, %0, c14, c0, 0" : "=r" (freq));
-
-	tick *= CONFIG_SYS_HZ;
-	do_div(tick, freq);
-
-	return tick;
-}
-
-static inline unsigned long long us_to_tick(unsigned long long usec)
-{
-	unsigned long freq;
-
-	asm volatile("mrc p15, 0, %0, c14, c0, 0" : "=r" (freq));
-
-	usec = usec * freq  + 999999;
-	do_div(usec, 1000000);
-
-	return usec;
-}
-
-int timer_init(void)
-{
-	struct sctr_regs *sctr = (struct sctr_regs *)SCTR_BASE_ADDR;
-	unsigned long val, freq;
-
-	freq = CONFIG_SC_TIMER_CLK;
-	asm("mcr p15, 0, %0, c14, c0, 0" : : "r" (freq));
-
-	writel(freq, &sctr->cntfid0);
-
-	/* Enable system counter */
-	val = readl(&sctr->cntcr);
-	val &= ~(SC_CNTCR_FREQ0 | SC_CNTCR_FREQ1);
-	val |= SC_CNTCR_FREQ0 | SC_CNTCR_ENABLE | SC_CNTCR_HDBG;
-	writel(val, &sctr->cntcr);
-
-	gd->arch.tbl = 0;
-	gd->arch.tbu = 0;
-
-	return 0;
-}
-
-unsigned long long get_ticks(void)
-{
-	unsigned long long now;
-
-	asm("mrrc p15, 0, %Q0, %R0, c14" : "=r" (now));
-
-	gd->arch.tbl = (unsigned long)(now & 0xffffffff);
-	gd->arch.tbu = (unsigned long)(now >> 32);
-
-	return now;
-}
-
-ulong get_timer_masked(void)
-{
-	return tick_to_time(get_ticks());
-}
-
-ulong get_timer(ulong base)
-{
-	return get_timer_masked() - base;
-}
-
-void __udelay(unsigned long usec)
-{
-	unsigned long long tmp;
-	ulong tmo;
-
-	tmo = us_to_tick(usec);
-	tmp = get_ticks() + tmo;	/* get current timestamp */
-
-	while (get_ticks() < tmp)	/* loop till event */
-		 /*NOP*/;
-}
-
-/*
- * This function is derived from PowerPC code (timebase clock frequency).
- * On ARM it returns the number of timer ticks per second.
- */
-ulong get_tbclk(void)
-{
-	unsigned long freq;
-
-	asm volatile("mrc p15, 0, %0, c14, c0, 0" : "=r" (freq));
-
-	return freq;
-}