shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity
640,858 Commits 55 Branches 2,486 Tags
24c8af87bee6a062376bf70b2f8ff61894f48705
Commit Graph

640858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Long Yu
24c8af87be emmc: modify the RPMB mark 
PD#151126: emmc: modify the RPMB mark

1. modify the RPMB mark in AMLSD.c file

2. add debug debugging methods

Change-Id: Iae4f87612c8976520c8283188d331e9e94e72784
Signed-off-by: Long Yu <long.yu@amlogic.com>
 2017-09-20 19:00:57 -07:00
Yueguie He
85917585fc dts: change s420 amlogic-dt-id 
PD#151313: dts: change s420 dts amlogic dt id

Change-Id: I4bf3a4eb4e798f876e048b190ab8c49b9882cb57
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
 2017-09-20 19:09:50 +08:00
Ao Xu
4d6daca6b7 defconfig: disable CONFIG_DEVPORT on arm64 systems 
PD#149771: disable CONFIG_DEVPORT on arm64 systems

CONFIG_DEVPORT should not be used on arm64 systems.
It cannot really be used.

Change-Id: I2ed538e3c9dc7596be55789dbc23480ed92b13f9
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
 2017-09-20 02:40:55 -07:00
Ao Xu
bd6adeed26 defconfig: remove meson64_audio_defconfig 
PD#149771: remove meson64_audio_defconfig

Change-Id: I80e92b3f7eae3895371bc2ad91d78f4538740937
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
 2017-09-20 17:30:05 +08:00
jianxin.pan
de86ad980b dts: fix arch timer irq trigger type warning 
PD#151167: fix arm_arch_timer irq trigger type warning
irq: type mismatch, failed to map hwirq-29 for /interrupt-controller

Change-Id: I51cee425500596a3c48fb440e04c74d647688650
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
 2017-09-20 00:00:27 -07:00
Rongjun Chen
1b17f19345 dts: wifi: fix irq type mismatch, failed to map error 
PD#151167: del interrupts = <  0 68 4> to fix irq: type mismatch issue
test on p212 board

Change-Id: I003175f59f77fd7711297a2472e1986fea8f3609
Signed-off-by: Rongjun Chen <rongjun.chen@amlogic.com>
 2017-09-19 23:46:49 -07:00
Weiming Liu
1e0437fabf lcd: synchronous lcd driver from linux3.14 
PD#150981: synchronous lcd driver linux3.14 to linux4.9

	1.add bl_level bootargs parameter

	2.repair unifykey bl_level error

	3.update the mechanism of 50/60hz switch

	4.add pwm & enable sequence reverse support

	5.add vbyone special control adjust support

Change-Id: I63136af6b96d793691eed23c064e7515e1d50aff
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
 2017-09-19 21:32:15 -07:00
Jiyu Yang
7e23b2c3a1 dts: gxl: update ion mem region size [3/3] 
PD#151016: update ion mem region size

Change-Id: I4488f42757c9bf41a13e995c87a2204a5246dad6
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
 2017-09-19 19:40:42 -07:00
Xindong Xu
e9a1bcc3d8 p230: use a/b partition.dtsi default [1/2] 
PD#151146: p230: use a/b partition.dtsi default

Change-Id: I7ebc40783aad7a50690403f3e28bed9be89d1b11
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
 2017-09-19 01:30:00 -07:00
Pengcheng Chen
afcba67e26 dts: fix fb_reserved/logo_reserved alloc failed 
PD#150868: fix fb_reserved/logo_reserved alloc failed

Change-Id: Ibae0efc18b221bc72c419b99d908bf4ae1267d4b
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
 2017-09-19 00:43:38 -07:00
Jiamin Ma
9487af325b memleek: using single_open/seq_read and single_release in pair 
PD#149178: memleek when single_open/seq_readwithout single_release

single_open/seq_read will apply for one page and two small
slab memory. If we do not release them in single_release,
the system will crash for memory leeking

Change-Id: I2b74a0c6faec415e96164d0c20ba0676836e55eb
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
 2017-09-18 23:55:39 -07:00
Tao Zeng
b661774b52 mm: optimize for cma allocation/free time 
PD#150914: mm: optimize for cma allocation/free time

1. NOT use __GFP_COLD during cma is under allcating to
  avoid page lock long time;
2. Mark __GFP_BDEV for alloc_migrate_target to avoid
   migrate allocate cma page again in cma allocate;
3. use SMP to allocate cma;
4. try to free large order of pages for cma.

Change-Id: I2213444a089ce27ee6486c84dea03e0584086cd3
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
 2017-09-18 22:45:27 -07:00
Pengcheng Chen
d6168e9768 osd: merge 3.14 osd fix to 4.9 
PD#151059: merge 3.14 osd fix to 4.9
1. osd: fix dummy data caused green line issue(190f842)
2. osd: add debug for direct-render(cee727f)
3. osd: fix screen zoom in/out error(9854bdc)
4. osd: cursor can't full screen osd1 in 2xscaler(afadaff)
5. osd: osd_reserved caused direct render display wrong(fc55e9b)
6. osd: fix osd crash when bringup Android8.0(206fbe6)
7. osd: fix osd cursor distortion in 1080I mode(612eead)
8. osd: fix error when screen zoom in/out in osd_reverse(2243eb6)

Change-Id: Icfef7a66fcb1d0d42fe2aa57bb370f9e9a7ad5a4
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
 2017-09-18 21:33:12 -07:00
Guosong Zhou
1fab8743b1 amlvideo2: fix unuse code and bad compare 
PD#150094: driver defect clean up:
#32
#86
#90
#92
#97
#101
#103
#152
#155
#157~#158
#164
#167
#169~#179
#187~#191
#193~#199
#201~#210
#212~#213
#316~#319
#385
#572
#693~#694
#696~#697

Change-Id: I9669e5c0d717ee2287faf57a271ff27692039802
Signed-off-by: Guosong Zhou <guosong.zhou@amlogic.com>
 2017-09-18 04:39:23 -07:00
Jiamin Ma
a0abf7e982 security: fix security issues about mem corruption and info leakage 
PD#150578: kernel4.9 secure review issues
1. Kernel Debugging Options Enabled

2. Exploit Mitigations (KASLR, Stack Protector)
   Not Enabled In Kernel Config

3. Buffer Overflow in Amvideo Driver file_name
   SysFS Attribute

4. Memory Corruption in VFM Driver SysFS Attribute

5. Kernel Syslog Accessible To  Unprivileged Users

6. Kernel Memory Corruption in EFuse Driver

7. Kernel Memory Corruption in Unifykey IOCTL

Change-Id: I277c449f4cb14141bf37f90fd66764b8dccaaee0
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
 2017-09-17 20:06:01 -07:00
Pengcheng Chen
905253988f osd: create logo_reserved node in dts in Android O 
PD#150868: create logo_reserved node in dts in Android O

Change-Id: I4057aef2e40504920a9d3b086d31d96aa23bb52f
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
 2017-09-15 00:23:40 -07:00
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