shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

video: rockchip: mpp: Separation vepu2 and vepu2-jpege dev

Browse Source 
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: If8d06652729325d7b986f53b50f265d341bcb4e8
This commit is contained in:
Yandong Lin
2022-06-14 14:52:10 +08:00
committed by Tao Huang
parent 500137ac8c
commit c01a3a8ab3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/video/rockchip/mpp/mpp_common.h
View File

@@ -62,6 +62,7 @@ enum MPP_DEVICE_TYPE {
MPP_DEVICE_RKVENC = 16, /* 0x00010000 */
MPP_DEVICE_VEPU1 = 17, /* 0x00020000 */
MPP_DEVICE_VEPU2 = 18, /* 0x00040000 */
MPP_DEVICE_VEPU2_JPEG = 19, /* 0x00080000 */
MPP_DEVICE_VEPU22 = 24, /* 0x01000000 */
MPP_DEVICE_IEP2 = 28, /* 0x10000000 */

6
drivers/video/rockchip/mpp/mpp_vepu2.c
View File

@@ -885,7 +885,7 @@ static const struct mpp_dev_var vepu_px30_data = {
};
static const struct mpp_dev_var vepu_ccu_data = {
.device_type = MPP_DEVICE_VEPU2,
.device_type = MPP_DEVICE_VEPU2_JPEG,
.hw_info = &vepu_v2_hw_info,
.trans_info = trans_rk_vepu2,
.hw_ops = &vepu_v2_hw_ops,
@@ -905,11 +905,11 @@ static const struct of_device_id mpp_vepu2_dt_match[] = {
#endif
#ifdef CONFIG_CPU_RK3588
{
.compatible = "rockchip,vpu-encoder-v2-core",
.compatible = "rockchip,vpu-jpege-core",
.data = &vepu_ccu_data,
},
{
.compatible = "rockchip,vpu-encoder-v2-ccu",
.compatible = "rockchip,vpu-jpege-ccu",
},
#endif
{},