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

Commit 108303ff 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: remove wakeup capabilities from vol+ key for 8952"

parents bfc4cfde 003f3bb2

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

+1 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
		synaptics,reset-gpio = <&msm_gpio 64 0x0>;

		synaptics,disable-gpios;

		synaptics,detect-device;

		synaptics,bypass-packrat-id-check;

		synaptics,device1 {

			synaptics,package-id = <3408>;

			synaptics,display-coords = <0 0 1079 1919>;
@@ -93,7 +94,6 @@ 
			gpios = <&msm_gpio 85 0x1>;

			linux,input-type = <1>;

			linux,code = <115>;

			gpio-key,wakeup;

			debounce-interval = <15>;

		};

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

+1 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
		synaptics,i2c-pull-up;

		synaptics,power-down;

		synaptics,disable-gpios;

		synaptics,bypass-packrat-id-check;

		synaptics,display-coords = <0 0 1079 1919>;

		synaptics,panel-coords = <0 0 1079 2084>;

	};
@@ -92,7 +93,6 @@ 
			gpios = <&msm_gpio 85 0x1>;

			linux,input-type = <1>;

			linux,code = <115>;

			gpio-key,wakeup;

			debounce-interval = <15>;

		};

	};

arch/arm/boot/dts/qcom/msm8952-qrd-skum.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
		synaptics,i2c-pull-up;

		synaptics,power-down;

		synaptics,disable-gpios;

		synaptics,bypass-packrat-id-check;

		synaptics,button-map = <139 172 158>;

	};

};