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

Commit 5ad20bb8 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: update pinctrl setting for MSM8953 gpio keys"

parents 157122d9 a9295279

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

+9 −2
Original line number Diff line number Diff line
@@ -169,9 +169,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";
@@ -179,6 +178,8 @@ 
			linux,input-type = <1>;

			linux,code = <0x210>;

			debounce-interval = <15>;

			linux,can-disable;

			gpio-key,wakeup;

		};



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

			linux,code = <0x2fe>;

			debounce-interval = <15>;

			linux,can-disable;

			gpio-key,wakeup;

		};



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

			linux,code = <115>;

			debounce-interval = <15>;

			linux,can-disable;

			gpio-key,wakeup;

		};



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

			linux,code = <102>;

			debounce-interval = <15>;

			linux,can-disable;

			gpio-key,wakeup;

		};

	};

};

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

+7 −2
Original line number Diff line number Diff line
@@ -168,9 +168,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";
@@ -178,6 +177,8 @@ 
			linux,input-type = <1>;

			linux,code = <0x210>;

			debounce-interval = <15>;

			linux,can-disable;

			gpio-key,wakeup;

		};



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

			linux,code = <0x2fe>;

			debounce-interval = <15>;

			linux,can-disable;

			gpio-key,wakeup;

		};



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

			linux,code = <115>;

			debounce-interval = <15>;

			linux,can-disable;

			gpio-key,wakeup;

		};

	};

};

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

+3 −2
Original line number Diff line number Diff line
@@ -28,9 +28,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";
@@ -38,6 +37,8 @@ 
			linux,input-type = <1>;

			linux,code = <115>;

			debounce-interval = <15>;

			linux,can-disable;

			gpio-key,wakeup;

		};

	};

};