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

Commit 38586120 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: matrix_keypad - make matrix keymap size dynamic
  Input: wistron_btns - support Prestigio Wifi RF kill button
  Input: i8042 - add Asus G1S to noloop exception list
parents 131f7340 d82f1c35

drivers/input/keyboard/matrix_keypad.c

+9 −9
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ struct matrix_keypad { 
	const struct matrix_keypad_platform_data *pdata;

	struct input_dev *input_dev;

	unsigned short *keycodes;

	unsigned int row_shift;



	uint32_t last_key_state[MATRIX_MAX_COLS];

	struct delayed_work work;
@@ -136,7 +137,7 @@ static void matrix_keypad_scan(struct work_struct *work) 
			if ((bits_changed & (1 << row)) == 0)

				continue;



			code = (row << 4) + col;

			code = MATRIX_SCAN_CODE(row, col, keypad->row_shift);

			input_event(input_dev, EV_MSC, MSC_SCAN, code);

			input_report_key(input_dev,

					 keypad->keycodes[code],
@@ -317,6 +318,7 @@ static int __devinit matrix_keypad_probe(struct platform_device *pdev) 
	struct matrix_keypad *keypad;

	struct input_dev *input_dev;

	unsigned short *keycodes;

	unsigned int row_shift;

	int i;

	int err;
@@ -332,14 +334,11 @@ static int __devinit matrix_keypad_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	if (!keymap_data->max_keymap_size) {

		dev_err(&pdev->dev, "invalid keymap data supplied\n");

		return -EINVAL;

	}

	row_shift = get_count_order(pdata->num_col_gpios);



	keypad = kzalloc(sizeof(struct matrix_keypad), GFP_KERNEL);

	keycodes = kzalloc(keymap_data->max_keymap_size *

				sizeof(keypad->keycodes),

	keycodes = kzalloc((pdata->num_row_gpios << row_shift) *

				sizeof(*keycodes),

			   GFP_KERNEL);

	input_dev = input_allocate_device();

	if (!keypad || !keycodes || !input_dev) {
@@ -350,6 +349,7 @@ static int __devinit matrix_keypad_probe(struct platform_device *pdev) 
	keypad->input_dev = input_dev;

	keypad->pdata = pdata;

	keypad->keycodes = keycodes;

	keypad->row_shift = row_shift;

	keypad->stopped = true;

	INIT_DELAYED_WORK(&keypad->work, matrix_keypad_scan);

	spin_lock_init(&keypad->lock);
@@ -363,7 +363,7 @@ static int __devinit matrix_keypad_probe(struct platform_device *pdev) 


	input_dev->keycode	= keycodes;

	input_dev->keycodesize	= sizeof(*keycodes);

	input_dev->keycodemax	= keymap_data->max_keymap_size;

	input_dev->keycodemax	= pdata->num_row_gpios << keypad->row_shift;



	for (i = 0; i < keymap_data->keymap_size; i++) {

		unsigned int key = keymap_data->keymap[i];
@@ -371,7 +371,7 @@ static int __devinit matrix_keypad_probe(struct platform_device *pdev) 
		unsigned int col = KEY_COL(key);

		unsigned short code = KEY_VAL(key);



		keycodes[(row << 4) + col] = code;

		keycodes[MATRIX_SCAN_CODE(row, col, row_shift)] = code;

		__set_bit(code, input_dev->keybit);

	}

	__clear_bit(KEY_RESERVED, input_dev->keybit);

drivers/input/misc/wistron_btns.c

+16 −0
Original line number Diff line number Diff line
@@ -611,6 +611,20 @@ static struct key_entry keymap_wistron_generic[] __initdata = { 
	{ KE_END, 0 }

};



static struct key_entry keymap_prestigio[] __initdata = {

	{ KE_KEY,  0x11, {KEY_PROG1} },

	{ KE_KEY,  0x12, {KEY_PROG2} },

	{ KE_WIFI,  0x30 },

	{ KE_KEY,  0x22, {KEY_REWIND} },

	{ KE_KEY,  0x23, {KEY_FORWARD} },

	{ KE_KEY,  0x24, {KEY_PLAYPAUSE} },

	{ KE_KEY,  0x25, {KEY_STOPCD} },

	{ KE_KEY,  0x31, {KEY_MAIL} },

	{ KE_KEY,  0x36, {KEY_WWW} },

	{ KE_END,  0 }

};





/*

 * If your machine is not here (which is currently rather likely), please send

 * a list of buttons and their key codes (reported when loading this module
@@ -971,6 +985,8 @@ static int __init select_keymap(void) 
	if (keymap_name != NULL) {

		if (strcmp (keymap_name, "1557/MS2141") == 0)

			keymap = keymap_wistron_ms2141;

		else if (strcmp (keymap_name, "prestigio") == 0)

			keymap = keymap_prestigio;

		else if (strcmp (keymap_name, "generic") == 0)

			keymap = keymap_wistron_generic;

		else {

drivers/input/serio/i8042-x86ia64io.h

+8 −0
Original line number Diff line number Diff line
@@ -77,6 +77,14 @@ static struct dmi_system_id __initdata i8042_dmi_noloop_table[] = { 
			DMI_MATCH(DMI_BOARD_VERSION, "Rev E"),

		},

	},

	{

		.ident = "ASUS G1S",

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer Inc."),

			DMI_MATCH(DMI_BOARD_NAME, "G1S"),

			DMI_MATCH(DMI_BOARD_VERSION, "1.0"),

		},

	},

	{

		/* AUX LOOP command does not raise AUX IRQ */

		.ident = "ASUS P65UP5",

include/linux/input/matrix_keypad.h

+7 −6
Original line number Diff line number Diff line
@@ -15,12 +15,13 @@ 
#define KEY_COL(k)		(((k) >> 16) & 0xff)

#define KEY_VAL(k)		((k) & 0xffff)



#define MATRIX_SCAN_CODE(row, col, row_shift)	(((row) << (row_shift)) + (col))



/**

 * struct matrix_keymap_data - keymap for matrix keyboards

 * @keymap: pointer to array of uint32 values encoded with KEY() macro

 *	representing keymap

 * @keymap_size: number of entries (initialized) in this keymap

 * @max_keymap_size: maximum size of keymap supported by the device

 *

 * This structure is supposed to be used by platform code to supply

 * keymaps to drivers that implement matrix-like keypads/keyboards.
@@ -28,14 +29,13 @@ 
struct matrix_keymap_data {

	const uint32_t *keymap;

	unsigned int	keymap_size;

	unsigned int	max_keymap_size;

};



/**

 * struct matrix_keypad_platform_data - platform-dependent keypad data

 * @keymap_data: pointer to &matrix_keymap_data

 * @row_gpios: array of gpio numbers reporesenting rows

 * @col_gpios: array of gpio numbers reporesenting colums

 * @row_gpios: pointer to array of gpio numbers representing rows

 * @col_gpios: pointer to array of gpio numbers reporesenting colums

 * @num_row_gpios: actual number of row gpios used by device

 * @num_col_gpios: actual number of col gpios used by device

 * @col_scan_delay_us: delay, measured in microseconds, that is
@@ -48,8 +48,9 @@ struct matrix_keymap_data { 
struct matrix_keypad_platform_data {

	const struct matrix_keymap_data *keymap_data;



	unsigned int	row_gpios[MATRIX_MAX_ROWS];

	unsigned int	col_gpios[MATRIX_MAX_COLS];

	const unsigned int *row_gpios;

	const unsigned int *col_gpios;



	unsigned int	num_row_gpios;

	unsigned int	num_col_gpios;