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

Commit 940be74d 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 DT node for GPIO keys on MSM8937"

parents 12a3f694 85d445a9

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

+65 −0
Original line number Diff line number Diff line
@@ -14,6 +14,71 @@ 
#include "msm8937-pinctrl.dtsi"



&soc {

	gpio_keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";

		pinctrl-names = "tlmm_gpio_key_active","tlmm_gpio_key_suspend";

		pinctrl-0 = <&gpio_key_active>;

		pinctrl-1 = <&gpio_key_suspend>;



		camera_focus {

			label = "camera_focus";

			gpios = <&tlmm 128 0x1>;

			linux,input-type = <1>;

			linux,code = <0x210>;

			debounce-interval = <15>;

		};



		camera_snapshot {

			label = "camera_snapshot";

			gpios = <&tlmm 127 0x1>;

			linux,input-type = <1>;

			linux,code = <0x2fe>;

			debounce-interval = <15>;

		};



		vol_up {

			label = "volume_up";

			gpios = <&tlmm 91 0x1>;

			linux,input-type = <1>;

			linux,code = <115>;

			debounce-interval = <15>;

		};



		home {

			label = "home";

			gpios = <&tlmm 86 0x1>;

			linux,input-type = <1>;

			linux,code = <102>;

			debounce-interval = <15>;

		};

	};

};



&tlmm {

	tlmm_gpio_key {

		gpio_key_active: gpio_key_active {

			mux {

				pins = "gpio86", "gpio91", "gpio127", "gpio128";

				function = "gpio";

			};



			config {

				pins = "gpio86", "gpio91", "gpio127", "gpio128";

			};

		};



		gpio_key_suspend: gpio_key_suspend {

			mux {

				pins = "gpio86", "gpio91", "gpio127", "gpio128";

				function = "gpio";

			};



			config {

				pins = "gpio86", "gpio91", "gpio127", "gpio128";

			};

		};

	};

};



&blsp1_uart2 {

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

+31 −0
Original line number Diff line number Diff line
@@ -14,6 +14,37 @@ 
#include "msm8937-pinctrl.dtsi"



&soc {

	gpio_keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";

		pinctrl-names = "tlmm_gpio_key_active","tlmm_gpio_key_suspend";

		pinctrl-0 = <&gpio_key_active>;

		pinctrl-1 = <&gpio_key_suspend>;



		camera_focus {

			label = "camera_focus";

			gpios = <&tlmm 128 0x1>;

			linux,input-type = <1>;

			linux,code = <0x210>;

			debounce-interval = <15>;

		};



		camera_snapshot {

			label = "camera_snapshot";

			gpios = <&tlmm 127 0x1>;

			linux,input-type = <1>;

			linux,code = <0x2fe>;

			debounce-interval = <15>;

		};



		vol_up {

			label = "volume_up";

			gpios = <&tlmm 91 0x1>;

			linux,input-type = <1>;

			linux,code = <115>;

			debounce-interval = <15>;

		};

	};

};



&blsp1_uart2 {

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

+28 −0
Original line number Diff line number Diff line
@@ -208,5 +208,33 @@ 
				bias-pull-up;

			};

		};



		tlmm_gpio_key {

			gpio_key_active: gpio_key_active {

				mux {

					pins = "gpio91", "gpio127", "gpio128";

					function = "gpio";

				};



				config {

					pins = "gpio91", "gpio127", "gpio128";

					drive-strength = <2>;

					bias-pull-up;

				};

			};



			gpio_key_suspend: gpio_key_suspend {

				mux {

					pins = "gpio91", "gpio127", "gpio128";

					function = "gpio";

				};



				config {

					pins = "gpio91", "gpio127", "gpio128";

					drive-strength = <2>;

					bias-pull-up;

				};

			};

		};

	};

};