黄涛
e1c56a82b5
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
...
Merge v3.0.58
Conflicts:
Makefile
drivers/net/wireless/p54/p54usb.c
2013-01-15 12:45:19 +08:00
Peter Popovec
ada84ad6dd
Input: walkera0701 - fix crash on startup
...
commit a455e2985f upstream.
The driver's timer must be set up before enabling IRQ handler, otherwise
bad things may happen.
Reported-and-tested-by: Fengguang Wu <fengguang.wu@intel.com >
Signed-off-by: Peter Popovec <popovec@fei.tuke.sk >
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-01-11 09:03:38 -08:00
Ondrej Zary
276c234515
x86, 8042: Enable A20 using KBC to fix S3 resume on some MSI laptops
...
commit ad68652412 upstream.
Some MSI laptop BIOSes are broken - INT 15h code uses port 92h to enable A20
line but resume code assumes that KBC was used.
The laptop will not resume from S3 otherwise but powers off after a while
and then powers on again stuck with a blank screen.
Fix it by enabling A20 using KBC in i8042_platform_init for x86.
Fixes https://bugzilla.kernel.org/show_bug.cgi?id=12878
Signed-off-by: Ondrej Zary <linux@rainbow-software.org >
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com >
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk >
Cc: Rafael J. Wysocki <rjw@sisk.pl >
Link: http://lkml.kernel.org/r/201212112218.06551.linux@rainbow-software.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-01-11 09:03:36 -08:00
黄涛
527dd83ed0
rk29_keys: fix init order, else may panic on adc callback
2013-01-06 14:09:03 +08:00
kfx
1bfe9d02e8
rk3168: ds1006h: update touchscreen(ct363)
2012-12-31 17:12:24 +08:00
kfx
3f833ed419
rk3168: ds1006h support
2012-12-30 22:07:35 +08:00
hhb
6cc22826ca
add ct36x_ts driver
2012-12-18 10:42:22 +08:00
黄涛
b77e0e8463
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
...
Conflicts:
Makefile
2012-12-12 17:18:39 +08:00
ywj
38aef71c2c
modify build error rk29_keys.c update develop3.0
2012-12-10 10:52:17 +08:00
ywj
122a324361
modify build error rk29_keys.c
2012-12-10 10:47:35 +08:00
黄涛
194b5f525d
rk29_keys: fix compile error caused by commit d9f2bfa1
2012-12-07 19:37:21 +08:00
ywj
d9f2bfa16b
modify error for no key define in init.rk29board.rc second
2012-12-07 18:08:49 +08:00
ywj
f5c08b7ebb
modify error for no key define in init.rk29board.rc
2012-12-07 18:03:51 +08:00
黄涛
f38c30bd69
rk29_key: call keys_isr when resume
...
This is patch for commit cdd3cccbd6
keyboard: If the power button is pressed in suspend state, immediately report event
2012-12-05 19:01:37 +08:00
Jussi Pakkanen
8cefc5594e
Input: bcm5974 - set BUTTONPAD property
...
commit 52965cc012 upstream.
Some bcm5974 trackpads have a physical button beneath the physical surface.
This patch sets the property bit so user space applications can detect the
trackpad type and act accordingly.
Signed-off-by: Jussi Pakkanen <jussi.pakkanen@canonical.com >
Reviewed-by: Henrik Rydberg <rydberg@euromail.se >
Signed-off-by: Dmitry Torokhov <dtor@mail.ru >
Cc: maximilian attems <max@stro.at >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2012-12-03 12:59:16 -08:00
wuhao
e422c56f96
rk292x :sitronix use macros CONFIG_RK_CONFIG to isolate pdata->direction_otation
2012-11-29 15:53:19 +08:00
wuhao
9bc9996900
rk292x : ft5x0x while suspend close vcctp and while resume open vcctp
2012-11-23 15:28:05 +08:00
wuhao
83a57919db
rk292x gt811: add wake up touch by int
2012-11-23 14:45:51 +08:00
gy@rock-chips.com
b181f07469
add gsensor mxc6225
2012-11-22 21:01:10 +08:00
luowei
48ff38b665
rk30_phonepad: update some driver from c8003
...
modified: drivers/input/misc/rk_board_id.c
modified: drivers/input/ts/chips/Kconfig
modified: drivers/input/ts/chips/Makefile
new file: drivers/input/ts/chips/ct360.c
new file: drivers/input/ts/chips/ct360_firmware.h
modified: drivers/input/ts/chips/gt828.c
modified: drivers/input/ts/ts-auto.c
modified: drivers/input/ts/ts-i2c.c
new file: drivers/input/ts/ts-serial.c
new file: drivers/input/ts/ts-spi.c
modified: drivers/misc/bp/bp-auto.c
modified: drivers/misc/bp/chips/mt6229.c
modified: drivers/usb/serial/usb-serial.c
modified: drivers/video/display/screen/lcd_auto.c
modified: include/linux/rk_board_id.h
modified: include/linux/ts-auto.h
2012-11-18 13:01:01 +08:00
wuhao
2b8c15e987
rk292x sitronix: while perform direction_otation ,determine whether pdata is NULL
2012-11-14 09:55:50 +08:00
wuhao
c6457dcf9a
revert v86 sitronix_ts of commit cb6f8a8f31 and Re touchscreen control for v86
2012-11-10 12:14:37 +08:00
wuhao
1e979fd77e
Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into v86-develop-1106
2012-11-06 18:22:46 +08:00
kfx
d4d865e351
rk2928: fixed 'WARNING: modpost: Found 1 section mismatch(es).'
2012-11-06 16:58:07 +08:00
kfx
8eaff33d66
rk2928 defconfig: v86(v1.1) support
2012-11-06 10:40:53 +08:00
wuhao
1c29b633d3
add ft5x0x for v86
2012-11-05 19:30:03 +08:00
wuhao
cb6f8a8f31
for rk2928 v86
2012-11-05 18:44:40 +08:00
kfx
46a7341368
rk2928: update rk2928_defconfig: camera: support: ov2659, gc0308, hi704
2012-11-03 15:28:56 +08:00
kfx
b69026678f
rk2926 sdk: fix 'tp crash'
2012-10-26 17:39:47 +08:00
kfx
da6318d1ca
rk2928: update gt811_ts driver
2012-10-25 17:06:48 +08:00
kfx
a7163b9816
rk2928_defconfig: support 'rk2928 phonepad'
2012-10-25 16:06:13 +08:00
kfx
4353a9c6a0
rk2928: tr726: gt811_ts.c optimize(yj)
2012-10-25 10:50:13 +08:00
linjh
6307cd6953
rk2928_phonepad: adjust ap321xx l/p sensor to compatibale sensor framework
...
[reference files]
modified:
arch/arm/configs/rk2928_phonepad_defconfig
arch/arm/mach-rk2928/board-rk2928-phonepad.c
arch/arm/mach-rk2928/include/mach/board.h
drivers/input/misc/Kconfig
drivers/input/misc/Makefile
drivers/input/sensors/lsensor/Kconfig
drivers/input/sensors/lsensor/Makefile
drivers/input/sensors/psensor/Kconfig
drivers/input/sensors/psensor/Makefile
drivers/input/sensors/sensor-dev.c
include/linux/sensor-dev.h
new file:
drivers/input/sensors/psensor/ps_ap321xx.c
drivers/input/sensors/lsensor/ls_ap321xx.c
deleted:
drivers/input/misc/ap321xx.c
2012-10-24 11:58:12 +08:00
kfx
3e41137abe
rk2928_defconfig: support 'rk2928 sdk'
2012-10-23 15:53:13 +08:00
kfx
21c2aa159e
rk2928_defconfig: support 'rk2928 top board'
2012-10-23 10:58:27 +08:00
kfx
767cf3e403
rk2928_defconfig: support 'rk2926 sdk(m713)'
2012-10-23 08:34:49 +08:00
kfx
8e8dcb7e5e
rk2928_defconfig: support 'rk2926 top board'
2012-10-22 15:41:15 +08:00
zhengxing
79707beff7
m701 - tp: improve tp can't work when low power startup.
2012-10-20 15:19:07 +08:00
kfx
031c9a5842
rk2928: rk2928 sdk(bga) initial
2012-10-16 17:09:47 +08:00
luowei
1ff0d97d07
rk30_phonepad:improve auto touch screen to support i2c,spi,uart interface
2012-10-16 15:03:24 +08:00
zhengxing
67c2b912fa
m701 - tp: modify firmware upgrade mode to async, avoid to barrage
...
and too slow when startup in m701.
2012-10-15 15:23:32 +08:00
kfx
cdd3cccbd6
keyboard: If the power button is pressed in suspend state, immediately report event
2012-10-15 15:10:27 +08:00
zhengxing
1e6f956347
m701 - tp: change the order that ft5306 sleep after set reg.
2012-10-15 13:12:09 +08:00
yzq
8b9b3f35b1
m701: remove ft5306_ts compile waring
2012-10-15 09:54:55 +08:00
luowei
1972e467e9
rk30_phonepad:add init parameter support after get board id
2012-10-14 13:15:11 +08:00
luowei
7da18b0195
rk30_phonepad:add gt828 support for auto touchscreen
2012-10-11 19:25:00 +08:00
luowei
f306c95b33
sensors:fix lightsensor ioctl logic error
2012-10-11 14:34:47 +08:00
luowei
901c0ecbc5
rk30_phonepad:improve auto touchscreen architecturefor gt8110
2012-10-10 20:11:31 +08:00
linjh
aaee33b952
rk2928-phonepad-sdk: add ap321xx l/p sensor and byd693x tp support
...
[reference files]
modified:
arch/arm/configs/rk2928_phonepad_defconfig
arch/arm/mach-rk2928/board-rk2928-phonepad.c
arch/arm/mach-rk2928/include/mach/board.h
drivers/input/misc/Kconfig
drivers/input/misc/Makefile
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile
new file:
drivers/input/misc/ap321xx.c
drivers/input/touchscreen/byd693x_ts.c
drivers/input/touchscreen/byd693x_ts.h
2012-10-10 19:14:05 +08:00
luowei
5f5bd605ab
rk30_phonepad:add auto touchscreen support
2012-10-09 20:10:19 +08:00