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

Commit 914a73e1 authored by Abhijit Trivedi's avatar Abhijit Trivedi
Browse files

UPSTREAM: Merge remote-tracking branch 'quic/dev/msm-4.9-camx' into msm-4.9 (mainline) 



* quic/dev/msm-4.9-camx:
  msm: camera: cpas: Add camnoc static info for sdm845 v2
  msm:camera: Add functionality to dump memory state

Change-Id: Ibbac2a94744b1839f30106d6a90ed58677ad7701
Signed-off-by: default avatarAbhijit Trivedi <abhijitt@codeaurora.org>
parents 607b49ce 13c0e6f9

drivers/media/platform/msm/camera/cam_cpas/cpas_top/cam_cpastop_hw.c

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

#include "cam_cpas_soc.h"

#include "cpastop100.h"

#include "cpastop_v170_110.h"



struct cam_camnoc_info *camnoc_info;
@@ -420,6 +421,10 @@ static int cam_cpastop_init_hw_version(struct cam_hw_info *cpas_hw, 
			(hw_caps->cpas_version.minor == 0) &&

			(hw_caps->cpas_version.incr == 0)) {

			camnoc_info = &cam170_cpas100_camnoc_info;

		} else if ((hw_caps->cpas_version.major == 1) &&

			(hw_caps->cpas_version.minor == 1) &&

			(hw_caps->cpas_version.incr == 0)) {

			camnoc_info = &cam170_cpas110_camnoc_info;

		} else {

			CAM_ERR(CAM_CPAS, "CPAS Version not supported %d.%d.%d",

				hw_caps->cpas_version.major,

drivers/media/platform/msm/camera/cam_cpas/cpas_top/cpastop_v170_110.h

0 → 100644
+542 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017, 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 _CPASTOP_V170_110_H_

#define _CPASTOP_V170_110_H_



#define TEST_IRQ_ENABLE 0



static struct cam_camnoc_irq_sbm cam_cpas110_irq_sbm = {

	.sbm_enable = {

		.access_type = CAM_REG_TYPE_READ_WRITE,

		.enable = true,

		.offset = 0x2040, /* SBM_FAULTINEN0_LOW */

		.value = 0x1 | /* SBM_FAULTINEN0_LOW_PORT0_MASK*/

			0x2 | /* SBM_FAULTINEN0_LOW_PORT1_MASK */

			0x4 | /* SBM_FAULTINEN0_LOW_PORT2_MASK */

			0x8 | /* SBM_FAULTINEN0_LOW_PORT3_MASK */

			0x10 | /* SBM_FAULTINEN0_LOW_PORT4_MASK */

			0x20 | /* SBM_FAULTINEN0_LOW_PORT5_MASK */

			(TEST_IRQ_ENABLE ?

			0x100 : /* SBM_FAULTINEN0_LOW_PORT8_MASK */

			0x0),

	},

	.sbm_status = {

		.access_type = CAM_REG_TYPE_READ,

		.enable = true,

		.offset = 0x2048, /* SBM_FAULTINSTATUS0_LOW */

	},

	.sbm_clear = {

		.access_type = CAM_REG_TYPE_WRITE,

		.enable = true,

		.offset = 0x2080, /* SBM_FLAGOUTCLR0_LOW */

		.value = TEST_IRQ_ENABLE ? 0x6 : 0x2,

	}

};



static struct cam_camnoc_irq_err

	cam_cpas110_irq_err[] = {

	{

		.irq_type = CAM_CAMNOC_HW_IRQ_SLAVE_ERROR,

		.enable = true,

		.sbm_port = 0x1, /* SBM_FAULTINSTATUS0_LOW_PORT0_MASK */

		.err_enable = {

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.enable = true,

			.offset = 0x2708, /* ERRLOGGER_MAINCTL_LOW */

			.value = 1,

		},

		.err_status = {

			.access_type = CAM_REG_TYPE_READ,

			.enable = true,

			.offset = 0x2710, /* ERRLOGGER_ERRVLD_LOW */

		},

		.err_clear = {

			.access_type = CAM_REG_TYPE_WRITE,

			.enable = true,

			.offset = 0x2718, /* ERRLOGGER_ERRCLR_LOW */

			.value = 1,

		},

	},

	{

		.irq_type = CAM_CAMNOC_HW_IRQ_IFE02_UBWC_ENCODE_ERROR,

		.enable = true,

		.sbm_port = 0x2, /* SBM_FAULTINSTATUS0_LOW_PORT1_MASK */

		.err_enable = {

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.enable = true,

			.offset = 0x5a0, /* SPECIFIC_IFE02_ENCERREN_LOW */

			.value = 1,

		},

		.err_status = {

			.access_type = CAM_REG_TYPE_READ,

			.enable = true,

			.offset = 0x590, /* SPECIFIC_IFE02_ENCERRSTATUS_LOW */

		},

		.err_clear = {

			.access_type = CAM_REG_TYPE_WRITE,

			.enable = true,

			.offset = 0x598, /* SPECIFIC_IFE02_ENCERRCLR_LOW */

			.value = 1,

		},

	},

	{

		.irq_type = CAM_CAMNOC_HW_IRQ_IFE13_UBWC_ENCODE_ERROR,

		.enable = true,

		.sbm_port = 0x4, /* SBM_FAULTINSTATUS0_LOW_PORT2_MASK */

		.err_enable = {

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.enable = true,

			.offset = 0x9a0, /* SPECIFIC_IFE13_ENCERREN_LOW */

			.value = 1,

		},

		.err_status = {

			.access_type = CAM_REG_TYPE_READ,

			.enable = true,

			.offset = 0x990, /* SPECIFIC_IFE13_ENCERRSTATUS_LOW */

		},

		.err_clear = {

			.access_type = CAM_REG_TYPE_WRITE,

			.enable = true,

			.offset = 0x998, /* SPECIFIC_IFE13_ENCERRCLR_LOW */

			.value = 1,

		},

	},

	{

		.irq_type = CAM_CAMNOC_HW_IRQ_IPE_BPS_UBWC_DECODE_ERROR,

		.enable = true,

		.sbm_port = 0x8, /* SBM_FAULTINSTATUS0_LOW_PORT3_MASK */

		.err_enable = {

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.enable = true,

			.offset = 0xd20, /* SPECIFIC_IBL_RD_DECERREN_LOW */

			.value = 1,

		},

		.err_status = {

			.access_type = CAM_REG_TYPE_READ,

			.enable = true,

			.offset = 0xd10, /* SPECIFIC_IBL_RD_DECERRSTATUS_LOW */

		},

		.err_clear = {

			.access_type = CAM_REG_TYPE_WRITE,

			.enable = true,

			.offset = 0xd18, /* SPECIFIC_IBL_RD_DECERRCLR_LOW */

			.value = 1,

		},

	},

	{

		.irq_type = CAM_CAMNOC_HW_IRQ_IPE_BPS_UBWC_ENCODE_ERROR,

		.enable = true,

		.sbm_port = 0x10, /* SBM_FAULTINSTATUS0_LOW_PORT4_MASK */

		.err_enable = {

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.enable = true,

			.offset = 0x11a0, /* SPECIFIC_IBL_WR_ENCERREN_LOW */

			.value = 1,

		},

		.err_status = {

			.access_type = CAM_REG_TYPE_READ,

			.enable = true,

			.offset = 0x1190,

			/* SPECIFIC_IBL_WR_ENCERRSTATUS_LOW */

		},

		.err_clear = {

			.access_type = CAM_REG_TYPE_WRITE,

			.enable = true,

			.offset = 0x1198, /* SPECIFIC_IBL_WR_ENCERRCLR_LOW */

			.value = 1,

		},

	},

	{

		.irq_type = CAM_CAMNOC_HW_IRQ_AHB_TIMEOUT,

		.enable = true,

		.sbm_port = 0x20, /* SBM_FAULTINSTATUS0_LOW_PORT5_MASK */

		.err_enable = {

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.enable = true,

			.offset = 0x2088, /* SBM_FLAGOUTSET0_LOW */

			.value = 0x1,

		},

		.err_status = {

			.access_type = CAM_REG_TYPE_READ,

			.enable = true,

			.offset = 0x2090, /* SBM_FLAGOUTSTATUS0_LOW */

		},

		.err_clear = {

			.enable = false,

		},

	},

	{

		.irq_type = CAM_CAMNOC_HW_IRQ_RESERVED1,

		.enable = false,

	},

	{

		.irq_type = CAM_CAMNOC_HW_IRQ_RESERVED2,

		.enable = false,

	},

	{

		.irq_type = CAM_CAMNOC_HW_IRQ_CAMNOC_TEST,

		.enable = TEST_IRQ_ENABLE ? true : false,

		.sbm_port = 0x100, /* SBM_FAULTINSTATUS0_LOW_PORT8_MASK */

		.err_enable = {

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.enable = true,

			.offset = 0x2088, /* SBM_FLAGOUTSET0_LOW */

			.value = 0x5,

		},

		.err_status = {

			.access_type = CAM_REG_TYPE_READ,

			.enable = true,

			.offset = 0x2090, /* SBM_FLAGOUTSTATUS0_LOW */

		},

		.err_clear = {

			.enable = false,

		},

	},

};



static struct cam_camnoc_specific

	cam_cpas110_camnoc_specific[] = {

	{

		.port_type = CAM_CAMNOC_CDM,

		.enable = true,

		.priority_lut_low = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x30, /* SPECIFIC_CDM_PRIORITYLUT_LOW */

			.value = 0x22222222,

		},

		.priority_lut_high = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x34, /* SPECIFIC_CDM_PRIORITYLUT_HIGH */

			.value = 0x22222222,

		},

		.urgency = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 1,

			.offset = 0x38, /* SPECIFIC_CDM_URGENCY_LOW */

			.mask = 0x7, /* SPECIFIC_CDM_URGENCY_LOW_READ_MASK */

			.shift = 0x0, /* SPECIFIC_CDM_URGENCY_LOW_READ_SHIFT */

			.value = 0,

		},

		.danger_lut = {

			.enable = false,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x40, /* SPECIFIC_CDM_DANGERLUT_LOW */

			.value = 0x0,

		},

		.safe_lut = {

			.enable = false,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x48, /* SPECIFIC_CDM_SAFELUT_LOW */

			.value = 0x0,

		},

		.ubwc_ctl = {

			.enable = false,

		},

	},

	{

		.port_type = CAM_CAMNOC_IFE02,

		.enable = true,

		.priority_lut_low = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x430, /* SPECIFIC_IFE02_PRIORITYLUT_LOW */

			.value = 0x66665433,

		},

		.priority_lut_high = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x434, /* SPECIFIC_IFE02_PRIORITYLUT_HIGH */

			.value = 0x66666666,

		},

		.urgency = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 1,

			.offset = 0x438, /* SPECIFIC_IFE02_URGENCY_LOW */

			/* SPECIFIC_IFE02_URGENCY_LOW_WRITE_MASK */

			.mask = 0x70,

			/* SPECIFIC_IFE02_URGENCY_LOW_WRITE_SHIFT */

			.shift = 0x4,

			.value = 3,

		},

		.danger_lut = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.offset = 0x440, /* SPECIFIC_IFE02_DANGERLUT_LOW */

			.value = 0xFFFFFF00,

		},

		.safe_lut = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.offset = 0x448, /* SPECIFIC_IFE02_SAFELUT_LOW */

			.value = 0x3,

		},

		.ubwc_ctl = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x588, /* SPECIFIC_IFE02_ENCCTL_LOW */

			.value = 1,

		},

	},

	{

		.port_type = CAM_CAMNOC_IFE13,

		.enable = true,

		.priority_lut_low = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x830, /* SPECIFIC_IFE13_PRIORITYLUT_LOW */

			.value = 0x66665433,

		},

		.priority_lut_high = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x834, /* SPECIFIC_IFE13_PRIORITYLUT_HIGH */

			.value = 0x66666666,

		},

		.urgency = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 1,

			.offset = 0x838, /* SPECIFIC_IFE13_URGENCY_LOW */

			/* SPECIFIC_IFE13_URGENCY_LOW_WRITE_MASK */

			.mask = 0x70,

			/* SPECIFIC_IFE13_URGENCY_LOW_WRITE_SHIFT */

			.shift = 0x4,

			.value = 3,

		},

		.danger_lut = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.offset = 0x840, /* SPECIFIC_IFE13_DANGERLUT_LOW */

			.value = 0xFFFFFF00,

		},

		.safe_lut = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.offset = 0x848, /* SPECIFIC_IFE13_SAFELUT_LOW */

			.value = 0x3,

		},

		.ubwc_ctl = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x988, /* SPECIFIC_IFE13_ENCCTL_LOW */

			.value = 1,

		},

	},

	{

		.port_type = CAM_CAMNOC_IPE_BPS_LRME_READ,

		.enable = true,

		.priority_lut_low = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0xc30, /* SPECIFIC_IBL_RD_PRIORITYLUT_LOW */

			.value = 0x33333333,

		},

		.priority_lut_high = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0xc34, /* SPECIFIC_IBL_RD_PRIORITYLUT_HIGH */

			.value = 0x33333333,

		},

		.urgency = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 1,

			.offset = 0xc38, /* SPECIFIC_IBL_RD_URGENCY_LOW */

			/* SPECIFIC_IBL_RD_URGENCY_LOW_READ_MASK */

			.mask = 0x7,

			/* SPECIFIC_IBL_RD_URGENCY_LOW_READ_SHIFT */

			.shift = 0x0,

			.value = 3,

		},

		.danger_lut = {

			.enable = false,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0xc40, /* SPECIFIC_IBL_RD_DANGERLUT_LOW */

			.value = 0x0,

		},

		.safe_lut = {

			.enable = false,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0xc48, /* SPECIFIC_IBL_RD_SAFELUT_LOW */

			.value = 0x0,

		},

		.ubwc_ctl = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0xd08, /* SPECIFIC_IBL_RD_DECCTL_LOW */

			.value = 1,

		},

	},

	{

		.port_type = CAM_CAMNOC_IPE_BPS_LRME_WRITE,

		.enable = true,

		.priority_lut_low = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x1030, /* SPECIFIC_IBL_WR_PRIORITYLUT_LOW */

			.value = 0x33333333,

		},

		.priority_lut_high = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x1034, /* SPECIFIC_IBL_WR_PRIORITYLUT_HIGH */

			.value = 0x33333333,

		},

		.urgency = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 1,

			.offset = 0x1038, /* SPECIFIC_IBL_WR_URGENCY_LOW */

			/* SPECIFIC_IBL_WR_URGENCY_LOW_WRITE_MASK */

			.mask = 0x70,

			/* SPECIFIC_IBL_WR_URGENCY_LOW_WRITE_SHIFT */

			.shift = 0x4,

			.value = 3,

		},

		.danger_lut = {

			.enable = false,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x1040, /* SPECIFIC_IBL_WR_DANGERLUT_LOW */

			.value = 0x0,

		},

		.safe_lut = {

			.enable = false,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x1048, /* SPECIFIC_IBL_WR_SAFELUT_LOW */

			.value = 0x0,

		},

		.ubwc_ctl = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x1188, /* SPECIFIC_IBL_WR_ENCCTL_LOW */

			.value = 1,

		},

	},

	{

		.port_type = CAM_CAMNOC_JPEG,

		.enable = true,

		.priority_lut_low = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x1430, /* SPECIFIC_JPEG_PRIORITYLUT_LOW */

			.value = 0x22222222,

		},

		.priority_lut_high = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x1434, /* SPECIFIC_JPEG_PRIORITYLUT_HIGH */

			.value = 0x22222222,

		},

		.urgency = {

			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x1438, /* SPECIFIC_JPEG_URGENCY_LOW */

			.value = 0x22,

		},

		.danger_lut = {

			.enable = false,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x1440, /* SPECIFIC_JPEG_DANGERLUT_LOW */

			.value = 0x0,

		},

		.safe_lut = {

			.enable = false,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x1448, /* SPECIFIC_JPEG_SAFELUT_LOW */

			.value = 0x0,

		},

		.ubwc_ctl = {

			.enable = false,

		},

	},

	{

		.port_type = CAM_CAMNOC_FD,

		.enable = false,

	},

	{

		.port_type = CAM_CAMNOC_ICP,

		.enable = false,

	}

};



static uint32_t cam_cpas110_slave_error_logger[] = {

	0x2700, /* ERRLOGGER_SWID_LOW */

	0x2704, /* ERRLOGGER_SWID_HIGH */

	0x2708, /* ERRLOGGER_MAINCTL_LOW */

	0x2710, /* ERRLOGGER_ERRVLD_LOW */

	0x2720, /* ERRLOGGER_ERRLOG0_LOW */

	0x2724, /* ERRLOGGER_ERRLOG0_HIGH */

	0x2728, /* ERRLOGGER_ERRLOG1_LOW */

	0x272c, /* ERRLOGGER_ERRLOG1_HIGH */

	0x2730, /* ERRLOGGER_ERRLOG2_LOW */

	0x2734, /* ERRLOGGER_ERRLOG2_HIGH */

	0x2738, /* ERRLOGGER_ERRLOG3_LOW */

	0x273c, /* ERRLOGGER_ERRLOG3_HIGH */

};



static struct cam_cpas_hw_errata_wa_list cam170_cpas110_errata_wa_list = {

	.camnoc_flush_slave_pending_trans = {

		.enable = true,

		.data.reg_info = {

			.access_type = CAM_REG_TYPE_READ,

			.offset = 0x2100, /* SidebandManager_SenseIn0_Low */

			.mask = 0xE0000, /* Bits 17, 18, 19 */

			.value = 0, /* expected to be 0 */

		},

	},

};



static struct cam_camnoc_info cam170_cpas110_camnoc_info = {

	.specific = &cam_cpas110_camnoc_specific[0],

	.specific_size = sizeof(cam_cpas110_camnoc_specific) /

		sizeof(cam_cpas110_camnoc_specific[0]),

	.irq_sbm = &cam_cpas110_irq_sbm,

	.irq_err = &cam_cpas110_irq_err[0],

	.irq_err_size = sizeof(cam_cpas110_irq_err) /

		sizeof(cam_cpas110_irq_err[0]),

	.error_logger = &cam_cpas110_slave_error_logger[0],

	.error_logger_size = sizeof(cam_cpas110_slave_error_logger) /

		sizeof(cam_cpas110_slave_error_logger[0]),

	.errata_wa_list = &cam170_cpas110_errata_wa_list,

};



#endif /* _CPASTOP_V170_110_H_ */

drivers/media/platform/msm/camera/cam_sensor_module/cam_csiphy/cam_csiphy_soc.c

+23 −0
Original line number Diff line number Diff line
@@ -14,6 +14,29 @@ 
#include "cam_csiphy_core.h"

#include "include/cam_csiphy_1_0_hwreg.h"



#ifdef CAM_CSIPHY_MEM_DMP

int32_t cam_csiphy_mem_dmp(struct cam_hw_soc_info *soc_info)

{

	int32_t rc = 0;

	resource_size_t size = 0;

	void __iomem *addr = NULL;



	if (!soc_info) {

		rc = -EINVAL;

		CAM_ERR(CAM_CSIPHY, "invalid input %d", rc);

		return rc;

	}

	addr = soc_info->reg_map[0].mem_base;

	size = resource_size(soc_info->mem_block[0]);

	rc = cam_io_dump(addr, 0, (size >> 2));

	if (rc < 0) {

		CAM_ERR(CAM_CSIPHY, "generating dump failed %d", rc);

		return rc;

	}

	return rc;

}

#endif



int32_t cam_csiphy_enable_hw(struct csiphy_device *csiphy_dev)

{

	int32_t rc = 0;

drivers/media/platform/msm/camera/cam_sensor_module/cam_csiphy/cam_csiphy_soc.h

+8 −0
Original line number Diff line number Diff line
@@ -67,4 +67,12 @@ int cam_csiphy_enable_hw(struct csiphy_device *csiphy_dev); 
 */

int cam_csiphy_disable_hw(struct csiphy_device *csiphy_dev);



/**

 * @soc_info: Soc info of cam hw driver module

 *

 * This API dumps memory for the entire mapped region

 * (needs to be macro enabled before use)

 */

int cam_csiphy_mem_dmp(struct cam_hw_soc_info *soc_info);



#endif /* _CAM_CSIPHY_SOC_H_ */

drivers/media/platform/msm/camera/cam_utils/cam_io_util.c

+2 −2
Original line number Diff line number Diff line
@@ -262,11 +262,11 @@ int cam_io_dump(void __iomem *base_addr, uint32_t start_offset, int size) 
		if (i % NUM_REGISTER_PER_LINE == 0) {

			snprintf(p_str, 12, "0x%08x: ",

				REG_OFFSET(start_offset, i));

			p_str += 12;

			p_str += 11;

		}

		data = readl_relaxed(base_addr + REG_OFFSET(start_offset, i));

		snprintf(p_str, 9, "%08x ", data);

		p_str += 9;

		p_str += 8;

		if ((i + 1) % NUM_REGISTER_PER_LINE == 0) {

			CAM_ERR(CAM_UTIL, "%s", line_str);

			line_str[0] = '\0';