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-cardhu-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-cardhu-panel.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu-panel.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-panel.c b/arch/arm/mach-tegra/board-cardhu-panel.c index 0777d75c2964..0964202196f9 100644 --- a/arch/arm/mach-tegra/board-cardhu-panel.c +++ b/arch/arm/mach-tegra/board-cardhu-panel.c @@ -1005,6 +1005,7 @@ static int cardhu_disp1_check_fb(struct device *dev, struct fb_info *info) } #endif +#if defined(CONFIG_TEGRA_NVMAP) static struct nvmap_platform_carveout cardhu_carveouts[] = { [0] = NVMAP_HEAP_CARVEOUT_IRAM_INIT, [1] = { @@ -1028,10 +1029,12 @@ static struct platform_device cardhu_nvmap_device = { .platform_data = &cardhu_nvmap_data, }, }; - +#endif static struct platform_device *cardhu_gfx_devices[] __initdata = { +#if defined(CONFIG_TEGRA_NVMAP) &cardhu_nvmap_device, +#endif #ifdef CONFIG_TEGRA_GRHOST &tegra_grhost_device, #endif @@ -1073,8 +1076,10 @@ int __init cardhu_panel_init(void) tegra_get_board_info(&board_info); tegra_get_display_board_info(&display_board_info); +#if defined(CONFIG_TEGRA_NVMAP) cardhu_carveouts[1].base = tegra_carveout_start; cardhu_carveouts[1].size = tegra_carveout_size; +#endif if (board_info.board_id == BOARD_E1291 && ((board_info.sku & SKU_TOUCHSCREEN_MECH_FIX) == 0)) { |