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