dts: arm64: msm8916: add vidc dt nodes

and correct iommu ctx names

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Conflicts:
	arch/arm64/boot/dts/qcom/msm8916.dtsi

diff --git a/arch/arm64/boot/dts/qcom/msm-iommu-v2.dtsi b/arch/arm64/boot/dts/qcom/msm-iommu-v2.dtsi
index 6f73eb26aaecc0bd5ccd5e286e97ceb8a12c9f19..fd6f6b7ce9e093ff2560f5543d8991de7655ab6e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm-iommu-v2.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm-iommu-v2.dtsi
@@ -86,7 +86,7 @@
                        label = "mdp_0";
                };
 
-               venus_ns: qcom,iommu-ctx@1e25000 {
+               venus_ns: venus_ns@1e25000 {
                        compatible = "qcom,msm-smmu-v2-ctx";
                        reg = <0x1e25000 0x1000>;
                        interrupts = <0 70 0>;
@@ -136,7 +136,7 @@
                        label = "mdp_1";
                };
 
-               venus_sec_pixel: qcom,iommu-ctx@1e33000 {
+               venus_sec_pixel: venus_sec_pixel@1e33000 {
                        compatible = "qcom,msm-smmu-v2-ctx";
                        qcom,secure-context;
                        reg = <0x1e33000 0x1000>;
@@ -145,7 +145,7 @@
                        label = "venus_sec_pixel";
                };
 
-               venus_sec_bitstream: qcom,iommu-ctx@1e34000 {
+               venus_sec_bitstream: venus_sec_bitstream@1e34000 {
                        compatible = "qcom,msm-smmu-v2-ctx";
                        qcom,secure-context;
                        reg = <0x1e34000 0x1000>;
@@ -154,7 +154,7 @@
                        label = "venus_sec_bitstream";
                };
 
-               venus_sec_non_pixel: qcom,iommu-ctx@1e35000 {
+               venus_sec_non_pixel: venus_sec_non_pixel@1e35000 {
                        compatible = "qcom,msm-smmu-v2-ctx";
                        qcom,secure-context;
                        reg = <0x1e35000 0x1000>;

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 47a98686ef9ed2843177b0eae46d4fc54c7be117..097ce850b9914628060238107016d2b6aa0c5f26 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -76,6 +76,10 @@
                         reg = <0x0 0x8b600000 0x0 0x0600000>;
                 };
 
+               vidc_mem: vidc_region@8f800000 {
+                       no-map;
+                       reg = <0 0x8f800000 0 0x800000>;
+               };
        };
 
        cpus {
@@ -976,6 +980,40 @@
                        qcom,offset-log-len-mask = <44>;
                        qcom,offset-page-indices = <56>;
                };
+
+               vidc_rproc: vidc_tzpil@0 {
+                       compatible = "qcom,tz-pil";
+                       clocks = <&gcc GCC_CRYPTO_CLK>,
+                                <&gcc GCC_CRYPTO_AHB_CLK>,
+                                <&gcc GCC_CRYPTO_AXI_CLK>,
+                                <&gcc CRYPTO_CLK_SRC>;
+                       clock-names = "scm_core_clk", "scm_iface_clk",
+                                     "scm_bus_clk", "scm_src_clk";
+                       qcom,firmware-name = "venus";
+                       qcom,pas-id = <9>;
+                       memory-region = <&vidc_mem>;
+                       status = "disabled";
+               };
+
+               vidc: qcom,vidc@1d00000 {
+                       compatible = "qcom,msm-vidc";
+                       reg = <0x01d00000 0xff000>;
+                       interrupts = <GIC_SPI 44 0>;
+                       power-domains = <&gcc VENUS_GDSC>;
+                       clocks = <&gcc GCC_VENUS0_VCODEC0_CLK>,
+                                <&gcc GCC_VENUS0_AHB_CLK>,
+                                <&gcc GCC_VENUS0_AXI_CLK>;
+                       clock-names = "core_clk", "iface_clk", "bus_clk";
+                       qcom,hfi = "venus";
+                       qcom,max-hw-load = <352800>; /* 720p @ 30 + 1080p @ 30 */
+                       qcom,enable-idle-indicator;
+                       rproc = <&vidc_rproc>;
+                       qcom,iommu-cb = <&venus_ns>,
+                                       <&venus_sec_bitstream>,
+                                       <&venus_sec_pixel>,
+                                       <&venus_sec_non_pixel>;
+                       status = "disabled";
+               };
        };
 
        smd {