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

Commit 20a67777 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 SDM712 target"

parents bd224685 c169c511

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

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

	}



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

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

		(soc_private->soc_id == SDM712_SOC_ID) ||

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

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

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



		struct cam_cpas_reg *reg_info;

		int tcsr_index;
@@ -585,9 +586,10 @@ static int cam_cpastop_poweroff(struct cam_hw_info *cpas_hw) 
		}

	}



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

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

		|| (soc_private->soc_id == SDM712_SOC_ID)

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

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

		(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
@@ -44,6 +44,7 @@ 
/* soc id */

#define SDM670_SOC_ID 336

#define SDM710_SOC_ID 360

#define SDM712_SOC_ID 393



/* Minor Version */

#define SDM670_V1_1 0x1