Messages in this thread | | | Date | Wed, 6 Feb 2013 16:25:23 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the driver-core tree with the iommu tree |
| |
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in drivers/iommu/tegra-smmu.c between commit a6870e928d1b ("iommu/tegra: smmu: Support variable MMIO ranges/blocks") from the iommu tree and commit bc5e6dea81b0 ("iommu: Convert to devm_ioremap_resource()") from the driver-core tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/iommu/tegra-smmu.c index 7747283,f08dbcd..0000000 --- a/drivers/iommu/tegra-smmu.c +++ b/drivers/iommu/tegra-smmu.c @@@ -1185,13 -1177,10 +1186,13 @@@ static int tegra_smmu_probe(struct plat res = platform_get_resource(pdev, IORESOURCE_MEM, i); if (!res) return -ENODEV; - smmu->regs[i] = devm_request_and_ioremap(&pdev->dev, res); - if (!smmu->regs[i]) - return -EBUSY; + smmu->regs[i] = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(smmu->regs[i])) + return PTR_ERR(smmu->regs[i]); + smmu->rege[i] = smmu->regs[i] + resource_size(res) - 1; } + /* Same as "mc" 1st regiter block start address */ + smmu->regbase = (void __iomem *)((u32)smmu->regs[0] & ~PAGE_MASK); err = of_get_dma_window(dev->of_node, NULL, 0, NULL, &base, &size); if (err) [unhandled content-type:application/pgp-signature] | |