Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe7bdb46 authored by Shwetha Kotekar's avatar Shwetha Kotekar
Browse files

msm: jpeg: Update VBIF registers for 8994 



Use default VBIF register values if device
version is 8994 because the expected register
values for this HW is the default values.

Change-Id: I2f6ff9541a29f92f5f64dcc951c435745ddd5c01
Signed-off-by: default avatarShwetha Kotekar <skotekar@codeaurora.org>
parent 8429a262

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[] = {

drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_sync.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#define JPEG_8974_V1 0x10000000

#define JPEG_8974_V2 0x10010000

#define JPEG_8994 0x10020000

#define JPEG_CLK_MAX 16



enum msm_jpeg_state {