platform/kernel/linux-amlogic.git
6 years agodemux: add demux irq for txlx
Chuangcheng Peng [Sun, 29 Apr 2018 07:43:55 +0000 (15:43 +0800)]
demux: add demux irq for txlx

PD#165368: add demux irq for txlx

Change-Id: I165a524cd5e161b22ee21318d9379bb139622e2f
Signed-off-by: Chuangcheng Peng <chuangcheng.peng@amlogic.com>
6 years agodtv_demod: add dtv demod for txlx
Jihong Sui [Sat, 28 Apr 2018 04:51:24 +0000 (12:51 +0800)]
dtv_demod: add dtv demod for txlx

PD#165005: dtv_demod: add dtv demod for txlx

Change-Id: I311fea46351644902a5e886be4623601e21ec6ac
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
6 years agomm: fixed tvp alloc failed
Bang Peng [Thu, 3 May 2018 08:25:41 +0000 (16:25 +0800)]
mm: fixed tvp alloc failed

PD#159668: fixed tvp alloc failed

[<ffffff80091c38a0>] shrink_inactive_list+0x578/0x584
[<ffffff80091c42c4>] shrink_node_memcg.isra.71+0x6a4/0x734
[<ffffff80091c43c8>] shrink_node+0x74/0x1e0
[<ffffff80091c46f0>] try_to_free_pages+0x1bc/0x4c0
[<ffffff80091b3f10>] __alloc_pages_nodemask+0x5a8/0xd0c
[<ffffff8009983898>] get_migrate_page+0x2c/0x34
[<ffffff8009203c84>] migrate_pages+0xe0/0x890
[<ffffff8009983548>] aml_alloc_contig_migrate_range+0x98/0x150
[<ffffff8009983788>] cma_boost_work_func+0x188/0x26c
[<ffffff80090c53e8>] kthread+0x10c/0x120
[<ffffff80090836e0>] ret_from_fork+0x10/0x30

Change-Id: Iada340b48dcb2ba2ebf7570a15cec21553fd0d0a
Signed-off-by: Bang Peng <bang.peng@amlogic.com>
6 years agohdmitx: fix frac_rate flag changed when setting mode
Yi Zhou [Thu, 3 May 2018 07:22:27 +0000 (15:22 +0800)]
hdmitx: fix frac_rate flag changed when setting mode

PD#165548: hdmitx: fix frac_rate flag changed when setting mode

Change-Id: Ie6d96ec6c7f58d17f02e241aa0aa122c7db1c0a2
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
6 years agosd: open the macro of sd_uart func.
Nan Li [Thu, 3 May 2018 07:06:51 +0000 (15:06 +0800)]
sd: open the macro of sd_uart func.

PD#165593: open the macro of sd_uart func.

Change-Id: Icf7c4c2faf7297a1da0bda47b4c648bb49faac2a
Signed-off-by: Nan Li <nan.li@amlogic.com>
6 years agodts: g12a: add system led control for u200 [2/2]
bichao.zheng [Thu, 26 Apr 2018 06:03:40 +0000 (14:03 +0800)]
dts: g12a: add system led control for u200 [2/2]

PD#165027: gpio-led: g12a_s905d2_u200 add system led

1.Turns on green light when booting and resume.
2.Turns off green light,turns on red light when suspend and shutdown

Change-Id: I170b4745b320a5525fe128c025f2670103950922
Signed-off-by: bichao.zheng <bichao.zheng@amlogic.com>
6 years agovideo_keeper: fixed unexpected green screen when seek
Hui Zhang [Thu, 3 May 2018 09:53:49 +0000 (17:53 +0800)]
video_keeper: fixed unexpected green screen when seek

PD#162351:
when start to toggle frame, the disable video cmd is set,
and seek immediately, play will be quit before enable video,
so keep failed and cur_dispbuf is uncertain, it may cause
unexpected green screen after seek

Change-Id: I62526b3dda0256d7a9476d378a13baffb4785bd6
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
6 years agocodec_mm: fixed scatter cached bug
Hui Zhang [Thu, 3 May 2018 09:43:44 +0000 (17:43 +0800)]
codec_mm: fixed scatter cached bug

PD#159652: it may occur in tvp mode, no tvp may a lost less.
some free slot not insert free list after first alloc.
this leads to a lot of wasted memory

Change-Id: Ia62d7f661ee5bc1563cac0980da604e5d8356113
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
6 years agodv: maintain previous md when md parser error to fix red screen
zhilei.wu [Thu, 3 May 2018 08:21:45 +0000 (16:21 +0800)]
dv: maintain previous md when md parser error to fix red screen

PD#157814: dv: maintain previous md when md parser error to fix red screen

Change-Id: Ie1b0c556ae65d275fdbd074356f633485bc5217a
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
6 years agoemmc: modify emmc shutdown time too long
Nan Li [Fri, 20 Apr 2018 05:53:51 +0000 (13:53 +0800)]
emmc: modify emmc shutdown time too long

PD#164859: modify emmc shutdown time too long.
Kingston EMMC08G-T227 POWER_OFF_LONG_TIME is 0xff,
shutdown time is too long.
modify mmc_delay 0 when POWER_OFF_LONG_TIME is 0xff.

Change-Id: Ie85be335a77d9ec82a12158996c2c773d113c41f
Signed-off-by: Nan Li <nan.li@amlogic.com>
6 years agodv: below 720p was chaged to HDR10 mode in Dolby
zhilei.wu [Thu, 12 Apr 2018 07:17:15 +0000 (15:17 +0800)]
dv: below 720p was chaged to HDR10 mode in Dolby

PD#163239: dv: below 720p was changed to HDR10 in Dolby

Change-Id: Ie6cedbc03582e4b36b6d3a8c628bbf41001862c2
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
6 years agovpp: adjust dmc for every YUV444 frame
Brian Zhu [Wed, 2 May 2018 14:57:04 +0000 (22:57 +0800)]
vpp: adjust dmc for every YUV444 frame

PD#165450: vpp: adjust dmc for every YUV444 frame

Change-Id: I07da12c337b2ba5b8af3b9d5c17e6a9ba080f83e
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agoatv_demod: Modify atv io ctrl and memory alloc for atv crash.
nengwen.chen [Tue, 24 Apr 2018 08:51:22 +0000 (16:51 +0800)]
atv_demod: Modify atv io ctrl and memory alloc for atv crash.

PD#165008: Modify atv io ctrl and memory alloc for atv crash.

Change-Id: Ib6aa737ffad5d155022ad276ecf16ce2a7537138
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
6 years agodts: disable saradc feature for u221
Xingyu Chen [Wed, 2 May 2018 09:33:33 +0000 (17:33 +0800)]
dts: disable saradc feature for u221

PD#165535: dts: disable saradc feature for u221

Change-Id: I442690cfdae5c1964bcef3cfb7810421cfc77d01
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
6 years agopcie: disable pcie feature in u221.
Yue Wang [Wed, 2 May 2018 08:45:52 +0000 (16:45 +0800)]
pcie: disable pcie feature in u221.

PD#165524: pcie: disable pcie feature in u211.

Change-Id: I7fd8108a167a745622b0b4d0582ca25caf3f0286
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
6 years agoemmc: using rx delay to avoid invalid tuning
Yonghui Yu [Thu, 26 Apr 2018 15:10:57 +0000 (23:10 +0800)]
emmc: using rx delay to avoid invalid tuning

PD#165303: emmc: using rx delay to avoid invalid tuning

When emmc work at hs200@200Mhz, tuning result using fixed
adj mode may got a full window. The tuning result contains
invalid point. we have to adjust rx-delay to avoid it.

Change-Id: I33c5e234fe0f480180b0c9312641ba7a0a4e9cfb
Signed-off-by: Yonghui Yu <yonghui.yu@amlogic.com>
6 years agovdin: add force_color_range control[1/2]
yicheng shen [Thu, 26 Apr 2018 13:33:32 +0000 (21:33 +0800)]
vdin: add force_color_range control[1/2]

PD#165178: vdin: add force_color_range control[1/2]

Change-Id: I5f8a94ed0416867841bc8d1c744e176cced64fc6
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
6 years agodts: update q200/p241 buildroot dts
wenbiao zhang [Mon, 5 Feb 2018 02:16:30 +0000 (10:16 +0800)]
dts: update q200/p241 buildroot dts

PD#160248: dts: update q200/p241 buildroot dts

Change-Id: Ice6038373877ad2911e45a21888beed5a2f2f604
Signed-off-by: wenbiao zhang <wenbiao.zhang@amlogic.com>
6 years agoosd: fix buildroot compile error issue
pengcheng chen [Sat, 28 Apr 2018 03:11:56 +0000 (11:11 +0800)]
osd: fix buildroot compile error issue

PD#163270: osd: fix buildroot compile error issue

Change-Id: I4745a302bc78a714a3f1cba464f4cfac86309378
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agohdmitx: add drm flag in hdmitx driver
Yi Zhou [Fri, 27 Apr 2018 09:00:15 +0000 (17:00 +0800)]
hdmitx: add drm flag in hdmitx driver

PD#165128: hdmitx: add drm flag in hdmitx driver

Change-Id: I56e4dc7ecf88a7ec330665d9dcff9744eac3d701
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
6 years agohdmirx: fix no HDR effect issue when the box is playing HDR videos
yicheng shen [Tue, 24 Apr 2018 07:53:50 +0000 (15:53 +0800)]
hdmirx: fix no HDR effect issue when the box is playing HDR videos

PD#164596: hdmirx: fix no HDR effect issue when the box is playing HDR videos

The previous irq_handle logic may miss some interrupts with a low probability.

Change-Id: I6ff1d8d9e25abc5b36dd60b7a479cab7700458ee
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
6 years agodi: mark di debug info default
Dezhi Kong [Tue, 24 Apr 2018 08:38:29 +0000 (16:38 +0800)]
di: mark di debug info default

PD#164230: di; mark di debug info default

Change-Id: Ib09afe967167f5974540232870e9c19e6c065bfb
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
6 years agor311: lcd: modify lvds panel backlight pwm polarity
Evoke Zhang [Sat, 28 Apr 2018 02:10:27 +0000 (10:10 +0800)]
r311: lcd: modify lvds panel backlight pwm polarity

PD#163711: r311: modify lvds panel backlight pwm polarity

Change-Id: Iaa9211554957cb0bed0794561192cc9e960d378c
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agoldim: add iw7027 driver
Weiming Liu [Thu, 19 Apr 2018 02:16:52 +0000 (10:16 +0800)]
ldim: add iw7027 driver

PD#164701: ldim: add iw7027 driver

Change-Id: I75dd8e802b2eecf2d3d9d2f32935721f1a1bb285
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
6 years agosr: fix calc issue
Dezhi Kong [Fri, 27 Apr 2018 10:44:54 +0000 (18:44 +0800)]
sr: fix calc issue

PD#159391: sr: fix calc issue

Change-Id: I4c52efe4fb09fd3b2516e8e46cef793a19a4003d
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
6 years agodi: fix pre timeout issue for pq load
kele bai [Thu, 26 Apr 2018 13:08:08 +0000 (21:08 +0800)]
di: fix pre timeout issue for pq load

PD#165280: di: fix timeout issue for pq load

1) freerun pre clock
2) skip ctrl&enable regsiters loaded from pq db

Change-Id: If9a5c7923195b29f7cef0cb97aaa2cc4c2533ff2
Signed-off-by: kele bai <kele.bai@amlogic.com>
6 years agodts: q201: fix osd driver probe fail issue
pengcheng chen [Fri, 27 Apr 2018 09:05:29 +0000 (17:05 +0800)]
dts: q201: fix osd driver probe fail issue

PD#163270: osd: fix q201 osd driver probe fail issue

Change-Id: I41276e09367079bafdbfedaea41cf8484815ac33
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agoemmc: DS shift picked the wrong window middle point
Long Yu [Tue, 24 Apr 2018 05:51:22 +0000 (13:51 +0800)]
emmc: DS shift picked the wrong window middle point

PD#165086: emmc: DS shift picked the wrong window middle point

Change-Id: If96b854b4e9669426351ba89d36e2d2a7dcf6be4
Signed-off-by: Long Yu <long.yu@amlogic.com>
6 years agolcd: correct CONFIG_AMLOGIC_UNIFYKEY for lcd unifykey usage [5/5]
Evoke Zhang [Thu, 26 Apr 2018 01:27:16 +0000 (09:27 +0800)]
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>
6 years agounifykey: add helper API so we can call unifykey APIs from drivers [4/5]
jiamin ma [Thu, 26 Apr 2018 06:59:00 +0000 (14:59 +0800)]
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>
6 years agoosd: add osd support hwc interface
pengcheng chen [Mon, 26 Feb 2018 06:39:34 +0000 (14:39 +0800)]
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>
6 years agovpp: fix vskip line calc issue
Dezhi Kong [Wed, 25 Apr 2018 11:29:38 +0000 (19:29 +0800)]
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>
6 years agodi: fix hardlock issue
kele bai [Mon, 23 Apr 2018 07:10:47 +0000 (15:10 +0800)]
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>
6 years agodts: Enable dm-verity on system and vendor [2/3]
Matthew Shyu [Mon, 16 Apr 2018 05:53:03 +0000 (13:53 +0800)]
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>
6 years agokernel: add s805 package define
Hui Zhang [Wed, 18 Apr 2018 07:54:50 +0000 (15:54 +0800)]
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>
6 years agomedia: fix crash in viu_set_dcu
rongrong zhou [Fri, 13 Apr 2018 06:46:33 +0000 (14:46 +0800)]
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>
6 years agodi: fix if2 disable issue
kele bai [Tue, 24 Apr 2018 05:21:46 +0000 (13:21 +0800)]
di: fix if2 disable issue

PD#164232: di: fix if2 disable issue

Change-Id: I0976e22738045c97e8ff1c9bd13d4e1b301b6eac
Signed-off-by: kele bai <kele.bai@amlogic.com>
6 years agolcd: optimize mipi clk sequence for LP mode
Evoke Zhang [Thu, 19 Apr 2018 09:51:53 +0000 (17:51 +0800)]
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>
6 years agoaudio: meson: fix spdif buffer size and optimizing copy
Xing Wang [Mon, 23 Apr 2018 10:55:34 +0000 (18:55 +0800)]
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>
6 years agodts: reduce r311 720p ion mem to 32m
Lei Qian [Wed, 25 Apr 2018 09:38:07 +0000 (17:38 +0800)]
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>
6 years agoethernet: disable clkout ephy
Zhuo Wang [Wed, 25 Apr 2018 06:57:07 +0000 (14:57 +0800)]
ethernet: disable clkout ephy

PD#165111: disable ephy clk_out

Change-Id: Icecff2b903a0ae0c91cabefd15803aaa74948e74
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>
6 years agodts: txlx add multi dtb function [1/7]
Lei Qian [Tue, 24 Apr 2018 12:57:49 +0000 (20:57 +0800)]
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>
6 years agohdmirx: optimize audio channel map
Hang Cheng [Mon, 23 Apr 2018 08:32:45 +0000 (16:32 +0800)]
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>
6 years agospicc: change txlx dts to use amlogic driver.
Sunny Luo [Wed, 25 Apr 2018 03:26:03 +0000 (11:26 +0800)]
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>
6 years agodefconfig: update buildcheck defconfig
Ao Xu [Tue, 24 Apr 2018 12:44:18 +0000 (20:44 +0800)]
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>
6 years agoaudio: auge: add spdifin sample rate and audio type event
Xing Wang [Tue, 24 Apr 2018 08:21:44 +0000 (16:21 +0800)]
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>
6 years agoMerge branch 'android-4.9' into amlogic-4.9-dev
Victor Wan [Tue, 24 Apr 2018 09:43:19 +0000 (17:43 +0800)]
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

6 years agodts: add g12a x2 u211 buildroot config
wenbiao zhang [Thu, 19 Apr 2018 02:49:16 +0000 (10:49 +0800)]
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>
6 years agoatv_demod: Modify atv sys for search and optimize code.
nengwen.chen [Fri, 20 Apr 2018 14:52:33 +0000 (22:52 +0800)]
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>
6 years agodts: fine-tune U211 OPP
Qiufang Dai [Tue, 24 Apr 2018 06:48:45 +0000 (14:48 +0800)]
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>
6 years agodts: txlx add unify key for panel ini param
wenbiao zhang [Fri, 20 Apr 2018 08:26:10 +0000 (16:26 +0800)]
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>
6 years agohdmitx: fix no scdc in 4k60 under some special tv
Yi Zhou [Wed, 18 Apr 2018 11:09:42 +0000 (19:09 +0800)]
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>
6 years agohdmirx: add pddq selection interface when suspend/resume
Hang Cheng [Fri, 13 Apr 2018 08:19:53 +0000 (16:19 +0800)]
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>
6 years agoethernet: chage u200 default as internal phy
Zhuo Wang [Sun, 8 Apr 2018 07:52:23 +0000 (15:52 +0800)]
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>
6 years agodts: add dts for p212 720p.[1/2]
Luan Yuan [Fri, 13 Apr 2018 03:33:17 +0000 (11:33 +0800)]
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>
6 years agoamvecm: add overscan iocontrol
wenfeng.guo [Wed, 21 Mar 2018 02:44:00 +0000 (10:44 +0800)]
amvecm: add overscan iocontrol

PD#162552: amvecm: add overscan iocontrol

Change-Id: I1aa4b2469e7360029a0c647a0a1e46c73c71e7cd
Signed-off-by: wenfeng.guo <wenfeng.guo@amlogic.com>
6 years agohdmitx: fix HDR compatibility
Kaifu Hu [Mon, 23 Apr 2018 06:29:06 +0000 (14:29 +0800)]
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>
6 years agodts: p230 add dvb module
Cheng Tong [Tue, 3 Apr 2018 08:15:59 +0000 (16:15 +0800)]
dts: p230 add dvb module

PD#163384: dts: p230 add dvb module

Change-Id: I0345718b0469218cb88a1f65aabdfe26a81f898f
Signed-off-by: Cheng Tong <cheng.tong@amlogic.com>
6 years agodvb: fix can't set frontend and get DTV_TS_INPUT
Cheng Tong [Mon, 9 Apr 2018 11:02:28 +0000 (19:02 +0800)]
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>
6 years agovpp: merge the adapter pic mode function from 3.14
Brian Zhu [Tue, 17 Apr 2018 08:03:40 +0000 (16:03 +0800)]
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>
6 years agoamvideo: add video_global_output sysfs control interface
jintao xu [Mon, 9 Apr 2018 03:20:20 +0000 (11:20 +0800)]
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>
6 years agodts: enable amvecm modules for r311 chips
Bencheng Jing [Thu, 19 Apr 2018 03:43:26 +0000 (11:43 +0800)]
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>
6 years agohdmitx: add sspll for hdmi modes
Zongdong Jiao [Mon, 19 Mar 2018 11:47:20 +0000 (19:47 +0800)]
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>
6 years agodrm_vpu: logo memory manage in drm_vpu
pengcheng chen [Thu, 19 Apr 2018 08:53:20 +0000 (16:53 +0800)]
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>
6 years agoosd: optimize osd dts
pengcheng chen [Thu, 19 Apr 2018 06:59:39 +0000 (14:59 +0800)]
osd: optimize osd dts

PD#164824: osd: optimize osd dts

Change-Id: I7cc372a4124b136bf999a73888ba6fd5671e9b5f
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agodvb: add dvb module dts & modify demux define
Peng Chuangcheng [Mon, 12 Mar 2018 08:51:11 +0000 (16:51 +0800)]
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>
6 years agodrm: Add support for ABGR and XBGR for scanout
Yalong Liu [Fri, 20 Apr 2018 01:27:09 +0000 (09:27 +0800)]
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>
6 years agoa113d: dts: add axg_s400emmc_512m.dts configuration
yuehu mi [Fri, 20 Apr 2018 02:10:50 +0000 (10:10 +0800)]
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>
6 years agoatv_demod: Modify atv entry and leave mode status.
nengwen.chen [Thu, 19 Apr 2018 12:55:43 +0000 (20:55 +0800)]
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>
6 years agoaudio: auge: fix pdm to 133m directly, not using dividor
Xing Wang [Wed, 18 Apr 2018 11:29:52 +0000 (19:29 +0800)]
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>
6 years agoPM_sleep: add alarm wakeup function.
Hong Guo [Thu, 12 Apr 2018 03:08:34 +0000 (11:08 +0800)]
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>
6 years agoclk: fix gp0_pll typo
Qiufang Dai [Thu, 19 Apr 2018 09:40:44 +0000 (17:40 +0800)]
clk: fix gp0_pll typo

PD#164749: fix gp0_pll typo

Change-Id: Id50fc1fbc0f0af4a6d2364271317b6b75d963a34
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
6 years agotrace: add meson trace func [2/2]
binqi.zhang [Fri, 13 Apr 2018 06:08:14 +0000 (14:08 +0800)]
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>
6 years agoBT: introduce power_down_disable property in DT
Kuibao Zhang [Fri, 13 Apr 2018 11:53:38 +0000 (19:53 +0800)]
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>
6 years agoamvecm: close mtx_only
Bencheng Jing [Wed, 28 Mar 2018 13:02:57 +0000 (21:02 +0800)]
amvecm: close mtx_only

PD#163270: amvecm: close mtx_only

Change-Id: Id6c92cba47d41bc7ef271dc3caa24b5bf2208ac7
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
6 years agoaudio: auge: support raw output[2/2]
Lianlian Zhu [Wed, 18 Apr 2018 08:11:03 +0000 (16:11 +0800)]
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>
6 years agoosd: fix osd suspend fail issue
pengcheng chen [Wed, 18 Apr 2018 07:53:37 +0000 (15:53 +0800)]
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>
6 years agoemmc: optimize sd & wifi TDMA.
Nan Li [Wed, 18 Apr 2018 09:04:15 +0000 (17:04 +0800)]
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>
6 years agoatv_demod: Add atv demod
nengwen.chen [Tue, 17 Apr 2018 14:01:19 +0000 (22:01 +0800)]
atv_demod: Add atv demod

PD#163853: Add atv demod

Change-Id: Ia3a7f51927df92025a67923e5acce2f0f07e674c
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
6 years agoemmc: hs200 200M on g12a [2/2]
Ruixuan Li [Wed, 18 Apr 2018 03:04:04 +0000 (11:04 +0800)]
emmc: hs200 200M on g12a [2/2]

PD#160968: emmc: hs200 200M on g12a

Change-Id: Iabfa18880dcf356f92be4319b948b0f132fc4704
Signed-off-by: Ruixuan Li <ruixuan.li@amlogic.com>
6 years agoosd: fix osd rdma recovery reg
pengcheng chen [Wed, 18 Apr 2018 01:44:17 +0000 (09:44 +0800)]
osd: fix osd rdma recovery reg

PD#160942: osd: fix osd rdma recovery reg
           1. modify VIU_OSD1_BLK0_CFG_W0 init value in update_color_mode
           2. add DOLBY_CORE2A_SWAP_CTRL1&CTRL2 in recovery table

Change-Id: I04c569bc4919e8adc5bd17d376ee65d084e49082
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agoemmc: add dtb backup machinisim
Ruixuan Li [Mon, 16 Apr 2018 06:31:43 +0000 (14:31 +0800)]
emmc: add dtb backup machinisim

PD#162119: emmc: change memory alloction mode

Change-Id: I108557d914d42158820d5cba00e2fc60e3d38451
Signed-off-by: Ruixuan Li <ruixuan.li@amlogic.com>
6 years agogpio-led: add system led
bichao.zheng [Thu, 12 Apr 2018 02:56:45 +0000 (10:56 +0800)]
gpio-led: add system led

PD#163340: gpio-led: add system led

1.Add CONFIG_LEDS_TRIGGER_CPU=y in meson64_defconfig
2.Turns on green light when booting and resume.
3.Turns off green light,turns on red light when suspend and shutdown

Change-Id: I237745e87737682364ab946abd2253025ac89984
Signed-off-by: bichao.zheng <bichao.zheng@amlogic.com>
6 years agohdmitx: update hdmitx pll parameter
Yi Zhou [Mon, 9 Apr 2018 12:21:46 +0000 (20:21 +0800)]
hdmitx: update hdmitx pll parameter

PD#163960: hdmitx: update hdmitx pll parameter

Change-Id: I4a770a976586d42b510c128586a5239ade54a7c0
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
6 years agodefect: fix section mismatch warning
jiamin ma [Wed, 18 Apr 2018 00:37:52 +0000 (08:37 +0800)]
defect: fix section mismatch warning

PD#164617: section mismatch warning

When a variable or function with __initxxx anotation refers a
variable or function without it, there will be a section mismatch
warning.
In such case, memory belong to the latter will be released after
kernel booting up, if the former still refers the latter, strange
things happens
So we have to use __initxxx anotations correctly or add __refxxx
anotations to teach modpost that it is okay and save to use __init
anotations in this way.

Change-Id: Ic97dac8998b2a01c82dd7a3bae12fa9c7a113bc4
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
6 years agoamlvideo: fix H264/VP9 adaptiveSkipBack cts errors
kunpeng.tang [Fri, 13 Apr 2018 04:18:20 +0000 (12:18 +0800)]
amlvideo: fix H264/VP9 adaptiveSkipBack cts errors

PD#163463: fix H264/VP9 adaptiveSkipBack cts errors

1.android.media.cts.AdaptivePlaybackTest#testH264_adaptiveSkipBack
2.android.media.cts.AdaptivePlaybackTest#testVP9_adaptiveSkipBack

Change-Id: Ib5f514ceb9a312b2bc608fa8192208dc49be74c9
Signed-off-by: kunpeng.tang <kunpeng.tang@amlogic.com>
6 years agowifi: add fw path to support mt7668 wifi fw load
Rongjun Chen [Thu, 15 Mar 2018 08:02:46 +0000 (16:02 +0800)]
wifi: add fw path to support mt7668 wifi fw load

PD# 161514

Change-Id: I5e067f2fb6503f1f2b537a6b36fb69b0e8f30b87
Signed-off-by: Rongjun Chen <rongjun.chen@amlogic.com>
6 years agomm: optimize for lowmemory killer
tao zeng [Tue, 17 Apr 2018 07:29:50 +0000 (15:29 +0800)]
mm: optimize for lowmemory killer

PD#164558: mm: optimize for lowmemory killer

1. Remove change for LRU;
2. Only subtract cma file caches when task is not kswapd.

Change-Id: I09ad86fc9754c1136cd976d656a023dee6cbe2eb
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
6 years agopinctrl: axg: fix w/r error for partial ao pins and add TESTN support
Xingyu Chen [Sat, 14 Apr 2018 02:28:40 +0000 (10:28 +0800)]
pinctrl: axg: fix w/r error for partial ao pins and add TESTN support

PD#164428: pinctrl: axg: fix w/r error for partial ao pins and add TESTN support

it returns error when operating the pins include the GPIOAO_10 - GPIOAO_13 which
are used as gpio.

Change-Id: I1337ab4d59110b87bd6b685e4ce7481cee02be46
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
6 years agosd: add port base addr in the matchdata.
Nan Li [Tue, 17 Apr 2018 11:51:22 +0000 (19:51 +0800)]
sd: add port base addr in the matchdata.

PD#163048: add port base addr in the matchdata,
for sd & sdio TDMA check.

Change-Id: Ib7432ffbf26c749d8799bfa5f60eaaff7735539d
Signed-off-by: Nan Li <nan.li@amlogic.com>
6 years agodts: optimize txlx_t962x_r311_720p memory usage[2/3]
Lei Qian [Tue, 17 Apr 2018 07:08:33 +0000 (15:08 +0800)]
dts: optimize txlx_t962x_r311_720p memory usage[2/3]

PD# 164558: dts: decrease memory usage

Change-Id: I0822e43ba8ecab264963d12a14fe102686d4ed70
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
6 years agosdemmc/sdio: g12a revA/B compatible
Nan Li [Tue, 17 Apr 2018 08:18:11 +0000 (16:18 +0800)]
sdemmc/sdio: g12a revA/B compatible

PD#163379: sdemmc: g12a revA/B compatible

Change-Id: I5edaf1e490de73d160b25d5976a71edda50038d6
Signed-off-by: Nan Li <nan.li@amlogic.com>
6 years agosd: add sd & sdio wifi TDMA on portB.
Nan Li [Tue, 3 Apr 2018 11:16:06 +0000 (19:16 +0800)]
sd: add sd & sdio wifi TDMA on portB.

PD#163048: add sd & sdio wifi time division multiple access
on portB.

Change-Id: Ie38a56daf03d5066af160575a322812ab5ffe5be
Signed-off-by: Nan Li <nan.li@amlogic.com>
6 years agohdmitx: config DDC to 100kHz
Kaifu Hu [Tue, 17 Apr 2018 03:06:47 +0000 (11:06 +0800)]
hdmitx: config DDC to 100kHz

PD#164530: hdmitx: config DDC to 100kHz

Config DDC to 100kHz for HDMI I2C.

Change-Id: I9b450bb8f9b727a3f468f55138aa64596abe92ef
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
6 years agocec: support 4 hdmi ports in board R311
wei wang [Mon, 16 Apr 2018 09:15:59 +0000 (17:15 +0800)]
cec: support 4 hdmi ports in board R311

PD#162758: modify dts to support hdmi4

Change-Id: I2216bc2c1f5a6dabd6890025075f7b40ad082799
Signed-off-by: wei wang <wei.wang@amlogic.com>
6 years agoatv_demod: Add atv demod
nengwen.chen [Sat, 14 Apr 2018 12:12:25 +0000 (20:12 +0800)]
atv_demod: Add atv demod

PD#163853: Add atv demod

Change-Id: I6e1fe3b50cccc2d6ee734ca77cf8593b95f47671
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
6 years agoemmc: optimized emmc timing parameter configuration method
Long Yu [Fri, 23 Mar 2018 09:50:00 +0000 (17:50 +0800)]
emmc: optimized emmc timing parameter configuration method

PD#162872: emmc: Optimizing eMMC/sd/sdio timing parameter configuration method

Change-Id: I5e9991a42d6f262a58e2b2c5635eadc690e39d4d
Signed-off-by: Long Yu <long.yu@amlogic.com>
6 years agohdmirx: revert audio fifo reset alternatively
Hang Cheng [Thu, 12 Apr 2018 02:59:26 +0000 (10:59 +0800)]
hdmirx: revert audio fifo reset alternatively

PD#154135: hdmirx: revert audio fifo reset alternatively

MIK-8267R device outputs 4 channel audio of pcm, which
txlx doesn't support. So revert this workaround and
avoid side effect.

Change-Id: Id969f27ed44567c9bcb6bfd8e77d8ff33d70b0f6
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
6 years agodrm: add drm buildroot dts for g12a
liangzhuo.xie [Fri, 13 Apr 2018 09:38:44 +0000 (17:38 +0800)]
drm: add drm buildroot dts for g12a

PD#162577: add drm buildroot dts for g12a

1. g12a default buildroot dts use g12a_s905d2_u200_buildroot.dts
2. g12a drm buildroot dts use g12a_s905d2_u200_drm_buildroot.dts

Change-Id: I08616ab1ce38b8db24ca78c1133294fff8e82ff8
Signed-off-by: liangzhuo.xie <liangzhuo.xie@amlogic.com>
6 years agousb: set bit18 of GUCTL1.[1/1]
Yue Wang [Thu, 12 Apr 2018 07:35:00 +0000 (15:35 +0800)]
usb: set bit18 of GUCTL1.[1/1]

PD#164190: usb: set bit18 of GUCTL1.[1/1]

for improve bulk transfer performance.

Change-Id: I986ddea677a9a31a6613cf00936b4c4e79449c1e
Signed-off-by: Yue Wang <yue.wang@amlogic.com>