Commit Graph

1061144 Commits

Author SHA1 Message Date
Sugar Zhang
e108ff9f6f drm/rockchip: dw_hdmi: Handle aud clk for hdmi qp
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I9a8abc55175a1c1219d7731d358a63451de60238
2021-11-25 18:25:22 +08:00
Wang Jie
ee356cb5a6 arm64: dts: rockchip: rk3588s-tablet: modify Type-C0 SBU1 and SBU2 gpio
Fixes: c87b8fcb8a ("rk3588s-tablet: add dp display for rk3588s tablet")
Fixes: 2171d7fcf6 ("rk3588s-tablet: modify Type-C0 vbus configuration")

Change-Id: I65f7289fe8769a0982a4e92e3d885de3cb7ce401
Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
2021-11-25 17:22:00 +08:00
Wyon Bi
80db5a7bc7 drm/rockchip: analogix_dp: Add support for split mode
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I7be492886ddd595a01415d92ce4a56ce9d69b21b
2021-11-25 16:59:40 +08:00
Wyon Bi
422e65990b drm/panel: simple: Silence missing connector_type warning
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I1f028658818ce15cdcf4678504c0b8203d2569a7
2021-11-25 16:59:40 +08:00
Jianqun Xu
9ae2518478 video/rockchip: rga3: support dma-cache
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Idbbc41e4e9d95ea43c48b1fbb7ae9cf52f26b025
2021-11-25 16:52:49 +08:00
Jianqun Xu
97516c0fee dma-buf: support to cache dma-buf-attachment
This patch try to fix this issue by caching the dma-buf attachments and
stores the cache list to dtor_data of dma-buf structor. The dma-buf
attach with cache will try to find cached attachment first and return
the valid instance.

This patch also store the deattch operation to dtor of dma-buf structor
by dma_buf_set_destructor.

Change-Id: I4778c3328825f6c04f5d2608994e62fe3478bf1b
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-11-25 16:35:27 +08:00
Jianqun Xu
9900aebfb0 drm: rockchip: use private rockchip_gem_destroy
Change-Id: Ia8f3741fa5f66bcba95e210bfdf55866964ea002
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-11-25 16:32:46 +08:00
Liam Mark
345084a2ed BACKPORT: ANDROID: GKI: dma-buf: Add support to set a destructor on a dma-buf
dma-buf destructor support is useful as it allows clients an opportunity
to undo any attributes, such as security attributes, they have applied to
the dma-buf's memory.

The destructor is called when the dma-buf is freed, if the destructor
returns an error the dma-buf's exporter release function is not called in
order to ensure that memory which has not been properly cleaned up isn't
returned to the system.

Signed-off-by: Liam Mark <lmark@codeaurora.org>
Signed-off-by: Swathi Sridhar <swatsrid@codeaurora.org>

[surenb: cherry-picked from:
3af4db1543c9 "dma-buf: Add support to set a destructor on a dma-buf"]

Bug: 150611569
Test: build
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I2d435b99fb9b1747bc1b32a4e0d484957614a5a3
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-11-25 16:29:03 +08:00
Ding Wei
458fe9eb4e video: rockchip: mpp: Issue for CONFIG changes but mpp_service.c not
rebulid

Change-Id: I5a243328da4cc932864aedda919d6433dc20c367
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-11-25 16:28:21 +08:00
Cai YiWei
c03c62661f media: rockchip: isp: fix scale resolution limit
Change-Id: I2af84a93f335ae19d42075907f599f73af092619
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-25 16:19:53 +08:00
Wu Liangqing
8be08d7f7c arm64: dts: rockchip: rk3588s-tablet: add vdpu
Change-Id: I9d7d8e2998098712d9fa580defd7ed0bf9f45293
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2021-11-25 15:29:38 +08:00
William Wu
06ba2dcb67 phy: rockchip: naneng-combphy: Add config for rk3588 usb3
This patch aims to configure usb for better compatibility.
1. Set ssc downward spread spectrum.
2. Enable the adaptive Continuous Time Linear Equalizer (CTLE).
3. Set ssc to 31.5KHz for 24MHz ref clk.
4. Adjusts the PLL the parameters for USB Rx to pass the
   Receiver Jitter Tolerance Test, and it's helpful to
   improve the USB 3.0 signal compatibility.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: Ide2e2325e9d273c0ebbcd9786eb256e85a042c1a
2021-11-25 15:28:35 +08:00
Jianwei Fan
7869ac63e7 media: i2c: ov13855: fix gain register error
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: I0c72c207a01f693ee0115f4c30ae08a3056a044a
2021-11-25 15:25:19 +08:00
Longjian Lin
47354855d9 arm64: dts: rockchip: rk3588s-tablet:add bt pinctrl
Signed-off-by: Longjian Lin <llj@rock-chips.com>
Change-Id: I1395a79683b612d154fb9b6257fdc72a4da9533b
2021-11-25 15:20:09 +08:00
Longjian Lin
69d513e082 arm64: dts: rockchip: rk3588-evb1-lp4: add bt pinctrl
Signed-off-by: Longjian Lin <llj@rock-chips.com>
Change-Id: Ic9267574527bfd28ba8cd7218617b963314bb6ef
2021-11-25 15:19:50 +08:00
Zefa Chen
dc5d09618c media: rockchip: rkcif fix some errors, these errors may cause the sub-device call to fail
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I20b742c2c75324914bbb1a9405017c18900df121
2021-11-25 15:11:26 +08:00
Zefa Chen
de253638e3 media: rockchip: cif clean unready subdev before async subdev-itf
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I2049f83a9d552109acca86d37d81ef0ceb2e9687
2021-11-25 15:11:06 +08:00
Wyon Bi
6f62dc64fe Revert "clk: rockchip: rk3588: export pclk_vopgrf id for vop"
This reverts commit 9c9db5fd41.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I11ef7f3e52cb7512acbc638a67e75c9295ddbbdd
2021-11-25 15:10:00 +08:00
Wyon Bi
9522113735 arm64: dts: rockchip: rk3588s: Fix vop pclk clock id
Fixes: 01ac874b5c ("arm64: dts: rockchip: rk3588s: Add pclk to vop node")
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I4e3a753d5017987e9803d5e4d1843a20e9405edc
2021-11-25 15:09:41 +08:00
David Wu
dfc1ca96ca arm64: dts: rockchip: Fix tx delayline for rk3588-evb1 and rk3588-evb2
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Icd2bf56f8aa06fd379ad37a8eb65ff36d53ad52d
2021-11-25 15:04:34 +08:00
Wyon Bi
73cbd8621f drm/rockchip: analogix_dp: Add audio support for rk3588
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: If68c6102e8c3d129ad5777cf1310b6226f4fb16d
2021-11-25 15:03:53 +08:00
Sugar Zhang
0e48a7ef3c ASoC: hdmi-codec: Fix mismatch channel status array
Fixes:
[smatch] sound/soc/codecs/hdmi-codec.c:504 hdmi_codec_hw_params()
error: memcpy() 'hcp->iec_status' too small (5 vs 24)

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I6dfa154c95159fa7563faf52a6fdbd87e0f398a9
2021-11-25 14:21:23 +08:00
Sugar Zhang
4142064c7f ASoC: rockchip: i2s: Add support for IEC958
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I58243b194cd15b7d57e9b580d6917c2e054a1e67
2021-11-25 14:20:56 +08:00
Sugar Zhang
6b7fb9a6c9 drm/bridge: synopsys: Fix register access panic when PD off
Internal error: synchronous external abort: 96000010 [#1] SMP
Modules linked in: bcmdhd
CPU: 3 PID: 958 Comm: aplay Not tainted 5.10.43 #275
Hardware name: Rockchip RK3588 EVB1 LP4 V10 Board (DT)
pstate: 20400089 (nzCv daIf +PAN -UAO -TCO BTYPE=--)
pc : regmap_mmio_read32le+0x18/0x34
lr : regmap_mmio_read+0x50/0x7c
sp : ffffffc013f7b6e0
x29: ffffffc013f7b6e0 x28: ffffff8406dc9200
x27: 0000000000000000 x26: 0000000000000000
x25: 0000000000000000 x24: 0000000000008106
x23: 0000000000000000 x22: ffffff84013c1400
x21: 0000000000000aa8 x20: ffffff8402478200
x19: ffffffc013f7b764 x18: 0000000000000000
x17: 0000000000000000 x16: ffffff84026a6844
x15: 0000000000000000 x14: 0000000000000000
x13: 0000000000000000 x12: 0000000000000008
x11: ffffffc010c2d150 x10: 0000000000000000
x9 : ffffffc01081bc80 x8 : ffffffc0136a0aa8
x7 : 0000000000000000 x6 : 0000000000000000
x5 : 0000000000000000 x4 : 0000000000000000
x3 : 0000000000000000 x2 : ffffffc013f7b764
x1 : 0000000000000aa8 x0 : ffffff8402478200
Call trace:
 regmap_mmio_read32le+0x18/0x34
 _regmap_bus_reg_read+0x24/0x30
 _regmap_read+0x94/0x14c
 _regmap_update_bits+0x98/0x110
 regmap_update_bits_base+0x70/0xa0
 hdmi_modb+0x38/0x44
 dw_hdmi_qp_i2s_hw_params+0x88/0x1ec
 hdmi_codec_hw_params+0x148/0x214
 snd_soc_dai_hw_params+0x68/0xbc
 soc_pcm_hw_params+0x28c/0x508
 snd_pcm_hw_params+0x140/0x3a0
 snd_pcm_common_ioctl+0x1284/0x1a40
 snd_pcm_ioctl+0x3c/0x54
 __arm64_sys_ioctl+0x84/0xbc
 el0_svc_common+0xac/0x184
 do_el0_svc+0x88/0x94
 el0_svc+0x10/0x1c
 el0_sync_handler+0x80/0x134
 el0_sync+0x1a0/0x1c0

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I85117d4375e6f32800188b37f432b9d1a41e738d
2021-11-25 14:19:13 +08:00
Sugar Zhang
93b6e9072f drm/bridge: synopsys: Add bitstream support for hdmi-qp
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I83e5558507994351b182a503325a56507f1867ee
2021-11-25 14:18:32 +08:00
Andy Yan
b634806e33 drm/rockchip: vop2: Always disable a zero actual_w/h window
This fix a case that a right part of a window in splice mode
that not disable when the right part isactual_w/h is zero, that
will cause a iommu page fault.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I71cfb819d200e642ef343c2d37f818772aa7e329
2021-11-24 19:46:06 +08:00
Andy Yan
1b5c4ae548 drm/rockchip: vop2: Both overlay mode of two VP should set the same in splice mode
Both overlay mode of two Video Ports should be set the
same in splice mode.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: If613bc91e18c585140fdcf6f6ac72d0e6aa434e2
2021-11-24 18:41:33 +08:00
Tao Huang
da8368cb44 Revert "arm64: dts: rockchip: rk3588-linux: Enable clk/pd always on"
This reverts commit f27234ade9.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I845de161f81e1a271c3018bdfbc253bd0d8f6f1a
2021-11-24 17:42:36 +08:00
Tao Huang
53b328df55 Revert "arm64: dts: rockchip: rk3588-android: Enable clk/pd always_on"
This reverts commit 06540af0a9.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5498aaf4df787a0046e89bd246acb59f46ef410b
2021-11-24 17:41:59 +08:00
Zhang Yubing
56be273aff phy: rockchip: usbdp-phy: set lane mapping when dp power on
dp lane mapping need set vo0grf, but vo0grf is in PD_VO0.
dp controller also in PD_VO0. Setting the vo0grf register
in the dp power on sequence, when the dp controller has
hold the PD_VO0.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: If944daf5ebd71ae9ebaa58dc1f9493a3022a2eaf
2021-11-24 17:41:01 +08:00
Yiqing Zeng
c77fca77ec media: i2c: imx464 set frame rate to 30fps
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: Iaa665c91da6c5526d15f1a3e3e68c9fc74b345a5
2021-11-24 17:36:30 +08:00
shengfei Xu
4d20d622f2 arm64: dts: rockchip: rk806: add init voltage for vdd_vdenc_s0
setting init voltage in uboot

Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I0842381dd44c83407db51368299bf38c6417f9f0
2021-11-24 17:32:23 +08:00
Frank Wang
b779fc7f0a arm64: dts: rockchip; rk3588: add u2phy-grf property for usbdp phy
This adds "rockchip,u2phy-grf" phandle for USBDP Combo PHY.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: Ia170eda889cdf8a45375887f460fcebd48ac88c8
2021-11-24 16:24:19 +08:00
Frank Wang
ee4eae4931 phy: rockchip: usbdp: add bvalid control for usb
For RK3588 EVB design, the USB vbus is always pull-up, and the USB
controller can not detect that the device was unattached. So based on
the orientation switch process, control the bvalid status via writing
U2PHY GRF when the Type-C controller detected that the device was
attached or unattached.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: Ied27dea686895c180ec7b5d33a06af888a9fd64d
2021-11-24 16:24:19 +08:00
Frank Wang
e310db187e dt-bindings: phy: rockchip-usbdp: add u2phy-grf property
Add "rockchip,u2phy-grf" property for usbdp combo PHY.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: Ieb58efce53446f45f188e25192e0b3a2835675bc
2021-11-24 16:24:19 +08:00
Shaoxing Chen
fb9d318c91 arm64: dts: rockchip: add gmac0 and gmac1 node for rk3588-evb4
Signed-off-by: Shaoxing Chen <csx@rock-chips.com>
Change-Id: Ic418ab872ecbf6b3a6ea99a4b3003529a21ff8a5
2021-11-24 15:26:31 +08:00
Lin Jinhan
56834fc1ea crypto: rockchip: add rk3588 support
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: If2f94bd8a57028a77df2f53f58bb117b4adc797a
2021-11-24 15:16:20 +08:00
Damon Ding
44f761d9fb arm64: dts: rockchip: rk3568-evb2-lp4x-v10-bt1120-to-hdmi: modify the bus-format definition
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I2c6ab9a586604156504394ce17cf3074cecf653c
2021-11-24 15:06:06 +08:00
Wang Jie
2171d7fcf6 arm64: dts: rockchip: rk3588s-tablet: modify Type-C0 vbus configuration
The Type-C0 vbus circuit of rk3588s tablet has been modified.
Type-C0 is used as the host mode, the charger ic(bq25703)
outputs vbus.

Change-Id: I4940b9dbe90c915256d6b6ec2d56fa6a461bcf76
Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
2021-11-24 14:54:15 +08:00
Wangqiang Guo
6c6c39e032 power: supply: bq25703(sc8886) power supply notifier
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
Change-Id: I51dc1a07bbaf974362ea23bf01cb212ebd2e44c7
2021-11-24 14:46:31 +08:00
Shunqing Chen
9dca921398 power: supply: cw2015: add CAPACITY_LEVEL for psy
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I6ca67d24c40990f54a2ba2217e0e26283e2f9ffc
2021-11-24 14:45:30 +08:00
Finley Xiao
c7fddf7117 arm64: dts: rockchip: rk3588s: Add opp table for gpu
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I544f260410d9b5a17dfff2d1f6d30e55662cd812
2021-11-24 14:42:09 +08:00
Huang zhibao
fcf292577e arm64: dts: rockchip: rk3588-nvr-demo: add dp1 support
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I7604bd230aba201efd09204eb910d5a0c03cead4
2021-11-24 14:37:41 +08:00
Algea Cao
582ab904e7 drm/rockchip: dw_hdmi: Enable rk3588 clks before write/read hdmitx regs
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I42ac9cd48e4c959d6f0990f606f0758575c9f796
2021-11-24 14:33:18 +08:00
Algea Cao
6b3a481369 arm64: dts: rockchip: rk3588: Add hdcp1 hclk/pclk for hdmi1
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I1cda5002f9e12422d0af376717eb9a12c98a30fd
2021-11-24 14:19:46 +08:00
Algea Cao
458b14e5cc arm64: dts: rockchip: rk3588s: Add hdcp1 hclk/pclk for hdmi0
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ib5abcd2940184c6dbee783d8b96bc1c5b4f0afbd
2021-11-24 14:19:16 +08:00
Wu Liangqing
01442ef09e arm64: dts: rockchip: rk3588-evb2 support
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: Iea0a39517411d2f6aa15a3ba6016ffef1fd9a191
2021-11-24 14:16:16 +08:00
Guochun Huang
ec9e7b000e drm/rockchip: dsi2: add helper function for mode valid
the minimum region size (HSA,HBP,HACT,HFP) is 4 pixels
which is the dsi2 ip known issues and limitations.

Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I15c4fd942ff5cd0fd8c3ad3590b83b24a0c7dd33
2021-11-24 14:10:31 +08:00
Guochun Huang
d08def6b42 drm/rockchip: dsi2: config cphy lp2hs/hs2lp timing
Change-Id: I37edc1aabc5592b2ab6453ea2bf966e82809947a
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2021-11-24 14:09:29 +08:00
Guochun Huang
b46d142d92 arm64: dts: rockchip: rk3588-evb3: modify timing for cphy panel
the minimum region size (HSA,HBP,HACT,HFP) is 4 pixels
which is the ip known issues and limitations.

Change-Id: I9069ed1c9b6a44b6da27ec0c11d5940f45f45a1c
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2021-11-24 11:41:15 +08:00