Commit Graph

1292488 Commits

Author SHA1 Message Date
Zorro Liu
7c1d184e4e drm/rockchip: ebc_dev: release version v8.06
1.Revert "overlay + regal support regaltype 5"
2.extern ebc init log level
3.extern pmic power off time after frame done

Change-Id: Iccfa25918cf1eccf44237f42c47bc1ac5c1c16a0
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2025-07-24 11:28:30 +00:00
Zorro Liu
7e77fe81d1 drm/rockchip: ebc_dev: release version v8.05
1.add temp fix for customer
2.don't update system buf lut when break from part mode
3.don't set osd buf status when osd buf is full win
4.overlay + regal support regaltype 5
5.organize overlay-related code

Change-Id: I19fdf58377ec8774dc31d7d4cdd978dca63200e1
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2025-07-24 11:28:30 +00:00
Tao Huang
cb4b2aa066 Merge commit '0e7abd67ecee19952915ddbf39d4d85ada1966b5'
* commit '0e7abd67ecee19952915ddbf39d4d85ada1966b5':
  video: rockchip: rga3: "reg" debug log add iommu readback register printing
  video: rockchip: rga3: restore iommu status on soft-reset
  video: rockchip: rga3: modify the reset method to replace auto_rst on RK3576
  phy: rockchip: inno-usb2: Destroy chg_worker on probe failure
  ARM: dts: rockchip: add rv1126b-evb2-v12-aov-dual-cam.dts
  ethernet: stmmac: stmmac_uio: Fixes compilation errors
  arm64: dts: rockchip: add bt_port for wireless_bluetooth
  ARM: dts: rockchip: rk3506{g-demo-display-control,b-test2-v10}: Add "pmic-reset" for rk801
  misc: rk628: Fix compilation errors on 32-bit soc platforms.
  phy: rockchip: inno-usb2: Fix DEBUG_LOCKS_WARN_ON in chg work

Change-Id: I277f5b7050d74da8819633dfc5b1a0db059e3106
2025-07-23 18:49:59 +08:00
Yu Qiaowei
0e7abd67ec video: rockchip: rga3: "reg" debug log add iommu readback register printing
Update driver version to 1.3.10

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I79b641e8b41d43c451988f278596f229e9e0fd2c
2025-07-23 10:02:41 +00:00
Yu Qiaowei
8bfa454c23 video: rockchip: rga3: restore iommu status on soft-reset
Avoid auto_gating/int_mask register state loss after reset

Change-Id: Ie341f0f58f398476daacffdd90565d39c68faa54
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2025-07-23 10:02:41 +00:00
Yu Qiaowei
6a03ec9cb5 video: rockchip: rga3: modify the reset method to replace auto_rst on RK3576
1. Resetting only core_clk will cause abnormal src1 status in blend
scenarios, so both aclk and core_clk must be reset.
2. Avoid the issue by shielding the wrong interrupt.

Fixes: a2a7ce0bf0 ("video: rockchip: rga3: add fix for hardware issuewith RK3576")

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I3cb0034f6c3090faca19cea2c2f5b375388271f8
2025-07-23 10:02:41 +00:00
William Wu
d86fac4c44 phy: rockchip: inno-usb2: Destroy chg_worker on probe failure
Fixes: a78b174c2f ("phy: rockchip: inno-usb2: Fix DEBUG_LOCKS_WARN_ON in chg work")
Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I1f200c7597418d9c174bc68d9a5fea0703cd9cc5
2025-07-23 04:30:40 +00:00
Leo Sun
253e11f01f ARM: dts: rockchip: add rv1126b-evb2-v12-aov-dual-cam.dts
Signed-off-by: Leo Sun <leo.sun@rock-chips.com>
Change-Id: I4a734cb199c7a1781b3a44b389e092790d7d69af
2025-07-23 03:56:39 +00:00
David Wu
7338ae1052 ethernet: stmmac: stmmac_uio: Fixes compilation errors
Change-Id: Ic460bcc5f11b6fb0e6961c5e58c63dfc1b318b3c
Signed-off-by: David Wu <david.wu@rock-chips.com>
2025-07-23 10:31:06 +08:00
lin longjian
f8dee2cf65 arm64: dts: rockchip: add bt_port for wireless_bluetooth
Signed-off-by: lin longjian <llj@rock-chips.com>
Change-Id: I893a0dae669a410e646df46926ed54fa693894f9
2025-07-22 10:37:40 +00:00
Joseph Chen
3664a5d88f ARM: dts: rockchip: rk3506{g-demo-display-control,b-test2-v10}: Add "pmic-reset" for rk801
Reset pmic and output NPOR signal 5ms when system reboot.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I8c59ed22342617cf555e54c3fb43821203aae70c
2025-07-22 10:12:39 +00:00
Guochun Huang
e5a4867edf misc: rk628: Fix compilation errors on 32-bit soc platforms.
Change-Id: I961b2f33ef3707795eddd701ec8765dbe0a0c4f7
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2025-07-22 10:06:27 +00:00
William Wu
a78b174c2f phy: rockchip: inno-usb2: Fix DEBUG_LOCKS_WARN_ON in chg work
The following trace can be seen if usb is connecting to
Host while do rockchip_chg_detect_work.

 DEBUG_LOCKS_WARN_ON(rt_mutex_owner(lock) != current)
 WARNING: CPU: 6 PID: 512 at kernel/locking/rtmutex-debug.c:47 debug_rt_mutex_unlock+0x58/0x64
 Modules linked in:
 CPU: 6 PID: 512 Comm: kworker/6:3 Not tainted 5.10.226-rt89 #186
 Hardware name: Rockchip RK3588 EVB1 LP4 V10 Board (DT)
 Workqueue: events rockchip_chg_detect_work
 pstate: 60c00089 (nZCv daIf +PAN +UAO -TCO BTYPE=--)
 pc : debug_rt_mutex_unlock+0x58/0x64
 lr : debug_rt_mutex_unlock+0x58/0x64
 ......
 Call trace:
  debug_rt_mutex_unlock+0x58/0x64
  __rt_mutex_unlock+0x48/0xf8
  _mutex_unlock+0xc/0x14
  rockchip_chg_detect_work+0x44c/0x6f0
  process_one_work+0x1bc/0x27c
  worker_thread+0x268/0x488
  kthread+0x170/0x210
  ret_from_fork+0x10/0x18

This issue can cause the preempt-rt Linux kernel to crash.
The reason is that all mutexes in preempt-rt have been replaced
with rt_mutexes. An rt_mutex has a PI (Priority Inversion) feature,
which means that when a high-priority task waits for a lock held
by a low-priority task, the priority of the low-priority task is
elevated. A linked list is established on p->pi_waiters. This
requires that lock/unlock operations be handled by the same task.
If unlock is performed and pi_waiters is released by another task,
the task that holds the lock will encounter an exception when
accessing pi_waiters. When executing rockchip_chg_detect_work,
a schedule_delayed_work operation is performed while holding the
mutex lock, causing the mutex lock to be released by a different
worker task, which triggers a kernel panic.

This patch use kthread_work instead of delayed_work to avoid
long-running chg work affecting other tasks in the system workqueue.
And also avoid chg work to be scheduled while hold a mutex lock.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I1e49a22f002b0dfcf0e04d243d99624d34c9a701
2025-07-18 14:24:16 +08:00
Tao Huang
937e52d195 Merge commit 'a54e105da36b4b00243c5c58dba3f59aff3d5665'
* commit 'a54e105da36b4b00243c5c58dba3f59aff3d5665':
  drm/bridge: synopsys: dw-hdmi-qp: Fix crash when accessing audio regs
  arm64: dts: rockchip: rk3588-evb1: add edp 8lanes local dimming board
  drm/rockchip: Add support for dimming panel driver

Change-Id: Ie60187c437294804196badfa2e850e59d13be384
2025-07-18 09:19:37 +08:00
Algea Cao
a54e105da3 drm/bridge: synopsys: dw-hdmi-qp: Fix crash when accessing audio regs
When dclk_en is set to true, audio regs may be accessed. If
crtc_post_enable() is called at this time, it will cause dclk to
be reset, resulting in a crash when accessing the register.

The crash stack is as follows:

[ 7765.124543][ T2309] CPU: 1 PID: 2309 Comm: writer Tainted: G           O       6.1.118 #1989
[ 7765.124551][ T2309] Hardware name: Rockchip RK3576 TEST1 V10 Board (DT)
[ 7765.124555][ T2309] pstate: 204000c5 (nzCv daIF +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
[ 7765.124562][ T2309] pc : regmap_mmio_read32le+0x8/0x20
[ 7765.124577][ T2309] lr : regmap_mmio_read+0x44/0x70
[ 7765.124583][ T2309] sp : ffffffc012483aa0
[ 7765.124586][ T2309] x29: ffffffc012483aa0 x28: 0000000000000004 x27: 0000000000000041
[ 7765.124595][ T2309] x26: fffffffffffffffc x25: 0000000000000000 x24: 0000000000000000
[ 7765.124603][ T2309] x23: 0000000000000e20 x22: ffffff80c2b25800 x21: ffffffc012483b24
[ 7765.124611][ T2309] x20: ffffff80c134d8c0 x19: ffffffc012483b24
[ 7765.126002][  T640] gsensor_icm4260x 3-0068: set sensor poll time to 133ms
[ 7765.126399][ T2309]  x18: ffffffc012883098
[ 7765.126405][ T2309] x17: 0000000000000001 x16: ffffffffffffffff x15: 0000000000000004
[ 7765.126414][ T2309] x14: ffffffc009f2c980 x13: 0000000000000003 x12: 0000000000000003
[ 7765.126422][ T2309] x11: 0000000000000000 x10: ffffffc009606e28 x9 : 0000000000000000
[ 7765.126430][ T2309] x8 : ffffffc00bd00e20 x7 : 205b5d3639363731 x6 : 0000000000000000
[ 7765.135247][ T2309] x5 : 0000000000000000 x4 : 0000000000000000 x3 : 0000000000001001
[ 7765.135950][ T2309] x2 : ffffffc012483b24 x1 : 0000000000000e20 x0 : ffffff80c134d8c0
[ 7765.136651][ T2309] Call trace:
[ 7765.136933][ T2309]  regmap_mmio_read32le+0x8/0x20
[ 7765.137363][ T2309]  _regmap_bus_reg_read+0x28/0x34
[ 7765.137801][ T2309]  _regmap_read+0x18c/0x240
[ 7765.138197][ T2309]  regmap_update_bits_base+0xb8/0x150
[ 7765.138666][ T2309]  dw_hdmi_i2s_audio_disable+0x54/0x64
[ 7765.139148][ T2309]  dw_hdmi_qp_audio_disable+0xb4/0xcc
[ 7765.139616][ T2309]  dw_hdmi_qp_i2s_audio_shutdown+0x14/0x20
[ 7765.140119][ T2309]  hdmi_codec_shutdown+0x48/0x70
[ 7765.140548][ T2309]  snd_soc_dai_shutdown+0x44/0x58
[ 7765.140984][ T2309]  soc_pcm_clean+0xbc/0x1a8
[ 7765.141378][ T2309]  soc_pcm_close+0x34/0x54
[ 7765.141760][ T2309]  snd_pcm_release_substream+0xbc/0x108
[ 7765.142241][ T2309]  snd_pcm_release+0x40/0x9c
[ 7765.142643][ T2309]  __fput+0x80/0x25c
[ 7765.142985][ T2309]  ____fput+0x10/0x1c
[ 7765.143334][ T2309]  task_work_run+0xb4/0xd4
[ 7765.143716][ T2309]  do_notify_resume+0x71c/0x2150
[ 7765.144145][ T2309]  el0_svc_compat+0x44/0x48
[ 7765.144540][ T2309]  el0t_32_sync_handler+0x68/0x8c
[ 7765.144977][ T2309]  el0t_32_sync+0x168/0x16c

Change-Id: Ief2a5ba5633ef8fc445ee5cf3454e0ba79ee6916
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2025-07-17 06:51:44 +00:00
Damon Ding
086a0a3087 arm64: dts: rockchip: rk3588-evb1: add edp 8lanes local dimming board
Panel TPM270WR1 supports 3840x2160p144 with 8lanes and local dimming
through SPI interface.

Change-Id: I0b7e33503d76661510bb99364b041ea18e2d4513
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
2025-07-17 11:18:51 +08:00
Damon Ding
aab46d64de drm/rockchip: Add support for dimming panel driver
The dimming panel driver supports to adjust the backlight brightness
of different zones.

Change-Id: Ieafa865fb9ad5bc184fb148c4a36fb3cbd4e854c
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
2025-07-17 09:48:23 +08:00
Chaoyi Chen
f21fdcd061 drm/rockchip: ebc: Add sleep pinctrl for RK3576 ebc
When PD_VPU power domain is off, the pin state of ebc is X state.
Set the EBC pin control to GPIO and pull low to ensure that it remains
in low state.

Change-Id: I3e4fcab3b0c5c4e5b4e47d78cec021562750ffb5
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
2025-07-15 11:50:38 +00:00
Tao Huang
b0d0e45003 Merge commit '12eb0cc4132fa6314179c6e214cca77911a34cb4'
* commit '12eb0cc4132fa6314179c6e214cca77911a34cb4':
  arm64: dts: rockchip: rk3576-eink: Add sleep pinctrl for ebc
  arm64: dts: rockchip: rk3576: Add sleep pinctrl for ebc
  drm/rockchip: vop2: move axi reset to the end of vop deinit
  drm/bridge: analogix_dp: Use LINK_BW_SET to set link rate if MAX_LINK_RATE is non-zero
  net: rfkill: bt: add btport for libbt to get port name
  media: rockchip: aiisp: add ioctl to reduce memory
  drm/rockchip: vop2: delete unused return error
  drm/rockchip: vop: delete unused return error
  ARM: dts: rockchip: add rv1126b-evb1-v11-fastboot-spi-nor.dts
  arm64: dts: rockchip: add rv1126b-evb1-v11-fastboot-spi-nor.dts
  ARM: dts: rockchip: add rv1126b-evb1-v11-fastboot-spi-nand.dts
  arm64: dts: rockchip: add rv1126b-evb1-v11-fastboot-spi-nand.dts
  ARM: dts: rockchip: add rv1126b-evb1-v11-fastboot-emmc.dts
  arm64: dts: rockchip: add rv1126b-evb1-v11-fastboot-emmc.dts
  arm64: dts: rockchip: rv1126b-pinctrl: Update BT1120/BT656 drive strength
  drm/rockchip: rgb: Set delay line for RV1126B BT1120/BT656
  ARM: dts: rockchip: add rv1126b-evb1-v11-spi-nor.dts
  arm64: dts: rockchip: add rv1126b-evb1-v11-spi-nor.dts
  drm/rockchip: vop: Fix brightness process for RK3506/RV1126B

Change-Id: Ib4f144874f91f9f00f88328d56c66edd078cf0ee
2025-07-15 19:47:01 +08:00
Chaoyi Chen
12eb0cc413 arm64: dts: rockchip: rk3576-eink: Add sleep pinctrl for ebc
When PD_VPU power domain is off, the pin state of ebc is X state.
Set the EBC pin control to GPIO and pull low to ensure that it remains
in low state.

Change-Id: Iafa70622f8fce475c307edfb6d4d4ad9635a43cd
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
2025-07-15 11:45:47 +00:00
Chaoyi Chen
9e196c8267 arm64: dts: rockchip: rk3576: Add sleep pinctrl for ebc
Change-Id: I991833f0eed695e73b500973bd3b9bfba716db53
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
2025-07-15 19:44:37 +08:00
Sandy Huang
c5415d9339 drm/rockchip: vop2: move axi reset to the end of vop deinit
Missing this commit may occasionally appear vop iommu pagefault/post buf
empty/vop pd idle failed during the suspend and resume process.

Fixes: e37ee94490f8 ("drm/rockchip: vop2: reset axi clk before disable vop")
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I8a4bc3346f32f6ea6672ff7103f9b3af0de6eecf
2025-07-15 11:37:31 +00:00
Damon Ding
0d42457e7e drm/bridge: analogix_dp: Use LINK_BW_SET to set link rate if MAX_LINK_RATE is non-zero
As the Table 4-24 in eDP 1.4 spec, the Sink device can only support
Main-Link rate selection via SUPPORTED_LINK_RATES when the value of
DPCD MAX_LINK_RATE is 00h. If MAX_LINK_RATE and SUPPORTED_LINK_RATES
are both non-zero, the Sink device can support both methods.

In practice, if MAX_LINK_RATE is not 00h and SUPPORTED_LINK_RATES
contains non-zero values, sometimes the sink device can only support
to set link rate via LINK_BW_SET. In such case, there will be errors
if set the link rate read from SUPPORTED_LINK_RATES to LINK_RATE_SET.

The panel vendor may explain this is to ensure the same Sink firmware
remains compatible across different versions of the eDP spec. Or the
Main-Link rate selection method has not been fully verified.

In order to avoid these unexpected cases, MAX_LINK_RATE/LINK_BW_SET
method will be selected first if MAX_LINK_RATE is non-zero for eDP
panels that support v1.4 or higher.

Previous patch for link rate table parsing:
commit 31702584f8 ("drm/bridge: analogix_dp: add support to parse link rate for eDP v1.4")

Change-Id: Ic8aedcec2c60584fedddc575b2a91c2eba7c8219
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
2025-07-15 11:33:03 +08:00
lin longjian
fd3306bdba net: rfkill: bt: add btport for libbt to get port name
set " bt_port = "/dev/ttyS*" " under wireless_bluetooth

Change-Id: I20298c3679d4d66f604e413198f1c7f6c89be46b
Signed-off-by: lin longjian <llj@rock-chips.com>
2025-07-15 02:56:01 +00:00
Hu Kejun
da44652e18 media: rockchip: aiisp: add ioctl to reduce memory
Change-Id: Ie0bbdf18e6a9e0c2990f505cfdd771fb69497ca3
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2025-07-15 01:43:16 +00:00
Sandy Huang
a930e7e610 drm/rockchip: vop2: delete unused return error
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ifeac16e82b0a3069811a4d71d7442f663cbb9294
2025-07-15 01:41:28 +00:00
Sandy Huang
fb0132457b drm/rockchip: vop: delete unused return error
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I2b8c2cc80d7fb083f8c723f4bfa8946b2415891a
2025-07-15 01:41:28 +00:00
Weiwen Chen
61d5a058cd ARM: dts: rockchip: add rv1126b-evb1-v11-fastboot-spi-nor.dts
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I0b7b27bdb2803fdb2ec88d6304968b7f141acc7f
2025-07-15 09:05:48 +08:00
Weiwen Chen
b99f522bf7 arm64: dts: rockchip: add rv1126b-evb1-v11-fastboot-spi-nor.dts
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I8ff6e83cdece005e382076e26ae1613b25237682
2025-07-15 09:05:24 +08:00
Weiwen Chen
6da1a1fe1c ARM: dts: rockchip: add rv1126b-evb1-v11-fastboot-spi-nand.dts
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I6432ff45af9f2fab4cc64f01f3abf08e9b737bad
2025-07-15 09:04:32 +08:00
Weiwen Chen
59b56f57db arm64: dts: rockchip: add rv1126b-evb1-v11-fastboot-spi-nand.dts
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Ib2db6844bab1ee0f72d7fbb9ef2a044e4f4580d6
2025-07-15 09:03:17 +08:00
Weiwen Chen
b6ee2762c7 ARM: dts: rockchip: add rv1126b-evb1-v11-fastboot-emmc.dts
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Ic537666c4f2870cb56c33c3e04f856e850c8aae0
2025-07-15 09:01:05 +08:00
Weiwen Chen
6ba45fcb5f arm64: dts: rockchip: add rv1126b-evb1-v11-fastboot-emmc.dts
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Ie8eea048ef9074c2270ad84477085321a4c2c64d
2025-07-15 09:00:25 +08:00
Chaoyi Chen
7d6ab659b7 arm64: dts: rockchip: rv1126b-pinctrl: Update BT1120/BT656 drive strength
According to SI test report, BT1120/BT656 drive strength should be
set.

Change-Id: I59aa29fc1c24b0b152fd96a260197fab21790d75
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
2025-07-14 11:39:43 +00:00
Chaoyi Chen
ff5d56d1f3 drm/rockchip: rgb: Set delay line for RV1126B BT1120/BT656
According to SI test report, BT1120/BT656 delay line should be set.

Change-Id: Id30655e15daac20ed126683768bab90d7425cb83
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
2025-07-14 11:39:43 +00:00
Weiwen Chen
9e7c8745fe ARM: dts: rockchip: add rv1126b-evb1-v11-spi-nor.dts
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I85660cca2bc5e2116547790bd4a31a9312a57106
2025-07-14 16:46:07 +08:00
Weiwen Chen
c29806c781 arm64: dts: rockchip: add rv1126b-evb1-v11-spi-nor.dts
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I9374464d0f6024f2cb79de96302d4c404e445ae6
2025-07-14 16:44:40 +08:00
Chaoyi Chen
b25696bf69 drm/rockchip: vop: Fix brightness process for RK3506/RV1126B
The RK3506/RV1126B use 7bit signed number to calculate the brightness.
That is [-64, 63].

Fixes: 08fbbdb571 ("drm/rockchip: vop: add support for rk3506")

Change-Id: I64df5bd97e20350e8f3e7db9fe68966f01155dd8
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
2025-07-14 02:54:24 +00:00
Tao Huang
49e6815ddc Merge commit '3fc5e850f4018da7d2c6bacadfc77267a428abec'
* commit '3fc5e850f4018da7d2c6bacadfc77267a428abec': (23 commits)
  arm64: dts: rockchip: rv1126b: Add decom_mmu clk to decom
  media: rockchip: hdmirx: add RK_HDMIRX_CMD_GET_SCAN_MODE
  media: i2c: rk628: reconfigure cec state when hdmirx reset
  spi: rockchip-slave: Support dma cyclic for misc devices
  media: rockchip: aiisp: support picture width over 4096 in airms algo
  media: rockchip: aiisp: update airms algo
  phy: rockchip: mipi dcphy move apb_rst to runtime resume to avoid break dcphy rx
  media: rockchip: vicap fixes error of stream off when one_frame mode change to mulit_frame mode
  media: rockchip: vicap fixes error of tool node get raw
  media: rockchip: vicap fixes error of crop enable state
  media: rockchip: vicap support config complete frame of toisp
  media: i2c: os12d40 support set wbgain and blc
  usb: dwc2: platform: Fix dwc2 resume failed for RK3506 OTG1
  ARM: dts: rockchip: add rv1126b-evb2-v10-dv
  arm64: dts: rockchip: add rv1126b-evb2-v10-dv
  media: rockchip: vicap support "cat /proc/rkcif*" to show mipi csi2 error info
  media: rockchip: vicap fixes error triggrer of fs/fe not match when monitor mode enable
  power: supply: rockchip-charger-manager: Resolving charging anomalies
  ARM: dts: rockchip: Add rv1126b-evb2-v10-tb-400w-emmc support
  ARM: dts: rockchip: Add rv1126b-evb2-v10-tb-400w-spi-nor support
  ...

Change-Id: I9ffc29af2616211acb0019be57110641766798ac
2025-07-12 19:28:31 +08:00
Jos Wang
95fe90fa45 BACKPORT: usb: typec: tcpm: PSSourceOffTimer timeout in PR_Swap enters ERROR_RECOVERY
As PD2.0 spec ("6.5.6.2 PSSourceOffTimer"),the PSSourceOffTimer is
used by the Policy Engine in Dual-Role Power device that is currently
acting as a Sink to timeout on a PS_RDY Message during a Power Role
Swap sequence. This condition leads to a Hard Reset for USB Type-A and
Type-B Plugs and Error Recovery for Type-C plugs and return to USB
Default Operation.

Therefore, after PSSourceOffTimer timeout, the tcpm state machine should
switch from PR_SWAP_SNK_SRC_SINK_OFF to ERROR_RECOVERY. This can also
solve the test items in the USB power delivery compliance test:
TEST.PD.PROT.SNK.12 PR_Swap – PSSourceOffTimer Timeout

[1] https://usb.org/document-library/usb-power-delivery-compliance-test-specification-0/USB_PD3_CTS_Q4_2025_OR.zip

Change-Id: I12947c108a9e8b49b0e9f6f19ce1296415d37d59
Fixes: f0690a25a1 ("staging: typec: USB Type-C Port Manager (tcpm)")
Cc: stable <stable@kernel.org>
Signed-off-by: Jos Wang <joswang@lenovo.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Tested-by: Amit Sunil Dhamne <amitsd@google.com>
Link: https://lore.kernel.org/r/20250213134921.3798-1-joswang1221@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit 659f5d55feb75782bd46cf130da3c1f240afe9ba)
2025-07-12 19:28:14 +08:00
Tao Huang
4fd4f81763 Merge commit '64e8ddbe73275df5a311aed06ac2738a0137bfff'
Merge made by the 'ours' strategy.

* commit '64e8ddbe73275df5a311aed06ac2738a0137bfff':
  BACKPORT: usb: typec: tcpm: PSSourceOffTimer timeout in PR_Swap enters ERROR_RECOVERY

Change-Id: Ied665184cb52dc7ffd5e266d96e45bd324eab45a
2025-07-12 19:27:58 +08:00
Tao Huang
1081beba20 Merge commit 'b611ab7090264b5a01181aa21a436f4bce2ef9bc'
* commit 'b611ab7090264b5a01181aa21a436f4bce2ef9bc':
  arm64: configs: optimize latency for PREEMPT_RT
  ARM: configs: add rockchip_rt.config for PREEMPT_RT
  drm/bridge: synopsys: dw-hdmi-qp: Fix hdmi is enabled twice during boot
  drm/rockchip: vop2: only esmart/cluster win0 need to manage done bit
  arm64: dts: rockchip: rv1126bp: set init-freq to 600M for npu
  arm64: dts: rockchip: rv1126b: adjust opp-supported-hw for npu
  media: rockchip: vicap fixes size error of rgb888
  rtc: s35390a: fix the issue where the alarm clock interruption cannot be triggered
  drm/bridge: synopsys: dw-hdmi-qp: Clear mode list when hdmi plug out
  soc: rockchip: fiq_debugger: fix dts property 'rockchip,irq-mode-enable'

Change-Id: I813202127d9f4e087f180f25368d16b78c6e95d1
2025-07-12 19:27:01 +08:00
Simon Xue
3fc5e850f4 arm64: dts: rockchip: rv1126b: Add decom_mmu clk to decom
Since the decom_mmu uses a dedicated clock, its clk must be included
in the decom's clk management to ensure proper operation.

Change-Id: Id95c4563c092dcf1cab09c190fa82d24018b6a1d
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2025-07-12 11:23:48 +00:00
Chen Shunqing
fe5312f2aa media: rockchip: hdmirx: add RK_HDMIRX_CMD_GET_SCAN_MODE
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
Change-Id: I549c04189564cd90698efae73549f15499da0a96
2025-07-12 11:22:27 +00:00
Chen Shunqing
542f74d590 media: i2c: rk628: reconfigure cec state when hdmirx reset
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
Change-Id: I22b9f97b0e39874ecc926b618f0f8147209a40e3
2025-07-12 11:22:16 +00:00
Xuhui Lin
dcb85d8d34 spi: rockchip-slave: Support dma cyclic for misc devices
Change-Id: I46ad77c9879f1d89dcc682ac201ff6aac5f46bbe
Signed-off-by: Xuhui Lin <xuhui.lin@rock-chips.com>
2025-07-12 11:22:01 +00:00
Hu Kejun
2be8f9d5fd media: rockchip: aiisp: support picture width over 4096 in airms algo
Change-Id: I5115494f57fc5a745ba066d32fc9e16b3911eb15
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2025-07-12 16:33:28 +08:00
Hu Kejun
2469020021 media: rockchip: aiisp: update airms algo
Change-Id: I6a1d1b9dd9bc120925da57ea817593bf639c4a80
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2025-07-12 16:32:42 +08:00
Zefa Chen
d5a7bbea0d phy: rockchip: mipi dcphy move apb_rst to runtime resume to avoid break dcphy rx
Change-Id: I097eeb7e3fd7decc4f0d1badd335b2d7176ce223
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2025-07-12 15:21:40 +08:00
Zefa Chen
c348e9697f media: rockchip: vicap fixes error of stream off when one_frame mode
change to mulit_frame mode

Change-Id: I97bc6e891342a78a4079d034876c7ad256abff20
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2025-07-12 15:17:11 +08:00