Commit Graph

332654 Commits

Author SHA1 Message Date
Sunny Luo
ebd2ef4e30 PD#158974: touchscreen: goodix GT1X driver support
Change-Id: I45b6e97a2fdba801c681e1858a155e2df7f050fd
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
2018-01-19 23:57:39 -07:00
kele bai
ef927a5be3 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>
2018-01-19 02:30:01 -07:00
Xingyu Chen
24091d7c43 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>
2018-01-18 04:04:34 -07:00
Nanxin Qin
8474a382fb 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>
2018-01-18 02:34:31 -07:00
sky zhou
05a1bf9ad2 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>
2018-01-18 02:18:53 -07:00
Sunny Luo
4f75f1bd8b PD#158972: touchscreen: focaltech ft3x27 driver support
Change-Id: I5e1de4a6074a75c288d52fd388323978415610bd
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
2018-01-18 02:05:00 -07:00
Yalong Liu
85254f4e37 Revert "drm: force ARGB8888 format to osd display"
PD#152825: Revert "drm: force ARGB8888 format to osd display"
This reverts commit 63a6fdd4fa.

Change-Id: Icc99d5ec3bcbf6e879bedf9385b4b56be679741b
Signed-off-by: Yalong Liu <yalong.liu@amlogic.com>
2018-01-18 08:17:39 +08:00
Renjun Xu
2449a4800e 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>
2018-01-17 10:59:07 +08:00
Liang Yang
a9c605df2f 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>
2018-01-15 23:18:17 -07:00
Renjun Xu
120ae475e8 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>
2018-01-11 19:40:34 -07:00
Evoke Zhang
2d3ba04332 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>
2018-01-11 04:15:01 -07:00
Nan Li
0a20c93893 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>
2018-01-10 02:02:03 -07:00
kele bai
81d604264c 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>
2018-01-10 01:40:57 -07:00
Renjun Xu
500ded7d9f led: modify ledring for mic board
PD#157849: modify ledring for mic board

Change-Id: I81c8400ee559dcf6f2bc3620d75e449c360df4f3
Signed-off-by: Renjun Xu <renjun.xu@amlogic.com>
2018-01-10 01:29:22 -07:00
Rongjun Chen
71e02e1836 wifi: add wifi build in support[2/2]
PD#158061: wifi: add wifi build in supportD

Change-Id: I42987b8579035cc0ca83d286f7a46fc0b83047e9
Signed-off-by: Rongjun Chen <rongjun.chen@amlogic.com>
2018-01-09 22:37:16 -07:00
hong.guo
c973fb0932 alarm: fixed the tiemerE counter's reading order
PD#157845: fixed the tiemerE counter's reading order

Change-Id: Ieccfc2fded45da398fa45e957497eff670790fa6
Signed-off-by: hong.guo <hong.guo@amlogic.com>
2018-01-09 19:11:22 -07:00
Zhi Zhou
4e12043e14 media: codec_mm: del a printk info
PD#157881: disabled a debug msg info.
	this msg is not a bug.

Change-Id: I043c57955646bcff92ee2dd9dbe41b8485e7c136
Signed-off-by: Zhi Zhou <zhi.zhou@amlogic.com>
2018-01-09 14:33:41 +08:00
Yicheng Shen
974b0eab06 hdmirx: enable the hdmirx module and code optimize
PD#158047: hdmirx: enable the hdmirx module and code optimize

1.Enable hdmirx in meson64_defconfig;
2.Remove useless code;
3.Add EXTCON interface(communicate with systemcontrol);
4.Modify dump esm log methode;
5.Modify esm/skp clk handle(use clk tree);
6.Fix coding style errors;

Change-Id: I62982ab8f5a6a3b1f482759cd8c2c79236951783
Signed-off-by: Yicheng Shen <yicheng.shen@amlogic.com>
2018-01-08 21:22:59 -07:00
Victor Wan
2c95ea743b Merge branch 'android-4.9' into amlogic-4.9-dev
Conflicts:
	arch/arm/configs/omap2plus_defconfig
	drivers/Makefile
	drivers/android/binder.c
2018-01-08 18:44:19 +08:00
Bencheng Jing
50c2ec4f13 di: move enable pre mif before frame reset avoid timeout
PD#154836: di:  move enable pre mif before frame reset avoid timeout

1) enable pre mif before&after frame reset for
   mc mif will be clear by pre frame reset

Change-Id: Ied15c337c4b28a62a873bd36361357b8fecdaf32
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2018-01-08 03:09:40 -07:00
Nan Li
43155b9271 sd: add the polling method of sd card_detect
PD#156898: add the polling method of sd card_detect,
because gpio irq remove raising & falling trigger method.

Change-Id: If270d27619d2686e74fe5e6d02748242faec4ce8
Signed-off-by: Nan Li <nan.li@amlogic.com>
2018-01-07 23:38:15 -07:00
Xingyu Chen
d7a862c50f pinctrl: define the pinmux with the same format [4/4]
PD#157965: pinctrl: define the pinmux with the same format.

there are two different pin controllers in Meson Soc Series, one of
them uses continuous 4-bit register to select function for each pin
(Eg: AXG and next), the other use indefinite bits that maybe from
different registers (Eg: Before AXG and GXLX)

previously, the driver use two different format to define the pinmux,
as follows:
[1] Before AXG and GXLX:
mux {
	groups = "uart_ao_tx_a", "uart_ao_rx_a";
	function = "uart_ao_a";
}

[2] AXG and next
mux {
	pins = "GPIOAO_0", "GPIOAO_1";
	function = "uart_ao_a";
}

which is a little confusing,and in this patch define the pinmux with
one format[1].

Change-Id: I04fb256294e1b664224c50a1baa622eb3a50b1c1
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2018-01-07 23:19:50 -07:00
Xingyu Chen
aa56afbe1e pinctrl: separate soc drivers [3/4]
PD#157965: pinctrl: separate soc drivers

When meson pinctrl is enabled, all meson platforms pinctrl drivers are
built in the kernel, with a significant amount of data.

This leads to situation where pinctrl drivers targeting an architecture
are also compiled and shipped on another one (ex: meson8 - ARM - compiled
and shipped on ARM64 builds). This is a waste of memory we can easily
avoid.

This change makes 3 pinctrl drivers (1 per SoC) out the original single
driver, allowing to compile and ship only the ones required.

porting from the upstream v4.15-rc2, commits as follows:

commit 277d14eb81

Change-Id: I68832eaf4a86233f89b8c32c44aaaab3593711d7
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2018-01-07 23:06:22 -07:00
Xingyu Chen
82ff7d6623 pinctrl: get rid of unneeded domain structures [2/4]
PD#157965: pinctrl: get rid of unneeded domain structures

porting from the upstream v4.15-rc2, commits as follows:

commit db80f0e158

Change-Id: I7c65b6844159378b7ef766569cb373fb78997d51
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2018-01-07 22:36:33 -07:00
Xingyu Chen
fd584a422c pinctrl: remove offset and pin_base from pinctrl [1/4]
PD#157965: pinctrl: remove offset and pin_base from pinctrl

porting from the upstream v4.15-rc2, commits as follows:

commit 634e40b0c2
commit 70e5ecb1b9
commit 40833a84fa
commit 6affd6981c

Change-Id: Ia856617fc202589199a9fc47664886a25779e8a0
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2018-01-07 22:24:06 -07:00
Xingyu Chen
690d31cb33 irqchip: replace the gpio IRQ driver with upstream
PD#151900: irqchip: replace the gpio IRQ driver with upstream v4.15-rc2

1) separate the driver from the pinctrl driver
2) add support for GPIOAO* of M8B as interrupt source
3) irq lines of GPIOAO* maximum up to eight
4) remove the GPIO IRQ Controller in AO domain

note that the driver does not support for detecting the double-edge signal
through the pin,if you have related needs, please consider using polling.

test pass on axg_skt, p212

Change-Id: Iaa8da8a0cbfa0fe90d26fc8c2b775e045c8768f2
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2018-01-07 21:26:59 -07:00
Larson Jiang
91f14cf381 wifi/bt: for wifi/bt share the power pin
PD#156561: for wifi/bt share the power pin

Change-Id: Id10edb58cf6d6d8658c40b6d1ec7004838527efe
Signed-off-by: Larson Jiang <larson.jiang@amlogic.com>
2018-01-02 22:49:21 -07:00
Ao Xu
0c80085b5b USB: gadget: add mtp 32bit ioctl support
PD#156196: USB: gadget: add mtp 32bit ioctl support

Change-Id: Ic83ca7f6b6736070e8ac435630a16a5a80014922
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2018-01-01 19:19:10 -07:00
Weiming Liu
25dada32d3 lcd_extern: add st7701 driver
PD#157223: lcd_extern: add st7701 driver for CES

Change-Id: I49d6930c4a4358a8a97a73cbe0194a77f39f55e3
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
2017-12-29 14:34:16 +08:00
tao zeng
4f40b91e06 mm: fix lowmem issue
PD#157252: mm: fix lowmem issue

1. add statistics for CMA pages;
2. reduce cma print and not protect cma unless driver called;
3. fix cma usage policy in alloc path;
4. increase file scan ratio in kswapd;
5. using NOOP for default IO-scheduler;
6. change alloc flags of ZRAM to retry harder.

Change-Id: If7b0363da03da1682efe3996c69bb9d511299209
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2017-12-28 20:20:30 -07:00
Weiming Liu
fc9f2af920 lcd: add lcd support for txlx
PD#154260: lcd: add txlx support

Add panel dtsi for txlx r311.
Also add backlight local dimming driver.

Change-Id: I8d6cbc0a2099c17de1adc4087a3f58e1c34264ae
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
2017-12-29 10:45:24 +08:00
Yi Zhou
df9c37611c hdmitx: fix the non_hdr effect in UI
PD#156644: hdmitx: fix the non_hdr effect in UI

Change-Id: I9b31757838a422bdf2e8c67bb838bb1bbc8dc497
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2017-12-28 03:32:05 -07:00
Yixun Lan
6056e7e120 eth: phy: add the debug interface to read/write regs
PD#150437: eth: phy: add the debug interface to read/write regs

Change-Id: I206760b46c63fcea544cbfb2c127a6488ce4ad8f
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
2017-12-28 00:59:31 -07:00
tao zeng
146f32cce5 mmext: fix panic caused by page trace
PD#157417: mmext: fix panic caused by page trace

stackframe.graph is not init if CONFIG_FUNCTION_GRAPH_TRACER
is opened.

Change-Id: Iea270dadd4579e71a778d0da764c4da27323938e
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2017-12-27 23:49:24 -07:00
Kaifu Hu
ee21b12b23 hdmitx: update hdmitx driver
PD#154260: hdmitx: update hdmitx driver

1. using pr_info or pr_debug instead of printk.
2. remove unuse code.
3. change modulepara to sysfs.
4. use iomap api for read and write reg

Change-Id: I523329d7b26cd7c6675bdae55cda76a6a11c533e
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
2017-12-27 02:39:21 -07:00
hongmin hua
72dcf27ab5 cec: add cec support for txlx
PD#154260: cec: add cec support for txlx

Change-Id: I16465d59fe73e85f7e760a660260590bc179ee53
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
2017-12-27 02:29:22 -07:00
Xingyu Chen
73fd77d783 iomap: enable hiu interface for gxl/gxm
PD#154260: iomap: enable hiu interface for gxl/gxm

Change-Id: I0df51f9d782b17901a6b1ea7e6c5aa8a43703583
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2017-12-27 02:29:02 -07:00
MingLiang Dong
af65277848 amvecm: add bitdepth config and keystone for txlx
PD#154260: amvecm: add bitdepth config and keystone for txlx

1. add bitdepth 10bit/12bit config for txlx
2. add keystone alg for txlx

Change-Id: Id3c31199dde9df9585c7d7a9d7ff5aab20d32d1f
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2017-12-27 02:28:02 -07:00
Nian Jing
e467c90268 tvin: tvafe: add tvafe driver support
PD#154260: tvin: tvafe: add tvafe driver support

1. palm paln pq adjust.
2. ntsc50 pq adjust.

Change-Id: I03b2e301d70a82560a37791457e524b916db3b16
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2017-12-27 02:23:06 -07:00
kele bai
bfebc35f9e di: merge latest di driver
PD#154260: di: add latest driver

1) add nr4&cue
2) remove pq releated hard-code
3) add pq load support
4) remove timerc, add hrtimer
5) remove tffbff detection
6) remove extern & global variables
7) move pulldown detection to separate directory
8) update amvecm head file
9) up to commit of PD#154436

Change-Id: I9cde21bb1fd4b4ee08ea88e883ef1c5368ad5b5d
Signed-off-by: kele bai <kele.bai@amlogic.com>
2017-12-27 02:21:46 -07:00
Yicheng Shen
3dba191da3 hdmirx: add hdmirx support for txlx
PD#154260: hdmirx: add hdmirx support for txlx

Change-Id: I26a0dee8aa79eec5f09d72b899ee067949380b12
Signed-off-by: Yicheng Shen <yicheng.shen@amlogic.com>
2017-12-27 02:20:45 -07:00
Bencheng Jing
7556ba8a7e vdin: amlogic: add vdin driver support
PD#154260: vdin: amlogic: add vdin driver support

Merge from kernel 3.14.
Optimize and fix memset error.

Change-Id: I0707de5cb6313da4e1ff8a3a1e91dfb098234529
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2017-12-27 02:20:19 -07:00
Nian Jing
878e0f00be cvbs: add cvbs driver support for txlx
PD#154260: add cvbs driver support for txlx

Update dts for all platforms.

1. Remove get_cpu type api and support dts match table data.
2. Add clock tree support.
3. Add performance property in device node.
4. Add protection flag for clk_gate on/off.

Change-Id: I082e48ecbbb44cfec5deb31a3a73b67b31370798
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2017-12-27 02:19:52 -07:00
Jiamin Ma
e5c989c180 unifykey: refine codes
PD#154260: refine unifykey codes

1. delete calling of cpu version related apis
2. replace self-implemented list with kernel-implemented one
3. delete unused MACRO defination
4. replace global variables with private data structure
5. define pr_fmt in each module
6. fix code defects:
   e438
   e527
   e550
   e570
   e650
7. add safe guard

Change-Id: I3dc93e3fef8ccfe3593d3275a69e0e21786e3ef1
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2017-12-27 02:19:35 -07:00
Xing Wang
edf886094e audio: meson: add sound driver support for txlx
PD#154260: audio: meson: add sound driver support for txlx

1. add sound driver support for txlx
2. add amaudio/amaudio2 driver
3. optimizing sound card driver

Change-Id: I726a139e6e34b82891ee4e72832dc529789f8ce7
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2017-12-27 02:19:06 -07:00
Evoke Zhang
514dfc0efc vout: update vout info support
PD#154260: vout: update vout info support

1. add htotal, vtotal support.
2. optimize dv_info, fresh_tx_pkt to vout_device.
3. add vinfo_base struct for vout IOCTL support.
4. set default invalid for hdmimode.

Change-Id: If9d99fd99b5f2d00eaee17504697c2dba3d47d6d
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2017-12-27 02:17:41 -07:00
Evoke Zhang
9585305649 vpu: add vpu support for txlx
PD#154260: vpu: add vpu support for txlx

Update dts for all platforms.

1. add support for txlx
2. add clktree support for clk change
3. remove unused vpu module for mem_pd
4. remove vpu_parent "vid_pll","mpll1","mpll2"

Change-Id: I43aa2435305fd02664ae825bc2f62664ffb526be
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2017-12-27 02:17:11 -07:00
pengcheng chen
c4e118637c osd: meson-txlx: add osd support
PD#154260: osd: meson-txlx: add osd support

Change-Id: I4c899bea555b7d654d8888a0c7433eb6c44893ad
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2017-12-27 01:39:17 -07:00
Matthew Shyu
6185bf05f9 crypto: meson-txlx: enable amlogic crypto dma
PD#154260: enable crypto driver

restructure crypto driver on top of dma and enable it on txlx

Change-Id: I0ffc0aaf9ad94c9652b9141bf92201c92463a893
Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>
2017-12-27 01:38:34 -07:00
Yue Wang
9695264269 usb: fix usb PLL set.
PD#157680: usb: fix usb PLL set.

meson-txlx: fix usb PLL set.

Change-Id: I3580e6d24a4bd9d22d4173fc370d5263339486f1
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
2017-12-26 23:39:35 -07:00