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

Commit 9181b869 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "input: synaptics_i2c_rmi4: Enable power saving in suspend mode"

parents cdef5d84 49222750

arch/arm/boot/dts/msm8226-cdp.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
			synaptics,irq-gpio = <&msmgpio 17 0x2008>;

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

			synaptics,i2c-pull-up;

			synaptics,power-down;

			synaptics,disable-gpios;

		};

	};

arch/arm/boot/dts/msm8226-mtp.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
			synaptics,irq-gpio = <&msmgpio 17 0x2008>;

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

			synaptics,i2c-pull-up;

			synaptics,power-down;

			synaptics,disable-gpios;

		};

	};

arch/arm/boot/dts/msm8226-qrd.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -29,7 +29,10 @@ 
			synaptics,irq-gpio = <&msmgpio 17 0x2008>;

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

			synaptics,i2c-pull-up;

			synaptics,power-down;

			synaptics,disable-gpios;

		};



		focaltech@38 {

			compatible = "focaltech,5x06";

			reg = <0x38>;

drivers/input/touchscreen/synaptics_i2c_rmi4.c

+0 −11
Original line number Diff line number Diff line
@@ -3461,17 +3461,6 @@ static int synaptics_rmi4_resume(struct device *dev) 
	rmi4_data->touch_stopped = false;

	synaptics_rmi4_irq_enable(rmi4_data, true);



	if (rmi4_data->board->power_down_enable ||

			rmi4_data->board->disable_gpios) {

		retval = synaptics_rmi4_reset_device(rmi4_data);

		if (retval < 0) {

			dev_err(&rmi4_data->i2c_client->dev,

				"%s: Failed to issue reset command, " \

				"rc = %d\n", __func__, retval);

			return retval;

		}

	}



	rmi4_data->suspended = false;



	return 0;