Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+9
-13
+1
-1
Documentation/devicetree/bindings/input/mediatek,mt6779-keypad.yaml
+1
-1
Documentation/devicetree/bindings/input/mediatek,mt6779-keypad.yaml
+8
-12
drivers/input/touchscreen/ili210x.c
+8
-12
drivers/input/touchscreen/ili210x.c
···
756
756
return ili251x_firmware_busy(client);
757
757
}
758
758
759
-
static void ili251x_hardware_reset(struct device *dev)
759
+
static void ili210x_hardware_reset(struct gpio_desc *reset_gpio)
760
760
{
761
-
struct i2c_client *client = to_i2c_client(dev);
762
-
struct ili210x *priv = i2c_get_clientdata(client);
763
-
764
761
/* Reset the controller */
765
-
gpiod_set_value_cansleep(priv->reset_gpio, 1);
766
-
usleep_range(10000, 15000);
767
-
gpiod_set_value_cansleep(priv->reset_gpio, 0);
762
+
gpiod_set_value_cansleep(reset_gpio, 1);
763
+
usleep_range(12000, 15000);
764
+
gpiod_set_value_cansleep(reset_gpio, 0);
768
765
msleep(300);
769
766
}
770
767
···
770
773
const char *buf, size_t count)
771
774
{
772
775
struct i2c_client *client = to_i2c_client(dev);
776
+
struct ili210x *priv = i2c_get_clientdata(client);
773
777
const char *fwname = ILI251X_FW_FILENAME;
774
778
const struct firmware *fw;
775
779
u16 ac_end, df_end;
···
801
803
802
804
dev_dbg(dev, "Firmware update started, firmware=%s\n", fwname);
803
805
804
-
ili251x_hardware_reset(dev);
806
+
ili210x_hardware_reset(priv->reset_gpio);
805
807
806
808
error = ili251x_firmware_reset(client);
807
809
if (error)
···
856
858
error = count;
857
859
858
860
exit:
859
-
ili251x_hardware_reset(dev);
861
+
ili210x_hardware_reset(priv->reset_gpio);
860
862
dev_dbg(dev, "Firmware update ended, error=%i\n", error);
861
863
enable_irq(client->irq);
862
864
kfree(fwbuf);
···
949
951
if (error)
950
952
return error;
951
953
952
-
usleep_range(50, 100);
953
-
gpiod_set_value_cansleep(reset_gpio, 0);
954
-
msleep(100);
954
+
ili210x_hardware_reset(reset_gpio);
955
955
}
956
956
957
957
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);