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-whistler-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-whistler-panel.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-whistler-panel.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-whistler-panel.c b/arch/arm/mach-tegra/board-whistler-panel.c index 9b548faf8fdd..41bf154deb86 100644 --- a/arch/arm/mach-tegra/board-whistler-panel.c +++ b/arch/arm/mach-tegra/board-whistler-panel.c @@ -39,8 +39,10 @@ #define whistler_hdmi_hpd TEGRA_GPIO_PN7 +#ifdef CONFIG_TEGRA_DC static struct regulator *whistler_hdmi_reg = NULL; static struct regulator *whistler_hdmi_pll = NULL; +#endif /* * In case which_pwm is TEGRA_PWM_PM0, @@ -68,6 +70,7 @@ static struct platform_device whistler_disp1_backlight_device = { }, }; +#ifdef CONFIG_TEGRA_DC static int whistler_hdmi_enable(void) { if (!whistler_hdmi_reg) { @@ -260,6 +263,7 @@ static struct nvhost_device whistler_disp2_device = { .platform_data = &whistler_disp2_pdata, }, }; +#endif static struct nvmap_platform_carveout whistler_carveouts[] = { [0] = NVMAP_HEAP_CARVEOUT_IRAM_INIT, @@ -287,14 +291,16 @@ static struct platform_device whistler_nvmap_device = { static struct platform_device *whistler_gfx_devices[] __initdata = { &whistler_nvmap_device, +#ifdef CONFIG_TEGRA_GRHOST &tegra_grhost_device, +#endif &whistler_disp1_backlight_device, }; int __init whistler_panel_init(void) { int err; - struct resource *res; + struct resource __maybe_unused *res; tegra_gpio_enable(whistler_hdmi_hpd); gpio_request(whistler_hdmi_hpd, "hdmi_hpd"); @@ -306,15 +312,18 @@ int __init whistler_panel_init(void) err = platform_add_devices(whistler_gfx_devices, ARRAY_SIZE(whistler_gfx_devices)); +#if defined(CONFIG_TEGRA_GRHOST) && defined(CONFIG_TEGRA_DC) res = nvhost_get_resource_byname(&whistler_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) res = nvhost_get_resource_byname(&whistler_disp2_device, IORESOURCE_MEM, "fbmem"); res->start = tegra_fb2_start; @@ -325,6 +334,7 @@ int __init whistler_panel_init(void) if (!err) err = nvhost_device_register(&whistler_disp2_device); +#endif return err; } |