summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-p1852.c
diff options
context:
space:
mode:
authorHiroshi Doyu <hdoyu@nvidia.com>2012-07-16 11:10:06 +0300
committerVarun Colbert <vcolbert@nvidia.com>2012-08-09 19:50:49 -0700
commitb4620d30379884271659552cc04307a16206bfad (patch)
tree84038dac7af0ad1a77611cbe515b5e3738ff44cf /arch/arm/mach-tegra/board-p1852.c
parente12b744a3a0bd7dd4c2289ae45d4feced656b88a (diff)
ARM: tegra: Create IOMMU map at board_init w/ PLATFORM_IOMMUABLE
Create IOMMU map at board_init with CONFIG_PLATFORM_IOMMUABLE enabled. Change-Id: I204b98c145420535821c4cbf03fa61765e619ec1 Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com> Reviewed-on: http://git-master/r/121219 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-p1852.c')
-rw-r--r--arch/arm/mach-tegra/board-p1852.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-p1852.c b/arch/arm/mach-tegra/board-p1852.c
index e3c017431366..46c1ffb5d815 100644
--- a/arch/arm/mach-tegra/board-p1852.c
+++ b/arch/arm/mach-tegra/board-p1852.c
@@ -362,9 +362,6 @@ static struct platform_device tegra_camera = {
};
static struct platform_device *p1852_devices[] __initdata = {
-#if defined(CONFIG_TEGRA_IOVMM_SMMU) || defined(CONFIG_TEGRA_IOMMU_SMMU)
- &tegra_smmu_device,
-#endif
#if defined(CONFIG_TEGRA_AVP)
&tegra_avp_device,
#endif
@@ -631,6 +628,7 @@ static void __init tegra_p1852_init(void)
tegra_init_board_info();
tegra_clk_init_from_table(p1852_clk_init_table);
tegra_enable_pinmux();
+ tegra_smmu_init();
p1852_pinmux_init();
p1852_i2c_init();
p1852_i2s_audio_init();