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

Commit c51a98e0 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Add call to dump memory for CSIPHY" into dev/msm-4.9-camx

parents e16d10fc d1ba6193

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

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 
#include "cam_csiphy_soc.h"

#include <cam_mem_mgr.h>



static int cam_csiphy_mem_dmp_param;

module_param(cam_csiphy_mem_dmp_param, int, 0644);



void cam_csiphy_query_cap(struct csiphy_device *csiphy_dev,

	struct cam_csiphy_query_cap *csiphy_cap)

{
@@ -480,6 +483,9 @@ int32_t cam_csiphy_core_cfg(void *phy_dev, 
			goto release_mutex;

		}

		rc = cam_csiphy_config_dev(csiphy_dev);

		if (cam_csiphy_mem_dmp_param == 1)

			cam_csiphy_mem_dmp(&csiphy_dev->soc_info);



		if (rc < 0) {

			CAM_ERR(CAM_CSIPHY, "cam_csiphy_config_dev failed");

			cam_cpas_stop(csiphy_dev->cpas_handle);

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

+0 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#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;
@@ -35,7 +34,6 @@ int32_t cam_csiphy_mem_dmp(struct cam_hw_soc_info *soc_info) 
	}

	return rc;

}

#endif



int32_t cam_csiphy_enable_hw(struct csiphy_device *csiphy_dev)

{