[PATCH 1/2] ARM: Layerscape: Be less noisy when no iommu node found

[PATCH 1/2] ARM: Layerscape: Be less noisy when no iommu node found

[Sascha Hauer]

The IOMMU node is not present in the upstream dts files. Do not complain
too loudly when we are presented such a device tree.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/mach-layerscape/icid.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-layerscape/icid.c b/arch/arm/mach-layerscape/icid.c
index b574a554ab..aec57f4b3f 100644
--- a/arch/arm/mach-layerscape/icid.c
+++ b/arch/arm/mach-layerscape/icid.c
@@ -495,8 +495,10 @@ static int icid_of_fixup(struct device_node *root, void *context)
 	phandle iommu_handle;
 
 	iommu = of_find_compatible_node(root, NULL, "arm,mmu-500");
-	if (!iommu)
-		return -ENOENT;
+	if (!iommu) {
+		pr_info("No \"arm,mmu-500\" node found, won't fixup\n");
+		return 0;
+	}
 
 	iommu_handle = of_node_create_phandle(iommu);
 
-- 
2.25.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/2] PCI: layerscape: be less noisy when no iommu node is found

[Sascha Hauer]

The upstream device tree files do not have the iommu nodes and
properties, so do not complain too loudly when they are not found.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/pci/pci-layerscape.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/pci-layerscape.c b/drivers/pci/pci-layerscape.c
index c4ed529181..53be43b28f 100644
--- a/drivers/pci/pci-layerscape.c
+++ b/drivers/pci/pci-layerscape.c
@@ -396,8 +396,8 @@ static int ls_pcie_of_fixup(struct device_node *root, void *ctx)
 
 	ret = ls_pcie_get_iommu_handle(np, &iommu_handle);
 	if (ret) {
-		dev_err(pcie->pci.dev, "Unable to get iommu phandle\n");
-		return ret;
+		dev_info(pcie->pci.dev, "No iommu phandle, won't fixup\n");
+		return 0;
 	}
 
 	if (ls_pcie_share_stream_id) {
-- 
2.25.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox