Merge git://git.denx.de/u-boot-imx

[oweals/u-boot.git] / arch / arm / mach-omap2 / sysinfo-common.c

diff --git a/arch/arm/mach-omap2/sysinfo-common.c b/arch/arm/mach-omap2/sysinfo-common.c
index 1dc7051ab3c6668ec1b4c35044bb8f91d12fdd85..4dab12a8d7bc6473854380a0f630afb8aa09ded0 100644 (file)
--- 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
 }