Commit Graph

174057 Commits

Author SHA1 Message Date
zhaoyifeng
b8f4f1e8a1 add emmc clk power save config. 2011-06-28 20:54:52 +08:00
蔡枫
1845e22435 Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop 2011-06-28 19:48:47 +08:00
phc
509f235848 RK29SmartPhone:SDK board does not have bp_ap_wakeup GPIO, so add judge here before use the GPIO 2011-06-28 19:33:25 +08:00
hhb
e5f65ed31f rk29:UART->add new uart driver and it is default used, but you can use the old driver by setting the menuconfig 2011-06-28 17:23:43 +08:00
黄涛
9261177cde pack-kernel.sh: exclude newton board, add phone sdk 2011-06-28 17:00:04 +08:00
黄涛
e587a1ca48 Staging: dream: Kconfig fix for non-HTC hardware 2011-06-28 16:33:31 +08:00
蔡枫
5d00576a6e Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop 2011-06-28 16:16:19 +08:00
蔡枫
3c734df1e9 update config file for newton 2011-06-28 16:16:01 +08:00
zyw
c2779c627f fix cursor reload bug 2011-06-28 15:43:14 +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
邱建斌
6bc26c18a2 rk29_phone: headset hook key update 2011-06-28 14:50:19 +08:00
chenli
2abd490402 rk29 IPP:IPP driver provides synchronous and asynchronous call interfaces.
1.In the case of synchronous call please use ipp_blit_sync function.
  In the case of asynchronous call please use ipp_blit_async function.
  The old interface ipp_do_blit is obsolete!
2.Use ipp_blit_sync instead of ipp_do_blit in rk29_fb.c and rk29_camera_oneframe.c.
3.Translate the Chinese commets into English.
2011-06-28 14:44:15 +08:00
xsf@rock-chips.com
fa1654666c A22:switch to 32k when sleep 2011-06-28 11:50:02 +08:00
邱建斌
7451a831e6 rk29_phone: fix hook key irq. if headset have not hook key then not reported keydown 2011-06-28 10:32:21 +08:00
chenli
d9dced963e rk29 IPP:IPP driver provides synchronous and asynchronous call interfaces.
1.In case of synchronous call please use ipp_blit_sync function.
  In case of asynchronous call please use ipp_blit_async function.
  The old interface ipp_do_blit is not recommended from now on.
2.Use ipp_blit_sync instead of ipp_do_blit in rk29_fb.c
2011-06-28 10:14:00 +08:00
黄涛
2caa51d22a Merge remote-tracking branch 'linux-2.6.32.y/master' into develop
Merge Linux 2.6.32.42
Conflicts:
	Makefile
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/p54/p54usb.c
2011-06-28 09:47:32 +08:00
phc
cc88c1f62a RK29SmartPhone:open 32K crystalloid default 2011-06-27 20:38:56 +08:00
xsf@rock-chips.com
107807acd1 RK29SmartPhone:switch to 32k when sleep 2011-06-27 20:18:27 +08:00
黄涛
b0b16ffd1d rk29: ddr3sdk: cpufreq support 1G Hz 2011-06-27 19:00:30 +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
root
6dcf219f49 phonesdk: modify ARM freq and core voltage in running 2011-06-27 16:47:30 +08:00
黄涛
c17e447d90 rk29: vivante: alloc_pages add GFP_DMA flag to support 1G memory 2011-06-27 14:16:12 +08:00
黄涛
d11238ad51 rk29: Kconfig: support 1G memory 2011-06-27 13:59:24 +08:00
黄涛
dca2183262 rk29: phonepadsdk: support 1G memory 2011-06-27 13:59:23 +08:00
黄涛
e9e1390fc2 rk29: phonesdk: support 1G memory 2011-06-27 13:59:23 +08:00
黄涛
ac60859ccb rk29: rk29-ddr3sdk: support 1G memory 2011-06-27 13:59:23 +08:00
黄涛
e217ff283f rk29: rk29sdk: support 1G memory 2011-06-27 13:59:23 +08:00
黄涛
8a39b8c8ad rk29: vivante: fix computation of resource size for 1G memory 2011-06-27 13:59:23 +08:00
黄涛
69b558b528 rk29: mmu.c: enlarge vmalloc_reserve to support 1G memory 2011-06-27 13:59:23 +08:00
黄涛
cf1bb28a1f rk29: memory.h: fix for highmem 2011-06-27 13:59:22 +08:00
黄涛
fad833ff01 rk29: rk29_iomap.h: set RK29_SDRAM_PHYS to 0x60000000U, fix gcc warning: integer overflow in expression 2011-06-27 13:59:22 +08:00
蔡枫
4d66cbb27b add 5 point touch, close cs42l52 log for newton 2011-06-27 11:48:04 +08:00
蔡枫
7dc7582171 Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop 2011-06-25 22:42:44 +08:00
蔡枫
184fcf6615 fix tp and codec bug in newton board 2011-06-25 22:42:23 +08:00
phc
753db746ee RK29SmartPhone:23d IMEI read support 2011-06-25 16:43:26 +08:00
蔡枫
90b7169811 Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop 2011-06-24 22:40:11 +08:00
蔡枫
7902882ebb add support for newton board 2011-06-24 22:39:48 +08:00
yangkai
f8b83dd6e0 fix kernel panic when not standard usb keyboard connect 2011-06-24 18:09:34 +08:00
yangkai
d25fee09fa revert ddr v2.02 and dpll use high band 2011-06-24 16:13:40 +08:00
xsf@rock-chips.com
dd54a73ceb A22: make wm8310 exit suspend 2011-06-24 15:43:10 +08:00
yangkai
a4bd9a7cb3 adjust usb controller init sequence and remove some log 2011-06-24 14:57:35 +08:00
phc
a8b0f28785 RK29SmartPhone:TP change from GT801 to GT818 2011-06-24 14:39:39 +08:00
黄涛
328ac983a4 rk29: cru.h: fix SOFT_RST_HSADC define bug 2011-06-24 12:14:43 +08:00
hhb
cd6b90ed7f rk29:add rk29_dma_config(dws->rx_dmach, 1, 1) one more argument 2011-06-24 10:27:56 +08:00
Greg Kroah-Hartman
c49ed7e7d1 Linux 2.6.32.42 v2.6.32.42 2011-06-23 15:24:26 -07:00
Greg Kroah-Hartman
2a96ae7075 Revert "iwlagn: Support new 5000 microcode."
This reverts commit 6f63415fc1.

It turns out this is not what we want to have happen for the .32 and
.33-longterm kernels as it does not work properly at all.

This was reported by Gentoo, Arch, and Canonical developers as causing
problems for their users:
	https://bugs.archlinux.org/task/24302
	http://bugs.gentoo.org/show_bug.cgi?id=359445
	https://bugs.launchpad.net/ubuntu/+source/linux/+bug/796336

Cc: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Cc: Gordon Malm <gengor@gentoo.org>
Cc: Don Fry <donald.h.fry@intel.com>
Cc: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-23 15:24:09 -07:00
Kasper Pedersen
a6d553ac64 time: Compensate for rounding on odd-frequency clocksources
commit a386b5af8e upstream.

When the clocksource is not a multiple of HZ, the clock will be off.  For
acpi_pm, HZ=1000 the error is 127.111 ppm:

The rounding of cycle_interval ends up generating a false error term in
ntp_error accumulation since xtime_interval is not exactly 1/HZ.  So, we
subtract out the error caused by the rounding.

This has been visible since 2.6.32-rc2
	commit a092ff0f90
	time: Implement logarithmic time accumulation
That commit raised NTP_INTERVAL_FREQ and exposed the rounding error.

testing tool: http://n1.taur.dk/permanent/testpmt.c
Also tested with ntpd and a frequency counter.

Signed-off-by: Kasper Pedersen <kkp2010@kasperkp.dk>
Acked-by: john stultz <johnstul@us.ibm.com>
Cc: John Kacur <jkacur@redhat.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Will Tisdale <willtisdale@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-23 15:24:09 -07:00