Commit Graph

648646 Commits

Author SHA1 Message Date
Qiufang Dai
0a2c1914a1 cpuversion: add SoC rev api [1/2]
PD#SWPL-4582

Problem:
Need api to distinguish G12B revB

Solution:
Add rev A/B/C api

Verify:
W400

Change-Id: I5cf82fcfc513f621513914cf83d18fe5c5ec081d
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2019-05-07 16:00:39 +09:00
yuehu mi
84cc7045b0 usb: remove usbphy reset 500ms wait [1/1]
PD#SWPL-4949

Problem:
kernel slow startup

Solution:
remove usbphy reset 500ms wait

Verify:
marconi platform insert U disk, power on boot verify OK

Change-Id: Ieb01e59ad428f98c3df303c7b3bee28397970c74
Signed-off-by: yuehu mi <yuehu.mi@amlogic.com>
2019-05-07 16:00:39 +09:00
Jian Cao
b4f41bc724 osd: osd: screen blank after boot logo [1/1]
PD#172587

Problem:
screen blank after boot logo

Solution:
correct default display information

Verify:
verified on tl1 ref board

Change-Id: I94237b5241eacee6965bfe4ea0426bb8e9f494f1
Signed-off-by: Jian Cao <jian.cao@amlogic.com>

osd: tl1 hold line fix needn't shift workaround [1/1]

PD#172587

Problem:
tl1 hold line fix needn't shift workaround.

Solution:
remove shift workaround int tl1

Verify:
verified by x301

Change-Id: I96d99758ba6f93622c34a8e69c4a3f769fdfad49
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>

usb: bringup usb for tl1 [1/1]

PD#172587

Problem:
bringup usb for tl1

Solution:
bringup usb for tl1.
disable usb device sof interrupt for tl1.

Verify:
verify on tl1 skt.

Change-Id: Ifbcd3b406145ac39709ff2df795544086277f00e
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>

Conflicts:
	arch/arm/boot/dts/amlogic/mesontl1.dtsi
2019-05-07 16:00:39 +09:00
Shunzhou Jiang
96c1c820ad mailbox: mailbox: add chip performance info read from efuse [2/2]
PD#SWPL-4035

Problem:
cpu driver need read efuse data

Solution:
add interface to read data

Verify:
g12a_skt

Change-Id: Ia5d74c3fa057d06426b4277652e508714400a30f
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
2019-05-07 16:00:39 +09:00
Hong Guo
11b7675ded cpufreq: add more syspll freq info [1/1]
PD#SWPL-4035

Problem:
add more syspll freq info.

Solution:
add more syspll freq info.

Verify:
g12a_u200, verify pass

Change-Id: I3e2a587f5ebaa20126e6ad5c37bd9d2730a75125
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
2019-05-07 16:00:39 +09:00
Jian Cao
885745176c gdc: reset alloc flag when free dma buffer [2/2]
PD#SWPL-4354

Problem:
alloc flag is not correct when free dma buffer

Solution:
reset alloc flag when free dma buffer

Verify:
test pass on g12a-u200

Change-Id: Idfc0be5b394d18799232f6239b3f6c6df9181ce0
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
2019-05-07 16:00:39 +09:00
Jian Cao
87d35481d5 ge2d: reset alloc flag when free dma buffer [1/2]
PD#SWPL-4354

Problem:
alloc flag is not correct when free dma buffer

Solution:
reset alloc flag when free dma buffer

Verify:
test pass on g12a-u200

Change-Id: I4aea27f38ebda72cfe77183423600c918b836d7c
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
2019-05-07 16:00:39 +09:00
Brian Zhu
99b8e6b4bc vpp: force vd2 using preblend when playing mvc [1/1]
PD#SWPL-3381

Problem:
vd2 used postblend as default after g12a chip

Solution:
force vd2 using preblend when playing mvc

Verify:
Locally on u212

Change-Id: Ia7fab8ad70ed1e58b7ade241828afab288b94bec
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2019-05-07 16:00:39 +09:00
Hanjie Lin
07f36ac69f perf_event: aml pmu interrupts routing on g12b [1/1]
PD#SWPL-3088

Problem:
g12b big-little cluster is different from other SoC with pmu
interrupts and registers.
software modifications must adapt to the difference.

Solution:
modify

Verify:
u200 w400

Change-Id: If9217c1025dff5c17d51790f8c216e31b7d6532b
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2019-05-07 16:00:39 +09:00
Hanjie Lin
1cf76d0f25 defconfig: arm: code score is low by Antutu benchmark [1/1]
PD#SWPL-3704

Problem:
32bit code score is low by Antutu benchmark.

PD#SWPL-3704

Solution:
enable CONFIG_SCHED_WALT CONFIG_CGROUP_SCHEDTUNE CONFIG_SCHED_TUNE
referenced by arm64

Verify:
w400

Change-Id: I6f461020b0fb0e42be94f1c66f5c38defb2c6ea1
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
2019-05-07 16:00:39 +09:00
Yi Zhou
39c9976d3b dv: close afbc2 when playing sources with unnecessary el [1/1]
PD#SWPL-915

Problem:
DOLBY only sets the enhancement for the first frame ->
Vd sets cur_dispubf2 according to enhance ->
codec_mm keeps the last frame according to cur_dispbuf2,
so it fails -> AFBC2 access to the released content causes the trigger.

Solution:
close afbc2

Verify:
r321

Change-Id: I03c431a6ea11b8aabf97b1f0b21f717024be2f62
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2019-05-07 16:00:39 +09:00
Pengcheng Chen
0fd7a7ac82 osd: fix osd_reverse casued afbc decode error [1/1]
PD#SWPL-4335

Problem:
osd_reverse casued afbc decode error

Solution:
add afbc prefect reverse when osd_reverse

Verify:
verify by tl1

Change-Id: I11730121e62935683480f42db7c43365bc91bf31
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2019-05-07 16:00:39 +09:00
Jiamin Ma
c85ded4f0e Kconfig: fix errorly select meson8b for ARMv8 AARCH32 [1/1]
PD#SWPL-4320

Problem:
The meson8b and arm64_a32 are both selected in Kconfig,
which is quite misleading

Solution:
Disable meson8b when arm64_a32 is selected

Verify:
Locally passed for Ampere

Change-Id: I93f55239ea90bf8cf6b96e108b6fd4a239de32b4
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2019-05-07 16:00:39 +09:00
Pengcheng Chen
d93c1770d3 gdc: add gdc dma_buf input/output support [2/2]
PD#SWPL-4036

Problem:
gdc don't support export dma_buf

Solution:
add gdc dma_buf input/output support

Verify:
test pass on w400

Change-Id: I67a60ede01e5c01630a00fbae2821430a870c2b8
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>

Conflicts:
	MAINTAINERS
2019-05-07 16:00:39 +09:00
Pengcheng Chen
f920effc80 ge2d: add ge2d dma_buf support [1/2]
PD#SWPL-4036

Problem:
don't support dma_buf

Solution:
add ge2d dma_buf support

Verify:
test pass on w400

Change-Id: I1277d04fb30753e579d5edc5f46f2406dc27217a
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2019-05-07 16:00:39 +09:00
Bichao Zheng
559ac2c022 gpio_led: g12a: give up using led-trigger cpu0 [1/1]
PD#SWPL-4876

Problem:
32bit will operate led-trigger cpu0 in cpu idle enter/exit causing
system led flashing.

Solution:
give up using led-trigger cpu0.

Verify:
g12a_u211 g12a_u212

Change-Id: I106a4fe0e35923919f5bbc34113fa73a4ca28577
Signed-off-by: Bichao Zheng <bichao.zheng@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>

Conflicts:
	arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot.dts
2019-05-07 16:00:39 +09:00
Jian Hu
46470310d8 clk: g12a: add bt656 clock [1/1]
PD#SWPL-3359

Problem:
the bt656 clocks were missing

Solution:
1.add bt656 clocks
2.fix several errors for media clocks

Verify:
test passed on u200

Change-Id: Iff69e790c78335930d6b2ea54f7544aca464e1fb
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2019-05-07 16:00:39 +09:00
Xuhua Zhang
494ad65bef bt656: fix bt656 bugs [1/1]
PD#OTT-1022

Problem:
bt656 can not work well.

Solution:
1. add clock control
2. fix bt656 id bug

Verify:
G12A U200

Change-Id: I2aaecee33fd590497d5a11cf3618fc07264f02a5
Signed-off-by: Xuhua Zhang <xuhua.zhang@amlogic.com>
2019-05-07 16:00:39 +09:00
Yong Qin
9214ba56f5 cec: ceca register access fail [1/1]
PD#SWPL-4133

Problem:
cec a register access fail and cause watchdog reboot

Solution:
reduce wait counter, and check clk register

Verify:
P215

Change-Id: Ic9d97e1eca9428ffd0c4a6bfe008cd9d8303075b
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>

Conflicts:
	drivers/amlogic/cec/hdmi_ao_cec.h
2019-05-07 16:00:39 +09:00
Yong Qin
596892a1b5 di: aptimise di flow, add some protection [1/1]
PD#SWPL-3976

Problem:
To prevent “stall when access DDR through memory interface”

Solution:
1.aptimise NRWR register access flow
2.add arb on/off and status check
3.add reset protect
4.add nr_en disable before arb status check
5.add nr_write_done sel
6.modify VPU_WRARB_MODE_L2C1 from vlsi feijun's suggest

Verify:
tl1, txlx

Change-Id: Ifb0f4f0502d957ffb2b07805575c27f4166d5717
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>

Conflicts:
	drivers/amlogic/media/deinterlace/deinterlace.c
2019-05-07 16:00:39 +09:00
jintao xu
c88975e42f omx: add two layer support [3/6]
PD#SWPL-85

Problem:
Need support two video layers feature

Solution:
1: Add videosync.
2: amlvideo support multi-instance

Verify:
U212

Change-Id: I3570fad361ba5bd388dd46c51a66da056fa7a1fd
Signed-off-by: jintao xu <jintao.xu@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>

Conflicts:
	MAINTAINERS
	drivers/amlogic/media/deinterlace/deinterlace_hw.c
2019-05-07 16:00:39 +09:00
Brian Zhu
e50e1e2a32 vpp: add osd and video zorder control [2/6]
PD#SWPL-85

Problem:
Upper layer need control osd and video layer zorder

Solution:
1.Add video layer zorder interface by sysfs and ioctl
2.Switch the osd and video layer order in vsync

Verify:
Verify on U212

Change-Id: Ic50e81784b865cc57e4ab9a63d74806f7a8721cf
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2019-05-07 16:00:39 +09:00
Brian Zhu
8ee3a7c080 vpp: add two layers support for each chips [1/6]
PD#SWPL-85

Problem:
Need support two video layers feature

Solution:
1.Add vd2 mif config
2.Add vd2 pps calculation and config
3.Add vd2 axis/crop/screen mode interface by sysfs and ioctl
4.Add layer query/alloc/free interface

Verify:
Verify on U212

Change-Id: I71fc9ab2ae0230c3e84c4b790e77d2c790951642
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2019-05-07 16:00:39 +09:00
wenfeng.guo
20fca5ef36 sr: add support for tl1 [1/1]
PD#172587

Problem:
Add sr driver support for tl1

Solution:
add sr driver support for tl1
fix horizontal line when play video on 4K screen

Verify:
TL1 X301

Change-Id: I422f27eb5cf12f69dc57de295425536671e2df38
Signed-off-by: wenfeng.guo <wenfeng.guo@amlogic.com>
2019-05-07 16:00:39 +09:00
Brian Zhu
e84f90b962 video: vpp: add vd afbc YUV 422/444 support for tl1 [1/1]
PD#172587

Problem:
Bringup TL1 vidoe driver.
TL1 need support YUV422/444 AFBC.
TL1 need check afbc source from decode or vdin.
TL1 need afbc compress loss mode.

Solution:
Merge from branch bringup/amlogic-4.9/tl1-20181111.

Verify:
verify on tl1

Change-Id: I0af62e7638db4e1c349df874ccffdeddcaa715af
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2019-05-07 16:00:39 +09:00
Brian Zhu
4c7b982681 vpp: sr: disable core0 and core1 scaler latch [1/1]
PD#SWPL-3144

Problem:
The latch function cause the super scaler size asynchronous

Solution:
Disable sr core0 and core1 scaler latch

Verify:
T962x2 x301 board test pass

Change-Id: Iecbcc3e0c751093b6515f7b46973eca2157cd349
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2019-05-07 16:00:39 +09:00
Pengcheng Chen
65c07f6d95 osd: fix some fence issue [2/2]
PD#SWPL-3348

Problem:
fix some fence issue

Solution:
1. add blank operation to FBIOPUT_OSD_SYNC_RENDER_ADD
2. move canvas_config to osd_setting_blend

Verify:
verify by franklin

Change-Id: I5d1ebb697ff542e5c36dab0dae9b322ec4e1fa16
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2019-05-07 16:00:39 +09:00
Zongdong Jiao
1349f12a7b hdmitx: sync hdmi_audio uevent to hdmi hpd
Change-Id: I39512030f058ab9c72ee4c779f3b692898440271
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2019-05-07 16:00:39 +09:00
Zhuo Wang
2798919bd8 ethernet: handle tx timeout
PD# 169839

After do suspend/resume circularly, sometimes ethernet can't recover from
suspend. Add a phy reset when every resume.

Change-Id: Id03223a9c62f4dcab1cdfbc4805cc3b4c0212cf5
Signed-off-by: Shen Liu <shen.liu@amlogic.com>
2019-05-07 16:00:39 +09:00
Shuai Li
62fadf6f52 audio: fix samesource clk after play DDP [1/1]
PD#SWPL-4331

Problem:
Same source clk doesn't recover to 48K
after playback 192k DDP stream.

Solution:
Add ways to recover the clk.

Verify:
Local verified

Change-Id: If410d9ca04446c35bafebe2913b01e19b5fee224
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
2019-05-07 16:00:39 +09:00
Shuai Li
4f69f92585 audio: audio glitch at tdm startup [1/1]
PD#SWPL-5219

Problem:
audio glitch at tdm startup

Solution:
Pad 0 data to clear the remaining data
in the module.

Verify:
Local tested.

Change-Id: Iab526c6893a32030799567b57e05e7bb11b8fea0
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
2019-05-07 16:00:39 +09:00
Yingwei Long
3d0d1e1af4 tsync: do not operate tsync_mode_switch before first video toggled [1/1]
PD#SWPL-5131

Problem:
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(egg:SYNC-HEVC-59FPS-DDP51)

Solution:
do not operate tsync_mode_switch before first video toggled

Verify:
verify by franklin

Change-Id: Icec2de71ea8f838146444aa3ea880f76ed8e0f13
Signed-off-by: Yingwei Long <yingwei.long@amlogic.com>
2019-05-07 16:00:39 +09:00
shuanglong.wang
10481a1b83 video: set vpp super_scaler default to 0 [1/1]
PD#SWPL-5113

Problem:
video flash when resolution change from 4K to 640x480

Solution:
temporary solution for video flash for u212

Verify:
verify by u212

Change-Id: I8b7ec009bf599032c7bff5f80b72b557403355da
Signed-off-by: shuanglong.wang <shuanglong.wang@amlogic.com>
2019-05-07 16:00:39 +09:00
Yi Zhou
9e26b66f43 hdmitx: eliminate the work of sdr effect when choosing hdr [1/1]
PD#SWPL-4079

Problem:
hdr->sdr must have 1.5s delay, when switching from sdr->hdr
the work queue can't be eliminated in time.

Solution:
eliminate the work of sdr effect when choosing hdr

Verify:
u212

Change-Id: I4c1d5467a58253ffa2fa12dfbac7f504d0388a00
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2019-05-07 16:00:39 +09:00
Kevin Kim
f910f56760 ODROID-COMMON:Modified PWM pinctrl
Change-Id: I951fd8481328149e64536cbf2a02e51d47b36acd
(cherry picked from commit d32317a627)
2019-05-02 10:55:37 +09:00
Luke Go
dd1560c737 ODROID_N2: Add GPIO-KEYS Drivers
Pin Number  | Net Name
11          | GPIOX.3
13          | GPIOX.4
15          | GPIOX.7
19          | GPIOX.8

Change-Id: I14ab93ef168a60afa65b281dfc1a05f4de1d6d5f
s922_9.0.0_20190425
2019-04-23 14:16:09 +09:00
Chris KIM
1456ea3ecd ODROID-N2 Add some USB Serial Converter drivers.
CP210X
FTDI_SIO

Change-Id: Ib09f82c44163fd20622d268d909f42b92325b7de
2019-04-22 09:34:42 +09:00
Chris KIM
9ca8db23c6 ODROID-N2 : HDMI-PHY suspend option added.
Change-Id: I9f9c0a305bbddcdd238500b37bd70125a4b829fd
s922_9.0.0_20190418 s922_9.0.0_20190404
2019-04-03 17:51:37 +09:00
Kevin Kim
41019f9a67 ODROID-N2:phy/realtek:Wake On Lan err fix.
On Linux PC)
sudo apt install wakeonlan
wakeonlan MAC-Address

Change-Id: Ia6f4917b3b54a19d0aff33c860c8cefa3e9c2c84
2019-04-03 16:00:44 +09:00
Chris KIM
3d08249028 Revert "Revert "ODROID-COMMON: media/vout: no use of 'vout=' for display resolution""
This reverts commit 31b5cfb6d7.

Change-Id: Id3caa0ec9d7cf5a2e72f660d48f56aeb2a37de71
2019-04-01 15:16:24 +09:00
Joy Cho
e3055d4b88 media: rc: Add lirc helper to support user remote wakeup
- set user remote wakeup key
- set ir decode protocol for wakeup

Change-Id: If083545f64d4e0b9c30bed89ce4bc9ecd37ea8ac
s922_9.0.0_20190320 s922_9.0.0_20190319
2019-03-19 10:48:47 +09:00
Chris KIM
31b5cfb6d7 Revert "ODROID-COMMON: media/vout: no use of 'vout=' for display resolution"
This reverts commit 0665994b208cce865e0fde3e7da201694e421320.

Change-Id: I6ffe41a6acbdc38a738b9658bebced31de5e45bb
2019-03-15 12:21:02 +09:00
Dongjin Kim
fdbe8aafb4 Merge "remote: Add a setup of user remote wakeup decode type" into odroidn2-4.9.y-android 2019-03-14 16:31:37 +09:00
Dongjin Kim
8a6446fa7a ODROID-N2: phy/realtek: add to support Wake On Lan enable
Adding new kernel command line "enable_wol=<1|0>" will configure the WOL
features on next power off.

Change-Id: I4830aeb1651e90d4699887199000def1163fb6db
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
(cherry picked from commit 22d698f4d2)
2019-03-14 15:37:07 +09:00
Joy Cho
e6c52c1843 remote: Add a setup of user remote wakeup decode type
Change-Id: Ib7bb759dfec67433b596ed64997f6894d1c7ec27
2019-03-14 10:06:40 +09:00
Chris KIM
d6c634e62f ODROID-N2: Add CONFIG_NLS_UTF8 as builtin.
Change-Id: I4b5e908ad8731ac4a14c4bda5a964e1ebd39ed54
2019-03-13 14:38:24 +09:00
Chris Kim
c1a84082ec Merge "ODROID-N2: config: enable 'CONFIG_CIFS'" into odroidn2-4.9.y-android 2019-03-13 14:29:00 +09:00
Chris Kim
f7069d049a Merge "ODROID-N2: config: refactoring kernel config" into odroidn2-4.9.y-android 2019-03-13 14:28:50 +09:00
Chris Kim
88e3d0d0fe Merge "osd/fb: set default color format for Linux" into odroidn2-4.9.y-android 2019-03-13 14:28:21 +09:00
Dongjin Kim
07c8e20d35 ODROID-N2: config: enable 'CONFIG_CIFS'
Change-Id: I76341cb0e545a7172ecdeb935525d57806339557
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
2019-03-13 01:42:43 +09:00