Commit Graph

582 Commits

Author SHA1 Message Date
Wenjie Qiao 093b0ff4f4 hdmitx: adjust the hdmiphy_ctrl5 setting [1/1]
PD#SWPL-74148

Problem:
During the suspend, the hdmiphy_ctrl5 setting is 0x800, and it will
enable the clock directly from the HPLL VCO

Solution:
Adjust the hdmiphy_ctrl5 setting when set phy

Verify:
boreal

Change-Id: I324086cf05fef933ee0d238dc4f7997958a5b45b
Signed-off-by: Wenjie Qiao <wenjie.qiao@amlogic.com>
2022-09-07 20:06:45 +08:00
junyi.zhao 82e39409d1 leds: add tlc and aw driver [1/1]
PD#SWPL-91800

Problem:
there is no ledIc driver

Solution:
porting driver

Verify:
s4 ah212

Signed-off-by: junyi.zhao <junyi.zhao@amlogic.com>
Change-Id: Id7e22d21b3378c56bdf2d0f00e55083f0830d94b
2022-09-07 20:06:45 +08:00
pengzhao.liu b946ffb848 typo: clear typo problem [1/1]
PD#SWPL-89627

Problem:
clear typo problem

Solution:
clear typo problem

Verify:
s4d

Signed-off-by: pengzhao.liu <pengzhao.liu@amlogic.com>
Change-Id: I9121c9d4b54df9b9a7c244182693e0fd616f5a9e
2022-09-07 20:06:45 +08:00
Wanwei Jiang 26bf5410a1 script: build linux kernel fail [1/1]
PD#SWPL-91666

Problem:
build linux kernel fail

Solution:
modify script

Verify:
sc2/a1

Signed-off-by: Wanwei Jiang <wanwei.jiang@amlogic.com>
Change-Id: I4e225d26ff9e3d5d491f5ef8e4f1ad64d6bcf0c9
2022-09-07 20:06:44 +08:00
jiebing chen 97040b72ed Audio: spk mute kcontrol is not exit [1/1]
PD#SWPL-88304

Problem:
spk mute kcontrol is not exit

Solution:
update of_get_named_gpio_flags "spk_mute-gpios"

Verify:
use ohm

Signed-off-by: jiebing chen <jiebing.chen@amlogic.com>
Change-Id: Ib23474a9339a28130f9dc531658727c879ebf45d
2022-09-07 20:06:44 +08:00
qinglin.li 290df20136 ddr_tool: fix code typo error [1/1]
PD#SWPL-93150

Problem:
fix code typo error

Solution:
fix code typo error

Verify:
sc2

Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
Change-Id: I2a20f32ce9c28bf98237606a79e52196106a2e8a
2022-09-07 20:06:44 +08:00
yao zhang1 3836b6bfb7 typo: clear typo problem for unifykey [1/1]
PD#SWPL-93152

Problem:
clear typo problem

Solution:
clear typo problem

Verify:
sc2

Signed-off-by: yao zhang1 <yao.zhang1@amlogic.com>
Change-Id: Ib8cf62973e1db89a272d04efb842c2c40ecc7699
2022-09-07 20:06:44 +08:00
hao.shi 7d9ab78c59 codec_mm: keeping addr print style consistent [1/1]
PD#SWPL-90182

Problem:
keeping addr print style consistent.

Solution:
keeping addr print style consistent.

Verify:
sc2

Signed-off-by: hao.shi <hao.shi@amlogic.com>
Change-Id: I411c74b7372a84f02dd51e516965f36da4d24786
2022-09-07 20:06:44 +08:00
Wanwei Jiang 3d65944517 t3: bring up to console [1/1]
PD#SWPL-93002

Problem:
bring up to console

Solution:
1. copy dts related files from kernel 5.4
2. modify the file style to meet the submission requirements
3. modify the CPU register to solve the problem of stuck cpuidle
4. porting clk driver
5. porting pinctrl driver
6. modify the reg of aucpu in dts to solve kernel panic
7. modify secmon dts to solve serror kernel panic

Verify:
t3

Change-Id: Idf318911e58fdb059bbae1035d390021326870c2
Signed-off-by: Wanwei Jiang <wanwei.jiang@amlogic.com>
2022-09-07 20:06:44 +08:00
shipeng.sun c85cede1b4 damabufmanage: CB1 Revert Last daptive v4l2 design avoid memory commit [1/1]
PD#SWPL-90160

Problem:
1. Revert Last daptive v4l2 design avoid memory commit

Solution:
1. Revert Last daptive v4l2 design avoid memory commit
2. Update secure vdec pool configurate variable

Verify:
S905X4

Change-Id: Ia444121462982811ee114900ce563218772efec5
Signed-off-by: shipeng.sun <shipeng.sun@amlogic.com>
2022-09-07 20:06:44 +08:00
sky zhou d34421be87 sc2: update ion fb size to support android T [1/1]
PD#SWPL-92661

Problem:
Switching resolution display abnormal and freeze.

Solution:
enlarge to 6 fbs to support switching.

Verify:
verify on OHM.

Change-Id: Icd7a33fe8c4c16cd29e14d4e090a360cc70539d1
Signed-off-by: sky zhou <sky.zhou@amlogic.com>
2022-09-07 20:06:44 +08:00
qinglin.li 37caac235a scripts: fix fastboot update failed [1/1]
PD#SWPL-92909

Problem:
fastboot update failed

Solution:
add usb_otg.ko

Verify:
sc2

Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
Change-Id: I070c2279f054a18f82f0e46c6b19c4aa9acbd67f
2022-09-07 20:06:44 +08:00
rong.quan d0bcae7d01 vpp: CB2 fix typo error [1/1]
PD#SWPL-90374

Problem:
There are spelling errors in the code.

Solution:
Check the spelling.

Verify:
sc2

Change-Id: I069fc253b91842a1f1e9f2d8b5dd45a972b54191
Signed-off-by: rong.quan <rong.quan@amlogic.com>
2022-09-07 20:06:44 +08:00
binqi zhang 4888a345fc UVM: fix null pointer dereference [1/1]
PD#SWPL-92386

Problem:
1.null pointer dereference in mua_get_meta_data
2.missing two CLs from kernel5.4

Solution:
1.add protect for potential null pointer;
2.cherry pick the following two CLs:
https://scgit.amlogic.com/#/c/234215/
https://scgit.amlogic.com/#/c/217078/

Verify:
AndroidT kernel5.4 ohm

Change-Id: I0eb4833d75ce7e11e80fe234a21f4bd7042de8ea
Signed-off-by: binqi zhang <binqi.zhang@amlogic.com>
2022-09-07 20:06:44 +08:00
Yan Wang 99a7f5ae7b audioinfo: system panic playing a dolby/DTS file(ddp). [1/1]
PD#SWPL-92683

Problem:
system panic when playing a dolby/DTS file
after pushing ddp/dtshd license to DUT.3/3

Solution:
fix ATF share memory access

Verify:
SC2

Signed-off-by: Yan Wang <yan.wang@amlogic.com>
Change-Id: Ib871a3f68a30d02aa85ea36eb7432eff51806fd7
2022-09-07 20:06:44 +08:00
binbin.wang 9940761fb3 PM: Sc2: Enable pm for K515 [1/1]
PD#SWPL-92649

Problem:
Need to enable pm driver for k515.

Solution:
Modify dts.

Verify:
SC2 pass

Signed-off-by: binbin.wang <binbin.wang@amlogic.com>
Change-Id: I9f807d7beb541582c2cfe117cfefa04be3867882
2022-09-07 20:06:44 +08:00
Jianxiong Pan b18a197fcc mm: drain all lru pages. [1/1]
PD#SWPL-92663

Problem:
cma alloc time too long.

Solution:
add lru_add_drain_all().

Verify:
sc2_ah212.

Change-Id: Ifc0b03b3f14837c0b2ce71d52ca5ce209ff50d95
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2022-09-07 20:06:44 +08:00
yao liu 36b48d896e amdv: dolby vsif singnal type issue [1/1]
PD#SWPL-91961

Problem:
SDK2.6 require new dolby_vision_signal_type,
but it will cause blank issue on SONY TV

Solution:
revert the change 207896

Verify:
sc2

Signed-off-by: yao liu <yao.liu@amlogic.com>
Change-Id: I6ba274f046a947a22420d2041d3ed6baac056018
2022-09-07 20:06:44 +08:00
shipeng.sun fb500fba4e vdecheap: CB1 Adaptive v4l2 design avoid memory realloc [1/1]
PD#SWPL-90160

Problem:
Adaptive v4l2 design avoid memory realloc for same size

Solution:
Adaptive v4l2 design avoid memory realloc for same size.

Verify:
S905X4-AH212

Change-Id: I554c5f084cb568d0638f59e24e69e88b319dd27f
Signed-off-by: shipeng.sun <shipeng.sun@amlogic.com>
2022-09-07 20:06:44 +08:00
Lei Zhang 2853aa5224 aarch32: bring up sc2 for aarch32 [1/1]
PD#SWPL-90403

Problem:
bring up sc2 for aarch32

Solution:
bring up sc2 for aarch32

Verify:
on SC2

Signed-off-by: Lei Zhang <lei.zhang@amlogic.com>
Change-Id: I1ff3e3854357c9ed56b4b2e8f4dfb9c67cc09500
2022-09-07 20:06:44 +08:00
qinglin.li 4ea4809eb6 module: optimisation list of modules launched first [2/2]
PD#SWPL-89845

Problem:
optimisation list of modules launched first

Solution:
optimisation list of modules launched first

Verify:
sc2

Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
Change-Id: I49fe2dc30588c5118540b378ae9ab26d6148f25e
2022-09-07 20:06:44 +08:00
ziyi 67ceb77964 emmc: prevent retune happened [1/1]
PD#SWPL-92313

Problem:
5.15 not shield the mmc retune code of common dir cause
tuning operation happened when change to rpmb partition
everytime

Solution:
hold retune at the probe time

Verify:
sc2

Change-Id: I12be3f98684abdddfd9ec0194c99a0de931b82cd
Signed-off-by: ziyi <ziyi.huang@amlogic.com>
2022-09-07 20:06:44 +08:00
lele xiang 1c3575f03a dmaheap: CF1 add codec_mm dmaheap. [1/1]
PD#SWPL-90930

Problem:
5.15 not support ion default

Solution:
add codec_mm dmaheap instead of codec_mm_cma

Verify:
ohm-sc2

Change-Id: I104883ff9ce0c19141fb90f35e492a76962dbecd
Signed-off-by: lele xiang <lele.xiang@amlogic.com>
2022-09-07 20:06:44 +08:00
Jiucheng Xu 8eeeeff400 fs: Add NTFS3 support [1/1]
PD#SWPL-90516

Problem:
NTFS3 is disable

Solution:
Set NTFS3 to module

Verify:
sc2

Signed-off-by: Jiucheng Xu <jiucheng.xu@amlogic.com>
Change-Id: Ia96d12f5b7777453d716aba81547d59948ea3b90
2022-09-07 20:06:44 +08:00
Wanwei Jiang a5977bd740 gki: modify configs to follow gki rule [1/1]
PD#SWPL-88872

Problem:
modify configs to follow gki rule

Solution:
1. remove annotated configs
2. remove invalid config: CONFIG_AMLOGIC_USB_HOST_ELECT_TEST
3. remove config CONFIG_MEDIA_SUBDRV_AUTOSELECT,
and configure tuner configs to not set
4. adjust symbols
5. keep modules.dep for viewing module dependencies

Verify:
sc2

Change-Id: I64ce960e81e7b8181b8f043dee48b23ebb2de8b2
Signed-off-by: Wanwei Jiang <wanwei.jiang@amlogic.com>
2022-09-07 20:06:44 +08:00
ziyi 82895c5887 emmc: sd: gpioC0 used by data0 conflict with mic [1/1]
PD#SWPL-91801

Problem:
gpioC0 used by data0 conflict with mic

Solution:
disable sdcard

Verify:
local

Change-Id: I185b5ead877478da71dd1c02f53fd474bf08297f
Signed-off-by: ziyi <ziyi.huang@amlogic.com>
2022-09-07 20:06:44 +08:00
yujun.zhang be15c8bbeb drm: correct DRM configs [1/1]
PD#SWPL-92391

Problem:
Some config option is not compatible
with GKI.

Solution:
1. Remove ION config, use amlogic's porting
version
2. Removed other useless config option

Verify:
sc2

Change-Id: Ie2f4b1983a9ce3d3831e10eaa0a70ea5f6f7867c
Signed-off-by: yujun.zhang <yujun.zhang@amlogic.com>
2022-09-07 20:06:43 +08:00
shipeng.sun 0c40a7cedb damabufmanage: CF1 support alloc cma memory [1/1]
PD#SWPL-88808

Problem:
1.support alloc cma memory by dmabufmanager
2.update secure vdec dmabuf pool

Solution:
1.support alloc cma memory by dmabufmanager
2.Update secure vdec dmabufpool capacity by maxallocsize

Verify:
S905X4-AH212

Change-Id: I3ca8ceec06097eb848072cc45d5b7bd7b3d854ac
Signed-off-by: shipeng.sun <shipeng.sun@amlogic.com>
2022-09-07 20:06:43 +08:00
Jianxiong Pan d1af2e4585 kaslr: fix pagetrace abnormal problem when enable kaslr. [1/1]
PD#SWPL-91379

Problem:
pagetrace abnormal.

Solution:
kaslr causes the module base address to change.

Verify:
sc2_ah212.

Change-Id: I76d0346730b65a3d9012cc0edeccb81256131a5e
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2022-09-07 20:06:43 +08:00
Kai Song c1dd5718ba dsm: allow mask in lower 16 bits when generate token [1/1]
PD#SWPL-88081

Problem:
not allow mask in lower 16 bits when generate token

Solution:
allow mask in lower 16 bits when generate token

Verify:
Android-T S905X4

Change-Id: I8a984b9d83ef431261c33f40a902b52322b8b09a
Signed-off-by: Kai Song <kai.song@amlogic.com>
2022-09-07 20:06:43 +08:00
Miaohong Chen 0d2fdc169a codec_mm: CB2 Scatter memory leakage. [1/1]
PD#SWPL-86524

Problem:
Probability of scatter memory leak
when switching resolutions frequently.
The reason is that the scatter map is an array.
Since the buffer is not limited,
the number of buffers exceeds the upper limit of the array.
When alloc scatter memory,
there is no map array record.
And the release is unsuccessful, memory leaks occur.

Solution:
increase map array size.

Verify:
sc2

Change-Id: Iad837fb8d2b80a21a368d289b6826eae5860ee61
Signed-off-by: miaohong chen <miaohong.chen@amlogic.com>
2022-09-07 20:06:43 +08:00
Bichao Zheng 7a3115037e mtd: remove unused config [1/1]
PD#SWPL-89127

Problem:
mtd need to meet GKI requirement.

Solution:
1. remove unused config

Verify:
SC2

Signed-off-by: Bichao Zheng <bichao.zheng@amlogic.com>
Change-Id: I0cca1c94afa37b317c7a10b9008774f6b43a33e9
2022-09-07 20:06:43 +08:00
wanwei.jiang d48064a87e gki_tool: same as the driver of 5.4 kernel [1/1]
PD#SWPL-88872

Problem:
google said that these two functions add_taint and security_locked_down
cannot be used in a module

Solution:
same as the driver of 5.4 kernel

Verify:
sc2

Change-Id: Ifc09e1a1be9999d291e809b8f36856682142796a
Signed-off-by: wanwei.jiang <wanwei.jiang@amlogic.com>
2022-09-07 20:06:43 +08:00
Rong Chen b2e08f113f sdio: reset SDIO failed with soft [1/1]
PD#SWPL-91297

Problem:
reset sdio the second failed

Solution:
clear the timing status

Verify:
sc2_ah212

Change-Id: Ib4d1fffb6b22bb75f1d508f211b706963e644e5a
Signed-off-by: Rong Chen <rong.chen@amlogic.com>
2022-09-07 20:06:43 +08:00
hao.shi eb76dc0089 v4l2: update v4l2 vendor hooks [3/3]
PD#SWPL-90257

Problem:
Update vendor hooks according to GKI.

Solution:
Update v4l2 vendor hooks and remove vendor data in vb2.

Verify:
SC2

Change-Id: I318883dc240dd996cdebe3a165a2f045f816e956
Signed-off-by: hao.shi <hao.shi@amlogic.com>
2022-09-07 20:06:43 +08:00
wanwei.jiang 763b8abce0 debug file: change build tool for debug_file_app [1/1]
PD#SWPL-88882

Problem:
change build tool for debug_file_app

Solution:
1. change build tool for debug_file_app
2. disable debug module config
3. move CONFIG_DMA_RESTRICTED_POOL to optimize

Verify:
sc2

Change-Id: Ie50d83d2008f133dcd627a9d62200fcdb7231d51
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2022-09-07 20:06:43 +08:00
song.han b44f186fcc ddr_scrambler: build ddr_scrambler func in module [2/2]
PD#SWPL-89148

Problem:
ddr scrambler key refresh that cause lastk miss

Solution:
enable ddr scrambler key preserve when pstore init
build this function as module

Verify:
SC2_AH212

Signed-off-by: song.han <song.han@amlogic.com>
Change-Id: Iae0848df26de4387075edcdcb7652173c89d2468
2022-09-07 20:06:43 +08:00
Jianxiong Pan ee69af9735 config: disable DMA_RESTRICTED_POOL [1/1]
PD#SWPL-90047

Problem:
can not access dma_io_tlb_mem pool.

Solution:
disable DMA_RESTRICTED_POOL.

Verify:
build pass.

Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
Change-Id: I49366b4ee4032623ca0b721a9bef0869ffa11293
2022-09-07 20:06:43 +08:00
qinglin.li 63feb20c26 debug file: add debug file function [1/2]
PD#SWPL-88882

Problem:
kernel through to user space rw files

Solution:
add debug file function

Verify:
sc2

Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
Change-Id: Ia19a8b071fe63fbcd46ff1a2a8259274e40e805e
2022-09-07 20:06:43 +08:00
xia.jin af30cd0533 Cpuidle: sc2 break GKI [1/2]
PD#SWPL-89162

Problem:
s4d is a35 and no need to modify dtsi

Solution:
restore s4d dtsi

Verify:
s4d

Change-Id: I13c2f8c0441b5dd73097a5dad5449ef5c19c3165
Signed-off-by: xia.jin <xia.jin@amlogic.com>
2022-09-07 20:06:43 +08:00
xia.jin e2994dcdd6 Cpuidle: sc2 s4d break GKI [1/2]
PD#SWPL-89162

Problem:
GKI is broken for common code is modified

Solution:
1 update value of mpidr in dts
2 delete original modification

Verify:
sc2

Change-Id: I5336856859545322e7d4ab88598413f789845a21
Signed-off-by: xia.jin <xia.jin@amlogic.com>
2022-09-07 20:06:43 +08:00
Wenjie Qiao 13069be9dc hdmitx: 5.15 for dolby typo [1/1]
PD#SWPL-84758

Problem:
fix typo in sysfs audio_cap

Solution:
fix typo in sysfs audio_cap

Verify:
t7

Change-Id: I1f3300f85d88d52f535029691ad7e87fbef1a866
Signed-off-by: Wenjie Qiao <wenjie.qiao@amlogic.com>
2022-09-07 20:06:43 +08:00
kun.liu 6ae926236a media: add config AMLOGIC_MEDIA_NO_PARSER. [1/2]
PD#SWPL-25647

Problem:
Clear Demux& Parser related code from decoder

Solution:
1. used build configuration to separate parser module.
2. add config item CONFIG_AMLOGIC_MEDIA_NO_PARSER.

Verify:
u212

Signed-off-by: kun.liu <kun.liu@amlogic.com>
Change-Id: Ic6eb81c606b81a056c8d9dfd8f11a822067dccc6
2022-09-07 20:06:43 +08:00
wanwei.jiang 0b9bf356e0 module: revert module name [1/1]
PD#SWPL-91666

Problem:
user app cannot find the module parameter file.
The reason is that the file path has changed.
/sys/module/xxx/parameters/, xxx is module name.

Solution:
revert module name, same as 5.4 kernel

Verify:
sc2

Change-Id: I42f98ff34edde91af40bade87298469707494d7b
Signed-off-by: wanwei.jiang <wanwei.jiang@amlogic.com>
2022-09-07 20:06:43 +08:00
wanwei.jiang 32be04e477 gki: break gki by wifi [1/1]
PD#SWPL-88872

Problem:
break gki by wifi

Solution:
1. move CONFIG_NL80211_TESTMODE=y and CONFIG_CFG80211_WEXT=y
from amlogic_gki.fragment to amlogic_gki.optimize.
2. wifi still work when disable these config

Verify:
sc2

Change-Id: Icea841d1b1cf322a6eb0342cb2f30e36c8b1e09c
Signed-off-by: wanwei.jiang <wanwei.jiang@amlogic.com>
2022-09-07 20:06:43 +08:00
min.yang fcfd8c5383 demod: use orginal dvb-core [1/1]
PD#SWPL-89132

Problem:
use dvb-core to ko.

Solution:
1.delete dvb_frontend.c
2.change included header path.

Verify:
verified by ohm and oppen.

Change-Id: I76c8b59f5b232ddaa84bf5deb258f70be825eea6
Signed-off-by: min.yang <min.yang@amlogic.com>
2022-09-07 20:06:43 +08:00
chuangcheng peng 7687f59168 dvb-core: use origion dvb-core in kernel [2/2]
PD#SWPL-89132

Problem:
use dvb-core to ko

Solution:
put aml modification to dvb-core

Verify:
not verified, compile pass

Signed-off-by: chuangcheng peng <chuangcheng.peng@amlogic.com>
Change-Id: If400a437e48a4e1c0f8193b56e2f54d06660e806
2022-09-07 20:06:43 +08:00
wanwei.jiang ff4dccdcb5 gki: an error occurred while comparing ABI error [1/2]
PD#SWPL-88872

Problem:
comparing ABI error

Solution:
move modules ext_modules and rootfs to amlogic directory

Verify:
sc2

Change-Id: I6e73fa5201e45fd171050f9e0a66b5bb28970c13
Signed-off-by: wanwei.jiang <wanwei.jiang@amlogic.com>
2022-09-07 20:06:43 +08:00
ziyi 34593c1360 emmc : vendor hook change to timer func [1/1]
PD#SWPL-89620

Problem:
change way to add dtb key device

Solution:
revise code

Verify:
sc2,s4d

Change-Id: I5b83b2e6704ce4ec1069f4d05cdaae9874ec7997
Signed-off-by: ziyi <ziyi.huang@amlogic.com>
Signed-off-by: Long <long.yu@amlogic.com>
2022-09-07 20:06:43 +08:00
chen.xu b59e3ba991 video_processor: break GKI for video [1/1]
PD#SWPL-89213

Problem:
break GKI--video.

Solution:
1.delete ./video_processor/pic_dev/Kconfig:AM_PTSSERVER.
2.modify ./video_processor/video_dev/Kconfig:VIDEOBUF_GEN.
3.modify ./video_processor/utils/Kconfig:VIDEOBUF_GEN.

Verify:
AH212_S905X4

Signed-off-by: chen.xu <chen.xu@amlogic.com>
Change-Id: Ic857789fe942c5ba097ef7284c9f13ccb6b2ad65
2022-09-07 20:06:43 +08:00