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

Commit 3e64fcbd authored by Andrew Duggan's avatar Andrew Duggan Committed by Dmitry Torokhov
Browse files

Input: synaptics-rmi4 - limit the range of what GPIOs are buttons 



By convention the first 6 bits of F30 Ctrl 2 and 3 are used to signify
GPIOs which are connected to buttons. Additional GPIOs may be used as
input GPIOs to signal the touch controller of some event
(ie disable touchpad). These additional GPIOs may meet the criteria of
a button in rmi_f30_is_valid_button() but should not be considered
buttons. This patch limits the GPIOs which are mapped to buttons to just
the first 6.

Signed-off-by: default avatarAndrew Duggan <aduggan@synaptics.com>
Reported-by: default avatarDaniel Martin <consume.noise@gmail.com>
Tested-by: default avatarDaniel Martin <consume.noise@gmail.com>
Acked-By: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent a5082947

drivers/input/rmi4/rmi_f30.c

+3 −2
Original line number Diff line number Diff line
@@ -232,9 +232,10 @@ static int rmi_f30_map_gpios(struct rmi_function *fn, 
	unsigned int trackstick_button = BTN_LEFT;

	bool button_mapped = false;

	int i;

	int button_count = min_t(u8, f30->gpioled_count, TRACKSTICK_RANGE_END);



	f30->gpioled_key_map = devm_kcalloc(&fn->dev,

					    f30->gpioled_count,

					    button_count,

					    sizeof(f30->gpioled_key_map[0]),

					    GFP_KERNEL);

	if (!f30->gpioled_key_map) {
@@ -242,7 +243,7 @@ static int rmi_f30_map_gpios(struct rmi_function *fn, 
		return -ENOMEM;

	}



	for (i = 0; i < f30->gpioled_count; i++) {

	for (i = 0; i < button_count; i++) {

		if (!rmi_f30_is_valid_button(i, f30->ctrl))

			continue;