Commit 4c493b1a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'input-for-v5.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input fixes from Dmitry Torokhov:
 "A small fixup to ili210x touchscreen driver, and updated maintainer
  entry for the device tree binding of Mediatek 6779 keypad:

   - fix reset timing of Ilitek touchscreens

   - update maintainer entry of DT binding of Mediatek 6779 keypad"

* tag 'input-for-v5.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: ili210x - use one common reset implementation
  Input: ili210x - fix reset timing
  dt-bindings: input: mediatek,mt6779-keypad: update maintainer
parents 36ed2da7 b26ff913

Documentation/devicetree/bindings/input/mediatek,mt6779-keypad.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Mediatek's Keypad Controller device tree bindings



maintainers:

  - Fengping Yu <fengping.yu@mediatek.com>

  - Mattijs Korpershoek <mkorpershoek@baylibre.com>



allOf:

  - $ref: "/schemas/input/matrix-keymap.yaml#"

drivers/input/touchscreen/ili210x.c

+8 −12
Original line number Diff line number Diff line
@@ -756,15 +756,12 @@ static int ili251x_firmware_reset(struct i2c_client *client) 
	return ili251x_firmware_busy(client);

}



static void ili251x_hardware_reset(struct device *dev)

static void ili210x_hardware_reset(struct gpio_desc *reset_gpio)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct ili210x *priv = i2c_get_clientdata(client);



	/* Reset the controller */

	gpiod_set_value_cansleep(priv->reset_gpio, 1);

	usleep_range(10000, 15000);

	gpiod_set_value_cansleep(priv->reset_gpio, 0);

	gpiod_set_value_cansleep(reset_gpio, 1);

	usleep_range(12000, 15000);

	gpiod_set_value_cansleep(reset_gpio, 0);

	msleep(300);

}
@@ -773,6 +770,7 @@ static ssize_t ili210x_firmware_update_store(struct device *dev, 
					     const char *buf, size_t count)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct ili210x *priv = i2c_get_clientdata(client);

	const char *fwname = ILI251X_FW_FILENAME;

	const struct firmware *fw;

	u16 ac_end, df_end;
@@ -803,7 +801,7 @@ static ssize_t ili210x_firmware_update_store(struct device *dev, 


	dev_dbg(dev, "Firmware update started, firmware=%s\n", fwname);



	ili251x_hardware_reset(dev);

	ili210x_hardware_reset(priv->reset_gpio);



	error = ili251x_firmware_reset(client);

	if (error)
@@ -858,7 +856,7 @@ static ssize_t ili210x_firmware_update_store(struct device *dev, 
	error = count;



exit:

	ili251x_hardware_reset(dev);

	ili210x_hardware_reset(priv->reset_gpio);

	dev_dbg(dev, "Firmware update ended, error=%i\n", error);

	enable_irq(client->irq);

	kfree(fwbuf);
@@ -951,9 +949,7 @@ static int ili210x_i2c_probe(struct i2c_client *client, 
		if (error)

			return error;



		usleep_range(50, 100);

		gpiod_set_value_cansleep(reset_gpio, 0);

		msleep(100);

		ili210x_hardware_reset(reset_gpio);

	}



	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);