Merge "arm/dt: msm8226: Update IOMMU register settings"
diff --git a/arch/arm/boot/dts/msm8226-iommu.dtsi b/arch/arm/boot/dts/msm8226-iommu.dtsi
index 9387bbd..51c2f38 100644
--- a/arch/arm/boot/dts/msm8226-iommu.dtsi
+++ b/arch/arm/boot/dts/msm8226-iommu.dtsi
@@ -14,18 +14,138 @@
&jpeg_iommu {
status = "ok";
+
+ qcom,iommu-bfb-regs = <0x604c
+ 0x6050
+ 0x6514
+ 0x6540
+ 0x656c
+ 0x6314
+ 0x6394
+ 0x6414
+ 0x60ac
+ 0x615c
+ 0x620c
+ 0x6008
+ 0x600c
+ 0x6010
+ 0x6014>;
+
+ qcom,iommu-bfb-data = <0x0000ffff
+ 0x00000000
+ 0x4
+ 0x4
+ 0x0
+ 0x0
+ 0x10
+ 0x50
+ 0x0
+ 0x10
+ 0x20
+ 0x0
+ 0x0
+ 0x0
+ 0x0>;
};
&mdp_iommu {
status = "ok";
/* HACK: set to -1 during pre-si due to lack of TZ */
qcom,iommu-secure-id = <0xFFFFFFFF>;
+
+ qcom,iommu-bfb-regs = <0x604c
+ 0x6050
+ 0x6514
+ 0x6540
+ 0x656c
+ 0x60ac
+ 0x615c
+ 0x620c
+ 0x6314
+ 0x6394
+ 0x6414
+ 0x6008
+ 0x600c
+ 0x6010
+ 0x6014
+ 0x6018
+ 0x601c
+ 0x6020>;
+
+ qcom,iommu-bfb-data = <0xffffffff
+ 0x00000000
+ 0x00000004
+ 0x00000010
+ 0x00000000
+ 0x00000000
+ 0x00000013
+ 0x00000017
+ 0x0
+ 0x13
+ 0x23
+ 0x0
+ 0x0
+ 0x0
+ 0x0
+ 0x0
+ 0x0
+ 0x0>;
};
&venus_iommu {
status = "ok";
/* HACK: set to -1 during pre-si due to lack of TZ */
qcom,iommu-secure-id = <0xFFFFFFFF>;
+
+ qcom,iommu-bfb-regs = <0x604c
+ 0x6050
+ 0x6514
+ 0x6540
+ 0x656c
+ 0x60ac
+ 0x615c
+ 0x620c
+ 0x6314
+ 0x6394
+ 0x6414
+ 0x6008
+ 0x600c
+ 0x6010
+ 0x6014
+ 0x6018
+ 0x601c
+ 0x6020
+ 0x6024
+ 0x6028
+ 0x602c
+ 0x6030
+ 0x6034
+ 0x6038>;
+
+ qcom,iommu-bfb-data = <0xffffffff
+ 0xffffffff
+ 0x00000004
+ 0x00000008
+ 0x00000000
+ 0x00000000
+ 0x00000094
+ 0x000000b4
+ 0x0
+ 0x94
+ 0x114
+ 0x0
+ 0x0
+ 0x0
+ 0x0
+ 0x0
+ 0x0
+ 0x0
+ 0x0
+ 0x0
+ 0x0
+ 0x0
+ 0x0
+ 0x0>;
};
&venus_ns {
@@ -38,8 +158,72 @@
&kgsl_iommu {
status = "ok";
+
+ qcom,iommu-bfb-regs = <0x604c
+ 0x6050
+ 0x6514
+ 0x6540
+ 0x656c
+ 0x60ac
+ 0x615c
+ 0x620c
+ 0x6314
+ 0x6394
+ 0x6414
+ 0x6008>;
+
+ qcom,iommu-bfb-data = <0x00000003
+ 0x0
+ 0x00000004
+ 0x00000010
+ 0x00000000
+ 0x00000000
+ 0x00000001
+ 0x00000011
+ 0x0
+ 0x1
+ 0x41
+ 0x0>;
};
&vfe_iommu {
status = "ok";
+
+ qcom,iommu-bfb-regs = <0x604c
+ 0x6050
+ 0x6514
+ 0x6540
+ 0x656c
+ 0x6314
+ 0x6394
+ 0x6414
+ 0x60ac
+ 0x615c
+ 0x620c
+ 0x6008
+ 0x600c
+ 0x6010
+ 0x6014
+ 0x6018
+ 0x601c
+ 0x6020>;
+
+ qcom,iommu-bfb-data = <0xffffffff
+ 0x00000000
+ 0x4
+ 0x8
+ 0x0
+ 0x0
+ 0x1b
+ 0x5b
+ 0x0
+ 0x1b
+ 0x2b
+ 0x0
+ 0x0
+ 0x0
+ 0x0
+ 0x0
+ 0x0
+ 0x0>;
};