platform/kernel/linux-amlogic.git
6 years agohdmitx: fix a null pointer in hdmitx_late_resume function
Yi Zhou [Tue, 20 Mar 2018 09:30:41 +0000 (17:30 +0800)]
hdmitx: fix a null pointer in hdmitx_late_resume function

PD#162465: hdmitx: fix a null pointer in hdmitx_late_resume function

Change-Id: Ib4b3f55d2ca8274fb4c1000cf79f403006d7a475
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
6 years agodts: spicc: add node for g12a_s905d2 skt.
Sunny Luo [Mon, 19 Mar 2018 03:37:07 +0000 (11:37 +0800)]
dts: spicc: add node for g12a_s905d2 skt.

PD#162464: dts: spicc: add node for g12a_s905d2 skt

kernel4.9 still use the amlogic driver. DTS compatible name should be
"spicc" but not "meson-g12a-spicc" to avoid probing the upstream driver.

Change-Id: I0465f71f1504929a459ae1d912cc4bb1f397ccde
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
6 years agodv: revised PQ calculation for vout panel
zhilei.wu [Wed, 21 Mar 2018 06:30:20 +0000 (14:30 +0800)]
dv: revised PQ calculation for vout panel

PD#157605: dv: revised PQ calculation for vout panel

Change-Id: I6a3d0a0fee30b82102e8344625669aab0f2f2965
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
6 years agohdmirx: enable edid overlay function
yicheng shen [Tue, 20 Mar 2018 07:16:03 +0000 (15:16 +0800)]
hdmirx: enable edid overlay function

PD#161284: hdmirx: enable edid overload function

Change-Id: If8d88c0351d9d79b9fe9cf5737d8909fc12480fb
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
6 years agodv: fixed core2 lut table error
zhilei.wu [Tue, 20 Mar 2018 13:43:10 +0000 (21:43 +0800)]
dv: fixed core2 lut table error

PD#161010: dv: fixed core2 lut table error

Change-Id: Ic0ebdf677869ab1325f17fda36e0869329be37b8
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
6 years agoamvecm: add G12A vdin/di HDR support
MingLiang Dong [Fri, 16 Mar 2018 12:52:15 +0000 (20:52 +0800)]
amvecm: add G12A vdin/di HDR support

PD#162408: amvecm: add G12A vdin/di HDR support

Change-Id: I34c410b47eff0c8e5b9105bd890a57f0d659c89b
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
6 years agohdmitx: add another SWRSTZREQ init after setting mode
Yi Zhou [Mon, 19 Mar 2018 08:15:39 +0000 (16:15 +0800)]
hdmitx: add another SWRSTZREQ init after setting mode

PD#160883: hdmitx: add another SWRSTZREQ init after setting mode

Change-Id: I002fa45bb5d0459ba31051314a3500a7b47d9512
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
6 years agocec: change the return code of str to uint
yicheng shen [Tue, 20 Mar 2018 07:20:33 +0000 (15:20 +0800)]
cec: change the return code of str to uint

PD#161284: cec: change the return code of str to uint

Change-Id: I88ac2b84574572f5a9ab82f111fdfe2e0ac60bc1
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
6 years agolcd: update pll setting for g12a
Evoke Zhang [Thu, 15 Mar 2018 08:12:59 +0000 (16:12 +0800)]
lcd: update pll setting for g12a

PD#162244: lcd: update pll setting for g12a

Change-Id: I8d406228a49dfe0354ef79f7cb27864114661d17
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agohdmirx: set pinmux for each port separately
Hang Cheng [Mon, 12 Mar 2018 06:33:03 +0000 (14:33 +0800)]
hdmirx: set pinmux for each port separately

PD#161978: hdmirx: set pinmux for each port separately

Change-Id: I51b933523cdc334f32662c4bb2ea75791adfad0b
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
6 years agohdmitx: fix dv funciton of hdmitx doesn't work when initing system
Yi Zhou [Tue, 20 Mar 2018 05:58:00 +0000 (13:58 +0800)]
hdmitx: fix dv funciton of hdmitx doesn't work when initing system

PD#162091: hdmitx: fix dv funciton of hdmitx doesn't work

When the mode is set in uboot, the ready flag must be 1.

Change-Id: Ibb23efc6687246a417dda74bd731a25e5fcf0ae7
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
6 years agohdmi_tx: fix hdmitx event extcon_audio when rising
qi.yuan [Tue, 13 Mar 2018 08:02:06 +0000 (16:02 +0800)]
hdmi_tx: fix hdmitx event extcon_audio when rising

PD#161285: fix extcon_audio event occur before extcon_hdmi when rising

Change-Id: I70fd070f62cc36e76aeba260420b24df1b1fe29f
Signed-off-by: qi.yuan <qi.yuan@amlogic.com>
6 years agovdin: use sprintf instead of printk in show functions
Xuhua Zhang [Fri, 16 Mar 2018 05:24:17 +0000 (13:24 +0800)]
vdin: use sprintf instead of printk in show functions

PD#134355: vdin: use sprintf instead of printk in show functions

Change-Id: I06abfe9acb27ba7ebe9e4e16aaf90a6e0e7e3601
Signed-off-by: Xuhua Zhang <xuhua.zhang@amlogic.com>
6 years agosr: fix video input h/v size config
Dezhi Kong [Mon, 19 Mar 2018 06:53:04 +0000 (14:53 +0800)]
sr: fix video input h/v size config

PD#162346: sr: fix video input h/v size config

1.sr size config
2.fix height/width align issue

Change-Id: Ie91e92a9feff75cd1a67cf14be1a94c47478ef64
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
6 years agodi: fix dumy buffer dismatch with normal buffer
kele bai [Fri, 16 Mar 2018 02:11:19 +0000 (10:11 +0800)]
di: fix dumy buffer dismatch with normal buffer

PD#161859: di: fix dummy buffer dismatch with normal buffer

1) fix dummy buffer dismatch with normal buffer
2) add debug print support

Change-Id: I304f93f4ef7883928fbd9fa237fb2dfd24ef557a
Signed-off-by: kele bai <kele.bai@amlogic.com>
6 years agosound: fix tas5756 volume invert
Renjun Xu [Fri, 16 Mar 2018 07:45:42 +0000 (15:45 +0800)]
sound: fix tas5756 volume invert

PD#161063: fix tas5756 volume invert

Change-Id: I354b063df203b89824dd36a99a93aae1b390b735
Signed-off-by: Renjun Xu <renjun.xu@amlogic.com>
6 years agosound: fix pcm186x driver playback/capture
Renjun Xu [Fri, 16 Mar 2018 07:25:36 +0000 (15:25 +0800)]
sound: fix pcm186x driver playback/capture

PD#161075: fix pcm186x driver playback/capture

Change-Id: I04d66ca1987efcaaff2ed897593748cf101db921
Signed-off-by: Renjun Xu <renjun.xu@amlogic.com>
6 years agodi: disable recycle buffer when source switch
kele bai [Fri, 16 Mar 2018 02:26:57 +0000 (10:26 +0800)]
di: disable recycle buffer when source switch

PD#160047: di: disable recycle buffer when source switch

1) atv&dtv will switch when channel switch,
   mirror function need enable
2) disable full pack feature for 8 bit mode

Change-Id: Ifde5afb637b259c0d4d789b94228c0cb488b48f7
Signed-off-by: kele bai <kele.bai@amlogic.com>
6 years agomtd: add a macro to hide the env region in rsv zone
Yi Zeng [Mon, 12 Mar 2018 07:38:55 +0000 (15:38 +0800)]
mtd: add a macro to hide the env region in rsv zone

PD#160529: mtd: add a macro to hide the env region in rsv zone

when we save the env data in normal partition, the env region
in the rsv zone is no needed anymore, so hide it with a macro.

Change-Id: Id1b92079d1127ffabf4c1f208b486daad0af3934
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
6 years agoMerge "mtd: rebuild the code about add partition" into amlogic-4.9-dev
Jianxin Pan [Sun, 18 Mar 2018 03:06:44 +0000 (20:06 -0700)]
Merge "mtd: rebuild the code about add partition" into amlogic-4.9-dev

6 years agoaudio: auge: add i2s to hdmix port
Xing Wang [Thu, 15 Mar 2018 07:19:40 +0000 (15:19 +0800)]
audio: auge: add i2s to hdmix port

PD#161826: audio: auge: add i2s to hdmix port

Change-Id: I0aca7160342810385ea0e531ab8fe31c948a80b6
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
6 years agousb: gadget: ffs: Execute copy_to_user() with USER_DS set
Yue Wang [Thu, 15 Mar 2018 02:28:35 +0000 (10:28 +0800)]
usb: gadget: ffs: Execute copy_to_user() with USER_DS set

PD#161764: usb: gadget: ffs: Execute copy_to_user() with USER_DS set

When using a AIO read() operation on the function FS gadget driver a URB is
submitted asynchronously and on URB completion the received data is copied
to the userspace buffer associated with the read operation.

This is done from a kernel worker thread invoking copy_to_user() (through
copy_to_iter()). And while the user space process memory is made available
to the kernel thread using use_mm(), some architecture require in addition
to this that the operation runs with USER_DS set. Otherwise the userspace
memory access will fail.

For example on ARM64 with Privileged Access Never (PAN) and User Access
Override (UAO) enabled the following crash occurs.

Address this by placing a set_fs(USER_DS) before of the copy operation
and revert it again once the copy operation has finished.

Change-Id: If523dac82905057607d3007de6a3974102d51e3f
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
6 years agovpp: disable pps as default when scaler ratio is 1:1
Brian Zhu [Sun, 11 Mar 2018 10:50:36 +0000 (18:50 +0800)]
vpp: disable pps as default when scaler ratio is 1:1

PD#161937: vpp: disable pps as default when scaler ratio is 1:1

Change-Id: Iabec01db371218c954bfdae25dfea5292acae3e2
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agohdmitx: update phy/clk parameters
Zongdong Jiao [Mon, 12 Mar 2018 13:56:27 +0000 (21:56 +0800)]
hdmitx: update phy/clk parameters

PD#160984: hdmitx: update phy/clk parameters of g12a
1. use 5.94G instead of 2.97G to get high performance
2. add workaround of setting 4.5~6GHz
3. fine tune phy parameters

Change-Id: I99a7bb428e835316bd464aae421e074841156670
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
6 years agoi2c: fix writing w_token reg error
Jian Hu [Wed, 14 Mar 2018 09:43:16 +0000 (17:43 +0800)]
i2c: fix writing  w_token reg error

PD#161535: i2c: fix writing w_token reg error

1.fix writing  w_token reg error
2.set default clock frequency 100khz
3.config i2c1 pinmux and change clock frequency to 300k

Change-Id: I9b3fe3ed404255e3897d7353c57770a6019e6f9b
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
6 years agohdmitx: add hdmitx driver in drm
Yi Zhou [Tue, 16 Jan 2018 06:03:58 +0000 (14:03 +0800)]
hdmitx: add hdmitx driver in drm

PD#156257: hdmitx: add hdmitx driver in drm
1.add irq
2.add edid reading
3.set hdmi mode
4.update drm_edid.c
5.modify vout api

Change-Id: I7a6666c4884655e168dd5125c9d1eb1f6ecb7587
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
6 years agodrm: add drm driver lcd support
Evoke Zhang [Tue, 16 Jan 2018 10:42:47 +0000 (18:42 +0800)]
drm: add drm driver lcd support

PD#160546: add drm driver lcd support

Change-Id: I3b5fa4c10b4ac542ccdfa8691e692e849f071145
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agoethernet: add suspend and resume function with DS=3
Zhuo Wang [Tue, 13 Mar 2018 08:29:10 +0000 (16:29 +0800)]
ethernet: add suspend and resume function with DS=3

PD#162078: suspend and resume code

Change-Id: I57d0582b4df5f4129b60c7e885022778b1f4c98c
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>
6 years agodv: enable 4.9 dolby vision driver for ko crash
zhilei.wu [Tue, 13 Mar 2018 13:05:16 +0000 (21:05 +0800)]
dv: enable 4.9 dolby vision driver for ko crash

PD#157605: dv: enable 4.9 dolby vision driver for ko crash

Change-Id: I2559e02d161f8a0aea3a98e85f8d6cb1529203a8
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
6 years agoion_dev: enlarge cam heap size .[1/1]
pengcheng chen [Wed, 14 Mar 2018 09:33:45 +0000 (17:33 +0800)]
ion_dev: enlarge cam heap size .[1/1]

PD#153134: some dEQP cases should always use direct render

Change-Id: I9bcde1632d27674e065771a2871e6e1bb193cb07
Signed-off-by: Sandy Luo <sandy.luo@amlogic.com>
6 years agomtd: rebuild the code about add partition
Yi Zeng [Wed, 14 Mar 2018 03:31:09 +0000 (11:31 +0800)]
mtd: rebuild the code about add partition

PD#161968: rebuild the code about add partition

rebuild the code about add partition process, and
add a macro to constraint skip bad blocks when counting.

Change-Id: I893afec2f76d5d3c8fb4c7859b72828612c867d2
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
6 years agovout: add vpu_clkc clktree management function for display2
Evoke Zhang [Fri, 9 Mar 2018 06:54:30 +0000 (14:54 +0800)]
vout: add vpu_clkc clktree management function for display2

PD#156734: vout: add vpu_clkc clktree management function for display2

Change-Id: I71f6d73cff9d7df2d7c8507f5f37b9d6d583286d
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agodv: revised g12 VPP_DOLBY_CTRL[0] same as txlx
zhilei.wu [Tue, 13 Mar 2018 08:21:52 +0000 (16:21 +0800)]
dv: revised g12 VPP_DOLBY_CTRL[0] same as txlx

PD#161251: dv: revised g12 VPP_DOLBY_CTRL[0] same as txlx

Change-Id: I0b73f19e273e248a89a6cf3b2f45d6cfe1366da2
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
6 years agodts: enable pstore to fix CtsLiblogTestCases [1/1]
jie.yuan [Tue, 6 Feb 2018 07:59:08 +0000 (15:59 +0800)]
dts: enable pstore to fix CtsLiblogTestCases [1/1]

PD#160700: enable pstore for gxl_p23 and txlx_t962e_r321

fix libc#__pstore_append

Change-Id: Ie4ddd90c4e42f4a4d778ba4d72cd51b672f1857d
Signed-off-by: jie.yuan <jie.yuan@amlogic.com>
6 years agolog_msg: too much logging messages for topology
Jiamin Ma [Tue, 13 Mar 2018 07:32:32 +0000 (15:32 +0800)]
log_msg: too much logging messages for topology

PD#138714: lowering log level to debug for cpu_cluster_energy and
cpu_core_energy and disabling their logging by default

Change-Id: Ie515d892aa4ff0c77a5393c1b9f67b4f0c463b3e
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
6 years agoamvecm: fix DNLP node doesn't work when play local 4k viedo
wenfeng.guo [Mon, 12 Mar 2018 07:14:53 +0000 (15:14 +0800)]
amvecm: fix DNLP node doesn't work when play local 4k viedo

PD#161992: amvecm: fix DNLP node doesn't work when play local 4k viedo

Change-Id: I38228ebf18127335529e2bca1679f5bb98d22863
Signed-off-by: wenfeng.guo <wenfeng.guo@amlogic.com>
6 years agolcd: fix lcd_resume without panel display mode mistake
Weiming Liu [Fri, 9 Mar 2018 08:24:57 +0000 (16:24 +0800)]
lcd: fix lcd_resume without panel display mode mistake

PD#156734: lcd: fix lcd_resume without panel display mode mistake

Change-Id: I2f41dba8fd777cf6748a3b3fe7f2b7922a12591d
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
6 years agohdmitx: add colorimetry feature to vpp
Yi Zhou [Fri, 2 Mar 2018 08:38:20 +0000 (16:38 +0800)]
hdmitx: add colorimetry feature to vpp

PD#161350: hdmitx: add colorimetry feature to vpp

Some special TVs just define HDR static Metadata,but don't
define colorimetry block. Therefore, hdmitx should use
another feature to accurately indicate HDR function

Change-Id: I8d9a9243c2e0fbcf8c938625aa8d2a20b1441a1b
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
6 years agohdmitx: add EMP (any packets) function
Yi Zhou [Mon, 12 Mar 2018 10:39:56 +0000 (18:39 +0800)]
hdmitx: add EMP (any packets) function

PD#156734: add EMP (any packets) function for test

The function is only used to test now. The details need to
be discussed in the feature.

method:
echo emp > /sys/class/amhdmitx/amhdmitx0/config

Change-Id: I73cf93d90c9247336340fdc36ae8779743dc262d
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
6 years agocvbs: add clk path select
Nian Jing [Tue, 6 Mar 2018 08:48:28 +0000 (16:48 +0800)]
cvbs: add clk path select

PD#156734: add clk path select
0: vid_pll vid2_clk (default)
1: gp0_pll vid2_clk
2: vid_pll vid1_clk
3: gp0_pll vid1_clk
use below command to change clk path:
echo set_clkpath 1 >/sys/class/cvbs/debug

Change-Id: Ib0e2e9dd284f1b103c945602050ba91737537037
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
6 years agohdmirx: optimize errorcable handle in PHY EQ algorithm
Yicheng Shen [Mon, 12 Mar 2018 06:30:51 +0000 (14:30 +0800)]
hdmirx: optimize errorcable handle in PHY EQ algorithm

PD#161977: optimize errorcable handle in PHY EQ algorithm

Change-Id: I4e0f2884f64ac7818198504f7592b558985b5512
Signed-off-by: Yicheng Shen <yicheng.shen@amlogic.com>
6 years agohdmitx: remove 5v close/open operation
Yi Zhou [Fri, 9 Mar 2018 10:41:25 +0000 (18:41 +0800)]
hdmitx: remove 5v close/open operation

PD#156734: remove 5v close/open operation

Change-Id: I8c4b4b892f0093081ef8ee2f007146f8dbde3897
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
6 years agosound: fixed microphone detect crash error
Peipeng Zhao [Wed, 28 Feb 2018 09:17:49 +0000 (17:17 +0800)]
sound: fixed microphone detect crash error

PD#161229: sound: fixed microphone detect crash error

Change-Id: If84c694275c68761a0844bcb3dcae797f2b9a4fd
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
6 years agop241: dts: fix cvbsout & vdac config mistake
Evoke Zhang [Wed, 7 Mar 2018 03:21:34 +0000 (11:21 +0800)]
p241: dts: fix cvbsout & vdac config mistake

PD#161357: p241: dts: fix cvbsout & vdac config mistake

Change-Id: Iff6c1ec0aec505a0e93ba2302a3c9ee419b23de5
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agoPM/sleep: modify register's dts format for suspend.
Hong Guo [Fri, 9 Mar 2018 11:51:58 +0000 (19:51 +0800)]
PM/sleep: modify register's dts format for suspend.

PD#156734: PM/sleep: modify register's dts format for suspend.

Change-Id: I8dd1f8927e3d5b2d0f815e732dc0c436ffd2fde9
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
6 years agohdmitx: fix wrong kmalloc usage
Zongdong Jiao [Thu, 8 Mar 2018 09:05:25 +0000 (17:05 +0800)]
hdmitx: fix wrong kmalloc usage

PD#161652: fix wrong kmailloc(, GFP_KERNEL) usage
At timer function. System will throw
    [<ffffff800908a0d8>] dump_backtrace+0x0/0x1d0
    [<ffffff800908a2cc>] show_stack+0x24/0x30
    [<ffffff8009465c60>] dump_stack+0x90/0xb0
    [<ffffff80090cc2e4>] ___might_sleep+0x14c/0x1a0
    [<ffffff80090cc394>] __might_sleep+0x5c/0x98
    [<ffffff80091e4ecc>] kmem_cache_alloc_trace+0x1ec/0x238
    [<ffffff800979d18c>] hdcptx_events_handle+0x45c/0x640
    [<ffffff800911193c>] call_timer_fn+0x3c/0x1b0
    [<ffffff8009111bb8>] expire_timers+0xd8/0x178
    [<ffffff8009111cec>] run_timer_softirq+0x94/0x178
    [<ffffff800908183c>] __do_softirq+0x12c/0x344
    [<ffffff80090a5344>] irq_exit+0xa4/0xd0
    [<ffffff80090fc8d8>] __handle_domain_irq+0x90/0x100
    [<ffffff800908154c>] gic_handle_irq+0x5c/0xb0
Should use GFP_ATOMIC instead.

Change-Id: I70778a6e3d993d87f71be208503688286913bda1
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
6 years agoworkqueue: avoid process_one_work NULL reference
Ao Xu [Wed, 7 Feb 2018 08:23:04 +0000 (16:23 +0800)]
workqueue: avoid process_one_work NULL reference

PD#158184: avoid process_one_work NULL reference

avoid process_one_work NULL reference

Change-Id: I96d9477b804e079e18663d8f80d714ed9fbbd642
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
6 years agousb: enable usb3.0 for s905d2_u200
Yue Wang [Fri, 9 Mar 2018 09:37:56 +0000 (17:37 +0800)]
usb: enable usb3.0 for s905d2_u200

PD#156734: usb: enable usn3.0 for s905d2_u200

Change-Id: I284a09ef192a23a844287ebf514b266f0662ccd6
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
6 years agodts: fixed hiu bus addr [2/2]
Jiyu Yang [Mon, 22 Jan 2018 06:11:01 +0000 (14:11 +0800)]
dts: fixed hiu bus addr [2/2]

PD#159303: this may cause the suspend to ram crash at mali modules

Change-Id: I57a9a83306a4f04619e5c0ebfd0bf5ab15dcb804
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
6 years agoRevert "vpp: disable pps as default when scaler ratio is 1:1"
Brian zhu [Fri, 9 Mar 2018 08:50:54 +0000 (00:50 -0800)]
Revert "vpp: disable pps as default when scaler ratio is 1:1"

This reverts commit 3f03850cd9ad28a2e56d986d991a8868bb34b4f5.

Change-Id: I9a760c8b3819728c9cab71a4526acc91538c99e0
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agoUSB: PCD: fix setup packet count issue
qi duan [Tue, 6 Mar 2018 10:06:15 +0000 (18:06 +0800)]
USB: PCD: fix setup packet count issue

PD#161573: USB: PCD: fix setup packet count issue.
           merge from dwc_otg version3.30a

Change-Id: I636129dfadc0b28e04d09df771aa062ee73670fa
Signed-off-by: qi duan <qi.duan@amlogic.com>
6 years agodts: g12a: add s905d2_u200 and s905y2_u221
jianxin.pan [Thu, 8 Mar 2018 09:19:11 +0000 (17:19 +0800)]
dts: g12a: add s905d2_u200 and s905y2_u221

PD#156734: add s905d2_u200 and s905y2_u221 for g12a
1. rename g12a_skt.dts to g12a_s905d2_u200.dts
2. cp g12a_dts.dts to g12a_s905d2_skt.dts, and change caps and
f_max for sd_emmc_a
3. cp g12a_skt_buidroot.dts to g12a_s905d2_skt_buildroot.dts, and
change caps and  f_max for sd_emmc_a
4. cp g12a_skt.dts to g12a_s905y2_u221.dts, disable ethmac
5.  cp g12a_skt.dts to g12a_s905y2_u211.dts
6. set f_max for sd_emmc_c to 50000000

Change-Id: Iffbeffc6dd730cff1c5ac371e237edcc8354b042
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
6 years agoSUSPEND: enable supspend function.
Hong Guo [Thu, 8 Mar 2018 05:32:10 +0000 (13:32 +0800)]
SUSPEND: enable supspend function.

PD#156734: suspend: enable supspend function.

Change-Id: I20d62c97147298617cc3c11b3a0ff878bff5f034
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
6 years agovout: optimize display mode changing flow
Evoke Zhang [Thu, 8 Mar 2018 06:59:49 +0000 (14:59 +0800)]
vout: optimize display mode changing flow

PD#161389: vout: optimize display mode changing flow

Change-Id: I29fadc879d1915917ffe19e3a4fa08ae36f36fd8
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agousb: fix adb aio buffer panic.
Yue Wang [Thu, 8 Mar 2018 10:23:06 +0000 (18:23 +0800)]
usb: fix adb aio buffer panic.

PD#161764: usb: fix adb aio buffer panic.

Change-Id: I32d2c45e28f09489f3f53d2935ab0cd1d7992ed0
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
6 years agohdmitx: fix VSDB parsing error
Kaifu Hu [Wed, 7 Feb 2018 12:05:07 +0000 (20:05 +0800)]
hdmitx: fix VSDB parsing error

PD#160588: hdmitx: fix VSDB parsing error

Fix EDID VSDB parsing error.

Change-Id: Idbc7e4c801f032583004ee7d4e3b9e0decf44074
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
6 years agoavin: fix disable detect abnormal
Nian Jing [Tue, 6 Mar 2018 11:29:30 +0000 (19:29 +0800)]
avin: fix disable detect abnormal

PD#161181: fix abnormal when disable detect

Change-Id: I946f6485d047630109665239c5e156a7f261cd47
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
6 years agodi: fix mirror buffer recycle error cause crash
kele bai [Wed, 7 Mar 2018 10:48:07 +0000 (18:48 +0800)]
di: fix mirror buffer recycle error cause crash

PD#160504: di: fix keep buffer pointer error

1) fix keep buffer pointer error for seek case

Change-Id: I9ad34b86f6cc3c9a5cd5840571346bf180e45c39
Signed-off-by: kele bai <kele.bai@amlogic.com>
6 years agomedia: fixes an issue where the CTS cause the kernel crash
Nanxin Qin [Tue, 6 Mar 2018 08:18:46 +0000 (16:18 +0800)]
media: fixes an issue where the CTS cause the kernel crash

PD#161202: recycles the vf data before must to be checked.

Change-Id: Ief413c5169d859be632f4799d6897ae1322e2fbb
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
6 years agoregister: improvers the regs ops to prevent crash duo to bus type err.
Nanxin Qin [Thu, 8 Mar 2018 07:29:55 +0000 (15:29 +0800)]
register: improvers the regs ops to prevent crash duo to bus type err.

PD#161757: improvers the regs ops to prevent crash duo to bus type err

Change-Id: Id5f7648de84d55700d7c240b32e988363ffb9ef7
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
6 years agodts: g12a: move common parts from dts to dtsi
jianxin.pan [Wed, 7 Mar 2018 06:05:05 +0000 (14:05 +0800)]
dts: g12a: move common parts from dts to dtsi

PD#156734: move g12a common parts from dts to dtsi

Change-Id: I67476217b44774c1645da5482d8c7e43ac91ae7e
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
6 years agocpufreq: boost cpufreq when remote key input
Jiamin Ma [Fri, 19 Jan 2018 08:54:32 +0000 (16:54 +0800)]
cpufreq: boost cpufreq when remote key input

PD#158772: cpufreq: boost cpufreq when remote key input

Change-Id: I0bc536737380d51f7f14b00d1fa34a52ccd528c0
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
6 years agocec: add cec version define in dts & cts 9.3
hongmin hua [Thu, 22 Feb 2018 07:51:41 +0000 (15:51 +0800)]
cec: add cec version define in dts & cts 9.3

PD#160943: cec: add cec version define in dts & cts 9.3

Change-Id: Ifd06bf388412d058efd90be3afe6119fc666dacb
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
6 years agoaudio: auge: add alsaPORT suffix name for android audio hal
Xing Wang [Wed, 28 Feb 2018 07:14:56 +0000 (15:14 +0800)]
audio: auge: add alsaPORT suffix name for android audio hal

PD#156734: audio: auge: add alsaPORT suffix name for android audio hal

Change-Id: Ie442dc27c594caf0181425e66fe555c1bd5355ba
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
6 years agovpp: disable pps as default when scaler ratio is 1:1
Brian Zhu [Tue, 27 Feb 2018 16:16:16 +0000 (00:16 +0800)]
vpp: disable pps as default when scaler ratio is 1:1

PD#156734: vpp: disable pps as default when scaler ratio is 1:1

Change-Id: I5ff2a9a1089461c92996066e0cec4379a5d509e4
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agohdmirx: code optimize
Yicheng Shen [Sat, 24 Feb 2018 03:06:42 +0000 (11:06 +0800)]
hdmirx: code optimize

PD#158047: hdmirx code optimization

1.remove useless parameters;
2.optimize coding style issues;
3.optimize the code frame structure;
4.merge the recent commits from 3.14;
5.add edid information parse;
6.add a new FSM methode;
7.add param to debug file point;

Change-Id: I515ff36f3b0e45dd8b624e7701e2d4b2b1af7e81
Signed-off-by: Yicheng Shen <yicheng.shen@amlogic.com>
6 years agoosd: remove wiat vsync in pan_display
pengcheng chen [Wed, 28 Feb 2018 04:27:30 +0000 (12:27 +0800)]
osd: remove wiat vsync in pan_display

PD#154106: osd: remove wiat vsync in pan_display

Change-Id: I02e460d17cc23f316c9c9ff6d475d529fa7ef985
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agodi: fix black screen&crash in switch test av&hdmi
kele bai [Mon, 5 Mar 2018 09:14:06 +0000 (17:14 +0800)]
di: fix black screen&crash in switch test av&hdmi

PD#161570: di: fix black screen in hdmi 1080p mode

1) fix r321 black screen in hdmi 1080p mode
2) add debug info for recovery mode
3) move pre hold ratio configuration into pecial function

Change-Id: I6e482505da6f3621a1934f600cedcec4341e0743
Signed-off-by: kele bai <kele.bai@amlogic.com>
6 years agogpio: core: Decouple open drain/source flag with active low/high
Laxman Dewangan [Thu, 6 Apr 2017 13:35:52 +0000 (19:05 +0530)]
gpio: core: Decouple open drain/source flag with active low/high

PD#161621: gpio: core: Decouple open drain/source flag with active low/high

Currently, the GPIO interface is said to Open Drain if it is Single
Ended and active LOW. Similarly, it is said as Open Source if it is
Single Ended and active HIGH.

The active HIGH/LOW is used in the interface for setting the pin
state to HIGH or LOW when enabling/disabling the interface.

In Open Drain interface, pin is set to HIGH by putting pin in
high impedance and LOW by driving to the LOW.

In Open Source interface, pin is set to HIGH by driving pin to
HIGH and set to LOW by putting pin in high impedance.

With above, the Open Drain/Source is unrelated to the active LOW/HIGH
in interface. There is interface where the enable/disable of interface
is ether active LOW or HIGH but it is Open Drain type.

Hence decouple the Open Drain with Single Ended + Active LOW and
Open Source with Single Ended + Active HIGH.

Adding different flag for the Open Drain/Open Source which is valid
only when Single ended flag is enabled.

Note: the patch from v4.14-rc6 with original commit ID 4c0facddb

Change-Id: I2f652614d3783caee3f510dc70e5e185379f49a7
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
6 years agomtd: change the block number of RSV member into macro
Yi Zeng [Mon, 29 Jan 2018 06:31:14 +0000 (14:31 +0800)]
mtd: change the block number of RSV member into macro

PD#159810: mtd: change the block number of RSV member into macro

in case of customer want change the RSV part size, we'd better
make the block number of every part be a macro, in case miss modified
in somewhere.

Change-Id: I75e665cc3efd8b4bf4ad5a0843f855d4915ae180
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
6 years agop241: dts: remove vpu default config in dts, only left clk_level
Evoke Zhang [Fri, 2 Mar 2018 03:07:07 +0000 (11:07 +0800)]
p241: dts: remove vpu default config in dts, only left clk_level

PD#161337: p241: dts: remove vpu default config in dts, only left clk_level

Change-Id: I3f993324f493417227c9325017c0c346d129320f
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agodrm: fix g12a drm dtsi
Yalong Liu [Wed, 7 Mar 2018 05:58:13 +0000 (13:58 +0800)]
drm: fix g12a drm dtsi

PD#160546: fix g12a drm dtsi

Change-Id: Ie67f1c413abb7ad58561f8b921e0292763a01f02
Signed-off-by: Yalong Liu <yalong.liu@amlogic.com>
6 years agogpu: set up gpu max freq to 850MHz
binqi.zhang [Sat, 24 Feb 2018 13:17:03 +0000 (21:17 +0800)]
gpu: set up gpu max freq to 850MHz

PD#156734: gpu: set up gpu max freq to 850MHz

Change-Id: I96d9c9beddd4c5e723fe4c4790c7ce99aeebc1e6
Signed-off-by: binqi.zhang <binqi.zhang@amlogic.com>
6 years agolcd: adjust the mipi_host reg address
Weiming Liu [Tue, 27 Feb 2018 09:14:37 +0000 (17:14 +0800)]
lcd: adjust the mipi_host reg address

PD#156734: lcd: adjust the mipi_host reg address

Change-Id: Ia25bd99d5eb32b129b4170558fdf42f820b7c977
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
6 years agoaudio: auge: pdm supports 96k sample rate
Xing Wang [Tue, 6 Mar 2018 02:31:05 +0000 (10:31 +0800)]
audio: auge: pdm supports 96k sample rate

PD#156734: audio: auge: pdm supports 96k sample rate

1) pdm supports 96k sample rate
2) set HCIC gain additional shift as default 0

Change-Id: I056f87cd43bb5c07d04b2baff461bb38c7443f6d
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
6 years agomtd: add a new slc nand and avoid the 2nd column in some command
Yi Zeng [Thu, 18 Jan 2018 02:53:29 +0000 (10:53 +0800)]
mtd: add a new slc nand and avoid the 2nd column in some command

PD#158989: mtd: add a new slc nand and avoid the 2nd column in some command

new slc nand: F59L1G81MB (2M)(same id with F59L1G81MA (2Y),
called a joint name of F59L1G81Mxxx).
We do not send the 2nd column in some command such as: read id,
read parameter etc

Change-Id: Ibeac872231c880efde8a38e6344c326043e7d7dc
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
6 years agodrm: fix g12a buildoot dts
Yalong Liu [Tue, 6 Mar 2018 07:06:43 +0000 (15:06 +0800)]
drm: fix g12a buildoot dts

PD#160546: fix g12a buildoot dts

Change-Id: Ia910dbed885a6fd8b294629a3ef3a3a84405069f
Signed-off-by: Yalong Liu <yalong.liu@amlogic.com>
6 years agodefconfig: generate defconfig with savedefconfig
jianxin.pan [Tue, 6 Mar 2018 05:00:39 +0000 (13:00 +0800)]
defconfig: generate defconfig with savedefconfig

PD#161257: generate  meson64_smarthome_defconfig and
meson64_defconfig with savedefconfig

Change-Id: I2afe36040aa75ffe0540a0f74a11d8ec93e8f6ba
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
6 years agoCPUFREQ: fix cpufreq system halt for reboot.
Hong Guo [Fri, 2 Mar 2018 06:14:39 +0000 (14:14 +0800)]
CPUFREQ: fix cpufreq system halt for reboot.

PD#156734: cpufreq: fix cpufreq system halt for reboot.

Change-Id: I5c12a58b2fa53ef4c22a7032572983bf566b19b7
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
6 years agoclk: fix g12a pll enable ops mutex in in_atomic
Qiufang Dai [Thu, 1 Mar 2018 13:56:06 +0000 (21:56 +0800)]
clk: fix g12a pll enable ops mutex in in_atomic

PD#161257: fix g12a pll enable ops mutex in in_atomic
Also fix mpll setting range

Change-Id: I0a3acfbfd111d48f3b31c8f068294c1714ad2886
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
6 years agodi: fix post write crash for pps enabled in post
kele bai [Fri, 2 Mar 2018 11:48:07 +0000 (19:48 +0800)]
di: fix post write crash for pps enabled in post

PD#156734: di: fix post write crash for pps enabled in post

1) diable post wirte in post write done irq to avoid
   pps send data to fifo

Change-Id: I758be72a2fb2c17b731a7575f24a75bc44c5e816
Signed-off-by: kele bai <kele.bai@amlogic.com>
6 years agomedia: adds the register ops for media codec io efuse bus [1/2].
Nanxin Qin [Sat, 24 Feb 2018 11:22:41 +0000 (19:22 +0800)]
media: adds the register ops for media codec io efuse bus [1/2].

PD#161104: adds the register ops for media codec io efuse bus

Change-Id: I6fc625848442754b089428fd8cb10a3047fa4062
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
6 years agodv: enable dv efuse for g12a
zhilei.wu [Mon, 5 Mar 2018 05:45:35 +0000 (13:45 +0800)]
dv: enable dv efuse for g12a

PD#157605: dv: enable dv efuse for g12a

Change-Id: I01bcded5f78bbf5c720b4ad95b06b0fc989c2692
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
6 years agohardlockup: detect hard lockups without NMIs using secondary cpus
Colin Cross [Fri, 11 Jan 2013 21:51:48 +0000 (13:51 -0800)]
hardlockup: detect hard lockups without NMIs using secondary cpus

PD#160530: porting hard lockup without nmi support

Emulate NMIs on systems where they are not available by using timer
interrupts on other cpus.  Each cpu will use its softlockup hrtimer
to check that the next cpu is processing hrtimer interrupts by
verifying that a counter is increasing.

This patch is useful on systems where the hardlockup detector is not
available due to a lack of NMIs, for example most ARM SoCs.
Without this patch any cpu stuck with interrupts disabled can
cause a hardware watchdog reset with no debugging information,
but with this patch the kernel can detect the lockup and panic,
which can result in useful debugging info.

Change-Id: I720032cbec78c79d8b4accacc01f183c70e5d403
Signed-off-by: Colin Cross <ccross@android.com>
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
6 years agohdmitx: optimise the clock divider
Zongdong Jiao [Fri, 2 Mar 2018 10:24:07 +0000 (18:24 +0800)]
hdmitx: optimise the clock divider

PD#156734: optimise the clock divider of VID_PLL_DIV
This is a bridge of analog signal and digital signal module.
With VCO output 4.455Gbps/2160p60hzY420 12bits mode and the
ENCP needs 594MHz, there should divide half to reduce the
risk of HHI_VID_PLL_CLK_DIV.

Change-Id: If6965d64df1aa4b7cb4a8dd66847db3d5d17aea7
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
6 years agoosd: remove useless log print
pengcheng chen [Thu, 1 Mar 2018 11:16:42 +0000 (19:16 +0800)]
osd: remove useless log print

PD#156734: osd: remove useless log print

Change-Id: Ib7638f396ece0ef2d29f81731bca74fd6794e696
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agolcd: support two clk_path for g12a
Evoke Zhang [Mon, 26 Feb 2018 06:49:01 +0000 (14:49 +0800)]
lcd: support two clk_path for g12a

PD#156734: lcd: support two clk_path for g12a
clk_path=0, use hpll, default setting;
clk_path=1, use gp0_pll.
clk_path is configured in dts, and can be changed by sysfs node:
echo path <n> >/sys/class/lcd/clk

Change-Id: I30d29ca8eefb2b3e8f4f7f37e4e0e639b23c06bb
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agoPD#156734: emmc: refixed core phase value for emmc highspeed busmode
Long Yu [Wed, 7 Feb 2018 09:47:08 +0000 (17:47 +0800)]
PD#156734: emmc: refixed core phase value for emmc highspeed busmode

Change-Id: I33ce650b3ed9dd6eac41b0814679fb660991a738
Signed-off-by: Long Yu <long.yu@amlogic.com>
6 years agovout: update viu config when change display mode
Evoke Zhang [Sat, 24 Feb 2018 07:36:53 +0000 (15:36 +0800)]
vout: update viu config when change display mode

PD#156734: vout: update viu config when change display mode
also clearup related reg settings in hdmitx/cvbsout/lcd.

Change-Id: I196363d6caaf7158c8e167fb8ca1353c74913263
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agovpu: add viu2 vpu_clk_gate control
Evoke Zhang [Sat, 24 Feb 2018 02:55:57 +0000 (10:55 +0800)]
vpu: add viu2 vpu_clk_gate control

PD#156734: vpu: add viu2 vpu_clk_gate control

Change-Id: I5a40a71e83a673292810233b000e853bd0420fe8
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agoosd: add viu2 support for g12a
pengcheng chen [Fri, 2 Mar 2018 07:41:39 +0000 (15:41 +0800)]
osd: add viu2 support for g12a

PD#156734: osd: add viu2 support for g12a

Change-Id: If225bdd08a0357960ca307ca7614131211b9aed1
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agoarm64: dts: add i2c alias aliases node
Jian Hu [Thu, 1 Mar 2018 06:33:42 +0000 (14:33 +0800)]
arm64: dts: add i2c alias aliases node

PD#158433: arm64: dts: add i2c alias in aliases node

add alias for i2c controller to fasten i2c dev id

Change-Id: I87c1999766c69e9df63f551f0559b8028844d660
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
6 years agoamvecm: gamma init enable
MingLiang Dong [Sat, 24 Feb 2018 11:12:38 +0000 (19:12 +0800)]
amvecm: gamma init enable

PD#156734: amvecm: gamma init enable

Change-Id: Ie09dba089cb0c2c574758f184f4e722162b9ce80
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
6 years agoclktree: enable dsi_meas clktree
Evoke Zhang [Sat, 24 Feb 2018 09:17:23 +0000 (17:17 +0800)]
clktree: enable dsi_meas clktree

PD#156734: clktree: enable dsi_meas clktree

Change-Id: I2c359119aa3abf8525efd37b53c7c32620b877c5
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agofactoryBurn: efuse: keyman support efuse user space
Sam Wu [Tue, 27 Feb 2018 07:21:05 +0000 (15:21 +0800)]
factoryBurn: efuse: keyman support efuse user space

PD# 156734 PD# 160873

1, add efuse user space key-name list, then can user key-name rd/wr efuse.

Change-Id: I5feee2e59cefb96fae907403509a86a631e57342
Signed-off-by: Sam Wu <yihui.wu@amlogic.com>
6 years agoencoder: add encoder for G12A
Jiacheng Mei [Thu, 1 Mar 2018 06:35:23 +0000 (14:35 +0800)]
encoder: add encoder for G12A

PD#156734: add encoder for G12A

Change-Id: Ib12f6af79f4264b9de5960cc65b7a3fd13e252f0
Signed-off-by: Jiacheng Mei <jiacheng.mei@amlogic.com>
6 years agodi: turn on cont wr interrupt, fine tune cue
kele bai [Fri, 23 Feb 2018 10:26:25 +0000 (18:26 +0800)]
di: turn on cont wr interrupt, fine tune cue

PD#156734: di: turn on cont wr interrupt, fine tune cue

1) turn on cont wr int, disable me int
2) modify cue mode for abnormal mode 2/4/7/8/9
3) move clk adjustment into thread env
4) set min clk rate when di disable
5) modify txlx clk tree

Change-Id: I759324806bb9c9bfa4e83ee4a39e5283c5653f3b
Signed-off-by: kele bai <kele.bai@amlogic.com>
6 years agoamvecm: optimize G12A hdr code
MingLiang Dong [Thu, 1 Mar 2018 02:27:09 +0000 (10:27 +0800)]
amvecm: optimize G12A hdr code

PD#156734: amvecm: optimize G12A hdr code

1. put all the mtx/lut parameters together

Change-Id: I902c362fe8d8b01f2793789e9150640e929e1e73
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
6 years agoge2d: fix the vapb div and ge2d gate error
Brian Zhu [Tue, 13 Feb 2018 19:29:17 +0000 (03:29 +0800)]
ge2d: fix the vapb div and ge2d gate error

PD#156734: ge2d: fix the vapb div and ge2d gate error

Change-Id: Ib0e8c0328d0c136d7a0b50b0bba13cd95b3070f7
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agoge2d: revised ge2d vapb clk for g12a
zhilei.wu [Wed, 28 Feb 2018 08:40:58 +0000 (16:40 +0800)]
ge2d: revised ge2d vapb clk for g12a

PD#156734: ge2d: revised ge2d vapb clk for g12a

Change-Id: Ie3acc059560f24957c2c95609fd3ecdde05b0e56
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>