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

Commit d243db38 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: Update AVTimer Register Addresses for 8916"

parents a0ec602b 633f07a5

drivers/media/platform/msm/camera_v2/isp/msm_isp.h

+10 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,14 @@ 




#include "msm_buf_mgr.h"

#include "msm_buf_mgr.h"





#define VFE40_8974V1_VERSION 0x10000018

#define VFE40_8974V2_VERSION 0x1001001A

#define VFE40_8974V3_VERSION 0x1001001B

#define VFE40_8x26_VERSION 0x20000013

#define VFE40_8x26V2_VERSION 0x20010014

#define VFE40_8916_VERSION 0x10030000



#define MAX_IOMMU_CTX 2

#define MAX_NUM_WM 7

#define MAX_NUM_WM 7

#define MAX_NUM_RDI 3

#define MAX_NUM_RDI 3

#define MAX_NUM_RDI_MASTER 3

#define MAX_NUM_RDI_MASTER 3
@@ -37,6 +45,8 @@ 




#define AVTIMER_MSW_PHY_ADDR 0xFE05300C

#define AVTIMER_MSW_PHY_ADDR 0xFE05300C

#define AVTIMER_LSW_PHY_ADDR 0xFE053008

#define AVTIMER_LSW_PHY_ADDR 0xFE053008

#define AVTIMER_MSW_PHY_ADDR_8916 0x7706010

#define AVTIMER_LSW_PHY_ADDR_8916 0x770600C

#define AVTIMER_ITERATION_CTR 16

#define AVTIMER_ITERATION_CTR 16





#define VFE_PING_FLAG 0xFFFFFFFF

#define VFE_PING_FLAG 0xFFFFFFFF

drivers/media/platform/msm/camera_v2/isp/msm_isp40.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -30,13 +30,6 @@ 
#define CDBG(fmt, args...) do { } while (0)

#define CDBG(fmt, args...) do { } while (0)

#endif

#endif





#define VFE40_8974V1_VERSION 0x10000018

#define VFE40_8974V2_VERSION 0x1001001A

#define VFE40_8974V3_VERSION 0x1001001B

#define VFE40_8x26_VERSION 0x20000013

#define VFE40_8x26V2_VERSION 0x20010014

#define VFE40_8916_VERSION 0x10030000



#define VFE40_BURST_LEN 1

#define VFE40_BURST_LEN 1

#define VFE40_BURST_LEN_8916_VERSION 2

#define VFE40_BURST_LEN_8916_VERSION 2

#define VFE40_STATS_BURST_LEN 1

#define VFE40_STATS_BURST_LEN 1

drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c

+11 −2
Original line number Original line Diff line number Diff line
@@ -594,8 +594,17 @@ int msm_isp_request_axi_stream(struct vfe_device *vfe_dev, void *arg) 
	if (stream_info->vt_enable) {

	if (stream_info->vt_enable) {

		vfe_dev->vt_enable = stream_info->vt_enable;

		vfe_dev->vt_enable = stream_info->vt_enable;

		msm_isp_start_avtimer();

		msm_isp_start_avtimer();

		vfe_dev->p_avtimer_lsw = ioremap(AVTIMER_LSW_PHY_ADDR, 4);

		if (vfe_dev->vfe_hw_version == VFE40_8916_VERSION) {

		vfe_dev->p_avtimer_msw = ioremap(AVTIMER_MSW_PHY_ADDR, 4);

			vfe_dev->p_avtimer_lsw =

				ioremap(AVTIMER_LSW_PHY_ADDR_8916, 4);

			vfe_dev->p_avtimer_msw =

				ioremap(AVTIMER_MSW_PHY_ADDR_8916, 4);

		} else {

			vfe_dev->p_avtimer_lsw =

				ioremap(AVTIMER_LSW_PHY_ADDR, 4);

			vfe_dev->p_avtimer_msw =

				ioremap(AVTIMER_MSW_PHY_ADDR, 4);

		}

	}

	}

	if (stream_info->num_planes > 1) {

	if (stream_info->num_planes > 1) {

		msm_isp_axi_reserve_comp_mask(

		msm_isp_axi_reserve_comp_mask(