Commit Graph

1066515 Commits

Author SHA1 Message Date
XiaoTan Luo
046993ac20 ASoC: rockchip: multicodecs: remove MAX_CODECS
a soundcard can connected more than 2 codecs.

Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Change-Id: Ie42d54e33c1be58582350ec24165d5310347b4d2
2022-06-24 14:26:04 +08:00
Ziyuan Xu
f72f13b4ce i2c: rk3x: initcall early when CONFIG_ROCKCHIP_THUNDER_BOOT=y && !CONFIG_INITCALL_ASYNC
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I496f251febc01c49f2703c425ea6563db3439203
2022-06-24 09:55:37 +08:00
Ziyuan Xu
aabfa89452 media: i2c: initcall sc230ai early when ROCKCHIP_THUNDER_BOOT_ISP=y
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ie4311886a46f070703ceb613bef0a8e3f85b5076
2022-06-23 18:40:22 +08:00
Ziyuan Xu
3c8e72bfea phy: rockchip: initcall csi2-dphy early when ROCKCHIP_THUNDER_BOOT_ISP=y
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I431f55560f2f87984ad92fd73f6ad4e0dd16e79e
2022-06-23 18:39:46 +08:00
Ziyuan Xu
6a0ab1e9fa media: platform: rockchip: initcall cif/isp early when ROCKCHIP_THUNDER_BOOT_ISP=y
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ibd92065a9819096275ea6530e6f1c3830b2ed463
2022-06-23 18:39:33 +08:00
Ziyuan Xu
4ce0428e42 media: v4l2-dev: call call videodev_init() early when ROCKCHIP_THUNDER_BOOT_ISP=y
The cif/isp drivers depends on videodev_init() to *video_register_device*.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ifc6d8c3e8a90ac045b68e3299537fec8d17f477f
2022-06-23 18:39:01 +08:00
Zefa Chen
67ca18a877 media: rockchip: vicap fixed pipe s_power error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I1e5e133127c2cd64f38da7d87af23fa8e5f5ceac
2022-06-23 18:38:27 +08:00
Zefa Chen
7466682f92 media: i2c: sc230ai fixed linkfreq err
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ib30492b8ff31d6cae36b4c237a84c3da09435fb2
2022-06-23 18:38:00 +08:00
Ziyuan Xu
60dbf2d80a ARM: dts: rv1106-thunder-boot: reserve 256KB~512KB for hpmcu
The HPMCU life cycle maybe go so far as to linux kernel, resever it
until thunder-boot had been done.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I6994e035bad24e910be7b7572fb85fbbcebec487
2022-06-23 18:36:35 +08:00
Wang Panzhenzhuan
6607339e85 arm64: rockchip_defconfig: enable ov02b10 & s5kjn1 & cn3927v & aw36518
Enable camera configs: ov02b10 & s5kjn1 & cn3927v & aw36518
for rk3588s tablet

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I46b59c285a0741ed0c6744bd6ae9bac5e943ae45
2022-06-23 15:10:59 +08:00
Caesar Wang
049b3dc624 arm64: dts: rockchip: add rk3588-evb7-lp4-v10-linux.dts
Add rk3588-evb7 that have single PMIC hardware design scheme
for customers to choose.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: Ia99fda8f73ad3bf7a3d4cb2a7763c2453176d10d
2022-06-23 15:08:31 +08:00
Sach Lin
54751504fb misc: rk803: fix current setting error.
Signed-off-by: Sach Lin <sach.lin@rock-chips.com>
Change-Id: If42362a188acb362bc0bbb9c3a36ea2f21ce9aa9
2022-06-23 15:07:15 +08:00
Jon Lin
b892850952 UPSTREAM: spi: rockchip: Unmask IRQ at the final to avoid preemption
Avoid pio_write process is preempted, resulting in abnormal state.

Change-Id: Iac7116b07b8eccb39cb408a219365be4b08a4424
Link: https://lore.kernel.org/r/20220617124251.5051-1-jon.lin@rock-chips.com
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
(cherry picked from commit 419bc8f681)
2022-06-23 10:07:57 +08:00
Jon Lin
7a5ad2fa7d Revert "spi: rockchip: Disable local irq when pio write out of interrupt service"
This reverts commit 8e82d2fc9f.

Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
Change-Id: I0d92d2c1d9d050e3e1eea632fd9d876876a4af0f
2022-06-23 10:07:57 +08:00
Jianqun Xu
c71d300e42 video: rockchip: mpp: reset buffer members when release buffer
Reset the buffer members by:
	buffer->dma = NULL;
	buffer->dmabuf = NULL;
	buffer->attach = NULL;
	buffer->sgt = NULL;
	buffer->copy_sgt = NULL;
	buffer->iova = 0;
	buffer->size = 0;
	buffer->vaddr = NULL;
	buffer->last_used = 0;

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I83cf68f51a9db7894a01bca01b5a53c6d6932a5f
2022-06-22 18:34:06 +08:00
Jianqun Xu
f4052bc00c video: rockchip: mpp_service add dump session
Add the dump session function to show iova stats.

Tested on RK3588 Debian:
[root@RK3588:/]# cat /proc/mpp_service/sessions-summary
session iova range dump:
   0: 0x00000000fff80000..0x00000000ffffffff (       512 KiB)
   1: 0x00000000f8000000..0x00000000fca09fff (     75816 KiB)
   2: 0x00000000f7c00000..0x00000000f7ffbfff (      4080 KiB)
   3: 0x00000000f7b00000..0x00000000f7bb2fff (       716 KiB)
   4: 0x00000000f7a80000..0x00000000f7ae0fff (       388 KiB)
   5: 0x00000000f7a00000..0x00000000f7a7ffff (       512 KiB)
   6: 0x00000000f0000000..0x00000000f4a09fff (     75816 KiB)
   7: 0x00000000efc00000..0x00000000efffbfff (      4080 KiB)
   8: 0x00000000e8000000..0x00000000eca09fff (     75816 KiB)
   9: 0x00000000e7c00000..0x00000000e7ffbfff (      4080 KiB)
  10: 0x00000000e0000000..0x00000000e4a09fff (     75816 KiB)
  11: 0x00000000dfc00000..0x00000000dfffbfff (      4080 KiB)
  12: 0x00000000d8000000..0x00000000dca09fff (     75816 KiB)
  13: 0x00000000d7c00000..0x00000000d7ffbfff (      4080 KiB)
  14: 0x00000000d0000000..0x00000000d4a09fff (     75816 KiB)
  15: 0x00000000c8000000..0x00000000cca09fff (     75816 KiB)
  16: 0x00000000c7f00000..0x00000000c7fb2fff (       716 KiB)
  17: 0x00000000c7e80000..0x00000000c7efffff (       512 KiB)
  18: 0x00000000c0000000..0x00000000c4a09fff (     75816 KiB)
  19: 0x00000000bfc00000..0x00000000bfffbfff (      4080 KiB)
  20: 0x00000000bfb00000..0x00000000bfbb2fff (       716 KiB)
  21: 0x00000000b8000000..0x00000000bca09fff (     75816 KiB)
  22: 0x00000000b0000000..0x00000000b4a09fff (     75816 KiB)
  23: 0x00000000a8000000..0x00000000aca09fff (     75816 KiB)
  24: 0x00000000a0000000..0x00000000a4a09fff (     75816 KiB)
session: pid=2296 index=1
 device: fdc38100.rkvdec-core
 memory: 916 MiB

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I545a26e37e50ee94e1eeae51eebf35d70cedc49f
2022-06-22 18:34:06 +08:00
Lin Jinhan
b8d9ef07ae media: i2c: sc132gs: 2 lane mode default use mirror
Change-Id: I02b30aa669ff6d08321eaef0f08def926c8af578
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2022-06-22 18:02:02 +08:00
Zefa Chen
f682ab540d media: rockchip: vicap deal fe before fs
When fe and the next frame of fs arrive at the same time,
processing the fs of the next frame first will cause the
timestamp of the current frame to be wrong.
There is only one timestamp variable of fs, which is not
stored in a ping-pong manner.

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ic76bdb67bf0debc11006df1195ffafa7540ca2d7
2022-06-22 17:33:20 +08:00
Zefa Chen
de27857dbb media: rockchip: vicap add tools video for capture raw with reback mode
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I6802d41608857776d6d8e25035b61b2bdcae17e4
2022-06-22 17:32:21 +08:00
Lei Chen
aeafaef713 drm/bridge: update ite-it6161 driver
Added mipirx retry mechanism to prevent abnormal display of individual resolutions.
Make global symbols static.

Signed-off-by: Lei Chen <lei.chen@rock-chips.com>
Change-Id: I3a97ab6590fab6f2cada92231d2ce790325806d4
2022-06-22 16:43:04 +08:00
Zhang Yubing
a1389d274b drm/rockchp: dw-dp: set output type for mode valid
DP need precise clock rate, so the display mode should be filterled
when the precise clock rate can't be get.

When connector connect to DP monitor, it will get the display mode
and do mode valid work. However, the output type is not set in this
case. It need to set all the possible crtcs' output type as DisplayPort
to filter the display mode that clock rate can't be config precisely.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I18f4e63f311ff1f589249f63ac5639e620ef0f86
2022-06-22 15:57:38 +08:00
Zhang Yubing
13b4a7b8da drm/rockchip: vop2: filter unsupported display mode
For DP and HDMI, if the request clock rate for a display mode
can't be precise get, filter it.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I6f323cfbafd4822f3cc5aac6c27b0c409d063368
2022-06-22 15:57:26 +08:00
Jianqun Xu
c9d08fc99c arm64: dts: rockchip: rk3588s reserve rkvdec iova closed to 4GiB address
Rockchip RK3588 rkvdecs use sram as part of buffer, then reserve the
iommu iova for the rcb. This patch changes the iova range close to 4G
to make the iova space more contiguous for the future.

With this patch, the iova reserve as following:

[    1.619149] mpp_rkvdec2 fdc38100.rkvdec-core: rcb_iova 0x00000000fff00000
[    1.630537] mpp_rkvdec2 fdc48100.rkvdec-core: rcb_iova 0x00000000ffe00000

Fixes: 707f4713a1 ("arm64: dts: rockchip: rk3588s: Add soft-ccu mode for rkvdec2")

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I2ec03a6a68c7fe87a0e3966e773991d024e58d20
2022-06-22 15:56:08 +08:00
Tao Huang
69d9bccc16 arm64: dts: rockchip: Fix system sram address for rk3588
Change system sram address from 0xFD600000 to 0xFF000000.
0xFF000000 support cpu cache.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I990c53fcae67ab80795a77e8c6d1d1851d9f18e8
2022-06-22 15:06:02 +08:00
Jon Lin
9e093149af net: wireless: rockchip: rkwifi: bcmdhd: Add rk wifi pcie APIs
Fix the error from dhd pcie interface.

Change-Id: I0f89e7c1a36aa289733082410f6fe65c27481cf8
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-06-22 15:05:09 +08:00
Jon Lin
d591c3f6ef PCI: Add ROCKCHIP PCIe ASPM interface
Change-Id: I1156bd10e352145d745899067bf43afda92d5a30
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-06-22 15:03:47 +08:00
Zefa Chen
22a6df2388 media: rockchip: vicap support capture raw in hdr mode with online
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I3a41cb22e68f21808485d7ba1c4cc6b62dfbd017
2022-06-22 14:53:04 +08:00
Zefa Chen
7040478a95 media: rockchip: vicap fixed bug of capture raw online
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I515e1ae1893f9bee36a8a67e0e4eb4a68d393657
2022-06-22 14:50:33 +08:00
Zefa Chen
50d0e0a002 media: rockchip: isp: support free rx buffer
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I3d8aef3f27f8e419c6ed02426735e03be8787998
2022-06-22 14:49:53 +08:00
Caesar Wang
480c29a809 arm64: dts: rockchip: Add mmc aliases for rk3588-linux.dtsi
With this series, adjust MMC alias and see mmcblk id change.
This patch is still useful on ChromeOS.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I384e49606c5623a403c93e62e9e7165b61e4ca80
2022-06-22 10:42:16 +08:00
Zhang Yubing
befdf06c03 drm/rockchip: vop2: print the correct vp id
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Ic3728c72715ab6ab5cab0fd8acf20d754feab51a
2022-06-22 09:27:40 +08:00
Wangqiang Guo
33df088602 media: i2c: it66353: add it66353 HDMI switch bridge driver
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
Change-Id: I4365641c2d088a5bce4c0b69ed98b864831db9d5
2022-06-21 17:29:53 +08:00
Dingxian Wen
1ee5d90938 arm64: dts: rockchip: rk3588: modify hdmirx pinctrl
add hdmim1_rx pinctrl group, set hdmirx detect pin to pull up.

Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I637d5d432d5879ed69077f00907667102e83153d
2022-06-21 16:36:07 +08:00
Wang Panzhenzhuan
e1489b2e38 media: i2c: gc8034: fix power on & off sequence
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Ia2b28d49662290de2784f9340a405b5061c6d76f
2022-06-21 15:06:48 +08:00
Ziyuan Xu
e654f9bb99 media: i2c: fixes sc230ai i2c transfer error when thunderboot
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I6c033c7e2c25ffa74f8b62465b63ae42814ae206
2022-06-21 14:19:51 +08:00
Dingxian Wen
f7a599ce64 arm64: dts: rockchip: modify hdmirx cma memory to 128MB for rk3588 boards
cma memory reserved for hdmirx reduced to 128MB

Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I80d909c5bba1769cf34a649e8482a905375c2512
2022-06-21 14:18:01 +08:00
Dingxian Wen
3e4a122e08 media: rockchip: hdmirx: correct image format to V4L2_PIX_FMT_BGR24
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I45bcd0450d1a85ed51261f47c282cc3f03b4c5b5
2022-06-21 14:15:06 +08:00
Zhen Chen
ab86d8ad07 MALI: rockchip: upgrade bifrost DDK to g12p0-01eac0, from g11p0-01eac0o
Change-Id: Ifde51336daa7c735118a314fcfc2fde38d7132b3
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2022-06-21 11:27:08 +08:00
Wang Panzhenzhuan
624d3eb4f8 media: i2c: s5kjn1: fix power off reset & pwdn state
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I14b40260cf0ea9e2beeeafc2a0ef0a1ffcc362df
2022-06-20 08:27:07 +00:00
Bian Jin chen
9659d6d260 arm64: configs: rockchip_defconfig: enable HID_PLAYSTATION by default.
Add support for PS5 gamepad controllers.

According to gki commit 6b7cc871d2 ("ANDROID: GKI: enable hid-playstation driver")
and commit c3bf09a68b ("ANDROID: GKI: enable hid-playstation FF").

Test: CtsHardwareTestCases
android.hardware.input.cts.tests.SonyDualSenseBluetoothTest
android.hardware.input.cts.tests.SonyDualSenseUsbTest

Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
Change-Id: I49a40d2375ccc9c58a09736bf729db6cb6f438af
2022-06-20 14:35:08 +08:00
Ziyuan Xu
7e65de47b2 ARM: dts: rockchip: delete unused nodes for rv1103g-battery-ipc board
It makes sense to reduce the number of device nodes.

Before:
[    0.150197] initcall of_platform_default_populate_init+0x1/0x6a returned 0 after 13020 usecs

After:
[    0.144482] initcall of_platform_default_populate_init+0x1/0x6a returned 0 after 9765 usecs

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I9896b9d673e92310cc3e0839bd02d55056b0bed3
2022-06-20 14:26:53 +08:00
Ziyuan Xu
259831a2de ARM: dts: rockchip: rv1103g-battery-ipc: reserved 6MB for 1080p@2f yuv
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Iabe42fa186c095f6fa7ac00a9c9aa36e8f23cddd
2022-06-20 14:25:07 +08:00
Jianwei Fan
7bd7fdc8c3 media: i2c: imx577: fix gain and exp errors and add 30fps support
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: I3f519c9a3efa57b10981cee60e5f5df9b1d46124
2022-06-20 14:18:50 +08:00
Chen Shunqing
da83a0167a arm64: rockchip_defconfig: enable CONFIG_REGULATOR_WL2868C
Add WL2868C Ldo for camera on rk3588s tablet.

Signed-off-by: Chen Shunqing <csq@rock-chips.com>
Change-Id: I7023dcd20b6716436ceffcdf389b4c566d0278bb
2022-06-20 11:17:24 +08:00
Finley Xiao
8729c661d5 soc: rockchip: power-domain: Fix panic when reset memory domain
rockchip-pm-domain fd8d8000.power-management:power-controller: failed to get mem status 'venc0', target_on=0, val=1
Kernel panic - not syncing: panic_on_set_domain set ...
CPU: 7 PID: 1 Comm: swapper/0 Not tainted 5.10.66 #1598
Hardware name: Rockchip RK3588 EVB1 LP4 V10 Board (DT)
Call trace:
 dump_backtrace+0x0/0x1c8
 show_stack+0x1c/0x2c
 dump_stack_lvl+0xdc/0x12c
 dump_stack+0x1c/0x64
 panic+0x150/0x3a4
 rockchip_do_pmu_set_power_domain+0x39c/0x3a0
 rockchip_pd_power+0xcc/0x1bc
 rockchip_pd_power_on+0x28/0x38
 genpd_power_on+0x104/0x294
 __genpd_dev_pm_attach+0x138/0x1f0
 genpd_dev_pm_attach+0x50/0x6c
 dev_pm_domain_attach+0x24/0x38
 platform_drv_probe+0x3c/0xc4
 really_probe+0x204/0x510
 driver_probe_device+0x80/0xc0
 device_driver_attach+0x70/0xb4
 __driver_attach+0xc8/0x150
 bus_for_each_dev+0x80/0xd0
 driver_attach+0x28/0x38
 bus_add_driver+0x108/0x1e8
 driver_register+0x7c/0x118
 __platform_driver_register+0x48/0x58
 rk_iommu_init+0x20/0x30
 do_one_initcall+0x98/0x2dc
 do_initcall_level+0xa8/0x160
 do_initcalls+0x58/0x9c
 do_basic_setup+0x28/0x38
 kernel_init_freeable+0xf4/0x16c
 kernel_init+0x18/0x190
 ret_from_fork+0x10/0x30

Fixes: 69b9adc8ad ("soc: rockchip: power-domain: fix panic when pd power on for rk3588")
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Idc22efbd87cbc0cd694720bfb48373c81c5d8c83
2022-06-17 18:59:40 +08:00
Liang Chen
c037294fbd arm64: configs: add rockchip_rt.config for kernel-rt
Signed-off-by: Liang Chen <cl@rock-chips.com>
Change-Id: I4abd6275cf12df0be8898d3bab2a3db6cefd73e6
2022-06-17 18:25:54 +08:00
Wyon Bi
bcde211e70 arm64: dts: rockchip: rk3588s-tablet: Limit DP PHY link rate to 5.4Gbps
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I7dfc211eaf69e0515581c9fd3ccd1b5062fbfcef
2022-06-17 18:20:06 +08:00
Wyon Bi
15fdfc37fa drm/rockchip: dw-dp: Add DP PHY max_link_rate limit
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I2f4522af3b997cb0c3a6209bbe142e550782e2fc
2022-06-17 18:20:06 +08:00
Guochun Huang
8cfe3a4ed8 drm/rockchip: dsi2: fix DSI_VID_TX_CFG configuration errors
Change-Id: Ibc7483323fc50985eb2542af3ab4193b7c7ad04e
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2022-06-17 18:18:18 +08:00
Guochun Huang
d416f690ee drm/panel: simple: delay init time after panel reset
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: Ifb9b57bb7ce84263dea96958f6a4da9c7a6af545
2022-06-17 18:15:50 +08:00