Commit Graph

1265718 Commits

Author SHA1 Message Date
Zorro Liu
cbb5ae48bf input: touchscreen: wacom_w9013: support tilt report
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I03c51dab934f4fce1c7718884ea6a0cd96c354d9
2023-12-21 15:22:02 +08:00
Weixin Zhou
8e6cbb690c input: touchscreen: add cyttsp5
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: Id758f89bf2e41562b524767af0ebb117f422c68e
2023-12-21 14:58:27 +08:00
Tao Huang
a5216b1266 input: touchscreen: cyttsp5: Remove use of variable length array
drivers/input/touchscreen/cyttsp5/cyttsp5_mt_common.c:238:9: error: ISO C90 forbids variable length array 'ids' [-Werror=vla]

Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I8c5c31f53b22fdb8852d9c67ee453fec52368c8f
2023-12-21 14:57:59 +08:00
Weixin Zhou
b520a8aa50 input: touchscreen: cyttsp5: fix memory out of bounds write issue
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I8d58353b74b96d6014613ae01e8a25643e2a50c9
2023-12-21 14:27:14 +08:00
Tao Huang
1576d1271b Merge commit 'e56d7f65a48330f34538ac382ee500c03f0130d1'
* commit 'e56d7f65a48330f34538ac382ee500c03f0130d1':
  drm/rockchip: analogix_dp: fix panel parsing in split mode
  media: rockchip: isp: wrap mode first done don't send event
  PCI: rockchip: dw: Add dev mutex to protect elbi0 irq user
  soc: rockchip: rockchip_system_monitor: Fix list_del corruption when del video info
  video: rockchip: mpp: fix watch dog interrupt storm issue
  arm64: dts: rockchip: rk3308-evb-audio-v10-display-rgb: enable pixelclk active
  ARM: rockchip: rv1106_pm: do hptimer soft adjust
  ARM: rockchip: add hptimer functions
  ARM: dts: rockchip: rv1106: add rockchip-suspend node
  dt-bindings: suspend: add rv1106 pm related macros
  ARM: rockchip: rv1106: sleep: support pm config
  ARM: configs: rockchip: rv1106-pm: enable CONFIG_ROCKCHIP_SUSPEND_MODE
  soc: rockchip: pm_config: add compatible "rockchip,pm-config"
  soc: rockchip: pm_config: support sleep_io_config
  soc: rockchip: pm_config: add rockchip_get_cur_sleep_config function
  soc: rockchip: Kconfig: delete ROCKCHIP_SUSPEND_MODE depends on ROCKCHIP_SIP
  mfd: rkx110_x120: support pattern generator for V1
  arm64: dts: rockchip: px30: fix vopb register length error
  soc: rockchip: opp_select: Add support to parse rockchip,pvtm-voltage-sel-<name>

Change-Id: Ifa8bc1fd696f43833c9c1e755ddad1ef9bf2439b
2023-12-20 17:30:20 +08:00
Tao Huang
8a7c7e5900 Merge commit 'feecbd010e4ef7f167611fad0ec94a2a8743d3ae'
* commit 'feecbd010e4ef7f167611fad0ec94a2a8743d3ae':
  soc: rockchip: rockchip_system_monitor: Add support to use low temp pvtpll config
  cpufreq: rockchip: Add support to init pvtpll table
  soc: rockchip: opp_select: Implement rockchip_init_pvtpll_table()

Change-Id: Id31976c5958fc0f89be5f9abee838f6cc40e6e41
2023-12-20 17:22:15 +08:00
Finley Xiao
0c99583df9 soc: rockchip: rockchip_system_monitor: Add support to use low temp pvtpll config
Change-Id: Ifa96a101008587309ca10ae6c2bd76424da6039b
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2023-12-20 17:10:16 +08:00
Finley Xiao
4e248de62f soc: rockchip: opp_select: Implement rockchip_init_pvtpll_table()
This patch adds support to parse pvtpll config from devicetree, and
change config through sip smc interface.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I5f23b9eb1d358a95b690ca214e35927e74451af1
2023-12-20 17:09:47 +08:00
Damon Ding
e56d7f65a4 drm/rockchip: analogix_dp: fix panel parsing in split mode
If using split mode with edp0 and edp1, the node of which
displays in the left area should have "split-mode" property
and config panel node, and the other does not.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I0533df43d5fd5d9ea3fd2fb94c9a8cdab1fd59e2
2023-12-20 16:26:11 +08:00
Mingwei Yan
3312d732ba media: rockchip: isp: wrap mode first done don't send event
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
Change-Id: I723ce7df449ae4020570e79990f671eb455ba55e
2023-12-20 16:19:45 +08:00
Jon Lin
8dc5855332 PCI: rockchip: dw: Add dev mutex to protect elbi0 irq user
Change-Id: I9dad204d1d714ecbfa9ac0872123e0001499b981
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-12-20 16:18:49 +08:00
Tao Huang
1b1010dfcd Merge commit 'ee4a8d1396928bad4cbe8b236903aad56682aae0'
* commit 'ee4a8d1396928bad4cbe8b236903aad56682aae0':
  firmware: rockchip_sip: support pvtpll config

Change-Id: I1c2cdb390858a2f80fa7a475b2fcf4c9c7a0571e
2023-12-20 16:14:42 +08:00
Tao Huang
12e4de7dc0 Merge commit '7fc3233fd146619a8db1a87aa3858714847ec004'
Merge made by the 'ours' strategy.

* commit '7fc3233fd146619a8db1a87aa3858714847ec004':
  soc: rockchip: opp_select: Add missing of_node_put()

Change-Id: I3220feb90ac55782e4595824c17aecbb192512ff
2023-12-20 16:14:32 +08:00
Finley Xiao
bd14f96e5e soc: rockchip: rockchip_system_monitor: Fix list_del corruption when del video info
list_del corruption, ffffffc028662d18->next is LIST_POISON1 (dead000000000100)
------------[ cut here ]------------
kernel BUG at lib/list_debug.c:47!
Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
Modules linked in: 8822es(O) sprdbt_tty
Process CtrlThread (pid: 3697, stack limit = 0x0000000060d302a5)
CPU: 1 PID: 3697 Comm: CtrlThread Tainted: G           O      4.19.232 #96
Hardware name: Rockchip RK3528 DEMO4 DDR4 V10 Board (DT)
pstate: 40400005 (nZcv daif +PAN -UAO)
pc : __list_del_entry_valid+0x64/0xb0
lr : __list_del_entry_valid+0x64/0xb0
sp : ffffff800fd1bc70
x29: ffffff800fd1bc70 x28: ffffffc05c468000
x27: 0000000000000000 x26: 0000000000000000
x25: 0000000046000000 x24: 0000000000000011
x23: ffffff800fd1be60 x22: ffffff80098188a0
x21: ffffff8009818000 x20: ffffffc0462af700
x19: ffffffc028662d00 x18: ffffffffffffffff
x17: 0000000000000000 x16: 0000000000000000
x15: ffffff800934a980 x14: 4f53494f505f5453
x13: 494c207369207478 x12: 656e3e2d38316432
x11: 3636383230636666 x10: 66666666202c6e6f
x9 : 6974707572726f63 x8 : 3030303030303030
x7 : 0000000000000058 x6 : ffffffc07f74aa18
x5 : ffffffc07f74aa18 x4 : 0000000000000000
x3 : ffffffc07f753908 x2 : ac674fb1e4701200
x1 : 0000000000000000 x0 : 000000000000004e
Call trace:
 __list_del_entry_valid+0x64/0xb0
 rockchip_update_system_status+0x168/0x250
 status_store+0x1c/0x38
 kobj_attr_store+0x14/0x28
 sysfs_kf_write+0x48/0x58
 kernfs_fop_write+0xf4/0x220
 __vfs_write+0x34/0x158
 vfs_write+0xb0/0x1d0
 ksys_write+0x64/0xe0
 __arm64_sys_write+0x14/0x20
 el0_svc_common.constprop.0+0x64/0x178
 el0_svc_compat_handler+0x18/0x20
 el0_svc_compat+0x8/0x34

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I42e9c42d7e65c742226f82b9367466b2ed86550d
2023-12-20 15:27:59 +08:00
Yandong Lin
ea89a09451 video: rockchip: mpp: fix watch dog interrupt storm issue
The enc did not stop working when the watch dog timeout was triggered,
and still check timeout and trigger watch dog irq. It will cause watch
dog interrupt storm.

Solution:
1. Mask watch dog irq when first watch dog irq trigger.
2. Set IRQF_ONESHOT to ensure the irq handling is completed.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I741fe9fd96486641b1ee5d337ecc144e29778157
2023-12-20 15:10:28 +08:00
ZhiZhan Chen
f0661e47e2 arm64: dts: rockchip: rk3308-evb-audio-v10-display-rgb: enable pixelclk active
Change-Id: I37af8539d753af9ed4ddb4581d62c83de750a37a
Signed-off-by: ZhiZhan Chen <zhizhan.chen@rock-chips.com>
2023-12-20 14:57:28 +08:00
Finley Xiao
5b3e3ea2b2 soc: rockchip: opp_select: Add missing of_node_put()
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ibb6afa022bffc74ef3ecedd40ba7fc47dd4b0b7f
2023-12-19 19:02:44 +08:00
Finley Xiao
6287739640 arm64: dts: rockchip: px30: Change gpu opp-microvolt to three entries
Change-Id: Idde6d0cc3defcc206d0f356d4987927080c2be24
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2023-12-19 18:05:34 +08:00
Shengfei Xu
f6f9c2eecb arm64: dts: rockchip: rk3399-sapphire: Adjust the sequence of vcc3v3_sys and vcc_sys
Change-Id: Iee8374a1262bb84b338333950f53185406fe63c4
Signed-off-by: Shengfei Xu <xsf@rock-chips.com>
2023-12-19 18:04:46 +08:00
Tao Huang
2c82f1f8a0 Merge commit 'f12596a9bae4983758c4a5ed3742e38598febdbc'
Merge made by the 'ours' strategy.

* commit 'f12596a9bae4983758c4a5ed3742e38598febdbc':
  PCI: rockchip: dw: Adding a retry mechanism to the enumeration process

Change-Id: I29fbadeb545b9973bd6a957aec1cf74993e6a780
2023-12-19 17:53:29 +08:00
Jon Lin
c45a42bc15 PCI: rockchip: dw: Adding a retry mechanism to the enumeration process
When there is a small probability of signal abnormality, try resetting
and enumerating again.

Change-Id: Id37950dc62a497dd1c4703c42de036ce50aaec68
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-12-19 17:52:07 +08:00
Tao Huang
3932baf684 Merge commit 'a16a11216577f50350302da5014d2cd7d5747d42'
* commit 'a16a11216577f50350302da5014d2cd7d5747d42':
  ARM: dts: rockchip: add rk3308-evb-audio-v10-display-rgb-aarch32.dts
  drm/rockchip: vop: remove unused PLANE_MASK prop for vop
  drm/rockchip: vop: fix vop dynamic debug crash
  dt-bindings: display: panel: add more properties with descriptions

Change-Id: Ief161511fc7563ad3c881a544b98f6a0795a048d
2023-12-19 17:40:31 +08:00
XiaoDong Huang
ed577e0c81 ARM: rockchip: rv1106_pm: do hptimer soft adjust
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: Ic5ca15872d3c03224104a2d1e0d18e9c0a2898be
2023-12-19 17:22:55 +08:00
XiaoDong Huang
f0c103f43b ARM: rockchip: add hptimer functions
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I947b8ced55b14a7c59f5092be255e72e694e6ad9
2023-12-19 17:22:11 +08:00
XiaoDong Huang
e0db73deaa ARM: dts: rockchip: rv1106: add rockchip-suspend node
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I6d3fd27d60973f0569abedcee3b8488ab9ac3513
2023-12-19 17:22:11 +08:00
XiaoDong Huang
34a34249b3 dt-bindings: suspend: add rv1106 pm related macros
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I999012f191bc40d29e728a61efc24d1b73370074
2023-12-19 17:22:11 +08:00
XiaoDong Huang
76cc23644b ARM: rockchip: rv1106: sleep: support pm config
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I0901947b0f978a985e50be34d42c9e63f19649dd
2023-12-19 17:22:11 +08:00
XiaoDong Huang
9284fc4ac6 ARM: configs: rockchip: rv1106-pm: enable CONFIG_ROCKCHIP_SUSPEND_MODE
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I4c98df0e65aefda4ebbcab342aa19e8b5fad07f5
2023-12-19 17:22:11 +08:00
XiaoDong Huang
c20415c7c6 soc: rockchip: pm_config: add compatible "rockchip,pm-config"
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: Ic87607c3fff5b4adbe50e8312f3cab6ce6ccc329
2023-12-19 17:22:11 +08:00
XiaoDong Huang
f109558947 soc: rockchip: pm_config: support sleep_io_config
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: Idbb08bb3f7c1deff8e53348dbee1a13785568b75
2023-12-19 17:22:11 +08:00
XiaoDong Huang
945dd8e6cb soc: rockchip: pm_config: add rockchip_get_cur_sleep_config function
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I90fb297782edda1c955786705adc44a4062f3ba8
2023-12-19 17:22:11 +08:00
XiaoDong Huang
67209dfb7d soc: rockchip: Kconfig: delete ROCKCHIP_SUSPEND_MODE depends on ROCKCHIP_SIP
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I4e4112951a018628687b888b75cddd10e9d31620
2023-12-19 17:22:11 +08:00
Zhang Yubing
ad8f45b6ce mfd: rkx110_x120: support pattern generator for V1
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I0fef8a64dd5602ac8642142b247b4198baef56cb
2023-12-19 17:11:43 +08:00
Sandy Huang
c17a354602 arm64: dts: rockchip: px30: fix vopb register length error
Change-Id: Id3972d03297542ca1738f0b13fe6fb1075f1af42
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2023-12-19 14:44:25 +08:00
Finley Xiao
feecbd010e soc: rockchip: rockchip_system_monitor: Add support to use low temp pvtpll config
Change-Id: Ifa96a101008587309ca10ae6c2bd76424da6039b
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2023-12-19 14:43:01 +08:00
Finley Xiao
ee4a8d1396 firmware: rockchip_sip: support pvtpll config
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I37f96edc8a97eaed2399c4ec4e7e1b17fc1f98ce
2023-12-19 14:43:01 +08:00
Finley Xiao
7fc3233fd1 soc: rockchip: opp_select: Add missing of_node_put()
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ibb6afa022bffc74ef3ecedd40ba7fc47dd4b0b7f
2023-12-19 14:43:01 +08:00
Finley Xiao
44dec9b035 soc: rockchip: opp_select: Add support to parse rockchip,pvtm-voltage-sel-<name>
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Icc29a8f8b3791dc9cb899dde4c2755d181a4c0c4
2023-12-19 14:43:01 +08:00
Finley Xiao
4df54d5e56 cpufreq: rockchip: Add support to init pvtpll table
This patch adds support to parse pvtpll config from devicetree, and
change config through sip smc interface.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I74f2127d862db005433d0a9da2703629f80b0faa
2023-12-19 14:43:01 +08:00
Finley Xiao
4149cbb903 soc: rockchip: opp_select: Implement rockchip_init_pvtpll_table()
This patch adds support to parse pvtpll config from devicetree, and
change config through sip smc interface.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I5f23b9eb1d358a95b690ca214e35927e74451af1
2023-12-19 14:43:01 +08:00
Jon Lin
f12596a9ba PCI: rockchip: dw: Adding a retry mechanism to the enumeration process
When there is a small probability of signal abnormality, try resetting
and enumerating again.

Change-Id: Id37950dc62a497dd1c4703c42de036ce50aaec68
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-12-19 09:23:28 +08:00
Lin Jianhua
a16a112165 ARM: dts: rockchip: add rk3308-evb-audio-v10-display-rgb-aarch32.dts
Change-Id: I33346b330dcb617069d3ca0e787d14dadd89d400
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
2023-12-18 20:09:59 +08:00
Sandy Huang
eefe952b3c drm/rockchip: vop: remove unused PLANE_MASK prop for vop
We can get the binding relationship between plane and vop from the standard
prop possible crtcs, so we remove the unused PLANE_MASK prop from vop.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I2c68ed60447024f4f5f379fa39b28ae0da065eae
2023-12-18 19:56:04 +08:00
Sandy Huang
61afbe5c41 drm/rockchip: vop: remove unused PLANE_MASK prop for vop
We can get the binding relationship between plane and vop from the standard
prop: possible_crtcs, so we remove the unused PLANE_MASK prop from vop.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I2c68ed60447024f4f5f379fa39b28ae0da065eae
2023-12-18 17:16:38 +08:00
Sandy Huang
09239f25f7 Revert "drm/rockchip: vop2: filter display mode by vop aclk"
VOP aclk DVFS will adjust vop aclk to 750M when output resuoution is
bigger then 4k.

This reverts commit e16a4b0a15.

Change-Id: I197c8e03661bcfc2446fce7c90d331341fdd83cb
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2023-12-18 17:13:21 +08:00
Liang Chen
3109ce971c arm64: dts: rockchip: add vop-supply for rk3566/rk3568 boards
Change-Id: Ia05a34f6b188006b9b789c24e782a525059311cb
Signed-off-by: Liang Chen <cl@rock-chips.com>
2023-12-18 17:12:58 +08:00
Sandy Huang
1543da8c99 arm64: dts: rockchip: rk3568: add opp-table for aclk_vop
Change-Id: I9467e8d412c38c03d168d5dbdb1b2894e62d4650
Signed-off-by: Liang Chen <cl@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2023-12-18 17:12:32 +08:00
Sandy Huang
cb85ca5828 arm64: dts: rockchip: add vop-supply for rk3588/rk3588s boards
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I0f0771d84b91b3c72e1dea2c0005f71918d05d5a
2023-12-18 17:11:50 +08:00
Finley Xiao
2780a47ffe arm64: dts: rockchip: rk3588s: Add opp table for vop
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ia1c30f8a18cb9e445910e909f39e0a27671f2bfa
2023-12-18 15:11:41 +08:00
Finley Xiao
fdf8d484ec arm64: dts: rockchip: rk3588-rk806: Change vdd_log max volt to 800mV
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I9622bee18d8a23e16cac8dfcbf9ef6f4a2bec884
2023-12-18 15:11:21 +08:00