Merge "ais: enable ais build for automotive" (c3c00465) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/devicetree/bindings/media/video/msm-cam-smmu.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -14,8 +14,8 @@ Required properties:
		[Second level nodes]
		Required properties:
		- compatible : one of:
		- "qcom,msm-cam-smmu-cb"
		- "qcom,qsmmu-cam-cb"
		- "qcom,msm-cam-smmu-cb" : For arm smmu iommu type.
		- "qcom,qsmmu-cam-cb" : For qsmmu iommu type .
		- iommus : Handle parsed by smmu driver. Number of entries will vary
		across targets.
		- label - string describing iommu domain usage.
		@@ -23,6 +23,7 @@ Required properties:
		Optional properties:
		- qcom,scratch-buf-support : Enables iommu scratch buffer support in
		that context bank.
		- qcom,secure-context : To set the context domain type as secure.

		Example:
		qcom,cam_smmu@0 {

arch/arm64/configs/msm-auto-perf_defconfig

+3 −28

Original line number	Diff line number	Diff line
		@@ -384,34 +384,9 @@ CONFIG_SOC_CAMERA_PLATFORM=y
		CONFIG_MSM_VIDC_V4L2=y
		CONFIG_MSM_VIDC_VMEM=y
		CONFIG_MSM_VIDC_GOVERNORS=y
		CONFIG_MSM_CAMERA=y
		CONFIG_MSM_CAMERA_DEBUG=y
		CONFIG_MSM_CAMERA_AUTOMOTIVE=y
		CONFIG_MSMB_CAMERA=y
		CONFIG_MSMB_CAMERA_DEBUG=y
		CONFIG_MSM_CAMERA_SENSOR=y
		CONFIG_MSM_CPP=y
		CONFIG_MSM_CCI=y
		CONFIG_MSM_CSI20_HEADER=y
		CONFIG_MSM_CSI22_HEADER=y
		CONFIG_MSM_CSI30_HEADER=y
		CONFIG_MSM_CSI31_HEADER=y
		CONFIG_MSM_CSIPHY=y
		CONFIG_MSM_CSID=y
		CONFIG_MSM_EEPROM=y
		CONFIG_MSM_ISPIF=y
		CONFIG_IMX134=y
		CONFIG_IMX132=y
		CONFIG_OV9724=y
		CONFIG_OV5648=y
		CONFIG_GC0339=y
		CONFIG_OV8825=y
		CONFIG_OV8865=y
		CONFIG_s5k4e1=y
		CONFIG_OV12830=y
		CONFIG_MSM_V4L2_VIDEO_OVERLAY_DEVICE=y
		CONFIG_MSMB_JPEG=y
		CONFIG_MSM_JPEGDMA=y
		CONFIG_MSM_AIS=y
		CONFIG_MSM_AIS_DEBUG=y
		CONFIG_MSM_AIS_CAMERA_SENSOR=y
		CONFIG_RADIO_SILABS=y
		# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
		CONFIG_VIDEO_ADV7481=y

arch/arm64/configs/msm-auto_defconfig

+3 −28

Original line number	Diff line number	Diff line
		@@ -387,34 +387,9 @@ CONFIG_SOC_CAMERA_PLATFORM=y
		CONFIG_MSM_VIDC_V4L2=y
		CONFIG_MSM_VIDC_VMEM=y
		CONFIG_MSM_VIDC_GOVERNORS=y
		CONFIG_MSM_CAMERA=y
		CONFIG_MSM_CAMERA_DEBUG=y
		CONFIG_MSM_CAMERA_AUTOMOTIVE=y
		CONFIG_MSMB_CAMERA=y
		CONFIG_MSMB_CAMERA_DEBUG=y
		CONFIG_MSM_CAMERA_SENSOR=y
		CONFIG_MSM_CPP=y
		CONFIG_MSM_CCI=y
		CONFIG_MSM_CSI20_HEADER=y
		CONFIG_MSM_CSI22_HEADER=y
		CONFIG_MSM_CSI30_HEADER=y
		CONFIG_MSM_CSI31_HEADER=y
		CONFIG_MSM_CSIPHY=y
		CONFIG_MSM_CSID=y
		CONFIG_MSM_EEPROM=y
		CONFIG_MSM_ISPIF=y
		CONFIG_IMX134=y
		CONFIG_IMX132=y
		CONFIG_OV9724=y
		CONFIG_OV5648=y
		CONFIG_GC0339=y
		CONFIG_OV8825=y
		CONFIG_OV8865=y
		CONFIG_s5k4e1=y
		CONFIG_OV12830=y
		CONFIG_MSM_V4L2_VIDEO_OVERLAY_DEVICE=y
		CONFIG_MSMB_JPEG=y
		CONFIG_MSM_JPEGDMA=y
		CONFIG_MSM_AIS=y
		CONFIG_MSM_AIS_DEBUG=y
		CONFIG_MSM_AIS_CAMERA_SENSOR=y
		CONFIG_RADIO_SILABS=y
		# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
		CONFIG_VIDEO_ADV7481=y

drivers/media/i2c/Makefile

+7 −0

Original line number	Diff line number	Diff line
		@@ -28,10 +28,17 @@ obj-$(CONFIG_VIDEO_ADV7343) += adv7343.o
		obj-$(CONFIG_VIDEO_ADV7393) += adv7393.o
		obj-$(CONFIG_VIDEO_ADV7604) += adv7604.o
		obj-$(CONFIG_VIDEO_ADV7842) += adv7842.o
		ifeq ($(CONFIG_MSM_AIS),y)
		ccflags-y += -Idrivers/media/platform/msm/ais
		ccflags-y += -Idrivers/media/platform/msm/ais/common
		ccflags-y += -Idrivers/media/platform/msm/ais/sensor/io
		ccflags-y += -Idrivers/media/platform/msm/ais/sensor/cci
		else
		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/io
		ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/cci
		endif
		obj-$(CONFIG_VIDEO_ADV7481) += adv7481.o
		obj-$(CONFIG_VIDEO_AD9389B) += ad9389b.o
		obj-$(CONFIG_VIDEO_ADV7511) += adv7511.o

drivers/media/platform/msm/Kconfig

+10 −8

Original line number	Diff line number	Diff line
		@@ -4,42 +4,42 @@ source "drivers/media/platform/msm/vidc/Kconfig"
		# MSM camera configuration
		#

		comment "Qualcomm MSM Camera And Video"
		comment "QTI MSM Camera And Video & AIS"

		menuconfig MSM_CAMERA
		bool "Qualcomm MSM camera and video capture support"
		bool "QTI MSM camera and video capture support"
		depends on ARCH_MSM && VIDEO_V4L2 && I2C
		---help---
		Say Y here to enable selecting the video adapters for
		Qualcomm msm camera and video capture drivers. enabling this
		QTI msm camera and video capture drivers. enabling this
		adds support for the camera driver stack including sensor, isp
		and postprocessing drivers for legacy chipsets.

		config MSM_CAMERA_DEBUG
		bool "Qualcomm MSM camera debugging with printk"
		bool "QTI MSM camera debugging with printk"
		depends on MSM_CAMERA
		default n
		---help---
		Enable printk() debug for msm camera

		config MSM_CAMERA_AUTOMOTIVE
		bool "Qualcomm MSM camera for automotive support"
		bool "QTI MSM camera for automotive support"
		depends on MSM_CAMERA
		default n
		---help---
		Enables support for automotive targets

		menuconfig MSMB_CAMERA
		bool "Qualcomm MSM camera and video capture 2.0 support"
		bool "QTI MSM camera and video capture 2.0 support"
		depends on ARCH_MSM && VIDEO_V4L2 && I2C
		---help---
		Say Y here to enable selecting the video adapters for
		Qualcomm msm camera and video capture 2.0, enabling this
		QTI msm camera and video capture 2.0, enabling this
		adds support for the camera driver stack including sensor, isp
		and postprocessing drivers.

		config MSMB_CAMERA_DEBUG
		bool "Qualcomm MSM camera 2.0 debugging with printk"
		bool "QTI MSM camera 2.0 debugging with printk"
		depends on MSMB_CAMERA
		---help---
		Enable printk() debug for msm camera 2.0
		@@ -47,6 +47,8 @@ config MSMB_CAMERA_DEBUG
		if MSMB_CAMERA
		source "drivers/media/platform/msm/camera_v2/Kconfig"
		endif # MSMB_CAMERA

		source "drivers/media/platform/msm/ais/Kconfig"
		source "drivers/media/platform/msm/dvb/Kconfig"
		source "drivers/media/platform/msm/broadcast/Kconfig"
		source "drivers/media/platform/msm/sde/Kconfig"