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

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

Merge "camera: Allocate ub with equal slicing for automotive"

parents 6818a887 0019e357
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -22,6 +22,13 @@ config MSM_CAMERA_DEBUG
	---help---
	  Enable printk() debug for msm camera

config MSM_CAMERA_AUTOMOTIVE
	bool "Qualcomm MSM camera for automotive support"
	depends on MSM_CAMERA
	default n
	---help---
	  Enables support for automotive targets

menuconfig MSMB_CAMERA
	bool "Qualcomm MSM camera and video capture 2.0 support"
	depends on ARCH_MSM && VIDEO_V4L2 && I2C
+7 −1
Original line number Diff line number Diff line
@@ -51,6 +51,12 @@

#define VFE47_VBIF_CLK_OFFSET    0x4

#ifdef CONFIG_MSM_CAMERA_AUTOMOTIVE
#define UB_CFG_POLICY MSM_WM_UB_EQUAL_SLICING
#else
#define UB_CFG_POLICY MSM_WM_UB_CFG_DEFAULT
#endif

static uint32_t stats_base_addr[] = {
	0x1D4, /* HDR_BE */
	0x254, /* BG(AWB_BG) */
@@ -1710,7 +1716,7 @@ void msm_vfe47_cfg_axi_ub(struct vfe_device *vfe_dev)
{
	struct msm_vfe_axi_shared_data *axi_data = &vfe_dev->axi_data;

	axi_data->wm_ub_cfg_policy = MSM_WM_UB_CFG_DEFAULT;
	axi_data->wm_ub_cfg_policy = UB_CFG_POLICY;
	if (axi_data->wm_ub_cfg_policy == MSM_WM_UB_EQUAL_SLICING)
		msm_vfe47_cfg_axi_ub_equal_slicing(vfe_dev);
	else