Merge "msm: camera: flash: Add i2c hw support" into dev/msm-4.9-camx (a73ee692) · Commits · e / devices / android_kernel_fairphone_FP3

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;

+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;

+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

+756 −123

File changed.

Preview size limit exceeded, changes collapsed.

+3 −11

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -16,20 +16,12 @@
		#include <linux/leds-qpnp-flash.h>
		#include <media/cam_sensor.h>
		#include "cam_flash_dev.h"
		#include "cam_sync_api.h"
		#include "cam_mem_mgr_api.h"

		int cam_flash_parser(struct cam_flash_ctrl fctrl, void arg);
		int cam_flash_publish_dev_info(struct cam_req_mgr_device_info *info);
		int cam_flash_establish_link(struct cam_req_mgr_core_dev_link_setup *link);
		int cam_flash_apply_setting(struct cam_flash_ctrl *fctrl, uint64_t req_id);
		int cam_flash_apply_request(struct cam_req_mgr_apply_request *apply);
		int cam_flash_process_evt(struct cam_req_mgr_link_evt_data *event_data);
		int cam_flash_flush_request(struct cam_req_mgr_flush_request *flush);
		int cam_flash_off(struct cam_flash_ctrl *fctrl);
		int cam_flash_prepare(struct cam_flash_ctrl *flash_ctrl,
		bool regulator_enable);
		void cam_flash_shutdown(struct cam_flash_ctrl *flash_ctrl);
		int cam_flash_stop_dev(struct cam_flash_ctrl *flash_ctrl);
		int cam_flash_release_dev(struct cam_flash_ctrl *fctrl);


		#endif /_CAM_FLASH_CORE_H_/