summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2016-05-06 09:21:37 -0700
committerMax Krummenacher <max.krummenacher@toradex.com>2016-06-28 09:28:18 +0200
commit10bc451b6948e842e24799fe7fb037d335714b36 (patch)
treec98a51812f85efd704dd9680f2b240373b2d4627
parent1c0a0a22eb107fe75f87eae6263027734fa62c5d (diff)
The i.MX 7 detection taken from upstream U-Boot adds a new macro MXC_CPU_MX7S. The downstream U-Boot still has one runtime occurence which currently checks for MXC_CPU_MX7D only. Fix this SoC detection to detect MXC_CPU_MX7S too. Note: While the GPT timer is available on i.MX 7, it is currently not configured (CONFIG_GPT_TIMER). Instead, the CPU internal syscounter timer is currently used (CONFIG_SYSCOUNTER_TIMER). Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--arch/arm/imx-common/timer.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/imx-common/timer.c b/arch/arm/imx-common/timer.c
index 6fea6fed8a4..0f93274dcb0 100644
--- a/arch/arm/imx-common/timer.c
+++ b/arch/arm/imx-common/timer.c
@@ -115,6 +115,7 @@ int timer_init(void)
is_cpu_type(MXC_CPU_MX6SOLO) ||
is_cpu_type(MXC_CPU_MX6SX) ||
is_cpu_type(MXC_CPU_MX7D) ||
+ is_cpu_type(MXC_CPU_MX7S) ||
is_cpu_type(MXC_CPU_MX6UL)) {
i |= GPTCR_24MEN;