diff options
| -rw-r--r-- | drivers/iommu/omap-iommu.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c index 4448c0a51213..30fdbabbc9c6 100644 --- a/drivers/iommu/omap-iommu.c +++ b/drivers/iommu/omap-iommu.c @@ -1127,18 +1127,12 @@ static int omap_iommu_dra7_get_dsp_system_cfg(struct platform_device *pdev, if (!of_device_is_compatible(np, "ti,dra7-dsp-iommu")) return 0; - obj->syscfg = - syscon_regmap_lookup_by_phandle(np, "ti,syscon-mmuconfig"); + obj->syscfg = syscon_regmap_lookup_by_phandle_args(np, "ti,syscon-mmuconfig", + 1, &obj->id); if (IS_ERR(obj->syscfg)) return dev_err_probe(&pdev->dev, PTR_ERR(obj->syscfg), "ti,syscon-mmuconfig property is missing\n"); - if (of_property_read_u32_index(np, "ti,syscon-mmuconfig", 1, - &obj->id)) { - dev_err(&pdev->dev, "couldn't get the IOMMU instance id within subsystem\n"); - return -EINVAL; - } - if (obj->id != 0 && obj->id != 1) { dev_err(&pdev->dev, "invalid IOMMU instance id\n"); return -EINVAL; |