TILER: Combined dmm and tiler folders and renamed files.

Renamed (and moved around) files in preparation for upstreaming activity.
Also fixed spacing checkpatch errors that are new since the creation of
these files.

Signed-off-by: Lajos Molnar <molnar@ti.com>

20 files changed, 22 insertions, 31 deletions

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 3da9900f4b2..74383b172d4 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -114,8 +114,6 @@ source "drivers/media/radio/Kconfig"
 
 source "drivers/media/dvb/Kconfig"
 
-source "drivers/media/video/dmm/Kconfig"
-
 source "drivers/media/video/tiler/Kconfig"
 
 endif # MEDIA_SUPPORT
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index a0ea34c79ab..e15e23fb6f6 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -181,7 +181,6 @@ obj-$(CONFIG_VIDEO_SAA7164)     += saa7164/
 obj-$(CONFIG_VIDEO_IR_I2C)  += ir-kbd-i2c.o
 
 obj-y   += davinci/
-obj-$(CONFIG_DMM_OMAP)  += dmm/
 obj-$(CONFIG_TI_TILER)  += tiler/
 
 obj-$(CONFIG_ARCH_OMAP) += omap/
diff --git a/drivers/media/video/dmm/Kconfig b/drivers/media/video/dmm/Kconfig
deleted file mode 100644
index 4af47ea0aef..00000000000
--- a/drivers/media/video/dmm/Kconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-config DMM_OMAP
-        tristate "OMAP DMM support"
-        default y
-        help
-           DMM driver for OMAP based boards.
-
diff --git a/drivers/media/video/dmm/Makefile b/drivers/media/video/dmm/Makefile
deleted file mode 100644
index 494e70569aa..00000000000
--- a/drivers/media/video/dmm/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-$(CONFIG_DMM_OMAP) += dmm_omap.o
-dmm_omap-objs = dmm.o tmm_pat.o
-
diff --git a/drivers/media/video/tiler/Kconfig b/drivers/media/video/tiler/Kconfig
index 09c2215abcf..13570ed9f88 100644
--- a/drivers/media/video/tiler/Kconfig
+++ b/drivers/media/video/tiler/Kconfig
@@ -8,7 +8,9 @@ menuconfig TI_TILER
         default y
         depends on HAVE_TI_TILER
         help
-           TILER driver for TI chips.
+           TILER and TILER-DMM driver for TI chips.  The TI TILER device
+           enables video rotation on certain TI chips such as OMAP4 or
+           Netra.  Video rotation will be limited without TILER support.
 
 config TILER_GRANULARITY
         int "Allocation granularity (2^n)"
diff --git a/drivers/media/video/tiler/Makefile b/drivers/media/video/tiler/Makefile
index a3933b65743..4a4b48b73ea 100644
--- a/drivers/media/video/tiler/Makefile
+++ b/drivers/media/video/tiler/Makefile
@@ -1,4 +1,8 @@
 obj-$(CONFIG_TI_TILER) += tcm/
-obj-$(CONFIG_TI_TILER) += tiler_omap.o
-tiler_omap-objs = tiler.o tiler_pack.o tiler_rot.o
+
+obj-$(CONFIG_TI_TILER) += tiler.o
+tiler-objs = tiler-main.o tiler-reserve.o tiler-geom.o tmm-pat.o
+
+obj-$(CONFIG_TI_TILER) += tiler_dmm.o
+tiler_dmm-objs = dmm.o
 
diff --git a/drivers/media/video/dmm/dmm.c b/drivers/media/video/tiler/dmm.c
index 8663b36a5e7..8663b36a5e7 100644
--- a/drivers/media/video/dmm/dmm.c
+++ b/drivers/media/video/tiler/dmm.c
diff --git a/drivers/media/video/tiler/tcm/tcm.h b/drivers/media/video/tiler/tcm.h
index 11201674fdc..11201674fdc 100644
--- a/drivers/media/video/tiler/tcm/tcm.h
+++ b/drivers/media/video/tiler/tcm.h
diff --git a/drivers/media/video/tiler/tcm/Makefile b/drivers/media/video/tiler/tcm/Makefile
index d0642102eb8..efd62d77847 100644
--- a/drivers/media/video/tiler/tcm/Makefile
+++ b/drivers/media/video/tiler/tcm/Makefile
@@ -1,2 +1,2 @@
-obj-$(CONFIG_TI_TILER) += tcm_sita.o
+obj-$(CONFIG_TI_TILER) += tcm-sita.o
 
diff --git a/drivers/media/video/tiler/tcm/_tcm_sita.h b/drivers/media/video/tiler/tcm/_tcm-sita.h
index 7a7f847e8b4..ef4da6c9ad2 100644
--- a/drivers/media/video/tiler/tcm/_tcm_sita.h
+++ b/drivers/media/video/tiler/tcm/_tcm-sita.h
@@ -19,7 +19,7 @@
 #ifndef _TCM_SITA_H_
 #define _TCM_SITA_H_
 
-#include "tcm.h"
+#include "../tcm.h"
 
 #define TL_CORNER       0
 #define TR_CORNER       1
diff --git a/drivers/media/video/tiler/tcm/tcm_sita.c b/drivers/media/video/tiler/tcm/tcm-sita.c
index 0aea8f12be2..2ab5ac59ae2 100644
--- a/drivers/media/video/tiler/tcm/tcm_sita.c
+++ b/drivers/media/video/tiler/tcm/tcm-sita.c
@@ -18,11 +18,11 @@
  */
 #include <linux/slab.h>
 
-#include "_tcm_sita.h"
-#include "tcm_sita.h"
+#include "_tcm-sita.h"
+#include "tcm-sita.h"
 
 #define TCM_ALG_NAME "tcm_sita"
-#include "tcm_utils.h"
+#include "tcm-utils.h"
 
 #define X_SCAN_LIMITER  1
 #define Y_SCAN_LIMITER  1
@@ -1355,4 +1355,3 @@ static s32 move_right(struct tcm *tcm, u16 x, u16 y, u32 num_pages,
         *yy = pos / pvt->width;
         return 0;
 }
-
diff --git a/drivers/media/video/tiler/tcm/tcm_sita.h b/drivers/media/video/tiler/tcm/tcm-sita.h
index cfdf810fc3c..8b6607652bb 100644
--- a/drivers/media/video/tiler/tcm/tcm_sita.h
+++ b/drivers/media/video/tiler/tcm/tcm-sita.h
@@ -19,7 +19,7 @@
 #ifndef TCM_SITA_H_
 #define TCM_SITA_H_
 
-#include "tcm.h"
+#include "../tcm.h"
 
 /**
  * Create a SiTA tiler container manager.
diff --git a/drivers/media/video/tiler/tcm/tcm_utils.h b/drivers/media/video/tiler/tcm/tcm-utils.h
index 7d0ed5c149b..1013929a455 100644
--- a/drivers/media/video/tiler/tcm/tcm_utils.h
+++ b/drivers/media/video/tiler/tcm/tcm-utils.h
@@ -17,7 +17,7 @@
 #ifndef _TCM_UTILS_H
 #define _TCM_UTILS_H
 
-#include "tcm.h"
+#include "../tcm.h"
 
 #define AREA_FMT   "(%03d %03d)-(%03d %03d)"
 #define AREA(area) (area).p0.x, (area).p0.y, (area).p1.x, (area).p1.y
diff --git a/drivers/media/video/tiler/tiler_def.h b/drivers/media/video/tiler/tiler-def.h
index d931e18de15..d931e18de15 100644
--- a/drivers/media/video/tiler/tiler_def.h
+++ b/drivers/media/video/tiler/tiler-def.h
diff --git a/drivers/media/video/tiler/tiler_rot.c b/drivers/media/video/tiler/tiler-geom.c
index aa38d72187d..d85f54cf885 100644
--- a/drivers/media/video/tiler/tiler_rot.c
+++ b/drivers/media/video/tiler/tiler-geom.c
@@ -17,7 +17,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <mach/tiler.h>
-#include "tiler_def.h"
+#include "tiler-def.h"
 
 #define DMM_SHIFT_PER_X_8 0
 #define DMM_SHIFT_PER_Y_8 0
diff --git a/drivers/media/video/tiler/tiler.c b/drivers/media/video/tiler/tiler-main.c
index 911a039a612..d964b15baad 100644
--- a/drivers/media/video/tiler/tiler.c
+++ b/drivers/media/video/tiler/tiler-main.c
@@ -35,10 +35,10 @@
 #include <asm/mach/map.h>              /* for ioremap_page */
 #include <mach/tiler.h>
 #include <mach/dmm.h>
-#include "../dmm/tmm.h"
-#include "tiler_def.h"
-#include "tcm/tcm_sita.h"       /* Algo Specific header */
-#include "tiler_pack.h"
+#include "tmm.h"
+#include "tiler-def.h"
+#include "tcm/tcm-sita.h"       /* Algo Specific header */
+#include "tiler-reserve.h"
 
 #include <linux/syscalls.h>
 
diff --git a/drivers/media/video/tiler/tiler_pack.c b/drivers/media/video/tiler/tiler-reserve.c
index 542b789f8f7..ddc6b7d38eb 100644
--- a/drivers/media/video/tiler/tiler_pack.c
+++ b/drivers/media/video/tiler/tiler-reserve.c
@@ -17,7 +17,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <mach/tiler.h>
-#include "tiler_def.h"
+#include "tiler-def.h"
 
 /* we want to find the most effective packing for the smallest area */
 
@@ -284,4 +284,3 @@ u16 nv12_together(u16 o, u16 w, u16 a, u16 n, u16 *area, u8 *packing)
 
         return n_best;
 }
-
diff --git a/drivers/media/video/tiler/tiler_pack.h b/drivers/media/video/tiler/tiler-reserve.h
index e454b1d240f..e454b1d240f 100644
--- a/drivers/media/video/tiler/tiler_pack.h
+++ b/drivers/media/video/tiler/tiler-reserve.h
diff --git a/drivers/media/video/dmm/tmm_pat.c b/drivers/media/video/tiler/tmm-pat.c
index 5b5053a83c1..4ffd8ae2b3b 100644
--- a/drivers/media/video/dmm/tmm_pat.c
+++ b/drivers/media/video/tiler/tmm-pat.c
@@ -311,4 +311,3 @@ error:
         return NULL;
 }
 EXPORT_SYMBOL(tmm_pat_init);
-
diff --git a/drivers/media/video/dmm/tmm.h b/drivers/media/video/tiler/tmm.h
index deaeca51a90..deaeca51a90 100644
--- a/drivers/media/video/dmm/tmm.h
+++ b/drivers/media/video/tiler/tmm.h