Commit Graph

1072232 Commits

Author SHA1 Message Date
Wang Panzhenzhuan
658e583bea media: i2c: ov13855: adjust some config for cts
1. 4224x3136@15fps & 2114x1568@60fps only enable for debug
2. fix some regs setting

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Iab37357aea55a66c51ef70a76383b8b7b26ffd14
2022-08-08 09:49:06 +08:00
Zhang Yubing
7c699c81b4 drm/rockchip: vop2: set black background as default config for rk3588
For RK3588, the reset value of background is 0xa0080200, which
will enable background and output a grey image. But the reset
value is just valid in first frame and disable in follow frames.
If the panel backlight is valid before follow frames. The screen
may flick a grey image. To avoid this phenomenon appear, setting
black background after reset vop.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Iadf805a26d84c1dc49cb64a637588c43ecd32977
2022-08-05 20:53:38 +08:00
Sugar Zhang
0d6541041f ASoC: rockchip: dlp: Fix wrong HW delta assign
Always update delta into ref, obviously, it's playback.

Fixes: 9975bc50f3 ("ASoC: rockchip: Add support for Digital Loopback")
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ie9507d87d56811cccd3ea884370e1e972aebf962
2022-08-05 20:49:53 +08:00
Herman Chen
9f7d75a79c video: rockchip: mpp: rkvenc2: Allow disabled rkvenc-core dtsi
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: Ic2bc6b469e7efbac9b03666a5a0cf791c130ab5b
2022-08-05 20:46:58 +08:00
Wyon Bi
495e32cf39 mfd: max96745: Fix power on reset
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I8b325e09dff1e0e9bf2a5262d60e803986e52845
2022-08-05 08:17:17 +00:00
Wyon Bi
bf78aaf1e6 drm/bridge: maxim-max96745: Add video status check
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I8563e1c8c885034b7c1cb61389ce8cc97c8114c3
2022-08-05 08:17:17 +00:00
Wyon Bi
176a78c0ce drm/bridge: maxim-max96745: Fix possible irq unbalanced
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Id26d457f36fb2451fae7223c3876388bb8ab9adc
2022-08-05 08:15:17 +00:00
Wyon Bi
416f7f52af drm/bridge: maxim-max96752f: Add video status check
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I3880a68f9a6ec2aef2b82a568d4f40dd39feeaa0
2022-08-05 08:15:17 +00:00
Wyon Bi
be3554a423 drm/rockchip: dw_dp: Find possible connector from encoder
Fixes: de30a9e538 ("drm/rockchip: dw-dp: Support dp show uboot logo")
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ib0e95ad4eaa88c7fd84f393d8c2dcceb4962a1b9
2022-08-05 08:15:17 +00:00
Yu Qiaowei
591a5a0071 video: rockchip: rga3: add debug node for hardware info
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I7edd4ebdac6235017631e1d7fa828d2e6362998d
2022-08-05 16:11:10 +08:00
Yu Qiaowei
75478f6429 video: rockchip: rga3: wakeup after updating status
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I74936fec3984cc19ed8720ccf9873b7dd561f47b
2022-08-05 16:11:10 +08:00
Sugar Zhang
c4047fb445 ARM: configs: rv1126: Update config by savedefconfig
Move ext device drivers (e.g. sensors) into segment config.

Usage:

  make ARCH=arm rv1126_defconfig rv1126-evb.config

Generated by:

  make ARCH=arm rv1126_defconfig
  cp .config tmp.config
  make ARCH=arm menuconfig
  bala...
  ./scripts/diffconfig -m tmp.config .config >
  arch/arm/configs/rv1126-evb.config

Updated by:

  make ARCH=arm rv1126_defconfig
  cp .config tmp.config
  make ARCH=arm rv1126_defconfig rv1126-evb.config
  make ARCH=arm menuconfig
  bala...
  ./scripts/diffconfig -m tmp.config .config >
  arch/arm/configs/rv1126-evb.config

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Id2faada752855fa041f67492669cfa4387c48c67
2022-08-05 15:28:07 +08:00
Nickey Yang
4706e5707c ARM: dts: rockchip: rv1126: change dsi and mipi dphy definition
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: Id60603657b39d4c01cd59af4cdfefd28031aa6f7
2022-08-04 18:13:34 +08:00
Nickey Yang
3198142cf2 phy/rockchip: inno-dsidphy: support rv1126
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: I84fb7a922528894c7c14c95902f0e273640834d6
2022-08-04 17:46:37 +08:00
Nickey Yang
ebcd655cc2 drm/rockchip: dsi: add rv1126 support
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: Ic3a8df6294aea290c7966f107333cc46f6fd63ba
2022-08-04 17:46:31 +08:00
Chen Shunqing
8f9d5e3447 media: rockchip: hdmirx: set to black screen when avmute
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
Change-Id: I5462df9e74b373c92ed412dbc3431e596a2e7ff3
2022-08-04 16:41:32 +08:00
Wyon Bi
1049fe8294 arm64: rockchip_defconfig: Enable maxim serdes driver
Enable the maxim serdes driver used on RK3588 vehicle.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I0ed611d2a14438e1fab76f97c2093804f4575940
2022-08-04 16:38:56 +08:00
William Wu
b9b76d08b5 phy: rockchip: inno-usb2: add phy reset during resume
On most of rockchip platforms, the usb2 phy lost power
during deep sleep. So we need to reset phy during pm
resume to recovery clock to usb controller.

When do sleeptest on rk3588 evb1, without this patch,
it may fail in ehci_resume or ohci_resume, because
the ehci/ohci controller can't get clock from usb2 phy.

Note that the phy reset is optional in devicetree, so
it needs to check the reset_control of phy before phy
reset operation to avoid unnecessary delay.

Fixes: ba8a6e65a7 ("phy: rockchip: inno_usb2: only reset phy if deassert iddq for rk3588")
Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I31dee9baea472d9e314eca6cb9f78b2aab0e5353
2022-08-04 16:21:02 +08:00
Damon Ding
d185ae34d0 drm/rockchip: dsi2: encoder->crtc maybe NULL
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I4f22a95f33ee012c47e2715aef0d66ec0b209b30
2022-08-04 16:15:33 +08:00
Zefa Chen
c0122f5de1 include: uapi/linux/rk-camera-module.h add RKMODULE_GET_READOUT_LINE_CNT_PER_LINE
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ic89639c97016d993a431a7f7ea67c05ecf62d428
2022-08-04 16:14:04 +08:00
Zefa Chen
5f2f434198 media: rockchip: vicap fixed dvp segfault
[    0.463070] Unable to handle kernel NULL pointer dereference at virtual address 00000000
[    0.457836] rkcif rkcif_dvp: rkcif driver version: v00.01.0a
[    0.458009] rkcif rkcif_dvp: attach to cif hw node
[    0.458033] rkcif rkcif_dvp: rkcif wait line 0
[    0.458056] : terminal subdev does not exist
[    0.463620] rkcif_dvp: There is not terminal subdev, not synchronized with ISP
[    0.464566] [00000000] *pgd=00000000
[    0.468850] Internal error: Oops: 5 [#1] PREEMPT SMP ARM
[    0.469332] Modules linked in:
[    0.469627] CPU: 1 PID: 1 Comm: swapper/0 Not tainted 5.10.110 #273
[    0.470186] Hardware name: Generic DT based system
[    0.470637] PC is at subdev_notifier_complete+0x2c0/0x3a0
[    0.471124] LR is at subdev_notifier_complete+0x34c/0x3a0
[    0.471608] pc : [<b06587e4>]    lr : [<b0658870>]    psr: 60000013
[    0.472169] sp : b86dbc78  ip : 0001c52c  fp : b1708030
[    0.472640] r10: b170801c  r9 : b1708078  r8 : b1708238
[    0.473113] r7 : b1708220  r6 : b1708220  r5 : 00000000  r4 : b170fcb0
[    0.473697] r3 : 00000000  r2 : 00000000  r1 : 60000013  r0 : b170fcb4
[    0.474282] Flags: nZCv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment user
[    0.474922] Control: 10c5387d  Table: 0000406a  DAC: 00000055
[    0.475442] Process swapper/0 (pid: 1, stack limit = 0xe78b9f4a)

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ic36dfc2cbc0928e39844263647eee082e5229e95
2022-08-04 16:14:04 +08:00
Allon Huang
731602bff1 ARM: dts: rv1126: mipi csi host add cru rst
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I3cd48af1b26bba4e8ae23aa6a64b14420dc87de7
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2022-08-04 16:14:04 +08:00
Zhang Yubing
0b955c148d drm/rockchip: vop2: close esmart pd when disable vop
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Ic12297df5e47e31e5eb3472a89030b158477ed60
2022-08-04 16:11:30 +08:00
Herman Chen
c26747a966 video: rockchip: mpp: rkvenc2: Add disable_work
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: Icd707042ba9698582a4472c649bf3f4146e73661
2022-08-04 16:07:39 +08:00
Yao Xiao
04e0902678 soc: rockchip: rk3308b: grf: support switching between sdmmc and uart2
Change-Id: I965f3262da493cc374fad3a0949055e3656b4c5b
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2022-08-04 15:55:33 +08:00
Ziyuan Xu
40a81aa549 ARM: configs: rv1106-battery-ipc.config: enable flock feature
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I34e6c2a7074c81888440635a834b163aa2b96022
2022-08-04 15:53:13 +08:00
Yiqing Zeng
93fb08ae40 ARM: dts: rockchip: rv1106-evb-cam: os04a10 reset pin active low
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I35858dd1bd82b4034c2bbe5ae140e0a0b51702ff
2022-08-04 15:50:51 +08:00
Jianwei Fan
6b4c37ce13 media: i2c: lt6911uxc: add ioctl RKMODULE_GET_HDMI_MODE
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: Iffde98bbf7529122e9c474ad91de03e949cbea22
2022-08-04 15:49:49 +08:00
Jianwei Fan
25f5becb7d media: i2c: lt7911d: add ioctl RKMODULE_GET_HDMI_MODE
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: Iedacb279f362651deaba63b44b05a974b1dc3448
2022-08-04 15:49:31 +08:00
William Wu
5b8d53d61f phy: rockchip-naneng-usb2: enable host port wakeup for rv1126
RV1126 PMU supports to enable USB interrupt as wakeup
source, include USB PHY irqs from OTG port and Host port.
In additionally, it needs to enable Host port wakeup in
GRF_SOC_CON0.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: Ia4d2b868a42afb9fe35d444d5df557c3b6c12b37
2022-08-04 15:46:56 +08:00
Tao Huang
31f044a419 Revert "[xjh] gsensor with debug open"
This reverts commit 9d886535b3.

Remove unused driver.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ic891dbb5e5187a0310563ed0c4b334139ad98c80
2022-08-03 20:33:03 +08:00
Tao Huang
07fa6f6cc7 Revert "add gsensor mma7660 driver"
This reverts commit e1a1842321.

Remove unused driver.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I28af49c11fdd91e30e2353ce1ff55f1bc5586e14
2022-08-03 20:30:33 +08:00
Tao Huang
80537780b9 Revert "block: partitions: add rockchip partition support"
This reverts commit 7fc89efff7.

Remove unused driver.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I7da36d499d3aab8cf41ede48d3203437e9e32cef
2022-08-03 20:10:03 +08:00
Tao Huang
30d7d1203e Revert "ARM: rockchip: Convert resume code to C"
This reverts commit 9e9a903f9e.

Remove unused driver.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Id6eb8c90b1890ef2711d48950143f4502b2383cb
2022-08-03 20:03:07 +08:00
Tao Huang
817e543445 Revert "rockchip: pm: add deep sleep support for rk3288"
This reverts commit 580ad3d371.

Remove unused driver.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ic665aa90b9ab1a0957def2f2fdaf4f3e7ccd1cbc
2022-08-03 20:02:59 +08:00
Zefa Chen
9c80afd282 media: i2c: os04a10: fixed segfault for power_off
[    3.193377] ------------[ cut here ]------------
[    3.193394] WARNING: CPU: 2 PID: 1 at drivers/regulator/core.c:2159 _regulator_put+0x34/0xc8
[    3.193400] Modules linked in:
[    3.193410] CPU: 2 PID: 1 Comm: swapper/0 Tainted: G        W         5.10.110 #4
[    3.193416] Hardware name: Rockchip RK3568 EVB1 DDR4 V10 Board (DT)
[    3.193423] pstate: 80c00009 (Nzcv daif +PAN +UAO -TCO BTYPE=--)
[    3.193430] pc : _regulator_put+0x34/0xc8
[    3.193437] lr : regulator_put+0x3c/0x54
[    3.193441] sp : ffffffc011e7bad0
[    3.193446] x29: ffffffc011e7bad0 x28: 0000000000000000
[    3.193455] x27: ffffffc011490440 x26: 0000000000000000
[    3.193464] x25: ffffffc011ca2880 x24: ffffffc0112a07f6
[    3.193473] x23: ffffff8004d71700 x22: 0000000000000008
[    3.193481] x21: 0000000000000002 x20: ffffff8004d71b00
[    3.193490] x19: ffffff8004d71b00 x18: ffffff80028f5550
[    3.193500] x17: 0000000000000000 x16: 0000000000000000
[    3.193509] x15: ffffff80026b8610 x14: ffffff80028f5488
[    3.193518] x13: 0000000000000016 x12: 0000000000000018
[    3.193527] x11: 0000000000000018 x10: ffffff80026b8630
[    3.193536] x9 : ffffffc0105d7eec x8 : ffffff80026b8610
[    3.193544] x7 : ffffffc011e7b998 x6 : 0000000000000001
[    3.193553] x5 : ffffff8002718000 x4 : 0000000000000000
[    3.193562] x3 : 0000000000000000 x2 : 0000000000000000
[    3.193571] x1 : ffffff8002718000 x0 : 0000000000000001
[    3.193579] Call trace:
[    3.193587]  _regulator_put+0x34/0xc8
[    3.193593]  regulator_put+0x3c/0x54
[    3.193600]  regulator_bulk_free+0x54/0x5c
[    3.193607]  devm_regulator_bulk_release+0x28/0x34
[    3.193616]  release_nodes+0x1f4/0x224
[    3.193622]  devres_release_all+0x5c/0x60
[    3.193630]  really_probe+0x218/0x46c
[    3.193637]  driver_probe_device+0x138/0x148
[    3.193644]  device_driver_attach+0x50/0x7c
[    3.193651]  __driver_attach+0x150/0x154
[    3.193657]  bus_for_each_dev+0x7c/0xc8
[    3.193664]  driver_attach+0x30/0x3c
[    3.193670]  bus_add_driver+0x1b4/0x1fc
[    3.193676]  driver_register+0xc0/0xf8
[    3.193684]  i2c_register_driver+0x70/0xb4
[    3.193692]  sensor_mod_init+0x28/0x34
[    3.193699]  do_one_initcall+0xa0/0x1e8
[    3.193707]  kernel_init_freeable+0x2a4/0x2ac
[    3.193714]  kernel_init+0x20/0x11c

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I7ce7fc064ddb5bbe717245f1aaf83fccafd3db02
2022-08-03 19:15:53 +08:00
Cai YiWei
754b4876e8 media: rockchip: ispp: remove qbuf to get vaddr
Change-Id: I30746c2d3ed3249d7e7b1d80e73e66fe23ee0e57
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-08-03 19:14:31 +08:00
Cai YiWei
594e943da6 media: rockchip: isp: fill extend line data for fix dhaz bug
Change-Id: I7271a57f4642aec71614598eb76df6fbfcdfe8b1
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-08-03 19:14:31 +08:00
XiaoTan Luo
eddc22cf2a arm64: rockchip_defconfig: enable aw883xx for 3588s tablet
Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Change-Id: I238bf5390b33f5fd5871af6f7c43f050174c8bff
2022-08-03 19:06:31 +08:00
XiaoTan Luo
7e755ee50b ASoC: codecs: add aw883xx smart PA
Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Change-Id: Iad30b10913ff922e71ec21cdb59ddd829ca69164
2022-08-03 19:05:38 +08:00
Su Yuefu
43c50a5fca media: i2c: sc3336 support fastboot
Signed-off-by: Su Yuefu <yuefu.su@rock-chips.com>
Change-Id: I092588f535a042c92dcc1e643c9f192825aef246
2022-08-03 18:54:31 +08:00
Su Yuefu
114f494bff media: i2c: add sc3338 sensor driver
Signed-off-by: Su Yuefu <yuefu.su@rock-chips.com>
Change-Id: I997ceaadf600ce377ad96beeac04add1250a1f7b
2022-08-03 18:30:00 +08:00
Sandy Huang
0184800224 arm64: dts: rockchip: px30: enable vop iommu rockchip,disable-device-link-resume
if out of this property, iommu will be enable by pm runtime and use
wrong domain, this will lead to vop iommu pagefault.

init_loader_memory()  --> use drm private domain
  -> __pm_runtime_resume -> rk_iommu_enable  --> use iommu domain
    -> vop iommu pagefault

after this commit:
init_loader_memory()  --> use drm private domain
  -> rockchip_drm_dma_attach_device()  --> instead of drm private domain
    -> rockchip_drm_dma_attach_device() --> enable iommu

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I797747e1f9eecac9feca8b844f66714b657a22f2
2022-08-03 18:28:32 +08:00
Zefa Chen
3a6edfd376 media: spi: rk1608: support get dphy_param from link sensor
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I60ad74821c814f67998a2d742cc67bb9bfdeed6e
2022-08-03 18:26:37 +08:00
Sach Lin
9789f91056 media: spi: rk1608: add quick stream ioctl.
Signed-off-by: Sach Lin <sach.lin@rock-chips.com>
Change-Id: I452628fd2780e049f91ab61563951f9856017a91
2022-08-03 18:26:37 +08:00
Sach Lin
dd78fa0bf6 arm64: dts: rockchip: rk3588-evb7-cam-8x: add rk1608 link sensor node.
Signed-off-by: Sach Lin <sach.lin@rock-chips.com>
Change-Id: Ief852a580f0c19663e20b129cd52aebc0ac62e08
2022-08-03 18:26:37 +08:00
Sach Lin
994bba6e48 media: spi: rk1608: support link sensor.
If sensor linked to rk1608, driver will use
sensor fmt/interval/fps and timing information.

Signed-off-by: Sach Lin <sach.lin@rock-chips.com>
Change-Id: Ie004e1fb7970c15254f3e7c866f367dccfa9dec3
2022-08-03 18:26:37 +08:00
Zhang Yubing
d1fe482eec drm/rockchop: vop2: set extend clk vp mask
When a extend clk is used before enter kernel, it need set the vp
mask to mark that it have been used by a video port

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Ie6f0419621e8b250adca1783355318d4a9a2412d
2022-08-03 18:24:13 +08:00
Felix Zeng
0add4d704d driver: rknpu: Update rknpu driver, version: 0.8.0
* Add SRAM memory allocation and manager support
* Improve job submit stability
* Add reset and mm node for debugging

Signed-off-by: Felix Zeng <felix.zeng@rock-chips.com>
Change-Id: I893e732baf54ba59ace8139964cee6985a0e3b34
2022-08-03 17:54:01 +08:00
Tao Huang
e2fedc046d arm64: rockchip_gki.config: Enable CONFIG_SND_SOC_ES8326
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I49c865cb71e4e6903a05c2af57cfd88a08e133e1
2022-08-03 15:34:09 +08:00