These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / soc / tegra / fuse / speedo-tegra124.c

diff --git a/kernel/drivers/soc/tegra/fuse/speedo-tegra124.c b/kernel/drivers/soc/tegra/fuse/speedo-tegra124.c
index 4636238..a63a134 100644 (file)
--- a/kernel/drivers/soc/tegra/fuse/speedo-tegra124.c
+++ b/kernel/drivers/soc/tegra/fuse/speedo-tegra124.c
@@ -24,7 +24,7 @@
 
 #define CPU_PROCESS_CORNERS    2
 #define GPU_PROCESS_CORNERS    2
-#define CORE_PROCESS_CORNERS   2
+#define SOC_PROCESS_CORNERS    2
 
 #define FUSE_CPU_SPEEDO_0      0x14
 #define FUSE_CPU_SPEEDO_1      0x2c
@@ -53,7 +53,7 @@ static const u32 __initconst gpu_process_speedos[][GPU_PROCESS_CORNERS] = {
        {0,     UINT_MAX},
 };
 
-static const u32 __initconst core_process_speedos[][CORE_PROCESS_CORNERS] = {
+static const u32 __initconst soc_process_speedos[][SOC_PROCESS_CORNERS] = {
        {2101,  UINT_MAX},
        {0,     UINT_MAX},
 };
@@ -119,19 +119,19 @@ void __init tegra124_init_speedo_data(struct tegra_sku_info *sku_info)
                        THRESHOLD_INDEX_COUNT);
        BUILD_BUG_ON(ARRAY_SIZE(gpu_process_speedos) !=
                        THRESHOLD_INDEX_COUNT);
-       BUILD_BUG_ON(ARRAY_SIZE(core_process_speedos) !=
+       BUILD_BUG_ON(ARRAY_SIZE(soc_process_speedos) !=
                        THRESHOLD_INDEX_COUNT);
 
-       cpu_speedo_0_value = tegra30_fuse_readl(FUSE_CPU_SPEEDO_0);
+       cpu_speedo_0_value = tegra_fuse_read_early(FUSE_CPU_SPEEDO_0);
 
        /* GPU Speedo is stored in CPU_SPEEDO_2 */
-       sku_info->gpu_speedo_value = tegra30_fuse_readl(FUSE_CPU_SPEEDO_2);
+       sku_info->gpu_speedo_value = tegra_fuse_read_early(FUSE_CPU_SPEEDO_2);
 
-       soc_speedo_0_value = tegra30_fuse_readl(FUSE_SOC_SPEEDO_0);
+       soc_speedo_0_value = tegra_fuse_read_early(FUSE_SOC_SPEEDO_0);
 
-       cpu_iddq_value = tegra30_fuse_readl(FUSE_CPU_IDDQ);
-       soc_iddq_value = tegra30_fuse_readl(FUSE_SOC_IDDQ);
-       gpu_iddq_value = tegra30_fuse_readl(FUSE_GPU_IDDQ);
+       cpu_iddq_value = tegra_fuse_read_early(FUSE_CPU_IDDQ);
+       soc_iddq_value = tegra_fuse_read_early(FUSE_SOC_IDDQ);
+       gpu_iddq_value = tegra_fuse_read_early(FUSE_GPU_IDDQ);
 
        sku_info->cpu_speedo_value = cpu_speedo_0_value;
 
@@ -143,7 +143,7 @@ void __init tegra124_init_speedo_data(struct tegra_sku_info *sku_info)
 
        rev_sku_to_speedo_ids(sku_info, &threshold);
 
-       sku_info->cpu_iddq_value = tegra30_fuse_readl(FUSE_CPU_IDDQ);
+       sku_info->cpu_iddq_value = tegra_fuse_read_early(FUSE_CPU_IDDQ);
 
        for (i = 0; i < GPU_PROCESS_CORNERS; i++)
                if (sku_info->gpu_speedo_value <
@@ -157,11 +157,11 @@ void __init tegra124_init_speedo_data(struct tegra_sku_info *sku_info)
                                break;
        sku_info->cpu_process_id = i;
 
-       for (i = 0; i < CORE_PROCESS_CORNERS; i++)
+       for (i = 0; i < SOC_PROCESS_CORNERS; i++)
                if (soc_speedo_0_value <
-                       core_process_speedos[threshold][i])
+                       soc_process_speedos[threshold][i])
                        break;
-       sku_info->core_process_id = i;
+       sku_info->soc_process_id = i;
 
        pr_debug("Tegra GPU Speedo ID=%d, Speedo Value=%d\n",
                 sku_info->gpu_speedo_id, sku_info->gpu_speedo_value);