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

Commit 32f53864 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 to 8992 CDP and MTP"

parents d9f768c9 78ec8f44

arch/arm/boot/dts/qcom/msm8992-cdp.dtsi

+41 −0
Original line number Diff line number Diff line
@@ -259,6 +259,26 @@ 
		status = "okay";

	};



	gpio@c600 { /* GPIO 7 */

		/* NFC pwr 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>;

		status = "okay";

	};



	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>;

		status = "okay";

	};



	gpio@ce00 { /* GPIO 15 */

		qcom,mode = <1>;

		qcom,output-type = <0>;
@@ -425,6 +445,27 @@ 
		qcom,key-codes = <158 139 102 217>;

	};



	i2c@f9928000 { /* BLSP1 QUP6 */

		status = "ok";

		nfc-nci@e {

			compatible = "qcom,nfc-nci";

			reg = <0x0e>;

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

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

			qcom,clk-src = "BBCLK2";

			interrupt-parent = <&msm_gpio>;

			interrupts = <29 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 = <&pm8994_gpios 10 0>;

			qcom,pwr-req-gpio = <&pm8994_gpios 7 0>;

			clocks = <&clock_rpm clk_bb_clk2_pin>;

			clock-names = "ref_clk";

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";

arch/arm/boot/dts/qcom/msm8992-mtp.dtsi

+41 −0
Original line number Diff line number Diff line
@@ -210,6 +210,26 @@ 
		status = "okay";

	};



	gpio@c600 { /* GPIO 7 */

		/* NFC pwr 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>;

		status = "okay";

	};



	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>;

		status = "okay";

	};



	gpio@ce00 { /* GPIO 15 */

		qcom,mode = <1>;

		qcom,output-type = <0>;
@@ -372,6 +392,27 @@ 
		qcom,key-codes = <158 139 102 217>;

	};



	i2c@f9928000 { /* BLSP1 QUP6 */

		status = "ok";

		nfc-nci@e {

			compatible = "qcom,nfc-nci";

			reg = <0x0e>;

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

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

			qcom,clk-src = "BBCLK2";

			interrupt-parent = <&msm_gpio>;

			interrupts = <29 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 = <&pm8994_gpios 10 0>;

			qcom,pwr-req-gpio = <&pm8994_gpios 7 0>;

			clocks = <&clock_rpm clk_bb_clk2_pin>;

			clock-names = "ref_clk";

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";

arch/arm/boot/dts/qcom/msm8992-pinctrl.dtsi

+51 −0
Original line number Diff line number Diff line
@@ -238,6 +238,57 @@ 
			};

		};



		pmx_i2c_6 {

			qcom,pins = <&gp 28>, <&gp 27>; /* SDA, SCL */

			qcom,num-grp-pins = <2>;

			qcom,pin-func = <3>;

			label = "pmx_i2c_6";



			i2c_6_active: i2c_6_active {

				drive-strength = <2>;

				bias-disable;

			};



			i2c_6_sleep: i2c_6_sleep {

				drive-strength = <2>;

				bias-disable;

			};

		};



		pmx_rd_nfc_int{

			qcom,pins = <&gp 29>;

			qcom,pin-func = <0>;

			qcom,num-grp-pins = <1>;

			label = "pmx_nfc_int";



			nfc_int_active: active {

				drive-strength = <6>;

				bias-pull-up;

			};



			nfc_int_suspend: suspend {

				drive-strength = <6>;

				bias-pull-up;

			};

		};



		pmx_nfc_reset{

			qcom,pins = <&gp 30>;

			qcom,pin-func = <0>;

			qcom,num-grp-pins = <1>;

			label = "pmx_nfc_disable";



			nfc_disable_active: active {

				drive-strength = <6>;

				bias-pull-up;

			};



			nfc_disable_suspend: suspend {

				drive-strength = <6>;

				bias-disable;

			};

		};



		/* CoreSight */

		tpiu_seta_1 {

			qcom,pins = <&gp 27>;

arch/arm/boot/dts/qcom/msm8992.dtsi

+27 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
		spi0 = &spi_0;

		sdhc1 = &sdhc_1; /* SDC1 eMMC slot */

		sdhc2 = &sdhc_2; /* SDC2 SD card slot */

		i2c6 = &i2c_6; /* I2C6 NFC qup6 device */

		i2c2  = &i2c_2;

		i2c5 = &i2c_5;
@@ -1081,6 +1082,32 @@ 
		qcom,master-id = <84>;

	};



	i2c_6: i2c@f9928000 { /* BLSP1 QUP6 */

		compatible = "qcom,i2c-msm-v2";

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabled";

		reg-names = "qup_phys_addr", "bam_phys_addr";

		reg = <0xf9928000 0x1000>,

		      <0xf9904000 0x19000>;

		interrupt-names = "qup_irq", "bam_irq";

		interrupts = <0 100 0>, <0 238 0>;

		qcom,clk-freq-out = <400000>;

		qcom,clk-freq-in  = <19200000>;

		clock-names = "iface_clk", "core_clk";

		clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,

			 <&clock_gcc clk_gcc_blsp1_qup6_i2c_apps_clk>;



		pinctrl-names = "i2c_active", "i2c_sleep";

		pinctrl-0 = <&i2c_6_active>;

		pinctrl-1 = <&i2c_6_sleep>;

		qcom,noise-rjct-scl = <0>;

		qcom,noise-rjct-sda = <0>;

		qcom,bam-pipe-idx-cons = <22>;

		qcom,bam-pipe-idx-prod = <23>;

		qcom,master-id = <86>;

	};



	slim_msm: slim@fe12f000 {

		cell-index = <1>;

		compatible = "qcom,slim-ngd";