Commit Graph

870289 Commits

Author SHA1 Message Date
cd1b2bb81f arm64: dts: rockchip: rk3568-nvr: use "rockchip,hdmi" instead of "simple-audio-card"
Signed-off-by: Qiqi Zhang <eddy.zhang@rock-chips.com>
Change-Id: Ie65c13cfda18b26098a4d4d3389c70a8a50bd3f4
2023-06-06 11:47:36 +08:00
ee81350d02 phy: rockchip: naneng-combphy: Fix Rx squelch for RK3528 U3
This patch adjust the RK3528 U3 Rx squelch input filler
bandwidth to 3'b110 which is used for rx_lfps, reduce the
bandwidth to avoid filtering valid superspeed data.

With this patch, it can fix the issue that Kingston U3 Disk
(idVendor=0951, idProduct=1666, bcdDevice= 1.10) read error
on RK3528 platforms.

Change-Id: Ifa4eac24bbdebe020db356ba45dae146f4df22f1
Signed-off-by: William Wu <william.wu@rock-chips.com>
2023-06-06 09:26:30 +08:00
695a9c9e4d phy: rockchip: naneng-combphy: Fix Rx squelch for RK3568 U3
This patch adjust the RK3568 U3 Rx squelch input filler
bandwidth to 3'b110 which is used for rx_lfps, reduce the
bandwidth to avoid filtering valid superspeed data.

With this patch, it can fix the issue that Kingston U3 Disk
(idVendor=0951, idProduct=1666, bcdDevice= 1.10) read error
on RK3568 platforms.

Change-Id: I27410c5702862df2d8829a2ca3c2c1d9f57885be
Signed-off-by: William Wu <william.wu@rock-chips.com>
2023-06-06 09:26:30 +08:00
413baae712 修复edp-touch设备树插件编译报错的问题 2023-06-03 01:06:47 +00:00
27eb12f5f9 2IO增加edp触摸的设备树插件 2023-06-02 09:50:49 +00:00
4d00e4c577 修复2n的uEnv文件没有添加设备树插件的问题 2023-06-02 09:49:01 +00:00
4452390ed6 简化设备树结构,用以适配摄像头设备树插件 2023-06-02 09:46:00 +00:00
78fec1dbd9 添加四款摄像头的设备树插件 2023-06-02 09:38:34 +00:00
2ff6bc9d21 uEnv文件添加摄像头的设备树插件 2023-06-02 09:37:48 +00:00
c2b5d8108f dt-bindings: rockchip-dw-mshc: Add pinctrl note
Add pinctrl description and example to show how it was used
to prevent power leak for SD/MMC cards.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I1b711328e4677e74b82c74a9bedbc052f5ea9b97
2023-06-02 11:51:24 +08:00
57be356445 mmc: dw_mmc: Add normal and idle pinctrl control
normal pinctrl is used for sd working mode. idle pinctrl is
used when the card is added or removed, so pull down the
IO to avoid power leak which makes the card unable to work.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I8780b9de735b86918b4d5ba857711e56de740ecf
2023-06-02 11:45:18 +08:00
f213c72b1e Fixed a problem with wwan dialing
Sometimes the display 4G, but can not access the Internet, switch driver solution
2023-06-02 03:02:19 +00:00
1029ff5aee video: rockchip: mpp: Fix deinit failure memory leak
The dmabuf allocated by video will leaked when media process exit
abnormal, this patch changes the deinit for mpp driver to fix it.

Tested on RK3588 Debian:
step1:
GST_DEBUG=fpsdisplaysink:6 gst-play-1.0 /data/1.mp4 --use-playbin3 \
	--audiosink=fakesink --videosink="fpsdisplaysink \
	video-sink=waylandsink signal-fps-measurements=true"
step2:
ctrl + c to kill process
step3:
cat /proc/rk_dmabuf/dev to check dmabuf stat

Tested-by: Jianqun Xu <jay.xu@rock-chips.com>
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: Ia3906b3a0bb5ec6511fc8d8abefadc37d6287c89
2023-06-02 09:06:47 +08:00
6613771ca0 video: rockchip: mpp: move session->wait to task->wait
reason:
1. If the task in the session is assigned to two different cores, the
task in the back may complete first and trigger the wait signal of the
session.
2. In the wait thread, it is taken according to the pending list order,
and the previous task will be triggered, and it must not be found in
the list.
3. For the above reasons, put the wait signal into the task and monitor
the wait signal of the task according to the pending order, then the
order will not be wrong.
4. According to this method, done_list can also be unnecessary.

relative log:
session 000000003edbfbaa task 00000000207419c6, not found in done list!
session 000000003edbfbaa task 000000006a0597ed, not found in done list!
session 000000003edbfbaa task 00000000fe35cb90, not found in done list!
session 000000003edbfbaa task 000000001638cf87, not found in done list!
session 000000003edbfbaa task 00000000a2ba5976, not found in done list!

Change-Id: I2ab6c98162cc4b71ef34cbcda0bc30434fecdb5d
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2023-06-02 09:06:41 +08:00
f4c37f0a7c phy: rockchip: naneng-combphy: Fix swing to 650mv under 100M refclk for rk3528
Change-Id: I30b988fe60a09ad3aafd6527238926526b1c3693
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-06-01 18:33:12 +08:00
9fa42a4d66 arm64: dts: rockchip: rk3528: Modify system-status-level of dmc
Only SYS_STATUS_NORMAL with DMC_FREQ_LEVEL_HIGH is left. This will not
trigger ddr frequency scaling by default.

Signed-off-by: Wesley Yao <wesley.yao@rock-chips.com>
Change-Id: I14cb44b189df79cb2441feb6d809696160c314c5
2023-06-01 09:32:58 +08:00
b243639804 tee: optee: interrupt an RPC when supplicant has been killed
check supplicant is dead or alive when get signal,
run normal program if supplicant is alive,
interrupting an RPC if supplicant is dead, Otherwise,
the current thread will be stuck in the optee driver.
The error is printed as follows:

INFO: task gatekeeper@1.0-:461 blocked for more than 20 seconds.
Not tainted 5.10.66 #2
task:gatekeeper@1.0- state:D stack: 0 pid: 461 ppid: 1 flags:0x0400002d
Call trace:
switch_to+0x180/0x230
__schedule+0x49c/0x704
schedule+0xa0/0xe8
schedule_timeout+0x38/0x124
wait_for_common+0xa4/0x134
wait_for_completion+0x1c/0x2c
optee_handle_rpc+0x1a4/0x6ec
optee_do_call_with_arg+0x1a4/0x298
optee_release+0x134/0x1bc
tee_release+0xa4/0x100

Change-Id: I2f82338ecccc1bc97bb5a6c25767eca4542cbcdf
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
(cherry picked from commit e6c7ea7d4da7e43ca05bb2634165e7c143a108ba)
2023-05-31 14:50:13 +08:00
23a922fb5b PM / devfreq: rockchip_dmcdbg: modify Dram ID print format
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
Change-Id: I84b1892e05089dda57fa82bf4b9429b100966e63
2023-05-30 18:11:59 +08:00
67ecbc2c00 fixed mipi panel power-supply 2023-05-29 16:36:07 +08:00
80bf7ea293 修复i2c5 ov8858 pwdn 和 reset io, 并支持双目摄像头 2023-05-29 16:33:40 +08:00
ac6c231342 修复rk3566不能用树莓派摄像头的问题 2023-05-26 09:45:45 +00:00
c6bd7c8fa2 更新sc132gs的内核以及设备树,设备树需要被引用 2023-05-26 09:06:37 +00:00
9f424182f4 phy: rockchip: inno-usb2: power on phy if linestate is SE1
Some special devices connected to host port, the linestate
maybe SE1 (DP/DM both in High level).

The below devices are the known special devices

Wireless HID: VID = 0xa604, PID = 0x0715
RK3308BS ADB: VID = 0x2207, PID = 0x0006

In order to support these special devices, this patch
handle the linestate SE1 as device connected state,
and power on the phy if it has already suspended.

Change-Id: I55fe83150c18d6c2629fbc857790ef04cdb68da5
Signed-off-by: William Wu <william.wu@rock-chips.com>
2023-05-26 15:57:15 +08:00
107e417ebe arm64: dts: rockchip: rk3528-evb: prepare bt sco settings
we don't directly add bt-sco cards because it may take some
i2s/pcm, which may use dma, but dmas may limit.
so we just prepare this settings, then if any one who want to
support bt-sco, he/she can just add dts in board-level dtsi.

For example diff in "rk3528-evb1-ddr4-v10.dtsi":

+&bt_sco {
+       status = "okay";
+};
+
+&bt_sound {
+       status = "okay";
+};
+
+&sai0{
+       status = "okay";
+};

The default pcm/i2s setting is:
Format: PCM, dsp_a, MSB first, short sync, rising edge and 1 bclk.
rockchip soc: master; Bt controller: slave

Change-Id: I64e76c2ae4b8449e2ee345587e080b3a70521ed9
Signed-off-by: Zou Dengming <marsow.zou@rock-chips.com>
2023-05-25 16:19:09 +08:00
fd6616ad21 arm64: dts: rockchip: rk3528: Split I2Sx pinctrl
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: Ibfc99cfbd5ef324f549ae356059b7fc7ab45fe96
2023-05-25 15:09:21 +08:00
53499155f7 ASoC: rockchip: rk817-codec: Be stable PLL status during switch sample rate and mclk
Change-Id: I5f01035efb68fac9800fb62388221210bdb12d93
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2023-05-25 15:06:56 +08:00
4222c190a2 arm64: dts: rockchip: rk3528: Add mbist-vmin for cpu gpu and dmc
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I664731babae657181e94734b721ae6d1d6a39078
2023-05-24 16:56:41 +08:00
66e6a60ef5 arm64: dts: rockchip: rk3528: Add 12500uV for cpu low frequencies
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Icfe74c6edbbb1328a864fa8d42448e09e71a0a46
2023-05-24 16:40:18 +08:00
09d3f22add crypto: rockchip: fixed probabilistic crashes in multithreading
The protection range of spin lock is optimized to prevent
competition conditions.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I6d3dd088fc5e5c0046df12184108b9e176ac26a7
2023-05-24 11:43:40 +08:00
19728054cd crypto: rockchip: Kconfig: select crypto v3 if RK3562
Change-Id: I3d22fa8a12d77c77b32f65e249300817d4fc862b
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2023-05-24 11:40:21 +08:00
9f51500ad2 更新lbc2n-v1的网口delay值用来适配新旧设备 2023-05-23 02:40:25 +00:00
413a45cd09 ARM: dts: rockchip: add clock refs and remove PD_NVM for rv1126-thunder_boot_mmc
Delete PD_NVM to prevent it's disabled by *unused_off*.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ibc0f6dcc3612ffc0ddd0cd3e8ba84ec4f6acac35
2023-05-22 14:31:09 +08:00
91b3a31c92 soc: rockchip: thunderboot_mmc: enable clk_emmc before accessing
Avoid the *clk_emmc* are disabled by *unused_off* when the ramdisk is
too large.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I38b6f33ab55fbb65781ee266237382c977848e68
2023-05-22 14:31:09 +08:00
c26f78cc23 drm/rockchip: vop2: fix hactive 4-pixel alignment in mode_fixup
For RK3588 and RK3568, the hactive of video timing must
be 4-pixel aligned.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I2485e27420b365104c5c876708600fb59189e1af
2023-05-22 14:22:02 +08:00
c1a8e8e626 drivers: rkflash: Support new devices
1.XT25Q64D, XT25Q128D, EN25QX256A, EN25QX128A, PY25Q64HA, PY25Q256H,
FM25Q256I3, NM25Q128EVB
2.HYF2GQ4IAACAE, HYF1GQ4IDACAE, DS35Q12B-IB, DS35M12B-IB, ANV1GCP0CLG,
HYF1GQ4UTXCAE, ANV1GCP0CLG, GSS01GSAK1, GSS02GSAK1

Change-Id: I3fa36be576a3d3d88da49297ad725d4ce4177dd7
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-05-22 14:21:41 +08:00
38818ffda1 version rk356x update KBUILD_BUILD_VERSION=5 2023-05-20 08:56:57 +08:00
ba8db7bd63 drm/rockchip: vop3: plane display size check use crtc_* parameter is more correct
Just like some 3D mode, the mode->crtc_* parameter will be recalculate
according the mode->flag, and we use the mode->crtc_* parameter to config
to VOP register, so we need use crtc_* parameter to do plane size check.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I0b8a7de251707bf4737b107b167be73270fe63bc
2023-05-19 17:39:59 +08:00
087ac3c05d arm64: dts: rockchip: rk3528: add rockchip,master-handle-irq for rkvdec_mmu
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ic71e948742b47158c401bd17371458e694f03302
2023-05-19 16:43:37 +08:00
31fc899eab 更新uEnv.txt 解决uboot无法读取uEnv.txt的问题 2023-05-19 08:36:43 +00:00
48c16d9d35 Merge branch 'stable-4.19-rk356x' of http://gitlab.ebf.local/rockchip/linux/kernel into stable-4.19-rk356x 2023-05-19 16:33:25 +08:00
f8f4446a2d 支持双目摄像头 2023-05-19 16:32:33 +08:00
c14f46f44c support cif 2023-05-19 16:29:27 +08:00
6021048451 更新kernel-deb包,安装完成后自动软链接uEnv.txt 2023-05-19 08:01:28 +00:00
ad0bb27688 修复GPIO0_C6无法控制的问题 2023-05-19 13:29:23 +08:00
e36ddad30d video: rockchip: mpp: replace err ref task
When there is an error task, traverse the running list to modify the ref
buffer to an err iova.

If hw dec use the err ref, it will trigger pagefault so that we can mark
the err task correctly.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Idaf16212c79c5b7c250b6f1b7494552d994d0329
2023-05-19 10:21:56 +08:00
72b31d8b87 update 2023-05-19 01:31:29 +00:00
e54fbb5cd2 修改8821cu和8822ce的打印等级,不打印内容 2023-05-18 09:30:29 +00:00
48db4e461c 更新8822ce驱动到5.12 2023-05-18 09:27:15 +00:00
647acbcad8 video: rockchip: mpp: fix share reset_group do not take effect
Some device share one pd, but reset control are different.
It should share a reset_group to ensure that one device can
not do reset while anothor is running.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I53527a053d0835085522396e2d9ee649d78325a5
2023-05-18 16:17:11 +08:00
82e88ce536 arm: dts: rockchip: rv1126: fix reset-name err for rkvdec
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ied310d99d27e841c224e28057ca8c6c03821fff9
2023-05-18 16:17:11 +08:00