Commit Graph

1060749 Commits

Author SHA1 Message Date
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
Cai YiWei
0647eda30c media: rockchip: isp: useless version return -EINVAL
fix crash for CPU_XXX no define

Change-Id: I4577c7b33823c258b0166378e96d0394b81f570e
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-12 16:24:27 +08:00
Shunhua Lan
1ab474fdf8 ASoC: es8323: support fixed and variable both clock rates
This patch supports some type of machine drivers that set 0 to mclk
when sound device goes to idle state. After applied this patch,
sysclk == 0 means there is no constraint of sound rate and other
values will set constraints which is derived by sysclk setting.

Signed-off-by: Katsuhiro Suzuki <katsuhiro@katsuster.net>
Link: https://lore.kernel.org/r/20190903165322.20791-2-katsuhiro@katsuster.ne

Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: If0a478f0cb46fa502cdf0d4e017ac2f36166055a
2021-11-12 16:20:52 +08:00
Wangqiang Guo
2baf8fc47d arm64: dts: rockchip: rk3588-evb: move touch pinctrl to rk3588-evbx.dtsi
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
Change-Id: I91fb070f4bd09a47db4967ca2bb458179c31f459
2021-11-12 16:14:22 +08:00
David Wu
8cdc87137f arm64: dts: rockchip: Add gmac0 node for rk3588-evb1
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I34f0723dc4b91ed5d13c7f2925da24b56776e217
2021-11-12 16:10:12 +08:00
Shawn Lin
7931e3b934 phy: phy-rockchip-snps-pcie3: Migrate to use bulk clk API
In order to make clock definition more flexible, use bulk
clk API instead.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I5f44c67e9d4c4d812b34a53f9f106cb2134b7199
2021-11-12 15:49:20 +08:00
David Wu
ff20bf6334 net: ethernet: stmmac: dwmac-rk: Disable delayline if it is invalid
If delayline can't get from DTB or invalid, don't enable delayline.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I9769af42d02c67d2ea3fd24de5def45a1ec1cc17
2021-11-12 15:44:33 +08:00
David Wu
b0a0001cdd net: ethernet: stmmac: dwmac-rk: Fix return value for RK3588 speed clock setting
This patch fixes the following log:
  rk_gmac-dwmac fe1b0000.ethernet: unknown speed value for GMAC speed=1000

Fixes: 2627dcd2c9e9("net: ethernet: stmmac: dwmac-rk: Add gmac support for rk3588")

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Ifaa4696492f1864acc9d999da7d59f1854e6e320
2021-11-12 15:44:33 +08:00
Tao Huang
d89acabf06 Revert "clk: rockchip: Temporarily fix for rk3588 pll"
This reverts commit fb7d7606a1.

Change-Id: I232636a08a2c034df5ac41d1f628ad55e4e59e36
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-11-12 15:34:24 +08:00
Elaine Zhang
46e88184cc arm64: dts: rockchip: rk3588s: init pll_aupll to 786M
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I2e552dc3a390c273f46d52a55c641697a66a7719
2021-11-12 14:31:26 +08:00
Elaine Zhang
e5277633c6 clk: rockchip: rk3588: add 786M for AUPLL init
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ic9b76bc29cf07593a94deaeeaaecd81d5bdbd649
2021-11-12 14:30:30 +08:00
Jianqun Xu
72d54feee5 arm64: rockchip_defconfig: disable ion
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Iaf69c2c61dd3b03fe9a6adfa29196258151e14e0
2021-11-12 14:26:14 +08:00
Jianqun Xu
84bb23a5d3 arm64: dts: rockchip: rk3588-evb default to disable sdmmc
RK3588-evb1 / RK3588-evb4 / RK3588-evb5 have no TF-card support
RK3588-evb2 / RK3588-evb3 support TF-card

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Ie67bdfba5b6e60c1a092dab2af0d1f96c3b9a1ca
2021-11-12 14:16:49 +08:00
Finley Xiao
678be475c7 cpufreq: dt-platdev: Add rk3588 project into blacklist
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ia08b5467b1a41c56afb27a067a3cbcec2c6a6026
2021-11-12 14:11:27 +08:00
Zhen Chen
ee20202c97 arm64: dts: rockchip: rk3588s: gpu: enlarge register space to 0x200000
Valhall device driver expects that it is at least 0x200000.

Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
Change-Id: Ide488624375fdc2b242442bf023040e8ed8358e8
2021-11-12 14:10:09 +08:00
Sugar Zhang
1e94be3e6e ASoC: es8323: Fix NULL pointer dereference when shutdown
Component is null when sound card link failed. So, switch to use regmap
directly in shutdown path.

Unable to handle kernel NULL pointer dereference at virtual address 0000000000000090
Mem abort info:
  ESR = 0x96000005
  EC = 0x25: DABT (current EL), IL = 32 bits
  SET = 0, FnV = 0
  EA = 0, S1PTW = 0
Data abort info:
  ISV = 0, ISS = 0x00000005
  CM = 0, WnR = 0
user pgtable: 4k pages, 39-bit VAs, pgdp=0000000005ff2000
[0000000000000090] pgd=0000000000000000, p4d=0000000000000000, pud=0000000000000000
Internal error: Oops: 96000005 [#1] PREEMPT SMP
Modules linked in:
CPU: 2 PID: 1 Comm: init Not tainted 5.10.43 #110
Hardware name: Rockchip RK3588 EVB1 LP4 V10 Board (DT)
pstate: 20400009 (nzCv daif +PAN -UAO -TCO BTYPE=--)
pc : mutex_lock+0x2c/0x64
lr : snd_soc_component_write+0x30/0xd0
sp : ffffffc011e2bc10
x29: ffffffc011e2bc10 x28: ffffff8002200000
x27: 0000000000000000 x26: ffffffc011cf1000
x25: ffffffc011dac000 x24: ffffff80046128c0
x23: ffffff8004612828 x22: 0000000000000001
x21: 0000000000000058 x20: 0000000000000000
x19: 0000000000000090 x18: ffffffc011e25058
x17: 000000000000000a x16: 0000000000000001
x15: 0000000000000000 x14: 0000000000000400
x13: 000000000000276a x12: 0000000029aaaaf0
x11: 0000000001000c2b x10: 0000000007ae1850
x9 : 0000000000000000 x8 : 0000000000000090
x7 : 0000000000000000 x6 : 0000000000000000
x5 : ffffffc011e2bb40 x4 : 0000000000000000
x3 : 0000000000000000 x2 : ffffff8002200000
x1 : 0000000000000000 x0 : 0000000000000090
Call trace:
 mutex_lock+0x2c/0x64
 snd_soc_component_write+0x30/0xd0
 es8323_i2c_shutdown+0x13c/0x1f0
 i2c_device_shutdown+0x44/0x54
 device_shutdown+0x174/0x214
 kernel_restart+0x44/0x110
 __arm64_sys_reboot+0x148/0x21c
 el0_svc_common+0xa4/0x180
 do_el0_svc+0x28/0x88
 el0_svc+0x14/0x24
 el0_sync_handler+0x88/0xec
 el0_sync+0x1a8/0x1c0

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I978764678bd36321d0e3f8ac8e487c328eb7a720
2021-11-12 11:34:31 +08:00
Tao Huang
52cbc3ce90 arm64: rockchip_defconfig: Enable CONFIG_PRINTK_TIME_FROM_ARM_ARCH_TIMER
For get boot time better.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Idcde84f57c29c81587e1c0b51c3308f031f1f2e6
2021-11-12 11:23:51 +08:00
Tao Huang
4214832392 printk: Introduce CONFIG_PRINTK_TIME_FROM_ARM_ARCH_TIMER
Some examples for console output:

Starting kernel ...

[    1.956071][    T0] Booting Linux on physical CPU 0x0000000000 [0x412fd050]

Change-Id: I0ab5914349ad3e0028954c831c5e79d46fe2d420
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-11-12 11:21:16 +08:00