Commit Graph

1255598 Commits

Author SHA1 Message Date
Tao Huang
4ead044ae5 Merge commit 'ec69911288bd488078ce1256e1a580123c9cf1e7'
* commit 'ec69911288bd488078ce1256e1a580123c9cf1e7':
  phy: rockchip: csi2-dphy: fixes hw_dev num error for rk3562
  video: rockchip: mpp: fix share reset_group do not take effect
  arm64: dts: rockchip: update rk3399-sapphire-excavator-lp4-linux.dts
  ARM: dts: rockchip: fix timing configs of panel k350c4516t for rv1103/rv1106 evb
  drm/rockchip: rgb: add mcu_max_dclk_rate for mode_valid check

Change-Id: Ia7b948597178623c8727cfc57c807ce32393ef8b
2023-08-25 19:12:55 +08:00
Tao Huang
37c18c4af3 Merge commit 'ea3b81ee34fda60da9dc5632ae4310aff8b7a9aa'
* commit 'ea3b81ee34fda60da9dc5632ae4310aff8b7a9aa':
  drm/rockchip: drv: fix the dclk calculation of mcu interface

Ignore:
commit ea3b81ee34 ("drm/rockchip: drv: fix the dclk calculation of mcu interface")

Change-Id: Ibfd403e33675bb205c622a7ad7571bcfae665564
2023-08-25 19:09:46 +08:00
Damon Ding
3cb261be89 drm/rockchip: drv: fix the dclk calculation of mcu interface
dclk = htotal * vtotal * frame-rate * cycles-per-pixel * pix-total

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I6b78463dc8290f562cfe44040d6b6030d652213d
2023-08-25 19:05:35 +08:00
Elaine Zhang
1b972f8b2e clk: rockchip: px30: remove dclk_vop_frac
dclk_vop_frac is frac divider with high jitter,
Is unfriendly to vop.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: If6218886fe64182261cf37172c88fcaeea197b22
2023-08-23 16:54:03 +08:00
Finley Xiao
ece05619d3 soc: rockchip: rockchip_system_monitor: Don't init wide temp when tz is NULL
Change-Id: I9e5213f130582fcb7ee1beae7a5200e9d7ff4bf4
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2023-08-23 10:25:56 +08:00
Finley Xiao
b5b12a0017 soc: rockchip: rockchip_system_monitor: Fix NULL pointer when check rate and volt
Fixes: 389088186f ("soc: rockchip: rockchip_system_monitor: Use new APIs to check rate and volt")
Change-Id: I252146bb541c4de97a0a4c72546842353c712318
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2023-08-23 10:24:54 +08:00
Finley Xiao
31f5c89615 arm64: dts: rockchip: rk356x: Add trips for gpu thermal node
This patch fixes the below error.

thermal_sys: Failed to find 'trips' node
thermal_sys: Failed to find trip points for tsadc id=1
rockchip-thermal fe710000.tsadc: failed to register sensor 1: -22
rockchip-thermal fe710000.tsadc: failed to register sensor[1] : error = -22
rockchip-thermal: probe of fe710000.tsadc failed with error -22

Change-Id: I13c9be7b63ca33334388c90381de5b16a9d56b48
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2023-08-23 09:20:28 +08:00
Finley Xiao
e09ca734c7 soc: rockchip: opp_select: Add support to parse 'rockchip,pvtm-voltage-sel-hw'
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I9d8ad8057f5fff32d5cd859b9d6ee71486c61160
2023-08-23 09:20:28 +08:00
Finley Xiao
bd3aeda3e5 soc: rockchip: opp_select: Implement rockchip_set_opp_supported_hw()
This implements new APIs to get soc info and set opp hardware info.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I167a37f661ce6fc8b32afc7768985fe23e35318c
2023-08-23 09:20:28 +08:00
Finley Xiao
b39462754a soc: rockchip: opp_select: Fix uninit opp table error
Fixes: c64369f0e4 ("soc: rockchip: opp_select: Implements new opp APIs for kernel 6.1")
Change-Id: I290ff336a90d36ab2636e6d8e55888b52862308d
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2023-08-23 09:20:27 +08:00
Steven Liu
ef6d8c8c3b arm64: dts: rockchip: rk3568: Add arm_pmu label
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: Ia2c342e70042e98c3800c5748e8d1f4ad39fbfc3
2023-08-22 21:07:18 +08:00
Guochun Huang
781a1bf608 drm/rockchip: dsi: set vop2 standby before command mode in rk3566/rk3568
Change-Id: I49bd967dfb6c561a7c187cb075ff0192f6caf69a
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-08-22 20:54:48 +08:00
Tao Huang
7974b3e21b Merge commit '8405687e7c2caa1b86236d98de602974388942c1'
* commit '8405687e7c2caa1b86236d98de602974388942c1': (22 commits)
  rtc: rockchip: fix up the rtc compensation value
  arm64: dts: rockchip: rk3568-toybrick-sd0: change gmac1 txdelay
  mmc: dw_mmc: Add some safe delay for releasing power leak
  video: rockchip: mpp: fix irq on poweroff for rkvdec2_link
  video: rockchip: mpp: fix reset_group protected range
  arm64: configs: rockchip_defconfig: Enable RT5651 for rk3399 excavator evb
  media: rockchip: hdmirx: fix CTS HF2-86 test fail
  media: i2c: update sc230ai again map
  crypto: rockchip: utils: optimize alignment criteria
  crypto: rockchip: Fixed the timeout timer being triggered incorrectly
  phy/rockchip: samsung-hdptx: make deskew fifo works on shared pointer
  arm64: dts: rockchip: px30: delete dmc 528MHz and en 666MHz ODT
  soc: rockchip: tb_service: fixes the register haven't been handle
  drm/rockchip: drv: fix the config csc data issue
  soc: rockchip: cpuinfo: Add support for rk3528a
  drm/rockchip: dw_hdmi: Fix crash caused by hotplug in uboot
  drm/rockchip: vop2: report vividhdr feature by property
  soc: rockchip: pm_config: support mcu-sleep-config
  arm64: dts: rockchip: rk3308b-amp: support config amp os irqs
  dt-bindings: soc: rockchip: add define for rockchip amp
  ...

Change-Id: Ibb2e8f1112b9787df755aa6aaf3bb28c0c01e8e2

Conflicts:
	drivers/irqchip/irq-gic.c
2023-08-22 20:27:34 +08:00
Tao Huang
cb05cc470c Merge commit '1ccd57c4b028ff3fdf84a9a50d0394bc9dffcd74'
* commit '1ccd57c4b028ff3fdf84a9a50d0394bc9dffcd74':
  arm64: dts: rockchip: rk3588-vehicle-s66-v10 support wifi/bt
  arm64: dts: rockchip: rk3588-vehicle-adsp-audio-s66 fix i2s-tdm
  media: rockchip: isp: fix 3dlut for multi sensor
  arm64: dts: rockchip: rk3528: Add trim configure for tsadc
  thermal: rockchip: Add trim temperature for rk3528
  video: rockchip: rga3: avoid premature wake_up causing request to be freed
  phy: rockchip: usbdp: amend to improve USB compatibility
  mtd: spi-nor: xmc: Support XM25QH256C
  arm64: dts: rockchip: rk3588-vehicle-display-v20: not assign clock for vop
  media: i2c: add os02k10 driver
  ARM: dts: rockchip: rv1106-evb: add mcu display v20 board
  arm64: dts: rockchip: add rk3528 demo6 dts
  video: rockchip: rga3: fix memory mapping will be skipped when handle is 0
  arm64: dts: rockchip: rk3568: Add opps for rk3568j/m

Conflicts:
	arch/arm64/boot/dts/rockchip/rk3568.dtsi
	drivers/media/i2c/Kconfig
	drivers/media/i2c/Makefile
	drivers/mtd/spi-nor/xmc.c

Ignore:
commit 0c5cc59876 ("arm64: dts: rockchip: rk3568: Add opps for rk3568j/m")
commit 724009a9d7 ("mtd: spi-nor: xmc: Support XM25QH256C")

Change-Id: I07a4b82a2dfae98c894cc28af98a4e2eeb1b8006
2023-08-22 20:13:40 +08:00
Jon Lin
8e9b7888a9 mtd: spi-nor: xmc: Support XM25QH256C
Change-Id: I0d1ee1b1615f9d29b472ef5bc8e2ed9aabd86602
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-08-22 20:05:01 +08:00
Liang Chen
b394f92e26 arm64: dts: rockchip: rk3568: Add opps for rk3568j/m
Change-Id: I2e394d1de0dc8d856177a7083b56dc3ac81c5816
Signed-off-by: Liang Chen <cl@rock-chips.com>
2023-08-22 15:27:18 +08:00
Tao Huang
247067d5e2 Merge commit 'fbd35aede4e2c60a1557bd824a4a194893d93695'
* 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
2023-08-22 15:03:24 +08:00
Tao Huang
54406c0eb1 Merge commit '6397c9ae572a61003dde39d2563c487bf12a0dc9'
* 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
2023-08-22 14:42:34 +08:00
Zhang Yubing
ce735d9a2c drm/rockchip: cdn-dp: support dp training outside dp firmware
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>
2023-08-22 10:33:07 +08:00
Chris Zhong
aa310d2a5e FROMLIST: drm/rockchip: add transfer function for cdn-dp
We may support training outside firmware, so we need support
dpcd read/write to get the message or do some setting with
display.

Change-Id: If89911e6205546df1a5ae8997ea214d5d2a60af6
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
Signed-off-by: Lin Huang <hl@rock-chips.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Enric Balletbo <enric.balletbo@collabora.com>
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
(am from https://patchwork.kernel.org/patch/10420461/)
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
2023-08-22 10:21:54 +08:00
Tao Huang
a9a553deaa Merge commit 'f3eda81058155e669b44cde653b431fb65da1c8a'
* commit 'f3eda81058155e669b44cde653b431fb65da1c8a':
  phy/rockchip: inno-dsidphy: remove duplicate code from inno_dsidphy_mipi_mode_enable()
  media: rockchip: isp: fix drc and hdrmge err for multi sensor
  video: rockchip: mpp: disable usr poll timeout
  media: rockchip: isp: version to v2.2.2
  arm64: dts: rockchip: rk3562: Optimize clk jitter for DAIs
  ASoC: rockchip: sai: Handle clk enable in prepare stage
  ASoC: rockchip: sai: Use generic pm_runtime_force_* for system PM
  drm/rockchip: vop2: add more plane check
  media: i2c: gc1084: add frame synchronization support
  phy: rockchip: csi2-dphy: fixes fwnode parse error of cphy

Conflicts:
	drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
	drivers/phy/rockchip/phy-rockchip-csi2-dphy.c

Ignore:
commit 74bb5a299c ("phy: rockchip: csi2-dphy: fixes fwnode parse error of cphy")
commit 06906b5a73 ("drm/rockchip: vop2: add more plane check")

Change-Id: I211567c8c1eff42ede255e7efd5b3883bc3e668b
2023-08-22 09:40:28 +08:00
Tao Huang
14d459382d drm/panel: maxim-max96772: Fix compilation errors on kernel 6.1
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
2023-08-21 20:11:23 +08:00
Tao Huang
0fa451f5bc Merge commit '955d8bfa4bbfbaf1f770c9cd86eaf828f82fb470'
* commit '955d8bfa4bbfbaf1f770c9cd86eaf828f82fb470':
  arm64: rockchip_defconfig: Enable CONFIG_DRM_PANEL_MAXIM_MAX96772
  net: wireless: rockchip_wlan: porting infineon driver.
  input: sensor: accel/gyro sensor: support iam20680.
  arm64: dts: rockchip: vehicle-s66: support iam20680.
  media: rockchip: isp: fix repeated reporting statistics if stats video on/off
  mfd: max96755f: lock status and link reg need access directly.
  drm/bridge: maxim-max96755: support dual link mode.
  drm/panel: Add panel driver for Maxim MAX96772 based LCDs
  media: i2c: it6616: modify set ctrl when video stable
  media: i2c: lt6911uxe: modify rk3588_dcphy params

Conflicts:
	drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/Makefile
	drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/dhd_custom_msm.c
	drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/dhd_linux.h
	drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/dhd_linux_platdev.c
	drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/dhd_pcie_linux.c
	drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/wl_cfgvendor.c

Ignore:
commit a748a1bd1c ("net: wireless: rockchip_wlan: porting infineon driver.")

Change-Id: Id9ebcbe2e66b64ed3f64f59bcfed5be42860bc6e
2023-08-21 19:42:41 +08:00
Tao Huang
f08f382946 Merge commit 'a9ed7b93e657b49420dc7c02c3ce9ce810e9b7d3'
* 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
2023-08-21 19:31:15 +08:00
Zefa Chen
8642adb339 phy: rockchip: csi2-dphy: logic node of mipi phy can control all hw of mipi phy
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I30cc62cc1d28c4219e9e5c5ccd77fa9f589e63af
2023-08-21 19:27:14 +08:00
Tao Huang
ef9c699e6b Merge commit 'c929ccacbb38fb047ca64ffee41ca4ab43f324eb'
* 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
2023-08-21 19:21:29 +08:00
Zefa Chen
464312fc6c arm64: dts: rockchip: rk3568 separate the node of csi2 and hw
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ia3694d29ee53a1ccd46e2e375eed94ce45dcf1fc
2023-08-21 19:14:15 +08:00
Tao Huang
7884ac62b0 Merge commit '9adfbb364a4b3148fcda177fcb780d7a393bfcc5'
* commit '9adfbb364a4b3148fcda177fcb780d7a393bfcc5': (37 commits)
  arm64: dts: rockchip: rk3588s: Add nvmem-cells for rkcif
  arm64: dts: rockchip: rk3588s: Add package serial number for otp
  mms: rk_sdmmc_ops: support resume and suspend
  mms: rk_sdmmc_ops: disabled command queue while execute
  soc: rockchip: sdmmc_vendor_storage: Using multiple blocks of read/write data
  mms: rk_sdmmc_ops: support multi-blocks ops
  phy: rockchip: mipi-dcphy: fix HSTX_CLK_SEL config
  video: rockchip: vehicle: support config rotate & mirror simultaneously
  phy: rockchip: inno-usb2: enable bvalid detect irq upon resume
  arm64: dts: rockchip: rk3588-vehicle: fix lt7911 compatible name error
  drm/rockchip: vop2: only legacy gamma set need extra config done
  drm/rockchip: vop2: update pre_dither_down config
  media: rockchip: vicap support tool video capture raw with rdbk by isp
  usb: typec: tcpm: fix dp altmode negotiation failure
  arm64: dts: rockchip: fix frame rate of mcu panel to 60Hz for rk3308/rk3562 evb
  ARM: dts: rockchip: fix frame rate of mcu panel to 60Hz for rv1103/rv1106 evb
  PCIe: dw: rockchip: Setting rk_pcie_hot_rst_wq before interrupt unmask
  arm64: dts: rockchip: rk3588-vehicle: init s66 project dts files
  ASoC: rockchip: rk817-codec: Solve pop problems cause by re-configure APLL
  media: i2c: optimize gc2053 sync issue
  ...

Conflicts:
	drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
	drivers/media/i2c/Kconfig

Ignore:
commit e2852b6423 ("drm/rockchip: vop2: Fix plane parameter check error at interlace mode")
commit 16b27eed7c ("drm/rockchip: vop2: recover win state when exit psr")
commit 903953ddeb ("drm/rockchip: vop2: update pre_dither_down config")
commit 4056d4ef2c ("drm/rockchip: vop2: only legacy gamma set need extra config done")

Change-Id: Ibc71f27f3e08d5ed047a2643911ba1b021528cfb
2023-08-21 17:16:40 +08:00
Tao Huang
91b91613dc Merge commit '328145662f6d6154fbf4329a0d53f9c152673648'
* 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
2023-08-21 16:47:24 +08:00
Jon Lin
b1fecc211e mtd: spinand: skyhigh: The vendor requires the devices to be patched
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>
2023-08-21 16:42:03 +08:00
Bin Yang
6c909bfa2f usb: gadget: uvc: fix uvc buffer not getting Scatter-Gather descriptor
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
2023-08-09 16:23:47 +08:00
Zefa Chen
ec69911288 phy: rockchip: csi2-dphy: fixes hw_dev num error for rk3562
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I8c2c6f392ea05264a5b173d22dea525ba86e5a20
2023-08-09 11:08:39 +08:00
Yandong Lin
4ae0e6cdb3 video: rockchip: mpp: fix share reset_group do not take effect
Some device share one pd, but reset control are different.
It should share a reset_group to ensure that one device can
not do reset while anothor is running.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I53527a053d0835085522396e2d9ee649d78325a5
2023-08-08 15:05:06 +08:00
Caesar Wang
7b61a88574 arm64: dts: rockchip: update rk3399-sapphire-excavator-lp4-linux.dts
1/ The backlight is for the eDP panel and it has the connector on the
   excavator baseboard.

2/ remove cdn_dp

Fixes: 5a2a93f1ee ("arm64: dts: rockchip: move backlight from rk3399 sapphire to excavator")

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I4de565a2658b9a26f7b4155fce03db875703fa0d
2023-08-04 18:12:19 +08:00
Damon Ding
8cfd518aab ARM: dts: rockchip: fix timing configs of panel k350c4516t for rv1103/rv1106 evb
1. Modify mcu-timing configs according to panel datasheet.
2. Modify clock-frequency config sync with mcu-timing
   configs.
3. Add more comments for panel initialization sequence.
4. Add 10ms delay before sending initialization sequence
   to make sure the reset gpio output a low pulse.
5. Remove unused parameter reset-value.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Ib0b5266de5612aa369be89c1c8edf1f4a5025c3f
2023-08-04 16:46:21 +08:00
Damon Ding
dd2b9adc1a drm/rockchip: rgb: add mcu_max_dclk_rate for mode_valid check
The max dclk rate of rgb interface is limited by lcdc
io rate, and that of mcu interface is limited by vop
input rate.

In addition, modify the check of mcu panel, and replace
the flag is_mcu_panel by np_mcu_panel.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I329715aff21f67baf0187cb06b31ffb65f2e9517
2023-08-04 16:45:41 +08:00
Damon Ding
ea3b81ee34 drm/rockchip: drv: fix the dclk calculation of mcu interface
dclk = htotal * vtotal * frame-rate * cycles-per-pixel * pix-total

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I6b78463dc8290f562cfe44040d6b6030d652213d
2023-08-04 16:31:30 +08:00
Elaine Zhang
8405687e7c rtc: rockchip: fix up the rtc compensation value
rtc compensation value needs to be converted to a bcd code.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ic24a5ba0c31c42b804d1efa65702e680bae26630
2023-08-04 15:39:20 +08:00
Shiqin Chen
84a85ea4a6 arm64: dts: rockchip: rk3568-toybrick-sd0: change gmac1 txdelay
Signed-off-by: Shiqin Chen <chensq@rock-chips.com>
Change-Id: I8fbaf468dc41b4da91345a089c0fcd3eb560a6b4
2023-08-04 15:17:44 +08:00
Shawn Lin
2a8db47d13 mmc: dw_mmc: Add some safe delay for releasing power leak
Add some delay for some broken card which need long time to
release the remain power leak. 200ms is very safe, no need to
bother device tree property, as it depends on card not board.

Fixes: 60c9e5240f ("mmc: dw_mmc: Add normal and idle pinctrl control")
Change-Id: I5437945cd860674be860d246200e15eed9d91e03
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
2023-08-04 14:50:39 +08:00
Yandong Lin
54ff36c469 video: rockchip: mpp: fix irq on poweroff for rkvdec2_link
rkvdec2_link_power_off():
    power_enabled = 0 -> disable irq -> power off

rkvdec2_link_irq():
    if power_enabled == 0 -> return and not clear irq

there is a corner case:
   1. after power_enabled flag set to 0 and before disable irq
   2. irq coming
   3. irq return and not clear irq
   4. repeat step 2

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I284bf40acb19e0c48cf04e526a534fec6383eb11
2023-08-04 14:50:04 +08:00
Yandong Lin
1173b14159 video: rockchip: mpp: fix reset_group protected range
In some platform, there are some devices share PD.
If one device is doing pmu idle request to cru reset and
at this time cpu want to read/write reg for the device will crash.

So use the reset_group to prevent the case.

There is a issue that reset_group protected range not enough,
so fix it.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ide32966f7cff842e4611213d26901617fd57bc14
2023-08-04 14:36:41 +08:00
Shunhua Lan
9bef8f31ad arm64: configs: rockchip_defconfig: Enable RT5651 for rk3399 excavator evb
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I09cdf40fdeac8dccc13c3a4b3ec4d3b58c2c35e3
2023-08-04 10:06:30 +08:00
Chen Shunqing
0cb0d5f1ec media: rockchip: hdmirx: fix CTS HF2-86 test fail
If sample_flat field is set to 1, there can't be any sound.

Change-Id: I56ad87d1165fe7d1cc993f9522c4e6d50c253b80
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
2023-08-03 16:48:13 +08:00
yuefu.su
b406f355a2 media: i2c: update sc230ai again map
Signed-off-by: yuefu.su <yuefu.su@rock-chips.com>
Change-Id: I6c5928d5bbb73a9d32a809f6750160a8730c0100
2023-08-03 16:46:04 +08:00
Lin Jinhan
203965847c crypto: rockchip: utils: optimize alignment criteria
There is no length alignment requirement for the last scatterlist.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I9625bce9379cef4c1a8507ba523f5f303d60c9e6
2023-08-03 11:56:23 +08:00
Lin Jinhan
43f141406e crypto: rockchip: Fixed the timeout timer being triggered incorrectly
If the time required for a single data calculation exceeds 3 seconds,
timeout occurs.The timeout timer should be reset after the CRYPTO irq
interrupt is triggered.

Change-Id: I21516ba57bfc8eef3b22624e4ed95523d000cee2
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2023-08-03 11:45:59 +08:00
Tao Huang
761bb33401 net: wireless: rockchip_wlan: bcmdhd: Fix out-of-srctree build
../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
2023-08-02 18:21:02 +08:00
Guochun Huang
c19bda6df3 phy/rockchip: samsung-hdptx: make deskew fifo works on shared pointer
the deskew fifo works on its own pointers may cause inter-lane skew
to exceed the vesa standard, this poses a risk of errors in dp sink
parsing MSA packet which inserted in data stream

Change-Id: Ia3bdfaed8696c8f7f21f39f0b55d18b1dce7761f
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-08-02 15:05:08 +08:00
Zhihuan He
ed5a9690cf arm64: dts: rockchip: px30: delete dmc 528MHz and en 666MHz ODT
For a more stable system, delete the 528MHz frequency and open
the 666MHz frequency ODT.

Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
Change-Id: I0354c6dde8f39a9b41878446475ee3acbe1be729
2023-08-01 10:21:40 +08:00