Merge "ARM: dts: msm: Modified nodes for multiple partitions in msm_vidc"
diff --git a/Documentation/devicetree/bindings/media/video/msm-vidc.txt b/Documentation/devicetree/bindings/media/video/msm-vidc.txt
index 6f6f68d..d9376e9 100644
--- a/Documentation/devicetree/bindings/media/video/msm-vidc.txt
+++ b/Documentation/devicetree/bindings/media/video/msm-vidc.txt
@@ -39,26 +39,26 @@
as "enum cp_mem_usage" in include/linux/msm_ion.h
- qcom,has-ocmem: indicate the target has ocmem if this property exists
- qcom,vidc-iommu-domains: node containing individual domain nodes, each with:
- - a unique domain name for the domain node (e.g vidc,domain-ns)
- - qcom,vidc-domain-phandle: phandle for the domain as defined in
- <target>-iommu-domains.dtsi (e.g msm8974-v1-iommu-domains.dtsi)
- - qcom,vidc-partition-buffer-types: bitmap of buffer types that can
- be mapped into each IOMMU domain partition. There must be exactly
- one buffer bitmap per partition in the domain, with order of the
- bitmaps to be the same as the order of the respective partitions.
- - Buffer types are defined as the following:
- input = 0x1
- output = 0x2
- output2 = 0x2
- extradata input = 0x4
- extradata output = 0x8
- extradata output2 = 0x8
- internal scratch = 0x10
- internal scratch1 = 0x20
- internal scratch2 = 0x40
- internal persist = 0x80
- internal persist1 = 0x100
- internal cmd queue = 0x200
+ - a unique domain name for the domain node (e.g vidc,domain-ns)
+ - qcom,vidc-domain-phandle: phandle for the domain as defined in
+ <target>-iommu-domains.dtsi (e.g msm8974-v1-iommu-domains.dtsi)
+ - qcom,vidc-partition-buffer-types: bitmap of buffer types that can
+ be mapped into each IOMMU domain partition. There must be exactly
+ one buffer bitmap per partition in the domain, with order of the
+ bitmaps to be the same as the order of the respective partitions.
+ - Buffer types are defined as the following:
+ input = 0x1
+ output = 0x2
+ output2 = 0x4
+ extradata input = 0x8
+ extradata output = 0x10
+ extradata output2 = 0x20
+ internal scratch = 0x40
+ internal scratch1 = 0x80
+ internal scratch2 = 0x100
+ internal persist = 0x200
+ internal persist1 = 0x400
+ internal cmd queue = 0x800
Example:
@@ -95,14 +95,14 @@
qcom,vidc-iommu-domains {
qcom,domain-ns {
qcom,vidc-domain-phandle = <&venus_domain_ns>;
- qcom,vidc-partition-buffer-types = <0x1ff>,
- <0x200>;
+ qcom,vidc-partition-buffer-types = <0x7ff>,
+ <0x800>;
};
qcom,domain-cp {
qcom,vidc-domain-phandle = <&venus_domain_cp>;
- qcom,vidc-partition-buffer-types = <0x2>,
- <0x1f1>;
+ qcom,vidc-partition-buffer-types = <0x6>,
+ <0x7c1>;
};
};
};
diff --git a/arch/arm/boot/dts/msm8226.dtsi b/arch/arm/boot/dts/msm8226.dtsi
index 8958984..151b508 100644
--- a/arch/arm/boot/dts/msm8226.dtsi
+++ b/arch/arm/boot/dts/msm8226.dtsi
@@ -189,14 +189,14 @@
qcom,vidc-iommu-domains {
qcom,domain-ns {
qcom,vidc-domain-phandle = <&venus_domain_ns>;
- qcom,vidc-partition-buffer-types = <0x1ff>,
- <0x200>;
+ qcom,vidc-partition-buffer-types = <0x7ff>,
+ <0x800>;
};
qcom,domain-cp {
qcom,vidc-domain-phandle = <&venus_domain_cp>;
- qcom,vidc-partition-buffer-types = <0x2>,
- <0x1f1>;
+ qcom,vidc-partition-buffer-types = <0x6>,
+ <0x7c1>;
};
};
};
diff --git a/arch/arm/boot/dts/msm8974-v2.dtsi b/arch/arm/boot/dts/msm8974-v2.dtsi
index f2f73e9..55e18f0 100644
--- a/arch/arm/boot/dts/msm8974-v2.dtsi
+++ b/arch/arm/boot/dts/msm8974-v2.dtsi
@@ -140,24 +140,24 @@
<0x42 0x2>,
<0x120 0x3>;
qcom,vidc-iommu-domains {
- qcom,domain-ns {
- qcom,vidc-domain-phandle = <&venus_domain_ns>;
- qcom,vidc-partition-buffer-types = <0x1ff>,
- <0x200>;
- };
- qcom,domain-sec-bs {
- qcom,vidc-domain-phandle = <&venus_domain_sec_bitstream>;
- qcom,vidc-partition-buffer-types = <0x91>;
- };
- qcom,domain-sec-px {
- qcom,vidc-domain-phandle = <&venus_domain_sec_pixel>;
- qcom,vidc-partition-buffer-types = <0x42>;
- };
- qcom,domain-sec-np {
- qcom,vidc-domain-phandle = <&venus_domain_sec_non_pixel>;
- qcom,vidc-partition-buffer-types = <0x120>;
- };
- };
+ qcom,domain-ns {
+ qcom,vidc-domain-phandle = <&venus_domain_ns>;
+ qcom,vidc-partition-buffer-types = <0x7ff>,
+ <0x800>;
+ };
+ qcom,domain-sec-bs {
+ qcom,vidc-domain-phandle = <&venus_domain_sec_bitstream>;
+ qcom,vidc-partition-buffer-types = <0x241>;
+ };
+ qcom,domain-sec-px {
+ qcom,vidc-domain-phandle = <&venus_domain_sec_pixel>;
+ qcom,vidc-partition-buffer-types = <0x106>;
+ };
+ qcom,domain-sec-np {
+ qcom,vidc-domain-phandle = <&venus_domain_sec_non_pixel>;
+ qcom,vidc-partition-buffer-types = <0x480>;
+ };
+ };
};
diff --git a/arch/arm/boot/dts/msm8974pro.dtsi b/arch/arm/boot/dts/msm8974pro.dtsi
index f45d75e..bd58653 100644
--- a/arch/arm/boot/dts/msm8974pro.dtsi
+++ b/arch/arm/boot/dts/msm8974pro.dtsi
@@ -214,20 +214,20 @@
qcom,vidc-iommu-domains {
qcom,domain-ns {
qcom,vidc-domain-phandle = <&venus_domain_ns>;
- qcom,vidc-partition-buffer-types = <0x1ff>,
- <0x200>;
+ qcom,vidc-partition-buffer-types = <0x7ff>,
+ <0x800>;
};
qcom,domain-sec-bs {
qcom,vidc-domain-phandle = <&venus_domain_sec_bitstream>;
- qcom,vidc-partition-buffer-types = <0x91>;
+ qcom,vidc-partition-buffer-types = <0x241>;
};
qcom,domain-sec-px {
qcom,vidc-domain-phandle = <&venus_domain_sec_pixel>;
- qcom,vidc-partition-buffer-types = <0x42>;
+ qcom,vidc-partition-buffer-types = <0x106>;
};
qcom,domain-sec-np {
qcom,vidc-domain-phandle = <&venus_domain_sec_non_pixel>;
- qcom,vidc-partition-buffer-types = <0x120>;
+ qcom,vidc-partition-buffer-types = <0x480>;
};
};
};