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

Commit 081420f6 authored by Senthil's avatar Senthil
Browse files

msm: camera: adds new msm_isp46 driver 



New hardware has newer version of ISP: Version46.
This changes adds the corresponding support for it.

Change-Id: I6ea040c9324a543767cc5aaf2614ab45bfec8cf0
Signed-off-by: default avatarSenthil <skrajago@codeaurora.org>
parent e30c480b

drivers/media/platform/msm/camera_v2/isp/Makefile

+1 −1
Original line number Diff line number Diff line 
ccflags-y += -Idrivers/media/platform/msm/camera_v2

ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/io

obj-$(CONFIG_MSMB_CAMERA) += msm_isp.o msm_buf_mgr.o msm_isp_util.o msm_isp_axi_util.o msm_isp_stats_util.o

obj-$(CONFIG_MSMB_CAMERA) += msm_isp44.o msm_isp40.o msm_isp32.o
 
obj-$(CONFIG_MSMB_CAMERA) += msm_isp46.o msm_isp44.o msm_isp40.o msm_isp32.o

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

+5 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "msm_isp_axi_util.h"

#include "msm_isp_stats_util.h"

#include "msm_sd.h"

#include "msm_isp46.h"

#include "msm_isp44.h"

#include "msm_isp40.h"

#include "msm_isp32.h"
@@ -36,6 +37,10 @@ 
static struct msm_sd_req_vb2_q vfe_vb2_ops;



static const struct of_device_id msm_vfe_dt_match[] = {

	{

		.compatible = "qcom,vfe46",

		.data = &vfe46_hw_info,

	},

	{

		.compatible = "qcom,vfe44",

		.data = &vfe44_hw_info,

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

0 → 100644
+1432 −0

File added.

Preview size limit exceeded, changes collapsed.

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

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#ifndef __MSM_ISP46_H__

#define __MSM_ISP46_H__



extern struct msm_vfe_hardware_info vfe46_hw_info;

#endif /* __MSM_ISP46_H__ */

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

+1 −0
Original line number Diff line number Diff line
@@ -987,6 +987,7 @@ static void msm_isp_update_camif_output_count( 
			continue;

		if (stream_info->stream_src == PIX_ENCODER ||

			stream_info->stream_src == PIX_VIEWFINDER ||

			stream_info->stream_src == PIX_VIDEO ||

			stream_info->stream_src == IDEAL_RAW) {

			if (stream_cfg_cmd->cmd == START_STREAM)

				vfe_dev->axi_data.src_info[VFE_PIX_0].