summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-enterprise-panel.c
diff options
context:
space:
mode:
authorBharat Nihalani <bnihalani@nvidia.com>2011-09-26 19:21:08 +0530
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:49:04 -0800
commit67fec61dd0438d2e666ee3ecf84ffd6d04a3580e (patch)
tree4642aee485866f9d633d1c956e0836bb0b40fb07 /arch/arm/mach-tegra/board-enterprise-panel.c
parent844e97f6902ce5970f5231d033d067e124cc7abb (diff)
ARM: tegra: nvavp: registering new nvavp driver
Also re-arranged tegra_nvavp code so that it is common accross boards Bug 880623 Change-Id: I7d634a718e07e07e945fb512466b3a0672aea7e2 Reviewed-on: http://git-master/r/54487 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com> Rebase-Id: R78e4af97d967003560e80efce79d6b22d6d66c4f
Diffstat (limited to 'arch/arm/mach-tegra/board-enterprise-panel.c')
-rw-r--r--arch/arm/mach-tegra/board-enterprise-panel.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise-panel.c b/arch/arm/mach-tegra/board-enterprise-panel.c
index 81b40744ff32..9ea904c447da 100644
--- a/arch/arm/mach-tegra/board-enterprise-panel.c
+++ b/arch/arm/mach-tegra/board-enterprise-panel.c
@@ -737,7 +737,13 @@ int __init enterprise_panel_init(void)
if (!err)
err = nvhost_device_register(&enterprise_disp2_device);
- err = platform_add_devices(enterprise_bl_devices,
+#if defined(CONFIG_TEGRA_NVAVP)
+ if (!err)
+ err = nvhost_device_register(&nvavp_device);
+#endif
+
+ if (!err)
+ err = platform_add_devices(enterprise_bl_devices,
ARRAY_SIZE(enterprise_bl_devices));
return err;
}