soc/tegra: fuse: Cache values of straps and Chip ID registers

[sfrench/cifs-2.6.git] / drivers / soc / tegra / fuse / tegra-apbmisc.c

diff --git a/drivers/soc/tegra/fuse/tegra-apbmisc.c b/drivers/soc/tegra/fuse/tegra-apbmisc.c
index 6aa6c9877b41e17fb8bd9750ad6cb4c36c6ac3fb..984f42c8011281b1a11060fa74b16cea49c98828 100644 (file)
--- a/drivers/soc/tegra/fuse/tegra-apbmisc.c
+++ b/drivers/soc/tegra/fuse/tegra-apbmisc.c
@@ -21,18 +21,15 @@
 #define PMC_STRAPPING_OPT_A_RAM_CODE_MASK_SHORT        \
        (0x3 << PMC_STRAPPING_OPT_A_RAM_CODE_SHIFT)
 
-static void __iomem *apbmisc_base;
-static void __iomem *strapping_base;
 static bool long_ram_code;
+static u32 strapping;
+static u32 chipid;
 
 u32 tegra_read_chipid(void)
 {
-       if (!apbmisc_base) {
-               WARN(1, "Tegra Chip ID not yet available\n");
-               return 0;
-       }
+       WARN(!chipid, "Tegra Chip ID not yet available\n");
 
-       return readl_relaxed(apbmisc_base + 4);
+       return chipid;
 }
 
 u8 tegra_get_chip_id(void)
@@ -42,10 +39,7 @@ u8 tegra_get_chip_id(void)
 
 u32 tegra_read_straps(void)
 {
-       if (strapping_base)
-               return readl_relaxed(strapping_base);
-       else
-               return 0;
+       return strapping;
 }
 
 u32 tegra_read_ram_code(void)
@@ -104,6 +98,7 @@ void __init tegra_init_revision(void)
 
 void __init tegra_init_apbmisc(void)
 {
+       void __iomem *apbmisc_base, *strapping_base;
        struct resource apbmisc, straps;
        struct device_node *np;
 
@@ -163,10 +158,14 @@ void __init tegra_init_apbmisc(void)
        apbmisc_base = ioremap_nocache(apbmisc.start, resource_size(&apbmisc));
        if (!apbmisc_base)
                pr_err("failed to map APBMISC registers\n");
+       else
+               chipid = readl_relaxed(apbmisc_base + 4);
 
        strapping_base = ioremap_nocache(straps.start, resource_size(&straps));
        if (!strapping_base)
                pr_err("failed to map strapping options registers\n");
+       else
+               strapping = readl_relaxed(strapping_base);
 
        long_ram_code = of_property_read_bool(np, "nvidia,long-ram-code");
 }