diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-06-13 11:17:53 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-06-13 11:17:53 -0700 |
| commit | d682fa41ba5963b83988fc5ce9b7836761d5e7a2 (patch) | |
| tree | 668cc21efd4d26599feac446a652479511072083 | |
| parent | e910c3cd78b4960a9435cb8abd868135ae421591 (diff) | |
Fix adv7180 patch.
It seems that some bit of commit f71be6d7a7aef1a496f73a9d9f8316c0e9477bb5
mx6_nitrogen6x: reserve 128M v4l2 memory to prevent dma alloc failure
leaked into commit 73898f34936475555d4797c0c64b24c4952c0c9a
mx6_nitrogen6x: add adv7180 tv input camera
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6_nitrogen6x.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-mx6/board-mx6_nitrogen6x.c b/arch/arm/mach-mx6/board-mx6_nitrogen6x.c index 97932d1ec6d6..d589afae7a7e 100644 --- a/arch/arm/mach-mx6/board-mx6_nitrogen6x.c +++ b/arch/arm/mach-mx6/board-mx6_nitrogen6x.c @@ -1264,14 +1264,6 @@ static void __init board_init(void) imx6q_add_lcdif(&lcdif_data); imx6q_add_ldb(&ldb_data); imx6q_add_bt656(&bt656_data); - voutdev = imx6q_add_v4l2_output(0); - if (vout_mem.res_msize && voutdev) { - dma_declare_coherent_memory(&voutdev->dev, - vout_mem.res_mbase, - vout_mem.res_mbase, - vout_mem.res_msize, - DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE); - } for (i = 0; i < ARRAY_SIZE(capture_data); i++) { if (!cpu_is_mx6q()) |