summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/common.c
diff options
context:
space:
mode:
authorHiro Sugawara <hsugawara@nvidia.com>2011-09-13 17:20:35 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:49:07 -0800
commit10f14812913c148217b4cd9d026284f367a7c660 (patch)
tree767ddda1a95674481ceeb2b6c5fc8d022c23c94c /arch/arm/mach-tegra/common.c
parenteae9abf71a28401cdfdcad939e62ae48415b2515 (diff)
arm: tegra: smmu: Remove IORESOURCE use from SMMU IOVA range
SMMU simply needs to know its assigned IOVA range, but does not need address space resources. Bug 874438 Change-Id: I0b9943d06c49363cfc0355586866f3bd6b217274 Reviewed-on: http://git-master/r/54534 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com> Rebase-Id: R3f4045ef2858960cd987a7477ec6869168ccec7d
Diffstat (limited to 'arch/arm/mach-tegra/common.c')
-rw-r--r--arch/arm/mach-tegra/common.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index b34bf3a76af1..9d0717974ff0 100644
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@ -43,6 +43,7 @@
#include "fuse.h"
#include "pm.h"
#include "reset.h"
+#include "tegra_smmu.h"
#define MC_SECURITY_CFG2 0x7c
@@ -519,11 +520,8 @@ void __init tegra_reserve(unsigned long carveout_size, unsigned long fb_size,
unsigned long fb2_size)
{
#ifdef SUPPORT_TEGRA_3_IOVMM_SMMU_A01
- extern struct platform_device tegra_smmu_device;
int smmu_reserved = 0;
- struct resource *smmu_window =
- platform_get_resource_byname(&tegra_smmu_device,
- IORESOURCE_MEM, "smmu");
+ struct tegra_smmu_window *smmu_window = tegra_smmu_window(0);
#endif
if (carveout_size) {
@@ -573,7 +571,7 @@ void __init tegra_reserve(unsigned long carveout_size, unsigned long fb_size,
#ifdef SUPPORT_TEGRA_3_IOVMM_SMMU_A01
if (!smmu_window) {
- pr_err("No SMMU resources\n");
+ pr_err("No SMMU resource\n");
} else {
size_t smmu_window_size;
@@ -648,7 +646,7 @@ void __init tegra_reserve(unsigned long carveout_size, unsigned long fb_size,
#ifdef SUPPORT_TEGRA_3_IOVMM_SMMU_A01
if (smmu_reserved)
- pr_info("SMMU: %08x - %08x\n",
+ pr_info("SMMU: %08lx - %08lx\n",
smmu_window->start, smmu_window->end);
#endif
}