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

Commit 7ece1b1e 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 samarium bringup"

parents dc3a18a2 a104fcc3

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

+21 −1
Original line number Diff line number Diff line
@@ -25,6 +25,20 @@ 
		enable-active-high;

	};



	i2c@f9964000 { /* BLSP2 QUP2 */

		nfc-nci@0e {

			compatible = "qcom,nfc-nci";

			reg = <0x0e>;

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

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

			qcom,clk-src = "BBCLK2";

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

			interrupt-parent = <&msmgpio>;

			interrupts = <59 0>;

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

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";
@@ -167,7 +181,13 @@ 
	};



	gpio@c900 { /* GPIO 10 */

		/* NFC clock request */



		/* 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 */

arch/arm/boot/dts/msmsamarium.dtsi

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

	};



	i2c@f9964000 { /* BLSP-2 QUP-2 */

		cell-index = <3>;

		compatible = "qcom,i2c-qup";

		reg = <0xf9964000 0x1000>;

		#address-cells = <1>;

		#size-cells = <0>;

		reg-names = "qup_phys_addr";

		interrupts = <0 102 0>;

		interrupt-names = "qup_err_intr";

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

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

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

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

		qcom,master-id = <84>;

	};



	qcom,wdt@f9017000 {

		compatible = "qcom,msm-watchdog";

		reg = <0xf9017000 0x1000>;