From a48b323ba8d9e189d88daab8fd7f56a0f6211159 Mon Sep 17 00:00:00 2001 From: Huan Biao Date: Thu, 11 Jul 2019 11:33:53 +0800 Subject: [PATCH] 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 --- arch/arm/boot/dts/amlogic/gxl_p212_1g.dts | 7 ++----- arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts | 7 ++----- arch/arm/boot/dts/amlogic/gxl_p212_1g_hd.dts | 7 ++----- arch/arm/boot/dts/amlogic/gxl_p212_2g.dts | 7 ++----- arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts | 7 ++----- arch/arm/boot/dts/amlogic/gxl_p230_2g.dts | 7 ++----- arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts | 7 ++----- arch/arm/boot/dts/amlogic/gxl_p231_1g.dts | 7 ++----- arch/arm/boot/dts/amlogic/gxl_p231_2g.dts | 7 ++----- arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts | 7 ++----- arch/arm/boot/dts/amlogic/gxl_p241_1g.dts | 7 ++----- arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts | 7 ++----- arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts | 7 ++----- arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts | 7 ++----- arch/arm/boot/dts/amlogic/gxl_p281_1g.dts | 7 ++----- arch/arm/boot/dts/amlogic/gxl_p281_2g.dts | 7 ++----- arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts | 7 ++----- arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts | 7 ++----- arch/arm64/boot/dts/amlogic/gxl_p212_1g_hd.dts | 7 ++----- arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts | 7 ++----- arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts | 7 ++----- arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts | 7 ++----- arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts | 7 ++----- arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts | 7 ++----- arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts | 7 ++----- arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts | 7 ++----- arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts | 7 ++----- arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts | 7 ++----- arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts | 7 ++----- arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts | 7 ++----- arch/arm64/boot/dts/amlogic/gxl_p281_1g.dts | 7 ++----- arch/arm64/boot/dts/amlogic/gxl_p281_2g.dts | 7 ++----- 32 files changed, 64 insertions(+), 160 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts index 5eb7752f07fe..b489abf6c760 100644 --- 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 9b6687bab2fb..b0e2707771b7 100644 --- 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 3ca951f8fb98..0ee49edd28f0 100644 --- 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 2e209e49cdb8..0c65860fd4d9 100644 --- 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 a32d289ce6da..41f0b87a56be 100644 --- 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 2f0e9bdda730..fb75adac5aa6 100644 --- 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 9209c2889911..9418632ac359 100644 --- 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 e8110805d2a8..1da54dae3505 100644 --- 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 a816fa248b7d..ab65fb6432e3 100644 --- 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 ca4f8214b7b4..544fda8370be 100644 --- 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 ce410d61f372..b2be4836d5a5 100644 --- 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 e51474b44863..7cac9aead267 100644 --- 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 9a190718cbc9..200bebe173f1 100644 --- 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 544f4be6a6bd..d23e10b69dcc 100644 --- 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 25b8f3b0b906..57ace29c0313 100644 --- 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 dc9cecc291cf..062b3dd8f04a 100644 --- 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 46a627790948..2057f013059d 100644 --- 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 d4233f40a8d1..576d02167e1f 100644 --- 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 3e60766fef78..0ae100177c87 100644 --- 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 c2c20f28fe5c..f6f657cda369 100644 --- 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 a0fec9002010..a7cc856dae00 100644 --- 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 8bcc146169c1..1444c1a52205 100644 --- 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 bfee483487e5..264d6fe35a53 100644 --- 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 0e4d538f4548..482e4183a858 100644 --- 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 20528ff11d60..e08cbd8e308e 100644 --- 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 607014dd8f0c..bf8c29fa0500 100644 --- 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 b7fcc3853daf..4881fc3db5a0 100644 --- 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 097bd1da6d56..219d9c641f65 100644 --- 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 22833597c9d2..d566dc704ed1 100644 --- 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 455891f7af94..6ae401f820b0 100644 --- 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 3f539e39e147..f76a86901d69 100644 --- 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 77f007d324d6..60015a4eab7f 100644 --- 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 {