Skip to content

Commit

Permalink
staging: omap-thermal: standardize register nomenclature to use 'GPU'
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Eduardo Valentin authored and Greg Kroah-Hartman committed Mar 11, 2013
1 parent 2cb4093 commit f49302d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
16 changes: 8 additions & 8 deletions drivers/staging/omap-thermal/omap-bandgap.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/omap-thermal/omap5-thermal.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
};
Expand Down

0 comments on commit f49302d

Please sign in to comment.