黄涛 [Tue, 9 Aug 2011 02:06:42 +0000 (10:06 +0800)]
Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36
Conflicts:
drivers/input/touchscreen/Makefile
drivers/media/video/rk29_camera.c
sound/soc/codecs/wm8994.c
黄涛 [Tue, 9 Aug 2011 02:03:30 +0000 (10:03 +0800)]
input: touchscreen: Makefile: indent only
kfx [Mon, 8 Aug 2011 09:38:23 +0000 (17:38 +0800)]
hdmi drivers: bug on hdmi_unregister function
陈金泉 [Mon, 8 Aug 2011 08:47:29 +0000 (16:47 +0800)]
update wm8994 driver
xbw [Mon, 8 Aug 2011 07:48:28 +0000 (15:48 +0800)]
fix bug for RK29-v1.30.2-BUG list about sd-moudule
zwp [Mon, 8 Aug 2011 06:35:42 +0000 (23:35 -0700)]
phone-pad:modify phone pad default configs.
slg [Mon, 8 Aug 2011 03:58:24 +0000 (08:58 +0500)]
phone-pad:add code for boe screen
zwp [Mon, 8 Aug 2011 03:53:09 +0000 (20:53 -0700)]
phone-pad:add code for nas touchscreen
方镇福 [Fri, 5 Aug 2011 07:59:37 +0000 (15:59 +0800)]
recover stop dly because RK29_I2C_STOP_TIMEOUT_COUNT is set 70
方镇福 [Fri, 5 Aug 2011 07:53:30 +0000 (15:53 +0800)]
update i2c stop func, del udelay(tmo)
jyk [Thu, 4 Aug 2011 15:20:39 +0000 (23:20 +0800)]
newton: fix lcd power leak on suspend
close LCD_DISP & LCD_EN on suspend
ddl [Thu, 4 Aug 2011 09:38:02 +0000 (17:38 +0800)]
camera:fix camera power gpio request may be failed
ddl [Thu, 4 Aug 2011 09:31:36 +0000 (17:31 +0800)]
camera and uvc: fix camera power gpio request may be failed, uvc driver support
ddl [Thu, 4 Aug 2011 08:59:57 +0000 (16:59 +0800)]
camera: uodate ov7675 sensor driver
ddl [Thu, 4 Aug 2011 04:38:19 +0000 (12:38 +0800)]
camera: camera add to board defconfig
ddl [Thu, 4 Aug 2011 04:29:55 +0000 (12:29 +0800)]
Merge branch 'develop-2.6.36' of 10.10.10.29:/home/rockchip/kernel-2.6.36 into develop-2.6.36
ddl [Thu, 4 Aug 2011 04:29:21 +0000 (12:29 +0800)]
camera: camera driver and all sensor driver support
chenli [Thu, 4 Aug 2011 03:56:07 +0000 (11:56 +0800)]
rk29-ipp:add store_clip_mode in struct rk29_ipp_req
store_clip_mode: 0: when src width is not 64-bits aligned,use dummy data make it 64-bits aligned 1:packed
蔡枫 [Thu, 4 Aug 2011 03:44:39 +0000 (11:44 +0800)]
newton:add gt819 checksum when firmware update,modiry suspend and resume for ft5406 and gt819
lyx [Wed, 3 Aug 2011 08:19:50 +0000 (01:19 -0700)]
compass ak8975: add suspend and resume return value
cwz [Wed, 3 Aug 2011 08:10:48 +0000 (01:10 -0700)]
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
cwz [Wed, 3 Aug 2011 08:10:03 +0000 (01:10 -0700)]
newton: get all sector3 info api.
lyx [Wed, 3 Aug 2011 08:07:37 +0000 (01:07 -0700)]
rk29sdk l/p sensor: modify driver
1.初始化时增加对light sensor中断范围寄存器的配置，
否则这个值可能不是我们想要的默认值，由此造成light sensor产生中断，影响psensor功能
root [Wed, 20 Jul 2011 07:08:48 +0000 (15:08 +0800)]
A22:modify touch screen driver according to its firmware
root [Fri, 22 Jul 2011 04:25:36 +0000 (12:25 +0800)]
A22:modify the backlight interface for charger display
root [Thu, 21 Jul 2011 22:30:40 +0000 (06:30 +0800)]
A22:improve backlight driver
root [Sun, 31 Jul 2011 03:18:27 +0000 (11:18 +0800)]
A22:reduce backlight delay while resume
root [Tue, 2 Aug 2011 14:50:06 +0000 (22:50 +0800)]
RK29_phone:impove battery detect driver
root [Tue, 2 Aug 2011 09:12:20 +0000 (17:12 +0800)]
rk29 phone:add wake lock support if SYSVDD under voltage
root [Thu, 21 Jul 2011 22:59:38 +0000 (06:59 +0800)]
A22:XBL modify mt9t111 driver
蔡伟立 [Wed, 3 Aug 2011 01:42:43 +0000 (09:42 +0800)]
fix some bug caused by low core voltage
蔡枫 [Tue, 2 Aug 2011 11:52:42 +0000 (19:52 +0800)]
newton:update config and board file
蔡枫 [Tue, 2 Aug 2011 11:25:22 +0000 (19:25 +0800)]
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
蔡枫 [Tue, 2 Aug 2011 11:24:59 +0000 (19:24 +0800)]
newton:fix gt819 and ft5406 irq disable bug
黄涛 [Tue, 2 Aug 2011 10:47:27 +0000 (18:47 +0800)]
regulator: rk29-pwm: use usleep_range to sleep, make cpu freq change more faster
hhb [Tue, 2 Aug 2011 09:53:55 +0000 (17:53 +0800)]
rk29_phonesdk : UART : fix the uart busy detect interrupt bug in rk29_serial.c
wdc [Tue, 2 Aug 2011 07:31:39 +0000 (15:31 +0800)]
Bluetooth: remove wake up key at driver level
ddl [Tue, 2 Aug 2011 07:24:14 +0000 (15:24 +0800)]
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
ddl [Tue, 2 Aug 2011 07:21:46 +0000 (15:21 +0800)]
camera: fix ov5640 capture error after 720p preview
clb [Tue, 2 Aug 2011 07:27:51 +0000 (15:27 +0800)]
fix timeout bug
lyx [Tue, 2 Aug 2011 07:22:10 +0000 (00:22 -0700)]
rk29 phonesdk defconfig: enable l/p sensor
蔡枫 [Tue, 2 Aug 2011 04:34:49 +0000 (12:34 +0800)]
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
蔡枫 [Tue, 2 Aug 2011 04:34:32 +0000 (12:34 +0800)]
newton:cs42l52 only support 44.1k sample rate
蔡枫 [Tue, 2 Aug 2011 03:55:40 +0000 (11:55 +0800)]
newton:update gt819, add version compare
lyx [Tue, 2 Aug 2011 01:39:17 +0000 (18:39 -0700)]
compass akm8975: modify earlysuspend and resume to nomal suspend and resume
黄涛 [Mon, 1 Aug 2011 11:18:27 +0000 (19:18 +0800)]
rk29: support get boot mode by register
黄涛 [Mon, 1 Aug 2011 06:52:01 +0000 (14:52 +0800)]
Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36
黄涛 [Mon, 1 Aug 2011 06:41:15 +0000 (14:41 +0800)]
Revert "cpufreq: ondemand: rk29 ignore nice default"
This reverts commit
71e7f0d47f03ed67282ae6e5a8c46b3d1b5f0113.
陈金泉 [Mon, 1 Aug 2011 06:42:23 +0000 (14:42 +0800)]
add rt5625.c.enc
黄涛 [Mon, 1 Aug 2011 04:16:19 +0000 (12:16 +0800)]
Merge remote-tracking branch 'remotes/kernel-2.6.32/develop' into develop-2.6.36
黄涛 [Mon, 1 Aug 2011 03:38:19 +0000 (11:38 +0800)]
rk29: ddr3sdk: defconfig: temp disable camera functions for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:31:31 +0000 (11:31 +0800)]
sound: rk29: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:30:58 +0000 (11:30 +0800)]
wm8900: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:30:43 +0000 (11:30 +0800)]
v4l2-chip-ident.h: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:30:29 +0000 (11:30 +0800)]
wakelock.h: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:30:13 +0000 (11:30 +0800)]
gpio.h: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:29:37 +0000 (11:29 +0800)]
partitions: msdos: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:29:00 +0000 (11:29 +0800)]
rk29_fb: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:28:43 +0000 (11:28 +0800)]
hdmi: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:28:21 +0000 (11:28 +0800)]
backlight: rk29: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:28:00 +0000 (11:28 +0800)]
gadget_chips.h: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:27:13 +0000 (11:27 +0800)]
f_mass_storage: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:26:57 +0000 (11:26 +0800)]
dwc_otg_hcd.h: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:26:42 +0000 (11:26 +0800)]
dwc_otg_hcd: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:26:26 +0000 (11:26 +0800)]
rk29: gpu: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:26:03 +0000 (11:26 +0800)]
bcm4329: add WEXT_PRIV, fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:25:20 +0000 (11:25 +0800)]
vmac: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:25:07 +0000 (11:25 +0800)]
mmc: rk29: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:24:42 +0000 (11:24 +0800)]
mmc: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:24:07 +0000 (11:24 +0800)]
pmem: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:23:51 +0000 (11:23 +0800)]
rename KXTF9/AK8975 config
黄涛 [Mon, 1 Aug 2011 03:22:16 +0000 (11:22 +0800)]
eeti_egalax_i2c: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:22:01 +0000 (11:22 +0800)]
mma8452: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:21:46 +0000 (11:21 +0800)]
i2c: rk29: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:21:28 +0000 (11:21 +0800)]
hid-core: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:21:06 +0000 (11:21 +0800)]
dbg: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:20:53 +0000 (11:20 +0800)]
rk_sysrq: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:20:38 +0000 (11:20 +0800)]
vflash: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:20:21 +0000 (11:20 +0800)]
adc: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:19:59 +0000 (11:19 +0800)]
rk29: vpu_service: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:19:42 +0000 (11:19 +0800)]
rk29: vpu_mem: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:19:22 +0000 (11:19 +0800)]
rk29: memory.h: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:18:53 +0000 (11:18 +0800)]
rk29: debug-macro.S: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:18:26 +0000 (11:18 +0800)]
rk29: devices: fix pmu init
黄涛 [Mon, 1 Aug 2011 03:17:47 +0000 (11:17 +0800)]
rk29: sdk: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:17:34 +0000 (11:17 +0800)]
rk29: phonepadsdk: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:17:20 +0000 (11:17 +0800)]
rk29: phonesdk: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:17:08 +0000 (11:17 +0800)]
rk29: ddr3sdk: fix for v2.6.36
黄涛 [Mon, 1 Aug 2011 03:16:18 +0000 (11:16 +0800)]
arm: dma: more fix for v2.6.36
黄涛 [Sun, 31 Jul 2011 18:16:52 +0000 (02:16 +0800)]
Revert "drivers: misc: pass miscdevice pointer via file private data"
This reverts commit
fa1f68db6ca7ebb6fc4487ac215bffba06c01c28.
Which broken pmem driver.
黄涛 [Sun, 31 Jul 2011 18:16:09 +0000 (02:16 +0800)]
pmem: quiet while request for physical address of pmem region from process
黄涛 [Sun, 31 Jul 2011 18:13:29 +0000 (02:13 +0800)]
PM: wakelock: dump active wake lock name when unable to suspend
黄涛 [Sun, 31 Jul 2011 18:05:41 +0000 (02:05 +0800)]
Revert "temp revert mmc change"
This reverts commit
77d6545a14db425b338c866cf4688f277fc17f89.
Conflicts:
drivers/mmc/card/block.c
drivers/mmc/core/core.c
drivers/mmc/core/host.c
drivers/mmc/core/sd.c
drivers/mmc/core/sdio.c
黄涛 [Sun, 31 Jul 2011 17:52:34 +0000 (01:52 +0800)]
Revert "temp revert wakelock change"
This reverts commit
28644b6abdd733203d1a645c0b5dc05854aca4d9.
Conflicts:
kernel/power/wakelock.c
黄涛 [Sun, 31 Jul 2011 17:49:14 +0000 (01:49 +0800)]
Revert "temp revert apanice change"
This reverts commit
755c00cd5193c5dc18f6b8bbf9e8f43413f59513.
黄涛 [Sun, 31 Jul 2011 17:48:54 +0000 (01:48 +0800)]
Revert "temp revert usb serial option change"
This reverts commit
19d351a97fd06b46798fa66558bd8302b0eaecf7.
Conflicts:
drivers/usb/serial/option.c
黄涛 [Sun, 31 Jul 2011 17:29:20 +0000 (01:29 +0800)]
Revert "temp revert usb gadget change"
This reverts commit
aa382e22fb1ff34df15ec71d14182c11264526d9.
Conflicts:
drivers/usb/gadget/composite.c
drivers/usb/gadget/f_mass_storage.c
黄涛 [Sun, 31 Jul 2011 16:29:04 +0000 (00:29 +0800)]
Revert "temp revert yaffs change"
This reverts commit
3349399fd52b51d2c324e7c7a21ad584c0f1276b.
Conflicts:
fs/yaffs2/yaffs_fs.c
fs/yaffs2/yaffs_mtdif.c
黄涛 [Sun, 31 Jul 2011 16:24:19 +0000 (00:24 +0800)]
Revert "temp revert alarm change"
This reverts commit
b283ec8cc448d5cfec727ce96eb633a23e267e0c.
黄涛 [Sun, 31 Jul 2011 16:21:45 +0000 (00:21 +0800)]
Revert "temp revert msdos change"
This reverts commit
8937476fff671d634c8b8df256d824fce0e60746.
projects / firefly-linux-kernel-4.4.55.git / log