ubuntu [Thu, 24 Mar 2011 01:47:04 +0000 (18:47 -0700)]
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
hhb [Wed, 23 Mar 2011 12:07:30 +0000 (20:07 +0800)]
rk29: modify lcd driver
hhb [Wed, 23 Mar 2011 12:06:17 +0000 (20:06 +0800)]
rk29: modify lcd driver
yangkai [Wed, 23 Mar 2011 11:22:35 +0000 (19:22 +0800)]
memtester support in kernel
hhb [Wed, 23 Mar 2011 09:36:16 +0000 (17:36 +0800)]
rk29: modify screen.h
陈真 [Wed, 23 Mar 2011 09:05:12 +0000 (17:05 +0800)]
Merge remote branch 'origin/develop' into develop
hhb [Wed, 23 Mar 2011 09:02:31 +0000 (17:02 +0800)]
modify lcd driver
陈真 [Wed, 23 Mar 2011 08:50:45 +0000 (16:50 +0800)]
gsensor : 将 gsensor 数据设备 /dev/input/eventX 的 name 恢复为 'gsensor'.
注意 :
必须同 android 上层同时对应修改, 才能保证 gsensor 相关功能工作正常.
android 中的对应 commit :
e3dffc1901f52de7fe6e7e96382fb892da8fcce8
hhb [Wed, 23 Mar 2011 08:31:27 +0000 (16:31 +0800)]
add 3 kinds of lcd's driver
hhb [Wed, 23 Mar 2011 08:12:49 +0000 (16:12 +0800)]
add gt801 touch screen driver
黄涛 [Wed, 23 Mar 2011 08:32:26 +0000 (16:32 +0800)]
rk29: backlight: backport from rk2818, enable backlight after show logo
黄涛 [Wed, 23 Mar 2011 07:14:17 +0000 (15:14 +0800)]
rk29: reset: reset pwm while reboot
黄涛 [Wed, 23 Mar 2011 07:13:08 +0000 (15:13 +0800)]
rk29: timer: try to fix stop on "Calibrating delay loop" bug
luowei [Wed, 23 Mar 2011 04:04:13 +0000 (12:04 +0800)]
add standby for lcd_ili9803_cpt4_3
luowei [Wed, 23 Mar 2011 03:55:30 +0000 (11:55 +0800)]
add standby for lcd_ili9803_cpt4_3
ubuntu [Wed, 23 Mar 2011 01:55:17 +0000 (18:55 -0700)]
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
lbt [Tue, 22 Mar 2011 11:09:19 +0000 (19:09 +0800)]
update mmc stack from linux2.6.35
sdio: add quirk to clamp byte mode transfer
Some SDIO cards expect byte transfers not to exceed the configured block
transfer size. Add a quirk to that effect.
黄涛 [Tue, 22 Mar 2011 10:31:23 +0000 (18:31 +0800)]
rk29: clock: default armclk set to 300MHz, fix reboot problem
luowei [Tue, 22 Mar 2011 10:15:22 +0000 (18:15 +0800)]
add lcd driver support for a22
ubuntu [Tue, 22 Mar 2011 09:07:51 +0000 (02:07 -0700)]
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
陈恒明 [Tue, 22 Mar 2011 08:58:32 +0000 (16:58 +0800)]
rk29: clock: add display power domain clock support
luowei [Tue, 22 Mar 2011 07:30:58 +0000 (15:30 +0800)]
add board-rk29-a22 support
陈智 [Tue, 22 Mar 2011 07:30:22 +0000 (15:30 +0800)]
BT: bluetooth device address read from ID block
luowei [Tue, 22 Mar 2011 06:29:56 +0000 (14:29 +0800)]
delete chinese annotation
黄涛 [Tue, 22 Mar 2011 04:54:54 +0000 (12:54 +0800)]
rk29: clock: rename vip to vip_out
黄涛 [Tue, 22 Mar 2011 04:05:50 +0000 (12:05 +0800)]
rk29: add ddr.h
kfx [Tue, 22 Mar 2011 03:09:38 +0000 (11:09 +0800)]
update i2c drivers about 'set scl_rate'
kfx [Tue, 22 Mar 2011 00:46:37 +0000 (08:46 +0800)]
update adc driver modify 'sync_read bug'
陈恒明 [Mon, 21 Mar 2011 10:19:38 +0000 (18:19 +0800)]
rk29: clock: do not power off power domain
陈恒明 [Mon, 21 Mar 2011 10:18:00 +0000 (18:18 +0800)]
Revert "rk29: disable power domain switch, which may halt cpu"
This reverts commit
f79c62a3b8889225126cb1d190ef0f325a086a17.
zhaoyifeng [Mon, 21 Mar 2011 09:35:58 +0000 (17:35 +0800)]
Support for the mtd part size larger than 4GB part 2.
ubuntu [Mon, 21 Mar 2011 09:29:40 +0000 (02:29 -0700)]
cwz update
杜坤明 [Mon, 21 Mar 2011 09:13:54 +0000 (17:13 +0800)]
gpu: fix the bug of gpu's exception after reboot
zhaoyifeng [Mon, 21 Mar 2011 09:02:51 +0000 (17:02 +0800)]
restore default value to register when reboot
zyw [Mon, 21 Mar 2011 08:29:27 +0000 (16:29 +0800)]
Postpone ipp_init for display power domain ctrl
zyw [Mon, 21 Mar 2011 07:39:02 +0000 (15:39 +0800)]
add display power domain ctrl in fb
lyx [Mon, 21 Mar 2011 06:12:10 +0000 (23:12 -0700)]
update spi driver
陈恒明 [Mon, 21 Mar 2011 03:09:58 +0000 (11:09 +0800)]
board-rk29sdk: fix bug on reboot - remove printk before reset uart1
黄涛 [Sat, 19 Mar 2011 08:16:12 +0000 (16:16 +0800)]
rk29: timer: clock source do not need irq
杜坤明 [Fri, 18 Mar 2011 10:12:06 +0000 (18:12 +0800)]
gpu: add power open/close support
陈恒明 [Fri, 18 Mar 2011 06:51:45 +0000 (14:51 +0800)]
vpu: remove delay on ioctl
陈恒明 [Fri, 18 Mar 2011 05:00:20 +0000 (13:00 +0800)]
vpu: update vpu.h
陈恒明 [Fri, 18 Mar 2011 02:53:22 +0000 (10:53 +0800)]
rk29: vpu: 规避 power domain on 时,硬件自动 reset ddr 端口的问题
zyw [Thu, 17 Mar 2011 12:59:14 +0000 (20:59 +0800)]
update fb for hdmi crash
zhaoyifeng [Thu, 17 Mar 2011 09:54:36 +0000 (17:54 +0800)]
1.emmc reset 2.16bit flash support 3.buffer sync.
huangdesheng [Thu, 17 Mar 2011 09:43:12 +0000 (17:43 +0800)]
modify change camera bring to win0 black problem
root [Thu, 17 Mar 2011 04:52:39 +0000 (12:52 +0800)]
sd/mmc:修改编译出错
root [Thu, 17 Mar 2011 03:48:33 +0000 (11:48 +0800)]
sd/mmc:1.在dto中断来了以后清掉控制器的dma_enable位.2.修改中断处理函数中的代码,让其更加合理.3.去掉卡检测时的寄存器复位操作.4.添加一些log
lbt [Thu, 17 Mar 2011 02:46:47 +0000 (10:46 +0800)]
wifi:bcm4329: add CSCAN define to support Combo-Scan
luowei [Thu, 17 Mar 2011 02:25:18 +0000 (10:25 +0800)]
add pmu config for rk29_phonesdk_defconfig
yangkai [Wed, 16 Mar 2011 14:14:14 +0000 (22:14 +0800)]
update ddr delayus
yangkai [Wed, 16 Mar 2011 13:46:39 +0000 (21:46 +0800)]
del pcd vbus timer before sys suspend
yangkai [Wed, 16 Mar 2011 13:20:01 +0000 (21:20 +0800)]
ddr3 function support
黄涛 [Wed, 16 Mar 2011 09:07:05 +0000 (17:07 +0800)]
rk29: pm: remove unused variable "delay"
黄涛 [Wed, 16 Mar 2011 09:04:19 +0000 (17:04 +0800)]
rk29: pm: better and faster printch
黄涛 [Wed, 16 Mar 2011 08:57:05 +0000 (16:57 +0800)]
rk29: board-* call rk29_setup_early_printk
黄涛 [Wed, 16 Mar 2011 08:53:31 +0000 (16:53 +0800)]
rk29: add early printk support
zhaoyifeng [Wed, 16 Mar 2011 06:42:33 +0000 (14:42 +0800)]
modify reboot code.
zhaoyifeng [Wed, 16 Mar 2011 06:30:23 +0000 (14:30 +0800)]
change emmc dma brst_len form 1 to 16
ubuntu [Wed, 16 Mar 2011 02:09:52 +0000 (19:09 -0700)]
cwz close vdd1 voltage debug
黄涛 [Tue, 15 Mar 2011 11:43:18 +0000 (19:43 +0800)]
rk29: pm: rk29_idle just restore CRU_MODE_CON, arm may run slow mode before enter idle
杜坤明 [Tue, 15 Mar 2011 01:27:02 +0000 (09:27 +0800)]
update early suspend
黄涛 [Mon, 14 Mar 2011 13:16:15 +0000 (21:16 +0800)]
rk29: support zImage for buggy RK29xxLoader
黄涛 [Mon, 14 Mar 2011 13:07:24 +0000 (21:07 +0800)]
rk29: uncompress implement putc
ddl [Fri, 11 Mar 2011 16:24:12 +0000 (00:24 +0800)]
IPP: fix ipp driver havn't load
ddl [Fri, 11 Mar 2011 16:23:21 +0000 (00:23 +0800)]
camera: fix sensor driver enter power down after sensor_video_probe is error, because sensor enter power down in sensor_deactive
ddl [Fri, 11 Mar 2011 16:19:39 +0000 (00:19 +0800)]
camera: fix caculate vip buffer size for each resolution
ddl [Fri, 11 Mar 2011 15:54:31 +0000 (23:54 +0800)]
camera: fih project front/back sensor preview/capture work success
ddl [Fri, 11 Mar 2011 15:52:26 +0000 (23:52 +0800)]
leds : add support att1272 white led driver for camera flash led
ddl [Mon, 7 Mar 2011 09:57:13 +0000 (17:57 +0800)]
camera: support front sensor
ddl [Mon, 7 Mar 2011 09:54:03 +0000 (17:54 +0800)]
camera: update sensor(s5k6aa) driver, preview/capture/suspend/resume is pass
ddl [Mon, 7 Mar 2011 09:47:18 +0000 (17:47 +0800)]
camera:camera driver must check vip memory is enough or not for scale process by IPP
ddl [Mon, 7 Mar 2011 09:37:42 +0000 (17:37 +0800)]
camera: fix sensor driver have not enter power down after probe
lbt [Sat, 12 Mar 2011 07:51:51 +0000 (15:51 +0800)]
wifi:bcm4329: add SDIO_ISR_THREAD define
ubuntu [Sat, 12 Mar 2011 06:42:04 +0000 (22:42 -0800)]
cwz set default regulator status
hxy/ubuntu [Fri, 11 Mar 2011 09:37:53 +0000 (17:37 +0800)]
fix ddr enter and exit self-refresh by hcy
ChenJQ [Fri, 11 Mar 2011 08:26:17 +0000 (00:26 -0800)]
解决喇叭播放音乐时音量增大声音失真问题
黄涛 [Fri, 11 Mar 2011 05:20:01 +0000 (13:20 +0800)]
rk29: implement sched_clock()
john stultz [Thu, 16 Dec 2010 19:03:27 +0000 (19:03 +0000)]
Fix rounding in clocks_calc_mult_shift()
Russell King reports:
| On the ARM dev boards, we have a 32-bit counter running at 24MHz. Calling
| clocks_calc_mult_shift(&mult, &shift, 24MHz, NSEC_PER_SEC, 60) gives
| us a multiplier of
2796202666 and a shift of 26.
|
| Over a large counter delta, this produces an error - lets take a count
| from
362976315 to
4280663372:
|
| (
4280663372-
362976315) *
2796202666 / 2^26 - (
4280663372-
362976315) * (1000/24)
| => -38.
91872422891230269990
|
| Can we do better?
|
| (
4280663372-
362976315) *
2796202667 / 2^26 - (
4280663372-
362976315) * (1000/24)
| 19.
45936211449532822051
|
| which is about twice as good as the
2796202666 multiplier.
|
| Looking at the equivalent divisions obtained,
2796202666 / 2^26 gives
| 41.66666665673255920410ns per tick, whereas
2796202667 / 2^26 gives
| 41.66666667163372039794ns. The actual value wanted is 1000/24 =
| 41.66666666666666666666ns.
Fix this by ensuring we round to nearest when calculating the
multiplier.
Signed-off-by: John Stultz <john.stultz@linaro.org>
Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: Will Deacon <will.deacon@arm.com>
Tested-by: Mikael Pettersson <mikpe@it.uu.se>
Tested-by: Eric Miao <eric.y.miao@gmail.com>
Tested-by: Olof Johansson <olof@lixom.net>
Tested-by: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Thomas Gleixner [Wed, 11 Nov 2009 14:05:29 +0000 (14:05 +0000)]
clocksource: Provide a generic mult/shift factor calculation
MIPS has two functions to calculcate the mult/shift factors for clock
sources and clock events at run time. ARM needs such functions as
well.
Implement a function which calculates the mult/shift factors based on
the frequencies to which and from which is converted. The function
also has a parameter to specify the minimum conversion range in
seconds. This range is guaranteed not to produce a 64bit overflow when
a value is multiplied with the calculated mult factor. The larger the
conversion range the less becomes the conversion accuracy.
Provide two inline wrappers which handle clock events and clock
sources. For clock events the "from" frequency is nano seconds per
second which corresponds to 1GHz and "to" is the device frequency. For
clock sources "from" is the device frequency and "to" is nano seconds
per second.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Mikael Pettersson <mikpe@it.uu.se>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Cc: John Stultz <johnstul@us.ibm.com>
LKML-Reference: <
20091111134229.
766673305@linutronix.de>
Russell King [Tue, 11 Jan 2011 16:44:02 +0000 (16:44 +0000)]
ARM: sched_clock: make minsec argument to clocks_calc_mult_shift() zero
The purpose of the minsec argument is to prevent 64-bit math overflow
when the number of cycles is multiplied up. However, the multipler
is 32-bit, and in the sched_clock() case, the cycle counter is up to
32-bit as well. So the math can never overflow.
With a value of 60, and clock rates greater than 71MHz, the calculated
multiplier is unnecessarily reduced in value, which reduces accuracy by
maybe 70ppt. It's almost not worth bothering with as the oscillator
driving the counter won't be any more than 1ppm - unless you're using
a rubidium lamp or caesium fountain frequency standard.
So, set the minsec argument to zero.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King [Tue, 11 Jan 2011 16:23:04 +0000 (16:23 +0000)]
ARM: sched_clock: allow init_sched_clock() to be called early
sched_clock is supposed to be initialized early - in the recently added
init_early platform hook. However, in doing so we end up calling
mod_timer() before the timer lists are initialized, resulting in an
oops.
Split the initialization in two - the part which the platform calls
early which starts things off. The addition of the timer can be
delayed until after we have more of the kernel initialized - when the
normal time sources are initialized.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King [Wed, 15 Dec 2010 19:23:07 +0000 (19:23 +0000)]
ARM: sched_clock: provide common infrastructure for sched_clock()
Provide common sched_clock() infrastructure for platforms to use to
create a 64-bit ns based sched_clock() implementation from a counter
running at a non-variable clock rate.
This implementation is based upon maintaining an epoch for the counter
and an epoch for the nanosecond time. When we desire a sched_clock()
time, we calculate the number of counter ticks since the last epoch
update, convert this to nanoseconds and add to the epoch nanoseconds.
We regularly refresh these epochs within the counter wrap interval.
We perform a similar calculation as above, and store the new epochs.
We read and write the epochs in such a way that sched_clock() can easily
(and locklessly) detect when an update is in progress, and repeat the
loading of these constants when they're known not to be stable. The
one caveat is that sched_clock() is not called in the middle of an
update. We achieve that by disabling IRQs.
Finally, if the clock rate is known at compile time, the counter to ns
conversion factors can be specified, allowing sched_clock() to be tightly
optimized. We ensure that these factors are correct by providing an
initialization function which performs a run-time check.
Acked-by: Peter Zijlstra <peterz@infradead.org>
Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: Will Deacon <will.deacon@arm.com>
Tested-by: Mikael Pettersson <mikpe@it.uu.se>
Tested-by: Eric Miao <eric.y.miao@gmail.com>
Tested-by: Olof Johansson <olof@lixom.net>
Tested-by: Jamie Iles <jamie@jamieiles.com>
Reviewed-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
root [Thu, 10 Mar 2011 09:08:32 +0000 (17:08 +0800)]
in video mode chage ui to 565 fail
黄涛 [Thu, 10 Mar 2011 06:46:33 +0000 (14:46 +0800)]
rtc: hym8563: work around set alarm problem and indent
杜坤明 [Thu, 10 Mar 2011 06:13:33 +0000 (14:13 +0800)]
update the conctrl of gpu' clk
杜坤明 [Wed, 9 Mar 2011 10:39:05 +0000 (18:39 +0800)]
add gpu's earlysuspend & remove soft reset before poweron
root [Wed, 9 Mar 2011 08:27:27 +0000 (16:27 +0800)]
In video mode change to PIXEL_FORMAT_RGB_565
黄涛 [Wed, 9 Mar 2011 07:22:16 +0000 (15:22 +0800)]
rk29: no reset while panic and fix gcc warning
ChenJQ [Wed, 9 Mar 2011 07:14:30 +0000 (23:14 -0800)]
reduce the wm8900 pop noise
zyw [Wed, 9 Mar 2011 06:45:49 +0000 (14:45 +0800)]
del CONFIG_MACH_RK29_AIGO in drivers/video/display/screen/lcd_hsd100pxn.c
黄涛 [Wed, 9 Mar 2011 06:01:08 +0000 (14:01 +0800)]
rk29: pm: dump irq status when resume
蔡枫 [Wed, 9 Mar 2011 03:32:06 +0000 (11:32 +0800)]
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
蔡枫 [Wed, 9 Mar 2011 03:31:33 +0000 (11:31 +0800)]
disable set hardware cursor log
蔡枫 [Wed, 9 Mar 2011 03:17:40 +0000 (11:17 +0800)]
add hardware cursor support, auto switch to hardware cursor mode when using TVOUT or HDMI output
luowei [Wed, 9 Mar 2011 03:04:42 +0000 (11:04 +0800)]
modify wm831x voltage according to hardware
hhb [Tue, 8 Mar 2011 12:45:33 +0000 (20:45 +0800)]
migrate touch screen driver xpt2046
ddl [Thu, 3 Mar 2011 14:38:21 +0000 (22:38 +0800)]
camera: FIH defconfig for camera, mt9p111 debug and board config
lyx [Mon, 7 Mar 2011 08:44:21 +0000 (00:44 -0800)]
backlight:set bl_pwm as gpio and set it low, make sure backlight be off
cch [Mon, 7 Mar 2011 06:42:33 +0000 (14:42 +0800)]
fix the Audio indicators(S/R), and the speak Playback distortion