| Message ID | 1373021097-32420-12-git-send-email-hdoyu@nvidia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 07/05/2013 04:44 AM, Hiroshi Doyu wrote: > Tegra 114 SMMU uses the almost same logic as one in Tegra 30 except > that they have different HaredWare Accelerators(HWA). Those difference > is provided from DT. > diff --git a/Documentation/devicetree/bindings/iommu/nvidia,tegra30-smmu.txt b/Documentation/devicetree/bindings/iommu/nvidia,tegra30-smmu.txt > Required properties: > -- compatible : "nvidia,tegra30-smmu" > +- compatible : "nvidia,tegra114-smmu", "nvidia,tegra30-smmu" So that we don't have to list every single chip in that list, we've often written that as: compatible : "nvidia,tegra<chip>-smmu". > diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c > static struct of_device_id tegra_smmu_of_match[] = { > + { .compatible = "nvidia,tegra114-smmu", }, > { .compatible = "nvidia,tegra30-smmu", }, So, there are no HW differences, and hence no driver changes required? In that case, there's no point making the driver explicitly support nvidia,tegra114-smmu, since the DT will always be: compatible = "nvidia,tegra114-smmu", "nvidia,tegra30-smmu"; ... and hence always match on the existing nvidia,tegra30-smmu entry in that table.
diff --git a/Documentation/devicetree/bindings/iommu/nvidia,tegra30-smmu.txt b/Documentation/devicetree/bindings/iommu/nvidia,tegra30-smmu.txt index 89fb543..ce5c43e 100644 --- a/Documentation/devicetree/bindings/iommu/nvidia,tegra30-smmu.txt +++ b/Documentation/devicetree/bindings/iommu/nvidia,tegra30-smmu.txt @@ -1,7 +1,7 @@ NVIDIA Tegra 30 IOMMU H/W, SMMU (System Memory Management Unit) Required properties: -- compatible : "nvidia,tegra30-smmu" +- compatible : "nvidia,tegra114-smmu", "nvidia,tegra30-smmu" - reg : Should contain 3 register banks(address and length) for each of the SMMU register blocks. - interrupts : Should contain MC General interrupt. diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c index 4c16c90..3e03c69 100644 --- a/drivers/iommu/tegra-smmu.c +++ b/drivers/iommu/tegra-smmu.c @@ -1262,6 +1262,7 @@ const struct dev_pm_ops tegra_smmu_pm_ops = { }; static struct of_device_id tegra_smmu_of_match[] = { + { .compatible = "nvidia,tegra114-smmu", }, { .compatible = "nvidia,tegra30-smmu", }, { }, };
Tegra 114 SMMU uses the almost same logic as one in Tegra 30 except that they have different HaredWare Accelerators(HWA). Those difference is provided from DT. Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com> --- .../bindings/iommu/nvidia,tegra30-smmu.txt | 2 +- drivers/iommu/tegra-smmu.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)