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

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

Merge "msm: camera: flash: Add i2c hw support" into dev/msm-4.9-camx

parents c8e96269 f2066451

drivers/media/platform/msm/camera/cam_sensor_module/cam_actuator/cam_actuator_core.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static int32_t cam_actuator_power_down(struct cam_actuator_ctrl_t *a_ctrl) 
		CAM_ERR(CAM_ACTUATOR, "failed: power_info %pK", power_info);

		return -EINVAL;

	}

	rc = msm_camera_power_down(power_info, soc_info);

	rc = cam_sensor_util_power_down(power_info, soc_info);

	if (rc) {

		CAM_ERR(CAM_ACTUATOR, "power down the core is failed:%d", rc);

		return rc;

drivers/media/platform/msm/camera/cam_sensor_module/cam_eeprom/cam_eeprom_core.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static int cam_eeprom_power_down(struct cam_eeprom_ctrl_t *e_ctrl) 
		CAM_ERR(CAM_EEPROM, "failed: power_info %pK", power_info);

		return -EINVAL;

	}

	rc = msm_camera_power_down(power_info, soc_info);

	rc = cam_sensor_util_power_down(power_info, soc_info);

	if (rc) {

		CAM_ERR(CAM_EEPROM, "power down the core is failed:%d", rc);

		return rc;

drivers/media/platform/msm/camera/cam_sensor_module/cam_flash/Makefile

+7 −6
Original line number Diff line number Diff line 
ccflags-y += -Idrivers/media/platform/msm/camera/cam_utils

ccflags-y += -Idrivers/media/platform/msm/camera/cam_sync

ccflags-y += -Idrivers/media/platform/msm/camera/cam_core

ccflags-y += -Idrivers/media/platform/msm/camera/cam_cpas/include

ccflags-y += -Idrivers/media/platform/msm/camera/cam_req_mgr

ccflags-y += -Idrivers/media/platform/msm/camera/cam_sensor_module/cam_cci

ccflags-y += -Idrivers/media/platform/msm/camera/cam_sensor_module/cam_res_mgr

ccflags-y += -Idrivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_utils

ccflags-y += -Idrivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_io

ccflags-y += -Idrivers/media/platform/msm/camera/cam_sensor_module/cam_cci

ccflags-y += -Idrivers/media/platform/msm/camera/cam_req_mgr

ccflags-y += -Idrivers/media/platform/msm/camera/cam_smmu/

ccflags-y += -Idrivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_utils

ccflags-y += -Idrivers/media/platform/msm/camera/cam_smmu

ccflags-y += -Idrivers/media/platform/msm/camera/cam_utils



obj-$(CONFIG_SPECTRA_CAMERA) += cam_flash_dev.o cam_flash_core.o cam_flash_soc.o