Commit Graph

1073659 Commits

Author SHA1 Message Date
Yandong Lin
5df3a678bf vdieo: rockchip: mpp: fix av1d iommu compile warning
drivers/video/rockchip/mpp/mpp_iommu_av1d.c:911 av1_iommu_probe() warn:
missing unwind goto?

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ia3ae5df50fa9d5ca7df84547b9b31d3ecd229922
2023-02-15 17:52:24 +08:00
Damon Ding
64c43c16fb dt-bindings: display: virtual-connector: add virtual devices support
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I409ab14126c42b61340aa806525a8c4d04d37a70
2023-02-15 17:50:29 +08:00
Lin Jinhan
5e16d409fe arm64: dts: rockchip: rk3528: trng use scmi clk
Change-Id: I7a8bb9e824e9e7732a8fc497a2c828980086bd65
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2023-02-15 09:37:43 +00:00
Joseph Chen
e18f50d371 arm64: dts: rockchip: rk3528: crypto use scmi clock and dummy softrst
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I3340c8a2acb2ee4913e42a558f321e62f63899a2
2023-02-15 09:37:43 +00:00
Joseph Chen
b5f76296d3 clk: rockchip: rk3528: Remove trng clock
It was moved to scmi clock.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I51d0c70cb408af0c8a82a16133b3706c9c425cde
2023-02-15 09:37:43 +00:00
Joseph Chen
3ca63279a0 clk: rockchip: rk3528: Remove crypto clock
They are moved to scmi clock.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I093a0f964c525efdf3a78fe5070c1860edac5a3c
2023-02-15 09:37:43 +00:00
Damon Ding
df5b684fe9 drm/rockchip: vconn: add support for DRM_MODE_CONNECTOR_VIRTUAL
Support for multiple virtual connectors. The dts maybe
like:

vconn {
	compatible = "rockchip,virtual-connector";
	virtual-connector-count = <2>;
	/*
	 * virtual0 connected by default
	 * virtual1 disconnected
	 */
	virtual1-disconnected;
	status = "okay";
};

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I0871031fdeb124c2b7a6d77f5bf1aa111c3e093e
2023-02-15 17:07:08 +08:00
Tao Huang
8cb1b2ad50 rk: scripts: update mkbootimg/unpack_bootimg
AOSP f85a2fd5640d ("Revert "unpack_bootimg: Export 'vendor_ramdisk' for vendor_boot v4"")
Revert 7261bb083a97 ("Check DTB image size for boot image header version 2 and above")
which failed to repack image without dtb.
Include gki.generate_gki_certificate.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ibf9543fd4a10547f9d956b6ffc09834389fbb20f
2023-02-15 16:30:35 +08:00
Cai YiWei
5f8124c0ae media: rockchip: isp: fix build warn
Change-Id: I1bf4a66df7f39275a3b670a2ff6dd457f69e6634
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-02-15 15:28:01 +08:00
Algea Cao
28c7e47817 phy: rockchip: inno-hdmi: Fix 'warn: missing unwind goto'
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I7044cc4e7268c9899f43eb927f29084e2e2f34b2
2023-02-15 15:27:28 +08:00
Tao Huang
c52799a13c clk: rockchip: pvtm: Fix rockchip_clock_pvtm_get_value() timeout
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I04e02ab210c682eca7c78e3f9229498c41568adf
2023-02-15 15:14:57 +08:00
Algea Cao
97811627ff phy: rockchip-samsung-hdptx-hdmi: Reduce ROPLL loop bandwidth
24M clock noise is carried into the PHY ROPLL loop filter.
Due to the low noise frequency, it can pass through the low-pass loop
filter of ROPLL, resulting in hdmi flash. Reduce ROPLL loop bandwidth
can solve this problem.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ibea774bc26ea8c2b06cf79c84b6cd6456df66ea5
2023-02-15 15:14:18 +08:00
Jon Lin
c544fe878d PCI: rockchip: dw: Fix warning in initial progress
1.missing unwind goto
2.Value stored to 'ret' is never read

Fixes: fa919e9611 ("pcie: rockchip: dw: Support dmatest")
Change-Id: I20ae68b97a6512cbb340668b1ffb7811dc6ef674
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-02-15 15:13:06 +08:00
Cai YiWei
3080b1c4e8 Revert "media: rockchip: isp: extend pixel to 32 for isp30 unite mode"
This reverts commit b3260da5e9.

Signed-off-by: Cai YiWei <cyw@rock-chips.com>
Change-Id: I3c322a0d187fcfcf38daac2dbd0f4ada6fd89fe4
2023-02-15 14:13:27 +08:00
Wang Panzhenzhuan
ce99bb8b5b arm64: dts: rockchip: rk3568-evb1: add dual camera
add dtsi & dts for gc2093+gc2053 dual camera module

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I4e0111db8ade20ead54188a2eed5b91dff350cb4
2023-02-15 11:07:11 +08:00
Jianqun Xu
a2e98940ee Revert "drm/rockchip: gem: add dmabuf sync partial to dma_buf_ops"
This reverts commit 64097b127c.

Change-Id: I18917edcda996538b09da55d999dcb76544fdafb
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2023-02-14 17:52:31 +08:00
Wangqiang Guo
002ff3ed95 arm64: dts: rockchip: rk3562-evb2: add camera dtsi.
Add dts for gc8034 on rk3562 evb2 board.

Change-Id: I3d190106b40b21f27f9c9f474a882238bcf0cb87
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
2023-02-14 15:52:57 +08:00
Damon Ding
b942725058 arm64: dts: rockchip: rk3562-evb: fix mcu display board naming errors
Fix board model and compatible and remove bl-gpios in
mcu_panel node.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I80b696e4df0cd409023b9656c5a13ba850d15340
2023-02-14 15:27:33 +08:00
Zhang Yubing
8b2a7f9145 phy: rockchip-typec: add support to tcpm framework
add support to tcpm framework and remove extcon.

Change-Id: I6ea7aa21b65a50eca2d85f8959d8d317184204e2
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
2023-02-14 14:44:36 +08:00
Damon Ding
5156642dd9 arm64: dts: rockchip: rk3562-evb: add rgb->panel display board
RGB panel FX070-DHM11BOE-A supports RGB666 and RGB888 mode.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Ice4688d7f9ff66094836baf474e09ed8edba747a
2023-02-14 14:31:14 +08:00
Hu Kejun
00d76e6608 media: i2c: dw9714: fix i2c error in resume function
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Ieb2b4f0c7a3bdef20392b746c7330fb6a0a72df1
2023-02-14 11:20:56 +08:00
Zhang Yubing
982a6aceb1 arm64: dts: rockchip: rk3399-evb-ind: add dp alt mode node
Add dp alt mode node to support tcpm

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I8130045074c9bc8c8b8223f44ebe5341db20b97d
2023-02-14 10:01:39 +08:00
Cai YiWei
e83e121d6f media: rockchip: isp: add iqtool video for isp32 lite
Change-Id: If5d31fc2b75e9aa0980044c47a8e429cc7e2a1b5
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-02-14 09:54:27 +08:00
Cai YiWei
dcd2ac21b1 media: rockchip: isp: add rk3562 config
Change-Id: I52cbcc819036b9b594a1fac0a24e8447c8ea536c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-02-14 09:54:13 +08:00
Cai YiWei
b38fc755a5 media: rockchip: isp: add isp32 lite
Change-Id: I3cdd29809e629df7903605d07e2dd2da40bcef01
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-02-14 09:54:06 +08:00
Finley Xiao
9fe7f38147 clk: rockchip: rk3562: Add ROCKCHIP_PLL_ALLOW_POWER_DOWN for apll vpp and hpll
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I95661f4f17245487169afd7f8a70f845f95ddb6d
2023-02-13 19:31:59 +08:00
Finley Xiao
deb2de164b clk: rockchip: rk3562: Add ROCKCHIP_PLL_ALLOW_POWER_DOWN flag
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I7047fee17bd26e6b23fb84b431010880ff577276
2023-02-13 19:31:59 +08:00
Finley Xiao
813eabe45b clk: rockchip: rk3562: Make aclk pclk core CLK_IGNORE_UNUSED
Don't add enable count to apll.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Id970ba227033599e894b3108af29bc6d2ae0cda5
2023-02-13 19:31:59 +08:00
Finley Xiao
ddea4b4025 clk: rockchip: rk3562: change pll to slow mode before power down
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I7ee6d2478bc012bf70ca061738534ed57d1612f0
2023-02-13 19:31:59 +08:00
Yandong Lin
0ce21e2477 video: rockchip: mpp: fix jpege dma coherence issue for rkvenc2
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ida23480b46ce37bcd40b1f7de7907e889b267fc4
2023-02-13 18:50:37 +08:00
Hongming Zou
3ab683e330 ARM: dts: rockchip: rk3036-evb1: fix es8311 default aec mode
For products with light performance like RK3036, the playback
function may not be so important, and the stereo recording can
be guaranteed first. Therefore, the default left channel is ADC
input data.

Change-Id: Iffc51986f58fd5946a35ea39d12104b2e1f2d39f
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com>
2023-02-13 18:40:50 +08:00
Hongming Zou
b7b36e0653 ARM: dts: rockchip: rk3036-evb1: add support multi-sounds and spdif-sound
Change-Id: Id0f7286003f08aeb0632a28cf1f08c1f2799010b
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com>
2023-02-13 18:40:50 +08:00
Hongming Zou
ec0ab20967 ARM: dts: rockchip: rk3036: update acodec compatible to rockchip,rk3036-codec
Change-Id: I094a62ccd06f4b62bb175cc7260117622628cd30
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com>
2023-02-13 18:40:50 +08:00
Hongming Zou
5ee5151fed ARM: dts: rockchip: rk3036: remove hdmi_sound node
Change-Id: I3cb4010e255559c31eb0fe46c14b3f700b060d64
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com>
2023-02-13 18:40:50 +08:00
Hongming Zou
3d2844c61b ARM: dts: rockchip: rk3036: add spdif-sound node
Change-Id: I34672a839876afa1e54c70b151f90479bb8f8a19
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com>
2023-02-13 18:40:50 +08:00
Jianwei Fan
24250deb77 arm64: dts: rockchip: rk3562-rk817-tablet: add camera configuration
Change-Id: I57b5841eb91c2a6a7cd3650bf1a75695aa646a4c
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
2023-02-13 18:32:42 +08:00
Jianqun Xu
e4d1514867 drm/rockchip: gem: fix for VVOP enabled but VOP and VOP2 not
In some case we need to select the CONFIG_ROCKCHIP_VVOP but unselect the
CONFIG_ROCKCHIP_VOP and CONFIG_ROCKCHIP_VOP2, this patch can fix it to
not do vop iommu map/unmap.

Change-Id: Ib48a11fd1dc6c0230701edb94c19c9f2a1a08a0a
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2023-02-13 18:31:28 +08:00
Jianlong Wang
53881cfb5f arm64: configs: add rockchip_linux_docker.config
enable kernel config for docker

for rk356x:
make ARCH=arm64 rockchip_linux_defconfig rockchip_linux_docker.config

for rk3588:
make ARCH=arm64 rockchip_linux_defconfig rk3588_linux.config rockchip_linux_docker.config

Signed-off-by: Jianlong Wang <jianlong.wang@rock-chips.com>
Change-Id: Idf52c56a30d6918ea12fb985c14dacccfaeb2583
2023-02-13 18:28:11 +08:00
Zefa Chen
61c9d9c4b8 arm64: dts: rockchip: add camera dtsi for rk3562 evb1
Add dts for gc8034 on rk3562 evb1 board.

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I64f34f37522a861b96ed509f95415dc0372bac97
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
2023-02-13 18:25:33 +08:00
Steven Liu
ed46f27f29 arm64: dts: rockchip: rk3562: fix pinctrl cam m0/m1 clk0/clk1
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: Iebf5c036af34478a44047ec55f71bb67f0f7e11e
2023-02-13 18:24:35 +08:00
Zhang Yubing
c6165d6923 drm/rockchip: vop3: implement get property function for hdr, csc, acm
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Ia89c70387a6e3093f327ff71c61886066935b7bc
2023-02-13 17:44:47 +08:00
Zhang Yubing
cb9f78f78e drm/rockchip: vop3: alloc hdr gem object when first use it
the vop is binded before iommu init, if alloc hdr gem object in
vop bind stage, which may get the wrong dma address. To fix this
issue, alloc hdr gem object when first used it.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I99359cc345cb49aee1ce34ff6d5ee33d04ac2283
2023-02-13 17:39:35 +08:00
Sandy Huang
390dee5bd8 drm/rockchip: vop3: add xmirror register define
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I3e6653efb208b53f7a858904b7babaf092a6841f
2023-02-13 16:33:13 +08:00
Jake Wu
707da1d0cb arm64: dts: rockchip: rk3562-test2: enable usb nodes
This enable usb20-otg.

Signed-off-by: Jake Wu <jake.wu@rock-chips.com>
Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I82a8e1417a7e4318e77d19504365bdd5908cbf3e
2023-02-13 14:56:23 +08:00
Yu Qiaowei
cc646fcd14 Revert "video: rockchip: rga3: disable memory when RGA power off to save power"
This reverts commit 0a7cd35e38.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I3d2c7a40ee3e0bc18fe802ce0b7a7e089ab58f3d
2023-02-13 14:55:44 +08:00
Jianwei Fan
58a0936021 arm64: rockchip_defconfig: enable dw9763 for rk3562-rk817-tablet
Change-Id: I47ce770ebb4fd40ef7222c7b1861b80f8c83571c
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
2023-02-13 14:23:55 +08:00
Jianwei Fan
f23955ad2c media: i2c: add vcm dw9763 driver
Change-Id: Ib7b903f508e002d9bd41d842a01f406925ee48f5
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
2023-02-13 14:23:11 +08:00
Joseph Chen
116e21f4fd arm64: dts: rockchip: rk3562: Use GRF_PMU_OS_REG8 as reboot-mode register
GRF_PMU_OS_REG8 can't be reset by NPOR.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ie1dee8c0744b00b3cba23637cadcc382ba529207
2023-02-13 03:20:35 +00:00
Hongming Zou
be6124d199 ARM: configs: rockchip_linux_defconfig: add two codec configs for the rk3036 evb1 board
CONFIG_SND_SOC_INNO_RK3036=y
CONFIG_SND_SOC_ES8311=y

Change-Id: Id90f81974cf045b3534031d5b504f6cac080a3f1
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com>
2023-02-10 20:38:16 +08:00
Hongming Zou
9b71d6a080 drm/rockchip: inno_hdmi: add support hdmi audio
Change-Id: I4df13c5ed17516cf820dc425c17368c1fbb9c6be
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com>
2023-02-10 20:35:45 +08:00