video: tegra: host: fix compilation issues

Change-Id: Ia3f4e331c564d93ed8ab7c679b1276bd6af1a98a
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>

8 files changed, 10 insertions, 24 deletions

diff --git a/drivers/video/tegra/host/bus.c b/drivers/video/tegra/host/bus.c
index 6298fbf275ae..25960b9fd929 100644
--- a/drivers/video/tegra/host/bus.c
+++ b/drivers/video/tegra/host/bus.c
@@ -21,6 +21,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/export.h>
 #include <linux/nvhost.h>
+#include <linux/io.h>
 
 #include "bus.h"
 #include "dev.h"
diff --git a/drivers/video/tegra/host/chip_support.h b/drivers/video/tegra/host/chip_support.h
index a0483d13798a..7084b4fcc39e 100644
--- a/drivers/video/tegra/host/chip_support.h
+++ b/drivers/video/tegra/host/chip_support.h
@@ -161,8 +161,6 @@ struct nvhost_chip_support *nvhost_get_chip_ops(void);
 #define cdma_pb_op()		nvhost_get_chip_ops()->push_buffer
 #define mem_op()		(nvhost_get_chip_ops()->mem)
 
-int nvhost_init_t20_support(struct nvhost_master *host);
-int nvhost_init_t30_support(struct nvhost_master *host);
-int nvhost_init_t114_support(struct nvhost_master *host);
+int nvhost_init_chip_support(struct nvhost_master *host);
 
 #endif /* _NVHOST_CHIP_SUPPORT_H_ */
diff --git a/drivers/video/tegra/host/dev.c b/drivers/video/tegra/host/dev.c
index cf7d3c6dbd16..b4051604f188 100644
--- a/drivers/video/tegra/host/dev.c
+++ b/drivers/video/tegra/host/dev.c
@@ -362,8 +362,8 @@ fail:
 
 struct nvhost_device *nvhost_get_device(char *name)
 {
-	if (host_device_op(nvhost).get_nvhost_device)
-		return host_device_op(nvhost).get_nvhost_device(nvhost, name);
+	if (host_device_op().get_nvhost_device)
+		return host_device_op().get_nvhost_device(name);
 	pr_warn("%s: nvhost device %s does not exist\n", __func__, name);
 	return NULL;
 }
@@ -390,23 +390,6 @@ static int __devinit nvhost_alloc_resources(struct nvhost_master *host)
 {
 	int err;
 
-	switch (tegra_get_chipid()) {
-	case TEGRA_CHIPID_TEGRA2:
-		err = nvhost_init_t20_support(host);
-		break;
-
-	case TEGRA_CHIPID_TEGRA3:
-		err = nvhost_init_t30_support(host);
-		break;
-
-	case TEGRA_CHIPID_TEGRA11:
-		err = nvhost_init_t114_support(host);
-		break;
-
-	default:
-		return -ENODEV;
-	}
-
 	err = nvhost_init_chip_support(host);
 	if (err)
 		return err;
diff --git a/drivers/video/tegra/host/gr3d/gr3d.c b/drivers/video/tegra/host/gr3d/gr3d.c
index b83265ee12ac..c9f1d90f956a 100644
--- a/drivers/video/tegra/host/gr3d/gr3d.c
+++ b/drivers/video/tegra/host/gr3d/gr3d.c
@@ -20,6 +20,7 @@
 
 #include <linux/slab.h>
 #include <linux/export.h>
+#include <linux/module.h>
 
 #include "t20/t20.h"
 #include "host1x/host1x_channel.h"
diff --git a/drivers/video/tegra/host/msenc/msenc.c b/drivers/video/tegra/host/msenc/msenc.c
index e32d789a48e1..8e65a9bbf1ee 100644
--- a/drivers/video/tegra/host/msenc/msenc.c
+++ b/drivers/video/tegra/host/msenc/msenc.c
@@ -21,6 +21,7 @@
 
 #include <linux/slab.h>         /* for kzalloc */
 #include <linux/firmware.h>
+#include <linux/module.h>
 #include <asm/byteorder.h>      /* for parsing ucode image wrt endianness */
 #include <linux/delay.h>	/* for udelay */
 #include <mach/iomap.h>
diff --git a/drivers/video/tegra/host/nvhost_cdma.c b/drivers/video/tegra/host/nvhost_cdma.c
index e172ea3ea249..8d533b88da09 100644
--- a/drivers/video/tegra/host/nvhost_cdma.c
+++ b/drivers/video/tegra/host/nvhost_cdma.c
@@ -450,8 +450,8 @@ void nvhost_cdma_push_gather(struct nvhost_cdma *cdma,
 {
 	u32 slots_free = cdma->slots_free;
 	struct push_buffer *pb = &cdma->push_buffer;
-	BUG_ON(!cdma_pb_op(cdma).push_to);
-	BUG_ON(!cdma_op(cdma).kick);
+	BUG_ON(!cdma_pb_op().push_to);
+	BUG_ON(!cdma_op().kick);
 
 	if (handle)
 		trace_write_gather(cdma, handle, offset, op1 & 0xffff);
diff --git a/drivers/video/tegra/host/t114/t114.c b/drivers/video/tegra/host/t114/t114.c
index c255465736ef..7eb2cf704189 100644
--- a/drivers/video/tegra/host/t114/t114.c
+++ b/drivers/video/tegra/host/t114/t114.c
@@ -20,6 +20,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include <linux/init.h>
 #include <linux/mutex.h>
 #include <mach/powergate.h>
 #include "dev.h"
diff --git a/drivers/video/tegra/host/tsec/tsec.c b/drivers/video/tegra/host/tsec/tsec.c
index 408e46126133..5592778594a6 100644
--- a/drivers/video/tegra/host/tsec/tsec.c
+++ b/drivers/video/tegra/host/tsec/tsec.c
@@ -21,6 +21,7 @@
 
 #include <linux/slab.h>         /* for kzalloc */
 #include <linux/firmware.h>
+#include <linux/module.h>
 #include <asm/byteorder.h>      /* for parsing ucode image wrt endianness */
 #include <linux/delay.h>	/* for udelay */
 #include <mach/iomap.h>