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

Commit 1c0e9ecc 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 device node"

parents bf67b0a0 76bfbd4e

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

+34 −0
Original line number Diff line number Diff line
@@ -14,6 +14,40 @@ 
#include "msmferrum-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 = <&msm_gpio 91 0x1>;

			linux,input-type = <1>;

			linux,code = <0x210>;

			gpio-key,wakeup;

			debounce-interval = <15>;

		};



		camera_snapshot {

			label = "camera_snapshot";

			gpios = <&msm_gpio 92 0x1>;

			linux,input-type = <1>;

			linux,code = <0x2fe>;

			gpio-key,wakeup;

			debounce-interval = <15>;

		};



		vol_up {

			label = "volume_up";

			gpios = <&msm_gpio 90 0x1>;

			linux,input-type = <1>;

			linux,code = <115>;

			gpio-key,wakeup;

			debounce-interval = <15>;

		};

	};

};



&blsp1_uart2 {

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

+34 −0
Original line number Diff line number Diff line
@@ -14,6 +14,40 @@ 
#include "msmferrum-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 = <&msm_gpio 91 0x1>;

			linux,input-type = <1>;

			linux,code = <0x210>;

			gpio-key,wakeup;

			debounce-interval = <15>;

		};



		camera_snapshot {

			label = "camera_snapshot";

			gpios = <&msm_gpio 92 0x1>;

			linux,input-type = <1>;

			linux,code = <0x2fe>;

			gpio-key,wakeup;

			debounce-interval = <15>;

		};



		vol_up {

			label = "volume_up";

			gpios = <&msm_gpio 90 0x1>;

			linux,input-type = <1>;

			linux,code = <115>;

			gpio-key,wakeup;

			debounce-interval = <15>;

		};

	};

};



&blsp1_uart2 {

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

+15 −0
Original line number Diff line number Diff line
@@ -553,5 +553,20 @@ 
				  bias-pull-up;

			};

		};



		tlmm_gpio_key {

			qcom,pins = <&gp 90>, <&gp 91>, <&gp 92>;

			qcom,pin-func = <0>;

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

			label = "tlmm_gpio_key";

			gpio_key_active: gpio_key_active {

				drive-strength = <2>;

				bias-pull-up;

			};

			gpio_key_suspend: gpio_key_suspend {

				drive-strength = <2>;

				bias-pull-up;

			};

		};

	};

};