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

Commit 4c5fed65 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc_3x: Add snapshot of video driver"

parents 244a23b6 2a252c72

Documentation/devicetree/bindings/media/video/msm-vidc-vmem.txt

0 → 100644
+42 −0
Original line number Diff line number Diff line 
* Qualcomm Technologies Inc MSM VIDC VMEM



Required properties:

- compatible : "qcom,msm-vmem"

- interrupts : Contains the interrupt that maps to the VMEM module

- reg : A set of 2 start address and size pairs that describe the hardware

register address space and mappable memory address space.

- reg-names : Strings that describe the pairs in "reg".  The register address

space should be called "reg-base" and the memory space should be called "mem-base".

- clocks : A set of clocks that correspond to the AHB and MAXI clocks that the

hardware uses.

- clock-names : A string that describes the "clocks" property.  The AHB clock

should be named "ahb" and the MAXI clock should be named "maxi".

- qcom,bank-size : The size of each memory bank, in bytes.

- vdd-supply: phandle to a regulator that is considered to be the footswitch for vmem.

- qcom,msm-bus,(name|num-cases,num-paths,vectors-KBps) - Bus to be voted for prior to

  issuing any IO transactions to vmem.  Refer to Documentation/devicetree/bindings/arm/\

  msm/msm_bus_adhoc.txt for further details.



Example:



qcom,vmem@880000 {

	compatible = "qcom,msm-vmem";

	interrupts = <0 429 0>;

	reg = <0x880000 0x800>,

	    <0x6800000 0x100000>;

	reg-names = "reg-base", "mem-base";



	vdd-supply = <&gdsc_mmagic_video>;

	clocks = <&clock_mmss clk_vmem_ahb_clk>,

	       <&clock_mmss clk_vmem_maxi_clk>;

	clock-names = "ahb", "maxi";



	qcom,bank-size = <131072>;



	qcom,msm-bus,name = "vmem";

	qcom,msm-bus,num-cases = <2>;

	qcom,msm-bus,num-paths = <1>;

	qcom,msm-bus,vectors-KBps =

	        <MSM_BUS_MASTER_AMPSS_M0 MSM_BUS_SLAVE_VMEM_CFG   0   0>,

	        <MSM_BUS_MASTER_AMPSS_M0 MSM_BUS_SLAVE_VMEM_CFG 500 800>;

};

drivers/media/platform/msm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ if MSMB_CAMERA 
source "drivers/media/platform/msm/camera_v2/Kconfig"

endif # MSMB_CAMERA



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

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

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

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

drivers/media/platform/msm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ obj-y += sde/ 
obj-$(CONFIG_MSM_NPU) += npu/

obj-$(CONFIG_MSM_NPU_V2) += npu_v2/

obj-$(CONFIG_MSM_VIDC_V4L2) += vidc/

obj-$(CONFIG_MSM_VIDC_3X_V4L2) += vidc_3x/

obj-$(CONFIG_SPECTRA_CAMERA) += camera/

obj-$(CONFIG_MSM_AIS) += ais/

obj-$(CONFIG_TSPP) += broadcast/

drivers/media/platform/msm/vidc_3x/Kconfig

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#

# VIDEO CORE

#

menuconfig MSM_VIDC_3X_V4L2

	tristate "Qualcomm Technologies, Inc. MSM V4L2 3X based video driver"

		depends on ARCH_QCOM && VIDEO_V4L2

		select VIDEOBUF2_CORE



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

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

drivers/media/platform/msm/vidc_3x/Makefile

0 → 100644
+18 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_MSM_VIDC_3X_V4L2) := 	msm_v4l2_vidc.o \

				msm_vidc_common.o \

				msm_vidc.o \

				msm_vdec.o \

				msm_venc.o \

				msm_smem.o \

				msm_vidc_debug.o \

				msm_vidc_res_parse.o \

				venus_hfi.o \

				hfi_response_handler.o \

				hfi_packetization.o \

				vidc_hfi.o \

				venus_boot.o \

				msm_vidc_dcvs.o



obj-$(CONFIG_MSM_VIDC_3X_V4L2) += governors/



obj-$(CONFIG_MSM_VIDC_VMEM) += vmem/