}
        }
  
 -      apbmisc_base = ioremap_nocache(apbmisc.start, resource_size(&apbmisc));
 +      apbmisc_base = ioremap(apbmisc.start, resource_size(&apbmisc));
-       if (!apbmisc_base)
+       if (!apbmisc_base) {
                pr_err("failed to map APBMISC registers\n");
+       } else {
+               chipid = readl_relaxed(apbmisc_base + 4);
+               iounmap(apbmisc_base);
+       }
  
 -      strapping_base = ioremap_nocache(straps.start, resource_size(&straps));
 +      strapping_base = ioremap(straps.start, resource_size(&straps));
-       if (!strapping_base)
+       if (!strapping_base) {
                pr_err("failed to map strapping options registers\n");
+       } else {
+               strapping = readl_relaxed(strapping_base);
+               iounmap(strapping_base);
+       }
  
        long_ram_code = of_property_read_bool(np, "nvidia,long-ram-code");
  }