diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-10-04 02:42:21 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-10-04 02:42:21 +0300 |
| commit | c758f96a8c346ac5a6822b521ec92308c5774381 (patch) | |
| tree | 377b72d74ee58b3e1eeb0528d0618e38645aaafc /drivers/input/touchscreen/wdt87xx_i2c.c | |
| parent | 9fb6de1b0bf4ec11573b76059da3c3b39ac7f2ff (diff) | |
| parent | 265d426d7470d53e900379960eef5b4482125089 (diff) | |
| download | linux-c758f96a8c346ac5a6822b521ec92308c5774381.tar.xz | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.9 merge window.
Diffstat (limited to 'drivers/input/touchscreen/wdt87xx_i2c.c')
| -rw-r--r-- | drivers/input/touchscreen/wdt87xx_i2c.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/wdt87xx_i2c.c b/drivers/input/touchscreen/wdt87xx_i2c.c index 73861ad22df4..a9132603ab34 100644 --- a/drivers/input/touchscreen/wdt87xx_i2c.c +++ b/drivers/input/touchscreen/wdt87xx_i2c.c @@ -23,7 +23,7 @@ #include <asm/unaligned.h> #define WDT87XX_NAME "wdt87xx_i2c" -#define WDT87XX_DRV_VER "0.9.7" +#define WDT87XX_DRV_VER "0.9.8" #define WDT87XX_FW_NAME "wdt87xx_fw.bin" #define WDT87XX_CFG_NAME "wdt87xx_cfg.bin" @@ -157,6 +157,7 @@ /* Controller requires minimum 300us between commands */ #define WDT_COMMAND_DELAY_MS 2 #define WDT_FLASH_WRITE_DELAY_MS 4 +#define WDT_FLASH_ERASE_DELAY_MS 200 #define WDT_FW_RESET_TIME 2500 struct wdt87xx_sys_param { @@ -726,7 +727,7 @@ static int wdt87xx_write_firmware(struct i2c_client *client, const void *chunk) break; } - msleep(50); + msleep(WDT_FLASH_ERASE_DELAY_MS); error = wdt87xx_write_data(client, data, start_addr, page_size); |