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

Commit 0af6e33f 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 node for msm8909"

parents 1e11cc4a 208dc237

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

+19 −0
Original line number Diff line number Diff line
@@ -160,6 +160,25 @@ 
		};

	};



	i2c@78b6000 { /* BLSP1 QUP2 */

		nq@28 {

			compatible = "qcom,nq-nci";

			reg = <0x28>;

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

			qcom,nq-ven = <&msm_gpio 20 0x00>;

			qcom,nq-firm = <&msm_gpio 45 0x00>;

			qcom,clk-src = "BBCLK2";

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

			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/msm8909-mtp.dtsi

+19 −0
Original line number Diff line number Diff line
@@ -137,6 +137,25 @@ 
		};

	};



	i2c@78b6000 { /* BLSP1 QUP2 */

		nq@28 {

			compatible = "qcom,nq-nci";

			reg = <0x28>;

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

			qcom,nq-ven = <&msm_gpio 20 0x00>;

			qcom,nq-firm = <&msm_gpio 45 0x00>;

			qcom,clk-src = "BBCLK2";

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

			clocks = <&clock_rpm clk_bb_clk2_pin>;

			clock-names = "ref_clk";

		};

	};



	gen-vkeys {

		compatible = "qcom,gen-vkeys";

		label = "synaptics_dsx";

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

+50 −0
Original line number Diff line number Diff line
@@ -513,6 +513,56 @@ 
			};

		};



		nfc {

			nfc_int_active: nfc_int_active {

				mux {

					pins = "gpio21";

					function = "gpio";

				};

				config {

					pins = "gpio21";

					drive-strength = <6>;

					bias-pull-up;

				};

			};



			nfc_int_suspend: nfc_int_suspend {

				mux {

					pins = "gpio21";

					function = "gpio";

				};

				config {

					pins = "gpio21";

					drive-strength = <6>;

					bias-pull-up;

				};

			};



			nfc_disable_active: nfc_disable_active {

				mux {

					pins = "gpio20";

					function = "gpio";

				};

				config {

					pins = "gpio20";

					drive-strength = <6>;

					bias-pull-up;

				};

			};



			nfc_disable_suspend: nfc_disable_suspend {

				mux {

					pins = "gpio20";

					function = "gpio";

				};

				config {

					pins = "gpio20";

					drive-strength = <6>;

					bias-disable;

				};

			};

		};



		pmx_i2c_3 {

			i2c_3_active: i2c_3_active {

				mux {

arch/arm/boot/dts/qcom/msm8909-pm8909-mtp.dtsi

+4 −5
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2015, 2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -124,9 +124,8 @@ 


&soc {

	i2c@78b6000 {

			nq@2b {

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

		nq@28 {

			qcom,nq-clkreq = <&pm8909_gpios 2 0>;

		};

	};



};

arch/arm/boot/dts/qcom/msm8909-pm8916-mtp.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,12 @@ 
		};

	};



	i2c@78b6000 {

		nq@28 {

			qcom,nq-clkreq = <&pm8916_gpios 2 0>;

		};

	};



};



&audio_codec_mtp {