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

Commit ca701e9b authored by Anomalchik's avatar Anomalchik
Browse files

camera_v2: add option for disable IR_Led and IR_Cut driver 

it's need for TAG LA.UM.5.3 and lower (reverted from commit c9c2b98b)
parent 5495a952

arch/arm64/configs/markw_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -2619,7 +2619,6 @@ CONFIG_OV8825=y 
CONFIG_OV8865=y

CONFIG_s5k4e1=y

CONFIG_OV12830=y

CONFIG_MSMB_WITHOUT_IR=y

CONFIG_MSM_V4L2_VIDEO_OVERLAY_DEVICE=y

CONFIG_MSMB_JPEG=y

CONFIG_MSM_FD=y

drivers/media/platform/msm/camera_v2/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -212,12 +212,6 @@ config OV12830 
		snapshot config = 4224 * 3000 at 15 fps.

		2 lanes max fps is 18, 4 lanes max fps is 24.



config MSMB_WITHOUT_IR

	bool "Compile camera_v2 without ir"

	depends on MSMB_CAMERA

	---help---

		Need for LA.UM.5.3 and lower



config MSM_V4L2_VIDEO_OVERLAY_DEVICE

	tristate "QTI MSM V4l2 video overlay device"

	---help---

drivers/media/platform/msm/camera_v2/sensor/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -4,9 +4,5 @@ ccflags-y += -Idrivers/media/platform/msm/camera_v2/msm_vb2 
ccflags-y += -Idrivers/media/platform/msm/camera_v2/camera

ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/io

ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/cci

ifeq ($(CONFIG_MSMB_WITHOUT_IR),y)

obj-$(CONFIG_MSMB_CAMERA) += cci/ io/ csiphy/ csid/ actuator/ eeprom/ ois/ flash/

else

obj-$(CONFIG_MSMB_CAMERA) += cci/ io/ csiphy/ csid/ actuator/ eeprom/ ois/ flash/ ir_led/ ir_cut/

endif

obj-$(CONFIG_MSM_CAMERA_SENSOR) += msm_sensor_init.o msm_sensor_driver.o msm_sensor.o

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

+0 −4
Original line number Diff line number Diff line
@@ -285,7 +285,6 @@ int msm_sensor_get_sub_module_index(struct device_node *of_node, 
		src_node = NULL;

	}



#ifndef CONFIG_MSMB_WITHOUT_IR

	src_node = of_parse_phandle(of_node, "qcom,ir-led-src", 0);

	if (!src_node) {

		CDBG("%s:%d src_node NULL\n", __func__, __LINE__);
@@ -317,7 +316,6 @@ int msm_sensor_get_sub_module_index(struct device_node *of_node, 
		of_node_put(src_node);

		src_node = NULL;

	}

#endif



	rc = of_property_read_u32(of_node, "qcom,strobe-flash-sd-index", &val);

	if (rc != -EINVAL) {
@@ -878,7 +876,6 @@ int msm_camera_init_gpio_pin_tbl(struct device_node *of_node, 
		return rc;

	}



#ifndef CONFIG_MSMB_WITHOUT_IR

	rc = of_property_read_u32(of_node, "qcom,gpio-ir-p", &val);

	if (rc != -EINVAL) {

		if (rc < 0) {
@@ -925,7 +922,6 @@ int msm_camera_init_gpio_pin_tbl(struct device_node *of_node, 
	} else {

		rc = 0;

	}

#endif



	rc = of_property_read_u32(of_node, "qcom,gpio-vana", &val);

	if (rc != -EINVAL) {

include/media/msm_cam_sensor.h

+0 −6
Original line number Diff line number Diff line
@@ -2,9 +2,7 @@ 
#define __LINUX_MSM_CAM_SENSOR_H



#include <uapi/media/msm_cam_sensor.h>

#ifndef CONFIG_MSMB_WITHOUT_IR

#include <uapi/media/msm_camsensor_sdk.h>

#endif



#include <linux/compat.h>
@@ -75,7 +73,6 @@ struct csid_cfg_data32 { 
	} cfg;

};



#ifndef CONFIG_MSMB_WITHOUT_IR

struct msm_ir_led_cfg_data_t32 {

	enum msm_ir_led_cfg_type_t cfg_type;

	int32_t pwm_duty_on_ns;
@@ -85,7 +82,6 @@ struct msm_ir_led_cfg_data_t32 { 
struct msm_ir_cut_cfg_data_t32 {

	enum msm_ir_cut_cfg_type_t cfg_type;

};

#endif



struct eeprom_read_t32 {

	compat_uptr_t dbuffer;
@@ -274,14 +270,12 @@ struct msm_flash_cfg_data_t32 { 
#define VIDIOC_MSM_FLASH_CFG32 \

	_IOWR('V', BASE_VIDIOC_PRIVATE + 13, struct msm_flash_cfg_data_t32)



#ifndef CONFIG_MSMB_WITHOUT_IR

#define VIDIOC_MSM_IR_LED_CFG32 \

	_IOWR('V', BASE_VIDIOC_PRIVATE + 14, struct msm_ir_led_cfg_data_t32)



#define VIDIOC_MSM_IR_CUT_CFG32 \

	_IOWR('V', BASE_VIDIOC_PRIVATE + 15, struct msm_ir_cut_cfg_data_t32)

#endif

#endif



#endif