GitHub/LineageOS/G12/android_kernel_amlogic_linux-4.9.git
6 years agoaudio: auge: only spdifin_event extcon for spdif_a in g12a
Xing Wang [Thu, 17 May 2018 06:29:18 +0000 (14:29 +0800)]
audio: auge: only spdifin_event extcon for spdif_a in g12a

PD#165680: audio: auge: only spdifin_event extcon for spdif_a in g12a

Change-Id: Ie8486dc460a9452dc8a0f26a2a5acce83ee7bf26
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
6 years agoamvecm: clean coverity errors
Bencheng Jing [Thu, 21 Jun 2018 03:17:23 +0000 (11:17 +0800)]
amvecm: clean coverity errors

PD#168792: amvecm: clean coverity errors

Change-Id: I1956c5e6b8bf3dff36e2820be4149f58dfa98f20
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
6 years agovpp: adjust vpp skip line limit for bandwidth
Dezhi Kong [Mon, 25 Jun 2018 08:20:58 +0000 (16:20 +0800)]
vpp: adjust vpp skip line limit for bandwidth

PD#167737: VPP: adjust vpp skip line limit for bandwidth

Change-Id: I18c4325750a3c266936db849e52d938adf00adda
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
6 years agoosd: fix not afbc ddr bandwidth too high issue
pengcheng chen [Tue, 26 Jun 2018 05:50:42 +0000 (13:50 +0800)]
osd: fix not afbc ddr bandwidth too high issue

PD#164816: osd: fix not afbc ddr bandwidth too high issue

Change-Id: I0108ccf8fd2564da2974e95d065811f9682d3bdc
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agovout_serve: code coverity fix
Evoke Zhang [Thu, 21 Jun 2018 05:23:55 +0000 (13:23 +0800)]
vout_serve: code coverity fix

PD#168799: vout_serve: code coverity fix

Change-Id: Id5358f4adc791980b14e2c22eff3443e9601a90e
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agoDRM: move irq request after crtc created.
sky zhou [Thu, 21 Jun 2018 04:49:06 +0000 (12:49 +0800)]
DRM: move irq request after crtc created.

PD#168985: fix vblank irq panic when crtc not created.

Change-Id: I369a8a0159549001ae0ef216391be730664a4690
Signed-off-by: sky zhou <sky.zhou@amlogic.com>
6 years agoWIFI: fix wifi disable issue when suspend [2/2]
Rongjun Chen [Mon, 25 Jun 2018 04:00:01 +0000 (12:00 +0800)]
WIFI: fix wifi disable issue when suspend [2/2]

PD#168416: increase the mem size

Change-Id: Ib5fac2941b870c6d3dcca320adef17893bb1ec78
Signed-off-by: Rongjun Chen <rongjun.chen@amlogic.com>
6 years agousb: phy2: recovery analog status in PHY initial function
Jianxin Qin [Tue, 26 Jun 2018 02:46:40 +0000 (10:46 +0800)]
usb: phy2: recovery analog status in PHY initial function

PD#164286: usb: phy2: recovery analog status during initial phase

If a USB device is enumerated done by Host, then the host system
reboot without power off, the AML USB PHY statue need to recovery,
or the USB device will be enumerated unsuccessfully.

Change-Id: If122e53b6a818be11be0ed6581ac485450244db0
Signed-off-by: Jianxin Qin <jianxin.qin@amlogic.com>
6 years agoosd: risk coverity bugs in osd module
pengcheng chen [Mon, 11 Jun 2018 03:00:08 +0000 (11:00 +0800)]
osd: risk coverity bugs in osd module

PD#168947: osd: risk coverity bugs in osd module

Change-Id: Ia593f55c1debbd5dca271461336edb29123fae00
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agoatv_demod: Add ATV NICAM. [1/5]
nengwen.chen [Thu, 7 Jun 2018 12:00:39 +0000 (20:00 +0800)]
atv_demod: Add ATV NICAM. [1/5]

PD#165624: Add ATV NICAM.

Change-Id: I2bcc018cd5ff7a611baa2f5473cfa1dbce28118d
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
6 years agovdin: fix hdmi input hlg video, vpp cannot get hlg flag
MingLiang Dong [Fri, 29 Jun 2018 06:55:50 +0000 (14:55 +0800)]
vdin: fix hdmi input hlg video, vpp cannot get hlg flag

PD#167991: vdin: fix hdmi input hlg video, vpp cannot get hlg flag

Change-Id: I9071d6fd956ea70bcfde7cb781ec687fb0a81021
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
6 years agoaudio: support raw data even in touch sound[1/2]
Xing Wang [Wed, 6 Jun 2018 02:55:57 +0000 (10:55 +0800)]
audio: support raw data even in touch sound[1/2]

PD#164738: audio: auge: check frddr src for each frddr

when output for raw data, disable the same frddrr src from other frddr

Change-Id: I930c84b0520ff404c6a323be79b26102699c817b
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
6 years agospicc: fix clk polarity error of amlogic driver
Sunny Luo [Mon, 2 Jul 2018 07:18:15 +0000 (15:18 +0800)]
spicc: fix clk polarity error of amlogic driver

PD#169301: spicc: fix clk polarity error of amlogic driver

Change-Id: Icb257e3394da94bd44cd78b63218161cfae63c69
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
6 years agocec: fix coverity code warning
Yong Qin [Thu, 21 Jun 2018 10:35:26 +0000 (18:35 +0800)]
cec: fix coverity code warning

PD#166957: cec: fix code coverity warning

Change-Id: Ic0671b76c0b9f1a1bb25d67c6e5255cba2a0835c
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
6 years agohdmitx: parsing the env of frac_rate_policy [2/2]
Kaifu Hu [Mon, 25 Jun 2018 11:53:57 +0000 (19:53 +0800)]
hdmitx: parsing the env of frac_rate_policy [2/2]

PD#165862: hdmitx: parsing the env of frac_rate_policy

Uboot add the env frac_rate_policy,and kernel pasring that.

Change-Id: I4db60059738cd15fd32d2def5a4330f14b9fb118
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
6 years agotvafe: atv default not support ntsc 50
Nian Jing [Fri, 22 Jun 2018 12:13:56 +0000 (20:13 +0800)]
tvafe: atv default not support ntsc 50

PD#167487: atv default not support ntsc 50

Change-Id: I723f2cf1b26056a4adef39eb76a22596ac878e69
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
6 years agotvafe: add hardware snow for txhd
Nian Jing [Wed, 27 Jun 2018 02:19:50 +0000 (10:19 +0800)]
tvafe: add hardware snow for txhd

PD#167605: add hardware snow for txhd

Change-Id: Ibd16773ddb304c813ed62ee14e828b30806f158a
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
6 years agomtd: avoid skip bad block in last part when add partition
Yi Zeng [Mon, 28 May 2018 10:32:48 +0000 (18:32 +0800)]
mtd: avoid skip bad block in last part when add partition

PD#167168: mtd: avoid skip bad block in last part when add partition

Change-Id: Ice1e8246f22dd0d275c9ffdb64dcf9f165097bab
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
6 years agohdmirx: optimize for devices which send signal slowly
Hang Cheng [Thu, 21 Jun 2018 04:20:25 +0000 (12:20 +0800)]
hdmirx: optimize for devices which send signal slowly

PD#168494: hdmirx: optimize for devices which send signal slowly

1.avoid rapid phy reset interference signal recognition
2.add 3d information parse of edid

Change-Id: Iafa38bad6907f287c0e021d5fb32d11e43c489a0
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
6 years agocec: clean cec task function
Yong Qin [Fri, 15 Jun 2018 06:05:23 +0000 (14:05 +0800)]
cec: clean cec task function

PD#168415: cec: clean cec rx buffer check

1.for new chip version, needn't check rx
buffer

Change-Id: Ieb49508f2563fd6212f97163d0fbb5b73c5486c5
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
6 years agodi: fix time out issue
Dezhi Kong [Thu, 21 Jun 2018 00:28:07 +0000 (08:28 +0800)]
di: fix time out issue

PD#167967: di: fix time out issue

Change-Id: Ic535742a4227704e289372401aa077290ddd1ed7
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
6 years agopicdec: enable yuv 444 output for txlx
Brian Zhu [Tue, 19 Jun 2018 14:09:47 +0000 (22:09 +0800)]
picdec: enable yuv 444 output for txlx

PD#168464: picdec: enable yuv 444 output for txlx

Change-Id: If19381ce88bf0f367fa5583b9d7045484ee22bf6
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agodebug: disable irq_check_en by default
jianxin.pan [Fri, 29 Jun 2018 09:46:53 +0000 (17:46 +0800)]
debug: disable irq_check_en by default

PD#165796: disable irq_check_en by default, because it may affect some
benchmark results.
It can be enabled by debugfs:
echo 1 > /sys/kernel/debug/lockup/irq_check_en

Change-Id: I6c39a9a6fc2f372eb71e0c1a0872865079e758cb
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
6 years agoosd: use f2v to calc osd pps filter
Brian Zhu [Fri, 22 Jun 2018 19:26:30 +0000 (03:26 +0800)]
osd: use f2v to calc osd pps filter

PD#167129: osd: use f2v to calc osd pps filter

Change-Id: I31fe220071269733b317bed87719843de30372dc
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agostb_dv: send the correct hdmi packet in dv/hdr/sdr mode
Brian Zhu [Thu, 17 May 2018 10:55:05 +0000 (18:55 +0800)]
stb_dv: send the correct hdmi packet in dv/hdr/sdr mode

PD#166555: stb_dv: send the correct hdmi packet in dv/hdr/sdr mode

hdmitx must clear hdr and dv enable bits when changing mode

Change-Id: I76131c8bdbf1f6a0144d481453f0fa18b3f558d1
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
6 years agoarm64: deconfig: smarthome: enable VOUT2_SERVE
Evoke Zhang [Fri, 29 Jun 2018 08:32:36 +0000 (16:32 +0800)]
arm64: deconfig: smarthome: enable VOUT2_SERVE

PD#165090: arm64: deconfig: smarthome: enable VOUT2_SERVE

Change-Id: I7e1e97aecbf95847e48de7f5e79acbf1cd75cd1f
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agog12b: dts: update specified panel support for basic board [2/2]
Evoke Zhang [Thu, 21 Jun 2018 10:05:15 +0000 (18:05 +0800)]
g12b: dts: update specified panel support for basic board [2/2]

PD#165090: g12b: dts: update specified panel support for basic board

Change-Id: Id26c312f5fabbdb8221e9cb2a0a2824cfd07c13b
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agoNANOQ: add nanoq reg in dts config
xingwei.zhou [Fri, 22 Jun 2018 08:41:34 +0000 (16:41 +0800)]
NANOQ: add nanoq reg in dts config

PD#165090: NANOQ: nanoq reg for sram and size

Change-Id: I29a9a698383c02ed527f3dc2b2cd5b03cf8dee53
Signed-off-by: xingwei.zhou <xingwei.zhou@amlogic.com>
6 years agokeypad: add gpio and adc keypad support
Xingyu Chen [Wed, 20 Jun 2018 09:25:40 +0000 (17:25 +0800)]
keypad: add gpio and adc keypad support

PD#165090: keypad: add gpio and adc keypad support

Change-Id: Icf4ea20d8523eefa76abf70b8b844922ab1ca43e
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
6 years agoCPUFREQ: modify cpufreq driver.
Hong Guo [Wed, 30 May 2018 02:07:33 +0000 (10:07 +0800)]
CPUFREQ: modify cpufreq driver.

PD#165090: cpufreq: modify cpufreq driver.

Change-Id: I8583acfd74a52629e40b39d5e53ea8b30a6b28e1
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
6 years agoisp: add isp_sc dts config
Brian Zhu [Tue, 19 Jun 2018 18:57:41 +0000 (02:57 +0800)]
isp: add isp_sc dts config

PD#165090: isp: add isp_sc dts config

Change-Id: Ia03722bbbccf71c6b404395dabe4a3c89b299bf2
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agoclk: clock: compatible clk count for different platform [1/1]
Shunzhou Jiang [Mon, 11 Jun 2018 04:08:22 +0000 (12:08 +0800)]
clk: clock: compatible clk count for different platform [1/1]

PD#165090: clock: fix clk count error

Change-Id: I3b7c181e159b2a028ddc53e7c72066ec3633fd75
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
6 years agocvbs: adjust output amplitude
Nian Jing [Tue, 12 Jun 2018 11:59:44 +0000 (19:59 +0800)]
cvbs: adjust output amplitude

PD#165090: cvbs

Change-Id: I031cbb04bb380e53bef6e5a8928244dcfbe25877
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
6 years agodts: expand isp cma and mv pinmux to dts
Jiacheng Mei [Fri, 15 Jun 2018 13:00:48 +0000 (21:00 +0800)]
dts: expand isp cma and mv pinmux to dts

PD#165090: 1.expand isp cma to 256M
2.mv clk12_24_z_pins from dtsi to dts

Change-Id: I3b17ee594967ea95e28bb2edc9d8eaaf7d8349dd
Signed-off-by: Jiacheng Mei <jiacheng.mei@amlogic.com>
6 years agodts: add isp & mipi dts
Jiacheng Mei [Thu, 7 Jun 2018 09:06:23 +0000 (17:06 +0800)]
dts: add isp & mipi dts

PD#165090: add isp & mipi dts

Change-Id: I98a46f48ddd62db40350f8717961c047b5230410
Signed-off-by: Jiacheng Mei <jiacheng.mei@amlogic.com>
6 years agodts: g12b: enable wifi
Larson Jiang [Fri, 15 Jun 2018 03:17:41 +0000 (11:17 +0800)]
dts: g12b: enable wifi

PD#165090: enable wifi

Change-Id: I1f769540c40602dff3c56811a10249684792f046
Signed-off-by: Larson Jiang <larson.jiang@amlogic.com>
6 years agoosd: add mali-afbc decode error statistics
pengcheng chen [Mon, 11 Jun 2018 05:50:30 +0000 (13:50 +0800)]
osd: add mali-afbc decode error statistics

PD#165090: osd: add mali-afbc decode error statistics

Change-Id: Idb3c37944d3a0ac48422ab901416279fc458b00b
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agopinctrl: add clk12_24 pin mux
Jian Hu [Wed, 6 Jun 2018 13:16:04 +0000 (21:16 +0800)]
pinctrl: add clk12_24 pin mux

PD#165090: pinctrl: add clk12_24 pin mux

Change-Id: Ia1226fd74449b0317dd57018188d50b06cfa6a69
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
6 years agowifi/bt: enable wifi
Larson Jiang [Wed, 13 Jun 2018 07:40:48 +0000 (15:40 +0800)]
wifi/bt: enable wifi

PD#165090: enable wifi for g12b

Change-Id: I067b4ba84e0d40d2332059adc988495072a75d84
Signed-off-by: Larson Jiang <larson.jiang@amlogic.com>
6 years agoclk: add gpio 12m and 24m for g12a/b
Jian Hu [Wed, 6 Jun 2018 09:23:44 +0000 (17:23 +0800)]
clk: add gpio 12m and 24m for g12a/b

PD#165090: clk: add gpio 12m and 24m for g12a/b

Change-Id: I2a3e8ed2f318eb13375415939d6216b0f30103a3
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
6 years agohdmitx: optimize hpll suspend
Zongdong Jiao [Tue, 12 Jun 2018 02:34:38 +0000 (10:34 +0800)]
hdmitx: optimize hpll suspend

PD#165090: hdmitx: optimize hpll suspend

The BIT definition of RESET / ENABLE in G12A is different from
earlier chips.
HPLL suspend workflow:
1. set RESET as 1
2. delay 50us
3. set ENABLE as 0
Resume workflow is inverse, but no need anymore, it will be set
in set_disp_mode_auto().

Change-Id: Iefc7f7f026562f566c8a40325c74a53f46465b02
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
6 years agoschedutil: limit up/down init rate
jianxin.pan [Wed, 6 Jun 2018 12:04:56 +0000 (20:04 +0800)]
schedutil: limit up/down init rate

PD#165090: schedutil: limit up/down min rate

Change-Id: Ib3aa6653d56056298df05bdede2e2bf6aea46882
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
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>