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

Commit aeb4ec2b 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 device for 8974 fluid"

parents 219f57dd 37553131

arch/arm/boot/dts/msm8974-fluid.dtsi

+19 −0
Original line number Diff line number Diff line
@@ -133,6 +133,20 @@ 
		};

	};



	i2c@f9928000 { /* BLSP1 QUP6 */

		nfc-nci@e {

			compatible = "qcom,nfc-nci";

			reg = <0x0e>;

			qcom,irq-gpio = <&msmgpio 59 0x00>;

			qcom,dis-gpio = <&msmgpio 13 0x00>;

			qcom,clk-src = "BBCLK2";

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

			interrupt-parent = <&msmgpio>;

			interrupts = <59 0>;

			qcom,clk-gpio = <&pm8941_gpios 32 0>;

		};

	};



	i2c@f9967000 {

		sii8334@72 {

			compatible = "qcom,mhl-sii8334";
@@ -607,6 +621,11 @@ 
	};



	gpio@df00 { /* GPIO 32 */

		qcom,mode = <0>;		/* QPNP_PIN_MODE_DIG_IN */

		qcom,pull = <5>;		/* QPNP_PIN_PULL_NO */

		qcom,vin-sel = <2>;		/* QPNP_PIN_VIN2 */

		qcom,src-sel = <2>;		/* QPNP_PIN_SEL_FUNC_1 */

		qcom,master-en = <1>;

	};



	gpio@e000 { /* GPIO 33 */

arch/arm/boot/dts/msm8974.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -2333,6 +2333,22 @@ 
		compatible = "qcom,bcl";

	};



	i2c@f9928000 { /* BLSP-1 QUP-6 */

		cell-index = <3>;

		compatible = "qcom,i2c-qup";

		reg = <0xf9928000 0x1000>;

		#address-cells = <1>;

		#size-cells = <0>;

		reg-names = "qup_phys_addr";

		interrupts = <0 100 0>;

		interrupt-names = "qup_err_intr";

		qcom,i2c-bus-freq = <400000>;

		qcom,i2c-src-freq = <19200000>;

		qcom,scl-gpio = <&msmgpio 30 0>;

		qcom,sda-gpio = <&msmgpio 29 0>;

		qcom,master-id = <86>;

	};



	qcom,ssm {

		compatible = "qcom,ssm";

		qcom,channel-name = "SSM_RTR";