diff options
author | Zhang Rui <rui.zhang@intel.com> | 2015-05-19 08:12:27 +0800 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2015-05-19 08:12:27 +0800 |
commit | e93cd95029c3b8aa628f0204e80e66fc61b57f12 (patch) | |
tree | f1e8c9c9a35c0af1a566e2e673c31abc04b1a35e /drivers/thermal/ti-soc-thermal/dra752-thermal-data.c | |
parent | e26081808edadfd257c6c9d81014e3b25e9a6118 (diff) | |
parent | efa86858e1d8970411a140fa1e0c4dd18a8f2a89 (diff) | |
download | op-kernel-dev-e93cd95029c3b8aa628f0204e80e66fc61b57f12.zip op-kernel-dev-e93cd95029c3b8aa628f0204e80e66fc61b57f12.tar.gz |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into for-rc
Diffstat (limited to 'drivers/thermal/ti-soc-thermal/dra752-thermal-data.c')
-rw-r--r-- | drivers/thermal/ti-soc-thermal/dra752-thermal-data.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/thermal/ti-soc-thermal/dra752-thermal-data.c b/drivers/thermal/ti-soc-thermal/dra752-thermal-data.c index a492927..58b5c66 100644 --- a/drivers/thermal/ti-soc-thermal/dra752-thermal-data.c +++ b/drivers/thermal/ti-soc-thermal/dra752-thermal-data.c @@ -420,7 +420,8 @@ const struct ti_bandgap_data dra752_data = { TI_BANDGAP_FEATURE_FREEZE_BIT | TI_BANDGAP_FEATURE_TALERT | TI_BANDGAP_FEATURE_COUNTER_DELAY | - TI_BANDGAP_FEATURE_HISTORY_BUFFER, + TI_BANDGAP_FEATURE_HISTORY_BUFFER | + TI_BANDGAP_FEATURE_ERRATA_814, .fclock_name = "l3instr_ts_gclk_div", .div_ck_name = "l3instr_ts_gclk_div", .conv_table = dra752_adc_to_temp, |