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

Commit 0d7a8b55 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: Add NFC to 8916 CDP and MTP"

parents 9bdf4ce7 23045e44

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

+25 −2
Original line number Diff line number Diff line
@@ -52,6 +52,25 @@ 
		qcom,panel-maxy = <2084>;

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

	};



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

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

			clock-names = "ref_clk";

		};

	};

};



&blsp1_uart2 {
@@ -177,8 +196,12 @@ 
	};



	gpio@c100 { /* GPIO 2 */

		/* NFC_CLK */

		status = "disabled";

		/* NFC_CLK_REQ */

		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@c200 { /* GPIO 3 */

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

+26 −2
Original line number Diff line number Diff line
@@ -52,6 +52,26 @@ 
		qcom,panel-maxy = <2084>;

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

	};



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

			clock-names = "ref_clk";

		};

	};

};



&blsp1_uart2 {
@@ -177,8 +197,12 @@ 
	};



	gpio@c100 { /* GPIO 2 */

		/* NFC_CLK */

		status = "disabled";

		/* NFC_CLK_REQ */

		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@c200 { /* GPIO 3 */

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

+52 −0
Original line number Diff line number Diff line
@@ -460,6 +460,58 @@ 
			};

		};



		pmx_i2c_6 {

			/* CLK, DATA */

			qcom,pins = <&gp 22>, <&gp 23>;

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

			qcom,pin-func = <2>;

			label = "pmx_i2c_6";

			/* active state */

			i2c_6_active: i2c_6_active{

				drive-strength = <2>; /* 2 MA */

				bias-disable; /* No PULL */

			};

			/*suspended state */

			i2c_6_sleep: i2c_6_sleep {

				drive-strength = <2>; /* 2 MA */

				bias-disable; /* No PULL */

			};

		};



		pmx_rd_nfc_int{

			qcom,pins = <&gp 21>;

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

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

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

+26 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
		spi0 = &spi_0; /* SPI0 controller device */

		i2c0 = &i2c_0; /* I2C0 controller device */

		i2c5 = &i2c_5; /* I2C5 controller device */

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

	};



	cpus {
@@ -1240,6 +1241,31 @@ 
		qcom,master-id = <86>;

	};



	i2c_6: i2c@78ba000 { /* BLSP1 QUP6 */

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

		#address-cells=<1>;

		#sice-cells=<0>;

		cell-index = <6>;

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

		reg = <0x78ba000 0x1000>,

		      <0x7884000 0x23000>;

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

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

		clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,

			 <&clock_gcc clk_gcc_blsp1_qup6_i2c_apps_clk>;

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

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

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

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

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

		qcom,master-id = <86>;

	};



	spmi_bus: qcom,spmi@200f000 {

		compatible = "qcom,spmi-pmic-arb";

		reg = <0x200f000 0x1000>,