[PATCH/RFC,10/10] iommu/ipmmu-vmsa: Hook up r8a7795 DT matching code

Commit Message

Magnus Damm Dec. 15, 2015, 1:06 p.m. UTC

From: Magnus Damm <[e-mail]>

Tie in r8a7795 features and update the IOMMU_OF_DECLARE
compat string to hook up the updated compat string.

TODO:
 - Describe IPMMU topology via DT
 - Document DT binding and topology
 - Figure out how to avoid multiple IOMMU_OF_DECLARE()

Signed-off-by: Magnus Damm <[e-mail]>
---

 drivers/iommu/ipmmu-vmsa.c |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- 0025/drivers/iommu/ipmmu-vmsa.c
+++ work/drivers/iommu/ipmmu-vmsa.c	2015-12-15 15:47:44.550513000 +0900
@@ -999,11 +999,22 @@  static const struct ipmmu_features ipmmu
 	.use_of_iommu = false,
 };
 
+static const struct ipmmu_features ipmmu_features_r8a7795 = {
+	.use_ns_alias_offset = false,
+	.has_cache_leaf_nodes = true,
+	.setup_imbuscr = false,
+	.twobit_imttbcr_sl0 = true,
+	.use_of_iommu = true,
+};
+
 static const struct of_device_id ipmmu_of_ids[] = {
 	{
 		.compatible = "renesas,ipmmu-vmsa",
 		.data = &ipmmu_features_default,
 	}, {
+		.compatible = "renesas,ipmmu-r8a7795",
+		.data = &ipmmu_features_r8a7795,
+	}, {
 		/* Terminator */
 	},
 };
@@ -1163,7 +1174,7 @@  static int __init ipmmu_vmsa_iommu_of_se
 	return 0;
 }
 
-IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa",
+IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-r8a7795",
 		 ipmmu_vmsa_iommu_of_setup);
 
 MODULE_DESCRIPTION("IOMMU API for Renesas VMSA-compatible IPMMU");