Binyuan Lan
44f70fc15b
input: touchscreen: support tp chipone_9551r
...
Signed-off-by: Binyuan Lan <lby@rock-chips.com >
Change-Id: Ia62dfe3670af23c69f857ab0fcc251607187974d
2024-02-29 21:50:57 +08:00
Zorro Liu
d21a7378aa
input: touch: cyttsp5: x,y max size for input use dts defined
...
Change-Id: I5845d1b06968f4b923949a3f55956b7bf91fbd60
Signed-off-by: Zorro Liu <lyx@rock-chips.com >
2024-02-29 21:42:09 +08:00
Tao Huang
ab55f1c685
Merge commit 'df9eb20bbf8104f56f2168cbebba212512cb39a4'
...
* commit 'df9eb20bbf8104f56f2168cbebba212512cb39a4':
arm64: dts: rockchip: rk3588-amp: add configs for amp irqs
arm64: dts: rockchip: rk3568-amp: add configs for amp irqs
soc: rockchip: power-domain: Add pd status module param for debug
video: rockchip: mpp: rkvenc2: Fix rw_sem error
arm64: dts: rockchip: rk3588-vehicle-evb: maxim support 1080p display
arm64: dts: rockchip: rk3588-vehicle-evb-v21/v22: Use vehicle dummy driver for gear selection
ASoC: rockchip: rk817-codec: fix pop from DAC_DIG_CLK_DIS and DAC_DIG_CLK_EN
misc: rk628: bt1120: add yc-swap and uv-swap property
arm64: dts: rockchip: rk3588-evb: rk628 change the interrupt to rise edge trigger
misc: rk628: bt1120-2-hdmi: set bus_format for bt1120
Change-Id: If1116aacbe9ac9d4ef3d433fb2e07bac8854dc9b
2024-02-29 18:55:15 +08:00
Tao Huang
7f72922db0
Merge commit 'ecf409630c9bb4b64460a95e7763ecb73281a715'
...
* commit 'ecf409630c9bb4b64460a95e7763ecb73281a715':
media: i2c: add sc3336p sensor driver
dt-bindings: soc: rockchip-amp: remove CPU_GET_AFFINITY() to dtsi file
ARM: dts: rockchip: add rv1106g-evb2-v12-spi-nand-tb.dts
arm64: dts: rockchip: rk3562-amp: define CPU_GET_AFFINITY
arm64: dts: rockchip: rk3308-amp: define CPU_GET_AFFINITY
soc: rockchip: amp: support init gpio group irqs for amp
irqchip/gicv3: support config amp os irqs
media: rockchip: isp: version v2.5.0
Change-Id: I2e5beffb8875efbbc3736fc3d38770340faabefd
2024-02-29 18:26:53 +08:00
Tao Huang
fe33d5d60d
Merge commit 'e0a6d5fa869c8ba0d109a415ca1bfa2d601d12df'
...
Merge made by the 'ours' strategy.
* commit 'e0a6d5fa869c8ba0d109a415ca1bfa2d601d12df':
media: rockchip: isp: support 8k for isp32 lite
media: rockchip: isp: fix isp32 lite frame buffer data read
media: rockchip: isp: add ioctl to get bay3d buf
Change-Id: Ib2ecc6d25a106a71bb4239429da67ce8c6e4b1c1
2024-02-29 18:25:00 +08:00
Cai YiWei
3e0f158519
media: rockchip: isp: support 8k for isp32 lite
...
Change-Id: I2ebd5bff4be4b646564a874ce801cc8c9bf261e1
Signed-off-by: Cai YiWei <cyw@rock-chips.com >
2024-02-29 18:23:29 +08:00
Cai YiWei
474d365d35
media: rockchip: isp: fix isp32 lite frame buffer data read
...
Change-Id: I1e8e19185bce2800a0aee2a1623b204adb07355d
Signed-off-by: Cai YiWei <cyw@rock-chips.com >
2024-02-29 18:23:24 +08:00
Cai YiWei
0713900194
media: rockchip: isp: add ioctl to get bay3d buf
...
Change-Id: Id65390eab9f1dc2d64405def56e854078ceba037
Signed-off-by: Cai YiWei <cyw@rock-chips.com >
2024-02-29 18:23:18 +08:00
Tao Huang
b70dfeba02
Merge commit 'c4c06227b02a3af6274f6ea0780cce7c79530293'
...
* commit 'c4c06227b02a3af6274f6ea0780cce7c79530293':
media: rockchip: isp: add RKISP_CMD_SET_TB_HEAD_V32 API
clk: rockchip: rv1106: optimize calibrate step for cru pvtpll
ARM: rockchip: rv1106_pm: optimize pvtpll save/restore process flow
UPSTREAM: gpio: rockchip: Reset int_bothedge when changing trigger
ARM: dts: rockchip: rv1106-evb-dual-cam add sc530ai
media: rockchip: isp: fix mp wrap buf from rockit no output
mfd: display-serdes: fix building error
Change-Id: Ifa823804017620c5297d002598dc87a3388e2dcd
2024-02-29 18:21:46 +08:00
Zain Wang
df9eb20bbf
arm64: dts: rockchip: rk3588-amp: add configs for amp irqs
...
Signed-off-by: Zain Wang <wzz@rock-chips.com >
Change-Id: Ia925cbce88d38fe22a61de3be5ffdd1936fe1119
2024-02-28 14:24:32 +08:00
Zain Wang
8679c3ff3c
arm64: dts: rockchip: rk3568-amp: add configs for amp irqs
...
Signed-off-by: Zain Wang <wzz@rock-chips.com >
Change-Id: I9509b9dbaffc081aefe53e4ca1bf97cff7a339c0
2024-02-28 14:24:32 +08:00
Finley Xiao
3402a5b434
soc: rockchip: power-domain: Add pd status module param for debug
...
Change-Id: I9edf5741a95f877dda22b2fa75eabe288403ed33
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com >
2024-02-28 14:22:19 +08:00
Herman Chen
e424736732
video: rockchip: mpp: rkvenc2: Fix rw_sem error
...
Use the pointer copy to replace rwsem entry copy.
https://redmine.rock-chips.com/issues/461476
DEBUG_RWSEMS_WARN_ON(sem->magic != sem): count = 0x100,
magic = 0xffffff81036e2a80, owner = 0xffffff81037f8001,
curr 0xffffff81037f8000, list not empty
WARNING: CPU: 0 PID: 171 at kernel/locking/rwsem.c:1468 __up_read+0x1dc/0x264
Modules linked in: bcmdhd(O) dhd_static_buf
CPU: 0 PID: 171 Comm: irq/47-fdbe0000 Tainted: G O 5.10.160 #13
Hardware name: Rockchip RK3588S TABLET V11 Board (DT)
pstate: 60c00009 (nZCv daif +PAN +UAO TCO BTYPE=-)
pc : __up_read+0x1dc/0x264
lr : __up_read+0x1dc/0x264
sp : ffffffc00ca83bb0
x29: ffffffc00ca83bb0 x28: 0000000000000000
x27: ffffffc0080e1000 x26: ffffffc0080e16e0
x25: ffffffc0080e17c0 x24: ffffff8103504080
x23: ffffff8299eeec00 x22: ffffff817ecf8038
x21: ffffff817ecf8088 x20: ffffffc00a725000
x19: ffffff81036e3280 x18: 0000000000000030
x17: 0000000000004d49 x16: 0000000000021f36
x15: ffffffc00a746570 x14: 0000000000000086
x13: ffffffc00964a930 x12: 0000000000000003
x11: fffffffffffe5a28 x10: fffffffffffe5a08
x9 : ffffffc0081b3290 x8 : ffffffc00a748b78
x7 : ffffffc00a7f8b78 x6 : 0000000000000001
x5 : 0000000000000000 x4 : ffffff84fd5b5df8
x3 : ffffff84fd5c6730 x2 : 0000000000000000
x1 : 0000000000000000 x0 : ffffff81037f8000
Call trace:
__up_read+0x1dc/0x264
up_read+0x44/0x70
mpp_task_finalize+0x6c/0xb4
rkvenc_free_task+0x20/0x7c
mpp_free_task+0x50/0x114
mpp_taskqueue_pop_running.isra.0+0x80/0xbc
mpp_task_finish+0xb8/0x180
rkvenc_isr+0xd0/0x2ec
mpp_dev_isr_sched+0x70/0xd0
irq_thread_fn+0x30/0xa0
irq_thread+0x1d4/0x2d0
kthread+0x150/0x154
ret_from_fork+0x10/0x1c
Fixes: 99582ba73aherman.chen@rock-chips.com >
Change-Id: Id3ecd4b03a9676183a80774fd571f86918281cb9
2024-02-28 11:07:25 +08:00
Luo Wei
3c7417b499
arm64: dts: rockchip: rk3588-vehicle-evb: maxim support 1080p display
...
dsi0-> ->max96752->720P
max96789
dsi1-> ->max96752->1080P
dp0/edp0-> ->max96752->720P
max96745
edp1/edp1-> ->max96752->720P
Signed-off-by: Luo Wei <lw@rock-chips.com >
Change-Id: I6f3c51ce40a6f11f0e135a6e649b2f5e7a8ba752
2024-02-27 16:05:57 +08:00
Cody Xie
4422957f75
arm64: dts: rockchip: rk3588-vehicle-evb-v21/v22: Use vehicle dummy driver for gear selection
...
Change-Id: I2ed1289f3a14361af15f09def32b654363c8a82a
Signed-off-by: Cody Xie <cody.xie@rock-chips.com >
2024-02-27 16:04:13 +08:00
Binyuan Lan
fbdf3d8d03
ASoC: rockchip: rk817-codec: fix pop from DAC_DIG_CLK_DIS and DAC_DIG_CLK_EN
...
Signed-off-by: Binyuan Lan <lby@rock-chips.com >
Change-Id: Idfa31a4f3484f1641ebcf46d237244e98e378e93
2024-02-27 16:01:55 +08:00
Zhibin Huang
2424e1c910
misc: rk628: bt1120: add yc-swap and uv-swap property
...
Type: Function
Redmine ID: N/A
Associated modifications: N/A
Test: N/A
Signed-off-by: Zhibin Huang <zhibin.huang@rock-chips.com >
Change-Id: Ie1c54ac3fbc01d76d32eff8d2857f68339654b70
2024-02-26 12:00:57 +08:00
Jianwei Fan
466091d79d
arm64: dts: rockchip: rk3588-evb: rk628 change the interrupt to rise edge trigger
...
Change-Id: I6c3905d2e1440ae82654e3a3f62b762c1f1e2ec7
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com >
2024-02-23 18:54:03 +08:00
Zhibin Huang
c1ea5f751e
misc: rk628: bt1120-2-hdmi: set bus_format for bt1120
...
Type: Fix
Redmine ID: N/A
Associated modifications: N/A
Test: N/A
Signed-off-by: Zhibin Huang <zhibin.huang@rock-chips.com >
Change-Id: I5e285e5c14e639a552936835b726da6e71a2e998
2024-02-23 15:12:02 +08:00
Lan Honglin
ecf409630c
media: i2c: add sc3336p sensor driver
...
Change-Id: I917458b8c8bb9f8d85d203d545ec11015c98b2e5
Signed-off-by: Lan Honglin <helin.lan@rock-chips.com >
2024-02-23 11:24:30 +08:00
Jianwei Fan
68598ecbf3
media: i2c: lt8668sx: fix kernel-6.1 compile errors
...
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com >
Change-Id: I3f06b045ff2f1d23be06248eb53b642ddf711f08
2024-02-22 17:49:51 +08:00
Tony Xie
dc7bc9ebe7
dt-bindings: soc: rockchip-amp: remove CPU_GET_AFFINITY() to dtsi file
...
Signed-off-by: Tony Xie <tony.xie@rock-chips.com >
Change-Id: I472ba149c529f70520963711147ef25d1905bf53
2024-02-22 15:26:27 +08:00
Weiwen Chen
11b3eda762
ARM: dts: rockchip: add rv1106g-evb2-v12-spi-nand-tb.dts
...
Signed-off-by: Weiwen Chen <cww@rock-chips.com >
Change-Id: I8090c6b2e95aa956cbe36c5aa344b9858c689094
2024-02-22 14:41:27 +08:00
Zain Wang
faf92ec690
arm64: dts: rockchip: rk3562-amp: define CPU_GET_AFFINITY
...
Signed-off-by: Zain Wang <wzz@rock-chips.com >
Change-Id: Ia5144a800de1dc014269969f1eadbf67a373827c
2024-02-22 14:24:01 +08:00
Zain Wang
80d2eb7080
arm64: dts: rockchip: rk3308-amp: define CPU_GET_AFFINITY
...
Signed-off-by: Zain Wang <wzz@rock-chips.com >
Change-Id: I7676d07e010a6ef6643b4cdc269379ad39aa806a
2024-02-22 14:23:44 +08:00
Tony Xie
3bdcd9e582
soc: rockchip: amp: support init gpio group irqs for amp
...
Signed-off-by: Tony Xie <tony.xie@rock-chips.com >
Change-Id: If152a54aa00b18aedf919b6053fb6d2fff853b07
2024-02-22 14:07:26 +08:00
Tony Xie
8f8a13a24d
irqchip/gicv3: support config amp os irqs
...
Signed-off-by: Tony Xie <tony.xie@rock-chips.com >
Change-Id: I0abcf9fd44514b1aac06aa6977df2859ebd01459
2024-02-22 11:18:24 +08:00
Cai YiWei
bd99973c0a
media: rockchip: isp: version v2.5.0
...
Change-Id: Ic885032c2e177a714cacfb0609032366e66aac3c
Signed-off-by: Cai YiWei <cyw@rock-chips.com >
2024-02-21 12:13:49 +08:00
Cai YiWei
e0a6d5fa86
media: rockchip: isp: support 8k for isp32 lite
...
Change-Id: I2ebd5bff4be4b646564a874ce801cc8c9bf261e1
Signed-off-by: Cai YiWei <cyw@rock-chips.com >
2024-02-21 12:13:39 +08:00
Cai YiWei
c4c06227b0
media: rockchip: isp: add RKISP_CMD_SET_TB_HEAD_V32 API
...
Change-Id: I07ae10d69ae977ff5932c377e24eefbd48387946
Signed-off-by: Cai YiWei <cyw@rock-chips.com >
2024-02-21 10:25:17 +08:00
Cai YiWei
6c66737840
media: rockchip: isp: fix isp32 lite frame buffer data read
...
Change-Id: I1e8e19185bce2800a0aee2a1623b204adb07355d
Signed-off-by: Cai YiWei <cyw@rock-chips.com >
2024-02-21 10:25:17 +08:00
Cai YiWei
e84d9bd50a
media: rockchip: isp: add ioctl to get bay3d buf
...
Change-Id: Id65390eab9f1dc2d64405def56e854078ceba037
Signed-off-by: Cai YiWei <cyw@rock-chips.com >
2024-02-21 10:25:17 +08:00
Liang Chen
25c456719d
clk: rockchip: rv1106: optimize calibrate step for cru pvtpll
...
The frequency of pvtpll may unstable when calibrate, if the step
is too small, it will stride a too big length and adjust back
again, that is bad.
Signed-off-by: Liang Chen <cl@rock-chips.com >
Change-Id: I96227b37cde45ae86df68777da8f32467f8926e6
2024-02-21 10:19:27 +08:00
Liang Chen
f3fcf22888
ARM: rockchip: rv1106_pm: optimize pvtpll save/restore process flow
...
Pvtpll length must configure before enable pvtpll, otherwise pvtpll
may output wrong frequency.
Signed-off-by: Liang Chen <cl@rock-chips.com >
Change-Id: I432d10b53bf5853c724fb9e4e54256a3dd3e146b
2024-02-21 10:19:16 +08:00
Sebastian Reichel
ef32b29caa
UPSTREAM: usb: dwc3: add optional PHY interface clocks
...
On Rockchip RK3588 one of the DWC3 cores is integrated weirdly and
requires two extra clocks to be enabled. Without these extra clocks
hot-plugging USB devices is broken.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com >
Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com >
Link: https://lore.kernel.org/r/20231020150022.48725-3-sebastian.reichel@collabora.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Signed-off-by: William Wu <william.wu@rock-chips.com >
(cherry picked from commit 97789b93b792fc97ad4476b79e0f38ffa8e7e0ee)
Change-Id: Ib6268cb1de3560c4a5f1f1af898cb8869bb3ca4f
2024-02-20 18:41:51 +08:00
Johan Hovold
ffe673b0e5
BACKPORT: USB: dwc3: refactor clock lookups
...
The probe callback has become unwieldy so break out the clock lookups
into a new helper function to improve readability.
Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com >
Signed-off-by: Johan Hovold <johan+linaro@kernel.org >
Link: https://lore.kernel.org/r/20230404072524.19014-11-johan+linaro@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Signed-off-by: William Wu <william.wu@rock-chips.com >
(cherry picked from commit bd82857424
2024-02-20 18:41:42 +08:00
Samuel Holland
8d3794f358
UPSTREAM: gpio: rockchip: Reset int_bothedge when changing trigger
...
With v2 hardware, an IRQ can be configured to trigger on both edges via
a bit in the int_bothedge register. Currently, the driver sets this bit
when changing the trigger type to IRQ_TYPE_EDGE_BOTH, but fails to reset
this bit if the trigger type is later changed to something else. This
causes spurious IRQs, and when using gpio-keys with wakeup-event-action
set to EV_ACT_(DE)ASSERTED, those IRQs translate into spurious wakeups.
Fixes: 3bcbd1a85bguillaume@baierouge.fr >
Tested-by: Guillaume Savaton <guillaume@baierouge.fr >
Signed-off-by: Samuel Holland <samuel@sholland.org >
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl >
(cherry picked from commit 7920af5c82steven.liu@rock-chips.com >
Change-Id: I8b4645a81e553957a77cca84e4152f1e38dd1852
2024-02-20 15:16:59 +08:00
Zhihua Wang
d55e030c51
ARM: dts: rockchip: rv1106-evb-dual-cam add sc530ai
...
Signed-off-by: Zhihua Wang <hogan.wang@rock-chips.com >
Change-Id: Ia073eb82e135466844e6474883f4b0f70aeacbf0
2024-02-19 09:28:11 +08:00
Cai YiWei
f938361535
media: rockchip: isp: fix mp wrap buf from rockit no output
...
Change-Id: I88fa7707ce8a67846951c0fc6287f81d8c3719ee
Signed-off-by: Cai YiWei <cyw@rock-chips.com >
2024-02-18 14:07:29 +08:00
wei.luo
4122e58de9
mfd: display-serdes: fix building error
...
Fixes: c60873aaf6lw@rock-chips.com >
Change-Id: Idcafd226b6e338f6c6180f61212ac7a09d8081b7
2024-02-18 10:07:13 +08:00
Binyuan Lan
19e4b7da39
ASoC: rockchip: rk817-codec: fix pop from DAC_DIG_CLK_DIS and DAC_DIG_CLK_EN
...
Signed-off-by: Binyuan Lan <lby@rock-chips.com >
Change-Id: Idfa31a4f3484f1641ebcf46d237244e98e378e93
2024-02-07 16:31:36 +08:00
Sandy Huang
a73c8e037d
drm/rockchip: vop2: primary plane need consider win possible_crtcs
...
Signed-off-by: Sandy Huang <hjc@rock-chips.com >
Change-Id: I4a7529bfd70a39970ffeb7ddaca0d37dfc0d7b0c
2024-02-07 16:31:00 +08:00
Tao Huang
a91f064677
Merge commit '5fe35955d774cc30268c13ee4d8b7a5709505269'
...
* commit '5fe35955d774cc30268c13ee4d8b7a5709505269':
input: rockchip_pwm_remotectl: add pwm v4 support
misc: rk628: optimize input and output mode information
ARM: dts: rockchip: rk3036-evb1-ddr3-v10: unify the rk628 node name of interface in dts
arm64: dts: rockchip: rk3568-evb-rk628: unify the node name of interface in dts
misc: rk628: unify the node name of interface in dts
Change-Id: I9890cae140709f25f67aa4a607e357ad88492cce
2024-02-07 16:22:00 +08:00
Tao Huang
5a8ee2c7f8
Merge commit 'edbfad5e8605a8d36334fd6637e72e0f93628850'
...
* commit 'edbfad5e8605a8d36334fd6637e72e0f93628850':
media: i2c: rk628: add suspend and resume support
Change-Id: I360eff65948d0072b686b479b04df7771ab113f2
2024-02-07 16:21:37 +08:00
Tao Huang
7fdd51f070
Merge commit 'bed6817b766a80ed9d49bbad3b5e3c6935778907'
...
Merge made by the 'ours' strategy.
* commit 'bed6817b766a80ed9d49bbad3b5e3c6935778907':
video: rockchip: mpp: fix get drv data type err
Change-Id: I6684d33e761119b4767bdb1ce083ff9c9bcea12a
2024-02-07 16:20:36 +08:00
Tao Huang
d082b581af
Merge commit '079fa67494942657b96ed069c0dba21a5d57b88e'
...
* commit '079fa67494942657b96ed069c0dba21a5d57b88e':
soc: rockchip: ipa: Avoid NULL pointer when get static power
media: rockchip: vicap update frame buffer with real frame phase when work with multi_dev combine to one
Change-Id: I2f6e8db6084394f128feea501323cb26984535a4
2024-02-07 16:19:47 +08:00
Yandong Lin
9de9c7ccf9
video: rockchip: mpp: fix get drv data type err
...
Fix issue that he drvdata obtained through dev_get_drvdata
does not match the converted type.
Change-Id: I4f5835c2fed609714ac6cb94197ca84a489a3d23
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com >
2024-02-07 16:18:55 +08:00
Huang zhibao
5fe35955d7
input: rockchip_pwm_remotectl: add pwm v4 support
...
Change-Id: I40d1571c3285165683845df8c48fe45d7fcac01d
Signed-off-by: Huang zhibao <hzb@rock-chips.com >
2024-02-07 16:00:59 +08:00
Zhibin Huang
ae97b71b7a
misc: rk628: optimize input and output mode information
...
1. Fixed the issue where the log displays input and output mode
information abnormally in some scenarios.
2. The input and output mode information of log and summary are
obtained from the same function to facilitate later maintenance.
Type: Fix
Redmine ID: N/A
Associated modifications: N/A
Test: dmesg | grep "rk628.*input_mode.*output_mode"
cat /sys/kernel/debug/rk628/2-0050/summary
Signed-off-by: Zhibin Huang <zhibin.huang@rock-chips.com >
Change-Id: I9c4549d1673417701dc929432b96fa802632e63c
2024-02-07 15:23:21 +08:00
Zhibin Huang
379dfa4350
ARM: dts: rockchip: rk3036-evb1-ddr3-v10: unify the rk628 node name of interface in dts
...
Type: Fix
Redmine ID: N/A
Associated modifications: https://10.10.10.29/c/rk/kernel/+/210058
Test: N/A
Signed-off-by: Zhibin Huang <zhibin.huang@rock-chips.com >
Change-Id: Ic650b9ddda9f9202e430f7459ee86f0b73fac479
2024-02-07 15:22:25 +08:00
