Commit Graph

1079757 Commits

Author SHA1 Message Date
Tao Huang
436709c2ce arm64: dts: rockchip: rk3588-cpu-swap: change cpu dynamic-power-coefficient
According to commit 666fa6cca7 ("arm64: dts: rockchip: rk3588s: change cpu dynamic-power-coefficient").

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Id21c8ffc187092c8cef7f76dd9c5bce355e1743d
2023-04-19 17:28:30 +08:00
Finley Xiao
9028a39e63 drm/rockchip: Add support to unprotect clocks
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Idde99b52f81df9a40dda916708c751666f420a39
2023-04-19 17:27:44 +08:00
Finley Xiao
8db5c7166a clk: rockchip: rk3562: Add protect clocks
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I87924f1fa528c86492879c1924c6098e1b263b80
2023-04-19 17:27:44 +08:00
Finley Xiao
a4db0afed4 clk: rockchip: Implement rockchip_clk_protect()
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I85ee79b594f86a6852bcdc8cde8eb5ac95e9ee19
2023-04-19 17:27:44 +08:00
Tao Huang
19b5bab46b soc: rockchip: Move drivers/staging/android/fiq_debugger/ to drivers/soc/rockchip/fiq_debugger/
drivers/staging/android/ is removed on upstream.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ifef3f52f9212cb79a028fc8f56052b156cc428ae
2023-04-19 10:39:50 +08:00
Jianlong Wang
fc905e3632 arm64: config: add rockchip_electric_defconfig
Change-Id: I3828bec48f0789a4fae775f1fa661cb69c9b9543
Signed-off-by: Jianlong Wang <jianlong.wang@rock-chips.com>
2023-04-18 17:11:55 +08:00
Zhang Yubing
c4a31b3e3a drm/rockchip: vop2: power on esmart pd without ref count
Fixes: b06e7b839c ("drm/rockchip: vop2: fix esmart pd turn off timeout issue")

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I841f74108506a9c69b57edcff73380be35c33576
2023-04-18 15:12:25 +08:00
Jianlong Wang
e1c4230889 ARM: configs: rk312x: enable RK_VIRTUAL_THERMAL
Change-Id: Ie8963ce75f1880a38aa0118b9e647f11eb5d1051
Signed-off-by: Jianlong Wang <jianlong.wang@rock-chips.com>
2023-04-17 17:27:57 +08:00
Rocky Hao
ca62707f4d thermal: rockchip: add virtual tsadc support for rk3126
rk previous SOCs such as rk3126 have no tsadc module, so a virtual tsadc is
implemented to control the thermal problem.

the virtual tsadc is designed on considering 2 factors, one is heating
modules' heating time and the working frequences, the other one is current
leval monitored by coulometer.

Change-Id: I0c7d8b952004d4f7918a41c925c50d38aaa65673
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2023-04-17 17:26:01 +08:00
Shaohan Yao
82c81b7eb9 arm64: dts: rockchip: rk3528: Add gpu ipa static power
Signed-off-by: Shaohan Yao <shaohan.yao@rock-chips.com>
Change-Id: Ib237564f3099609622e274159f9b15c56eea43eb
2023-04-17 17:05:14 +08:00
Shaohan Yao
791feb8cc2 mali400: mali: Add rockchip simple-power-model support
Signed-off-by: Shaohan Yao <shaohan.yao@rock-chips.com>
Change-Id: I0f4edae3b6ad76d31fdc93a5cf96561afe0511ee
2023-04-17 17:05:08 +08:00
Chandler Chen
2938e413fd video: rockchip: mpp: fix dma buffer use-after-free issue
refcount_t: underflow; use-after-free.
WARNING: CPU: 0 PID: 1806 at lib/refcount.c:28
refcount_warn_saturate+0xf8/0x134
Call trace:
 refcount_warn_saturate+0xf8/0x134
 kref_put+0x108/0x10c
 mpp_dma_release+0x2c/0x48
 mpp_task_finalize+0x8c/0xb4
 rkvdec2_free_task+0x18/0x34
 rkvdec2_link_free_task+0x78/0x144
 mpp_session_pop_pending+0x78/0xb4
 rkvdec2_link_wait_result+0x180/0x1f8
 mpp_dev_ioctl+0x53c/0x5dc
 __arm64_compat_sys_ioctl+0x104/0x158
 el0_svc_common+0xac/0x1ac
 do_el0_svc_compat+0x1c/0x28
 el0_svc_compat+0x10/0x1c
 el0_sync_compat_handler+0x60/0x8c
 el0_sync_compat+0x164/0x180

Signed-off-by: Chandler Chen <chandler.chen@rock-chips.com>
Change-Id: I14c1ace207282341799bb43092f54a901eef2921
2023-04-17 16:36:46 +08:00
Algea Cao
e53e7c4bc5 arm64: dts: rockchip: rk3528: set hdmi ddc scl rate as 50KHz
The original 100khz rate is prone to ddc communication
error on some TVs. The scl rate was reduced to 50khz
by referring to competitor.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I51c3307566b68932e8ab9f1cb6a8ba47d03e7110
2023-04-17 16:14:08 +08:00
Algea Cao
50864b4004 arm64: dts: rockchip: rk3528: Add hdmi reference to hdmiphy pll clock
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Id26060a32de4e50d1f574fe17593ae39602b3840
2023-04-17 16:13:57 +08:00
Algea Cao
68767361ad drm/rockchip: dw_hdmi: Introduce hdmiphy-pll clock
If drm bind takes too long when entering the kernel,
for example, retry reading edid. When the clock is not
enabled, it will closed by rockchip_clocks_loader_unprotect().
Therefore, if the uboot logo is displayed, hdmi needs to
enable hdmiphy pll when hdmi bind.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I908f3f23bd60535d01399c972ae0942e6abe3dd4
2023-04-17 16:13:57 +08:00
Algea Cao
38aeab12c6 drm: bridge: dw-hdmi: Fix kernel logo can't display if can't get edid
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I41ea95670a8f38e54adaa121de6685ea5e7fbcf4
2023-04-17 16:13:57 +08:00
Algea Cao
ab4061629d drm: bridge: dw-hdmi: Read edid in 8-bytes steps
This saves about 200 milliseconds compared to the
original method of reading one byte at a time.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I456194cc1ecb91f3df888a7771c6bb0163855620
2023-04-17 16:13:57 +08:00
Algea Cao
eca1277ac8 drm: bridge: dw-hdmi: Fix falcon tv display residue when play hdr video
Originally 50 milliseconds delay on the Hisense TV will appear
picture residual problem when exit hdr mode .

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ia2da0ad743720cb8428ffa749b99d18373e1794b
2023-04-17 16:13:57 +08:00
Damon Ding
9a42eaaa9d arm64: dts: rockchip: rk3588: add pwm interrupt configs for oneshot mode
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Ic58f3e38df65588f6565529a615f77c82696d641
2023-04-15 19:12:12 +08:00
Jianwei Fan
36f6dd0f59 video: rockchip: vehicle: fix bug if flinger plane is NULL
Change-Id: I898c8e9ad95cd5409d061571d9f6c933418aea50
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
2023-04-14 20:35:10 +08:00
Guochun Huang
453536f7f3 drm/bridge: maxim-max96755f: add support dsi rx lane map
Change-Id: I3a2b5d4c6e0070137b398b3b379252ef62901610
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-04-14 20:34:42 +08:00
Zhang Yubing
4c1222a138 drm/rockchip: dsi2: clear output if in dual channels case
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Ib9e9255e400a52a4c1f136876c6efde7d3fd930d
2023-04-14 18:31:22 +08:00
Zhang Yubing
575487d67e drm/bridge: analogix_dp: clear output if when disable edp
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I131a94190bf74bcd85f1008ebb13e0442bb16fe9
2023-04-14 18:31:22 +08:00
Zhang Yubing
d10cd8054c drm/rockchip: vop2: clear dual channel flag when disable video port
when a video port is in dual channel mode, it will enable dual channel
and the dual channel mode flag will be set. But it will not be clear
when disable video port. The next time enable the video port the dual
channel mode is still enable whether we really need it or not. So it
need to clear dual channel flag when disable video port.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I7001e712729be6c254051a7a8645a08a39c975ed
2023-04-14 18:31:22 +08:00
shengfei Xu
543d0f3691 arm64: dts: rockchip: rk3562: add rockchip-suspend node
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: Idbd91344ac80ff638203da183126f3afb40ae4ef
2023-04-14 18:23:24 +08:00
Cai Wenzhong
5e5365f69c arm64: dts: rockchip: add rk3588-vehicle-evb-maxim-max96712.dtsi.
Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: I725ad0108dad8431df6af710134ca91e5621b28f
2023-04-14 18:22:48 +08:00
Cai Wenzhong
aa8d34bd34 media: i2c: add max96712 GMSL2/GMSL1 to CSI-2 Deserializer driver.
Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: Ie0aa979d625d146c078b1d1a7b5de58868511aa7
2023-04-14 18:22:48 +08:00
Jon Lin
3aa56fd5f7 mtd: spinand: skyhigh: Support new devices
S35ML01G3

Change-Id: Idaa2c88d1e0fc958cb08ca6c508c46883e16dc21
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-04-14 18:15:34 +08:00
Finley Xiao
4fc4aa9f5a arm64: dts: rockchip: rk3528-demo: Enable gpu busfreq
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I54d2d9fe3d5887e96e6d30ecd3911c1d640db4b3
2023-04-14 18:14:56 +08:00
Finley Xiao
1a23898914 arm64: dts: rockchip: rk3528-evb: Enable gpu busfreq
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I403c9e6813c63978376ad7b5de7fa09430f1486d
2023-04-14 18:14:56 +08:00
Finley Xiao
7912bedfb6 arm64: dts: rockchip: rk3528: Add busfreq device node for gpu
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I60008e86750e1812ab3f24e78bbefba962954196
2023-04-14 18:14:56 +08:00
Finley Xiao
7fbdfc8ae5 PM / devfreq: rockchip_bus: add support for rk3528
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I7f2c65f87e2500357b896e39b477faae97451a3c
2023-04-14 18:14:56 +08:00
Finley Xiao
77315667bd arm64: dts: rockchip: rk3528: Modify cpu gpu opp table
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: If73c4a6ef846db0cf1abe43eeb13f2736ee4f0bb
2023-04-14 18:14:56 +08:00
Finley Xiao
c7dd211f36 arm64: dts: rockchip: rk3528: Add leakage-voltage-sel for dmc
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Id08dae4a78766cc91f7ebfee8f430cf76f2676f4
2023-04-14 18:14:56 +08:00
Finley Xiao
877e38048f arm64: dts: rockchip: rk3528: Add opp-info for dmc
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I11bcea8e8c0e0a93f46d9763ccc474fd95d8c901
2023-04-14 18:14:56 +08:00
Finley Xiao
583537cab3 arm64: dts: rockchip: rk3528-demo: Enable dmc
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I3deeafe231358eb45d9883dcc11b0ca98a14dbf5
2023-04-14 18:14:56 +08:00
Finley Xiao
b034c4b2ae arm64: dts: rockchip: rk3528-evb: Enable dmc
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ib00af20284f8b06c8d75760a76a25b3e780afd52
2023-04-14 18:14:56 +08:00
Finley Xiao
26a0b944fa arm64: dts: rockchip: rk3528: Add dmc device node
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I5e70d07c4af007c3ac2edb27d0ae416ccf7cdbea
2023-04-14 18:14:56 +08:00
Finley Xiao
102afd597a PM / devfreq: rockchip_dmc: Add support for rk3528
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I1c8a32f620238ffa0271cb11bf3ca94718596b91
2023-04-14 18:14:56 +08:00
Finley Xiao
affd6e891b PM / devfreq: rockchip_dmc: Don't do suspend and resume when devfreq is null
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I2d1c87024507ae1670f1e5eae8c4c3872e1a3f91
2023-04-14 18:14:56 +08:00
Finley Xiao
58d460fe45 PM / devfreq: rockchip_dmc: Add system monitor support when no devfreq
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ib7cba347c705ea5159bc29a2268da9d63116f1e0
2023-04-14 18:14:56 +08:00
Finley Xiao
805307498d arm64: dts: rockchip: rk3528: Add more opp-microvolt for gpu opp
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I3f7d089850123f35068ac44a6241128d58f1fefc
2023-04-14 18:14:56 +08:00
Finley Xiao
5233f3b451 arm64: dts: rockchip: rk3528: Add more opp-microvolt for cpu opp
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I6bf9def474b522f26e75592d682c76455ea82d99
2023-04-14 18:14:56 +08:00
Liang Chen
ee54b35b54 arm64: dts: rockchip: rk3568: adjust opp-table for cpu/cpu/gpu/dmc
Change-Id: I1b31c529accf36039adeaa4d7be1db0a72fe12cc
Signed-off-by: Liang Chen <cl@rock-chips.com>
2023-04-14 17:41:08 +08:00
Algea Cao
a024be9ff1 drm: bridge: dw-hdmi: Restore the original mode_valid arguments
Fixes: 0a52ff8181 ("drm/rockchip: dw_hdmi: check display mode with crtc mode valid")
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Icaef76860b9df1b3cd2e9f5899297584440fd465
2023-04-14 16:48:18 +08:00
Jianlong Wang
8e6b1313d2 ARM: configs: rk3126: enable MEDIA_USB_SUPPORT
Change-Id: I66b97017a326ab8a6542ed1c1b0f5f7db6da26f3
Signed-off-by: Jianlong Wang <jianlong.wang@rock-chips.com>
2023-04-14 14:57:00 +08:00
Damon Ding
f9467f1d98 arm64: dts: rockchip: rk3308: add pwm interrupt configs for oneshot mode
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I2474639a9732dac94d3b0401c376ed32cf4ce970
2023-04-14 14:54:04 +08:00
Damon Ding
d921d395eb arm64: dts: rockchip: rk3562: add pwm interrupt configs for oneshot mode
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I395c4d179450dc2e92bff0598a6afee88bfc4266
2023-04-14 14:53:32 +08:00
Damon Ding
8b60a3c6b4 ARM: dts: rockchip: rv1106: add pwm interrupt configs for oneshot mode
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I4675a9e3b49baa691769b25893f61a002e9d07de
2023-04-14 14:53:03 +08:00
Damon Ding
281e564466 pwm: rockchip: add interrupt support for oneshot mode
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I8554bcd9858e7eb7bca0951ff9e002bfdfda80f1
2023-04-14 14:52:03 +08:00