Merge branch 'p-ti-android-3.8.y-video' of git://git.ti.com/android-sdk/kernel-video into p-ti-android-3.8.y

* 'p-ti-android-3.8.y-video' of git://git.ti.com/android-sdk/kernel-video:
  ARM: OMAP5/DRA7: hwmod: add ADDR_TYPE_RT to bb2d address flags
  gc320: gcx: [WA] Allocate MMU page tables as non cached
  gc320: Added  missing programming of MTLB base second time
  gc320: Increase VRAM buffers to 4
  gc320: adding gcxxx support in Makefiles
  gc320: Adapt GC320 driver for K3.8
  devices: Initialize GC320 as part of devices init
  platform_data: Added platform data for GC320
  gc320: OMAP4: Adding cache-2dmanager

Change-Id: I7b240582c78cb9ba0c5d77e56ab0cf06d29a64a4
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

3 files changed, 99 insertions, 0 deletions

diff --git a/include/linux/cache-2dmanager.h b/include/linux/cache-2dmanager.h
new file mode 100644
index 00000000000..2f452da63ee
--- /dev/null
+++ b/include/linux/cache-2dmanager.h
@@ -0,0 +1,62 @@
+/*
+ * cache-2dmanager.h
+ *
+ * Copyright (C) 2011-2012 Texas Instruments Corporation.
+ *
+ * This package is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef CACHE_2DMANAGER_H_
+#define CACHE_2DMANAGER_H_
+
+#include "slab.h"
+
+#ifdef CONFIG_ARCH_OMAP4
+#define L1CACHE_SIZE 32768
+#define L2CACHE_SIZE 1048576
+
+#define L1THRESHOLD L1CACHE_SIZE
+#define L2THRESHOLD L2CACHE_SIZE
+#else
+#error Cache configuration must be specified.
+#endif
+
+struct c2dmrgn {
+        char *start;    /* addr of upper left of rect */
+        size_t span;    /* bytes to be operated on per line */
+        size_t lines;   /* lines to be operated on */
+        long stride;    /* bytes per line */
+};
+
+/*
+ *      c2dm_l1cache(count, rgns, dir)
+ *
+ *      L1 Cache operations in 2D
+ *
+ *      - count  - number of regions
+ *      - rgns   - array of regions
+ *      - dir    - cache operation direction
+ *
+ */
+void c2dm_l1cache(int count, struct c2dmrgn rgns[], int dir);
+
+/*
+ *      c2dm_l2cache(count, rgns, dir)
+ *
+ *      L2 Cache operations in 2D
+ *
+ *      - count  - number of regions
+ *      - rgns   - array of regions
+ *      - dir    - cache operation direction
+ *
+ */
+void c2dm_l2cache(int count, struct c2dmrgn rgns[], int dir);
+
+
+#endif /* CACHE_2DMANAGER_H_ */
diff --git a/include/linux/gccore.h b/include/linux/gccore.h
index ce9ed4fb75e..ae64f2f75c6 100644
--- a/include/linux/gccore.h
+++ b/include/linux/gccore.h
@@ -18,6 +18,10 @@
 #include "sched.h"
 #include "gcioctl.h"
 
+
+/* Hw availability query */
+bool gc_is_hw_present(void);
+
 /* Capability query. */
 void gc_caps(struct gcicaps *gcicaps);
 
diff --git a/include/linux/platform_data/omap_gcx.h b/include/linux/platform_data/omap_gcx.h
new file mode 100644
index 00000000000..82abd8a97fc
--- /dev/null
+++ b/include/linux/platform_data/omap_gcx.h
@@ -0,0 +1,33 @@
+/*
+ *  arch/arm/plat-omap/include/plat/omap_gcx.h
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef OMAP_GCX_H
+#define OMAP_GCX_H
+
+struct omap_gcx_platform_data {
+        bool is_hw_present;
+        void *regbase;
+        /*bool (*was_context_lost)(struct device *dev);*/
+        int (*get_context_loss_count)(struct device *dev);
+        /* device scale */
+        int (*scale_dev)(struct device *dev, unsigned long freq);
+        /* bandwith */
+        int (*set_bw)(struct device *dev, unsigned long v);
+};
+
+#endif