Commit Graph

1086854 Commits

Author SHA1 Message Date
Rimon Xu dfb726bf21 video: rockchip: vtunnel: buffer ID should generate by instance
When resetting an instance, the buffer generation ID will be changed,
but when receiving images, the ID will be used to determine whether
it is an expired buffer. Therefore, the ID generator should be placed
in the instance instead of the device.

Change-Id: I707403dd22dce784dee07654d7333a02f5f35f43
Signed-off-by: Rimon Xu <rimon.xu@rock-chips.com>
2023-11-17 16:50:39 +08:00
Mingwei Yan 5eda8fae48 media: i2c: add mis4001 sensor driver
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
Change-Id: I14ce592e0f03af0584b49f9dbf79b4685265bba3
2023-11-17 15:46:44 +08:00
Mingwei Yan 7a09fd1675 media: i2c: add mis2031 sensor driver
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
Change-Id: Ief24f6240f85971aa1e65927127934b2c2e41e77
2023-11-17 15:42:21 +08:00
Sach Lin 094d8870cd media: i2c: add sc2355 driver
Signed-off-by: Sach Lin <sach.lin@rock-chips.com>
Change-Id: I829a47eb558a47d93e437c0aef71b42fd1ce4fd1
2023-11-17 15:15:49 +08:00
Jianlong Wang 36fe76db56 ARM: configs: rk312x: enable CONFIG_DRM_IGNORE_IOTCL_PERMIT
Allow the DRM ignore some permission issues.

Change-Id: I8e122ebeb1fc103b0bb5b9334cbb89ebf5a4334d
Signed-off-by: Jianlong Wang <jianlong.wang@rock-chips.com>
2023-11-17 15:04:20 +08:00
Zefa Chen 187f0ceb6a media: i2c: sc5336 update register list
compatible with sc5336 and sc5338

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I294b88bae34a4f38e8d4947acdc7b1fddacdfd5c
2023-11-17 14:51:42 +08:00
Tao Huang 3b5325a4cd soc: rockchip: minidump: make md_vmalloc_to_page() static
drivers/soc/rockchip/minidump/minidump_log.c:662:14: warning: no previous prototype for 'md_vmalloc_to_page' [-Wmissing-prototypes]

Fixes: 0417e5b732 ("soc: rockchip: minidump: don't save peripheral space")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I23753bd1baebb78fc60aae8ab1529f560ea84d25
2023-11-17 09:36:10 +08:00
Huibin Hong 4ec9300575 fiq_debugger: set current_cpu to new cpu after current_cpu is offline
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: Ie86c4115df6b20e2d5ab3d79cd594e6e5ddad0c9
2023-11-16 14:23:27 +08:00
Zhichao Guo cfae443e0a ARM: dts: rockchip: add rv1106g-evb2-v12-aov-spi-nor.dts
Signed-off-by: Zhichao Guo <zhichao.guo@rock-chips.com>
Change-Id: I76e9dd8413fa2ccc6cd0d08e31e3a5aaae58a9de
2023-11-16 11:26:29 +08:00
Zefa Chen 07eb3ddd78 media: rockchip: vicap: reserve memory according to actual needs when dev change from thunderboot to online
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I539450bd80ee5e1a81e58924f75bd27d0aefe86c
2023-11-16 10:31:03 +08:00
Zefa Chen 61949a9b21 media: rockchip: vicap fixes error when work on both thunderboot and quick suspend/resume
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ied9db7a3ed4e63735066424c48b6870830284588
2023-11-16 10:11:26 +08:00
Yandong Lin 49b335bda8 video: rockchip: add mpp osal
The osal is to adapt to kmpp ko.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I134d1e50b66a0e23ecfd8de60498b7b6e5c3a0c2
2023-11-16 10:09:16 +08:00
Huibin Hong 0417e5b732 soc: rockchip: minidump: don't save peripheral space
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: I9da05cd44d85866dccd0bbd61962c2ac4534dcfd
2023-11-16 01:21:08 +00:00
Huibin Hong 15eb463188 arm64: dts: rockchip: rk3588-linux: support minidump
Take a buffer from pstore buffer for minidump share memory

Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: If201f09d771b612258d703fa567813976f7c99f2
2023-11-16 01:21:08 +00:00
Cody Xie 33ea3cee5e media: i2c: max92756: Support V4L2 DV class
Change-Id: Ia790015f551442f7716deeb10f79530d8a023c9a
Signed-off-by: Cody Xie <cody.xie@rock-chips.com>
2023-11-15 18:58:36 +08:00
Zefa Chen 2688d7f925 media: i2c: add ar2020 sensor driver
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I16a53fa473d82ac377c31fadb3cc55898825428f
2023-11-15 18:45:36 +08:00
Simon Xue e8cea8fe67 watchdog: dw_wdt: fix array out-of-bounds in theory
Change-Id: Ie11b60cf79b4c988af1ca7939334cbb742582247
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2023-11-15 18:44:21 +08:00
Zhang Yubing 077c5b13fa mfd: rkx110_x120: add irq support
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Ibb8316211ef67ffe9ee9a0dcfa391ecfae0af9d0
2023-11-15 18:17:57 +08:00
Andy Yan 5498c2a4d2 drm/rockchip: vop2: fix overlapping_copy
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: Icbae6c1dd5ad0b3c580c73b8776272d364473501
2023-11-15 18:11:05 +08:00
Jon Lin eeaca8874b mtd: spi-nor-ids: support PY25Q128LA
Change-Id: I5b92a866871b5635963510f46d3ba822d66964a2
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-11-15 17:58:35 +08:00
Andy Yan 7f0033da72 drm/rockchip: vvop: fix a potential race condition when vvop_disable_vblank
A very similar case on amdgpu_vkms:
commit 826c1e923b ("drm/amdgpu/vkms: relax timer deactivation by
hrtimer_try_to_cancel")

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I0692cd2c4ad3e3f090c0df040537995f99c2fcff
2023-11-15 16:33:51 +08:00
Sandy Huang f15552775d drm/rockchip: vop2: Fix possible_crtcs error for cursor plane
Before this commit, because the crtc is not initialized yet, if use the drm_crtc_mask(crtc) at
vop2_cursor_plane_init(), the cursor plane possible_crtcs will always be 1 for vp0.

After this commit, the plane possible_crtcs will be:
if (disable_win_move && vop2)
	possible_crtcs = BIT(registered_num_crtcs);
else if (vop3)
	possible_crtcs = win->possible_crtcs from reg_data;
else
	possible_crtcs =(1 << vop2_data->nr_vps) - 1;//all crtc

Fixes: 1a6b7e170f1e ("drm/rockchip: vop3: add support rk3528")
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I7d23aab328962c1a77f6d0c11c5f81731bdceb80
2023-11-15 15:33:03 +08:00
Cai Wenzhong f89c0e66e0 media: i2c: maxim2c: driver version v2.00.01
1. MIPI TXPHY add tunnel mode support.
2. MIPI TXPHY mode only support 2x4Lanes and 2x2Lanes.

Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: I33d5ff240c9f85319f757c3cc2ba7d067ce69aae
2023-11-15 15:28:11 +08:00
Damon Ding 4b18a69d88 drm/rockchip: vvop: add support to multiple CRTCs
1.Add crtc property IS_VIRTUAL and SOC_ID. HWC needs
  property IS_VIRTUAL to identify the virtual crtc,
  and the property SOC_ID to confirm the platform.
2.Add support for resolutions:
  1280x720   720x1280
  1920x1080  1080x1920
  2560x1440  1440x2560
  3840x2160  2160x3840
  4096x2160  2160x4096
  with frame rate 30/60/90/120/144.
3.Fix the process of releasing resources in vvop_unbind().

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I5cbd8ce4cb0d55023fb36426ff3a79bf0ae25080
2023-11-15 15:22:49 +08:00
Andy Yan ffba59e3bb drm/rockchip: dw-dp: fix warning Using an uninitialized value mode.head when calling drm_mode_copy
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: Id522eb77d8585a9a33702d820f37b4a5d2e10b38
2023-11-15 14:45:03 +08:00
XiaoDong Huang d3660dc13f ARM: rockchip: rv1106: delete RV1106_GPIO0_A1_LOWPOWER
Always make GPIO0_A1 low-power when system sleep.

Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I487aa4a5d0fa239a693b784d98ab53e9414c63db
2023-11-15 14:36:55 +08:00
Zefa Chen 8c9e65da11 media: rockchip: vicap: fixes error when register multi dev
Fixes: 6a556c2b9e ("media: rockchip: vicap: resume/suspend with rtt")
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I202d2eb9065f4b2e3ca181f16945224afa6b832c
2023-11-15 14:36:09 +08:00
XiaoDong Huang 856ca3fcd3 ARM: rockchip: rv1106: pull up gpio0_a4 for lower power
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: Ia38833a0ac8396a3cc93f4090c2c3eb75ef5db15
2023-11-14 15:02:15 +08:00
Guochun Huang d090ed8f63 drm/rockchip/rk628: combtxphy: ref_clk should not be zero
Change-Id: I395d721b2ab833fee6dfbdb53c6fc923f733a3d1
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-11-14 12:19:48 +08:00
Algea Cao c952ca6f8c drm/rockchip: dw_hdmi: Fix warning Using an uninitialized value mode.head when calling drm_mode_copy
Change-Id: I8fb0e887160c96b9b8142700b1ba2aeecac7a6bc
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2023-11-14 12:18:41 +08:00
Lin Jinhan a1653e50d1 crypto: rockchip: Fixed a warning found by static code scanner
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I95055ed3d767719b9b2088330f3e5646491b6894
2023-11-14 12:17:50 +08:00
Damon Ding 7b2a1c8a6b drm/rockchip: vop: init mcu_frame_st as 0 in vop_mcu_mode()
If mcu_hold_mode is 1, set 1 to mcu_frame_st will
refresh one frame from ddr. So mcu_frame_st is needed
to be initialized as 0.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I75d755826dbbdd229da3c3db15d4682dc2bd13a0
2023-11-14 12:16:13 +08:00
Elaine Zhang 6e890ef6f6 rtc: rk630: add rtc for rk630
Change-Id: I36bfe7ba7c4876d9030b065f26b1e99fefc738b9
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2023-11-14 12:10:52 +08:00
Elaine Zhang 84f3edadb7 mfd: rk630: add rtc regmap and irq
Change-Id: Ia21198d9806e697c6383ed7211959a3a3c6e38d9
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2023-11-14 12:10:47 +08:00
David Wu 7c99cc64ec mfd: rk630: Set phy clock from ref clock
The phy clock is the same as the input clock of rk630, so
use this clock for configuration.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Ie5c0e58958a1fdd9e264d861295d64e4ccb483cb
2023-11-14 11:26:12 +08:00
Algea Cao 9cab28b37f mfd: rk630: Add rk630 ref clk
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ie3ad8834ab5d0f25eeb8bdf52445f726192c0161
2023-11-14 11:26:12 +08:00
Elaine Zhang df698fe006 clk: rockchip: avoid division by zero
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ie28c61d3907d80c3d12087dea59a9567e183012d
2023-11-14 11:14:24 +08:00
Su Yuefu bc3739735d media: i2c: add sc4336p driver
Signed-off-by: Su Yuefu <yuefu.su@rock-chips.com>
Change-Id: Ib7d7b41a79dba49ea73137149590527e3347d1a6
2023-11-14 11:06:39 +08:00
Yifeng Zhao c95ecab515 mmc: add timeout for write data and reset while recovery
Some problematic TF cards may stop at busy state during
the data writing process, and the mmc controller needs
to add a timeout processing.

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I11b75910f99eb040fa364990049f5cfe74fccfbf
2023-11-14 11:03:25 +08:00
Zefa Chen c252d35d35 media: rockchip: vicap restore sequence of sof after resume
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I58723bd60429a5fa77982602514689c32e08d25f
2023-11-14 11:01:53 +08:00
Jianwei Fan 9e5b5dff61 media: i2c: imx577: fix exp_def because exp must less than (vts - 22)
fix commit "9625dd4e2af2"
(media: i2c: imx577: fix exposure control range according to datasheet)

Change-Id: Ie0e02b553599ed969dee496767c57ebac244bce1
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
2023-11-14 11:00:54 +08:00
Tao Huang 4997ee78fe arm64: rockchip_linux_defconfig: Enable CONFIG_ARM64_USE_LSE_ATOMICS
CONFIG_ARM64_USE_LSE_ATOMICS is depends on CONFIG_JUMP_LABEL and
default y. So we should enable CONFIG_JUMP_LABEL.

Now we can use LSE to replace LL/SC on Cortex-A55/A76 for better performance.

Before:
    text	    data	    bss	     dec	    hex	filename
24693888	10091965	 541616	35327469	21b0ded	vmlinux

After:
    text	    data	    bss	     dec	    hex	filename
25114676	10943949	 542776	36601401	22e7e39	vmlinux

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2900ff6f2fd8dae9f8afb0fc2da72c83de8ff63e
2023-11-13 19:27:55 +08:00
Liang Chen 1d795ddee4 soc: rockchip: cpuinfo: optimize error log
Do not output error when return -EPROBE_DEFER.

Change-Id: I94a9e0349a69ce76ee939bc29d2862cd4f20c1e9
Signed-off-by: Liang Chen <cl@rock-chips.com>
2023-11-13 18:12:11 +08:00
Elaine Zhang 1aef70a303 rtc: rockchip: fix the rtc suspend crash
In some special products, after rtc probe, The system quickly goes to
sleep before the calibration function of delay_work is executed. In rtc
suspend will clamp rtc. In the off process, if delay_work is executed,
the system will crash.
Added calibration judgments to turn off delay_work when rtc suspend.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ib212eabd18c27ddeff5c50e5b8ac0444a2cafc23
2023-11-13 18:07:42 +08:00
XiaoDong Huang 8cfed66d7f soc: rockchip: fiq debugger: check "target_cpu" before switch cpu
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I2ed0fb4c5aa60b735a7570e13dffd2ee8e646f3b
2023-11-13 17:59:56 +08:00
Guochun Huang 614d7a8339 clk/rockchip/regmap: rate should not be zero
Change-Id: I4cf808ae4948b203be18772ce20ec2e0f892b0b7
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-11-13 09:17:55 +00:00
Yifeng Zhao 45a89eb8fa mmc: dw_mmc: Fix DM 4GB TF card write data errors in RV1106
Before resetting the controller, it is necessary to increase
the delay by 1 us or wait for a slight decrease in FIFO, so
that no errors will occur during the DM 4GB TF card testing
process.

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: Ic03a4d88367e3fea00f648f4a21df1669f4f0832
2023-11-13 11:54:14 +08:00
Hongming Zou ef29dab574 arm64: rk3308_linux_defconfig: enable Rockchip RPMsg
+CONFIG_RPMSG_ROCKCHIP_SOFTIRQ=y
+CONFIG_RPMSG_VIRTIO=y

Change-Id: Ib677ca3d11c0489a99fe75aa9252e5c31a8b1584
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com>
2023-11-10 16:28:12 +08:00
Jianwei Fan 9625dd4e2a media: i2c: imx577: fix exposure control range according to datasheet
Change-Id: Idcb10103015279e1a5e532f490b7b28685d0c0a5
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
2023-11-10 14:08:02 +08:00
Steven Liu 1c08964430 arm64: configs: rockchip_linux: change RPMSG config to RPMSG_MBOX
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I98f03d79d53ff2c2a32a6c00e3d579cabf18e000
2023-11-10 11:07:17 +08:00