diff options
| author | Terje Bergstrom <tbergstrom@nvidia.com> | 2011-10-06 10:55:04 +0300 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:49:26 -0800 |
| commit | 753cdc02611cd5792dcee1b805b470aceae9f28d (patch) | |
| tree | c015062fd187c3be3f41ee72990758c6daa6e6d1 /arch/arm/mach-tegra/board-aruba-panel.c | |
| parent | d229bde19ad403fb74c72ff8fb253f87c91cf714 (diff) | |
arm: tegra: Make kernel buildable without nvhost
Cuts dependencies to nvhost by adding a Kconfig dependency from DC to
GRHOST and from HD Audio to DC. Configure out calls to nvhost in board
panel files if GRHOST is not present.
Bug 870898
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Change-Id: If7830528e321e951bcadc2a10515e6cab58a6cdf
Reviewed-on: http://git-master/r/56370
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: Antti Miettinen <amiettinen@nvidia.com>
Tested-by: Antti Miettinen <amiettinen@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Reviewed-by: Chris Dragan <kdragan@nvidia.com>
Rebase-Id: R16d9286d67235b0697c914476e7d6462eec7f3ac
Diffstat (limited to 'arch/arm/mach-tegra/board-aruba-panel.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-aruba-panel.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-aruba-panel.c b/arch/arm/mach-tegra/board-aruba-panel.c index a0adfca052e1..e4953bde46c3 100644 --- a/arch/arm/mach-tegra/board-aruba-panel.c +++ b/arch/arm/mach-tegra/board-aruba-panel.c @@ -85,6 +85,7 @@ static struct platform_device aruba_backlight_device = { }, }; +#ifdef CONFIG_TEGRA_DC static int aruba_panel_enable(void) { static struct regulator *reg = NULL; @@ -180,6 +181,7 @@ static struct nvhost_device aruba_disp1_device = { .platform_data = &aruba_disp1_pdata, }, }; +#endif static struct nvmap_platform_carveout aruba_carveouts[] = { [0] = NVMAP_HEAP_CARVEOUT_IRAM_INIT, @@ -207,7 +209,9 @@ static struct platform_device aruba_nvmap_device = { static struct platform_device *aruba_gfx_devices[] __initdata = { &aruba_nvmap_device, +#ifdef CONFIG_TEGRA_GRHOST &tegra_grhost_device, +#endif &tegra_pwfm2_device, &aruba_backlight_device, }; @@ -215,7 +219,7 @@ static struct platform_device *aruba_gfx_devices[] __initdata = { int __init aruba_panel_init(void) { int err; - struct resource *res; + struct resource __maybe_unused *res; aruba_carveouts[1].base = tegra_carveout_start; aruba_carveouts[1].size = tegra_carveout_size; @@ -223,17 +227,21 @@ int __init aruba_panel_init(void) err = platform_add_devices(aruba_gfx_devices, ARRAY_SIZE(aruba_gfx_devices)); +#if defined(CONFIG_TEGRA_GRHOST) && defined(CONFIG_TEGRA_DC) res = nvhost_get_resource_byname(&aruba_disp1_device, IORESOURCE_MEM, "fbmem"); res->start = tegra_fb_start; res->end = tegra_fb_start + tegra_fb_size - 1; +#endif /* Copy the bootloader fb to the fb. */ tegra_move_framebuffer(tegra_fb_start, tegra_bootloader_fb_start, min(tegra_fb_size, tegra_bootloader_fb_size)); +#if defined(CONFIG_TEGRA_GRHOST) && defined(CONFIG_TEGRA_DC) if (!err) err = nvhost_device_register(&aruba_disp1_device); +#endif return err; } |