From: Will Deacon <will@kernel.org>
Date: Fri, 12 Jul 2024 15:55:43 +0000 (+0100)
Subject: Merge branch 'iommu/fwspec-ops-removal' into iommu/next
X-Git-Tag: v6.11-rc1~115^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=342d3c1cbf6f181e202c9984c5f9c68b808f4f61;p=thirdparty%2Fkernel%2Flinux.git

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]
---

342d3c1cbf6f181e202c9984c5f9c68b808f4f61
diff --cc drivers/iommu/tegra-smmu.c
index c0c6dbd87fca9,4365d9936e686..7f633bb5efef1
--- a/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;