Merge "msm: camera: secure camera support" (30b03115) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/devicetree/bindings/media/video/msm-cci.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -106,6 +106,8 @@ Optional properties:
		- qcom,mount-angle : should contain the physical mount angle of the sensor on
		the target
		- 0, 90, 180, 360
		- qcom,secure : should be enabled to operate the camera in secure mode
		- 0, 1
		- qcom,mclk-23880000 : should be enabled if the supported mclk is 23.88Mhz and
		not 24 Mhz.
		- qcom,gpio-no-mux : should contain field to indicate whether gpio mux table is
		@@ -273,6 +275,7 @@ Example:
		qcom,csiphy-sd-index = <0>;
		qcom,csid-sd-index = <0>;
		qcom,mount-angle = <90>;
		qcom,secure = <1>;
		qcom,led-flash-src = <&led_flash0>;
		qcom,actuator-src = <&actuator0>;
		qcom,eeprom-src = <&eeprom0>;

drivers/media/platform/msm/camera_v2/Kconfig

+30 −18

Original line number	Diff line number	Diff line
		config MSM_CAMERA_SENSOR
		bool "Qualcomm MSM camera sensor support"
		bool "QTI MSM camera sensor support"
		depends on MSMB_CAMERA
		select NEW_LEDS
		select LEDS_CLASS
		@@ -10,7 +10,7 @@ config MSM_CAMERA_SENSOR
		subdev APIs.

		config MSM_CPP
		bool "Qualcomm MSM Camera Post Processing Engine support"
		bool "QTI MSM Camera Post Processing Engine support"
		depends on MSMB_CAMERA
		---help---
		Enable support for Camera Post-processing Engine
		@@ -19,7 +19,7 @@ config MSM_CPP
		APIs.

		config MSM_CCI
		bool "Qualcomm MSM Camera Control Interface support"
		bool "QTI MSM Camera Control Interface support"
		depends on MSMB_CAMERA
		---help---
		Enable support for Camera Control Interface driver only
		@@ -29,7 +29,7 @@ config MSM_CCI
		GPIO and data frames.

		config MSM_CSI20_HEADER
		bool "Qualcomm MSM CSI 2.0 Header"
		bool "QTI MSM CSI 2.0 Header"
		depends on MSMB_CAMERA
		---help---
		Enable support for CSI drivers to include 2.0
		@@ -39,7 +39,7 @@ config MSM_CSI20_HEADER
		8930 and 8064 platforms.

		config MSM_CSI22_HEADER
		bool "Qualcomm MSM CSI 2.2 Header"
		bool "QTI MSM CSI 2.2 Header"
		depends on MSMB_CAMERA
		---help---
		Enable support for CSI drivers to include 2.2
		@@ -49,7 +49,7 @@ config MSM_CSI22_HEADER
		platform.

		config MSM_CSI30_HEADER
		bool "Qualcomm MSM CSI 3.0 Header"
		bool "QTI MSM CSI 3.0 Header"
		depends on MSMB_CAMERA
		---help---
		Enable support for CSI drivers to include 3.0
		@@ -59,7 +59,7 @@ config MSM_CSI30_HEADER
		8064 platforms.

		config MSM_CSI31_HEADER
		bool "Qualcomm MSM CSI 3.1 Header"
		bool "QTI MSM CSI 3.1 Header"
		depends on MSMB_CAMERA
		---help---
		Enable support for CSI drivers to include 3.0
		@@ -69,7 +69,7 @@ config MSM_CSI31_HEADER
		APQ8084 platform.

		config MSM_CSIPHY
		bool "Qualcomm MSM Camera Serial Interface Physical receiver support"
		bool "QTI MSM Camera Serial Interface Physical receiver support"
		depends on MSMB_CAMERA
		---help---
		Enable support for Camera Serial Interface
		@@ -78,7 +78,7 @@ config MSM_CSIPHY
		signalling.

		config MSM_CSID
		bool "Qualcomm MSM Camera Serial Interface decoder support"
		bool "QTI MSM Camera Serial Interface decoder support"
		depends on MSMB_CAMERA
		---help---
		Enable support for Camera Serial Interface decoder.
		@@ -87,7 +87,7 @@ config MSM_CSID
		and datatype.

		config MSM_EEPROM
		bool "Qualcomm MSM Camera ROM Interface for Calibration support"
		bool "QTI MSM Camera ROM Interface for Calibration support"
		depends on MSMB_CAMERA
		---help---
		Enable support for ROM Interface for Calibration
		@@ -96,7 +96,7 @@ config MSM_EEPROM
		Currently supports I2C, CCI and SPI protocol

		config MSM_ISPIF
		bool "Qualcomm MSM Image Signal Processing interface support"
		bool "QTI MSM Image Signal Processing interface support"
		depends on MSMB_CAMERA
		---help---
		Enable support for Image Signal Processing interface module.
		@@ -105,7 +105,7 @@ config MSM_ISPIF
		data interface in VFE.

		config MSM_ISPIF_V1
		bool "Qualcomm MSM Image Signal Processing interface support"
		bool "QTI MSM Image Signal Processing interface support"
		depends on MSMB_CAMERA
		---help---
		Enable support for Image Signal Processing interface module.
		@@ -114,7 +114,7 @@ config MSM_ISPIF_V1
		or raw data interface in VFE.

		config MSM_ISPIF_V2
		bool "Qualcomm MSM Image Signal Processing interface support"
		bool "QTI MSM Image Signal Processing interface support"
		depends on MSMB_CAMERA
		---help---
		Enable support for Image Signal Processing interface module.
		@@ -204,7 +204,7 @@ config OV12830
		2 lanes max fps is 18, 4 lanes max fps is 24.

		config MSM_V4L2_VIDEO_OVERLAY_DEVICE
		tristate "Qualcomm MSM V4l2 video overlay device"
		tristate "QTI MSM V4l2 video overlay device"
		---help---
		Enables support for the MSM V4L2 video
		overlay driver. This allows video rendering
		@@ -212,7 +212,7 @@ config MSM_V4L2_VIDEO_OVERLAY_DEVICE
		APIs, by using /dev/videoX device

		config MSMB_JPEG
		tristate "Qualcomm MSM Jpeg Encoder Engine support"
		tristate "QTI MSM Jpeg Encoder Engine support"
		depends on MSMB_CAMERA && (ARCH_MSM8974 \|\| ARCH_MSM8226 \|\| ARCH_APQ8084 \|\| ARCH_MSM8916 \|\| ARCH_MSM)
		---help---
		Enable support for Jpeg Encoder/Decoder
		@@ -221,7 +221,7 @@ config MSMB_JPEG
		for the JPEG 1.0 encoder and decoder.

		config MSM_GEMINI
		tristate "Qualcomm MSM Gemini JPEG engine support"
		tristate "QTI MSM Gemini JPEG engine support"
		depends on MSMB_CAMERA && (ARCH_MSM7X30 \|\| ARCH_MSM8X60 \|\| ARCH_MSM8960)
		---help---
		Enables support for the Gemini JPEG encoder
		@@ -230,14 +230,26 @@ config MSM_GEMINI
		for JPEG encoding functionality.

		config MSM_FD
		tristate "Qualcomm MSM FD face detection engine support"
		tristate "QTI MSM FD face detection engine support"
		depends on MSMB_CAMERA
		---help---
		Enables support for the MSM FD face detection engine.

		config MSM_JPEGDMA
		tristate "Qualcomm Technologies Inc. MSM Jpeg dma"
		tristate "QTI MSM Jpeg dma"
		depends on MSMB_CAMERA
		select V4L2_MEM2MEM_DEV
		---help---
		Enable support for Jpeg dma engine.

		config MSM_SEC_CCI_TA_NAME
		string "Name of TA to handle Secure CCI transactions"
		depends on MSM_CCI
		default "seccamdemo64"

		config MSM_SEC_CCI_DEBUG
		bool "QTI MSM Secure CCI Relay Debug"
		depends on MSM_CCI
		---help---
		Enables simulation of secure camera for Secure CCI Realy
		debugging.

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -2,4 +2,5 @@ ccflags-y += -Idrivers/media/platform/msm/camera_v2/
		ccflags-y += -Idrivers/media/platform/msm/camera_v2/common
		ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor
		ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/cci
		obj-$(CONFIG_MSMB_CAMERA) += msm_camera_cci_i2c.o msm_camera_qup_i2c.o msm_camera_spi.o msm_camera_dt_util.o
		ccflags-y += -Idrivers/misc/
		obj-$(CONFIG_MSMB_CAMERA) += msm_camera_cci_i2c.o msm_camera_qup_i2c.o msm_camera_spi.o msm_camera_dt_util.o msm_camera_tz_i2c.o

drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_i2c.h

+56 −0

Original line number	Diff line number	Diff line
		@@ -152,4 +152,60 @@ int32_t msm_camera_qup_i2c_poll(struct msm_camera_i2c_client *client,
		uint32_t addr, uint16_t data,
		enum msm_camera_i2c_data_type data_type, uint32_t delay_ms);

		int32_t msm_camera_tz_i2c_register_sensor(void *s_ctrl_p);

		int32_t msm_camera_tz_i2c_power_up(struct msm_camera_i2c_client *client);

		int32_t msm_camera_tz_i2c_power_down(struct msm_camera_i2c_client *client);

		int32_t msm_camera_tz_i2c_read(struct msm_camera_i2c_client *client,
		uint32_t addr, uint16_t *data,
		enum msm_camera_i2c_data_type data_type);

		int32_t msm_camera_tz_i2c_read_seq(struct msm_camera_i2c_client *client,
		uint32_t addr, uint8_t *data, uint32_t num_byte);

		int32_t msm_camera_tz_i2c_write(struct msm_camera_i2c_client *client,
		uint32_t addr, uint16_t data,
		enum msm_camera_i2c_data_type data_type);

		int32_t msm_camera_tz_i2c_write_seq(struct msm_camera_i2c_client *client,
		uint32_t addr, uint8_t *data, uint32_t num_byte);

		int32_t msm_camera_tz_i2c_write_table(
		struct msm_camera_i2c_client *client,
		struct msm_camera_i2c_reg_setting *write_setting);

		int32_t msm_camera_tz_i2c_write_table_async(
		struct msm_camera_i2c_client *client,
		struct msm_camera_i2c_reg_setting *write_setting);

		int32_t msm_camera_tz_i2c_write_table_sync(
		struct msm_camera_i2c_client *client,
		struct msm_camera_i2c_reg_setting *write_setting);

		int32_t msm_camera_tz_i2c_write_table_sync_block(
		struct msm_camera_i2c_client *client,
		struct msm_camera_i2c_reg_setting *write_setting);

		int32_t msm_camera_tz_i2c_write_seq_table(
		struct msm_camera_i2c_client *client,
		struct msm_camera_i2c_seq_reg_setting *write_setting);

		int32_t msm_camera_tz_i2c_write_table_w_microdelay(
		struct msm_camera_i2c_client *client,
		struct msm_camera_i2c_reg_setting *write_setting);

		int32_t msm_camera_tz_i2c_write_conf_tbl(
		struct msm_camera_i2c_client *client,
		struct msm_camera_i2c_reg_conf *reg_conf_tbl, uint16_t size,
		enum msm_camera_i2c_data_type data_type);

		int32_t msm_sensor_tz_i2c_util(struct msm_camera_i2c_client *client,
		uint16_t cci_cmd);

		int32_t msm_camera_tz_i2c_poll(struct msm_camera_i2c_client *client,
		uint32_t addr, uint16_t data,
		enum msm_camera_i2c_data_type data_type);

		#endif

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

0 → 100644

+1093 −0

File added.

Preview size limit exceeded, changes collapsed.