Merge "msm: camera: vreg: Fix vreg power up issue" (5108f6a3) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_dt_util.c

+16 −1

Original line number	Diff line number	Diff line
		@@ -67,6 +67,8 @@ int msm_camera_fill_vreg_params(struct camera_vreg_t *cam_vreg,
		break;
		}
		}
		if (j == num_vreg)
		power_setting[i].seq_val = INVALID_VREG;
		break;

		case CAM_VIO:
		@@ -86,6 +88,8 @@ int msm_camera_fill_vreg_params(struct camera_vreg_t *cam_vreg,
		break;
		}
		}
		if (j == num_vreg)
		power_setting[i].seq_val = INVALID_VREG;
		break;

		case CAM_VANA:
		@@ -105,6 +109,8 @@ int msm_camera_fill_vreg_params(struct camera_vreg_t *cam_vreg,
		break;
		}
		}
		if (j == num_vreg)
		power_setting[i].seq_val = INVALID_VREG;
		break;

		case CAM_VAF:
		@@ -124,6 +130,8 @@ int msm_camera_fill_vreg_params(struct camera_vreg_t *cam_vreg,
		break;
		}
		}
		if (j == num_vreg)
		power_setting[i].seq_val = INVALID_VREG;
		break;

		case CAM_V_CUSTOM1:
		@@ -144,7 +152,9 @@ int msm_camera_fill_vreg_params(struct camera_vreg_t *cam_vreg,
		break;
		}
		}

		if (j == num_vreg)
		power_setting[i].seq_val = INVALID_VREG;
		break;
		case CAM_V_CUSTOM2:
		for (j = 0; j < num_vreg; j++) {
		if (!strcmp(cam_vreg[j].reg_name,
		@@ -163,6 +173,8 @@ int msm_camera_fill_vreg_params(struct camera_vreg_t *cam_vreg,
		break;
		}
		}
		if (j == num_vreg)
		power_setting[i].seq_val = INVALID_VREG;
		break;

		default:
		@@ -1401,6 +1413,9 @@ int msm_camera_power_up(struct msm_camera_power_ctrl_t *ctrl,
		(int) power_setting->config_val);
		break;
		case SENSOR_VREG:
		if (power_setting->seq_val == INVALID_VREG)
		break;

		if (power_setting->seq_val >= CAM_VREG_MAX) {
		pr_err("%s vreg index %d >= max %d\n", __func__,
		power_setting->seq_val,