MLK-16671-2 - [i.MX8QXP/Malone]: Add vpu malone decoder driver

Add vpu module in device tree and makefile

Signed-off-by: Zhou Peng-B04994 <eagle.zhou@nxp.com>

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qxp.dtsi
index 0e47d45..6b2fc19 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp.dtsi
@@ -626,9 +626,13 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       pd_vpu_core: vpu_core {
-                               name = "vpu_core";
-                               reg = <SC_R_VPUCORE>;
+                       pd_vpu_enc: VPU_ENC {
+                               reg = <SC_R_VPU_ENC>;
+                               #power-domain-cells = <0>;
+                               power-domains =<&pd_vpu>;
+                       };
+                       pd_vpu_dec: VPU_DEC {
+                               reg = <SC_R_VPU_DEC>;
                                #power-domain-cells = <0>;
                                power-domains =<&pd_vpu>;
                        };
@@ -2164,6 +2168,24 @@
                fsl,heap-id = <0>;
        };
 
+       vpu: vpu@2c000000 {
+               compatible = "nxp,imx8qm-vpu", "nxp,imx8qxp-vpu";
+               reg = <0x0 0x2c000000 0x0 0x1000000>;
+               reg-names = "vpu_regs";
+               interrupts = <0 464 0x4>, /* encoder irq */
+               <0 465 0x4>, /* encoder fiq */
+               <0 466 0x4>, /* decoder irq */
+               <0 467 0x4>, /* decoder fiq */
+               <0 468 0x4>; /* decoder sif */
+               interrupt-names = "enc_irq", "enc_fiq", "dec_irq", "dec_fiq", "dec_sif";
+               clocks = <&clk IMX8QXP_VPU_DEC_CLK>;
+               clock-names = "vpu_clk";
+               assigned-clocks = <&clk IMX8QXP_VPU_DEC_CLK>;
+               assigned-clock-rates = <600000000>;
+               power-domains = <&pd_vpu_dec>;
+               status = "disabled";
+       };
+
        imx_rpmsg: imx_rpmsg {
                compatible = "fsl,rpmsg-bus", "simple-bus";
                #address-cells = <2>;

diff --git a/drivers/mxc/Kconfig b/drivers/mxc/Kconfig
index 0e23bdb..af4c149 100755 (executable)
--- a/drivers/mxc/Kconfig
+++ b/drivers/mxc/Kconfig
@@ -7,6 +7,7 @@ menu "MXC support drivers"
 #drivers common to MXC and MX8 goes here
 source "drivers/mxc/gpu-viv/Kconfig"
 source "drivers/mxc/hantro/Kconfig"
+source "drivers/mxc/vpu-malone/Kconfig"
 source "drivers/mxc/hdp/Kconfig"
 
 

diff --git a/drivers/mxc/Makefile b/drivers/mxc/Makefile
index c829a7a..3347c47 100755 (executable)
--- a/drivers/mxc/Makefile
+++ b/drivers/mxc/Makefile
@@ -6,4 +6,5 @@ obj-$(CONFIG_MXC_HDMI_CEC) += hdmi-cec/
 obj-$(CONFIG_MXC_GPU_VIV) += gpu-viv/
 obj-$(CONFIG_MXC_MIPI_CSI2) += mipi/
 obj-$(CONFIG_MXC_HANTRO) += hantro/
+obj-$(CONFIG_MXC_VPU_MALONE) += vpu-malone/
 obj-$(CONFIG_MX8_HDP)  += hdp/