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

Commit 1134ca26 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'next' into for-linus

Prepare second round of input updates for 4.9 merge window.
parents c758f96a 930e1924
Loading
Loading
Loading
Loading
+21 −0
Original line number Original line Diff line number Diff line
* MELFAS MIP4 Touchscreen

Required properties:
- compatible: must be "melfas,mip4_ts"
- reg: I2C slave address of the chip (0x48 or 0x34)
- interrupt-parent: interrupt controller to which the chip is connected
- interrupts: interrupt to which the chip is connected

Optional properties:
- ce-gpios: GPIO connected to the CE (chip enable) pin of the chip

Example:
	i2c@00000000 {
		touchscreen: melfas_mip4@48 {
			compatible = "melfas,mip4_ts";
			reg = <0x48>;
			interrupt-parent = <&gpio>;
			interrupts = <0 IRQ_TYPE_EDGE_FALLING>;
			ce-gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
		};
	};
+1 −0
Original line number Original line Diff line number Diff line
@@ -143,6 +143,7 @@ marvell Marvell Technology Group Ltd.
maxim	Maxim Integrated Products
maxim	Maxim Integrated Products
mediatek	MediaTek Inc.
mediatek	MediaTek Inc.
melexis	Melexis N.V.
melexis	Melexis N.V.
melfas	MELFAS Inc.
merrii	Merrii Technology Co., Ltd.
merrii	Merrii Technology Co., Ltd.
micrel	Micrel Inc.
micrel	Micrel Inc.
microchip	Microchip Technology Inc.
microchip	Microchip Technology Inc.
+57 −0
Original line number Original line Diff line number Diff line
@@ -319,3 +319,60 @@ For touchpad packet, the format is:
               otherwise byte 0 bit 4 must be set and byte 0/4/5 are
               otherwise byte 0 bit 4 must be set and byte 0/4/5 are
               in NEW fmt
               in NEW fmt
 F:         Number of fingers - 3, 0 means 3 fingers, 1 means 4 ...
 F:         Number of fingers - 3, 0 means 3 fingers, 1 means 4 ...


ALPS Absolute Mode - Protocol Version 8
---------------------------------------

Spoken by SS4 (73 03 14) and SS5 (73 03 28) hardware.

The packet type is given by the APD field, bits 4-5 of byte 3.

Touchpad packet (APD = 0x2):

           b7   b6   b5   b4   b3   b2   b1   b0
 byte 0:  SWM  SWR  SWL    1    1    0    0   X7
 byte 1:    0   X6   X5   X4   X3   X2   X1   X0
 byte 2:    0   Y6   Y5   Y4   Y3   Y2   Y1   Y0
 byte 3:    0  T&P    1    0    1    0    0   Y7
 byte 4:    0   Z6   Z5   Z4   Z3   Z2   Z1   Z0
 byte 5:    0    0    0    0    0    0    0    0

SWM, SWR, SWL: Middle, Right, and Left button states

Touchpad 1 Finger packet (APD = 0x0):

           b7   b6   b5   b4   b3   b2   b1   b0
 byte 0:  SWM  SWR  SWL    1    1   X2   X1   X0
 byte 1:   X9   X8   X7    1   X6   X5   X4   X3
 byte 2:    0  X11  X10  LFB   Y3   Y2   Y1   Y0
 byte 3:   Y5   Y4    0    0    1 TAPF2 TAPF1 TAPF0
 byte 4:  Zv7  Y11  Y10    1   Y9   Y8   Y7   Y6
 byte 5:  Zv6  Zv5  Zv4    0  Zv3  Zv2  Zv1  Zv0

TAPF: ???
LFB:  ???

Touchpad 2 Finger packet (APD = 0x1):

           b7   b6   b5   b4   b3   b2   b1   b0
 byte 0:  SWM  SWR  SWL    1    1  AX6  AX5  AX4
 byte 1: AX11 AX10  AX9  AX8  AX7  AZ1  AY4  AZ0
 byte 2: AY11 AY10  AY9  CONT AY8  AY7  AY6  AY5
 byte 3:    0    0    0    1    1  BX6  BX5  BX4
 byte 4: BX11 BX10  BX9  BX8  BX7  BZ1  BY4  BZ0
 byte 5: BY11 BY10  BY9    0  BY8  BY7  BY5  BY5

CONT: A 3-or-4 Finger packet is to follow

Touchpad 3-or-4 Finger packet (APD = 0x3):

           b7   b6   b5   b4   b3   b2   b1   b0
 byte 0:  SWM  SWR  SWL    1    1  AX6  AX5  AX4
 byte 1: AX11 AX10  AX9  AX8  AX7  AZ1  AY4  AZ0
 byte 2: AY11 AY10  AY9  OVF  AY8  AY7  AY6  AY5
 byte 3:    0    0    1    1    1  BX6  BX5  BX4
 byte 4: BX11 BX10  BX9  BX8  BX7  BZ1  BY4  BZ0
 byte 5: BY11 BY10  BY9    0  BY8  BY7  BY5  BY5

OVF: 5th finger detected
+8 −1
Original line number Original line Diff line number Diff line
@@ -1409,7 +1409,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
	i8042.nopnp	[HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX
	i8042.nopnp	[HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX
			     controllers
			     controllers
	i8042.notimeout	[HW] Ignore timeout condition signalled by controller
	i8042.notimeout	[HW] Ignore timeout condition signalled by controller
	i8042.reset	[HW] Reset the controller during init and cleanup
	i8042.reset	[HW] Reset the controller during init, cleanup and
			     suspend-to-ram transitions, only during s2r
			     transitions, or never reset
			Format: { 1 | Y | y | 0 | N | n }
			1, Y, y: always reset controller
			0, N, n: don't ever reset controller
			Default: only on s2r transitions on x86; most other
			architectures force reset to be always executed
	i8042.unlock	[HW] Unlock (ignore) the keylock
	i8042.unlock	[HW] Unlock (ignore) the keylock
	i8042.kbdreset  [HW] Reset device connected to KBD port
	i8042.kbdreset  [HW] Reset device connected to KBD port


+7 −0
Original line number Original line Diff line number Diff line
@@ -7155,6 +7155,13 @@ F: Documentation/scsi/megaraid.txt
F:	drivers/scsi/megaraid.*
F:	drivers/scsi/megaraid.*
F:	drivers/scsi/megaraid/
F:	drivers/scsi/megaraid/


MELFAS MIP4 TOUCHSCREEN DRIVER
M:	Sangwon Jee <jeesw@melfas.com>
W:	http://www.melfas.com
S:	Supported
F:	drivers/input/touchscreen/melfas_mip4.c
F:	Documentation/devicetree/bindings/input/touchscreen/melfas_mip4.txt

MELLANOX ETHERNET DRIVER (mlx4_en)
MELLANOX ETHERNET DRIVER (mlx4_en)
M: 	Eugenia Emantayev <eugenia@mellanox.com>
M: 	Eugenia Emantayev <eugenia@mellanox.com>
L:	netdev@vger.kernel.org
L:	netdev@vger.kernel.org
Loading