diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-05-23 20:31:57 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-05-23 20:31:57 +0200 |
| commit | 388292df27810a01c3f459533578255bbba4a4de (patch) | |
| tree | 091d8dd55b7d4556306603bdad0e20d31a13719f /include/linux | |
| parent | 5a66bfb27748d4fd284997dea060c76cdc245375 (diff) | |
| parent | c23b7517fe623d5812436682937a79ca0cc4cd39 (diff) | |
| download | cachepc-linux-388292df27810a01c3f459533578255bbba4a4de.tar.gz cachepc-linux-388292df27810a01c3f459533578255bbba4a4de.zip | |
Merge back earlier thermal control updates for 5.19-rc1.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/iio/adc/qcom-vadc-common.h | 2 | ||||
| -rw-r--r-- | include/linux/thermal.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/iio/adc/qcom-vadc-common.h b/include/linux/iio/adc/qcom-vadc-common.h index ce78d4804994..aa21b032e861 100644 --- a/include/linux/iio/adc/qcom-vadc-common.h +++ b/include/linux/iio/adc/qcom-vadc-common.h @@ -152,6 +152,8 @@ int qcom_adc5_hw_scale(enum vadc_scale_fn_type scaletype, u16 qcom_adc_tm5_temp_volt_scale(unsigned int prescale_ratio, u32 full_scale_code_volt, int temp); +u16 qcom_adc_tm5_gen2_temp_res_scale(int temp); + int qcom_adc5_prescaling_from_dt(u32 num, u32 den); int qcom_adc5_hw_settle_time_from_dt(u32 value, const unsigned int *hw_settle); diff --git a/include/linux/thermal.h b/include/linux/thermal.h index c314893970b3..365733b428d8 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -299,6 +299,8 @@ struct thermal_zone_params { * temperature. * @set_trip_temp: a pointer to a function that sets the trip temperature on * hardware. + * @change_mode: a pointer to a function that notifies the thermal zone + * mode change. */ struct thermal_zone_of_device_ops { int (*get_temp)(void *, int *); @@ -306,6 +308,7 @@ struct thermal_zone_of_device_ops { int (*set_trips)(void *, int, int); int (*set_emul_temp)(void *, int); int (*set_trip_temp)(void *, int, int); + int (*change_mode) (void *, enum thermal_device_mode); }; /* Function declarations */ |