yangkai [Tue, 20 Dec 2011 03:52:48 +0000 (11:52 +0800)]
Merge branch 'develop-3.0' of 10.10.10.29:/home/rockchip/kernel into develop-3.0
lw [Tue, 20 Dec 2011 03:28:30 +0000 (11:28 +0800)]
td8801:modify gsensor orientation
lw [Tue, 20 Dec 2011 02:47:54 +0000 (10:47 +0800)]
sensors:modify a22 and td8801 sensor driver,need update android
CMY [Mon, 19 Dec 2011 09:23:00 +0000 (17:23 +0800)]
rtl8192c: channel plan setting error
CMY [Mon, 19 Dec 2011 09:19:49 +0000 (17:19 +0800)]
rtl8192c not available if RFKILL is selected
CMY [Mon, 19 Dec 2011 09:05:01 +0000 (17:05 +0800)]
support huawei E392 dongle
黄涛 [Mon, 19 Dec 2011 04:12:33 +0000 (12:12 +0800)]
rk29: ddr3sdk: defconfig: sync with tuna
Enable more input devices
Add CONFIG_IP_MULTICAST option
Add CONFIG_PPP_MPPE, CONFIG_PPPOLAC, CONFIG_PPPOPNS options
杜坤明 [Mon, 19 Dec 2011 03:04:04 +0000 (11:04 +0800)]
gpu : enable shutdown control & add some command check.
Benoit Goby [Sat, 10 Dec 2011 02:05:00 +0000 (18:05 -0800)]
usb: gadget: android: Don't allow changing the functions list if enabled
Change-Id: I3ad39b420ce79a8602a7eca1daac1f56b30bad5c
Signed-off-by: Benoit Goby <benoit@android.com>
Benoit Goby [Tue, 29 Nov 2011 21:49:27 +0000 (13:49 -0800)]
usb: gadget: android: Cancel pending ctrlrequest before disabling
Make sure there is no pending ctrlrequest before removing the config.
Otherwise the ctrlrequest complete callback could access structures
after they have been freed. Unbind cancels pending transfers but not
ep0 requests.
Bug:
5513065 5440193
Change-Id: I063c22bf5d104a3d2df71cf622409459fac5f27a
Signed-off-by: Benoit Goby <benoit@android.com>
Colin Cross [Wed, 30 Nov 2011 00:37:07 +0000 (16:37 -0800)]
ARM: idle: call idle notifiers before stopping nohz tick
If an idle notifier modifies a timer, calling the notifier after
the sched tick has been stopped may leave the sched tick set too
early. Move teh idle notifier call before the call to
tick_nohz_stop_sched_tick.
Change-Id: I0db3284bec6d0193bc5e2a57650ab06bd8342319
Signed-off-by: Colin Cross <ccross@android.com>
zhanghao [Mon, 19 Dec 2011 02:09:46 +0000 (10:09 +0800)]
ION : Add ION to td8801\a22\phonesdk
黄涛 [Mon, 19 Dec 2011 02:07:34 +0000 (10:07 +0800)]
gpu: ion: fix printk when alloc failed
黄涛 [Sat, 17 Dec 2011 08:44:51 +0000 (16:44 +0800)]
rk29: dd3sdk: defconfig: enable ion
zhanghao [Sat, 17 Dec 2011 06:48:06 +0000 (14:48 +0800)]
td8801 : add ion
邱建斌 [Sat, 17 Dec 2011 03:35:06 +0000 (11:35 +0800)]
wm8994 : add POWER_EN PA_CTRL iomux to pdata
kfx [Fri, 16 Dec 2011 02:32:41 +0000 (10:32 +0800)]
ion: flush cache
lw [Thu, 15 Dec 2011 06:53:04 +0000 (14:53 +0800)]
A22:modify a22 defconfig according to ddr3 defconfig
lw@rock-chips.com [Thu, 15 Dec 2011 03:05:07 +0000 (11:05 +0800)]
A22:modify camera driver according to android4.0
xbw [Thu, 15 Dec 2011 03:06:19 +0000 (11:06 +0800)]
Merge branch 'develop-3.0' of 10.10.10.29:/home/rockchip/kernel into develop-3.0
xbw [Thu, 15 Dec 2011 03:04:31 +0000 (11:04 +0800)]
modify the failure of SD-sdio in some case,due to print too much to invalid
杜坤明 [Thu, 15 Dec 2011 02:57:09 +0000 (10:57 +0800)]
gpu : repair gckVIDMEM_Unlock's event problem; add gcvFLUSH_2D at gckVIDMEM_Unlock to avoid gpu hang.
邱建斌 [Thu, 15 Dec 2011 02:43:52 +0000 (10:43 +0800)]
wm8994: add Earpiece Volume control
yangkai [Thu, 15 Dec 2011 01:45:13 +0000 (09:45 +0800)]
Revert "Revert "ddr v2.02 for lower power consumption""
This reverts commit
c4c21f5d3a5076f34d6851635fe22e2dc38b6fca.
yangkai [Thu, 15 Dec 2011 01:38:39 +0000 (09:38 +0800)]
Merge branch 'develop-3.0' of 10.10.10.29:/home/rockchip/kernel into develop-3.0
root [Wed, 14 Dec 2011 07:11:18 +0000 (15:11 +0800)]
A22:fix system die when 23d modem open
黄涛 [Wed, 14 Dec 2011 07:16:05 +0000 (15:16 +0800)]
rk29: vpu_mem: fix pass miscdevice pointer via file private data
kfx [Wed, 14 Dec 2011 04:58:55 +0000 (12:58 +0800)]
add ion(kernel allocator) for gralloc
黄涛 [Wed, 14 Dec 2011 02:11:20 +0000 (10:11 +0800)]
dd3sdk: defconfig: PANIC_TIMEOUT=1
lw [Tue, 13 Dec 2011 09:57:22 +0000 (17:57 +0800)]
A22:add wm8994 support for rk29_a22_defconfig
lw@rock-chips.com [Tue, 13 Dec 2011 06:08:44 +0000 (14:08 +0800)]
modify ak8975 orientation for phonesdk
黄涛 [Tue, 13 Dec 2011 04:11:43 +0000 (12:11 +0800)]
rk29: boot mode better support recovery by parse command line
黄涛 [Tue, 13 Dec 2011 04:05:20 +0000 (12:05 +0800)]
pmem: fix pass miscdevice pointer via file private data
黄涛 [Tue, 13 Dec 2011 02:35:49 +0000 (10:35 +0800)]
Revert "Revert "drivers: misc: pass miscdevice pointer via file private data""
This reverts commit
932cf8f1d4f17c38804c0b0a0237d5718bd8d5ac.
杜坤明 [Tue, 13 Dec 2011 02:47:26 +0000 (10:47 +0800)]
gpu : modify the number of pre-alloc pages for gckOS_AllocateNonPagedMemory & add some debug code
黄涛 [Mon, 12 Dec 2011 14:53:01 +0000 (22:53 +0800)]
inv_mpu: do not select the driver by default
lw@rock-chips.com [Mon, 12 Dec 2011 12:54:19 +0000 (20:54 +0800)]
modify some board file according to mpu3050 driver
hwg [Mon, 12 Dec 2011 12:24:09 +0000 (20:24 +0800)]
reset g_onoff in wifi driver insmode, to avoid wifi driver error when rmmod with G_WLAN_SET_OFF status
lw [Mon, 12 Dec 2011 11:15:50 +0000 (19:15 +0800)]
add new mpu3050 driver support from manufacturing company
liuji [Mon, 12 Dec 2011 01:42:45 +0000 (09:42 +0800)]
Mtp: fix mtp sync operation no response,hold in error stat.
fix bug: while read buffer length > MTP_BULK_BUFFER_SIZE, return -1
errno=EINVAL(22)
yangkai [Sat, 10 Dec 2011 07:57:13 +0000 (15:57 +0800)]
Revert "ddr v2.02 for lower power consumption"
This reverts commit
fecada63c18475840bc53219deac4a3a087172c3.
黄涛 [Fri, 9 Dec 2011 06:30:42 +0000 (14:30 +0800)]
rk29: Temporary disable DDR frequency scaling, which is broken
邱建斌 [Fri, 9 Dec 2011 06:19:08 +0000 (14:19 +0800)]
wm8994: add MICBIAS control
chenli [Fri, 9 Dec 2011 02:05:16 +0000 (10:05 +0800)]
change PMEM_GPU_SIZE from 16M to 64M
yangkai [Thu, 8 Dec 2011 13:19:08 +0000 (21:19 +0800)]
reinit usb pcd ep4,ep6 when reset
wdc [Wed, 7 Dec 2011 09:54:19 +0000 (17:54 +0800)]
fixed config override warning
wdc [Wed, 7 Dec 2011 02:13:53 +0000 (10:13 +0800)]
bluetooth: enable config for android4.0
黄涛 [Wed, 7 Dec 2011 01:31:13 +0000 (09:31 +0800)]
Revert "earlysuspend: Temporary enable debug"
This reverts commit
9b6c7f264c2d38c93d5acac94ce9760894611a71.
Disable earlysuspend debug for release.
ddl [Tue, 6 Dec 2011 10:21:55 +0000 (18:21 +0800)]
camera: add support query 480p framerate
zhanghao [Tue, 6 Dec 2011 08:09:59 +0000 (16:09 +0800)]
add driver net_filter_qtaguid for netflow control
if no include this driver , 3g/gprs cannot be use in any apps
phc [Mon, 5 Dec 2011 10:45:30 +0000 (18:45 +0800)]
z5 phone:enable codec I2S-II in used
phc [Mon, 5 Dec 2011 10:44:45 +0000 (18:44 +0800)]
z5 Phone:add OV7690 sensor support
邱建斌 [Mon, 5 Dec 2011 10:09:40 +0000 (18:09 +0800)]
z5: add automatic I2S1/I2S0 for wm8994
yzq [Mon, 5 Dec 2011 08:42:45 +0000 (16:42 +0800)]
update hdmi: modify hdmi init and add HDMI_SAVE_DATA config
邱建斌 [Mon, 5 Dec 2011 08:23:50 +0000 (16:23 +0800)]
a22: wm8994 add pa control
yangkai [Mon, 5 Dec 2011 08:14:05 +0000 (16:14 +0800)]
disable async suspend in usb system
phc [Mon, 5 Dec 2011 07:15:00 +0000 (15:15 +0800)]
z5 phone:shield the touchscreen redundant log
phc [Mon, 5 Dec 2011 07:01:53 +0000 (15:01 +0800)]
z5 phone:home key changed && codec8994 support
JacobChen [Mon, 5 Dec 2011 07:00:31 +0000 (15:00 +0800)]
Mtp func: prevent dev state change frome cancel to error.
JacobChen [Mon, 5 Dec 2011 06:58:58 +0000 (14:58 +0800)]
Merge branch 'develop-3.0' of ssh://10.10.10.29/home/rockchip/kernel into develop-3.0
黄涛 [Mon, 5 Dec 2011 06:04:07 +0000 (14:04 +0800)]
Makefile: fix for android gold linker
zhanghao [Sat, 3 Dec 2011 07:47:55 +0000 (15:47 +0800)]
driver : update touchscreen pixcir driver with power control
xzj [Sat, 3 Dec 2011 03:38:32 +0000 (11:38 +0800)]
usb Ether works ok
phc [Sat, 3 Dec 2011 03:17:27 +0000 (11:17 +0800)]
Z5:update z5 wifi control
ddl [Fri, 2 Dec 2011 09:34:39 +0000 (17:34 +0800)]
camera: support query framerate and support detect framerate, version update to v0.1.5
lw@rock-chips.com [Fri, 2 Dec 2011 09:30:00 +0000 (17:30 +0800)]
A22:modify menu key definition
zhanghao [Fri, 2 Dec 2011 09:23:24 +0000 (17:23 +0800)]
change keyboard value HOME -> HOMEPAGE
lw@rock-chips.com [Fri, 2 Dec 2011 07:37:59 +0000 (15:37 +0800)]
compass:modify ioctl interface
杜坤明 [Fri, 2 Dec 2011 06:40:15 +0000 (14:40 +0800)]
gpu : add 8 page cache & modify the number of pre-alloc pages for gckOS_AllocateNonPagedMemory.
黄涛 [Fri, 2 Dec 2011 06:05:35 +0000 (14:05 +0800)]
rk29: last_log: support /proc/last_kmsg when ANDROID_RAM_CONSOLE is not enabled, better support android bugreport
phc [Thu, 1 Dec 2011 12:54:32 +0000 (20:54 +0800)]
Z5 Support In 3.0
linjh [Thu, 1 Dec 2011 10:04:08 +0000 (18:04 +0800)]
phonesdk: change function to static function of gns7560
黄涛 [Thu, 1 Dec 2011 08:50:13 +0000 (16:50 +0800)]
video: rk29: add FB_WIMO config
黄涛 [Thu, 1 Dec 2011 08:49:19 +0000 (16:49 +0800)]
rk29: dd3sdk: defconfig: add COMPACTION, CPU_FREQ_DEFAULT_GOV_INTERACTIVE, INPUT_KEYCHORD, more HID, rm ANDROID_RAM_CONSOLE
linjh [Thu, 1 Dec 2011 09:31:32 +0000 (17:31 +0800)]
phonesdk: fixup function interface of gns7560 driver ioctl in kernel-3.0
linjh [Thu, 1 Dec 2011 09:19:48 +0000 (17:19 +0800)]
td8801: fixup multitouch of pixcir_tp in kernel-3.0
邱建斌 [Thu, 1 Dec 2011 08:51:17 +0000 (16:51 +0800)]
a22/td8801: board add include file
邱建斌 [Thu, 1 Dec 2011 08:38:40 +0000 (16:38 +0800)]
a22/td8801: update board for wm8994
JacobChen [Thu, 1 Dec 2011 03:30:34 +0000 (11:30 +0800)]
Merge branch 'develop-3.0' of ssh://10.10.10.29/home/rockchip/kernel into develop-3.0
邱建斌 [Thu, 1 Dec 2011 02:49:43 +0000 (10:49 +0800)]
phonesdk: update wm8994 device
hwg [Thu, 1 Dec 2011 01:44:09 +0000 (09:44 +0800)]
delete drivers/net/wireless/ar6003/host/tools/ dir
黄涛 [Wed, 30 Nov 2011 11:41:47 +0000 (19:41 +0800)]
input: eeti_egalax_i2c: never report ABS_MT_TOUCH_MAJOR with 0
黄涛 [Wed, 30 Nov 2011 11:40:43 +0000 (19:40 +0800)]
rk29: dd3sdk: defconfig: PANIC_TIMEOUT=0
hwg [Wed, 30 Nov 2011 11:15:43 +0000 (19:15 +0800)]
delete ar6003/host/Android.mk
lw [Wed, 30 Nov 2011 10:07:03 +0000 (18:07 +0800)]
A22:improve touchscreen ili2102 driver
lw@rock-chips.com [Wed, 30 Nov 2011 09:27:45 +0000 (17:27 +0800)]
A22:modify rk29_a22_defconfig and touchscreen
xbw [Wed, 30 Nov 2011 08:48:11 +0000 (16:48 +0800)]
Optimize the SDMMC module for Kernel3.0 after cherry-pick from RK29-2.10SDK
陈恒明 [Wed, 30 Nov 2011 06:28:27 +0000 (14:28 +0800)]
rk29: vpu_service: fix bug when encoder and pp work at the same time
lw@rock-chips.com [Wed, 30 Nov 2011 03:50:18 +0000 (11:50 +0800)]
a22:modify board-rk29-a22.c
陈金泉 [Wed, 30 Nov 2011 03:42:08 +0000 (11:42 +0800)]
add tlv320aic3111 codec driver
cmy [Wed, 30 Nov 2011 03:04:51 +0000 (11:04 +0800)]
rtl8192c: fix gpio operation error, softap switch error
黄涛 [Wed, 30 Nov 2011 02:36:13 +0000 (10:36 +0800)]
Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0
ddl [Tue, 29 Nov 2011 12:08:07 +0000 (20:08 +0800)]
camera(videobuf-core): fix deadlock in videobuf core, because dqueue ioctl havn't unlock vdev lock when stream is empty
hwg [Tue, 29 Nov 2011 07:41:58 +0000 (15:41 +0800)]
add atheros ar6003 wifi driver
need to remove bt support in menuconfig: Networking support ---> Bluetooth subsystem support.
陈金泉 [Tue, 29 Nov 2011 03:38:28 +0000 (11:38 +0800)]
change for wm8994
Benoit Goby [Tue, 29 Nov 2011 02:01:03 +0000 (18:01 -0800)]
usb: gadget: android: Reset next_string_id before enable
Reset next_string_id to 0 before enabling the gadget driver. Otherwise,
after a large number of enable/disable cycles, bind will fail
because we cannot allocate new string ids. String ids cannot be larger
than 254 per USB spec.
Change-Id: I44f5fece45008b7a0a18c025d4eb5ce842585c28
Signed-off-by: Benoit Goby <benoit@android.com>
hyungseoung.yoo [Fri, 18 Nov 2011 04:57:01 +0000 (13:57 +0900)]
Bluetooth: Keep master role when SCO or eSCO is active
This improves compatbility with a lot of headset / chipset
combinations. Ideally this should not be needed.
Change-Id: I8b676701e12e416aa7d60801b9d353b15d102709
Signed-off-by: hyungseoung.yoo <hyungseoung.yoo@samsung.com>
Signed-off-by: Jaikumar Ganesh <jaikumarg@android.com>
杜坤明 [Mon, 28 Nov 2011 09:21:15 +0000 (17:21 +0800)]
gpu : Prior the cancel_delayed_work_sync to gckOS_AcquireMutex
张昊 [Mon, 28 Nov 2011 07:10:41 +0000 (15:10 +0800)]
fix building error mtd23d
ddl [Mon, 28 Nov 2011 04:16:14 +0000 (12:16 +0800)]
camera: update a22 board file for support obtain camera information(facing,orientation)