Commit Graph

1256038 Commits

Author SHA1 Message Date
Tao Huang
ce4f9cc205 Merge commit 'ccaa5a718372de677a3ca0d7e48fbdb27c313dbe'
* commit 'ccaa5a718372de677a3ca0d7e48fbdb27c313dbe':
  regulator: rk806: delete the PLDO6 enable/disable interface
  mfd: rkx110_x120: change panel device and driver name
  arm64: dts: rockchip: remove androidboot bootargs for px30/rk3326 boards
  video: rockchip: rga2: add hardware time-consuming printing
  media: i2c: gc2093: get camera param from cam-tb-setup

Change-Id: Iaa791f3d16b6725f8e40f69ac60276962d117732
2023-10-12 16:31:08 +08:00
Tao Huang
15ca5c7d22 Merge commit '2604a38ab45fef071b54515f4edd0c5e7c245a70'
* commit '2604a38ab45fef071b54515f4edd0c5e7c245a70':
  media: i2c: add cam-tb-setup

Merge using ours merge strategy.

Change-Id: I4462b49049243fe794db3ff98b25db27a4267898
2023-10-12 16:30:31 +08:00
Wang Xiaobin
813ac004fb media: i2c: add cam-tb-setup
Thunder boot related camera parameters.

Signed-off-by: Wang Xiaobin <xb.wang@rock-chips.com>
Change-Id: I221e22041677325842a3d192c232fbff9d1bc992
2023-10-12 16:29:12 +08:00
Tao Huang
bbdbeabda2 Merge commit 'bbe13f289fc573df0b69c8405aa15e246f6420a2'
* commit 'bbe13f289fc573df0b69c8405aa15e246f6420a2':
  input: sensors: add icm4260x driver.

Merge using ours merge strategy.

Change-Id: I8c6adef48b4522a021d492f9acf96401450f697d
2023-10-12 14:56:09 +08:00
Wangqiang Guo
fdb8c50bcd input: sensors: add icm4260x driver.
Change-Id: Ic1951c136bb81c0a93229e75e39605303cef3105
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
2023-10-12 14:51:54 +08:00
Tao Huang
c03548401b Merge commit 'de1cbb0ebd2d3b3e66bf6682af5798d76f423c68'
* commit 'de1cbb0ebd2d3b3e66bf6682af5798d76f423c68': (24 commits)
  video: rockchip: mpp: fix iommu fault irq triggered repeatedly
  video: rockchip: mpp: rkvenc2: optimize iommu fault handle
  video: rockchip: mpp: vepu2: add iommu fault handle
  media: rockchip: hdmirx: add new controls for audio status and audio rate
  media: rockchip: hdmirx: implement RK_HDMIRX_V4L2_EVENT_AUDIOINFO event
  media: rockchip: hdmirx: add private v4l2 event
  arm64: dts: rockchip: rk3588s: Add reset for i2c
  i2c: busses: i2c-rk3x: Add i2c bus reset for scl hold timeout by slave
  i2c: busses: i2c-rk3x: Fix msg length 32 for autostop tx only mode
  media: i2c: maxim4c: Add debugfs entry to change MIPI timing
  media: i2c: maxim4c: Add config ssc-ratio property
  arm64: dts: rockchip: rk3588-vehicle-evb-v22: Change regulators supply for cameras
  arm64: dts: rockchip: rk3588-vehicle-evb-maxim-max9671(/2)2-d(c)phy0(/3): Add regulators
  media: i2c: maxim4c: Add regulator suppliers
  BACKPORT: iio: adc: rockchip_saradc: do not use internal iio_dev lock
  arm64/configs: rockchip_defconfig: enable CONFIG_GPIO_SYSCON
  arm64/configs: rockchip_linux_defconfig: enable CONFIG_GPIO_SYSCON
  media: i2c: lt6911uxc: add dcphy params
  arm64: dts: rockchip: Add dual mipi configuration for rk3588 evb1 extboard
  media: i2c: sc401ai: add support thunder boot
  ...

Change-Id: Ib93e5f5697a9fe8d8011b871aeab9e8e3860aa40
2023-10-12 14:30:28 +08:00
Tao Huang
117e18c52e Merge commit '0eba9f8ec037e4c7fccb16e2a433be822dd802b8'
* commit '0eba9f8ec037e4c7fccb16e2a433be822dd802b8':
  dmaengine: pl330: Add support for interleaved transfer

Merge using ours merge strategy.

Change-Id: I466ab3dfd0b08e5dea4cc62f8cf9c1a0bc631653
2023-10-12 14:29:46 +08:00
Sugar Zhang
4367b72380 dmaengine: pl330: Add support for interleaved transfer
This patch add support for interleaved transfer which used
for interleaved audio or 2d video data transfer.

for audio situation, we add 'nump' for number of period frames.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I502ea9c86c8403dc5b1f38abf40be8b6ee13c1dc
2023-10-12 11:32:43 +08:00
Tao Huang
86adb4b672 Merge commit 'de0064df8fa35b0d0e2951b2b2799f9e02157439'
* commit 'de0064df8fa35b0d0e2951b2b2799f9e02157439':
  arm64: dts: rockchip: rk3308b-amp: using 64-bits for cpu's affinity
  arm64: dts: rockchip: rk3562-amp: using 64-bits for cpu's affinity
  irqchip/gic: add the parameter of gic version for rockchip amp
  soc: rockchip: amp: using 64-bits variable to manage the cpu's affinity
  irqchip/gic: allow to config pending function between different os
  arm64: dts: rockchip: rk3588-vehicle-evb-v22: Add delay for all camera related regulators
  drm: bridge: dw-hdmi: Fix 3d fp mode clock miscalculation
  BACKPORT: xhci: Improve the XHCI system resume time
  media: rockchip: isp: fix rv1106g3 4k cmsk right

Change-Id: I253ac2ecaee64e1b90cd2f2fb85538ad5b77da65
2023-10-12 11:30:38 +08:00
Tao Huang
4621f35ed9 Merge commit '28a26c7b729986a62c3ad6bfb0ba587cd6e26363'
* commit '28a26c7b729986a62c3ad6bfb0ba587cd6e26363':
  media: i2c: lt6911uxc: add 4K60 dual mipi port support

Merge using ours merge strategy.

Change-Id: Id5a071669a2afb5a538f450002e086598de99a52
2023-10-12 11:29:47 +08:00
Jianwei Fan
ec9514c1ad media: i2c: lt6911uxc: add 4K60 dual mipi port support
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: Ib70ec05ed521b924f5e10343a3399d629ee40dbe
2023-10-12 01:04:37 +00:00
shengfei Xu
ccaa5a7183 regulator: rk806: delete the PLDO6 enable/disable interface
The PLDO6 must be always on. if the PLDO6 is off, the PMIC
will be abnormal.

Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I5c2cf8f0d2ba3cb08cd7538d998857d8c2db55f2
2023-10-11 19:40:21 +08:00
Zhang Yubing
07f45d2725 mfd: rkx110_x120: change panel device and driver name
In the display-serdes panel driver, it has the same name
"serdes-panel" as rkserdes panel device. When register
rkserdes panel device, it may mismatch to the display-serdes
panel driver. To avoid this issue happen, change the rkserdes
panel device name. For the same reason, change the rkserdes
panel driver name.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Ic146472c40252b3e55b2d46f1a6bfd099eb013c3
2023-10-11 19:32:06 +08:00
Wu Liangqing
da65c04d60 arm64: dts: rockchip: remove androidboot bootargs for px30/rk3326 boards
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: Ifb5eda4386ae04b298434c4e1d175eed941c4278
2023-10-11 19:28:04 +08:00
Yu Qiaowei
4bbe1970ad video: rockchip: rga2: add hardware time-consuming printing
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I780056e58892cf9c265026119ebbe0c6eb3dc75d
2023-10-11 19:13:04 +08:00
Wang Xiaobin
180ac760c9 media: i2c: gc2093: get camera param from cam-tb-setup
Signed-off-by: Wang Xiaobin <xb.wang@rock-chips.com>
Change-Id: I733f612f413a788beee7c1acbe02462dcefb2dc1
2023-10-10 19:34:31 +08:00
Wang Xiaobin
2604a38ab4 media: i2c: add cam-tb-setup
Thunder boot related camera parameters.

Signed-off-by: Wang Xiaobin <xb.wang@rock-chips.com>
Change-Id: I221e22041677325842a3d192c232fbff9d1bc992
2023-10-10 19:34:16 +08:00
Wangqiang Guo
bbe13f289f input: sensors: add icm4260x driver.
Change-Id: Ic1951c136bb81c0a93229e75e39605303cef3105
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
2023-10-10 19:31:16 +08:00
Yandong Lin
de1cbb0ebd video: rockchip: mpp: fix iommu fault irq triggered repeatedly
Add mask iommu irq in iommu fault handle func to prevent iommu trigger
pagefault repeatedly.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I11c9b918e3a9c3af576b7f82cbdc7dbeb960dbd8
2023-10-10 19:01:52 +08:00
Yandong Lin
ca7fd65693 video: rockchip: mpp: rkvenc2: optimize iommu fault handle
1. There are two rkvenc cores and share a iommu domain. When they work at
the same time, the arg with iommu fault handle will be mismatch with
real device.
So find the real device according to iommu_dev.

2. config appropriate timeout threshold and it can trigger hw timeout
when pagefault.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: If816e43c9732d6cefc60d80efbaf297001d500ff
2023-10-10 18:55:23 +08:00
Yandong Lin
c51724a2c1 video: rockchip: mpp: vepu2: add iommu fault handle
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: If6dac8d783d5b6d3b344ab2f511503af9c322073
2023-10-10 18:54:49 +08:00
Shunhua Lan
cd5a25f0f1 media: rockchip: hdmirx: add new controls for audio status and audio rate
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I9fd34740ee0417c5dd0f5bf61b8070b162205768
2023-10-10 11:42:58 +08:00
Shunhua Lan
95aa09af43 media: rockchip: hdmirx: implement RK_HDMIRX_V4L2_EVENT_AUDIOINFO event
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I3f0594807d86990121e45460df359b33b6594c21
2023-10-10 11:42:24 +08:00
Shunhua Lan
1a2bbe66b1 media: rockchip: hdmirx: add private v4l2 event
add private v4l2 event: RK_HDMIRX_V4L2_EVENT_AUDIOINFO
when audio info changed, driver will queue event and apps
should chang audio record parameters

Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I6fa6c951d648f546655475eede21d1769444741c
2023-10-10 09:35:29 +08:00
David Wu
70d6108844 arm64: dts: rockchip: rk3588s: Add reset for i2c
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Ib7ab98d3059bbefba1fbf3a26c82d8d35f155944
2023-10-10 09:23:48 +08:00
David Wu
006c0b1e77 i2c: busses: i2c-rk3x: Add i2c bus reset for scl hold timeout by slave
If the scl has been pulled low for a long time and is not released,
at this time, because the exception needs to end the I2C, a reset
needs to be done to ensure that the state machine is restored. Set
the timeout time to 200ms, and the debounce of the scl is pulled
low to 100ms.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Iee0c2afe2fbd59a30d1b7ef486d0856b00b88cc8
2023-10-10 09:23:48 +08:00
David Wu
f67504a486 i2c: busses: i2c-rk3x: Fix msg length 32 for autostop tx only mode
If autostop mode is enabled, such as RK3588, autostop mode requires
statistics on the transmission length; for tx only mode, the device
address is also counted as one byte, so the judgment conditions become
different.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I91c0b68fabb60952f630a98133423aa4cb1b9b48
2023-10-10 09:23:48 +08:00
Cody Xie
e5ab4cbe7f media: i2c: maxim4c: Add debugfs entry to change MIPI timing
Change-Id: I3e215583975e7272ca1c655dc61a59abc6c07d4e
Signed-off-by: Cody Xie <cody.xie@rock-chips.com>
2023-10-09 17:55:50 +08:00
Cody Xie
f237af29a4 media: i2c: maxim4c: Add config ssc-ratio property
Change-Id: I1178c5becbdf2ded1648e31ff609b7ce6a07bdf5
Signed-off-by: Cody Xie <cody.xie@rock-chips.com>
2023-10-09 17:55:42 +08:00
Cody Xie
368f785570 arm64: dts: rockchip: rk3588-vehicle-evb-v22: Change regulators supply for cameras
Change-Id: I6c004cc78d851500b6e1651419c6aa3b3f6a5a31
Signed-off-by: Cody Xie <cody.xie@rock-chips.com>
2023-10-09 17:55:18 +08:00
Cody Xie
423b02db66 arm64: dts: rockchip: rk3588-vehicle-evb-maxim-max9671(/2)2-d(c)phy0(/3): Add regulators
Change-Id: Idb176416c330ecf11d646d7582377d82ae401f72
Signed-off-by: Cody Xie <cody.xie@rock-chips.com>
2023-10-09 17:53:37 +08:00
Cody Xie
ea15f616ec media: i2c: maxim4c: Add regulator suppliers
Change-Id: I637e20533515844f185167cda97a619cc475debd
Signed-off-by: Cody Xie <cody.xie@rock-chips.com>
2023-10-09 17:52:22 +08:00
Nuno Sá
1341bf639b BACKPORT: iio: adc: rockchip_saradc: do not use internal iio_dev lock
The iio_device lock is only meant for internal use. Hence define a
device local lock to protect against concurrent accesses.

While at it, properly include "mutex.h" for mutex related APIs.

Signed-off-by: Nuno Sá <nuno.sa@analog.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20221004134909.1692021-8-nuno.sa@analog.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Simon Xue <xxm@rock-chips.com>
(cherry picked from commit bb690935df)
Change-Id: If04914774fec56645b1eb9bbb82d504fdd44779f
2023-10-09 15:27:09 +08:00
Xing Zheng
eade682577 arm64/configs: rockchip_defconfig: enable CONFIG_GPIO_SYSCON
The SYSCON driver was designed for using memory areas (registers)
that are used in several subsystems. We can use bits in one
register for various purposes and thus should be handled by
various kernel subsystems.

In Rockchip RK3328, the output only GPIO_MUTE pin, originally for
codec mute control, can also be used for general purpose. It is
manipulated by the GRF_SOC_CON10 register in GRF. Aside from the
GPIO_MUTE pin, the HDMI pins can also be set in the same way.

Therefore, we need to enable this feature in rockchip_defconfig.

Change-Id: I0036bb8d3fb007f0ccab5d340d179886926a98ed
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2023-10-09 15:11:59 +08:00
Xing Zheng
8c83c66953 arm64/configs: rockchip_linux_defconfig: enable CONFIG_GPIO_SYSCON
The SYSCON driver was designed for using memory areas (registers)
that are used in several subsystems. We can use bits in one
register for various purposes and thus should be handled by
various kernel subsystems.

In Rockchip RK3328, the output only GPIO_MUTE pin, originally for
codec mute control, can also be used for general purpose. It is
manipulated by the GRF_SOC_CON10 register in GRF. Aside from the
GPIO_MUTE pin, the HDMI pins can also be set in the same way.

Therefore, we need to enable this feature in rockchip_linux_defconfig.

Change-Id: If83f232121fb9fe54b6ff362d7911edf229d3878
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2023-10-09 14:46:48 +08:00
Jianwei Fan
26290eb60d media: i2c: lt6911uxc: add dcphy params
Change-Id: Id97a48e84fd84a70f4ba2d092436355a55f78779
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
2023-10-08 12:18:43 +00:00
Jianwei Fan
11a496172b arm64: dts: rockchip: Add dual mipi configuration for rk3588 evb1 extboard
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: Id3efb7546e3e9fb5206cc12058724e778f1c5340
2023-10-08 19:29:11 +08:00
LongChang Ma
7a031fea60 media: i2c: sc401ai: add support thunder boot
Signed-off-by: LongChang Ma <chad.ma@rock-chips.com>
Change-Id: I1608a9341ddc772aaa72002e1b9c7361235908c0
2023-10-08 19:27:02 +08:00
Xiao Ya peng
f7a8feac25 misc: pcie-rkep: Fix memory leak in pcie_rkep_remove.
Fixes: 006505ca76 ("misc: add rockchip standard EP function driver")
Signed-off-by: Xiao Ya peng <yp.xiao@rock-chips.com>
Change-Id: I602323f9cedc6edf94f951b9b9c9787b3a271550
2023-10-08 18:52:45 +08:00
Rimon Xu
da317c6776 video: rockchip: vtunnel: add video tunnel driver
Signed-off-by: Rimon Xu <rimon.xu@rock-chips.com>
Change-Id: Ic621f6fcbc4924bd5567c9161f358e9365830618
2023-10-08 14:47:17 +08:00
Sugar Zhang
0eba9f8ec0 dmaengine: pl330: Add support for interleaved transfer
This patch add support for interleaved transfer which used
for interleaved audio or 2d video data transfer.

for audio situation, we add 'nump' for number of period frames.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I502ea9c86c8403dc5b1f38abf40be8b6ee13c1dc
2023-10-08 09:35:31 +08:00
Sugar Zhang
7405801db4 dmaengine: Drop the unused config
This patch drop the unused config src/dst_interleace_size.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I78dba866c6d7c6c755c77d1558a8449716bcc1aa
2023-10-08 09:35:31 +08:00
Sugar Zhang
86f2de0e18 ASoC: rockchip: multi-dais: Use interleaved dma transfer API
This patch use the interleaved dma transfer API for multi-dais
data, now, let's drop the legacy implementation.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I8f217e25ae68017eff3eaedfe1d3475cbbaccde6
2023-10-08 09:35:31 +08:00
Tony Xie
de0064df8f arm64: dts: rockchip: rk3308b-amp: using 64-bits for cpu's affinity
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
Change-Id: I532adb6c891fcda4733740027cb6bbb878b24e2b
2023-10-07 15:45:45 +08:00
Tony Xie
8c22a02698 arm64: dts: rockchip: rk3562-amp: using 64-bits for cpu's affinity
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
Change-Id: Ic515f53185d380c6ce4de84b777ca6578e8c08fa
2023-10-07 15:45:33 +08:00
Tony Xie
cb753cddaa irqchip/gic: add the parameter of gic version for rockchip amp
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
Change-Id: Idf679a2e91a62a90de4059f09451c58d6d56ecd4
2023-10-07 15:40:17 +08:00
Tony Xie
5c09e33a23 soc: rockchip: amp: using 64-bits variable to manage the cpu's affinity
for compatiblility between arm32 and arm64, giv2 and giv3,using 64-bits
variable to manage the cpu's affinity.

Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
Change-Id: Ic5ce758d4711c039be9dc52df8f0ebbbdfcc1244
2023-10-07 15:39:17 +08:00
Tony Xie
726d78e739 irqchip/gic: allow to config pending function between different os
for rpmsg, it needs to set pending reg between different os, so allow to
config pending function between different os.

Fixes: 2e7658ef57 ("irqchip/gic: support config amp os irqs")
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
Change-Id: I4b06f8a692e34c339d4facb40b8120fdbe1d7bcd
2023-10-07 15:38:17 +08:00
Cody Xie
6013ab7070 arm64: dts: rockchip: rk3588-vehicle-evb-v22: Add delay for all camera related regulators
It will be more safer for regulator consumer devices to power on
after their power suppliers are stable. And regulator consumer devices
need to completely shut down, then power up for a reset cycle.
Therefor, regulator providers need to be make sure shutdown completely.

- startup-delay-us can be used to wait regulator providers be powered on
  good, according their power-up time.
- off-on-delay-us can be used to wait regulator providers be shut down
  completely.

1. cameraN_vcc12v_buck have a approximate ~1ms power on rise time
and ~13-~14ms power off fall time

2. vcc5v0_buck uses MPQ4317 which have a approximate ~1.5ms
EN(on)->PG(high) delay and ~0.8ms EN(off)->PG(low)

Change-Id: I8f23a6a4b53c8760f62c64758a481ad86be4da16
Signed-off-by: Cody Xie <cody.xie@rock-chips.com>
2023-10-07 15:27:30 +08:00
Algea Cao
db86421b1a drm: bridge: dw-hdmi: Fix 3d fp mode clock miscalculation
3d fp mode pixel clock needs to be doubled. mode->crtc_clock
is already a doubled clock, don't have to multiply it by 2.
At the same time, this error will cause the audio cts calculation
error so that hdmi has no sound output. This commit can also
fix the problem.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I7d080f9779a640649c149f4b21072597cf0c0cf7
2023-10-07 15:23:13 +08:00