shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity
640,842 Commits 55 Branches 2,486 Tags
50d9fb95d9593c1923f641d36e23888708944ddf
Commit Graph

640842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Wan
50d9fb95d9 Merge branch 'android-4.9' into amlogic-4.9-dev 2017-09-15 14:23:48 +08:00
Yi Zhou
2f938ee3dc hdmitx: fix DEADCODE errors 
PD#150471: hdmitx: driver defect clean up:
#168
#186
#200
#211
#192

Change-Id: Iffafec12c39cd98f8260a99417cb709ccc94935d
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
 2017-09-14 22:44:02 -07:00
Pengcheng Chen
00cd01eb12 osd: fix move cursor caused android O reboot issue 
PD#150952: fix move cursor caused android O reboot issue

Change-Id: Iba352617d7250167666029f80f82fd8bc9e4de3f
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
 2017-09-14 22:31:34 -07:00
Yixun Lan
7a8f830bf4 eth: stmmac: fix timer expire issue in resume stage 
PD#150780: eth: stmmac: fix timer expire issue in resume stage

Change-Id: I1d154c1eb581972d6131871901ade2272a1192ad
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
 2017-09-14 20:23:43 -07:00
Nanxin Qin
6470478320 media: merged code from c502feca7 on the amlogic-3.14-dev [1/3] 
PD#150739: merged code from c502feca7 on the amlogic-3.14-dev
1.codec_mm: fixed tvp first wait long time bug
2.pcrmaster: fix some avsync issue in pcrmaster mode
3.vfm: fix vf provider crash issue

Change-Id: I64202a38a3ed0c50ba665fb477caea26c67ddcb0
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
 2017-09-14 04:16:12 -07:00
Pengcheng Chen
fba1030374 osd: clean up deadcode 
PD#150472: driver defect clean up:
#118
#147

Change-Id: I5eb405b884e05d42f238db43c9d3a16255f06d84
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
 2017-09-14 03:55:25 -07:00
Dezhi Kong
2b43197d58 viu: null point check 
PD#150474: viu: null point check

driver defect clean up:
#95

Change-Id: I29daf5b12927c7f6227c332d0064d2e437099a8c
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
 2017-09-14 03:44:32 -07:00
Jiamin Ma
a613fe0d2b unifykey: check return value of of_property_read_u32 
PD#150092: Calling "of_property_read_u32" without checking return value
driver defect clean up:
#30

Change-Id: I590627fec489e2251c689b9a013d5c792ff19975
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
 2017-09-14 03:27:45 -07:00
Bo Yang
aa222a2e4c jtag: add check for class_register 
PD#150090: driver defect clean up:
#28


Change-Id: Ib75bbc51cf415b9ccdf8db9bbec7ae764b06e036
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
 2017-09-14 03:22:25 -07:00
Yonghui Yu
c27b2a5282 mtd: nand: add slc ids and fix timing 
PD#150552: mtd: nand: add slc ids and fix timing

Add ids:
    1. Toshiba 4Gib TC58BVG2S0HTA00
    2. Micron 4Gib MT29F4G08ABAEA
    3. Micron 4Gib MT29F4G08ABADA
fix timing for spansion/AMD
    1. S34ML02G1
    2. S34ML01G2

Change-Id: Ie92b0d5b25d1c27701e3ab1c06e5e0fbc7f27630
Signed-off-by: Yonghui Yu <yonghui.yu@amlogic.com>
 2017-09-14 01:09:40 -07:00
Jiyu Yang
bedc42a4a2 osd: use the old fence close way [3/3] 
PD#149525: osd use the old fence close way

Change-Id: I9473e4820d2cbf42c623ee6c563163b654c7fe85
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
 2017-09-13 21:15:29 -07:00
Rongjun Chen
80a2e62e8b PD#146454 wifi: update dhd_static_buf[1/2] 
update dhd_static_buf to fix prealloc mem issue

Change-Id: I0f11d174d3b8d688b1ffe37f5dd922244cfae873
Signed-off-by: Rongjun Chen <rongjun.chen@amlogic.com>
 2017-09-13 20:55:19 -07:00
Lianghu Su
fc4107647e dts: p241: add p241 dts config. 
PD#150865: add p241 dts.
1. system partition size is 0x80000000.
2. max gpu clk is 650M.
3. uart_A status is disable, uart_C is okay.
4. vpu clk level is 200M.

Change-Id: I03cc3119e3d5be8ccedc2f6f3304189fd89ef33b
Signed-off-by: Lianghu Su <lianghu.su@amlogic.com>
 2017-09-13 19:50:34 -07:00
jianxin.pan
b9a6758655 Revert "emmc: buffer size setting mismatch" 
revert this commit to avoid android boot error.

This reverts commit 709ec9c96b.

Change-Id: Ie813a0051b38743fefa495b5401490459c15d1e4
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
 2017-09-13 17:37:48 +08:00
Zongdong Jiao
c5c71dff08 hdmitx: fix dead code and bad sizeof 
PD#150078: driver defect clean up:
#14
#89
#111
#124
#133
#136
#137
#146
#148
#150
#153

Change-Id: I734a66a8b92a0dc57a232879463a3fc074534fa0
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
 2017-09-13 01:53:06 -07:00
Zongdong Jiao
d78a0bfdd5 hdmitx: clean up bad compare and dead code 
PD#150071: hdmitx: driver defect clean up:
#2
#156

Change-Id: Icf9d9d0cd112344d9981ed33171b04f744930808
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
 2017-09-13 01:50:08 -07:00
Weiguang Ruan
f85a6ec3f4 bt: compile hci_uart as module [3/4] 
PD#150522: compile hci_uart as module

    meson64_smarthome_defconfig:

    CONFIG_BT_HCIUART=m
    CONFIG_BT_HCIUART_QCA=y

1. realtek bt has its own hci_uart driver
   so we need compile both hci_uart driver
   as module

2. add hciuart_qca support, for we need qualcomm
   bt for bluez later

Change-Id: Icffbb66623a5e28803a4f26bb3523f79cae91bc3
Signed-off-by: Weiguang Ruan <Weiguang.ruan@amlogic.com>
 2017-09-13 13:53:32 +08:00
KeLe Bai
faa1093753 di: clean up deadcode 
PD#150463: driver defect clean up:
#69


Change-Id: If9604d390f5a77e2470d009058b2e77ce13f10e7
Signed-off-by: KeLe Bai <kele.bai@amlogic.com>
 2017-09-12 22:24:07 -07:00
KeLe Bai
0401afa3a9 di: clean up deadcode in flm 
PD#150460: driver defect clean up
#57

Change-Id: I91f65ecadb8799971503fa26e1e58a557d54516e
Signed-off-by: KeLe Bai <kele.bai@amlogic.com>
 2017-09-12 22:22:25 -07:00
KeLe Bai
5fd2aa9607 di: fix CHECK_RETURN error 
PD#150096: di: fix CHECK_RETURN error add return check for reserved mem

driver defect clean up:
#34


Change-Id: I18c38121e3f7628e83cc3f385c142dfda96ff412
Signed-off-by: KeLe Bai <kele.bai@amlogic.com>
 2017-09-12 22:17:29 -07:00
Long Yu
709ec9c96b emmc: buffer size setting mismatch 
PD#150079: emmc: buffer size setting mismatch

1. change the tmp_table size from 16 to 20

driver defect clean up:
#15
#16
#17

Change-Id: Iebd919e760cd0ab975508a6a57e862ff5f683fc0
Signed-off-by: Long Yu <long.yu@amlogic.com>
 2017-09-12 22:15:39 -07:00
Peipeng Zhao
a8efd8fc4b defconfig: add meson64_smarthome_defconfig for audio product 
PD#150725: defconfig: add meson64_smarthome_defconfig for audio product

Change-Id: I92611e5c28b66e8d48f4cd6ce190979311b92773
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
 2017-09-12 22:05:43 -07:00
Jian Hu
70f21fbddb i2c: clean up bad shift and return check 
PD#150077: driver defect clean up:
#8
#9
#10
#11
#12
#13
#24

Change-Id: I6bc36d30b761588a06a27957820d3ebc6aa5bf13
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
 2017-09-12 21:35:31 -07:00
Evoke Zhang
cea891a168 vout: driver defect clean up 
PD#150476: driver defect clean up:
#115
#597
#607
#609
#845

Change-Id: I92f0366ff00c8bd5e684db80c20000635256f612
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
 2017-09-12 21:26:23 -07:00
Tao Zeng
4053a7d0ec mm: forward memory reclaim process 
PD#150206: mm: forward memory reclaim process

memory reclaim process is usually do when first allocate failed
from buddy. This will cause some process crash especially when
memory is low, because there is not enough time to do reclaim
process. This change try to wake up kswapd process to reclaim
memory if free memory is less than high water mark. After apply
this change, free memory is usually keeps high than high_water
mark.

Change-Id: I03b5b931b6ec1fe1345d6f5cf8c15150438a26d3
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
 2017-09-12 18:36:25 -07:00
Evoke Zhang
78e0532bf6 vpu: driver defect clean up 
PD#150097: driver defect clean up:
#35
#39
#54
#55
#83
#94
#96
#102
#649
#690
#695

Change-Id: I1b9a9384100f4e39da246c5242de8e506671454d
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
 2017-09-12 06:05:23 -07:00
Evoke Zhang
caf7882c0b lcd: driver defect clean up 
PD#150465: driver defect clean up:
#71
#77
#109
#127
#411
#600
#602
#603
#604
#611
#612

Change-Id: I38ac5ed6583bd6e57df9f42eaab04d05ee4ed663
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
 2017-09-12 05:54:29 -07:00
Evoke Zhang
ee38eeafc1 backlight: driver defect clean up 
driver defect clean up:
#40
#41
#99
#100
#395
#396
#475
#614
#669

Change-Id: I581aaa8a1b950278bbf74d0c94aa647de89e07a9
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
 2017-09-12 05:45:57 -07:00
Evoke Zhang
0fc52b6f56 lcd_extern: driver defect clean up 
PD#150081: driver defect clean up:
#20
#38
#87
#468
#469
#470
#471
#613
#668
  

Change-Id: Ifa0756e25088599571761b33efaffb6c2c898dfc
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
 2017-09-12 02:22:21 -07:00
Nian Jing
4083308162 cvbs: clean up bad shift, deadcode, mixed enums errors 
PD#150075: driver defect clean up:
 vdac_dev.c:
#5
#6
#876
 tv_vout.c:
#181
#267
#311
#312
#313
#314
#315
#532
#605

Change-Id: I185072efb68df1abdad036a21867bb64efca914c
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
 2017-09-12 01:51:11 -07:00
Jiamin Ma
d03949a035 cpufreq: change interactive default parameters 
PD#138714: change interactive default parameters

Change-Id: I1813cda0f52755486a72efd85f79b0a4cc108514
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
 2017-09-12 00:58:15 -07:00
Pengcheng Chen
c530fb5e1e osd: move alloc buffer to osd_mmap for save memory in android 
PD#148907: osd: move alloc buffer to osd_mmap for save memory in android

Change-Id: Id8f42a08dbca33468bd8cea016aa88fa71e282c8
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
 2017-09-12 00:18:45 -07:00
Shuai Li
40e787fa79 audio: optimize DDR fifo management 
PD#150616: optimize audio DDR FIFO management driver.

Previously, we need to set DDR num and DDR IRQ number
in each audio devices.

This commit add one DDR manager which manipulate all
the ddr num and irq stuffs.
Make other audio driver easy to use it by simple interface.

Change-Id: Ie9688e651a4eff6fd4135811c50aa343e89580fe
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
 2017-09-11 01:12:23 -07:00
Peipeng Zhao
83ca5fef3e codec: fixed audio codec tlv320adc3101 input mode error 
PD#150798: codec: fixed audio codec tlv320adc3101 input mode
	add single end and differential input for S400&S420

Change-Id: I83086663b38e322425f6719247c89877504f22f5
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
 2017-09-11 10:45:38 +08:00
Yao.Liu
39f914e073 vfm: fixed vfm bug on provider init 
PD#149448: vfm: fixed vfm bug on provider init
        if provider use_cnt init later,
        some one may have on peek/get
        use_cnt may become error.

Change-Id: Ic4e416ab4ec6e0590ee095cbd1a8b40990537980
Signed-off-by: Yao.Liu <yao.liu@amlogic.com>
 2017-09-08 21:05:08 -07:00
Zhi Zhou
64d6b11ab3 media: merge some bugfix from 3.14 
PD#146178: codec_mm: fixed scatter inc check bug
PD#148029: fixed codec_mm tvp aligned bug.
PD#148029 codec_mm: fixed 2 bugs [1/1]
	fixed scatter memory check bug.
	fixed codec_mm tvp alloc aligned bug.
PD#147242: amports: add protect for video keepr.
	if not memory may free on keeping.

Change-Id: I7ebe0d3fb3caac3849dea558d91129123f8147ad
Signed-off-by: Zhi Zhou <zhi.zhou@amlogic.com>
 2017-09-07 23:46:42 -07:00
Long Yu
cdd6d7c4f1 emmc: refixed RPMB operation process 
PD149212: emmc: refixed RPMB operation process

Change-Id: Ifc845dc1009d2c28ee57a51fd45e43f12c28b7f6
Signed-off-by: Long Yu <long.yu@amlogic.com>
 2017-09-07 20:33:16 -07:00
Nan Li
4e128497b2 emmc: pre-alloc cali blk_test memory to fix suspend/resume failed 
PD#150194: modify suspend & resume fail.
1. fixed alloc blk_test memory on probe,
	pre-allocated memory allows suspend/resume
	without dynamic allocation.
2. do not flush cache while resume.

Change-Id: If4a310da82f053359f89599fd187ad51a24f16ba
Signed-off-by: Nan Li <nan.li@amlogic.com>
 2017-09-07 20:28:45 -07:00
Yao.Liu
e57a03aafe dts: enlarge buffer size for omx & framebuffer 
PD#150660: dts: enlarge buffer size for omx & framebuffer

Change-Id: Ib57e9ceef98df0c2f1b1f4785e5bcb916a8a35c0
Signed-off-by: Yao.Liu <yao.liu@amlogic.com>
 2017-09-07 03:36:55 -07:00
Qi Duan
5132975b6e USB: disable usb device interrupt when host mode 
PD#150668: USB: disable usb device interrupt when host mode. [1/1]

Change-Id: I4888617a442e0271f238a52d3998301264d4af4a
Signed-off-by: Qi Duan <qi.duan@amlogic.com>
 2017-09-07 17:10:21 +08:00
Evoke Zhang
3bc6cab0f9 tvin: add bt656in and hdmirx_ext support 
PD#149610: tvin: add bt656in & hdmirx_ext support

Change-Id: Ic4bde4b8d9c5a945f59023dd6cb961b736c83eb2
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
 2017-09-06 22:09:48 -07:00
Tao Zeng
1e0af8baa1 mm: update cma policy and debug sysfs 
PD#150194: mm: update cma policy and debug sysfs

1. For movable memory, using CMA first, this can help to avoid
   low memory issue and driver can't allocate pages issue;
2. change /proc/slabinfo sysfs with total size print of each slab;
3. change /proc/pagetypeinfo with toatal pages of each migrate type;
4. add statistics for free pages of each migrate type, and show in
   echo m > /proc/sysrq-trigger.

Change-Id: I2fdab73c2d1278cd025185362a1159e4f683166b
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
 2017-09-06 20:24:23 -07:00
Weiguang Ruan
038eab447d wifi: add pci reinit and remove_reinit function [4/7] 
PD#148564: add pci reinit and remove_reinit function

pci_reinit: power on/off then rescan pci device.

pci_remove_reinit: remove pci device first,
then power on/off, rescan pci device.

Change-Id: I03f3ceb7b526ce686b835eaacddbbd7f2ed2c384
Signed-off-by: Weiguang Ruan <Weiguang.ruan@amlogic.com>
 2017-09-06 20:04:21 -07:00
Peifu Jiang
0d1f23ae52 reboot: add rpmbp reboot mode 
PD#145456: Support RPMB shared secret provisioning [2/2]

[Problem]
RPMB requires a shared secret between host (AP) and device (eMMC flash)
in order to perform HMAC authentication.

[Solution]
This commit provides a special reboot mode, reboot rpmbp, to securely
provision the shared secret into eMMC flash device.

[Test]
Tested on GXL reference board P212. Passed.

Change-Id: I81dd482215d0f0232fe10efbc60b6af4ba2d9641
Signed-off-by: Peifu Jiang <peifu.jiang@amlogic.com>
 2017-09-06 19:47:18 -07:00
Matthew Shyu
381b7140e0 crypto: crypto update for axg 
PD#146628: crypto update for axg

1. KEY_IV now can only read 16 bytes a time
2. DES is completely disabled and TDES with three identical keys are
also disabled.  This creates a potential hole in TDES driver, and
thus TDES support is removed from dts in axg

Change-Id: Iface9c52d494b8b5232e4f5915e0f85a959863a4
Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>
 2017-09-06 19:23:58 -07:00
Xindong Xu
84edbc7284 md: use dm-anroid-verity [3/4] 
PD#150024: md: use dm-android-verity.c for android dm-verity

Change-Id: I44ee22afb38aeb8f7c5958a6974f6bc48c721dbc
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
 2017-09-06 03:45:04 -07:00
Xindong Xu
4b84a16b03 dts: change a/b update partition table [3/3] 
PD#150024 dts: change a/b update partition table

1. a/b update do not need recovery/cache
2. boot/system/vendor/odm need two slots: _a & _b

Change-Id: If74667eb4f7ebbd96a9ded3618d3d6b4c1fb8ae4
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
 2017-09-06 01:59:30 -07:00
Xindong Xu
dc59fda205 dts: p230: enlarge buffer size for omx & framebuffer [1/1] 
PD#148907: enlarge buffer size for omx & framebuffer

Change-Id: I0c9725b1ce35ba1e330ca1b603e09d99a26e0a86
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
 2017-09-06 01:29:13 -07:00
Yao.Liu
ed85ef9aa5 amlvideo: set omx output buffer size to compWidth*compHeight 
PD#150218: amlvideo: set omx output buffer size to compWidth*compHeight

Change-Id: I69ff2e5defb8344cd4aec05582f4696faa0abe7f
Signed-off-by: Yao.Liu <yao.liu@amlogic.com>
 2017-09-05 23:39:12 -07:00
Yueguie He
e2aece4a0a mtd: nand : add slc ids 
PD#150442: mtd: nand: add 128m FS33ND01GS108TFI0 nand

Change-Id: Ibda5d793825cef1a3c522cf42f277f74db3172f7
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
 2017-09-05 22:41:45 -07:00