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

Commit 76ae076f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input updates from Dmitry Torokhov:
 "A new driver for Surface 2.0/Pixelsense touchscreen and a couple of
  driver fixups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  MAINTAINERS - add keyboard driver to Hyper-V file list
  Input: atmel-wm97xx - fix compile error
  Input: hp_sdc_rtc - unlock on error in hp_sdc_rtc_read_i8042timer()
  Input: cyttsp4 -  remove unnecessary work pending test
  Input: add sur40 driver for Samsung SUR40 (aka MS Surface 2.0/Pixelsense)
parents 4c1cc40a 5cf0eb98

drivers/input/misc/hp_sdc_rtc.c

+4 −1
Original line number Diff line number Diff line
@@ -180,7 +180,10 @@ static int64_t hp_sdc_rtc_read_i8042timer (uint8_t loadcmd, int numreg) 
	if (WARN_ON(down_interruptible(&i8042tregs)))

		return -1;



	if (hp_sdc_enqueue_transaction(&t)) return -1;

	if (hp_sdc_enqueue_transaction(&t)) {

		up(&i8042tregs);

		return -1;

	}

	

	/* Sleep until results come back. */

	if (WARN_ON(down_interruptible(&i8042tregs)))

drivers/input/touchscreen/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -906,6 +906,17 @@ config TOUCHSCREEN_STMPE 
	  To compile this driver as a module, choose M here: the

	  module will be called stmpe-ts.



config TOUCHSCREEN_SUR40

	tristate "Samsung SUR40 (Surface 2.0/PixelSense) touchscreen"

	depends on USB

	select INPUT_POLLDEV

	help

	  Say Y here if you want support for the Samsung SUR40 touchscreen

	  (also known as Microsoft Surface 2.0 or Microsoft PixelSense).



	  To compile this driver as a module, choose M here: the

	  module will be called sur40.



config TOUCHSCREEN_TPS6507X

	tristate "TPS6507x based touchscreens"

	depends on I2C

drivers/input/touchscreen/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ obj-$(CONFIG_TOUCHSCREEN_PIXCIR) += pixcir_i2c_ts.o 
obj-$(CONFIG_TOUCHSCREEN_S3C2410)	+= s3c2410_ts.o

obj-$(CONFIG_TOUCHSCREEN_ST1232)	+= st1232.o

obj-$(CONFIG_TOUCHSCREEN_STMPE)		+= stmpe-ts.o

obj-$(CONFIG_TOUCHSCREEN_SUR40)		+= sur40.o

obj-$(CONFIG_TOUCHSCREEN_TI_AM335X_TSC)	+= ti_am335x_tsc.o

obj-$(CONFIG_TOUCHSCREEN_TNETV107X)	+= tnetv107x-ts.o

obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213)	+= touchit213.o

drivers/input/touchscreen/atmel-wm97xx.c

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ static int __exit atmel_wm97xx_remove(struct platform_device *pdev) 
}



#ifdef CONFIG_PM_SLEEP

static int atmel_wm97xx_suspend(struct *dev)

static int atmel_wm97xx_suspend(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct atmel_wm97xx *atmel_wm97xx = platform_get_drvdata(pdev);

drivers/input/touchscreen/cyttsp4_core.c

+1 −2
Original line number Diff line number Diff line
@@ -1246,7 +1246,6 @@ static void cyttsp4_watchdog_timer(unsigned long handle) 


	dev_vdbg(cd->dev, "%s: Watchdog timer triggered\n", __func__);



	if (!work_pending(&cd->watchdog_work))

	schedule_work(&cd->watchdog_work);



	return;