Commit Graph

1749 Commits

Author SHA1 Message Date
黄涛
380873f76d Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
This reverts commit 67078ecae3, reversing
changes made to dc136618cb.

Conflicts:

	drivers/net/wireless/ath/ar9170/usb.c
	drivers/net/wireless/ath/ath5k/base.c
	drivers/net/wireless/ath/ath5k/eeprom.c
	drivers/net/wireless/ath/ath5k/eeprom.h
	drivers/net/wireless/ath/ath5k/phy.c
	drivers/net/wireless/ath/ath9k/ath9k.h
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/hw.h
	drivers/net/wireless/ath/ath9k/mac.c
	drivers/net/wireless/ath/ath9k/mac.h
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/ath9k/reg.h
	drivers/net/wireless/ath/ath9k/xmit.c
	drivers/net/wireless/b43/b43.h
	drivers/net/wireless/b43/main.c
	drivers/net/wireless/b43/rfkill.c
	drivers/net/wireless/b43legacy/rfkill.c
	drivers/net/wireless/ipw2x00/ipw2100.c
	drivers/net/wireless/iwlwifi/iwl-3945.c
	drivers/net/wireless/iwlwifi/iwl-4965.c
	drivers/net/wireless/iwlwifi/iwl-5000-hw.h
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn-rs.c
	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-dev.h
	drivers/net/wireless/iwlwifi/iwl-eeprom.c
	drivers/net/wireless/iwlwifi/iwl-eeprom.h
	drivers/net/wireless/iwlwifi/iwl3945-base.c
	drivers/net/wireless/iwmc3200wifi/iwm.h
	drivers/net/wireless/libertas/scan.c
	drivers/net/wireless/libertas/wext.c
	drivers/net/wireless/orinoco/wext.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/net/wireless/rtl818x/rtl8187.h
	drivers/net/wireless/rtl818x/rtl8187_dev.c
	drivers/net/wireless/rtl818x/rtl8187_rfkill.c
	drivers/usb/serial/option.c
2011-07-30 22:24:29 +08:00
黄涛
35b9b535e7 Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"
This reverts commit 6e2688ca84, reversing
changes made to 4b7c9de4de.

Conflicts:

	drivers/gpio/wm831x-gpio.c
	drivers/i2c/busses/Kconfig
	drivers/net/dm9000.c
	drivers/net/wireless/airo.c
	drivers/net/wireless/ath/ar9170/hw.h
	drivers/net/wireless/ath/ar9170/main.c
	drivers/net/wireless/ath/ar9170/usb.c
	drivers/net/wireless/ath/ath5k/ath5k.h
	drivers/net/wireless/ath/ath5k/attach.c
	drivers/net/wireless/ath/ath5k/base.c
	drivers/net/wireless/ath/ath5k/qcu.c
	drivers/net/wireless/ath/ath5k/reset.c
	drivers/net/wireless/ath/ath9k/ath9k.h
	drivers/net/wireless/ath/ath9k/beacon.c
	drivers/net/wireless/ath/ath9k/eeprom.h
	drivers/net/wireless/ath/ath9k/eeprom_def.c
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/hw.h
	drivers/net/wireless/ath/ath9k/initvals.h
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/ath9k/pci.c
	drivers/net/wireless/ath/ath9k/phy.h
	drivers/net/wireless/ath/ath9k/rc.c
	drivers/net/wireless/ath/ath9k/xmit.c
	drivers/net/wireless/ath/regd.h
	drivers/net/wireless/b43/Kconfig
	drivers/net/wireless/b43/Makefile
	drivers/net/wireless/b43/b43.h
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/b43/main.c
	drivers/net/wireless/b43/pio.c
	drivers/net/wireless/b43/pio.h
	drivers/net/wireless/b43/xmit.c
	drivers/net/wireless/b43legacy/main.c
	drivers/net/wireless/hostap/hostap_cs.c
	drivers/net/wireless/hostap/hostap_hw.c
	drivers/net/wireless/hostap/hostap_pci.c
	drivers/net/wireless/hostap/hostap_wlan.h
	drivers/net/wireless/iwlwifi/iwl-3945.c
	drivers/net/wireless/iwlwifi/iwl-4965.c
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn-rs.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/iwlwifi/iwl-dev.h
	drivers/net/wireless/iwlwifi/iwl-helpers.h
	drivers/net/wireless/iwlwifi/iwl-rx.c
	drivers/net/wireless/iwlwifi/iwl-scan.c
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c
	drivers/net/wireless/libertas/if_sdio1.c
	drivers/net/wireless/p54/eeprom.c
	drivers/net/wireless/p54/p54pci.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/p54/txrx.c
	drivers/net/wireless/rndis_wlan.c
	drivers/net/wireless/rtl818x/rtl8180_dev.c
	drivers/net/wireless/wl12xx/wl1251_debugfs.c
	drivers/net/wireless/wl12xx/wl1251_sdio.c
	drivers/usb/serial/option.c
	net/bluetooth/rfcomm/core.c
2011-07-30 16:24:52 +08:00
黄涛
5f1e6e97d5 Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"
This reverts commit 7cd3739f32, reversing
changes made to 2748ae2cc2.

Conflicts:

	drivers/usb/core/hub.c
	drivers/usb/serial/option.c
2011-07-30 16:09:59 +08:00
hhb
8d06500430 rk29phonesdk:touch screen->modify gt818 driver to fit the new touch screen panel 2011-07-29 10:58:24 +08:00
黄涛
b9556fd539 rk2818: remove all rk2818 stuff, prepare for 2.6.36 2011-07-28 10:20:10 +08:00
蔡枫
d035f2c5fb newton:add gt819 firmware 2011-07-19 18:04:28 +08:00
蔡枫
d6b84a8289 newton:add gt819 firmware 2011-07-19 18:00:14 +08:00
蔡枫
3e6d9ab94a newton:fix touch screen compile error 2011-07-18 17:19:57 +08:00
黄涛
e6197bdf81 Revert "Merge branch 'hdmi' into develop"
This reverts commit 57a857b574, reversing
changes made to 5a152bcf02.
2011-07-18 09:59:10 +08:00
root
89fda76617 A22:deal with minimum and maximal value of touchscreen specially 2011-07-16 14:07:57 +08:00
root
57a857b574 Merge branch 'hdmi' into develop 2011-07-17 15:39:29 +08:00
yzq
76fe1d903a fix hdmi bug : wake up , the hdmi screen probabilistic flash of white 2011-07-17 15:35:56 +08:00
蔡枫
ad21ed9a45 newton:add gt819 config and firmware update 2011-07-15 22:13:00 +08:00
蔡枫
8ce03217ca newton:update config and board 2011-07-13 22:54:29 +08:00
蔡枫
8e46094df6 newton:optimize ft5406,modify supend and resume for ft5406 and gt819 2011-07-13 22:13:05 +08:00
jyk
f6f7748176 newton: add goodix tp support and support goodix and focal detect
1. add goodix touchscreen support
2. modify focal touchscreen driver to support goodix and focal detect
2011-07-06 20:02:37 +08:00
lyx
d032591169 gsensor: improve gsensor 2011-07-01 20:17:08 -07:00
root
a64838fe31 Improve something for A22:
1、use SPI0 init LCD to avoid SPI1 conflict between WM831X and lcd while system resume;
2、use polling instead of intterupt to read touch screen data to reduce CPU working;
3、reduce time of light backlight when charging to reduce power consumption;
2011-06-30 19:35:33 +08:00
hhb
08b54c888b rk29:touch screen -> modify gt818's INT port and SHUTDOWN port control when resume or suspned 2011-06-29 18:11:40 +08:00
jyk
d0b6fd4ce2 newton: add FT5406 touchscreen driver support 2011-06-29 10:22:10 +08:00
蔡枫
df10271a74 Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop 2011-06-28 15:24:52 +08:00
蔡枫
f183847518 add camera support and rtc for newton board 2011-06-28 15:24:06 +08:00
黄涛
2a9850e70a Revert "rk29:UART->add new uart driver rk_serial.c which can be configurated in menuconfig,but the old driver is default used"
This reverts commit ee1cd71135.
2011-06-27 17:59:38 +08:00
hhb
ee1cd71135 rk29:UART->add new uart driver rk_serial.c which can be configurated in menuconfig,but the old driver is default used 2011-06-27 17:40:18 +08:00
hhb
0b3b1d8c29 rk29:touch screen -> modify tp suspend and resume function which would really work 2011-06-27 17:05:54 +08:00
蔡枫
4d66cbb27b add 5 point touch, close cs42l52 log for newton 2011-06-27 11:48:04 +08:00
蔡枫
184fcf6615 fix tp and codec bug in newton board 2011-06-25 22:42:23 +08:00
蔡枫
7902882ebb add support for newton board 2011-06-24 22:39:48 +08:00
hhb
3ada0b01a7 optimise touch screen gt818 response time 2011-06-22 17:32:01 +08:00
zwp
82812fa339 gsensor:1.fix bug in sampling rate counting; 2.add low pass filter. 2011-06-22 00:28:33 -07:00
root
ba2c745306 1.A22:add debug interface for touch screen.
2.A22:report touch up event to android when resume to avoid following error:
I/InputDispatcher(   86): Dropping event because the pointer is not down.
2011-06-18 17:15:16 +08:00
hhb
88682f92ba rk29: touch screen : add gt818 driver 2011-06-18 11:30:20 +08:00
root
25d845b5bf 1.make sure power key can wake up system and light lcd even though pressure time is short.
2.mask some unused log.
2011-06-17 04:08:53 +08:00
黄涛
7cd3739f32 Merge remote-tracking branch 'linux-2.6.32.y/master' into develop
Merge Linux 2.6.32.41
Conflicts:
	Makefile
	drivers/mmc/core/core.c
	drivers/net/wireless/ath/ath9k/ath9k.h
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/regd_common.h
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/b43/dma.h
	drivers/net/wireless/b43/sdio.c
	drivers/net/wireless/hostap/hostap_cs.c
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-helpers.h
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/libertas/cmd.c
	drivers/net/wireless/p54/p54pci.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/p54/txrx.c
	drivers/net/wireless/rt2x00/rt2400pci.c
	drivers/net/wireless/rt2x00/rt2500pci.c
	drivers/net/wireless/rt2x00/rt2500usb.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt2x00.h
	drivers/net/wireless/rt2x00/rt2x00dev.c
	drivers/net/wireless/rt2x00/rt2x00queue.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/net/wireless/rt2x00/rt73usb.c
	drivers/usb/serial/option.c
	mm/shmem.c
2011-06-16 11:56:59 +08:00
root
cc7524966a A22:keep tp reset high when resume to reduce current 2011-06-14 19:36:12 +08:00
root
28e2d64d1c A22:add udelay to 200 for touch screen i2c reading 2011-06-10 00:51:52 +08:00
root
81431db8b7 1. add irq enable and disable for gpio.c to support disable_irq_nosync() function;
2. change irq type of touch screen between IRQF_TRIGGER_LOW and IRQF_TRIGGER_FALLING when suspend and resume,
so that can avoid system death.
2011-06-10 00:26:36 +08:00
root
6770b703b4 1、update wm831x_power.c from cj5;
2、use resume command instead of init LCD;
3、add delay after reset TP may be avoid death while resume;
2011-06-03 12:13:44 +08:00
linjh
c71cce9858 phonepad: add lcd hsd07pfw1; tp d70_l3188a 2011-06-02 12:28:56 +08:00
root
1cd3e0d990 touchscreen:keep touchscreen workqueue while suspend 2011-05-26 01:38:33 +08:00
黄涛
daf94627d7 input: eeti_egalax_i2c: fix no up event bug, use schedule_timeout_interruptible instead of schedule, fix gcc warning, irq type set to low 2011-05-26 10:37:41 +08:00
lyx
cf77093219 add boardconfig for gsensor orientation 2011-05-24 21:36:14 -07:00
root
c2d4e4e3c6 xxm FIH: update touch panel:slow report 2011-05-25 12:02:52 +08:00
root
850722c442 1. return -1 if read voltage error before reporting battery's event;
2. change to use delay workqueue to wait spi resume;
3. delete flush(dws) operation from spi resume function to avoid spi error while system resume;
4. delete suspend_noirq function from wm831x_on.c to avoid reading spi before spim resume;
5. add touchscreen delay to 200us to avoid i2c error;
2011-05-24 09:11:45 +08:00
root
344d70a08a xxm FIH: 1.update cm3202 ,2.update rk29_serial for gps 2011-05-19 10:30:33 +08:00
Éric Piel
276c429b5d Input: elantech - discard the first 2 positions on some firmwares
commit 7f29f17b57 upstream.

According to the Dell/Ubuntu driver, what was previously observed as
"jumpy cursor" corresponds to the hardware sending incorrect data for
the first two reports of a one touch finger. So let's use the same
workaround as in the other driver. Also, detect another firmware
version with the same behaviour, as in the other driver.

Signed-off-by: Éric Piel <eric.piel@tremplin-utc.net>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
[bwh: Adjust for 2.6.32]
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-09 15:55:08 -07:00
Dmitry Torokhov
1747aac65b Input: elantech - relax signature checks
commit a083632eaf upstream.

Apparently there are Elantech touchpads that report non-zero in the 2nd byte
of their signature. Adjust the detection routine so that if 2nd byte is
zero and 3rd byte contains value that is not a valid report rate, we still
assume that signature is valid.

Tested-by: Eric Piel <eric.piel@tremplin-utc.net>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
[bwh: Adjust context for 2.6.32]
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-09 15:55:07 -07:00
Dmitry Torokhov
8bac623e5b Input: elantech - use all 3 bytes when checking version
commit 504e8beed1 upstream.

Apparently all 3 bytes returned by ETP_FW_VERSION_QUERY are significant
and should be taken into account when matching hardware version/features.

Tested-by: Eric Piel <eric.piel@tremplin-utc.net>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-09 15:55:06 -07:00
Florian Ragwitz
6883f58088 Input: elantech - ignore high bits in the position coordinates
commit e938fbfd4a upstream.

In older versions of the elantech hardware/firmware those bits always
were unset, so it didn't actually matter, but newer versions seem to
use those high bits for something else, screwing up the coordinates
we report to the input layer for those devices.

Signed-off-by: Florian Ragwitz <rafl@debian.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-09 15:55:06 -07:00
Florian Ragwitz
c96981dd21 Input: elantech - allow forcing Elantech protocol
commit f81bc788ff upstream.

Apparently hardware vendors now ship elantech touchpads with different version
magic. This options allows for them to be tested easier with the current driver
in order to add their magic to the whitelist later.

Signed-off-by: Florian Ragwitz <rafl@debian.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-09 15:55:06 -07:00