Commit Graph

855 Commits

Author SHA1 Message Date
Jing Li1 64c7e3bfb1 Revert "Demux: Add api for multi2 [1/2]"
This reverts commit febc85e083.

PD#SWPL-183570

Revert multi2 api because it is not compatible with some old projects.

Change-Id: I209e83a07af6096234789ff7993ea3f6befa3d45
Signed-off-by: jing.li1 <jing.li1@amlogic.com>
2024-08-27 05:57:23 -07:00
qinglin.li 0a9e20de35 ddr_tool: add t6d outstanding support [1/1]
PD#SWPL-182359

Problem:
add t6d outstanding support

Solution:
add t6d outstanding support

Verify:
local

Change-Id: Ia9173cbfb0cc2b1861d1a3dc7ae1cfafebe65b5b
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2024-08-27 02:47:34 -07:00
qinglin.li 7b2e4c5340 ddr_tool: use aml_ddr_tool.h as ddr_tool drivers common head file [1/1]
PD#SWPL-182359

Problem:
use aml_ddr_tool.h as ddr_tool drivers common head file

Solution:
use aml_ddr_tool.h as ddr_tool drivers common head file

Verify:
local

Change-Id: Ie2abc7e3405192192b9de65374371b6301934933
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2024-08-27 02:47:29 -07:00
can.zhang ac3d7fe01f amvecm: disable hdr10plus ability [1/1]
PD#SWPL-181880

Problem:
hdr10plus func need open or not

Solution:
add code

Verify:
local

Change-Id: I30696cb2ac0df9e98e99f5ac9b57ffdeccd3b95d
Signed-off-by: can.zhang <can.zhang@amlogic.com>
2024-08-26 05:47:31 -07:00
Wenjie Qiao 34ef11fd45 hdmitx: set segment 0 when read block0/1 under kernel [2/2]
PD#SWPL-169569

Problem:
read edid error after reboot under kernel

Solution:
set segment 0 when read block0/1
read edid use DDC master access in HW TPI mode

Verify:
s5/s7

Test:
DRM-HDMITX-104

Change-Id: I885081b383c041986c54684d0b9225e24dd1e233
Signed-off-by: Wenjie Qiao <wenjie.qiao@amlogic.com>
2024-08-23 02:05:00 -07:00
jing.li1 febc85e083 Demux: Add api for multi2 [1/2]
PD#SWPL-181881

Problem:
S6 need to support multi2

Solution:
Add api for multi2

Verify:
Verified on bl201

Change-Id: Ifb6d02d198efacea99c1360ec37d2d5de7b79086
Signed-off-by: jing.li1 <jing.li1@amlogic.com>
2024-08-22 23:49:05 -07:00
Sunny Luo d30056cc9f spicc: reset controller when busy [1/1]
PD#SWPL-183022

Problem:
ldim crash caused by spi abnormal transfer

Solution:
reset spicc controller when busy

Verify:
t5m

Change-Id: I1317e8e5b2ddec6198126e8cd4a9c569f13eb4d5
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
2024-08-22 07:40:49 -07:00
Tao Zeng 187ca993ca t6d: amfc: use device config and compress uImage
PD#SWPL-181954

Problem:
uImage not decompressed by AMFC

Solution:
1, change zstd tools to append size at end of uImage;
2, change scripts to support uImage decomperss by AMFC

Verify:
t6d

Change-Id: I2f2465a2247085c150a1c7f42ede688011745071
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
2024-08-22 14:40:36 +08:00
huijie.huang dc16c0cc20 lcd: t6d tcon support [2/2]
PD#SWPL-180353

Problem:
t6d lcd tcon bringup

Solution:
support tcon driver

Verify:
t6d br301

Change-Id: If52b51bf609a17de138fb76b840bf865e15a4cfc
Signed-off-by: huijie.huang <huijie.huang@amlogic.com>
Signed-off-by: chenyang.liu <chenyang.liu@amlogic.com>
2024-08-22 14:27:53 +08:00
Zhongfu Luo 8542413395 efuse: T6D: efuse driver bringup [1/1]
PD#SWPL-180289

Problem:
T6D: efuse driver bringup

Solution:
update efuse node
update efuse cali subitem

Verify:
T6D BR309

Change-Id: I025dd508a630cfad3596f0ca3d7ff2165f84b468
Signed-off-by: Zhongfu Luo <zhongfu.luo@amlogic.com>
2024-08-22 14:27:53 +08:00
dian.shao fb2db42f7f usb: t6d usb2t controller clks update [1/1]
PD#SWPL-180337

Problem:
S6 usb2t controller clks need update.

Solution:
Add clk mux codes & dts nodes.

Verify:
br201.

Change-Id: I5342898a9864601f58f3ba6aa49f113ca1e81642
Signed-off-by: dian.shao <dian.shao@amlogic.com>
2024-08-22 14:27:53 +08:00
Tao Zeng d601d7ea09 t6d: enable amfc [1/3]
PD#SWPL-181159

Problem:
AMFC not enabled

Solution:
enable it

Verify:
t6d

Change-Id: I710887e1d00b296e8c0e804ce62cf0dccf5c8957
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
2024-08-22 14:27:52 +08:00
dian.shao 5bdcf2ac78 usb: t6d bringup [1/1]
PD#SWPL-180337

Problem:
T6D Silicon Bringup
- Kernel
- High speed peripheral driver
- USB

Solution:
Add dt nodes & driver.

Verify:
t6d.

Change-Id: Ib714eda2d9ccc0b247d8a6dee9851e31150f7a3f
Signed-off-by: dian.shao <dian.shao@amlogic.com>
2024-08-22 14:27:51 +08:00
Huijuan Xiao 3e6b6bb78e amvecm: t6d bringup [1/1]
PD#SWPL-167798

Problem:
add t6d pxp bringup flow

Solution:
probe lut1 gmt_comp lut3d osd_mtx

Verify:
t6d

Change-Id: I72b493cc8ecdf12d42bef495e6c49abee9a90439
Signed-off-by: Huijuan Xiao <huijuan.xiao@amlogic.com>
2024-08-22 14:27:51 +08:00
Pengcheng Chen b4bf41313b video: add t6d video support [1/1]
PD#SWPL-167810

Problem:
add support for t6d

Solution:
complete it

Verify:
t6d

Change-Id: I4529e7871f85abde6c2cd22ce955aadff27d5c9c
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2024-08-22 14:27:51 +08:00
yuhua.lin 3626f20998 canvas: add support for t6d [1/1]
PD#SWPL-163819

Problem:
add support for t6d

Solution:
complete it

Verify:
t6d

Change-Id: Ia6228907993326e8c3bc22495ac8d17b075df6cf
Signed-off-by: yuhua.lin <yuhua.lin@amlogic.com>
2024-08-22 14:27:50 +08:00
huijie.huang 6fda565ebf lcd: support t6d [1/1]
PD#SWPL-167796

Problem:
t6d pxp bring up

Solution:
Support t6d pxp bring up

Verify:
t6d

Change-Id: I92a30523dd75594e78c45caa2fda64f88fe51906
Signed-off-by: huijie.huang <huijie.huang@amlogic.com>
2024-08-22 14:27:50 +08:00
yuhua.lin 17413ae0d8 vpp: add codec_io/canvas/rdma support for t6d [1/1]
PD#SWPL-167808

Problem:
add support fot t6d

Solution:
complete it

Verify:
ptm

Change-Id: I27a292260e8b7e8a644b2dcd43dab5acd721a9f1
Signed-off-by: yuhua.lin <yuhua.lin@amlogic.com>
2024-08-22 14:27:50 +08:00
gerrit autosubmit a8f3c5ce7b Merge "hdmitx: add edid_valid property [1/1]" into amlogic-5.15-dev 2024-08-21 21:24:07 -07:00
zhou.han 659a8d1dc2 hdmitx: add edid_valid property [1/1]
PD#SWPL-99060

Problem:
Try to limit the external module directly r/w  the driver node.

Solution:
Add edid_valid property

Verify:
ohm

Test:
DRM-TX-20

Change-Id: I3bc300e0a8c0ec019d2ef10db976584140de4588
Signed-off-by: zhou.han <zhou.han@amlogic.com>
2024-08-19 22:49:10 -07:00
Pengcheng Chen 62829a4a25 vpp: fix src_fmt_str overflow issue [1/1]
PD#SWPL-182110

Problem:
fix src_fmt_str overflow issue

Solution:
fix src_fmt_str overflow issue

Verify:
t5w

Change-Id: Ie4d2b709a027f5297e4f941df00b2971eb552422
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2024-08-19 21:53:07 -07:00
Feng Chen 932190b3f1 spinand: F35SQA001G QPL qualify [1/1]
PD#SWPL-148920

Problem:
STB QPL qualify

Solution:
add F35SQA001G to flash id table.

Verify:
S1A_BG201

Change-Id: I3da23fa93396f96822a3bb32fc3d2332b9e9a7fd
Signed-off-by: Feng Chen <feng.chen@amlogic.com>
2024-08-19 07:42:40 -07:00
zhenteng.tian ac4d783d72 vc: notify frame display info to mediaproxy. [1/1]
PD#SWPL-177588

Problem:
video_composer need notify frame display info to mediaproxy

Solution:
notify frame display info to mediaproxy

Verify:
T5M

Change-Id: Icd7f8f030a78245086dd0c3eba5cd1e7d3761e70
Signed-off-by: zhenteng.tian <zhenteng.tian@amlogic.com>
2024-08-15 21:45:31 -07:00
wenlong.zhang 2745334200 drm: amvecm ctm update [1/1]
PD#SWPL-180143

Problem:
drm should not call rdma write register by video channel.

Solution:
re-implement ctm api, drm just set matrix parameters, then amvecm
will write register in vsync isr.

Verify:
t7c

Change-Id: I68700d65fa494fab2552414044b011c2ef21bdeb
Signed-off-by: wenlong.zhang <wenlong.zhang@amlogic.com>
2024-08-15 19:46:40 -07:00
lizhi.hu e2f3ba505f lcd: projection mode support [1/1]
PD#SWPL-173046

Problem:
projection broken after lcd multi-timing support 1

Solution:
1. divide panel dtsi to tv/tablet/projection
2. add vout regist ctrl to force regist multi vout

Verify:
txhd2_be311

Change-Id: I163818378fc762c961926dac84b11c4c28404842
Signed-off-by: lizhi.hu <lizhi.hu@amlogic.com>
2024-08-15 19:46:34 -07:00
jinbiao b6bce37072 SD: control sd io-related GPIO output low when reboot. [1/1]
PD#SWPL-164281

Problem:
SD io-related GPIO always output high when reboot.

Solution:
control sd io related GPIO output low via Pinctrl.

Verify:
C3_AW419

Change-Id: I487b5be27e2248b709c709c3bd7e3beb6d9adeee
Signed-off-by: jinbiao <jinbiao.ou@amlogic.com>
2024-08-15 01:42:32 -07:00
gerrit autosubmit 0d9978f078 Merge "dmabuf_manage : CF0 add secmem v3 64bit addr support [1/1]" into amlogic-5.15-dev 2024-08-13 21:46:48 -07:00
Evoke Zhang e5e428f250 lcd_extern: support reload cmd bin [1/1]
PD#SWPL-175831

Problem:
need support lcd_extern reload cmd bin

Solution:
add lcd_extern reload cmd bin

Verify:
ay301

Change-Id: I3ed9041bc680a458e5853f0ef23bdb5f6810ae13
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2024-08-13 21:46:32 -07:00
song.han ba1bb225eb iotrace: add preempt protections at hooks [1/1]
PD#SWPL-179411

Problem:
BUG: sleeping function called from invalid context
	at kernel/sched/completion.c
in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 1,
	name: swapper/0
Preemption disabled at:
[<c0428468>] queue_stop_cpus_work+0x60/0x1bc
[<c030dc24>] show_stack+0x28/0x2c
[<c105e624>] dump_stack_lvl+0x48/0x54
[<c0371660>] ___might_sleep+0x1c4/0x1e8
[<c10621b8>] wait_for_completion+0x28/0x58
[<c0428180>] stop_machine_cpuslocked+0x10c/0x208
[<c106ac28>] patch_text+0x20/0x28
[<c0501254>] __jump_label_update+0x7c/0xec
[<c05002b8>] static_key_enable_cpuslocked+0x8c/0x100
[<c050034c>] static_key_enable+0x20/0x28
[<c0441acc>] tracepoint_add_func+0x38c/0x400
[<c0441c00>] tracepoint_probe_register+0x54/0x6c
[<c0db6974>] ftrace_ramoops_init+0x288/0x2fc
[<c163cb30>] aml_iotrace_init+0x46c/0x550
[<c03020a0>] do_one_initcall+0x104/0x364
[<c1601f90>] do_initcall_level+0xa0/0x15c
[<c1601ec0>] do_initcalls+0x58/0x88
[<c1601d04>] kernel_init_freeable+0x114/0x160
[<c105fe24>] kernel_init+0x20/0x1c4
[<c0300134>] ret_from_fork+0x14/0x40

Solution:
add preempt protections at hooks

Verify:
t5w

Change-Id: Ib6a13e104aeb697e84e331152f6ea41ef6d11b35
Signed-off-by: song.han <song.han@amlogic.com>
2024-08-13 05:44:40 -07:00
Sunny Luo 0585d28c0b spi: spicc-v2: add vsync trig mode support [1/1]
PD#SWPL-159505

Problem:
vsync trig mode requirement from LDIM

Solution:
add vsync trig mode support for spicc-v2

Verify:
T3X T968D4-BC302

Change-Id: I16e24c55d884cf4871875e5a22c0935b13e36f01
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
2024-08-13 01:46:32 -07:00
chen.xu 32a3341535 video_composer: vc support dec set screen mode [1/1]
PD#SWPL-178926

Problem:
video_composer need support dec set screen mode.

Solution:
1.while dec set screen mode, vpp using this 1st priority.

Verify:
T982

Change-Id: I71d9cdb4d7b7ed452427f55e6e8767709d35b052
Signed-off-by: chen.xu <chen.xu@amlogic.com>
2024-08-12 23:48:34 -07:00
Hao Shi 5ef408908c dmabuf_manage : CF0 add secmem v3 64bit addr support [1/1]
PD#SWPL-176629

Problem:
add secmem v3 64bit addr support

Solution:
add secmem v3 64bit addr support

Verify:
None

Change-Id: Id5c6bca16e8620140770b7dc9f6b9dbddc395850
Signed-off-by: shipeng sun <shipeng.sun@amlogic.com>
2024-08-12 22:09:13 -07:00
Jianxiong Pan 9b29864e12 mm: set the special flags of cma allocation to filter printing of dmc. [1/1]
PD#SWPL-179075

Problem:
dmc monitor not filter cma allocation function by default.

Solution:
set the special migrate flags for dmc monitor.

Verify:
local.

Change-Id: Ie55a22685edc386c1e2af53a31269669e852d089
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2024-08-12 19:52:49 -07:00
gerrit autosubmit 45d6b0fd38 Merge "vdin: fix the ms12 test failure issue on t5m [1/1]" into amlogic-5.15-dev 2024-08-12 05:14:18 -07:00
haitao.liu fd355878e3 vdin: fix the ms12 test failure issue on t5m [1/1]
PD#SWPL-180965

Problem:
AV out of sync on t5m causing ms12 test failure

Solution:
1.change the vdin frame buffer number to 11 on t5m
2.return the real frame buffer number to vpp
3.add irq cnt into vframe for vlock

Verify:
t5m

Change-Id: I753f573faa80f8b17e3cd6ff041268d89e49ba6c
Signed-off-by: haitao.liu <haitao.liu@amlogic.com>
2024-08-12 01:17:26 -07:00
Long cb9cdc449a storage: dma access to memory physical addresses above 4G for MMC Host. [1/1]
PD#SWPL-176827

Problem:
1.need to access to memory physical above 4G.
2.sdio/sd/emmc need to use sg-link mode

Solution:
1.dma access to memory physical addresses
above 4G for MMC Host
2.sdio/sd/emmc use sg-link mode

Verify:
S6 bl201

Change-Id: I1726a8c086b2d665aefb32043ee19a251d0cdb3b
Signed-off-by: Long <long.yu@amlogic.com>
2024-08-09 08:04:26 -07:00
Rong Chen e75d5b42da mmc: add hs400 para save [1/1]
PD#SWPL-178572

Problem:
lack hs400 para save.

Solution:
add hs400 para save.

Verify:
S5

Change-Id: Ie363d3b303dd26c55b47778aa7753444be4af423
Signed-off-by: Rong Chen <rong.chen@amlogic.com>
2024-08-07 21:48:49 -07:00
lizhi.hu c4db023225 lcd: support phy tuning function [2/2]
PD#SWPL-168501

Problem:
need support lcd phy tuning function

Solution:
1.support lcd phy tuning tool api
2.support lcd tuning_Attr parse
3.support multi group phy tuning parameters

Verify:
ay301

Change-Id: Ib4aacfe358a993876ee2a11f954b509811702619
Signed-off-by: lizhi.hu <lizhi.hu@amlogic.com>
2024-08-07 21:48:26 -07:00
Yongjie Zhu 5e346070e3 dmaheap: add class and debug node [1/1]
PD#SWPL-176242

Problem:
dmaheap driver need support debug & class node
gralloc need use ioctl to get dmaheap info

Solution:
add class and debug node for dmaheap
add dmaheap ioctl for gralloc

Verify:
s7d

Change-Id: I60fa73f6c51bbb37fc81531e61b28ecd1fbf700f
Signed-off-by: Yongjie Zhu <yongjie.zhu@amlogic.com>
2024-08-06 01:42:57 -07:00
hualing chen f473d32d48 media_proxy: CB2 move proxy to kernel common for 5.15. [1/8]
PD#SWPL-177051

Problem:
1  Di module can not call proxy api for 5.15.

Solution:
1  Move MediaProxy to kernel common for 5.15.

Verify:
t5m

Change-Id: I573f51392c809b77bf6a2e8194a4a3a451f1cc35
Signed-off-by: hualing chen <hualing.chen@amlogic.com>
2024-08-06 01:42:22 -07:00
Junyi Zhao 38ff5910ca pwm: s7: add double channel and normal channel in tee env [1/2]
PD#SWPL-176719

Problem:
when pwm's clk be locked by tee, all pwm should follow tee.
so, should support wifi 32K on pwm tee module.
in case of clk of wifi's pwm channel being locked.

Solution:
add  double channel to match wifi 32K legacy used.

Verify:
s7

Signed-off-by: Junyi Zhao <junyi.zhao@amlogic.com>
Change-Id: I343be31d409cf1480b5681acc1ec83fd7a7fad5c
2024-08-05 21:46:19 -07:00
Evoke Zhang e30676fc8e lcd: update ufr mute control [1/1]
PD#SWPL-175916

Problem:
need support different unmute time for upper layer UI switch

Solution:
support different unmute time for upper layer UI switch

Verify:
bc302

Change-Id: I2018f8380ba186f2a232adfb8a24c734bf95bdc3
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2024-08-02 03:52:42 -07:00
dian.shao fa8e67605c usb: s6 power optimise & misc [1/1]
PD#SWPL-177679

Problem:
S6 usb high power.
speed-drop usb devices.
u2phy disconnect, squelch & edgedrv cali

Solution:
Optimise suspend logic by holding usb controller reset bit,
usb controller comb reset bit, usb2_phy_reset_bit, usb3_phy_reset_bit
.Besides:
1. reset usb3_apb_reset_bit and leave it set then modify corresponding
static regs for low power.
2. off unused usb3phy digital 100M clk.
3. Some quirky devices take >2s to turn on Rterm and begin polling
after resume, which is seen in the new clean usb3 phy. This leads
to wait_for_connected timeout when resuming. Add XHCI_MISSING_CAS
for xHC to workaround by asserting warm reset at resume.

The speed-drop usb devices TX maybe unstable at insertion, leading to
CDR KI overload. Delay freq tracking start point by modifying fr_en
delay 1us->300us.

Modify params in driver & dts.

Verify:
BL201.

Change-Id: I4d6139ecad79e8582ada818338fcf53a1d66b131
Signed-off-by: dian.shao <dian.shao@amlogic.com>
2024-08-02 01:00:02 -07:00
Long 1622e39ea9 eMMC: optimizing the data tuning process of HS400ES. [1/1]
PD#SWPL-175417

Problem:
if any cmd resp timeout error in HS400es will not
continue to send the stop command.

Solution:
if there is cmd resp timeout error, we need to
send stop command additionally.

Verify:
txhd2

Change-Id: Id6652ab18e8e7b4281e06d8ff537986bdf60a31e
Signed-off-by: Long <long.yu@amlogic.com>
2024-08-01 06:25:56 -07:00
ruofei.zhao 2fcea7e589 hdmitx: optimized hdmitx logs [2/2]
PD#SWPL-178894

Problem:
hdmitx logs non-normative

Solution:
optimized hdmitx logs

Verify:
S7D

Test:
DRM-TX-78

Change-Id: I49bf8a82fc34e12594f823843aa705d992a96640
Signed-off-by: ruofei.zhao <ruofei.zhao@amlogic.com>
2024-08-01 03:00:20 -07:00
Sunny Luo 12ceda73f6 spisg: fix mutex lock panic of dirspi_async [1/1]
PD#SWPL-179542

Problem:
dirspi_async is designed for the ldim isr. Unfortunately, the
clk_set_rate and clk_get_rate it calls use a mutex lock, which
will lead to a mutex lock panic.

Solution:
Set spi speed in spi_setup only when controller_data use_dirspi=1
Pre-save the spi speed to avoid calling clk_get_rate

Verify:
t5m

Change-Id: I4fdf9d3be687901a5e8cffa1f838f99551b7d94a
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
2024-07-31 01:52:43 -07:00
zongdong.jiao 9ca532cf80 hdmitx: add external plugin/out handler for eARC hpd [1/2]
PD#SWPL-177527
PD#SWPL-173088
PD#SWPL-173090

Problem:
The HPD signal may be come from HDMI HPD, but eARC has HPD
status from status bits

Solution:
Add reading EDID data in external plugin handler with mutex
No external plugout handler

Verify:
sc2, t7c

Test:
DRM-TX-38

Change-Id: I443e69aa6c8949a0d49df476108414431fd067d7
Signed-off-by: zongdong.jiao <zongdong.jiao@amlogic.com>
2024-07-31 01:52:03 -07:00
xiangyang.yan 6d63338baa S6: ethernet: googlecast wakeup [1/1]
PD#SWPL-179266

Problem:
googlecast wakeup

Solution:
add function googlecast wakeup

Verify:
bl201

Change-Id: I92b40055453e65df0a7735769acb590dc41f009c
Signed-off-by: xiangyang.yan <xiangyang.yan@amlogic.com>
2024-07-30 23:54:41 -07:00
qiyao.zhou df13c445fb vicp: add shutdown flow for vicp. [1/1]
PD#SWPL-179050

Problem:
poweroff dissipation for VICP clk.

Solution:
1.Implement function in vicp for shutdown.
2.cherry pick 20baea19c687c86f559e02fcd4e10184f14c409f.

Verify:
s5

Change-Id: I0e6fcd59176172d13f70e02661f7e0da182c0677
Signed-off-by: qiyao.zhou <qiyao.zhou@amlogic.com>
2024-07-30 00:41:28 -07:00
Pengcheng Chen c4de7d4562 vpp: add lcevc support [1/1]
PD#SWPL-164381

Problem:
add lcevc support

Solution:
add lcevc support

Verify:
s7d

Change-Id: Ieb6a24902b687d16faec2399bcde6a72c9a13ef8
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2024-07-30 09:46:47 +08:00