summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/host/dev.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/tegra/host/dev.h')
-rw-r--r--drivers/video/tegra/host/dev.h52
1 files changed, 4 insertions, 48 deletions
diff --git a/drivers/video/tegra/host/dev.h b/drivers/video/tegra/host/dev.h
index 74d7e16fc272..53ec2de13aa1 100644
--- a/drivers/video/tegra/host/dev.h
+++ b/drivers/video/tegra/host/dev.h
@@ -1,9 +1,7 @@
/*
* drivers/video/tegra/host/dev.h
*
- * Tegra Graphics Host Driver Entrypoint
- *
- * Copyright (c) 2010-2012, NVIDIA Corporation.
+ * 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,
@@ -18,51 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __NVHOST_DEV_H
-#define __NVHOST_DEV_H
-
-#include "nvhost_acm.h"
-#include "nvhost_syncpt.h"
-#include "nvhost_intr.h"
-#include "nvhost_channel.h"
-#include "chip_support.h"
-
-#define TRACE_MAX_LENGTH 128U
-#define IFACE_NAME "nvhost"
-
-extern int nvhost_major;
-extern int nvhost_minor;
-
-struct nvhost_hwctx;
-
-struct nvhost_master {
- void __iomem *aperture;
- void __iomem *sync_aperture;
- struct resource *reg_mem;
- struct class *nvhost_class;
- struct cdev cdev;
- struct device *ctrl;
- struct nvhost_syncpt syncpt;
- struct nvmap_client *nvmap;
- struct nvhost_intr intr;
- struct nvhost_device *dev;
- struct nvhost_channel *channels;
- u32 nb_channels;
-
- struct nvhost_chip_support op;
-
- atomic_t clientid;
-};
-
-extern struct nvhost_master *nvhost;
-
-void nvhost_debug_init(struct nvhost_master *master);
-void nvhost_debug_dump(struct nvhost_master *master);
-
-#define host_device_op(host) (host->op.nvhost_dev)
-
-struct nvhost_device *nvhost_get_device(char *name);
+#ifndef NVHOST_DEV_H
+#define NVHOST_DEV_H
-extern pid_t nvhost_debug_null_kickoff_pid;
+#include "host1x/host1x.h"
#endif