Commit Graph

641903 Commits

Author SHA1 Message Date
Renjun Xu
672f0d3993 ledring: add ledring driver
PD#156869: add ledring driver

Change-Id: I162133eb7eedbf8705ec7c7cdd6ec401be9b92ea
Signed-off-by: Renjun Xu <renjun.xu@amlogic.com>
2017-12-20 19:29:45 +08:00
Bencheng Jing
39627ff3ea di: modify true bypass conditions
PD#155786: di: modify true bypass conditions

Change-Id: I5e8ef74b87915870089497166d272830ceb453db
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2017-12-20 00:33:27 -07:00
Xingyu Chen
7f22cf4c89 cpuid: amlogic: add cpu id for gxlx and txhd
PD#154260: add cpu id for gxlx and txhd

Change-Id: I346ba42dc3473626ab70e86bb8847e926e465576
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2017-12-19 04:36:44 -07:00
Bo Yang
370c8bf462 script: amlogic: add new build script
PD#154260: script: amlogic: add new build script

Add new kernel build script.
	mkimage_32.sh for arm
	mkimage_64.sh for arm64

Usage: mkimage_xx.sh [-k def] [-d dts | -p chip] [-f rootfs] [-c] [-h]

Examples:

	# build kernel using default meson32_defconfig
	mkimage_32.sh

	# build kernel using default meson64_defconfig
	mkimage_64.sh

	# build kernel using defconfig specified by the option -k
	# with full name.
	mkimage_64.sh -k meson64_defconfig

	# build all dtb for the board with prefix or suffix <p320>
	# specified by the option -d
	mkimage_64.sh -d p320

	# build all dtb for the chip with prefix <txl>
	# specified by the option -p
	mkimage_64.sh -p txl

	# make distclean and build kernel and dtb
	mkimage_64.sh -k meson64_defconfig -d p320 -c

	# make distclean
	mkimage_64.sh -c

	# print help
	mkimage_64.sh -h

Change-Id: I617a2546a40ab74e741706f4625afb924421953a
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
2017-12-19 04:36:36 -07:00
Ao Xu
cae7a2e49c defconfig: add module version support
PD#149771: add module version support

A module compiled for one kernel won't load if
you boot a different kernel. If you're having
trouble loading the modules because of versioning
errors, compile a kernel with modversioning turned off.

Change-Id: Id00f10af84426a8f26a3439796d2de56e28fb9c6
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2017-12-19 04:35:56 -07:00
jianxin.pan
872270857a module: skip sublevel and crc when ver check
PD#157069: skip SUBLEVEL and crc when ver check durning insmod

When CONFIG_MODVERSIONS enabled, vermagic and crc are checked
durning insmod.

Change-Id: I6eb7bdda5b771afa754f7b783a7bbfe1be7cedd1
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
2017-12-19 04:11:48 -07:00
Yueguie He
0ad11cb314 USB: add mass stoarge function
PD#157133: USB: add mass storage function

1. add udisk partition to s400 emmc dts
2. add mass storage config

Change-Id: I8e90403c2803e216b7f11a420c5087b3ef859746
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
2017-12-19 03:55:59 -07:00
Yixun Lan
811719006f config: disable nfs client option [2/2]
PD#156770: config: disable nfs client option

this attempt to make android 8.1 compatible

Change-Id: I47d84695df00a9ab83a203565f3dd3cfd1a0159a
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
2017-12-19 03:55:49 -07:00
Yixun Lan
000e9115a9 config: enable BFP option [1/2]
PD#156770: config: enable BFP option

this attempt to make android 8.1 compatible

Change-Id: I2b0b91fe33902fc5680ffec62f2dc205c0b7c5f3
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
2017-12-19 03:39:30 -07:00
Jiamin Ma
e9fd448041 rng: replace abandoned rng register with new one
PD#157034: enable hw random generator for meson AXG

Change-Id: I0012465da1e7d22fc04a61de374277b2d6af32fd
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2017-12-19 14:33:36 +08:00
Yi Zeng
58384aae5b nand: add a error handler in aml_nand_add_partition
PD#156335: nand: add a error handler in aml_nand_add_partition

add a error handler in aml_nand_add_partition to avoid the endless
loop, when dts config a over size partition.

Change-Id: I8375990283bc6b36a09e09a37d041ebd929990d6
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
2017-12-17 18:17:49 -07:00
Jiamin Ma
231ce0586c rng: enable hw random generator for meson AXG
PD#157034: enable hw random generator for meson AXG

Change-Id: Ie72368b25a1d028627d4212d31b49da33be3185f
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2017-12-15 07:10:53 -07:00
Zhi Zhou
abdb7453fb media: codec mm scatter used reserved first.
PD#155696: if have reserved used reserved first
	so we can init&play fast.

Change-Id: Id3c5319acef88d373ac1bf76bbb26163ab0c12d5
Signed-off-by: Zhi Zhou <zhi.zhou@amlogic.com>
2017-12-15 15:03:07 +08:00
Yi Zeng
6facb53203 nand: add three new slc-nand support
PD#154862: nand: add three new slc-nand support

According to new customer demand, we need add this three new nand into
our code:
1. GD 9FU1G8F2AMGI
2. Winbond W29N04GVSIAA
3. Samsung k9f2g08u0d

Change-Id: Ibb098fa79edca50613bbafb3ebcd706a86c46c3e
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
2017-12-14 21:37:17 -07:00
wenbiao zhang
ed0298c9a2 dts: add p241 buildroot v2 dts [1/2]
PD#154923: dts: add p241 v2 dts for v2 hardware
support multi dts for v1/v2 hardware

Change-Id: Ie0fade5d0d8cbfa200e7717219b1b0ba29e66da4
Signed-off-by: wenbiao zhang <wenbiao.zhang@amlogic.com>
2017-12-14 19:04:57 -07:00
Jianxin Pan
d2e8bd39db Merge "clk: update clk total number [1/1]" into amlogic-4.9-dev 2017-12-14 18:04:34 -08:00
Yi Zeng
49832da244 mtd: fix the macro of BCH mode index
PD#155673: mtd: fix the macro of BCH mode index

Change-Id: Iee7d1b11569411c2edcd43e2355299735b7dd1d1
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
2017-12-14 05:05:06 -07:00
Hui Zhang
2dc5888c59 codec_mm: fixed scatter def setting [1/1]
PD#155696: fixed scatter def setting

Change-Id: I2c3299bd7003c340079622369e51407a823ce80e
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
2017-12-14 04:11:08 -07:00
Zhi Zhou
31a5e03143 media: fixed codec_mm fast play bug
PD#155696:

	1. if no res & have cma_res, may crashed on
	codec_mm alloc.
	2. if cma res is not set the has_res, some module may alloc failed
	on no res.
	3. scatter memory fast wait used complete.

Change-Id: I2104ec948762ca587d0c90f221c811de6bc4d3c4
Signed-off-by: Zhi Zhou <zhi.zhou@amlogic.com>
2017-12-14 03:39:06 -07:00
wenbiao zhang
c9814937de clk: update clk total number [1/1]
PD#152261: clk: update clk total number
add bt656 clk, but total number not update

Change-Id: I24f2f17e4e773a883bab3f564144a49768fc16d5
Signed-off-by: wenbiao zhang <wenbiao.zhang@amlogic.com>
2017-12-14 03:28:27 -07:00
kele bai
ec371bebf7 di: remove bypass pre print [1/1]
PD#156889: di: remove bypass pre process print

Change-Id: If9f6d4af26088b18d67072a01011aad3e64552cd
Signed-off-by: kele bai <kele.bai@amlogic.com>
2017-12-14 14:57:49 +08:00
pengcheng chen
1a5125cc8b osd: fix cursor support with 32bit app[1/2]
PD#156057: osd: fix cursor support with 32bit app

Change-Id: I69f4c94ea16efca4e130af665e0fc7e4b05c5312
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2017-12-13 00:50:41 -07:00
Luan Yuan
61a614707e dts: optimize p241 fb addr error [1/2]
PD#156267: optimize p241 fb addr error

Change-Id: I652fc5e2c068383700be58a0cc36be5fefaca14c
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
2017-12-12 19:17:16 -07:00
binqi.zhang
942dd16d98 revert "sync_file: Return consistent status in SYNC_IOC_FILE_INFO [2/3]"
This reverts commit fe912ab314899e3add2993c630c15d28638a3348.

This reverts part commit of ARM and reserved original commit in upstread.

Change-Id: I4e0f39bee86342cd89aa2fb8f10c81f92e4b1985
Signed-off-by: binqi.zhang <binqi.zhang@amlogic.com>
2017-12-12 03:10:54 -07:00
Lianlian Zhu
b26a613a44 audio: fixed multi ch pcm switch to passthrough mute issue[3/3]
PD#154595: fixed multi ch pcm out to IEC raw out mute issue

Change-Id: I2a6643975bea0970e9fecbd59cc6282886eacdbb
Signed-off-by: LianLian Zhu <lianlian.zhu@amlogic.com>
2017-12-12 00:24:32 -07:00
Jian Hu
10df19ebb1 arm64: dts: fix pwm c/d base reg for gx SoCs
PD#156419: arm64: dts: fix pwm c/d base reg for gx SoCs

Change-Id: Ie3d17330d2d460a1071c09efb9ce5521b8c80837
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2017-12-11 22:39:09 -07:00
tao zeng
de9dedcaed mm: correct page stat API
PD#156236: mm: correct page stat API

Using mod_zone_page_state instead of __mod_zone_page_state to
avoid SMP warning of __this_cpu_preempt_check

Change-Id: I3f95768beabf5d330d13189d189b32aef39448cd
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2017-12-11 16:34:05 +08:00
tao zeng
b0c8f6e30f mm: show more informations when catch user fault
PD#154260: mm: show more informations when catch user fault

1. show pfn for all registers;
2. show memory around all registers;
3. show vma maps around pc/lr.

Change-Id: Ibc92f3aea2727c749c3e865495ca7a4920d4e7a0
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2017-12-10 19:21:25 -07:00
tao zeng
3e1038b0aa mm: fix deadlock due to too_many_isolated
PD#156236: mm: fix deadlock due to too_many_isolated

When CMA allocating, allocation task  may be dead lock
in following backtrace. So add a count for CMA isolated
to avoid this case.

[<0000000000000000>] __switch_to+0x98/0xac
[<0000000000000000>] congestion_wait+0xa0/0x188
[<0000000000000000>] shrink_inactive_list+0x4a0/0x528
[<0000000000000000>] shrink_node_memcg.isra.71+0x684/0x714
[<0000000000000000>] shrink_node+0x74/0x1e0
[<0000000000000000>] try_to_free_pages+0x1bc/0x4c0
[<0000000000000000>] __alloc_pages_nodemask+0x57c/0xcf4
[<0000000000000000>] alloc_migrate_target+0x2c/0x34
[<0000000000000000>] migrate_pages+0xe0/0x890
[<0000000000000000>] __alloc_contig_migrate_range+0x94/0x1a4
[<0000000000000000>] cma_boost_work_func+0xd0/0x168
[<0000000000000000>] process_one_work+0x140/0x418
[<0000000000000000>] worker_thread+0x154/0x480
[<0000000000000000>] kthread+0x10c/0x120
[<0000000000000000>] ret_from_fork+0x10/0x50

Change-Id: Ib1c5d8f25ac966170292ed6b6f078e8b447e99a8
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2017-12-10 19:06:03 -07:00
Baocheng Sun
aa641abe46 binder: fix binderDriverInterfaceTest fail [1/1]
PD#155252: bind: fix binderDriverInterfaceTest fail

Commit "ANDROID: binder: Add thread->process_todo flag." brings one
binderDriverInterfaceTest failure. The commit is for improving the
performance of synchronous transactions. So we just workround not
revert it. And the patch do not impact performance.

Before patch:
Benchmark                       Time           CPU Iterations
-------------------------------------------------------------
BM_sendVec_binder/4         55697 ns      33263 ns      21198
BM_sendVec_binder/8         56630 ns      33161 ns      21074
BM_sendVec_binder/16        56569 ns      33155 ns      21156
BM_sendVec_binder/32        56469 ns      33465 ns      21003
BM_sendVec_binder/64        58141 ns      33785 ns      20483
BM_sendVec_binder/128       57505 ns      33845 ns      20512
BM_sendVec_binder/256       57711 ns      33844 ns      20434
BM_sendVec_binder/512       58497 ns      34360 ns      20243
BM_sendVec_binder/1024      59609 ns      34893 ns      20012
BM_sendVec_binder/2k        61486 ns      36065 ns      19495
BM_sendVec_binder/4k        67373 ns      38824 ns      17904
BM_sendVec_binder/8k        80915 ns      45374 ns      15254
BM_sendVec_binder/16k      115286 ns      62732 ns      11189
BM_sendVec_binder/32k      202865 ns     104122 ns       6728
BM_sendVec_binder/64k      601649 ns     309523 ns       2259

After patch
Benchmark                       Time           CPU Iterations
-------------------------------------------------------------
BM_sendVec_binder/4         55247 ns      33132 ns      21086
BM_sendVec_binder/8         56771 ns      33465 ns      21094
BM_sendVec_binder/16        56517 ns      33476 ns      20850
BM_sendVec_binder/32        56732 ns      33413 ns      20964
BM_sendVec_binder/64        57548 ns      33977 ns      20515
BM_sendVec_binder/128       60491 ns      34868 ns      20404
BM_sendVec_binder/256       59150 ns      34609 ns      20293
BM_sendVec_binder/512       59519 ns      34914 ns      19970
BM_sendVec_binder/1024      60230 ns      35313 ns      19832
BM_sendVec_binder/2k        65008 ns      37580 ns      18866
BM_sendVec_binder/4k        69085 ns      39789 ns      17511
BM_sendVec_binder/8k        84204 ns      47321 ns      14894
BM_sendVec_binder/16k      118609 ns      64363 ns      10730
BM_sendVec_binder/32k      207010 ns     106080 ns       6547
BM_sendVec_binder/64k      605543 ns     312110 ns       2256

Change-Id: If70094a330082122c47259c8e1df8ef7eee219dd
Signed-off-by: Baocheng Sun <baocheng.sun@amlogic.com>
2017-12-07 19:08:55 -07:00
Yi Zhou
c0d4c5b3b3 tx: fix the system crash
PD#152848: fix the system crash

When box authenticate with TV under hdcp 2.2, the hdcp 2.2 must
be reset in syspend function.

Change-Id: I0c85070893b7a2e17606b05c2df068a8ceb8f774
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2017-12-07 04:33:13 -07:00
Yueguie He
b25bacca88 dts: update boot partition size
PD#155853: update boot partiton size

Change-Id: I5b3ab48e522f7ed4c33084d43b62d4a14a64afef
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
2017-12-06 19:41:57 -07:00
John Einar Reitan
1654b625ef sync_file: Return consistent status in SYNC_IOC_FILE_INFO [2/3]
PD#153134:to solve dEQP-EGL.functional.get_frame_timestamps issues

sync_file_ioctl_fence_info has a race between filling the status
of the underlying fences and the overall status of the sync_file.
If fence transitions in the time frame between its sync_fill_fence_info
and the later dma_fence_is_signaled for the sync_file, the returned
information is inconsistent showing non-signaled underlying fences but
an overall signaled state.

This patch changes sync_file_ioctl_fence_info to track what has been
encoded and using that as the overall sync_file status.

Change-Id: I8d785bb04510be99e250dbd017eef883faca147b
Tested-by: Vamsidhar Reddy Gaddam <vamsidhar.gaddam@arm.com>
Signed-off-by: John Einar Reitan <john.reitan@arm.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Gustavo Padovan <gustavo@padovan.org>
Cc: dri-devel@lists.freedesktop.org
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171009134936.27219-1-john.reitan@arm.com
2017-12-06 05:56:21 -07:00
Yi Zeng
1d6e27d5b3 storage: fix the source of register base
PD#155205: storage: fix the source of register base

The register base get from dts now,no longer from macro.

Change-Id: Ic763db5a9380396cfbfde0333d85ffb08c601713
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
2017-12-06 03:36:24 -07:00
Xindong Xu
229bd2a709 dts: partition: add slotselect to fsmgr_flags [1/1]
PD#156037: dts: add slotselect to fsmgr_flags

Change-Id: I48baedc6e5079233d5320748c6a5d623d3ad15fa
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
2017-12-05 20:10:43 -07:00
Victor Wan
1e547d2935 Merge branch 'android-4.9' into amlogic-4.9-dev 2017-12-02 16:52:23 +08:00
Nan Li
fa5d2eff77 emmc: driver defect clean up
PD#152884: driver defect clean up
#307.

Change-Id: Ie81654ecc710bb322e5411d8f66d670388e563ee
Signed-off-by: Nan Li <nan.li@amlogic.com>
2017-11-30 22:52:33 -07:00
Zhigang Yu
7b32d317ce dts: add misc partition for upgrade store bcb command[1/3].
PD#150940: add misc partition for S400 nand

Change-Id: I69a8e9223ee5fa431dad610a33d04ab33eed1edc
Signed-off-by: Zhigang Yu <zhigang.yu@amlogic.com>
2017-11-29 20:22:37 -07:00
Zan Peng
6b4b9550ba remote: add mouse function to 4.9
PD#154561: remote mouse function to 4.9

1. need execute remotecfg to config it
    remotecfg -t remote-mouse.tab
2. config exp, default to set 0xffff
    fn_key_scancode = 0x15 (ir scancode)
    cursor_left_scancode = 0x1c
    cursor_right_scancode = 0x48
    cursor_up_scancode = 0x44
    cursor_down_scancode = 0x1d
    cursor_ok_scancode = 0x5c
3. mv rc_common.h {include/uapi/linux => drivers/amlogic/input/remote}

Change-Id: I7f62e0d5a6dfaa1ad7f56358a30fd968f84b543a
Signed-off-by: Zan Peng <zan.peng@amlogic.com>
2017-11-29 20:11:59 -07:00
Zongdong Jiao
f6a4349c69 hdmitx: fix a series of ddc issues
PD#155588: hdmitx: fix a series of ddc issues
1. 149535 issue sw i2c transaction to take advantage of SDA recovery logic
2. 150784/152582 add I2C HW REACTIVE when RX serves as master
3. 151088 using only scdc.tmds.configuration
4. 152584 reduce ddc activities and add mutex to sequence ddc

Change-Id: I3f69a0fbd04ce54c4f794271fce38753f63f3b5f
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2017-11-29 04:22:40 -07:00
Zhiwei Gong
8262aeec1b dts: gxl: add gpio_keypad for p230[1/1]
PD#153251: gpio_keypad: add gpio_keypad for p230

Change-Id: I4a7f5fe6d263d415fecc490dbfc937e9e63a4b86
Signed-off-by: Zhiwei Gong <zhiwei.gong@amlogic.com>
2017-11-28 19:19:20 -07:00
Yao.Liu
921c011316 media: video layer keep last frame [2/4]
PD#152306: dont display frames which are dropped by apk

PD#152104: video layer keep last frame

Change-Id: I271ee268b8d768fe42cd60b57d1f10b12fac7fa6
Signed-off-by: Yao.Liu <yao.liu@amlogic.com>
2017-11-28 02:09:03 -07:00
Evoke Zhang
8c1fba7f28 lcd: add gpio support for mipi_dsi init cmd
PD#155126: lcd: add gpio support for mipi_dsi init cmd
add data_type 0xf0 for gpio operation

Change-Id: I58b5fc2456b8ceaf3ca97f3ca1626430d723212d
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2017-11-27 18:57:45 -07:00
Yi Zhou
fcec451b2d hdmitx: add the hdmi change mode op
PD#153294: hdmitx: add the hdmi change mode op

add switch when changing display mode
if the display mode is NULL, the switch can't be opened.

Change-Id: I2a0bdbda6950c401ad3a7b29d810976436558c14
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
2017-11-27 18:55:26 -07:00
Frank Chen
a8aba76b55 dts: axg: modify Audiopdm-in and loopback setting[2/2]
PD#155244: audio: modify pdm-in and loopback setting

support 7 channel pdm-in and 1 channel loopback

Change-Id: Ia8e2314a5f80e0dc5eeee7252af9b836e921873e
Signed-off-by: Frank Chen <frank.chen@amlogic.com>
2017-11-23 18:38:20 -07:00
Bo Yang
84a1058529 watchdog: meson-wdt: fix reboot notify to stop reset
PD#154679: watchdog: meson-wdt: fix reboot notify to stop reset

In some cases, the watchdog reboot notify will not disable
watchdog. The watchdog reset workqueue will continue work
in the first cpu that invokes panic(oops). So the hardware
watchdog will not reboot.

Cancel the delayed workqueue to stop reset the watchdog in
reboot notify.
And move the print message to the right location.

Change-Id: I7d85d49f2f5d780f7c5f2612e64494e77957dfff
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
2017-11-23 15:29:28 +08:00
xingyu.chen
26e3ae09aa adc_keypad: update the property file path
PD#150908: adc_keypad: update the property file path

move the property file "table" from "/sys/devices/platform/adc_keypad/"
to "/sys/class/adc_keypad/"

Change-Id: I99ebb2f49df4ef336a3db422f60cb32a49bf2936
Signed-off-by: xingyu.chen <xingyu.chen@amlogic.com>
2017-11-22 00:39:23 -07:00
siming chen
d5da43e066 dts: add gxl p241 v2 dts[1/3]
PD# 154923: dts: add gxl p241 board v2 dts



Change-Id: Iad6947b9af8bd76b3805cfcf95b2bb0c87ad08f6
Signed-off-by: siming chen <siming.chen@amlogic.com>
2017-11-20 20:27:55 -07:00
binqi.zhang
9896903ded ion_dev: enlarge cma heap size . [1/1]
PD#153134: some dEQP cases should always use direct render

Change-Id: I3d65b7c34e948e5a1f6d5d745713c2caa3eb89d5
Signed-off-by: binqi.zhang <binqi.zhang@amlogic.com>
2017-11-18 04:15:54 -07:00
Nan Li
fa1fa680a2 emmc: driver defect cleanup
PD#152912: driver defect cleanup:
376

Change-Id: I25e7cbdd63b7b797aec17df7b858588e60bb5be7
Signed-off-by: Nan Li <nan.li@amlogic.com>
2017-11-17 01:36:55 -07:00