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

Commit ce864a04 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 volume up/down for apq8x53 devices"

parents 11cf3c52 ce1fd8af
Loading
Loading
Loading
Loading
+15 −8
Original line number Diff line number Diff line
@@ -103,6 +103,21 @@
		pinctrl-1 = <&sec_tlmm_lines_sus>;
	};

	gpio_keys {
		compatible = "gpio-keys";
		input-name = "gpio-keys";
		pinctrl-names = "default";
		pinctrl-0 = <&gpio_key_active>;
		vol_up {
			label = "volume_up";
			gpios = <&tlmm 85 0x1>;
			linux,input-type = <1>;
			linux,code = <115>;
			debounce-interval = <15>;
			linux,can-disable;
			gpio-key,wakeup;
		};
	};
};

&firmware {
@@ -358,14 +373,6 @@
};

&spmi_bus {
	qcom,pm8953@0 {
		qcom,power-on@800 {
			qcom,resin-gpiobase = <1019>;
			qcom,pon_2 {
				/delete-property/ linux,code;
			};
		};
	};
	qcom,pmi8950@2 {
		qcom,leds@a100 {
			compatible = "qcom,leds-qpnp";