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

Commit c636aef1 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 support for bcl on 8084"

parents 599055ed 2957453e

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

+5 −0
Original line number Diff line number Diff line
@@ -464,6 +464,11 @@ 
	};



	mpp@a500 { /* MPP 6 */

		qcom,mode = <4>;		/* Digital output */

		qcom,invert = <1>;

		qcom,ain-route = <1>;		/* AMUX 6 */

		qcom,src-sel = <0>;		/* Constant */

		qcom,master-en = <1>;

	};



	mpp@a600 { /* MPP 7 */

arch/arm/boot/dts/qcom/apq8084.dtsi

+23 −0
Original line number Diff line number Diff line
@@ -3102,6 +3102,17 @@ 


	qcom,bcl {

		compatible = "qcom,bcl";

		qcom,ibat-vadc = <&pma8084_vadc>;

		qcom,ibat-threshold-adc_tm = <&pma8084_adc_tm>;

		qcom,ibat-monitor {

			high-threshold-uamp = <3000000>;

			low-threshold-uamp = <1000000>;

			mitigation-freq-khz = <1958400>;

			ibat-channel = <0x15>;

			adc-interval-usec = <3900>;

			uv-to-ua-numerator = <2>;

			uv-to-ua-denominator = <1>;

		};

	};



	qcom,msm-mct {
@@ -3868,6 +3879,18 @@ 
		qcom,btm-channel-number = <0x70>;

		qcom,thermal-node;

	};



	chan@15 {

		label = "mpp6_div1";

		reg = <0x15>;

		qcom,decimation = <0>;

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

		qcom,calibration-type = "absolute";

		qcom,scale-function = <0>;

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

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

		qcom,btm-channel-number = <0x78>;

	};

};



&krait_regulator_pmic {

arch/arm/boot/dts/qcom/msm-pma8084.dtsi

+12 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, 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
@@ -306,6 +306,17 @@ 
				qcom,hw-settle-time = <0>;

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

			};



			chan@15 {

				label = "mpp6_div1";

				reg = <0x15>;

				qcom,decimation = <0>;

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

				qcom,calibration-type = "absolute";

				qcom,scale-function = <0>;

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

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

			};

		};



		pma8084_adc_tm: vadc@3400 {