From: Derald D. Woods <woods.technical@gmail.com>
Date: Mon, 31 Jul 2017 12:41:40 +0000 (-0500)
Subject: arm: omap: Fix 'get_device_type()' for OMAP34XX
X-Git-Tag: v2017.09-rc2~39
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=da0227f7d2568c0cb0e435ed3caf780f9846d9a0;p=u-boot

arm: omap: Fix 'get_device_type()' for OMAP34XX

Fixes: 00bbe96ebabb ("arm: omap: Unify get_device_type() function")

The control status register value is embedded in a structure somewhere
in SRAM, with the last refactoring effort. This patch allows OMAP3 EVM
(TMDSEVM3530) to boot again using the known control register base and
offset for 'readl', for the OMAP34XX case.

Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
[trini: Change to if/else, add comment about it.]
Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/arch/arm/mach-omap2/sysinfo-common.c b/arch/arm/mach-omap2/sysinfo-common.c
index 1dc7051ab3..4dab12a8d7 100644
--- a/arch/arm/mach-omap2/sysinfo-common.c
+++ b/arch/arm/mach-omap2/sysinfo-common.c
@@ -16,6 +16,15 @@
  */
 u32 get_device_type(void)
 {
+#if defined(CONFIG_OMAP34XX)
+	/*
+	 * On OMAP3 systems we call this early enough that we must just
+	 * use the direct offset for safety.
+	 */
+	return (readl(OMAP34XX_CTRL_BASE + 0x2f0) & DEVICE_TYPE_MASK) >>
+		DEVICE_TYPE_SHIFT;
+#else
 	return (readl((*ctrl)->control_status) & DEVICE_TYPE_MASK) >>
 		DEVICE_TYPE_SHIFT;
+#endif
 }