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

Commit 29dc94b4 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 Embedded power monitor node"

parents bd831a1f 52423fac

arch/arm/boot/dts/qti/apq8084-liquid.dtsi

+19 −0
Original line number Diff line number Diff line
@@ -783,6 +783,25 @@ 
	};

};



&spi_epm {

	epm-adc@1 {

		compatible = "cy,epm-adc-cy8c5568lti-114";

		reg = <1>;

		interrupt-parent = <&msmgpio>;

		spi-max-frequency = <960000>;

		qcom,channels = <31>;

		qcom,gain = <50 50 50 50 50 100 50 100 50 50

				100 50 50 50 50 50 50 50 50 50

				50 50 50 100 50 50 50 1 1 1

				1>;

		qcom,rsense = <50 100 500 10 25 1000 40 200 200 5

				500 500 75 10 5 25 33 75 25 200

				10 25 33 100 10 10 3 1000 1000 1000

				1000>;

		qcom,channel-type = <0xf0000000>;

	};

};



&spmi_bus {

	qcom,pma8084@0 {

		qcom,leds@a300 {

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

+4 −3
Original line number Diff line number Diff line
@@ -1878,7 +1878,7 @@ 
		};

	};



	spi_0: spi@f9923000 { /* BLSP1 QUP1 */

	spi_0: spi_epm: spi@f9923000 { /* BLSP1 QUP1 */

		compatible = "qcom,spi-qup-v2";

		#address-cells = <1>;

		#size-cells = <0>;
@@ -1891,8 +1891,9 @@ 
		qcom,gpio-mosi = <&msmgpio 0 0>;

		qcom,gpio-miso = <&msmgpio 1 0>;

		qcom,gpio-clk  = <&msmgpio 3 0>;

		qcom,gpio-cs0  = <&msmgpio 0 0>;

		qcom,gpio-cs2  = <&msmgpio 117 0>;

		qcom,gpio-cs0  = <&msmgpio 2 0>;

		qcom,gpio-cs1  = <&msmgpio 116 0>;

		qcom,gpio-cs3  = <&msmgpio 117 0>;



		qcom,infinite-mode = <0>;

		qcom,use-bam;