Commit Graph

643312 Commits

Author SHA1 Message Date
Qiufang Dai
ecedcccc28 clock: G12A: new add decode, t_sensor clock & vclk2 clk tree
PD#156734: clock: G12A: new add decode, t_sensor clock & vclk2 clk tree

Change-Id: I1a76bb870ecb5793ae7b560472fd2c2aa3f3651f
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-03-02 15:07:50 +08:00
Evoke Zhang
708c5cde4b vpu: update mem_pd control for g12a
PD#156734: vpu: update mem_pd control for g12a
also add vpu power on init function to avoid uboot coupling

Change-Id: Idcf435d7ec2c0e49f2b115102fba10ae9ee86b9d
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-03-02 15:07:50 +08:00
Jian Hu
fc796cfe6a arm64: dts: meson-g12a: add i2c DT info [2/2]
PD#156734: arm64: dts: meson-g12a: add i2c DT info

Change-Id: I9ff9a61319bbac54722e15c84fa3a19653c481ce
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2018-03-02 15:07:49 +08:00
Jiyu Yang
6846c23c2e dts: add dvalin config
PD#156734: add dvalin gpu config

Change-Id: Ib30694b302ae9e2839cb2f64e076934c041f9ff0
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
2018-03-02 15:07:49 +08:00
zhilei.wu
c33382976f ge2d: add ge2d support for g12a
PD#156734: ge2d: add ge2d support for g12a

support src2 blend

Change-Id: I5b8acd95d54d4c6160290a7d0254f8e96e20ce4b
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
2018-03-02 14:52:29 +08:00
Bo Yang
c5f5f23f7d watchdog: add meson watchdog driver v3
PD#156734: watchdog: add meson watchdog driver v3

Change-Id: I5aac3393fd56b9961d669ca990dea0b7d42ee016
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
2018-03-02 14:52:28 +08:00
Jian Hu
18696fe7ac arm64: dts: meson-g12a: add pwm DT info [2/2]
PD#156734: arm64: dts: meson-g12a: add pwm DT info

Change-Id: Iff1ed3709c66e97ac0334290d873b8a67544a6f2
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2018-03-02 14:52:28 +08:00
Brian Zhu
055f7ed761 media: add codec_io and canvas module for g12a
PD#156734: G12A: media: add codec_id and canvas module

Change-Id: Ib0e4ef05c237c313f483ebe2b029bf50f57d1c0a
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
2018-03-02 14:52:28 +08:00
Jian Hu
3573846a75 pwm: meson-g12a: add pwm support [1/2]
PD#156734: pwm: meson-g12a: add pwm support

Change-Id: I30b996a96e9c731379c10b4a09c4ff751d84140b
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2018-03-02 14:52:28 +08:00
Jian Hu
4d21978ef5 i2c: meson-g12a: add i2c support [1/2]
PD#156734: i2c: meson-g12a: add i2c support

Change-Id: I10ac105b99f7a426e23fef501741a62d3b887985
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2018-03-02 14:52:28 +08:00
Qiufang Dai
48ae4764bd G12A: psci: enable psci in dts
PD#156734: G12A: psci: enable psci in dts

Change-Id: I448e6a85e2ecf0ed8870c9b883b598c51f5d7b74
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-03-02 14:52:27 +08:00
Qiufang Dai
2e4da54fed clock: G12A: add sys_pll/hifi_pll/gp0_pll table
PD#156734: pll freq table which 3G < DCO < 6G

Change-Id: Ia1cadbd13af57d45a3a6d7b1bf65b8a055f4f91f
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-03-02 14:52:27 +08:00
Yi Zhou
9391abb298 hdmitx: hdmitx bringup for g12a
PD#156734: hdmitx: hdmitx bringup for g12a

Change-Id: Ie99915e69c90e3335183692611d8b92f7d3620ef
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2018-03-02 14:52:27 +08:00
Evoke Zhang
dbf24e0936 vout_serve: add vout, vout2 support for g12a
PD#156734: vout_serve: add vout, vout2 support for g12a

Change-Id: I1cb45beca5325f9013901687d7d995bfb9a25766
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-03-02 14:52:27 +08:00
Evoke Zhang
231a12fb9c vpu: add vpu support for g12a
PD#156734: vpu: add vpu support for g12a

Change-Id: I65f559e34408a6c2ecf2ff8b34a3fe1f9d1e440a
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-03-02 14:52:26 +08:00
Xingyu Chen
294a05a220 pinctrl: add pinctrl&gpio support for g12a
PD#156734: pinctrl: add pinctrl&gpio support for g12a

the new pin feature (drive-strength) is first introduced in Meson
Series SoC [G12A]. we can refer the following example to use:
mux {
	groups = "uart_ao_tx_a", "uart_ao_rx_a";
	function = "uart_ao_a";

	drive-strength = <1>;
}

the value of drive-strength can be set to 0/1/2/3, the larger
the value, the faster the slew rate.

Change-Id: I22c6967aa1d5de1b3f6acb84cb18a79b05c0403b
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2018-03-02 14:52:26 +08:00
Xingyu Chen
f595962f03 irqchip: add gpio IRQ support for g12a
PD#156734: irqchip: add gpio IRQ support for g12a

Change-Id: I6eac421ca9ac9d908f3c52f0417da32fdde74c57
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2018-03-02 14:52:26 +08:00
Qiufang Dai
229df792fa clock: G12A media/gpu/fclk_div2p5 clk
PD#156734: G12A media/gpu/fclk_div2p5 clk

Change-Id: I804fdfff57f841a9628bc4a35cbc2ba63fe076c6
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-03-02 14:52:26 +08:00
Qiufang Dai
8b5ae71fdf clock: clock tree for G12A
PD#156734: base clock tree for G12A,
include clk81, ee gate, sdemmc clock, fix/hifi/syspll/pcie plls, mpll, clkmsr

Change-Id: I9fe7c1d64d9db5d384070f5dcefdc69f5f60dbd2
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-03-02 14:52:26 +08:00
Qiufang Dai
bbc834999a cpuinfo: cputype api for G12A
PD#156734: cpuinfo: cputype api for G12A

Change-Id: Ib21038d4c622d0ca48c714f3773e63c89c408929
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-03-02 14:52:25 +08:00
Qiufang Dai
ad6c0e42a2 G12A: initial clk headfile for pxp
PD#156734: G12A: initial clk headfile for pxp

Change-Id: I82b549cea704d9d1b94b36dfb27eaf5547bcf172
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-03-02 14:52:25 +08:00
Qiufang Dai
6ee68402f4 G12A: initial dts porting for pxp
PD#156734: G12A: initial dts porting for pxp

Change-Id: I84d9bd5eb97c0ae0e04f17cd1e41b68fead0ed05
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2018-03-02 14:52:25 +08:00
Yixun Lan
555b92f53f ARM64: DTS: drop the q200 dts
PD#NONE: ARM64: DTS: drop the q200 dts

This will revert the Merge commit fa121b2d34 which introduced
by accident. After this is done, the result version is equal to
commit cc1dabc182

Change-Id: I0a4e5b9a41c09f9fc6eaaf55c4453219c17c59ab
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
2018-02-23 15:21:54 +08:00
Yalong Liu
af036febfb PD#NONE: test git right
Signed-off-by: Yalong Liu <yalong.liu@amlogic.com>
2018-02-23 14:12:34 +08:00
Yalong Liu
fa121b2d34 Merge branch 'amlogic-4.9-dev' of git://git.myamlogic.com/kernel/common into amlogic-4.9-dev 2018-02-22 10:15:48 +08:00
Zhi Zhou
cc1dabc182 media: codec_mm: fixed some bugs
PD#154520: media: fixed some bugs
	1. codec_mm: fixed alloc & free statistics error bug
	2. codec_mm: when some buffers have used. a big size alloc failed,
	   because of faragmented.
	   add retry for alloc small size.
	   and del some dump infos
	3. codec_mm: fixed codec_mm fast play bug
	4. don't used system's cma pool

Change-Id: I047f1bed75729cf6fe14040243d82906832c9497
Signed-off-by: Zhi Zhou <zhi.zhou@amlogic.com>
2018-02-21 17:30:10 -08:00
Yicheng Shen
5089368f74 hdmirx: fix hdmirx soundless issue
PD#159963 hdmirx: fix hdmirx soundless issue

Change-Id: I60a63af785d3a9c737814ad2d079905e4f0f07a8
Signed-off-by: Yicheng Shen <yicheng.shen@amlogic.com>
2018-02-13 18:53:25 -08:00
kele bai
e318415472 di: decoder buffer mangement changed for multi decode
PD#152765: di: no put decoder buffer after unreg

Change-Id: Ifb68b53ab35ac94905b59b0400213814a5ee6ec9
Signed-off-by: kele bai <kele.bai@amlogic.com>
2018-02-13 15:44:13 +08:00
Lianlian Zhu
f85537a1b7 hdmi_tx: solve audiopolicy update at flash plug issue[1/1]
PD#155057: add a delay of 2000ms for disconect to filt the flash plug

Change-Id: Ic5402ccf9f03293a87ee0321c7f8754b2a1c5310
Signed-off-by: Lianlian Zhu <lianlian.zhu@amlogic.com>
2018-02-12 00:58:45 -08:00
Bencheng Jing
6d796b43ec vdin: fix black screen caused by vdin_check_vs
PD#160716: vdin: fix black screen caused by vdin_check_vs

1.add vdin msrclk in dts
2.remove vdin_check_vf

Change-Id: Ie0a63821f2eea85cf8f67202b067e4f2b491066c
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2018-02-11 21:50:55 -08:00
Yalong Liu
5d07664407 drm: enable q200 drm dts
PD#158474: enable q200 drm dts

Change-Id: If9f08e4b78c9cd0ba4c3307740ad9b53dc73937a
Signed-off-by: Yalong Liu <yalong.liu@amlogic.com>
2018-02-11 17:48:38 +08:00
Peipeng Zhao
e4341e80c1 sound: resove external loopback for 2ch pdm + 2ch loopback on axg
PD#160814: sound: resove external loopback for 2ch pdm + 2ch loopback

Change-Id: I7a558dcc3850d4d174faa3c9259394b78bf8f45b
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
2018-02-11 15:14:43 +08:00
Bencheng Jing
6d2bf52480 di: fix pulldown crash caused by wrong pointer
PD#160099: di: fix pulldown crash
1) fix pulldown info bit error

Change-Id: I9c111cda6efb7b3161f601d6ffe3c17838108b4a
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2018-02-08 19:10:31 +08:00
Nian Jing
16f9f71bf3 tvafe: fix palm/n flash on adjust CROSS
PD#160251: fix palm/n flash on adjust CROSS

Change-Id: Ic4a122b45a0bbeba7cbc277d73fc720e8c4d212e
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-02-08 00:22:00 -08:00
Zongdong Jiao
9594c4e4f0 hdmitx: remove unused print message
PD#160315: hdmitx: remove unused print message
1. if current cmd is correct, no need print extra info any more.
2. correct cmd judgement

Change-Id: I088ace66eba224359b57f6cf190eefee3076304b
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2018-02-07 03:46:30 -08:00
Yalong Liu
11d0a4f6ba DRM: fix gem_prime_get_sg_table
PD#158474: fixed gem_prime_get_sg_table

modified gem_prime_get_sg_table by allocating
a sg_table for this GEM object through
sg_alloc_table and sg_set_page APIs

Change-Id: Idb7446e8ffa8700a2b8e2a2b2db1c5c3c4d62eb5
Signed-off-by: Yalong Liu <yalong.liu@amlogic.com>
2018-02-07 02:11:00 -08:00
tao zeng
c4c0f4ce68 mm: Improve page trace and mm debug function
PD#160479: mm: Improve page trace and mm debug function

1. Use page->flags to store trace value in 64bit Kernel;
   And this feature can be enabled default, without any
   memory usage increase;
2. Sort and optimize common caller find function in pagetrace;
3. Add some debug print for secmon/of-reserved memory.

Change-Id: I70ce1629889934a5bf31b91df570afa537339479
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2018-02-07 10:21:21 +08:00
Nian Jing
8029810ff9 tvafe: modify avdetect config process
PD#154265: modify avdetect config process

Change-Id: I889e4244abf1a8e3ed83e7cb3d1a2d4983dc09ba
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-02-06 00:09:41 -08:00
Jianxin Pan
ba61437e80 Merge "amvecm: fix pq load fail" into amlogic-4.9-dev 2018-02-05 18:29:17 -08:00
MingLiang Dong
12c6a8c12a amvecm: fix pq load fail
PD#158996: amvecm: fix pq load fail

Change-Id: I23d26427ebff2d13c2ea95ffa0b97c9b9a14f865
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2018-02-05 03:34:45 -08:00
hongmin hua
18e836d11a cec: add unlock for every return
PD#158781: cec: add unlock for every return

Change-Id: If4b0b563040c8c5fa62cd7e2cd3487d3663042dc
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
2018-02-05 17:33:52 +08:00
Luan Yuan
1b596398a8 hdmitx: 2160p50zh contains 2160p50hz420 etc.[1/2]
PD#158454: hdmitx: uniform the sysfs node 'disp_cap'

Previous handling of node 'disp_cap' may contains both '2160p50hz'
and '2160p50hz420', which may confuse the application.
Now start to uniform the 'disp_cap', which will only contains valid
mode, without colorspace information. Not each combination of 'disp_cap'
and 'dc_cap' is valid, please use 'valid_mode' to test combination.

Change-Id: I2d1c97b33272ddd439acf8cadef9e35dfc2dbe82
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2018-02-04 23:04:59 -08:00
kele bai
e1d6405555 di: speed up input mif read efficiency
PD#159864: di: speed up input mif read efficiency

1) change input mif read pass ratio from 50% to 66.6% according
   to vlsi's suggestment
2) pass ratio = (pass_cnt + 1)/(pass_cnt + 1 + hold_cnt + 1)

Change-Id: Ib5bc274f40e3e085c22f807effbac436a02b0d76
Signed-off-by: kele bai <kele.bai@amlogic.com>
2018-02-04 05:48:57 -08:00
Xing Wang
35464c4784 audio: dts: disabled dmic
PD#157997: audio: dts: disabled dmic

Change-Id: Id8a71dbf1c51db46ae2ca678952a8108707dcf03
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2018-02-04 05:48:44 -08:00
Bencheng Jing
884db5dc50 di: fix pq load fail
PD#158740: di: fix pq load fail

1) problem: load reg in thread run into gate turn off
2) solution: load reg in size config after gate on
   add debug information for load reg fail&successful

Change-Id: I46e57f15c9231bcf4f3e889e357009e8c9b0fbaa
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2018-02-02 04:14:04 -08:00
Dezhi Kong
ecc1113666 di: fix flash black issue
PD#159372: di: fix flash black issue

Change-Id: Ib37b257ba1ce88d6923f68341a4782b1924ac4c6
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
2018-02-02 00:03:56 -08:00
Peipeng Zhao
340bfe757e sound: fixed pdm record data slow error
PD#160225: sound: fixed pdm record data slow error

Change-Id: I8a6a0ae3207c27c6928342057df44b6454de55c2
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
2018-02-02 14:30:55 +08:00
Yi Zhou
5ec43f40ae hdmitx: eliminate the unreasonable mutex
PD#157189: hdmitx: eliminate the unreasonable mutex

Change-Id: I0ce4ebb1440c8a346602f892cae7afafa38cbfe7
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2018-02-01 21:28:41 -08:00
Lianlian Zhu
1c617c9407 audio: add axg audio efuse module support
PD#160113: audio:add axg audio efuse module support

Change-Id: I3b18ea4c7b8eb5069a1038a5c5c6b11b46d198c7
Signed-off-by: Lianlian Zhu <lianlian.zhu@amlogic.com>
2018-02-01 15:02:39 +08:00
Peipeng Zhao
f5febfdaf8 sound: changed endian mode of pcm
and fixed pdm in i2s code clk error for gxl chip

PD#160061: sound: changed endian mode of pcm

and fixed pdm in i2s code clk error for gxl chip

Change-Id: Idb0f8bc32dbe49dafbab73c30ca20491a7e6891a
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
2018-01-31 00:01:37 -08:00