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
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)
黄涛 [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)
ddl [Mon, 28 Nov 2011 03:17:57 +0000 (11:17 +0800)]
camera: update phonesdk and td8801 board file for support obtain camera information(facing,orientation)
黄涛 [Fri, 25 Nov 2011 09:47:39 +0000 (17:47 +0800)]
Merge remote-tracking branch 'last/develop-3.0' into develop-3.0
黄涛 [Fri, 25 Nov 2011 09:47:33 +0000 (17:47 +0800)]
Revert "wm831x:fix building error"
This reverts commit
74d34d6871f272a36b60b139b08ceffdf3f2d152.
ddl [Fri, 25 Nov 2011 07:33:52 +0000 (15:33 +0800)]
camera: support obtain camera information(facing,orientation)
陈金泉 [Fri, 25 Nov 2011 03:32:27 +0000 (11:32 +0800)]
turn up rt5631 SPK volume
JacobChen [Thu, 24 Nov 2011 12:05:13 +0000 (20:05 +0800)]
Merge branch 'develop-3.0' of ssh://192.168.1.29/rk/kernel into develop-3.0
黄涛 [Thu, 24 Nov 2011 09:41:28 +0000 (17:41 +0800)]
sound: rk29: pcm: fix bug on rockchip_pcm_enqueue
Fix this bug:
Unable to handle kernel paging request at virtual address
6b6b6b77
pgd =
d41ec000
[
6b6b6b77] *pgd=
00000000
Internal error: Oops: 5 [#1] PREEMPT
CPU: 0 Tainted: P (3.0.8+ #250)
PC is at rockchip_pcm_enqueue+0x2c/0xec
LR is at rk29_audio_buffdone+0x58/0x84
pc : [<
c0713094>] lr : [<
c071361c>] psr:
80000193
sp :
d0bfdcf8 ip :
00000001 fp :
d51f5c44
r10:
d0a2e414 r9 :
6b6b6b6b r8 :
6b6b6b6b
r7 :
00000001 r6 :
d53abc80 r5 :
6b6b6b6b r4 :
d0a983c0
r3 :
6b6b6b6b r2 :
d6d6d6d6 r1 :
0000001d r0 :
d53abc80
[<
c0713094>] (rockchip_pcm_enqueue+0x2c/0xec) from [<
c071361c>] (rk29_audio_buffdone+0x58/0x84)
[<
c071361c>] (rk29_audio_buffdone+0x58/0x84) from [<
c0447a50>] (rk29_pl330_rq+0x270/0x2d0)
[<
c0447a50>] (rk29_pl330_rq+0x270/0x2d0) from [<
c04438f4>] (pl330_update+0x374/0x438)
[<
c04438f4>] (pl330_update+0x374/0x438) from [<
c0446d3c>] (pl330_irq_handler+0xc/0x18)
[<
c0446d3c>] (pl330_irq_handler+0xc/0x18) from [<
c04960e0>] (handle_irq_event_percpu+0x30/0x174)
[<
c04960e0>] (handle_irq_event_percpu+0x30/0x174) from [<
c049627c>] (handle_irq_event+0x58/0x80)
[<
c049627c>] (handle_irq_event+0x58/0x80) from [<
c0498358>] (handle_fasteoi_irq+0xb4/0x108)
[<
c0498358>] (handle_fasteoi_irq+0xb4/0x108) from [<
c0495d70>] (generic_handle_irq+0x28/0x3c)
[<
c0495d70>] (generic_handle_irq+0x28/0x3c) from [<
c0433060>] (asm_do_IRQ+0x60/0x84)
[<
c0433060>] (asm_do_IRQ+0x60/0x84) from [<
c04384c4>] (__irq_svc+0x44/0xa0)
Exception stack(0xd0bfde10 to 0xd0bfde58)
de00:
00000001 00000108 00000002 00000000
de20:
00000013 d5028640 c0b0d32c d05e8808 d05e8800 d05e8808 c0b0d804 d0bfdeb8
de40:
d4bd2400 d0bfde58 c0454ab4 c046ef54 40000013 ffffffff
[<
c04384c4>] (__irq_svc+0x44/0xa0) from [<
c046ef54>] (__queue_work+0x334/0x370)
[<
c046ef54>] (__queue_work+0x334/0x370) from [<
c046efdc>] (queue_work_on+0x2c/0x34)
[<
c046efdc>] (queue_work_on+0x2c/0x34) from [<
c046f024>] (queue_work+0x2c/0x54)
[<
c046f024>] (queue_work+0x2c/0x54) from [<
c047b214>] (__async_schedule+0x194/0x1b4)
[<
c047b214>] (__async_schedule+0x194/0x1b4) from [<
c070f118>] (dapm_power_widgets+0x334/0x3a4)
[<
c070f118>] (dapm_power_widgets+0x334/0x3a4) from [<
c070f234>] (snd_soc_dapm_stream_event+0xac/0xbc)
[<
c070f234>] (snd_soc_dapm_stream_event+0xac/0xbc) from [<
c070b3a0>] (soc_codec_close+0x164/0x178)
[<
c070b3a0>] (soc_codec_close+0x164/0x178) from [<
c07025a0>] (snd_pcm_release_substream+0x54/0xa4)
[<
c07025a0>] (snd_pcm_release_substream+0x54/0xa4) from [<
c0702618>] (snd_pcm_release+0x28/0x6c)
[<
c0702618>] (snd_pcm_release+0x28/0x6c) from [<
c04c8e50>] (fput+0x104/0x1f8)
[<
c04c8e50>] (fput+0x104/0x1f8) from [<
c04c5e60>] (filp_close+0x6c/0x78)
[<
c04c5e60>] (filp_close+0x6c/0x78) from [<
c04c5f30>] (sys_close+0xc4/0x124)
[<
c04c5f30>] (sys_close+0xc4/0x124) from [<
c0438940>] (ret_fast_syscall+0x0/0x30)
rk29_audio_buffdone call rockchip_pcm_enqueue, which access
rockchip_runtime_data *prtd, but prtd is freed on rockchip_pcm_close.
张昊 [Thu, 24 Nov 2011 03:42:39 +0000 (11:42 +0800)]
fix driver bug : muti-touch & td8801
张昊 [Wed, 23 Nov 2011 04:40:21 +0000 (12:40 +0800)]
Driver : add new modem driver sc8800 & tdsc8800
张昊 [Wed, 23 Nov 2011 03:45:19 +0000 (11:45 +0800)]
TD8801 : change for wm8994
陈金泉 [Wed, 23 Nov 2011 02:43:22 +0000 (10:43 +0800)]
change for wm8994
Arve Hjønnevåg [Tue, 22 Nov 2011 22:56:50 +0000 (14:56 -0800)]
rtc: Fix some bugs that allowed accumulating time drift in suspend/resume
The current code checks if abs(delta_delta.tv_sec) is greater or
equal to two before it discards the old delta value, but this can
trigger at close to -1 seconds since -1.
000000001 seconds is stored
as tv_sec -2 and tv_nsec
999999999 in a normalized timespec.
rtc_resume had an early return check if the rtc value had not changed
since rtc_suspend. This effectivly stops time for the duration of the
short sleep. Check if sleep_time is positive after all the adjustments
have been applied instead since this allows the old_system adjustment
in rtc_suspend to have an effect even for short sleep cycles.
Change-Id: I00b45c0349ec91a4bab9b41a126b377515427898
Signed-off-by: Arve Hjønnevåg <arve@android.com>
Arve Hjønnevåg [Tue, 22 Nov 2011 23:28:27 +0000 (15:28 -0800)]
Fix "time: Catch invalid timespec sleep values in __timekeeping_inject_sleeptime" to compile on 3.0
Change-Id: I1225f279cda04dedbfb7f853f6b58f1032bd6d2b
John Stultz [Thu, 2 Jun 2011 01:18:09 +0000 (18:18 -0700)]
time: Catch invalid timespec sleep values in __timekeeping_inject_sleeptime
Arve suggested making sure we catch possible negative sleep time
intervals that could be passed into timekeeping_inject_sleeptime.
CC: Arve Hjønnevåg <arve@android.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
John Stultz [Fri, 27 May 2011 18:33:18 +0000 (11:33 -0700)]
rtc: Avoid accumulating time drift in suspend/resume
Because the RTC interface is only a second granular interface,
each time we read from the RTC for suspend/resume, we introduce a
half second (on average) of error.
In order to avoid this error accumulating as the system is suspended
over and over, this patch measures the time delta between the RTC
and the system CLOCK_REALTIME.
If the delta is less then 2 seconds from the last suspend, we compensate
by using the previous time delta (keeping it close). If it is larger
then 2 seconds, we assume the clock was set or has been changed, so we
do no correction and update the delta.
Note: If NTP is running, ths could seem to "fight" with the NTP corrected
time, where as if the system time was off by 1 second, and NTP slewed the
value in, a suspend/resume cycle could undo this correction, by trying to
restore the previous offset from the RTC. However, without this patch,
since each read could cause almost a full second worth of error, its
possible to get almost 2 seconds of error just from the suspend/resume
cycle alone, so this about equal to any offset added by the compensation.
Further on systems that suspend/resume frequently, this should keep time
closer then NTP could compensate for if the errors were allowed to
accumulate.
Credits to Arve Hjønnevåg for suggesting this solution.
This patch also improves some of the variable names and adds more clear
comments.
CC: Arve Hjønnevåg <arve@android.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
黄涛 [Tue, 22 Nov 2011 14:09:46 +0000 (22:09 +0800)]
pack-kernel.sh: fix local version
陈金泉 [Tue, 22 Nov 2011 14:01:51 +0000 (22:01 +0800)]
fix rt5631 calling function error
张昊 [Tue, 22 Nov 2011 13:16:20 +0000 (21:16 +0800)]
Driver : add new driver al3006/bma023 & fix gc0309 building error
张昊 [Tue, 22 Nov 2011 13:14:36 +0000 (21:14 +0800)]
PHONE : use new sdmmc driver