Commit Graph

403733 Commits

Author SHA1 Message Date
hjc
64974bbd64 rk fb: fix compile warning
Signed-off-by: hjc <hjc@rock-chips.com>
2015-01-12 17:11:46 +08:00
hjc
bd946e8d24 rk3368 lcdc: add CABC mode config
Signed-off-by: hjc <hjc@rock-chips.com>
2015-01-12 17:11:34 +08:00
hjc
3b966f2960 dtsi: add cabc lut config for sdk lvds/edp screen
Signed-off-by: hjc <hjc@rock-chips.com>
2015-01-12 17:11:11 +08:00
hjc
85dbde5a89 rk3368 lcdc: update for vop mmu config. lcdc driver don't to config mmu reg, it will cause unknow error. just like when lcdc do reg_restore will config 0x0 to 0x308, this is mmu cmd to active mmu paging.
Signed-off-by: hjc <hjc@rock-chips.com>
2015-01-12 17:10:57 +08:00
hjc
34f2f0636d rk3368 lcdc: check win2 win3 mutile area config
Signed-off-by: hjc <hjc@rock-chips.com>
2015-01-12 17:10:34 +08:00
dkl
61ed90154e clk: rk3368: add clk_pll_ops_3368_low_jitter and modify dclk_lcdc ops
In order to provide low jitter dclk_lcdc for dislay(especially HDMI),
we neeed to set dclk_lcdc's src pll with max VCO. Thus we add
clk_pll_ops_3368_low_jitter type pll to get pll low jitter setting
from a table. Also dclk_lcdc ops in rk3368 is modifided to get best
parent rate from a table firstly, or caculate a parent rate if not
found in the table.

Signed-off-by: dkl <dkl@rock-chips.com>
2015-01-12 15:31:16 +08:00
David Wu
be11cff0b0 rk3368: add extra name for grf,sgrf,pmu-grf syscon node
Signed-off-by: David Wu <wdc@rock-chips.com>
2015-01-09 08:58:31 +08:00
CMY
92ad540611 ARM64: ion: ION_IOC_GET_PHYS compat 32bit userspace app.
Signed-off-by: CMY <cmy@rock-chips.com>
2015-01-07 18:10:42 +08:00
Huang, Tao
dc3b1542ff video: rockchip: iep: covert dsb() to dsb(sy)
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-01-07 14:38:57 +08:00
Huang, Tao
2879802a3c Merge branch develop-3.10 2015-01-07 14:30:39 +08:00
Huang, Tao
8e593905dc Revert "video: rockchip: iep: covert dsb() to dsb(sy)"
This reverts commit 0956ae5f32.
2015-01-07 14:30:32 +08:00
Huang, Tao
49f19c409d rk29_wdt: fromdos only
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-01-07 14:22:41 +08:00
smj
110f7ae7d3 rk3128 : remove cif sensor include for box dts
Signed-off-by: hjh <hjh@rock-chips.com>
2015-01-07 14:04:13 +08:00
chenzhen
b8413842ff rk312x, mali_400_driver : support mali_so to get rk_ko_ver from mali_ko. 2015-01-07 14:15:42 +08:00
Alpha Lin
38fe8ecc55 IEP: Coding Style revision according to K-R style.
Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
2015-01-07 11:24:42 +08:00
Alpha Lin
03898b614e VPU, fix undefined reference to `syscon_regmap_lookup_by_phandle'.
Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
2015-01-07 09:57:43 +08:00
chenzhen
b83f8495b2 rk312x, mali_400_driver :
Integrate arm_release_ver r5p0-01rel0;
	Modify resource init code to run with 'dts_for_mali_ko_befor_r5p0'.
2015-01-07 09:44:20 +08:00
Alpha Lin
b5936892be VPU, Disable iommu when decoding failure
Disable iommu when decoding failure, so the iommu could
restore its state when the decoding resume.
Without this step, iommu will work in invalid state.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
2015-01-07 09:31:30 +08:00
cl
fb24629ff4 <4>[ 4109.549711] CPU: 0 PID: 125 Comm: ddrfreqd Not tainted 3.10.0 #136
<4>[ 4109.549723] [<c0013e24>] (unwind_backtrace+0x0/0xe0) from [<c001172c>] (show_stack+0x10/0x14)
<4>[ 4109.549737] [<c001172c>] (show_stack+0x10/0x14) from [<c0032408>] (warn_slowpath_common+0x4c/0x68)
<4>[ 4109.549750] [<c0032408>] (warn_slowpath_common+0x4c/0x68) from [<c00324a4>] (warn_slowpath_fmt+0x2c/0x3c)
<4>[ 4109.549762] [<c00324a4>] (warn_slowpath_fmt+0x2c/0x3c) from [<c009899c>] (watchdog_check_hardlockup_other_cpu+0xd0/0xf8)
<4>[ 4109.549778] [<c009899c>] (watchdog_check_hardlockup_other_cpu+0xd0/0xf8) from [<c00989fc>] (watchdog_timer_fn+0x38/0x168)
<4>[ 4109.549793] [<c00989fc>] (watchdog_timer_fn+0x38/0x168) from [<c0054c7c>] (__run_hrtimer+0x1a4/0x2b8)
<4>[ 4109.549807] [<c0054c7c>] (__run_hrtimer+0x1a4/0x2b8) from [<c005587c>] (hrtimer_interrupt+0x11c/0x278)
<4>[ 4109.549830] [<c005587c>] (hrtimer_interrupt+0x11c/0x278) from [<c056b65c>] (arch_timer_handler_phys+0x28/0x30)
<4>[ 4109.549846] [<c056b65c>] (arch_timer_handler_phys+0x28/0x30) from [<c009c3a4>] (handle_percpu_devid_irq+0xf8/0x1b4)
<4>[ 4109.549861] [<c009c3a4>] (handle_percpu_devid_irq+0xf8/0x1b4) from [<c0098fa4>] (generic_handle_irq+0x20/0x30)
<4>[ 4109.549872] [<c0098fa4>] (generic_handle_irq+0x20/0x30) from [<c000e3ac>] (handle_IRQ+0x64/0x8c)
<4>[ 4109.549883] [<c000e3ac>] (handle_IRQ+0x64/0x8c) from [<c0008538>] (gic_handle_irq+0x34/0x58)
<4>[ 4109.549893] [<c0008538>] (gic_handle_irq+0x34/0x58) from [<c000d600>] (__irq_svc+0x40/0x70)
<4>[ 4109.549901] Exception stack(0xed0addd8 to 0xed0ade20)
<4>[ 4109.549910] ddc0:                                                       00000003 00000000
<4>[ 4109.549920] dde0: 00000003 c0c5bff3 c0c5bff0 c0c5bff0 547b152f 000003c8 00000000 c0b8446c
<4>[ 4109.549930] de00: ed0ade48 83126e97 00000003 ed0ade20 c0023638 c00235ec 600f0113 ffffffff
<4>[ 4109.549941] [<c000d600>] (__irq_svc+0x40/0x70) from [<c00235ec>] (call_with_single_cpu.isra.4+0x9c/0x154)
<4>[ 4109.549952] [<c00235ec>] (call_with_single_cpu.isra.4+0x9c/0x154) from [<c0023820>] (_ddr_change_freq+0x17c/0x1c0)
<4>[ 4109.549963] [<c0023820>] (_ddr_change_freq+0x17c/0x1c0) from [<c0025088>] (ddrfreq_scale_rate_for_dvfs+0x20/0x74)
<4>[ 4109.549978] [<c0025088>] (ddrfreq_scale_rate_for_dvfs+0x20/0x74) from [<c002937c>] (dvfs_target+0x15c/0x204)
<4>[ 4109.549993] [<c002937c>] (dvfs_target+0x15c/0x204) from [<c0027d70>] (dvfs_clk_set_rate+0x44/0x80)
<4>[ 4109.550007] [<c0027d70>] (dvfs_clk_set_rate+0x44/0x80) from [<c00252a0>] (ddrfreq_mode.part.3+0x40/0xec)
<4>[ 4109.550017] [<c00252a0>] (ddrfreq_mode.part.3+0x40/0xec) from [<c00257c0>] (ddrfreq_work+0x184/0x1d4)
<4>[ 4109.550029] [<c00257c0>] (ddrfreq_work+0x184/0x1d4) from [<c0025868>] (ddrfreq_task+0x58/0x1b8)
<4>[ 4109.550041] [<c0025868>] (ddrfreq_task+0x58/0x1b8) from [<c0051ad4>] (kthread+0xa0/0xac)
<4>[ 4109.550054] [<c0051ad4>] (kthread+0xa0/0xac) from [<c000da98>] (ret_from_fork+0x14/0x3c)

<4>[ 4092.709215] CPU: 2 PID: 17844 Comm: mali-utility-wo Not tainted 3.10.0 #136
<4>[ 4092.709408] [<c0037494>] (mm_update_next_owner+0xc4/0x1c0) from [<c0037704>] (exit_mm+0x174/0x184)
<4>[ 4092.709422] [<c0037704>] (exit_mm+0x174/0x184) from [<c0037918>] (do_exit+0x204/0x400)
<4>[ 4092.709433] [<c0037918>] (do_exit+0x204/0x400) from [<c0037bc8>] (do_group_exit+0x88/0xb4)
<4>[ 4092.709447] [<c0037bc8>] (do_group_exit+0x88/0xb4) from [<c00444b0>] (get_signal_to_deliver+0x3b4/0x3fc)
<4>[ 4092.709459] [<c00444b0>] (get_signal_to_deliver+0x3b4/0x3fc) from [<c0010c00>] (do_signal+0xa0/0x14c)
<4>[ 4092.709469] [<c0010c00>] (do_signal+0xa0/0x14c) from [<c0010fa4>] (do_work_pending+0x4c/0x94)
<4>[ 4092.709480] [<c0010fa4>] (do_work_pending+0x4c/0x94) from [<c000da40>] (work_pending+0xc/0x20)

	cpu0 is waiting for the other cpu respond ipi, but one cpu is blocked on getting &tasklist_lock
while irq is disabled and it will not respond ipi. If all the operation of &tasklist_lock is irq-disabled,
the &tasklist_lock will become available before the owner respond ipi, so the blocked cpu will get the
&tasklist_lock.

Signed-off-by: cl <cl@rock-chips.com>
2015-01-06 21:40:32 +08:00
cl
7217700f77 ddr_rk32.c: optimize timeout procedure when change freq
Signed-off-by: cl <cl@rock-chips.com>
2015-01-06 21:02:37 +08:00
cl
f67f271a85 ddrfreq: complete(&vop_req_completion) must be called after ddrfreq_work is done when VOP_REQ_BLOCK is defined
Signed-off-by: cl <cl@rock-chips.com>
2015-01-06 20:54:14 +08:00
cl
f7fc5a6f9b ddr_freq: change the type of vop request from andriod
Signed-off-by: cl <cl@rock-chips.com>
2015-01-06 19:43:48 +08:00
张晴
527476298e rk312x:pmic:rt5036:modify ldo1 defult voltage 1.2V
Signed-off-by: 张晴 <zhangqing@rock-chips.com>
2015-01-06 16:06:00 +08:00
Huang, Tao
6ed2a41c0b ARM: rockchip: enable ARM_ERRATA_821420 for RK3288
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-01-06 12:25:21 +08:00
Huang, Tao
452b07f879 ARM: errata: Workaround for Cortex-A12 erratum 821420
On Cortex-A12 (r0p0, r0p1), in very rare timing conditions, a sequence of
VMOV to Core registers instructions, for which the second one is in the
shadow of a branch or abort, can lead to a deadlock when the VMOV
instructions are issued out-of-order. This workaround setting bit 1 of
the Internal Feature Register prevents the erratum.

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-01-06 12:25:21 +08:00
zwl
bb70e88099 rk312x: lcdc: the function that adjust GAMMA by config dsp lut is OK
Signed-off-by: zwl <zwl@rockchips.com>
2015-01-06 08:56:56 +08:00
smj
e5e62c70c1 rk3128 codec : fix the depop logic of codec
Signed-off-by: smj <smj@rock-chips.com>
2015-01-05 17:44:05 +08:00
许盛飞
f5458974e1 battery: update rk818-battery driver
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
2015-01-05 15:07:36 +08:00
xiaoyao
0b73bb2a99 rk3128-86v: suspend/resume armoff 2015-01-05 10:55:45 +08:00
zwl
0071a7a4fb rk312x: lvds: fix suspend failed at the first time if uboot logo is set
Signed-off-by: zwl <zwl@rockchips.com>
2015-01-05 09:33:10 +08:00
lyz
ee0a272565 usb: dwc_otg: fix usb battery charger detect bug
For we don't use charge display function in 3.10 kernel, when
android write 0 to /sys/class/android_usb/android0/enable no need
to set pcd->conn_status = 2 and gating usb clocks.

Signed-off-by: lyz <lyz@rock-chips.com>
2015-01-04 16:58:39 +08:00
Alpha Lin
686ec54a7e RK3036: fix vpu probe failed problem.
no power domain on rk3036, but trying to enable the power
domain in previous driver code. remove the power domain
enable in this revision on rk3036 platform.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
2015-01-04 16:12:13 +08:00
hjc
cf1abcbacc rk3368 lcdc: fix dsp info config error in interlace mode
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-31 18:20:47 +08:00
hjc
7a3cd592f3 rk3368 lvds: config for LVDS TTL mode
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-31 18:20:37 +08:00
hjc
e1f5c2d954 rk3368 lcdc: fix shutdown lead to scrash
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-31 18:20:25 +08:00
hjc
f93e3bcf22 rk fb: define data format for fbdc
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-31 18:20:13 +08:00
Wu Liang feng
4a1bab8fa9 USB: DWC_OTG: fix otg device clk repeatedly disable
The commit 28e9901cf0 set
otg device phy enter suspend and resume it after system
wakeup. But we don't control the clk, and it will cause
otg device repeatedly disable clk when resume from suspend.

Signed-off-by: Wu Liang feng <wulf@rock-chips.com>
2014-12-31 18:13:01 +08:00
chenyifu
c540072d45 rk mipi: disable non-continued function of mipi clock
Not all the mipi panel support the non-continued function.
So it is better not support this function in SDK. We can
offer single patch for them who need this function.

Signed-off-by: chenyifu <chenyf@rock-chips.com>
2014-12-31 15:10:03 +08:00
Xiao Feng
b7546312d2 DMA: memcpy_test: allocate memory using kmalloc
Signed-off-by: Xiao Feng <xf@rock-chips.com>
2014-12-31 14:28:07 +08:00
zsq
aad244ef1d add rga ION phy addr offset 2014-12-31 10:36:39 +08:00
sugar
bcd2f5fdd8 arm64: dts: rk3368-tb_8846: fix rt3261 codec i2c match.
Signed-off-by: sugar <sugar.zhang@rock-chips.com>
2014-12-31 09:08:42 +08:00
sugar
85d067dc7e Documentation: sound: add rt3261 codec documentation.
Signed-off-by: sugar <sugar.zhang@rock-chips.com>
2014-12-31 08:53:22 +08:00
smj
d7c3407bf5 RK312x codec : fix the codec probably no sound of rk3126
Signed-off-by: lxt <lxt@rock-chips.com>
2014-12-30 12:39:30 +08:00
Mark Yao
e2da965145 rk_fb: bmp_helper: remove unalign 24bit bmp check
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2014-12-30 09:39:01 +08:00
chenzhen
4e2a14cac0 mali_760_driver :
handle crash when accessing gpu nodes under /sys in cts test;
	upgrade rk_ko_ver to 12.
2014-12-29 17:45:06 +08:00
chenzhen
8be5c2eeb5 mali_760_driver : reduce period of gpu clk adjusting to 20 ms. 2014-12-29 17:45:05 +08:00
Mark Yao
2fddf40afc rk_fb: update uboot & kernel logo parse
Sometimes we want to display logo at hdmi screen. but hdmi uboot
resolution maybe different with framebuffer size, so we need read
logo config from regs and decide how to display logo at kernel.

now only support uboot logo size = kernel logo size

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2014-12-29 16:30:03 +08:00
Mark Yao
bef88e87a3 rk_fb: bmp_helper: copy bmp data with memcpy
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2014-12-29 15:03:49 +08:00
zsq
963a9aa886 close rga debug log 2014-12-29 11:53:34 +08:00
Alpha Lin
c1b99a7acb rk3288, rk3036, rk312x, vpu: new vpu driver.
Define the vpu and hevc as the sub-devices of the vpu_combo on
rk3036 and rk312x, combine the work queue of two device, avoid two
device running in the same time, (cause bus error on platform rk3036
and rk312x).
2014-12-29 10:10:01 +08:00