Commit d42d5b6f authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Guenter Roeck

hwmon: (scpi) add thermal-of dependency

The newly added scpi thermal support is broken when the scpi driver
is built-in but the thermal driver is a loadable module:

drivers/built-in.o: In function `scpi_hwmon_probe':
(.text+0x444d70): undefined reference to `thermal_zone_of_sensor_unregister'
(.text+0x444d94): undefined reference to `thermal_zone_of_sensor_register'
drivers/built-in.o: In function `scpi_hwmon_remove':
(text+0x444e6c): undefined reference to `thermal_zone_of_sensor_unregister'

This uses the same Kconfig trick that we have in a couple of other
drivers already to ensure we can only select the driver in valid
configurations when either THERMAL_OF is disabled, or when with a
dependency on CONFIG_THERMAL that can force SCPI to be a loadable
module in the case I was hitting.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: 68acc77a ("hwmon: Support thermal zones registration for SCP temperature sensors")
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 5e0a0ee4
...@@ -324,6 +324,7 @@ config SENSORS_APPLESMC ...@@ -324,6 +324,7 @@ config SENSORS_APPLESMC
config SENSORS_ARM_SCPI config SENSORS_ARM_SCPI
tristate "ARM SCPI Sensors" tristate "ARM SCPI Sensors"
depends on ARM_SCPI_PROTOCOL depends on ARM_SCPI_PROTOCOL
depends on THERMAL || !THERMAL_OF
help help
This driver provides support for temperature, voltage, current This driver provides support for temperature, voltage, current
and power sensors available on ARM Ltd's SCP based platforms. The and power sensors available on ARM Ltd's SCP based platforms. The
......
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