From 10bc451b6948e842e24799fe7fb037d335714b36 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Fri, 6 May 2016 09:21:37 -0700 Subject: mx7: fix i.MX 7 detection where only MXC_CPU_MX7D was used 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 Acked-by: Max Krummenacher --- arch/arm/imx-common/timer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/imx-common/timer.c b/arch/arm/imx-common/timer.c index 6fea6fed8a..0f93274dcb 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; -- cgit v1.2.3