Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc/mpc85xx: Add TMU device tree support for T1040/T1042

Also add nodes and properties for thermal management support. Meanwhile
preprocessor support is needed using thermal of framework.

Signed-off-by: Jia Hongtao <hongtao.jia@freescale.com>
Reviewed-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>

authored by

Hongtao Jia and committed by
Scott Wood
be489a39 23307707

+106 -8
+1 -1
arch/powerpc/boot/dts/fsl/t1040d4rdb.dts
··· 43 43 interrupt-parent = <&mpic>; 44 44 }; 45 45 46 - /include/ "t1040si-post.dtsi" 46 + #include "t1040si-post.dtsi"
+1 -1
arch/powerpc/boot/dts/fsl/t1040qds.dts
··· 43 43 interrupt-parent = <&mpic>; 44 44 }; 45 45 46 - /include/ "t1040si-post.dtsi" 46 + #include "t1040si-post.dtsi"
+1 -1
arch/powerpc/boot/dts/fsl/t1040rdb.dts
··· 45 45 }; 46 46 }; 47 47 48 - /include/ "t1040si-post.dtsi" 48 + #include "t1040si-post.dtsi"
+94
arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
··· 32 32 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 33 33 */ 34 34 35 + #include <dt-bindings/thermal/thermal.h> 36 + 35 37 &bman_fbpr { 36 38 compatible = "fsl,bman-fbpr"; 37 39 alloc-ranges = <0 0 0x10000 0>; ··· 484 482 serdes: serdes@ea000 { 485 483 compatible = "fsl,t1040-serdes"; 486 484 reg = <0xea000 0x4000>; 485 + }; 486 + 487 + tmu: tmu@f0000 { 488 + compatible = "fsl,qoriq-tmu"; 489 + reg = <0xf0000 0x1000>; 490 + interrupts = <18 2 0 0>; 491 + fsl,tmu-range = <0xa0000 0x90026 0x8004a 0x1006a>; 492 + fsl,tmu-calibration = <0x00000000 0x00000025 493 + 0x00000001 0x00000028 494 + 0x00000002 0x0000002d 495 + 0x00000003 0x00000031 496 + 0x00000004 0x00000036 497 + 0x00000005 0x0000003a 498 + 0x00000006 0x00000040 499 + 0x00000007 0x00000044 500 + 0x00000008 0x0000004a 501 + 0x00000009 0x0000004f 502 + 0x0000000a 0x00000054 503 + 504 + 0x00010000 0x0000000d 505 + 0x00010001 0x00000013 506 + 0x00010002 0x00000019 507 + 0x00010003 0x0000001f 508 + 0x00010004 0x00000025 509 + 0x00010005 0x0000002d 510 + 0x00010006 0x00000033 511 + 0x00010007 0x00000043 512 + 0x00010008 0x0000004b 513 + 0x00010009 0x00000053 514 + 515 + 0x00020000 0x00000010 516 + 0x00020001 0x00000017 517 + 0x00020002 0x0000001f 518 + 0x00020003 0x00000029 519 + 0x00020004 0x00000031 520 + 0x00020005 0x0000003c 521 + 0x00020006 0x00000042 522 + 0x00020007 0x0000004d 523 + 0x00020008 0x00000056 524 + 525 + 0x00030000 0x00000012 526 + 0x00030001 0x0000001d>; 527 + #thermal-sensor-cells = <0>; 528 + }; 529 + 530 + thermal-zones { 531 + cpu_thermal: cpu-thermal { 532 + polling-delay-passive = <1000>; 533 + polling-delay = <5000>; 534 + 535 + thermal-sensors = <&tmu>; 536 + 537 + trips { 538 + cpu_alert: cpu-alert { 539 + temperature = <85000>; 540 + hysteresis = <2000>; 541 + type = "passive"; 542 + }; 543 + cpu_crit: cpu-crit { 544 + temperature = <95000>; 545 + hysteresis = <2000>; 546 + type = "critical"; 547 + }; 548 + }; 549 + 550 + cooling-maps { 551 + map0 { 552 + trip = <&cpu_alert>; 553 + cooling-device = 554 + <&cpu0 THERMAL_NO_LIMIT 555 + THERMAL_NO_LIMIT>; 556 + }; 557 + map1 { 558 + trip = <&cpu_alert>; 559 + cooling-device = 560 + <&cpu1 THERMAL_NO_LIMIT 561 + THERMAL_NO_LIMIT>; 562 + }; 563 + map2 { 564 + trip = <&cpu_alert>; 565 + cooling-device = 566 + <&cpu2 THERMAL_NO_LIMIT 567 + THERMAL_NO_LIMIT>; 568 + }; 569 + map3 { 570 + trip = <&cpu_alert>; 571 + cooling-device = 572 + <&cpu3 THERMAL_NO_LIMIT 573 + THERMAL_NO_LIMIT>; 574 + }; 575 + }; 576 + }; 487 577 }; 488 578 489 579 scfg: global-utilities@fc000 {
+1 -1
arch/powerpc/boot/dts/fsl/t1042d4rdb.dts
··· 50 50 }; 51 51 }; 52 52 53 - /include/ "t1040si-post.dtsi" 53 + #include "t1042si-post.dtsi"
+1 -1
arch/powerpc/boot/dts/fsl/t1042qds.dts
··· 43 43 interrupt-parent = <&mpic>; 44 44 }; 45 45 46 - /include/ "t1042si-post.dtsi" 46 + #include "t1042si-post.dtsi"
+1 -1
arch/powerpc/boot/dts/fsl/t1042rdb.dts
··· 45 45 }; 46 46 }; 47 47 48 - /include/ "t1042si-post.dtsi" 48 + #include "t1042si-post.dtsi"
+1 -1
arch/powerpc/boot/dts/fsl/t1042rdb_pi.dts
··· 54 54 }; 55 55 }; 56 56 57 - /include/ "t1042si-post.dtsi" 57 + #include "t1042si-post.dtsi"
+1 -1
arch/powerpc/boot/dts/fsl/t1042si-post.dtsi
··· 32 32 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 33 33 */ 34 34 35 - /include/ "t1040si-post.dtsi" 35 + #include "t1040si-post.dtsi" 36 36 37 37 /* Place holder for ethernet related device tree nodes */
+4
arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi
··· 76 76 reg = <0>; 77 77 clocks = <&mux0>; 78 78 next-level-cache = <&L2_1>; 79 + #cooling-cells = <2>; 79 80 L2_1: l2-cache { 80 81 next-level-cache = <&cpc>; 81 82 }; ··· 86 85 reg = <1>; 87 86 clocks = <&mux1>; 88 87 next-level-cache = <&L2_2>; 88 + #cooling-cells = <2>; 89 89 L2_2: l2-cache { 90 90 next-level-cache = <&cpc>; 91 91 }; ··· 96 94 reg = <2>; 97 95 clocks = <&mux2>; 98 96 next-level-cache = <&L2_3>; 97 + #cooling-cells = <2>; 99 98 L2_3: l2-cache { 100 99 next-level-cache = <&cpc>; 101 100 }; ··· 106 103 reg = <3>; 107 104 clocks = <&mux3>; 108 105 next-level-cache = <&L2_4>; 106 + #cooling-cells = <2>; 109 107 L2_4: l2-cache { 110 108 next-level-cache = <&cpc>; 111 109 };