summaryrefslogtreecommitdiff
path: root/arch/arm/include
diff options
context:
space:
mode:
authorYe.Li <B37916@freescale.com>2015-05-04 17:15:29 +0800
committerYe.Li <B37916@freescale.com>2015-05-04 22:27:30 +0800
commit25a0ba04a051e5b3c03cc628c849551aa803409d (patch)
tree0661c0faae359910b28aedea7d7b658e9cdb0f15 /arch/arm/include
parentcab4e299b24cb2ae3a429d7d52d9b4d9f9bfd163 (diff)
downloadu-boot-imx-25a0ba04a051e5b3c03cc628c849551aa803409d.zip
u-boot-imx-25a0ba04a051e5b3c03cc628c849551aa803409d.tar.gz
u-boot-imx-25a0ba04a051e5b3c03cc628c849551aa803409d.tar.bz2
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>
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/imx-common/syscounter.h (renamed from arch/arm/include/asm/arch-mx7/timer.h)4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-mx7/timer.h b/arch/arm/include/asm/imx-common/syscounter.h
index 0bb2ebe..ddb412e 100644
--- a/arch/arm/include/asm/arch-mx7/timer.h
+++ b/arch/arm/include/asm/imx-common/syscounter.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#ifndef _ASM_ARCH_MX7_TIMER_H
-#define _ASM_ARCH_MX7_TIMER_H
+#ifndef _ASM_ARCH_SYSTEM_COUNTER_H
+#define _ASM_ARCH_SYSTEM_COUNTER_H
/* System Counter */
struct sctr_regs {