summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/board-aruba-panel.c5
-rw-r--r--arch/arm/mach-tegra/board-cardhu-panel.c7
-rw-r--r--arch/arm/mach-tegra/board-enterprise-panel.c5
-rw-r--r--arch/arm/mach-tegra/board-harmony-panel.c3
-rw-r--r--arch/arm/mach-tegra/board-kai-panel.c3
-rw-r--r--arch/arm/mach-tegra/board-p1852-panel.c1
-rw-r--r--arch/arm/mach-tegra/board-ventana-panel.c5
-rw-r--r--arch/arm/mach-tegra/board-whistler-panel.c5
-rw-r--r--arch/arm/mach-tegra/devices.c50
-rw-r--r--arch/arm/mach-tegra/devices.h1
-rw-r--r--arch/arm/mach-tegra/p852/board-p852-panel.c3
11 files changed, 7 insertions, 81 deletions
diff --git a/arch/arm/mach-tegra/board-aruba-panel.c b/arch/arm/mach-tegra/board-aruba-panel.c
index 7524f821f359..92e43626a5f9 100644
--- a/arch/arm/mach-tegra/board-aruba-panel.c
+++ b/arch/arm/mach-tegra/board-aruba-panel.c
@@ -1,7 +1,7 @@
/*
* arch/arm/mach-tegra/board-aruba-panel.c
*
- * Copyright (c) 2010-2011, NVIDIA Corporation.
+ * Copyright (c) 2010-2012, NVIDIA Corporation.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -213,9 +213,6 @@ 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
&tegra_pwfm2_device,
&aruba_backlight_device,
};
diff --git a/arch/arm/mach-tegra/board-cardhu-panel.c b/arch/arm/mach-tegra/board-cardhu-panel.c
index 90801b0e610d..7de847695f60 100644
--- a/arch/arm/mach-tegra/board-cardhu-panel.c
+++ b/arch/arm/mach-tegra/board-cardhu-panel.c
@@ -1,7 +1,7 @@
/*
* arch/arm/mach-tegra/board-cardhu-panel.c
*
- * Copyright (c) 2010-2011, NVIDIA Corporation.
+ * Copyright (c) 2010-2012, NVIDIA Corporation.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -1097,9 +1097,6 @@ static struct platform_device *cardhu_gfx_devices[] __initdata = {
#if defined(CONFIG_ION_TEGRA)
&tegra_ion_device,
#endif
-#ifdef CONFIG_TEGRA_GRHOST
- &tegra_grhost_device,
-#endif
&tegra_pwfm0_device,
&cardhu_backlight_device,
};
@@ -1113,8 +1110,6 @@ struct early_suspend cardhu_panel_early_suspender;
static void cardhu_panel_early_suspend(struct early_suspend *h)
{
- unsigned i;
-
/* power down LCD, add use a black screen for HDMI */
if (num_registered_fb > 0)
fb_blank(registered_fb[0], FB_BLANK_POWERDOWN);
diff --git a/arch/arm/mach-tegra/board-enterprise-panel.c b/arch/arm/mach-tegra/board-enterprise-panel.c
index ec7eae3b365d..0defe56a7bc7 100644
--- a/arch/arm/mach-tegra/board-enterprise-panel.c
+++ b/arch/arm/mach-tegra/board-enterprise-panel.c
@@ -1,7 +1,7 @@
/*
* arch/arm/mach-tegra/board-enterprise-panel.c
*
- * Copyright (c) 2011, NVIDIA Corporation.
+ * Copyright (c) 2011-2012, NVIDIA Corporation.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -694,9 +694,6 @@ 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
&tegra_pwfm0_device,
};
diff --git a/arch/arm/mach-tegra/board-harmony-panel.c b/arch/arm/mach-tegra/board-harmony-panel.c
index 4ea6725101ee..d9974f1b1caa 100644
--- a/arch/arm/mach-tegra/board-harmony-panel.c
+++ b/arch/arm/mach-tegra/board-harmony-panel.c
@@ -1,7 +1,7 @@
/*
* arch/arm/mach-tegra/board-harmony-panel.c
*
- * Copyright (c) 2010-2011, NVIDIA Corporation.
+ * Copyright (c) 2010-2012, NVIDIA Corporation.
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
@@ -325,7 +325,6 @@ 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,
};
diff --git a/arch/arm/mach-tegra/board-kai-panel.c b/arch/arm/mach-tegra/board-kai-panel.c
index 742633735071..1e5c588d6065 100644
--- a/arch/arm/mach-tegra/board-kai-panel.c
+++ b/arch/arm/mach-tegra/board-kai-panel.c
@@ -602,9 +602,6 @@ static struct platform_device *kai_gfx_devices[] __initdata = {
#if defined(CONFIG_TEGRA_NVMAP)
&kai_nvmap_device,
#endif
-#ifdef CONFIG_TEGRA_GRHOST
- &tegra_grhost_device,
-#endif
&tegra_pwfm0_device,
&kai_backlight_device,
};
diff --git a/arch/arm/mach-tegra/board-p1852-panel.c b/arch/arm/mach-tegra/board-p1852-panel.c
index b26ff19e87be..238642380e72 100644
--- a/arch/arm/mach-tegra/board-p1852-panel.c
+++ b/arch/arm/mach-tegra/board-p1852-panel.c
@@ -104,7 +104,6 @@ static struct nvmap_platform_data p1852_nvmap_data = {
static struct platform_device *p1852_gfx_devices[] __initdata = {
&tegra_nvmap_device,
- &tegra_grhost_device
};
int __init p1852_panel_init(void)
diff --git a/arch/arm/mach-tegra/board-ventana-panel.c b/arch/arm/mach-tegra/board-ventana-panel.c
index e2a54cdb2a68..83bfb7822357 100644
--- a/arch/arm/mach-tegra/board-ventana-panel.c
+++ b/arch/arm/mach-tegra/board-ventana-panel.c
@@ -1,7 +1,7 @@
/*
* arch/arm/mach-tegra/board-ventana-panel.c
*
- * Copyright (c) 2010-2011, NVIDIA Corporation.
+ * Copyright (c) 2010-2012, NVIDIA Corporation.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -337,9 +337,6 @@ 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
&tegra_pwfm2_device,
&ventana_backlight_device,
};
diff --git a/arch/arm/mach-tegra/board-whistler-panel.c b/arch/arm/mach-tegra/board-whistler-panel.c
index 9516a315c912..6fc576b3607e 100644
--- a/arch/arm/mach-tegra/board-whistler-panel.c
+++ b/arch/arm/mach-tegra/board-whistler-panel.c
@@ -1,7 +1,7 @@
/*
* arch/arm/mach-tegra/board-whistler-panel.c
*
- * Copyright (c) 2010-2011, NVIDIA Corporation.
+ * Copyright (c) 2010-2012, NVIDIA Corporation.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -300,9 +300,6 @@ 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
&whistler_disp1_backlight_device,
};
diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c
index 65a5fadefad5..202c767550e8 100644
--- a/arch/arm/mach-tegra/devices.c
+++ b/arch/arm/mach-tegra/devices.c
@@ -1478,56 +1478,6 @@ struct platform_device tegra_pwfm3_device = {
.resource = &tegra_pwfm3_resource,
};
-static struct resource tegra_grhost_resources[] = {
- {
- .start = TEGRA_HOST1X_BASE,
- .end = TEGRA_HOST1X_BASE + TEGRA_HOST1X_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = TEGRA_DISPLAY_BASE,
- .end = TEGRA_DISPLAY_BASE + TEGRA_DISPLAY_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = TEGRA_DISPLAY2_BASE,
- .end = TEGRA_DISPLAY2_BASE + TEGRA_DISPLAY2_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = TEGRA_VI_BASE,
- .end = TEGRA_VI_BASE + TEGRA_VI_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = TEGRA_ISP_BASE,
- .end = TEGRA_ISP_BASE + TEGRA_ISP_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = TEGRA_MPE_BASE,
- .end = TEGRA_MPE_BASE + TEGRA_MPE_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = INT_SYNCPT_THRESH_BASE,
- .end = INT_SYNCPT_THRESH_BASE + INT_SYNCPT_THRESH_NR - 1,
- .flags = IORESOURCE_IRQ,
- },
- {
- .start = INT_HOST1X_MPCORE_GENERAL,
- .end = INT_HOST1X_MPCORE_GENERAL,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-struct platform_device tegra_grhost_device = {
- .name = "tegra_grhost",
- .id = -1,
- .resource = tegra_grhost_resources,
- .num_resources = ARRAY_SIZE(tegra_grhost_resources),
-};
-
static struct tegra_avp_platform_data tegra_avp_pdata = {
#ifdef CONFIG_ARCH_TEGRA_2x_SOC
.emc_clk_rate = ULONG_MAX,
diff --git a/arch/arm/mach-tegra/devices.h b/arch/arm/mach-tegra/devices.h
index 5aa554ffe8df..b7fc6fdd655c 100644
--- a/arch/arm/mach-tegra/devices.h
+++ b/arch/arm/mach-tegra/devices.h
@@ -107,7 +107,6 @@ extern struct platform_device tegra_uartb_device;
extern struct platform_device tegra_uartc_device;
extern struct platform_device tegra_uartd_device;
extern struct platform_device tegra_uarte_device;
-extern struct platform_device tegra_grhost_device;
extern struct platform_device tegra_avp_device;
extern struct nvhost_device nvavp_device;
extern struct platform_device tegra_aes_device;
diff --git a/arch/arm/mach-tegra/p852/board-p852-panel.c b/arch/arm/mach-tegra/p852/board-p852-panel.c
index bfd35fa5da53..3d65a61adecb 100644
--- a/arch/arm/mach-tegra/p852/board-p852-panel.c
+++ b/arch/arm/mach-tegra/p852/board-p852-panel.c
@@ -1,7 +1,7 @@
/*
* arch/arm/mach-tegra/board-p852-panel.c
*
- * Copyright (c) 2010-2011, NVIDIA Corporation.
+ * Copyright (c) 2010-2012, NVIDIA Corporation.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -157,7 +157,6 @@ static struct platform_device p852_nvmap_device = {
};
static struct platform_device *p852_gfx_devices[] __initdata = {
- &tegra_grhost_device,
&tegra_pwfm2_device,
};
generated by cgit v1.2.3 (git 2.0.4) at 2024-11-17 01:08:16 +0000