decon: merge all into decon_data_path

Signed-off-by: Michael Benedict <michaelbt@live.com>

diff --git a/drivers/video/fbdev/exynos/dpu/decon.h b/drivers/video/fbdev/exynos/dpu/decon.h
index e2616c3156fb3273d1bbb65032c26a70ef4f4c01..23a00fc739699c97ad29e7e3038a493add33bfbe 100644 (file)
--- a/drivers/video/fbdev/exynos/dpu/decon.h
+++ b/drivers/video/fbdev/exynos/dpu/decon.h
@@ -389,9 +389,7 @@ enum decon_data_path {
        DPATH_DSCC_DSCENC01_FF01_FORMATTER01_DSIMIF01   = 0x0B3,
        /* WB_PRE */
        DPATH_WBPRE_ONLY                                        = 0x100,
-};
 
-enum decon1_data_path {
        /* No comp - FF0 - FORMATTER0 - DSIM_IF0 */
        DECON1_NOCOMP_FF0_FORMATTER0_DSIMIF0    = 0x001,
        /* No comp - FF0 - FORMATTER0 - WB_POST */
@@ -402,9 +400,7 @@ enum decon1_data_path {
        DECON1_DSCENC1_FF0_FORMATTER0_WBPOST    = 0x014,
        /* WB_PRE */
        DECON1_WBPRE_ONLY                               = 0x100,
-};
-
-enum decon2_data_path {
+       
        /* No comp - FF0 - FORMATTER0  - WB_POST */
        DECON2_NOCOMP_FF0_FORMATTER0_WBPOST             = 0x004,
        /* No comp - FF0 - FORMATTER0  - DISPIF */