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

Commit 4bfb6205 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 APQ8084"

parents b16fa45c fcfb0e53

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

+26 −0
Original line number Diff line number Diff line
@@ -35,6 +35,20 @@ 
		qcom,ext-mclk-gpio  = <&msmgpio 47 0>;

	};



	i2c@f9926000 { /* BLSP1 QUP4 */

		nfc-nci@0e {

			compatible = "qcom,nfc-nci";

			reg = <0x0e>;

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

			qcom,dis-gpio = <&pma8084_mpps 5 0>;

			qcom,clk-src = "BBCLK2";

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

			interrupt-parent = <&msmgpio>;

			interrupts = <58 0>;

			qcom,clk-gpio = <&pma8084_gpios 10 0>;

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";
@@ -287,6 +301,12 @@ 
	};



	gpio@c900 { /* GPIO 10 */

		/* NFC clk request */

		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@ca00 { /* GPIO 11 */
@@ -394,6 +414,12 @@ 
	};



	mpp@a400 { /* MPP 5 */

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

		qcom,output-type = <0>;		/* CMOS */

		qcom,vin-sel = <2>;		/* PMA8084 S4 = 1.8V > 1.6V */

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

		qcom,out-strength = <1>;	/* Low */

		qcom,master-en = <1>;

	};



	mpp@a500 { /* MPP 6 */

arch/arm/boot/dts/apq8084.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -389,6 +389,22 @@ 
		qcom,master-id = <86>;

	};



	i2c@f9926000 { /* BLSP-1 QUP-4 */

		cell-index = <3>;

		compatible = "qcom,i2c-qup";

		reg = <0xf9926000 0x1000>;

		#address-cells = <1>;

		#size-cells = <0>;

		reg-names = "qup_phys_addr";

		interrupts = <0 98 0>;

		interrupt-names = "qup_err_intr";

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

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

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

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

		qcom,master-id = <86>;

	};



	i2c_1: i2c@f9966000 { /* BLSP2 QUP4 */

		cell-index = <1>;

		compatible = "qcom,i2c-qup";