From: Jeongtae Park Date: Mon, 30 Apr 2018 01:08:56 +0000 (+0900) Subject: [COMMON] fimc-is2: add the maximum of sub-device ch. mode to CSI X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a3c78b5c5427330ceff1fda632efca3ef29b455b;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [COMMON] fimc-is2: add the maximum of sub-device ch. mode to CSI Change-Id: If453aff6b5adf672191e8d3118c28928772f83d6 Signed-off-by: Jeongtae Park --- diff --git a/drivers/media/platform/exynos/fimc-is2/fimc-is-device-csi.h b/drivers/media/platform/exynos/fimc-is2/fimc-is-device-csi.h index eb9f2434a97c..672a886d95c9 100644 --- a/drivers/media/platform/exynos/fimc-is2/fimc-is-device-csi.h +++ b/drivers/media/platform/exynos/fimc-is2/fimc-is-device-csi.h @@ -63,6 +63,7 @@ enum itf_vc_buf_data_type { struct fimc_is_device_csi { /* channel information */ u32 instance; + u32 num_of_scm; enum subdev_ch_mode scm; u32 __iomem *base_reg; u32 __iomem *vc_reg[SCM_MAX][CSI_VIRTUAL_CH_MAX]; diff --git a/drivers/media/platform/exynos/fimc-is2/fimc-is-device-csi_v4.c b/drivers/media/platform/exynos/fimc-is2/fimc-is-device-csi_v4.c index 787a50d6101b..e11f22f82404 100644 --- a/drivers/media/platform/exynos/fimc-is2/fimc-is-device-csi_v4.c +++ b/drivers/media/platform/exynos/fimc-is2/fimc-is-device-csi_v4.c @@ -1921,6 +1921,8 @@ int fimc_is_csi_probe(void *parent, u32 instance) goto err_get_resource; } + csi->num_of_scm = device->pdata->num_of_ch_mode; + /* VC DMA */ i = 0; while (cnt_resource < num_resource) {