* commit 'fbd35aede4e2c60a1557bd824a4a194893d93695':
cpufreq: rockchip: set supported hw version for opp
driver: rknpu: Update rknpu driver, version: 0.9.1
media: i2c: sc301iot: pm runtime put device until stream off for thunderboot
drm/rockchip: dw-dp: support hdcp key without aes encrypt
video: rockchip: mpp: fix session cleanup issue
media: i2c: sc3338 support normal boot
arm64: dts: rockchip: rk3588-vehicle-evb-v21: change pcie wifi power control
arm64: dts: rockchip: rk3308bs-evb-mipi-display-v11: reduce drive strength of lcdc d18~23 from 6ma to 2ma
ARM: dts: rockchip: rv1106g-evb2-v10: correct sc3338 gpio
phy: rockchip-typec: use phy interface replace global functions
drm/rockchip: cdn-dp: use phy interface replace global functions
phy: rockchip-typec: Fix DP lane config
Conflicts:
drivers/cpufreq/rockchip-cpufreq.c
Ignore:
commit fbd35aede4 ("cpufreq: rockchip: set supported hw version for opp")
Change-Id: Ib0a67c2e034e9863bd8a02a4ee032c3c10971078
* commit '6397c9ae572a61003dde39d2563c487bf12a0dc9':
drm/rockchip: cdn-dp: support dp training outside dp firmware
drm/rockchip: cdn-dp: Avoid drm_dp_link helpers in dp training
FROMLIST: drm/rockchip: add transfer function for cdn-dp
Conflicts:
drivers/gpu/drm/rockchip/cdn-dp-core.c
drivers/gpu/drm/rockchip/cdn-dp-core.h
Ignore:
0aefe26fd9 ("FROMLIST: drm/rockchip: add transfer function for cdn-dp")
99b9c4c771 ("drm/rockchip: cdn-dp: Avoid drm_dp_link helpers in dp training")
6397c9ae57 ("drm/rockchip: cdn-dp: support dp training outside dp firmware")
Change-Id: I1c17714963639b3ea88418ddd8ad43e88327d0ec
DP firmware uses fixed phy config values to do training, but some
boards need to adjust these values to fit for their unique hardware
design. So get phy config values from dts and use software link training
instead of relying on firmware, if software training fail, keep firmware
training as a fallback if sw training fails.
Change-Id: I075bff6aa153a5e18b6a5ddec2645131f1411913
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
Signed-off-by: Lin Huang <hl@rock-chips.com>
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
drivers/gpu/drm/panel/panel-maxim-max96772.c:22:10: fatal error: drm/drm_dp_helper.h: No such file or directory
drivers/gpu/drm/panel/panel-maxim-max96772.c:536:19: error: initialization of 'void (*)(struct i2c_client *)' from incompatible pointer type 'int (*)(struct i2c_client *)'
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I53cd11e89b92a96e5724db344c86709c2ca414ff
* commit 'a9ed7b93e657b49420dc7c02c3ce9ce810e9b7d3':
media: rockchip: vicap compatible with rk3588s2
media: rockchip: vicap support combine two mipi to one dev
phy: rockchip: csi2-dphy: logic node of mipi phy can control all hw of mipi phy
Conflicts:
drivers/phy/rockchip/phy-rockchip-csi2-dphy.c
Ignore:
commit 08330d500d ("phy: rockchip: csi2-dphy: logic node of mipi phy can control all hw of mipi phy")
Change-Id: Ief48fe16863dc477a183289f9a4c49881d2d2942
* commit 'c929ccacbb38fb047ca64ffee41ca4ab43f324eb':
include: rk-camera-module: support get/set capture info
include: rkcif-config: support set multi csi info
ARM: dts: rockchip: rv1106 separate the node of csi2 and hw
ARM: dts: rockchip: rv1126 separate the node of csi2 and hw
arm64: dts: rockchip: rk1808 separate the node of csi2 and hw
arm64: dts: rockchip: rk3562 separate hw node of mipi csi2 and mipi dphy
arm64: dts: rockchip: rk3568 separate the node of csi2 and hw
arm64: dts: rockchip: rk3588 separate the node of csi2 logic and hw
arm64: dts: rockchip: rk3588 mipi dphy config modify
Conflicts:
arch/arm64/boot/dts/rockchip/rk3568.dtsi
Ignore:
commit 841fa2175d ("arm64: dts: rockchip: rk3568 separate the node of csi2 and hw")
Change-Id: If60dc34bbe2d753ff36a3325cb5a648b1f80169d
* commit '328145662f6d6154fbf4329a0d53f9c152673648':
mtd: spinand: skyhigh: The vendor requires the devices to be patched
mtd: spinand: foresee: Support new device F35UQA001G-WWT
mtd: spinand: foresee: Support new device F35UQA002G-WWT
mtd: spinand: fmsh: Support new device FM25S01BI3
mtd: spinand: fmsh: Modify incorrect information despite not used
drm/bridge: analogix_dp: add support split area prop
drm/rockchip: dsi2: add support split area prop
drm/rockchip: analogix_dp: support split mode with other display interface
drm/bridge: analogix_dp: support dual connector with other display interface
drm/rockchip: dsi2: support split mode with other display interface
drm/rockchip: drv: Add crtc_clock convert in drm_mode_convert_to_{split,origin}_mode()
drm/bridge: analogix_dp: mv mode_set to bridge .atomic_pre_enable
drm/rockchip: dsi2: mv mode set to encoder .atomic_enable
Change-Id: Ie34682a12a9877c582fc95803edcf527ccdae98e
Conflicts:
drivers/mtd/nand/spi/core.c
Ignore:
commit 328145662f ("mtd: spinand: skyhigh: The vendor requires the devices to be patched")
Change-Id: I5baf8f1296e43b3491994529cb8b4ac1f08b3cf4
1.Double OIP=0 after page 13H
2.The nand flash does not support 84H and 34H command
Change-Id: Ie805f42a36e1a864115988087bdc43592cc94ded
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
Commit 000cbb7d4b ("UPSTREAM: usb: gadget: uvc: add scatter gather
support") use scatter gather transfers for uvc isoc. However, the patch
conflicts with rockchip's zero-copy code.
Fixes: 5452a06eed ("usb: gadget: uvc: support zero copy with rockchip encoder")
Signed-off-by: Bin Yang <yangbin@rock-chips.com>
Change-Id: I515d79610a9bba74bbf28b0be974b5081a4b3c76
../drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/aiutils.c:25:10: fatal error: 'typedefs.h' file not found
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I425cb52776bb1b3294b8ef67c951b04afe2288a9
The original WARNING:
memcpy: detected field-spanning write (size 8) of single field "&trace_buffer->name" at drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c:267 (size 1)
WARNING: CPU: 4 PID: 341 at drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c:267 kbase_csf_firmware_parse_trace_buffer_entry+0x1b8/0x1c0
...
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
Change-Id: I27da582ae033b4a89a4a5c7c3e98e636e3336df8
After other threads will trigger the wakeup, there may be a case where
the request is exited abnormally, so it is necessary to wake_up again
when the function exits.
Change-Id: Ia3e754cf3d4f9064ddc07a590f73f2f75c92d2c3
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Amends ln0/ln2 RX DFE to improve the compatibility of USB3 link training.
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: I568f9260bcfbb4625139222f06b68765f187dd04
ERROR: modpost: module rga3 uses symbol dma_buf_vmap from namespace DMA_BUF, but does not import it.
ERROR: modpost: module rga3 uses symbol dma_buf_vunmap from namespace DMA_BUF, but does not import it.
ERROR: modpost: module rga3 uses symbol dma_buf_attach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module rga3 uses symbol dma_buf_map_attachment from namespace DMA_BUF, but does not import it.
ERROR: modpost: module rga3 uses symbol dma_buf_detach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module rga3 uses symbol dma_buf_put from namespace DMA_BUF, but does not import it.
ERROR: modpost: module rga3 uses symbol dma_buf_get from namespace DMA_BUF, but does not import it.
ERROR: modpost: module rga3 uses symbol dma_buf_unmap_attachment from namespace DMA_BUF, but does not import it.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I3fbad697bb9419f91f82d1aa5af087132c07cca7
ERROR: modpost: module iep uses symbol dma_buf_put from namespace DMA_BUF, but does not import it.
ERROR: modpost: module iep uses symbol dma_buf_attach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module iep uses symbol dma_buf_map_attachment from namespace DMA_BUF, but does not import it.
ERROR: modpost: module iep uses symbol dma_buf_detach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module iep uses symbol dma_buf_unmap_attachment from namespace DMA_BUF, but does not import it.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2726f9a0d2bc960c4e986aa759a7f7c0d083628d
ERROR: modpost: module rknpu uses symbol dma_buf_mmap from namespace DMA_BUF, but does not import it.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I956ab29689da5e1089c12757a5ea73ede7c1208e
ERROR: modpost: module video_rkispp uses symbol dma_buf_fd from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkispp uses symbol dma_buf_put from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkispp uses symbol dma_buf_attach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkispp uses symbol dma_buf_map_attachment from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkispp uses symbol dma_buf_vmap from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkispp uses symbol dma_buf_detach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkispp uses symbol dma_buf_vunmap from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkispp uses symbol dma_buf_unmap_attachment from namespace DMA_BUF, but does not import it.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: If364340011efaa4e92c9d99a50bb27da24072db5
ERROR: modpost: module video_rkisp uses symbol dma_buf_detach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkisp uses symbol dma_buf_put from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkisp uses symbol dma_buf_unmap_attachment from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkisp uses symbol dma_buf_attach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkisp uses symbol dma_buf_map_attachment from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkisp uses symbol dma_buf_fd from namespace DMA_BUF, but does not import it.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ib2615d64e349ddfcf9f2ffb0bccfa7055c0ae49c
ERROR: modpost: module video_rkcif uses symbol dma_buf_put from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkcif uses symbol dma_buf_fd from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkcif uses symbol dma_buf_export from namespace DMA_BUF, but does not import it.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I1c8940e20546f965edf7438095b20a8365854b09
ERROR: modpost: module cryptodev uses symbol dma_buf_unmap_attachment from namespace DMA_BUF, but does not import it.
ERROR: modpost: module cryptodev uses symbol dma_buf_detach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module cryptodev uses symbol dma_buf_put from namespace DMA_BUF, but does not import it.
ERROR: modpost: module cryptodev uses symbol dma_buf_get from namespace DMA_BUF, but does not import it.
ERROR: modpost: module cryptodev uses symbol dma_buf_attach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module cryptodev uses symbol dma_buf_map_attachment from namespace DMA_BUF, but does not import it.
ERROR: modpost: module cryptodev uses symbol dma_buf_begin_cpu_access from namespace DMA_BUF, but does not import it.
ERROR: modpost: module cryptodev uses symbol dma_buf_end_cpu_access from namespace DMA_BUF, but does not import it.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I4b456188306f1b69ca0572191a8bb1ff51221732
The camera device should keep *power on* until stream off, that make
sure the mclk is enable.
Signed-off-by: yuefu.su <yuefu.su@rock-chips.com>
Change-Id: I877d73cfa64e484e7c93e7b761d31ff23e353960
The session can only be released after all tasks are released.
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I9a4e7940323be72cb0982338777af813888f957f
regulator should always on when system suspend, avoid wifi crash.
Change-Id: If78702e56b68f653b2d50a06d7fd31bc4ced2943
Signed-off-by: Xu Xuehui <xxh@rock-chips.com>
The touchscreen i2c is abnormal due to current crosstalk of lcdc
d18~23,so reduced drive strength reduces crosstalk
Change-Id: Iaa7f6fc3854ecf2ab5e96d96c44464044a23b128
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
