Merge tag 'pm-extra-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-microblaze.git] / arch / arm / mach-omap2 / id.c

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index cc6d9fa..e2274a1 100644 (file)
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -223,7 +223,15 @@ static void __init omap3_cpuinfo(void)
         * and CPU class bits.
         */
        if (soc_is_omap3630()) {
-               cpu_name = "OMAP3630";
+               if (omap3_has_iva() && omap3_has_sgx()) {
+                       cpu_name = (omap3_has_isp()) ? "OMAP3630/DM3730" : "OMAP3621";
+               } else if (omap3_has_iva()) {
+                       cpu_name = "DM3725";
+               } else if (omap3_has_sgx()) {
+                       cpu_name = "OMAP3615/AM3715";
+               } else {
+                       cpu_name = (omap3_has_isp()) ? "AM3703" : "OMAP3611";
+               }
        } else if (soc_is_am35xx()) {
                cpu_name = (omap3_has_sgx()) ? "AM3517" : "AM3505";
        } else if (soc_is_ti816x()) {