summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-tegra')
-rw-r--r--arch/arm/mach-tegra/board-aruba-panel.c3
-rw-r--r--arch/arm/mach-tegra/board-cardhu-panel.c3
-rw-r--r--arch/arm/mach-tegra/board-enterprise-panel.c3
-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.c3
-rw-r--r--arch/arm/mach-tegra/board-ventana-panel.c3
-rw-r--r--arch/arm/mach-tegra/board-whistler-panel.c3
-rw-r--r--arch/arm/mach-tegra/devices.h1
-rw-r--r--arch/arm/mach-tegra/p852/board-p852-panel.c3
-rw-r--r--arch/arm/mach-tegra/tegra2_host1x_devices.h26
-rw-r--r--arch/arm/mach-tegra/tegra3_host1x_devices.h26
12 files changed, 70 insertions, 10 deletions
diff --git a/arch/arm/mach-tegra/board-aruba-panel.c b/arch/arm/mach-tegra/board-aruba-panel.c
index 0e24a4375c99..01ade01a0eb6 100644
--- a/arch/arm/mach-tegra/board-aruba-panel.c
+++ b/arch/arm/mach-tegra/board-aruba-panel.c
@@ -35,6 +35,7 @@
#include "board.h"
#include "devices.h"
#include "gpio-names.h"
+#include "tegra2_host1x_devices.h"
#define aruba_lvds_shutdown TEGRA_GPIO_PB2
#define aruba_bl_enb TEGRA_GPIO_PW1
@@ -228,7 +229,7 @@ int __init aruba_panel_init(void)
#endif
#ifdef CONFIG_TEGRA_GRHOST
- err = nvhost_device_register(&tegra_grhost_device);
+ err = tegra2_register_host1x_devices();
if (err)
return err;
#endif
diff --git a/arch/arm/mach-tegra/board-cardhu-panel.c b/arch/arm/mach-tegra/board-cardhu-panel.c
index 4a5f8548f0dd..2a9e5201061a 100644
--- a/arch/arm/mach-tegra/board-cardhu-panel.c
+++ b/arch/arm/mach-tegra/board-cardhu-panel.c
@@ -41,6 +41,7 @@
#include "board-cardhu.h"
#include "devices.h"
#include "gpio-names.h"
+#include "tegra3_host1x_devices.h"
#define DC_CTRL_MODE TEGRA_DC_OUT_ONE_SHOT_MODE
@@ -1385,7 +1386,7 @@ skip_lvds:
#endif
#ifdef CONFIG_TEGRA_GRHOST
- err = nvhost_device_register(&tegra_grhost_device);
+ err = tegra3_register_host1x_devices();
if (err)
return err;
#endif
diff --git a/arch/arm/mach-tegra/board-enterprise-panel.c b/arch/arm/mach-tegra/board-enterprise-panel.c
index 8876c8ebf88e..7043916921d0 100644
--- a/arch/arm/mach-tegra/board-enterprise-panel.c
+++ b/arch/arm/mach-tegra/board-enterprise-panel.c
@@ -39,6 +39,7 @@
#include "board-enterprise.h"
#include "devices.h"
#include "gpio-names.h"
+#include "tegra3_host1x_devices.h"
#define DC_CTRL_MODE TEGRA_DC_OUT_ONE_SHOT_MODE
@@ -885,7 +886,7 @@ int __init enterprise_panel_init(void)
#endif
#ifdef CONFIG_TEGRA_GRHOST
- err = nvhost_device_register(&tegra_grhost_device);
+ err = tegra3_register_host1x_devices();
if (err)
return err;
#endif
diff --git a/arch/arm/mach-tegra/board-harmony-panel.c b/arch/arm/mach-tegra/board-harmony-panel.c
index 9c3d296dd8d3..d4cd3f461b66 100644
--- a/arch/arm/mach-tegra/board-harmony-panel.c
+++ b/arch/arm/mach-tegra/board-harmony-panel.c
@@ -33,6 +33,7 @@
#include "devices.h"
#include "gpio-names.h"
#include "board.h"
+#include "tegra2_host1x_devices.h"
#define harmony_bl_enb TEGRA_GPIO_PB5
#define harmony_lvds_shutdown TEGRA_GPIO_PB2
@@ -356,7 +357,7 @@ int __init harmony_panel_init(void)
#endif
#ifdef CONFIG_TEGRA_GRHOST
- err = nvhost_device_register(&tegra_grhost_device);
+ err = tegra2_register_host1x_devices();
if (err)
return err;
#endif
diff --git a/arch/arm/mach-tegra/board-kai-panel.c b/arch/arm/mach-tegra/board-kai-panel.c
index 45333840ffb7..e6ac6dd82846 100644
--- a/arch/arm/mach-tegra/board-kai-panel.c
+++ b/arch/arm/mach-tegra/board-kai-panel.c
@@ -37,6 +37,7 @@
#include "board-kai.h"
#include "devices.h"
#include "gpio-names.h"
+#include "tegra3_host1x_devices.h"
/* kai default display board pins */
#define kai_lvds_avdd_en TEGRA_GPIO_PH6
@@ -681,7 +682,7 @@ int __init kai_panel_init(void)
#endif
#ifdef CONFIG_TEGRA_GRHOST
- err = nvhost_device_register(&tegra_grhost_device);
+ err = tegra3_register_host1x_devices();
if (err)
return err;
#endif
diff --git a/arch/arm/mach-tegra/board-p1852-panel.c b/arch/arm/mach-tegra/board-p1852-panel.c
index c104b913518e..4e86476cdd2c 100644
--- a/arch/arm/mach-tegra/board-p1852-panel.c
+++ b/arch/arm/mach-tegra/board-p1852-panel.c
@@ -28,6 +28,7 @@
#include "board.h"
#include "devices.h"
+#include "tegra3_host1x_devices.h"
static int p1852_panel_enable(void)
{
@@ -185,7 +186,7 @@ int __init p1852_panel_init(void)
res->end = tegra_fb_start + tegra_fb_size - 1;
#ifdef CONFIG_TEGRA_GRHOST
- err = nvhost_device_register(&tegra_grhost_device);
+ err = tegra3_register_host1x_devices();
if (err)
return err;
#endif
diff --git a/arch/arm/mach-tegra/board-ventana-panel.c b/arch/arm/mach-tegra/board-ventana-panel.c
index 437969261b22..a9e7a67f2bb1 100644
--- a/arch/arm/mach-tegra/board-ventana-panel.c
+++ b/arch/arm/mach-tegra/board-ventana-panel.c
@@ -36,6 +36,7 @@
#include "devices.h"
#include "gpio-names.h"
#include "board.h"
+#include "tegra2_host1x_devices.h"
#define ventana_bl_enb TEGRA_GPIO_PD4
#define ventana_lvds_shutdown TEGRA_GPIO_PB2
@@ -411,7 +412,7 @@ int __init ventana_panel_init(void)
#endif
#ifdef CONFIG_TEGRA_GRHOST
- err = nvhost_device_register(&tegra_grhost_device);
+ err = tegra2_register_host1x_devices();
if (err)
return err;
#endif
diff --git a/arch/arm/mach-tegra/board-whistler-panel.c b/arch/arm/mach-tegra/board-whistler-panel.c
index d171cf008a77..3510f9468394 100644
--- a/arch/arm/mach-tegra/board-whistler-panel.c
+++ b/arch/arm/mach-tegra/board-whistler-panel.c
@@ -38,6 +38,7 @@
#include "devices.h"
#include "gpio-names.h"
#include "board.h"
+#include "tegra2_host1x_devices.h"
#define whistler_hdmi_hpd TEGRA_GPIO_PN7
@@ -361,7 +362,7 @@ int __init whistler_panel_init(void)
#endif
#ifdef CONFIG_TEGRA_GRHOST
- err = nvhost_device_register(&tegra_grhost_device);
+ err = tegra2_register_host1x_devices();
if (err)
return err;
#endif
diff --git a/arch/arm/mach-tegra/devices.h b/arch/arm/mach-tegra/devices.h
index 3d0734d1c688..1ee723534476 100644
--- a/arch/arm/mach-tegra/devices.h
+++ b/arch/arm/mach-tegra/devices.h
@@ -109,7 +109,6 @@ 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_avp_device;
-extern struct nvhost_device tegra_grhost_device;
extern struct nvhost_device nvavp_device;
extern struct platform_device tegra_aes_device;
#if !defined(CONFIG_ARCH_TEGRA_2x_SOC)
diff --git a/arch/arm/mach-tegra/p852/board-p852-panel.c b/arch/arm/mach-tegra/p852/board-p852-panel.c
index bcf9f4af76cf..8ed62f039dc8 100644
--- a/arch/arm/mach-tegra/p852/board-p852-panel.c
+++ b/arch/arm/mach-tegra/p852/board-p852-panel.c
@@ -32,6 +32,7 @@
#include <mach/fb.h>
#include "board-p852.h"
+#include "../tegra2_host1x_devices.h"
#define CARVEOUT_IRAM {\
.name = "iram",\
@@ -175,7 +176,7 @@ int __init p852_panel_init(void)
return err;
#ifdef CONFIG_TEGRA_GRHOST
- err = nvhost_device_register(&tegra_grhost_device);
+ err = tegra2_register_host1x_devices();
if (err)
return err;
#endif
diff --git a/arch/arm/mach-tegra/tegra2_host1x_devices.h b/arch/arm/mach-tegra/tegra2_host1x_devices.h
new file mode 100644
index 000000000000..974154a414dd
--- /dev/null
+++ b/arch/arm/mach-tegra/tegra2_host1x_devices.h
@@ -0,0 +1,26 @@
+/*
+ * drivers/video/tegra/host/tegra2_host1x_devices.h
+ *
+ * Tegra2 Graphics Host Devices
+ *
+ * Copyright (c) 2012, NVIDIA Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TEGRA2_HOST1X_DEVICES_H
+#define TEGRA2_HOST1X_DEVICES_H
+
+int tegra2_register_host1x_devices(void);
+
+#endif
diff --git a/arch/arm/mach-tegra/tegra3_host1x_devices.h b/arch/arm/mach-tegra/tegra3_host1x_devices.h
new file mode 100644
index 000000000000..38a5eabf037f
--- /dev/null
+++ b/arch/arm/mach-tegra/tegra3_host1x_devices.h
@@ -0,0 +1,26 @@
+/*
+ * drivers/video/tegra/host/tegra3_host1x_devices.h
+ *
+ * Tegra3 Graphics Host Devices
+ *
+ * Copyright (c) 2012, NVIDIA Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TEGRA3_HOST1X_DEVICES_H
+#define TEGRA3_HOST1X_DEVICES_H
+
+int tegra3_register_host1x_devices(void);
+
+#endif
generated by cgit v1.2.3 (git 2.0.4) at 2024-05-01 23:22:48 +0000