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

Commit 55ff5254 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: Add header file changes" into camera-kernel.lnx.4.0

parents 95ecd232 6d2e9d6d

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid17x.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define CAM_CSID_VERSION_V170                 0x10070000

#define CAM_CSID_VERSION_V170                 0x10070000

#define CAM_CSID_VERSION_V175                 0x10070050

#define CAM_CSID_VERSION_V175                 0x10070050

#define CAM_CSID_VERSION_V480                 0x40080000

#define CAM_CSID_VERSION_V480                 0x40080000

#define CAM_CSID_VERSION_V165                 0x10060050





static struct cam_ife_csid_hw_info cam_ife_csid170_hw_info = {

static struct cam_ife_csid_hw_info cam_ife_csid170_hw_info = {

	.csid_reg = &cam_ife_csid_170_reg_offset,

	.csid_reg = &cam_ife_csid_170_reg_offset,
@@ -44,6 +45,11 @@ static struct cam_ife_csid_hw_info cam_ife_csid480_hw_info = { 
	.hw_dts_version = CAM_CSID_VERSION_V480,

	.hw_dts_version = CAM_CSID_VERSION_V480,

};

};





static struct cam_ife_csid_hw_info cam_ife_csid165_204_hw_info = {

	.csid_reg = &cam_ife_csid_175_200_reg_offset,

	.hw_dts_version = CAM_CSID_VERSION_V165,

};



static const struct of_device_id cam_ife_csid17x_dt_match[] = {

static const struct of_device_id cam_ife_csid17x_dt_match[] = {

	{

	{

		.compatible = "qcom,csid170",

		.compatible = "qcom,csid170",
@@ -69,6 +75,10 @@ static const struct of_device_id cam_ife_csid17x_dt_match[] = { 
		.compatible = "qcom,csid580",

		.compatible = "qcom,csid580",

		.data = &cam_ife_csid480_hw_info,

		.data = &cam_ife_csid480_hw_info,

	},

	},

	{

		.compatible = "qcom,csid165_204",

		.data = &cam_ife_csid165_204_hw_info,

	},

	{}

	{}

};

};

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_lite17x.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -37,6 +37,10 @@ static const struct of_device_id cam_ife_csid_lite_dt_match[] = { 
		.compatible = "qcom,csid-lite580",

		.compatible = "qcom,csid-lite580",

		.data = &cam_ife_csid_lite_480_hw_info,

		.data = &cam_ife_csid_lite_480_hw_info,

	},

	},

	{

		.compatible = "qcom,csid-lite165",

		.data = &cam_ife_csid_lite_17x_hw_info,

	},

	{}

	{}

};

};

MODULE_DEVICE_TABLE(of, cam_ife_csid_lite_dt_match);

MODULE_DEVICE_TABLE(of, cam_ife_csid_lite_dt_match);

drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -10,8 +10,10 @@ 
#include "cam_vfe175_130.h"

#include "cam_vfe175_130.h"

#include "cam_vfe480.h"

#include "cam_vfe480.h"

#include "cam_vfe580.h"

#include "cam_vfe580.h"

#include "cam_vfe165_160.h"

#include "cam_vfe_lite17x.h"

#include "cam_vfe_lite17x.h"

#include "cam_vfe_lite48x.h"

#include "cam_vfe_lite48x.h"

#include "cam_vfe_lite16x.h"

#include "cam_vfe_hw_intf.h"

#include "cam_vfe_hw_intf.h"

#include "cam_vfe_core.h"

#include "cam_vfe_core.h"

#include "cam_vfe_dev.h"

#include "cam_vfe_dev.h"
@@ -42,6 +44,10 @@ static const struct of_device_id cam_vfe_dt_match[] = { 
		.compatible = "qcom,vfe580",

		.compatible = "qcom,vfe580",

		.data = &cam_vfe580_hw_info,

		.data = &cam_vfe580_hw_info,

	},

	},

	{

		.compatible = "qcom,vfe165_160",

		.data = &cam_vfe165_160_hw_info,

	},

	{

	{

		.compatible = "qcom,vfe-lite170",

		.compatible = "qcom,vfe-lite170",

		.data = &cam_vfe_lite17x_hw_info,

		.data = &cam_vfe_lite17x_hw_info,
@@ -58,6 +64,10 @@ static const struct of_device_id cam_vfe_dt_match[] = { 
		.compatible = "qcom,vfe-lite580",

		.compatible = "qcom,vfe-lite580",

		.data = &cam_vfe_lite48x_hw_info,

		.data = &cam_vfe_lite48x_hw_info,

	},

	},

	{

		.compatible = "qcom,vfe-lite165",

		.data = &cam_vfe_lite16x_hw_info,

	},

	{}

	{}

};

};

MODULE_DEVICE_TABLE(of, cam_vfe_dt_match);

MODULE_DEVICE_TABLE(of, cam_vfe_dt_match);