diff options
| author | Hiroshi DOYU <hdoyu@nvidia.com> | 2011-12-27 10:02:07 +0200 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-01-12 09:12:23 -0800 |
| commit | 7fe7ca90275001eda883076ae14cb3821554f465 (patch) | |
| tree | c390b4d25927ad44408c6acbd72b5d9f43eecc96 /arch/arm/mach-tegra | |
| parent | 8aa1dea9a994a46f24ef6eafab249f94234a0da8 (diff) | |
arm: tegra: smmu: Set TEGRA_IOMMU_SMMU for platform_device
This platform_device will be used for struct iommu_ops for SMMU in
addition to iovmm-smmu exclusively.
Change-Id: I8a15ba5ce40cd4bd5df255ecbe70a79a33fe8209
Signed-off-by: Hiroshi DOYU <hdoyu@nvidia.com>
Reviewed-on: http://git-master/r/72216
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra')
| -rw-r--r-- | arch/arm/mach-tegra/board-aruba.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/devices.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/tegra_smmu.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/board-aruba.c b/arch/arm/mach-tegra/board-aruba.c index dec2efc022aa..152f34720489 100644 --- a/arch/arm/mach-tegra/board-aruba.c +++ b/arch/arm/mach-tegra/board-aruba.c @@ -442,7 +442,7 @@ static struct platform_device *aruba_devices[] __initdata = { &tegra_pmu_device, &tegra_rtc_device, &tegra_udc_device, -#if defined(CONFIG_TEGRA_IOVMM_SMMU) +#if defined(CONFIG_TEGRA_IOVMM_SMMU) || defined(CONFIG_TEGRA_IOMMU_SMMU) &tegra_smmu_device, #endif &aruba_keys_device, diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index 445a5453e859..2fc621d79341 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -566,7 +566,7 @@ static struct platform_device *cardhu_devices[] __initdata = { &tegra_pmu_device, &tegra_rtc_device, &tegra_udc_device, -#if defined(CONFIG_TEGRA_IOVMM_SMMU) +#if defined(CONFIG_TEGRA_IOVMM_SMMU) || defined(CONFIG_TEGRA_IOMMU_SMMU) &tegra_smmu_device, #endif &tegra_wdt_device, diff --git a/arch/arm/mach-tegra/board-enterprise.c b/arch/arm/mach-tegra/board-enterprise.c index 489c1cdcc348..b5bedac1ae66 100644 --- a/arch/arm/mach-tegra/board-enterprise.c +++ b/arch/arm/mach-tegra/board-enterprise.c @@ -527,7 +527,7 @@ static struct platform_device *enterprise_devices[] __initdata = { &tegra_pmu_device, &tegra_rtc_device, &tegra_udc_device, -#if defined(CONFIG_TEGRA_IOVMM_SMMU) +#if defined(CONFIG_TEGRA_IOVMM_SMMU) || defined(CONFIG_TEGRA_IOMMU_SMMU) &tegra_smmu_device, #endif &tegra_wdt_device, diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c index c301654426b5..e055e1d7e84c 100644 --- a/arch/arm/mach-tegra/devices.c +++ b/arch/arm/mach-tegra/devices.c @@ -1313,7 +1313,7 @@ struct platform_device tegra_gart_device = { }; #endif -#if defined(CONFIG_TEGRA_IOVMM_SMMU) +#if defined(CONFIG_TEGRA_IOVMM_SMMU) || defined(CONFIG_TEGRA_IOMMU_SMMU) static struct resource tegra_smmu_resources[] = { [0] = { .name = "mc", diff --git a/arch/arm/mach-tegra/tegra_smmu.h b/arch/arm/mach-tegra/tegra_smmu.h index b46ae11c6f2e..40a22a76997e 100644 --- a/arch/arm/mach-tegra/tegra_smmu.h +++ b/arch/arm/mach-tegra/tegra_smmu.h @@ -13,7 +13,7 @@ * GNU General Public License for more details. * */ -#ifdef CONFIG_TEGRA_IOVMM_SMMU +#if defined(CONFIG_TEGRA_IOVMM_SMMU) || defined(CONFIG_TEGRA_IOMMU_SMMU) struct tegra_smmu_window { unsigned long start; unsigned long end; |