diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2015-11-03 15:24:40 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2015-11-03 15:24:40 +0800 |
| commit | c75960aa7a4ef09bb768fa474071f4190adae49c (patch) | |
| tree | f2bae724550db82264c525d9edfdec8705327817 /drivers/thermal/armada_thermal.c | |
| parent | 049e6dde7e57f0054fdc49102e7ef4830c698b46 (diff) | |
| parent | 8fb2b9ac2aadd6d87f89071c2c85f8c12b41c943 (diff) | |
| download | linux-next-c75960aa7a4ef09bb768fa474071f4190adae49c.tar.gz | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc
Diffstat (limited to 'drivers/thermal/armada_thermal.c')
| -rw-r--r-- | drivers/thermal/armada_thermal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c index 26b8d326546a..ae75328945f7 100644 --- a/drivers/thermal/armada_thermal.c +++ b/drivers/thermal/armada_thermal.c @@ -224,9 +224,9 @@ static const struct armada_thermal_data armada380_data = { .is_valid_shift = 10, .temp_shift = 0, .temp_mask = 0x3ff, - .coef_b = 2931108200UL, - .coef_m = 5000000UL, - .coef_div = 10502, + .coef_b = 1172499100UL, + .coef_m = 2000096UL, + .coef_div = 4201, .inverted = true, }; |