Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3701c123 authored by Simon Horman's avatar Simon Horman Committed by Joerg Roedel
Browse files

iommu/ipmmu-vmsa: Hook up r8a779(70|95) DT matching code 



Support the r8a77970 (R-Car V3M) and r8a77995 (R-Car D3) IPMMUs by sharing
feature flags with r8a7795 (R-Car H3) and r8a7796 (R-Car M3-W). Also update
IOMMU_OF_DECLARE to hook up the compat strings.

Based on work for the r8a7796 by Magnus Damm

[rebased on v4.17]
Signed-off-by: default avatarJacopo Mondi <jacopo+renesas@jmondi.org>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 0b8ac140

drivers/iommu/ipmmu-vmsa.c

+10 −0
Original line number Diff line number Diff line
@@ -763,6 +763,8 @@ static bool ipmmu_slave_whitelist(struct device *dev) 
static const struct soc_device_attribute soc_rcar_gen3[] = {

	{ .soc_id = "r8a7795", },

	{ .soc_id = "r8a7796", },

	{ .soc_id = "r8a77970", },

	{ .soc_id = "r8a77995", },

	{ /* sentinel */ }

};
@@ -942,6 +944,12 @@ static const struct of_device_id ipmmu_of_ids[] = { 
	}, {

		.compatible = "renesas,ipmmu-r8a7796",

		.data = &ipmmu_features_rcar_gen3,

	}, {

		.compatible = "renesas,ipmmu-r8a77970",

		.data = &ipmmu_features_rcar_gen3,

	}, {

		.compatible = "renesas,ipmmu-r8a77995",

		.data = &ipmmu_features_rcar_gen3,

	}, {

		/* Terminator */

	},
@@ -1119,6 +1127,8 @@ module_exit(ipmmu_exit); 
IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa");

IOMMU_OF_DECLARE(ipmmu_r8a7795_iommu_of, "renesas,ipmmu-r8a7795");

IOMMU_OF_DECLARE(ipmmu_r8a7796_iommu_of, "renesas,ipmmu-r8a7796");

IOMMU_OF_DECLARE(ipmmu_r8a77970_iommu_of, "renesas,ipmmu-r8a77970");

IOMMU_OF_DECLARE(ipmmu_r8a77995_iommu_of, "renesas,ipmmu-r8a77995");



MODULE_DESCRIPTION("IOMMU API for Renesas VMSA-compatible IPMMU");

MODULE_AUTHOR("Laurent Pinchart <laurent.pinchart@ideasonboard.com>");