iommu: msm: Change driver name
Change the driver name used in the code and device tree for
IOMMU. The driver and compatible string formerly known as iommu-v1
is now called iommu-v0 and the one formerly known as iommu-v2
is now called iommu-v1 to match file names.
Change-Id: Ida38a0a788e28e820907b93e05187cd61235400c
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
diff --git a/drivers/iommu/msm_iommu-v0.c b/drivers/iommu/msm_iommu-v0.c
index 9ce19a3..28f1516 100644
--- a/drivers/iommu/msm_iommu-v0.c
+++ b/drivers/iommu/msm_iommu-v0.c
@@ -1355,7 +1355,7 @@
static int __init msm_iommu_init(void)
{
- if (!msm_soc_version_supports_iommu_v1())
+ if (!msm_soc_version_supports_iommu_v0())
return -ENODEV;
msm_iommu_lock_initialize();
diff --git a/drivers/iommu/msm_iommu_dev-v0.c b/drivers/iommu/msm_iommu_dev-v0.c
index 7d55e1e..3a9cc23 100644
--- a/drivers/iommu/msm_iommu_dev-v0.c
+++ b/drivers/iommu/msm_iommu_dev-v0.c
@@ -549,13 +549,13 @@
static struct of_device_id msm_iommu_match_table[] = {
- { .compatible = "qcom,msm-smmu-v1", },
+ { .compatible = "qcom,msm-smmu-v0", },
{}
};
static struct platform_driver msm_iommu_driver = {
.driver = {
- .name = "msm_iommu",
+ .name = "msm_iommu-v0",
.of_match_table = msm_iommu_match_table,
},
.probe = msm_iommu_probe,
diff --git a/drivers/iommu/msm_iommu_dev-v1.c b/drivers/iommu/msm_iommu_dev-v1.c
index e29e9b4..9291e30 100644
--- a/drivers/iommu/msm_iommu_dev-v1.c
+++ b/drivers/iommu/msm_iommu_dev-v1.c
@@ -349,13 +349,13 @@
}
static struct of_device_id msm_iommu_match_table[] = {
- { .compatible = "qcom,msm-smmu-v2", },
+ { .compatible = "qcom,msm-smmu-v1", },
{}
};
static struct platform_driver msm_iommu_driver = {
.driver = {
- .name = "msm_iommu_v2",
+ .name = "msm_iommu_v1",
.of_match_table = msm_iommu_match_table,
},
.probe = msm_iommu_probe,
@@ -369,7 +369,7 @@
static struct platform_driver msm_iommu_ctx_driver = {
.driver = {
- .name = "msm_iommu_ctx_v2",
+ .name = "msm_iommu_ctx_v1",
.of_match_table = msm_iommu_ctx_match_table,
},
.probe = msm_iommu_ctx_probe,
diff --git a/drivers/iommu/msm_iommu_sec.c b/drivers/iommu/msm_iommu_sec.c
index afbba91..3b411a6 100644
--- a/drivers/iommu/msm_iommu_sec.c
+++ b/drivers/iommu/msm_iommu_sec.c
@@ -79,7 +79,7 @@
unsigned int spare;
int ret, ptbl_ret = 0;
- for_each_compatible_node(np, NULL, "qcom,msm-smmu-v2")
+ for_each_compatible_node(np, NULL, "qcom,msm-smmu-v1")
if (of_find_property(np, "qcom,iommu-secure-id", NULL))
break;