From c01a3a8ab3fab4213b71dcb3cc16a9fcee172703 Mon Sep 17 00:00:00 2001 From: Yandong Lin Date: Tue, 14 Jun 2022 14:52:10 +0800 Subject: [PATCH] video: rockchip: mpp: Separation vepu2 and vepu2-jpege dev Signed-off-by: Yandong Lin Change-Id: If8d06652729325d7b986f53b50f265d341bcb4e8 --- drivers/video/rockchip/mpp/mpp_common.h | 1 + drivers/video/rockchip/mpp/mpp_vepu2.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/video/rockchip/mpp/mpp_common.h b/drivers/video/rockchip/mpp/mpp_common.h index b1c5271f34a7..bee33cf4c99e 100644 --- a/drivers/video/rockchip/mpp/mpp_common.h +++ b/drivers/video/rockchip/mpp/mpp_common.h @@ -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 */ diff --git a/drivers/video/rockchip/mpp/mpp_vepu2.c b/drivers/video/rockchip/mpp/mpp_vepu2.c index 89f55c67e0c4..e39431520d5f 100644 --- a/drivers/video/rockchip/mpp/mpp_vepu2.c +++ b/drivers/video/rockchip/mpp/mpp_vepu2.c @@ -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 {},