summaryrefslogtreecommitdiffstats
path: root/drivers/iommu
diff options
context:
space:
mode:
authorNipun Gupta <nipun.gupta@nxp.com>2018-09-10 15:49:16 +0200
committerJoerg Roedel <jroedel@suse.de>2018-09-25 09:47:52 +0200
commit2a6db719c92dbfe43c9eea7e4358ea2e51b5004e (patch)
tree4c685a9457b305ca4ce8f620e85c0a34de97ca0c /drivers/iommu
parentDocumentation: fsl-mc: add iommu-map device-tree binding for fsl-mc bus (diff)
downloadlinux-2a6db719c92dbfe43c9eea7e4358ea2e51b5004e.tar.xz
linux-2a6db719c92dbfe43c9eea7e4358ea2e51b5004e.zip
iommu/of: make of_pci_map_rid() available for other devices too
iommu-map property is also used by devices with fsl-mc. This patch moves the of_pci_map_rid to generic location, so that it can be used by other busses too. 'of_pci_map_rid' is renamed here to 'of_map_rid' and there is no functional change done in the API. Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com> Reviewed-by: Rob Herring <robh@kernel.org> Reviewed-by: Robin Murphy <robin.murphy@arm.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/of_iommu.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index f7787e757244..c13eecac0e8a 100644
--- a/drivers/iommu/of_iommu.c
+++ b/drivers/iommu/of_iommu.c
@@ -132,9 +132,8 @@ static int of_pci_iommu_init(struct pci_dev *pdev, u16 alias, void *data)
struct of_phandle_args iommu_spec = { .args_count = 1 };
int err;
- err = of_pci_map_rid(info->np, alias, "iommu-map",
- "iommu-map-mask", &iommu_spec.np,
- iommu_spec.args);
+ err = of_map_rid(info->np, alias, "iommu-map", "iommu-map-mask",
+ &iommu_spec.np, iommu_spec.args);
if (err)
return err == -ENODEV ? NO_IOMMU : err;