diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2015-01-14 15:49:19 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2015-01-14 15:49:19 +0800 |
| commit | a4378cc66d9c772dc37d32d434b14c7545e6fc21 (patch) | |
| tree | 71c3f71c7f11376476ccea7848019f9d890de418 /drivers/thermal/imx_thermal.c | |
| parent | 693a30b8f19a964087a3762d09fb2e1cbad6b0d4 (diff) | |
| parent | ee853addd9fedb116bd34a18f11dd5959fcf0428 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc
Diffstat (limited to 'drivers/thermal/imx_thermal.c')
| -rw-r--r-- | drivers/thermal/imx_thermal.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c index c1188ac053c9..2ccbc0788353 100644 --- a/drivers/thermal/imx_thermal.c +++ b/drivers/thermal/imx_thermal.c @@ -608,6 +608,7 @@ static int imx_thermal_suspend(struct device *dev) regmap_write(map, TEMPSENSE0 + REG_CLR, TEMPSENSE0_MEASURE_TEMP); regmap_write(map, TEMPSENSE0 + REG_SET, TEMPSENSE0_POWER_DOWN); data->mode = THERMAL_DEVICE_DISABLED; + clk_disable_unprepare(data->thermal_clk); return 0; } @@ -617,6 +618,7 @@ static int imx_thermal_resume(struct device *dev) struct imx_thermal_data *data = dev_get_drvdata(dev); struct regmap *map = data->tempmon; + clk_prepare_enable(data->thermal_clk); /* Enabled thermal sensor after resume */ regmap_write(map, TEMPSENSE0 + REG_CLR, TEMPSENSE0_POWER_DOWN); regmap_write(map, TEMPSENSE0 + REG_SET, TEMPSENSE0_MEASURE_TEMP); |