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

Commit 41dc178f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Add new spectra camera changes"

parents 3d981e99 ded723e9

Documentation/devicetree/bindings/media/video/msm-cam-ife-csid.txt

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ First Level Node - CAM IFE CSID device 
- compatible

  Usage: required

  Value type: <string>

  Definition: Should be "qcom,csid170" or "qcom,csid-lite170".

  Definition: Should be "qcom,csid170", "qcom,csid175", "qcom,csid175_200",

		"qcom,csid-lite170" or "qcom,csid-lite175".



- cell-index

  Usage: required

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

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ Required properties: 
  Usage: required

  Value type: <string>

  Definition: Should specify the compatibility string for matching the

    driver. e.g. "qcom,vfe170", "qcom,vfe-lite170".

	driver. e.g. "qcom,vfe175", "qcom,vfe170", "qcom,vfe175_130",

		"qcom,vfe-lite175", "qcom,vfe-lite175_130", "qcom,vfe-lite170".



- cell-index

  Usage: required

drivers/media/platform/msm/Kconfig

+15 −0
Original line number Diff line number Diff line
@@ -51,6 +51,21 @@ if MSMB_CAMERA 
source "drivers/media/platform/msm/camera_v2/Kconfig"

endif # MSMB_CAMERA



menuconfig SPECTRA2_CAMERA

   bool "Qualcomm Technologies, Inc. Spectra camera and video capture support"

    depends on SPECTRA_CAMERA

    ---help---

      Say Y here to enable selecting the video adapters for

      QTI msm camera and video capture 2.1, enabling this

      adds support for the camera driver stack including sensor, isp

      and postprocessing drivers.



config SPECTRA2_CAMERA_DEBUG

    bool "QTI MSM camera debugging with printk"

    depends on SPECTRA2_CAMERA

    ---help---

      Enable printk() debug for msm camera 2.1



source "drivers/media/platform/msm/vidc_3x/Kconfig"

source "drivers/media/platform/msm/vidc/Kconfig"

source "drivers/media/platform/msm/sde/Kconfig"

drivers/media/platform/msm/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -6,7 +6,11 @@ obj-y += adsp_shmem/ 
obj-$(CONFIG_MSM_VIDC_V4L2) += vidc/

obj-$(CONFIG_MSM_VIDC_3X_V4L2) += vidc_3x/

obj-y += sde/

ifeq ($(CONFIG_SPECTRA2_CAMERA), y)

obj-$(CONFIG_SPECTRA_CAMERA) += camera_v3/

else

obj-$(CONFIG_SPECTRA_CAMERA) += camera/

endif

obj-$(CONFIG_MSMB_CAMERA) += camera_v2/

obj-y += broadcast/

obj-$(CONFIG_DVB_MPQ) += dvb/

drivers/media/platform/msm/camera_v3/Makefile

0 → 100644
+13 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_SPECTRA_CAMERA) += cam_req_mgr/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_utils/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_core/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_sync/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_smmu/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_cpas/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_cdm/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_isp/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_sensor_module/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_icp/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_jpeg/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_fd/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_lrme/