From f72070e575433ad07ed018aef5c43677424003d0 Mon Sep 17 00:00:00 2001
From: Nishanth Menon <nm@ti.com>
Date: Fri, 21 May 2010 12:09:33 -0500
Subject: [PATCH 2/7] omap: generic: introduce a single check_revision
Introduce a single omap generic check_revision that routes the
request to the right revision of check_revision.
Note: OMAP1 and OMAP2+ are not built into a single kernel.
Cc: Tony Lindgren <tony@atomide.com>
Cc: Angelo Arrifano <miknix@gmail.com>
Cc: "Zebediah C. McClure" <zmc@lurian.net>
Cc: Alistair Buxton <a.j.buxton@gmail.com>
Cc: Grazvydas Ignotas <notasas@gmail.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Sanjeev Premi <premi@ti.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Senthilvadivu Gurusamy <svadivu@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Tarun Kanti DebBarma <tarun.kanti@ti.com>
Cc: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Cc: Aaro Koskinen <aaro.koskinen@nokia.com>
Cc: Vikram Pandita <vikram.pandita@ti.com>
Cc: Vishwanath S <vishwa.s@ti.com>
Cc: linux-omap@vger.kernel.org
Signed-off-by: Nishanth Menon <nm@ti.com>
---
arch/arm/mach-omap1/io.c | 1 -
arch/arm/mach-omap2/id.c | 2 +-
arch/arm/mach-omap2/io.c | 2 +-
arch/arm/plat-omap/include/plat/cpu.h | 3 ++-
4 files changed, 4 insertions(+), 4 deletions(-)
@@ -20,7 +20,6 @@
#include "clock.h"
-extern void omap_check_revision(void);
extern void omap_sram_init(void);
/*
@@ -371,7 +371,7 @@ static void __init omap3_cpuinfo(void)
/*
* Try to detect the exact revision of the omap we're running on
*/
-void __init omap2_check_revision(void)
+void __init omap_check_revision(void)
{
/*
* At this point we have an idea about the processor revision set
@@ -238,7 +238,7 @@ static void __init _omap2_map_common_io(void)
local_flush_tlb_all();
flush_cache_all();
- omap2_check_revision();
+ omap_check_revision();
omap_sram_init();
}
@@ -431,7 +431,8 @@ IS_OMAP_TYPE(3517, 0x3517)
int omap_chip_is(struct omap_chip_id oci);
-void omap2_check_revision(void);
+
+void omap_check_revision(void);
/*
* Runtime detection of OMAP3 features
--
1.6.3.3