Commit Graph

1066575 Commits

Author SHA1 Message Date
Sandy Huang
22dbcb386f drm/rockchip: vop2: update cds div and dsc_htotal for 1 slice panel
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Iaf7af6b697add09b08a0984052af4d357add0747
2022-07-04 14:36:15 +08:00
Yu Qiaowei
344479a3b4 video: rockchip: rga3: Fix physical continuous dma_fd not working
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I7ccfbd9bf1af4fc300f9367fc247f300ef82be4b
2022-07-04 11:27:58 +08:00
Cai YiWei
d46850b0ab media: rockchip: isp: support mesh buf count from user for isp30 and isp32
Change-Id: If2473f0a040f97786833fdfdadb2928e5092a575
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-07-04 11:24:41 +08:00
William Wu
970efca023 phy: rockchip: inno_usb2: update phy tuning for rv1106 and rv1103
1. Set different pre_emphasize strength for rv1106 and rv1103.
   - Set pre_emphasize strength to 0x03 for cpu verison_0;
   - Set pre_emphasize strength to 0x01 for cpu verison_1;

2. Bypass Squelch detector calibration to improve receiving
   sensitivity.
   - Before: E-17 248.7mv, E-16 112.6mv
   - After:  E-17 150mv,   E-16 98.8mv

Note:
E-17 and E-16 is on page 3 of the "USB 2.0 Electrical Compliance Test Specification"
https://usb.org/document-library/usb-20-electrical-compliance-test-specification-version-107

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I0d668b3d126583ada03d9675e0175f02537d915f
2022-07-01 21:01:47 +08:00
Zefa Chen
ee66b0c6b8 media: rockchip: vicap fixed error when sditf is NULL
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Iadecf86f27f35090c3daba4c5e28def4ab7ad62c
2022-07-01 18:43:20 +08:00
Yandong Lin
aa1f2eb72b video: rockchip: mpp: fix vepu access ccu crash issue
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I73d0703b2b58d8d23be1c38bf23ce470ffc13be3
2022-07-01 18:38:50 +08:00
Tao Huang
de0913f45a media: rockchip: isp: Add missing sentinel to rkisp_hw_of_match
Fixes: 40e63cc682 ("media: rockchip: isp: build depends on CPU config")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ic8340cc86bc5d58e5e33de34cebfd49df57d7f27
2022-07-01 18:20:24 +08:00
Cai YiWei
6f826853cb media: rockchip: isp: remove associated of cproc and ie for isp3x
Change-Id: If2165bdc9afcd2b5c946be3e013f569f292604a5
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-07-01 16:02:49 +08:00
Cai YiWei
a63cec68e5 media: rockchip: isp: fix isp30 cgc limit config
cgc limit bug in hw, cproc limit replace it.

Change-Id: Id95035e43c471ac11b7e865b55fb4882916ee639
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-07-01 16:02:41 +08:00
Yandong Lin
94a5dd9f32 arm64: dts: rockchip: add vepu support and separate jpege for rk3588
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I530c8213039d52329a05ddc3092ec18f63c4063a
2022-07-01 14:21:53 +08:00
Yandong Lin
c01a3a8ab3 video: rockchip: mpp: Separation vepu2 and vepu2-jpege dev
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: If8d06652729325d7b986f53b50f265d341bcb4e8
2022-07-01 14:21:38 +08:00
Yandong Lin
500137ac8c video: rockchip: mpp: fix jpege core distribution issue
The four jpeg enc core are not the same queue, and there is only one
core in a single queue.
So, can not use queue->cores to get different core.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: If9f56e351af23871e68b83de1917f26e88382dfc
2022-07-01 14:21:29 +08:00
Jon Lin
a6c71606de PCI: aspm_ext: Re-enable LRT for L1SS after power loss
Change-Id: Iedb72ee74660a8f11f38895e06766c3b77728ba3
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-07-01 14:14:11 +08:00
Su Yuefu
9c75f9ae0a media: i2c: sc230ai support 1080p@25fps config
Signed-off-by: Su Yuefu <yuefu.su@rock-chips.com>
Change-Id: I26989d0a74f2572e683e45c76c57b885bd724d37
2022-07-01 14:10:51 +08:00
Mark Huang
46130c99b6 usb: gadget: f_uvc: add device name for mult uvc
Change-Id: Ib19bb07a70019e474f5268475cadbb194fc4288d
Signed-off-by: Mark Huang <huangjc@rock-chips.com>
2022-07-01 11:10:48 +08:00
Damon Ding
e4660fb3bb drm/rockchip: vop2: set reg splice_en to 0 when disabling vp0 in splice mode
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I600ba962d00b7f87b1d8200852c71da8a30ec70d
2022-07-01 11:10:07 +08:00
Damon Ding
91d0c47595 drm/rockchip: vop2: set all display modes of vp1 invalid in splice mode
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I9ea4f1c218cefa1fef0d0625afa3795692a71497
2022-07-01 11:10:07 +08:00
Yu Qiaowei
7f53ead8ab video: rockchip: rga3: Avoid operating on invalid rga_dma_buffer
Update driver version to 1.2.15

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I0b2bdcdc9750ca8051fb000048f3e8df3113c6ca
2022-07-01 10:59:39 +08:00
shengfei Xu
9b12899635 power: supply: charger: add sc8551 charger pump driver
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I9580e0af62cb652c0e90832455d025049edb374a
2022-07-01 09:54:02 +08:00
Jianqun Xu
4fe55239b3 iommu/iova: add iova procfs for each dma iommu
Tested on RK3588 EVB1:

localhost# ls /proc/iova/
av1d-master    fdb90000.jpegd       fdbb0000.iep          fdcb0000.rkisp
fdab0000.npu   fdba0000.jpege-core  fdbd0000.rkvenc-core  fdce0000.rkcif
fdb50400.vdpu  fdba4000.jpege-core  fdbe0000.rkvenc-core  fdd90000.vop
fdb60000.rga   fdba8000.jpege-core  fdc38100.rkvdec-core  rkcif-mipi-lvds
fdb70000.rga   fdbac000.jpege-core  fdc48100.rkvdec-core

localhost# cat /proc/iova/fdc38100.rkvdec-core/used
   0: [0x00000000ffe00000..0x00000000ffeff000]   1024KiB (4094 - 4095)MiB
   1: [0x00000000fff00000..0x00000000fffff000]   1024KiB (4095 - 4096)MiB
used: 2 MiB

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I102e08243b5a0a4cd173e75e2e25f68f1f5b09b6
2022-06-30 14:20:34 +08:00
Algea Cao
02382afd4e drm/bridge: synopsys: dw-hdmi-qp: Use software flt instead of hardware auto flt
Hdmi controller hardware automatic flt has compatibility issues.
For example, the 980B protocol analyzer cannot recognize signal.
Therefore, software flt is needed.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ie32ac705622048ff71cb301e2e06d5673b5889cc
2022-06-30 11:07:56 +08:00
shengfei Xu
bcbe97df5c power: supply: rockchip-charger-manager: support charger manager
support:
1. Use EXTCON Subsystem to detect charger cables for charging
2. Set current limit of battery for over current protection
3. Set power limit of charger for overload protection
4. control charge pump charging current/voltage

Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I97a461996977d418a47e6075202d82c5b87bd17b
2022-06-30 10:14:50 +08:00
Jianqun Xu
0c51523b06 iommu/iova: dump iova when alloc failed
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I8e2d99ed2e22e1c22f11ba67b5a69783d39df87d
2022-06-30 09:58:55 +08:00
Wu Liangqing
7d1bea221a arm64: dts: rockchip: add rk3588s-evb8-lp4x-v10.dts
Change-Id: Idd2e2cbc82445bef0871a155893a089232b1583a
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2022-06-30 09:58:10 +08:00
Finley Xiao
f822ab60e5 rtc: hym8563: Add CLK_IS_CRITICAL for output clock
The 32k clock is used for hp timer on RK3588, and it should be always on.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ie28a16308521fadc33ae91c25215f30bd2265f33
2022-06-30 09:56:31 +08:00
Sugar Zhang
112f4f431d ASoC: rockchip: i2s-tdm: Fix panic on rockchip_dai_tdm_slot
SError Interrupt on CPU0, code 0xbe000011 -- SError
CPU: 0 PID: 7 Comm: kworker/u16:0 Not tainted 5.10.66 #107
Workqueue: events_unbound deferred_probe_work_func
pstate: 60c00009 (nZCv daif +PAN +UAO -TCO BTYPE=--)
pc : _raw_spin_unlock_irqrestore+0x28/0x60
lr : regmap_unlock_spinlock+0x18/0x28
sp : ffffffc01251b850
x29: ffffffc01251b850 x28: ffffff81039afa80
x27: ffffff810349b1b0 x26: ffffffc011aa5d20
x25: 0000000000000000 x24: ffffff8100023000
x23: 0000000000000030 x22: 0000000000003fff
x21: 0000000000001e7f x20: 0000000000000000
x19: 0000000000000000 x18: ffffffc0123d10c0
x17: 0000000000000080 x16: 00000000000000d8
x15: ffffffc0105db5c8 x14: ffffffc011668c18
x13: 0000000062b0642e x12: 7fffffffffffffff
x11: 0000000000000000 x10: 0000000000000030
x9 : 0000000100000001 x8 : ffffff8100325880
x7 : 0000000000000000 x6 : 0000000000000000
x5 : 0000000000000000 x4 : 0000000000000000
x3 : 0000000000003eff x2 : 0000000000001e7f
x1 : 0000000000000000 x0 : ffffff8100023000
Kernel panic - not syncing: Asynchronous SError Interrupt
CPU: 0 PID: 7 Comm: kworker/u16:0 Not tainted 5.10.66 #107
Workqueue: events_unbound deferred_probe_work_func
Call trace:
 dump_backtrace+0x0/0x1c8
 show_stack+0x1c/0x2c
 dump_stack_lvl+0xdc/0x12c
 dump_stack+0x1c/0x64
 panic+0x150/0x3a4
 test_taint+0x0/0x30
 arm64_serror_panic+0x78/0x84
 do_serror+0xe0/0x100
 el1_error+0x94/0x118
 _raw_spin_unlock_irqrestore+0x28/0x60
 regmap_unlock_spinlock+0x18/0x28
 regmap_update_bits_base+0x78/0x9c
 rockchip_dai_tdm_slot+0x5c/0x94
 snd_soc_dai_set_tdm_slot+0xac/0x124
 asoc_simple_init_dai+0x64/0xc4
 asoc_simple_dai_init+0x74/0x178
 snd_soc_link_init+0x28/0x84
 snd_soc_bind_card+0x6b4/0xad0
 snd_soc_register_card+0xf8/0x114
 devm_snd_soc_register_card+0x48/0x90
 asoc_simple_probe+0x2a0/0x348
 ...

Fixes: 2b987b28a8 ("ASoC: rockchip: i2s_tdm: add support for tdm mode")
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ib5ceb2f21bad346285c814aaf4c367e71c44230a
2022-06-30 09:51:16 +08:00
Wangqiang Guo
1d20cb9b78 media: rockchip: hdmirx: fix 1280x720p25 get timing error
According to the CEA-861, 1280x720p25 Hblank timing up to 2680,
and all standard video format timings are less than 3000

Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
Change-Id: I936ac8d6a21754fee6038328fd45eaf028f2dd2f
2022-06-29 19:45:48 +08:00
Wang Panzhenzhuan
fe6fe3c72d media: i2c: ov02b10: fix power on & off sequence
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I6b751f0bc14b6c4e5f1bcb2b46bb6de5e2708330
2022-06-29 19:42:57 +08:00
Wang Panzhenzhuan
b96728f539 media: i2c: s5kjn1: adjust supply sequence to suit spec
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I1f38b2d2d59a068c4b400bdc95aa3582aff23ac0
2022-06-29 19:41:57 +08:00
Wang Panzhenzhuan
fbd4a4eb7e media: i2c: gc8034: adjust supply sequence to suit spec
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I8089970ea321472c3d66e6e65c33954010367da2
2022-06-29 19:41:22 +08:00
Wyon Bi
332f5e008a mfd: max96752f: Fix display error during system suspend/resume
Remove regcache function.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I17c17b8f6d49a6de0248932e4d579bcd4bd623ae
2022-06-29 19:11:19 +08:00
Yu Qiaowei
a9d7cb122c video: rockchip: rga3: remove the binding of RGA2 and 'RGA_MMU'
Since some RGA2 will use IOMMU, it is unreasonable to use RGA2_core for
previous MMU-related judgments.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Ibd1f33cd57178fac9fa04ea752459307b7304d39
2022-06-29 17:46:17 +08:00
shengfei Xu
da1523cb4e power: supply: charger: add sgm4154x charger driver
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: Ib6440de3638622c9b7c8a76950940ffadb47036a
2022-06-29 14:33:17 +08:00
Cai YiWei
9f30930942 media: rockchip: isp: fix warp size error
Change-Id: I33f168bc12ecad0a774261f2b8cf49daf3d8d60f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-06-28 20:20:49 +08:00
Bian Jin chen
73b47f5972 arm64: dts: rockchip: rk3588s-tablet: add simple battery info.
Test: CtsStatsdAtomHostTestCases
android.cts.statsdatom.statsd.HostAtomTests#testFullBatteryCapacity

Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
Change-Id: I516bd06211e02e563d6243985d597964d7596448
2022-06-28 17:22:27 +08:00
Yu Qiaowei
450da90c36 video: rockchip: rga3: Fix config-only mode cannot release request
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I11e38dfc72c0a6ba1300646f7c83707dec9eaaf6
2022-06-28 16:49:38 +08:00
Yu Qiaowei
e19e03fdeb video: rockchip: rga3: RGA3 IOMMU supports physical address
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I1071ce8f38f71a13b5e632fc20bc56b75f333944
2022-06-28 16:49:38 +08:00
Jianwei Fan
7a37791d87 media: i2c: it6616: add it6616 HDMI to MIPI-CSI2 bridge driver
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: I8bfd9c90ae8517fd307d6831d5325187756c90ea
2022-06-28 15:39:22 +08:00
Jianwei Fan
280c9a89fa include: rk-camera-module: add hdmi2mipi-csi mode control
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: Ia1257ec877b82ac6ba3f5b283960742b61908215
2022-06-28 15:39:22 +08:00
Cai YiWei
a4678e961a media: rockchip: isp: api for video to free tb reserved memory
Change-Id: Ia7ca669fac6c58a700fff9f1f18d51210da484b7
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-06-28 15:14:45 +08:00
Cai YiWei
6977a0278f media: rockchip: isp: api get fast stream output info
Change-Id: I770906113078104b22731a83bf3280331f3ac15e
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-06-28 15:14:45 +08:00
Xing Zheng
c10b7526e9 ASoC: codecs: rv1106_codec: fix the incorrect range of ADC ALC
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I3d01fafe78d5ac70d20fc310d0727a5e7c516bdc
2022-06-28 15:11:52 +08:00
Algea Cao
69e9bf7101 drm/bridge: synopsys: dw-hdmi-qp: Don't re-training when switch color in frl mode
In the frl mode, hdmi output in fixed rate. Don't re-training
It can avoid the abnormal of 8/10 bit deep color switching, and
reduce the black screen time during switching, so that the user
experience is better.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I3207639fdfdbfda7bad26b151358cae7a79037d3
2022-06-28 11:40:38 +08:00
Zhang Yubing
727678768b drm/rockchip: vop2: set active vp for splice video port
When the vop run in splice mode, 2 video port is used. But just
the main video port set as active vp, and the splice video port
not.

When attaching a win to a vp, a win for main video port set the
main video port to its vp mask, a win for splice video port set
the splice video port to its vp mask. The vp mask will attach
to the win's power domain finally.

When set a power domain off, it's a constraint that win power
dowmain's vp mask is included in vop active vp. For splice video
mode, it can's satisfied this condition, which will not real
set the power domain off.

To fix this issue, it need to set the splice video port as active
vp.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: If60d057c21c1f24db0c6e3001c2da2f5a8b46f27
2022-06-27 18:56:59 +08:00
Lin Jinhan
96f4d4808f ARM: dts: rockchip: rv1106-smd-cam: fix ircut config error
1. ircut should use 'lens-focus' as label rather than 'ir-cut' in
 kernel-5.10.
2. swap open and close gpio setting.

Change-Id: I44f55c0e455d0ee19c14207928bafadeac934703
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2022-06-27 18:25:08 +08:00
shengfei Xu
18e0f4ff9f power_supply: Add power supply type "Charge Pump"
Introduce a new power supply type "Charge Pump" under the power_supply
class. Also, add power supply properties corresponding to power supply
type charge pump.

Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: Ib51bfd7c69b549cad4a254bd0c3f50629ea211a3
2022-06-27 16:38:29 +08:00
Yu Qiaowei
560bc18d7e video: rockchip: rga3: modify the check of virtual stride
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I6c955fc1c746629142494c4c6d6f2f49c94d0d7c
2022-06-27 15:55:23 +08:00
Yu Qiaowei
fc308534be video: rockchip: rga3: optimize struct rga_hw_data
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: If48f4748409226dc73bdf0822eb832ca09bca86e
2022-06-27 15:55:23 +08:00
Elon Zhang
9293a37349 ARM: dts: rockchip: rv1106-thunder-boot: remove no-map for rtos mem
no-map property added in rtos reserved memory will cause
kernel can not boot up issue.

Fixes: 60dbf2d80a ("ARM: dts: rv1106-thunder-boot: reserve 256KB~512KB for hpmcu")

Signed-off-by: Elon Zhang <zhangzj@rock-chips.com>
Change-Id: I24f588a54e88d7c546cd3e53bd7aa5a0f5a46476
2022-06-27 15:44:47 +08:00
Ziyuan Xu
e23ddb2ee4 dma-buf: rk_heaps: call rk_add_default_cma_heap() early when ROCKCHIP_THUNDER_BOOT_ISP=y && !CONFIG_INITCALL_ASYNC
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ief7da5a7358b4e0625c68e2b51583f89cb0362c6
2022-06-27 12:07:35 +08:00