From c986dcfd3bfae55fbab9d27c2be57464011f7b28 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 13 Jun 2012 11:57:59 +0300 Subject: video: tegra: host: Remove version from dev name Remove version from nvhost_device name, and use a new field, version, to distinguish between IP versions. This restores the sysfs API for 3D clock scaling back to its original path. Change-Id: I444ef728b7cab9e5ea3a08f3c7be0f1661209686 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/108501 Reviewed-by: Simone Willett Tested-by: Simone Willett --- include/linux/nvhost.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/linux/nvhost.h b/include/linux/nvhost.h index 1293cec7cd75..382a54f2370c 100644 --- a/include/linux/nvhost.h +++ b/include/linux/nvhost.h @@ -36,7 +36,7 @@ struct nvhost_master; struct nvhost_device_id { char name[NVHOST_NAME_SIZE]; - unsigned long driver_data; + unsigned long version; }; struct nvhost_clock { @@ -52,11 +52,8 @@ enum nvhost_device_powerstate_t { }; struct nvhost_device { - /* device name: its format is of type - - * . - * e.g.: gr3d01 = gr3d ip version 01 used in tegra2 - * no instance number means hardware supports single instance */ - const char *name; + const char *name; /* device name */ + int version; /* ip version number of device */ struct device dev; /* Linux device struct */ int id; /* Separates clients of same hw */ int index; /* Hardware channel number */ -- cgit v1.2.3