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

Commit e6d83bd9 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 NFC dtsi entry for 8610 qrd skuaa devices"

parents 54cef805 38af618a

arch/arm/boot/dts/msm8610-qrd-skuaa.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -27,15 +27,6 @@ 


        qcom,ext-spk-amp-gpio = <&msmgpio 92 0x0>;

    };

};



/ {

	qrd_batterydata: qcom,battery-data {

		qcom,rpull-up-kohm = <100>;

		qcom,vref-batt-therm = <1800000>;



		/include/ "batterydata-qrd-4v2-1300mah.dtsi"

	};



	i2c@f9925000 { /* BLSP-1 QUP-3 */

		nfc-nci@e {
@@ -51,6 +42,15 @@ 
			vlogic-supply = <&pm8110_l14>;

		};

	};

};



/ {

	qrd_batterydata: qcom,battery-data {

		qcom,rpull-up-kohm = <100>;

		qcom,vref-batt-therm = <1800000>;



		/include/ "batterydata-qrd-4v2-1300mah.dtsi"

	};



};