diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-04-16 18:40:42 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-04-16 18:40:42 +0200 |
commit | a142fa62b8d3c82f8da95dfb136ca986e7d31dd4 (patch) | |
tree | e28354e82ba2d5419b3d8b21d17129096adb24c0 | |
parent | 8e45b774633e1f602ab7dc8744db1b2aff6c515e (diff) | |
parent | 068b9307413621a2a9af97b44e47501235f61fbe (diff) | |
download | barebox-a142fa62b8d3c82f8da95dfb136ca986e7d31dd4.tar.gz barebox-a142fa62b8d3c82f8da95dfb136ca986e7d31dd4.tar.xz |
Merge branch 'for-next/layerscape'
-rw-r--r-- | arch/arm/mach-layerscape/icid.c | 6 | ||||
-rw-r--r-- | drivers/pci/pci-layerscape.c | 4 |
2 files changed, 6 insertions, 4 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); 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) { |