Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: 7640/1: memory: tegra_ahb_enable_smmu() depends on TEGRA_IOMMU_SMMU

New SoC, Tegra114 also uses SMMU. Change tegra_ahb_enable_smmu()'s
dependency from ARCH_TEGRA_3x_SOC to TEGRA_IOMMU_SMMU. No need to edit
whenever a new Tegra SoC comes.

The following combination caused build error, which this patch fixes.

CONFIG_ARCH_TEGRA_2x_SOC=y
CONFIG_ARCH_TEGRA_114_SOC=y

drivers/iommu/tegra-smmu.c:485: undefined reference to gra_ahb_enable_smmu'

Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Hiroshi Doyu and committed by
Russell King
b44bf43b 69dde4c5

+1 -1
+1 -1
drivers/amba/tegra-ahb.c
··· 129 129 writel(value, ahb->regs + offset); 130 130 } 131 131 132 - #ifdef CONFIG_ARCH_TEGRA_3x_SOC 132 + #ifdef CONFIG_TEGRA_IOMMU_SMMU 133 133 static int tegra_ahb_match_by_smmu(struct device *dev, void *data) 134 134 { 135 135 struct tegra_ahb *ahb = dev_get_drvdata(dev);