Merge "ARM: dts: msm: enable NFC on QRD msm8916"

		qcom,panel-maxy = <1369>;

		qcom,key-codes = <158 172 139>;

	};

	i2c@78ba000 { /* BLSP1 QUP6 */

		nfc-nci@e {

			compatible = "qcom,nfc-nci";

			reg = <0x0e>;

			qcom,irq-gpio = <&msm_gpio 21 0x00>;

			qcom,dis-gpio = <&msm_gpio 20 0x00>;

			qcom,clk-src = "BBCLK2";

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

			interrupt-parent = <&msm_gpio>;

			interrupts = <21 0>;

			interrupt-names = "nfc_irq";

			pinctrl-names = "nfc_active","nfc_suspend";

			pinctrl-0 = <&nfc_int_active &nfc_disable_active>;

			pinctrl-1 = <&nfc_int_suspend &nfc_disable_suspend>;

			qcom,clk-gpio = <&pm8916_gpios 2 0>;

			clocks = <&clock_rpm clk_bb_clk2_pin>;

			clock-names = "ref_clk";

		};

	};

};

&android_usb {