Merge branch 'stable/for-jens-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / arch / arm / mach-omap2 / id.c

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index cf2362ccb234cfe7f980fccfb34c3f7bc8bacf50..45cc7ed4dd5875e4a9ceb290ca14a85b931b33db 100644 (file)
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -28,6 +28,9 @@
 #include "soc.h"
 #include "control.h"
 
+#define OMAP4_SILICON_TYPE_STANDARD            0x01
+#define OMAP4_SILICON_TYPE_PERFORMANCE         0x02
+
 static unsigned int omap_revision;
 static const char *cpu_rev;
 u32 omap_features;
@@ -273,25 +276,11 @@ void __init omap4xxx_check_features(void)
 {
        u32 si_type;
 
-       if (cpu_is_omap443x())
-               omap_features |= OMAP4_HAS_MPU_1GHZ;
-
+       si_type =
+       (read_tap_reg(OMAP4_CTRL_MODULE_CORE_STD_FUSE_PROD_ID_1) >> 16) & 0x03;
 
-       if (cpu_is_omap446x()) {
-               si_type =
-                       read_tap_reg(OMAP4_CTRL_MODULE_CORE_STD_FUSE_PROD_ID_1);
-               switch ((si_type & (3 << 16)) >> 16) {
-               case 2:
-                       /* High performance device */
-                       omap_features |= OMAP4_HAS_MPU_1_5GHZ;
-                       break;
-               case 1:
-               default:
-                       /* Standard device */
-                       omap_features |= OMAP4_HAS_MPU_1_2GHZ;
-                       break;
-               }
-       }
+       if (si_type == OMAP4_SILICON_TYPE_PERFORMANCE)
+               omap_features = OMAP4_HAS_PERF_SILICON;
 }
 
 void __init ti81xx_check_features(void)
@@ -559,11 +548,12 @@ void __init omap5xxx_check_revision(void)
  * detect the exact revision later on in omap2_detect_revision() once map_io
  * is done.
  */
-void __init omap2_set_globals_tap(struct omap_globals *omap2_globals)
+void __init omap2_set_globals_tap(u32 class, void __iomem *tap)
 {
-       omap_revision = omap2_globals->class;
-       tap_base = omap2_globals->tap;
+       omap_revision = class;
+       tap_base = tap;
 
+       /* XXX What is this intended to do? */
        if (cpu_is_omap34xx())
                tap_prod_id = 0x0210;
        else