Merge "msm: jpeg: Update VBIF registers for 8994" (d2f33c1b) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_platform.c

+30 −24

Original line number	Diff line number	Diff line
		@@ -152,6 +152,8 @@ static void set_vbif_params(struct msm_jpeg_device *pgmn_dev,
		{
		writel_relaxed(0x1,
		jpeg_vbif_base + JPEG_VBIF_CLKON);

		if (pgmn_dev->hw_version != JPEG_8994) {
		writel_relaxed(0x10101010,
		jpeg_vbif_base + JPEG_VBIF_IN_RD_LIM_CONF0);
		writel_relaxed(0x10101010,
		@@ -170,14 +172,19 @@ static void set_vbif_params(struct msm_jpeg_device *pgmn_dev,
		jpeg_vbif_base + JPEG_VBIF_OUT_WR_LIM_CONF0);
		writel_relaxed(0x00000707,
		jpeg_vbif_base + JPEG_VBIF_DDR_OUT_MAX_BURST);
		writel_relaxed(0x7,
		jpeg_vbif_base + JPEG_VBIF_OCMEM_OUT_MAX_BURST);
		writel_relaxed(0x00000030,
		jpeg_vbif_base + JPEG_VBIF_ARB_CTL);
		writel_relaxed(0x00000FFF,
		jpeg_vbif_base + JPEG_VBIF_OUT_AXI_AOOO_EN);
		writel_relaxed(0x0FFF0FFF,
		jpeg_vbif_base + JPEG_VBIF_OUT_AXI_AOOO);
		writel_relaxed(0x2222,
		jpeg_vbif_base + JPEG_VBIF_OUT_AXI_AMEMTYPE_CONF1);
		}

		writel_relaxed(0x7,
		jpeg_vbif_base + JPEG_VBIF_OCMEM_OUT_MAX_BURST);
		writel_relaxed(0x00000030,
		jpeg_vbif_base + JPEG_VBIF_ARB_CTL);

		/*FE and WE QOS configuration need to be set when
		QOS RR arbitration is enabled*/
		if (pgmn_dev->hw_version != JPEG_8974_V1)
		@@ -189,8 +196,7 @@ static void set_vbif_params(struct msm_jpeg_device *pgmn_dev,

		writel_relaxed(0x22222222,
		jpeg_vbif_base + JPEG_VBIF_OUT_AXI_AMEMTYPE_CONF0);
		writel_relaxed(0x2222,
		jpeg_vbif_base + JPEG_VBIF_OUT_AXI_AMEMTYPE_CONF1);

		}

		static struct msm_bus_vectors msm_jpeg_init_vectors[] = {

+1 −0