Commit Graph

400160 Commits

Author SHA1 Message Date
陈亮
a0156060d7 Revert "diable vdd_gpu when early suspend"
This reverts commit 8b0f7177ae.
2014-06-13 03:36:43 -07:00
陈亮
55836d8eef Revert "rk3288:pmic:modify gpu not always on by defult"
This reverts commit ec490fda1f.
2014-06-13 03:36:18 -07:00
陈亮
e905678c2d Revert "ARM: rockchip: rk3288: power down GPU domain by default"
This reverts commit 875c39be53.
2014-06-13 03:35:51 -07:00
陈亮
1308a831a9 rockchip-cpufreq.c: remove warning 2014-06-13 03:30:25 -07:00
郭毅
1549b588c5 sensor: modify some warnings of sensor_dev.c 2014-06-13 16:50:55 +08:00
wlf
feebf06557 USB: fix compile warnings. 2014-06-13 16:47:32 +08:00
ddl
f372e74059 camsys_drv: v0.0x11.0 2014-06-13 16:24:50 +08:00
lin tao
00febd7e70 mmc: host: rk_sdmmc:
verid: 270A, Complete H/W Reset programming sequence.
2014-06-13 15:26:10 +08:00
黄涛
e4cb1d6d7e i2c: rockchip: fix using smp_processor_id() in preemptible warning
Fix this warning when DEBUG_PREEMPT is selected:
BUG: using smp_processor_id() in preemptible [00000000] code: cfinteractive/72
caller is rockchip_i2c_doxfer+0x58/0x3cc
2014-06-13 15:25:29 +08:00
郭毅
bf2c6f3634 cw2015_battery : modify some warnings 2014-06-13 11:38:54 +08:00
黄涛
f211b40eda ARM: rockchip: rockchip_defconfig enable DMA_CMA 2014-06-12 21:11:30 +08:00
黄涛
ee25a425b9 Merge tag 'lsk-android-14.05' into develop-3.10
lsk 14.05 android release

Conflicts:
	arch/arm/common/Kconfig
	arch/arm64/include/asm/arch_timer.h
	drivers/staging/android/fiq_debugger/fiq_debugger.c
	drivers/usb/Kconfig
2014-06-12 21:04:26 +08:00
dkl
79ef987e89 iclk: rk3288: set hclk_vio when clk_3288_dclk_lcdc0_set_rate 2014-06-12 18:09:19 +08:00
CMY
b6d8214f0b rk: ion: register rockchip cma device 2014-06-12 17:14:36 +08:00
xxm
8865f902db midgard : build as module by default
must update android
2014-06-12 16:49:06 +08:00
xxm
511fc892af rockchip:midgard:1,update version to r4p1-02dev0 2,disable ve configuration when CONFIG_MALI_DEBUG enabled 3,device driver version to 2 2014-06-12 16:10:18 +08:00
张晴
a05c3a3973 rk3288:pmic:act8846&syr82x:modify some warnings 2014-06-12 15:38:12 +08:00
张晴
61f30b7316 rk3288:pmic:rk808:modify some warnings 2014-06-12 15:35:37 +08:00
张晴
75e9568f06 rk3288:pmic:ricoh619:modify some warnings 2014-06-12 15:33:37 +08:00
gwl
d4a5437594 WiFi: fix the compile warming. 2014-06-12 14:35:14 +08:00
wlf
73be0c227b USB: fix compile warnings. 2014-06-12 11:50:41 +08:00
wlf
ae26e67933 USB: fix usb bypass uart bug, avoid enter fiq debugger if connect with usb adapter. 2014-06-12 11:29:17 +08:00
wlf
f2ea428ba5 USB: fix usb bypass uart compile warnings 2014-06-12 11:16:36 +08:00
wlf
41847c7d7c USB: fix compile warnings. 2014-06-12 10:33:18 +08:00
wlf
a2eda5756a USB: support otg_id irq wakeup system. 2014-06-12 09:54:46 +08:00
qjb
511f054f86 audio codec : remove compiler warnings 2014-06-12 09:33:24 +08:00
CMY
874f3ff67e rk: ion: fix build warning 2014-06-12 08:44:26 +08:00
郭毅
9fe6c218f3 dts: p977_8846: sd/mmc: fix spell error --by lintao 2014-06-11 16:31:11 +08:00
zwl
bed6221bcc rk fb: add get frame time interface that is used for ddr change 2014-06-11 16:29:24 +08:00
zwl
d97c2db79b rk fb: modify wake_up_interruptible to wake_up for update_regs_wait 2014-06-11 15:00:35 +08:00
lintao
bc9c115f09 Revert "mmc: host: rk_sdmmc:"
This reverts commit 4821809db2.
2014-06-11 14:40:09 +08:00
lintao
4821809db2 mmc: host: rk_sdmmc:
[IMPORTANT COMMIT | NEED_EXPERIMENTAL | CAN_REVERT]

     <1> Support SDIO 3.0, workaround for non-standard behaviour(AP6335) Temporarily.
     <2> Support SD3.0, and SDXC card  should use  exfat filesystem.
     <3> Non-emmc devices that turning fail would not bug kernel.
         Hotplug and poweroff-able (wifi,SD,MMC) devices support re-insert and try it again.
     <4> note:
         (a) card & io aware devices, f_max = 2 * clock, e.g USH_SDR104 means
             support max 208MHz clock in standard.
         (b) setup_bus doesn't need update clk in svi flow
         (c) card_busy: bascially should check CMD,DATA[0:3], however we use
             toggle tags to match svi flow now.
         (d) shorter wait busy and remove  dump_stack in vsi flow.
             Card should be busy until clk re-enable and svi complete.

      All behaviour follow the protocol, enjoy it!
2014-06-11 14:14:55 +08:00
lintao
5274b6743e dts: rk3288:
sd/mmc: fix spell error
2014-06-11 12:58:18 +08:00
黄涛
875c39be53 ARM: rockchip: rk3288: power down GPU domain by default
vdd_gpu may power off when boot, but pmu do not know.
So make pmu power off GPU power domain by default.
2014-06-11 12:15:40 +08:00
zwl
2b5f7c07cb rk fb: add support fence sync and async switch 2014-06-11 11:42:29 +08:00
黄涛
44099f09d9 ARM: rockchip: rk3288: power up/down GPU domain wait 1us
Default wait 1ms, which block system too long.
2014-06-11 11:31:28 +08:00
wlf
4fd32aee8a USB: fix usb gadget ffs string id bug. 2014-06-11 10:45:44 +08:00
gwl
384134cb60 NFC: Add to support ap6441 & ap6493 nfc function. 2014-06-11 09:14:43 +08:00
lintao
feae1869ae mmc: host:rk_sdmmc:
sdio-wifi: fetch  accurate boot clock
2014-06-10 16:11:23 +08:00
lintao
5f5d643646 mmc: host: rk_sdmmc:
revert b8c4dede9e
2014-06-10 15:55:07 +08:00
ddl
e62ea88ccb camsys_drv: v0.d.0 2014-06-10 09:43:37 +08:00
qjb
649662820c pl330 : fix ifdef error 2014-06-10 09:42:08 +08:00
qjb
0774031f52 audio soc dma : add audio getposition dma 2014-06-10 09:17:55 +08:00
zyc
68aee7b787 camsys_drv:v0.c.0 camsys_head:v0.7.0 2014-06-09 09:40:28 +08:00
wlf
f534474238 USB: fix usb host hot-plug bug. 2014-06-09 09:40:06 +08:00
黄涛
66bd82550f rk808: fix deadlock when shutown or reboot
When shutdown, rk808 driver shutdown first, so io_lock mutex is locked.
At same time, gpu change freq by runtime pm, will locked on rk808_reg_read.
Finally, gpu device shutdown, call pm_runtime_barrier. Deadlock happens.

Fix this bug by make rk808 shutdown later.

  task                PC stack   pid father
init            D c06e9a14     0     1      0 0x00000000
[<c06e9a14>] (__schedule+0x48c/0x554) from [<c02e281c>] (__pm_runtime_barrier+0x114/0x138)
[<c02e281c>] (__pm_runtime_barrier+0x114/0x138) from [<c02e3cf4>] (pm_runtime_barrier+0x68/0xb8)
[<c02e3cf4>] (pm_runtime_barrier+0x68/0xb8) from [<c02d85ac>] (device_shutdown+0xa0/0x190)
[<c02d85ac>] (device_shutdown+0xa0/0x190) from [<c0042128>] (kernel_restart+0xc/0x50)
[<c0042128>] (kernel_restart+0xc/0x50) from [<c00422c4>] (SyS_reboot+0x150/0x1b0)
[<c00422c4>] (SyS_reboot+0x150/0x1b0) from [<c000da00>] (ret_fast_syscall+0x0/0x30)
kworker/2:1     D c06e9a14     0    32      2 0x00000000
Workqueue: pm pm_runtime_work
[<c06e9a14>] (__schedule+0x48c/0x554) from [<c06e9ec0>] (schedule_preempt_disabled+0x24/0x34)
[<c06e9ec0>] (schedule_preempt_disabled+0x24/0x34) from [<c06e8bf8>] (__mutex_lock_slowpath+0x1c0/0x22c)
[<c06e8bf8>] (__mutex_lock_slowpath+0x1c0/0x22c) from [<c06e8c94>] (mutex_lock+0x30/0x48)
[<c06e8c94>] (mutex_lock+0x30/0x48) from [<c02f0dbc>] (rk808_reg_read+0x24/0x5c)
[<c02f0dbc>] (rk808_reg_read+0x24/0x5c) from [<c02f0fa8>] (rk808_dcdc_is_enabled+0x28/0x38)
[<c02f0fa8>] (rk808_dcdc_is_enabled+0x28/0x38) from [<c02a6acc>] (_regulator_is_enabled+0x34/0x40)
[<c02a6acc>] (_regulator_is_enabled+0x34/0x40) from [<c02a6c50>] (_regulator_do_set_voltage+0xbc/0x3e4)
[<c02a6c50>] (_regulator_do_set_voltage+0xbc/0x3e4) from [<c02a7c1c>] (regulator_set_voltage+0xc0/0xe0)
[<c02a7c1c>] (regulator_set_voltage+0xc0/0xe0) from [<c0027b7c>] (dvfs_regulator_set_voltage_readback.isra.6+0x14/0x8c)
[<c0027b7c>] (dvfs_regulator_set_voltage_readback.isra.6+0x14/0x8c) from [<c0027d5c>] (dvfs_scale_volt_direct+0xa0/0xc4)
[<c0027d5c>] (dvfs_scale_volt_direct+0xa0/0xc4) from [<c0027f24>] (dvfs_target+0x1a4/0x1d4)
[<c0027f24>] (dvfs_target+0x1a4/0x1d4) from [<c00273e8>] (dvfs_clk_set_rate+0x44/0x80)
[<c00273e8>] (dvfs_clk_set_rate+0x44/0x80) from [<c02c1388>] (mali_dvfs_clk_set+0x28/0x48)
[<c02c1388>] (mali_dvfs_clk_set+0x28/0x48) from [<c02c01f4>] (kbase_platform_dvfs_set_level+0x9c/0xe0)
[<c02c01f4>] (kbase_platform_dvfs_set_level+0x9c/0xe0) from [<c02c032c>] (kbase_platform_dvfs_enable+0xf4/0x110)
[<c02c032c>] (kbase_platform_dvfs_enable+0xf4/0x110) from [<c02bf908>] (pm_callback_runtime_off+0x3c/0x58)
[<c02bf908>] (pm_callback_runtime_off+0x3c/0x58) from [<c02d2650>] (kbase_device_runtime_suspend+0x24/0x34)
[<c02d2650>] (kbase_device_runtime_suspend+0x24/0x34) from [<c02de738>] (pm_generic_runtime_suspend+0x2c/0x40)
[<c02de738>] (pm_generic_runtime_suspend+0x2c/0x40) from [<c02e25c4>] (__rpm_callback+0x38/0x68)
[<c02e25c4>] (__rpm_callback+0x38/0x68) from [<c02e2658>] (rpm_callback+0x64/0x7c)
[<c02e2658>] (rpm_callback+0x64/0x7c) from [<c02e3210>] (rpm_suspend+0x2d8/0x534)
[<c02e3210>] (rpm_suspend+0x2d8/0x534) from [<c02e3e60>] (pm_runtime_work+0x7c/0x94)
[<c02e3e60>] (pm_runtime_work+0x7c/0x94) from [<c004773c>] (process_one_work+0x29c/0x458)
[<c004773c>] (process_one_work+0x29c/0x458) from [<c0047a8c>] (worker_thread+0x194/0x2d4)
[<c0047a8c>] (worker_thread+0x194/0x2d4) from [<c004cf74>] (kthread+0xa0/0xac)
[<c004cf74>] (kthread+0xa0/0xac) from [<c000da98>] (ret_from_fork+0x14/0x3c)
2014-06-06 18:52:14 +08:00
huangds
3c2e780f34 color_fill_mode mmu 2014-06-06 18:18:58 +08:00
zwl
c6d076c7c2 rk fb: fix 10 bit yuv video play err 2014-06-06 17:57:36 +08:00
黄涛
5dfd7a0e15 ARM: rockchip: fix building without CONFIG_INPUT, CONFIG_CPU_FREQ, CONFIG_FB_ROCKCHIP 2014-06-06 17:26:52 +08:00
zwl
d983f03abe rk32 lcdc: add cabc other mode 2014-06-06 16:16:05 +08:00