Commit Graph

1368748 Commits

Author SHA1 Message Date
William Wu
5f8a3c94fb Revert "usb: quirks: add device quirk for Sonix FaceBlack device"
This reverts commit f078cc7762.

The upstream commit 991df39499 ("media: uvcvideo: Disable
autosuspend for Insta360 Link") has introduced a new quirk
"UVC_QUIRK_DISABLE_AUTOSUSPEND" for usb cameras to disable
autosuspend, so let's remove legacy autosuspend quirks.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I572e5298fe3be62c570158cc018fd7ada59db7e1
2025-08-08 14:59:57 +08:00
William Wu
c22ead6fde Revert "USB: quirks: add quirk auto suspend for Sonix webcam"
This reverts commit f537dfe383.

The upstream commit 991df39499 ("media: uvcvideo: Disable
autosuspend for Insta360 Link") has introduced a new quirk
"UVC_QUIRK_DISABLE_AUTOSUSPEND" for usb cameras to disable
autosuspend, so let's remove legacy autosuspend quirks.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: Ibe4f168f8b2cb4b42b5a90aa2cb7e19cfad9cf7a
2025-08-08 14:59:39 +08:00
William Wu
4d2a422299 Revert "usb: quirks: add device quirk for HD Camera PID 0x9320"
This reverts commit 3a4301edee.

The upstream commit 991df39499 ("media: uvcvideo: Disable
autosuspend for Insta360 Link") has introduced a new quirk
"UVC_QUIRK_DISABLE_AUTOSUSPEND" for usb cameras to disable
autosuspend, so let's remove legacy autosuspend quirks.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I6d1db026f7e753ff9976f2ec2243cb604273251b
2025-08-08 14:58:15 +08:00
Tao Huang
1afb65a60a rk: scripts/mkimg: ARM support dts vendor sub-directories
Change-Id: Ifca58666a73ce97f23d2b0f2485a0af5d7a7a6e1
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2025-08-06 11:34:53 +08:00
Tao Huang
3d33f335f2 rk: ARM: make image support dts vendor sub-directories
Change-Id: I333c60198ad45ed5ff8f9786b85a7ce53e41921d
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2025-08-06 11:32:11 +08:00
Tao Huang
2aa4ef1520 Revert "init: defer free large memblock to Buddy allocator when CONFIG_ROCKCHIP_THUNDER_BOOT=y"
This reverts commit b6cd53a3a2.

Change-Id: I8c0933ec1b01edfc16da05a43441a775a8237a39
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2025-08-05 19:24:06 +08:00
Shuangjie Lin
1843e14f39 driver: rknpu: Add compatibility for Linux kernel 6.12
Change-Id: If6799f454820cec3c9a4457edf4c88c5d55605c7
Signed-off-by: Shuangjie Lin <shuangjie.lin@rock-chips.com>
2025-08-05 16:18:38 +08:00
Tao Huang
56ab425cad media: rockchip: flexbus_cif: fixes build error
Change-Id: I69f303112c65a7e84c8d8ac5dbcbcc1f661da21d
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2025-08-05 15:09:26 +08:00
Tao Huang
9afff37f8b media: rockchip: flexbus_cif: Rename v4l2_async_subdev as v4l2_async_connection
Change-Id: I05ec5f126a12bf87315e1aa72c857c912fddc884
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2025-08-05 15:06:48 +08:00
David Wu
bf92e0cfe9 ethernet: stmmac: dwmac-rk-tool: Fix compilation error when CONFIG_DWMAC_ROCKCHIP=m
ERROR: modpost: "stmmac_reset" [drivers/net/ethernet/stmicro/stmmac/dwmac-rockchip.ko] undefined!

Change-Id: I1dc4d3dc7f038d7a53524eaa50fac16db7e7480b
Signed-off-by: David Wu <david.wu@rock-chips.com>
2025-08-05 02:28:31 +00:00
Huibin Hong
a2d32cc42b pstore: Fix fs/pstore compile error when CONFIG_PSTORE_BOOT_LOG=y
Change-Id: I3f2d575d246d38bddcfcb90d890b5a15c0d5883d
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2025-07-31 12:04:28 +00:00
Huibin Hong
0cd672616f soc: rockchip: fiq_debugger: arm: modify report_trace for new walk_stackframe
Fixes: 70ccc7c066 ("ARM: 9258/1: stacktrace: Make stack walk callback consistent with generic code")
Change-Id: Ib97b995652c8a294ef41074e653b7e52efb47770
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2025-07-31 19:58:28 +08:00
Tao Huang
1f2c47597e drm/edid: Provide missing stubs for !CONFIG_DRM_EDID
Change-Id: I1454f8c347c09811317bd8fd2b225390f2eec1ac
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2025-07-31 19:52:01 +08:00
Tao Huang
e2ee2092ba Merge commit '243363ccfdc2f2ed3be8e210d1687d7a8b14a97a'
* commit '243363ccfdc2f2ed3be8e210d1687d7a8b14a97a':
  misc: rockchip: pcie-rkep: Remove redundancy vm_flags
  media: i2c: add support sc485sl sensor driver
  media: i2c: add support os04e10 sensor driver for v6.1
  media: rockchip: vicap support get error info
  include: rk-camera-module: add cmd RKMODULE_GET_ERROR_INFO
  arm64: dts: rockchip: rv1126b-evb1-v10&rv1126b-evb2-v10: enable low power aoa
  dt-bindings: suspend: add RKPM_SLP_LP_AOA macro for rv1126b
  video: rockchip: rga3: fix error of using DMA_MAPPING_ERROR directly
  video: rockchip: rga3: fix image size cal error in BPP format

Change-Id: Ia2a29e67d344ca7902e351c20e3ac76363df916d
2025-07-30 18:35:44 +08:00
Jon Lin
243363ccfd misc: rockchip: pcie-rkep: Remove redundancy vm_flags
1.It will be added by remap_pfn_range_internal;
2.Fix compile warning:
drivers/misc/rockchip/pcie-rkep.c:613:23: error: assignment of read-only member 'vm_flags'
  613 |         vma->vm_flags |= VM_IO;
      |                       ^~
drivers/misc/rockchip/pcie-rkep.c:614:23: error: assignment of read-only member 'vm_flags'
  614 |         vma->vm_flags |= (VM_DONTEXPAND | VM_DONTDUMP);
      |                       ^~

Change-Id: I3c705248b216c246a8efb25f28c44fc419110fee
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2025-07-30 06:29:57 +00:00
LongChang Ma
0c442bded1 media: i2c: add support sc485sl sensor driver
Signed-off-by: LongChang Ma <chad.ma@rock-chips.com>
Change-Id: I6893ddf907860c4f4f48365e5e0422c7bfee67d5
2025-07-30 02:34:34 +00:00
LongChang Ma
0876851019 media: i2c: add support os04e10 sensor driver for v6.1
Signed-off-by: LongChang Ma <chad.ma@rock-chips.com>
Change-Id: I94c770909e6def65c9a5257daceeb838cb9d9621
2025-07-30 02:34:07 +00:00
Zefa Chen
992ff35c2d media: rockchip: vicap support get error info
Change-Id: I61fc0834e3574876f40d563290222044550594a4
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2025-07-30 10:21:45 +08:00
Zefa Chen
95c2e9defc include: rk-camera-module: add cmd RKMODULE_GET_ERROR_INFO
Change-Id: I06c31f514f771d6e51a46eae3ee287e0c01d0956
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2025-07-30 10:21:35 +08:00
XiaoDong Huang
6dd93bf724 arm64: dts: rockchip: rv1126b-evb1-v10&rv1126b-evb2-v10: enable low power aoa
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I5c0019df2576450fb15751ba1b83529c307ae13e
2025-07-30 01:19:25 +00:00
XiaoDong Huang
eb1d1e7885 dt-bindings: suspend: add RKPM_SLP_LP_AOA macro for rv1126b
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I83b3d537c78e188232c95890fb4d316457ee07ac
2025-07-30 01:19:25 +00:00
Yu Qiaowei
95b8ad3b83 video: rockchip: rga3: fix error of using DMA_MAPPING_ERROR directly
Change-Id: Iefacf3223404d6806c1999c96126bc25700645e8
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2025-07-30 01:16:38 +00:00
Yu Qiaowei
b27d0c8a15 video: rockchip: rga3: fix image size cal error in BPP format
Change-Id: I2e3ad31172e9ba5b013500927e016b88b69c87f5
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2025-07-30 01:16:38 +00:00
Tao Huang
19a99c47d7 soc: rockchip: grf: Explicitly include bitfield.h
drivers/soc/rockchip/grf.c:76:14: error: implicit declaration of function 'FIELD_GET' [-Werror=implicit-function-declaration]

Fixes: aa65b81218 ("Merge commit '62646c7ab19511b8fc17078cf4b0603e550e73cd'")
Change-Id: I44c101a111911d888774390e7096979971f8c332
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2025-07-29 18:44:07 +08:00
Tao Huang
0521e3a698 Merge commit '0b1e03cc77f7677a8f5d837bc150a09c1b46c605'
* commit '0b1e03cc77f7677a8f5d837bc150a09c1b46c605': (99 commits)
  arm64: dts: rockchip: Remove property support-psr of eDP nodes
  drm/rockchip: Move the init/cleanup of self refresh helper from VOP/VOP2 to eDP/RGB drivers
  drm/rockchip: vop: Add errno if &vop->lut memory allocation failed in vop_create_crtc()
  drm/bridge: analogix_dp: Add &analogix_dp_plat_data.disable_psr to check whether to disable PSR
  PCI: rockchip: dw-dmatest: Fix compile warning
  dt-bindings: display: rockchip: analogix-dp: Add property rockchip,disable-psr
  dt-bindings: display: rockchip: analogix-dp: Add properties for dual-channel/split modes
  dt-bindings: display: rockchip: analogix-dp: Add compatible for RK3568
  dt-bindings: display: rockchip: analogix-dp: Add support for RK3576
  UPSTREAM: dt-bindings: display: rockchip: analogix-dp: Add support for RK3588
  UPSTREAM: dt-bindings: display: rockchip: convert analogix_dp-rockchip.txt to yaml
  UPSTREAM: dt-bindings: display: bridge: convert analogix_dp.txt to yaml
  drm/rockchip: dw_hdmi: Do not enable DSC when the DSC compression ratio is below 0.375.
  media: i2c: ov13b10: add ov13b10 sensor driver
  soc: rockchip: opp_select: avoid duplicate of_find_property
  pinctrl: rockchip: Correctly support rk3308/rk3308b/rk3308bs
  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
  ...

Change-Id: Ic14227ff8f6b7eada9a188284e58b326e9a024f6
2025-07-29 17:53:41 +08:00
Tao Huang
f5d9f717d1 input: touchscreen: hyn: Drop the unused id parameter from hyn_ts_probe()
Change-Id: I9c78202ec126868986d4eb1a5efee243c909f80e
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2025-07-29 17:17:12 +08:00
Tao Huang
6bf7dcab12 Merge commit 'cb2c6fee8a36d85b5ead8f246bbc035259b14b2a'
Merge made by the 'ours' strategy.

Change-Id: I4cf7f08128735a403a9a0ff8546726b832b56941
2025-07-29 17:16:57 +08:00
Tao Huang
d4ae9d6ea7 Merge commit '40fac1a66ccf61bdf3afb70c18a5db7791410b22'
* commit '40fac1a66ccf61bdf3afb70c18a5db7791410b22': (220 commits)
  Revert "tee: optee: interrupt an RPC when supplicant has been killed"
  Revert "tee: optee: interrupt an RPC depend on shutdown flag"
  arm64: dts: rockchip: rv1126bp-evb-v14: Adjust the matching voltage
  media: rockchip: aiisp: delete one temp buffer to reduce memory
  media: rockchip: isp: mp output buf notice to aiisp
  media: rockchip: aiisp: modify for aiynr algo
  rtc: rockchip: add ready flag for rtc setting time
  soc: rockchip: cpuinfo: export chip unique id to userspace
  media: rockchip: vpss: offline mode support auto unite output
  drm/rockchip: vop2: Add "DIMMING_DATA" property for local dimming
  media: rockchip: isp: aiisp switch for offline mode
  media: rockchip: isp: aiisp switch for isp35
  media: rockchip: isp: support aiisp yuv mode
  input: touchscreen: gt1x: prefix global variables and functions with "gt1x_"
  MALI: valhall: add gpu mem sysfs entry
  drm/rockchip: Make the DRM panel as part of Rockchip DRM sub devices for panel loader protect
  drm/rockchip: Pass struct rockchip_drm_sub_dev for &rockchip_drm_sub_dev.loader_protect()
  pwm: rockchip: Add &rockchip_pwm_chip.oneshot_valid to indicate validity of configurations
  pwm: rockchip: Add comments for why to add delay before disabling the dclk for PWM v4
  input: touchscreen: hyn: reduce logs
  ...

Change-Id: I1b562efca0842173010b2506231d7200a5116e5a
2025-07-29 17:16:09 +08:00
Damon Ding
0b1e03cc77 arm64: dts: rockchip: Remove property support-psr of eDP nodes
Since the PSR feature can help to reduce the power consumption, the
Source device, which can support PSR function, should enable PSR if
the PSR capability of Sink device is detected rather than depending
on the user to add 'support-psr' DTS property manually.

Change-Id: I2f51312621f62519f388e06561fb61f01145256b
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
2025-07-29 14:38:19 +08:00
Damon Ding
3b97d716d5 drm/rockchip: Move the init/cleanup of self refresh helper from VOP/VOP2 to eDP/RGB drivers
Before this commit, the drm_self_refresh_helper_init() was called
in &component_ops.bind() of VOP/VOP2 drivers. The VOP or VPs,
which do not want to enable PSR functionality, will also initialize
the self refresh helper.

Since it wastes resources(e.g., allocating &drm_self_refresh_data and
initializing &drm_self_refresh_data.entry_work), we move the init and
cleanup process from bind()/unbind() of VOP/VOP2 drivers to the ones
of eDP/RGB drivers, which can support PSR functionality.

Change-Id: Ie7643b54f42ea3d5ab7b0cdbc77ccfdb06c614b9
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
2025-07-29 14:38:19 +08:00
Damon Ding
554eda652f drm/rockchip: vop: Add errno if &vop->lut memory allocation failed in vop_create_crtc()
If no errno assignment for this case, there will be a warning:

drivers/gpu/drm/rockchip/rockchip_drm_vop.c:5754 vop_create_crtc() warn:
missing error code 'ret'

Change-Id: I9e78fe99b3ca24d8734ee286b1dc1f0908721f25
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
2025-07-29 14:37:31 +08:00
Damon Ding
303b0de1b8 drm/bridge: analogix_dp: Add &analogix_dp_plat_data.disable_psr to check whether to disable PSR
First of all, since the PSR feature can help to reduce the power
consumption, the Source device, which can support PSR function,
should enable PSR if the PSR capability of Sink device is detected
rather than depending on the user to add 'support-psr' DTS property
manually.

Different platforms that use the same Analogix DP bridge driver may
have different methods for parsing the PSR capability. Therefore, add
a new flag &analogix_dp_plat_data.disable_psr to disable PSR forcely,
which set in the platform side, should be more reasonable.

If the user truly does not want to enable PSR function or the Panel
has something wrong with it, the property 'rockchip,disable-psr' will
be helpful.

Fixes: 9622f2d0f1 ("drm/bridge: analogix_dp: disable PSR feature by default")
Change-Id: Id2fce34857df80de5a1ec97f342709a6e2840ed4
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
2025-07-29 06:23:29 +00:00
Jon Lin
9f86a7a402 PCI: rockchip: dw-dmatest: Fix compile warning
drivers/pci/controller/dwc/pcie-dw-dmatest.c:157:5: error: no previous prototype for 'rk_pcie_local_dma_tobus_block' [-Werror=missing-prototypes]

Change-Id: I616a4759d856a72b469996a3c6f07e4af90d5616
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2025-07-29 06:20:54 +00:00
Damon Ding
72d923c5f8 dt-bindings: display: rockchip: analogix-dp: Add property rockchip,disable-psr
Since the PSR feature can help to reduce the power consumption, the
Source device, which can support PSR function, should enable PSR if
the PSR capability of Sink device is detected.

If the user truly does not want to enable PSR function or the Panel
has something wrong with it, the property 'rockchip,disable-psr' will
be helpful.

Change-Id: I03b3c83c7c88ea3fc3ccd447e5c5da49e16f22a9
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
2025-07-28 11:14:14 +00:00
Damon Ding
c516e523a2 dt-bindings: display: rockchip: analogix-dp: Add properties for dual-channel/split modes
After converting analogix_dp.txt to yaml, the descriptions of
properties for dual-channel and split modes, which have been
already supported, should be added synchronously.

Change-Id: I8a66ef3ed8c469eca0c9d6e06a827c1f1a8d58a1
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
2025-07-28 11:14:14 +00:00
Damon Ding
d191490eb5 dt-bindings: display: rockchip: analogix-dp: Add compatible for RK3568
The RK3568 eDP TX controller is almost the same as that of RK3399.
It supports RBR/HBR with 1/2/4 lanes and the max supported resolution
is 2560x1600p60.

The slight difference with RK3399 is the newly added 'apb' reset,
which is just like that of RK3588/RK3576.

Change-Id: Ifd5bc2d8f337b794a6d2983b689d2bd2271d78c2
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
2025-07-28 11:14:14 +00:00
Damon Ding
39843b4ec3 dt-bindings: display: rockchip: analogix-dp: Add support for RK3576
The RK3576 eDP TX controller is the same as that of RK3588.

Change-Id: I3f32329866bc70f6f26132eb583f520e39f53594
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
2025-07-28 11:14:14 +00:00
Damon Ding
a73b31a8da UPSTREAM: dt-bindings: display: rockchip: analogix-dp: Add support for RK3588
Compared with RK3288/RK3399, the HBR2 link rate support is the main
improvement of RK3588 eDP TX controller, and there are also two
independent eDP display interfaces on RK3588 Soc.

The newly added 'apb' reset is to ensure the APB bus of eDP controller
works well on the RK3588 SoC.

Reviewed-by: Rob Herring (Arm) <robh@kernel.org>
Change-Id: If3864613762898624ba39ad0395516a4ebb02732
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Link: https://lore.kernel.org/r/20250310104114.2608063-10-damon.ding@rock-chips.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
(cherry picked from commit f855146263b14abadd8d5bd0e280e54fbab3bd18)
2025-07-28 11:14:14 +00:00
Johan Jonker
57fc3e6d41 UPSTREAM: dt-bindings: display: rockchip: convert analogix_dp-rockchip.txt to yaml
Convert analogix_dp-rockchip.txt to yaml.

Changed:
  Add power-domains property
  File name

Change-Id: Ibd1493c5b35697e37a7b22b454dbafc3e035ab9e
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Link: https://patchwork.freedesktop.org/patch/msgid/88a5a9e3-9bc8-5966-22ec-5bdb1fa7a5b1@gmail.com
(cherry picked from commit 9bb35d4c32)
2025-07-28 11:14:14 +00:00
Johan Jonker
b30177fbce UPSTREAM: dt-bindings: display: bridge: convert analogix_dp.txt to yaml
Convert analogix_dp.txt to yaml for use as common document.

Changed:
  Relexed requirements

Change-Id: I7d667c53d51b79eeb79b8ea03002bfc696454094
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Link: https://patchwork.freedesktop.org/patch/msgid/489e7bd3-fa26-885f-4104-8b0b29aa4f2b@gmail.com
(cherry picked from commit 440112adad)
2025-07-28 11:14:14 +00:00
Algea Cao
dbcc3c130c drm/rockchip: dw_hdmi: Do not enable DSC when the DSC compression ratio is below 0.375.
If the DSC mode with a compression rate lower than 0.375 is to
be supported, the dclk clock source of the VOP bound to HDMI must
be a CRU PLL that supports fractional frequency division.
However, in most scenarios, HDMI is unable to be assigned such a
PLL. So in this scenario, instead of enabling DSC, we switch to
YUV420 format.

Change-Id: I450cdd5857e4384894651ed063fac152a8d9bb0f
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2025-07-28 16:44:50 +08:00
Jianwei Fan
9f6237f086 media: i2c: ov13b10: add ov13b10 sensor driver
Change-Id: I428d778ce7c4e853ea9e5728ec8e0cbb04c7735f
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2025-07-28 08:22:51 +00:00
Tao Huang
bfa6f2f019 ASoC: es8311: Drop the unused id parameter from es8311_i2c_probe()
Change-Id: Iba68239af94fd339164d600e42e95f4d97674081
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2025-07-28 12:07:47 +08:00
Simon Xue
7983696702 dma-buf: rk_heaps: rk-dma-heap: make struct class.devnode() take a const *
According to commit ff62b8e658 ("driver core: make struct class.devnode() take a const *").

Change-Id: I827e8ff555b606aa7a15da4b7e14cadfdfb6c28c
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2025-07-28 12:07:47 +08:00
XiaoDong Huang
2227caf217 arm64: dts: rockchip: add suffix "-gpios" to "rockchip,power-ctrl"
sed -i 's/rockchip,power-ctrl =/rockchip,power-ctrl-gpios =/' arch/arm64/boot/dts/rockchip/*

Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: If0f581f4ef8a8995e0ff5855f0a93cf3758631ee
2025-07-28 12:07:47 +08:00
XiaoDong Huang
07090c3a7f soc: rockchip: pm_config: fix build error
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I163f1a60c540fe2e435d27c12a8294270b115a36
2025-07-28 12:07:47 +08:00
Zhen Chen
ad901a525e MALI: mali400: Changes to adapt kernel 6.6
Change-Id: I1ea0178f8f0e634d38ed3c148e4714a29a346177
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2025-07-28 12:07:47 +08:00
Michael Tretter
9b46a0855e BACKPORT: drm/rockchip: vop2: Demote message in mod_supported to drm_dbg_kms
Checking if a modifier is supported by a plane is normal behavior. It is
normal that a plane may not support certain modifiers. Failing the check
doesn't justify an error message in the kernel log and may mislead
users.

Demote the error message to drm_dbg_kms to only print the message if the
respective debug messages are enabled. This is similar to the behavior
in rockchip_drm_vop.c.

Change-Id: I987bd416bf39a6e8632e7ff061a705cd4d14bf9a
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20231009103753.830458-1-m.tretter@pengutronix.de
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
(cherry picked from commit eb23cffdd7f085149799e5eda12a9aff792cc34d)
2025-07-28 12:07:47 +08:00
Simon Xue
f209b77648 BACKPORT: FROMLIST: iommu/rockchip: prevent iommus dead loop when two masters share one IOMMU
When two masters share an IOMMU, calling ops->of_xlate during
the second master's driver init may overwrite iommu->domain set
by the first. This causes the check if (iommu->domain == domain)
in rk_iommu_attach_device() to fail, resulting in the same
iommu->node being added twice to &rk_domain->iommus, which can
lead to an infinite loop in subsequent &rk_domain->iommus operations.

Cc: <stable@vger.kernel.org>
Fixes: 25c2325575 ("iommu/rockchip: Add missing set_platform_dma_ops callback")
Change-Id: I2057ef8b05b289c317464a9144768377a977f6e6
Signed-off-by: Simon Xue <xxm@rock-chips.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/20250623020018.584802-1-xxm@rock-chips.com
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
2025-07-28 11:04:58 +08:00
Tao Huang
e7844e0dc8 ARM: configs: rv1126b_linux_defconfig: drop CONFIG_EMBEDDED
According to commit ef815d2cba ("treewide: drop CONFIG_EMBEDDED").

Change-Id: I884bb6b9adc2500e717c09a61f0bca4fa4acb9e3
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2025-07-28 10:55:36 +08:00