From e1116856058dcaa951c021a31ef4fc8f66b00fb6 Mon Sep 17 00:00:00 2001 From: Chandler Chen Date: Tue, 24 Sep 2024 15:15:54 +0800 Subject: [PATCH] video: rockchip: mpp: rk3562 use cru reset Change-Id: Ib37af192325ed685aad5bdf55827382d9de61e2b Signed-off-by: Chandler Chen --- drivers/video/rockchip/mpp/mpp_rkvdec2.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2.c b/drivers/video/rockchip/mpp/mpp_rkvdec2.c index 741924e03ef5..50ec9334ddc4 100644 --- a/drivers/video/rockchip/mpp/mpp_rkvdec2.c +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2.c @@ -1346,7 +1346,7 @@ static int rkvdec2_vdpu382_reset(struct mpp_dev *mpp) int ret = 0; /* - * only for rk3528 and rk3562 + * only for rk3528 * use mmu reset as soft reset * rkvdec will reset together when rkvdec_mmu force reset */ @@ -1550,7 +1550,7 @@ static const struct mpp_dev_var rkvdec_rk3568_data = { .dev_ops = &rkvdec_rk3568_dev_ops, }; -static const struct mpp_dev_var rkvdec_vdpu382_data = { +static const struct mpp_dev_var rkvdec_rk3528_data = { .device_type = MPP_DEVICE_RKVDEC, .hw_info = &rkvdec_vdpu382_hw_info, .trans_info = rkvdec_v2_trans, @@ -1558,6 +1558,14 @@ static const struct mpp_dev_var rkvdec_vdpu382_data = { .dev_ops = &rkvdec_v2_dev_ops, }; +static const struct mpp_dev_var rkvdec_rk3562_data = { + .device_type = MPP_DEVICE_RKVDEC, + .hw_info = &rkvdec_vdpu382_hw_info, + .trans_info = rkvdec_v2_trans, + .hw_ops = &rkvdec_v2_hw_ops, + .dev_ops = &rkvdec_v2_dev_ops, +}; + static const struct mpp_dev_var rkvdec_rk3588_data = { .device_type = MPP_DEVICE_RKVDEC, .hw_info = &rkvdec_v2_hw_info, @@ -1594,13 +1602,13 @@ static const struct of_device_id mpp_rkvdec2_dt_match[] = { #ifdef CONFIG_CPU_RK3528 { .compatible = "rockchip,rkv-decoder-rk3528", - .data = &rkvdec_vdpu382_data, + .data = &rkvdec_rk3528_data, }, #endif #ifdef CONFIG_CPU_RK3562 { .compatible = "rockchip,rkv-decoder-rk3562", - .data = &rkvdec_vdpu382_data, + .data = &rkvdec_rk3562_data, }, #endif #ifdef CONFIG_CPU_RK3576