Commit Graph

399421 Commits

Author SHA1 Message Date
xjh
c883ea0001 Revert "1. sdmmc support level-2 suspend"
This reverts commit c167037b8a.
2014-05-08 09:25:55 +08:00
yangjie@rock-chips.com
d18f706d42 codec: 5631 playback error 2014-05-08 08:52:38 +08:00
xjh
0c376ebaba Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10 2014-05-07 21:43:43 +08:00
xjh
c167037b8a 1. sdmmc support level-2 suspend
2. sdmmc suspend not to removed card
2014-05-07 21:40:35 +08:00
陈亮
0180727dca ddrfreq: add more auto freq point 2014-05-07 06:30:33 -07:00
黄涛
f1c7ceac64 pwm: rockchip: fix lock warning
INFO: trying to register non-static key.
the code is fine but needs lockdep annotation.
turning off the locking correctness validator.
CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.10.0 #43
[<c00142ec>] (unwind_backtrace+0x0/0xe0) from [<c0011c08>] (show_stack+0x10/0x14)
[<c0011c08>] (show_stack+0x10/0x14) from [<c007e018>] (__lock_acquire.isra.24+0x1a4/0x7a4)
[<c007e018>] (__lock_acquire.isra.24+0x1a4/0x7a4) from [<c007ebd0>] (lock_acquire+0x120/0x144)
[<c007ebd0>] (lock_acquire+0x120/0x144) from [<c0717f84>] (_raw_spin_lock_irqsave+0x4c/0x60)
[<c0717f84>] (_raw_spin_lock_irqsave+0x4c/0x60) from [<c0288750>] (rk_pwm_config_v2+0xd4/0x15c)
[<c0288750>] (rk_pwm_config_v2+0xd4/0x15c) from [<c0288b98>] (rk_pwm_config+0x60/0x74)
2014-05-07 19:47:44 +08:00
hjc
d7e7e908e2 rk3288 lcdc: adjust vop disp info 2014-05-07 18:05:20 +08:00
yj
206a8497a6 codec: mod err for soc-core . 2014-05-07 17:53:00 +08:00
hwg
0cdb1e5d80 usb ethernet: support dm9601, dm9620 2014-05-07 17:29:20 +08:00
yj
a76d695281 codec: soc-core log error 2014-05-07 17:28:40 +08:00
xbw
6d1d598337 SDMMC: kernel crash due to wait_unbusy too long. 2014-05-07 17:22:14 +08:00
libing
6acc7a6e98 rk3288-mipi-dsi: add test eye pattern. 2014-05-07 17:00:44 +08:00
CMY
bf46fdf5df rk: ion: support High Memory for CMA 2014-05-07 15:14:41 +08:00
hjc
3c511f4f49 rk fb: fb mem alloc 32 align for special resolution 2014-05-07 14:34:40 +08:00
wlf
facd2683df USB: Fix usb debug log. 2014-05-07 12:37:39 +08:00
yj
db9fda0795 codec 8323:mod for record 2014-05-07 11:46:50 +08:00
yj
a68d60ab40 codec:8323 support for 4.4 RK32 2014-05-07 11:31:48 +08:00
ddl
ac09f13c94 camera: camsys_drv: v0.8.0 2014-05-07 10:31:06 +08:00
黄涛
2ce503ed6b Revert "mm: make vmstat_update periodic run conditional"
This reverts commit 7d252cd22a.
Which can cause kernel panic when resume.
2014-05-07 09:14:43 +08:00
zwl
0a784a9fde rk3288 hdmi: add the judge about whether reading edid succeed 2014-05-06 21:18:25 +08:00
黄涛
477119c0f2 ARM: rockchip: rk3288.dtsi indent only 2014-05-06 21:11:28 +08:00
zwl
9e2b8ceb05 rk3288 hdmi: modify pll para to improve signal 2014-05-06 19:59:53 +08:00
许盛飞
357c41cf94 clocks: not gating the gpios-clocks 2014-05-06 19:29:15 +08:00
ddl
c76142ff64 camsys_drv: v0.7.0 camsys_head: v0.6.0 2014-05-06 16:11:52 +08:00
lintao
55bf73c13b mmc: host: rk_sdmmc:
Add rk32 mmc controller with cap HW_RESET support, default N.
2014-05-06 15:22:20 +08:00
wdc
36bc2f8d00 i2c-core: set default i2c clk 100k, at i2c smbus transfer 2014-05-06 14:30:52 +08:00
hcy
e8248e4d19 LPDDR2 always use BL8 2014-05-06 14:21:54 +08:00
张晴
89825aecd4 rk3288:pmu:ricoh619:support charger usb connect to adp;enable clkout2 when init 2014-05-06 14:10:32 +08:00
许盛飞
f575a0f312 RK818: add rk818-battery driver 2014-05-06 11:27:03 +08:00
许盛飞
a2790ef688 PWM: improvement pwm-clk setting 2014-05-06 10:40:49 +08:00
Cody Xie
fc3de05dff revert this for new pll policy
Revert "rk3288-p977 : lcd-LP097Qx1 modify to change fps to 59"

This reverts commit 2563925bd6.
2014-05-06 10:13:26 +08:00
yj
8fcf576f06 codec:mod for pop 2014-05-06 10:02:21 +08:00
hjc
4be5c8bbb0 rk3288 lcdc: close vop auto gating 2014-05-06 08:27:56 +08:00
xxm
a53d07fa19 rockchip:midgard:get policy from kernel as a param for mali dvfs 2014-05-05 18:16:30 +08:00
xxm
bf90b0680d rockchip:iommu:dump fault address message when mmu page fault 2014-05-05 18:07:20 +08:00
xxh
7379a7cc69 add USB config for GSM Modem 2014-05-05 16:58:34 +08:00
Stephen Boyd
28650a80a6 ARM: 7803/1: Fix deadlock scenario with smp_send_stop()
If one process calls sys_reboot and that process then stops other
CPUs while those CPUs are within a spin_lock() region we can
potentially encounter a deadlock scenario like below.

CPU 0                   CPU 1
-----                   -----
                        spin_lock(my_lock)
smp_send_stop()
 <send IPI>             handle_IPI()
                         disable_preemption/irqs
                          while(1);
 <PREEMPT>
spin_lock(my_lock) <--- Waits forever

We shouldn't attempt to run any other tasks after we send a stop
IPI to a CPU so disable preemption so that this task runs to
completion. We use local_irq_disable() here for cross-arch
consistency with x86.

Reported-by: Sundarajan Srinivasan <sundaraj@codeaurora.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2014-05-05 16:17:08 +08:00
zwl
e7d4ec96a9 rk3288 hdmi: fix audio cts value calc error when color depth is 10 bit 2014-05-05 10:37:46 +08:00
xbw
36ae021903 SDMMC:
1、set the emmc-clock to 150Mhz which compatible with new PLL.
2. Optimization timing Training.
3. SD3.0/SDIO3.0 implementation process.
2014-05-05 10:10:32 +08:00
xbw
6e2deb958a SDMMC: emmc: set the emmc-clock to 150Mhz.Compatible with the back of a submission about rk_sdmmc driver. 2014-05-05 10:01:25 +08:00
陈亮
76f9c5ebbf cpufreq: rename cpufreq_reboot_limit_freq to rockchip_cpufreq_reboot_limit_freq 2014-05-04 04:48:10 -07:00
陈亮
01eed837f6 reboot: lock core rate and volt(1.0V), cancle temp control, cancel ddr freq thread 2014-05-04 04:22:30 -07:00
陈亮
04de428e09 Revert "cpufreq: set core volt to 1.0V when reboot, and make sure core rate will not change any more"
reboot limit core rate at cpufreq.c may happen while ddr freq limit core rate.
it cause dvfs_clk_enable_limit restore wrong min && max;

This reverts commit 4cc5af311c.
2014-05-04 02:00:29 -07:00
黄涛
238115300c ARM: rockchip: dump kernel log to uart when panic or reboot/shutdown 2014-05-04 16:47:11 +08:00
xxm
afe5043b39 Documentation:Documentation/devicetree/bindings/iommu/rockchip,rk32-iommu.txt 2014-05-04 15:29:15 +08:00
xxm
98d6567e46 Documentation : Documentation/devicetree/bindings/arm/mali-midgard.txt 2014-05-04 15:29:15 +08:00
陈亮
4cc5af311c cpufreq: set core volt to 1.0V when reboot, and make sure core rate will not change any more 2014-05-04 00:34:48 -07:00
lintao
ae0ea28b22 mmc: core: fix unbalanced pm_runtime_enable/disable 2014-05-04 15:02:03 +08:00
xxm
77356b196e rockchip:iommu:reenable mmu page fault and bus error irq mask when host device enable it's mmu 2014-05-04 14:38:38 +08:00
xxm
49d1d490ce rockchip:midgard : update gpu dvfs & use new comment 2014-05-04 14:36:19 +08:00