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

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

Merge "msm: isp: Add 48K UB for MSM8917 target"

parents 2ca3df6e 26c2d143

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

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#define VFE40_8952_VERSION 0x10060000

#define VFE40_8976_VERSION 0x10050000

#define VFE40_8937_VERSION 0x10080000

#define VFE40_8917_VERSION 0x10080001

#define VFE40_8953_VERSION 0x10090000

#define VFE32_8909_VERSION 0x30600

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

+3 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ static void msm_vfe40_init_hardware_reg(struct vfe_device *vfe_dev) 
		break;

	case VFE40_8937_VERSION:

	case VFE40_8953_VERSION:

	case VFE40_8917_VERSION:

	default:

		ISP_DBG("%s: No special QOS\n", __func__);

	}
@@ -1466,6 +1467,7 @@ static void msm_vfe40_axi_cfg_wm_reg( 
		wm_bit_shift = VFE40_WM_BIT_SHIFT;

	} else if (vfe_dev->vfe_hw_version == VFE40_8976_VERSION ||

		vfe_dev->vfe_hw_version == VFE40_8937_VERSION ||

		vfe_dev->vfe_hw_version == VFE40_8917_VERSION ||

		vfe_dev->vfe_hw_version == VFE40_8953_VERSION) {

		burst_len = VFE40_BURST_LEN_8952_VERSION;

		wm_bit_shift = VFE40_WM_BIT_SHIFT_8976_VERSION;
@@ -1977,6 +1979,7 @@ static void msm_vfe40_stats_cfg_ub(struct vfe_device *vfe_dev) 
	if (vfe_dev->vfe_hw_version == VFE40_8916_VERSION ||

		vfe_dev->vfe_hw_version == VFE40_8939_VERSION ||

		vfe_dev->vfe_hw_version == VFE40_8937_VERSION ||

		vfe_dev->vfe_hw_version == VFE40_8917_VERSION ||

		vfe_dev->vfe_hw_version == VFE40_8953_VERSION) {

		stats_burst_len = VFE40_STATS_BURST_LEN_8916_VERSION;

		ub_offset = VFE40_UB_SIZE_8916;