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 /arch | |
| parent | 8e45b774633e1f602ab7dc8744db1b2aff6c515e (diff) | |
| parent | 068b9307413621a2a9af97b44e47501235f61fbe (diff) | |
| download | barebox-a142fa62b8d3c82f8da95dfb136ca986e7d31dd4.tar.gz barebox-a142fa62b8d3c82f8da95dfb136ca986e7d31dd4.tar.xz | |
Merge branch 'for-next/layerscape'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-layerscape/icid.c | 6 |
1 files 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); |