platform/kernel/linux-amlogic.git
6 years agoge2d: enhanced hsc adv num
zhilei.wu [Thu, 7 Jun 2018 11:10:14 +0000 (19:10 +0800)]
ge2d: enhanced hsc adv num

PD#165090: ge2d: enhanced hsc adv num

Change-Id: Ib4026d6883e70ddf38ab4d093fd37827b98f6c5e
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
6 years agogdc: add gdc driver
Jiyu Yang [Wed, 6 Jun 2018 13:20:34 +0000 (21:20 +0800)]
gdc: add gdc driver

PD#165090: gdc add platform drivers base on the arm release.
TODO use v4l2 m2m device driver rewrite.

Change-Id: I1943f762041d005c17abd9b803b69ef68b08d290
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
6 years agovpp: enable pps last line dummy fixing for g12b
Brian Zhu [Fri, 8 Jun 2018 11:00:43 +0000 (19:00 +0800)]
vpp: enable pps last line dummy fixing for g12b

PD#165090: vpp: enable pps last line dummy fixing for g12b

Change-Id: I276d34c1864c4d5265162c6af092b63e1a92efb9
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agoG12B: clock: fix mipi_csi_phy clk parent error
Shunzhou Jiang [Thu, 7 Jun 2018 09:26:12 +0000 (17:26 +0800)]
G12B: clock: fix mipi_csi_phy clk parent error

PD#165090: clock: Change parent clk name

Change-Id: Ib2a3416481f828e6ddb93ffaf6dc1dd26a2f6d78
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
6 years agodv: enable dolby vision driver
zhilei.wu [Wed, 6 Jun 2018 12:39:38 +0000 (20:39 +0800)]
dv: enable dolby vision driver

PD#165090: dv: enable dolby vision driver

Change-Id: If4e0f899dbf57a179180ee994af2ddaed25c71ed
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
6 years agobase: add CONFIG_AMLOGIC_MODIFY for EXPORT_SYMBOL
Jiacheng Mei [Wed, 6 Jun 2018 08:00:41 +0000 (16:00 +0800)]
base: add CONFIG_AMLOGIC_MODIFY for EXPORT_SYMBOL

PD#165090: EXPORT_SYMBOL for dma_alloc_from_contiguous && dma_release_from_contiguous

Change-Id: I99720292a02e3f3939bd3ad274daa82d8bc485b2
Signed-off-by: Jiacheng Mei <jiacheng.mei@amlogic.com>
6 years agoG12B: NANOQ: nanoq dts and clock tree modify
xingwei.zhou [Tue, 5 Jun 2018 08:15:44 +0000 (16:15 +0800)]
G12B: NANOQ: nanoq dts and clock tree modify

PD#165090: NANOQ: modify a311d platform dts and add nanoq clock tree

Change-Id: I62419ade33c2e10a03d12f1fe26f7f54a44364a4
Signed-off-by: xingwei.zhou <xingwei.zhou@amlogic.com>
6 years agovpu: udpate vpu mem_pd control for g12b
Evoke Zhang [Mon, 4 Jun 2018 06:10:14 +0000 (14:10 +0800)]
vpu: udpate vpu mem_pd control for g12b

PD#165090: vpu: udpate vpu mem_pd control for g12b

Change-Id: I7ac907d8b00e2ef0884082c3a56afc6b66dd00d5
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agoviu2: add viu2 rotate
pengcheng chen [Mon, 4 Jun 2018 10:10:25 +0000 (18:10 +0800)]
viu2: add viu2 rotate

PD#165090: viu2: add viu2 rotate

Change-Id: Ib9804f7113a8da9fd97c653fcf367b46db5af778
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agocvbs: add cvbs support for g12b
Nian Jing [Mon, 28 May 2018 09:15:24 +0000 (17:15 +0800)]
cvbs: add cvbs support for g12b

PD#165090: g12b cvbs

Change-Id: I04c26993d96af570a9d3a3bbabd4211d706081b1
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
6 years agosd: optimize sd_uart support
Nan Li [Fri, 1 Jun 2018 03:35:21 +0000 (11:35 +0800)]
sd: optimize sd_uart support

PD#165090: optimize sd_uart pinmux dts.

Change-Id: I89b1d96dee01082d686a3517ef81d9c85e03f3c0
Signed-off-by: Nan Li <nan.li@amlogic.com>
6 years agoemmc: set co-phase 1 for Highspeed busmode
Long Yu [Thu, 31 May 2018 08:42:49 +0000 (16:42 +0800)]
emmc: set co-phase 1 for Highspeed busmode

PD#165090: emmc: set co-phase 1 for Highspeed busmode

Change-Id: Ia2d925121ee101eb3c706b79eae6b0464a3087e4
Signed-off-by: Long Yu <long.yu@amlogic.com>
6 years agoarm64: dts: g12b: enable saradc
Jian Hu [Thu, 31 May 2018 08:21:03 +0000 (16:21 +0800)]
arm64: dts: g12b: enable saradc

PD#165090: arm64: dts: g12b: enable saradc

Change-Id: If480dcec3c6eea7d32a480fdeadd7140626a7ec0
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
6 years agoMerge "base: EXPORT_SYMBOL for dma_alloc_from_contiguous && dma_release_from_contiguo...
Yixun Lan [Fri, 29 Jun 2018 07:15:36 +0000 (00:15 -0700)]
Merge "base: EXPORT_SYMBOL for dma_alloc_from_contiguous && dma_release_from_contiguous" into amlogic-4.9-dev

6 years agoMerge "arm64: dts: txlx: add the attestationkeybox of unifykey" into amlogic-4.9-dev
Bo Yang [Fri, 29 Jun 2018 07:15:28 +0000 (00:15 -0700)]
Merge "arm64: dts: txlx: add the attestationkeybox of unifykey" into amlogic-4.9-dev

6 years agobase: EXPORT_SYMBOL for dma_alloc_from_contiguous && dma_release_from_contiguous
Jiacheng Mei [Tue, 29 May 2018 07:22:58 +0000 (15:22 +0800)]
base: EXPORT_SYMBOL for dma_alloc_from_contiguous && dma_release_from_contiguous

PD#165090: EXPORT_SYMBOL for dma_alloc_from_contiguous && dma_release_from_contiguous

Change-Id: I3809ed9a393e99fad9c63e3cbc60003de2ed8748
Signed-off-by: Jiacheng Mei <jiacheng.mei@amlogic.com>
6 years agodefconfig: bypass Speculation and meltdown walkaround
jianxin.pan [Wed, 30 May 2018 07:09:00 +0000 (15:09 +0800)]
defconfig: bypass Speculation and meltdown walkaround

PD#165090: disable UNMAP_KERNEL_AT_EL0 and HARDEN_BRANCH_PREDICTOR

Change-Id: I5107b974669bb94d727a99e65df1cbed3b7613e6
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
6 years agoarm64: dts: txlx: add the attestationkeybox of unifykey
Chao Liu [Tue, 26 Jun 2018 02:24:05 +0000 (10:24 +0800)]
arm64: dts: txlx: add the attestationkeybox of unifykey

PD#167832: GTS AttestationRootHostTest test failed

Change-Id: Ife0e80ade487cb69a4f4871d2e83fedc8242b9ef
Signed-off-by: Chao Liu <chao.liu@amlogic.com>
6 years agosd: add sd_uart support on g12b
Nan Li [Wed, 30 May 2018 05:41:16 +0000 (13:41 +0800)]
sd: add sd_uart support on g12b

PD#165090: add sd_uart support on g12b.

Change-Id: Iee7c7a4ec0b2e5269561179779a6eeb3296f80d7
Signed-off-by: Nan Li <nan.li@amlogic.com>
6 years agodtsi: modify xtal_tick_en of uart for g12b
Yu Tu [Wed, 30 May 2018 02:52:17 +0000 (10:52 +0800)]
dtsi: modify xtal_tick_en of uart for g12b

PD#165090: dtsi: modify xtal_tick_en of uart

1.modify after xtal_tick_en = 2 (12MHz)
2.xtal_tick_en = 1 (8MHz)

Change-Id: I1ed4b45d367d3add8196b6d72016a4035464edc2
Signed-off-by: Yu Tu <yu.tu@amlogic.com>
6 years agodi: new mtn ctrl, nrds mif enable in pre ctrl
kele bai [Tue, 29 May 2018 11:30:52 +0000 (19:30 +0800)]
di: new mtn ctrl, nrds mif enable in pre ctrl

PD#165090: new mtn ctrl, nrds mif enable in pre ctrl

1) enable mtn ctrl addressed 0x170b
2) fix pre ctrl[11] for nrds mif enable

Change-Id: I1c125991520d2f4c12a5b6b473e52c752f26934d
Signed-off-by: kele bai <kele.bai@amlogic.com>
6 years agodts: add g12b_a311d_w400.dts
Qiufang Dai [Tue, 29 May 2018 09:20:53 +0000 (17:20 +0800)]
dts: add g12b_a311d_w400.dts

PD#165090: add g12b_a311d_w400.dts

Change-Id: I7f0c13e662abb0dea61a42f74f0db51190367ef7
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
6 years agodts: fb: fine-tune fb for 2G mem
Qiufang Dai [Tue, 29 May 2018 08:54:38 +0000 (16:54 +0800)]
dts: fb: fine-tune fb for 2G mem

PD#165090: fine-tune fb cma/alloc for 2G mem

Change-Id: Ibbe35435eef867b34b46f090791477663b56270d
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
6 years agoeas: update g12b sched eneryg data
jianxin.pan [Tue, 29 May 2018 04:58:57 +0000 (12:58 +0800)]
eas: update g12b sched eneryg data

PD#165090: update g12b sched energy model data

Change-Id: I27d4ef858c49098042efb97ad5e60c0256bfecdd
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
6 years agocpufreq: add core param to limit kernel boot cpufreq
jianxin.pan [Tue, 29 May 2018 06:10:23 +0000 (14:10 +0800)]
cpufreq: add core param to limit kernel boot cpufreq

PD#165090: add freqmax0 and freqmax1 to limit kernel boot cpufreq
add freqmax0=1000000 to bootargs, and boot freq of cluster0 will be
limited to 1G.

Change-Id: I5cb44727f74c574669663887473a80f87ddf61a7
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
6 years agosched: disable SD_WAKE_AFFINE
jianxin.pan [Mon, 28 May 2018 07:34:37 +0000 (15:34 +0800)]
sched: disable SD_WAKE_AFFINE

PD#165090: remove WAKE_AFFINE to get better balance when heavy loading

Change-Id: Id5650e9c3fd12b23be04f8f52a0f5c2e11c49199
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
6 years agodts: g12b add ionvideo
shihong.zheng [Tue, 29 May 2018 08:17:11 +0000 (16:17 +0800)]
dts: g12b add ionvideo

PD#165090: add ionvideo dev

Change-Id: I58bc04485c417cc1774cc642b06e94d897d10a54
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
6 years agolcd: add g12b support [2/2]
Evoke Zhang [Sat, 26 May 2018 08:06:16 +0000 (16:06 +0800)]
lcd: add g12b support [2/2]

PD#165090: lcd: add g12b support

Change-Id: I437dbe99cf0a1d9517e61be82e640c7a32dda42d
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agovdin/sr: add vdin/viu/sr support for g12b
Dezhi Kong [Sat, 26 May 2018 06:32:53 +0000 (14:32 +0800)]
vdin/sr: add vdin/viu/sr support for g12b

PD#165090: vdin/viu/sr: add vdin/viu/sr support for g12b

Change-Id: I74e3d879774cddba531498612d88d0642b4ac915
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
6 years agoPUFREQ: delete big core 1.896G.
Hong Guo [Tue, 29 May 2018 06:50:35 +0000 (14:50 +0800)]
PUFREQ: delete big core 1.896G.

PD#165090: cpufreq: delete big core  1.896G.

Change-Id: Ifd438722b67b22c604daabc0ded68d40893bb9a4
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
6 years agodts: g12b: enable cec
gongwei.chen [Tue, 29 May 2018 05:15:55 +0000 (13:15 +0800)]
dts: g12b: enable cec

PD#165090: dts: g12b: enable cec

Change-Id: I8c6a173b255e02de2d3d1341ad616d7f86decf6e
Signed-off-by: Gongwei Chen <gongwei.chen@amlogic.com>
6 years agoemmc: support emmc HS200 for G12B
Long Yu [Mon, 28 May 2018 14:18:00 +0000 (22:18 +0800)]
emmc: support emmc HS200 for G12B

PD#165090: emmc: support emmc HS200 for G12B

Change-Id: I04d63f64b99f429b3c184555124ea6cbc8761199
Signed-off-by: Long Yu <long.yu@amlogic.com>
6 years agoosd_drm: osd drm for g12b bring up
pengcheng chen [Mon, 28 May 2018 12:25:50 +0000 (20:25 +0800)]
osd_drm: osd drm for g12b bring up

PD#165090: osd drm for g12b bring up

Change-Id: Id69a152b22ba3e408d20fa494b9475c9ad3797de
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agodts: g12b: enable g12b cooldev
Huan Biao [Mon, 28 May 2018 08:25:14 +0000 (16:25 +0800)]
dts: g12b: enable g12b cooldev

PD#165090: thermal: enable g12b thermal cooldev

Change-Id: I2decf4844a9eeddc9f8187d23bc989be87ef7d14
Signed-off-by: Huan Biao <huan.biao@amlogic.com>
6 years agounifykey: add node in dts and enble it by default
jiamin ma [Mon, 28 May 2018 02:39:13 +0000 (10:39 +0800)]
unifykey: add node in dts and enble it by default

PD#165090: g12b bring up

Change-Id: Iffdc15cf07ed29169a8ee2bdf1c6d6faca626279
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
6 years agoCPUFREQ: add big core cpufreq dts config for g12b.
Hong Guo [Mon, 28 May 2018 08:43:37 +0000 (16:43 +0800)]
CPUFREQ: add big core cpufreq dts config for g12b.

PD#165090: cpufreq: add big corecpufreq dts config for g12b.

Change-Id: I5fc15d84df79ebd1267a59269f3a1d40e2e53651
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
6 years agoclk: add media clk and fine-tune clkmsr table for g12b
Qiufang Dai [Sun, 27 May 2018 10:11:34 +0000 (18:11 +0800)]
clk: add media clk and fine-tune clkmsr table for g12b

PD#165090: add clock isp, mipi, vipnanoq, gate etc.
Fine-tune clkmsr table

Change-Id: I4b15996eccac439ce91ac51365411fca7c38f320
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
6 years agodts: change g12b skt memsize to 2G
Qiufang Dai [Sun, 27 May 2018 09:55:19 +0000 (17:55 +0800)]
dts: change g12b skt memsize to 2G

PD#165090: change g12b memsize from 1G to 2G

Change-Id: Iea14e894ad8dae87aaf32aa258de774c8e3b12f5
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
6 years agoosd: bringup for g12b
pengcheng chen [Fri, 25 May 2018 12:48:40 +0000 (20:48 +0800)]
osd: bringup for g12b

PD#165090: osd: bringup for g12b

1. add g12b version type
2. init VPP_OFIFO_SIZE

Change-Id: Ia72964ceefd28fb9a536d8362b2fc53ecbb91207
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agodts: g12b: disable wifi temp for Android launch
gongwei.chen [Sun, 27 May 2018 07:05:41 +0000 (15:05 +0800)]
dts: g12b: disable wifi temp for Android launch

PD#165090: G12B bring up

Change-Id: I031fd49bd29052c5d83508a6e63a0f5b6a97e9fa
Signed-off-by: Gongwei Chen <gongwei.chen@amlogic.com>
6 years agocpufreq: remove 1896M for A73
jianxin.pan [Sat, 26 May 2018 15:52:58 +0000 (23:52 +0800)]
cpufreq: remove 1896M for A73

PD#165090: remove 1896M for A73, it cause panic

Change-Id: Iae806a4597d5c3bb071585ace05b45b2dfa89ff6
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
6 years agoemmc: enable emmc driver
Long Yu [Sat, 26 May 2018 14:19:59 +0000 (22:19 +0800)]
emmc: enable emmc driver

PD#165090: emmc: enable emmc driver

Change-Id: Ifd4549e03d57c486a4f742fea68aad0aea0fa25a
Signed-off-by: Long Yu <long.yu@amlogic.com>
6 years agoarm64: dts: g12b: update i2c pin mux
Jian Hu [Sat, 26 May 2018 12:55:38 +0000 (20:55 +0800)]
arm64: dts: g12b: update i2c pin mux

PD#165090: arm64: dts: g12b: update i2c pin mux

1.add default drive-strength
2.add interal pull up

Change-Id: I061491372463d6b4f499594603837a6877179847
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
6 years agoCPUFREQ: add cpufreq dts config for g12b.
Hong Guo [Sat, 26 May 2018 09:34:23 +0000 (17:34 +0800)]
CPUFREQ: add cpufreq dts config for g12b.

PD#165090: cpufreq: add cpufreq dts config for g12b.

Change-Id: If03ef64bf55641c771f475884df348b52b867329
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
6 years agoaudio: add audio support for g12b
Shuai Li [Sat, 26 May 2018 09:05:15 +0000 (17:05 +0800)]
audio: add audio support for g12b

PD#165090: audio support added.

Change-Id: Ic6a52fa69a9f6c494bbd15de5964c5aca2a90672
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
6 years agodts: decoder enable for g12b
shihong.zheng [Sat, 26 May 2018 07:53:26 +0000 (15:53 +0800)]
dts: decoder enable for g12b

PD#165090: enable decoder/codec_mm/amstream in dts

Change-Id: I6d221bb98c83a0ccfd33c16cb021b0aeea7c37e3
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
6 years agonand: add mtd supported on g12b
Yonghui Yu [Sat, 26 May 2018 07:18:48 +0000 (15:18 +0800)]
nand: add mtd supported on g12b

PD#165090: mtd nand added.

Change-Id: Ib0bc0e8f42a5a7a54b01ef3ffa31945aed5eb944
Signed-off-by: Yonghui Yu <yonghui.yu@amlogic.com>
6 years agoclk: add clkmsr for g12b
Qiufang Dai [Sat, 26 May 2018 03:51:47 +0000 (11:51 +0800)]
clk: add clkmsr for g12b

PD#165090: add clkmsr for g12b

Change-Id: I320b0759b5f3f57e8683ec5732f6660df1f0e052
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
6 years agoclk: add sys1_pll/sys_pll for g12b
Qiufang Dai [Sat, 26 May 2018 03:31:36 +0000 (11:31 +0800)]
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>
6 years agopwm: pwm driver compatible with g12b
bichao.zheng [Sat, 26 May 2018 03:49:17 +0000 (11:49 +0800)]
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>
6 years agovpp: enable amvideo module for g12b
Brian Zhu [Sat, 26 May 2018 06:25:07 +0000 (14:25 +0800)]
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>
6 years agosd: add mmc supported on g12b
Nan Li [Fri, 25 May 2018 11:59:48 +0000 (19:59 +0800)]
sd: add mmc supported on g12b

PD#165090: emmc highspeed, sd highspeed.

Change-Id: Ia3899a29a97e354ec75943e21f7b1e4077f3376e
Signed-off-by: Nan Li <nan.li@amlogic.com>
6 years agoarm64: dts: g12b: add i2c devicetree
Jian Hu [Fri, 25 May 2018 11:04:11 +0000 (19:04 +0800)]
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>
6 years agoi2c: add support for g12b
Jian Hu [Fri, 25 May 2018 09:09:08 +0000 (17:09 +0800)]
i2c: add support for g12b

PD#165090: i2c: add support for g12b

Change-Id: I2240e361dff3e3d56898ffb4f43c1ad4cadd3912
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
6 years agohdmitx: bringup for g12b to g12b3
Yi Zhou [Thu, 24 May 2018 11:11:55 +0000 (19:11 +0800)]
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>
6 years agodts: add usb/pcie/ethernet/uart dts config on g12b skt
Yue Wang [Fri, 25 May 2018 06:22:33 +0000 (14:22 +0800)]
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>
6 years agothermal: enable thermal sensor for g12b
Huan Biao [Fri, 25 May 2018 08:16:15 +0000 (16:16 +0800)]
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>
6 years agoclk: add g12b.c for g12b new clocks
Qiufang Dai [Fri, 11 May 2018 09:31:59 +0000 (17:31 +0800)]
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>
6 years agodts: add g12b skt dts
Qiufang Dai [Fri, 25 May 2018 04:16:29 +0000 (12:16 +0800)]
dts: add g12b skt dts

PD#165090: add g12b skt a311d dts

Change-Id: Icdb5f8aea3d83d74731c7828986bac01da39c7bb
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
6 years agoCPUFREQ: add cpufreq dts config for g12b.
Hong Guo [Wed, 23 May 2018 08:50:53 +0000 (16:50 +0800)]
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>
6 years agodi: add madi&mcdi&nr4 for g12b
kele bai [Fri, 18 May 2018 10:48:20 +0000 (18:48 +0800)]
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>
6 years agoosd: add mali-afbc frame reset for g12b
pengcheng chen [Sat, 12 May 2018 07:46:26 +0000 (15:46 +0800)]
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>
6 years agopinctrl: add extra pin-groups for g12b
Xingyu Chen [Wed, 9 May 2018 09:05:14 +0000 (17:05 +0800)]
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>
6 years agovpp: enable the video data path for g12b
Brian Zhu [Thu, 10 May 2018 15:19:14 +0000 (23:19 +0800)]
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>
6 years agomedia: adds the register ops for g12b
Qiufang Dai [Mon, 7 May 2018 13:04:23 +0000 (21:04 +0800)]
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>
6 years agoosd: bringup for g12b
pengcheng chen [Fri, 4 May 2018 14:02:25 +0000 (22:02 +0800)]
osd: bringup for g12b

PD#165090: osd: bringup for g12b

Change-Id: Ib1f721f695482a90716273555c7802a925145227
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agovpu: add g12b support
Evoke Zhang [Mon, 7 May 2018 03:11:34 +0000 (11:11 +0800)]
vpu: add g12b support

PD#165090: vpu: add g12b support

Change-Id: I16fcd32700a5868209cd30563435b54f27a157a5
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agoclk: add sys1_pll for g12b
Qiufang Dai [Mon, 7 May 2018 06:29:49 +0000 (14:29 +0800)]
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>
6 years agocpuver: g12b: add cpuversion api for g12b
Qiufang Dai [Mon, 7 May 2018 03:37:14 +0000 (11:37 +0800)]
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>
6 years agohdmitx: bringup for g12b
Yi Zhou [Fri, 4 May 2018 07:39:05 +0000 (15:39 +0800)]
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>
6 years agosched: eas support
jianxin.pan [Sat, 28 Apr 2018 07:24:04 +0000 (15:24 +0800)]
sched: eas support

PD#165090: EAS support on g12b

Change-Id: Ic816ddef61e80f39944251f67ca8ebb2cb36f8ae
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
6 years agodts: g12b: initial add g12b
Yan Wang [Mon, 23 Apr 2018 07:37:16 +0000 (15:37 +0800)]
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>
6 years agovpp: set vd & afbc's hold lines as vpp hold lines
Brian Zhu [Thu, 21 Jun 2018 18:06:16 +0000 (02:06 +0800)]
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>
6 years agovpu: code coverity fix
Evoke Zhang [Wed, 20 Jun 2018 07:15:45 +0000 (15:15 +0800)]
vpu: code coverity fix

PD#168737: vpu: code coverity fix

Change-Id: Icbeb972a7022531c9146559046c1bddd28f44ab3
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agohdmirx: fix coverity errors
yicheng shen [Thu, 21 Jun 2018 11:32:22 +0000 (19:32 +0800)]
hdmirx: fix coverity errors

PD#167692: hdmirx: fix coverity errors

Change-Id: I685ff24dc791a2bfd233c7f6db3ce23bf6744207
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
6 years agoemmc: add tuning retry.
Nan Li [Fri, 22 Jun 2018 05:26:04 +0000 (13:26 +0800)]
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>
6 years agoemmc: Optimized hs200 mode with the known latest data line
Long Yu [Fri, 27 Apr 2018 09:48:15 +0000 (17:48 +0800)]
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>
6 years agodtv_demod: fix atsc search bug and clear coverity warning
Jihong Sui [Fri, 15 Jun 2018 07:57:10 +0000 (15:57 +0800)]
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>
6 years agovideo: Add pulldown pattern metrics pick from bug168503
shuanglong.wang [Tue, 19 Jun 2018 03:23:49 +0000 (11:23 +0800)]
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>
6 years agoring: ring: add osc ring efuse info get cmd for g12 [3/3]
Huan Biao [Thu, 7 Jun 2018 11:27:44 +0000 (19:27 +0800)]
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>
6 years agoosd: fix dfbshow display error in none 1080p mode
pengcheng chen [Thu, 21 Jun 2018 03:20:40 +0000 (11:20 +0800)]
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>
6 years agonetwork: enable UDP socket monitoring
Yixun Lan [Fri, 25 May 2018 06:42:19 +0000 (14:42 +0800)]
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>
6 years agonetwork: enable VTI option
Yixun Lan [Fri, 25 May 2018 06:20:56 +0000 (14:20 +0800)]
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>
6 years agocrypto: enable sha512 algorithm
Yixun Lan [Fri, 25 May 2018 05:50:50 +0000 (13:50 +0800)]
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>
6 years agotvin: coverity fix
xuhua zhang [Wed, 20 Jun 2018 03:35:24 +0000 (11:35 +0800)]
tvin: coverity fix

PD#168718: tvin: coverity fix

Change-Id: I196de9ae44fc443f5cb7050fad92bea9cd138c8a
Signed-off-by: xuhua zhang <xuhua.zhang@amlogic.com>
6 years agohdmitx: clean up deadcode
Yi Zhou [Wed, 20 Jun 2018 10:28:13 +0000 (18:28 +0800)]
hdmitx: clean up deadcode

PD#168723: hdmitx: clean up deadcode

Change-Id: I9e9267d748ee002f76e70c0634d43cfaba333988
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
6 years agoaudio: turn some log into debug mode
weijia.zhu [Tue, 19 Jun 2018 11:45:13 +0000 (19:45 +0800)]
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>
6 years agousb: phy2: modify tuning sequence for aml-phy
Jianxin Qin [Thu, 21 Jun 2018 03:21:56 +0000 (11:21 +0800)]
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>
6 years agocrypto: aml-dma: fix errors found in coverity check
Matthew Shyu [Tue, 19 Jun 2018 11:04:13 +0000 (19:04 +0800)]
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>
6 years agoaudio: fix lineout L/R phase diff 7 degree issue
Shuai Li [Fri, 15 Jun 2018 09:27:55 +0000 (17:27 +0800)]
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>
6 years agoclk: ringmsr: add osc ring msr for g12 [1/1]
Huan Biao [Thu, 7 Jun 2018 06:36:06 +0000 (14:36 +0800)]
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>
6 years agocvbsout: cvbsout/vdac coverity fix
Nian Jing [Wed, 20 Jun 2018 05:56:47 +0000 (13:56 +0800)]
cvbsout: cvbsout/vdac coverity fix

PD#168730: coverity fix

Change-Id: I0753c4ae9a4eed14a46a1f2bcda4cc11fbb0b351
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
6 years agouart: fix support sysrq function. [1/1]
Yu Tu [Wed, 20 Jun 2018 03:14:39 +0000 (11:14 +0800)]
uart: fix support sysrq function. [1/1]

PD#167742: uart: support sysrq

Change-Id: I67b183942047428a3aea35cbcf8ffae490319ac8
Signed-off-by: Yu Tu <yu.tu@amlogic.com>
6 years agohdmirx: fix HDCP CTS issues
Lei Yang [Tue, 12 Jun 2018 10:20:30 +0000 (18:20 +0800)]
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>
6 years agohdr: optimize hdr/hlg effect
MingLiang Dong [Tue, 12 Jun 2018 03:08:59 +0000 (11:08 +0800)]
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>
6 years agocrypto: aml-dma: Enable HW crypto on G12A
Matthew Shyu [Thu, 24 May 2018 08:23:42 +0000 (16:23 +0800)]
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>
6 years agovideo: add sysfs video_inuse for vfm map share[1/9]
kieth liu [Fri, 8 Jun 2018 07:51:56 +0000 (15:51 +0800)]
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>
6 years agowifi: mac80211 add p2p0 [5/6]
Weiguang Ruan [Thu, 14 Jun 2018 07:48:14 +0000 (15:48 +0800)]
wifi: mac80211 add p2p0 [5/6]

PD#168467: wifi: mac80211 add p2p0

softmac wifi need mac80211 to register cfg80211 interfaeces
wlan0 is default, add p2p0 for Android WIFI P2P

Change-Id: I6fd48f85e010a1ec9e35954b85205634312c73d9
Signed-off-by: Weiguang Ruan <Weiguang.ruan@amlogic.com>
6 years agoatv_demod: Fix audio always mute and unmute during ATV playing. [1/1]
nengwen.chen [Fri, 15 Jun 2018 06:52:20 +0000 (14:52 +0800)]
atv_demod: Fix audio always mute and unmute during ATV playing. [1/1]

PD#167378: Modify atv demod for audio driver get atv audio data.

Change-Id: I221c6a94d3756d5361c140fdc88f25b65e33d114
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
6 years agoosd: add osd reverse support with cursor
pengcheng chen [Tue, 5 Jun 2018 01:39:38 +0000 (09:39 +0800)]
osd: add osd reverse support with cursor

PD#165875: osd: add osd reverse support with cursor

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