diff options
author | Krishna Reddy <vdumpa@nvidia.com> | 2011-12-16 18:35:28 -0800 |
---|---|---|
committer | Varun Wadekar <vwadekar@nvidia.com> | 2011-12-28 21:27:20 -0800 |
commit | 7bcaefb7cafaccfe83f1701ae6b05749c1e937ec (patch) | |
tree | 32a9fb9dfc7eff5a7ad77722de90d89391a9cf38 /arch/arm/mach-tegra/board-enterprise-panel.c | |
parent | afb496954b25d800d6847a4c3805fe42032c87ac (diff) |
arm: tegra: Create nvmap dev based on config flag.
Create nvmap dev and related resources only when CONFIG_TEGRA_NVMAP
is defined.
Change-Id: Iee9e43de79767353a750f73cddd6550a74315cff
Signed-off-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-on: http://git-master/r/70699
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-enterprise-panel.c')
-rw-r--r-- | arch/arm/mach-tegra/board-enterprise-panel.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise-panel.c b/arch/arm/mach-tegra/board-enterprise-panel.c index fb69bd3536d1..1d5507004913 100644 --- a/arch/arm/mach-tegra/board-enterprise-panel.c +++ b/arch/arm/mach-tegra/board-enterprise-panel.c @@ -664,6 +664,7 @@ static struct nvhost_device enterprise_disp2_device = { }; #endif +#if defined(CONFIG_TEGRA_NVMAP) static struct nvmap_platform_carveout enterprise_carveouts[] = { [0] = NVMAP_HEAP_CARVEOUT_IRAM_INIT, [1] = { @@ -687,9 +688,12 @@ static struct platform_device enterprise_nvmap_device = { .platform_data = &enterprise_nvmap_data, }, }; +#endif static struct platform_device *enterprise_gfx_devices[] __initdata = { +#if defined(CONFIG_TEGRA_NVMAP) &enterprise_nvmap_device, +#endif #ifdef CONFIG_TEGRA_GRHOST &tegra_grhost_device, #endif @@ -748,8 +752,10 @@ int __init enterprise_panel_init(void) enterprise_dsi.chip_id = tegra_get_chipid(); enterprise_dsi.chip_rev = tegra_get_revision(); +#if defined(CONFIG_TEGRA_NVAVP) enterprise_carveouts[1].base = tegra_carveout_start; enterprise_carveouts[1].size = tegra_carveout_size; +#endif tegra_gpio_enable(enterprise_hdmi_hpd); gpio_request(enterprise_hdmi_hpd, "hdmi_hpd"); |