Commit Graph

645485 Commits

Author SHA1 Message Date
Evoke Zhang
de3cb02ece lcd: correct CONFIG_AMLOGIC_UNIFYKEY for lcd unifykey usage [5/5]
PD#163711: lcd: correct CONFIG_AMLOGIC_UNIFYKEY for lcd unifykey usage

Change-Id: I235bada07a7082e5315fb4e48c30a34c11145f40
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-04-27 02:11:49 -07:00
jiamin ma
7771f2cbe3 unifykey: add helper API so we can call unifykey APIs from drivers [4/5]
PD#165222: crash if call unifykey APIs from other drivers

example to call unifykey APIs from kernel space:

  ret = key_unify_query(get_ukdev(), key_name, &key_exist, &keypermit);

Change-Id: I2e7f6cdad21c9faa4d95d0536b187ece485a5b46
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
2018-04-27 02:10:10 -07:00
pengcheng chen
9a016e699d osd: add osd support hwc interface
PD#163270: osd: add osd support hwc interface

Change-Id: I17854518b63b0ecb6c13a4550364b6ede02fdb8d
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2018-04-27 01:52:57 -07:00
Dezhi Kong
b45899887d vpp: fix vskip line calc issue
PD#164045: vpp: fix vskip line calc issue

Change-Id: I9ff41cac9220bae9f521987d4716e462b28c5fff
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
2018-04-27 01:39:40 -07:00
kele bai
9521390c55 di: fix hardlock issue
PD#157641: di: fix hardlock issue

1) add protection for di vf get
2) add missing irq restore

Change-Id: I8e0cfce609b04564279a90109851f8e2859b1651
Signed-off-by: kele bai <kele.bai@amlogic.com>
2018-04-26 23:00:36 -07:00
Matthew Shyu
fc54bf7139 dts: Enable dm-verity on system and vendor [2/3]
PD#164354: Enable dm-verity on system and vendor partition for
partition_mbox_normal.dtsi

Change-Id: Ia6b7d89de5d03734cd76425415776fd32dc9598a
Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>
2018-04-26 19:44:37 -07:00
Hui Zhang
83f3b93426 kernel: add s805 package define
PD#163927: add a interlace to get s805x package

Change-Id: I7ff61a52e24215aae557c12fcffea783abceac2c
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
2018-04-26 04:19:22 -07:00
rongrong zhou
2f22a9bc74 media: fix crash in viu_set_dcu
PD#164288: 1. add check in viu_set_dcu.
2. do not clear cur_dispbuf in irq & unreg

Unable to handle kernel NULL pointer dereference at virtual address
 0000000c
task: ffffff800a688900 task.stack: ffffff800a670000
PC is at vsync_isr+0x2c20/0x51e0
LR is at vsync_isr+0x2c04/0x51e0
[<ffffff80098398cc>] vsync_isr+0x2c20/0x51e0
[<ffffff80091072bc>] __handle_irq_event_percpu+0x68/0x23c
[<ffffff80091074d0>] handle_irq_event_percpu+0x40/0x94
[<ffffff8009107570>] handle_irq_event+0x4c/0x7c
[<ffffff800910b66c>] handle_fasteoi_irq+0xd4/0x1a4
[<ffffff8009106268>] generic_handle_irq+0x34/0x4c
[<ffffff8009106974>] __handle_domain_irq+0x90/0xf8
[<ffffff80090815f4>] gic_handle_irq+0x5c/0xa8

Change-Id: I871bf078c25cbb92889d592ee7cb88cea62f089c
Signed-off-by: rongrong zhou <rongrong.zhou@amlogic.com>
2018-04-26 03:49:39 -07:00
kele bai
5ef9438822 di: fix if2 disable issue
PD#164232: di: fix if2 disable issue

Change-Id: I0976e22738045c97e8ff1c9bd13d4e1b301b6eac
Signed-off-by: kele bai <kele.bai@amlogic.com>
2018-04-26 14:09:24 +08:00
Evoke Zhang
dd54346223 lcd: optimize mipi clk sequence for LP mode
PD#163160: lcd: optimize mipi clk sequence for LP mode

Change-Id: I5006fb3bc4afe0a86cdea2aea45281f7cfd7da37
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-04-25 04:20:57 -07:00
Xing Wang
dd8de0ca6e audio: meson: fix spdif buffer size and optimizing copy
PD#164044: audio: meson: fix spdif buffer size and optimizing copy

Change-Id: Ib734b39db7334a332924dd9e100be1d2f865df31
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2018-04-25 04:17:17 -07:00
Lei Qian
558072fc0c dts: reduce r311 720p ion mem to 32m
PD#165131: dts: reduce r311 720p ion mem to 32m

Change-Id: I337fdefd538f789a03cbc2adbce511c2adee7478
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
2018-04-25 17:38:07 +08:00
Zhuo Wang
fd4846bd95 ethernet: disable clkout ephy
PD#165111: disable ephy clk_out

Change-Id: Icecff2b903a0ae0c91cabefd15803aaa74948e74
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>
2018-04-25 02:00:35 -07:00
Lei Qian
e731e79037 dts: txlx add multi dtb function [1/7]
PD#165131: dts: txlx add multi dtb function

Change-Id: Iafdc84a887046d9d5117532468e6f4059481b85f
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
2018-04-25 01:44:18 -07:00
Hang Cheng
4ef665a5f5 hdmirx: optimize audio channel map
PD#154135: hdmirx: optimize audio channel map

set audio channel map according to received audio subpackets
layout and audio speaker allocation info.

Change-Id: I9438b25d422704bed4dba3c19fbd215365c8996f
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
2018-04-25 01:26:18 -07:00
Sunny Luo
8356e607a5 spicc: change txlx dts to use amlogic driver.
PD#164701: spicc: change txlx dts to use amlogic driver.

1. disable upstream dt and add amlogic dt on r311.
1. fix dirspi interface error for ldim.

Change-Id: Ia610cbb69ba03aea63fae8adbeb76579c0250de1
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
2018-04-25 11:31:53 +08:00
Ao Xu
48565d1644 defconfig: update buildcheck defconfig
PD#149771: update buildcheck defconfig

in fs/proc/uid.c file, compile will fail
when CONFIG_CPU_FREQ_TIMES is not set

Change-Id: Icdab57085749c1d8ce1b5886f2c1b52a2acc913d
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2018-04-24 20:44:18 +08:00
Xing Wang
76cb1336a0 audio: auge: add spdifin sample rate and audio type event
PD#149689: audio: auge: add spdifin sample rate and audio type event

Change-Id: I1991711ddfda438ad5c0ffa602e4364eec0737a8
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2018-04-24 03:36:28 -07:00
Victor Wan
810c6dd972 Merge branch 'android-4.9' into amlogic-4.9-dev
Signed-off-by: Victor Wan <victor.wan@amlogic.com>

Conflicts:
	arch/arm/configs/bcm2835_defconfig
	arch/arm/configs/sunxi_defconfig
	include/linux/cpufreq.h
	init/main.c
2018-04-24 17:43:19 +08:00
wenbiao zhang
230bfb864b dts: add g12a x2 u211 buildroot config
PD#165073: dts: add g12a x2 u211 buildroot config

Change-Id: I3e47f0b8bdd2f08add89b122edc7426651fdf5c7
Signed-off-by: wenbiao zhang <wenbiao.zhang@amlogic.com>
2018-04-24 00:33:46 -07:00
nengwen.chen
cfdacfc52e atv_demod: Modify atv sys for search and optimize code.
PD#164878: Modify atv sys for search and optimize code.

Change-Id: I4ba7c6c38a742ebfe9cb8488277b0d04cf12230e
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2018-04-24 00:32:49 -07:00
Qiufang Dai
593c187612 dts: fine-tune U211 OPP
PD#164888: fine-tune U211 OPP for stability.

Change-Id: Ib99fb68971b7593381f82051c881e5200a3af9c7
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-04-23 23:57:45 -07:00
wenbiao zhang
9aa22f3e2f dts: txlx add unify key for panel ini param
PD#163711: dts: txlx add unify key for panel ini param

Change-Id: If1ee0c9ed2cc68db9c2b518aba1f019e1c67f7ec
Signed-off-by: wenbiao zhang <wenbiao.zhang@amlogic.com>
2018-04-23 22:52:53 -07:00
Yi Zhou
ca55aa9059 hdmitx: fix no scdc in 4k60 under some special tv
PD#164688: hdmitx: fix no scdc in 4k60 under some special tv

Change-Id: I647400d643c80051ea4bb8e4ea38fdb35e321941
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2018-04-23 19:15:31 -07:00
Hang Cheng
f23af31d60 hdmirx: add pddq selection interface when suspend/resume
PD#164216: hdmirx: add pddq selection interface when suspend/resume

when suspend, set pddq down by default, use another Rxsense pulse
during resume to recovery MTK box from hdcp2.2 transaction

Change-Id: Icc574847105a00c5d441fdd589b928eaaf2acf05
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
2018-04-23 02:38:11 -07:00
Zhuo Wang
ec0cdf9a14 ethernet: chage u200 default as internal phy
PD#163830: change u200 use internal phy

Change-Id: I1e60f66b8d624534a337f134c69d9256e517f766
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>
2018-04-23 02:20:18 -07:00
Luan Yuan
7fb4fde021 dts: add dts for p212 720p.[1/2]
PD#164268: dts: add dts for p212 720p.[1/2]

Change-Id: I3511eb72c8eb35a09875e809e06fe1c13e2506ac
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2018-04-23 02:08:03 -07:00
wenfeng.guo
7e32eee308 amvecm: add overscan iocontrol
PD#162552: amvecm: add overscan iocontrol

Change-Id: I1aa4b2469e7360029a0c647a0a1e46c73c71e7cd
Signed-off-by: wenfeng.guo <wenfeng.guo@amlogic.com>
2018-04-23 01:49:38 -07:00
Kaifu Hu
807e56fcb4 hdmitx: fix HDR compatibility
PD#161939: HDMITX: fix HDR compatibility.

Fix HDR compatibility for the samsung TV of need to
disable and enable hdmi phy when sdr to hdr.

Change-Id: I5fa648a35ff32f1d4eb544cc12ce759d4c7bcfae
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
2018-04-23 00:51:58 -07:00
Cheng Tong
c4c38dab32 dts: p230 add dvb module
PD#163384: dts: p230 add dvb module

Change-Id: I0345718b0469218cb88a1f65aabdfe26a81f898f
Signed-off-by: Cheng Tong <cheng.tong@amlogic.com>
2018-04-22 23:22:28 -07:00
Cheng Tong
67157a752c dvb: fix can't set frontend and get DTV_TS_INPUT
PD#163384: dvb: fix can't set frontend and get DTV_TS_INPUT

Change-Id: I5143aa3b653207901bbb940e6a70e66e2ac741af
Signed-off-by: Cheng Tong <cheng.tong@amlogic.com>
2018-04-22 23:20:57 -07:00
Brian Zhu
031723c7bd vpp: merge the adapter pic mode function from 3.14
PD#163892: vpp: merge the adapter pic mode function from 3.14
1.PD#159260: video: add new pic_mode interface in vframe
2.PD#157527: vpp: add new display mode, custom AR and AFD

Change-Id: I8714cd434001703a3c4a5aadeb4b18498cb16dc4
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2018-04-22 21:25:45 -07:00
jintao xu
d0929427b4 amvideo: add video_global_output sysfs control interface
PD#163190: screen still displays the last frame after HDMI disconnect

Change-Id: Ic3b31a6af6a00a83a58d5d293a2fcab2a4369b04
Signed-off-by: jintao xu <jintao.xu@amlogic.com>
2018-04-22 20:10:54 -07:00
Bencheng Jing
2ca6dfc4e9 dts: enable amvecm modules for r311 chips
PD#163826: dts: enable amvecm modules for r311 chips

Change-Id: I9dc67fe8267c79083c5eb2e1d7f1bec169626cff
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2018-04-20 05:19:33 -07:00
Zongdong Jiao
454ecea283 hdmitx: add sspll for hdmi modes
PD#162511: hdmitx: add sspll for hdmi modes
To reduce EMI issue, enable sspll function under certain modes.

Change-Id: Ib5187aaafbc92eccbdd6a77d1c4828776ff596be
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2018-04-20 03:44:35 -07:00
pengcheng chen
26013145b4 drm_vpu: logo memory manage in drm_vpu
PD#160546: drm_vpu: logo memory manage in drm_vpu

Change-Id: I590caf78301f09f71dc005559a79656e8ff9c206
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2018-04-20 16:37:18 +08:00
pengcheng chen
e6bbb1786d osd: optimize osd dts
PD#164824: osd: optimize osd dts

Change-Id: I7cc372a4124b136bf999a73888ba6fd5671e9b5f
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2018-04-20 00:44:23 -07:00
Peng Chuangcheng
d71c991c7e dvb: add dvb module dts & modify demux define
PD#156734: add dvb module dts & modify demux define

Change-Id: I6125be7c0f489687524529a547b9d426eb5de4ac
Signed-off-by: Chuangcheng Peng <chuangcheng.peng@amlogic.com>
2018-04-20 00:12:45 -07:00
Yalong Liu
112c4eb9d1 drm: Add support for ABGR and XBGR for scanout
PD#160546: Add support for ABGR and XBGR for scanout

Change-Id: Id846f2db2431737a956a8f3474278938bd2905a1
Signed-off-by: Yalong Liu <yalong.liu@amlogic.com>
2018-04-19 22:34:09 -07:00
yuehu mi
499a8c65a1 a113d: dts: add axg_s400emmc_512m.dts configuration
PD#164463: add 512M dts configuration

Change-Id: Id777ae85a9d4b645f74962184ce76048eaba8be1
Signed-off-by: yuehu mi <yuehu.mi@amlogic.com>
2018-04-19 19:50:09 -07:00
nengwen.chen
eea68d6501 atv_demod: Modify atv entry and leave mode status.
PD#163853: Modify atv entry and leave mode status.

Change-Id: I508574f7c0328342e0dff7657f79de4e60443d9a
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2018-04-19 19:18:57 -07:00
Xing Wang
e44ec41eb7 audio: auge: fix pdm to 133m directly, not using dividor
PD#164405: audio: auge: fix pdm to 133m directly, not using dividor

Change-Id: I4a26abdb6b2555275a7126cefcfa1d2575bb721b
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2018-04-19 18:26:13 -07:00
Hong Guo
667b02f4dd PM_sleep: add alarm wakeup function.
PD#161914: PM_sleep: add alarm wakeup function.

Change-Id: Ib24fd030631f77be3d607a32cfd53f7a0b143b05
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
2018-04-19 03:32:38 -07:00
Qiufang Dai
48971d19d0 clk: fix gp0_pll typo
PD#164749: fix gp0_pll typo

Change-Id: Id50fc1fbc0f0af4a6d2364271317b6b75d963a34
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-04-19 02:48:56 -07:00
binqi.zhang
ff2cc992f3 trace: add meson trace func [2/2]
PD#164734: meson: Aid to kernel debug

echo 1 >
/sys/kernel/debug/tracing/events/meson_atrace/tracing_mark_write/enable

Change-Id: I11d56296ae8f5bd7427b292b0c98c6b4541b6faa
Signed-off-by: binqi.zhang <binqi.zhang@amlogic.com>
2018-04-19 01:58:53 -07:00
Kuibao Zhang
4ad0ec9c9a BT: introduce power_down_disable property in DT
PD#163673: BT: introduce power_down_disable property in DT

introduce a power_down_disable property in the DT file, we need to
keep power on for the ap62x8 in order to pass the vts test

Change-Id: I1984ded1e7f96732630b4e94a97bbb2705a8fbd6
Signed-off-by: Kuibao Zhang <kuibao.zhang@amlogic.com>
2018-04-19 01:39:08 -07:00
Bencheng Jing
9253361a99 amvecm: close mtx_only
PD#163270: amvecm: close mtx_only

Change-Id: Id6c92cba47d41bc7ef271dc3caa24b5bf2208ac7
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2018-04-18 22:36:15 -07:00
Lianlian Zhu
4834498509 audio: auge: support raw output[2/2]
PD#162366: audio: auge: add ac3 eac3 dts output

Change-Id: If77a02601ad1fba4985f361188db1abf732043c0
Signed-off-by: Lianlian Zhu <lianlian.zhu@amlogic.com>
2018-04-18 21:27:47 -07:00
pengcheng chen
54050fcd54 osd: fix osd suspend fail issue
PD#164508: osd: fix osd suspend fail issue

Change-Id: I30c9efd77748a795b341ad4bedafa5f379ae52f1
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2018-04-18 19:23:32 -07:00
Nan Li
7f59a14a8f emmc: optimize sd & wifi TDMA.
PD#164677: optimize sd & wifi TDMA patch
to bring errors to v2 controller.

Change-Id: I2859af721953ab4bd8ad34a1f6722321dd6b1d00
Signed-off-by: Nan Li <nan.li@amlogic.com>
2018-04-18 01:32:26 -08:00