diff options
| author | Krishna Reddy <vdumpa@nvidia.com> | 2014-05-20 11:15:41 -0700 |
|---|---|---|
| committer | Riham Haidar <rhaidar@nvidia.com> | 2014-05-23 22:36:04 -0700 |
| commit | 077dd69b23d0b6cbc30c7b18c1129a0cbdf27bc3 (patch) | |
| tree | 65c8fbfed98976fbbba9c727c63c2cbd1813ea10 /arch/arm/mach-tegra/board-vcm30_t124-panel.c | |
| parent | 7025c6ca7bb15110e42a173e6dd9f5ff7eaacd52 (diff) | |
arm: tegra: nvmap: pass dma_dev arg for carveouts
Pass dma_dev arg for carveouts. This is necessary
to allocate from carveouts via Dma API.
Change-Id: I9c3fea752c9399fb40dccffc09bd572e1713a930
Signed-off-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-on: http://git-master/r/412168
(cherry picked from commit 9dc0a54feae983c85cd99638837062cee1e5c5c9)
Reviewed-on: http://git-master/r/412803
Diffstat (limited to 'arch/arm/mach-tegra/board-vcm30_t124-panel.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-vcm30_t124-panel.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-vcm30_t124-panel.c b/arch/arm/mach-tegra/board-vcm30_t124-panel.c index 0af169ca4c4a..16e1abbb81bc 100644 --- a/arch/arm/mach-tegra/board-vcm30_t124-panel.c +++ b/arch/arm/mach-tegra/board-vcm30_t124-panel.c @@ -318,18 +318,21 @@ static struct nvmap_platform_carveout vcm30_t124_carveouts[] = { .usage_mask = NVMAP_HEAP_CARVEOUT_IRAM, .base = TEGRA_IRAM_BASE + TEGRA_RESET_HANDLER_SIZE, .size = TEGRA_IRAM_SIZE - TEGRA_RESET_HANDLER_SIZE, + .dma_dev = &tegra_iram_dev, }, [1] = { .name = "generic-0", .usage_mask = NVMAP_HEAP_CARVEOUT_GENERIC, .base = 0, /* Filled in by vcm30_t124_panel_init() */ .size = 0, /* Filled in by vcm30_t124_panel_init() */ + .dma_dev = &tegra_generic_dev, }, [2] = { .name = "vpr", .usage_mask = NVMAP_HEAP_CARVEOUT_VPR, .base = 0, /* Filled in by vcm30_t124_panel_init() */ .size = 0, /* Filled in by vcm30_t124_panel_init() */ + .dma_dev = &tegra_vpr_dev, }, }; @@ -401,11 +404,9 @@ int __init vcm30_t124_panel_init(void) #ifdef CONFIG_TEGRA_NVMAP vcm30_t124_carveouts[1].base = tegra_carveout_start; vcm30_t124_carveouts[1].size = tegra_carveout_size; - vcm30_t124_carveouts[2].dma_dev = &tegra_generic_dev; vcm30_t124_carveouts[2].base = tegra_vpr_start; vcm30_t124_carveouts[2].size = tegra_vpr_size; - vcm30_t124_carveouts[2].dma_dev = &tegra_vpr_dev; generic_dma_info.name = "generic"; generic_dma_info.base = tegra_carveout_start; |