Commit 9f29333d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

* git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: make EVIOCGSND return meaningful data
  Input: ressurect EVIOCGREP and EVIOCSREP
  Input: psmouse - fix new device detection logic
  Input: move input_device_id to mod_devicetable.h
  Input: allow using several chords for braille
  Input: allow passing NULL to input_free_device()
  Input: spitzkbd - fix the reversed Address and Calender keys
  Input: ads7846 - improve filtering for thumb press accuracy
  Input: ads7846 - report 0 pressure value along with pen up event
  Input: ads7846 - handle IRQs that were latched during disabled IRQs
  Input: ads7846 - miscellaneous fixes
  Input: ads7846 - use msleep() instead of udelay() in suspend
  Input: ads7846 - debouncing and rudimentary sample filtering
  Input: ads7846 - power down ADC a bit later
  Input: ads7846 - add pen_down sysfs attribute
  Input: wistron - add support for Fujitsu N3510
  Input: wistron - add signature for Amilo M7400
parents 494b9aea 8fdc1948

drivers/char/keyboard.c

+28 −10
Original line number Diff line number Diff line
@@ -860,9 +860,32 @@ static void k_slock(struct vc_data *vc, unsigned char value, char up_flag, struc 
}



/* by default, 300ms interval for combination release */

static long brl_timeout = 300;

MODULE_PARM_DESC(brl_timeout, "Braille keys release delay in ms (0 for combination on first release, < 0 for dead characters)");

module_param(brl_timeout, long, 0644);

static unsigned brl_timeout = 300;

MODULE_PARM_DESC(brl_timeout, "Braille keys release delay in ms (0 for commit on first key release)");

module_param(brl_timeout, uint, 0644);



static unsigned brl_nbchords = 1;

MODULE_PARM_DESC(brl_nbchords, "Number of chords that produce a braille pattern (0 for dead chords)");

module_param(brl_nbchords, uint, 0644);



static void k_brlcommit(struct vc_data *vc, unsigned int pattern, char up_flag, struct pt_regs *regs)

{

	static unsigned long chords;

	static unsigned committed;



	if (!brl_nbchords)

		k_deadunicode(vc, BRL_UC_ROW | pattern, up_flag, regs);

	else {

		committed |= pattern;

		chords++;

		if (chords == brl_nbchords) {

			k_unicode(vc, BRL_UC_ROW | committed, up_flag, regs);

			chords = 0;

			committed = 0;

		}

	}

}



static void k_brl(struct vc_data *vc, unsigned char value, char up_flag, struct pt_regs *regs)

{

	static unsigned pressed,committing;
@@ -882,11 +905,6 @@ static void k_brl(struct vc_data *vc, unsigned char value, char up_flag, struct 
	if (value > 8)

		return;



	if (brl_timeout < 0) {

		k_deadunicode(vc, BRL_UC_ROW | (1 << (value - 1)), up_flag, regs);

		return;

	}



	if (up_flag) {

		if (brl_timeout) {

			if (!committing ||
@@ -897,13 +915,13 @@ static void k_brl(struct vc_data *vc, unsigned char value, char up_flag, struct 
			pressed &= ~(1 << (value - 1));

			if (!pressed) {

				if (committing) {

					k_unicode(vc, BRL_UC_ROW | committing, 0, regs);

					k_brlcommit(vc, committing, 0, regs);

					committing = 0;

				}

			}

		} else {

			if (committing) {

				k_unicode(vc, BRL_UC_ROW | committing, 0, regs);

				k_brlcommit(vc, committing, 0, regs);

				committing = 0;

			}

			pressed &= ~(1 << (value - 1));

drivers/input/evdev.c

+21 −0
Original line number Diff line number Diff line
@@ -403,6 +403,27 @@ static long evdev_ioctl_handler(struct file *file, unsigned int cmd, 
		case EVIOCGID:

			if (copy_to_user(p, &dev->id, sizeof(struct input_id)))

				return -EFAULT;

			return 0;



		case EVIOCGREP:

			if (!test_bit(EV_REP, dev->evbit))

				return -ENOSYS;

			if (put_user(dev->rep[REP_DELAY], ip))

				return -EFAULT;

			if (put_user(dev->rep[REP_PERIOD], ip + 1))

				return -EFAULT;

			return 0;



		case EVIOCSREP:

			if (!test_bit(EV_REP, dev->evbit))

				return -ENOSYS;

			if (get_user(u, ip))

				return -EFAULT;

			if (get_user(v, ip + 1))

				return -EFAULT;



			input_event(dev, EV_REP, REP_DELAY, u);

			input_event(dev, EV_REP, REP_PERIOD, v);



			return 0;

drivers/input/input.c

+7 −4
Original line number Diff line number Diff line
@@ -155,6 +155,9 @@ void input_event(struct input_dev *dev, unsigned int type, unsigned int code, in 
			if (code > SND_MAX || !test_bit(code, dev->sndbit))

				return;



			if (!!test_bit(code, dev->snd) != !!value)

				change_bit(code, dev->snd);



			if (dev->event) dev->event(dev, type, code, value);



			break;
@@ -286,19 +289,19 @@ static struct input_device_id *input_match_device(struct input_device_id *id, st 
	for (; id->flags || id->driver_info; id++) {



		if (id->flags & INPUT_DEVICE_ID_MATCH_BUS)

			if (id->id.bustype != dev->id.bustype)

			if (id->bustype != dev->id.bustype)

				continue;



		if (id->flags & INPUT_DEVICE_ID_MATCH_VENDOR)

			if (id->id.vendor != dev->id.vendor)

			if (id->vendor != dev->id.vendor)

				continue;



		if (id->flags & INPUT_DEVICE_ID_MATCH_PRODUCT)

			if (id->id.product != dev->id.product)

			if (id->product != dev->id.product)

				continue;



		if (id->flags & INPUT_DEVICE_ID_MATCH_VERSION)

			if (id->id.version != dev->id.version)

			if (id->version != dev->id.version)

				continue;



		MATCH_BIT(evbit,  EV_MAX);

drivers/input/keyboard/spitzkbd.c

+2 −2
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ static unsigned char spitzkbd_keycode[NR_SCANCODES] = { 
	KEY_LEFTCTRL, KEY_1, KEY_3, KEY_5, KEY_6, KEY_7, KEY_9, KEY_0, KEY_BACKSPACE, SPITZ_KEY_EXOK, SPITZ_KEY_EXCANCEL, 0, 0, 0, 0, 0,  /* 1-16 */

	0, KEY_2, KEY_4, KEY_R, KEY_Y, KEY_8, KEY_I, KEY_O, KEY_P, SPITZ_KEY_EXJOGDOWN, SPITZ_KEY_EXJOGUP, 0, 0, 0, 0, 0, /* 17-32 */

	KEY_TAB, KEY_Q, KEY_E, KEY_T, KEY_G, KEY_U, KEY_J, KEY_K, 0, 0, 0, 0, 0, 0, 0, 0,                                 /* 33-48 */

	SPITZ_KEY_CALENDER, KEY_W, KEY_S, KEY_F, KEY_V, KEY_H, KEY_M, KEY_L, 0, KEY_RIGHTSHIFT, 0, 0, 0, 0, 0, 0,         /* 49-64 */

	SPITZ_KEY_ADDRESS, KEY_A, KEY_D, KEY_C, KEY_B, KEY_N, KEY_DOT, 0, KEY_ENTER, KEY_LEFTSHIFT, 0, 0, 0, 0, 0, 0,	  /* 65-80 */

	SPITZ_KEY_ADDRESS, KEY_W, KEY_S, KEY_F, KEY_V, KEY_H, KEY_M, KEY_L, 0, KEY_RIGHTSHIFT, 0, 0, 0, 0, 0, 0,         /* 49-64 */

	SPITZ_KEY_CALENDER, KEY_A, KEY_D, KEY_C, KEY_B, KEY_N, KEY_DOT, 0, KEY_ENTER, KEY_LEFTSHIFT, 0, 0, 0, 0, 0, 0,	  /* 65-80 */

	SPITZ_KEY_MAIL, KEY_Z, KEY_X, KEY_MINUS, KEY_SPACE, KEY_COMMA, 0, KEY_UP, 0, 0, SPITZ_KEY_FN, 0, 0, 0, 0, 0,      /* 81-96 */

	KEY_SYSRQ, SPITZ_KEY_JAP1, SPITZ_KEY_JAP2, SPITZ_KEY_CANCEL, SPITZ_KEY_OK, SPITZ_KEY_MENU, KEY_LEFT, KEY_DOWN, KEY_RIGHT, 0, 0, 0, 0, 0, 0, 0  /* 97-112 */

};

drivers/input/misc/wistron_btns.c

+30 −0
Original line number Diff line number Diff line
@@ -273,6 +273,18 @@ static struct key_entry keymap_fs_amilo_pro_v2000[] = { 
	{ KE_END,  0 }

};



static struct key_entry keymap_fujitsu_n3510[] = {

	{ KE_KEY, 0x11, KEY_PROG1 },

	{ KE_KEY, 0x12, KEY_PROG2 },

	{ KE_KEY, 0x36, KEY_WWW },

	{ KE_KEY, 0x31, KEY_MAIL },

	{ KE_KEY, 0x71, KEY_STOPCD },

	{ KE_KEY, 0x72, KEY_PLAYPAUSE },

	{ KE_KEY, 0x74, KEY_REWIND },

	{ KE_KEY, 0x78, KEY_FORWARD },

	{ KE_END, 0 }

};



static struct key_entry keymap_wistron_ms2141[] = {

	{ KE_KEY,  0x11, KEY_PROG1 },

	{ KE_KEY,  0x12, KEY_PROG2 },
@@ -321,6 +333,24 @@ static struct dmi_system_id dmi_ids[] = { 
		},

		.driver_data = keymap_fs_amilo_pro_v2000

	},

	{

		.callback = dmi_matched,

		.ident = "Fujitsu-Siemens Amilo M7400",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),

			DMI_MATCH(DMI_PRODUCT_NAME, "AMILO M        "),

		},

		.driver_data = keymap_fs_amilo_pro_v2000

	},

	{

		.callback = dmi_matched,

		.ident = "Fujitsu N3510",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),

			DMI_MATCH(DMI_PRODUCT_NAME, "N3510"),

		},

		.driver_data = keymap_fujitsu_n3510

	},

	{

		.callback = dmi_matched,

		.ident = "Acer Aspire 1500",

CRA Git | Maintained and supported by SUSTech CRA and CCSE