Project import generated by Copybara. GitOrigin-RevId: bd04d8bee722d17b33cc364f57deb9ad14f72fe1
diff --git a/arch/arm64/boot/dts/amlogic/mesonsm1_sabrina.dtsi b/arch/arm64/boot/dts/amlogic/mesonsm1_sabrina.dtsi index b8e1aa6..e0f6b2a 100644 --- a/arch/arm64/boot/dts/amlogic/mesonsm1_sabrina.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesonsm1_sabrina.dtsi
@@ -1991,7 +1991,7 @@ dyn_coeff = <215>; gpu_pp = <2>; cluster_id = <0>; - node_name = "gpufreq_cool0"; + node_name = "bifrost"; device_type = "gpufreq"; }; gpucore_cool { @@ -2008,9 +2008,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 */ };
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_sabrina.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_sabrina.dts index e1c8c6e..52ba176 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_sabrina.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_sabrina.dts
@@ -984,27 +984,27 @@ cooling-maps { cpufreq_cooling_map0 { trip = <&soc_pll_trip0>; - cooling-device = <&cpufreq_cool0 0 4>; + cooling-device = <&CPU0 0 4>; }; cpufreq_cooling_map1 { trip = <&soc_pll_trip1>; - cooling-device = <&cpufreq_cool0 5 6>; + cooling-device = <&CPU0 5 6>; }; cpufreq_cooling_map2 { trip = <&soc_pll_trip2>; - cooling-device = <&cpufreq_cool0 7 7>; + cooling-device = <&CPU0 7 7>; }; cpufreq_cooling_map3 { trip = <&soc_pll_trip3>; - cooling-device = <&cpufreq_cool0 8 8>; + cooling-device = <&CPU0 8 8>; }; gpufreq_cooling_map1 { trip = <&soc_pll_trip0>; - cooling-device = <&gpufreq_cool0 1 1>; + cooling-device = <&gpu 1 1>; }; gpufreq_cooling_map2 { trip = <&soc_pll_trip1>; - cooling-device = <&gpufreq_cool0 2 2>; + cooling-device = <&gpu 2 2>; }; }; }; @@ -1045,27 +1045,27 @@ cooling-maps { cpufreq_cooling_map0 { trip = <&soc_ddr_trip0>; - cooling-device = <&cpufreq_cool0 0 4>; + cooling-device = <&CPU0 0 4>; }; cpufreq_cooling_map1 { trip = <&soc_ddr_trip1>; - cooling-device = <&cpufreq_cool0 5 6>; + cooling-device = <&CPU0 5 6>; }; cpufreq_cooling_map2 { trip = <&soc_ddr_trip2>; - cooling-device = <&cpufreq_cool0 7 7>; + cooling-device = <&CPU0 7 7>; }; cpufreq_cooling_map3 { trip = <&soc_ddr_trip3>; - cooling-device = <&cpufreq_cool0 8 8>; + cooling-device = <&CPU0 8 8>; }; gpufreq_cooling_map1 { trip = <&soc_ddr_trip0>; - cooling-device = <&gpufreq_cool0 1 1>; + cooling-device = <&gpu 1 1>; }; gpufreq_cooling_map2 { trip = <&soc_ddr_trip1>; - cooling-device = <&gpufreq_cool0 2 2>; + cooling-device = <&gpu 2 2>; }; }; }; @@ -1073,6 +1073,7 @@ board_ddr_thermal: board_ddr_thermal { polling-delay = <1000>; polling-delay-passive = <100>; + policy = "step_wise"; thermal-sensors = <&thermistor_ddr>; trips { board_ddr_trip0: trip-point@0 { @@ -1104,27 +1105,27 @@ cooling-maps { cpufreq_cooling_map0 { trip = <&board_ddr_trip0>; - cooling-device = <&cpufreq_cool0 0 4>; + cooling-device = <&CPU0 0 4>; }; cpufreq_cooling_map1 { trip = <&board_ddr_trip1>; - cooling-device = <&cpufreq_cool0 5 6>; + cooling-device = <&CPU0 5 6>; }; cpufreq_cooling_map2 { trip = <&board_ddr_trip2>; - cooling-device = <&cpufreq_cool0 7 7>; + cooling-device = <&CPU0 7 7>; }; cpufreq_cooling_map3 { trip = <&board_ddr_trip3>; - cooling-device = <&cpufreq_cool0 8 8>; + cooling-device = <&CPU0 8 8>; }; gpufreq_cooling_map0 { trip = <&board_ddr_trip0>; - cooling-device = <&gpufreq_cool0 1 1>; + cooling-device = <&gpu 1 1>; }; gpufreq_cooling_map1 { trip = <&board_ddr_trip1>; - cooling-device = <&gpufreq_cool0 2 2>; + cooling-device = <&gpu 2 2>; }; }; }; @@ -1132,6 +1133,7 @@ board_soc_thermal: board_soc_thermal { polling-delay = <1000>; polling-delay-passive = <100>; + policy = "step_wise"; thermal-sensors = <&thermistor_soc>; trips { board_soc_trip0: trip-point@0 { @@ -1163,27 +1165,27 @@ cooling-maps { cpufreq_cooling_map0 { trip = <&board_soc_trip0>; - cooling-device = <&cpufreq_cool0 0 4>; + cooling-device = <&CPU0 0 4>; }; cpufreq_cooling_map1 { trip = <&board_soc_trip1>; - cooling-device = <&cpufreq_cool0 5 6>; + cooling-device = <&CPU0 5 6>; }; cpufreq_cooling_map2 { trip = <&board_soc_trip2>; - cooling-device = <&cpufreq_cool0 7 7>; + cooling-device = <&CPU0 7 7>; }; cpufreq_cooling_map3 { trip = <&board_soc_trip3>; - cooling-device = <&cpufreq_cool0 8 8>; + cooling-device = <&CPU0 8 8>; }; gpufreq_cooling_map0 { trip = <&board_soc_trip0>; - cooling-device = <&gpufreq_cool0 1 1>; + cooling-device = <&gpu 1 1>; }; gpufreq_cooling_map1 { trip = <&board_soc_trip1>; - cooling-device = <&gpufreq_cool0 2 2>; + cooling-device = <&gpu 2 2>; }; }; }; @@ -1191,6 +1193,7 @@ skin_thermal: skin_thermal { polling-delay = <1000>; polling-delay-passive = <100>; + policy = "step_wise"; thermal-sensors = <&thermistor_wifi>; coefficients = <1 (-3500)>; trips { @@ -1223,27 +1226,27 @@ cooling-maps { cpufreq_cooling_map0 { trip = <&skin_trip0>; - cooling-device = <&cpufreq_cool0 0 4>; + cooling-device = <&CPU0 0 4>; }; cpufreq_cooling_map1 { trip = <&skin_trip1>; - cooling-device = <&cpufreq_cool0 5 6>; + cooling-device = <&CPU0 5 6>; }; cpufreq_cooling_map2 { trip = <&skin_trip2>; - cooling-device = <&cpufreq_cool0 7 7>; + cooling-device = <&CPU0 7 7>; }; cpufreq_cooling_map3 { trip = <&skin_trip3>; - cooling-device = <&cpufreq_cool0 8 8>; + cooling-device = <&CPU0 8 8>; }; gpufreq_cooling_map0 { trip = <&skin_trip0>; - cooling-device = <&gpufreq_cool0 1 1>; + cooling-device = <&gpu 1 1>; }; gpufreq_cooling_map1 { trip = <&skin_trip1>; - cooling-device = <&gpufreq_cool0 2 2>; + cooling-device = <&gpu 2 2>; }; }; };