diff options
author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2015-01-28 12:13:35 -0500 |
---|---|---|
committer | Eduardo Valentin <edubezval@gmail.com> | 2015-01-28 12:29:58 -0500 |
commit | 252454f5cbda2c6b40c5d36f58cac2938437b85d (patch) | |
tree | 909f7ca404b302272df8160cf6df5ae6a7039745 | |
parent | eccb60145415dd8e171687cd1694f50141f50d6d (diff) |
thermal: Fix examples in DT documentation
There are various issues with the examples in this documentation, some
of the DT labels are invalid and one of the macro THERMAL_NO_LIMITS
referenced is not available as well.
This patch attempts to fix such errors in the documentation.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
-rw-r--r-- | Documentation/devicetree/bindings/thermal/thermal.txt | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/Documentation/devicetree/bindings/thermal/thermal.txt b/Documentation/devicetree/bindings/thermal/thermal.txt index f5db6b72a36f..29fe0bfae38e 100644 --- a/Documentation/devicetree/bindings/thermal/thermal.txt +++ b/Documentation/devicetree/bindings/thermal/thermal.txt | |||
@@ -251,24 +251,24 @@ ocp { | |||
251 | }; | 251 | }; |
252 | 252 | ||
253 | thermal-zones { | 253 | thermal-zones { |
254 | cpu-thermal: cpu-thermal { | 254 | cpu_thermal: cpu-thermal { |
255 | polling-delay-passive = <250>; /* milliseconds */ | 255 | polling-delay-passive = <250>; /* milliseconds */ |
256 | polling-delay = <1000>; /* milliseconds */ | 256 | polling-delay = <1000>; /* milliseconds */ |
257 | 257 | ||
258 | thermal-sensors = <&bandgap0>; | 258 | thermal-sensors = <&bandgap0>; |
259 | 259 | ||
260 | trips { | 260 | trips { |
261 | cpu-alert0: cpu-alert { | 261 | cpu_alert0: cpu-alert0 { |
262 | temperature = <90000>; /* millicelsius */ | 262 | temperature = <90000>; /* millicelsius */ |
263 | hysteresis = <2000>; /* millicelsius */ | 263 | hysteresis = <2000>; /* millicelsius */ |
264 | type = "active"; | 264 | type = "active"; |
265 | }; | 265 | }; |
266 | cpu-alert1: cpu-alert { | 266 | cpu_alert1: cpu-alert1 { |
267 | temperature = <100000>; /* millicelsius */ | 267 | temperature = <100000>; /* millicelsius */ |
268 | hysteresis = <2000>; /* millicelsius */ | 268 | hysteresis = <2000>; /* millicelsius */ |
269 | type = "passive"; | 269 | type = "passive"; |
270 | }; | 270 | }; |
271 | cpu-crit: cpu-crit { | 271 | cpu_crit: cpu-crit { |
272 | temperature = <125000>; /* millicelsius */ | 272 | temperature = <125000>; /* millicelsius */ |
273 | hysteresis = <2000>; /* millicelsius */ | 273 | hysteresis = <2000>; /* millicelsius */ |
274 | type = "critical"; | 274 | type = "critical"; |
@@ -277,17 +277,17 @@ thermal-zones { | |||
277 | 277 | ||
278 | cooling-maps { | 278 | cooling-maps { |
279 | map0 { | 279 | map0 { |
280 | trip = <&cpu-alert0>; | 280 | trip = <&cpu_alert0>; |
281 | cooling-device = <&fan0 THERMAL_NO_LIMITS 4>; | 281 | cooling-device = <&fan0 THERMAL_NO_LIMIT 4>; |
282 | }; | 282 | }; |
283 | map1 { | 283 | map1 { |
284 | trip = <&cpu-alert1>; | 284 | trip = <&cpu_alert1>; |
285 | cooling-device = <&fan0 5 THERMAL_NO_LIMITS>; | 285 | cooling-device = <&fan0 5 THERMAL_NO_LIMIT>; |
286 | }; | 286 | }; |
287 | map2 { | 287 | map2 { |
288 | trip = <&cpu-alert1>; | 288 | trip = <&cpu_alert1>; |
289 | cooling-device = | 289 | cooling-device = |
290 | <&cpu0 THERMAL_NO_LIMITS THERMAL_NO_LIMITS>; | 290 | <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; |
291 | }; | 291 | }; |
292 | }; | 292 | }; |
293 | }; | 293 | }; |
@@ -298,13 +298,13 @@ used to monitor the zone 'cpu-thermal' using its sole sensor. A fan | |||
298 | device (fan0) is controlled via I2C bus 1, at address 0x48, and has ten | 298 | device (fan0) is controlled via I2C bus 1, at address 0x48, and has ten |
299 | different cooling states 0-9. It is used to remove the heat out of | 299 | different cooling states 0-9. It is used to remove the heat out of |
300 | the thermal zone 'cpu-thermal' using its cooling states | 300 | the thermal zone 'cpu-thermal' using its cooling states |
301 | from its minimum to 4, when it reaches trip point 'cpu-alert0' | 301 | from its minimum to 4, when it reaches trip point 'cpu_alert0' |
302 | at 90C, as an example of active cooling. The same cooling device is used at | 302 | at 90C, as an example of active cooling. The same cooling device is used at |
303 | 'cpu-alert1', but from 5 to its maximum state. The cpu@0 device is also | 303 | 'cpu_alert1', but from 5 to its maximum state. The cpu@0 device is also |
304 | linked to the same thermal zone, 'cpu-thermal', as a passive cooling device, | 304 | linked to the same thermal zone, 'cpu-thermal', as a passive cooling device, |
305 | using all its cooling states at trip point 'cpu-alert1', | 305 | using all its cooling states at trip point 'cpu_alert1', |
306 | which is a trip point at 100C. On the thermal zone 'cpu-thermal', at the | 306 | which is a trip point at 100C. On the thermal zone 'cpu-thermal', at the |
307 | temperature of 125C, represented by the trip point 'cpu-crit', the silicon | 307 | temperature of 125C, represented by the trip point 'cpu_crit', the silicon |
308 | is not reliable anymore. | 308 | is not reliable anymore. |
309 | 309 | ||
310 | (b) - IC with several internal sensors | 310 | (b) - IC with several internal sensors |
@@ -329,7 +329,7 @@ ocp { | |||
329 | }; | 329 | }; |
330 | 330 | ||
331 | thermal-zones { | 331 | thermal-zones { |
332 | cpu-thermal: cpu-thermal { | 332 | cpu_thermal: cpu-thermal { |
333 | polling-delay-passive = <250>; /* milliseconds */ | 333 | polling-delay-passive = <250>; /* milliseconds */ |
334 | polling-delay = <1000>; /* milliseconds */ | 334 | polling-delay = <1000>; /* milliseconds */ |
335 | 335 | ||
@@ -338,12 +338,12 @@ thermal-zones { | |||
338 | 338 | ||
339 | trips { | 339 | trips { |
340 | /* each zone within the SoC may have its own trips */ | 340 | /* each zone within the SoC may have its own trips */ |
341 | cpu-alert: cpu-alert { | 341 | cpu_alert: cpu-alert { |
342 | temperature = <100000>; /* millicelsius */ | 342 | temperature = <100000>; /* millicelsius */ |
343 | hysteresis = <2000>; /* millicelsius */ | 343 | hysteresis = <2000>; /* millicelsius */ |
344 | type = "passive"; | 344 | type = "passive"; |
345 | }; | 345 | }; |
346 | cpu-crit: cpu-crit { | 346 | cpu_crit: cpu-crit { |
347 | temperature = <125000>; /* millicelsius */ | 347 | temperature = <125000>; /* millicelsius */ |
348 | hysteresis = <2000>; /* millicelsius */ | 348 | hysteresis = <2000>; /* millicelsius */ |
349 | type = "critical"; | 349 | type = "critical"; |
@@ -356,7 +356,7 @@ thermal-zones { | |||
356 | }; | 356 | }; |
357 | }; | 357 | }; |
358 | 358 | ||
359 | gpu-thermal: gpu-thermal { | 359 | gpu_thermal: gpu-thermal { |
360 | polling-delay-passive = <120>; /* milliseconds */ | 360 | polling-delay-passive = <120>; /* milliseconds */ |
361 | polling-delay = <1000>; /* milliseconds */ | 361 | polling-delay = <1000>; /* milliseconds */ |
362 | 362 | ||
@@ -365,12 +365,12 @@ thermal-zones { | |||
365 | 365 | ||
366 | trips { | 366 | trips { |
367 | /* each zone within the SoC may have its own trips */ | 367 | /* each zone within the SoC may have its own trips */ |
368 | gpu-alert: gpu-alert { | 368 | gpu_alert: gpu-alert { |
369 | temperature = <90000>; /* millicelsius */ | 369 | temperature = <90000>; /* millicelsius */ |
370 | hysteresis = <2000>; /* millicelsius */ | 370 | hysteresis = <2000>; /* millicelsius */ |
371 | type = "passive"; | 371 | type = "passive"; |
372 | }; | 372 | }; |
373 | gpu-crit: gpu-crit { | 373 | gpu_crit: gpu-crit { |
374 | temperature = <105000>; /* millicelsius */ | 374 | temperature = <105000>; /* millicelsius */ |
375 | hysteresis = <2000>; /* millicelsius */ | 375 | hysteresis = <2000>; /* millicelsius */ |
376 | type = "critical"; | 376 | type = "critical"; |
@@ -383,7 +383,7 @@ thermal-zones { | |||
383 | }; | 383 | }; |
384 | }; | 384 | }; |
385 | 385 | ||
386 | dsp-thermal: dsp-thermal { | 386 | dsp_thermal: dsp-thermal { |
387 | polling-delay-passive = <50>; /* milliseconds */ | 387 | polling-delay-passive = <50>; /* milliseconds */ |
388 | polling-delay = <1000>; /* milliseconds */ | 388 | polling-delay = <1000>; /* milliseconds */ |
389 | 389 | ||
@@ -392,12 +392,12 @@ thermal-zones { | |||
392 | 392 | ||
393 | trips { | 393 | trips { |
394 | /* each zone within the SoC may have its own trips */ | 394 | /* each zone within the SoC may have its own trips */ |
395 | dsp-alert: gpu-alert { | 395 | dsp_alert: dsp-alert { |
396 | temperature = <90000>; /* millicelsius */ | 396 | temperature = <90000>; /* millicelsius */ |
397 | hysteresis = <2000>; /* millicelsius */ | 397 | hysteresis = <2000>; /* millicelsius */ |
398 | type = "passive"; | 398 | type = "passive"; |
399 | }; | 399 | }; |
400 | dsp-crit: gpu-crit { | 400 | dsp_crit: gpu-crit { |
401 | temperature = <135000>; /* millicelsius */ | 401 | temperature = <135000>; /* millicelsius */ |
402 | hysteresis = <2000>; /* millicelsius */ | 402 | hysteresis = <2000>; /* millicelsius */ |
403 | type = "critical"; | 403 | type = "critical"; |
@@ -457,7 +457,7 @@ ocp { | |||
457 | }; | 457 | }; |
458 | 458 | ||
459 | thermal-zones { | 459 | thermal-zones { |
460 | cpu-thermal: cpu-thermal { | 460 | cpu_thermal: cpu-thermal { |
461 | polling-delay-passive = <250>; /* milliseconds */ | 461 | polling-delay-passive = <250>; /* milliseconds */ |
462 | polling-delay = <1000>; /* milliseconds */ | 462 | polling-delay = <1000>; /* milliseconds */ |
463 | 463 | ||
@@ -508,7 +508,7 @@ with many sensors and many cooling devices. | |||
508 | /* | 508 | /* |
509 | * An IC with several temperature sensor. | 509 | * An IC with several temperature sensor. |
510 | */ | 510 | */ |
511 | adc-dummy: sensor@0x50 { | 511 | adc_dummy: sensor@0x50 { |
512 | ... | 512 | ... |
513 | #thermal-sensor-cells = <1>; /* sensor internal ID */ | 513 | #thermal-sensor-cells = <1>; /* sensor internal ID */ |
514 | }; | 514 | }; |
@@ -520,7 +520,7 @@ thermal-zones { | |||
520 | polling-delay = <2500>; /* milliseconds */ | 520 | polling-delay = <2500>; /* milliseconds */ |
521 | 521 | ||
522 | /* sensor ID */ | 522 | /* sensor ID */ |
523 | thermal-sensors = <&adc-dummy 4>; | 523 | thermal-sensors = <&adc_dummy 4>; |
524 | 524 | ||
525 | trips { | 525 | trips { |
526 | ... | 526 | ... |
@@ -531,14 +531,14 @@ thermal-zones { | |||
531 | }; | 531 | }; |
532 | }; | 532 | }; |
533 | 533 | ||
534 | board-thermal: board-thermal { | 534 | board_thermal: board-thermal { |
535 | polling-delay-passive = <1000>; /* milliseconds */ | 535 | polling-delay-passive = <1000>; /* milliseconds */ |
536 | polling-delay = <2500>; /* milliseconds */ | 536 | polling-delay = <2500>; /* milliseconds */ |
537 | 537 | ||
538 | /* sensor ID */ | 538 | /* sensor ID */ |
539 | thermal-sensors = <&adc-dummy 0>, /* pcb top edge */ | 539 | thermal-sensors = <&adc_dummy 0>, /* pcb top edge */ |
540 | <&adc-dummy 1>, /* lcd */ | 540 | <&adc_dummy 1>, /* lcd */ |
541 | <&adc-dymmy 2>; /* back cover */ | 541 | <&adc_dummy 2>; /* back cover */ |
542 | /* | 542 | /* |
543 | * An array of coefficients describing the sensor | 543 | * An array of coefficients describing the sensor |
544 | * linear relation. E.g.: | 544 | * linear relation. E.g.: |
@@ -548,22 +548,22 @@ thermal-zones { | |||
548 | 548 | ||
549 | trips { | 549 | trips { |
550 | /* Trips are based on resulting linear equation */ | 550 | /* Trips are based on resulting linear equation */ |
551 | cpu-trip: cpu-trip { | 551 | cpu_trip: cpu-trip { |
552 | temperature = <60000>; /* millicelsius */ | 552 | temperature = <60000>; /* millicelsius */ |
553 | hysteresis = <2000>; /* millicelsius */ | 553 | hysteresis = <2000>; /* millicelsius */ |
554 | type = "passive"; | 554 | type = "passive"; |
555 | }; | 555 | }; |
556 | gpu-trip: gpu-trip { | 556 | gpu_trip: gpu-trip { |
557 | temperature = <55000>; /* millicelsius */ | 557 | temperature = <55000>; /* millicelsius */ |
558 | hysteresis = <2000>; /* millicelsius */ | 558 | hysteresis = <2000>; /* millicelsius */ |
559 | type = "passive"; | 559 | type = "passive"; |
560 | } | 560 | } |
561 | lcd-trip: lcp-trip { | 561 | lcd_trip: lcp-trip { |
562 | temperature = <53000>; /* millicelsius */ | 562 | temperature = <53000>; /* millicelsius */ |
563 | hysteresis = <2000>; /* millicelsius */ | 563 | hysteresis = <2000>; /* millicelsius */ |
564 | type = "passive"; | 564 | type = "passive"; |
565 | }; | 565 | }; |
566 | crit-trip: crit-trip { | 566 | crit_trip: crit-trip { |
567 | temperature = <68000>; /* millicelsius */ | 567 | temperature = <68000>; /* millicelsius */ |
568 | hysteresis = <2000>; /* millicelsius */ | 568 | hysteresis = <2000>; /* millicelsius */ |
569 | type = "critical"; | 569 | type = "critical"; |
@@ -572,17 +572,17 @@ thermal-zones { | |||
572 | 572 | ||
573 | cooling-maps { | 573 | cooling-maps { |
574 | map0 { | 574 | map0 { |
575 | trip = <&cpu-trip>; | 575 | trip = <&cpu_trip>; |
576 | cooling-device = <&cpu0 0 2>; | 576 | cooling-device = <&cpu0 0 2>; |
577 | contribution = <55>; | 577 | contribution = <55>; |
578 | }; | 578 | }; |
579 | map1 { | 579 | map1 { |
580 | trip = <&gpu-trip>; | 580 | trip = <&gpu_trip>; |
581 | cooling-device = <&gpu0 0 2>; | 581 | cooling-device = <&gpu0 0 2>; |
582 | contribution = <20>; | 582 | contribution = <20>; |
583 | }; | 583 | }; |
584 | map2 { | 584 | map2 { |
585 | trip = <&lcd-trip>; | 585 | trip = <&lcd_trip>; |
586 | cooling-device = <&lcd0 5 10>; | 586 | cooling-device = <&lcd0 5 10>; |
587 | contribution = <15>; | 587 | contribution = <15>; |
588 | }; | 588 | }; |