arm: omap3: Update cpuinfo for DM3730, DM3725, AM3715, and AM3703

The check for OMAP3630/3730 only checks for 800MHz 3630/3730, but
anything else is lumped into 36XX/37XX with an assumed 1GHz speed.

Based on the DM3730 TRM bit 9 shows the MPU Frequency (800MHz/1GHZ).
This also adds the ability to distinguish between the DM3730, DM3725,
AM3715, and AM3703 and correctly display their maximum speed.

Signed-off-by: Adam Ford <aford173@gmail.com>
Tested-by: Ladislav Michl <ladis@linux-mips.org>

diff --git a/arch/arm/include/asm/arch-omap3/omap.h b/arch/arm/include/asm/arch-omap3/omap.h
index 417ff895f19e472b85870bd9aa7e78f7e9e64a15..91d73c2f1d619da21dc252231256fb27259bb299 100644 (file)
--- a/arch/arm/include/asm/arch-omap3/omap.h
+++ b/arch/arm/include/asm/arch-omap3/omap.h
@@ -230,6 +230,14 @@ struct gpio {
 #define AM3517                 0x1c00
 
 #define OMAP3730               0x0c00
 #define AM3517                 0x1c00
 
 #define OMAP3730               0x0c00

+#define OMAP3725               0x4c00
+#define AM3715                 0x1c00
+#define AM3703                 0x5c00
+
+#define OMAP3730_1GHZ          0x0e00
+#define OMAP3725_1GHZ          0x4e00
+#define AM3715_1GHZ            0x1e00
+#define AM3703_1GHZ            0x5e00

 
 /*
  * ROM code API related flags
 
 /*
  * ROM code API related flags

diff --git a/arch/arm/mach-omap2/omap3/sys_info.c b/arch/arm/mach-omap2/omap3/sys_info.c
index 1f8b5ad77cdc718026e9d973a807b5102ae69808..7e6c2633f9b395e9af820bcb57ef870abf1b7462 100644 (file)
--- a/arch/arm/mach-omap2/omap3/sys_info.c
+++ b/arch/arm/mach-omap2/omap3/sys_info.c
@@ -295,16 +295,54 @@ int print_cpuinfo (void)
                max_clk = "600 MHz";
                break;
        case CPU_OMAP36XX:
                max_clk = "600 MHz";
                break;
        case CPU_OMAP36XX:

-               cpu_family_s = "OMAP";

                switch (get_cpu_type()) {
                switch (get_cpu_type()) {

+               case AM3703:
+                       cpu_family_s = "AM";
+                       cpu_s = "3703";
+                       max_clk = "800 MHz";
+                       break;
+               case AM3703_1GHZ:
+                       cpu_family_s = "AM";
+                       cpu_s = "3703";
+                       max_clk = "1 GHz";
+                       break;
+               case AM3715:
+                       cpu_family_s = "AM";
+                       cpu_s = "3715";
+                       max_clk = "800 MHz";
+                       break;
+               case AM3715_1GHZ:
+                       cpu_family_s = "AM";
+                       cpu_s = "3715";
+                       max_clk = "1 GHz";
+                       break;
+               case OMAP3725:
+                       cpu_family_s = "OMAP";
+                       cpu_s = "3625/3725";
+                       max_clk = "800 MHz";
+                       break;
+               case OMAP3725_1GHZ:
+                       cpu_family_s = "OMAP";
+                       cpu_s = "3625/3725";
+                       max_clk = "1 GHz";
+                       break;

                case OMAP3730:
                case OMAP3730:

+                       cpu_family_s = "OMAP";

                        cpu_s = "3630/3730";
                        cpu_s = "3630/3730";

+                       max_clk = "800 MHz";
+                       break;
+               case OMAP3730_1GHZ:
+                       cpu_family_s = "OMAP";
+                       cpu_s = "3630/3730";
+                       max_clk = "1 GHz";

                        break;
                default:
                        break;
                default:

+                       cpu_family_s = "OMAP/AM";

                        cpu_s = "36XX/37XX";
                        cpu_s = "36XX/37XX";

+                       max_clk = "1 GHz";

                        break;
                }
                        break;
                }

-               max_clk = "1 GHz";
+

                break;
        default:
                cpu_family_s = "OMAP";
                break;
        default:
                cpu_family_s = "OMAP";