mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-13 14:09:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'juno-update-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into soc/dt

Browse Source 
Arm Vexpress/Juno update for v6.8

Just a single update to align the thermal zone names with bindings matching
[alphanumericals]*-thermal pattern.

* tag 'juno-update-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  arm64: dts: juno: Align thermal zone names with bindings

Link: https://lore.kernel.org/r/20231213115826.3577764-1-sudeep.holla@arm.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2023-12-21 15:57:22 +00:00
parent 965c83326e fb4d25d7a3
commit 7b0ddbf748
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm64/boot/dts/arm/juno-base.dtsi
View File

@@ -747,7 +747,7 @@ scpi_sensors0: sensors {
};
thermal-zones {
pmic {
pmic-thermal {
polling-delay = <1000>;
polling-delay-passive = <100>;
thermal-sensors = <&scpi_sensors0 0>;
@@ -760,7 +760,7 @@ pmic_crit0: trip0 {
};
};
soc {
soc-thermal {
polling-delay = <1000>;
polling-delay-passive = <100>;
thermal-sensors = <&scpi_sensors0 3>;
@@ -773,28 +773,28 @@ soc_crit0: trip0 {
};
};
big_cluster_thermal_zone: big-cluster {
big_cluster_thermal_zone: big-cluster-thermal {
polling-delay = <1000>;
polling-delay-passive = <100>;
thermal-sensors = <&scpi_sensors0 21>;
status = "disabled";
};
little_cluster_thermal_zone: little-cluster {
little_cluster_thermal_zone: little-cluster-thermal {
polling-delay = <1000>;
polling-delay-passive = <100>;
thermal-sensors = <&scpi_sensors0 22>;
status = "disabled";
};
gpu0_thermal_zone: gpu0 {
gpu0_thermal_zone: gpu0-thermal {
polling-delay = <1000>;
polling-delay-passive = <100>;
thermal-sensors = <&scpi_sensors0 23>;
status = "disabled";
};
gpu1_thermal_zone: gpu1 {
gpu1_thermal_zone: gpu1-thermal {
polling-delay = <1000>;
polling-delay-passive = <100>;
thermal-sensors = <&scpi_sensors0 24>;

12
arch/arm64/boot/dts/arm/juno-scmi.dtsi
View File

@@ -76,27 +76,27 @@ scmi_sensors0: protocol@15 {
};
thermal-zones {
pmic {
pmic-thermal {
thermal-sensors = <&scmi_sensors0 0>;
};
soc {
soc-thermal {
thermal-sensors = <&scmi_sensors0 3>;
};
big-cluster {
big-cluster-thermal {
thermal-sensors = <&scmi_sensors0 21>;
};
little-cluster {
little-cluster-thermal {
thermal-sensors = <&scmi_sensors0 22>;
};
gpu0 {
gpu0-thermal {
thermal-sensors = <&scmi_sensors0 23>;
};
gpu1 {
gpu1-thermal {
thermal-sensors = <&scmi_sensors0 24>;
};
};