Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/arch/arm/mach-mx6/board-mx6_nitrogen6x.c b/arch/arm/mach-mx6/board-mx6_nitrogen6x.c
- index d589afa..376b78a 100644
- --- a/arch/arm/mach-mx6/board-mx6_nitrogen6x.c
- +++ b/arch/arm/mach-mx6/board-mx6_nitrogen6x.c
- @@ -864,6 +864,16 @@ static struct imx_ipuv3_platform_data ipu_data[] = {
- },
- };
- +struct imx_vout_mem {
- + resource_size_t res_mbase;
- + resource_size_t res_msize;
- +};
- +
- +static struct imx_vout_mem vout_mem __initdata = {
- + .res_msize = SZ_128M,
- +};
- +
- +
- static struct fsl_mxc_capture_platform_data capture_data[] = {
- #if defined(CONFIG_MXC_CAMERA_OV5642) || defined(CONFIG_MXC_CAMERA_OV5642_MODULE)
- {
- @@ -1206,6 +1216,8 @@ static void __init board_init(void)
- struct clk *new_parent;
- int rate;
- int isn6 ;
- + struct platform_device *voutdev;
- +
- IOMUX_SETUP(common_pads);
- @@ -1265,6 +1277,15 @@ static void __init board_init(void)
- 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())
- capture_data[i].ipu = 0;
- @@ -1425,6 +1446,13 @@ static void __init reserve(void)
- imx6_gpu_pdata.reserved_mem_base = phys;
- }
- #endif
- +
- + if (vout_mem.res_msize) {
- + phys = memblock_alloc_base(vout_mem.res_msize,
- + SZ_4K, SZ_1G);
- + memblock_remove(phys, vout_mem.res_msize);
- + vout_mem.res_mbase = phys;
- + }
- }
- /*
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement