Commit Graph

266375 Commits

Author SHA1 Message Date
黄涛
9c60c70b72 rk30: sdk: fix gcc warning, "CONFIG_RK30_PWM_REGULATOR" is not defined 2012-08-17 22:08:24 +08:00
黄涛
6214df8abb rk2928: sdk: fix gcc warning, "CONFIG_RK30_PWM_REGULATOR" is not defined 2012-08-17 22:08:08 +08:00
黄涛
d7fb2169b6 Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0
Conflicts:
	arch/arm/mach-rk30/include/mach/rk30_camera.h
	arch/arm/plat-rk/include/plat/rk_camera.h
	drivers/gpio/gpio-tps65910.c
	drivers/media/video/rk30_camera_oneframe.c
	drivers/mmc/host/rk29_sdmmc.c
	drivers/net/wireless/Kconfig
	drivers/net/wireless/Makefile
	drivers/net/wireless/wifi_sys/rkwifi_sys_iface.c
	drivers/regulator/rk30-pwm-regulator.c
	drivers/usb/dwc_otg/dwc_otg_driver.c
	drivers/usb/dwc_otg/dwc_otg_hcd.c
	drivers/usb/dwc_otg/dwc_otg_pcd.c
	sound/soc/codecs/Makefile
	sound/soc/rk29/Kconfig
2012-08-17 21:48:20 +08:00
黄涛
3be93856a1 gitignore: ignore scripts/bmptologo 2012-08-17 19:20:47 +08:00
黄涛
f962867a8f bmptologo: fix gcc warning 2012-08-17 19:17:19 +08:00
ywj
f22b396074 gsensor code result in system reboot,gsensor code by lw update 2012-08-17 18:20:55 +08:00
zyc
67d9247a13 camera : support arm and rga to do digital zoom. 2012-08-17 18:01:02 +08:00
ywj
fe5f1eac21 Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0 2012-08-17 17:58:04 +08:00
ywj
8476fc265f add bmp photo for factory and del fb test log 2012-08-17 17:57:15 +08:00
yangkai
92fcf2abad merge rk2928 usb 2012-08-17 16:20:17 +08:00
gwl
1ef6037854 Merge branch 'develop-3.0-rk2928' of ssh://10.10.10.29/rk/kernel into develop-3.0-rk2928 2012-08-17 15:10:51 +08:00
gwl
1c9e908069 add usb wifi rtl8188eus support. 2012-08-17 15:10:37 +08:00
Zheng Yang
c4915c3f0f rk2929 acodec: for internal audio codec, mclk = 64*bclk = 256*lrclk. 2012-08-17 14:33:23 +08:00
张晴
3fd8816a56 rk30:sdk:support wm8326 early suspend and modify dcdc or ldo mode when in early suspend 2012-08-17 14:30:45 +08:00
ddl
852aaf411c camera rk29: add support zoom by arm, version update to v0.x.11 2012-08-17 12:24:47 +08:00
ywj
22858bea3b Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0 2012-08-17 11:33:49 +08:00
ywj
3161f4afe4 amend DEVICE_ATTR of rk30_factory_adc_battery for cts 2012-08-17 11:32:40 +08:00
xbw
66add55467 Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0 2012-08-17 10:49:46 +08:00
xbw
4dd108cba4 sdmmc: prepare for RK2918 and RK31 2012-08-17 10:49:17 +08:00
zyc
6ef0af5a9b camera : fix conflict when merge to rk30 2012-08-17 10:31:42 +08:00
root
e392c72196 camera rk30 : fix conflict when merge 2928 2012-08-17 10:25:57 +08:00
ywj
bfeaf0792a Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0 2012-08-17 10:03:12 +08:00
xbw
b4996adcf8 sdmmc: modify the card is easy to run overtime due to data-busy. 2012-08-16 20:56:48 +08:00
CMY
101aadaefe 3G: Support for more 3g devices 2012-08-16 19:20:03 +08:00
ywj
2c6254864f Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0 2012-08-16 18:23:33 +08:00
ywj
333cf5284c merge new gsensor driver 2012-08-16 17:59:08 +08:00
宋秀杰
4cf1f94c06 phonepad: codec set slave when BT incall, and set pll. 2012-08-16 17:58:48 +08:00
Zheng Yang
ab49eaa2e0 rk30 hdmi:
1. Need not take tmds_clk pull up to 3.3V as a hdmi connection condition.
	2. When parse unkown edid extensions, return false and set it as a hdmi sink.
2012-08-16 17:45:11 +08:00
黄涛
9e0aa7b6bb rga: refactor rga_drv.c for support rk30/rk31/rk2928 2012-08-16 15:55:57 +08:00
黄涛
28ef1d8c93 Input: rk29_keys: close debug print, open by 9ea1329 2012-08-16 15:46:15 +08:00
zsq
b7e56ead76 Merge branch 'develop-3.0-rk2928' of ssh://10.10.10.29/rk/kernel into develop-3.0-rk2928 2012-08-16 14:43:23 +08:00
zsq
475f235898 fix no async bug 2012-08-16 14:43:06 +08:00
ywj
170a300423 new add bmp logo for factorytool 2012-08-16 14:33:38 +08:00
ywj
1f3bc5a919 new add LCD driver for factorytool 2012-08-16 14:31:09 +08:00
ywj
c353c8fed9 new add rk30_factory_adc_battery driver for factorytool 2012-08-16 14:29:57 +08:00
ywj
03d6b5fe19 add node of rk29_backlight and rk29_keys for factorytool 2012-08-16 14:27:56 +08:00
ywj
0f08408447 add gsensor orientation node for factorytool 2012-08-16 14:25:47 +08:00
黄涛
278d2a1ab2 gpio: rk2928: enable support rk30_gpiolib_pull_updown 2012-08-16 11:51:17 +08:00
黄涛
c5066ca248 rk2928: add initial pm support 2012-08-16 09:43:53 +08:00
黄涛
7db28b5ce2 rk2928: sram: fix loop use Thumb instruction set 2012-08-16 09:22:17 +08:00
黄涛
bbc68b65d9 i2c: rk: only rk29/rk30 need idle lock 2012-08-16 09:22:16 +08:00
gwl
c31596c7c9 Merge branch 'develop-3.0-rk2928' of ssh://10.10.10.29/rk/kernel into develop-3.0-rk2928 2012-08-15 21:09:05 +08:00
gwl
24424b7461 Add wifi reset control (for RK2928) 2012-08-15 21:08:54 +08:00
chenxing
43e39f9617 rk2928:sdk: use lowest rate when all div rates are higher then request 2012-08-15 20:05:59 +08:00
chenxing
b514287dc9 rk30:sdk: dvfs add err info when current voltage out of bound 2012-08-15 18:39:11 +08:00
张晴
e592356dbb rk2928:sdk:support pwm set voltage 2012-08-15 17:20:59 +08:00
lw
532d0404a8 phonepad:uart0 support 1-3Mbps baud rate 2012-08-15 17:01:33 +08:00
lw
0c3cb26b93 phonepad:set ddr frequency 300M 2012-08-15 15:15:54 +08:00
lw
e0c50d1303 phonepad:delete lpsensor item because of i2c address conflict 2012-08-15 14:35:16 +08:00
lw@rock-chips.com
ba15610480 sensor:add gsensor disable irq operation 2012-08-15 11:53:26 +08:00