aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo+renesas@jmondi.org>2018-06-14 06:48:25 -0400
committerJoerg Roedel <jroedel@suse.de>2018-07-06 08:12:28 -0400
commit98dbffd39a6513b9d0b60e9a20265b2d7866af3c (patch)
tree8583fd9098e1bdf41ee87ed6d0b7c13d72d6f572
parent3be6937a271a808e42ea785d1555e7df97b750e3 (diff)
iommu/ipmmu-vmsa: Hook up R8A77965 DT matching code
Add support for R-Car M3-N (R8A77965) SoC IPMMUs. Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Joerg Roedel <jroedel@suse.de>
-rw-r--r--drivers/iommu/ipmmu-vmsa.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
index 933a3dabe9ef..6a0e7142f41b 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -763,6 +763,7 @@ static bool ipmmu_slave_whitelist(struct device *dev)
763static const struct soc_device_attribute soc_rcar_gen3[] = { 763static const struct soc_device_attribute soc_rcar_gen3[] = {
764 { .soc_id = "r8a7795", }, 764 { .soc_id = "r8a7795", },
765 { .soc_id = "r8a7796", }, 765 { .soc_id = "r8a7796", },
766 { .soc_id = "r8a77965", },
766 { .soc_id = "r8a77970", }, 767 { .soc_id = "r8a77970", },
767 { .soc_id = "r8a77995", }, 768 { .soc_id = "r8a77995", },
768 { /* sentinel */ } 769 { /* sentinel */ }
@@ -945,6 +946,9 @@ static const struct of_device_id ipmmu_of_ids[] = {
945 .compatible = "renesas,ipmmu-r8a7796", 946 .compatible = "renesas,ipmmu-r8a7796",
946 .data = &ipmmu_features_rcar_gen3, 947 .data = &ipmmu_features_rcar_gen3,
947 }, { 948 }, {
949 .compatible = "renesas,ipmmu-r8a77965",
950 .data = &ipmmu_features_rcar_gen3,
951 }, {
948 .compatible = "renesas,ipmmu-r8a77970", 952 .compatible = "renesas,ipmmu-r8a77970",
949 .data = &ipmmu_features_rcar_gen3, 953 .data = &ipmmu_features_rcar_gen3,
950 }, { 954 }, {
@@ -1127,6 +1131,7 @@ module_exit(ipmmu_exit);
1127IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa"); 1131IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa");
1128IOMMU_OF_DECLARE(ipmmu_r8a7795_iommu_of, "renesas,ipmmu-r8a7795"); 1132IOMMU_OF_DECLARE(ipmmu_r8a7795_iommu_of, "renesas,ipmmu-r8a7795");
1129IOMMU_OF_DECLARE(ipmmu_r8a7796_iommu_of, "renesas,ipmmu-r8a7796"); 1133IOMMU_OF_DECLARE(ipmmu_r8a7796_iommu_of, "renesas,ipmmu-r8a7796");
1134IOMMU_OF_DECLARE(ipmmu_r8a77965_iommu_of, "renesas,ipmmu-r8a77965");
1130IOMMU_OF_DECLARE(ipmmu_r8a77970_iommu_of, "renesas,ipmmu-r8a77970"); 1135IOMMU_OF_DECLARE(ipmmu_r8a77970_iommu_of, "renesas,ipmmu-r8a77970");
1131IOMMU_OF_DECLARE(ipmmu_r8a77995_iommu_of, "renesas,ipmmu-r8a77995"); 1136IOMMU_OF_DECLARE(ipmmu_r8a77995_iommu_of, "renesas,ipmmu-r8a77995");
1132 1137