diff --git a/drivers/video/rockchip/mpp/mpp_iep2.c b/drivers/video/rockchip/mpp/mpp_iep2.c index 31bb794ae094..0aaf187f0da6 100644 --- a/drivers/video/rockchip/mpp/mpp_iep2.c +++ b/drivers/video/rockchip/mpp/mpp_iep2.c @@ -918,10 +918,12 @@ static const struct of_device_id mpp_iep2_match[] = { .compatible = "rockchip,iep-v2", .data = &iep2_v2_data, }, +#ifdef CONFIG_CPU_RV1126 { .compatible = "rockchip,rv1126-iep", .data = &iep2_v2_data, }, +#endif {}, }; diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec.c b/drivers/video/rockchip/mpp/mpp_rkvdec.c index 61b7276f2757..0b26ac288ff6 100644 --- a/drivers/video/rockchip/mpp/mpp_rkvdec.c +++ b/drivers/video/rockchip/mpp/mpp_rkvdec.c @@ -1821,30 +1821,40 @@ static const struct of_device_id mpp_rkvdec_dt_match[] = { .compatible = "rockchip,hevc-decoder", .data = &rk_hevcdec_data, }, +#ifdef CONFIG_CPU_PX30 { .compatible = "rockchip,hevc-decoder-px30", .data = &rk_hevcdec_px30_data, }, +#endif +#ifdef CONFIG_CPU_RK3368 { .compatible = "rockchip,hevc-decoder-rk3368", .data = &rk_hevcdec_3368_data, }, +#endif { .compatible = "rockchip,rkv-decoder-v1", .data = &rkvdec_v1_data, }, +#ifdef CONFIG_CPU_RK3399 { .compatible = "rockchip,rkv-decoder-rk3399", .data = &rkvdec_3399_data, }, +#endif +#ifdef CONFIG_CPU_RK3328 { .compatible = "rockchip,rkv-decoder-rk3328", .data = &rkvdec_3328_data, }, +#endif +#ifdef CONFIG_CPU_RV1126 { .compatible = "rockchip,rkv-decoder-rv1126", .data = &rkvdec_1126_data, }, +#endif {}, }; diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2.c b/drivers/video/rockchip/mpp/mpp_rkvdec2.c index 302ef66da2e3..a75867671ffc 100644 --- a/drivers/video/rockchip/mpp/mpp_rkvdec2.c +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2.c @@ -874,10 +874,12 @@ static const struct of_device_id mpp_rkvdec2_dt_match[] = { .compatible = "rockchip,rkv-decoder-v2", .data = &rkvdec_v2_data, }, +#ifdef CONFIG_CPU_RK3568 { .compatible = "rockchip,rkv-decoder-rk3568", .data = &rkvdec_rk3568_data, }, +#endif {}, }; diff --git a/drivers/video/rockchip/mpp/mpp_rkvenc.c b/drivers/video/rockchip/mpp/mpp_rkvenc.c index 398cb0aa29b7..8881f9f04036 100644 --- a/drivers/video/rockchip/mpp/mpp_rkvenc.c +++ b/drivers/video/rockchip/mpp/mpp_rkvenc.c @@ -961,8 +961,9 @@ static struct monitor_dev_profile enc_mdevp = { .high_temp_adjust = rockchip_monitor_dev_high_temp_adjust, }; -static int rv1126_get_soc_info(struct device *dev, struct device_node *np, - int *bin, int *process) +static int __maybe_unused rv1126_get_soc_info(struct device *dev, + struct device_node *np, + int *bin, int *process) { int ret = 0; u8 value = 0; @@ -985,6 +986,7 @@ static int rv1126_get_soc_info(struct device *dev, struct device_node *np, } static const struct of_device_id rockchip_rkvenc_of_match[] = { +#ifdef CONFIG_CPU_RV1126 { .compatible = "rockchip,rv1109", .data = (void *)&rv1126_get_soc_info, @@ -993,6 +995,7 @@ static const struct of_device_id rockchip_rkvenc_of_match[] = { .compatible = "rockchip,rv1126", .data = (void *)&rv1126_get_soc_info, }, +#endif {}, }; diff --git a/drivers/video/rockchip/mpp/mpp_vdpu1.c b/drivers/video/rockchip/mpp/mpp_vdpu1.c index f3b0c1dbe516..f6c16295c542 100644 --- a/drivers/video/rockchip/mpp/mpp_vdpu1.c +++ b/drivers/video/rockchip/mpp/mpp_vdpu1.c @@ -762,18 +762,24 @@ static const struct of_device_id mpp_vdpu1_dt_match[] = { .compatible = "rockchip,vpu-decoder-v1", .data = &vdpu_v1_data, }, +#ifdef CONFIG_CPU_RK3288 { .compatible = "rockchip,vpu-decoder-rk3288", .data = &vdpu_3288_data, }, +#endif +#ifdef CONFIG_CPU_RK3368 { .compatible = "rockchip,vpu-decoder-rk3368", .data = &vdpu_3368_data, }, +#endif +#ifdef CONFIG_CPU_RK3328 { .compatible = "rockchip,avs-plus-decoder", .data = &avsd_plus_data, }, +#endif {}, }; diff --git a/drivers/video/rockchip/mpp/mpp_vdpu2.c b/drivers/video/rockchip/mpp/mpp_vdpu2.c index c1972624ed70..49cf098c037b 100644 --- a/drivers/video/rockchip/mpp/mpp_vdpu2.c +++ b/drivers/video/rockchip/mpp/mpp_vdpu2.c @@ -666,10 +666,12 @@ static const struct of_device_id mpp_vdpu2_dt_match[] = { .compatible = "rockchip,vpu-decoder-v2", .data = &vdpu_v2_data, }, +#ifdef CONFIG_CPU_PX30 { .compatible = "rockchip,vpu-decoder-px30", .data = &vdpu_px30_data, }, +#endif {}, }; diff --git a/drivers/video/rockchip/mpp/mpp_vepu2.c b/drivers/video/rockchip/mpp/mpp_vepu2.c index a90b5ad6abb2..3cc3823e24f1 100644 --- a/drivers/video/rockchip/mpp/mpp_vepu2.c +++ b/drivers/video/rockchip/mpp/mpp_vepu2.c @@ -792,10 +792,12 @@ static const struct of_device_id mpp_vepu2_dt_match[] = { .compatible = "rockchip,vpu-encoder-v2", .data = &vepu_v2_data, }, +#ifdef CONFIG_CPU_PX30 { .compatible = "rockchip,vpu-encoder-px30", .data = &vepu_px30_data, }, +#endif {}, };