platform/kernel/linux-amlogic.git
6 years agobacklight: ldim: optimize get config flow [2/3]
Evoke Zhang [Wed, 23 May 2018 04:26:41 +0000 (12:26 +0800)]
backlight: ldim: optimize get config flow [2/3]

PD#166898: backlight: ldim: optimize get config flow
also correct local dimming spelling mistake

Change-Id: Iea2c7802e9fa55ad2e587126e1281ec9b34113e2
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agoosd: FBIO_WAITFORVSYNC expand to 64bit caused chrome crashed
pengcheng chen [Tue, 29 May 2018 06:48:17 +0000 (14:48 +0800)]
osd: FBIO_WAITFORVSYNC expand to 64bit caused chrome crashed

PD#167080: osd: FBIO_WAITFORVSYNC expand to 64bit caused chrome crashed

1. used FBIO_WAITFORVSYNC and FBIO_WAITFORVSYNC_64

Change-Id: Ia4a457f876fad24c6d1df60f3ea1b5fdc7f6bd8a
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agopwm: fix array out of bounds
Jian Hu [Wed, 30 May 2018 05:39:59 +0000 (13:39 +0800)]
pwm: fix array out of bounds

PD#165090: pwm: fix array out of bounds

Change-Id: I5fbc06619cbbc04dc998ea68e4f4a23cdb2e20a0
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
6 years agoarm64: dts: add amlogic jtag support for g12a
Bo Yang [Mon, 7 May 2018 11:34:44 +0000 (19:34 +0800)]
arm64: dts: add amlogic jtag support for g12a

PD#165810: add amlogic jtag support for g12a

Change-Id: I6f3fa717a54f027155c41496c50e2ffaae009c33
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agospicc: add enhanced features of oen, clock divider
Sunny Luo [Thu, 19 Apr 2018 07:04:56 +0000 (15:04 +0800)]
spicc: add enhanced features of oen, clock divider

PD#164751: spicc: add enhanced features of oen, clock divider

1. use the definite and significative name "has_oen" and
   "has_enhance_clk_div" to replace the unclear "is_enhance".
2. add some comment about enhance clk divider.

Change-Id: I9ffe51aaf696cdb09b5e486d60b5378c6433783e
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
6 years agoBT: fix bluetooth power issue for AP62X8
Larson Jiang [Fri, 25 May 2018 10:01:02 +0000 (18:01 +0800)]
BT: fix bluetooth power issue for AP62X8

PD#166763: fix bluetooth power issue for AP62X8

Change-Id: I4cdf2e3af67a47908a55113cf05dd9fdffd1e0cd
Signed-off-by: Sandy Luo <sandy.luo@amlogic.com>
6 years agomm: optimize for cma free time
tao zeng [Fri, 25 May 2018 13:19:25 +0000 (21:19 +0800)]
mm: optimize for cma free time

PD#165878: mm: optimize for cma free time

Fix bad parameter error and using high efficient free method.

Change-Id: I5fa1373644a373b3dd94775c5c29891f7f6f7420
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
6 years agovlock: adjust enc mode
wenfeng.guo [Wed, 16 May 2018 12:17:01 +0000 (20:17 +0800)]
vlock: adjust enc mode

PD#162336: vlock: adjust enc mode

1) separate vlock code from amve.c
2) optimize vlock default setting.
3) adjust enc mode
4) add manual enc soft adjust

Change-Id: Ie180c7fb6d9b1aa1fa016dd39bfa401197a5ac85
Signed-off-by: wenfeng.guo <wenfeng.guo@amlogic.com>
6 years agohdmitx: fix VSDB block parsing error
Kaifu Hu [Mon, 28 May 2018 03:01:25 +0000 (11:01 +0800)]
hdmitx: fix VSDB block parsing error

PD#160588: hdmitx: fix VSDB parsing error

It cann't parse YUV format when using special
edid with support YUV.

Change-Id: Ic17e3b3dc1f26694252e608fa2e609d08578aa71
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
6 years agousb: fix usb phy 1 reset bug.
Yue Wang [Tue, 29 May 2018 02:13:59 +0000 (10:13 +0800)]
usb: fix usb phy 1 reset bug.

PD#167234: usb: fix usb phy 1 reset bug.

Change-Id: Iac4c59a95f8a85553ac665e675a47f1a733cc1a8
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
6 years agoGEM: allocated buffer size must be PAGE_SIZE alignment
binqi.zhang [Thu, 17 May 2018 10:54:44 +0000 (18:54 +0800)]
GEM: allocated buffer size must be PAGE_SIZE alignment

PD#158474: do PAGE_SIZE alignment before initializing gem object

Change-Id: I98723ed2a22cfdc279253e06725482a656535184
Signed-off-by: binqi.zhang <binqi.zhang@amlogic.com>
6 years agoframe_sync: optimize AV SYNC procession.
manhao liang [Thu, 24 May 2018 06:37:23 +0000 (14:37 +0800)]
frame_sync: optimize AV SYNC procession.

PD#165368: frame_sync: optimize AV SYNC procession.

Change-Id: Ib9f11c059b9c2985878f83f428cebc5f70bdd0fd
Signed-off-by: manhao liang <manhao.liang@amlogic.com>
6 years agoAudio: dts: disable pwrdet
Xing Wang [Mon, 28 May 2018 07:28:18 +0000 (15:28 +0800)]
Audio: dts: disable pwrdet

PD#167203: Disable pwrdet for u200

Change-Id: Ied661fe8f578ef7a60ff9a9dda82408ad13a77ba
Signed-off-by: Sandy Luo <sandy.luo@amlogic.com>
6 years agoatv_demod: Modify atv v4l2 dev number
nengwen.chen [Fri, 25 May 2018 10:49:40 +0000 (18:49 +0800)]
atv_demod: Modify atv v4l2 dev number

PD#166852: atv_demod: Modify atv v4l2 dev number.

Change-Id: I6dfa226715d5e3908a20add4c93f0ba554a769dc
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
6 years agolcd: mipi-dsi: optimize retry_enable management [2/2]
Evoke Zhang [Mon, 21 May 2018 06:25:07 +0000 (14:25 +0800)]
lcd: mipi-dsi: optimize retry_enable management [2/2]

PD#166330: lcd: mipi-dsi: optimize retry_enable management,
change mipi-dsi check_state after retry flow finished.
fix issue: mipi panel status is incorrect sometimes when lcd enable.

Change-Id: I5fc30f46589274b1cc2fda735c166779233ce1c2
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agohdr: add osd lut table for nts test
Jihong Sui [Tue, 22 May 2018 09:28:36 +0000 (17:28 +0800)]
hdr: add osd lut table for nts test

PD#164627: hdr: add osd lut table for nts test

1. debug fs : /sys/kernel/debug/hdr/cfg_en_osd_100
1: enable new osd lut table (for nts test)
0: use old osd lut table
2. dts: amlvecm:cfg_en_osd_100
1: enable new osd lut table (for nts test)
0/not define: use old osd lut table

Change-Id: If3c51eaba58f7d83188b8920ad7dca78d3b38c19
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
6 years agohdmitx: add hdcp topo information [3/5]
Zongdong Jiao [Thu, 24 May 2018 08:16:11 +0000 (16:16 +0800)]
hdmitx: add hdcp topo information [3/5]

PD#165815: hdmitx: add hdcp topo information

1. add SYSFS 'hdcp_topo_info' to represent HDCP22 Topology
2. rewrite SYSFS 'hdcp22_type', should be controlled by Daemon

Change-Id: Ie9f748c5592a32b8658b63186429794e877fd41c
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
6 years agovideo: change rgb pattern matrix coefficient from 601 to 709
Bencheng Jing [Thu, 24 May 2018 07:29:35 +0000 (15:29 +0800)]
video: change rgb pattern matrix coefficient from 601 to 709

PD#167037: video: optimize rgb2yuv for 709

Change-Id: I25d9085ddcdde467ac8f33b4795488f3f395ced2
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
6 years agoosd: updated vinfo when it is not null every frame
pengcheng chen [Thu, 24 May 2018 06:43:55 +0000 (14:43 +0800)]
osd: updated vinfo when it is not null every frame

PD#167032: osd: updated vinfo when it is not null every frame

Change-Id: If914fc39d014e2a1c2db564d427292977edc7530
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agosdio: modify Cfg_irq_sdio_sleep reg set err
Nan Li [Thu, 17 May 2018 07:10:02 +0000 (15:10 +0800)]
sdio: modify Cfg_irq_sdio_sleep reg set err

PD#166568: modify Cfg_irq_sdio_sleep reg set error.

Change-Id: I82946b321a729b378968466edee50ce3f8817bff
Signed-off-by: Nan Li <nan.li@amlogic.com>
6 years agoaudio: add EQ/DRC control[1/3]
Zhe Wang [Mon, 21 May 2018 05:21:00 +0000 (13:21 +0800)]
audio: add EQ/DRC control[1/3]

PD#166486: add EQ/DRC kcontrol

Change-Id: I9b49960b0f0d8e82a46e1b9670e3352e9289e3bc
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
6 years agohdmitx: fix bsod and path dealy under hdcp22
Yi Zhou [Thu, 10 May 2018 08:03:08 +0000 (16:03 +0800)]
hdmitx: fix bsod and path dealy under hdcp22

PD#166207: hdmitx: fix bsod and path dealy under hdcp22

1.HDMITX_TOP_HDCP22_BSOD[25] doesn't use bsod
2.HDCP22REG_CTRL[6.7] match path delays
  between hdcp path and non-hdcp path

Change-Id: I295804895f715687f975ab8ecfb7ea348999095a
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
6 years agousb: modify the fifth compliance test partner
Jianxin Qin [Tue, 22 May 2018 09:33:24 +0000 (17:33 +0800)]
usb: modify the fifth compliance test partner

PD#163486: usb: modify the fifth compliance test parnter

Change-Id: Ic30f709ca278413576879b4ff5acc789f72c74d8
Signed-off-by: Jianxin Qin <jianxin.qin@amlogic.com>
6 years agodi: fix nr pq load error
kele bai [Tue, 15 May 2018 09:33:55 +0000 (17:33 +0800)]
di: fix nr pq load error

PD#162226: di: fix nr pq load error

1) move nr gate ctrl before nr init
2) fix skip logic error
3) load ctrl reg in irq avoid affect pre sequence

Change-Id: I9b5438f55e42eabfa37e10a04dc0f3026bbbd595
Signed-off-by: kele bai <kele.bai@amlogic.com>
6 years agoatv_demod: Add atv afc [2/2]
nengwen.chen [Mon, 21 May 2018 03:25:43 +0000 (11:25 +0800)]
atv_demod: Add atv afc [2/2]

PD#166320: Add atv afc(Modify module params use).

Change-Id: I2d9d84c742ab1ce56c99ff8e40b483bd01d4d237
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
6 years agoaudio: auge: init spdif_b when bootup and add channel status
Xing Wang [Mon, 30 Apr 2018 13:12:28 +0000 (21:12 +0800)]
audio: auge: init spdif_b when bootup and add channel status

PD#165171: audio: auge: init spdif_b when bootup and add channel status

Change-Id: I001d74a0f21fb3f02edf741bd3b87d45dfddcd5f
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
6 years agohdmitx: add dolby debug info
Kaifu Hu [Tue, 24 Apr 2018 02:02:55 +0000 (10:02 +0800)]
hdmitx: add dolby debug info

PD#164913: hdmitx: add dolby debug info

Add dolby debug info.

Change-Id: I65156223b66bcb95c31e8b60a602f834bacf89f2
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
6 years agoSMC: secmon: uniform SMC call interface.
Yan Wang [Mon, 29 Jan 2018 08:16:11 +0000 (16:16 +0800)]
SMC: secmon: uniform SMC call interface.

PD#160539: check secmon dev in dts and uniform SMC call interface.

 1. SMC call interface is provided by ARCH.
    arm_smccc_smc(...)
 2. check secmon device is registed or not.

Change-Id: I5bd58747db5b167ab8ad59be083f31e7b6395bbf
Signed-off-by: Yan Wang <yan.wang@amlogic.com>
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
6 years agohdmirx: optimize timing format detection
Hang Cheng [Wed, 9 May 2018 11:54:15 +0000 (19:54 +0800)]
hdmirx: optimize timing format detection

PD#164010: hdmirx: optimize timing format detection

Change-Id: Ibf868664d4fda5fa21d4e80cfcc6575b25acd500
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
6 years agodemux: modify interrupt no for dmx 2
Chuangcheng Peng [Tue, 22 May 2018 07:53:22 +0000 (15:53 +0800)]
demux: modify interrupt no for dmx 2

PD#165368: enable dmux 2 work

Change-Id: Ic21bbc30c8b2cc7eeedd9206c1f355156554646f
Signed-off-by: Chuangcheng Peng <chuangcheng.peng@amlogic.com>
6 years agoosd: return if vinfo is null
pengcheng chen [Sat, 19 May 2018 14:19:24 +0000 (22:19 +0800)]
osd: return if vinfo is null

PD#165381: osd: return if vinfo is null

Change-Id: I21b7de315859268f51b185a77ad221ded5a2d755
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agoosd: rdma overflow handling
pengcheng chen [Sat, 19 May 2018 11:06:03 +0000 (19:06 +0800)]
osd: rdma overflow handling

PD#165381: osd: rdma overflow handling

Change-Id: Ic82a7d03ef3f985720e0c84bf9c65f5dee9324a9
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agoosd: osd suspend fail issue
pengcheng chen [Wed, 2 May 2018 05:19:31 +0000 (13:19 +0800)]
osd: osd suspend fail issue

PD#164508: osd: suspend fail issue

Change-Id: I673a907bea2abf37d09967ef0e0a924806ce6fae
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agolcd: local dimming: add unifykey support [2/2]
Weiming Liu [Tue, 15 May 2018 11:29:01 +0000 (19:29 +0800)]
lcd: local dimming: add unifykey support [2/2]

PD#166418: ldim: add unifykey support

Change-Id: I0cb7629ed9824c50d5f85b7ec34e26c165a60a1e
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
6 years agoarm64: dts: g12a: add cpufreq 1.908G.
Hong Guo [Mon, 21 May 2018 03:27:44 +0000 (11:27 +0800)]
arm64: dts: g12a: add cpufreq 1.908G.

PD#165143: cpufreq: add cpufreq 1.908G.

Change-Id: Id8cca5402a02372247def759ff455ef5bbe11f05
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
6 years agodts: enable picdec [1/1]
Lei Qian [Mon, 21 May 2018 13:31:34 +0000 (21:31 +0800)]
dts: enable picdec [1/1]

PD#166830: dts: enable picdec

or we can't play 4K picture

Change-Id: I7109cd421608a82fb5cd05617bf4065d4897a430
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
6 years agoethernet: add wol for internal phy
Zhuo Wang [Tue, 22 May 2018 03:26:34 +0000 (11:26 +0800)]
ethernet: add wol for internal phy

PD#166640: add wol for internal phy

Change-Id: I1c34af9022e5aa4968516d6826089531b55a1c10
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>
6 years agodts: unify dvb dts definition
Cheng Tong [Mon, 21 May 2018 12:56:49 +0000 (20:56 +0800)]
dts: unify dvb dts definition

PD#163384: dts: unify dvb dts definition

Change-Id: I323c9200d2441aa8d40f4972612f9ecfbf0edc5b
Signed-off-by: Cheng Tong <cheng.tong@amlogic.com>
6 years agovout: optimize invalid mode management for init
Evoke Zhang [Fri, 4 May 2018 02:54:16 +0000 (10:54 +0800)]
vout: optimize invalid mode management for init

PD#166032: vout: optimize invalid mode management for init

Change-Id: I16d36b1745faf0adf8316837d3df2d061ea94dda
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agoosd: fix dfbshow can't show picture
pengcheng chen [Thu, 10 May 2018 13:33:52 +0000 (21:33 +0800)]
osd: fix dfbshow can't show picture

PD#165698: osd: fix dfbshow can't show picture

Change-Id: I0f13537391c98f106a5154d498ef46af90aa7690
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agoMerge branch 'android-4.9' into amlogic-4.9-dev
Victor Wan [Tue, 22 May 2018 02:48:42 +0000 (10:48 +0800)]
Merge branch 'android-4.9' into amlogic-4.9-dev

6 years agoldim: add db load support
Weiming Liu [Mon, 14 May 2018 09:14:23 +0000 (17:14 +0800)]
ldim: add db load support

PD#166311: lcd: add ldim db load support

Change-Id: I71c8a6d3b07daae63d19dec128da3c71a6031cba
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
6 years agoosd: support hw vsync [1/1]
shuze.ma [Tue, 17 Apr 2018 07:03:45 +0000 (15:03 +0800)]
osd: support hw vsync [1/1]

PD#163001: osd: support hw vsync

Change-Id: I1e7f158b8cbc9434165745f77274ae353cfae342
Signed-off-by: shuze.ma <shuze.ma@amlogic.com>
6 years agoIR: add S905X small IR remote on T962E
gongwei.chen [Thu, 10 May 2018 09:02:01 +0000 (17:02 +0800)]
IR: add S905X small IR remote on T962E

PD#165963: IR: add S905X small IR remote on T962E

Change-Id: I3d3bf0abaf30c0dc8d0ce925afeeefff6af27923
Signed-off-by: Gongwei Chen <gongwei.chen@amlogic.com>
6 years agomm: remove total summary of pagetypeinfo
tao zeng [Wed, 16 May 2018 05:27:47 +0000 (13:27 +0800)]
mm: remove total summary of pagetypeinfo

PD#166462:

This caused vts VtsKernelProcFileApi on Android P failed.

Change-Id: I332c7ec324e7f87b0f8e0adeeef15cfd93f9b077
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
6 years agoatv_demod: Add atv afc [1/2]
nengwen.chen [Tue, 15 May 2018 11:27:42 +0000 (19:27 +0800)]
atv_demod: Add atv afc [1/2]

PD#166320: Add atv afc.

Change-Id: I7b5d8d6290f1e394900b09a1147e7db5ec6fecf4
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
6 years agodts: update p230 dts for attach mode
Cheng Tong [Thu, 17 May 2018 06:09:49 +0000 (14:09 +0800)]
dts: update p230 dts for attach mode

PD#163384: dts: update p230 dts for attach mode

Change-Id: Iac83d28e31883f812c05f7fcd0342b0f4f225475
Signed-off-by: Cheng Tong <cheng.tong@amlogic.com>
6 years agovbi: fix vbi cc error
Xuhua Zhang [Fri, 9 Mar 2018 03:29:14 +0000 (11:29 +0800)]
vbi: fix vbi cc error

PD#161806: vbi: fix cc nosync and disappearance problem

Add interface to read real-time data what vbi-hw write to memory.

Change-Id: Ie36a9826ecf3320f7a1a366bac7a6a4f15e6f7d2
Signed-off-by: Xuhua Zhang <xuhua.zhang@amlogic.com>
6 years agoarm64: dts: g12a: fine-tune U220 OPP
Hong Guo [Wed, 16 May 2018 02:20:21 +0000 (10:20 +0800)]
arm64: dts: g12a: fine-tune U220 OPP

PD#165143: fine-tune U220 OPP for stability.

Change-Id: I84d543519c9053db0060ba3d090c4ecc9f233fa8
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
6 years agoreboot: make system reboot when panic occurs
Yixun Lan [Fri, 18 May 2018 09:28:39 +0000 (17:28 +0800)]
reboot: make system reboot when panic occurs

PD#166529: reboot: make system reboot when panic occurs

CONFIG_PANIC_TIMEOUT=0 means no reboot when panic occurs,
This will make VTS stuck forever, fix this by making
the default reboot timeout as 5s.

Change-Id: Ib8888a4f87c6c178891d7e7fed2f186a6bfed119
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
6 years agodts: add defendkey function for G12A
Zhongfu Luo [Thu, 10 May 2018 12:16:00 +0000 (20:16 +0800)]
dts: add defendkey function for G12A

PD#164929: G12A need to support defendkey

add defendkey function in all G12A dts

Change-Id: Id269d4c14f2c2a6ad0674191aff353122a13d558
Signed-off-by: Zhongfu Luo <zhongfu.luo@amlogic.com>
6 years agoethernet: fix wol_error when test eye_pattern
Zhuo Wang [Fri, 18 May 2018 09:56:11 +0000 (17:56 +0800)]
ethernet: fix wol_error when test eye_pattern

PD#166642: add eye pattern function for 4.9

Change-Id: If57f74262589c02e12cbff3f01745c70a687da9e
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>
6 years agodefendkey: support secure upgrade check
Zhongfu Luo [Thu, 17 May 2018 11:50:11 +0000 (19:50 +0800)]
defendkey: support secure upgrade check

PD#164929: G12A need to support defendkey

Change-Id: I3c805c4dda03a39156fb91b53cc55ee8930f9e03
Signed-off-by: Zhongfu Luo <zhongfu.luo@amlogic.com>
6 years agowifi: enable cfg80211 testmode for qca6174
libo [Thu, 17 May 2018 08:53:36 +0000 (16:53 +0800)]
wifi: enable cfg80211 testmode for qca6174

PD#166420: enable cfg80211 testmode for qca6174

Change-Id: I65f6fa499e02fdc48bc23f1e7541fd8e7fee4850
Signed-off-by: libo <bo.li@amlogic.com>
6 years agohdmitx: fix no display under frac_mode
Yi Zhou [Fri, 18 May 2018 04:41:38 +0000 (12:41 +0800)]
hdmitx: fix no display under frac_mode

PD#166241: hdmitx: fix no display under frac_mode

1.update pll parameters
2.4k60hz444/rgb8bit doesn't frac_mode

Change-Id: I45c8bade4cd8f83a7b4d36aadbdbbaa9dfca32f1
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
6 years agobacklight: ldim: add remap function restrictions by ldim_func [2/2]
Evoke Zhang [Thu, 17 May 2018 05:16:52 +0000 (13:16 +0800)]
backlight: ldim: add remap function restrictions by ldim_func [2/2]

PD#166583: backlight: ldim: add remap function restrictions by ldim_func
also optimize iw7027 driver

Change-Id: I2a863d17d3cef521b6d7af016f4c47e29ef5b44b
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agovpp: fix the vskip overflow when playing interlace video
Brian Zhu [Sat, 5 May 2018 08:49:12 +0000 (16:49 +0800)]
vpp: fix the vskip overflow when playing interlace video

PD#164722: vpp: fix the vskip overflow when playing interlace video

Change-Id: Id65e8c58aedf35da4762280ae19cf933f08786f9
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agospicc: g12a: spicc0 pins_c debug
Sunny Luo [Fri, 18 May 2018 06:29:13 +0000 (14:29 +0800)]
spicc: g12a: spicc0 pins_c debug

PD#166556: spicc: g12a: spicc0 pins_c debug

Change-Id: I4f5f118410617cc3de8a1132100a1f7e21bc9f66
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
6 years agou221: disable cvbsout [2/2]
Evoke Zhang [Wed, 2 May 2018 09:34:00 +0000 (17:34 +0800)]
u221: disable cvbsout [2/2]

PD#165555: u221: disable cvbsout
s905y2 don't support cvbsout

Change-Id: If29a9c6e9fa38cafcbcf6e75f942fb03b2cd5e1b
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agohdr: add hlg support
MingLiang Dong [Wed, 16 May 2018 09:24:32 +0000 (17:24 +0800)]
hdr: add hlg support

PD#166567: hdr: add hlg support

Change-Id: I00acc352ce534485c8950f979704f96880811faa
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
6 years agotsync: do not operate tsync_mode_switch before first video toggled.
shuanglong.wang [Mon, 14 May 2018 06:49:39 +0000 (14:49 +0800)]
tsync: do not operate tsync_mode_switch before first video toggled.

PD#165355: do not operate tsync_mode_switch before first video toggled.
Some stream in tunnel mode, first audio pts is large than
AV_DISCONTINUE_THREDHOLD_MAX(60s). In audio_hw it will check pcr and
apts diff, so large difference between pcr and apts will lead sync mode
from amster to vmaster
[ 2414.316223@3] vdec_init, dev_name:ammvdec_vp9,
vdec_type=VDEC_TYPE_STREAM_PARSER
[ 2414.326361@3] vp9: ver (201602101,0) decinfo: 1920x1080 rate=4000
[ 2414.326827@3] mem_start_virt failed
[ 2414.330600@3] init_pic_list ok, used_buf_num = 12
[ 2414.336555@2] set pts unstable
[ 2414.338121@2] success set parent hevc_p1_composite rate to 666666666
[ 2414.356287@0]
A-discontinue,pcr=1500,vpts=0,apts=1500,diff_pts=16209420,lugsp_5ts6
207920
[ 2414.359685@0] discontinue-tsync_mode:A->Vvptatr:S->adji
ffies=204004utsize 12179
[ 2414.366696@0] debugcnt=0x10,diff_pts=16209420,tsync_mode=0

Change-Id: I7e33abb5e6c27169ecec86fb6e4df33de6bd80cf
Signed-off-by: shuanglong.wang <shuanglong.wang@amlogic.com>
6 years agoavsync: av not sync problem cased by vp9 trig
shuanglong.wang [Mon, 14 May 2018 08:33:49 +0000 (16:33 +0800)]
avsync: av not sync problem cased by vp9 trig

PD#161895: av not sync problem cased by vp9 trig

1)vp9 initialization stream do not post VIDEO_START event,
so do not post VIDEO_STOP in unregister when not post
VIDEO_START which occured in vp9 tirg reset codec operation.
2)AV audio master adjust pcr according apts diff in
tsync tsync_set_apts need to reopen which was commented in
the begining tree of 4.9 codec
3)summit as Tim's patch

Change-Id: I9fb62aecb27f75d1ea9dff938452e0dd4f11b901
Signed-off-by: shuanglong.wang <shuanglong.wang@amlogic.com>
6 years agodi: fix nr4 param sys interface crash
kele bai [Tue, 15 May 2018 06:44:32 +0000 (14:44 +0800)]
di: fix nr4 param sys interface crash

PD#166354: di: fix nr4 param sys interface crash

1) nr4 param array access violation

Change-Id: Ia79bd0ef8118715c6f1a94c5427c2c4b715f8bf8
Signed-off-by: kele bai <kele.bai@amlogic.com>
6 years agohdmirx: improve the snow noise issue during timing switching
Lei Yang [Wed, 16 May 2018 07:11:01 +0000 (15:11 +0800)]
hdmirx: improve the snow noise issue during timing switching

PD#166184: hdmirx: improve the snow noise issue during timing switching

Change-Id: If143d418758f3b0d4895a7ecab87cebe98d8c457
Signed-off-by: Lei Yang <lei.yang@amlogic.com>
6 years agoosd: add afbc arb reset which caused screen blank
pengcheng chen [Sat, 12 May 2018 08:05:19 +0000 (16:05 +0800)]
osd: add afbc arb reset which caused screen blank

PD#166248: osd: afbc arb reset which caused screen blank

Change-Id: I35035a40a50d5123394d527c60df2abb58e10b9a
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agoaudio: codec: add suspend and resume for ad82584f
Xing Wang [Wed, 16 May 2018 03:33:41 +0000 (11:33 +0800)]
audio: codec: add suspend and resume for ad82584f

PD#165897: audio: codec: add suspend and resume for ad82584f

Change-Id: I5a98b4d19f4cc411ea2f94ab62bd323658fb1c25
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
6 years agolcd: add retry flow to ensure power on state
Evoke Zhang [Mon, 14 May 2018 12:24:25 +0000 (20:24 +0800)]
lcd: add retry flow to ensure power on state

PD#166330: mipi panel status is incorrect sometimes when lcd enable

Change-Id: Iace4963e576752208815d672befa4e215f860097
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agolcd: premote a common lcd_extern_i2c_probe
Weiming Liu [Fri, 13 Apr 2018 10:58:06 +0000 (18:58 +0800)]
lcd: premote a common lcd_extern_i2c_probe

PD#164139: lcd: premote a common lcd_extern_i2c_probe

premote a common lcd_extern_i2c_probe() function,
so it will be shared by various display controller IC

Change-Id: I47638520f32a0865829a1fd776c3a9ca626798ba
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
6 years agoamvecm: fix G12A eye protect function unused
MingLiang Dong [Fri, 11 May 2018 09:25:10 +0000 (17:25 +0800)]
amvecm: fix G12A eye protect function unused

PD#165151: amvecm: fix G12A eye protect function unused

1. G12A use post matrix as wb adjust module
2. fix 905x eye protect function bug

Change-Id: Ic161cafbb455cf278283d20ef9d93f18c07f5811
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
6 years agousb: phy2: analog tuning for aml-phy
Jianxin Qin [Thu, 10 May 2018 06:50:56 +0000 (14:50 +0800)]
usb: phy2: analog tuning for aml-phy

PD#164286: usb: phy2: analog tuning for aml-phy

Packet lost occures with high probability in High Speed mode, This patch
re-configurate PHY parameters for improving this issue.

Change-Id: If51d300a01d8c30dce27454ad887a0d14f2d1e52
Signed-off-by: Jianxin Qin <jianxin.qin@amlogic.com>
6 years agoscript: amlogic: add code scan script
Ao Xu [Tue, 15 May 2018 07:59:14 +0000 (15:59 +0800)]
script: amlogic: add code scan script

PD#166377: script: amlogic: add code scan script

Add code scan script.

Usage: ./script/amlogic/code_scan.sh [path]

Examples:
# scan all code
./script/amlogic/code_scan.sh

# scan specified directory
./script/amlogic/code_scan.sh drivers/amlogic

scan result is in src code's parent directory, named coverity_html

Change-Id: I069cd99d08014cc50a3bf127e199690649e196c8
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
6 years agohdmirx: fixed the pink screen issue when connect with roku box
yicheng shen [Fri, 4 May 2018 08:58:26 +0000 (16:58 +0800)]
hdmirx: fixed the pink screen issue when connect with roku box

PD#165686: hdmirx: fixed the pink screen issue when connect with roku box

Change-Id: Ia1723b9e88bcf7dd0773bc301301e682d35a9c5c
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
6 years agocec: add err initiator int for cec error [2/3]
hongmin hua [Wed, 9 May 2018 09:17:55 +0000 (17:17 +0800)]
cec: add err initiator int for cec error [2/3]

PD#163965: cec: add err initiator int for cec error

Change-Id: I7a10f4d6a90d2e3a15ec3ed969735aadb230db43
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
6 years agohdmitx: update hdmi phsycial size during hotplug [1/1]
shuze.ma [Tue, 15 May 2018 10:52:28 +0000 (18:52 +0800)]
hdmitx: update hdmi phsycial size during hotplug [1/1]

PD#163001: update hdmi phsycial size during hotplug

Change-Id: I71e863c56abbe5ae8dd151de481b1465317cebf1
Signed-off-by: shuze.ma <shuze.ma@amlogic.com>
6 years agoarm64: dts: txlx: adjust the position of saradc node
Xingyu Chen [Tue, 15 May 2018 09:09:22 +0000 (17:09 +0800)]
arm64: dts: txlx: adjust the position of saradc node

PD#165196: arm64: dts: txlx: adjust the position of saradc node

In order to compatible with the saradc driver in uboot, the node
must be placed in the /{}.

Change-Id: I135a89866249b23b89f466699ecdb8cd7f21db82
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
6 years agohdmirx: add new atmos edid handle method
yicheng shen [Fri, 11 May 2018 03:23:12 +0000 (11:23 +0800)]
hdmirx: add new atmos edid handle method

PD#164867: hdmirx: add new atmos edid handle method

Change-Id: I03865be263d195b3b38bf782bd52b992e2084c71
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
6 years agoarm64: cpufeature: Pass capability structure to ->enable callback
Mark Rutland [Thu, 12 Apr 2018 11:11:09 +0000 (12:11 +0100)]
arm64: cpufeature: Pass capability structure to ->enable callback

PD#166068: arm64: cpufeature: Pass capability structure to ->enable callback

Fix CPU-hotplug fail to bringup issue once stopped CPU.

From: Will Deacon <will.deacon@arm.com>

commit 0a0d111d40fd1dc588cc590fab6b55d86ddc71d3 upstream.

In order to invoke the CPU capability ->matches callback from the ->enable
callback for applying local-CPU workarounds, we need a handle on the
capability structure.

This patch passes a pointer to the capability structure to the ->enable
callback.

Change-Id: I2c002dfbba4e923d0e44ab085ede46e6f47c9755
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Mark Rutland <mark.rutland@arm.com> [v4.9 backport]
Tested-by: Greg Hackmann <ghackmann@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
6 years agoarm64: cpufeature: __this_cpu_has_cap() shouldn't stop early
Mark Rutland [Thu, 12 Apr 2018 11:11:07 +0000 (12:11 +0100)]
arm64: cpufeature: __this_cpu_has_cap() shouldn't stop early

PD#166068: arm64: cpufeature: __this_cpu_has_cap() shouldn't stop early

From: James Morse <james.morse@arm.com>

Fix CPU-hotplug fail to bringup issue once stopped CPU.

commit edf298cfce47ab7279d03b5203ae2ef3a58e49db upstream.

this_cpu_has_cap() tests caps->desc not caps->matches, so it stops
walking the list when it finds a 'silent' feature, instead of
walking to the end of the list.

Prior to v4.6's 644c2ae198412 ("arm64: cpufeature: Test 'matches' pointer
to find the end of the list") we always tested desc to find the end of
a capability list. This was changed for dubious things like PAN_NOT_UAO.
v4.7's e3661b128e53e ("arm64: Allow a capability to be checked on
single CPU") added this_cpu_has_cap() using the old desc style test.

Change-Id: I29788b05eb636de777de5d4f423097804d465a7b
CC: Suzuki K Poulose <suzuki.poulose@arm.com>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Mark Rutland <mark.rutland@arm.com> [v4.9 backport]
Tested-by: Greg Hackmann <ghackmann@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
6 years agohdr: fix the bug that sdr can't switch to hdr for g12a
Jihong Sui [Mon, 14 May 2018 09:56:03 +0000 (17:56 +0800)]
hdr: fix the bug that sdr can't switch to hdr for g12a

PD#166004: hdr: fix the bug that sdr can't switch to hdr for g12a

Change-Id: Ia7c14f86d63aa8b00617c47abad14e2eab96d2f6
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
6 years agoarm64: dts: g12a: add cpufreq 1.92G.
Hong Guo [Mon, 14 May 2018 11:35:02 +0000 (19:35 +0800)]
arm64: dts: g12a: add cpufreq 1.92G.

PD#165143: cpufreq: add cpufreq 1.92G.

Change-Id: I8b9dddf8c4c138bf4b5763f707c174ad48e8a53a
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
6 years agoaudio: add 16K mic aux and 32bit feature
bin pang [Mon, 14 May 2018 09:37:57 +0000 (17:37 +0800)]
audio: add 16K mic aux and 32bit feature

PD#164543: audio: 16K mic aux and 32bit support[2/2]

Change-Id: I7e19374cae45821c6189c60eff4b1e2d872ba4c6
Signed-off-by: bin pang <bin.pang@amlogic.com>
6 years agoarm64: dts: g12a: add default drive strength for i2c controllers
Jian Hu [Mon, 14 May 2018 05:29:53 +0000 (13:29 +0800)]
arm64: dts: g12a: add default drive strength for i2c controllers

PD#165715: arm64: dts: g12a: add default drive strength for i2c controllers

Change-Id: I4d909e25d08fa29ac6ebdf756af76bef86bf0bf6
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
6 years agoatv_demod: Add atv color and sound system setting separately [7/8]
nengwen.chen [Thu, 10 May 2018 11:32:49 +0000 (19:32 +0800)]
atv_demod: Add atv color and sound system setting separately [7/8]

PD#165560: Add atv color and sound system setting separately.

Change-Id: I8279143706ddfd705bce95c3f40f701ae9af7829
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
6 years agothermal: fix thermal issue
Huan Biao [Fri, 11 May 2018 02:57:31 +0000 (10:57 +0800)]
thermal: fix thermal issue

PD#166068: thermal: fix cpu cooldev work issue and gpupp not match

Change-Id: I26f4626b309cad984e59f3c2f30eb60f1ec5121b
Signed-off-by: Huan Biao <huan.biao@amlogic.com>
6 years agoethernet: bypass wol_reg12 check when 10M
Zhuo Wang [Mon, 14 May 2018 04:43:29 +0000 (12:43 +0800)]
ethernet: bypass wol_reg12 check when 10M

PD#166287: 10M wol_reg12 error

Change-Id: I1b9bd412786509d2a4889c58ef634f6391b54e9e
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>
6 years agodtv_demod: modified dtv demod
Jihong Sui [Thu, 10 May 2018 11:18:01 +0000 (19:18 +0800)]
dtv_demod: modified dtv demod

PD#165971: dtv_demod: modified dtv demod

1. change folder name(amldemod ->dtv_demod);
2. set status 0 when not support;

Change-Id: I96c23b0b333ee0967d5013ebc8915fdffa097433
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
6 years agoMerge "audio: add audio spdif format kcontrol [1/2]" into amlogic-4.9-dev
Jian Xu [Fri, 11 May 2018 14:39:17 +0000 (07:39 -0700)]
Merge "audio: add audio spdif format kcontrol [1/2]" into amlogic-4.9-dev

6 years agovpp: fix the bypass pps condition for non-linear scaler
Brian Zhu [Wed, 9 May 2018 14:12:52 +0000 (22:12 +0800)]
vpp: fix the bypass pps condition for non-linear scaler

PD#164896: vpp: fix the bypass pps condition for non-linear scaler

Change-Id: Ie4e30499b6fe12253da52194d2b89002faf28bd2
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agohdmirx: optimize for cases do hdcp1.4 interaction very early
Hang Cheng [Thu, 26 Apr 2018 08:48:08 +0000 (16:48 +0800)]
hdmirx: optimize for cases do hdcp1.4 interaction very early

PD#165229: hdmirx: optimize for cases do hdcp1.4 interaction very early

Change-Id: I8b07c2f1be524eed47bde77681c3724b110db618
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
6 years agodts: g12 socket: change max freq
Sandy Luo [Fri, 11 May 2018 08:41:02 +0000 (16:41 +0800)]
dts: g12 socket: change max freq

PD#164108: change max freq to 2G Hz

Change-Id: I6ccb051485ee2ff04ddb6558a63340cd52151464
Signed-off-by: Sandy Luo <sandy.luo@amlogic.com>
6 years agoaudio: add audio spdif format kcontrol [1/2]
Zhe Wang [Fri, 11 May 2018 06:53:30 +0000 (14:53 +0800)]
audio: add audio spdif format kcontrol [1/2]

PD#165552: add audio spdif format kcontrol

1) remove drc control for ground noise
2) fast attrack for volume
3) add spdif format kcontrol

Change-Id: I3b4574170d808dd7fe955d249e3414880285eb3e
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
6 years agodebug: drop sscanf, use kstrto variant instead
Yixun Lan [Fri, 11 May 2018 06:20:29 +0000 (14:20 +0800)]
debug: drop sscanf, use kstrto variant instead

PD#165796: debug: drop sscanf, use kstrto variant instead

kstrto is kernel reconmmend function which is more safe than sscanf
this will also fix the following checkpatch.pl warning

WARNING: Prefer kstrto<type> to single variable sscanf
+       ret = sscanf(buf, "%ld", &val);

Change-Id: I9a4673b9aa43c10f51a20778ba520461ee0a7984
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
6 years agohdmirx: fix deadlock issue
Lei Qian [Thu, 10 May 2018 13:17:58 +0000 (21:17 +0800)]
hdmirx: fix deadlock issue

PD#164867: fix deadlock issue

Revert "hdmirx: add new atmos edid handle method"

This reverts commit 6bf27f9a5a1777fe965f0d381296f886085a3c87.

Change-Id: Ica0d99c9b4b3f05ccb86c85693c5cc4d2871bd7a
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
6 years agocvbs: cvbs performance for g12a Rev.B
Nian Jing [Thu, 19 Apr 2018 11:46:03 +0000 (19:46 +0800)]
cvbs: cvbs performance for g12a Rev.B

PD#164108: cvbs performance for g12a Rev.B

Change-Id: If140535984762cf6d843878e78ab285e014868e7
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
6 years agoethernet: chage u200 buildroot default as internal phy
wenbiao zhang [Wed, 9 May 2018 09:19:08 +0000 (17:19 +0800)]
ethernet: chage u200 buildroot default as internal phy

PD#163830: ethernet: chage u200 buildroot default as internal phy

Change-Id: I1be5bfddae6fc0c43e3da5f604a80cca36cfad6e
Signed-off-by: wenbiao zhang <wenbiao.zhang@amlogic.com>
6 years agodtv_demod: modify dtv demod to adapter tuner
Jihong Sui [Wed, 9 May 2018 03:25:27 +0000 (11:25 +0800)]
dtv_demod: modify dtv demod to adapter tuner

PD#165971: dtv_demod: Modify atv demod to adapter tuner

1. add get_strength;
2. call release when switch to not-support format;
3. chang DVBT/DVBC from DVBFE_ALGO_SW to DVBFE_ALGO_HW;

Change-Id: I5d58542dd1dded1579e950ec36c395d6a01e6cd7
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
6 years agoi2c: fix i2c clock-frequency inaccurate in fast-mode
Jian Hu [Thu, 3 May 2018 03:01:00 +0000 (11:01 +0800)]
i2c: fix i2c clock-frequency inaccurate in fast-mode

PD#165568: i2c: fix i2c clock-frequency in fast-mode

1.When i2c controller used in U-boot,may affect i2c
  controller in Kernel,should clear i2c registers.
2.Add i2c default clock-frequency for axg.
3.Add i2c clock-frequency debug sysfs, for i2c-0:
  /sys/class/i2c-adapter/i2c-0/device/speed
4.change clock high/low = 1:2 to 2:3

Change-Id: I44ca7ecd8e2e7aec978f3240ff837121ae478ba7
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
6 years agovdin: fix atv nosignal after snowon
Nian Jing [Tue, 8 May 2018 08:16:42 +0000 (16:16 +0800)]
vdin: fix atv nosignal after snowon

PD#164655: dynamic config clamp for signal stable

Change-Id: I29c42053d2014b2ba17ab62b9a670b82b0d3550e
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
6 years agopwm: fix min and max duty cycle
Jian Hu [Wed, 9 May 2018 05:50:29 +0000 (13:50 +0800)]
pwm: fix min and max duty cycle

PD#165774: pwm: fix min and max duty cycle

When the duty equal 0% and 100%, there is one high or low
count ,the constant bit should be enabled;and constant
bit should be disabled for other duty_cycle.

Change-Id: I36eefee3613f113f6c30db076e41cd8223086c54
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
6 years agocpuidle: enable cpu idle
Shunzhou Jiang [Tue, 10 Apr 2018 02:41:02 +0000 (10:41 +0800)]
cpuidle: enable cpu idle

PD#163959: G12A: enable cpu idle

Change-Id: If5493f037f51092358b8f1c4151655aafec6e379
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>