staging: omap-thermal: standardize register nomenclature to use 'GPU'

In order to keep same nomenclature across the register definition,
this change will make all 'MM' suffixes to be named 'GPU'.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/omap-thermal/omap-bandgap.h b/drivers/staging/omap-thermal/omap-bandgap.h
index a13e43adfcaa302367ab22ae346befef38ef5379..ef342d8352c1deaaede5ab573811a2f7d9a8fb3d 100644 (file)
--- a/drivers/staging/omap-thermal/omap-bandgap.h
+++ b/drivers/staging/omap-thermal/omap-bandgap.h
@@ -110,10 +110,10 @@
 #define OMAP5430_MASK_HOT_CORE_MASK                    (1 << 5)
 #define OMAP5430_MASK_COLD_CORE_SHIFT                  4
 #define OMAP5430_MASK_COLD_CORE_MASK                   (1 << 4)
-#define OMAP5430_MASK_HOT_MM_SHIFT                     3
-#define OMAP5430_MASK_HOT_MM_MASK                      (1 << 3)
-#define OMAP5430_MASK_COLD_MM_SHIFT                    2
-#define OMAP5430_MASK_COLD_MM_MASK                     (1 << 2)
+#define OMAP5430_MASK_HOT_GPU_SHIFT                    3
+#define OMAP5430_MASK_HOT_GPU_MASK                     (1 << 3)
+#define OMAP5430_MASK_COLD_GPU_SHIFT                   2
+#define OMAP5430_MASK_COLD_GPU_MASK                    (1 << 2)
 #define OMAP5430_MASK_HOT_MPU_SHIFT                    1
 #define OMAP5430_MASK_HOT_MPU_MASK                     (1 << 1)
 #define OMAP5430_MASK_COLD_MPU_SHIFT                   0
@@ -144,10 +144,10 @@
 #define OMAP5430_HOT_CORE_FLAG_MASK                    (1 << 5)
 #define OMAP5430_COLD_CORE_FLAG_SHIFT                  4
 #define OMAP5430_COLD_CORE_FLAG_MASK                   (1 << 4)
-#define OMAP5430_HOT_MM_FLAG_SHIFT                     3
-#define OMAP5430_HOT_MM_FLAG_MASK                      (1 << 3)
-#define OMAP5430_COLD_MM_FLAG_SHIFT                    2
-#define OMAP5430_COLD_MM_FLAG_MASK                     (1 << 2)
+#define OMAP5430_HOT_GPU_FLAG_SHIFT                    3
+#define OMAP5430_HOT_GPU_FLAG_MASK                     (1 << 3)
+#define OMAP5430_COLD_GPU_FLAG_SHIFT                   2
+#define OMAP5430_COLD_GPU_FLAG_MASK                    (1 << 2)
 #define OMAP5430_HOT_MPU_FLAG_SHIFT                    1
 #define OMAP5430_HOT_MPU_FLAG_MASK                     (1 << 1)
 #define OMAP5430_COLD_MPU_FLAG_SHIFT                   0

diff --git a/drivers/staging/omap-thermal/omap5-thermal.c b/drivers/staging/omap-thermal/omap5-thermal.c
index dfa0350f04322f237f39dffd573a3e84651c8538..4965556852412dde94a1bbd85510ba38d0460230 100644 (file)
--- a/drivers/staging/omap-thermal/omap5-thermal.c
+++ b/drivers/staging/omap-thermal/omap5-thermal.c
@@ -71,8 +71,8 @@ omap5430_gpu_temp_sensor_registers = {
        .bgap_dtemp_mask = OMAP5430_BGAP_TEMP_SENSOR_DTEMP_MASK,
 
        .bgap_mask_ctrl = OMAP5430_BGAP_CTRL_OFFSET,
-       .mask_hot_mask = OMAP5430_MASK_HOT_MM_MASK,
-       .mask_cold_mask = OMAP5430_MASK_COLD_MM_MASK,
+       .mask_hot_mask = OMAP5430_MASK_HOT_GPU_MASK,
+       .mask_cold_mask = OMAP5430_MASK_COLD_GPU_MASK,
 
        .bgap_mode_ctrl = OMAP5430_BGAP_COUNTER_GPU_OFFSET,
        .mode_ctrl_mask = OMAP5430_REPEAT_MODE_MASK,
@@ -91,8 +91,8 @@ omap5430_gpu_temp_sensor_registers = {
        .bgap_status = OMAP5430_BGAP_STATUS_OFFSET,
        .status_clean_stop_mask = 0x0,
        .status_bgap_alert_mask = OMAP5430_BGAP_ALERT_MASK,
-       .status_hot_mask = OMAP5430_HOT_MM_FLAG_MASK,
-       .status_cold_mask = OMAP5430_COLD_MM_FLAG_MASK,
+       .status_hot_mask = OMAP5430_HOT_GPU_FLAG_MASK,
+       .status_cold_mask = OMAP5430_COLD_GPU_FLAG_MASK,
 
        .bgap_efuse = OMAP5430_FUSE_OPP_BGAP_GPU,
 };