Merged TI feature multimedia into ti-linux-4.19.y

* 'multimedia-ti-linux-4.19.y' of ssh://bitbucket.itg.ti.com/lcpdpublicdom/multimedia:
  ti_config_fragments: multimedia.cfg: Add video encode configuration
  drivers: media: platorm: Kconfig: Add Video encoder kconfig entries
  arm64: dts: ti: k3-j721e-main.dtsi: Add VXE384 node
  dt-bindings: Add binding for img,vxe384 for J721E

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

Documentation/devicetree/bindings/media/img,vxe384.txt

@@ -0,0 +1,20 @@
+Imagination VXE384 Driver
+-------------------------
+
+The IMG VXE384 video encode driver for the VXE384 is a video encoder for
+multiple video formats including H.264 on the TI J721E family of SoCs.
+
+Required properties:
+- compatible: must be "img,vxe384"
+- reg: physical base address and length of the registers for the VXE384
+- interrupts: should contain interrupt number for the VXE384
+
+Example for J721E:
+==================
+
+       vxe384: video-encoder@4200000 {
+               compatible = "img,vxe384";
+               reg = <0x00 0x04200000 0x00 0x100000>;
+               power-domains = <&k3_pds 153 TI_SCI_PD_EXCLUSIVE>;
+               interrupts = <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>;
+       };

arch/arm64/boot/dts/ti/k3-j721e-main.dtsi

@@ -2137,6 +2137,13 @@
 		interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
+	vxe384: video-encoder@4200000 {
+		compatible = "img,vxe384";
+		reg = <0x00 0x04200000 0x00 0x100000>;
+		power-domains = <&k3_pds 153 TI_SCI_PD_EXCLUSIVE>;
+		interrupts = <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>;
+	};
+
 	ufs_wrapper: ufs-wrapper@4e80000 {
 		compatible = "ti,j721e-ufs";
 		reg = <0x0 0x4e80000 0x0 0x100>;

drivers/media/platform/Kconfig

@@ -494,6 +494,19 @@ config VIDEO_IMG_VXD_DEC
 	Imagination D5520 (Video Decoder) hardware.
 	The module name when built is vxd-dec.
 
+config VIDEO_IMG_VXE_ENC
+	tristate "IMG VXE ENC (Video Encoder) driver"
+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on ARCH_K3_J721E_SOC || COMPILE_TEST
+	select VIDEOBUF2_CORE
+	select VIDEOBUF2_DMA_CONTIG
+	select VIDEOBUF2_DMA_SG
+	select V4L2_MEM2MEM_DEV
+	---help---
+	This is an IMG VXE ENC V4L2 driver that adds support for the
+	Imagination VXE384 (Video Encoder) hardware.
+	The module name when built is vxe-enc.
+
 config VIDEO_QCOM_VENUS
 	tristate "Qualcomm Venus V4L2 encoder/decoder driver"
 	depends on VIDEO_DEV && VIDEO_V4L2

ti_config_fragments/multimedia.cfg

@@ -5,3 +5,6 @@
 # IMG D5500 v4l2 Driver Config Options
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_IMG_VXD_DEC=m
+
+# IMG VXE384 v4l2 Driver Config Options
+CONFIG_VIDEO_IMG_VXE_ENC=m