Commit Graph

1265626 Commits

Author SHA1 Message Date
Tao Huang
32a4fc2c55 Merge commit 'b7adbc93a7494e848e11897db39f917c5874b445'
* commit 'b7adbc93a7494e848e11897db39f917c5874b445':
  ARM: dts: rockchip: rv1106g-cvr: Supports dual-channel sensors
  ARM: dts: rockchip: rv1106-mcu-v20: Added MCU panel general configuration
  video: rockchip: vtunnel: do not fput fence file after fd install
  drm/rockchip: vop2: move crtc_clock check to mode_fixup for rk3528

Change-Id: Icc9b5ef59b0362497768fcd1b36165aa4e7c776e
2023-12-13 19:37:28 +08:00
Tao Huang
99dd9ad1ab Merge commit '58e55eb624c66f4e0fae1d55578e211c6f838385'
* commit '58e55eb624c66f4e0fae1d55578e211c6f838385':
  drm/rockchip: vop2: add rockchip_drm_dclk_set_rate for some special pll
  clk: rockchip: rk35xx: fix dclk_vop flags for drm dclk set rate
  ARM: dts: rockchip: rv1106g-dual: Swap front and rear road positions
  media: rockchip: hdmirx: low latency support fence
  media: rockchip: hdmirx: support hdmirx low latency function
  arm64: dts: rockchip: px30: add gpio aliases

Change-Id: I89a422bdb66c7ea4dfab13f2e42ca041eaf0c87c

Conflicts:
	drivers/gpu/drm/rockchip/rockchip_drm_drv.h
2023-12-13 19:32:15 +08:00
Ye Zhang
d84481d736 arm64: dts: rockchip: rk3399: 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 ff260000.tsadc: failed to register sensor 1: -22
rockchip-thermal ff260000.tsadc: failed to register sensor[1] : error = -22
rockchip-thermal: probe of ff260000.tsadc failed with error -22

Fixes: 778ce099dc ("arm64: dts: rockchip: add the IPA needed parameters for rk3399 thermal")
Signed-off-by: Ye Zhang <ye.zhang@rock-chips.com>
Change-Id: Ia438b0f900c93267c3196d70b26db2e79e0a271b
2023-12-13 19:08:51 +08:00
Li Hangyu
b7adbc93a7 ARM: dts: rockchip: rv1106g-cvr: Supports dual-channel sensors
Change-Id: Ifdadb74d6670d18de4299d179c6c6dd72cb70316
Signed-off-by: Li Hangyu <hangyu.li@rock-chips.com>
2023-12-13 18:10:17 +08:00
Li Hangyu
371e924377 ARM: dts: rockchip: rv1106-mcu-v20: Added MCU panel general configuration
Separate some configuration items of "rv1106g-evb1-mcu-display-v20.dts"
so that they can be used as common configurations

Change-Id: I72323b9342235f1c1e9b1c131ead3aabbe9dd51e
Signed-off-by: Li Hangyu <hangyu.li@rock-chips.com>
2023-12-13 18:09:29 +08:00
Sandy Huang
2d7e051cf5 drm/rockchip: vop: fix AFBC format check error
Fixes: fa6c7f1111 ("drm/rockchip: vop: sync with linux-4.19 for rk3399 vop")
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I8d2bb4980d6a4c875af8f20d9358fd98ebc0f74a
2023-12-13 18:07:30 +08:00
Finley Xiao
b2077d12a7 arm64: dts: rockchip: rk3399: Fix nvmem-cell-names for opp table
Change-Id: Ie6f60d0beec1a721aa4237bccbcfeca7e0e29985
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2023-12-13 18:06:32 +08:00
Finley Xiao
a2a92da5ef arm64: dts: rockchip: rk3328: Fix nvmem-cell-names for opp table
Change-Id: I7a33115d45f9764eee44ddc884fa1e68e1cb4c81
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2023-12-13 18:06:32 +08:00
Finley Xiao
c05a42749d arm64: dts: rockchip: px30: Fix nvmem-cell-names for opp table
Change-Id: I3f9d0028e2e1d4ef78e29faa69c48e7e5f60bd14
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2023-12-13 18:06:32 +08:00
Finley Xiao
1d614d3cd9 ARM: dts: rockchip: Fix nvmem-cell-names for opp table
Change-Id: I8d96287159c8a58b94664db6573c978ff3733d32
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2023-12-13 18:05:33 +08:00
Zhen Chen
c19692bbff Mali: midgard: import DMA_BUF module namespace
Fix compilation errors when building as modules:

ERROR: modpost: module midgard_kbase uses symbol dma_buf_end_cpu_access from namespace DMA_BUF, but does not import it.
ERROR: modpost: module midgard_kbase uses symbol dma_buf_mmap from namespace DMA_BUF, but does not import it.
ERROR: modpost: module midgard_kbase uses symbol dma_buf_attach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module midgard_kbase uses symbol dma_buf_map_attachment from namespace DMA_BUF, but does not import it.
ERROR: modpost: module midgard_kbase uses symbol dma_buf_begin_cpu_access from namespace DMA_BUF, but does not import it.
ERROR: modpost: module midgard_kbase uses symbol dma_buf_unmap_attachment from namespace DMA_BUF, but does not import it.
ERROR: modpost: module midgard_kbase uses symbol dma_buf_get from namespace DMA_BUF, but does not import it.
ERROR: modpost: module midgard_kbase uses symbol dma_buf_put from namespace DMA_BUF, but does not import it.
ERROR: modpost: module midgard_kbase uses symbol dma_buf_detach from namespace DMA_BUF, but does not import it.

Change-Id: I36b1f2bb0f1c9018a795d9640f64656a275bfb28
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2023-12-13 11:04:53 +08:00
Rimon Xu
7c4a3b6468 video: rockchip: vtunnel: do not fput fence file after fd install
Signed-off-by: Rimon Xu <rimon.xu@rock-chips.com>
Change-Id: I2d596aa981dac5a32267f4f08935fb0401186ead
2023-12-13 09:47:17 +08:00
Damon Ding
3aa5acec15 drm/rockchip: vop2: move crtc_clock check to mode_fixup for rk3528
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I207dbe09f17991e9a107cc2df5e7b130600be7b7
2023-12-13 08:47:47 +08:00
Sandy Huang
58e55eb624 drm/rockchip: vop2: add rockchip_drm_dclk_set_rate for some special pll
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I12f1e797d02253ce97b46e6845144f09db101485
2023-12-13 08:47:37 +08:00
Elaine Zhang
842ad2732d clk: rockchip: rk35xx: fix dclk_vop flags for drm dclk set rate
The specify dclk setting rules in drm.

Change-Id: I802b28005ca76b13836d2ead04954d67ee3f625b
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2023-12-13 08:45:21 +08:00
Li Hangyu
243648ee57 ARM: dts: rockchip: rv1106g-dual: Swap front and rear road positions
Change-Id: I8c4824a7593efa4062d07495070a0a320361bcc4
Signed-off-by: Li Hangyu <hangyu.li@rock-chips.com>
2023-12-12 20:05:01 +08:00
Dingxian Wen
588c040ed1 media: rockchip: hdmirx: low latency support fence
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I1d86ace09f73e7794b6e682a1438ad691a24ab59
2023-12-12 19:09:47 +08:00
Dingxian Wen
6d8b5b33d5 media: rockchip: hdmirx: support hdmirx low latency function
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I6a03bdfae6436972c3875711c8c2e75aa24c4c82
2023-12-12 19:09:47 +08:00
Elaine Zhang
a2b651515a clk: rockchip: rk3568: Mark clk_msch and parent clk as critical
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ia622a8537c3ce3d4d98c352672b79ac86c05add4
2023-12-12 18:23:34 +08:00
Tao Huang
8e7b38ba25 Merge commit '7f71d2776b12d75dababf4dc1a98ca0d8a3205f4'
* commit '7f71d2776b12d75dababf4dc1a98ca0d8a3205f4':
  PCI: rockchip: dw: Support IRQ user
  misc: rockchip: pcie-rkep: Change to use pci_request_irq apis.
  arm64: dts: rockchip: Covert ciu-drv to ciu-drive for matching the driver
  media: i2c: imx415: fix issues for thunderboot

Change-Id: I9f617a032a1c14ec377c93e05bb63fca5376d584
2023-12-12 17:50:44 +08:00
Tao Huang
54f1bbde22 Merge commit '27061736bc5c6fab8bfeb0739c82fff1e2a48c3a'
Merge made by the 'ours' strategy.

* commit '27061736bc5c6fab8bfeb0739c82fff1e2a48c3a':
  media: i2c: imx415: add 720P config

Change-Id: Ib445c3c11a232a8127b674e7bde6073d8e8584b8
2023-12-12 17:50:27 +08:00
Lan Honglin
b76fdeb319 media: i2c: imx415: add 720P config
Change-Id: I2af6b9677ecaf0356f12cbd8e15592d26da134e3
Signed-off-by: Lan Honglin <helin.lan@rock-chips.com>
2023-12-12 17:14:55 +08:00
Tao Huang
a2fd270849 Merge commit '542f25b9ec2f03cf1f4ea5f0556430ab26934924'
* commit '542f25b9ec2f03cf1f4ea5f0556430ab26934924':
  Revert "dt-bindings: add binding document for Rockchip cpu avs"
  drm/rockchip: vop: correct RK3288/RK3399 VOP WIN register fields
  arm64: dts: rockchip: px30-android: add debug support
  spi: rockchip: Support DMA burst 16
  arm64: configs: rockchip_defconfig: enable CONFIG_SND_SOC_ROCKCHIP_SPI_CODEC
  arm64: dts: rockchip: rk3588-vehicle-evb: use a spi-codec driver for the remote adsp

Change-Id: I6d23398ae8c2ef4bee13b1b7f2965405d393193a
2023-12-12 17:07:58 +08:00
Tao Huang
0f3345a4cd Merge commit 'bf10d7edd82707add9e4fdc5328c50ee6c196820'
Merge made by the 'ours' strategy.

* commit 'bf10d7edd82707add9e4fdc5328c50ee6c196820':
  ASoC: codecs: add rockchip-spi-codec driver support

Change-Id: I1e68b227660bbc85f560d20da3449806b0e047da
2023-12-12 17:07:33 +08:00
Jianqun Xu
1e770b0a29 ASoC: codecs: add rockchip-spi-codec driver support
Introduce a codec driver to control a remote audio dsp chip by spi.

This patch is running on a rk3588 board with rk3308 adsp board, while the
rk3308 actually is a SoC without a slave spi controller, so the rk3588
needs connect to rk3308 by spi.

Currently, the host(rk3588) uses the audiocontrol to set volume to the
adsp.

Change-Id: Ia07e9def78cfe7441dc03c97124f0532bc9d72bc
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Signed-off-by: Jun Zeng <jun.zeng@rock-chips.com>
2023-12-12 16:46:02 +08:00
Tao Huang
04732468fa Merge commit 'e58f2f0f0527d29448a856ba35be113158236bdc'
* commit 'e58f2f0f0527d29448a856ba35be113158236bdc':
  drm/rockchip: vop2: add some debug info for ignored crtc
  dt-bindings: spi: Document binding for rockchip SPI Slave

Change-Id: If5729ef7bb89e57f6aabe28c46bc7c88cb25d762
2023-12-12 16:42:20 +08:00
Tao Huang
bc1a0b8a82 Merge commit 'a2d5817390691327851904d86c2a194e5b51030f'
Merge made by the 'ours' strategy.

* commit 'a2d5817390691327851904d86c2a194e5b51030f':
  spi: rockchip-slave: Add code

Change-Id: Idbac27af62b858cb2c77f35d05801e317096ec94
2023-12-12 16:33:14 +08:00
Jon Lin
15bd02f5c3 spi: rockchip-slave: Add code
1.Implement one msg mechanism
2.Support SRAM extension by dts rockchip,sram property

Change-Id: I0fccc5d4347294488b5382ad3ba5ae72b35610f2
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-12-12 15:54:32 +08:00
Steven Liu
507366b5f1 arm64: dts: rockchip: px30: add gpio aliases
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I0929e68947f720534e212bf4da360ea4ef64f9c1
2023-12-12 15:50:33 +08:00
Jon Lin
7f71d2776b PCI: rockchip: dw: Support IRQ user
In order to expand the number of interrupts and achieve independent
services, a specific IRQ USER concept is proposed.

For user:
	ioctl PCIE_EP_RAISE_IRQ_USER to raise a dedicated IRQ event
	ioctl PCIE_EP_POLL_IRQ_USER to check IRQ event status

Change-Id: I2dd5792a6245d3918dc3d555fccd1601fb9fb22e
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-12-12 15:05:04 +08:00
Jon Lin
a01ba48fea misc: rockchip: pcie-rkep: Change to use pci_request_irq apis.
Fix error:
[  517.934944] RIP: 0010:pci_free_cap_save_buffers+0x19/0x30
...
[  517.935040]  ? page_fault_oops+0x136/0x2c0
[  517.935048]  ? search_bpf_extables+0x63/0x80
[  517.935055]  ? pci_free_cap_save_buffers+0x19/0x30
[  517.935061]  ? search_exception_tables+0x5f/0x70
[  517.935068]  ? kernelmode_fixup_or_oops+0xa2/0x120
[  517.935074]  ? __bad_area_nosemaphore+0x15d/0x1a0
[  517.935080]  ? __wake_up_common+0x7e/0x140

Change-Id: Ib0d769dc2ee7428fd289cfbda6a31d28ccb970bd
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-12-12 15:05:04 +08:00
Shawn Lin
47bfce4123 arm64: dts: rockchip: Covert ciu-drv to ciu-drive for matching the driver
The driver is using ciu-drive instead of ciu-drv.

They were converted by:
sed -i "s/ciu-drv;/ciu-drive;/g" `grep ciu-drv -rl arch/arm64/boot/dts/rockchip/*`

Change-Id: I7e5be98a46d7eb5d29b5b0fe0280ea8b91c60406
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2023-12-12 10:00:00 +08:00
Lan Honglin
27061736bc media: i2c: imx415: add 720P config
Change-Id: I2af6b9677ecaf0356f12cbd8e15592d26da134e3
Signed-off-by: Lan Honglin <helin.lan@rock-chips.com>
2023-12-12 09:53:39 +08:00
Lan Honglin
2a27bd854f media: i2c: imx415: fix issues for thunderboot
Change-Id: I2f61cba2c5f6a4d7d019d3bc0a8d21f191be943f
Signed-off-by: Lan Honglin <helin.lan@rock-chips.com>
2023-12-12 09:53:39 +08:00
Finley Xiao
542f25b9ec Revert "dt-bindings: add binding document for Rockchip cpu avs"
Remove unused file.

This reverts commit 21b5ccaf85.

Change-Id: I01d5c35e03b6b346c8361ce92301e99459d07ab3
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2023-12-11 21:29:16 +08:00
Tao Huang
e97ec4041d Merge commit 'b97e3d77e750d210dc742b2f8c675143ee85de0e'
* commit 'b97e3d77e750d210dc742b2f8c675143ee85de0e':
  ARM: dts: rockchip: add rv1106 dual sensor v11 extboard dts.
  ARM: configs: rk3308_linux_aarch32_defconfig: enable rk816 pmic

Change-Id: Ibe04cd56326e6b5a1a0a900d70fc14a5d10fc7b1
2023-12-11 17:38:03 +08:00
Tao Huang
a780da0696 Merge commit '967ccfd802e649563fc1f8cbdf28da65c4e7b354'
Merge made by the 'ours' strategy.

* commit '967ccfd802e649563fc1f8cbdf28da65c4e7b354':
  ARM: configs: rk3308_linux_aarch32_defconfig: sync from  savedefconfig

Change-Id: Ifa1c36d9d227392f1814f6d634932a79152db0fc
2023-12-11 17:26:25 +08:00
Lin Jianhua
50674f9a03 ARM: configs: rk3308_linux_aarch32_defconfig: sync from savedefconfig
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
Change-Id: I064cef348b469db1e3327465b47d52ea6f56e59d
2023-12-11 17:15:27 +08:00
Tao Huang
b9baa5231b Merge commit 'be425cca7a4863178c4dfa6322a1aeb7b23bd5a9'
* commit 'be425cca7a4863178c4dfa6322a1aeb7b23bd5a9':
  media: rockchip: vicap hw change suspend/resume early

Change-Id: Ifafc800ab49535625d12fa753969a43f7ef14e16
2023-12-11 17:06:40 +08:00
Tao Huang
cc1db06225 Merge commit '5525a9cc48ab35c4fdb9905ee7c07137fb756078'
Merge made by the 'ours' strategy.

* commit '5525a9cc48ab35c4fdb9905ee7c07137fb756078':
  arm64: dts: rockchip: Remove unused quirk for usb dwc3 controller

Change-Id: I5c355249827459dd102ea6b27ad36db0f48b8900
2023-12-11 17:05:08 +08:00
William Wu
3c73baf9c1 arm64: dts: rockchip: Remove unused quirk for usb dwc3 controller
This patch remove unused property "snps,xhci-trb-ent-quirk"
for rockchip platforms.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I34212099c21764dfdd2e42d03f91dbf449e3b0c9
2023-12-11 16:57:33 +08:00
Tao Huang
2ca6a5d926 Merge commit '36e981880962e2f7580e42a9ea125a6a04c218ad'
* commit '36e981880962e2f7580e42a9ea125a6a04c218ad':
  Revert "arm64: dts: rockchip: add xhci trb ent quirk for rockchip SoCs"
  ARM: dts: rockchip: rv1126: Remove unused quirk for usb
  PCI: rockchip: dw: Remove useless apis
  PCI: rockchip: dw: Fix resize bar capability for EP
  arm64: configs: add rockchip_linux_pcie_ep.config for some case use PCIe EP Card
  arm64: dts: rockchip: add PCIe EP Board for rk3568
  media: rockchip: isp: version v2.4.0
  media: i2c: techpoint: add tp9951 driver
  media: i2c: sc3338 adapt sleep_wakeup

Change-Id: I88f3b8c3875243e9f302b5f173bb7ce1544e9ccf
2023-12-11 16:55:33 +08:00
Tao Huang
6ef91165fa Merge commit '190f4223b2b4b1320d485cb6211af1733d9da7a2'
* commit '190f4223b2b4b1320d485cb6211af1733d9da7a2':
  media: i2c: sc200ai adapt sleep_wakeup
  media: i2c: add sleep-wakeup mod
  media: rockchip: vicap: call sensor quick stream only rv1106 when resume
  spi: rockchip-test: Support config spi mode
  media: rockchip: vicap add intr mask for bandwidth, and mask bandwidth err per second
  ARM: configs: rv1106-wakeup.config: enable VIDEO_CAM_SLEEP_WAKEUP
  ARM: configs: rockchip: update rv1106-wakeup.config
  arm64: dts: rockchip: rk3588-vehicle-evb-v20: change to use mfd display
  ARM: dts: rockchip: rv1106g-evb2-v12-wakeup remove rtt

Change-Id: I7d1adaee411c28b49bb004f428aba046724376ce

Conflicts:
	drivers/media/i2c/Makefile
	drivers/media/i2c/sc200ai.c
2023-12-11 16:54:03 +08:00
Chaoyi Chen
71928f92e6 drm/rockchip: vop: correct RK3288/RK3399 VOP WIN register fields
In RK3288/RK3399, there is a problem with the definition of the
`fmt_10` field in the VOP WIN register. The original `fmt_10`
definition conflicts with the `lb_mode` definition.

This will cause the `lb_mode` function to be affected, there may be
problems with incorrect colors displayed, incorrect window sizes,
image flickering, etc.

This patch correct `fmt_10` field to the expected value in TRM.

Change-Id: I0f9f23c459dc5870532e28b74053a9b4dc606de0
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
2023-12-11 16:38:06 +08:00
Wu Liangqing
a3a9607565 arm64: dts: rockchip: px30-android: add debug support
Change-Id: Id36e08c0e5c946b27440c3e841912dfd82b6ec19
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2023-12-11 16:31:40 +08:00
Jon Lin
41a3bd108a spi: rockchip: Support DMA burst 16
Change-Id: Ic8b6c0284158d034c3d5ce36810b69588b4b13a2
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-12-11 16:27:14 +08:00
Jianqun Xu
bf10d7edd8 ASoC: codecs: add rockchip-spi-codec driver support
Introduce a codec driver to control a remote audio dsp chip by spi.

This patch is running on a rk3588 board with rk3308 adsp board, while the
rk3308 actually is a SoC without a slave spi controller, so the rk3588
needs connect to rk3308 by spi.

Currently, the host(rk3588) uses the audiocontrol to set volume to the
adsp.

Change-Id: Ia07e9def78cfe7441dc03c97124f0532bc9d72bc
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Signed-off-by: Jun Zeng <jun.zeng@rock-chips.com>
2023-12-11 16:19:34 +08:00
Jianqun Xu
6834fefbb4 arm64: configs: rockchip_defconfig: enable CONFIG_SND_SOC_ROCKCHIP_SPI_CODEC
The RK3588M car audio product uses spi codec

Change-Id: Ibba1affd44ba86a223690a15b5296ae8fe93ccc4
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2023-12-11 16:19:34 +08:00
Jun Zeng
3e396a0fff arm64: dts: rockchip: rk3588-vehicle-evb: use a spi-codec driver for the remote adsp
Change to use a spi-codec driver for the remote adsp, instead of the old
dummy codec driver.

Change-Id: I44a41dbdfe8a7489cc94d9a8f83a5b5f0d99a4c8
Signed-off-by: Jun Zeng <jun.zeng@rock-chips.com>
2023-12-11 16:19:34 +08:00
Sandy Huang
e58f2f0f05 drm/rockchip: vop2: add some debug info for ignored crtc
For RK356X/RK3588, the VP plane_mask be 0 will have the following two case:

1. The VP is disabled;
2. For some mistake, the VP is enabled but the plane_mask is 0;

This will lead to this crtc register be ignored, So add a few reminders log.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ia49db3051e651095350aeba9c2a27ac7086fe06b
2023-12-11 16:07:08 +08:00