commit 0d85007d20dec751b3e76bf82842e69c2c8d46b4
author Linux Build Service Account <lnxbuild@localhost> Tue Jun 11 01:45:55 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jun 11 01:45:54 2013 -0700
tree a6d929a7c3b053d2c78286d001474d7b413fff87
parent 4d362fe1844432ec1f08168de10bf8fe5bd7f862
parent 8ebf4cfab7eb300609e439cb4ac711eaac997eaa

Merge "ARM: dts: msm: Update VFE SMMU MID map for msm8610"

arch/arm/boot/dts/msm-iommu-v0.dtsi

diff --git a/arch/arm/boot/dts/msm-iommu-v0.dtsi b/arch/arm/boot/dts/msm-iommu-v0.dtsi
index 65075e5..2cfc5cf 100644
--- a/arch/arm/boot/dts/msm-iommu-v0.dtsi
+++ b/arch/arm/boot/dts/msm-iommu-v0.dtsi
@@ -326,16 +326,8 @@
 			compatible = "qcom,msm-smmu-v0-ctx";
 			reg = <0xfd890000 0x1000>;
 			interrupts = <0 65 0>;
-			qcom,iommu-ctx-mids = <0>;
+			qcom,iommu-ctx-mids = <0 1 2 3 4 5 6 7 8 9>;
 			label = "vfe0";
 		};
-
-		qcom,iommu-ctx@fd891000 {
-			compatible = "qcom,msm-smmu-v0-ctx";
-			reg = <0xfd891000 0x1000>;
-			interrupts = <0 65 0>;
-			qcom,iommu-ctx-mids = <1>;
-			label = "vfe1";
-		};
 	};
 };