Commit 68b62e5d authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'thermal-v5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux

Pull thermal fixes from Daniel Lezcano:

 - Fix a severe docs build failure for cpu idle cooling device (Randy
   Dunlap)

 - Fix a spelling mistake in the error message for the stm32 (Colin Ian
   King)

* tag 'thermal-v5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  thermal: stm32: fix spelling mistake "preprare" -> "prepare"
  Documentation: cpu-idle-cooling: fix a SEVERE docs build failure
parents ffda81b6 8c173d5e
...@@ -65,6 +65,8 @@ We use a fixed duration of idle injection that gives an acceptable ...@@ -65,6 +65,8 @@ We use a fixed duration of idle injection that gives an acceptable
performance penalty and a fixed latency. Mitigation can be increased performance penalty and a fixed latency. Mitigation can be increased
or decreased by modulating the duty cycle of the idle injection. or decreased by modulating the duty cycle of the idle injection.
::
^ ^
| |
| |
...@@ -91,6 +93,8 @@ computed. ...@@ -91,6 +93,8 @@ computed.
The governor will change the cooling device state thus the duty cycle The governor will change the cooling device state thus the duty cycle
and this variation will modulate the cooling effect. and this variation will modulate the cooling effect.
::
^ ^
| |
| |
...@@ -154,6 +158,7 @@ equation: ...@@ -154,6 +158,7 @@ equation:
P(opp)target = ((Trunning x (P(opp)running) + (Tidle x P(opp)idle)) / P(opp)target = ((Trunning x (P(opp)running) + (Tidle x P(opp)idle)) /
(Trunning + Tidle) (Trunning + Tidle)
... ...
Tidle = Trunning x ((P(opp)running / P(opp)target) - 1) Tidle = Trunning x ((P(opp)running / P(opp)target) - 1)
......
...@@ -535,7 +535,7 @@ static int stm_thermal_probe(struct platform_device *pdev) ...@@ -535,7 +535,7 @@ static int stm_thermal_probe(struct platform_device *pdev)
/* Configure and enable HW sensor */ /* Configure and enable HW sensor */
ret = stm_thermal_prepare(sensor); ret = stm_thermal_prepare(sensor);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Error preprare sensor: %d\n", ret); dev_err(&pdev->dev, "Error prepare sensor: %d\n", ret);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment