summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSanjeev Premi <premi@ti.com>2011-01-03 19:54:48 +0530
committerSascha Hauer <s.hauer@pengutronix.de>2011-01-05 11:05:25 +0100
commit752fd26153d0e465986b3a4d5f663c7e13998c8b (patch)
tree2a9519ed61d541b085e8e085c96586982500455a
parent2d92d08db8cd9b06adb9dbed5f53216502de3888 (diff)
downloadbarebox-752fd26153d0e465986b3a4d5f663c7e13998c8b.tar.gz
barebox-752fd26153d0e465986b3a4d5f663c7e13998c8b.tar.xz
omap36x: Add support for dynamic detection
This patch adds the support to detect OMAP3630. It also re-organizes the CPU_xxxx definitions in sys_info.h to ascending order so that newer silicons can be added at bottom. Signed-off-by: Sanjeev Premi <premi@ti.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-omap/include/mach/sys_info.h10
-rw-r--r--arch/arm/mach-omap/omap3_generic.c5
2 files changed, 10 insertions, 5 deletions
diff --git a/arch/arm/mach-omap/include/mach/sys_info.h b/arch/arm/mach-omap/include/mach/sys_info.h
index 8b8d332d16..37a4a7156a 100644
--- a/arch/arm/mach-omap/include/mach/sys_info.h
+++ b/arch/arm/mach-omap/include/mach/sys_info.h
@@ -44,11 +44,12 @@
#define DDR_133 133 /* most combo, some mem d-boards */
#define DDR_165 165 /* future parts */
-#define CPU_3430 0x3430
-#define CPU_2430 0x2430
-#define CPU_2420 0x2420
-#define CPU_1710 0x1710
#define CPU_1610 0x1610
+#define CPU_1710 0x1710
+#define CPU_2420 0x2420
+#define CPU_2430 0x2430
+#define CPU_3430 0x3430
+#define CPU_3630 0x3630
/**
* Define CPU revisions
@@ -80,6 +81,7 @@
* Hawkeye definitions to identify silicon families
*/
#define OMAP_HAWKEYE_34XX 0xB7AE
+#define OMAP_HAWKEYE_36XX 0xB891
/** These are implemented by the System specific code in omapX-generic.c */
u32 get_cpu_type(void);
diff --git a/arch/arm/mach-omap/omap3_generic.c b/arch/arm/mach-omap/omap3_generic.c
index e14678028a..e9083bc143 100644
--- a/arch/arm/mach-omap/omap3_generic.c
+++ b/arch/arm/mach-omap/omap3_generic.c
@@ -66,7 +66,7 @@ EXPORT_SYMBOL(reset_cpu);
/**
* @brief Low level CPU type
*
- * @return CPU_3430
+ * @return Detected CPU type
*/
u32 get_cpu_type(void)
{
@@ -80,6 +80,9 @@ u32 get_cpu_type(void)
if (hawkeye == OMAP_HAWKEYE_34XX)
return CPU_3430;
+ if (hawkeye == OMAP_HAWKEYE_36XX)
+ return CPU_3630;
+
/*
* Fallback to OMAP3430 as default.
*/