Commit Graph

646457 Commits

Author SHA1 Message Date
Qiufang Dai
586a0e481e clk: add clkmsr for g12b
PD#165090: add clkmsr for g12b

Change-Id: I320b0759b5f3f57e8683ec5732f6660df1f0e052
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-06-28 23:54:41 -07:00
Qiufang Dai
6c937ab673 clk: add sys1_pll/sys_pll for g12b
PD#165090: Add sys1_pll/sys_pll for g12b

These patch is compatible with g12a.

clk structur:

G12A: sys_pll(0xbd) ----> cpu_mux(0x67) ---> A53
G12B: sys1_pll(0xe0) ----> cpu_mux(0x67) ---> A53
      sys_pll(0xbd) ----> cpu_mux1(0x82) ---> A73

Change-Id: I67b508f216db6124885154ea09ccb4868834e772
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-06-28 23:54:17 -07:00
bichao.zheng
9bca4ec549 pwm: pwm driver compatible with g12b
PD#165090: pwm: pwm driver compatible with g12b

pwm driver compatible with g12b,enable pwm controller pwm_AO_cd
pwm_ab pwm_ef for dvfs and wifi.

Change-Id: If65c4b5239ee0a4f4409aa85d9481645b44521e9
Signed-off-by: bichao.zheng <bichao.zheng@amlogic.com>
2018-06-28 23:53:46 -07:00
Brian Zhu
18a70d31da vpp: enable amvideo module for g12b
PD#165090: vpp: enable amvideo module for g12b

Change-Id: Ifef976077e2578585aa02719bc85a67bc3c19185
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2018-06-28 23:53:01 -07:00
Nan Li
6a4d63b6d6 sd: add mmc supported on g12b
PD#165090: emmc highspeed, sd highspeed.

Change-Id: Ia3899a29a97e354ec75943e21f7b1e4077f3376e
Signed-off-by: Nan Li <nan.li@amlogic.com>
2018-06-28 23:52:38 -07:00
Jian Hu
968e807f33 arm64: dts: g12b: add i2c devicetree
PD#165090: arm64: dts: g12b: add i2c devicetree

Change-Id: I289d5b71ae0dc1080cb6c9e56c786a1937e124d6
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2018-06-28 23:49:46 -07:00
Jian Hu
5cdd52e2f0 i2c: add support for g12b
PD#165090: i2c: add support for g12b

Change-Id: I2240e361dff3e3d56898ffb4f43c1ad4cadd3912
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2018-06-28 23:48:50 -07:00
Yi Zhou
e0e879114f hdmitx: bringup for g12b to g12b3
PD#165090: hdmitx: bringup for g12b to g12b3

add g12b ic_type

Change-Id: I2b6871fc228a04dfffe0c5a0131b38a4cfbf6c64
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2018-06-28 23:46:04 -07:00
Yue Wang
02d17cfc98 dts: add usb/pcie/ethernet/uart dts config on g12b skt
PD#165090: add usb/pcie/ethernet/uart dts config on g12b skt

Change-Id: Idba2f66ccac904564f49427269474ec27499a58e
Signed-off-by: yue wang <yue.wang@amlogic.com>
2018-06-28 23:45:46 -07:00
Huan Biao
655d35ff62 thermal: enable thermal sensor for g12b
PD#165090: thermal: enable g12b thermal sensor dts

Change-Id: Ia7dbdf0330bacbd50bc1f1c599abac439ff38985
Signed-off-by: Huan Biao <huan.biao@amlogic.com>
2018-06-28 23:45:08 -07:00
Qiufang Dai
f6739bf8ea clk: add g12b.c for g12b new clocks
PD#165090: add g12b.c for new clocks, include sys1_pll

Change-Id: If9234037eab5439cf1abfbcecc70c9f4eab6c954
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
2018-06-28 23:44:40 -07:00
Qiufang Dai
1b5fcd9e9c dts: add g12b skt dts
PD#165090: add g12b skt a311d dts

Change-Id: Icdb5f8aea3d83d74731c7828986bac01da39c7bb
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-06-28 23:43:55 -07:00
Hong Guo
250ad910e8 CPUFREQ: add cpufreq dts config for g12b.
PD#165090: cpufreq: add cpufreq dts config for g12b.

Change-Id: I5478b967d14a574a3b435743363cdb23969b38e9
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
2018-06-28 23:43:02 -07:00
kele bai
e3a10297e5 di: add madi&mcdi&nr4 for g12b
PD#165090: di: add madi&mcdi&nr4 for g12b

Change-Id: Icebb9761915e005afca90974efc9c96d0d8b0c63
Signed-off-by: kele bai <kele.bai@amlogic.com>
2018-06-28 23:42:27 -07:00
pengcheng chen
8757969ec1 osd: add mali-afbc frame reset for g12b
PD#165090: osd: add mali-afbc frame reset for g12b

Change-Id: If0176807a1a845a1eebb6c53ad05fdff2e5a1654
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2018-06-28 23:41:19 -07:00
Xingyu Chen
f1b8fec674 pinctrl: add extra pin-groups for g12b
PD#165090: pinctrl: add extra pin-groups for g12b

The pins on G12B are compatible with the G12A, but it introduces
extra mux function for a few of pins.

Change-Id: I686a952b85dd014cc9de95364dd7dec4e1a53ee7
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2018-06-28 23:40:53 -07:00
Brian Zhu
0daf159af2 vpp: enable the video data path for g12b
PD#165090: vpp: enable the video data path for g12b

Change-Id: I35fd1e61d97d4d416f70f954c58217b70740e6f3
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2018-06-28 23:40:29 -07:00
Qiufang Dai
bdd48e2a31 media: adds the register ops for g12b
PD#165090: adds the register ops for g12b

Change-Id: Id7bb271934e5826b65fbf992dff9798fb6323e40
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-06-28 23:39:44 -07:00
pengcheng chen
c9c71e27e5 osd: bringup for g12b
PD#165090: osd: bringup for g12b

Change-Id: Ib1f721f695482a90716273555c7802a925145227
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2018-06-28 23:39:08 -07:00
Evoke Zhang
2b7cfbd712 vpu: add g12b support
PD#165090: vpu: add g12b support

Change-Id: I16fcd32700a5868209cd30563435b54f27a157a5
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-06-28 23:38:22 -07:00
Qiufang Dai
0bc5df5436 clk: add sys1_pll for g12b
PD#165090: add sys1_pll for g12b

Change-Id: Icc1be3df1ca9ba2863ce49e0acf0be872e2dd411
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-06-28 23:34:39 -07:00
Qiufang Dai
eb3669cf00 cpuver: g12b: add cpuversion api for g12b
PD#165090: add cpuversion api for g12b

Change-Id: I64a5edb8953258b2033fe6aab05e75890ff7e9ae
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-06-28 23:34:00 -07:00
Yi Zhou
b7d80224c5 hdmitx: bringup for g12b
PD#165090: hdmitx: bringup for g12b

1. update address of RESET0_REGISTER
2. open hdmitx function

Change-Id: I4878d25109058c67046003dc349572df2bb991a2
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2018-06-28 23:28:37 -07:00
jianxin.pan
959e21e6be sched: eas support
PD#165090: EAS support on g12b

Change-Id: Ic816ddef61e80f39944251f67ca8ebb2cb36f8ae
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
2018-06-28 23:27:41 -07:00
Yan Wang
c198fa6e33 dts: g12b: initial add g12b
PD#165090: initial add g12b

initial G12B dts for bringup.

Change-Id: If7c390b2139055f637fb17fb4e3ce0acd71a6f17
Signed-off-by: Yan Wang <yan.wang@amlogic.com>
2018-06-28 22:46:37 -07:00
Brian Zhu
7c4efb6798 vpp: set vd & afbc's hold lines as vpp hold lines
PD#168549: vpp: set vd & afbc's hold lines as vpp hold lines

Change-Id: Ie5c1690ec57408d3650b8ad8a2538490edbd7430
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2018-06-25 03:24:21 -07:00
Evoke Zhang
cd2fe3ed40 vpu: code coverity fix
PD#168737: vpu: code coverity fix

Change-Id: Icbeb972a7022531c9146559046c1bddd28f44ab3
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-06-24 22:29:29 -07:00
yicheng shen
83b57322e1 hdmirx: fix coverity errors
PD#167692: hdmirx: fix coverity errors

Change-Id: I685ff24dc791a2bfd233c7f6db3ce23bf6744207
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
2018-06-24 18:57:18 -07:00
Nan Li
36f8db78fa emmc: add tuning retry.
PD#167389: add tuning retry when tuning points num == clk_div.

Change-Id: I9cc68c9c69c1aad55e8cc916a5d5a4f6441e3ace
Signed-off-by: Nan Li <nan.li@amlogic.com>
2018-06-22 00:23:15 -07:00
Long Yu
37111ed5fb emmc: Optimized hs200 mode with the known latest data line
PD#165333: emmc: Optimized hs200 mode with the known latest data line

Change-Id: Ic1581dbfbadda8e14879beabb4f7ae4a4a30546f
Signed-off-by: Long Yu <long.yu@amlogic.com>
2018-06-22 00:17:38 -07:00
Jihong Sui
9240c65d9d dtv_demod: fix atsc search bug and clear coverity warning
PD#168297: fix atsc search bug
1. change j83/atsc search mechanism;
2. delet 'set_frontend' in dvb_fronten.c
3. clear coverity warning;

Change-Id: I9f9905ce88dea435a9d7ac46617ea34786a0b176
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
2018-06-21 22:52:53 -07:00
shuanglong.wang
e152cfd028 video: Add pulldown pattern metrics pick from bug168503
PD#168503: video: Add pulldown pattern metrics
[Problem]
The 3:2,2:2,4:1 pulldown metrics information added in
framework
does not cover the cases for 4K, secure playback and tunnel mode.

[Solution]
Add the 3:2,2:2,4:1 pulldown metrics information in video
display driver from kernel space.

Change-Id: I2e09a797b1114bf9d6e2bdc07025a8f065f03635
Signed-off-by: shuanglong.wang <shuanglong.wang@amlogic.com>
2018-06-21 22:34:48 -07:00
Huan Biao
788157e181 ring: ring: add osc ring efuse info get cmd for g12 [3/3]
PD#165091:

Problem:
no osc ring efuse info

Solution:
add g12 osc ring efuse info get cmd

Verify:
g12 skt

Change-Id: I5adf6efd9787a6afeea38e959105f4a273a82bad
Signed-off-by: Huan Biao <huan.biao@amlogic.com>
2018-06-21 19:02:41 -07:00
pengcheng chen
d2bbcddb71 osd: fix dfbshow display error in none 1080p mode
PD#168740: osd: fix dfbshow display error in none 1080p mode

Change-Id: Ia196cd2635d8cee1b62abd1793c1679b9674578e
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2018-06-21 04:52:28 -07:00
Yixun Lan
622c221d7d network: enable UDP socket monitoring
PD#167119: network: enable UDP socket monitoring

this is need by VtsKernelNetTests, otherwise some test cases will fail

Error info:

testUdp (sock_diag_test.SockDestroyPermissionTest) ... skipped 'INET_UDP_DIAG not enabled'
testClosesUdpSockets (sock_diag_test.SockDestroyUdpTest) ... skipped 'INET_UDP_DIAG not enabled'
testReadInterrupted (sock_diag_test.SockDestroyUdpTest)
Tests that read() is interrupted by SOCK_DESTROY. ... skipped 'INET_UDP_DIAG not enabled'
testSocketAddressesAfterClose (sock_diag_test.SockDestroyUdpTest) ... skipped 'INET_UDP_DIAG not enabled'

Change-Id: I732f8d654a476614308992c756d5c8a8711bbbc9
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
2018-06-21 01:41:23 -07:00
Yixun Lan
58c13404df network: enable VTI option
PD#167119: network: enable VTI option

this is need by VtsKernelNetTests, otherwise some test cases will fail

Error info:
ERROR: testAddVti (xfrm_tunnel_test.XfrmAddDeleteVtiTest)
Test the creation of a Virtual Tunnel Interface.

Change-Id: I19b05d7684ab97245f02384c4f50cee349f76131
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
2018-06-21 01:40:58 -07:00
Yixun Lan
10a47ac88d crypto: enable sha512 algorithm
PD#167119: crypto: enable sha512 algorithm

this is need by VtsKernelNetTests, the xfrm test case
will require this option to work, otherwise will fail

errors info:
testSocketPolicySimple_cbc-aes_192_hmac-sha512_512_256_IPv4_TCP (xfrm_algorithm_test.XfrmAlgorithmTest) ... ERROR
testSocketPolicySimple_cbc-aes_192_hmac-sha512_512_256_IPv4_UDP (xfrm_algorithm_test.XfrmAlgorithmTest) ... ERROR
testSocketPolicySimple_cbc-aes_192_hmac-sha512_512_256_IPv6_TCP (xfrm_algorithm_test.XfrmAlgorithmTest) ... ERROR
testSocketPolicySimple_cbc-aes_192_hmac-sha512_512_256_IPv6_UDP (xfrm_algorithm_test.XfrmAlgorithmTest) ... ERROR
testSocketPolicySimple_cbc-aes_192_hmac-sha512_512_512_IPv4_TCP (xfrm_algorithm_test.XfrmAlgorithmTest) ... ERROR


Change-Id: I7f2502c4c76c09f00fe2719aac3f26b9b0d7f772
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
2018-06-21 01:40:26 -07:00
xuhua zhang
3a97fb42ca tvin: coverity fix
PD#168718: tvin: coverity fix

Change-Id: I196de9ae44fc443f5cb7050fad92bea9cd138c8a
Signed-off-by: xuhua zhang <xuhua.zhang@amlogic.com>
2018-06-21 00:29:18 -07:00
Yi Zhou
f559e41f2a hdmitx: clean up deadcode
PD#168723: hdmitx: clean up deadcode

Change-Id: I9e9267d748ee002f76e70c0634d43cfaba333988
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2018-06-21 00:27:36 -07:00
weijia.zhu
deddcbc9e5 audio: turn some log into debug mode
PD#168597: disable hdmi plugin log print

Change-Id: Ie6731ef35d17f12ad2e696d1f186350d58fda52e
Signed-off-by: weijia.zhu <weijia.zhu@amlogic.com>
2018-06-20 23:05:01 -07:00
Jianxin Qin
aefab40d70 usb: phy2: modify tuning sequence for aml-phy
PD#164286: usb: phy2: modify tuning sequence for aml-phy

The firt two steps of PHY tuning sequence only need to do once, so
we move them to initial function.

Change-Id: Ib6e0daa429aeea17007130a001d7fc0905307c1e
Signed-off-by: Jianxin Qin <jianxin.qin@amlogic.com>
2018-06-20 21:33:04 -07:00
Matthew Shyu
e9cdacdc34 crypto: aml-dma: fix errors found in coverity check
PD#168725: fix errors found in coverity check

Change-Id: I7528dc0c6122d32e3f2937a4b1869031d10851af
Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>
2018-06-20 21:11:11 -07:00
Shuai Li
f669cda618 audio: fix lineout L/R phase diff 7 degree issue
PD#168345: audio: fix lineout L/R phase diff 7 degree issue

Change-Id: I6768b9fc8324baf00a9b759f7a6e3faea2695371
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
2018-06-20 06:29:58 -07:00
Huan Biao
2b1ebf192a clk: ringmsr: add osc ring msr for g12 [1/1]
PD#165091:

Problem:
no osc ring msr function

Solution:
add g12 osc ring msr code

Verify:
g12 skt

Change-Id: I1fc9292b750cd402f81d3a0d6d8206cea94098b6
Signed-off-by: Huan Biao <huan.biao@amlogic.com>
2018-06-20 03:49:05 -07:00
Nian Jing
caebb4cabc cvbsout: cvbsout/vdac coverity fix
PD#168730: coverity fix

Change-Id: I0753c4ae9a4eed14a46a1f2bcda4cc11fbb0b351
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-06-20 02:56:57 -07:00
Yu Tu
bc3d4d89e6 uart: fix support sysrq function. [1/1]
PD#167742: uart: support sysrq

Change-Id: I67b183942047428a3aea35cbcf8ffae490319ac8
Signed-off-by: Yu Tu <yu.tu@amlogic.com>
2018-06-20 11:18:30 +08:00
Lei Yang
2aa3dc0fb1 hdmirx: fix HDCP CTS issues
PD#168221: hdmirx: fix HDCP CTS issues

1. disable hdcp 1.1 feature && fastreauth function.
2. ignore dvi recovery logic when aksv was received.

Change-Id: I48c37d4b7e0da7309c743052e16b0d607daa4110
Signed-off-by: Lei Yang <lei.yang@amlogic.com>
2018-06-19 19:50:26 -07:00
MingLiang Dong
82b02c99d8 hdr: optimize hdr/hlg effect
PD#167989: hdr: optimize hdr/hlg effect

1. fix hdr->sdr exposure
2. fix hlg->hdr abnormal image

Change-Id: Ia72178084335940d4d6984f07c7b9d7b7025b5e8
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2018-06-19 07:19:14 -07:00
Matthew Shyu
7ad8db81e5 crypto: aml-dma: Enable HW crypto on G12A
PD#167825: Enable HW crypto on G12A and rework sha driver

1. allocate atomic mem to avoid sleep
2. rework import and export function for fixing race conditions
3. rework hmac setkey to avoid HW bug
4. Use fallback on AES-192
5. passed all AES and SHA related tests in tcrypt

Change-Id: I1c0dcbbad025f0d8d7c16f921948a8cb6d4b2548
Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>
2018-06-19 17:00:40 +08:00
kieth liu
ea5ec8a557 video: add sysfs video_inuse for vfm map share[1/9]
PD#165474: add sysfs video_inuse for vfm map share

Change-Id: Ic226eaf89cbd55dae14532b3c291485a8585b933
Signed-off-by: kieth liu <kieth.liu@amlogic.com>
2018-06-19 00:54:48 -07:00