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

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

Merge "thermal: adc_tm: Update support for PMIC4 ADC_TM"

parents 5cbf8ce1 84e9cfe0

drivers/thermal/qcom/adc-tm.c

+4 −0
Original line number Diff line number Diff line
@@ -195,6 +195,10 @@ static const struct of_device_id adc_tm_match_table[] = { 
		.compatible = "qcom,adc-tm5",

		.data = &data_adc_tm5,

	},

	{

		.compatible = "qcom,adc-tm-rev2",

		.data = &data_adc_tm_rev2,

	},

	{

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

		.data = &data_adc_tm5,

drivers/thermal/qcom/adc-tm.h

+2 −1
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.

 */



#ifndef __QCOM_ADC_TM_H__
@@ -164,6 +164,7 @@ struct adc_tm_data { 


extern const struct adc_tm_data data_adc_tm5;

extern const struct adc_tm_data data_adc_tm7;

extern const struct adc_tm_data data_adc_tm_rev2;



/**

 * Channel index for the corresponding index to adc_tm_channel_select

drivers/thermal/qcom/adc-tm5.c

+9 −1
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>
@@ -1140,3 +1140,11 @@ 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},

};



const struct adc_tm_data data_adc_tm_rev2 = {

	.ops			= &ops_adc_tm5,

	.full_scale_code_volt	= 0x4000,

	.decimation = (unsigned int []) {256, 512, 1024},

	.hw_settle = (unsigned int []) {0, 100, 200, 300, 400, 500, 600, 700,

					800, 900, 1, 2, 4, 6, 8, 10},

};