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

Commit 4dca2692 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add VADC channels for mdmcalifornium"

parents c7746cb5 0b2ba357

arch/arm/boot/dts/qcom/mdmcalifornium-cdp.dtsi

+39 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2016, 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
@@ -106,6 +106,7 @@ 
		qcom,scale-function = <4>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

		qcom,vadc-thermal-node;

	};



	chan@53 {
@@ -117,6 +118,43 @@ 
		qcom,scale-function = <2>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

		qcom,vadc-thermal-node;

	};



	chan@4d {

		label = "mdm_case_therm";

		reg = <0x4d>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

		qcom,vadc-thermal-node;

	};



	chan@4e {

		label = "pa_therm1";

		reg = <0x4e>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

		qcom,vadc-thermal-node;

	};



	chan@4f {

		label = "pa_therm2";

		reg = <0x4f>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

		qcom,vadc-thermal-node;

	};

};

arch/arm/boot/dts/qcom/mdmcalifornium-mtp.dtsi

+38 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ 
		qcom,scale-function = <4>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

		qcom,vadc-thermal-node;

	};



	chan@53 {
@@ -139,5 +140,42 @@ 
		qcom,scale-function = <2>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

		qcom,vadc-thermal-node;

	};



	chan@4d {

		label = "mdm_case_therm";

		reg = <0x4d>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

		qcom,vadc-thermal-node;

	};



	chan@4e {

		label = "pa_therm1";

		reg = <0x4e>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

		qcom,vadc-thermal-node;

	};



	chan@4f {

		label = "pa_therm2";

		reg = <0x4f>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

		qcom,vadc-thermal-node;

	};

};