Commit 7b0ddbf7 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'juno-update-6.8' of...

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

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.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 965c8332 fb4d25d7
...@@ -747,7 +747,7 @@ scpi_sensors0: sensors { ...@@ -747,7 +747,7 @@ scpi_sensors0: sensors {
}; };
thermal-zones { thermal-zones {
pmic { pmic-thermal {
polling-delay = <1000>; polling-delay = <1000>;
polling-delay-passive = <100>; polling-delay-passive = <100>;
thermal-sensors = <&scpi_sensors0 0>; thermal-sensors = <&scpi_sensors0 0>;
...@@ -760,7 +760,7 @@ pmic_crit0: trip0 { ...@@ -760,7 +760,7 @@ pmic_crit0: trip0 {
}; };
}; };
soc { soc-thermal {
polling-delay = <1000>; polling-delay = <1000>;
polling-delay-passive = <100>; polling-delay-passive = <100>;
thermal-sensors = <&scpi_sensors0 3>; thermal-sensors = <&scpi_sensors0 3>;
...@@ -773,28 +773,28 @@ soc_crit0: trip0 { ...@@ -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 = <1000>;
polling-delay-passive = <100>; polling-delay-passive = <100>;
thermal-sensors = <&scpi_sensors0 21>; thermal-sensors = <&scpi_sensors0 21>;
status = "disabled"; status = "disabled";
}; };
little_cluster_thermal_zone: little-cluster { little_cluster_thermal_zone: little-cluster-thermal {
polling-delay = <1000>; polling-delay = <1000>;
polling-delay-passive = <100>; polling-delay-passive = <100>;
thermal-sensors = <&scpi_sensors0 22>; thermal-sensors = <&scpi_sensors0 22>;
status = "disabled"; status = "disabled";
}; };
gpu0_thermal_zone: gpu0 { gpu0_thermal_zone: gpu0-thermal {
polling-delay = <1000>; polling-delay = <1000>;
polling-delay-passive = <100>; polling-delay-passive = <100>;
thermal-sensors = <&scpi_sensors0 23>; thermal-sensors = <&scpi_sensors0 23>;
status = "disabled"; status = "disabled";
}; };
gpu1_thermal_zone: gpu1 { gpu1_thermal_zone: gpu1-thermal {
polling-delay = <1000>; polling-delay = <1000>;
polling-delay-passive = <100>; polling-delay-passive = <100>;
thermal-sensors = <&scpi_sensors0 24>; thermal-sensors = <&scpi_sensors0 24>;
......
...@@ -76,27 +76,27 @@ scmi_sensors0: protocol@15 { ...@@ -76,27 +76,27 @@ scmi_sensors0: protocol@15 {
}; };
thermal-zones { thermal-zones {
pmic { pmic-thermal {
thermal-sensors = <&scmi_sensors0 0>; thermal-sensors = <&scmi_sensors0 0>;
}; };
soc { soc-thermal {
thermal-sensors = <&scmi_sensors0 3>; thermal-sensors = <&scmi_sensors0 3>;
}; };
big-cluster { big-cluster-thermal {
thermal-sensors = <&scmi_sensors0 21>; thermal-sensors = <&scmi_sensors0 21>;
}; };
little-cluster { little-cluster-thermal {
thermal-sensors = <&scmi_sensors0 22>; thermal-sensors = <&scmi_sensors0 22>;
}; };
gpu0 { gpu0-thermal {
thermal-sensors = <&scmi_sensors0 23>; thermal-sensors = <&scmi_sensors0 23>;
}; };
gpu1 { gpu1-thermal {
thermal-sensors = <&scmi_sensors0 24>; thermal-sensors = <&scmi_sensors0 24>;
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment