diff --git a/drivers/media/platform/rockchip/isp/capture_v39.c b/drivers/media/platform/rockchip/isp/capture_v39.c index 10c6438813bf..c275d65b548f 100644 --- a/drivers/media/platform/rockchip/isp/capture_v39.c +++ b/drivers/media/platform/rockchip/isp/capture_v39.c @@ -1461,15 +1461,11 @@ static int rkisp_stream_start(struct rkisp_stream *stream) { struct rkisp_device *dev = stream->ispdev; struct v4l2_device *v4l2_dev = &dev->v4l2_dev; - bool async = false; int ret; if (stream->id == RKISP_STREAM_LDC) goto skip; - async = (dev->cap_dev.stream[RKISP_STREAM_MP].streaming || - dev->cap_dev.stream[RKISP_STREAM_SP].streaming); - /* * can't be async now, otherwise the latter started stream fails to * produce mi interrupt. @@ -1480,7 +1476,7 @@ static int rkisp_stream_start(struct rkisp_stream *stream) return ret; } - ret = rkisp_stream_config_rsz(stream, async); + ret = rkisp_stream_config_rsz(stream, false); if (ret < 0) { v4l2_err(v4l2_dev, "config rsz failed with error %d\n", ret); return ret; diff --git a/drivers/media/platform/rockchip/isp/hw.c b/drivers/media/platform/rockchip/isp/hw.c index 57ad06b020a9..b9031c1fe13e 100644 --- a/drivers/media/platform/rockchip/isp/hw.c +++ b/drivers/media/platform/rockchip/isp/hw.c @@ -638,8 +638,9 @@ static const struct isp_clk_info rk3568_isp_clk_rate[] = { }; static const struct isp_clk_info rk3576_isp_clk_rate[] = { + /* clk 300 * 2 equal to aclk issue if ldcv enable */ { - .clk_rate = 300, + .clk_rate = 400, .refer_data = 1920, //width }, { .clk_rate = 400, diff --git a/drivers/media/platform/rockchip/isp/isp_sditf.c b/drivers/media/platform/rockchip/isp/isp_sditf.c index 7228deb5ad77..91ed3ee3670a 100644 --- a/drivers/media/platform/rockchip/isp/isp_sditf.c +++ b/drivers/media/platform/rockchip/isp/isp_sditf.c @@ -230,6 +230,7 @@ static const struct of_device_id rkisp_sditf_of_match[] = { { .compatible = "rockchip,rkisp-sditf", }, + {}, }; struct platform_driver rkisp_sditf_drv = {