Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 963f98e8 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "thermal: adc-tm: Fix compilation recipe in makefile"

parents 0b0f7507 418e8fac

drivers/thermal/qcom/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ obj-$(CONFIG_QCOM_TSENS) += qcom_tsens.o 
qcom_tsens-y			+= tsens.o tsens-common.o tsens-v0_1.o \

				   tsens-8960.o tsens-v2.o tsens-v1.o

obj-$(CONFIG_QCOM_SPMI_TEMP_ALARM)	+= qcom-spmi-temp-alarm.o

obj-$(CONFIG_QTI_ADC_TM) += adc-tm.o

adc-tm-y += adc-tm-common.o adc-tm5.o adc-tm7.o

obj-$(CONFIG_QTI_ADC_TM) += qti-adc-tm.o

qti-adc-tm-y += adc-tm.o adc-tm-common.o adc-tm5.o adc-tm7.o

obj-$(CONFIG_QTI_QMI_SENSOR) += qti_qmi_sensor.o

qti_qmi_sensor-y += thermal_sensor_service_v01.o qmi_sensors.o

drivers/thermal/qcom/adc-tm-common.c

+1 −11
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.

 */



#include <linux/module.h>
@@ -316,7 +316,6 @@ int adc_tm_get_temp_vadc(struct adc_tm_sensor *sensor, int *temp) 


	return iio_read_channel_processed(sensor->adc, temp);

}

EXPORT_SYMBOL(adc_tm_get_temp_vadc);



int32_t adc_tm_read_reg(struct adc_tm_chip *chip,

					int16_t reg, u8 *data, int len)
@@ -329,7 +328,6 @@ int32_t adc_tm_read_reg(struct adc_tm_chip *chip, 


	return ret;

}

EXPORT_SYMBOL(adc_tm_read_reg);



int32_t adc_tm_write_reg(struct adc_tm_chip *chip,

					int16_t reg, u8 *data, int len)
@@ -342,7 +340,6 @@ int32_t adc_tm_write_reg(struct adc_tm_chip *chip, 


	return ret;

}

EXPORT_SYMBOL(adc_tm_write_reg);



int adc_tm_is_valid(struct adc_tm_chip *chip)

{
@@ -354,7 +351,6 @@ int adc_tm_is_valid(struct adc_tm_chip *chip) 


	return -EINVAL;

}

EXPORT_SYMBOL(adc_tm_is_valid);



int therm_fwd_scale(int64_t code, uint32_t adc_hc_vdd_ref_mv,

			const struct adc_tm_data *data)
@@ -372,7 +368,6 @@ int therm_fwd_scale(int64_t code, uint32_t adc_hc_vdd_ref_mv, 


	return result;

}

EXPORT_SYMBOL(therm_fwd_scale);



int therm_fwd_scale_adc7(int64_t code)

{
@@ -391,7 +386,6 @@ int therm_fwd_scale_adc7(int64_t code) 


	return result;

}

EXPORT_SYMBOL(therm_fwd_scale_adc7);



void adc_tm_scale_therm_voltage_100k(struct adc_tm_config *param,

				const struct adc_tm_data *data)
@@ -431,7 +425,6 @@ void adc_tm_scale_therm_voltage_100k(struct adc_tm_config *param, 
		param->high_thr_voltage++;



}

EXPORT_SYMBOL(adc_tm_scale_therm_voltage_100k);



void adc_tm_scale_therm_voltage_100k_adc7(struct adc_tm_config *param)

{
@@ -472,7 +465,6 @@ void adc_tm_scale_therm_voltage_100k_adc7(struct adc_tm_config *param) 
	if (temp > param->low_thr_temp)

		param->high_thr_voltage++;

}

EXPORT_SYMBOL(adc_tm_scale_therm_voltage_100k_adc7);



int32_t adc_tm_absolute_rthr(const struct adc_tm_data *data,

			struct adc_tm_config *tm_config)
@@ -493,7 +485,6 @@ int32_t adc_tm_absolute_rthr(const struct adc_tm_data *data, 


	return 0;

}

EXPORT_SYMBOL(adc_tm_absolute_rthr);



int32_t adc_tm_absolute_rthr_adc7(struct adc_tm_config *tm_config)

{
@@ -513,7 +504,6 @@ int32_t adc_tm_absolute_rthr_adc7(struct adc_tm_config *tm_config) 


	return 0;

}

EXPORT_SYMBOL(adc_tm_absolute_rthr_adc7);



MODULE_DESCRIPTION("Qualcomm Technologies Inc. PMIC ADC_TM common driver");

MODULE_LICENSE("GPL v2");

drivers/thermal/qcom/adc-tm5.c

+1 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.

 */



#include <linux/module.h>
@@ -1079,7 +1079,6 @@ const struct adc_tm_data data_adc_tm5 = { 
	.hw_settle = (unsigned int []) {15, 100, 200, 300, 400, 500, 600, 700,

					1, 2, 4, 8, 16, 32, 64, 128},

};

EXPORT_SYMBOL(data_adc_tm5);



MODULE_DESCRIPTION("Qualcomm Technologies Inc. ADC_TM5 driver");

MODULE_LICENSE("GPL v2");

drivers/thermal/qcom/adc-tm7.c

+1 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.

 */



#include <linux/module.h>
@@ -792,7 +792,6 @@ const struct adc_tm_data data_adc_tm7 = { 
					1000, 2000, 4000, 8000, 16000, 32000,

					64000, 128000},

};

EXPORT_SYMBOL(data_adc_tm7);



MODULE_DESCRIPTION("Qualcomm Technologies Inc. ADC_TM7 driver");

MODULE_LICENSE("GPL v2");