[PATCH] ARM i.MX: fix iMX6SL detection

[PATCH] ARM i.MX: fix iMX6SL detection

[Alexander Kurz]

When booting iMX6SL SoC, a message "detected unknown i.MX6 revision 1.2"
has been reported. Fix thie detection for iMX6SL again.

fixes: 82239accfc8  ("ARM: i.MX6: factor out function to read si_rev")
Signed-off-by: Alexander Kurz <akurz@blala.de>
---
 include/mach/imx/imx6.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/mach/imx/imx6.h b/include/mach/imx/imx6.h
index f36ac6ce40..109df9b811 100644
--- a/include/mach/imx/imx6.h
+++ b/include/mach/imx/imx6.h
@@ -63,7 +63,7 @@ static inline uint32_t __imx6_read_si_rev(void)
 	si_rev = readl(MX6_ANATOP_BASE_ADDR + IMX6SL_ANATOP_SI_REV);
 	cpu_type = SI_REV_CPUTYPE(si_rev);
 
-	if (si_rev == 0x60)
+	if (cpu_type == (IMX6_CPUTYPE_IMX6SL & 0xff))
 		return si_rev;
 
 	return 0;
@@ -74,8 +74,8 @@ static inline int __imx6_cpu_type(void)
 	uint32_t si_rev = __imx6_read_si_rev();
 	uint32_t cpu_type = SI_REV_CPUTYPE(si_rev);
 
-	/* intentionally skip scu_get_core_count() for MX6SL */
-	if (cpu_type == IMX6_CPUTYPE_IMX6SL)
+	/* There exists only one, single-cored iMX6SL variant. */
+	if (cpu_type == (IMX6_CPUTYPE_IMX6SL & 0xff))
 		return IMX6_CPUTYPE_IMX6SL;
 
 	cpu_type |= scu_get_core_count() << 8;
-- 
2.39.5