]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ARM: dts: meson: drop iio-hwmon in favour of generic-adc-thermal
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Sat, 8 Nov 2025 21:15:03 +0000 (22:15 +0100)
committerNeil Armstrong <neil.armstrong@linaro.org>
Wed, 7 Jan 2026 14:02:40 +0000 (15:02 +0100)
Commit 85b21fdec906e ("thermal/drivers/generic-adc: Register thermal
zones as hwmon sensors") made "generic-adc-thermal" also register hwmon
attributes. That means we now have the temperature sensor shown twice:
- once from iio-hwmon
- and another time from generic-adc-thermal

We need the latter for SoC temperature control, so simply drop the
former so userspace doesn't see duplicate sensors. Also
generic-adc-thermal provides a better name to userspace
("soc_thermal-virtual-0") than iio_hwmon.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Link: https://patch.msgid.link/20251108211503.1578711-1-martin.blumenstingl@googlemail.com
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
arch/arm/boot/dts/amlogic/meson.dtsi

index 28ec2c821cdc98c947348e88e6704295b690ff13..6792377b284193ecdf66cb70a7d22068ea3ae640 100644 (file)
        #size-cells = <1>;
        interrupt-parent = <&gic>;
 
-       iio-hwmon {
-               compatible = "iio-hwmon";
-               io-channels = <&saradc 8>;
-       };
-
        soc {
                compatible = "simple-bus";
                #address-cells = <1>;