Merge branch 'master' of git.ti.com:graphics/omap5-sgx-ddk-linux

2 files changed, 17 insertions, 0 deletions

diff --git a/eurasia_km/services4/srvkm/env/linux/module.c b/eurasia_km/services4/srvkm/env/linux/module.c
index e071749..0050780 100644
--- a/eurasia_km/services4/srvkm/env/linux/module.c
+++ b/eurasia_km/services4/srvkm/env/linux/module.c
@@ -89,6 +89,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <linux/fs.h>
 #include <linux/proc_fs.h>
 
+#ifdef CONFIG_OF
+#include <linux/of.h>
+#endif
+
 #if defined(SUPPORT_DRI_DRM)
 #include <drm/drmP.h>
 #if defined(PVR_SECURE_DRM_AUTH_EXPORT)
@@ -262,10 +266,21 @@ static struct platform_device_id powervr_id_table[] = {
 #endif
 
 #if defined(SUPPORT_DRI_DRM_EXTERNAL) || !defined(SUPPORT_DRI_DRM)
+#ifdef CONFIG_OF
+static const struct of_device_id omap_gpu_id_table[] = {
+        { .compatible = "ti,omap4-gpu" },
+        {}
+};
+MODULE_DEVICE_TABLE(of, omap_gpu_id_table);
+#endif
+
 static LDM_DRV powervr_driver = {
 #if defined(PVR_LDM_PLATFORM_MODULE)
         .driver = {
                 .name           = DRVNAME,
+#ifdef CONFIG_OF
+                .of_match_table = of_match_ptr(omap_gpu_id_table),
+#endif
         },
 #endif
 #if defined(PVR_LDM_PCI_MODULE)
diff --git a/eurasia_km/services4/system/omap5/syslocal.h b/eurasia_km/services4/system/omap5/syslocal.h
index c8c6cb6..5e97862 100644
--- a/eurasia_km/services4/system/omap5/syslocal.h
+++ b/eurasia_km/services4/system/omap5/syslocal.h
@@ -85,7 +85,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0))
 #include <linux/platform_data/omap-gpu.h>
+#endif
 #if !defined(PVR_NO_OMAP_TIMER)
 #define PVR_OMAP_USE_DM_TIMER_API
 #include <plat/dmtimer.h>