Merge branch 'iommu/fwspec-ops-removal' into iommu/next

* iommu/fwspec-ops-removal:
  iommu: Remove iommu_fwspec ops
  OF: Simplify of_iommu_configure()
  ACPI: Retire acpi_iommu_fwspec_ops()
  iommu: Resolve fwspec ops automatically
  iommu/mediatek-v1: Clean up redundant fwspec checks

[will: Fixed conflict in drivers/iommu/tegra-smmu.c between fwspec ops
 removal and fwspec driver fix as per Robin and Jon]

diff --cc drivers/iommu/arm/arm-smmu/arm-smmu.c
Simple merge

diff --cc drivers/iommu/tegra-smmu.c
index c0c6dbd87fca987527f4aa8e8e37e3b78e7cb001,4365d9936e68676f50da245e287005675ae1f44e..7f633bb5efef166b551f3d632bd221d9b5dd1bd1
--- 1/drivers/iommu/tegra-smmu.c
--- 2/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@@ -837,7 -837,7 +837,7 @@@ static int tegra_smmu_configure(struct 
        const struct iommu_ops *ops = smmu->iommu.ops;
        int err;
  
-       err = iommu_fwspec_init(dev, &smmu->dev->of_node->fwnode, ops);
 -      err = iommu_fwspec_init(dev, of_fwnode_handle(dev->of_node));
++      err = iommu_fwspec_init(dev, dev_fwnode(smmu->dev));
        if (err < 0) {
                dev_err(dev, "failed to initialize fwspec: %d\n", err);
                return err;

diff --cc include/linux/iommu.h
Simple merge