diff options
| author | Seshendra Gadagottu <sgadagottu@nvidia.com> | 2012-07-26 17:51:23 -0700 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2012-07-27 17:48:12 -0700 |
| commit | 9fe871f33edc3f902e54509a8b3ba51ed093e02d (patch) | |
| tree | 9daf9bd8f04389930a617abb058ea1a18f204963 /arch/arm/mach-tegra/board-curacao-panel.c | |
| parent | 2610e1c99e9292ab8301431454cf03a4faaee0a7 (diff) | |
tegra: dc: fix build errors
Fixed compilation erros with CONFIG_TEGRA_DC enable:
1. Unused variables in dc.c and board-curacao-panel.c
2. Merge issue related to window.c
Signed-off-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Change-Id: I087b6f15b68ef5fa9739c84dc3abc81db7d7b9d2
Reviewed-on: http://git-master/r/118821
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-curacao-panel.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-curacao-panel.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-curacao-panel.c b/arch/arm/mach-tegra/board-curacao-panel.c index 2e087ce30adb..a90dc92d5931 100644 --- a/arch/arm/mach-tegra/board-curacao-panel.c +++ b/arch/arm/mach-tegra/board-curacao-panel.c @@ -115,6 +115,7 @@ static int curacao_panel_disable(void) return -ENODEV; } +#if TEGRA_DSI_GANGED_MODE static struct resource curacao_disp1_resources[] = { { .name = "irq", @@ -158,6 +159,7 @@ static struct resource curacao_disp1_resources[] = { #endif }; +#endif static struct tegra_dc_sd_settings curacao_sd_settings = { .enable = 0, /* Normal mode operation */ @@ -363,6 +365,7 @@ static struct tegra_dsi_out curacao_dsi = { .fpga_freq_khz = 162000, }; +#if TEGRA_DSI_GANGED_MODE static struct tegra_dc_out curacao_disp1_out = { .sd_settings = &curacao_sd_settings, @@ -400,6 +403,7 @@ static struct nvhost_device curacao_disp1_device = { .platform_data = &curacao_disp1_pdata, }, }; +#endif static struct resource curacao_disp2_resources[] = { { @@ -547,6 +551,17 @@ int __init curacao_panel_init(void) return err; #endif +#if TEGRA_DSI_GANGED_MODE +#if defined(CONFIG_TEGRA_GRHOST) && defined(CONFIG_TEGRA_DC) + res = nvhost_get_resource_byname(&curacao_disp1_device, + IORESOURCE_MEM, "fbmem"); + res->start = tegra_fb_start; + res->end = tegra_fb_start + tegra_fb_size - 1; + + if (!err) + err = nvhost_device_register(&curacao_disp1_device); +#endif +#else #if defined(CONFIG_TEGRA_GRHOST) && defined(CONFIG_TEGRA_DC) res = nvhost_get_resource_byname(&curacao_disp2_device, IORESOURCE_MEM, "fbmem"); @@ -556,6 +571,7 @@ int __init curacao_panel_init(void) if (!err) err = nvhost_device_register(&curacao_disp2_device); #endif +#endif #if defined(CONFIG_TEGRA_GRHOST) && defined(CONFIG_TEGRA_NVAVP) if (!err) |