许盛飞 [Fri, 13 Jun 2014 11:21:41 +0000 (19:21 +0800)]
resolve the warning: initialization from incompatible pointer type
陈亮 [Fri, 13 Jun 2014 10:36:43 +0000 (03:36 -0700)]
Revert "diable vdd_gpu when early suspend"
This reverts commit
8b0f7177ae661d6579ef71d85b72ba1bcc85403d.
陈亮 [Fri, 13 Jun 2014 10:36:18 +0000 (03:36 -0700)]
Revert "rk3288:pmic:modify gpu not always on by defult"
This reverts commit
ec490fda1f7c40e91143b090c622e504d420b178.
陈亮 [Fri, 13 Jun 2014 10:35:51 +0000 (03:35 -0700)]
Revert "ARM: rockchip: rk3288: power down GPU domain by default"
This reverts commit
875c39be53ac090fd52c410081e99d2ea17873b9.
陈亮 [Fri, 13 Jun 2014 10:20:56 +0000 (03:20 -0700)]
rockchip-cpufreq.c: remove warning
郭毅 [Fri, 13 Jun 2014 08:50:38 +0000 (16:50 +0800)]
sensor: modify some warnings of sensor_dev.c
wlf [Fri, 13 Jun 2014 08:47:32 +0000 (16:47 +0800)]
USB: fix compile warnings.
ddl [Fri, 13 Jun 2014 08:24:40 +0000 (16:24 +0800)]
camsys_drv: v0.0x11.0
lin tao [Fri, 13 Jun 2014 07:23:50 +0000 (15:23 +0800)]
mmc: host: rk_sdmmc:
verid: 270A, Complete H/W Reset programming sequence.
黄涛 [Fri, 13 Jun 2014 07:22:58 +0000 (15:22 +0800)]
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
郭毅 [Fri, 13 Jun 2014 03:38:54 +0000 (11:38 +0800)]
cw2015_battery : modify some warnings
黄涛 [Thu, 12 Jun 2014 13:11:30 +0000 (21:11 +0800)]
ARM: rockchip: rockchip_defconfig enable DMA_CMA
黄涛 [Thu, 12 Jun 2014 13:04:26 +0000 (21:04 +0800)]
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
dkl [Thu, 12 Jun 2014 09:59:55 +0000 (17:59 +0800)]
iclk: rk3288: set hclk_vio when clk_3288_dclk_lcdc0_set_rate
CMY [Thu, 12 Jun 2014 09:14:19 +0000 (17:14 +0800)]
rk: ion: register rockchip cma device
xxm [Thu, 12 Jun 2014 08:48:49 +0000 (16:48 +0800)]
midgard : build as module by default
must update android
xxm [Thu, 12 Jun 2014 06:44:51 +0000 (14:44 +0800)]
rockchip:midgard:1,update version to r4p1-02dev0 2,disable ve configuration when CONFIG_MALI_DEBUG enabled 3,device driver version to 2
张晴 [Thu, 12 Jun 2014 07:38:12 +0000 (15:38 +0800)]
rk3288:pmic:act8846&syr82x:modify some warnings
张晴 [Thu, 12 Jun 2014 07:35:37 +0000 (15:35 +0800)]
rk3288:pmic:rk808:modify some warnings
张晴 [Thu, 12 Jun 2014 07:33:37 +0000 (15:33 +0800)]
rk3288:pmic:ricoh619:modify some warnings
gwl [Thu, 12 Jun 2014 06:35:14 +0000 (14:35 +0800)]
WiFi: fix the compile warming.
wlf [Thu, 12 Jun 2014 03:50:41 +0000 (11:50 +0800)]
USB: fix compile warnings.
wlf [Thu, 12 Jun 2014 03:29:17 +0000 (11:29 +0800)]
USB: fix usb bypass uart bug, avoid enter fiq debugger if connect with usb adapter.
wlf [Thu, 12 Jun 2014 03:16:36 +0000 (11:16 +0800)]
USB: fix usb bypass uart compile warnings
wlf [Thu, 12 Jun 2014 02:33:18 +0000 (10:33 +0800)]
USB: fix compile warnings.
wlf [Thu, 12 Jun 2014 01:54:46 +0000 (09:54 +0800)]
USB: support otg_id irq wakeup system.
qjb [Thu, 12 Jun 2014 01:33:24 +0000 (09:33 +0800)]
audio codec : remove compiler warnings
CMY [Thu, 12 Jun 2014 00:44:26 +0000 (08:44 +0800)]
rk: ion: fix build warning
郭毅 [Wed, 11 Jun 2014 08:29:39 +0000 (16:29 +0800)]
dts: p977_8846: sd/mmc: fix spell error --by lintao
zwl [Wed, 11 Jun 2014 08:29:24 +0000 (16:29 +0800)]
rk fb: add get frame time interface that is used for ddr change
zwl [Wed, 11 Jun 2014 07:00:17 +0000 (15:00 +0800)]
rk fb: modify wake_up_interruptible to wake_up for update_regs_wait
lintao [Wed, 11 Jun 2014 06:40:09 +0000 (14:40 +0800)]
Revert "mmc: host: rk_sdmmc:"
This reverts commit
4821809db2a464603338d4fd4a7bad34391d7377.
lintao [Wed, 11 Jun 2014 06:02:19 +0000 (14:02 +0800)]
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!
lintao [Wed, 11 Jun 2014 04:58:18 +0000 (12:58 +0800)]
dts: rk3288:
sd/mmc: fix spell error
黄涛 [Wed, 11 Jun 2014 04:05:20 +0000 (12:05 +0800)]
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.
zwl [Wed, 11 Jun 2014 03:41:43 +0000 (11:41 +0800)]
rk fb: add support fence sync and async switch
黄涛 [Wed, 11 Jun 2014 03:29:12 +0000 (11:29 +0800)]
ARM: rockchip: rk3288: power up/down GPU domain wait 1us
Default wait 1ms, which block system too long.
wlf [Wed, 11 Jun 2014 02:45:44 +0000 (10:45 +0800)]
USB: fix usb gadget ffs string id bug.
gwl [Wed, 11 Jun 2014 01:14:43 +0000 (09:14 +0800)]
NFC: Add to support ap6441 & ap6493 nfc function.
lintao [Tue, 10 Jun 2014 08:11:23 +0000 (16:11 +0800)]
mmc: host:rk_sdmmc:
sdio-wifi: fetch accurate boot clock
lintao [Tue, 10 Jun 2014 07:55:07 +0000 (15:55 +0800)]
mmc: host: rk_sdmmc:
revert
b8c4dede9e
ddl [Tue, 10 Jun 2014 01:43:23 +0000 (09:43 +0800)]
camsys_drv: v0.d.0
qjb [Tue, 10 Jun 2014 01:42:08 +0000 (09:42 +0800)]
pl330 : fix ifdef error
qjb [Tue, 10 Jun 2014 01:17:55 +0000 (09:17 +0800)]
audio soc dma : add audio getposition dma
zyc [Thu, 5 Jun 2014 00:48:02 +0000 (08:48 +0800)]
camsys_drv:v0.c.0 camsys_head:v0.7.0
wlf [Mon, 9 Jun 2014 01:40:06 +0000 (09:40 +0800)]
USB: fix usb host hot-plug bug.
黄涛 [Fri, 6 Jun 2014 10:50:11 +0000 (18:50 +0800)]
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)
huangds [Fri, 6 Jun 2014 10:18:58 +0000 (18:18 +0800)]
color_fill_mode mmu
zwl [Fri, 6 Jun 2014 09:57:21 +0000 (17:57 +0800)]
rk fb: fix 10 bit yuv video play err
黄涛 [Fri, 6 Jun 2014 09:26:20 +0000 (17:26 +0800)]
ARM: rockchip: fix building without CONFIG_INPUT, CONFIG_CPU_FREQ, CONFIG_FB_ROCKCHIP
zwl [Fri, 6 Jun 2014 08:15:50 +0000 (16:15 +0800)]
rk32 lcdc: add cabc other mode
hcy [Fri, 6 Jun 2014 07:42:34 +0000 (15:42 +0800)]
ddr_rk32.c: addition fix system reboot stop at DDR_DEBUG information
zsq [Fri, 6 Jun 2014 06:27:51 +0000 (14:27 +0800)]
del RGA suppot iommu releate to IOMMU must be open
张晴 [Fri, 6 Jun 2014 03:44:48 +0000 (11:44 +0800)]
rk3288:pmic:act8846:modify shutdown func
张晴 [Fri, 6 Jun 2014 03:09:24 +0000 (11:09 +0800)]
rk3288:pmic:ricoh619:modify some warning
张晴 [Fri, 6 Jun 2014 03:04:37 +0000 (11:04 +0800)]
rk3288:pmic:ricoh619:add some lock and modify suspend func
zwl [Fri, 6 Jun 2014 02:08:59 +0000 (10:08 +0800)]
rk3288 hdmi: modify pinctrl gpio state to sleep state
xxx [Fri, 6 Jun 2014 02:03:09 +0000 (10:03 +0800)]
fixed: uart and gic resume for sleep mode
zwl [Fri, 6 Jun 2014 00:49:13 +0000 (08:49 +0800)]
rk3288 hdmi: add iomux to gpio and pull down when suspend
xjh [Thu, 5 Jun 2014 11:30:22 +0000 (19:30 +0800)]
SDMMC: fix pad can not power down with sdmmc card insert
zsq [Thu, 5 Jun 2014 11:10:15 +0000 (19:10 +0800)]
fix rga 2 compile bug
lintao [Thu, 5 Jun 2014 10:41:32 +0000 (18:41 +0800)]
mmc: host:rk_sdmmc:
wifi: SDIO use flags to detect card-in or card-remove.If
tagged up wifi and off, then go into deep suspend and resume, we
do not judge if wifi is on or off, this will crash pm.resume for
drivers cannot access register without hclk_mmc.
[ 357.835059] 1192..dw_mci_set_ios: no card. [mmc1]
[ 358.322686] dwmmc_rockchip
ff0d0000.rksdmmc: Timeout resetting block (ctrl reset 0x1)
[ 358.322792] dpm_run_callback(): platform_pm_resume+0x0/0x54 returns -19
[ 358.322813] PM: Device
ff0d0000.rksdmmc failed to resume: error -19
Fix it by default return success state to pm.resume if wifi off in SDIO slot
zsq [Thu, 5 Jun 2014 08:57:04 +0000 (16:57 +0800)]
add rga iommu support
张晴 [Thu, 5 Jun 2014 08:32:51 +0000 (16:32 +0800)]
rk3288:pmic:act8846:support power off when charger;ricoh619:add protect for i2c error
lintao [Thu, 5 Jun 2014 08:02:21 +0000 (16:02 +0800)]
mmc: host:rk_sdmmc: move out effect to sd/sdio
lintao [Thu, 5 Jun 2014 05:28:15 +0000 (13:28 +0800)]
mmc: host: rk_sdmmc:
[IMPORTANT COMMIT]
(1) Complete HS200 tuning algorithm for better performance & stability
(2) Auto workaround for error emmc clk settingin dts by Linux BSP engineer.
(3) Fixme: BUG on HS-DDR50 eMMC with div = 0
CMY [Thu, 5 Jun 2014 04:04:47 +0000 (12:04 +0800)]
rk: ion: resolve sg table alloc failed if ion's vmalloc heap is used
CMY [Thu, 5 Jun 2014 03:55:15 +0000 (11:55 +0800)]
Revert "rk: ion: resolve sg table alloc failed when iommu has enable"
This reverts commit
d5479ef94730a2898ac0ae3dcf7518448eaa401e.
zwl [Thu, 5 Jun 2014 01:10:28 +0000 (09:10 +0800)]
rk32 dts: add cabc mode prop in lcdc node
zwl [Thu, 5 Jun 2014 00:51:57 +0000 (08:51 +0800)]
rk32-lcdc: improve the cabc function
黄涛 [Wed, 4 Jun 2014 12:30:43 +0000 (20:30 +0800)]
rk: ion: fix ion.h build warnings
qjb [Wed, 4 Jun 2014 10:17:08 +0000 (18:17 +0800)]
dma soc audio : add support dma infiniteloop mode
soc audio rockchip default use infiniteloop mode
qjb [Wed, 4 Jun 2014 02:46:12 +0000 (10:46 +0800)]
soc dma : add audio dma timeout debuginterface
hcy [Tue, 3 Jun 2014 08:54:13 +0000 (16:54 +0800)]
fix system reboot stop at DDR_DEBUG information
郭毅 [Tue, 3 Jun 2014 08:47:44 +0000 (16:47 +0800)]
p977: pmic:modify gpu not always on by defult
张晴 [Tue, 3 Jun 2014 08:09:05 +0000 (16:09 +0800)]
rk3288:pmic:modify gpu not always on by defult
陈亮 [Tue, 3 Jun 2014 07:16:11 +0000 (00:16 -0700)]
diable vdd_gpu when early suspend
陈亮 [Tue, 3 Jun 2014 06:41:46 +0000 (23:41 -0700)]
ddrfreq: ddr enter auto_self_refresh when early suspend
qjb [Tue, 3 Jun 2014 03:05:21 +0000 (11:05 +0800)]
i2s : fix i2s suspend resume set error
CMY [Sat, 31 May 2014 05:48:09 +0000 (13:48 +0800)]
rk: ion: resolve snapshot error and enable it by default
xxm [Sat, 31 May 2014 02:45:08 +0000 (10:45 +0800)]
rockchip:midgard:update to r4p1_01dev0
黄涛 [Sat, 31 May 2014 02:37:12 +0000 (10:37 +0800)]
ARM: rockchip: set default reboot flag as BOOT_NORMAL
xxm [Fri, 30 May 2014 06:48:27 +0000 (14:48 +0800)]
rockchip:midgard:disable temperature control temporarily
zwl [Fri, 30 May 2014 03:43:33 +0000 (11:43 +0800)]
rk fb: modify acq_fence wait
zwl [Fri, 30 May 2014 02:01:57 +0000 (10:01 +0800)]
rk fb: remove xvir align that have moved to hwc
zwl [Thu, 29 May 2014 12:37:54 +0000 (20:37 +0800)]
rk fb: modify some danger code
zwl [Thu, 29 May 2014 12:14:14 +0000 (20:14 +0800)]
rk fb: coding style for upstream
黄涛 [Thu, 29 May 2014 06:53:13 +0000 (14:53 +0800)]
ARM: rockchip: rockchip_defconfig enable SWP_EMULATE
郭毅 [Thu, 29 May 2014 01:07:18 +0000 (09:07 +0800)]
p977_8846: dts: recovery brightness
zwl [Thu, 29 May 2014 03:10:09 +0000 (11:10 +0800)]
rk hdmi: coding style for upstream
郭毅 [Thu, 29 May 2014 01:51:52 +0000 (09:51 +0800)]
p977: dts: open i2c3 to make camera work fine
dkl [Wed, 28 May 2014 09:45:06 +0000 (17:45 +0800)]
clk: rk3288: when apll change rate, adjust div to make rate change more gently
dkl [Wed, 28 May 2014 07:02:42 +0000 (15:02 +0800)]
clk: rockchip: add rk3188plus_pll_com_table and some marcos, to
separate CLK_PLL_3188PLUS pll type from CLK_PLL_3188 better.
zyc [Wed, 28 May 2014 05:54:41 +0000 (13:54 +0800)]
camsys driver: v0.b.0
lintao [Wed, 28 May 2014 00:31:14 +0000 (08:31 +0800)]
mmc: host: rk_sdmmc:
Use clk subsystem interface to judge enable_cnt refer number
lintao [Wed, 28 May 2014 00:18:14 +0000 (08:18 +0800)]
mmc: host: rk_sdmmc.c
Fix
67f4bf0667d and move sdio-relative clk managerment in
dw_mci_set_sdio_status.
黄涛 [Tue, 27 May 2014 10:36:21 +0000 (18:36 +0800)]
ARM: PIE: empty.S add __gnu_mcount_nc, fix for function tracer
黄涛 [Tue, 27 May 2014 10:33:26 +0000 (18:33 +0800)]
ARM: rockchip: fix for function tracer
郭毅 [Tue, 27 May 2014 09:43:51 +0000 (17:43 +0800)]
p977: dts: disabled unused spi and i2c to reducing power consumption
CMY [Tue, 27 May 2014 09:35:47 +0000 (17:35 +0800)]
rk: bt: to solve problem that bluetooth can not wake up system