Skip to content

Commit

Permalink
powerpc/mpc85xx: Add TMU device tree support for T1040/T1042
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Hongtao Jia authored and Scott Wood committed Dec 24, 2015
1 parent 2330770 commit be489a3
Show file tree
Hide file tree
Showing 10 changed files with 106 additions and 8 deletions.
2 changes: 1 addition & 1 deletion arch/powerpc/boot/dts/fsl/t1040d4rdb.dts
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@
interrupt-parent = <&mpic>;
};

/include/ "t1040si-post.dtsi"
#include "t1040si-post.dtsi"
2 changes: 1 addition & 1 deletion arch/powerpc/boot/dts/fsl/t1040qds.dts
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@
interrupt-parent = <&mpic>;
};

/include/ "t1040si-post.dtsi"
#include "t1040si-post.dtsi"
2 changes: 1 addition & 1 deletion arch/powerpc/boot/dts/fsl/t1040rdb.dts
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@
};
};

/include/ "t1040si-post.dtsi"
#include "t1040si-post.dtsi"
94 changes: 94 additions & 0 deletions arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#include <dt-bindings/thermal/thermal.h>

&bman_fbpr {
compatible = "fsl,bman-fbpr";
alloc-ranges = <0 0 0x10000 0>;
Expand Down Expand Up @@ -484,6 +486,98 @@
reg = <0xea000 0x4000>;
};

tmu: tmu@f0000 {
compatible = "fsl,qoriq-tmu";
reg = <0xf0000 0x1000>;
interrupts = <18 2 0 0>;
fsl,tmu-range = <0xa0000 0x90026 0x8004a 0x1006a>;
fsl,tmu-calibration = <0x00000000 0x00000025
0x00000001 0x00000028
0x00000002 0x0000002d
0x00000003 0x00000031
0x00000004 0x00000036
0x00000005 0x0000003a
0x00000006 0x00000040
0x00000007 0x00000044
0x00000008 0x0000004a
0x00000009 0x0000004f
0x0000000a 0x00000054

0x00010000 0x0000000d
0x00010001 0x00000013
0x00010002 0x00000019
0x00010003 0x0000001f
0x00010004 0x00000025
0x00010005 0x0000002d
0x00010006 0x00000033
0x00010007 0x00000043
0x00010008 0x0000004b
0x00010009 0x00000053

0x00020000 0x00000010
0x00020001 0x00000017
0x00020002 0x0000001f
0x00020003 0x00000029
0x00020004 0x00000031
0x00020005 0x0000003c
0x00020006 0x00000042
0x00020007 0x0000004d
0x00020008 0x00000056

0x00030000 0x00000012
0x00030001 0x0000001d>;
#thermal-sensor-cells = <0>;
};

thermal-zones {
cpu_thermal: cpu-thermal {
polling-delay-passive = <1000>;
polling-delay = <5000>;

thermal-sensors = <&tmu>;

trips {
cpu_alert: cpu-alert {
temperature = <85000>;
hysteresis = <2000>;
type = "passive";
};
cpu_crit: cpu-crit {
temperature = <95000>;
hysteresis = <2000>;
type = "critical";
};
};

cooling-maps {
map0 {
trip = <&cpu_alert>;
cooling-device =
<&cpu0 THERMAL_NO_LIMIT
THERMAL_NO_LIMIT>;
};
map1 {
trip = <&cpu_alert>;
cooling-device =
<&cpu1 THERMAL_NO_LIMIT
THERMAL_NO_LIMIT>;
};
map2 {
trip = <&cpu_alert>;
cooling-device =
<&cpu2 THERMAL_NO_LIMIT
THERMAL_NO_LIMIT>;
};
map3 {
trip = <&cpu_alert>;
cooling-device =
<&cpu3 THERMAL_NO_LIMIT
THERMAL_NO_LIMIT>;
};
};
};
};

scfg: global-utilities@fc000 {
compatible = "fsl,t1040-scfg";
reg = <0xfc000 0x1000>;
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/boot/dts/fsl/t1042d4rdb.dts
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@
};
};

/include/ "t1040si-post.dtsi"
#include "t1042si-post.dtsi"
2 changes: 1 addition & 1 deletion arch/powerpc/boot/dts/fsl/t1042qds.dts
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@
interrupt-parent = <&mpic>;
};

/include/ "t1042si-post.dtsi"
#include "t1042si-post.dtsi"
2 changes: 1 addition & 1 deletion arch/powerpc/boot/dts/fsl/t1042rdb.dts
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@
};
};

/include/ "t1042si-post.dtsi"
#include "t1042si-post.dtsi"
2 changes: 1 addition & 1 deletion arch/powerpc/boot/dts/fsl/t1042rdb_pi.dts
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@
};
};

/include/ "t1042si-post.dtsi"
#include "t1042si-post.dtsi"
2 changes: 1 addition & 1 deletion arch/powerpc/boot/dts/fsl/t1042si-post.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

/include/ "t1040si-post.dtsi"
#include "t1040si-post.dtsi"

/* Place holder for ethernet related device tree nodes */
4 changes: 4 additions & 0 deletions arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
reg = <0>;
clocks = <&mux0>;
next-level-cache = <&L2_1>;
#cooling-cells = <2>;
L2_1: l2-cache {
next-level-cache = <&cpc>;
};
Expand All @@ -85,6 +86,7 @@
reg = <1>;
clocks = <&mux1>;
next-level-cache = <&L2_2>;
#cooling-cells = <2>;
L2_2: l2-cache {
next-level-cache = <&cpc>;
};
Expand All @@ -94,6 +96,7 @@
reg = <2>;
clocks = <&mux2>;
next-level-cache = <&L2_3>;
#cooling-cells = <2>;
L2_3: l2-cache {
next-level-cache = <&cpc>;
};
Expand All @@ -103,6 +106,7 @@
reg = <3>;
clocks = <&mux3>;
next-level-cache = <&L2_4>;
#cooling-cells = <2>;
L2_4: l2-cache {
next-level-cache = <&cpc>;
};
Expand Down

0 comments on commit be489a3

Please sign in to comment.