Commit Graph

1061189 Commits

Author SHA1 Message Date
Elaine Zhang
dbd5f33301 clk: rockchip: rk3588: Change the clk registration sequence
Reduces clock registration time

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I9ee110dde6cfcae13fbec6604567c930b709d34b
2021-11-29 18:05:42 +08:00
Ding Wei
3b0208b0c2 video: rockchip: mpp: Fix hand writing error
Change-Id: Ie385fd808f667a09396c7280851ba27937f85343
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-11-29 16:47:31 +08:00
Andy Yan
dfcff113be drm/rockchip: vop2: Fix a left_src_w calc error in splice mode
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I8900bfd1018dfcd5b47d857007a1d888dbe6c039
2021-11-29 16:26:16 +08:00
ZiHan Huang
dcbe6022af arm64: dts: rockchip: add rk3588-evb1-lp4-v10-6x-linux.dts
rk3588 evb1 add six camera config of imx464

Signed-off-by: ZiHan Huang <zack.huang@rock-chips.com>
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I4adc4a7f9f8f04fad23d9cacf03d7fef48990f53
2021-11-29 16:24:48 +08:00
Cai YiWei
5b28972d97 media: rockchip: isp: fix fbc stop iommu page fault for isp30
Change-Id: I422e99c289c74b14525a21a198d37bbea8337eec
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-29 16:06:42 +08:00
Zheng Yang
ca885383eb drm/rockchip: dw-dp: support dynamic binding to different vp port
According to the application scenario, DP0/DP1 may be bind to the
same vp port, or different vp port. The corresponding bit in output_if
needs to be set or cleared correctly.

Change-Id: I880946d0c61a209d5a16ff7d2aada43f87a075c5
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2021-11-29 16:05:47 +08:00
Tao Huang
18a6cae4bb rk: scripts/mkimg: Support Create U-Boot FIT Image use ${BOOT_ITS}
Change-Id: Id878ebf13606f1be324b11d89cb803ec9ed6c209
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-11-29 15:17:46 +08:00
Jianqun Xu
146b4dc1de dma-buf: dma-heap set device max_segment_size to DMA_BIT_MASK(32)
With CONFIG_DMA_API_DEBUG_SG enabled built:

[   14.668444][  T369] ------------[ cut here ]------------
[   14.668476][  T369] DMA-API: dma_heap system-uncached: mapping sg segment longer than device claims to support [len=1048576] [max=65536]
[   14.668508][  T369] WARNING: CPU: 1 PID: 369 at kernel/dma/debug.c:1173 debug_dma_map_sg+0x1d4/0x3f8
[   14.668517][  T369] Modules linked in:
[   14.668533][  T369] CPU: 1 PID: 369 Comm: HwBinder:364_2 Not tainted 5.10.43 #53
[   14.668542][  T369] Hardware name: Rockchip RK3588 EVB2 LP4 V10 Board (DT)
[   14.668553][  T369] pstate: 60400009 (nZCv daif +PAN -UAO -TCO BTYPE=--)
[   14.668564][  T369] pc : debug_dma_map_sg+0x1d4/0x3f8
[   14.668574][  T369] lr : debug_dma_map_sg+0x1d4/0x3f8
[   14.668582][  T369] sp : ffffffc015cb3a90
[   14.668591][  T369] x29: ffffffc015cb3ab0 x28: ffffff8003557000
[   14.668605][  T369] x27: 0000000000000011 x26: 0000000000010000
[   14.668619][  T369] x25: ffffffffffffffff x24: ffffffc015cb3c90
[   14.668632][  T369] x23: ffffff80057fec00 x22: ffffff80055c1c00
[   14.668646][  T369] x21: ffffffc011fbf000 x20: 0000000000000011
[   14.668660][  T369] x19: ffffffc011dd9000 x18: ffffffc015ce5050
[   14.668673][  T369] x17: 0000000000000000 x16: 00000000000000d8
[   14.668686][  T369] x15: 0000000000000004 x14: 0000000000003fff
[   14.668699][  T369] x13: ffffffc011e5c9e8 x12: 0000000000000003
[   14.668712][  T369] x11: 00000000ffffbfff x10: 00000000ffffffff
[   14.668725][  T369] x9 : 20e580535cacc400 x8 : 20e580535cacc400
[   14.668738][  T369] x7 : 3d6e656c5b207472 x6 : ffffffc01205b610
[   14.668751][  T369] x5 : ffffffffffffffff x4 : 0000000000000000
[   14.668765][  T369] x3 : ffffffc011b27378 x2 : 0000000000000000
[   14.668777][  T369] x1 : 0000000000000001 x0 : 0000000000000074
[   14.668791][  T369] Call trace:
[   14.668802][  T369]  debug_dma_map_sg+0x1d4/0x3f8
[   14.668814][  T369]  dma_map_sg_attrs+0x7c/0xcc
[   14.668828][  T369]  system_heap_do_allocate+0x78c/0x7d4
[   14.668839][  T369]  system_uncached_heap_allocate+0x18/0x28
[   14.668850][  T369]  dma_heap_ioctl+0x140/0x1f0
[   14.668862][  T369]  __arm64_sys_ioctl+0x94/0xd0
[   14.668875][  T369]  el0_svc_common+0xa4/0x180
[   14.668885][  T369]  do_el0_svc+0x28/0x88
[   14.668897][  T369]  el0_svc+0x14/0x24
[   14.668906][  T369]  el0_sync_handler+0x88/0xec
[   14.668917][  T369]  el0_sync+0x1a8/0x1c0
[   14.668925][  T369] ---[ end trace acb8f73633a08943 ]---

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I551ae9da257c1337e857de8a21931594f8d25d3c
2021-11-29 15:13:17 +08:00
Alex Wang
abf624145e arm64: dts: rockchip: add rk3588-nvr-demo-v10-android dts
Change-Id: I02b79559265d714c49292029a02ee83de0be1136
Signed-off-by: Alex Wang <alex.wang@rock-chips.com>
2021-11-29 12:01:48 +08:00
Wangqiang Guo
fbf26729da arm64: dts: rockchip: Modify battery curve for rk3588s tablet
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
Change-Id: I7d4696eef302b59e633430b4347a17bead62751b
2021-11-29 12:00:03 +08:00
William Wu
17e122ec97 arm64: dts: rockchip: rk3588-nvr-demo: remove hs limit for usb3_0
Because the usb3_0 super-speed phy driver is ready, let's
remove the maximum-speed limit for usb3_0 on nvr demo board.
Add also enable the usbdp_phy1_u3 to force usb3_1 to u2 only.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: If8835a667ad9e561d0291130b8fd1fbbe0fc6206
2021-11-29 11:57:26 +08:00
Wyon Bi
ffd1c1b1d6 drm/rockchip: dw-dp: Register aux channel
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I3bd76c5ba249901179d56db29661ef195839ae3a
2021-11-29 11:56:52 +08:00
Wyon Bi
307b981a4e arm64: configs: rockchip_defconfig: Enable CONFIG_DRM_DP_AUX_CHARDEV
DPCD read:
dd if=/dev/drm_dp_aux0 bs=1 skip=$((0x200)) count=1 status=none | od -tx1

DPCD write:
echo -e -n "\x80" | dd of=/dev/drm_dp_aux0 bs=1 seek=$((0x10a)) count=1 status=none

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I2a81b94b466d0e77b8608ea55e5ff91d18931956
2021-11-29 11:53:14 +08:00
Cai YiWei
bc6d4938a4 media: rockchip: isp: fix bigmode for multi device
Change-Id: I5debe62ea15fa8d5f01931aea643f2c982c57f6b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-29 10:44:19 +08:00
Andy Yan
edf7edcdee drm/rockchip: vop2: Check PMU_BISR_STATUS register for pd status when bisr enabled
We should check PMU_BISR_STATUS register for
pd on/off status when bisr memory repair is
enabled.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: If1d0927551ddea9757c70b3a948367132a83ed5c
2021-11-29 10:35:44 +08:00
Zhang Yubing
a1663d7e8a phy: rockchip: usbdp: Fix aux channel polarity setting
It's too late to set the aux channel polarity. Some
sink device will not  send attention cmd to indicate
hpd plug event. Setting the aux channel polarity earlier.
When detecting the connected status is disconnected,
Setting the gpio status to low.

Fixes: 8081c70a82: ("phy: rockchip: usbdp-phy: add pointer check, avoid NULL pointer")
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Ie653a043f9d3cecf489846d7edbd6eca73f5ee28
2021-11-27 16:56:15 +08:00
Wyon Bi
e3093cade8 drm/rockchip: dw-dp: Check hpd status before power down link
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I3a05b3520d71ef5f0429a2c33933db62f3a2fffc
2021-11-27 11:07:47 +08:00
XiaoTan Luo
4ef5723d99 ASoC: es8323: fixed dapm route error
Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Change-Id: Idde66be4fc3a32a5d1c496795d5cbf3a49464ea6
2021-11-26 20:47:44 +08:00
Jianhui Wang
94995f4e33 arm64: dts: rockchip: rk3588-tablet.dtsi: Enable rga node
Signed-off-by: Jianhui Wang <wjh@rock-chips.com>
Change-Id: Ia4adc96df7f70aa8c008c81a218d7928cd306e61
2021-11-26 20:46:16 +08:00
Kever Yang
9d98b3fedd arm64: dts: rockchip: rk3588: Fix pcie module clock
PCIe need pipe clock for interface with phy;

Note that pcie controller also need its clock(has been set critical)
ACLK_PHP_GIC_ITS, and ACLK_PCIE_BRIDGE(has been set as parent).

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Change-Id: I98b2c001e8d0568af482cef8702a73a6cbd661f6
2021-11-26 20:42:48 +08:00
XiaoTan Luo
9e1ddefd50 arm64: configs: rockchip_linux_defconfig: enable SND_SOC_ROCKCHIP_HDMI
enable ROCKCHIP_HDMI ASoC driver to report jack status.

Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Change-Id: I61dd19266747cfa2eb97030c107d95924f80f03d
2021-11-26 19:28:42 +08:00
Lin Jinhan
83906c9426 crypto: rockchip: v2: modify to pass crypto selftest case
Compared to 4.19, there are many new algorithm boundary
 condition tests in 5.10. Drivers need to be fixed to
 pass these tests and increase driver robustness.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I597a478a5cfff5fa6c5389f45adec21acb63c68e
2021-11-26 19:23:25 +08:00
Wyon Bi
34cbbf50e8 arm64: dts: rockchip: Add RK3588 EVB2 LP4 V10 eDP to DP Board
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Id6298bbdcbbd926b84f51193526ea975ebd86f3f
2021-11-26 19:20:31 +08:00
Zhang Yubing
63e8f7ff8a arm64: dts: rockchip: rk3588-evb3-lp5: change dp clk source
use v0pll as dp interface dclk source default.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I893bf3dc83632c500b8fafa664cf2e8177d809fc
2021-11-26 19:18:36 +08:00
Wyon Bi
956b7cc975 drm/rockchip: dw-dp: Use drm_dp_read_dpcd_caps() helper
Reads the extended DPRX caps (%DP_DP13_DPCD_REV) if present.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I5c442e4c92917e136665b3dd5554abef9b7c81e5
2021-11-26 19:10:58 +08:00
Elaine Zhang
347e6b3e3d clk: rockchip: rk3588: fix usb3\sata\gamc\pcie aclk parent
aclk dependencies:
aclk_usb3/satax/gmac --> aclk_mmu_php --> aclk_php_root -->
aclk_pcie_root

aclk_pciex_mst --> aclk_mmu_pcie --> aclk_pcie_bridge -->
aclk_pcie_root --> aclk_php_root

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I51933de0e401f6fc381ea177943bde16ca00401a
2021-11-26 19:09:36 +08:00
Li Huang
42333bee4f video: rockchip: rga3: Support multi core config by userspace.
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I8dfb08ca6f4490fd2097e971127ef7c274b1babd
2021-11-26 17:38:54 +08:00
Li Huang
262304034d video: rockchip: rga3: Fixup wrong uv_stride on rga888 fbc
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I60626f464e5a55c5afce5ae9fc546b374f4119ad
2021-11-26 17:32:14 +08:00
Wyon Bi
e66a221f58 arm64: dts: rockchip: rk3588s-evb1-lp4x: Add support for edp panel
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I7033313667e233a381d1bede0ae3c586bf57a901
2021-11-26 17:02:35 +08:00
Elaine Zhang
046268f16b clk: rockchip: rk3588: mark aclk_php_gic_its as critical
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ibe77113d127cb6ac1f63eb917607aef47683cf18
2021-11-26 14:21:50 +08:00
David Wu
ae65c3830d arm64: configs: rockchip_linux_defconfig: Enable SMMU V3
There are two MMU600 instances in RK3588.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I9b1709a90098a72b9d64f02055fdabd2ce2f2754
2021-11-26 11:27:57 +08:00
Zhang Yubing
d6fbed788e phy: rockchip: usbdp: fix repeat modify mode_change flag issue
When use Typc-C Interface, after detect CC connect, we assume
the usbdp phy can be use as multi-function(both usb and dp use)
and init the phy in multi-function mode. If the sink only
support only dp function, we need reinit the usbdp phy only dp
function.

When enter dp mode, config the pin assignment, get the attention
cmd from sink, tcpm will callback the mux set. But we only need
the info when hpd is true.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I25aa718e4b41b9645aa456a2767addfbd624318c
2021-11-26 11:01:24 +08:00
Jianhui Wang
e830cf86d5 arm64: dts: rockchip: rk3588s-tablet: remove vp0&vp3
The tablet only uses edp and dp display interfaces(edp->vp2,dp->vp1),
so remove vp0&vp3

Signed-off-by: Jianhui Wang <wjh@rock-chips.com>
Change-Id: I1c56a95c4bd3c052f18ed43fd3b9962156b59b22
2021-11-26 10:56:25 +08:00
Wang Panzhenzhuan
6793be67bb arm64: dts: rockchip: rk3588s-tablet: raise avdd_1v2_cam_s0 voltage
Tablet's rear camera convert fpc decrease the dvdd,
so need raise nldo4 voltage to ensure rear camera ov50c40 normal.

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Id36f920dd80d9072cf3265a6cc992ae648c77142
2021-11-26 10:53:25 +08:00
Zain Wang
1edbd29596 power: supply: bq25700: change register notifier to EXTCON_USB_VBUS_EN
Generally, bq25700 is only source for USB VBUS, bq25700 should
respond all EXTCON_USB_VBUS_EN requests.

And at OTG mode, there may be no EXTCON_USB_HOST_EN changes,
in this case, USB always keeps vbus output even if it used
as device mode.

Signed-off-by: Zain Wang <wzz@rock-chips.com>
Change-Id: I0b50be90bfc70ad296c1ec67d5a39f2b1c26920d
2021-11-26 10:37:16 +08:00
Jianqun Xu
ec6350b547 drm/rockchip: fix overflow of min_pitch
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I45a90e68d5ca3f24fea66086ddae46b03f7ee5a7
2021-11-26 10:35:27 +08:00
Wang Jie
6e09befb4d arm64: dts: rockchip: rk3588s-tablet: remove hs limit for usb3_0
Change-Id: Ibcdb89fc2b50b15f722c5709e98037b8dbb8ad4d
Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
2021-11-26 09:51:52 +08:00
Wyon Bi
7b87558613 drm/rockchip: dw-dp: Fix aux_status register field
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ide7b83c9debec94825d4cf2a2ede621fb2764849
2021-11-26 09:21:08 +08:00
Wang Panzhenzhuan
ddceb14a7e arm64: rockchip_defconfig: enable CONFIG_VIDEO_OV50C40
Enable ov50c40 config for rk3588s tablet & rk3588 evb1.

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I61a3d6141babcb0872ec9377f83e5bd759bfe6a4
2021-11-25 21:12:39 +08:00
Tao Huang
fa0abb00cd media: i2c: ov50c40: Select VIDEO_OTP_EEPROM
Enable otp_eeprom config for ov50c40 module.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ib6bc08bd1d33814ecd752dd834d81fb50174bc39
2021-11-25 21:07:03 +08:00
Simon Xue
a9ffcf51f7 PCI: rockchip: dw: refactor resize bar register address
Change-Id: I31c6ec368409d1e75fb1a15d9f4dc28a4e1c011f
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2021-11-25 20:13:10 +08:00
Simon Xue
889f7522e4 pcie-dma-trx: update to version 0x3
support reverse buffer address

if reverse
	buf_idx 0-7	rc <- ep
	buf_idx 8-15	rc -> ep
else
	buf_idx 0-7	rc -> ep
	buf_idx 8-15	rc <- ep

Should update test-pcie:

rc: ./test-pcie 2 1000 1024 0 0
ep: ./test-pcie 1 1000 1024 0 0

Change-Id: I73cd6cb3511068166d5681f44a7f53d46003775b
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2021-11-25 20:12:37 +08:00
Wang Panzhenzhuan
bf930ada8e arm64: dts: rockchip: rk3588s-tablet: add camera config
support ov13855 & ov50c40

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I473da810c706017fed7658c30b05c58d57e598c7
2021-11-25 19:57:18 +08:00
Yiqing Zeng
ecdb73a16f media: i2c: add rk ircut driver
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: Ie29c235e22e19fb5a0cd5c080f46eaba32ec57fc
2021-11-25 19:54:04 +08:00
Sugar Zhang
3a7f369b5c arm64: dts: rockchip: rk3588: Add aud clk for hdmi nodes
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I58e07f40529352a986e4b7582d792aa0856861aa
2021-11-25 18:25:44 +08:00
Sugar Zhang
e108ff9f6f drm/rockchip: dw_hdmi: Handle aud clk for hdmi qp
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I9a8abc55175a1c1219d7731d358a63451de60238
2021-11-25 18:25:22 +08:00
Wang Jie
ee356cb5a6 arm64: dts: rockchip: rk3588s-tablet: modify Type-C0 SBU1 and SBU2 gpio
Fixes: c87b8fcb8a ("rk3588s-tablet: add dp display for rk3588s tablet")
Fixes: 2171d7fcf6 ("rk3588s-tablet: modify Type-C0 vbus configuration")

Change-Id: I65f7289fe8769a0982a4e92e3d885de3cb7ce401
Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
2021-11-25 17:22:00 +08:00
Wyon Bi
80db5a7bc7 drm/rockchip: analogix_dp: Add support for split mode
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I7be492886ddd595a01415d92ce4a56ce9d69b21b
2021-11-25 16:59:40 +08:00
Wyon Bi
422e65990b drm/panel: simple: Silence missing connector_type warning
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I1f028658818ce15cdcf4678504c0b8203d2569a7
2021-11-25 16:59:40 +08:00
Jianqun Xu
9ae2518478 video/rockchip: rga3: support dma-cache
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Idbbc41e4e9d95ea43c48b1fbb7ae9cf52f26b025
2021-11-25 16:52:49 +08:00