msm: iommu: Do not register IOMMU devices before 8660v2.1
Prevent IOMMU devices from being registered on MSM8660
prior to version 2.1.
Change-Id: If5d537d504100359d3385fb3dba740b1cb4700bc
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
diff --git a/arch/arm/mach-msm/devices-iommu.c b/arch/arm/mach-msm/devices-iommu.c
index 969a1c6..397fdea 100644
--- a/arch/arm/mach-msm/devices-iommu.c
+++ b/arch/arm/mach-msm/devices-iommu.c
@@ -1057,9 +1057,11 @@
static int __init iommu_init(void)
{
int ret;
-
- if (cpu_is_msm8960() &&
- SOCINFO_VERSION_MAJOR(socinfo_get_version()) < 2) {
+ if ((cpu_is_msm8960() &&
+ SOCINFO_VERSION_MAJOR(socinfo_get_version()) < 2) ||
+ (cpu_is_msm8x60() &&
+ (SOCINFO_VERSION_MAJOR(socinfo_get_version()) != 2 ||
+ SOCINFO_VERSION_MINOR(socinfo_get_version()) < 1))) {
pr_err("IOMMU is not supported on this SoC version.\n");
return -ENODEV;
}