diff options
author | Hans de Goede <hdegoede@redhat.com> | 2024-09-05 16:51:58 +0200 |
---|---|---|
committer | Hans de Goede <hdegoede@redhat.com> | 2024-09-05 16:57:36 +0200 |
commit | 56d8b784c56588cd40f98e4b1d4f6e29e3cb02b8 (patch) | |
tree | 5edd10e48440fcbb5a76bbb9b78dc1706b3d5cec /arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | |
parent | 3a1fb526c2482b2f61c9813e9e14fcdab4ffa390 (diff) | |
parent | a54da9df75cd1b4b5028f6c60f9a211532680585 (diff) |
Merge tag 'hwmon-for-v6.11-rc7' into review-hans
Merge "hwmon fixes for v6.11-rc7" into review-hans to bring in
commit a54da9df75cd ("hwmon: (hp-wmi-sensors) Check if WMI event
data exists").
This is a dependency for a set of WMI event data refactoring changes.
Diffstat (limited to 'arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi index 6b6e3ee950e5..acf293310f7a 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi @@ -175,7 +175,7 @@ }; }; - core-cluster-thermal { + cluster-thermal { polling-delay-passive = <1000>; polling-delay = <5000>; thermal-sensors = <&tmu 1>; |