Commit Graph

648738 Commits

Author SHA1 Message Date
Chuangcheng Peng
969bcb261e dvb: sm1 bringup add one asyncfifo [2/2]
PD#SWPL-5403

Problem:
demux add one asyncfifo, need compatile

Solution:
demux compatile with previous code.

Verify:
verify at sm1

Change-Id: Iea0b7b5f69d3200062b9e757f2712b98926fb3b9
Signed-off-by: Chuangcheng Peng <chuangcheng.peng@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2019-05-07 16:00:39 +09:00
Huan Biao
a7a78247ca thermal: move thermal dts for sm1 [1/1]
PD#SWPL-6675

Problem:
sm1 thermal dts issue

Solution:
move thermal dts for dtsi to board dts

Verify:
test pass on sm1_ac200

Change-Id: I3fa5f2f4b15bc78d322d94402b8d0894fd8cbd35
Signed-off-by: Huan Biao <huan.biao@amlogic.com>
2019-05-07 16:00:39 +09:00
Hong Guo
07c3f4b83e cpufreq: dts: adjust cpufreq table for g12b [1/1]
PD#SWPL-5975

Problem:
adjust cpufreq table for g12b

Solution:
adjust cpufreq table for g12b

Verify:
test pass on g12b_w400

Change-Id: I037ab2a1718a2aae0f42a15b7d95f163bc77ca85
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
2019-05-07 16:00:39 +09:00
Zhe Wang
31a9a1781f audio: fixed conflict of SM1-bringup and mainline [1/1]
PD#SWPL-6486

Problem:
merge to mainline conflict.

Solution:
add clk change in dts

Verify:
sm1_ac200, verify pass

Change-Id: I37e7317cd795cd8cb9815ff20db49bc8644f0087
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
2019-05-07 16:00:39 +09:00
Xing Wang
4224a3b58b audio: auge: support av out and amp spk for sm1 [1/2]
PD#SWPL-6192

Problem:
no sound from av and amp spk

Solution:
1) fix tocodec for sm1
2) add no mclk control for ad82584

Verify:
ac200

Change-Id: I63f0ec94d2f5b980249ac5c9c810c8e4d8410ea3
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2019-05-07 16:00:39 +09:00
Xing Wang
e159524778 dts: sm1: add sound card config [1/2]
PD#SWPL-6151

Problem:
sound card for sm1

Solution:
add sound card for sm1

Verify:
ac200

Change-Id: I1de0cfe1748d401ab0e21b0a244def37b277b1ff
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2019-05-07 16:00:39 +09:00
Hong Guo
1259a4c9b1 CPUFREQ: update cpufreq tables for sm1. [1/1]
PD#SWPL-6205

Problem:
update cpufreq tables.

Solution:
update cpufreq tables.

Verify:
sm1_ac200, verify pass

Change-Id: I360264df88981a16267a20896f97c93dbd0e4b37
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2019-05-07 16:00:39 +09:00
Hong Guo
58476d2c61 CPUFREQ: delete different cpufreq tables for sm1. [1/1]
PD#SWPL-6205

Problem:
delete different cpufreq tables.

Solution:
delete different cpufreq tables.

Verify:
sm1_ac200, verify pass

Change-Id: I99142d2f99847f45eafc876a1b2d785a28815e15
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
2019-05-07 16:00:39 +09:00
Hang Cheng
4cf15a2134 cec: add change for sm1 [1/1]
PD#SWPL-5419

Problem:
cec change for sm1

Solution:
add cec change for sm1

Verify:
ac200

Change-Id: Ic808e4bd128358b7f10c7f0b21a629d72f1c71cc
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2019-05-07 16:00:39 +09:00
Brian Zhu
d0825a20bf vpp: sm1: add vpp and sr support [1/1]
PD#SWPL-6101

Problem:
Need vpp and sr supprt for sm1

Solution:
add support for sm1

Verify:
test pass on sm1 ac200

Change-Id: I038ceba52a0b47512767e851d0047a3ee36e351c
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2019-05-07 16:00:39 +09:00
Brian Zhu
c00bcbfa05 vpp: sr: remove the vpp misc operation in sr function [1/1]
PD#SWPL-2613

Problem:
sr mux in vpp misc is set incorrectly.

Solution:
move the vpp misc operation together

Verify:
verify by x301

Change-Id: Ie813e5b04b97a4481c2e45bcf0c8b4c065fb9f69
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2019-05-07 16:00:39 +09:00
Jian Cao
fe2b605225 ge2d: sm1: add ge2d power control [1/1]
PD#SWPL-6186

Problem:
add ge2d power control

Solution:
add ge2d power control

Verify:
SM1-AC200 board

Change-Id: I3ea08c4d800f78e5187b6ae334849db02309ce0e
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
2019-05-07 16:00:39 +09:00
Shunzhou Jiang
7ad2a89d22 power: sm1: add power control driver [1/1]
PD#SWPL-6186

Problem:
add power control register

Solution:
avoid same register access at the same time

Verify:
sm1_skt

Change-Id: I0ec61cda9721c1b95a9d78f7884458f442581fe5
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2019-05-07 16:00:39 +09:00
Nian Jing
00403f2ea2 cvbs: add cvbs support for sm1 [1/1]
PD#SWPL-6112

Problem:
need add cvbsout support for sm1

Solution:
add cvbsout support for sm1

Verify:
sm1

Change-Id: I037fbdb41b823d9ef93a9069f3798f8d38ac5796
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2019-05-07 16:00:39 +09:00
Nanxin.Qin
17991e8a51 dts: update chip name. [2/2]
PD#SWPL-5261

Problem:
update chip name.

Solution:
the chip name used for media modules.

Verify:
AC200

Change-Id: I229ca3f991b29fdebf10f98dff5173768b910aaa
Signed-off-by: Nanxin.Qin <nanxin.qin@amlogic.com>
2019-05-07 16:00:39 +09:00
Evoke Zhang
38d656f77a vpu: fix mem_pd reg addr mistake [1/1]
PD#SWPL-5857

Problem:
vpu_mem_pd register address changed

Solution:
update vpu_mem_pd register address for sm1

Verify:
pxp

Change-Id: Iefcb190b40a5ac949351a4c88bea502e437cd59f
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2019-05-07 16:00:39 +09:00
Evoke Zhang
c9a8ce4140 vpu: add vpu support for sm1 [1/1]
PD#SWPL-5857

Problem:
sm1 is a new chip

Solution:
add sm1 support for vpu driver

Verify:
pxp

Change-Id: I88966a26fb4f8f90620081c4d9a86ad21a6e03fc
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2019-05-07 16:00:39 +09:00
cancan.chang
07d0cbd0ce usb: add NN power control [1/1]
PD#SWPL-5380

Problem:
add NN power control

Solution:
add NN power control

Verify:
sm1

Test: pass

Change-Id: I729d782181490fc31b0b18bb27718ad12b3937c0
Signed-off-by: cancan.chang <cancan.chang@amlogic.com>
2019-05-07 16:00:39 +09:00
cancan.chang
b1dd96fb21 NNA: add NNA support on sm1 [1/1]
PD#SWPL-5380

Problem:
sm1 not support NNA now.

Solution:
add NNA support.

Verify:
sm1_ac200 & sm1_skt

Change-Id: I3de566bbc730ef69f26160ad9f915ac92b4f2e2b
Signed-off-by: Cancan Chang <cancan.chang@amlogic.com>
2019-05-07 16:00:39 +09:00
Jian Cao
11b3e3c263 ge2d: change ge2d to independent power [1/1]
PD#SWPL-5391

Problem:
change ge2d to independent power

Solution:
add independent power switch

Verify:
verified on SM1-AC200 board

Change-Id: Ifce980fc88753db63317c11bc1126e492b677a64
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
2019-05-07 16:00:39 +09:00
Tao Guo
b9f923d686 debug: add atrace support [1/1]
PD#SWPL-4956

Problem:
Need atrace to debug multimedia issue

Solution:
Add atrace functions

Verify:
P212

Change-Id: Ieee441fc75b6f83e8e8a22350a402ec7e77f1134
Signed-off-by: Tao Guo <tao.guo@amlogic.com>
2019-05-07 16:00:39 +09:00
Yi Zhou
cc03487d5f dv: dv bringup for sm1 [1/1]
PD#SWPL-5408

Problem:
dv bringup for sm1

Solution:
dv bringup for sm1, add chip id

Verify:
sm1 ptm

Change-Id: Ifbf175cb5c495949f5e4bd02b98690f08239a735
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2019-05-07 16:00:39 +09:00
Yi Zhou
572c3f06d2 hdmitx: hdmitx bringup for sm1 [1/1]
PD#SWPL-5408

Problem:
hdmitx bringup for sm1

Solution:
hdmitx bringup for sm1, add chip id

Verify:
sm1 ptm

Change-Id: I804dec4b743c660b180b7061d110ab76b9ec0468
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2019-05-07 16:00:39 +09:00
Pengcheng Chen
1e9df1fcb7 osd: add osd SM1 feature [1/1]
PD#SWPL-6106

Problem:
bring up osd for SM1

Solution:
add osd SM1 feature

Verify:
Verified on SM1-AC200

Change-Id: I5cba13f7539e48f6cba1ca0fb3abcaad2ba8494d
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2019-05-07 16:00:39 +09:00
Jian Cao
b2703e5a5a media: add codec support for SM1 [1/1]
PD#SWPL-2867

Problem:
bringup codec for SM1.

Solution:
add the register ops for SM1

Verify:
Verified on SM1-AC200

Change-Id: I31db8f0b5816d67664e8161b3dc73574909afe31
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
2019-05-07 16:00:39 +09:00
Qiang Li
d4f93c6bb0 dts: sm1: dts enable sdio node. [1/1]
PD#SWPL-5409

Problem:
dts sdio node disable.

Solution:
dts enable sdio node.

Verify:
SM1_AC200

Change-Id: Ifd33de0f08adb202af07eee13db8894fdf0c77fa
Signed-off-by: Qiang Li <qiang.li@amlogic.com>
2019-05-07 16:00:39 +09:00
Qiang Li
a00278e81e sdcard: sm1: fix dts problem. [2/2]
PD#SWPL-5409

Problem:
dts compile error.

Solution:
delect sd_emmc_b2 node.

Verify:
SM1_AC200

Change-Id: Ib3965a083fdc3f95a5c0a9de37bff98c898d0993
Signed-off-by: Qiang Li <qiang.li@amlogic.com>
2019-05-07 16:00:39 +09:00
Huan Biao
d89df4c543 thermal: dts: enable sm1 thermal [1/1]
PD#SWPL-6071

Problem:
enable thermal for sm1

Solution:
enable thermal for sm1

Verify:
test pass on sm1_skt

Change-Id: I54fd4431bec1a48135da0b0b9c05cd53d4055a56
Signed-off-by: Huan Biao <huan.biao@amlogic.com>
2019-05-07 16:00:39 +09:00
Shunzhou Jiang
def0f935d0 clk: sm1: add sm1 special clk [1/1]
PD#SWPL-5407

Problem:
not include sm1 special defined clk

Solution:
add this clk

Verify:
sm1_skt

Change-Id: Iaf20aebe377d077d95eb053f7eea99473e3ac45d
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
2019-05-07 16:00:39 +09:00
Shunzhou Jiang
c164e0360f clk: sm1: add clk measure driver [1/2]
PD#SWPL-5407

Problem:
sm1 support clk measure

Solution:
support clk measure

Verify:
ac200

Change-Id: I43c74375c16fee73037a1df4e4531c429e1229fd
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
2019-05-07 16:00:39 +09:00
Shunzhou Jiang
5631e934dc clk: sm1: add clk driver [1/1]
PD#SWPL-5407

Problem:
sm1 not have clk driver

Solution:
add clk driver

Verify:
PxP

Change-Id: Id48257d88ef200fd4adb309bf2e4ada1be407753
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
2019-05-07 16:00:39 +09:00
Yue Wang
46dd36d1b0 usb: modify usb dts for sm1 [1/1]
PD#SWPL-5385

Problem:
SM1 bring up

Solution:
modify usb dts for SM1 bringup

Verify:
g12a

Test: pass

Change-Id: Ie6f2925315ce12b3ad2964cf85aa3f4cee4bf2a7
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
2019-05-07 16:00:39 +09:00
Yong Qin
7fb59a6c0b di: add di for sm1 bringup [1/1]
PD#SWPL-5865

Problem:
SM1 bring up

Solution:
add the chipid

Verify:
sm

Change-Id: I9b738efea210b4fb3deb2dab9de6a443aabadb53
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
	drivers/amlogic/media/deinterlace/deinterlace_dbg.c
	drivers/amlogic/media/deinterlace/deinterlace_hw.c
	drivers/amlogic/media/deinterlace/nr_drv.c
2019-05-07 16:00:39 +09:00
Jianxiong Pan
cfef1b4202 dts: add dts-id for sm1 and g12a_u200. [1/1]
PD#SWPL-5865

Problem:
add dts-id for sm1 and g12a.

Solution:
sm1_ac200_2g
g12a_u200_1g
g12a_u200_2g

Verify:
no test.

Change-Id: Id09b2b811529d11b85898e5f3e83f558dc7ba5f6
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2019-05-07 16:00:39 +09:00
Hanjie Lin
fc8ea3186c dts: arm: disable cpu idle [1/1]
PD#SWPL-5865

Problem:
SM1 bring up

Solution:
cpu idle has not ready, disable it

Verify:
AC200

Change-Id: I5dd4bf8d2940587b10b8c85ff64122ce931bfb85
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
2019-05-07 16:00:39 +09:00
zhiqiang liang
6c00d8ec59 cpu: add the cpuid check interface [1/1]
PD#SWPL-5865

Problem:
SM1 bring up

Solution:
add the cpuid check interface

Verify:
AC200

Change-Id: Ifa7dd8fb0b6ec621411652acf6b799e69c4069b7
Signed-off-by: zhiqiang liang <zhiqiang.liang@amlogic.com>
2019-05-07 16:00:39 +09:00
zhiqiang liang
fc7eb1d66f dts: modify the dts for skt and ac200 board [1/1]
PD#SWPL-5865

Problem:
SM1 bring up

Solution:
modify the dts for skt and ac200 board

Verify:
AC200

Change-Id: I5e5d52329d7a190ad2b4bd967be837b4ae91ea11
Signed-off-by: zhiqiang liang <zhiqiang.liang@amlogic.com>
2019-05-07 16:00:39 +09:00
zhiqiang liang
17dc33e8fa dts: add the chipid for sm1 bringup [1/1]
PD#SWPL-5865

Problem:
SM1 bring up

Solution:
add the chipid

Verify:
PxP

Change-Id: I7164a4fff39932f81de1b5c4404f1ad0d878484c
Signed-off-by: zhiqiang liang <zhiqiang.liang@amlogic.com>
2019-05-07 16:00:39 +09:00
Jianxiong Pan
0793ab5ba2 dts: sm1: add sm1_s905d3_ac200 and sm1_s905d3_skt dts. [1/1]
PD#SWPL-5865

Problem:
add sm1 dts.

Solution:
copy from g12a_s905d2_u200.dts.

Verify:
no.

Change-Id: Idcd997d2c1a52a247c55ad41b557941314dfcb2c
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2019-05-07 16:00:39 +09:00
zhiqiang liang
6b98de6bf7 dts: add the partition info for sm1 bringup [1/1]
PD#SWPL-5865

Problem:
SM1 bring up

Solution:
add the partition info

Verify:
PxP

Change-Id: I779369d92780f9380cb634a90cabb012df11859d
Signed-off-by: zhiqiang liang <zhiqiang.liang@amlogic.com>
2019-05-07 16:00:39 +09:00
Jiyu Yang
c291f41621 dts: use mesong12a-bifrost instead [1/1]
PD#SWPL-5865

Problem:
SM1 bring up

Solution:
commit dts for SM1 bringup

Verify:
PxP

Change-Id: Ifdbc751e2fa9ecb3d747c114ac820ab60021294d
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
2019-05-07 16:00:39 +09:00
zhiqiang liang
833ad2fcc4 dts: modify dts for SM1 bringup with SMP [1/1]
PD#SWPL-5865

Problem:
SM1 bring up

Solution:
modify dts for SM1 bringup with smp

Verify:
PxP

Change-Id: Ie83ad7434acfb8c6232a8e373dfc63ef0ba9b87e
Signed-off-by: zhiqiang liang <zhiqiang.liang@amlogic.com>
2019-05-07 16:00:39 +09:00
zhiqiang liang
cf095cbe70 dts: rename dts for SM1 bringup [1/1]
PD#SWPL-5865

Problem:
SM1 bring up

Solution:
rename dts for SM1 bringup

Verify:
PxP

Change-Id: I991b6a0fb65cf9a03c6cb75a1ad8823a067e6bdd
Signed-off-by: zhiqiang liang <zhiqiang.liang@amlogic.com>
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2019-05-07 16:00:39 +09:00
zhiqiang liang
29b10cbe88 dts: commit dts for SM1 bringup [1/1]
PD#SWPL-5865

Problem:
SM1 bring up

Solution:
commit dts for SM1 bringup

Verify:
PxP

Change-Id: Id117d7ff130c67feb8ca04657d8a4ad463793fed
Signed-off-by: zhiqiang liang <zhiqiang.liang@amlogic.com>
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>

Conflicts:
	MAINTAINERS
2019-05-07 16:00:39 +09:00
long yu
1399a1ff40 storage: emmc: Compatible with G12B revA and revB [1/1]
PD#SWPL-5575

Problem:
not Compatible with G12B version a and b

Solution:
add revA match-data

Verify:
G12B-W400 RevA and RevB

Change-Id: Iee09861f7b162ee0660ea12dab60a238a9ae6be5
Signed-off-by: long yu <long.yu@amlogic.com>
2019-05-07 16:00:39 +09:00
he.he
e067cec82a usb: revB usb EL compliance test [2/1]
PD#SWPL-4941

Problem:
EL27,28,29,31 failed in the el compliance test.
tl1 frameworks test result(USB20CV) failed.

Solution:
Change the parameters (0x10 and 0x38) of usb phy
to solve the el failed problem and modified the
dwc_otg_pcd_handle_enum_done_intr function to solve
the USB20CV failed problem.

Verify:
verify on revB

Test: Pass

Change-Id: I9d7dc6472f95c6bcdf2c031222db4fed25be8a13
Signed-off-by: he.he <he.he@amlogic.com>
2019-05-07 16:00:39 +09:00
Nan Li
f64eb7fe5e sdio: set sdio hs mode co_phase [1/1]
PD#SWPL-5152

Problem:
Setup time in sdio highspeed mode of g12a is
inconsistent with the protocol standard.

Solution:
set co_phase = 2.

Verify:
u212

Change-Id: Ifc4576ce83c810c2ae5cbd57fe53d12959a9acca
Signed-off-by: Nan Li <nan.li@amlogic.com>
2019-05-07 16:00:39 +09:00
Luan Yuan
c1c5ab56e3 config: replace stack protector config [1/1]
PD#SWPL-4617

Problem:
CONFIG_CC_STACKPROTECTOR_STRONG will increase stack size for some large
functions and may cause stack overflow problems or increase real stack
usage after we have enabled VMAP STACK config. But direct remove it
from defconfig will cause CTS fail.

Solution:
using CONFIG_CC_STACKPROTECTOR_STRONG_AMLOGIC for real stack protect
config

Verify:
p212

Change-Id: Ic7d205459523f6156b1014f139b4da31068165ae
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2019-05-07 16:00:39 +09:00
Hong Guo
e0de0ce353 cpufreq: set fixpll to 1G when cpufreq init. [1/1]
PD#SWPL-5392

Problem:
set fixpll to 1G when cpufreq init.

Solution:
set fixpll to 1G when cpufreq init.

Verify:
test pass on A311D-W400

Change-Id: I65eb70b86eca5192f8d153ac59a24a03d6018421
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
2019-05-07 16:00:39 +09:00
Brian Zhu
90e7a85509 vpp: disable vd2 again if the last vframe is MVC [1/1]
PD#SWPL-4003

Problem:
VD2 keep displaying after keep last frame for mvc streaming

Solution:
check the last frame type and disable vd2 again

Verify:
verify by tl1

Change-Id: Ia2b598331e8f65c02974d41c498408bee40a407e
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2019-05-07 16:00:39 +09:00