Commit Graph

647773 Commits

Author SHA1 Message Date
Victor Wan
7152bce7ca Revert "BACKPORT: dma-buf/sync_file: Allow multiple sync_files to wrap a single dma-fence"
This reverts commit 74fa0af473.

The commit 74fa0af caused GPU driver loading failed.

Change-Id: I255eb6b7a26e3b00e4f11489ece49896ff004d79
2018-08-07 14:46:15 +08:00
Victor Wan
cc7b1eac54 Merge branch 'android-4.9' into amlogic-4.9-dev
Signed-off-by: Victor Wan <victor.wan@amlogic.com>

 Conflicts:
	drivers/md/dm-bufio.c
	drivers/media/dvb-core/dvb_frontend.c
	drivers/usb/dwc3/core.c
	drivers/usb/gadget/function/f_fs.c
2018-08-07 14:43:24 +08:00
Xindong Xu
32b05b3c6a dts: add dtsi for system as root [1/9]
PD#170278: dts: add dtsi for system as root

Change-Id: Ie2eda798ac17425ddaf73d90bc04a3d9fdb74ade
Signed-off-by: Xindong Xu  <xindong.xu@amlogic.com>
2018-08-06 23:05:33 -07:00
Yi Zeng
8e6dad10fb mtd: spifc: add spifc support for txl
PD#171041: mtd: spifc: add spifc support for txl

Change-Id: I487161c6e85e3b232ed0c3891784b5a37f6d878c
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
2018-08-06 22:47:48 -07:00
MingLiang Dong
791bd6209e amvecm: dnlp coverity fix
PD#171026: amvecm: dnlp coverity fix

1. fix dnlp coverity
2. add kernel auto make dnlp_alg.ko

Change-Id: Idafc02e95655a9970ad778820b33c044e87bb767
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2018-08-06 21:30:30 -07:00
Lei Qian
41827da496 dts:txlx_t962x_r311_720p: fix commit error[1/1]
PD#170749:dts:txlx_t962x_r311_720p: fix commit error

Change-Id: Ie2f8398fab203e752657d54c77ac5ffbe56abebc
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
2018-08-06 19:56:10 -07:00
Lei Qian
71ef210ab0 dts:txl:sync fb config with txlx
PD#171168:dts:txl:sync fb config with txlx

Change-Id: I17f2521c5c571258c249ed042dc2978ebb21a5f9
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
2018-08-06 19:49:37 -07:00
Yong Qin
cb7b073391 cec: proble cec fail
PD#171266: cec: proble cec fail on sei 210 board

Change-Id: If45588072a6d700e0b90be4778cb73eed1deeb34
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2018-08-07 10:17:25 +08:00
Dezhi Kong
eb19549d8c di: optimize di pre mif config
PD#170980: di: optimize di pre mif config

1.add protect for di pre reset
2.add pre de done check when unreg
3.merge afbc hold line from alishan code
4.optimize pre mif enable sequence

Change-Id: I18851ad644aaee7c6c1d76c69f41a91f9599a36d
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
2018-08-06 02:22:59 -07:00
Lei Qian
8362dfe1c5 clk: fix txl crash issue
PD#169833: clk: fix txl crash issue

Revert "clk: fix 32bit system compatibility issue"

This reverts commit e39e646127.

Change-Id: I6c7af24e60a46bb386d64b794dd76fb2ec5db354
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
2018-08-06 00:47:55 -07:00
jiamin ma
244bb020db unifykey: add secure node
PD#168660: secure hdcp1.4 key

echo key_name > name
cat secure
to query whether a key is secure

Change-Id: If416fc8f2946176ecc956b73f1c9e77a55f7e57b
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
2018-08-05 23:52:00 -07:00
hongmin hua
b0f8ecf939 cec: add the port info and connect status for audio system
PD#170794: cec: add the port info and connect status for audio system

Change-Id: I433788d4f5fcbb3164f894ebc0f6827dd47b0633
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
2018-08-05 23:48:27 -07:00
hongmin hua
4e76488f2c hdmirx: add lock for top sw reset & edid size protect [1/2]
PD#170713: hdmirx: add lock for top sw reset & edid size protect

Change-Id: I97502324d01d2e99d3a30bb1829affef5d2c123b
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2018-08-06 10:34:53 +08:00
MingLiang Dong
3281c4c10b amvecm: packet dnlp algorithm
PD#171026: amvecm: packet dnlp algorithm

Change-Id: I29dec857c1ca2eed47fd27f6cb3ec986daeaab6a
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2018-08-03 07:22:31 -07:00
Wencai You
f32a3e45bb mm: decrease DEFAULT_TVP_SIZE_FOR_4K and reserved-memory
PD#166821: decrease DEFAULT_TVP_SIZE_FOR_4K and reserved-memory

DEFAULT_TVP_SIZE_FOR_4K to 192M
codec_mm_cma to 208M
ion_reserved to 78M

Change-Id: I2fd38f40c242ef531f8cf2226822bed4b0250a4f
Signed-off-by: Wencai You <wencai.you@amlogic.com>
2018-08-03 07:12:24 -07:00
Renjun Xu
305e6776cd audio: fix adc3101 8ch PCM format support
PD#171085: fix adc3101 8ch PCM format support

For S400 & S420 board, please modify dts to enable adc3101 8ch PCM
please read following file:
Documentation/devicetree/bindings/amlogic/axg-adc3010-pcm.txt

Change-Id: I945441f80d269b167148ccf3d6c33093a20a4f2f
Signed-off-by: Renjun Xu <renjun.xu@amlogic.com>
2018-08-03 04:20:53 -07:00
Shunzhou Jiang
e39e646127 clk: fix 32bit system compatibility issue
PD#169833: clk: fix 32bit system compatibility issue

Change-Id: I4033611ab0863448deb66d7ec1d06e645919fdc6
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
2018-08-03 03:06:16 -07:00
xuhua zhang
02bf0c02c0 vdin: add vdin output color depth selection from dts
PD#170749: vdin: add vdin output color depth selection

when vdin receive 4K && 50/60hz && 10bit data,
we can select vdin output color depth 8bit or 10bit from dts

Change-Id: I9c030b4769927dbf53880fad6c80707d7b282e86
Signed-off-by: xuhua zhang <xuhua.zhang@amlogic.com>
2018-08-03 03:05:03 -07:00
Conglin Guo
f8273ea4ec arm64: dts: txl: add decoder support
PD#170321: arm64: dts: txl: add decoder support

add ionvideo devicetree node

Change-Id: I5b628d86a64ff7920546e8122895cc048d8fc039
Signed-off-by: Conglin Guo <conglin.guo@amlogic.com>
2018-08-03 01:38:41 -07:00
Jihong Sui
0ad331e683 deinterlace: txl: fix di abnormal when inverted screen
PD#170301: txl: fix di abnormal when inverted screen

Change-Id: I2777e0092413115da5f4fdd4975c721c3f086ee3
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
2018-08-03 01:37:49 -07:00
Evoke Zhang
66188fce68 backlight: ldim: algorithms clear up
PD#170815: backlight: ldim: algorithms clear up

Change-Id: Ic6fc691dc67478ae4af6fc842427a839acf9d381
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-08-03 00:31:02 -07:00
Nian Jing
07bd8e13e8 tvin: tvafe: fix black side on atv snow
PD#168366: tvin: tvafe: fix black side on atv snow

Change-Id: I3e40ff3d6e9dbee5ba4db4f720ae3c2d7aebc690
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-08-02 23:17:09 -07:00
nengwen.chen
5ed549832c atv_demod: modify atv audio for txl [1/1]
PD#170705: modify atv audio for txl

1.txl non supprot audio decode.

Change-Id: I535354b03b40b8189c050358f96a73e44fc89399
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2018-08-02 23:09:15 -07:00
Jihong Sui
5fc3c8cbe9 deinterlace: txl: add patch for hdmi progressive input
PD#170301: deinterlace: txl: add patch for hdmi progressive input

Change-Id: I12a534d8aa545cfc2c8d5cfb0b9ab763da58d015
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
2018-08-02 23:02:29 -07:00
Huan Biao
d483a76307 thermal: add thermal meson cooldev point check
PD#170391: thermal: add thermal meson cooldev point check.

Change-Id: I9aa705a764399670583cb51e0dc8b743ec80fd54
Signed-off-by: Huan Biao <huan.biao@amlogic.com>
2018-08-02 22:38:25 -07:00
Yan Wang
8342aed2ee dts: txl: add cpu-idle-states nodes to str fun[1/1]
PD#170812: gxbb_pm: get system suspend level fail,
need to add cpu-idle-states nodes

Change-Id: I38128bcc6ef84cb1af0dbba556e65d47928182a1
Signed-off-by: yuehu mi <yuehu.mi@amlogic.com>
2018-08-02 02:44:00 -07:00
Yixun Lan
4c8082194e Merge "audio: fail to play DD and DTS files" into amlogic-4.9-dev 2018-08-02 02:39:57 -07:00
can.cao
d054233a8d dts: decrease the codec mm size for u200
PD#170726: Modify reserved code_mm size value

Change-Id: Id5454f7759ca05dd3e1705cefce9ddd1eb6611ab
Signed-off-by: can.cao <can.cao@amlogic.com>
2018-08-02 02:35:43 -07:00
weijia.zhu
dca47302a1 audio: fail to play DD and DTS files
PD#170383: add audio_data in p321.dts

Change-Id: I0763daf316821ceed179205e7adbd7b89e5a2185
Signed-off-by: weijia.zhu <weijia.zhu@amlogic.com>
2018-08-02 02:35:28 -07:00
Xindong Xu
e37c6e9891 arm64: dts: add atom & Beast project [1/1]
PD#170502: add atom & Beast project

Change-Id: I50da79dbb660372528c5abcdf5da4bb13773bf6c
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
2018-08-02 01:55:32 -07:00
Yixun Lan
8e393a358d dts: keypad: fix u200 dtb compile error
PD#169209: dts: keypad: fix u200 dtb compile error

Change-Id: Id4956084ae3ee0910860a830d65cfdecb07fbb32
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
2018-08-02 16:17:24 +08:00
zhilei.wu
a6f69500d1 osd: debug for osd suspend fail issue
PD#164508: osd: debug for osd suspend fail issue

Change-Id: Ibd7930c64d102bbe53e1775fa4f52aab0c67d078
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
2018-08-02 00:37:02 -07:00
Yingyuan Zhu
ca474b95ed keypad: gpio key drive optimization
PD#169209: keypad: gpio key drive optimization

1.replace the old interface gpio_ with gpiod_.
2.add irq detection mode,can be configured as
 interrupt mode or polling mode through DTS.
3.add keys to eliminate jitter.
4.remove useless code.

Change-Id: I81ef3cd0061e36faa10f58932588ff5031208b25
Signed-off-by: Yingyuan Zhu <yingyuan.zhu@amlogic.com>
2018-08-02 00:22:00 -07:00
Hong Guo
6c02942d0f CPUFREQ: modify cpufreq driver.
PD#170037: modify cpufreq driver.

Change-Id: Ic07e887dda26447653c407d06b009755aacc0d41
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
2018-08-01 22:37:29 -07:00
Jianxin Qin
d5f0d65965 usb: dwc2: modify SOF interrupt
PD#170407: usb: dwc2: modify SOF interrupt

SOF interrupt leads to the system overloading, so we reduce the
workload in the SOF interrupt handler.

Change-Id: I6bf11e672e0f024ac4b2da1ba47effe1da1ab476
Signed-off-by: Jianxin Qin <jianxin.qin@amlogic.com>
2018-08-01 21:30:41 -07:00
Ao Xu
a122e7c9ce board: solve 32bit printk type error
PD#169652: board: solve 32bit printk type error

for some data type, printk should follow below rule:
size_t: %zu or %zx
phys_addr_t: %pa

Change-Id: I456bd2f010080e6365b521a787367cc51bb4e9f4
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2018-08-01 21:22:52 -07:00
Xingyu Chen
b5aba319aa input: avin_detect: add avin detect driver
PD#170716: input: avin_detect: add avin detect driver

porting from the Linux-3.14

Change-Id: Id0566a62be7d587ca6368b3d29f3887bab1f6d87
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2018-08-02 10:59:32 +08:00
nengwen.chen
8c9d51363c atv_demod: modify afc to prevent demod error locking [1/1]
PD#169984: modify afc to prevent demod error locking

Change-Id: I02d184309fdeb5696da6158e0f29311cdc7675a5
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2018-08-01 04:32:58 -07:00
yicheng shen
12a12b8555 hdmirx: keep bandgap enabled to fix bibi sound issue
PD#170722: hdmirx: keep bandgap enabled to fix bibi sound issue

Change-Id: I55e6cb9084ea93f5bf4accf1cffc04d873cb7c0e
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
2018-08-01 04:31:28 -07:00
Evoke Zhang
31c9040d47 backlight: optimize pwm level step calculation
PD#168569: backlight: optimize pwm level step calculation

Change-Id: I570c12cc44af399a861ca54ad98180314924c180
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-08-01 04:07:52 -07:00
Shuide Chen
7ff9741701 power: battery add dummy battery driver [1/1]
PD#169027: add dummy battery and charger for CTS/VTS

some CTS and VTS testcases use the battery information, here
implement a dummy battery for it.
for P, it requires a dummy charger to set the online property to 1.

Change-Id: I7cf516f7050b3930cfdd933dc65b811289f89c4f
Signed-off-by: Shuide Chen <shuide.chen@amlogic.com>
2018-08-01 01:04:15 -07:00
Shuide Chen
5d415782ab dts: bingup for u212 [2/3]
PD#170940: dts for u212, change codec cma to 196M

add dts for u212

Change-Id: I9d3f20d9c8e3a8a60a67d28d85bdfdfa7d4932b7
Signed-off-by: Shuide Chen <shuide.chen@amlogic.com>
2018-08-01 00:46:09 -07:00
Yong Qin
7fa72600d9 cec: add debug cmd interface
PD#170470: cec: add debug cmd interface

	1.enable cec error_initator interrupt
	2.add debug cmd interfacec
	 1)dump info
	 2)register read write
	 3)bypass hal cmd
	3.boot reson ioctrl add mutex unlock

Change-Id: I340e4d363a46890001ff0494744cd9ec2fb28ea3
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2018-07-31 23:50:23 -07:00
Dezhi Kong
30329dbcbb di: fix pre mif reset issue for g12a
PD#169426: di: fix pre mif reset issue for g12a

Change-Id: I851ef6ff9a1ac844afd32bc40e73c4a189a47b6f
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
2018-07-31 22:34:32 -07:00
Nian Jing
6af926107c tvafe: fix avin unstable issue
PD#170316: fix avin unstable issue

Change-Id: Id229eff1e996399251cf2d3c93c3d4b2561f8451
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-07-31 20:11:19 -07:00
jiamin ma
7d5c6af845 unifykey: switch init order of unifykey and securitykey
PD#170850: unifykey: wrong unifykey driver init status

  The linux driver init order depends on init func level and
position in Makefile. Securitykey and unifykey are both
necessary for unifykey driver to work normal. Currently
securitykey is always initialized before unifykey, and the
unifykey init status checking API only checkes whether the
probe process of unifykey is done.So there is a chance when
LCD driver get unifykey probing process done status, while
securitykey is still under probing, which means unifykey
still cannot work normal
  We should switch the init order of these two module to
solve this issue

Change-Id: I8c4471d3689cff4356645fdc45df735be625baa2
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
2018-07-31 19:25:50 -07:00
Huan Biao
b9d6392bd9 thermal: fix big core smp fail to cooldev crash
PD#170391:thermal: fix big core smp fail to cooldev crash
	big core smp fail, cooldev driver cannot get
	cpu2 cpufreq policy, driver init fail, gpu cooldev
	data not init, mail ko init fail crash.

Change-Id: I705240b060d80f7afe97fe4dcb20bb2beebc2e13
Signed-off-by: Huan Biao <huan.biao@amlogic.com>
2018-07-31 01:06:08 -07:00
Zongdong Jiao
7dd1701cf5 hdmitx: forward partial EDID data to upstream [2/2]
PD#170713: hdmitx: forward partial EDID data to upstream

TXLX have both HDMITX and HDMIRX. We need forward nessary downstream
information to upstream.

Change-Id: Ie129415b49ceeba2f326d1e500323d39c3a8ba12
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2018-07-31 00:27:09 -07:00
Hanjie Lin
eee83d2d49 defconfig: disable ext2 support
PD#167122: defconfig: ext2 cause ltp test fail

now amlogic ext2 has disabled xattr feature
it cause ltp test fail
so disable ext2

Change-Id: I26876366bf4efecf2a3002ba36751bec31286ea9
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
2018-07-30 20:21:28 -07:00
Shunzhou Jiang
0e7db6285c clk: clock: Fix PCIE100M clock output some corner chip swing small issue
PD#170610: clock: Fix PCIE100M clock output

Change-Id: I8ada918f6910b537374115260ebaea7a4489e9d6
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
2018-07-30 20:01:06 -07:00