dts: thermal: fix gpu pp get fail issue [1/1]

PD#SWPL-11138

Problem:
gpufreq cooling device init get gpu pp fail

Solution:
get gpu pp from gpu dts

Verify:
verified on s905x p212

Change-Id: I0dfa8f6ff2a767432177301b32acdceb0f5e3462
Signed-off-by: Huan Biao <huan.biao@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts
index 5eb7752..b489abf 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts
@@ -450,7 +450,7 @@
                                min_state = <500>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -467,9 +467,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -518,7 +515,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
index 9b6687b..b0e2707 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
@@ -418,7 +418,7 @@
                                min_state = <500>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -435,9 +435,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -486,7 +483,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_1g_hd.dts b/arch/arm/boot/dts/amlogic/gxl_p212_1g_hd.dts
index 3ca951f..0ee49ed 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p212_1g_hd.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p212_1g_hd.dts
@@ -429,7 +429,7 @@
                                min_state = <400>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -446,9 +446,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -497,7 +494,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts
index 2e209e4..0c65860 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts
@@ -537,7 +537,7 @@
                                min_state = <500>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -554,9 +554,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -605,7 +602,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
index a32d289..41f0b87 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
@@ -496,7 +496,7 @@
                                min_state = <500>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -513,9 +513,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -564,7 +561,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts
index 2f0e9bd..fb75ada 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts
@@ -526,7 +526,7 @@
                                min_state = <400>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -543,9 +543,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -594,7 +591,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts
index 9209c28..9418632 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts
@@ -509,7 +509,7 @@
                                min_state = <400>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -526,9 +526,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -577,7 +574,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts
index e811080..1da54da 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts
@@ -452,7 +452,7 @@
                                min_state = <400>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -469,9 +469,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -520,7 +517,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts
index a816fa2..ab65fb6 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts
@@ -451,7 +451,7 @@
                                min_state = <400>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -468,9 +468,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -519,7 +516,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
index ca4f821..544fda8 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
@@ -441,7 +441,7 @@
                                min_state = <400>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -458,9 +458,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -509,7 +506,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts
index ce410d6..b2be483 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts
@@ -513,7 +513,7 @@
                                min_state = <400>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -530,9 +530,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -581,7 +578,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
index e51474b..7cac9ae 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
@@ -491,7 +491,7 @@
                                min_state = <400>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -508,9 +508,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -559,7 +556,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts b/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts
index 9a19071..200bebe 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts
@@ -513,7 +513,7 @@
                                min_state = <400>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -530,9 +530,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -581,7 +578,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
index 544f4be..d23e10b 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
@@ -490,7 +490,7 @@
                                min_state = <400>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -507,9 +507,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -558,7 +555,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p281_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p281_1g.dts
index 25b8f3b..57ace29 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p281_1g.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p281_1g.dts
@@ -443,7 +443,7 @@
                                min_state = <500>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -460,9 +460,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -511,7 +508,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm/boot/dts/amlogic/gxl_p281_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p281_2g.dts
index dc9cecc..062b3dd 100644 (file)
--- a/arch/arm/boot/dts/amlogic/gxl_p281_2g.dts
+++ b/arch/arm/boot/dts/amlogic/gxl_p281_2g.dts
@@ -537,7 +537,7 @@
                                min_state = <500>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -554,9 +554,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -605,7 +602,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts
index 46a6277..2057f01 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts
@@ -445,7 +445,7 @@
                                min_state = <500>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -462,9 +462,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -513,7 +510,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
index d4233f4..576d021 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
@@ -417,7 +417,7 @@
                                min_state = <500>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -434,9 +434,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -485,7 +482,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_hd.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_hd.dts
index 3e60766..0ae1001 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_hd.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_hd.dts
@@ -428,7 +428,7 @@
                                min_state = <400>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -445,9 +445,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -496,7 +493,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
index c2c20f2..f6f657c 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
@@ -534,7 +534,7 @@
                                min_state = <500>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -551,9 +551,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -602,7 +599,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
index a0fec90..a7cc856 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
@@ -496,7 +496,7 @@
                                min_state = <500>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -513,9 +513,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -564,7 +561,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
index 8bcc146..1444c1a 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
@@ -524,7 +524,7 @@
                                min_state = <400>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -541,9 +541,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -592,7 +589,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts
index bfee483..264d6fe 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts
@@ -510,7 +510,7 @@
                                min_state = <400>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -527,9 +527,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -578,7 +575,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts
index 0e4d538..482e418 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts
@@ -451,7 +451,7 @@
                                min_state = <400>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -468,9 +468,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -519,7 +516,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts
index 20528ff..e08cbd8 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts
@@ -451,7 +451,7 @@
                                min_state = <400>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -468,9 +468,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -519,7 +516,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
index 607014d..bf8c29f 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
@@ -441,7 +441,7 @@
                                min_state = <400>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -458,9 +458,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -509,7 +506,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts
index b7fcc38..4881fc3 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts
@@ -509,7 +509,7 @@
                                min_state = <400>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -526,9 +526,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -577,7 +574,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
index 097bd1d..219d9c6 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
@@ -490,7 +490,7 @@
                                min_state = <400>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -507,9 +507,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -558,7 +555,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts
index 2283359..d566dc7 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts
@@ -510,7 +510,7 @@
                                min_state = <400>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -527,9 +527,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -578,7 +575,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
index 455891f..6ae401f 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
@@ -489,7 +489,7 @@
                                min_state = <400>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -506,9 +506,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -557,7 +554,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p281_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p281_1g.dts
index 3f539e3..f76a869 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p281_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p281_1g.dts
@@ -438,7 +438,7 @@
                                min_state = <500>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -455,9 +455,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -506,7 +503,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p281_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p281_2g.dts
index 77f007d..60015a4 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p281_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p281_2g.dts
@@ -534,7 +534,7 @@
                                min_state = <500>;
                                dyn_coeff = <437>;
                                cluster_id = <0>;
-                               node_name = "gpufreq_cool0";
+                               node_name = "mali";
                                device_type = "gpufreq";
                        };
                        gpucore_cool {
@@ -551,9 +551,6 @@
                cpucore_cool0:cpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
-               gpufreq_cool0:gpufreq_cool0 {
-                       #cooling-cells = <2>; /* min followed by max */
-               };
                gpucore_cool0:gpucore_cool0 {
                        #cooling-cells = <2>; /* min followed by max */
                };
@@ -602,7 +599,7 @@
                                };
                                gpufreq_cooling_map {
                                        trip = <&control>;
-                                       cooling-device = <&gpufreq_cool0 0 4>;
+                                       cooling-device = <&gpu 0 4>;
                                        contribution = <1024>;
                                };
                                gpucore_cooling_map {