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

Commit 1dcf0666 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 camera focus and snapshot nodes for MSMFALCON"

parents a9d2a423 66f8dff8
Loading
Loading
Loading
Loading
+28 −0
Original line number Diff line number Diff line
@@ -760,5 +760,33 @@
				bias-disable;
			};
		};

		tlmm_gpio_key {
			gpio_key_active: gpio_key_active {
				mux {
					pins = "gpio64", "gpio113";
					function = "gpio";
				};

				config {
					pins = "gpio64", "gpio113";
					drive-strength = <2>;
					bias-pull-up;
				};
			};

			gpio_key_suspend: gpio_key_suspend {
				mux {
					pins = "gpio64", "gpio113";
					function = "gpio";
				};

				config {
					pins = "gpio64", "gpio113";
					drive-strength = <2>;
					bias-pull-up;
				};
			};
		};
	};
};
+20 −1
Original line number Diff line number Diff line
@@ -1672,9 +1672,28 @@

&soc {
	gpio_keys {
		status = "okay";
		compatible = "gpio-keys";
		input-name = "gpio-keys";
		status = "okay";
		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 64 0x1>;
			linux,input-type = <1>;
			linux,code = <0x210>;
			debounce-interval = <15>;
		};

		camera_snapshot {
			label = "camera_snapshot";
			gpios = <&tlmm 113 0x1>;
			linux,input-type = <1>;
			linux,code = <0x2fe>;
			debounce-interval = <15>;
		};

		vol_up {
			label = "volume_up";