summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/devices.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/devices.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/devices.c')
-rw-r--r--arch/arm/mach-tegra/devices.c25
1 files changed, 19 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c
index b956d018f429..cbbb00709d0c 100644
--- a/arch/arm/mach-tegra/devices.c
+++ b/arch/arm/mach-tegra/devices.c
@@ -34,6 +34,7 @@
#include <mach/dma.h>
#include <mach/usb_phy.h>
#include "gpio-names.h"
+#include "tegra_smmu.h"
#if !defined(CONFIG_ARCH_TEGRA_2x_SOC)
#define UART_SOURCE_RATE 408000000
@@ -1238,12 +1239,6 @@ static struct resource tegra_smmu_resources[] = {
.end = TEGRA_MC_BASE + TEGRA_MC_SIZE - 1,
},
[1] = {
- .name = "smmu",
- .flags = IORESOURCE_MEM,
- .start = TEGRA_SMMU_BASE,
- .end = TEGRA_SMMU_BASE + TEGRA_SMMU_SIZE - 1,
- },
- [2] = {
.name = "ahbarb",
.flags = IORESOURCE_MEM,
.start = TEGRA_AHB_ARB_BASE,
@@ -1257,6 +1252,24 @@ struct platform_device tegra_smmu_device = {
.num_resources = ARRAY_SIZE(tegra_smmu_resources),
.resource = tegra_smmu_resources
};
+
+
+static struct tegra_smmu_window tegra_smmu[] = {
+ [0] = {
+ .start = TEGRA_SMMU_BASE,
+ .end = TEGRA_SMMU_BASE + TEGRA_SMMU_SIZE - 1,
+ },
+};
+
+struct tegra_smmu_window *tegra_smmu_window(int wnum)
+{
+ return &tegra_smmu[wnum];
+}
+
+int tegra_smmu_window_count(void)
+{
+ return ARRAY_SIZE(tegra_smmu);
+}
#endif
#if defined(CONFIG_ARCH_TEGRA_2x_SOC)