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

Commit 07176b98 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'next' into for-linus 

Merge first round of changes for 3.12 merge window.
parents fa46c798 52764fed

Documentation/devicetree/bindings/input/input-reset.txt

0 → 100644
+33 −0
Original line number Diff line number Diff line 
Input: sysrq reset sequence



A simple binding to represent a set of keys as described in

include/uapi/linux/input.h. This is to communicate a sequence of keys to the

sysrq driver. Upon holding the keys for a specified amount of time (if

specified) the system is sync'ed and reset.



Key sequences are global to the system but all the keys in a set must be coming

from the same input device.



The /chosen node should contain a 'linux,sysrq-reset-seq' child node to define

a set of keys.



Required property:

sysrq-reset-seq: array of Linux keycodes, one keycode per cell.



Optional property:

timeout-ms: duration keys must be pressed together in milliseconds before

generating a sysrq. If omitted the system is rebooted immediately when a valid

sequence has been recognized.



Example:



 chosen {

                linux,sysrq-reset-seq {

                        keyset = <0x03

                                  0x04

                                  0x0a>;

                        timeout-ms = <3000>;

                };

         };



Would represent KEY_2, KEY_3 and KEY_9.

Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Required properties: 
- interrupt-parent: the phandle for the interrupt controller

- interrupts: touch controller interrupt

- wakeup-gpios: the gpio pin to be used for waking up the controller

  as well as uased as irq pin

  and also used as irq pin



Example:

MAINTAINERS

+9 −2
Original line number Diff line number Diff line
@@ -2411,9 +2411,9 @@ S: Maintained 
F:	drivers/media/common/cypress_firmware*



CYTTSP TOUCHSCREEN DRIVER

M:	Javier Martinez Canillas <javier@dowhile0.org>

M:	Ferruh Yigit <fery@cypress.com>

L:	linux-input@vger.kernel.org

S:	Maintained

S:	Supported

F:	drivers/input/touchscreen/cyttsp*

F:	include/linux/input/cyttsp.h
@@ -4038,6 +4038,13 @@ W: http://launchpad.net/ideapad-laptop 
S:	Maintained

F:	drivers/platform/x86/ideapad-laptop.c



IDEAPAD LAPTOP SLIDEBAR DRIVER

M:	Andrey Moiseev <o2g.org.ru@gmail.com>

L:	linux-input@vger.kernel.org

W:	https://github.com/o2genum/ideapad-slidebar

S:	Maintained

F:	drivers/input/misc/ideapad_slidebar.c



IDE/ATAPI DRIVERS

M:	Borislav Petkov <bp@alien8.de>

L:	linux-ide@vger.kernel.org

drivers/input/joystick/as5011.c

+2 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static int as5011_probe(struct i2c_client *client, 
	int irq;

	int error;



	plat_data = client->dev.platform_data;

	plat_data = dev_get_platdata(&client->dev);

	if (!plat_data)

		return -EINVAL;
@@ -288,6 +288,7 @@ static int as5011_probe(struct i2c_client *client, 
	if (irq < 0) {

		dev_err(&client->dev,

			"Failed to get irq number for button gpio\n");

		error = irq;

		goto err_free_button_gpio;

	}

drivers/input/joystick/maplecontrol.c

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static void dc_pad_callback(struct mapleq *mq) 


static int dc_pad_open(struct input_dev *dev)

{

	struct dc_pad *pad = dev->dev.platform_data;

	struct dc_pad *pad = dev_get_platdata(&dev->dev);



	maple_getcond_callback(pad->mdev, dc_pad_callback, HZ/20,

		MAPLE_FUNC_CONTROLLER);
@@ -71,7 +71,7 @@ static int dc_pad_open(struct input_dev *dev) 


static void dc_pad_close(struct input_dev *dev)

{

	struct dc_pad *pad = dev->dev.platform_data;

	struct dc_pad *pad = dev_get_platdata(&dev->dev);



	maple_getcond_callback(pad->mdev, dc_pad_callback, 0,

		MAPLE_FUNC_CONTROLLER);