summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/mach-tegra/board-aruba-panel.c6
-rw-r--r--arch/arm/mach-tegra/board-cardhu-panel.c7
-rw-r--r--arch/arm/mach-tegra/board-enterprise-panel.c6
-rw-r--r--arch/arm/mach-tegra/board-harmony-panel.c6
-rw-r--r--arch/arm/mach-tegra/board-ventana-panel.c6
-rw-r--r--arch/arm/mach-tegra/board-whistler-panel.c7
-rw-r--r--arch/arm/mach-tegra/board.h2
7 files changed, 39 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-aruba-panel.c b/arch/arm/mach-tegra/board-aruba-panel.c
index e4953bde46c3..7524f821f359 100644
--- a/arch/arm/mach-tegra/board-aruba-panel.c
+++ b/arch/arm/mach-tegra/board-aruba-panel.c
@@ -183,6 +183,7 @@ static struct nvhost_device aruba_disp1_device = {
};
#endif
+#if defined(CONFIG_TEGRA_NVMAP)
static struct nvmap_platform_carveout aruba_carveouts[] = {
[0] = NVMAP_HEAP_CARVEOUT_IRAM_INIT,
[1] = {
@@ -206,9 +207,12 @@ static struct platform_device aruba_nvmap_device = {
.platform_data = &aruba_nvmap_data,
},
};
+#endif
static struct platform_device *aruba_gfx_devices[] __initdata = {
+#if defined(CONFIG_TEGRA_NVMAP)
&aruba_nvmap_device,
+#endif
#ifdef CONFIG_TEGRA_GRHOST
&tegra_grhost_device,
#endif
@@ -221,8 +225,10 @@ int __init aruba_panel_init(void)
int err;
struct resource __maybe_unused *res;
+#if defined(CONFIG_TEGRA_NVMAP)
aruba_carveouts[1].base = tegra_carveout_start;
aruba_carveouts[1].size = tegra_carveout_size;
+#endif
err = platform_add_devices(aruba_gfx_devices,
ARRAY_SIZE(aruba_gfx_devices));
diff --git a/arch/arm/mach-tegra/board-cardhu-panel.c b/arch/arm/mach-tegra/board-cardhu-panel.c
index 0777d75c2964..0964202196f9 100644
--- a/arch/arm/mach-tegra/board-cardhu-panel.c
+++ b/arch/arm/mach-tegra/board-cardhu-panel.c
@@ -1005,6 +1005,7 @@ static int cardhu_disp1_check_fb(struct device *dev, struct fb_info *info)
}
#endif
+#if defined(CONFIG_TEGRA_NVMAP)
static struct nvmap_platform_carveout cardhu_carveouts[] = {
[0] = NVMAP_HEAP_CARVEOUT_IRAM_INIT,
[1] = {
@@ -1028,10 +1029,12 @@ static struct platform_device cardhu_nvmap_device = {
.platform_data = &cardhu_nvmap_data,
},
};
-
+#endif
static struct platform_device *cardhu_gfx_devices[] __initdata = {
+#if defined(CONFIG_TEGRA_NVMAP)
&cardhu_nvmap_device,
+#endif
#ifdef CONFIG_TEGRA_GRHOST
&tegra_grhost_device,
#endif
@@ -1073,8 +1076,10 @@ int __init cardhu_panel_init(void)
tegra_get_board_info(&board_info);
tegra_get_display_board_info(&display_board_info);
+#if defined(CONFIG_TEGRA_NVMAP)
cardhu_carveouts[1].base = tegra_carveout_start;
cardhu_carveouts[1].size = tegra_carveout_size;
+#endif
if (board_info.board_id == BOARD_E1291 &&
((board_info.sku & SKU_TOUCHSCREEN_MECH_FIX) == 0)) {
diff --git a/arch/arm/mach-tegra/board-enterprise-panel.c b/arch/arm/mach-tegra/board-enterprise-panel.c
index fb69bd3536d1..1d5507004913 100644
--- a/arch/arm/mach-tegra/board-enterprise-panel.c
+++ b/arch/arm/mach-tegra/board-enterprise-panel.c
@@ -664,6 +664,7 @@ static struct nvhost_device enterprise_disp2_device = {
};
#endif
+#if defined(CONFIG_TEGRA_NVMAP)
static struct nvmap_platform_carveout enterprise_carveouts[] = {
[0] = NVMAP_HEAP_CARVEOUT_IRAM_INIT,
[1] = {
@@ -687,9 +688,12 @@ static struct platform_device enterprise_nvmap_device = {
.platform_data = &enterprise_nvmap_data,
},
};
+#endif
static struct platform_device *enterprise_gfx_devices[] __initdata = {
+#if defined(CONFIG_TEGRA_NVMAP)
&enterprise_nvmap_device,
+#endif
#ifdef CONFIG_TEGRA_GRHOST
&tegra_grhost_device,
#endif
@@ -748,8 +752,10 @@ int __init enterprise_panel_init(void)
enterprise_dsi.chip_id = tegra_get_chipid();
enterprise_dsi.chip_rev = tegra_get_revision();
+#if defined(CONFIG_TEGRA_NVAVP)
enterprise_carveouts[1].base = tegra_carveout_start;
enterprise_carveouts[1].size = tegra_carveout_size;
+#endif
tegra_gpio_enable(enterprise_hdmi_hpd);
gpio_request(enterprise_hdmi_hpd, "hdmi_hpd");
diff --git a/arch/arm/mach-tegra/board-harmony-panel.c b/arch/arm/mach-tegra/board-harmony-panel.c
index a63710be2663..d0eecfc9917a 100644
--- a/arch/arm/mach-tegra/board-harmony-panel.c
+++ b/arch/arm/mach-tegra/board-harmony-panel.c
@@ -192,6 +192,7 @@ static int harmony_disp1_check_fb(struct device *dev, struct fb_info *info)
return info->device == &harmony_disp1_device.dev;
}
+#if defined(CONFIG_TEGRA_NVMAP)
static struct nvmap_platform_carveout harmony_carveouts[] = {
[0] = NVMAP_HEAP_CARVEOUT_IRAM_INIT,
[1] = {
@@ -213,9 +214,12 @@ static struct platform_device harmony_nvmap_device = {
.platform_data = &harmony_nvmap_data,
},
};
+#endif
static struct platform_device *harmony_gfx_devices[] __initdata = {
+#if defined(CONFIG_TEGRA_NVMAP)
&harmony_nvmap_device,
+#endif
&tegra_grhost_device,
&tegra_pwfm0_device,
&harmony_backlight_device,
@@ -237,8 +241,10 @@ int __init harmony_panel_init(void) {
gpio_direction_output(harmony_lvds_shutdown, 1);
tegra_gpio_enable(harmony_lvds_shutdown);
+#if defined(CONFIG_TEGRA_NVMAP)
harmony_carveouts[1].base = tegra_carveout_start;
harmony_carveouts[1].size = tegra_carveout_size;
+#endif
err = platform_add_devices(harmony_gfx_devices,
ARRAY_SIZE(harmony_gfx_devices));
diff --git a/arch/arm/mach-tegra/board-ventana-panel.c b/arch/arm/mach-tegra/board-ventana-panel.c
index 749240687735..5290a3da02ca 100644
--- a/arch/arm/mach-tegra/board-ventana-panel.c
+++ b/arch/arm/mach-tegra/board-ventana-panel.c
@@ -309,6 +309,7 @@ static int ventana_disp1_check_fb(struct device *dev, struct fb_info *info)
}
#endif
+#if defined(CONFIG_TEGRA_NVMAP)
static struct nvmap_platform_carveout ventana_carveouts[] = {
[0] = NVMAP_HEAP_CARVEOUT_IRAM_INIT,
[1] = {
@@ -330,9 +331,12 @@ static struct platform_device ventana_nvmap_device = {
.platform_data = &ventana_nvmap_data,
},
};
+#endif
static struct platform_device *ventana_gfx_devices[] __initdata = {
+#if defined(CONFIG_TEGRA_NVMAP)
&ventana_nvmap_device,
+#endif
#ifdef CONFIG_TEGRA_GRHOST
&tegra_grhost_device,
#endif
@@ -403,8 +407,10 @@ int __init ventana_panel_init(void)
register_early_suspend(&ventana_panel_early_suspender);
#endif
+#if defined(CONFIG_TEGRA_NVMAP)
ventana_carveouts[1].base = tegra_carveout_start;
ventana_carveouts[1].size = tegra_carveout_size;
+#endif
err = platform_add_devices(ventana_gfx_devices,
ARRAY_SIZE(ventana_gfx_devices));
diff --git a/arch/arm/mach-tegra/board-whistler-panel.c b/arch/arm/mach-tegra/board-whistler-panel.c
index 0f1912fdd427..e68d6bf40292 100644
--- a/arch/arm/mach-tegra/board-whistler-panel.c
+++ b/arch/arm/mach-tegra/board-whistler-panel.c
@@ -270,6 +270,7 @@ static struct nvhost_device whistler_disp2_device = {
};
#endif
+#if defined(CONFIG_TEGRA_NVMAP)
static struct nvmap_platform_carveout whistler_carveouts[] = {
[0] = NVMAP_HEAP_CARVEOUT_IRAM_INIT,
[1] = {
@@ -293,9 +294,12 @@ static struct platform_device whistler_nvmap_device = {
.platform_data = &whistler_nvmap_data,
},
};
+#endif
static struct platform_device *whistler_gfx_devices[] __initdata = {
+#if defined(CONFIG_TEGRA_NVMAP)
&whistler_nvmap_device,
+#endif
#ifdef CONFIG_TEGRA_GRHOST
&tegra_grhost_device,
#endif
@@ -348,8 +352,11 @@ int __init whistler_panel_init(void)
whistler_panel_early_suspender.level = EARLY_SUSPEND_LEVEL_DISABLE_FB;
register_early_suspend(&whistler_panel_early_suspender);
#endif
+
+#if defined(CONFIG_TEGRA_NVMAP)
whistler_carveouts[1].base = tegra_carveout_start;
whistler_carveouts[1].size = tegra_carveout_size;
+#endif
err = platform_add_devices(whistler_gfx_devices,
ARRAY_SIZE(whistler_gfx_devices));
diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h
index 8720de5eef45..bb533458238f 100644
--- a/arch/arm/mach-tegra/board.h
+++ b/arch/arm/mach-tegra/board.h
@@ -25,6 +25,7 @@
#include <linux/types.h>
#include <linux/power_supply.h>
+#if defined(CONFIG_TEGRA_NVMAP)
#define NVMAP_HEAP_CARVEOUT_IRAM_INIT \
{ .name = "iram", \
.usage_mask = NVMAP_HEAP_CARVEOUT_IRAM, \
@@ -32,6 +33,7 @@
.size = TEGRA_IRAM_SIZE - TEGRA_RESET_HANDLER_SIZE, \
.buddy_size = 0, /* no buddy allocation for IRAM */ \
}
+#endif
void tegra_assert_system_reset(char mode, const char *cmd);
generated by cgit v1.2.3 (git 2.0.4) at 2024-11-20 02:49:02 +0000