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

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

Merge "msm: camera: cpas: new soc id for SDM710 target"

parents 96be7f7b b8c71593

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

+6 −4
Original line number Diff line number Diff line
@@ -492,8 +492,9 @@ static int cam_cpastop_poweron(struct cam_hw_info *cpas_hw) 
		}

	}



	if ((soc_private && soc_private->soc_id == SDM670_SOC_ID) &&

		(soc_private->hw_rev == SDM670_V1_1)) {

	if ((soc_private && ((soc_private->soc_id == SDM710_SOC_ID) ||

		((soc_private->soc_id == SDM670_SOC_ID) &&

		(soc_private->hw_rev == SDM670_V1_1))))) {



		struct cam_cpas_reg *reg_info;

		int tcsr_index;
@@ -551,8 +552,9 @@ static int cam_cpastop_poweroff(struct cam_hw_info *cpas_hw) 
		}

	}



	if ((soc_private && soc_private->soc_id == SDM670_SOC_ID) &&

		(soc_private->hw_rev == SDM670_V1_1)) {

	if ((soc_private && ((soc_private->soc_id == SDM710_SOC_ID)

		|| ((soc_private->soc_id == SDM670_SOC_ID) &&

		(soc_private->hw_rev == SDM670_V1_1))))) {



		struct cam_cpas_reg *reg_info;

		int tcsr_index;

drivers/media/platform/msm/camera/cam_utils/cam_soc_util.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 


/* soc id */

#define SDM670_SOC_ID 336

#define SDM710_SOC_ID 360



/* Minor Version */

#define SDM670_V1_1 0x1