pengcheng chen [Thu, 14 Dec 2017 11:21:23 +0000 (19:21 +0800)]
osd: add osd support for g12a
PD#156734: osd: add osd support for g12a
Change-Id: I7192f0377da899846219af8d934a50f57fecbe29
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
Qiufang Dai [Fri, 26 Jan 2018 11:05:54 +0000 (19:05 +0800)]
secmon: G12A: enable secmon driver in dts
PD#156734: secmon: enable secmon driver in dts
Change-Id: I32a3d5c3505de1c44c8be6b82a7e10ec1fc0a3de
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
Qiufang Dai [Fri, 26 Jan 2018 02:59:07 +0000 (10:59 +0800)]
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>
Evoke Zhang [Sat, 24 Feb 2018 02:44:13 +0000 (10:44 +0800)]
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>
Jian Hu [Tue, 9 Jan 2018 12:57:56 +0000 (20:57 +0800)]
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>
Jiyu Yang [Mon, 25 Dec 2017 06:26:45 +0000 (14:26 +0800)]
dts: add dvalin config
PD#156734: add dvalin gpu config
Change-Id: Ib30694b302ae9e2839cb2f64e076934c041f9ff0
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
zhilei.wu [Sat, 24 Feb 2018 07:44:27 +0000 (15:44 +0800)]
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>
Bo Yang [Sun, 21 Jan 2018 09:52:18 +0000 (17:52 +0800)]
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>
Jian Hu [Mon, 8 Jan 2018 13:36:16 +0000 (21:36 +0800)]
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>
Brian Zhu [Tue, 16 Jan 2018 12:25:59 +0000 (20:25 +0800)]
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>
Jian Hu [Mon, 8 Jan 2018 13:02:08 +0000 (21:02 +0800)]
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>
Jian Hu [Tue, 9 Jan 2018 12:33:41 +0000 (20:33 +0800)]
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>
Qiufang Dai [Thu, 11 Jan 2018 08:41:15 +0000 (16:41 +0800)]
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>
Qiufang Dai [Mon, 8 Jan 2018 13:10:53 +0000 (21:10 +0800)]
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>
Yi Zhou [Sat, 24 Feb 2018 02:11:54 +0000 (10:11 +0800)]
hdmitx: hdmitx bringup for g12a
PD#156734: hdmitx: hdmitx bringup for g12a
Change-Id: Ie99915e69c90e3335183692611d8b92f7d3620ef
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
Evoke Zhang [Tue, 2 Jan 2018 03:27:09 +0000 (11:27 +0800)]
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>
Evoke Zhang [Fri, 29 Dec 2017 14:11:10 +0000 (22:11 +0800)]
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>
Xingyu Chen [Sat, 24 Feb 2018 06:22:42 +0000 (14:22 +0800)]
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>
Xingyu Chen [Tue, 2 Jan 2018 04:01:40 +0000 (12:01 +0800)]
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>
Qiufang Dai [Tue, 2 Jan 2018 11:56:29 +0000 (19:56 +0800)]
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>
Qiufang Dai [Sat, 23 Dec 2017 09:32:27 +0000 (17:32 +0800)]
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>
Qiufang Dai [Mon, 18 Dec 2017 13:56:00 +0000 (21:56 +0800)]
cpuinfo: cputype api for G12A
PD#156734: cpuinfo: cputype api for G12A
Change-Id: Ib21038d4c622d0ca48c714f3773e63c89c408929
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
Qiufang Dai [Wed, 13 Dec 2017 03:56:38 +0000 (11:56 +0800)]
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>
Qiufang Dai [Tue, 12 Dec 2017 11:55:02 +0000 (19:55 +0800)]
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>
Yixun Lan [Fri, 23 Feb 2018 07:19:28 +0000 (15:19 +0800)]
ARM64: DTS: drop the q200 dts
PD#NONE: ARM64: DTS: drop the q200 dts
This will revert the Merge commit
fa121b2d3444 which introduced
by accident. After this is done, the result version is equal to
commit
cc1dabc1824c
Change-Id: I0a4e5b9a41c09f9fc6eaaf55c4453219c17c59ab
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
Yalong Liu [Fri, 23 Feb 2018 06:12:34 +0000 (14:12 +0800)]
PD#NONE: test git right
Signed-off-by: Yalong Liu <yalong.liu@amlogic.com>
Yalong Liu [Thu, 22 Feb 2018 02:15:48 +0000 (10:15 +0800)]
Merge branch 'amlogic-4.9-dev' of git://git.myamlogic.com/kernel/common into amlogic-4.9-dev
Zhi Zhou [Wed, 20 Sep 2017 03:31:55 +0000 (11:31 +0800)]
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>
Yicheng Shen [Wed, 14 Feb 2018 02:49:21 +0000 (10:49 +0800)]
hdmirx: fix hdmirx soundless issue
PD#159963 hdmirx: fix hdmirx soundless issue
Change-Id: I60a63af785d3a9c737814ad2d079905e4f0f07a8
Signed-off-by: Yicheng Shen <yicheng.shen@amlogic.com>
kele bai [Tue, 13 Feb 2018 07:44:13 +0000 (15:44 +0800)]
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>
Lianlian Zhu [Wed, 7 Feb 2018 14:08:16 +0000 (22:08 +0800)]
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>
Bencheng Jing [Fri, 9 Feb 2018 14:55:08 +0000 (22:55 +0800)]
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>
Yalong Liu [Tue, 23 Jan 2018 05:57:35 +0000 (13:57 +0800)]
drm: enable q200 drm dts
PD#158474: enable q200 drm dts
Change-Id: If9f08e4b78c9cd0ba4c3307740ad9b53dc73937a
Signed-off-by: Yalong Liu <yalong.liu@amlogic.com>
Peipeng Zhao [Sun, 11 Feb 2018 07:07:19 +0000 (15:07 +0800)]
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>
Bencheng Jing [Thu, 1 Feb 2018 13:33:01 +0000 (21:33 +0800)]
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>
Nian Jing [Wed, 7 Feb 2018 03:40:59 +0000 (11:40 +0800)]
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>
Zongdong Jiao [Wed, 7 Feb 2018 07:21:55 +0000 (15:21 +0800)]
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>
Yalong Liu [Tue, 6 Feb 2018 08:24:48 +0000 (16:24 +0800)]
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>
tao zeng [Wed, 7 Feb 2018 02:18:07 +0000 (10:18 +0800)]
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>
Nian Jing [Wed, 3 Jan 2018 03:19:44 +0000 (11:19 +0800)]
tvafe: modify avdetect config process
PD#154265: modify avdetect config process
Change-Id: I889e4244abf1a8e3ed83e7cb3d1a2d4983dc09ba
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
Jianxin Pan [Tue, 6 Feb 2018 02:29:17 +0000 (18:29 -0800)]
Merge "amvecm: fix pq load fail" into amlogic-4.9-dev
MingLiang Dong [Sat, 3 Feb 2018 05:54:10 +0000 (13:54 +0800)]
amvecm: fix pq load fail
PD#158996: amvecm: fix pq load fail
Change-Id: I23d26427ebff2d13c2ea95ffa0b97c9b9a14f865
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
hongmin hua [Fri, 2 Feb 2018 08:41:32 +0000 (16:41 +0800)]
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>
Luan Yuan [Mon, 5 Feb 2018 02:59:50 +0000 (10:59 +0800)]
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>
kele bai [Wed, 31 Jan 2018 02:10:38 +0000 (10:10 +0800)]
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>
Xing Wang [Wed, 31 Jan 2018 07:49:44 +0000 (15:49 +0800)]
audio: dts: disabled dmic
PD#157997: audio: dts: disabled dmic
Change-Id: Id8a71dbf1c51db46ae2ca678952a8108707dcf03
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
Bencheng Jing [Fri, 2 Feb 2018 02:38:56 +0000 (10:38 +0800)]
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>
Dezhi Kong [Thu, 1 Feb 2018 12:27:57 +0000 (20:27 +0800)]
di: fix flash black issue
PD#159372: di: fix flash black issue
Change-Id: Ib37b257ba1ce88d6923f68341a4782b1924ac4c6
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
Peipeng Zhao [Fri, 2 Feb 2018 06:26:32 +0000 (14:26 +0800)]
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>
Yi Zhou [Wed, 24 Jan 2018 07:22:15 +0000 (15:22 +0800)]
hdmitx: eliminate the unreasonable mutex
PD#157189: hdmitx: eliminate the unreasonable mutex
Change-Id: I0ce4ebb1440c8a346602f892cae7afafa38cbfe7
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
Lianlian Zhu [Thu, 1 Feb 2018 07:02:39 +0000 (15:02 +0800)]
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>
Peipeng Zhao [Wed, 31 Jan 2018 07:05:51 +0000 (15:05 +0800)]
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>
hongmin hua [Sun, 28 Jan 2018 04:58:12 +0000 (12:58 +0800)]
cec: modify dts pintrl selection to default
PD#158936: cec: modify dts pintrl selection to default
Change-Id: Id6718d7920b08d856081e39806458f3baf998b4e
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
Yvonne Chen [Thu, 18 Jan 2018 08:34:30 +0000 (16:34 +0800)]
tee: add tee load dynamic control
PD#159071: tee load dynamic control using disable_flag
using disable flag to disable tee load
Change-Id: I9c138e3830412ee04dcd82812b1a00cbed1ab940
Signed-off-by: Yvonne Chen <yvonne.chen@amlogic.com>
Pengguang Zhu [Wed, 10 Jan 2018 06:39:33 +0000 (14:39 +0800)]
tee: firmware: add new parameter vdec type
PD#159071: add new parameter vdec type
Change-Id: Ib3d49d2bbc56a36844d0c53a7c8a46d30543ebdc
Signed-off-by: Pengguang Zhu <pengguang.zhu@amlogic.com>
Evoke Zhang [Mon, 22 Jan 2018 03:37:13 +0000 (11:37 +0800)]
lcd: optimize lcd notifier event for power sequence
PD#158197: lcd: optimize lcd notifier event for power sequence
Change-Id: I6b91bf1c2c6e31dfa3133f078d37d32fdce2a5bd
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
wenfeng.guo [Fri, 19 Jan 2018 06:50:12 +0000 (14:50 +0800)]
di: optimize wire drawing in pulldown22 video appears on gxlx
PD#157033: di: optimize wire drawing in pulldown22 video appears on gxlx
Change-Id: I4c56cee942059794aac4969febbf35c0ef565fd3
Signed-off-by: wenfeng.guo <wenfeng.guo@amlogic.com>
Kaifu Hu [Wed, 24 Jan 2018 08:14:14 +0000 (16:14 +0800)]
hdmitx: add delay for plugout
PD#157869: hdmitx: add delay for plugout
1. add delay for plugout and ignore plugout work when boot.
2. delete set display when plugin.
Change-Id: I21fee9d3f68dc5fe84bcd76efc0a8572e3976ef6
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
Bencheng Jing [Fri, 26 Jan 2018 12:22:10 +0000 (20:22 +0800)]
di: fix pulldown crash for 1080i&1088i timing
PD#159599: di: fix pulldown crash for 1080i&1088i timing
Change-Id: I1f89920e195feaaa643f94d9227bf2e1a0268b15
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
Nian Jing [Wed, 24 Jan 2018 06:00:34 +0000 (14:00 +0800)]
cvbs: fix display set mode block
PD#157658: add delaywork enable dac
Change-Id: I2682c80c7a28d8bfdb88e038141c3e83aea33c46
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
hongmin hua [Mon, 4 Dec 2017 11:46:55 +0000 (19:46 +0800)]
cec: set reg map before irq enable
PD#158921: cec: change the order of irq in probe
Change-Id: I8099e918a06c9d741de890b773ec6ca47ab44aba
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
Matthew Shyu [Mon, 15 Jan 2018 09:07:21 +0000 (17:07 +0800)]
crypto: Enable EXT4_ENCRYPTION for file based encryption [2/4]
PD#158397: crypto: enable FBE
Encrypto CONFIG_EXT4_ENCRYPTION for file based encryption
Change-Id: Iaad3679bc9ac05eea1d44ad7c6d30a0324e82e89
Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>
Tellen Yu [Fri, 26 Jan 2018 07:18:22 +0000 (15:18 +0800)]
ppmgr:enable ppmgr module [1/1]
PD#157786: enable ppmgr
enable txlx ppmgr feature
Change-Id: I3939724e5a9c51349875bc340e5fcd47c2774e12
Signed-off-by: Tellen Yu <tellen.yu@amlogic.com>
Peipeng Zhao [Thu, 25 Jan 2018 05:49:44 +0000 (13:49 +0800)]
audio: add audio external loopback feature for axg chip
PD#159617: audio: add audio external loopback feature for axg chip
For S400 & S420 board, please modify dts to enable external loopback
please read following file:
Documentation/devicetree/bindings/amlogic/axg-sound-loopback.txt
Change-Id: Ie96d10eb8e6ae81aaff0b3e6965aa4e22f07f0b8
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
Sunny Luo [Sat, 20 Jan 2018 10:02:17 +0000 (18:02 +0800)]
touchscreen: goodix gt9xx driver support
PD#158973: goodix gt9xx driver support
Change-Id: Iffac9172ab1869521ecff731f7d50ddf7ea01b14
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
Yi Zhou [Fri, 19 Jan 2018 08:48:09 +0000 (16:48 +0800)]
hdmitx: update gxm dts
PD#154260: hdmitx: update gxm dts
Change-Id: Iddf3aa4512e5073f7e7dd1ba4558f38eb7998d58
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
Kuibao Zhang [Mon, 22 Jan 2018 07:20:35 +0000 (15:20 +0800)]
dts: fix 8.1 r311 bt open fail
PD#159307: BT fix 8.1 r311 bt open fail
1.DTS,change bt en pin
2.FIX bt en pinmux
Change-Id: I59c5978a5b52b49f9aa1aeede93d2761bca62959
Signed-off-by: Kuibao Zhang <kuibao.zhang@amlogic.com>
Kaifu Hu [Tue, 23 Jan 2018 02:49:06 +0000 (10:49 +0800)]
hdmitx: update txlx dts
PD#159209: hdmitx: update txlx dts
add hdcp22_skpclk and hdcp22_esmclk.
Change-Id: I2a1cc3fd31cf3bb5002cdc1673573f18349f612d
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
Nian Jing [Fri, 19 Jan 2018 07:38:51 +0000 (15:38 +0800)]
vbi: fix vbi crash on switch channel
PD#158142: fix vbi crash on switch channel
Change-Id: I0d4a585479b142cc585db0b00efb9d8772cc61ee
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
Weiming Liu [Thu, 18 Jan 2018 02:21:13 +0000 (10:21 +0800)]
lcd: add lcd_extern p070acb driver
PD#159016: lcd_extern: add p070acb driver
Change-Id: Id2fd949f37815de1ec9bbd90170dce459b661256
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
Victor Wan [Mon, 22 Jan 2018 12:17:25 +0000 (20:17 +0800)]
Merge branch 'android-4.9' into amlogic-4.9-dev
Conflicts:
Makefile
init/main.c
Liang Yang [Wed, 13 Dec 2017 09:15:01 +0000 (17:15 +0800)]
nand: Rsv zone bug fix
PD#156785: enhance rsv ecc&incomplete abnormal handler
NOTE: Relative commit(bug156785), patch together.
Change-Id: I05f9a4c521b75f5fcd071fdf09ca76a3f0aae033
Signed-off-by: Liang Yang <liang.yang@amlogic.com>
Xing Wang [Fri, 19 Jan 2018 15:07:58 +0000 (23:07 +0800)]
audio: dts: fix i2c for tas5707 and i2s pinmux
PD#159131: audio: dts : fix i2c for tas5707 and i2s pinmux
Change-Id: Ic4a2de8b5dcba668a793bf0c0c17d660418933b2
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
Evoke Zhang [Fri, 19 Jan 2018 07:15:07 +0000 (15:15 +0800)]
lcd: optimize gpio register function for init value
PD#158752: lcd: optimize gpio register function for init value
For gpio register required init value, we can't register gpio when
lcd probe, otherwise it maybe change the gpio value which is working
by bootloader init.
So we register gpio when first calling by lcd power step controlling.
Change-Id: I629143f50924aac7e3ea27aa1a2c4b12a1992b71
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
Jian Wang [Fri, 19 Jan 2018 10:08:58 +0000 (18:08 +0800)]
ionvideo: update ionvideo dts for tv
PD#158997: update ionvideo dts for tv
Change-Id: Iefa4ed1b93dc244d23aa0892e04722aed2836eb7
Signed-off-by: Jian Wang <jian.wang@amlogic.com>
Sunny Luo [Thu, 18 Jan 2018 13:27:27 +0000 (21:27 +0800)]
PD#158974: touchscreen: goodix GT1X driver support
Change-Id: I45b6e97a2fdba801c681e1858a155e2df7f050fd
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
kele bai [Tue, 16 Jan 2018 10:46:05 +0000 (18:46 +0800)]
di: add dummy buffer for first field
PD#158592: di: add dummy buffer for first field
1) only middle buffer can be process in di
Change-Id: Ide92f1a17428cf5c27468a6dfc086ad2f4685fe3
Signed-off-by: kele bai <kele.bai@amlogic.com>
Logan Gunthorpe [Thu, 15 Jun 2017 20:05:20 +0000 (14:05 -0600)]
char_dev: extend dynamic allocation of majors into a higher range
PD#159028: char_dev: extend dynamic allocation of majors into a higher range
We've run into problems with running out of dynamicly assign char
device majors particullarly on automated test systems with
all-yes-configs. Roughly 40 dynamic assignments can be made with such
kernels at this time while space is reserved for only 20.
Currently, the kernel only prints a warning when dynamic allocation
overflows the reserved region. And when this happens drivers that have
fixed assignments can randomly fail depending on the order of
initialization of other drivers. Thus, adding a new char device can cause
unexpected failures in completely unrelated parts of the kernel.
This patch solves the problem by extending dynamic major number
allocations down from 511 once the 234-254 region fills up. Fixed
majors already exist above 255 so the infrastructure to support
high number majors is already in place. The patch reserves an
additional 128 major numbers which should hopefully last us a while.
Kernels that don't require more than 20 dynamic majors assigned (which
is pretty typical) should not be affected by this change.
Change-Id: Ibf1ddaf0b7ce623c9f1a18c42a1ad39a89bb3f41
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Link: https://lkml.org/lkml/2017/6/4/107
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
Xingyu Chen [Thu, 18 Jan 2018 09:41:00 +0000 (17:41 +0800)]
pinctrl: correct spelling mistakes for txlx and axg
PD#158937: pinctrl: correct spelling mistakes for txlx and axg
Change-Id: I465cd138b9b9a5e7089715c8495f47137d21e6ad
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Nanxin Qin [Tue, 16 Jan 2018 08:02:49 +0000 (16:02 +0800)]
media: fixed the issure of crash when get pts rec num.
PD#158950: fixed the issure of crash when get pts rec num.
Change-Id: Iadba80bd5c0c1c4dc001e0321ed0e1a460c57ced
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
sky zhou [Wed, 17 Jan 2018 04:12:59 +0000 (12:12 +0800)]
DRM: fix gem object leak in PRIME_EXPORT operation.
PD#158474: fixed exported fd leaked.
Exported fd didnot bind correct release function,
use core gem-prime function to re-write export function.
The import function is not provded, for now we only import
the buffer created from meson driver.
Change-Id: I15fad65741631ee2b367d088e733f20af8b0cf5a
Signed-off-by: sky zhou <sky.zhou@amlogic.com>
Sunny Luo [Thu, 18 Jan 2018 06:08:22 +0000 (14:08 +0800)]
PD#158972: touchscreen: focaltech ft3x27 driver support
Change-Id: I5e1de4a6074a75c288d52fd388323978415610bd
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
Nan Li [Wed, 17 Jan 2018 02:58:29 +0000 (10:58 +0800)]
sd: add txlx r311 sd_uart support
PD#158480: r321 sd_emmc_b port is sdio wifi,
so modify r321 dts b port pinname.
Change-Id: I6a7e44c7b567f1ba9467c2696b6d5637b12939de
Signed-off-by: Nan Li <nan.li@amlogic.com>
Nan Li [Tue, 16 Jan 2018 07:05:44 +0000 (15:05 +0800)]
emmc: optimize emmc dts config
PD#158871: optimize emmc dts config,
delete "status" cfg.
Change-Id: I5ae2aa66384db84619ffcad7354facd4aa2bac54
Signed-off-by: Nan Li <nan.li@amlogic.com>
Yalong Liu [Thu, 18 Jan 2018 00:11:35 +0000 (08:11 +0800)]
Revert "drm: force ARGB8888 format to osd display"
PD#152825: Revert "drm: force ARGB8888 format to osd display"
This reverts commit
63a6fdd4fa329e0ac41da0ac672d014b7ad5a5ef.
Change-Id: Icc99d5ec3bcbf6e879bedf9385b4b56be679741b
Signed-off-by: Yalong Liu <yalong.liu@amlogic.com>
Renjun Xu [Wed, 17 Jan 2018 02:42:13 +0000 (10:42 +0800)]
ledring: add suspend/resume for ledring
PD#158940: add suspend/resume for ledring
Change-Id: I64827cd230708481768be7aabc3b4f814af8b636
Signed-off-by: Renjun Xu <renjun.xu@amlogic.com>
tao zeng [Tue, 16 Jan 2018 06:47:49 +0000 (14:47 +0800)]
mm: fix compile error on other configs
PD#153120: mm:fix compile error on other configs
Change-Id: I8e72afa508c44149f69c6d8c34698d13848e539c
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
Liang Yang [Fri, 12 Jan 2018 06:18:52 +0000 (14:18 +0800)]
nand: add llseek for fw_env tools
PD#158552: Implememt llseek for fw_printenv/fw_setenv tools
Change-Id: Ie6176903c7155cdb7daf17049a7356ed8f61e463
Signed-off-by: Liang Yang <liang.yang@amlogic.com>
Nan Li [Thu, 11 Jan 2018 08:43:14 +0000 (16:43 +0800)]
sd: add txlx r311 sd_uart support
PD#158480: add sd_uart support on txlx r311.
Change-Id: I62a094e66ca5934e0992cc6a5cc44d14e8ce20c3
Signed-off-by: Nan Li <nan.li@amlogic.com>
tao zeng [Mon, 15 Jan 2018 06:04:52 +0000 (14:04 +0800)]
mm: close debug print of cma alloc
PD#153120: mm: close debug print of cma alloc
These print message may print a lot when video playback
And cause it not smooth.
Change-Id: If1f18d5e8a0234f1daca2c6e803a23ba90354414
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
tao zeng [Tue, 9 Jan 2018 06:03:15 +0000 (14:03 +0800)]
mm: check pfn overflow for low memory platform
PD#158373: mm: check pfn overflow for low memory platform
On ARM64 platform, when vmemmap_populate is called for reserve
memory for struct page, it reserved based 1GB a loop. And 16MB
memory will be reserved at least. This caused memory waste if
total RAM is less than 1GB.
Basically reserve memory size for struct page is calculated by:
reserve size = sizeof(struct page) * number of pages.
For example, currently struct page is 64 bytes on ARM64. A page
is 4KB. So reserve size table can be:
Memory | page count | reserve size(bytes)
-------------------------------------------------
128MB | 32768 | 2097152(2MB)
256MB | 65536 | 4194304(4MB)
512MB | 131072 | 8388608(8MB)
Note, This reserve is aligned at 2MB.
Change-Id: I912ab01252d68fd065eb94fa2c5556cefa59a256
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
Renjun Xu [Thu, 11 Jan 2018 05:54:10 +0000 (13:54 +0800)]
ledring: modify ioctl support 32bit and 64bit
PD#157849: modify ioctl support 32bit and 64bit
Change-Id: I2f2395110454a2a05ec089601a937a1c884fa800
Signed-off-by: Renjun Xu <renjun.xu@amlogic.com>
Evoke Zhang [Thu, 11 Jan 2018 08:51:36 +0000 (16:51 +0800)]
clkmsr: init clkmsr earlier for lcd driver called
PD#158608: clkmsr: init clkmsr earlier for lcd driver called.
also add missed pwm config in dts for backlight,
and add pwm pointer protection in backlight driver.
Change-Id: Ib3d435a0f4418e31d94e65b1cee9919f1f6325c8
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
Nan Li [Tue, 9 Jan 2018 11:44:58 +0000 (19:44 +0800)]
emmc: optimize emmc driver configs.
PD#158348: modify emmc dts config data to match data.
Change-Id: Id1f29a8f5b47342376cfa976c6dba7e88bcc5514
Signed-off-by: Nan Li <nan.li@amlogic.com>
Greg Kroah-Hartman [Wed, 10 Jan 2018 08:51:38 +0000 (09:51 +0100)]
Merge 4.9.76 into android-4.9
Changes in 4.9.76
kernel/acct.c: fix the acct->needcheck check in check_free_space()
crypto: n2 - cure use after free
crypto: chacha20poly1305 - validate the digest size
crypto: pcrypt - fix freeing pcrypt instances
sunxi-rsb: Include OF based modalias in device uevent
fscache: Fix the default for fscache_maybe_release_page()
nbd: fix use-after-free of rq/bio in the xmit path
kernel: make groups_sort calling a responsibility group_info allocators
kernel/signal.c: protect the traced SIGNAL_UNKILLABLE tasks from SIGKILL
kernel/signal.c: protect the SIGNAL_UNKILLABLE tasks from !sig_kernel_only() signals
kernel/signal.c: remove the no longer needed SIGNAL_UNKILLABLE check in complete_signal()
iommu/arm-smmu-v3: Don't free page table ops twice
iommu/arm-smmu-v3: Cope with duplicated Stream IDs
ARC: uaccess: dont use "l" gcc inline asm constraint modifier
Input: elantech - add new icbody type 15
x86/microcode/AMD: Add support for fam17h microcode loading
parisc: Fix alignment of pa_tlb_lock in assembly on 32-bit SMP kernel
parisc: qemu idle sleep support
x86/tlb: Drop the _GPL from the cpu_tlbstate export
Map the vsyscall page with _PAGE_USER
mtd: nand: pxa3xx: Fix READOOB implementation
Linux 4.9.76
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Yueguie He [Wed, 10 Jan 2018 05:22:33 +0000 (13:22 +0800)]
audio: tdm: set tdmin max channals by dts
PD#158473: set tdmin max channals by dts
Change-Id: Ia6ff262fec6b3c156ac35f89b72cd690621f12fc
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
kele bai [Wed, 20 Dec 2017 02:12:46 +0000 (10:12 +0800)]
di: add protection for no mirror function
PD#157314: di: add protection for no mirror function
1) disable mirror function, set keep frame to 0 avoid post process
buffer
2) modify for keep function, avoid crash caused by calling de post
in blankout mode
3) move mutex operation out of tasklet
4) remove framereset in hw disable function
Change-Id: I6166a855a7fe6ad38a21c570e9ad0a6f9a204424
Signed-off-by: kele bai <kele.bai@amlogic.com>
Greg Kroah-Hartman [Wed, 10 Jan 2018 08:29:55 +0000 (09:29 +0100)]
Linux 4.9.76
Boris Brezillon [Mon, 18 Dec 2017 10:32:45 +0000 (11:32 +0100)]
mtd: nand: pxa3xx: Fix READOOB implementation
commit
fee4380f368e84ed216b62ccd2fbc4126f2bf40b upstream.
In the current driver, OOB bytes are accessed in raw mode, and when a
page access is done with NDCR_SPARE_EN set and NDCR_ECC_EN cleared, the
driver must read the whole spare area (64 bytes in case of a 2k page,
16 bytes for a 512 page). The driver was only reading the free OOB
bytes, which was leaving some unread data in the FIFO and was somehow
leading to a timeout.
We could patch the driver to read ->spare_size + ->ecc_size instead of
just ->spare_size when READOOB is requested, but we'd better make
in-band and OOB accesses consistent.
Since the driver is always accessing in-band data in non-raw mode (with
the ECC engine enabled), we should also access OOB data in this mode.
That's particularly useful when using the BCH engine because in this
mode the free OOB bytes are also ECC protected.
Fixes:
43bcfd2bb24a ("mtd: nand: pxa3xx: Add driver-specific ECC BCH support")
Reported-by: Sean Nyekjær <sean.nyekjaer@prevas.dk>
Tested-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Tested-by: Sean Nyekjaer <sean.nyekjaer@prevas.dk>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Borislav Petkov [Thu, 4 Jan 2018 16:42:45 +0000 (17:42 +0100)]
Map the vsyscall page with _PAGE_USER
This needs to happen early in kaiser_pagetable_walk(), before the
hierarchy is established so that _PAGE_USER permission can be really
set.
A proper fix would be to teach kaiser_pagetable_walk() to update those
permissions but the vsyscall page is the only exception here so ...
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
projects / platform / kernel / linux-amlogic.git / log