OMAP3: Move get_cpu_id() function to not duplicate code

[pandora-x-loader.git] / cpu / omap3 / sys_info.c

diff --git a/cpu/omap3/sys_info.c b/cpu/omap3/sys_info.c
index f6cb65f..8422b4e 100644 (file)
--- a/cpu/omap3/sys_info.c
+++ b/cpu/omap3/sys_info.c
@@ -33,3 +33,34 @@ u32 get_device_type(void)
        mode = __raw_readl(CONTROL_STATUS) & (DEVICE_MASK);
        return mode >>= 8;
 }
+
+/*
+ *  get_cpu_type(): extract cpu info
+ */
+u32 get_cpu_type(void)
+{
+       return __raw_readl(CONTROL_OMAP_STATUS);
+}
+
+/*
+ * get_cpu_id(): extract cpu id
+ * returns 0 for ES1.0, cpuid otherwise
+ */
+u32 get_cpu_id(void)
+{
+       u32 cpuid = 0;
+
+       /*
+        * On ES1.0 the IDCODE register is not exposed on L4
+        * so using CPU ID to differentiate between ES1.0 and > ES1.0.
+        */
+       __asm__ __volatile__("mrc p15, 0, %0, c0, c0, 0":"=r"(cpuid));
+       if ((cpuid & 0xf) == 0x0) {
+               return 0;
+       } else {
+               /* Decode the IDs on > ES1.0 */
+               cpuid = __raw_readl(CONTROL_IDCODE);
+       }
+
+       return cpuid;
+}