Commit Graph

649050 Commits

Author SHA1 Message Date
Nian Jing
bab3adbe76 tvafe: add av/atv/cvbs support for tm2 [1/1]
PD#:SWPL-6702

Problem:
tm2 bringup

Solution:
add av/atv/cvbs support for tm2

Verify:
tm2 T962E2

Change-Id: I1c7358cd17463843fbdd7a93c7416a22aaa2387c
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2019-04-11 14:36:06 +08:00
Nian Jing
2c05842e63 vdin: add vdin support for tm2 [1/1]
PD#SWPL-6701

Problem:
Need vdin supprt for sm2

Solution:
add vdin support for tm2

Verify:
test pass on tm2 ab311

Change-Id: I57d7b3014938011d18c5e168f18c78e4fa542fc7
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2019-04-11 14:18:14 +08:00
MingLiang Dong
b2f9010906 hdr: TM2 bringup disable lc/cm [1/1]
PD#SWPL-6720

Problem:
video display color green

Solution:
TM2 bringup disable lc/cm

Verify:
verify on TM2

Change-Id: I2d8222c92f8181710a13a56f650655281fac5115
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2019-04-11 13:34:30 +08:00
Brian Zhu
c807fc47e7 vpp: tm2: add vd2 function for tm2 [2/2]
PD#SWPL-6615

Problem:
Need vd2 function

Solution:
add vd2 function for tm2:
1.vd2 pps scaler
2.disable vd2 afbc

Verify:
test pass on tm2 skt

Change-Id: I7af5de741b90e443ee065218aecb823ef06d66a7
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2019-04-11 13:34:22 +08:00
Jian Hu
a6d41b925b clk: tm2: add dsu clock [2/3]
PD#SWPL-6758

Problem:
tm2 dsu clock does not work

Solution:
1.add dsu clock
2.gp1 pll clock

Verify:
verify on tm2 ad311

Change-Id: I8090a75d15ae4e532f6ae04563d6d0158f8fbc87
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2019-04-11 13:34:12 +08:00
kieth liu
07f5ca179a dts: update t962x3_ab301 and disable hdmitx for other boards [2/3]
PD#SWPL-6720

Problem:
no t962x3_ab301 dts
For TM2 series, some have hdmitx port, while others don't have it.

Solution:
add t962x3_ab301 dts
amhdmitx/status = "disabled" as default value for those no-hdmitx
boards

Verify:
verify by t962x3_ab301

Change-Id: I0e521acd5704a58de6aad98a94d286c8b9b00dc9
Signed-off-by: kieth liu <kieth.liu@amlogic.com>
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2019-04-11 13:33:54 +08:00
nengwen.chen
a236a8991a atv_demod: tm2: atv demod basic functin bringup [1/1]
PD#SWPL-6731

Problem:
atv demod basic functin bringup.

Solution:
atv demod basic functin bringup.

Verify:
Verified by ab301 and ab309.

Change-Id: Ie2d92aad9d2ebf2493f26c50ff7ded57cd040b1c
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2019-04-11 13:33:44 +08:00
Yue Wang
7f9b7bd721 usb: bringup TM2 usb3 [2/2]
PD#SWPL-5609

Problem:
bringup TM2 usb3.

Solution:
bringup TM2 usb3.

Verify:
TM2

Change-Id: Ib2c80e7e586ddbe6f85a6d046efdbd650b81b030
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
2019-04-11 13:31:19 +08:00
Jianxiong Pan
ff8c42a489 dts: rename tm2_t962e2_ab301.dts to tm2_t962x3_ab301.dts. [1/1]
PD#SWPL-6678

Problem:
rename tm2_t962e2_ab301.dts

Solution:
rename tm2_t962e2_ab301.dts to tm2_t962x3_ab301.dts.

Verify:
build pass.

Change-Id: Ia320b36323a56b5ae496fbd44ffcd2b38ada8ec1
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2019-04-11 13:31:11 +08:00
Hong Guo
d57c6b66d8 CPUFREQ: add cpufreq function for tm2 [1/1]
PD#SWPL-6732

Problem:
add cpufreq function for tm2.

Solution:
add cpufreq function for tm2.

Verify:
test passed on tm2 ab3100

Change-Id: Ic01c39f33ffb64b9bf5e419b8f2c55701b510a94
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
2019-04-11 13:31:04 +08:00
Yue Wang
85e66f8c8d usb: bringup TM2 usb3 [1/1]
PD#SWPL-5609

Problem:
bringup TM2 usb3.

Solution:
bringup TM2 usb3.

Verify:
TM2

Change-Id: Iea60a85e7d344f8f1cd44d07a634a6edd351218c
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
2019-04-11 13:30:55 +08:00
Jian Hu
1ab1c05855 clk: tm2: dspb clock does not work [1/1]
PD#SWPL-5636

Problem:
dspb clock does not work

Solution:
the dspb clocks describe the wrong register, fix it.

Verify:
test passed on tm2 ab3100

Change-Id: I9ef0fb432bc3394843fb397392fc02f5c613cec0
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2019-04-11 13:30:49 +08:00
Brian Zhu
eea348a66e vpp: tm2: add vpp and sr support [1/2]
PD#SWPL-6615

Problem:
Need vpp and sr supprt for sm2

Solution:
add support for tm2

Verify:
test pass on tm2 skt

Change-Id: I0ae2cb178fcbe047cdfec6b4e200424178993e6e
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2019-04-11 13:30:41 +08:00
Zhe Wang
0b4d894b68 audio: TM2: disable spk on skt board [1/1]
PD#SWPL-6721

Problem:
audio block start.

Solution:
disable spk on dts setting.

Verify:
Verified on T962e2_ab311

Change-Id: I85da808dad14d0b16b66ea4e07276980c6896aa4
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
2019-04-11 13:30:35 +08:00
Pengcheng Chen
7bcfa1847f osd: set osd1 scaler before osd blend [1/1]
PD#SWPL-6596

Problem:
bring up osd for TM2

Solution:
set osd1 scaler before osd blend

Verify:
Verified on T962e2_ab319

Change-Id: I9e7d5fa83b2edc8e9359371695ea46fa3b39e09c
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2019-04-11 13:27:16 +08:00
Yi Zhou
3cd1a565d7 hdmitx: hdmitx bringup for tm2 [1/1]
PD#SWPL-5617

Problem:
no irq and can't read edid

Solution:
add irq

Verify:
tm2 ptm

Change-Id: Iedbff2da4758e9a091b56f9ec75b8130b72b846a
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2019-04-11 11:58:58 +08:00
Jian Hu
e3f35d98bc clk_measure: tm2: add clock measurement [1/1]
PD#SWPL-5636

Problem:
the clock measurement in SoC is changed

Solution:
add clock measurement

Verify:
test passed on ptm

Change-Id: I2325e9c76e27498c258449624b01f0deff9f7684
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2019-04-11 11:58:52 +08:00
Jian Hu
7625b3d031 clk: meson-tm2: add new clocks [1/1]
PD#SWPL-5636

Problem:
pcie and several clk81 clocks are newly added in tm2 SoC

Solution:
add pcie and several clk81 clocks

Verify:
test passed on ptm

Change-Id: I8456d7fa8ffb6438e99d3f1cddee4a3ba846b933
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2019-04-11 11:58:41 +08:00
Shunzhou Jiang
ba2ffc5f2d power: sm1/tm2: add sleep and iso mask function [1/1]
PD#SWPL-6186

Problem:
add mask function

Solution:
add sleep and iso mask function

Verify:
sm1_skt

Change-Id: Ifbb7329fd1eb6e333d0332f53c809e7b2e55181d
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
2019-04-11 11:24:10 +08:00
Jianxiong Pan
a988703093 dts: add tm2_t962e2_ab301.dts. [1/1]
PD#SWPL-6678

Problem:
need support tm2_t962e2_ab301.dts

Solution:
copy from tm2_t962e2_ab311.dts

Verify:
build pass.

Change-Id: I83c0f103399352b524a5203f22dc8d6f541b56a9
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2019-04-11 11:12:49 +08:00
ruixuan.li
53cd8bad01 tm2: emmc run hs200 busmode [1/1]
PD#SWPL-5658

Problem:
emmc run high speed now

Solution:
modify dts

Verify:
passed on t962e2_ab319

Change-Id: Iedef30bed9547e7f57c883077462f1762c55fda3
Signed-off-by: ruixuan.li <ruixuan.li@amlogic.com>
2019-04-11 11:12:43 +08:00
Yi Zhou
b8cef5e8cb hdmitx: hdmitx bringup for tm2 [1/1]
PD#SWPL-5617

Problem:
error print

Solution:
remove it

test method:

Verify:
tm2 ptm

Change-Id: I63f64a98980ee22fb60af442f39f465f2fc74915
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2019-04-11 11:12:39 +08:00
qingweixu
cc29e4ceaa partion: increase vendor partion size for 64bit [1/1]
PD#SWPL-6373

Problem:
increase vendor partion size for 64bit kernel

Solution:
increase vendor partion size for 64bit kernel

Verify:
verify by tm2_skt

Change-Id: I18afd344c4bd4b486407033103743816b8408205
Signed-off-by: qingweixu <qingwei.xu@amlogic.com>
2019-04-11 11:12:31 +08:00
Jian Cao
6e02bd3697 osd: add osd TM2 support [1/1]
PD#SWPL-6558

Problem:
bring up osd for TM2

Solution:
osd: add osd TM2 support

Verify:
Verfied on TM2 skt board

Change-Id: I2183bd1f60793baf947c303b6d456e8c69d104ac
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
2019-04-11 11:12:02 +08:00
Qianggui Song
c6d7fadb53 irqchip: tm2 irqchip support [1/1]
PD#SWPL-5651

Problem:
tm2 has 2 extra pins than tl1, should use new param data

Solution:
add tm2 param data

Verify:
T962e2_ab319

Change-Id: I77aaaead7b10024cd5f12354ba6b47db74ba96f5
Signed-off-by: Qianggui Song <qianggui.song@amlogic.com>
2019-04-11 11:02:45 +08:00
Yi Zhou
573c005b4e hdmitx: hdmitx bringup for tm2 [3/3]
PD#SWPL-5617

Problem:
hdmitx bringup for tm2

Solution:
echo null > /sys/class/display/mode
echo 1080p60hz > /sys/class/display/mode

test method:
echo bist1920 > /sys/class/amhdmitx/amhdmitx0/debug
echo bistoff > /sys/class/amhdmitx/amhdmitx0/debug

Verify:
tm2 ptm

Change-Id: I4c69ec1e1e26c1ae7fde0fca5cd8b98c13e609f2
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2019-04-11 11:00:15 +08:00
Evoke Zhang
d807c881d0 vpu: add tm2 support [1/1]
PD#SWPL-6397

Problem:
tm2 is a new chip

Solution:
add vpu driver support for tm2

Verify:
pxp

Change-Id: I19275c513b68fba8feced37f1ff8fca9bf48d395
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2019-04-11 11:00:02 +08:00
ruixuan.li
915029e1f3 tm2: make emmc run high speed [1/1]
PD#SWPL-5658

Problem:
emmc run hs200 report cmd18 rx data crc

Solution:
emmc run high speed first

Verify:
passed on t962e2_ab319

Change-Id: Iaeef33e38f7c5130ebfd0e7c5886459b8138a803
Signed-off-by: ruixuan.li <ruixuan.li@amlogic.com>
2019-04-11 10:59:29 +08:00
Yue Wang
8955d4a275 usb: bringup TM2 usb [1/1]
PD#SWPL-5609

Problem:
bringup TM2 usb.

Solution:
bringup TM2 usb.

Verify:
TM2

Change-Id: I61f388a516442064af5b21f4688f6787e9e358e9
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
2019-04-11 10:59:18 +08:00
pan.yang
3ed5bb274c dts: modified t962ex_ab311 319 and t962x3_a309,pxp dts [1/1]
PD#SWPL-6560

Problem:
Need to change dts

Solution:
modified ab311 ab319 and ab309 and pxp

Verify:
test pass at skt_tm2

Change-Id: Iabc21582910f66b321b55928ce86d0958cb83503
Signed-off-by: pan yang<pan.yang@amlogic.com>
2019-04-11 10:59:09 +08:00
Jianxin Pan
92961bb25f dts: add t962ex_ab311 319 and t962x3_a309 [1/1]
PD#SWPL-6559

Problem:
Need more DTB support

Solution:
add ab311 ab319 and ab309
ab311 is from tl1_x301
ab319 and ab309 are from tl1_skt

Verify:
Build pass

Change-Id: Ie8a8bec03107d4c4d0328dcd8deab916bd7f63f2
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2019-04-11 10:59:01 +08:00
pan.yang
a957a78967 power: tm2: add power control dts config [1/1]
PD#SWPL-5648

Problem:
need power control dts

Solution:
add power control dts

Verify:
tm2_skt

Change-Id: Ia677567dec5bb9ca8ea0cf067d8885d3005d32c2
Signed-off-by: pan yang<pan.yang@amlogic.com>
2019-04-11 10:58:47 +08:00
pan.yang
6d6d0e018d tm2: change tm2 mailbox dts config [1/1]
PD#SWPL-5639

Problem:
tm2 mailbox config has been changed

Solution:
change tm2 mailbox dts config

Verify:
tm2_skt

Change-Id: I1e3fb569464826304f46276668ed359ad5cc2718
Signed-off-by: pan yang<pan.yang@amlogic.com>
2019-04-11 10:58:38 +08:00
Jian Cao
5b7f01bd41 dts: tm2: add ge2d support [1/1]
PD#SWPL-6552

Problem:
add ge2d support

Solution:
add ge2d support

Verify:
verified on TM2 skt board

Change-Id: Idba0f97ea1596a4f579530fb86829f5ede307e52
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
2019-04-11 10:58:30 +08:00
Qianggui Song
20fe541c42 pinctrl: support tm2 pinctrl [1/1]
PD#SWPL-5656

Problem:
tm2 need a static data pinctrl file to depict pins

Solution:
add relative codes to support tm2

Verify:
T962E2_ab319

Change-Id: I55206f9b3df6390e8821fd777d329ddf05dd8386
Signed-off-by: Qianggui Song <qianggui.song@amlogic.com>
2019-04-11 10:58:02 +08:00
shanghai engineers
df65f1ff75 TM2: add chip id and name for tm2 [1/1]
PD#SWPL-6157

Problem:
TM2 bring up need to update chip version name and id

Solution:
add the chipid and chip version name at dts and help file

Verify:
on ptm board4

Change-Id: I37e44828db1821c7fd2921c3e4271a27bd715b88
Signed-off-by: pan yang <pan.yang@amlogic.com>
2019-04-11 10:41:31 +08:00
shanghai engineers
b73f974f2c tm2: add tm2_pxp dts at amlogic for ptm bringup [1/1]
PD#SWPL-6157

Problem:
Current branch need tm2_pxp dts at amlogic system

Solution:
Create tm2_pxp dts at tm2 kernel branch, and modified scripts

Verify:
on ptm board4

Change-Id: I83204db07462729861a59d322fa99e4370c09dea
Signed-off-by: pan yang <pan.yang@amlogic.com>
2019-04-11 10:40:39 +08:00
Bencheng Jing
5052fcf375 amvecm: fix lc enable/disable not follow pq.db [1/1]
PD#TV-4358

Problem:
lc enable/disable not follow pq.db

Solution:
check the db reg vlaue,then adjust lc_en

Verify:
TL1

Change-Id: I0bf652eff96d75355c8fb1329291d1611e226b96
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2019-04-10 18:55:27 -07:00
Shuai Li
27c68d02b0 audio: add codec trigger mute for depop [1/1]
PD#SWPL-6944

Problem:
TV-3381
Speaker sometimes has clicking noise when playing DTV program.

Solution:
add codec trigger mute for depop

Verify:
Local verified.

Change-Id: Ib15a6b90bd3a6cdda2255afaf86daeab68ba07e2
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
2019-04-10 04:05:29 -07:00
Zongdong Jiao
35eb57d7df hdmitx: add audio ATMOS parsing [1/1]
PD#SWPL-4085

Problem:
Need audio ATMOS information in RX EDID

Solution:
Add parsing audio ATMOS information

Verify:
GXL/P212

Change-Id: I882b817a4d7621833bb7e4b85231d7a42e426382
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2019-04-10 04:02:54 -07:00
Zongdong Jiao
5b21b90d8b hdmitx: adjust PHY parameter with 5.1 ohm resistor [2/2]
PD#SWPL-2927

Problem:
No enough eye diagram when adding TMDS 5.1 ohm resistor

Solution:
adjust PHY parameter with 5.1 ohm resistor

Verify:
G12/U212

Change-Id: Ib5518613c556f9b04eb0aa374193c7a6046a7ba9
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2019-04-10 15:56:56 +08:00
Evoke Zhang
5a825f14bd vdin: config vdin mif/afbc path directly [1/1]
PD#SWPL-6277

Problem:
switch hdmi port maybe display green screen

Solution:
1.optimize vdin stop sequence, reduce afbc state polling interval,
  and rest afbc to get a clean state
2.change vdin mif/afbc patch directly, not rdma method,
  for vdin0/1 rdma are independent

Verify:
x301

Change-Id: I0ddf5d27dcfc0fd930eeb681f876c4c5e92e8d70
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2019-04-09 20:58:31 -07:00
Pengcheng Chen
6913eaacf9 osd: osd display color abnormal when run drm [1/1]
PD#SWPL-6867

Problem:
osd dispaly color abnormal because osd enable not update.

Solution:
update osd enalbe flag in drm process.

Verify:
Verified u212

Change-Id: I1c2e8b62d9d5af203c95d3d0ac940fb512dd8e5e
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2019-04-09 18:44:36 -07:00
Yong Qin
4041b84987 vlock: phase lock sometime lose effect [1/1]
PD#SWPL-6723

Problem:
phase lock sometime effect vlock

Solution:
disable phase lock function now

Verify:
tl1

Change-Id: I4cfe1e0153084717967309e832b028691ab44c88
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2019-04-09 02:35:24 -07:00
Xing Wang
f3f2d60287 audio: codec: un-mute ad82584 in default [1/1]
PD#SWPL-6810

Problem:
android version, no sound for spk
ad82584 is mute in default.

Solution:
un-mute ad82584, and add delay for de-pop

Verify:
ac200

Change-Id: Id78eb77b5e1a0ebed0a16a9b97992c6a07f78cde
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
Signed-off-by: Jian Xu <jian.xu@amlogic.com>
2019-04-09 02:14:02 -07:00
Jiamin Ma
043ae971bf time: fix fail to read generic timer's counter value correctly [1/1]
PD#SWPL-6837

Problem:
The return value of arch_counter_get_cntvct is always abnormal
when it is in irq stack. In this case, arch_counter_get_cntvct
trys to access a variable in 8Bytes via a 4Bytes aligned addr-
ess, which vialates the rule: The address that is accessed
should be aligned to the size of the data element being
accessed

Solution:
after switching to irq stack, force the base sp value to be
16Bytes aligned. Since the address of variable in irq stack is
based on the base sp and arranged automatically, all the data
accessing in irq stack will be aligned.

Verify:
Ampere

Change-Id: I3b30a56491dd0720d1c885bfaf2ca98d1b103fdd
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2019-04-09 01:59:41 -07:00
Yong Qin
c75a783c42 di: change clkb frq from 500 to 667 [1/1]
PD#SWPL-6762

Problem:
di clkb frq is not right

Solution:
change from 500 to 667

Verify:
tl1

Change-Id: I9c62bb9936630937f19d8a6b490a8266d73a268c
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2019-04-09 01:55:23 -07:00
Jianxin Pan
0b352e3e35 Merge "media_module: h264/mpeg2/h265 [2/2]" into amlogic-4.9-dev 2019-04-08 23:54:33 -07:00
Rong Zhang
166b30a5e6 media_module: h264/mpeg2/h265 [2/2]
PD#SWPL-3654

Problem:
provide aspect_ratio information by AMSTREAM_IOC_VDECSTAT

Solution:
add ration_control information in vdec_status function for
h264/mh264/vh265/mpeg12/mmpeg12, and normalized it for
aspect_ratio in AMSTREAM_IOC_VDECSTAT message.

Verify:
Verified U212

Change-Id: Icd9270eb8f2ce2f6f7455ec28780d26ac6c56348
Signed-off-by: Rong Zhang <rong.zhang@amlogic.com>
2019-04-08 23:54:18 -07:00
Rong Zhang
97e1613e7c media_module: mh264/h265/avs2 [1/2]
PD#SWPL-6607

Problem:
	Not support QOS information for mh264.h265,avs2

Solution:
	Support QOS information picking for mh264,h265,avs2
	Support QOS information access interface by ioctl

Verify:
	Verified franklin

Change-Id: I4e6f85392007bc78a274726aba510c39088018e3
Signed-off-by: Rong Zhang <rong.zhang@amlogic.com>
2019-04-08 02:00:57 -07:00