diff --git a/drivers/video/rockchip/mpp/mpp_common.c b/drivers/video/rockchip/mpp/mpp_common.c index 9d4ec9734a9d..dbc625c2a491 100644 --- a/drivers/video/rockchip/mpp/mpp_common.c +++ b/drivers/video/rockchip/mpp/mpp_common.c @@ -71,6 +71,7 @@ const char *mpp_device_name[MPP_DEVICE_BUTT] = { [MPP_DEVICE_HEVC_DEC] = "HEVC_DEC", [MPP_DEVICE_RKVDEC] = "RKVDEC", [MPP_DEVICE_AVSPLUS_DEC] = "AVSPLUS_DEC", + [MPP_DEVICE_RKJPEGD] = "RKJPEGD", [MPP_DEVICE_RKVENC] = "RKVENC", [MPP_DEVICE_VEPU1] = "VEPU1", [MPP_DEVICE_VEPU2] = "VEPU2", diff --git a/drivers/video/rockchip/mpp/mpp_common.h b/drivers/video/rockchip/mpp/mpp_common.h index f20bd7307726..a088d62975f9 100644 --- a/drivers/video/rockchip/mpp/mpp_common.h +++ b/drivers/video/rockchip/mpp/mpp_common.h @@ -58,7 +58,7 @@ enum MPP_DEVICE_TYPE { MPP_DEVICE_HEVC_DEC = 8, /* 0x00000100 */ MPP_DEVICE_RKVDEC = 9, /* 0x00000200 */ MPP_DEVICE_AVSPLUS_DEC = 12, /* 0x00001000 */ - MPP_DEVICE_JPGDEC = 13, /* 0x00002000 */ + MPP_DEVICE_RKJPEGD = 13, /* 0x00002000 */ MPP_DEVICE_RKVENC = 16, /* 0x00010000 */ MPP_DEVICE_VEPU1 = 17, /* 0x00020000 */ diff --git a/drivers/video/rockchip/mpp/mpp_jpgdec.c b/drivers/video/rockchip/mpp/mpp_jpgdec.c index 0f204e22e0e6..753b061f22ea 100644 --- a/drivers/video/rockchip/mpp/mpp_jpgdec.c +++ b/drivers/video/rockchip/mpp/mpp_jpgdec.c @@ -558,7 +558,7 @@ static struct mpp_dev_ops jpgdec_v1_dev_ops = { }; static const struct mpp_dev_var jpgdec_v1_data = { - .device_type = MPP_DEVICE_JPGDEC, + .device_type = MPP_DEVICE_RKJPEGD, .hw_info = &jpgdec_v1_hw_info, .trans_info = jpgdec_v1_trans, .hw_ops = &jpgdec_v1_hw_ops,