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

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

Merge "msm: camera2: Add support in cpp driver for HW version 4.1.1"

parents 0a4a7055 db63d99b

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+51 −54
Original line number Diff line number Diff line
@@ -709,8 +709,9 @@ static void cpp_get_clk_freq_tbl(struct clk *clk, struct cpp_hw_info *hw_info) 
static int cpp_init_hardware(struct cpp_device *cpp_dev)

{

	int rc = 0;

	uint32_t msm_micro_iface_idx;

	uint32_t msm_cpp_core_clk_idx;

	uint32_t msm_micro_iface_idx;

	uint32_t vbif_version;

	rc = msm_isp_init_bandwidth_mgr(ISP_CPP);

	if (rc < 0) {

		pr_err("%s: Bandwidth registration Failed!\n", __func__);
@@ -737,7 +738,7 @@ static int cpp_init_hardware(struct cpp_device *cpp_dev) 
		pr_err("Fail to get clock index\n");

		goto fs_failed;

	}

	if (cpp_dev->hw_info.cpp_hw_version != CPP_HW_VERSION_4_0_0) {



	cpp_dev->cpp_clk[msm_micro_iface_idx] =

		clk_get(&cpp_dev->pdev->dev,

		cpp_clk_info[msm_micro_iface_idx].clk_name);
@@ -777,7 +778,6 @@ static int cpp_init_hardware(struct cpp_device *cpp_dev) 
	usleep_range(1000, 1200);



	clk_put(cpp_dev->cpp_clk[msm_micro_iface_idx]);

	}



	rc = msm_cam_clk_enable(&cpp_dev->pdev->dev, cpp_clk_info,

			cpp_dev->cpp_clk, cpp_dev->num_clk, 1);
@@ -830,6 +830,11 @@ static int cpp_init_hardware(struct cpp_device *cpp_dev) 


	cpp_dev->hw_info.cpp_hw_version =

		msm_camera_io_r(cpp_dev->cpp_hw_base);

	if (cpp_dev->hw_info.cpp_hw_version == CPP_HW_VERSION_4_1_0) {

		vbif_version = msm_camera_io_r(cpp_dev->vbif_base);

		if (vbif_version == VBIF_VERSION_2_3_0)

			cpp_dev->hw_info.cpp_hw_version = CPP_HW_VERSION_4_0_0;

	}

	pr_info("CPP HW Version: 0x%x\n", cpp_dev->hw_info.cpp_hw_version);

	cpp_dev->hw_info.cpp_hw_caps =

		msm_camera_io_r(cpp_dev->cpp_hw_base + 0x4);
@@ -843,7 +848,6 @@ static int cpp_init_hardware(struct cpp_device *cpp_dev) 
	msm_cpp_create_buff_queue(cpp_dev, MSM_CPP_MAX_BUFF_QUEUE);

	pr_err("stream_cnt:%d\n", cpp_dev->stream_cnt);

	cpp_dev->stream_cnt = 0;

	if (cpp_dev->hw_info.cpp_hw_version != CPP_HW_VERSION_4_0_0) {

	if (cpp_dev->is_firmware_loaded == 1) {

		disable_irq(cpp_dev->irq->start);

		cpp_load_fw(cpp_dev, cpp_dev->fw_name_bin);
@@ -853,14 +857,7 @@ static int cpp_init_hardware(struct cpp_device *cpp_dev) 
		msm_camera_io_w_mb(0xFFFF, cpp_dev->base +

			MSM_CPP_MICRO_IRQGEN_CLR);

	}

	} else {

		msm_camera_io_w(0x1,

			cpp_dev->base + MSM_CPP_MICRO_CLKEN_CTL);

		msm_camera_io_w_mb(0x7C8,

			cpp_dev->base + MSM_CPP_MICRO_IRQGEN_MASK);

		msm_camera_io_w_mb(0xFFFF,

			cpp_dev->base + MSM_CPP_MICRO_IRQGEN_CLR);

	}



	return rc;

req_irq_fail:

	iounmap(cpp_dev->cpp_hw_base);

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.h

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
#define CPP_HW_VERSION_4_1_0  0x40010000

#define CPP_HW_VERSION_5_0_0  0x50000000



#define VBIF_VERSION_2_3_0  0x20030000



#define MAX_ACTIVE_CPP_INSTANCE 8

#define MAX_CPP_PROCESSING_FRAME 2

#define MAX_CPP_V4l2_EVENTS 30