diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-15 12:50:56 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-15 12:50:56 -0700 |
| commit | 9a004a75a3305fbd3c253f38cd0788164c4fbd56 (patch) | |
| tree | 7f038ef949e24e9b6645d2c12b50cd69efaf69a1 /drivers/hwmon/tmp102.c | |
| parent | f8113cd5b64f41502b98531e732d7d53539b5f19 (diff) | |
| parent | b67eed8ec19c334acd3935d224bd5dffc6c75fad (diff) | |
Merge branch 'v3.18/topic/thermal' into linux-linaro-lsk-v3.18
* v3.18/topic/thermal: (66 commits)
thermal: exynos: fix compile error in _zone_bind_cooling_device()
thermal: of-thermal: add support for reading coefficients property
thermal: support slope and offset coefficients
thermal: power_allocator: round the division when divvying up power
kernel.h: implement DIV_ROUND_CLOSEST_ULL
thermal: cpu_cooling: Fix power calculation when CPUs are offline
thermal: cpu_cooling: Remove cpu_dev update on policy CPU update
thermal: Default OF created trip points to writable
thermal: export thermal_zone_parameters to sysfs
thermal: core: Add Kconfig option to enable writable trips
of: thermal: Introduce sustainable power for a thermal zone
thermal: add trace events to the power allocator governor
thermal: introduce the Power Allocator governor
thermal: cpu_cooling: implement the power cooling device API
thermal: extend the cooling device API to include power information
thermal: let governors have private data for each thermal zone
thermal: fair_share: generalize the weight concept
thermal: export weight to sysfs
thermal: fair_share: use the weight from the thermal instance
thermal: of: fix cooling device weights in device tree
...
Diffstat (limited to 'drivers/hwmon/tmp102.c')
| -rw-r--r-- | drivers/hwmon/tmp102.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c index 51719956cc03..ba9f478f64ee 100644 --- a/drivers/hwmon/tmp102.c +++ b/drivers/hwmon/tmp102.c @@ -158,6 +158,10 @@ ATTRIBUTE_GROUPS(tmp102); #define TMP102_CONFIG (TMP102_CONF_TM | TMP102_CONF_EM | TMP102_CONF_CR1) #define TMP102_CONFIG_RD_ONLY (TMP102_CONF_R0 | TMP102_CONF_R1 | TMP102_CONF_AL) +static const struct thermal_zone_of_device_ops tmp102_of_thermal_ops = { + .get_temp = tmp102_read_temp, +}; + static int tmp102_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -215,7 +219,7 @@ static int tmp102_probe(struct i2c_client *client, } tmp102->hwmon_dev = hwmon_dev; tmp102->tz = thermal_zone_of_sensor_register(hwmon_dev, 0, hwmon_dev, - tmp102_read_temp, NULL); + &tmp102_of_thermal_ops); if (IS_ERR(tmp102->tz)) tmp102->tz = NULL; |