Merge branch 'akpm' (incoming from Andrew)

Merge misc patches from Andrew Morton:

 - Florian has vanished so I appear to have become fbdev maintainer
   again :(

 - Joel and Mark are distracted to welcome to the new OCFS2 maintainer

 - The backlight queue

 - Small core kernel changes

 - lib/ updates

 - The rtc queue

 - Various random bits

* akpm: (164 commits)
  rtc: rtc-davinci: use devm_*() functions
  rtc: rtc-max8997: use devm_request_threaded_irq()
  rtc: rtc-max8907: use devm_request_threaded_irq()
  rtc: rtc-da9052: use devm_request_threaded_irq()
  rtc: rtc-wm831x: use devm_request_threaded_irq()
  rtc: rtc-tps80031: use devm_request_threaded_irq()
  rtc: rtc-lp8788: use devm_request_threaded_irq()
  rtc: rtc-coh901331: use devm_clk_get()
  rtc: rtc-vt8500: use devm_*() functions
  rtc: rtc-tps6586x: use devm_request_threaded_irq()
  rtc: rtc-imxdi: use devm_clk_get()
  rtc: rtc-cmos: use dev_warn()/dev_dbg() instead of printk()/pr_debug()
  rtc: rtc-pcf8583: use dev_warn() instead of printk()
  rtc: rtc-sun4v: use pr_warn() instead of printk()
  rtc: rtc-vr41xx: use dev_info() instead of printk()
  rtc: rtc-rs5c313: use pr_err() instead of printk()
  rtc: rtc-at91rm9200: use dev_dbg()/dev_err() instead of printk()/pr_debug()
  rtc: rtc-rs5c372: use dev_dbg()/dev_warn() instead of printk()/pr_debug()
  rtc: rtc-ds2404: use dev_err() instead of printk()
  rtc: rtc-efi: use dev_err()/dev_warn()/pr_err() instead of printk()
  ...

16 files changed, 590 insertions, 160 deletions

diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h
index 12731a19ef06..350459910fe1 100644
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
@@ -254,6 +254,7 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio);
 #define BDI_CAP_EXEC_MAP        0x00000040
 #define BDI_CAP_NO_ACCT_WB      0x00000080
 #define BDI_CAP_SWAP_BACKED     0x00000100
+#define BDI_CAP_STABLE_WRITES   0x00000200
 
 #define BDI_CAP_VMFLAGS \
         (BDI_CAP_READ_MAP | BDI_CAP_WRITE_MAP | BDI_CAP_EXEC_MAP)
@@ -308,6 +309,11 @@ long wait_iff_congested(struct zone *zone, int sync, long timeout);
 int pdflush_proc_obsolete(struct ctl_table *table, int write,
                 void __user *buffer, size_t *lenp, loff_t *ppos);
 
+static inline bool bdi_cap_stable_pages_required(struct backing_dev_info *bdi)
+{
+        return bdi->capabilities & BDI_CAP_STABLE_WRITES;
+}
+
 static inline bool bdi_cap_writeback_dirty(struct backing_dev_info *bdi)
 {
         return !(bdi->capabilities & BDI_CAP_NO_WRITEBACK);
diff --git a/include/linux/bug.h b/include/linux/bug.h
index b1cf40de847e..7f4818673c41 100644
--- a/include/linux/bug.h
+++ b/include/linux/bug.h
@@ -2,6 +2,7 @@
 #define _LINUX_BUG_H
 
 #include <asm/bug.h>
+#include <linux/compiler.h>
 
 enum bug_trap_type {
         BUG_TRAP_TYPE_NONE = 0,
@@ -12,11 +13,12 @@ enum bug_trap_type {
 struct pt_regs;
 
 #ifdef __CHECKER__
-#define BUILD_BUG_ON_NOT_POWER_OF_2(n)
+#define BUILD_BUG_ON_NOT_POWER_OF_2(n) (0)
 #define BUILD_BUG_ON_ZERO(e) (0)
 #define BUILD_BUG_ON_NULL(e) ((void*)0)
 #define BUILD_BUG_ON_INVALID(e) (0)
-#define BUILD_BUG_ON(condition)
+#define BUILD_BUG_ON_MSG(cond, msg) (0)
+#define BUILD_BUG_ON(condition) (0)
 #define BUILD_BUG() (0)
 #else /* __CHECKER__ */
 
@@ -39,29 +41,37 @@ struct pt_regs;
 #define BUILD_BUG_ON_INVALID(e) ((void)(sizeof((__force long)(e))))
 
 /**
+ * BUILD_BUG_ON_MSG - break compile if a condition is true & emit supplied
+ *                    error message.
+ * @condition: the condition which the compiler should know is false.
+ *
+ * See BUILD_BUG_ON for description.
+ */
+#define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
+
+/**
  * BUILD_BUG_ON - break compile if a condition is true.
  * @condition: the condition which the compiler should know is false.
  *
  * If you have some code which relies on certain constants being equal, or
- * other compile-time-evaluated condition, you should use BUILD_BUG_ON to
+ * some other compile-time-evaluated condition, you should use BUILD_BUG_ON to
  * detect if someone changes it.
  *
- * The implementation uses gcc's reluctance to create a negative array, but
- * gcc (as of 4.4) only emits that error for obvious cases (eg. not arguments
- * to inline functions).  So as a fallback we use the optimizer; if it can't
- * prove the condition is false, it will cause a link error on the undefined
- * "__build_bug_on_failed".  This error message can be harder to track down
- * though, hence the two different methods.
+ * The implementation uses gcc's reluctance to create a negative array, but gcc
+ * (as of 4.4) only emits that error for obvious cases (e.g. not arguments to
+ * inline functions).  Luckily, in 4.3 they added the "error" function
+ * attribute just for this type of case.  Thus, we use a negative sized array
+ * (should always create an error on gcc versions older than 4.4) and then call
+ * an undefined function with the error attribute (should always create an
+ * error on gcc 4.3 and later).  If for some reason, neither creates a
+ * compile-time error, we'll still have a link-time error, which is harder to
+ * track down.
  */
 #ifndef __OPTIMIZE__
 #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
 #else
-extern int __build_bug_on_failed;
-#define BUILD_BUG_ON(condition)                                 \
-        do {                                                    \
-                ((void)sizeof(char[1 - 2*!!(condition)]));      \
-                if (condition) __build_bug_on_failed = 1;       \
-        } while(0)
+#define BUILD_BUG_ON(condition) \
+        BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition)
 #endif
 
 /**
@@ -71,12 +81,7 @@ extern int __build_bug_on_failed;
  * build time, you should use BUILD_BUG to detect if it is
  * unexpectedly used.
  */
-#define BUILD_BUG()                                             \
-        do {                                                    \
-                extern void __build_bug_failed(void)            \
-                        __linktime_error("BUILD_BUG failed");   \
-                __build_bug_failed();                           \
-        } while (0)
+#define BUILD_BUG() BUILD_BUG_ON_MSG(1, "BUILD_BUG failed")
 
 #endif  /* __CHECKER__ */
 
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index 6a6d7aefe12d..24545cd90a25 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -5,6 +5,9 @@
 /*
  * Common definitions for all gcc versions go here.
  */
+#define GCC_VERSION (__GNUC__ * 10000 \
+                   + __GNUC_MINOR__ * 100 \
+                   + __GNUC_PATCHLEVEL__)
 
 
 /* Optimization barrier */
diff --git a/include/linux/compiler-gcc3.h b/include/linux/compiler-gcc3.h
index 37d412436d0f..7d89febe4d79 100644
--- a/include/linux/compiler-gcc3.h
+++ b/include/linux/compiler-gcc3.h
@@ -2,22 +2,22 @@
 #error "Please don't include <linux/compiler-gcc3.h> directly, include <linux/compiler.h> instead."
 #endif
 
-#if __GNUC_MINOR__ < 2
+#if GCC_VERSION < 30200
 # error Sorry, your compiler is too old - please upgrade it.
 #endif
 
-#if __GNUC_MINOR__ >= 3
+#if GCC_VERSION >= 30300
 # define __used                 __attribute__((__used__))
 #else
 # define __used                 __attribute__((__unused__))
 #endif
 
-#if __GNUC_MINOR__ >= 4
+#if GCC_VERSION >= 30400
 #define __must_check            __attribute__((warn_unused_result))
 #endif
 
 #ifdef CONFIG_GCOV_KERNEL
-# if __GNUC_MINOR__ < 4
+# if GCC_VERSION < 30400
 #   error "GCOV profiling support for gcc versions below 3.4 not included"
 # endif /* __GNUC_MINOR__ */
 #endif /* CONFIG_GCOV_KERNEL */
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
index 662fd1b4c42a..68b162d92254 100644
--- a/include/linux/compiler-gcc4.h
+++ b/include/linux/compiler-gcc4.h
@@ -4,7 +4,7 @@
 
 /* GCC 4.1.[01] miscompiles __weak */
 #ifdef __KERNEL__
-# if __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ <= 1
+# if GCC_VERSION >= 40100 &&  GCC_VERSION <= 40101
 #  error Your version of gcc miscompiles the __weak directive
 # endif
 #endif
@@ -13,7 +13,11 @@
 #define __must_check            __attribute__((warn_unused_result))
 #define __compiler_offsetof(a,b) __builtin_offsetof(a,b)
 
-#if __GNUC_MINOR__ >= 3
+#if GCC_VERSION >= 40100
+# define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
+#endif
+
+#if GCC_VERSION >= 40300
 /* Mark functions as cold. gcc will assume any path leading to a call
    to them will be unlikely.  This means a lot of manual unlikely()s
    are unnecessary now for any paths leading to the usual suspects
@@ -29,11 +33,15 @@
    the kernel context */
 #define __cold                  __attribute__((__cold__))
 
-#define __linktime_error(message) __attribute__((__error__(message)))
-
 #define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
 
-#if __GNUC_MINOR__ >= 5
+#ifndef __CHECKER__
+# define __compiletime_warning(message) __attribute__((warning(message)))
+# define __compiletime_error(message) __attribute__((error(message)))
+#endif /* __CHECKER__ */
+#endif /* GCC_VERSION >= 40300 */
+
+#if GCC_VERSION >= 40500
 /*
  * Mark a position in code as unreachable.  This can be used to
  * suppress control flow warnings after asm blocks that transfer
@@ -48,30 +56,22 @@
 /* Mark a function definition as prohibited from being cloned. */
 #define __noclone       __attribute__((__noclone__))
 
-#endif
-#endif
+#endif /* GCC_VERSION >= 40500 */
 
-#if __GNUC_MINOR__ >= 6
+#if GCC_VERSION >= 40600
 /*
  * Tell the optimizer that something else uses this function or variable.
  */
 #define __visible __attribute__((externally_visible))
 #endif
 
-#if __GNUC_MINOR__ > 0
-#define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
-#endif
-#if __GNUC_MINOR__ >= 3 && !defined(__CHECKER__)
-#define __compiletime_warning(message) __attribute__((warning(message)))
-#define __compiletime_error(message) __attribute__((error(message)))
-#endif
 
 #ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
-#if __GNUC_MINOR__ >= 4
+#if GCC_VERSION >= 40400
 #define __HAVE_BUILTIN_BSWAP32__
 #define __HAVE_BUILTIN_BSWAP64__
 #endif
-#if __GNUC_MINOR__ >= 8 || (defined(__powerpc__) && __GNUC_MINOR__ >= 6)
+#if GCC_VERSION >= 40800 || (defined(__powerpc__) && GCC_VERSION >= 40600)
 #define __HAVE_BUILTIN_BSWAP16__
 #endif
-#endif
+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index dd852b73b286..10b8f23fab0f 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -307,10 +307,36 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
 #endif
 #ifndef __compiletime_error
 # define __compiletime_error(message)
+# define __compiletime_error_fallback(condition) \
+        do { ((void)sizeof(char[1 - 2 * condition])); } while (0)
+#else
+# define __compiletime_error_fallback(condition) do { } while (0)
 #endif
-#ifndef __linktime_error
-# define __linktime_error(message)
-#endif
+
+#define __compiletime_assert(condition, msg, prefix, suffix)            \
+        do {                                                            \
+                bool __cond = !(condition);                             \
+                extern void prefix ## suffix(void) __compiletime_error(msg); \
+                if (__cond)                                             \
+                        prefix ## suffix();                             \
+                __compiletime_error_fallback(__cond);                   \
+        } while (0)
+
+#define _compiletime_assert(condition, msg, prefix, suffix) \
+        __compiletime_assert(condition, msg, prefix, suffix)
+
+/**
+ * compiletime_assert - break build and emit msg if condition is false
+ * @condition: a compile-time constant condition to check
+ * @msg:       a message to emit if condition is false
+ *
+ * In tradition of POSIX assert, this macro will break the build if the
+ * supplied condition is *false*, emitting the supplied error message if the
+ * compiler has support to do so.
+ */
+#define compiletime_assert(condition, msg) \
+        _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
+
 /*
  * Prevent the compiler from merging or refetching accesses.  The compiler
  * is also forbidden from reordering successive instances of ACCESS_ONCE(),
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 2bca44b0893c..bfe88c4aa251 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -359,7 +359,9 @@ extern void lockdep_trace_alloc(gfp_t mask);
 
 #define lockdep_depth(tsk)      (debug_locks ? (tsk)->lockdep_depth : 0)
 
-#define lockdep_assert_held(l)  WARN_ON(debug_locks && !lockdep_is_held(l))
+#define lockdep_assert_held(l)  do {                            \
+                WARN_ON(debug_locks && !lockdep_is_held(l));    \
+        } while (0)
 
 #define lockdep_recursing(tsk)  ((tsk)->lockdep_recursion)
 
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 6da609d14c15..0e38e13eb249 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -414,6 +414,7 @@ static inline void wait_on_page_writeback(struct page *page)
 }
 
 extern void end_page_writeback(struct page *page);
+void wait_for_stable_page(struct page *page);
 
 /*
  * Add an arbitrary waiter to a page's wait queue
diff --git a/include/linux/platform_data/lp855x.h b/include/linux/platform_data/lp855x.h
index e81f62d24ee2..20ee8b221dbd 100644
--- a/include/linux/platform_data/lp855x.h
+++ b/include/linux/platform_data/lp855x.h
@@ -49,12 +49,24 @@
 #define LP8556_FAST_CONFIG      BIT(7) /* use it if EPROMs should be maintained
                                           when exiting the low power mode */
 
+/* CONFIG register - LP8557 */
+#define LP8557_PWM_STANDBY      BIT(7)
+#define LP8557_PWM_FILTER       BIT(6)
+#define LP8557_RELOAD_EPROM     BIT(3)  /* use it if EPROMs should be reset
+                                           when the backlight turns on */
+#define LP8557_OFF_OPENLEDS     BIT(2)
+#define LP8557_PWM_CONFIG       LP8557_PWM_ONLY
+#define LP8557_I2C_CONFIG       LP8557_I2C_ONLY
+#define LP8557_COMB1_CONFIG     LP8557_COMBINED1
+#define LP8557_COMB2_CONFIG     LP8557_COMBINED2
+
 enum lp855x_chip_id {
         LP8550,
         LP8551,
         LP8552,
         LP8553,
         LP8556,
+        LP8557,
 };
 
 enum lp855x_brightness_ctrl_mode {
@@ -89,6 +101,13 @@ enum lp8556_brightness_source {
         LP8556_COMBINED2,       /* pwm + i2c after the shaper block */
 };
 
+enum lp8557_brightness_source {
+        LP8557_PWM_ONLY,
+        LP8557_I2C_ONLY,
+        LP8557_COMBINED1,       /* pwm + i2c after the shaper block */
+        LP8557_COMBINED2,       /* pwm + i2c before the shaper block */
+};
+
 struct lp855x_rom_data {
         u8 addr;
         u8 val;
diff --git a/include/linux/printk.h b/include/linux/printk.h
index 5bef3045218e..1249a54d17e0 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -252,6 +252,15 @@ extern void dump_stack(void) __cold;
         printk_once(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
 #define pr_cont_once(fmt, ...)                                  \
         printk_once(KERN_CONT pr_fmt(fmt), ##__VA_ARGS__)
+
+#if defined(DEBUG)
+#define pr_devel_once(fmt, ...)                                 \
+        printk_once(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
+#else
+#define pr_devel_once(fmt, ...)                                 \
+        no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
+#endif
+
 /* If you are writing a driver, please use dev_dbg instead */
 #if defined(DEBUG)
 #define pr_debug_once(fmt, ...)                                 \
@@ -295,6 +304,15 @@ extern void dump_stack(void) __cold;
 #define pr_info_ratelimited(fmt, ...)                                   \
         printk_ratelimited(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
 /* no pr_cont_ratelimited, don't do that... */
+
+#if defined(DEBUG)
+#define pr_devel_ratelimited(fmt, ...)                                  \
+        printk_ratelimited(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
+#else
+#define pr_devel_ratelimited(fmt, ...)                                  \
+        no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
+#endif
+
 /* If you are writing a driver, please use dev_dbg instead */
 #if defined(DEBUG)
 #define pr_debug_ratelimited(fmt, ...)                                  \
diff --git a/include/linux/smp.h b/include/linux/smp.h
index dd6f06be3c9f..3e07a7df6478 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -89,7 +89,8 @@ void kick_all_cpus_sync(void);
 #ifdef CONFIG_USE_GENERIC_SMP_HELPERS
 void __init call_function_init(void);
 void generic_smp_call_function_single_interrupt(void);
-void generic_smp_call_function_interrupt(void);
+#define generic_smp_call_function_interrupt \
+        generic_smp_call_function_single_interrupt
 #else
 static inline void call_function_init(void) { }
 #endif
diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
index 126a8175e3e2..900b9484445b 100644
--- a/include/uapi/linux/elf.h
+++ b/include/uapi/linux/elf.h
@@ -49,14 +49,14 @@ typedef __s64	Elf64_Sxword;
  *
  * Specifications are available in:
  *
- * - Sun microsystems: Linker and Libraries.
- *   Part No: 817-1984-17, September 2008.
- *   URL: http://docs.sun.com/app/docs/doc/817-1984
+ * - Oracle: Linker and Libraries.
+ *   Part No: 817–1984–19, August 2011.
+ *   http://docs.oracle.com/cd/E18752_01/pdf/817-1984.pdf
  *
  * - System V ABI AMD64 Architecture Processor Supplement
- *   Draft Version 0.99.,
- *   May 11, 2009.
- *   URL: http://www.x86-64.org/
+ *   Draft Version 0.99.4,
+ *   January 13, 2010.
+ *   http://www.cs.washington.edu/education/courses/cse351/12wi/supp-docs/abi.pdf
  */
 #define PN_XNUM 0xffff
 
diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h
index 780d4c6093eb..c7fc1e6517c3 100644
--- a/include/uapi/linux/fs.h
+++ b/include/uapi/linux/fs.h
@@ -86,6 +86,9 @@ struct inodes_stat_t {
 #define MS_KERNMOUNT    (1<<22) /* this is a kern_mount call */
 #define MS_I_VERSION    (1<<23) /* Update inode I_version field */
 #define MS_STRICTATIME  (1<<24) /* Always perform atime updates */
+
+/* These sb flags are internal to the kernel */
+#define MS_SNAP_STABLE  (1<<27) /* Snapshot pages during writeback, if needed */
 #define MS_NOSEC        (1<<28)
 #define MS_BORN         (1<<29)
 #define MS_ACTIVE       (1<<30)
diff --git a/include/video/exynos_mipi_dsim.h b/include/video/exynos_mipi_dsim.h
index 83ce5e667d47..89dc88a171af 100644
--- a/include/video/exynos_mipi_dsim.h
+++ b/include/video/exynos_mipi_dsim.h
@@ -220,7 +220,6 @@ struct mipi_dsim_config {
 struct mipi_dsim_device {
         struct device                   *dev;
         int                             id;
-        struct resource                 *res;
         struct clk                      *clock;
         unsigned int                    irq;
         void __iomem                    *reg_base;
diff --git a/include/video/mmp_disp.h b/include/video/mmp_disp.h
new file mode 100644
index 000000000000..b9dd1fbb0082
--- /dev/null
+++ b/include/video/mmp_disp.h
@@ -0,0 +1,352 @@
+/*
+ * linux/include/video/mmp_disp.h
+ * Header file for Marvell MMP Display Controller
+ *
+ * Copyright (C) 2012 Marvell Technology Group Ltd.
+ * Authors: Zhou Zhu <zzhu3@marvell.com>
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef _MMP_DISP_H_
+#define _MMP_DISP_H_
+#include <linux/kthread.h>
+
+enum {
+        PIXFMT_UYVY = 0,
+        PIXFMT_VYUY,
+        PIXFMT_YUYV,
+        PIXFMT_YUV422P,
+        PIXFMT_YVU422P,
+        PIXFMT_YUV420P,
+        PIXFMT_YVU420P,
+        PIXFMT_RGB565 = 0x100,
+        PIXFMT_BGR565,
+        PIXFMT_RGB1555,
+        PIXFMT_BGR1555,
+        PIXFMT_RGB888PACK,
+        PIXFMT_BGR888PACK,
+        PIXFMT_RGB888UNPACK,
+        PIXFMT_BGR888UNPACK,
+        PIXFMT_RGBA888,
+        PIXFMT_BGRA888,
+        PIXFMT_RGB666, /* for output usage */
+        PIXFMT_PSEUDOCOLOR = 0x200,
+};
+
+static inline int pixfmt_to_stride(int pix_fmt)
+{
+        switch (pix_fmt) {
+        case PIXFMT_RGB565:
+        case PIXFMT_BGR565:
+        case PIXFMT_RGB1555:
+        case PIXFMT_BGR1555:
+        case PIXFMT_UYVY:
+        case PIXFMT_VYUY:
+        case PIXFMT_YUYV:
+                return 2;
+        case PIXFMT_RGB888UNPACK:
+        case PIXFMT_BGR888UNPACK:
+        case PIXFMT_RGBA888:
+        case PIXFMT_BGRA888:
+                return 4;
+        case PIXFMT_RGB888PACK:
+        case PIXFMT_BGR888PACK:
+                return 3;
+        case PIXFMT_YUV422P:
+        case PIXFMT_YVU422P:
+        case PIXFMT_YUV420P:
+        case PIXFMT_YVU420P:
+        case PIXFMT_PSEUDOCOLOR:
+                return 1;
+        default:
+                return 0;
+        }
+}
+
+/* parameters used by path/overlay */
+/* overlay related para: win/addr */
+struct mmp_win {
+        /* position/size of window */
+        u16     xsrc;
+        u16     ysrc;
+        u16     xdst;
+        u16     ydst;
+        u16     xpos;
+        u16     ypos;
+        u16     left_crop;
+        u16     right_crop;
+        u16     up_crop;
+        u16     bottom_crop;
+        int     pix_fmt;
+};
+
+struct mmp_addr {
+        /* phys address */
+        u32     phys[6];
+};
+
+/* path related para: mode */
+struct mmp_mode {
+        const char *name;
+        u32 refresh;
+        u32 xres;
+        u32 yres;
+        u32 left_margin;
+        u32 right_margin;
+        u32 upper_margin;
+        u32 lower_margin;
+        u32 hsync_len;
+        u32 vsync_len;
+        u32 hsync_invert;
+        u32 vsync_invert;
+        u32 invert_pixclock;
+        u32 pixclock_freq;
+        int pix_fmt_out;
+};
+
+/* main structures */
+struct mmp_path;
+struct mmp_overlay;
+struct mmp_panel;
+
+/* status types */
+enum {
+        MMP_OFF = 0,
+        MMP_ON,
+};
+
+static inline const char *stat_name(int stat)
+{
+        switch (stat) {
+        case MMP_OFF:
+                return "OFF";
+        case MMP_ON:
+                return "ON";
+        default:
+                return "UNKNOWNSTAT";
+        }
+}
+
+struct mmp_overlay_ops {
+        /* should be provided by driver */
+        void (*set_fetch)(struct mmp_overlay *overlay, int fetch_id);
+        void (*set_onoff)(struct mmp_overlay *overlay, int status);
+        void (*set_win)(struct mmp_overlay *overlay, struct mmp_win *win);
+        int (*set_addr)(struct mmp_overlay *overlay, struct mmp_addr *addr);
+};
+
+/* overlay describes a z-order indexed slot in each path. */
+struct mmp_overlay {
+        int id;
+        const char *name;
+        struct mmp_path *path;
+
+        /* overlay info: private data */
+        int dmafetch_id;
+        struct mmp_addr addr;
+        struct mmp_win win;
+
+        /* state */
+        int open_count;
+        int status;
+        struct mutex access_ok;
+
+        struct mmp_overlay_ops *ops;
+};
+
+/* panel type */
+enum {
+        PANELTYPE_ACTIVE = 0,
+        PANELTYPE_SMART,
+        PANELTYPE_TV,
+        PANELTYPE_DSI_CMD,
+        PANELTYPE_DSI_VIDEO,
+};
+
+struct mmp_panel {
+        /* use node to register to list */
+        struct list_head node;
+        const char *name;
+        /* path name used to connect to proper path configed */
+        const char *plat_path_name;
+        struct device *dev;
+        int panel_type;
+        void *plat_data;
+        int (*get_modelist)(struct mmp_panel *panel,
+                        struct mmp_mode **modelist);
+        void (*set_mode)(struct mmp_panel *panel,
+                        struct mmp_mode *mode);
+        void (*set_onoff)(struct mmp_panel *panel,
+                        int status);
+};
+
+struct mmp_path_ops {
+        int (*check_status)(struct mmp_path *path);
+        struct mmp_overlay *(*get_overlay)(struct mmp_path *path,
+                        int overlay_id);
+        int (*get_modelist)(struct mmp_path *path,
+                        struct mmp_mode **modelist);
+
+        /* follow ops should be provided by driver */
+        void (*set_mode)(struct mmp_path *path, struct mmp_mode *mode);
+        void (*set_onoff)(struct mmp_path *path, int status);
+        /* todo: add query */
+};
+
+/* path output types */
+enum {
+        PATH_OUT_PARALLEL,
+        PATH_OUT_DSI,
+        PATH_OUT_HDMI,
+};
+
+/* path is main part of mmp-disp */
+struct mmp_path {
+        /* use node to register to list */
+        struct list_head node;
+
+        /* init data */
+        struct device *dev;
+
+        int id;
+        const char *name;
+        int output_type;
+        struct mmp_panel *panel;
+        void *plat_data;
+
+        /* dynamic use */
+        struct mmp_mode mode;
+
+        /* state */
+        int open_count;
+        int status;
+        struct mutex access_ok;
+
+        struct mmp_path_ops ops;
+
+        /* layers */
+        int overlay_num;
+        struct mmp_overlay overlays[0];
+};
+
+extern struct mmp_path *mmp_get_path(const char *name);
+static inline void mmp_path_set_mode(struct mmp_path *path,
+                struct mmp_mode *mode)
+{
+        if (path)
+                path->ops.set_mode(path, mode);
+}
+static inline void mmp_path_set_onoff(struct mmp_path *path, int status)
+{
+        if (path)
+                path->ops.set_onoff(path, status);
+}
+static inline int mmp_path_get_modelist(struct mmp_path *path,
+                struct mmp_mode **modelist)
+{
+        if (path)
+                return path->ops.get_modelist(path, modelist);
+        return 0;
+}
+static inline struct mmp_overlay *mmp_path_get_overlay(
+                struct mmp_path *path, int overlay_id)
+{
+        if (path)
+                return path->ops.get_overlay(path, overlay_id);
+        return NULL;
+}
+static inline void mmp_overlay_set_fetch(struct mmp_overlay *overlay,
+                int fetch_id)
+{
+        if (overlay)
+                overlay->ops->set_fetch(overlay, fetch_id);
+}
+static inline void mmp_overlay_set_onoff(struct mmp_overlay *overlay,
+                int status)
+{
+        if (overlay)
+                overlay->ops->set_onoff(overlay, status);
+}
+static inline void mmp_overlay_set_win(struct mmp_overlay *overlay,
+                struct mmp_win *win)
+{
+        if (overlay)
+                overlay->ops->set_win(overlay, win);
+}
+static inline int mmp_overlay_set_addr(struct mmp_overlay *overlay,
+                struct mmp_addr *addr)
+{
+        if (overlay)
+                return overlay->ops->set_addr(overlay, addr);
+        return 0;
+}
+
+/*
+ * driver data is set from each detailed ctrl driver for path usage
+ * it defined a common interface that plat driver need to implement
+ */
+struct mmp_path_info {
+        /* driver data, set when registed*/
+        const char *name;
+        struct device *dev;
+        int id;
+        int output_type;
+        int overlay_num;
+        void (*set_mode)(struct mmp_path *path, struct mmp_mode *mode);
+        void (*set_onoff)(struct mmp_path *path, int status);
+        struct mmp_overlay_ops *overlay_ops;
+        void *plat_data;
+};
+
+extern struct mmp_path *mmp_register_path(
+                struct mmp_path_info *info);
+extern void mmp_unregister_path(struct mmp_path *path);
+extern void mmp_register_panel(struct mmp_panel *panel);
+extern void mmp_unregister_panel(struct mmp_panel *panel);
+
+/* defintions for platform data */
+/* interface for buffer driver */
+struct mmp_buffer_driver_mach_info {
+        const char      *name;
+        const char      *path_name;
+        int     overlay_id;
+        int     dmafetch_id;
+        int     default_pixfmt;
+};
+
+/* interface for controllers driver */
+struct mmp_mach_path_config {
+        const char *name;
+        int overlay_num;
+        int output_type;
+        u32 path_config;
+        u32 link_config;
+};
+
+struct mmp_mach_plat_info {
+        const char *name;
+        const char *clk_name;
+        int path_num;
+        struct mmp_mach_path_config *paths;
+};
+
+/* interface for panel drivers */
+struct mmp_mach_panel_info {
+        const char *name;
+        void (*plat_set_onoff)(int status);
+        const char *plat_path_name;
+};
+#endif  /* _MMP_DISP_H_ */
diff --git a/include/video/samsung_fimd.h b/include/video/samsung_fimd.h
index e7554486a2b7..b0393209679b 100644
--- a/include/video/samsung_fimd.h
+++ b/include/video/samsung_fimd.h
@@ -8,12 +8,8 @@
  * S3C Platform - new-style fimd and framebuffer register definitions
  *
  * This is the register set for the fimd and new style framebuffer interface
- * found from the S3C2443 onwards into the S3C2416, S3C2450 and the
- * S3C64XX series such as the S3C6400 and S3C6410.
- *
- * The file does not contain the cpu specific items which are based on
- * whichever architecture is selected, it only contains the core of the
- * register set. See <mach/regs-fb.h> to get the specifics.
+ * found from the S3C2443 onwards into the S3C2416, S3C2450, the
+ * S3C64XX series such as the S3C6400 and S3C6410, and EXYNOS series.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -22,10 +18,10 @@
 
 /* VIDCON0 */
 
-#define VIDCON0                                 (0x00)
+#define VIDCON0                                 0x00
 #define VIDCON0_INTERLACE                       (1 << 29)
 #define VIDCON0_VIDOUT_MASK                     (0x7 << 26)
-#define VIDCON0_VIDOUT_SHIFT                    (26)
+#define VIDCON0_VIDOUT_SHIFT                    26
 #define VIDCON0_VIDOUT_RGB                      (0x0 << 26)
 #define VIDCON0_VIDOUT_TV                       (0x1 << 26)
 #define VIDCON0_VIDOUT_I80_LDI0                 (0x2 << 26)
@@ -35,7 +31,7 @@
 #define VIDCON0_VIDOUT_WB_I80_LDI1              (0x7 << 26)
 
 #define VIDCON0_L1_DATA_MASK                    (0x7 << 23)
-#define VIDCON0_L1_DATA_SHIFT                   (23)
+#define VIDCON0_L1_DATA_SHIFT                   23
 #define VIDCON0_L1_DATA_16BPP                   (0x0 << 23)
 #define VIDCON0_L1_DATA_18BPP16                 (0x1 << 23)
 #define VIDCON0_L1_DATA_18BPP9                  (0x2 << 23)
@@ -44,7 +40,7 @@
 #define VIDCON0_L1_DATA_16BPP8                  (0x5 << 23)
 
 #define VIDCON0_L0_DATA_MASK                    (0x7 << 20)
-#define VIDCON0_L0_DATA_SHIFT                   (20)
+#define VIDCON0_L0_DATA_SHIFT                   20
 #define VIDCON0_L0_DATA_16BPP                   (0x0 << 20)
 #define VIDCON0_L0_DATA_18BPP16                 (0x1 << 20)
 #define VIDCON0_L0_DATA_18BPP9                  (0x2 << 20)
@@ -53,7 +49,7 @@
 #define VIDCON0_L0_DATA_16BPP8                  (0x5 << 20)
 
 #define VIDCON0_PNRMODE_MASK                    (0x3 << 17)
-#define VIDCON0_PNRMODE_SHIFT                   (17)
+#define VIDCON0_PNRMODE_SHIFT                   17
 #define VIDCON0_PNRMODE_RGB                     (0x0 << 17)
 #define VIDCON0_PNRMODE_BGR                     (0x1 << 17)
 #define VIDCON0_PNRMODE_SERIAL_RGB              (0x2 << 17)
@@ -61,14 +57,14 @@
 
 #define VIDCON0_CLKVALUP                        (1 << 16)
 #define VIDCON0_CLKVAL_F_MASK                   (0xff << 6)
-#define VIDCON0_CLKVAL_F_SHIFT                  (6)
-#define VIDCON0_CLKVAL_F_LIMIT                  (0xff)
+#define VIDCON0_CLKVAL_F_SHIFT                  6
+#define VIDCON0_CLKVAL_F_LIMIT                  0xff
 #define VIDCON0_CLKVAL_F(_x)                    ((_x) << 6)
 #define VIDCON0_VLCKFREE                        (1 << 5)
 #define VIDCON0_CLKDIR                          (1 << 4)
 
 #define VIDCON0_CLKSEL_MASK                     (0x3 << 2)
-#define VIDCON0_CLKSEL_SHIFT                    (2)
+#define VIDCON0_CLKSEL_SHIFT                    2
 #define VIDCON0_CLKSEL_HCLK                     (0x0 << 2)
 #define VIDCON0_CLKSEL_LCD                      (0x1 << 2)
 #define VIDCON0_CLKSEL_27M                      (0x3 << 2)
@@ -76,17 +72,17 @@
 #define VIDCON0_ENVID                           (1 << 1)
 #define VIDCON0_ENVID_F                         (1 << 0)
 
-#define VIDCON1                                 (0x04)
+#define VIDCON1                                 0x04
 #define VIDCON1_LINECNT_MASK                    (0x7ff << 16)
-#define VIDCON1_LINECNT_SHIFT                   (16)
+#define VIDCON1_LINECNT_SHIFT                   16
 #define VIDCON1_LINECNT_GET(_v)                 (((_v) >> 16) & 0x7ff)
 #define VIDCON1_FSTATUS_EVEN                    (1 << 15)
 #define VIDCON1_VSTATUS_MASK                    (0x3 << 13)
-#define VIDCON1_VSTATUS_SHIFT                   (13)
+#define VIDCON1_VSTATUS_SHIFT                   13
 #define VIDCON1_VSTATUS_VSYNC                   (0x0 << 13)
 #define VIDCON1_VSTATUS_BACKPORCH               (0x1 << 13)
 #define VIDCON1_VSTATUS_ACTIVE                  (0x2 << 13)
-#define VIDCON1_VSTATUS_FRONTPORCH              (0x0 << 13)
+#define VIDCON1_VSTATUS_FRONTPORCH              (0x3 << 13)
 #define VIDCON1_VCLK_MASK                       (0x3 << 9)
 #define VIDCON1_VCLK_HOLD                       (0x0 << 9)
 #define VIDCON1_VCLK_RUN                        (0x1 << 9)
@@ -98,12 +94,12 @@
 
 /* VIDCON2 */
 
-#define VIDCON2                                 (0x08)
+#define VIDCON2                                 0x08
 #define VIDCON2_EN601                           (1 << 23)
 #define VIDCON2_TVFMTSEL_SW                     (1 << 14)
 
 #define VIDCON2_TVFMTSEL1_MASK                  (0x3 << 12)
-#define VIDCON2_TVFMTSEL1_SHIFT                 (12)
+#define VIDCON2_TVFMTSEL1_SHIFT                 12
 #define VIDCON2_TVFMTSEL1_RGB                   (0x0 << 12)
 #define VIDCON2_TVFMTSEL1_YUV422                (0x1 << 12)
 #define VIDCON2_TVFMTSEL1_YUV444                (0x2 << 12)
@@ -115,74 +111,75 @@
  * Might not be present in the S3C6410 documentation,
  * but tests prove it's there almost for sure; shouldn't hurt in any case.
  */
-#define PRTCON                                  (0x0c)
+#define PRTCON                                  0x0c
 #define PRTCON_PROTECT                          (1 << 11)
 
 /* VIDTCON0 */
 
-#define VIDTCON0                                (0x10)
+#define VIDTCON0                                0x10
 #define VIDTCON0_VBPDE_MASK                     (0xff << 24)
-#define VIDTCON0_VBPDE_SHIFT                    (24)
-#define VIDTCON0_VBPDE_LIMIT                    (0xff)
+#define VIDTCON0_VBPDE_SHIFT                    24
+#define VIDTCON0_VBPDE_LIMIT                    0xff
 #define VIDTCON0_VBPDE(_x)                      ((_x) << 24)
 
 #define VIDTCON0_VBPD_MASK                      (0xff << 16)
-#define VIDTCON0_VBPD_SHIFT                     (16)
-#define VIDTCON0_VBPD_LIMIT                     (0xff)
+#define VIDTCON0_VBPD_SHIFT                     16
+#define VIDTCON0_VBPD_LIMIT                     0xff
 #define VIDTCON0_VBPD(_x)                       ((_x) << 16)
 
 #define VIDTCON0_VFPD_MASK                      (0xff << 8)
-#define VIDTCON0_VFPD_SHIFT                     (8)
-#define VIDTCON0_VFPD_LIMIT                     (0xff)
+#define VIDTCON0_VFPD_SHIFT                     8
+#define VIDTCON0_VFPD_LIMIT                     0xff
 #define VIDTCON0_VFPD(_x)                       ((_x) << 8)
 
 #define VIDTCON0_VSPW_MASK                      (0xff << 0)
-#define VIDTCON0_VSPW_SHIFT                     (0)
-#define VIDTCON0_VSPW_LIMIT                     (0xff)
+#define VIDTCON0_VSPW_SHIFT                     0
+#define VIDTCON0_VSPW_LIMIT                     0xff
 #define VIDTCON0_VSPW(_x)                       ((_x) << 0)
 
 /* VIDTCON1 */
 
-#define VIDTCON1                                (0x14)
+#define VIDTCON1                                0x14
 #define VIDTCON1_VFPDE_MASK                     (0xff << 24)
-#define VIDTCON1_VFPDE_SHIFT                    (24)
-#define VIDTCON1_VFPDE_LIMIT                    (0xff)
+#define VIDTCON1_VFPDE_SHIFT                    24
+#define VIDTCON1_VFPDE_LIMIT                    0xff
 #define VIDTCON1_VFPDE(_x)                      ((_x) << 24)
 
 #define VIDTCON1_HBPD_MASK                      (0xff << 16)
-#define VIDTCON1_HBPD_SHIFT                     (16)
-#define VIDTCON1_HBPD_LIMIT                     (0xff)
+#define VIDTCON1_HBPD_SHIFT                     16
+#define VIDTCON1_HBPD_LIMIT                     0xff
 #define VIDTCON1_HBPD(_x)                       ((_x) << 16)
 
 #define VIDTCON1_HFPD_MASK                      (0xff << 8)
-#define VIDTCON1_HFPD_SHIFT                     (8)
-#define VIDTCON1_HFPD_LIMIT                     (0xff)
+#define VIDTCON1_HFPD_SHIFT                     8
+#define VIDTCON1_HFPD_LIMIT                     0xff
 #define VIDTCON1_HFPD(_x)                       ((_x) << 8)
 
 #define VIDTCON1_HSPW_MASK                      (0xff << 0)
-#define VIDTCON1_HSPW_SHIFT                     (0)
-#define VIDTCON1_HSPW_LIMIT                     (0xff)
+#define VIDTCON1_HSPW_SHIFT                     0
+#define VIDTCON1_HSPW_LIMIT                     0xff
 #define VIDTCON1_HSPW(_x)                       ((_x) << 0)
 
-#define VIDTCON2                                (0x18)
-#define VIDTCON2                                (0x18)
+#define VIDTCON2                                0x18
 #define VIDTCON2_LINEVAL_E(_x)                  ((((_x) & 0x800) >> 11) << 23)
 #define VIDTCON2_LINEVAL_MASK                   (0x7ff << 11)
-#define VIDTCON2_LINEVAL_SHIFT                  (11)
-#define VIDTCON2_LINEVAL_LIMIT                  (0x7ff)
+#define VIDTCON2_LINEVAL_SHIFT                  11
+#define VIDTCON2_LINEVAL_LIMIT                  0x7ff
 #define VIDTCON2_LINEVAL(_x)                    (((_x) & 0x7ff) << 11)
 
 #define VIDTCON2_HOZVAL_E(_x)                   ((((_x) & 0x800) >> 11) << 22)
 #define VIDTCON2_HOZVAL_MASK                    (0x7ff << 0)
-#define VIDTCON2_HOZVAL_SHIFT                   (0)
-#define VIDTCON2_HOZVAL_LIMIT                   (0x7ff)
+#define VIDTCON2_HOZVAL_SHIFT                   0
+#define VIDTCON2_HOZVAL_LIMIT                   0x7ff
 #define VIDTCON2_HOZVAL(_x)                     (((_x) & 0x7ff) << 0)
 
 /* WINCONx */
 
 #define WINCON(_win)                            (0x20 + ((_win) * 4))
+#define WINCONx_CSCCON_EQ601                    (0x0 << 28)
+#define WINCONx_CSCCON_EQ709                    (0x1 << 28)
 #define WINCONx_CSCWIDTH_MASK                   (0x3 << 26)
-#define WINCONx_CSCWIDTH_SHIFT                  (26)
+#define WINCONx_CSCWIDTH_SHIFT                  26
 #define WINCONx_CSCWIDTH_WIDE                   (0x0 << 26)
 #define WINCONx_CSCWIDTH_NARROW                 (0x3 << 26)
 #define WINCONx_ENLOCAL                         (1 << 22)
@@ -195,14 +192,14 @@
 #define WINCONx_WSWP                            (1 << 15)
 #define WINCONx_YCbCr                           (1 << 13)
 #define WINCONx_BURSTLEN_MASK                   (0x3 << 9)
-#define WINCONx_BURSTLEN_SHIFT                  (9)
+#define WINCONx_BURSTLEN_SHIFT                  9
 #define WINCONx_BURSTLEN_16WORD                 (0x0 << 9)
 #define WINCONx_BURSTLEN_8WORD                  (0x1 << 9)
 #define WINCONx_BURSTLEN_4WORD                  (0x2 << 9)
 #define WINCONx_ENWIN                           (1 << 0)
 
 #define WINCON0_BPPMODE_MASK                    (0xf << 2)
-#define WINCON0_BPPMODE_SHIFT                   (2)
+#define WINCON0_BPPMODE_SHIFT                   2
 #define WINCON0_BPPMODE_1BPP                    (0x0 << 2)
 #define WINCON0_BPPMODE_2BPP                    (0x1 << 2)
 #define WINCON0_BPPMODE_4BPP                    (0x2 << 2)
@@ -215,7 +212,7 @@
 #define WINCON1_LOCALSEL_CAMIF                  (1 << 23)
 #define WINCON1_BLD_PIX                         (1 << 6)
 #define WINCON1_BPPMODE_MASK                    (0xf << 2)
-#define WINCON1_BPPMODE_SHIFT                   (2)
+#define WINCON1_BPPMODE_SHIFT                   2
 #define WINCON1_BPPMODE_1BPP                    (0x0 << 2)
 #define WINCON1_BPPMODE_2BPP                    (0x1 << 2)
 #define WINCON1_BPPMODE_4BPP                    (0x2 << 2)
@@ -234,7 +231,7 @@
 #define WINCON1_ALPHA_SEL                       (1 << 1)
 
 /* S5PV210 */
-#define SHADOWCON                               (0x34)
+#define SHADOWCON                               0x34
 #define SHADOWCON_WINx_PROTECT(_win)            (1 << (10 + (_win)))
 /* DMA channels (all windows) */
 #define SHADOWCON_CHx_ENABLE(_win)              (1 << (_win))
@@ -243,52 +240,52 @@
 
 /* VIDOSDx */
 
-#define VIDOSD_BASE                             (0x40)
+#define VIDOSD_BASE                             0x40
 #define VIDOSDxA_TOPLEFT_X_E(_x)                ((((_x) & 0x800) >> 11) << 23)
 #define VIDOSDxA_TOPLEFT_X_MASK                 (0x7ff << 11)
-#define VIDOSDxA_TOPLEFT_X_SHIFT                (11)
-#define VIDOSDxA_TOPLEFT_X_LIMIT                (0x7ff)
+#define VIDOSDxA_TOPLEFT_X_SHIFT                11
+#define VIDOSDxA_TOPLEFT_X_LIMIT                0x7ff
 #define VIDOSDxA_TOPLEFT_X(_x)                  (((_x) & 0x7ff) << 11)
 
 #define VIDOSDxA_TOPLEFT_Y_E(_x)                ((((_x) & 0x800) >> 11) << 22)
 #define VIDOSDxA_TOPLEFT_Y_MASK                 (0x7ff << 0)
-#define VIDOSDxA_TOPLEFT_Y_SHIFT                (0)
-#define VIDOSDxA_TOPLEFT_Y_LIMIT                (0x7ff)
+#define VIDOSDxA_TOPLEFT_Y_SHIFT                0
+#define VIDOSDxA_TOPLEFT_Y_LIMIT                0x7ff
 #define VIDOSDxA_TOPLEFT_Y(_x)                  (((_x) & 0x7ff) << 0)
 
 #define VIDOSDxB_BOTRIGHT_X_E(_x)               ((((_x) & 0x800) >> 11) << 23)
 #define VIDOSDxB_BOTRIGHT_X_MASK                (0x7ff << 11)
-#define VIDOSDxB_BOTRIGHT_X_SHIFT               (11)
-#define VIDOSDxB_BOTRIGHT_X_LIMIT               (0x7ff)
+#define VIDOSDxB_BOTRIGHT_X_SHIFT               11
+#define VIDOSDxB_BOTRIGHT_X_LIMIT               0x7ff
 #define VIDOSDxB_BOTRIGHT_X(_x)                 (((_x) & 0x7ff) << 11)
 
 #define VIDOSDxB_BOTRIGHT_Y_E(_x)               ((((_x) & 0x800) >> 11) << 22)
 #define VIDOSDxB_BOTRIGHT_Y_MASK                (0x7ff << 0)
-#define VIDOSDxB_BOTRIGHT_Y_SHIFT               (0)
-#define VIDOSDxB_BOTRIGHT_Y_LIMIT               (0x7ff)
+#define VIDOSDxB_BOTRIGHT_Y_SHIFT               0
+#define VIDOSDxB_BOTRIGHT_Y_LIMIT               0x7ff
 #define VIDOSDxB_BOTRIGHT_Y(_x)                 (((_x) & 0x7ff) << 0)
 
 /* For VIDOSD[1..4]C */
 #define VIDISD14C_ALPHA0_R(_x)                  ((_x) << 20)
 #define VIDISD14C_ALPHA0_G_MASK                 (0xf << 16)
-#define VIDISD14C_ALPHA0_G_SHIFT                (16)
-#define VIDISD14C_ALPHA0_G_LIMIT                (0xf)
+#define VIDISD14C_ALPHA0_G_SHIFT                16
+#define VIDISD14C_ALPHA0_G_LIMIT                0xf
 #define VIDISD14C_ALPHA0_G(_x)                  ((_x) << 16)
 #define VIDISD14C_ALPHA0_B_MASK                 (0xf << 12)
-#define VIDISD14C_ALPHA0_B_SHIFT                (12)
-#define VIDISD14C_ALPHA0_B_LIMIT                (0xf)
+#define VIDISD14C_ALPHA0_B_SHIFT                12
+#define VIDISD14C_ALPHA0_B_LIMIT                0xf
 #define VIDISD14C_ALPHA0_B(_x)                  ((_x) << 12)
 #define VIDISD14C_ALPHA1_R_MASK                 (0xf << 8)
-#define VIDISD14C_ALPHA1_R_SHIFT                (8)
-#define VIDISD14C_ALPHA1_R_LIMIT                (0xf)
+#define VIDISD14C_ALPHA1_R_SHIFT                8
+#define VIDISD14C_ALPHA1_R_LIMIT                0xf
 #define VIDISD14C_ALPHA1_R(_x)                  ((_x) << 8)
 #define VIDISD14C_ALPHA1_G_MASK                 (0xf << 4)
-#define VIDISD14C_ALPHA1_G_SHIFT                (4)
-#define VIDISD14C_ALPHA1_G_LIMIT                (0xf)
+#define VIDISD14C_ALPHA1_G_SHIFT                4
+#define VIDISD14C_ALPHA1_G_LIMIT                0xf
 #define VIDISD14C_ALPHA1_G(_x)                  ((_x) << 4)
 #define VIDISD14C_ALPHA1_B_MASK                 (0xf << 0)
-#define VIDISD14C_ALPHA1_B_SHIFT                (0)
-#define VIDISD14C_ALPHA1_B_LIMIT                (0xf)
+#define VIDISD14C_ALPHA1_B_SHIFT                0
+#define VIDISD14C_ALPHA1_B_LIMIT                0xf
 #define VIDISD14C_ALPHA1_B(_x)                  ((_x) << 0)
 
 /* Video buffer addresses */
@@ -300,22 +297,22 @@
 
 #define VIDW_BUF_SIZE_OFFSET_E(_x)              ((((_x) & 0x2000) >> 13) << 27)
 #define VIDW_BUF_SIZE_OFFSET_MASK               (0x1fff << 13)
-#define VIDW_BUF_SIZE_OFFSET_SHIFT              (13)
-#define VIDW_BUF_SIZE_OFFSET_LIMIT              (0x1fff)
+#define VIDW_BUF_SIZE_OFFSET_SHIFT              13
+#define VIDW_BUF_SIZE_OFFSET_LIMIT              0x1fff
 #define VIDW_BUF_SIZE_OFFSET(_x)                (((_x) & 0x1fff) << 13)
 
 #define VIDW_BUF_SIZE_PAGEWIDTH_E(_x)           ((((_x) & 0x2000) >> 13) << 26)
 #define VIDW_BUF_SIZE_PAGEWIDTH_MASK            (0x1fff << 0)
-#define VIDW_BUF_SIZE_PAGEWIDTH_SHIFT           (0)
-#define VIDW_BUF_SIZE_PAGEWIDTH_LIMIT           (0x1fff)
+#define VIDW_BUF_SIZE_PAGEWIDTH_SHIFT           0
+#define VIDW_BUF_SIZE_PAGEWIDTH_LIMIT           0x1fff
 #define VIDW_BUF_SIZE_PAGEWIDTH(_x)             (((_x) & 0x1fff) << 0)
 
 /* Interrupt controls and status */
 
-#define VIDINTCON0                              (0x130)
+#define VIDINTCON0                              0x130
 #define VIDINTCON0_FIFOINTERVAL_MASK            (0x3f << 20)
-#define VIDINTCON0_FIFOINTERVAL_SHIFT           (20)
-#define VIDINTCON0_FIFOINTERVAL_LIMIT           (0x3f)
+#define VIDINTCON0_FIFOINTERVAL_SHIFT           20
+#define VIDINTCON0_FIFOINTERVAL_LIMIT           0x3f
 #define VIDINTCON0_FIFOINTERVAL(_x)             ((_x) << 20)
 
 #define VIDINTCON0_INT_SYSMAINCON               (1 << 19)
@@ -323,7 +320,7 @@
 #define VIDINTCON0_INT_I80IFDONE                (1 << 17)
 
 #define VIDINTCON0_FRAMESEL0_MASK               (0x3 << 15)
-#define VIDINTCON0_FRAMESEL0_SHIFT              (15)
+#define VIDINTCON0_FRAMESEL0_SHIFT              15
 #define VIDINTCON0_FRAMESEL0_BACKPORCH          (0x0 << 15)
 #define VIDINTCON0_FRAMESEL0_VSYNC              (0x1 << 15)
 #define VIDINTCON0_FRAMESEL0_ACTIVE             (0x2 << 15)
@@ -338,7 +335,7 @@
 
 #define VIDINTCON0_INT_FRAME                    (1 << 12)
 #define VIDINTCON0_FIFIOSEL_MASK                (0x7f << 5)
-#define VIDINTCON0_FIFIOSEL_SHIFT               (5)
+#define VIDINTCON0_FIFIOSEL_SHIFT               5
 #define VIDINTCON0_FIFIOSEL_WINDOW0             (0x1 << 5)
 #define VIDINTCON0_FIFIOSEL_WINDOW1             (0x2 << 5)
 #define VIDINTCON0_FIFIOSEL_WINDOW2             (0x10 << 5)
@@ -346,7 +343,7 @@
 #define VIDINTCON0_FIFIOSEL_WINDOW4             (0x40 << 5)
 
 #define VIDINTCON0_FIFOLEVEL_MASK               (0x7 << 2)
-#define VIDINTCON0_FIFOLEVEL_SHIFT              (2)
+#define VIDINTCON0_FIFOLEVEL_SHIFT              2
 #define VIDINTCON0_FIFOLEVEL_TO25PC             (0x0 << 2)
 #define VIDINTCON0_FIFOLEVEL_TO50PC             (0x1 << 2)
 #define VIDINTCON0_FIFOLEVEL_TO75PC             (0x2 << 2)
@@ -354,46 +351,46 @@
 #define VIDINTCON0_FIFOLEVEL_FULL               (0x4 << 2)
 
 #define VIDINTCON0_INT_FIFO_MASK                (0x3 << 0)
-#define VIDINTCON0_INT_FIFO_SHIFT               (0)
+#define VIDINTCON0_INT_FIFO_SHIFT               0
 #define VIDINTCON0_INT_ENABLE                   (1 << 0)
 
-#define VIDINTCON1                              (0x134)
+#define VIDINTCON1                              0x134
 #define VIDINTCON1_INT_I180                     (1 << 2)
 #define VIDINTCON1_INT_FRAME                    (1 << 1)
 #define VIDINTCON1_INT_FIFO                     (1 << 0)
 
 /* Window colour-key control registers */
-#define WKEYCON                                 (0x140) /* 6410,V210 */
+#define WKEYCON                                 0x140
 
-#define WKEYCON0                                (0x00)
-#define WKEYCON1                                (0x04)
+#define WKEYCON0                                0x00
+#define WKEYCON1                                0x04
 
 #define WxKEYCON0_KEYBL_EN                      (1 << 26)
 #define WxKEYCON0_KEYEN_F                       (1 << 25)
 #define WxKEYCON0_DIRCON                        (1 << 24)
 #define WxKEYCON0_COMPKEY_MASK                  (0xffffff << 0)
-#define WxKEYCON0_COMPKEY_SHIFT                 (0)
-#define WxKEYCON0_COMPKEY_LIMIT                 (0xffffff)
+#define WxKEYCON0_COMPKEY_SHIFT                 0
+#define WxKEYCON0_COMPKEY_LIMIT                 0xffffff
 #define WxKEYCON0_COMPKEY(_x)                   ((_x) << 0)
 #define WxKEYCON1_COLVAL_MASK                   (0xffffff << 0)
-#define WxKEYCON1_COLVAL_SHIFT                  (0)
-#define WxKEYCON1_COLVAL_LIMIT                  (0xffffff)
+#define WxKEYCON1_COLVAL_SHIFT                  0
+#define WxKEYCON1_COLVAL_LIMIT                  0xffffff
 #define WxKEYCON1_COLVAL(_x)                    ((_x) << 0)
 
 /* Dithering control */
-#define DITHMODE                                (0x170)
+#define DITHMODE                                0x170
 #define DITHMODE_R_POS_MASK                     (0x3 << 5)
-#define DITHMODE_R_POS_SHIFT                    (5)
+#define DITHMODE_R_POS_SHIFT                    5
 #define DITHMODE_R_POS_8BIT                     (0x0 << 5)
 #define DITHMODE_R_POS_6BIT                     (0x1 << 5)
 #define DITHMODE_R_POS_5BIT                     (0x2 << 5)
 #define DITHMODE_G_POS_MASK                     (0x3 << 3)
-#define DITHMODE_G_POS_SHIFT                    (3)
+#define DITHMODE_G_POS_SHIFT                    3
 #define DITHMODE_G_POS_8BIT                     (0x0 << 3)
 #define DITHMODE_G_POS_6BIT                     (0x1 << 3)
 #define DITHMODE_G_POS_5BIT                     (0x2 << 3)
 #define DITHMODE_B_POS_MASK                     (0x3 << 1)
-#define DITHMODE_B_POS_SHIFT                    (1)
+#define DITHMODE_B_POS_SHIFT                    1
 #define DITHMODE_B_POS_8BIT                     (0x0 << 1)
 #define DITHMODE_B_POS_6BIT                     (0x1 << 1)
 #define DITHMODE_B_POS_5BIT                     (0x2 << 1)
@@ -403,18 +400,18 @@
 #define WINxMAP(_win)                           (0x180 + ((_win) * 4))
 #define WINxMAP_MAP                             (1 << 24)
 #define WINxMAP_MAP_COLOUR_MASK                 (0xffffff << 0)
-#define WINxMAP_MAP_COLOUR_SHIFT                (0)
-#define WINxMAP_MAP_COLOUR_LIMIT                (0xffffff)
+#define WINxMAP_MAP_COLOUR_SHIFT                0
+#define WINxMAP_MAP_COLOUR_LIMIT                0xffffff
 #define WINxMAP_MAP_COLOUR(_x)                  ((_x) << 0)
 
 /* Winodw palette control */
-#define WPALCON                                 (0x1A0)
+#define WPALCON                                 0x1A0
 #define WPALCON_PAL_UPDATE                      (1 << 9)
 #define WPALCON_W4PAL_16BPP_A555                (1 << 8)
 #define WPALCON_W3PAL_16BPP_A555                (1 << 7)
 #define WPALCON_W2PAL_16BPP_A555                (1 << 6)
 #define WPALCON_W1PAL_MASK                      (0x7 << 3)
-#define WPALCON_W1PAL_SHIFT                     (3)
+#define WPALCON_W1PAL_SHIFT                     3
 #define WPALCON_W1PAL_25BPP_A888                (0x0 << 3)
 #define WPALCON_W1PAL_24BPP                     (0x1 << 3)
 #define WPALCON_W1PAL_19BPP_A666                (0x2 << 3)
@@ -423,7 +420,7 @@
 #define WPALCON_W1PAL_16BPP_A555                (0x5 << 3)
 #define WPALCON_W1PAL_16BPP_565                 (0x6 << 3)
 #define WPALCON_W0PAL_MASK                      (0x7 << 0)
-#define WPALCON_W0PAL_SHIFT                     (0)
+#define WPALCON_W0PAL_SHIFT                     0
 #define WPALCON_W0PAL_25BPP_A888                (0x0 << 0)
 #define WPALCON_W0PAL_24BPP                     (0x1 << 0)
 #define WPALCON_W0PAL_19BPP_A666                (0x2 << 0)
@@ -433,13 +430,11 @@
 #define WPALCON_W0PAL_16BPP_565                 (0x6 << 0)
 
 /* Blending equation control */
-#define BLENDCON                                (0x260)
+#define BLENDCON                                0x260
 #define BLENDCON_NEW_MASK                       (1 << 0)
 #define BLENDCON_NEW_8BIT_ALPHA_VALUE           (1 << 0)
 #define BLENDCON_NEW_4BIT_ALPHA_VALUE           (0 << 0)
 
-#define S3C_FB_MAX_WIN (5)  /* number of hardware windows available. */
-
 /* Notes on per-window bpp settings
  *
  * Value        Win0     Win1     Win2     Win3     Win 4
@@ -462,8 +457,8 @@
 */
 
 /* FIMD Version 8 register offset definitions */
-#define FIMD_V8_VIDTCON0        (0x20010)
-#define FIMD_V8_VIDTCON1        (0x20014)
-#define FIMD_V8_VIDTCON2        (0x20018)
-#define FIMD_V8_VIDTCON3        (0x2001C)
-#define FIMD_V8_VIDCON1         (0x20004)
+#define FIMD_V8_VIDTCON0        0x20010
+#define FIMD_V8_VIDTCON1        0x20014
+#define FIMD_V8_VIDTCON2        0x20018
+#define FIMD_V8_VIDTCON3        0x2001C
+#define FIMD_V8_VIDCON1         0x20004