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

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

Merge "ARM: dts: msm: Update ADC_TM compatible field for PM660"

parents ee266d16 51e01acc

Documentation/devicetree/bindings/thermal/qcom-adc-tm.txt

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ ADC_TM node 
    Value type: <string>

    Definition: Should contain "qcom,adc-tm5" or "qcom,adc-tm5-iio"

                for PMIC5 ADC TM driver.

		Should contain "qcom,adc-tm-rev2" for PMIC refresh

		ADC_TM driver.



- reg:

    Usage: required

arch/arm64/boot/dts/qcom/pm660.dtsi

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2016-2017, 2019,2020 The Linux Foundation. All rights reserved.

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -362,7 +362,7 @@ 
		};



		pm660_adc_tm: vadc@3400 {

			compatible = "qcom,adc-tm5";

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

			reg = <0x3400 0x100>;

			interrupts = <0x0 0x34 0x0 IRQ_TYPE_EDGE_RISING>;

			interrupt-names = "thr-int-en";

drivers/thermal/qcom/adc-tm.c

+5 −1
Original line number Diff line number Diff line 
/*

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

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -171,6 +171,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 
/*

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

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

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and
@@ -141,6 +141,7 @@ struct adc_tm_data { 
};



extern const struct adc_tm_data data_adc_tm5;

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 
/*

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

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1148,3 +1148,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},

};