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

Commit 3569235c 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 gpio keys support for MSM8917 MTP/CDP/QRD"

parents 00c23d74 f12b7bce

arch/arm64/boot/dts/qcom/msm8917-cdp.dtsi

+9 −2
Original line number Diff line number Diff line
@@ -17,9 +17,8 @@ 
	gpio_keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";

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

		pinctrl-names = "default";

		pinctrl-0 = <&gpio_key_active>;

		pinctrl-1 = <&gpio_key_suspend>;



		camera_focus {

			label = "camera_focus";
@@ -27,6 +26,8 @@ 
			linux,input-type = <1>;

			linux,code = <0x210>;

			debounce-interval = <15>;

			linux,can-disable;

			gpio-key,wakeup;

		};



		camera_snapshot {
@@ -35,6 +36,8 @@ 
			linux,input-type = <1>;

			linux,code = <0x2fe>;

			debounce-interval = <15>;

			linux,can-disable;

			gpio-key,wakeup;

		};



		vol_up {
@@ -43,6 +46,8 @@ 
			linux,input-type = <1>;

			linux,code = <115>;

			debounce-interval = <15>;

			linux,can-disable;

			gpio-key,wakeup;

		};



		home {
@@ -51,6 +56,8 @@ 
			linux,input-type = <1>;

			linux,code = <102>;

			debounce-interval = <15>;

			linux,can-disable;

			gpio-key,wakeup;

		};

	};

arch/arm64/boot/dts/qcom/msm8917-mtp.dtsi

+37 −0
Original line number Diff line number Diff line
@@ -80,6 +80,43 @@ 
		qcom,dig-vtg-min = <1800000>;

		qcom,dig-vtg-max = <1800000>;

	};



	gpio_keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&gpio_key_active>;



		camera_focus {

			label = "camera_focus";

			gpios = <&tlmm 128 0x1>;

			linux,input-type = <1>;

			linux,code = <0x210>;

			debounce-interval = <15>;

			linux,can-disable;

			gpio-key,wakeup;

		};



		camera_snapshot {

			label = "camera_snapshot";

			gpios = <&tlmm 127 0x1>;

			linux,input-type = <1>;

			linux,code = <0x2fe>;

			debounce-interval = <15>;

			linux,can-disable;

			gpio-key,wakeup;

		};



		vol_up {

			label = "volume_up";

			gpios = <&tlmm 91 0x1>;

			linux,input-type = <1>;

			linux,code = <115>;

			debounce-interval = <15>;

			linux,can-disable;

			gpio-key,wakeup;

		};

	};

};



#include "msm8937-mdss-panels.dtsi"

arch/arm64/boot/dts/qcom/msm8917-qrd.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -88,9 +88,8 @@ 
	gpio_keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";

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

		pinctrl-names = "default";

		pinctrl-0 = <&gpio_key_active>;

		pinctrl-1 = <&gpio_key_suspend>;



		vol_up {

			label = "volume_up";
@@ -98,6 +97,8 @@ 
			linux,input-type = <1>;

			linux,code = <115>;

			debounce-interval = <15>;

			linux,can-disable;

			gpio-key,wakeup;

		};

	};

};