videomode: combine videomode dmt_flags and data_flags

Both videomode and display_timing contain flags describing the modes.
These are stored in dmt_flags and data_flags. There's no need to
separate these flags, and having separate fields just makes the flags
more difficult to use.

This patch combines the fields and renames VESA_DMT_* flags to
DISPLAY_FLAGS_*.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>

2 files changed, 12 insertions, 17 deletions

diff --git a/include/video/display_timing.h b/include/video/display_timing.h
index 71e9a383a981..a8a4be5b0af7 100644
--- a/include/video/display_timing.h
+++ b/include/video/display_timing.h
@@ -12,19 +12,16 @@
 #include <linux/bitops.h>
 #include <linux/types.h>
 
-/* VESA display monitor timing parameters */
-#define VESA_DMT_HSYNC_LOW              BIT(0)
-#define VESA_DMT_HSYNC_HIGH             BIT(1)
-#define VESA_DMT_VSYNC_LOW              BIT(2)
-#define VESA_DMT_VSYNC_HIGH             BIT(3)
-
-/* display specific flags */
-#define DISPLAY_FLAGS_DE_LOW            BIT(0)  /* data enable flag */
-#define DISPLAY_FLAGS_DE_HIGH           BIT(1)
-#define DISPLAY_FLAGS_PIXDATA_POSEDGE   BIT(2)  /* drive data on pos. edge */
-#define DISPLAY_FLAGS_PIXDATA_NEGEDGE   BIT(3)  /* drive data on neg. edge */
-#define DISPLAY_FLAGS_INTERLACED        BIT(4)
-#define DISPLAY_FLAGS_DOUBLESCAN        BIT(5)
+#define DISPLAY_FLAGS_HSYNC_LOW         BIT(0)
+#define DISPLAY_FLAGS_HSYNC_HIGH        BIT(1)
+#define DISPLAY_FLAGS_VSYNC_LOW         BIT(2)
+#define DISPLAY_FLAGS_VSYNC_HIGH        BIT(3)
+#define DISPLAY_FLAGS_DE_LOW            BIT(4)  /* data enable flag */
+#define DISPLAY_FLAGS_DE_HIGH           BIT(5)
+#define DISPLAY_FLAGS_PIXDATA_POSEDGE   BIT(6)  /* drive data on pos. edge */
+#define DISPLAY_FLAGS_PIXDATA_NEGEDGE   BIT(7)  /* drive data on neg. edge */
+#define DISPLAY_FLAGS_INTERLACED        BIT(8)
+#define DISPLAY_FLAGS_DOUBLESCAN        BIT(9)
 
 /*
  * A single signal can be specified via a range of minimal and maximal values
@@ -72,8 +69,7 @@ struct display_timing {
         struct timing_entry vback_porch;        /* ver. back porch */
         struct timing_entry vsync_len;          /* ver. sync len */
 
-        unsigned int dmt_flags;                 /* VESA DMT flags */
-        unsigned int data_flags;                /* video data flags */
+        unsigned int flags;                     /* display flags */
 };
 
 /*
diff --git a/include/video/videomode.h b/include/video/videomode.h
index a42156234dd4..f4ae6edfeb08 100644
--- a/include/video/videomode.h
+++ b/include/video/videomode.h
@@ -29,8 +29,7 @@ struct videomode {
         u32 vback_porch;
         u32 vsync_len;
 
-        unsigned int dmt_flags; /* VESA DMT flags */
-        unsigned int data_flags; /* video data flags */
+        unsigned int flags; /* display flags */
 };
 
 /**