Commit Graph

1086588 Commits

Author SHA1 Message Date
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
Finley Xiao
bcbcebd833 soc: rockchip: opp_select: implement rockchip_uninit_opp_table()
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I5c3a8248af267609e363046baeb7014cb8471166
2023-11-09 19:27:15 +08:00
Huibin Hong
6de3d51dcd soc: rockchip: debug: don't enable Serror when panic
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: I5cf12effecefe9cf31113f0453e1f9672f1d868c
2023-11-09 19:07:05 +08:00
Huibin Hong
010f6eb3a4 pstore/ram: don't register boot_log to minidump when it is off
Fixes: 08e5018b7c ("fs: pstore: register buffers to minidump")
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: I7af139c4915504650acf0c5858f96be54f76639a
2023-11-09 19:00:17 +08:00
shengfei Xu
1ff00f4eb5 power: supply: rk816/rk817/rk818 battery: avoid division by zero
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I510263adc079f23ad52ebdf68971f7a28ce20a0d
2023-11-09 18:49:33 +08:00
Yu Qiaowei
af706ad8bf video: rockchip: rga3: fix iommu device sync cache causing crash
When the iommu device calls the dma_sync_single_xx API, it will be
regarded as being called through iova by default, so the physical
address obtained will be invalid.

Update driver version to 1.3.1

Change-Id: I0a2c8fcecd556eccee499e06f41d790043f1fa0d
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2023-11-09 18:29:36 +08:00
Yu Qiaowei
4ddda80541 video: rockchip: rga3: fix the error report of Coverity
1. Fix the issue of scheduler and hardware maximum count mismatch.
2. Fix the issue of potential GCD returning 0.

Change-Id: I083553e69ab60549b26465b5d1437e817575856f
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2023-11-09 18:29:36 +08:00
Tao Huang
9a4ab40b64 soc: rockchip: rockchip_system_monitor: simplify include
Move include dt-bindings/soc/rockchip-system-status.h
to soc/rockchip/rockchip-system-status.h.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ie6046f762e38458a3505a6098d5211bdc4fd60e2
2023-11-08 18:40:29 +08:00
William Wu
ab0546fdd0 media: uvcvideo: set system status to performance when stream on
For rockchip platforms, set performance frequency for the
memory controller when uvc stream on, and clear it after
uvc stream off. It can improve uvc streaming stability.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I1dc0cf10c552bba2c3a0f8a1bb37d90f546eb4a3
2023-11-08 18:28:40 +08:00
Jkand Huang
87f2ffb98e ARM: configs: rv1106-wakeup.config: fix some sleep to slow down the process
Change-Id: Ie8283ca6d1c8939f9ee6f4881c619e9d979d0a39
Signed-off-by: Jkand Huang <jkand.huang@rock-chips.com>
2023-11-08 18:17:55 +08:00
Finley Xiao
776e251569 clk: rockchip: rk3562: Fix clk_uart3_frac parent clk
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ief524953ddb3875ca1e99e63b99eca6193b7f3cc
2023-11-08 18:17:08 +08:00
Cai Wenzhong
04a82bed12 media: i2c: maxim4c: driver version v2.05.00
1. local device power on add some delay for i2c normal access.
2. enable hot plug detect for partial links are locked.
3. remote device hot plug init disable lock irq.

Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: I3424421395601266c0c2a787bedbd5028a786aab
2023-11-08 18:15:59 +08:00
Lan Honglin
006f6868f6 media: i2c: sc230ai support master&slaver mode
Change-Id: If019de218771c7f5a87d8dcc4439d7b464480b6d
Signed-off-by: Lan Honglin <helin.lan@rock-chips.com>
2023-11-08 18:15:40 +08:00
Cai YiWei
d0d7380104 media: rockchip: isp: add isp dgain for tb mem head
Change-Id: I35e717445e798b0d7bee9e173cb39e67299676cb
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-11-08 18:14:46 +08:00
Cai YiWei
03d235b318 media: rockchip: isp: support for param run double
Change-Id: I4b7d32b98762b66a322a831a2c20b23958714a07
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-11-08 18:14:19 +08:00
Tao Huang
e201a6c59d regulator: core: Ensure debugfs is fully initialized
regulator->debugfs is NULL when sysfs_create_link_nowarn() return -EEXIST,
and triggering the following warning:

[    2.426974] debugfs: File 'uA_load' in directory '/' already present!
[    2.426983] debugfs: File 'min_uV' in directory '/' already present!
[    2.426991] debugfs: File 'max_uV' in directory '/' already present!
[    2.426999] debugfs: File 'constraint_flags' in directory '/' already present!

Fixes: 08880713ce ("regulator: core: Streamline debugfs operations")
Fixes: 2715bb11cf ("regulator: core: Fix more error checking for debugfs_create_dir()")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iab0b91cacba410705a643d7198eee4f70e1108d5
2023-11-08 17:39:47 +08:00
Tao Huang
383aefeeab Merge tag 'ASB-2023-11-05_12-5.10' of https://android.googlesource.com/kernel/common
https://source.android.com/docs/security/bulletin/2023-11-01

* tag 'ASB-2023-11-05_12-5.10':
  BACKPORT: firmware_loader: Abort all upcoming firmware load request once reboot triggered
  UPSTREAM: firmware_loader: Refactor kill_pending_fw_fallback_reqs()

Change-Id: I63f764e519e8791928832881b292a20e0b28c986
2023-11-08 09:47:16 +08:00