Skip to content

Commit d2ad7f5

Browse files
franciscofrancoalexpotter1
authored andcommitted
msm: thermal: add franco simple thermal driver (squash)
Signed-off-by: engstk <eng.stk@sapo.pt> Conflicts: drivers/thermal/msm_thermal.c Signed-off-by: engstk <eng.stk@sapo.pt> Conflicts: arch/arm/mach-msm/lge/board-8974-hammerhead.c drivers/thermal/msm_thermal.c
1 parent 1b97479 commit d2ad7f5

File tree

4 files changed

+115
-3284
lines changed

4 files changed

+115
-3284
lines changed

arch/arm/mach-msm/lge/8974-g2/board-8974-g2-open_ame.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ void __init msm8974_add_drivers(void)
121121
else
122122
msm_clock_init(&msm8974_clock_init_data);
123123
tsens_tm_init_driver();
124-
msm_thermal_device_init();
124+
//msm_thermal_device_init();
125125
#ifdef CONFIG_LGE_LCD_TUNING
126126
lge_add_lcd_misc_devices();
127127
#endif

drivers/thermal/msm_thermal-dev.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,8 @@ static long msm_thermal_ioctl_process(struct file *filep, unsigned int cmd,
119119

120120
switch (cmd) {
121121
case MSM_THERMAL_SET_CPU_MAX_FREQUENCY:
122-
ret = msm_thermal_set_frequency(query.cpu_freq.cpu_num,
123-
query.cpu_freq.freq_req, true);
124122
break;
125123
case MSM_THERMAL_SET_CPU_MIN_FREQUENCY:
126-
ret = msm_thermal_set_frequency(query.cpu_freq.cpu_num,
127-
query.cpu_freq.freq_req, false);
128124
break;
129125
default:
130126
ret = -ENOTTY;

0 commit comments

Comments
 (0)