Commit Graph

1060829 Commits

Author SHA1 Message Date
Kever Yang
e984bc2a96 phy: rockchip: naneng-combphy: Add config option for pcie1ln-sel
Add dts decode to support the pcie2x1l0 and pcie2x1l1 setting, which is
in PHP_GRF_PCIESEL_CON.
pcie1l0_sel
Select the signal form PHY to PCIe1l0
1'b0: Select comb PHY
1'b1: Select PCIE3 PHY

Usage in dts:
rockchip,pcie1ln-sel-bits = <0x100 0 0 0>;

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Change-Id: I5fb177f37b23c5f3cdaadf8c103f8e6487ea6a76
2021-11-15 14:32:33 +08:00
Kever Yang
7a6e007af7 arm64: dts: rockchip: rk3588: Enable gic its
rk3588 has two its:
- its0: pcie2x1l0, pcie2x1l1, pcie2x1l2
- its1: pcie3x4, pcie3x2

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Change-Id: Ie0dc4a79bdd8708c4be06b3175d48b7a9a927f6d
2021-11-15 14:27:09 +08:00
Tao Huang
d097bd0240 Revert "arm64: dts: rockchip: Temporarily disable its for rk3588"
This reverts commit 92ce906652.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I69dd18fcaeb72a3736e34ea90e977cf28d484b1c
2021-11-15 14:27:05 +08:00
Sugar Zhang
6658d3e5c3 arm64: dts: rockchip: rk3588-evb: Fixed property clk for i2s0~3
Currently, the datasheet and pcb design has removed all the
pin {bclk, lrck}_rx, and use the pin {bclk, lrck}_tx only
to simpilify design.

  - Remove pin {bclk, lrck}_rx
  - Rename pin {bclk, lrck}_tx to [bclk, lrck]

So, we do the same thing by default.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ide90500b766fa39d6f032b0edf309e001939b579
2021-11-15 14:16:18 +08:00
Sugar Zhang
dacf90ff18 arm64: dts: rockchip: rk3588: Fixed property clk for i2s0~3
Currently, the datasheet and pcb design has removed all the
pin {bclk, lrck}_rx, and use the pin {bclk, lrck}_tx only
to simpilify design.

  - Remove pin {bclk, lrck}_rx
  - Rename pin {bclk, lrck}_tx to [bclk, lrck]

So, we do the same thing by default.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ief06364337ccd6b7f2bc61ffd4aeb8d6e168a8a4
2021-11-15 14:15:52 +08:00
Nickey Yang
a17b7070ee arm64: configs: rockchip_linux: Enable CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: I91e44ca4bfdc6944370792eefcfa2e1a8806fed0
2021-11-15 12:15:49 +08:00
Shawn Lin
e18adadf56 arm64: dts: rockchip: rk3588: add pinctrl for sdio
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I5eb3258fc02ce2e237cf76c7bd1297be48031185
2021-11-15 12:11:50 +08:00
Zefa Chen
ec87cfdebb media: rockchip: cif fixes iommu issue
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Id61e87ba20cc13d682fd01417fa1ba271f7e66f8
2021-11-15 12:10:45 +08:00
Zefa Chen
0b2335921b media: rockchip: cif: rk3588 fixes capture issue in hdr mode
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I433e4f6cf9a2a0f2127ddd278f4ce305f4814e4f
2021-11-15 12:10:45 +08:00
Zefa Chen
17df3150ec media: rockchip: cif fixes the problem of failure to get sof
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I5d76a221154809d7fa351e7f9ff0db8fe5b94bde
2021-11-15 12:10:45 +08:00
Tao Huang
d8e0afd6b2 arm64: rockchip_gki.config: Enable CONFIG_TOUCHSCREEN_ELAN5515
Enable the ELAN touch panel used on Rockchip RK3588s tablet.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ia93230ac356752600ea98182cc0b26ae4320c094
2021-11-15 11:14:28 +08:00
Tao Huang
063b107f0e input: touchscreen: elan5515: Fix build as modules
drivers/input/touchscreen/elan/elan_update.c:40:22: error: incomplete definition of type 'struct i2c_client'

Fixes: 7f61b3481d ("input: touchscreen: support ELAN TP_5515")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I9b5aa8c8fc5d6ee2082938dc74719a2db9041f9d
2021-11-15 11:14:28 +08:00
Tao Huang
bca20667e3 arm64: rockchip_gki.config: Enable CONFIG_SND_SOC_ROCKCHIP_MULTICODECS
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I49d69eca1f3239c48545fc94b2756b366e9d2efb
2021-11-15 11:14:18 +08:00
Cai YiWei
f2ea0aef2c media: rockchip: isp: fix dhaz config with dual unite isp
Change-Id: I6c566165a92dea1c3cbc40f039110ea93794c47e
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-15 11:13:04 +08:00
Tao Huang
804f9d0081 arm64: rockchip_gki.config: Enable CONFIG_MALI_CSF_SUPPORT
To support RK3588 GPU.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ic4866ced6ec855cdc46e7e06f07157997946fc97
2021-11-15 10:26:17 +08:00
Tao Huang
122b5edcd4 arm64: rockchip_gki.config: Enable CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I984f7eeec83d2a23f351a3760bc46193741e1b20
2021-11-15 10:25:05 +08:00
Tao Huang
8e876467ab arm64: rockchip_gki.config: Enable CONFIG_ROCKCHIP_MPP_RKVENC2
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2f9c9871c5968b1a86165dde9727e6cdf335f159
2021-11-15 10:00:45 +08:00
Chen Jinsen
19977df8de arm64: rockchip_defconfig: Enable CONFIG_ROCKCHIP_MPP_RKVENC2
Signed-off-by: Chen Jinsen <kevin.chen@rock-chips.com>
Change-Id: I7ffc6e551002e3f4bd7e6515dc77ab2f52dbf9a1
2021-11-15 09:59:17 +08:00
Yandong Lin
aadb82e121 video: rockchip: mpp: Fix out-of-bounds err
Rootcause: fmt_reg.class not initial

Error notes:

[  172.540549][ T4535] BUG: KFENCE: out-of-bounds read in rkvenc_alloc_task+0x494/0x6d8 [rk_vcodec]
[  172.540549][ T4535]
[  172.540565][ T4535] Out-of-bounds read at 0x000000002927f5b0 (768B right of kfence-#30):
[  172.540671][ T4535]  rkvenc_alloc_task+0x494/0x6d8 [rk_vcodec]
[  172.540775][ T4535]  mpp_process_task_default+0x38/0x210 [rk_vcodec]
[  172.540877][ T4535]  mpp_dev_ioctl+0x1e4/0x368 [rk_vcodec]
[  172.540895][ T4535]  __arm64_compat_sys_ioctl+0x10c/0x160
[  172.540912][ T4535]  el0_svc_common+0xa4/0x180
[  172.540925][ T4535]  do_el0_svc_compat+0x20/0x50
[  172.540941][ T4535]  el0_svc_compat+0x14/0x24
[  172.540955][ T4535]  el0_sync_compat_handler+0x7c/0xbc
[  172.540966][ T4535]  el0_sync_compat+0x1ac/0x1c0
[  172.540974][ T4535]
[  172.540987][ T4535] kfence-#30 [0x0000000027db494f-0x00000000574dca5f, size=92,cache=kmalloc-128] allocated by task 4535:
[  172.541100][ T4535]  kzalloc+0x18/0x28 [rk_vcodec]
[  172.541201][ T4535]  rkvenc_alloc_task+0x260/0x6d8 [rk_vcodec]
[  172.541301][ T4535]  mpp_process_task_default+0x38/0x210 [rk_vcodec]
[  172.541401][ T4535]  mpp_dev_ioctl+0x1e4/0x368 [rk_vcodec]
[  172.541414][ T4535]  __arm64_compat_sys_ioctl+0x10c/0x160
[  172.541428][ T4535]  el0_svc_common+0xa4/0x180
[  172.541441][ T4535]  do_el0_svc_compat+0x20/0x50
[  172.541455][ T4535]  el0_svc_compat+0x14/0x24
[  172.541468][ T4535]  el0_sync_compat_handler+0x7c/0xbc
[  172.541479][ T4535]  el0_sync_compat+0x1ac/0x1c0
[  172.541486][ T4535]
[  172.541499][ T4535] CPU: 5 PID: 4535 Comm: mpp_h264e_4534 Not tainted 5.10.43 #264
[  172.541509][ T4535] Hardware name: Rockchip RK3588 EVB1 LP4 V10 Board (DT)
[  172.541524][ T4535]

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ic1ffce5d5c4f5b65115f4a530e76383f6aa8f8d7
2021-11-15 08:54:42 +08:00
Huang zhibao
84b44e0ae3 arm64: dts: rockchip: rk3588-nvr: Add supply regulators for cpu
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I33b5c114dc3be4e3224d8319ec5fa58c6b34bfad
2021-11-14 20:27:27 +08:00
Zhen Chen
d4c297429a arm64: dts: rockchip: rk3588-evb: enable gpu
Change-Id: I5c8eeae28415c439530ebc4aca39a43cf934a552
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2021-11-14 19:53:20 +08:00
Zhixiong Lin
cec8f849bf arm64: rockchip_defconfig: Enable CONFIG_MALI_CSF_SUPPORT
Enable this to support RK3588 GPU.
But RK3568 GPU should disable this config.

Signed-off-by: Zhixiong Lin <zhixiong.lin@rock-chips.com>
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
Change-Id: I78c165329c9cbc8565af26494c6034dcc704ad66
2021-11-14 19:49:49 +08:00
Zhen Chen
44194e5f13 MALI: bifrost: Kconfig: make MALI_CSF_SUPPORT selectable
remove depends on MALI_BIFROST=m

Change-Id: I3296839dd0f40e8fdfc6c66aa0d6f8f7155cdf68
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2021-11-14 19:39:22 +08:00
Jianhui Wang
6851609376 arm64: rockchip_defconfig: enable CONFIG_TOUCHSCREEN_ELAN5515
Enable the ELAN touch panel used on Rockchip RK3588s tablet.

Signed-off-by: Jianhui Wang <wjh@rock-chips.com>
Change-Id: I4a5f116cd8bfd9e6cb232af9f4eabe9289978372
2021-11-14 17:54:24 +08:00
Guochun Huang
e23da6e8c9 phy: rockchip: mipi-dcphy: delay more time for pll and lane lock
Change-Id: Ic2e60cad56107c4096ded5571e8a89f1d557a496
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2021-11-14 17:47:19 +08:00
Guochun Huang
127485c33e drm/rockchip: dsi2: make send or receive cmd packet more robust
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I013803d14730132c13bdca2bcced829aaf3b5112
2021-11-14 17:46:47 +08:00
Guochun Huang
a4527a60bf drm/rockchip: dsi2: add support dual channel dsi
Display Pipeline:
                   ---> dsi0 --> dcphy_tx0 --->
                  /                  |         \
                 /              dcphy0_pll      \
      vp2/vp3 -->                                --->dual channel panel
                 \              dcphy1_pll      /
                  \                  |         /
                   ---> dsi1 --> dcphy_tx1 --->

Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I5a87aa940510f803479318c66535024d5ce2c8d6
2021-11-14 17:01:43 +08:00
Guochun Huang
4c3fbbcd22 drm/panel: simple: add support dsc/pps sequence transfer for dsi
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I7a828c34c13c201694bd5e3fcaeab47508b58ed8
2021-11-14 17:01:11 +08:00
Hu Kejun
75c63df7c5 media: rockchip: isp: add constraint to gaus_en/viir_en/v1_fir_sel of rawaf
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I9ef5bf7caa4e1ceab78a6b0c62e0fbb173de7ece
2021-11-14 16:56:41 +08:00
Andy Yan
6d75cc0dc6 drm/rockchip: vop2: Delete mipi_dclk_pol on rk3588
This bit has a hide founction for height/low bit swap,
And should not be touched.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I8ce2caddebdf87edbd75cc1fe4460699e7d9ca89
2021-11-14 15:17:12 +08:00
Andy Yan
57ff9f2f3a drm/rockchip: vop2: Set K = 2 for eDP DUAL_CHANNEL_LEFT_RIGHT_MODE
Video_Pixclk = edp_pixclk x K = edp_dclk x K = dclk_core x 4;

K = 2 for SPLIT, other condition is 1.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I8e6f3e32bd1c214bfe46cc3f37dd813af8901839
2021-11-14 15:17:08 +08:00
Cai YiWei
caf502507b media: rockchip: isp: fix NULL Pointer for stats v3x
Change-Id: Id21bcc88fb644bb2fd159dd7dd5ce652cac54ab1
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-14 15:16:23 +08:00
Huang zhibao
e835762a6d arm64: dts: rockchip: rk3588-nvr: Enable tsadc
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: Ic85ef02eb9c5abccdf8777f57fa9f9dae415047f
2021-11-14 15:15:36 +08:00
Huang zhibao
30f8750b79 arm64: dts: rockchip: rk3588-nvr: Enabld rkvdec
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I97fbc66bcb3f8e572264ed4398b1ef7cc09915e2
2021-11-14 15:15:16 +08:00
Jianhui Wang
d4f4e5cea6 arm64: dts: rockchip: rk3588s-tablet: bring up tablet
Signed-off-by: Jianhui Wang <wjh@rock-chips.com>
Change-Id: I6601901251c535240b4a2cad6f4ea4bc22494ff8
2021-11-14 15:13:44 +08:00
Wyon Bi
5ee51da6f2 arm64: dts: rockchip: Add RK3588 EVB3 LP5 V10 eDP Board
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I629312c9dccda589aea157c488d838e12aedc45d
2021-11-14 15:09:33 +08:00
Wyon Bi
93faefa6fe arm64: rockchip_defconfig: enable CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX
Enable the HDPTX PHY driver used on Rockchip RK3588 SoC.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ib96cd35d7bda166900afc4b0650f922a21f1c0d5
2021-11-14 15:05:33 +08:00
Wyon Bi
4e5e956026 phy/rockchip: Add support for Samsung HDMI/DP Combo PHY
Add a new driver for Samsung HDPTX Combo transmit-PHY IP used
in Rockchip RK3588 SoC. The HDPTX is a PHY hardmacro to
support HDMI and DP interfaces.

Currently, it supports only DP mode.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ie70017969ee59dfc53f9e319591aa3f998a86b0c
2021-11-14 15:04:58 +08:00
Sugar Zhang
53a3ef7353 ASoC: rockchip: Add support for multicodecs machine driver
This patch adds support for sound which link multiple codecs
to the same cpu dai.

Change-Id: I77d3e9c10d03c2b8809c6d82b5268dba279ee6f0
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2021-11-14 14:27:56 +08:00
Sugar Zhang
513946019c ASoC: rockchip: Add support for Voice Activity Detection
- Drop duplicated PCM_RUNTIME_CHECK
- Replace rtd->x to macro asoc_rtd_to_x

Change-Id: I6ae63b4d36f2f9b24f0fdf352fdc385ec425b330
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2021-11-14 14:24:43 +08:00
Sugar Zhang
4d0c0e0a07 ASoC: dt-bindings: rockchip: Add compatible for rk3588 vad
This patch adds compatible string for rk3588 vad.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I69672704997a9344faa6b53b050e82d6259afdfd
2021-11-14 14:16:32 +08:00
Sugar Zhang
e811780873 ASoC: rockchip: vad: Add support for rk3588 SoC
This patch adds support for rk3588 SoC.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ic5488967f7147c84700849d2d38e419ab707327a
2021-11-14 14:16:15 +08:00
Caesar Wang
94d7910211 arm64/configs: update configs for rockchip_linux_defconfig
1) make ARCH=arm64 savedefconfig

2) Enable CONFIG_PRINTK_TIME_FROM_ARM_ARCH_TIMER
   For get boot time better

3) Enable CONFIG_RFKILL_RK

4) Enable CONFIG_SND_SOC_ES8323
   This patch enable CONFIG_SND_SOC_ES8323 default for rk3588 evb boards.

5) Enable CONFIG_PHY_ROCKCHIP_SAMSUNG_DCPHY
   The driver is used by RK3588.

6) Enable type-c support
   Select Type-C related configs for Rockchip SoCs.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I42144dcb9ffbaced8ca58acc786c7319e6116a7b
2021-11-14 14:12:25 +08:00
William Wu
0e63394c58 arm64: dts: rockchip: rk3588s-evb2-lp5: add u3 phy for u3 host_2
This patch add usb3 combphy for usb3 host_2, with this
patch, the rk3588s evb2 board can support usb3 host.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: Ia8fdf5921218a554bb29ab4a8cc10fbd1b37827d
2021-11-14 11:48:17 +08:00
William Wu
3712121527 arm64: dts: rockchip: rk3588-nvr-demo: add u3 phy for u3 host_2
This patch add usb3 combphy for usb3 host_2, with this
patch, the rk3588 nvr demo v10 board can support usb3 host.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I72301e14fc6b428722f171795377b1cbae9d2aa4
2021-11-14 11:48:17 +08:00
William Wu
d37e72f33b arm64: dts: rockchip: rk3588: add u3 phy for u3 host_2
This patch add usb3 combphy for usb3 host_2.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I38fb63446a285d791cd0466e112ad33df1f3254e
2021-11-14 11:48:17 +08:00
Elaine Zhang
2f510ebc1f clk: rockchip: rk3588: fix up the cpu setting high freq crash
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ia5b825a3c8013a51973c37d45c91c7c36280e634
2021-11-14 11:38:01 +08:00
Tao Huang
3f948b3493 arm64: rockchip_gki.config: Enable CONFIG_PHY_ROCKCHIP_USBDP
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I66435f558679eee5afbd5ea8ff683c67dcd775cd
2021-11-14 10:46:12 +08:00
Tao Huang
61c1c97f4d arm64: rockchip_defconfig: Enable CONFIG_PHY_ROCKCHIP_USBDP
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I223c4d8ef5ce53132c0345ec4fe1ba4dc0dff0d7
2021-11-14 10:46:12 +08:00
Tao Huang
2bd5dfcad9 arm64: rockchip_gki.config: Enable CONFIG_RTC_DRV_HYM8563
Rockchip EVB use this feature.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ia5a9ebb76a9c7e7a5b7d5342f645ec156d18c9a8
2021-11-14 10:46:12 +08:00