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

Commit 81f8320f 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 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: appletouch - apply idle reset logic to all touchpads
  Input: usbtouchscreen - add support for GoTop tablet devices
  Input: bf54x-keys - return real error when request_irq() fails
  Input: i8042 - export i8042_command()
parents 6d435365 46249ea6

drivers/input/keyboard/bf54x-keys.c

+0 −1
Original line number Diff line number Diff line
@@ -256,7 +256,6 @@ static int __devinit bfin_kpad_probe(struct platform_device *pdev) 
		printk(KERN_ERR DRV_NAME

			": unable to claim irq %d; error %d\n",

			bf54x_kpad->irq, error);

		error = -EBUSY;

		goto out2;

	}

drivers/input/mouse/appletouch.c

+11 −14
Original line number Diff line number Diff line
@@ -504,25 +504,22 @@ static void atp_complete(struct urb* urb) 
		memset(dev->xy_acc, 0, sizeof(dev->xy_acc));

	}



	/* Geyser 3 will continue to send packets continually after

	input_report_key(dev->input, BTN_LEFT, key);

	input_sync(dev->input);



	/* Many Geysers will continue to send packets continually after

	   the first touch unless reinitialised. Do so if it's been

	   idle for a while in order to avoid waking the kernel up

	   several hundred times a second */



	if (atp_is_geyser_3(dev)) {

	if (!x && !y && !key) {

		dev->idlecount++;

		if (dev->idlecount == 10) {

			dev->valid = 0;

			schedule_work(&dev->work);

		}

		}

		else

	} else

		dev->idlecount = 0;

	}



	input_report_key(dev->input, BTN_LEFT, key);

	input_sync(dev->input);



exit:

	retval = usb_submit_urb(dev->urb, GFP_ATOMIC);

drivers/input/serio/i8042.c

+3 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/err.h>

#include <linux/rcupdate.h>

#include <linux/platform_device.h>

#include <linux/i8042.h>



#include <asm/io.h>
@@ -208,7 +209,7 @@ static int __i8042_command(unsigned char *param, int command) 
	return 0;

}



static int i8042_command(unsigned char *param, int command)

int i8042_command(unsigned char *param, int command)

{

	unsigned long flags;

	int retval;
@@ -219,6 +220,7 @@ static int i8042_command(unsigned char *param, int command) 


	return retval;

}

EXPORT_SYMBOL(i8042_command);



/*

 * i8042_kbd_write() sends a byte out through the keyboard interface.

drivers/input/serio/i8042.h

+0 −22
Original line number Diff line number Diff line
@@ -60,28 +60,6 @@ 
#define I8042_CTR_AUXDIS	0x20

#define I8042_CTR_XLATE		0x40



/*

 * Commands.

 */



#define I8042_CMD_CTL_RCTR	0x0120

#define I8042_CMD_CTL_WCTR	0x1060

#define I8042_CMD_CTL_TEST	0x01aa



#define I8042_CMD_KBD_DISABLE	0x00ad

#define I8042_CMD_KBD_ENABLE	0x00ae

#define I8042_CMD_KBD_TEST	0x01ab

#define I8042_CMD_KBD_LOOP	0x11d2



#define I8042_CMD_AUX_DISABLE	0x00a7

#define I8042_CMD_AUX_ENABLE	0x00a8

#define I8042_CMD_AUX_TEST	0x01a9

#define I8042_CMD_AUX_SEND	0x10d4

#define I8042_CMD_AUX_LOOP	0x11d3



#define I8042_CMD_MUX_PFX	0x0090

#define I8042_CMD_MUX_SEND	0x1090



/*

 * Return codes.

 */

drivers/input/touchscreen/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ config TOUCHSCREEN_USB_COMPOSITE 
	  - DMC TSC-10/25

	  - IRTOUCHSYSTEMS/UNITOP

	  - IdealTEK URTC1000

	  - GoTop Super_Q2/GogoPen/PenPower tablets



	  Have a look at <http://linux.chapter7.ch/touchkit/> for

	  a usage description and the required user-space stuff.
@@ -259,4 +260,9 @@ config TOUCHSCREEN_USB_GENERAL_TOUCH 
	bool "GeneralTouch Touchscreen device support" if EMBEDDED

	depends on TOUCHSCREEN_USB_COMPOSITE



config TOUCHSCREEN_USB_GOTOP

	default y

	bool "GoTop Super_Q2/GogoPen/PenPower tablet device support" if EMBEDDED

	depends on TOUCHSCREEN_USB_COMPOSITE



endif