commit ea1c8d08bc9e71723869f7e754aa1d57c56f55ce
author Linux Build Service Account <lnxbuild@localhost> Mon Nov 07 11:29:43 2011 -0800
committer QuIC Gerrit Code Review <code-review@localhost> Mon Nov 07 11:29:43 2011 -0800
tree 975eed4d47715dedc93b33aa64a16c738ef582cf
parent 893e3b5c1b57a42095bdbb634f3d14fbcf469367
parent d8e6db70c2bba865ecdc8a39142157207402e714

Merge "tsens: msm8960: Split write ordering for TSENS Enable" into msm-3.0

drivers/thermal/msm8960_tsens.c

diff --git a/drivers/thermal/msm8960_tsens.c b/drivers/thermal/msm8960_tsens.c
index 742bae5..0accb32 100644
--- a/drivers/thermal/msm8960_tsens.c
+++ b/drivers/thermal/msm8960_tsens.c
@@ -601,13 +601,15 @@
 	writel_relaxed(reg_cntl | TSENS_SW_RST, TSENS_CNTL_ADDR);
 
 	if (tmdev->hw_type == MSM_8960 || tmdev->hw_type == MSM_9615) {
-		reg_cntl |= TSENS_8960_SLP_CLK_ENA | TSENS_EN |
+		reg_cntl |= TSENS_8960_SLP_CLK_ENA |
 			(TSENS_MEASURE_PERIOD << 18) |
 			TSENS_LOWER_STATUS_CLR | TSENS_UPPER_STATUS_CLR |
 			TSENS_MIN_STATUS_MASK | TSENS_MAX_STATUS_MASK |
 			(((1 << tmdev->tsens_num_sensor) - 1) <<
 			TSENS_SENSOR0_SHIFT);
 		writel_relaxed(reg_cntl, TSENS_CNTL_ADDR);
+		reg_cntl |= TSENS_EN;
+		writel_relaxed(reg_cntl, TSENS_CNTL_ADDR);
 
 		reg_cfg = readl_relaxed(TSENS_8960_CONFIG_ADDR);
 		reg_cfg = (reg_cfg & ~TSENS_8960_CONFIG_MASK) |