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

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

Merge "thermal: adc-tm: Fix match table description and Makefile"

parents bc4811bb 444271f5

drivers/thermal/qcom/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +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-common.o adc-tm5.o adc-tm7.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_QMI_SENSOR) += qti_qmi_sensor.o

qti_qmi_sensor-y += thermal_sensor_service_v01.o qmi_sensors.o

drivers/thermal/qcom/adc-tm.c

+3 −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/err.h>
@@ -188,7 +188,8 @@ static const struct of_device_id adc_tm_match_table[] = { 
	{

		.compatible = "qcom,adc-tm5-iio",

		.data = &data_adc_tm5,



	},

	{

		.compatible = "qcom,adc-tm7",

		.data = &data_adc_tm7,

	},