platform/kernel/linux-amlogic.git
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>
6 years agoaudio: add an interface for HDMI out disable [1/2]
qi.yuan [Fri, 20 Apr 2018 11:08:29 +0000 (19:08 +0800)]
audio: add an interface for HDMI out disable [1/2]

PD#165284: add an interface control for audio hdmi out disable

1)add a gpio control switch for ARCIN and SPDIFIN
2)clean global value in audio driver
3)rewrite HDMITX audio control interface
4)remove HDMITX user space control SYSFS
  Forbidden user space control of HDMITX audio, must via AUDIO

Change-Id: Ifc69c8553df903631d80f414771d91966045f85f
Signed-off-by: qi.yuan <qi.yuan@amlogic.com>
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
6 years agoir: fix ir memory overflow issue
jiamin ma [Wed, 9 May 2018 00:44:20 +0000 (08:44 +0800)]
ir: fix ir memory overflow issue

PD#164774: kernel panic after mtk_cfg80211_set_power_mgmt

two possible overflow cases:
1. dev->debug_current + len == dev->debug_buffer_size
2. len > dev->debug_buffer_size

for the first case(currently triggered case)
  the last byte of string pointed to by fmt, aka.'\0', will
overwrite the first byte of memory pointed to by header(in
function __register_sysctl_table), which is just the LSB of
ipv4_table[]'s base address. Leading to "Unable to handle
kernel paging request at virtual address xxxx" panic

for the second case
  a bunch of memory pointed to by header(in function
__register_sysctl_table) will be overwritten

Change-Id: I6bc42308323b7ffb52fe4d1fa9d22742a31e8b1f
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
6 years agoworkqueue: add more debug when null pwq
jianxin.pan [Mon, 7 May 2018 05:51:20 +0000 (13:51 +0800)]
workqueue: add more debug when null pwq

PD#158184: print work and worker function when null pwq

Change-Id: I552c6585935e47abfb9593f4a2d2f1588906aaf8
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
6 years agotvafe: reset vdin asynchronous fifo in tvafe reset
Nian Jing [Wed, 9 May 2018 08:19:02 +0000 (16:19 +0800)]
tvafe: reset vdin asynchronous fifo in tvafe reset

PD#165571: fix greenscreen on repeatly power on/off

Change-Id: Iefa412c2c4f86ba525bfdebbf395d38d34b77a30
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
6 years agodebug: add watchdog trigger in sysrq
jianxin.pan [Mon, 7 May 2018 06:25:48 +0000 (14:25 +0800)]
debug: add watchdog trigger in sysrq

PD#165796: watchdog trigger to debug wdt related behavior
"echo x > /proc/sysrq-trigger" to trigger watchdog

Change-Id: Iddd92cd64c9a7ccdf452f23706b396eaf50ae448
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
6 years agodebug: hard lockup detect
jianxin.pan [Sat, 20 Jan 2018 07:24:50 +0000 (15:24 +0800)]
debug: hard lockup detect

PD#165796: detect dead lock in isr and dead lock with irq disabled

Change-Id: I0aace28fd29e5aeb8c514f6ab1700ac1248f836c
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
6 years agohdmitx: remove setting BT2020 in 4k color deptch mode
Yi Zhou [Wed, 9 May 2018 07:48:20 +0000 (15:48 +0800)]
hdmitx: remove setting BT2020 in 4k color deptch mode

PD#162864: hdmitx: remove setting BT2020 in 4k color deptch mode

some TVs flash when changing colormetry
such as bt2020 to bt709, or bt709 to bt601

Change-Id: I360dfc1ea3299d4ec75903d435530425afb4f546
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
6 years agohdmirx: add new atmos edid handle method
yicheng shen [Mon, 23 Apr 2018 02:50:25 +0000 (10:50 +0800)]
hdmirx: add new atmos edid handle method

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

Change-Id: I4f6fa58ebfe106cedb9f814c92657f08dc6d2aaf
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
6 years agoddr: fix wrong bandwidth result on g12 platform
tao zeng [Thu, 26 Apr 2018 03:14:25 +0000 (11:14 +0800)]
ddr: fix wrong bandwidth result on g12 platform

PD#161475: ddr: fix wrong bandwidth result on g12 platform

Correct function name get_ddr_freq to get_dmc_freq in order
to avoid misunderstanding.

Change-Id: I9000970f100394cf63468149d431d05ece2aaa1d
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
6 years agoarm64: dts: g12a: dvfs voltage duty modify.
Hong Guo [Wed, 25 Apr 2018 06:06:56 +0000 (14:06 +0800)]
arm64: dts: g12a: dvfs voltage duty modify.

PD#165143: cpufreq: dvfs voltage duty modify for 0.731mv.

Change-Id: I85370ea18b68eb3b37636629a9e0da8b26491f83
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
6 years agopwm: optimizing pwm duty calculation
Jian Hu [Fri, 27 Apr 2018 09:16:44 +0000 (17:16 +0800)]
pwm: optimizing pwm duty calculation

PD#165143: pwm: optimizing pwm duty calculation

1.Fix duty equal 0% and 100% duty count incorrect
2.Change period unit to ps to increase accuracy

Change-Id: Ied478f21ac4b4f9f3d1508d69dfbcdbb9ca4e732
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
6 years agosd: add sd_uart to g12a.
Nan Li [Mon, 7 May 2018 09:11:24 +0000 (17:11 +0800)]
sd: add sd_uart to g12a.

PD#165584: add sd_uart on g12a.
test on u211.

Change-Id: Ia8e5cde6c60b3019329324445593d82cf2543afe
Signed-off-by: Nan Li <nan.li@amlogic.com>
6 years agohdmitx: set frac_rate_policy as 1.[1/2]
Zongdong Jiao [Tue, 8 May 2018 02:55:28 +0000 (10:55 +0800)]
hdmitx: set frac_rate_policy as 1.[1/2]

PD#165862: hdmitx: set frac_rate_policy as 1
For most video/films or NTSC, they are 23.976/29.97/59.94fps, so
hdmitx should adjust set frac_rate_policy as 1.

Change-Id: I9671935c5121634d1af6879d8ccd91eb4f92c9cb
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
6 years agodtv_mode: R311 add tuner mxl661
manhao liang [Tue, 8 May 2018 07:22:01 +0000 (15:22 +0800)]
dtv_mode: R311 add tuner mxl661

PD#165368: dtv_mode: R311 add tuner mxl661

Change-Id: Ifbc3ffece7d30d29e295f3e70c37d9d25ee0ac69
Signed-off-by: manhao liang <manhao.liang@amlogic.com>
6 years agosd: sd & wifi TDMA crash.
Nan Li [Fri, 20 Apr 2018 10:10:33 +0000 (18:10 +0800)]
sd: sd & wifi TDMA crash.

PD#164804: when system run with SD card in,
system will be crashed. rm post_dma() crash error.

Change-Id: I99c10fcbf151a4c349bf6b0584056cd9080349e8
Signed-off-by: Nan Li <nan.li@amlogic.com>
6 years agoethernet: add delay after reset phy
Zhuo Wang [Tue, 8 May 2018 07:22:37 +0000 (15:22 +0800)]
ethernet: add delay after reset phy

PD#165891: can't readout phyid when bootup

Change-Id: I775f4fe9b8c4b2e76475f239e75539ecbe2bf843
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>
6 years agovpp: use correct width to select the min skip ratio
Brian Zhu [Fri, 4 May 2018 16:11:22 +0000 (00:11 +0800)]
vpp: use correct width to select the min skip ratio

PD#165601: vpp: use correct width to select the min skip ratio

Change-Id: Idcf9ff250c4d6af089dd2b8a25285b81c849a78a
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agoatv_demod: Modify atv demod to adapter tuner
nengwen.chen [Fri, 4 May 2018 12:49:01 +0000 (20:49 +0800)]
atv_demod: Modify atv demod to adapter tuner

PD#165368: atv_demod: Modify atv demod to adapter tuner

Change-Id: Ifa69db980dfe9519c80932d22dffbb1fb6600fc9
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
6 years agomtd: add new slc nand type
Yi Zeng [Thu, 26 Apr 2018 05:43:12 +0000 (13:43 +0800)]
mtd: add new slc nand type

PD#165148: mtd: add new slc nand type

add the MFR id, flash id and factory bad block
management of Dosilicon & ATO into our code.

Change-Id: If00e026460c6c3f5d354832bef9ba95a0733fdf3
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
6 years agovideo_keeper: fixed greenscreen bug
Hui Zhang [Thu, 3 May 2018 12:47:49 +0000 (20:47 +0800)]
video_keeper: fixed greenscreen bug

PD#155455: fixed green screen bug

Change-Id: Idbb2ae30b1bd88d1782ff47b485e0cbf476641d0
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
6 years agodts: audio: disable dac for u211
Xing Wang [Thu, 3 May 2018 15:28:50 +0000 (23:28 +0800)]
dts: audio: disable dac for u211

PD#165585: dts: audio: disable dac for u211

Change-Id: I290cc1445e30c5b7de2003f579751d0cf6ce291f
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
6 years agolcd_extern: add mipi default driver [2/2]
Weiming Liu [Wed, 11 Apr 2018 02:33:23 +0000 (10:33 +0800)]
lcd_extern: add mipi default driver [2/2]

PD#164036: lcd_extern: add mipi default driver

Change-Id: Id120299c2434a3cce9b154064cd0c7e5dd0bbe8e
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
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>