Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Wandboard imx 3.0.35 4.0.0 test #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 1, 2013
Merged

Wandboard imx 3.0.35 4.0.0 test #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c7a46f
Fix uninitialized variables warnings
wolfgar Jul 31, 2013
15bb848
Fix compilation when mipi-csi option is disabled
wolfgar Jul 31, 2013
c81dfc9
Adapt video memory limit according to wandboard version
wolfgar Jul 31, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions arch/arm/mach-mx6/board-wand.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,7 @@ static void wand_init_hdmi(void) {
mxc_iomux_set_gpr_register(0, 0, 1, 1);
}

#ifdef CONFIG_IMX_HAVE_PLATFORM_IMX_MIPI_CSI
/****************************************************************************
*
* MIPI CSI
Expand Down Expand Up @@ -628,8 +629,8 @@ static struct mipi_csi2_platform_data wand_mipi_csi2_platform_data = {
};

/* Wandboard MIPI CSI init function */
static void __init wand_init_mipi_csi(void){

static void __init wand_init_mipi_csi(void)
{
pr_debug("%s\n", __func__);

/* Add CSI2 */
Expand All @@ -640,6 +641,12 @@ static void __init wand_init_mipi_csi(void){
i2c_register_board_info(1, wand_mipi_csi_i2c_board_info,
ARRAY_SIZE(wand_mipi_csi_i2c_board_info));
}
#else
static void __init wand_init_mipi_csi(void)
{
return;
}
#endif

/****************************************************************************
*
Expand Down Expand Up @@ -1142,7 +1149,12 @@ static void __init wand_reserve(void) {
phys_addr_t phys;

if (wand_gpu_pdata.reserved_mem_size) {
phys = memblock_alloc_base(wand_gpu_pdata.reserved_mem_size, SZ_4K, SZ_2G);
if (cpu_is_mx6q())
phys = memblock_alloc_base(wand_gpu_pdata.reserved_mem_size, SZ_4K, SZ_2G);
else if (cpu_is_mx6dl())
phys = memblock_alloc_base(wand_gpu_pdata.reserved_mem_size, SZ_4K, SZ_1G);
else
phys = memblock_alloc_base(wand_gpu_pdata.reserved_mem_size, SZ_4K, SZ_512M);
memblock_remove(phys, wand_gpu_pdata.reserved_mem_size);
wand_gpu_pdata.reserved_mem_base = phys;
}
Expand Down Expand Up @@ -1181,7 +1193,7 @@ static void __init wand_board_init(void) {
capture_data[i].ipu = 0;
imx6q_add_v4l2_capture(i, &capture_data[i]);
}
wand_init_mipi_csi();
wand_init_mipi_csi();
wand_init_lcd();
wand_init_wifi();
wand_init_bluetooth();
Expand Down
2 changes: 1 addition & 1 deletion drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@ gckKERNEL_Dispatch(
{
gceSTATUS status = gcvSTATUS_OK;
gctSIZE_T bytes;
gcuVIDMEM_NODE_PTR node;
gcuVIDMEM_NODE_PTR node = gcvNULL;
gctBOOL locked = gcvFALSE;
gctPHYS_ADDR physical = gcvNULL;
gctPOINTER logical = gcvNULL;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,7 @@ _AllocateCommandBuffer(
gctUINT requestedSize;
gctUINT allocationSize;
gctUINT32 address = 0;
gcsCMDBUFFER_PTR commandBuffer;
gcsCMDBUFFER_PTR commandBuffer = gcvNULL;
gctUINT8_PTR endCommand;

/* Determine the aligned header size. */
Expand Down
2 changes: 1 addition & 1 deletion drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1660,7 +1660,7 @@ gckVIDMEM_Lock(
gctBOOL acquired = gcvFALSE;
gctBOOL locked = gcvFALSE;
gckOS os = gcvNULL;
gctBOOL needMapping;
gctBOOL needMapping = gcvFALSE;
gctUINT32 baseAddress;

gcmkHEADER_ARG("Node=0x%x", Node);
Expand Down