Commit Graph

1060766 Commits

Author SHA1 Message Date
Andy Yan
d9ba95a38e drm/rockchip: vop2: Fix win_dly register definition
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I49bf658d1e6447a34d2af18d9aea574d1636f054
2021-11-13 16:35:18 +08:00
Simon Xue
13230c090c pcie-dma-trx: update to version 0x2
1. support buffer_size set by user
2. support assigned chn
3. support udma read
4. support buffer address set by userspace

Need to update test_pcie and test-pcie-ep-new.

New test command:

1. run ./test-pcie-ep-new 500 1024 chn_num buffer_address both on RC and EP first
   Release buffer use dma channel number = chn_num.

   if buffer_address = 0
	   pcie_dma_buffer_address get from DT reserved memory
   else
	   pcie_dma_buffer_address = buffer_address

2. run ./test-pcie 1 1000 1024 1 chn_num on RC
   The last "1" means enable PCIe udma read, "0" means write.
   RC read from EP use dma channel number = chn_num.

3. run ./test-pcie 2 1000 1024 1 chn_num on EP
   EP read from RC with offset = buffer count * buffer size.

4. check version by:
   cat /sys/kernel/debug/pcie/pcie_trx | grep version

5. 1024 means set buffer size to 1MB.

Change-Id: I7613037924659c75014d19b6c4845e096a56d295
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2021-11-13 16:14:34 +08:00
Huang zhibao
aac2ef1f0a arm64: dts: rockchip: add rk3588 nvr demo V10 Board
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: Iebafff8398966758ed9500656f5af2bf6f86d047
2021-11-13 15:56:46 +08:00
Sugar Zhang
11e33efe53 arm64: dts: rockchip: rk3588-evb: Add hdmi sound for evb
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ia8f538a1dc8c18aa9bcc7adb4fe9d182e2eb19eb
2021-11-13 15:42:35 +08:00
Sugar Zhang
0bd9ec6285 arm64: dts: rockchip: rk3588: Add snd property for hdmi nodes
This patch adds property '#sound-dai-cells' for hdmi nodes.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I0a785dda12fe57e1632021b12b3a8efc1044ee9f
2021-11-13 15:41:13 +08:00
Sugar Zhang
cb239e6eff arm64: dts: rockchip: rk3588: Fix clk for dedicated i2s
These controllers use the same clk for tx/rx.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ie9a0adb950cdc584761c1079cb45e58d5eafccfb
2021-11-13 15:33:23 +08:00
Zefa Chen
fae7bbff82 media: i2c: imx464 fixed compatible err
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I830ec663d8c23aa6df0ec4703b7fc50ad151d1ab
2021-11-13 15:27:11 +08:00
Andy Yan
7b1fa2969a arm64: dts: rockchip: rk3588-android: Enable vop multi-area
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I50d03decc694d27d66431d8efef0c97ca4f19bc9
2021-11-13 15:11:12 +08:00
Jianqun Xu
21ad0ff168 arm64: dts: rockchip: rk3588-android add reserved memory
Reserved 8M for cma heap, the node' name will be used as heap' name.

Also add ramoops and logo node.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I50654b1122126bb54092e3933d1a36cadf8d4ec5
2021-11-13 15:00:41 +08:00
Finley Xiao
28545837dd arm64: dts: rockchip: rk3588s: Add system monitor device node
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Iacbba5421ad2840336e1232b4507888a68206d84
2021-11-13 14:52:29 +08:00
Finley Xiao
85556b1e7f cpufreq: rockchip: Implement rockchip_cpufreq_opp_set_rate()
When enter low temperature mode, system monitor update opp table, then
check and change the current voltage for cpu, but now the opp voltage
inside cpu_opp_helper() may be old, the current voltage may be changed
back to old value. Move the volt_adjust_mutex out of dev_pm_opp_set_rate()
so that the opp voltage inside cpu_opp_helper() will be latest.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I9a91775dc9b5443e4b47b4255de6e21133c32404
2021-11-13 14:52:29 +08:00
Simon Xue
57ed5527ed iio: adc: rockchip_saradc: fix RK3588 channel issue
If read multiple channels at the same time, channel 1 will
error, add assert when start saradc as a workaround.

Change-Id: Iababf604b200555a46a96e1ca0bc7108c6df8680
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2021-11-13 14:43:22 +08:00
Andy Yan
cea2902425 drm/rockchip: vop2: Change pd->lock to spinlock
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: If1f50d15c48c569e8cf91c98cd0077bd53a753a1
2021-11-13 14:36:45 +08:00
Finley Xiao
3d4f2e5567 arm64: dts: rockchip: rk3588-evb: Enable tsadc
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I3705cfd0140609097e7e5c7cab41c5a64991bb4d
2021-11-13 14:31:19 +08:00
Finley Xiao
9e18ed0d02 arm64: dts: rockchip: rk3588s: Add thermal zones device node
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I37a73ca0837cb2fa11753202e83725d1a1ae1019
2021-11-13 14:27:49 +08:00
Finley Xiao
131920c5e4 thermal: rockchip: Support RK3588 SoC in the thermal driver
The RK3588 SoC has seven channels TS-ADC(TOP, BIG_CORE0, BIG_CORE1,
LITTEL_CORE, CENTER, GPU, and NPU).

Change-Id: I940a10c8062ba73876f2dfd133ab8ea60ad3a799
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2021-11-13 14:13:09 +08:00
Finley Xiao
f93c9d6e78 OPP: Add two regulaters support for opp summary
device                rate(Hz)    target(uV)    min(uV)    max(uV)
-------------------------------------------------------------------
 cpu0
                      408000000       750000      750000      950000
                                      750000      750000      950000
                      600000000       750000      750000      950000
                                      750000      750000      950000
                      816000000       750000      750000      950000
                                      750000      750000      950000
                     1008000000       750000      750000      950000
                                      750000      750000      950000

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I589fab5579e74a7ed58c8eefb16c4671335c8c75
2021-11-13 14:12:24 +08:00
shengfei Xu
a8069e368a arm64: rockchip_linux_defconfig: Enable RK806
+CONFIG_PINCTRL_RK806=y
+CONFIG_MFD_RK806_SPI=y
+CONFIG_REGULATOR_RK806=y

Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I6c6f55219d317e49805570192d966681f23ce690
2021-11-13 11:51:27 +08:00
Andy Yan
f8d3c11f67 drm/rockchip: vop2: Support set unique possible_crtcs by plane_mask
Enabled by:

&vop2 {
	disable-win-move;
};

Change-Id: Idc15f713b74650ac910233538d186ad799e25124
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-11-13 11:49:20 +08:00
Andy Yan
d188e84472 drm/rockchip: vop2: Enable POST_BUF_EMPTY_INT err irq print
Just print out POST_BUF_EMPTY_INT err irq if it happened.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: Ia1d3747c94d432ca8451f38e10d32a82bbf7b958
2021-11-13 11:49:20 +08:00
Wu Liangqing
dbba421c59 arm64: dts: rockhip: rk3588-evb: adjust adc key value
Change-Id: I1df091f4368d7f435f8099b67cf0552c9c81df65
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2021-11-13 11:46:13 +08:00
shengfei Xu
5bc1d86729 arm64: dts: rockchip: rk806: disable the powerkey function of the slave rk806
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I7d74133d4fa7323cf83d61784f1c6694b1abf46c
2021-11-13 11:36:58 +08:00
shengfei Xu
86c64761ef Input: powerkey: rk8xx: check the powerkey is available
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I24162089c4ada3defd0a4cb066a632316934327b
2021-11-13 11:36:58 +08:00
Finley Xiao
dc74ddc4ec arm64: dts: rockchip: rk3588s: Add opp table for cpu
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I0caea1e9f4290a113861eb0a17467fd860fd55a7
2021-11-12 22:25:04 +08:00
Sandy Huang
fb678bd98a drm/rockchip: vop2: fix splash screen when vsync less than 8
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I065f1e5d4795b10442d285eae2178153be870d02
2021-11-12 22:08:52 +08:00
Finley Xiao
d33636a552 soc: rockchip_system_monitor: Add multiple regulators support
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I24a52ebb9ee599aadbe6e95449b905d29ee4b92d
2021-11-12 21:55:44 +08:00
Elaine Zhang
e274955893 clk: rockchip: rk3588: fix up the armclk_l setting freq crash
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I2e30212c2fbb7a2ee48c175543da766afc4ab985
2021-11-12 21:53:00 +08:00
Sugar Zhang
800034979c ASoC: rk_codec_digital: Make clk_adc optional
It's optional on RK3588 platform which support dsm only.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I3cbe3a3bb7789eab2a279403d359a58f1fd85c7b
2021-11-12 21:50:07 +08:00
Ding Wei
e32d99016a arm64: dts: rockchip: rk3588s: Add the nodes for video codec
Change-Id: I995db9a17cc244d6e6e6eefa43de2ac7ed34b414
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-11-12 21:32:24 +08:00
Andy Yan
1b19072d1d drm/rockchip: vop2: Fix AFBC gating on rk3588
On RK3568: this bit is Auto gating enable
on RK3588: this bit is gating disable(we must set it to 1 when afbc
enable)

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: If689c587c6df9e1e8c6ff670d30e62c53b621194
2021-11-12 21:21:43 +08:00
Sugar Zhang
07be6306d9 ASoC: es7202: provide configuration for i2c_bus_num/mic_max_channels
Configuration is flexible than hard code, and minimal changes.

Change-Id: I15835fcbf198252410feb3feb6080ca047388ce1
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2021-11-12 21:00:39 +08:00
Sugar Zhang
c8a734f812 arm64: dts: rockchip: rk3588-evb: Fix pinctrl for pdm on EVB2/3
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I7fa2c2f749cec082a54f7bf5e3ac0c7382a3e7f9
2021-11-12 21:00:05 +08:00
Sugar Zhang
9277538e2b ASoC: rockchip: pdm: Fix signoff for rk3588 pdm
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I75efb9ea38d2a5fe86c3797896d44fb0dd179f2c
2021-11-12 20:59:51 +08:00
Weixin Zhou
c9bcd43068 arm64: rockchip_defconfig: Enable CONFIG_RTC_DRV_HYM8563
Rockchip EVB use this feature.

Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I778b020ea3b79a7842c3b701966002965ae76b62
2021-11-12 20:54:30 +08:00
Jianqun Xu
26b748082e arm64: dts: rockchip: rk3588-evb: fix vcc3v3_lcd0_n node
Remove a regulator-fixed node without gpio enable pin from evb dtsi,
move them to next level board dt file.

The vcc3v3_lcd0_n regulator is a software virtual regulator for camera
module to push high/low level from a gpio but through regulator
enable/disable.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I1f587fe1ca0ef9d31c6cba5362c1912b7208f293
2021-11-12 20:45:14 +08:00
Steven Liu
57276b0cae arm64: dts: rockchip: rk3588/rk3588s: fix uart8m0 pinctrl
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I7b475b4c81f31e5f8139c32e9bb530d01896db42
2021-11-12 20:39:34 +08:00
Finley Xiao
3a86be0a31 soc: rockchip: pvtm: Fix npu gpu id for rk3588
Fixes: aec8ff24ff ("soc: rockchip: pvtm: Add support for RK3568 SoCs")
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I482d994981346642958c87bdfe814b575ed9d514
2021-11-12 20:37:52 +08:00
Jianqun Xu
8bc63bf4e5 pinctrl: rockchip: fix rk3588 pinconf offset
Fixes: 7c357cd7cf ("pinctrl: rockchip: add rk3588 support")

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I98b213dd880211d4e070228a9570536c64f2eb44
2021-11-12 20:14:24 +08:00
Wangqiang Guo
da7393d092 arm64: dts: rockchip: rk3588s-evbx: add sensors dts
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
Change-Id: I664bf37bc8f4ad7642104cb2bb9d7561d57d8a04
2021-11-12 18:00:38 +08:00
Wangqiang Guo
d530f96fa3 arm64: dts: rockchip: rk3588-evb3: add sensors dts
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
Change-Id: Ic331d3966a52266d7cd657a00b27170413b72b34
2021-11-12 18:00:38 +08:00
Cai YiWei
4e34953851 media: rockchip: isp: fix isp30 config for cnr with gain off
Change-Id: I657478751e5223edeb6ba4dd2185c871a7a6594b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-12 17:57:57 +08:00
Ding Wei
d592dbfafe video: rockchip: mpp: rkvenc2: add rkv version 2 encoder codes
tips:
1. this driver supports one or multi-core device.
2. the multi-core method is the same as vepu2.
   'commit 88fa5fa5675b ("video: rockchip: mpp: vepu: add ccu for
    multi-core device")'

Change-Id: Iee54b7d5c24104e64e66fcc684b83665c61e6b58
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-11-12 17:11:12 +08:00
Ding Wei
c9f15264b9 video: rockchip: mpp: vepu: add ccu for multi-core device
tips:
1. CCU is short-name for the central control unit.
2. In multi-core processing, CCU is used to balance the scheduling of
each core.
3. The scheduling criteria are the number of tasks in the current queue
and the total number of completed tasks.

Change-Id: I178211550d4f4e40fd23dcff5a76220ccada6b71
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-11-12 16:52:39 +08:00
Guochun Huang
ff3bc17f44 drm/rockchip: fix ratio of frequency phy_ipi_ratio
Change-Id: I4f5166d44e404dbb1300eb31d012ab5bfcf09f59
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2021-11-12 16:43:45 +08:00
Guochun Huang
c0a4b403db phy: rockchip: mipi-dcphy: set EMP depending on data rate
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I4d1ea156991471ac2beb3ecad0d2cfd6666527cf
2021-11-12 16:43:45 +08:00
Sandy Huang
1490bd254f drm/rockchip: dsi2: fix some reg define error
Change-Id: I11e141ecc5b962c28e37125d01b30e38aaa57e3e
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2021-11-12 16:43:45 +08:00
Sandy Huang
5c2186f1b8 arm64: dts: rockchip: rk3588-evb: panel timing must bigger than 3
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ia55dcc83cb53e9331a0dabc764ab18d3458ce2f3
2021-11-12 16:43:45 +08:00
Tao Huang
05cc2cbe83 arm64: rockchip_linux_defconfig: Enable CONFIG_CPU_RK3588
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2ef19e19b667cf761c2afc28fae19e40c43a0f88
2021-11-12 16:34:12 +08:00
Simon Xue
39568d0bb4 iio: adc: rockchip_saradc: fix RK3588 saradc interrupt issue
Fixes: 7af20071ed ("iio: adc: rockchip_saradc: add support rk3588 new saradc")
Change-Id: Ice925d6a9c1a57b76d3cf99bd07bd843439139a3
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2021-11-12 16:29:31 +08:00
Cai YiWei
7c425a9c63 media: rockchip: isp: fix first frame abnormal
Change-Id: Ie0046cdca76064b11642accf57b303328787536b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-12 16:24:44 +08:00