Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

thermal: msm8960_tsens: Fix setting mode for disabled sensors

Browse source 
Thermal driver in kernel currently requires the main sensor
to perform mitigation. Disable all the auxiliary sensors
and update the mode of the main sensor as being enabled during
TSENS init.

Round the converted temperature to the nearest degree.
Remove unwanted register reads added for debug and reference
to magic numbers in the code.

Change-Id: Id5652ba16f9adb462dc61266600f394901eee194
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
This commit is contained in:
Siddartha Mohanadoss 2012-02-17 09:23:16 -08:00 committed by Stephen Boyd
parent 085efea37e
commit 6d72c9b1b4
1 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
drivers/thermal/msm8960_tsens.c
View file

@ -161,18 +161,28 @@ struct tsens_tm_device *tmdev;
/* Temperature on y axis and ADC-code on x-axis */
static int tsens_tz_code_to_degC(int adc_code, int sensor_num)
{
int degc;
degc = (adc_code * tmdev->sensor[sensor_num].slope_mul_tsens_factor
+ tmdev->sensor[sensor_num].offset)
/ tmdev->tsens_factor;
int degcbeforefactor, degc;
degcbeforefactor = (adc_code *
tmdev->sensor[sensor_num].slope_mul_tsens_factor
+ tmdev->sensor[sensor_num].offset);
if (degcbeforefactor == 0)
degc = degcbeforefactor;
else if (degcbeforefactor > 0)
degc = (degcbeforefactor + tmdev->tsens_factor/2)
/ tmdev->tsens_factor;
else
degc = (degcbeforefactor - tmdev->tsens_factor/2)
/ tmdev->tsens_factor;
return degc;
}
static int tsens_tz_degC_to_code(int degC, int sensor_num)
{
int code = (degC * tmdev->tsens_factor -
tmdev->sensor[sensor_num].offset)
/ tmdev->sensor[sensor_num].slope_mul_tsens_factor;
tmdev->sensor[sensor_num].offset
+ tmdev->sensor[sensor_num].slope_mul_tsens_factor/2)
/ tmdev->sensor[sensor_num].slope_mul_tsens_factor;
if (code > TSENS_THRESHOLD_MAX_CODE)
code = TSENS_THRESHOLD_MAX_CODE;
@ -632,7 +642,7 @@ static irqreturn_t tsens_isr(int irq, void *data)
sensor_addr = (unsigned int)TSENS_S0_STATUS_ADDR;
for (i = 0; i < tmdev->tsens_num_sensor; i++) {
if (i == TSENS_8064_SEQ_SENSORS)
sensor_addr += 40;
sensor_addr += TSENS_8064_S4_S5_OFFSET;
if (sensor & TSENS_MASK1) {
code = readl_relaxed(sensor_addr);
upper_th_x = code >= threshold;
@ -662,6 +672,20 @@ static irqreturn_t tsens_isr(int irq, void *data)
return IRQ_HANDLED;
}
static void tsens8960_sensor_mode_init(void)
{
unsigned int reg_cntl = 0;
reg_cntl = readl_relaxed(TSENS_CNTL_ADDR);
if (tmdev->hw_type == MSM_8960 || tmdev->hw_type == MSM_9615 ||
tmdev->hw_type == APQ_8064) {
writel_relaxed(reg_cntl &
~((((1 << tmdev->tsens_num_sensor) - 1) >> 1)
<< (TSENS_SENSOR0_SHIFT + 1)), TSENS_CNTL_ADDR);
tmdev->sensor[TSENS_MAIN_SENSOR].mode = THERMAL_DEVICE_ENABLED;
}
}
static void tsens_disable_mode(void)
{
unsigned int reg_cntl = 0;
@ -889,7 +913,6 @@ int msm_tsens_early_init(struct tsens_platform_data *pdata)
static int __init tsens_tm_init(void)
{
int rc, i;
unsigned int reg_cntl, reg_status;
if (!tmdev) {
pr_info("%s : TSENS early init not done.\n", __func__);
@ -913,6 +936,8 @@ static int __init tsens_tm_init(void)
tmdev->sensor[i].mode = THERMAL_DEVICE_DISABLED;
}
tsens8960_sensor_mode_init();
rc = request_irq(TSENS_UPPER_LOWER_INT, tsens_isr,
IRQF_TRIGGER_RISING, "tsens_interrupt", tmdev);
if (rc < 0) {
@ -922,11 +947,8 @@ static int __init tsens_tm_init(void)
goto fail;
}
reg_status = readl_relaxed(TSENS_8064_STATUS_CNTL);
pr_debug("%s: OK\n", __func__);
mb();
reg_status = readl_relaxed(TSENS_8064_STATUS_CNTL);
reg_cntl = readl_relaxed(TSENS_CNTL_ADDR);
return 0;
fail:
tsens_disable_mode();