105 files changed, 4711 insertions, 857 deletions

diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h
index ef1cef77d32b..d7bd661bfae7 100644
--- a/include/acpi/acoutput.h
+++ b/include/acpi/acoutput.h
@@ -183,13 +183,19 @@
 
 #if defined (ACPI_DEBUG_OUTPUT) || !defined (ACPI_NO_ERROR_MESSAGES)
 /*
- * Module name is included in both debug and non-debug versions primarily for
- * error messages. The __FILE__ macro is not very useful for this, because it
- * often includes the entire pathname to the module
+ * The module name is used primarily for error and debug messages.
+ * The __FILE__ macro is not very useful for this, because it
+ * usually includes the entire pathname to the module making the
+ * debug output difficult to read.
  */
 #define ACPI_MODULE_NAME(name)          static const char ACPI_UNUSED_VAR _acpi_module_name[] = name;
 #else
+/*
+ * For the no-debug and no-error-msg cases, we must at least define
+ * a null module name.
+ */
 #define ACPI_MODULE_NAME(name)
+#define _acpi_module_name ""
 #endif
 
 /*
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index ff103ba96b78..3a10ef5914eb 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -250,7 +250,6 @@ struct acpi_device_wakeup {
         struct acpi_handle_list resources;
         struct acpi_device_wakeup_flags flags;
         int prepare_count;
-        int run_wake_count;
 };
 
 /* Device */
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index e46ec95a8ada..f6ad63d25b73 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -47,7 +47,7 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20110112
+#define ACPI_CA_VERSION                 0x20110316
 
 #include "actypes.h"
 #include "actbl.h"
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index 7e42bfee0e29..d41c94885211 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -343,4 +343,20 @@ struct acpi_table_desc {
 #include <acpi/actbl1.h>
 #include <acpi/actbl2.h>
 
+/*
+ * Sizes of the various flavors of FADT. We need to look closely
+ * at the FADT length because the version number essentially tells
+ * us nothing because of many BIOS bugs where the version does not
+ * match the expected length. In other words, the length of the
+ * FADT is the bottom line as to what the version really is.
+ *
+ * For reference, the values below are as follows:
+ *     FADT V1  size: 0x74
+ *     FADT V2  size: 0x84
+ *     FADT V3+ size: 0xF4
+ */
+#define ACPI_FADT_V1_SIZE       (u32) (ACPI_FADT_OFFSET (flags) + 4)
+#define ACPI_FADT_V2_SIZE       (u32) (ACPI_FADT_OFFSET (reserved4[0]) + 3)
+#define ACPI_FADT_V3_SIZE       (u32) (sizeof (struct acpi_table_fadt))
+
 #endif                          /* __ACTBL_H__ */
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 0fc15dfb2e22..58bdd0545c5a 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Name: actbl2.h - ACPI Specification Revision 2.0 Tables
+ * Name: actbl2.h - ACPI Table Definitions (tables not in ACPI spec)
  *
  *****************************************************************************/
 
@@ -716,6 +716,68 @@ struct acpi_table_mchi {
 
 /*******************************************************************************
  *
+ * SLIC - Software Licensing Description Table
+ *        Version 1
+ *
+ * Conforms to "OEM Activation 2.0 for Windows Vista Operating Systems",
+ * Copyright 2006
+ *
+ ******************************************************************************/
+
+/* Basic SLIC table is only the common ACPI header */
+
+struct acpi_table_slic {
+        struct acpi_table_header header;        /* Common ACPI table header */
+};
+
+/* Common SLIC subtable header */
+
+struct acpi_slic_header {
+        u32 type;
+        u32 length;
+};
+
+/* Values for Type field above */
+
+enum acpi_slic_type {
+        ACPI_SLIC_TYPE_PUBLIC_KEY = 0,
+        ACPI_SLIC_TYPE_WINDOWS_MARKER = 1,
+        ACPI_SLIC_TYPE_RESERVED = 2     /* 2 and greater are reserved */
+};
+
+/*
+ * SLIC Sub-tables, correspond to Type in struct acpi_slic_header
+ */
+
+/* 0: Public Key Structure */
+
+struct acpi_slic_key {
+        struct acpi_slic_header header;
+        u8 key_type;
+        u8 version;
+        u16 reserved;
+        u32 algorithm;
+        char magic[4];
+        u32 bit_length;
+        u32 exponent;
+        u8 modulus[128];
+};
+
+/* 1: Windows Marker Structure */
+
+struct acpi_slic_marker {
+        struct acpi_slic_header header;
+        u32 version;
+        char oem_id[ACPI_OEM_ID_SIZE];  /* ASCII OEM identification */
+        char oem_table_id[ACPI_OEM_TABLE_ID_SIZE];      /* ASCII OEM table identification */
+        char windows_flag[8];
+        u32 slic_version;
+        u8 reserved[16];
+        u8 signature[128];
+};
+
+/*******************************************************************************
+ *
  * SPCR - Serial Port Console Redirection table
  *        Version 1
  *
diff --git a/include/acpi/apei.h b/include/acpi/apei.h
index c4dbb132d902..e67b523a50e1 100644
--- a/include/acpi/apei.h
+++ b/include/acpi/apei.h
@@ -30,10 +30,11 @@ int apei_hest_parse(apei_hest_func_t func, void *data);
 
 int erst_write(const struct cper_record_header *record);
 ssize_t erst_get_record_count(void);
-int erst_get_next_record_id(u64 *record_id);
+int erst_get_record_id_begin(int *pos);
+int erst_get_record_id_next(int *pos, u64 *record_id);
+void erst_get_record_id_end(void);
 ssize_t erst_read(u64 record_id, struct cper_record_header *record,
                   size_t buflen);
-ssize_t erst_read_next(struct cper_record_header *record, size_t buflen);
 int erst_clear(u64 record_id);
 
 #endif
diff --git a/include/asm-generic/bitops.h b/include/asm-generic/bitops.h
index a54f4421a24d..280ca7a96f75 100644
--- a/include/asm-generic/bitops.h
+++ b/include/asm-generic/bitops.h
@@ -38,8 +38,7 @@
 
 #include <asm-generic/bitops/atomic.h>
 #include <asm-generic/bitops/non-atomic.h>
-#include <asm-generic/bitops/ext2-non-atomic.h>
+#include <asm-generic/bitops/le.h>
 #include <asm-generic/bitops/ext2-atomic.h>
-#include <asm-generic/bitops/minix.h>
 
 #endif /* __ASM_GENERIC_BITOPS_H */
diff --git a/include/asm-generic/bitops/ext2-atomic.h b/include/asm-generic/bitops/ext2-atomic.h
index ab1c875efb74..ecf1c9d8a7cc 100644
--- a/include/asm-generic/bitops/ext2-atomic.h
+++ b/include/asm-generic/bitops/ext2-atomic.h
@@ -5,7 +5,7 @@
         ({                                              \
                 int ret;                                \
                 spin_lock(lock);                        \
-                ret = ext2_set_bit((nr), (unsigned long *)(addr)); \
+                ret = __test_and_set_bit_le(nr, addr);  \
                 spin_unlock(lock);                      \
                 ret;                                    \
         })
@@ -14,7 +14,7 @@
         ({                                              \
                 int ret;                                \
                 spin_lock(lock);                        \
-                ret = ext2_clear_bit((nr), (unsigned long *)(addr)); \
+                ret = __test_and_clear_bit_le(nr, addr);        \
                 spin_unlock(lock);                      \
                 ret;                                    \
         })
diff --git a/include/asm-generic/bitops/ext2-non-atomic.h b/include/asm-generic/bitops/ext2-non-atomic.h
deleted file mode 100644
index 63cf822431a2..000000000000
--- a/include/asm-generic/bitops/ext2-non-atomic.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _ASM_GENERIC_BITOPS_EXT2_NON_ATOMIC_H_
-#define _ASM_GENERIC_BITOPS_EXT2_NON_ATOMIC_H_
-
-#include <asm-generic/bitops/le.h>
-
-#define ext2_set_bit(nr,addr)   \
-        generic___test_and_set_le_bit((nr),(unsigned long *)(addr))
-#define ext2_clear_bit(nr,addr) \
-        generic___test_and_clear_le_bit((nr),(unsigned long *)(addr))
-
-#define ext2_test_bit(nr,addr)  \
-        generic_test_le_bit((nr),(unsigned long *)(addr))
-#define ext2_find_first_zero_bit(addr, size) \
-        generic_find_first_zero_le_bit((unsigned long *)(addr), (size))
-#define ext2_find_next_zero_bit(addr, size, off) \
-        generic_find_next_zero_le_bit((unsigned long *)(addr), (size), (off))
-#define ext2_find_next_bit(addr, size, off) \
-        generic_find_next_le_bit((unsigned long *)(addr), (size), (off))
-
-#endif /* _ASM_GENERIC_BITOPS_EXT2_NON_ATOMIC_H_ */
diff --git a/include/asm-generic/bitops/le.h b/include/asm-generic/bitops/le.h
index 80e3bf13b2b9..946a21b1b5dc 100644
--- a/include/asm-generic/bitops/le.h
+++ b/include/asm-generic/bitops/le.h
@@ -4,54 +4,77 @@
 #include <asm/types.h>
 #include <asm/byteorder.h>
 
-#define BITOP_WORD(nr)          ((nr) / BITS_PER_LONG)
-#define BITOP_LE_SWIZZLE        ((BITS_PER_LONG-1) & ~0x7)
-
 #if defined(__LITTLE_ENDIAN)
 
-#define generic_test_le_bit(nr, addr) test_bit(nr, addr)
-#define generic___set_le_bit(nr, addr) __set_bit(nr, addr)
-#define generic___clear_le_bit(nr, addr) __clear_bit(nr, addr)
+#define BITOP_LE_SWIZZLE        0
 
-#define generic_test_and_set_le_bit(nr, addr) test_and_set_bit(nr, addr)
-#define generic_test_and_clear_le_bit(nr, addr) test_and_clear_bit(nr, addr)
+static inline unsigned long find_next_zero_bit_le(const void *addr,
+                unsigned long size, unsigned long offset)
+{
+        return find_next_zero_bit(addr, size, offset);
+}
 
-#define generic___test_and_set_le_bit(nr, addr) __test_and_set_bit(nr, addr)
-#define generic___test_and_clear_le_bit(nr, addr) __test_and_clear_bit(nr, addr)
+static inline unsigned long find_next_bit_le(const void *addr,
+                unsigned long size, unsigned long offset)
+{
+        return find_next_bit(addr, size, offset);
+}
 
-#define generic_find_next_zero_le_bit(addr, size, offset) find_next_zero_bit(addr, size, offset)
-#define generic_find_next_le_bit(addr, size, offset) \
-                        find_next_bit(addr, size, offset)
+static inline unsigned long find_first_zero_bit_le(const void *addr,
+                unsigned long size)
+{
+        return find_first_zero_bit(addr, size);
+}
 
 #elif defined(__BIG_ENDIAN)
 
-#define generic_test_le_bit(nr, addr) \
-        test_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-#define generic___set_le_bit(nr, addr) \
-        __set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-#define generic___clear_le_bit(nr, addr) \
-        __clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-
-#define generic_test_and_set_le_bit(nr, addr) \
-        test_and_set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-#define generic_test_and_clear_le_bit(nr, addr) \
-        test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-
-#define generic___test_and_set_le_bit(nr, addr) \
-        __test_and_set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-#define generic___test_and_clear_le_bit(nr, addr) \
-        __test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
+#define BITOP_LE_SWIZZLE        ((BITS_PER_LONG-1) & ~0x7)
 
-extern unsigned long generic_find_next_zero_le_bit(const unsigned long *addr,
+extern unsigned long find_next_zero_bit_le(const void *addr,
                 unsigned long size, unsigned long offset);
-extern unsigned long generic_find_next_le_bit(const unsigned long *addr,
+extern unsigned long find_next_bit_le(const void *addr,
                 unsigned long size, unsigned long offset);
 
+#define find_first_zero_bit_le(addr, size) \
+        find_next_zero_bit_le((addr), (size), 0)
+
 #else
 #error "Please fix <asm/byteorder.h>"
 #endif
 
-#define generic_find_first_zero_le_bit(addr, size) \
-        generic_find_next_zero_le_bit((addr), (size), 0)
+static inline int test_bit_le(int nr, const void *addr)
+{
+        return test_bit(nr ^ BITOP_LE_SWIZZLE, addr);
+}
+
+static inline void __set_bit_le(int nr, void *addr)
+{
+        __set_bit(nr ^ BITOP_LE_SWIZZLE, addr);
+}
+
+static inline void __clear_bit_le(int nr, void *addr)
+{
+        __clear_bit(nr ^ BITOP_LE_SWIZZLE, addr);
+}
+
+static inline int test_and_set_bit_le(int nr, void *addr)
+{
+        return test_and_set_bit(nr ^ BITOP_LE_SWIZZLE, addr);
+}
+
+static inline int test_and_clear_bit_le(int nr, void *addr)
+{
+        return test_and_clear_bit(nr ^ BITOP_LE_SWIZZLE, addr);
+}
+
+static inline int __test_and_set_bit_le(int nr, void *addr)
+{
+        return __test_and_set_bit(nr ^ BITOP_LE_SWIZZLE, addr);
+}
+
+static inline int __test_and_clear_bit_le(int nr, void *addr)
+{
+        return __test_and_clear_bit(nr ^ BITOP_LE_SWIZZLE, addr);
+}
 
 #endif /* _ASM_GENERIC_BITOPS_LE_H_ */
diff --git a/include/asm-generic/bitops/minix-le.h b/include/asm-generic/bitops/minix-le.h
deleted file mode 100644
index 4a981c1bb1ae..000000000000
--- a/include/asm-generic/bitops/minix-le.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _ASM_GENERIC_BITOPS_MINIX_LE_H_
-#define _ASM_GENERIC_BITOPS_MINIX_LE_H_
-
-#include <asm-generic/bitops/le.h>
-
-#define minix_test_and_set_bit(nr,addr) \
-        generic___test_and_set_le_bit((nr),(unsigned long *)(addr))
-#define minix_set_bit(nr,addr)          \
-        generic___set_le_bit((nr),(unsigned long *)(addr))
-#define minix_test_and_clear_bit(nr,addr) \
-        generic___test_and_clear_le_bit((nr),(unsigned long *)(addr))
-#define minix_test_bit(nr,addr)         \
-        generic_test_le_bit((nr),(unsigned long *)(addr))
-#define minix_find_first_zero_bit(addr,size) \
-        generic_find_first_zero_le_bit((unsigned long *)(addr),(size))
-
-#endif /* _ASM_GENERIC_BITOPS_MINIX_LE_H_ */
diff --git a/include/asm-generic/bitops/minix.h b/include/asm-generic/bitops/minix.h
deleted file mode 100644
index 91f42e87aa51..000000000000
--- a/include/asm-generic/bitops/minix.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _ASM_GENERIC_BITOPS_MINIX_H_
-#define _ASM_GENERIC_BITOPS_MINIX_H_
-
-#define minix_test_and_set_bit(nr,addr) \
-        __test_and_set_bit((nr),(unsigned long *)(addr))
-#define minix_set_bit(nr,addr)          \
-        __set_bit((nr),(unsigned long *)(addr))
-#define minix_test_and_clear_bit(nr,addr) \
-        __test_and_clear_bit((nr),(unsigned long *)(addr))
-#define minix_test_bit(nr,addr)         \
-        test_bit((nr),(unsigned long *)(addr))
-#define minix_find_first_zero_bit(addr,size) \
-        find_first_zero_bit((unsigned long *)(addr),(size))
-
-#endif /* _ASM_GENERIC_BITOPS_MINIX_H_ */
diff --git a/include/drm/drm.h b/include/drm/drm.h
index 9ac431396176..4be33b4ca2f8 100644
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
@@ -463,12 +463,15 @@ struct drm_irq_busid {
 enum drm_vblank_seq_type {
         _DRM_VBLANK_ABSOLUTE = 0x0,     /**< Wait for specific vblank sequence number */
         _DRM_VBLANK_RELATIVE = 0x1,     /**< Wait for given number of vblanks */
+        /* bits 1-6 are reserved for high crtcs */
+        _DRM_VBLANK_HIGH_CRTC_MASK = 0x0000003e,
         _DRM_VBLANK_EVENT = 0x4000000,   /**< Send event instead of blocking */
         _DRM_VBLANK_FLIP = 0x8000000,   /**< Scheduled buffer swap should flip */
         _DRM_VBLANK_NEXTONMISS = 0x10000000,    /**< If missed, wait for next vblank */
         _DRM_VBLANK_SECONDARY = 0x20000000,     /**< Secondary display controller */
         _DRM_VBLANK_SIGNAL = 0x40000000 /**< Send signal instead of blocking, unsupported */
 };
+#define _DRM_VBLANK_HIGH_CRTC_SHIFT 1
 
 #define _DRM_VBLANK_TYPES_MASK (_DRM_VBLANK_ABSOLUTE | _DRM_VBLANK_RELATIVE)
 #define _DRM_VBLANK_FLAGS_MASK (_DRM_VBLANK_EVENT | _DRM_VBLANK_SIGNAL | \
@@ -753,6 +756,7 @@ struct drm_event_vblank {
 };
 
 #define DRM_CAP_DUMB_BUFFER 0x1
+#define DRM_CAP_VBLANK_HIGH_CRTC 0x2
 
 /* typedef area */
 #ifndef __KERNEL__
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index b0ada6f37dd6..75cf611641e6 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -233,6 +233,7 @@ header-y += magic.h
 header-y += major.h
 header-y += map_to_7segment.h
 header-y += matroxfb.h
+header-y += media.h
 header-y += mempolicy.h
 header-y += meye.h
 header-y += mii.h
@@ -276,6 +277,7 @@ header-y += nfsacl.h
 header-y += nl80211.h
 header-y += nubus.h
 header-y += nvram.h
+header-y += omap3isp.h
 header-y += omapfb.h
 header-y += oom.h
 header-y += param.h
@@ -370,6 +372,8 @@ header-y += unistd.h
 header-y += usbdevice_fs.h
 header-y += utime.h
 header-y += utsname.h
+header-y += v4l2-mediabus.h
+header-y += v4l2-subdev.h
 header-y += veth.h
 header-y += vhost.h
 header-y += videodev2.h
diff --git a/include/linux/acpi_io.h b/include/linux/acpi_io.h
index 7180013a4a3a..4afd7102459d 100644
--- a/include/linux/acpi_io.h
+++ b/include/linux/acpi_io.h
@@ -10,7 +10,6 @@ static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys,
        return ioremap_cache(phys, size);
 }
 
-int acpi_os_map_generic_address(struct acpi_generic_address *addr);
-void acpi_os_unmap_generic_address(struct acpi_generic_address *addr);
+void __iomem *acpi_os_get_iomem(acpi_physical_address phys, unsigned int size);
 
 #endif
diff --git a/include/linux/aer.h b/include/linux/aer.h
index f7df1eefc107..8414de22a779 100644
--- a/include/linux/aer.h
+++ b/include/linux/aer.h
@@ -7,6 +7,28 @@
 #ifndef _AER_H_
 #define _AER_H_
 
+struct aer_header_log_regs {
+        unsigned int dw0;
+        unsigned int dw1;
+        unsigned int dw2;
+        unsigned int dw3;
+};
+
+struct aer_capability_regs {
+        u32 header;
+        u32 uncor_status;
+        u32 uncor_mask;
+        u32 uncor_severity;
+        u32 cor_status;
+        u32 cor_mask;
+        u32 cap_control;
+        struct aer_header_log_regs header_log;
+        u32 root_command;
+        u32 root_status;
+        u16 cor_err_source;
+        u16 uncor_err_source;
+};
+
 #if defined(CONFIG_PCIEAER)
 /* pci-e port driver needs this function to enable aer */
 extern int pci_enable_pcie_error_reporting(struct pci_dev *dev);
@@ -27,5 +49,7 @@ static inline int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev)
 }
 #endif
 
+extern void cper_print_aer(const char *prefix, int cper_severity,
+                           struct aer_capability_regs *aer);
 #endif //_AER_H_
 
diff --git a/include/linux/amba/clcd.h b/include/linux/amba/clcd.h
index be33b3affc8a..24d26efd1432 100644
--- a/include/linux/amba/clcd.h
+++ b/include/linux/amba/clcd.h
@@ -53,6 +53,7 @@
 #define CNTL_LCDBPP8            (3 << 1)
 #define CNTL_LCDBPP16           (4 << 1)
 #define CNTL_LCDBPP16_565       (6 << 1)
+#define CNTL_LCDBPP16_444       (7 << 1)
 #define CNTL_LCDBPP24           (5 << 1)
 #define CNTL_LCDBW              (1 << 4)
 #define CNTL_LCDTFT             (1 << 5)
@@ -66,6 +67,32 @@
 #define CNTL_LDMAFIFOTIME       (1 << 15)
 #define CNTL_WATERMARK          (1 << 16)
 
+enum {
+        /* individual formats */
+        CLCD_CAP_RGB444         = (1 << 0),
+        CLCD_CAP_RGB5551        = (1 << 1),
+        CLCD_CAP_RGB565         = (1 << 2),
+        CLCD_CAP_RGB888         = (1 << 3),
+        CLCD_CAP_BGR444         = (1 << 4),
+        CLCD_CAP_BGR5551        = (1 << 5),
+        CLCD_CAP_BGR565         = (1 << 6),
+        CLCD_CAP_BGR888         = (1 << 7),
+
+        /* connection layouts */
+        CLCD_CAP_444            = CLCD_CAP_RGB444 | CLCD_CAP_BGR444,
+        CLCD_CAP_5551           = CLCD_CAP_RGB5551 | CLCD_CAP_BGR5551,
+        CLCD_CAP_565            = CLCD_CAP_RGB565 | CLCD_CAP_BGR565,
+        CLCD_CAP_888            = CLCD_CAP_RGB888 | CLCD_CAP_BGR888,
+
+        /* red/blue ordering */
+        CLCD_CAP_RGB            = CLCD_CAP_RGB444 | CLCD_CAP_RGB5551 |
+                                  CLCD_CAP_RGB565 | CLCD_CAP_RGB888,
+        CLCD_CAP_BGR            = CLCD_CAP_BGR444 | CLCD_CAP_BGR5551 |
+                                  CLCD_CAP_BGR565 | CLCD_CAP_BGR888,
+
+        CLCD_CAP_ALL            = CLCD_CAP_BGR | CLCD_CAP_RGB,
+};
+
 struct clcd_panel {
         struct fb_videomode     mode;
         signed short            width;  /* width in mm */
@@ -73,6 +100,7 @@ struct clcd_panel {
         u32                     tim2;
         u32                     tim3;
         u32                     cntl;
+        u32                     caps;
         unsigned int            bpp:8,
                                 fixedtimings:1,
                                 grayscale:1;
@@ -97,6 +125,11 @@ struct clcd_board {
         const char *name;
 
         /*
+         * Optional.  Hardware capability flags.
+         */
+        u32     caps;
+
+        /*
          * Optional.  Check whether the var structure is acceptable
          * for this display.
          */
@@ -155,34 +188,35 @@ struct clcd_fb {
 
 static inline void clcdfb_decode(struct clcd_fb *fb, struct clcd_regs *regs)
 {
+        struct fb_var_screeninfo *var = &fb->fb.var;
         u32 val, cpl;
 
         /*
          * Program the CLCD controller registers and start the CLCD
          */
-        val = ((fb->fb.var.xres / 16) - 1) << 2;
-        val |= (fb->fb.var.hsync_len - 1) << 8;
-        val |= (fb->fb.var.right_margin - 1) << 16;
-        val |= (fb->fb.var.left_margin - 1) << 24;
+        val = ((var->xres / 16) - 1) << 2;
+        val |= (var->hsync_len - 1) << 8;
+        val |= (var->right_margin - 1) << 16;
+        val |= (var->left_margin - 1) << 24;
         regs->tim0 = val;
 
-        val = fb->fb.var.yres;
+        val = var->yres;
         if (fb->panel->cntl & CNTL_LCDDUAL)
                 val /= 2;
         val -= 1;
-        val |= (fb->fb.var.vsync_len - 1) << 10;
-        val |= fb->fb.var.lower_margin << 16;
-        val |= fb->fb.var.upper_margin << 24;
+        val |= (var->vsync_len - 1) << 10;
+        val |= var->lower_margin << 16;
+        val |= var->upper_margin << 24;
         regs->tim1 = val;
 
         val = fb->panel->tim2;
-        val |= fb->fb.var.sync & FB_SYNC_HOR_HIGH_ACT  ? 0 : TIM2_IHS;
-        val |= fb->fb.var.sync & FB_SYNC_VERT_HIGH_ACT ? 0 : TIM2_IVS;
+        val |= var->sync & FB_SYNC_HOR_HIGH_ACT  ? 0 : TIM2_IHS;
+        val |= var->sync & FB_SYNC_VERT_HIGH_ACT ? 0 : TIM2_IVS;
 
-        cpl = fb->fb.var.xres_virtual;
+        cpl = var->xres_virtual;
         if (fb->panel->cntl & CNTL_LCDTFT)        /* TFT */
                 /* / 1 */;
-        else if (!fb->fb.var.grayscale)           /* STN color */
+        else if (!var->grayscale)                 /* STN color */
                 cpl = cpl * 8 / 3;
         else if (fb->panel->cntl & CNTL_LCDMONO8) /* STN monochrome, 8bit */
                 cpl /= 8;
@@ -194,10 +228,22 @@ static inline void clcdfb_decode(struct clcd_fb *fb, struct clcd_regs *regs)
         regs->tim3 = fb->panel->tim3;
 
         val = fb->panel->cntl;
-        if (fb->fb.var.grayscale)
+        if (var->grayscale)
                 val |= CNTL_LCDBW;
 
-        switch (fb->fb.var.bits_per_pixel) {
+        if (fb->panel->caps && fb->board->caps &&
+            var->bits_per_pixel >= 16) {
+                /*
+                 * if board and panel supply capabilities, we can support
+                 * changing BGR/RGB depending on supplied parameters
+                 */
+                if (var->red.offset == 0)
+                        val &= ~CNTL_BGR;
+                else
+                        val |= CNTL_BGR;
+        }
+
+        switch (var->bits_per_pixel) {
         case 1:
                 val |= CNTL_LCDBPP1;
                 break;
@@ -212,15 +258,17 @@ static inline void clcdfb_decode(struct clcd_fb *fb, struct clcd_regs *regs)
                 break;
         case 16:
                 /*
-                 * PL110 cannot choose between 5551 and 565 modes in
-                 * its control register
+                 * PL110 cannot choose between 5551 and 565 modes in its
+                 * control register.  It is possible to use 565 with
+                 * custom external wiring.
                  */
-                if ((fb->dev->periphid & 0x000fffff) == 0x00041110)
+                if (amba_part(fb->dev) == 0x110 ||
+                    var->green.length == 5)
                         val |= CNTL_LCDBPP16;
-                else if (fb->fb.var.green.length == 5)
-                        val |= CNTL_LCDBPP16;
-                else
+                else if (var->green.length == 6)
                         val |= CNTL_LCDBPP16_565;
+                else
+                        val |= CNTL_LCDBPP16_444;
                 break;
         case 32:
                 val |= CNTL_LCDBPP24;
@@ -228,7 +276,7 @@ static inline void clcdfb_decode(struct clcd_fb *fb, struct clcd_regs *regs)
         }
 
         regs->cntl = val;
-        regs->pixclock = fb->fb.var.pixclock;
+        regs->pixclock = var->pixclock;
 }
 
 static inline int clcdfb_check(struct clcd_fb *fb, struct fb_var_screeninfo *var)
diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h
index 4ce34fa937d4..96f4094b706d 100644
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
@@ -66,8 +66,6 @@ struct backing_dev_info {
         unsigned int capabilities; /* Device capabilities */
         congested_fn *congested_fn; /* Function pointer if device is md/dm */
         void *congested_data;   /* Pointer to aux data for congested func */
-        void (*unplug_io_fn)(struct backing_dev_info *, struct page *);
-        void *unplug_io_data;
 
         char *name;
 
@@ -251,7 +249,6 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio);
 
 extern struct backing_dev_info default_backing_dev_info;
 extern struct backing_dev_info noop_backing_dev_info;
-void default_unplug_io_fn(struct backing_dev_info *bdi, struct page *page);
 
 int writeback_in_progress(struct backing_dev_info *bdi);
 
@@ -336,17 +333,4 @@ static inline int bdi_sched_wait(void *word)
         return 0;
 }
 
-static inline void blk_run_backing_dev(struct backing_dev_info *bdi,
-                                       struct page *page)
-{
-        if (bdi && bdi->unplug_io_fn)
-                bdi->unplug_io_fn(bdi, page);
-}
-
-static inline void blk_run_address_space(struct address_space *mapping)
-{
-        if (mapping)
-                blk_run_backing_dev(mapping->backing_dev_info, NULL);
-}
-
 #endif          /* _LINUX_BACKING_DEV_H */
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 35dcdb3589bc..ce33e6868a2f 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -304,7 +304,6 @@ struct biovec_slab {
 };
 
 extern struct bio_set *fs_bio_set;
-extern struct biovec_slab bvec_slabs[BIOVEC_NR_POOLS] __read_mostly;
 
 /*
  * a small number of entries is fine, not going to be performance critical.
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index 46ad5197537a..be50d9e70a7d 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -128,7 +128,6 @@ enum rq_flag_bits {
         __REQ_NOIDLE,           /* don't anticipate more IO after this one */
 
         /* bio only flags */
-        __REQ_UNPLUG,           /* unplug the immediately after submission */
         __REQ_RAHEAD,           /* read ahead, can fail anytime */
         __REQ_THROTTLED,        /* This bio has already been subjected to
                                  * throttling rules. Don't do it again. */
@@ -148,9 +147,11 @@ enum rq_flag_bits {
         __REQ_ALLOCED,          /* request came from our alloc pool */
         __REQ_COPY_USER,        /* contains copies of user pages */
         __REQ_FLUSH,            /* request for cache flush */
+        __REQ_FLUSH_SEQ,        /* request for flush sequence */
         __REQ_IO_STAT,          /* account I/O stat */
         __REQ_MIXED_MERGE,      /* merge of different types, fail separately */
         __REQ_SECURE,           /* secure discard (used with __REQ_DISCARD) */
+        __REQ_ON_PLUG,          /* on plug list */
         __REQ_NR_BITS,          /* stops here */
 };
 
@@ -170,7 +171,6 @@ enum rq_flag_bits {
          REQ_NOIDLE | REQ_FLUSH | REQ_FUA)
 #define REQ_CLONE_MASK          REQ_COMMON_MASK
 
-#define REQ_UNPLUG              (1 << __REQ_UNPLUG)
 #define REQ_RAHEAD              (1 << __REQ_RAHEAD)
 #define REQ_THROTTLED           (1 << __REQ_THROTTLED)
 
@@ -188,8 +188,10 @@ enum rq_flag_bits {
 #define REQ_ALLOCED             (1 << __REQ_ALLOCED)
 #define REQ_COPY_USER           (1 << __REQ_COPY_USER)
 #define REQ_FLUSH               (1 << __REQ_FLUSH)
+#define REQ_FLUSH_SEQ           (1 << __REQ_FLUSH_SEQ)
 #define REQ_IO_STAT             (1 << __REQ_IO_STAT)
 #define REQ_MIXED_MERGE         (1 << __REQ_MIXED_MERGE)
 #define REQ_SECURE              (1 << __REQ_SECURE)
+#define REQ_ON_PLUG             (1 << __REQ_ON_PLUG)
 
 #endif /* __LINUX_BLK_TYPES_H */
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index d5063e1b5555..16a902f099ac 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -108,11 +108,17 @@ struct request {
 
         /*
          * Three pointers are available for the IO schedulers, if they need
-         * more they have to dynamically allocate it.
+         * more they have to dynamically allocate it.  Flush requests are
+         * never put on the IO scheduler. So let the flush fields share
+         * space with the three elevator_private pointers.
          */
-        void *elevator_private;
-        void *elevator_private2;
-        void *elevator_private3;
+        union {
+                void *elevator_private[3];
+                struct {
+                        unsigned int            seq;
+                        struct list_head        list;
+                } flush;
+        };
 
         struct gendisk *rq_disk;
         struct hd_struct *part;
@@ -190,7 +196,6 @@ typedef void (request_fn_proc) (struct request_queue *q);
 typedef int (make_request_fn) (struct request_queue *q, struct bio *bio);
 typedef int (prep_rq_fn) (struct request_queue *, struct request *);
 typedef void (unprep_rq_fn) (struct request_queue *, struct request *);
-typedef void (unplug_fn) (struct request_queue *);
 
 struct bio_vec;
 struct bvec_merge_data {
@@ -273,7 +278,6 @@ struct request_queue
         make_request_fn         *make_request_fn;
         prep_rq_fn              *prep_rq_fn;
         unprep_rq_fn            *unprep_rq_fn;
-        unplug_fn               *unplug_fn;
         merge_bvec_fn           *merge_bvec_fn;
         softirq_done_fn         *softirq_done_fn;
         rq_timed_out_fn         *rq_timed_out_fn;
@@ -287,12 +291,9 @@ struct request_queue
         struct request          *boundary_rq;
 
         /*
-         * Auto-unplugging state
+         * Delayed queue handling
          */
-        struct timer_list       unplug_timer;
-        int                     unplug_thresh;  /* After this many requests */
-        unsigned long           unplug_delay;   /* After this many jiffies */
-        struct work_struct      unplug_work;
+        struct delayed_work     delay_work;
 
         struct backing_dev_info backing_dev_info;
 
@@ -363,11 +364,12 @@ struct request_queue
          * for flush operations
          */
         unsigned int            flush_flags;
-        unsigned int            flush_seq;
-        int                     flush_err;
+        unsigned int            flush_pending_idx:1;
+        unsigned int            flush_running_idx:1;
+        unsigned long           flush_pending_since;
+        struct list_head        flush_queue[2];
+        struct list_head        flush_data_in_flight;
         struct request          flush_rq;
-        struct request          *orig_flush_rq;
-        struct list_head        pending_flushes;
 
         struct mutex            sysfs_lock;
 
@@ -387,14 +389,13 @@ struct request_queue
 #define QUEUE_FLAG_ASYNCFULL    4       /* write queue has been filled */
 #define QUEUE_FLAG_DEAD         5       /* queue being torn down */
 #define QUEUE_FLAG_REENTER      6       /* Re-entrancy avoidance */
-#define QUEUE_FLAG_PLUGGED      7       /* queue is plugged */
-#define QUEUE_FLAG_ELVSWITCH    8       /* don't use elevator, just do FIFO */
-#define QUEUE_FLAG_BIDI         9       /* queue supports bidi requests */
-#define QUEUE_FLAG_NOMERGES    10       /* disable merge attempts */
-#define QUEUE_FLAG_SAME_COMP   11       /* force complete on same CPU */
-#define QUEUE_FLAG_FAIL_IO     12       /* fake timeout */
-#define QUEUE_FLAG_STACKABLE   13       /* supports request stacking */
-#define QUEUE_FLAG_NONROT      14       /* non-rotational device (SSD) */
+#define QUEUE_FLAG_ELVSWITCH    7       /* don't use elevator, just do FIFO */
+#define QUEUE_FLAG_BIDI         8       /* queue supports bidi requests */
+#define QUEUE_FLAG_NOMERGES     9       /* disable merge attempts */
+#define QUEUE_FLAG_SAME_COMP   10       /* force complete on same CPU */
+#define QUEUE_FLAG_FAIL_IO     11       /* fake timeout */
+#define QUEUE_FLAG_STACKABLE   12       /* supports request stacking */
+#define QUEUE_FLAG_NONROT      13       /* non-rotational device (SSD) */
 #define QUEUE_FLAG_VIRT        QUEUE_FLAG_NONROT /* paravirt device */
 #define QUEUE_FLAG_IO_STAT     15       /* do IO stats */
 #define QUEUE_FLAG_DISCARD     16       /* supports DISCARD */
@@ -472,7 +473,6 @@ static inline void queue_flag_clear(unsigned int flag, struct request_queue *q)
         __clear_bit(flag, &q->queue_flags);
 }
 
-#define blk_queue_plugged(q)    test_bit(QUEUE_FLAG_PLUGGED, &(q)->queue_flags)
 #define blk_queue_tagged(q)     test_bit(QUEUE_FLAG_QUEUED, &(q)->queue_flags)
 #define blk_queue_stopped(q)    test_bit(QUEUE_FLAG_STOPPED, &(q)->queue_flags)
 #define blk_queue_nomerges(q)   test_bit(QUEUE_FLAG_NOMERGES, &(q)->queue_flags)
@@ -667,9 +667,7 @@ extern int blk_rq_prep_clone(struct request *rq, struct request *rq_src,
 extern void blk_rq_unprep_clone(struct request *rq);
 extern int blk_insert_cloned_request(struct request_queue *q,
                                      struct request *rq);
-extern void blk_plug_device(struct request_queue *);
-extern void blk_plug_device_unlocked(struct request_queue *);
-extern int blk_remove_plug(struct request_queue *);
+extern void blk_delay_queue(struct request_queue *, unsigned long);
 extern void blk_recount_segments(struct request_queue *, struct bio *);
 extern int scsi_cmd_ioctl(struct request_queue *, struct gendisk *, fmode_t,
                           unsigned int, void __user *);
@@ -713,7 +711,6 @@ extern int blk_execute_rq(struct request_queue *, struct gendisk *,
                           struct request *, int);
 extern void blk_execute_rq_nowait(struct request_queue *, struct gendisk *,
                                   struct request *, int, rq_end_io_fn *);
-extern void blk_unplug(struct request_queue *q);
 
 static inline struct request_queue *bdev_get_queue(struct block_device *bdev)
 {
@@ -850,7 +847,6 @@ extern struct backing_dev_info *blk_get_backing_dev_info(struct block_device *bd
 
 extern int blk_rq_map_sg(struct request_queue *, struct request *, struct scatterlist *);
 extern void blk_dump_rq_flags(struct request *, char *);
-extern void generic_unplug_device(struct request_queue *);
 extern long nr_blockdev_pages(void);
 
 int blk_get_queue(struct request_queue *);
@@ -858,6 +854,31 @@ struct request_queue *blk_alloc_queue(gfp_t);
 struct request_queue *blk_alloc_queue_node(gfp_t, int);
 extern void blk_put_queue(struct request_queue *);
 
+struct blk_plug {
+        unsigned long magic;
+        struct list_head list;
+        unsigned int should_sort;
+};
+
+extern void blk_start_plug(struct blk_plug *);
+extern void blk_finish_plug(struct blk_plug *);
+extern void __blk_flush_plug(struct task_struct *, struct blk_plug *);
+
+static inline void blk_flush_plug(struct task_struct *tsk)
+{
+        struct blk_plug *plug = tsk->plug;
+
+        if (unlikely(plug))
+                __blk_flush_plug(tsk, plug);
+}
+
+static inline bool blk_needs_flush_plug(struct task_struct *tsk)
+{
+        struct blk_plug *plug = tsk->plug;
+
+        return plug && !list_empty(&plug->list);
+}
+
 /*
  * tag stuff
  */
@@ -1135,7 +1156,6 @@ static inline uint64_t rq_io_start_time_ns(struct request *req)
 extern int blk_throtl_init(struct request_queue *q);
 extern void blk_throtl_exit(struct request_queue *q);
 extern int blk_throtl_bio(struct request_queue *q, struct bio **bio);
-extern void throtl_shutdown_timer_wq(struct request_queue *q);
 #else /* CONFIG_BLK_DEV_THROTTLING */
 static inline int blk_throtl_bio(struct request_queue *q, struct bio **bio)
 {
@@ -1144,7 +1164,6 @@ static inline int blk_throtl_bio(struct request_queue *q, struct bio **bio)
 
 static inline int blk_throtl_init(struct request_queue *q) { return 0; }
 static inline int blk_throtl_exit(struct request_queue *q) { return 0; }
-static inline void throtl_shutdown_timer_wq(struct request_queue *q) {}
 #endif /* CONFIG_BLK_DEV_THROTTLING */
 
 #define MODULE_ALIAS_BLOCKDEV(major,minor) \
@@ -1278,6 +1297,26 @@ static inline long nr_blockdev_pages(void)
         return 0;
 }
 
+struct blk_plug {
+};
+
+static inline void blk_start_plug(struct blk_plug *plug)
+{
+}
+
+static inline void blk_finish_plug(struct blk_plug *plug)
+{
+}
+
+static inline void blk_flush_plug(struct task_struct *task)
+{
+}
+
+static inline bool blk_needs_flush_plug(struct task_struct *tsk)
+{
+        return false;
+}
+
 #endif /* CONFIG_BLOCK */
 
 #endif
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
index 499dfe982a0e..b8613e806aa9 100644
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
@@ -19,10 +19,6 @@ extern unsigned long min_low_pfn;
  */
 extern unsigned long max_pfn;
 
-#ifdef CONFIG_CRASH_DUMP
-extern unsigned long saved_max_pfn;
-#endif
-
 #ifndef CONFIG_NO_BOOTMEM
 /*
  * node_bootmem_map is a map pointer - the bits represent all physical 
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 68d1fe7b877c..f5df23561b96 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -219,7 +219,6 @@ int generic_cont_expand_simple(struct inode *inode, loff_t size);
 int block_commit_write(struct page *page, unsigned from, unsigned to);
 int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,
                                 get_block_t get_block);
-void block_sync_page(struct page *);
 sector_t generic_block_bmap(struct address_space *, sector_t, get_block_t *);
 int block_truncate_page(struct address_space *, loff_t, get_block_t *);
 int nobh_write_begin(struct address_space *, loff_t, unsigned, unsigned,
diff --git a/include/linux/capability.h b/include/linux/capability.h
index fb16a3699b99..16ee8b49a200 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -368,6 +368,15 @@ struct cpu_vfs_cap_data {
 
 #ifdef __KERNEL__
 
+struct dentry;
+struct user_namespace;
+
+struct user_namespace *current_user_ns(void);
+
+extern const kernel_cap_t __cap_empty_set;
+extern const kernel_cap_t __cap_full_set;
+extern const kernel_cap_t __cap_init_eff_set;
+
 /*
  * Internal kernel functions only
  */
@@ -530,40 +539,27 @@ static inline kernel_cap_t cap_raise_nfsd_set(const kernel_cap_t a,
                            cap_intersect(permitted, __cap_nfsd_set));
 }
 
-extern const kernel_cap_t __cap_empty_set;
-extern const kernel_cap_t __cap_full_set;
-extern const kernel_cap_t __cap_init_eff_set;
-
-/**
- * has_capability - Determine if a task has a superior capability available
- * @t: The task in question
- * @cap: The capability to be tested for
- *
- * Return true if the specified task has the given superior capability
- * currently in effect, false if not.
- *
- * Note that this does not set PF_SUPERPRIV on the task.
- */
-#define has_capability(t, cap) (security_real_capable((t), (cap)) == 0)
+extern bool has_capability(struct task_struct *t, int cap);
+extern bool has_ns_capability(struct task_struct *t,
+                              struct user_namespace *ns, int cap);
+extern bool has_capability_noaudit(struct task_struct *t, int cap);
+extern bool capable(int cap);
+extern bool ns_capable(struct user_namespace *ns, int cap);
+extern bool task_ns_capable(struct task_struct *t, int cap);
 
 /**
- * has_capability_noaudit - Determine if a task has a superior capability available (unaudited)
- * @t: The task in question
- * @cap: The capability to be tested for
+ * nsown_capable - Check superior capability to one's own user_ns
+ * @cap: The capability in question
  *
- * Return true if the specified task has the given superior capability
- * currently in effect, false if not, but don't write an audit message for the
- * check.
- *
- * Note that this does not set PF_SUPERPRIV on the task.
+ * Return true if the current task has the given superior capability
+ * targeted at its own user namespace.
  */
-#define has_capability_noaudit(t, cap) \
-        (security_real_capable_noaudit((t), (cap)) == 0)
-
-extern int capable(int cap);
+static inline bool nsown_capable(int cap)
+{
+        return ns_capable(current_user_ns(), cap);
+}
 
 /* audit system wants to get cap info from files as well */
-struct dentry;
 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
 
 #endif /* __KERNEL__ */
diff --git a/include/linux/cper.h b/include/linux/cper.h
index 3104aaff5dd0..372a25839fd1 100644
--- a/include/linux/cper.h
+++ b/include/linux/cper.h
@@ -388,5 +388,7 @@ struct cper_sec_pcie {
 #pragma pack()
 
 u64 cper_next_record_id(void);
+void cper_print_bits(const char *prefix, unsigned int bits,
+                     const char *strs[], unsigned int strs_size);
 
 #endif
diff --git a/include/linux/cred.h b/include/linux/cred.h
index 4aaeab376446..9aeeb0ba2003 100644
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -354,9 +354,11 @@ static inline void put_cred(const struct cred *_cred)
 #define current_fsgid()         (current_cred_xxx(fsgid))
 #define current_cap()           (current_cred_xxx(cap_effective))
 #define current_user()          (current_cred_xxx(user))
-#define current_user_ns()       (current_cred_xxx(user)->user_ns)
+#define _current_user_ns()      (current_cred_xxx(user)->user_ns)
 #define current_security()      (current_cred_xxx(security))
 
+extern struct user_namespace *current_user_ns(void);
+
 #define current_uid_gid(_uid, _gid)             \
 do {                                            \
         const struct cred *__cred;              \
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index 272496d1fae4..e2768834f397 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -286,11 +286,6 @@ void dm_table_add_target_callbacks(struct dm_table *t, struct dm_target_callback
 int dm_table_complete(struct dm_table *t);
 
 /*
- * Unplug all devices in a table.
- */
-void dm_table_unplug_all(struct dm_table *t);
-
-/*
  * Table reference counting.
  */
 struct dm_table *dm_get_live_table(struct mapped_device *md);
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 4d857973d2c9..d93efcc44570 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -20,7 +20,6 @@ typedef void (elevator_bio_merged_fn) (struct request_queue *,
 typedef int (elevator_dispatch_fn) (struct request_queue *, int);
 
 typedef void (elevator_add_req_fn) (struct request_queue *, struct request *);
-typedef int (elevator_queue_empty_fn) (struct request_queue *);
 typedef struct request *(elevator_request_list_fn) (struct request_queue *, struct request *);
 typedef void (elevator_completed_req_fn) (struct request_queue *, struct request *);
 typedef int (elevator_may_queue_fn) (struct request_queue *, int);
@@ -46,7 +45,6 @@ struct elevator_ops
         elevator_activate_req_fn *elevator_activate_req_fn;
         elevator_deactivate_req_fn *elevator_deactivate_req_fn;
 
-        elevator_queue_empty_fn *elevator_queue_empty_fn;
         elevator_completed_req_fn *elevator_completed_req_fn;
 
         elevator_request_list_fn *elevator_former_req_fn;
@@ -101,17 +99,17 @@ struct elevator_queue
  */
 extern void elv_dispatch_sort(struct request_queue *, struct request *);
 extern void elv_dispatch_add_tail(struct request_queue *, struct request *);
-extern void elv_add_request(struct request_queue *, struct request *, int, int);
-extern void __elv_add_request(struct request_queue *, struct request *, int, int);
+extern void elv_add_request(struct request_queue *, struct request *, int);
+extern void __elv_add_request(struct request_queue *, struct request *, int);
 extern void elv_insert(struct request_queue *, struct request *, int);
 extern int elv_merge(struct request_queue *, struct request **, struct bio *);
+extern int elv_try_merge(struct request *, struct bio *);
 extern void elv_merge_requests(struct request_queue *, struct request *,
                                struct request *);
 extern void elv_merged_request(struct request_queue *, struct request *, int);
 extern void elv_bio_merged(struct request_queue *q, struct request *,
                                 struct bio *);
 extern void elv_requeue_request(struct request_queue *, struct request *);
-extern int elv_queue_empty(struct request_queue *);
 extern struct request *elv_former_request(struct request_queue *, struct request *);
 extern struct request *elv_latter_request(struct request_queue *, struct request *);
 extern int elv_register_queue(struct request_queue *q);
@@ -167,6 +165,8 @@ extern struct request *elv_rb_find(struct rb_root *, sector_t);
 #define ELEVATOR_INSERT_BACK    2
 #define ELEVATOR_INSERT_SORT    3
 #define ELEVATOR_INSERT_REQUEUE 4
+#define ELEVATOR_INSERT_FLUSH   5
+#define ELEVATOR_INSERT_SORT_MERGE      6
 
 /*
  * return values from elevator_may_queue_fn
diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
index 6043c64c207a..85c1d302c12e 100644
--- a/include/linux/ext3_fs.h
+++ b/include/linux/ext3_fs.h
@@ -418,13 +418,13 @@ struct ext3_inode {
 #define EXT2_MOUNT_DATA_FLAGS           EXT3_MOUNT_DATA_FLAGS
 #endif
 
-#define ext3_set_bit                    ext2_set_bit
+#define ext3_set_bit                    __test_and_set_bit_le
 #define ext3_set_bit_atomic             ext2_set_bit_atomic
-#define ext3_clear_bit                  ext2_clear_bit
+#define ext3_clear_bit                  __test_and_clear_bit_le
 #define ext3_clear_bit_atomic           ext2_clear_bit_atomic
-#define ext3_test_bit                   ext2_test_bit
-#define ext3_find_first_zero_bit        ext2_find_first_zero_bit
-#define ext3_find_next_zero_bit         ext2_find_next_zero_bit
+#define ext3_test_bit                   test_bit_le
+#define ext3_find_first_zero_bit        find_first_zero_bit_le
+#define ext3_find_next_zero_bit         find_next_zero_bit_le
 
 /*
  * Maximal mount counts between two filesystem checks
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 12529e966350..b677bd77f2d6 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -138,16 +138,10 @@ struct inodes_stat_t {
  *                      block layer could (in theory) choose to ignore this
  *                      request if it runs into resource problems.
  * WRITE                A normal async write. Device will be plugged.
- * WRITE_SYNC_PLUG      Synchronous write. Identical to WRITE, but passes down
+ * WRITE_SYNC           Synchronous write. Identical to WRITE, but passes down
  *                      the hint that someone will be waiting on this IO
- *                      shortly. The device must still be unplugged explicitly,
- *                      WRITE_SYNC_PLUG does not do this as we could be
- *                      submitting more writes before we actually wait on any
- *                      of them.
- * WRITE_SYNC           Like WRITE_SYNC_PLUG, but also unplugs the device
- *                      immediately after submission. The write equivalent
- *                      of READ_SYNC.
- * WRITE_ODIRECT_PLUG   Special case write for O_DIRECT only.
+ *                      shortly. The write equivalent of READ_SYNC.
+ * WRITE_ODIRECT        Special case write for O_DIRECT only.
  * WRITE_FLUSH          Like WRITE_SYNC but with preceding cache flush.
  * WRITE_FUA            Like WRITE_SYNC but data is guaranteed to be on
  *                      non-volatile media on completion.
@@ -163,18 +157,14 @@ struct inodes_stat_t {
 #define WRITE                   RW_MASK
 #define READA                   RWA_MASK
 
-#define READ_SYNC               (READ | REQ_SYNC | REQ_UNPLUG)
+#define READ_SYNC               (READ | REQ_SYNC)
 #define READ_META               (READ | REQ_META)
-#define WRITE_SYNC_PLUG         (WRITE | REQ_SYNC | REQ_NOIDLE)
-#define WRITE_SYNC              (WRITE | REQ_SYNC | REQ_NOIDLE | REQ_UNPLUG)
-#define WRITE_ODIRECT_PLUG      (WRITE | REQ_SYNC)
+#define WRITE_SYNC              (WRITE | REQ_SYNC | REQ_NOIDLE)
+#define WRITE_ODIRECT           (WRITE | REQ_SYNC)
 #define WRITE_META              (WRITE | REQ_META)
-#define WRITE_FLUSH             (WRITE | REQ_SYNC | REQ_NOIDLE | REQ_UNPLUG | \
-                                 REQ_FLUSH)
-#define WRITE_FUA               (WRITE | REQ_SYNC | REQ_NOIDLE | REQ_UNPLUG | \
-                                 REQ_FUA)
-#define WRITE_FLUSH_FUA         (WRITE | REQ_SYNC | REQ_NOIDLE | REQ_UNPLUG | \
-                                 REQ_FLUSH | REQ_FUA)
+#define WRITE_FLUSH             (WRITE | REQ_SYNC | REQ_NOIDLE | REQ_FLUSH)
+#define WRITE_FUA               (WRITE | REQ_SYNC | REQ_NOIDLE | REQ_FUA)
+#define WRITE_FLUSH_FUA         (WRITE | REQ_SYNC | REQ_NOIDLE | REQ_FLUSH | REQ_FUA)
 
 #define SEL_IN          1
 #define SEL_OUT         2
@@ -586,7 +576,6 @@ typedef int (*read_actor_t)(read_descriptor_t *, struct page *,
 struct address_space_operations {
         int (*writepage)(struct page *page, struct writeback_control *wbc);
         int (*readpage)(struct file *, struct page *);
-        void (*sync_page)(struct page *);
 
         /* Write back some dirty pages from this mapping. */
         int (*writepages)(struct address_space *, struct writeback_control *);
@@ -1457,8 +1446,13 @@ enum {
 #define put_fs_excl() atomic_dec(&current->fs_excl)
 #define has_fs_excl() atomic_read(&current->fs_excl)
 
-#define is_owner_or_cap(inode)  \
-        ((current_fsuid() == (inode)->i_uid) || capable(CAP_FOWNER))
+/*
+ * until VFS tracks user namespaces for inodes, just make all files
+ * belong to init_user_ns
+ */
+extern struct user_namespace init_user_ns;
+#define inode_userns(inode) (&init_user_ns)
+extern bool inode_owner_or_capable(const struct inode *inode);
 
 /* not quite ready to be deprecated, but... */
 extern void lock_super(struct super_block *);
@@ -1642,7 +1636,7 @@ struct super_operations {
 };
 
 /*
- * Inode state bits.  Protected by inode_lock.
+ * Inode state bits.  Protected by inode->i_lock
  *
  * Three bits determine the dirty state of the inode, I_DIRTY_SYNC,
  * I_DIRTY_DATASYNC and I_DIRTY_PAGES.
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index c0d5f6945c1e..d764a426e9fd 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -109,7 +109,7 @@ struct hd_struct {
         int make_it_fail;
 #endif
         unsigned long stamp;
-        int in_flight[2];
+        atomic_t in_flight[2];
 #ifdef  CONFIG_SMP
         struct disk_stats __percpu *dkstats;
 #else
@@ -370,21 +370,21 @@ static inline void free_part_stats(struct hd_struct *part)
 
 static inline void part_inc_in_flight(struct hd_struct *part, int rw)
 {
-        part->in_flight[rw]++;
+        atomic_inc(&part->in_flight[rw]);
         if (part->partno)
-                part_to_disk(part)->part0.in_flight[rw]++;
+                atomic_inc(&part_to_disk(part)->part0.in_flight[rw]);
 }
 
 static inline void part_dec_in_flight(struct hd_struct *part, int rw)
 {
-        part->in_flight[rw]--;
+        atomic_dec(&part->in_flight[rw]);
         if (part->partno)
-                part_to_disk(part)->part0.in_flight[rw]--;
+                atomic_dec(&part_to_disk(part)->part0.in_flight[rw]);
 }
 
 static inline int part_in_flight(struct hd_struct *part)
 {
-        return part->in_flight[0] + part->in_flight[1];
+        return atomic_read(&part->in_flight[0]) + atomic_read(&part->in_flight[1]);
 }
 
 static inline struct partition_meta_info *alloc_part_info(struct gendisk *disk)
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index 58afd9d2c438..0c0d1ae79981 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -698,6 +698,7 @@ struct twl4030_platform_data {
         struct regulator_init_data              *vana;
         struct regulator_init_data              *vcxio;
         struct regulator_init_data              *vusb;
+        struct regulator_init_data              *clk32kg;
 };
 
 /*----------------------------------------------------------------------*/
@@ -777,5 +778,6 @@ static inline int twl4030charger_usb_en(int enable) { return 0; }
 
 /* INTERNAL LDOs */
 #define TWL6030_REG_VRTC        47
+#define TWL6030_REG_CLK32KG     48
 
 #endif /* End of __TWL4030_H */
diff --git a/include/linux/i2c/twl4030-madc.h b/include/linux/i2c/twl4030-madc.h
new file mode 100644
index 000000000000..6427d298fbfc
--- /dev/null
+++ b/include/linux/i2c/twl4030-madc.h
@@ -0,0 +1,141 @@
+/*
+ * twl4030_madc.h - Header for TWL4030 MADC
+ *
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ * J Keerthy <j-keerthy@ti.com>
+ *
+ * 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 published by the Free Software Foundation.
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef _TWL4030_MADC_H
+#define _TWL4030_MADC_H
+
+struct twl4030_madc_conversion_method {
+        u8 sel;
+        u8 avg;
+        u8 rbase;
+        u8 ctrl;
+};
+
+#define TWL4030_MADC_MAX_CHANNELS 16
+
+
+/*
+ * twl4030_madc_request- madc request packet for channel conversion
+ * @channels:   16 bit bitmap for individual channels
+ * @do_avgP:    sample the input channel for 4 consecutive cycles
+ * @method:     RT, SW1, SW2
+ * @type:       Polling or interrupt based method
+ */
+
+struct twl4030_madc_request {
+        unsigned long channels;
+        u16 do_avg;
+        u16 method;
+        u16 type;
+        bool active;
+        bool result_pending;
+        int rbuf[TWL4030_MADC_MAX_CHANNELS];
+        void (*func_cb)(int len, int channels, int *buf);
+};
+
+enum conversion_methods {
+        TWL4030_MADC_RT,
+        TWL4030_MADC_SW1,
+        TWL4030_MADC_SW2,
+        TWL4030_MADC_NUM_METHODS
+};
+
+enum sample_type {
+        TWL4030_MADC_WAIT,
+        TWL4030_MADC_IRQ_ONESHOT,
+        TWL4030_MADC_IRQ_REARM
+};
+
+#define TWL4030_MADC_CTRL1              0x00
+#define TWL4030_MADC_CTRL2              0x01
+
+#define TWL4030_MADC_RTSELECT_LSB       0x02
+#define TWL4030_MADC_SW1SELECT_LSB      0x06
+#define TWL4030_MADC_SW2SELECT_LSB      0x0A
+
+#define TWL4030_MADC_RTAVERAGE_LSB      0x04
+#define TWL4030_MADC_SW1AVERAGE_LSB     0x08
+#define TWL4030_MADC_SW2AVERAGE_LSB     0x0C
+
+#define TWL4030_MADC_CTRL_SW1           0x12
+#define TWL4030_MADC_CTRL_SW2           0x13
+
+#define TWL4030_MADC_RTCH0_LSB          0x17
+#define TWL4030_MADC_GPCH0_LSB          0x37
+
+#define TWL4030_MADC_MADCON     (1 << 0)        /* MADC power on */
+#define TWL4030_MADC_BUSY       (1 << 0)        /* MADC busy */
+/* MADC conversion completion */
+#define TWL4030_MADC_EOC_SW     (1 << 1)
+/* MADC SWx start conversion */
+#define TWL4030_MADC_SW_START   (1 << 5)
+#define TWL4030_MADC_ADCIN0     (1 << 0)
+#define TWL4030_MADC_ADCIN1     (1 << 1)
+#define TWL4030_MADC_ADCIN2     (1 << 2)
+#define TWL4030_MADC_ADCIN3     (1 << 3)
+#define TWL4030_MADC_ADCIN4     (1 << 4)
+#define TWL4030_MADC_ADCIN5     (1 << 5)
+#define TWL4030_MADC_ADCIN6     (1 << 6)
+#define TWL4030_MADC_ADCIN7     (1 << 7)
+#define TWL4030_MADC_ADCIN8     (1 << 8)
+#define TWL4030_MADC_ADCIN9     (1 << 9)
+#define TWL4030_MADC_ADCIN10    (1 << 10)
+#define TWL4030_MADC_ADCIN11    (1 << 11)
+#define TWL4030_MADC_ADCIN12    (1 << 12)
+#define TWL4030_MADC_ADCIN13    (1 << 13)
+#define TWL4030_MADC_ADCIN14    (1 << 14)
+#define TWL4030_MADC_ADCIN15    (1 << 15)
+
+/* Fixed channels */
+#define TWL4030_MADC_BTEMP      TWL4030_MADC_ADCIN1
+#define TWL4030_MADC_VBUS       TWL4030_MADC_ADCIN8
+#define TWL4030_MADC_VBKB       TWL4030_MADC_ADCIN9
+#define TWL4030_MADC_ICHG       TWL4030_MADC_ADCIN10
+#define TWL4030_MADC_VCHG       TWL4030_MADC_ADCIN11
+#define TWL4030_MADC_VBAT       TWL4030_MADC_ADCIN12
+
+/* Step size and prescaler ratio */
+#define TEMP_STEP_SIZE          147
+#define TEMP_PSR_R              100
+#define CURR_STEP_SIZE          147
+#define CURR_PSR_R1             44
+#define CURR_PSR_R2             88
+
+#define TWL4030_BCI_BCICTL1     0x23
+#define TWL4030_BCI_CGAIN       0x020
+#define TWL4030_BCI_MESBAT      (1 << 1)
+#define TWL4030_BCI_TYPEN       (1 << 4)
+#define TWL4030_BCI_ITHEN       (1 << 3)
+
+#define REG_BCICTL2             0x024
+#define TWL4030_BCI_ITHSENS     0x007
+
+struct twl4030_madc_user_parms {
+        int channel;
+        int average;
+        int status;
+        u16 result;
+};
+
+int twl4030_madc_conversion(struct twl4030_madc_request *conv);
+int twl4030_get_madc_conversion(int channel_no);
+#endif
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
index 51952989ad42..a6d1655f9607 100644
--- a/include/linux/ipc_namespace.h
+++ b/include/linux/ipc_namespace.h
@@ -5,6 +5,7 @@
 #include <linux/idr.h>
 #include <linux/rwsem.h>
 #include <linux/notifier.h>
+#include <linux/nsproxy.h>
 
 /*
  * ipc namespace events
@@ -15,6 +16,7 @@
 
 #define IPCNS_CALLBACK_PRI 0
 
+struct user_namespace;
 
 struct ipc_ids {
         int in_use;
@@ -56,6 +58,8 @@ struct ipc_namespace {
         unsigned int    mq_msg_max;      /* initialized to DFLT_MSGMAX */
         unsigned int    mq_msgsize_max;  /* initialized to DFLT_MSGSIZEMAX */
 
+        /* user_ns which owns the ipc ns */
+        struct user_namespace *user_ns;
 };
 
 extern struct ipc_namespace init_ipc_ns;
@@ -90,7 +94,7 @@ static inline int mq_init_ns(struct ipc_namespace *ns) { return 0; }
 
 #if defined(CONFIG_IPC_NS)
 extern struct ipc_namespace *copy_ipcs(unsigned long flags,
-                                       struct ipc_namespace *ns);
+                                       struct task_struct *tsk);
 static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
 {
         if (ns)
@@ -101,12 +105,12 @@ static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
 extern void put_ipc_ns(struct ipc_namespace *ns);
 #else
 static inline struct ipc_namespace *copy_ipcs(unsigned long flags,
-                struct ipc_namespace *ns)
+                                              struct task_struct *tsk)
 {
         if (flags & CLONE_NEWIPC)
                 return ERR_PTR(-EINVAL);
 
-        return ns;
+        return tsk->nsproxy->ipc_ns;
 }
 
 static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index 27e79c27ba08..a32dcaec04e1 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -432,13 +432,35 @@ struct jbd2_journal_handle
         int                     h_err;
 
         /* Flags [no locking] */
-        unsigned int    h_sync:         1;      /* sync-on-close */
-        unsigned int    h_jdata:        1;      /* force data journaling */
-        unsigned int    h_aborted:      1;      /* fatal error on handle */
+        unsigned int    h_sync:1;       /* sync-on-close */
+        unsigned int    h_jdata:1;      /* force data journaling */
+        unsigned int    h_aborted:1;    /* fatal error on handle */
+        unsigned int    h_cowing:1;     /* COWing block to snapshot */
+
+        /* Number of buffers requested by user:
+         * (before adding the COW credits factor) */
+        unsigned int    h_base_credits:14;
+
+        /* Number of buffers the user is allowed to dirty:
+         * (counts only buffers dirtied when !h_cowing) */
+        unsigned int    h_user_credits:14;
+
 
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
         struct lockdep_map      h_lockdep_map;
 #endif
+
+#ifdef CONFIG_JBD2_DEBUG
+        /* COW debugging counters: */
+        unsigned int h_cow_moved; /* blocks moved to snapshot */
+        unsigned int h_cow_copied; /* blocks copied to snapshot */
+        unsigned int h_cow_ok_jh; /* blocks already COWed during current
+                                     transaction */
+        unsigned int h_cow_ok_bitmap; /* blocks not set in COW bitmap */
+        unsigned int h_cow_ok_mapped;/* blocks already mapped in snapshot */
+        unsigned int h_cow_bitmaps; /* COW bitmaps created */
+        unsigned int h_cow_excluded; /* blocks set in exclude bitmap */
+#endif
 };
 
 
diff --git a/include/linux/journal-head.h b/include/linux/journal-head.h
index 525aac3c97df..44e95d0a721f 100644
--- a/include/linux/journal-head.h
+++ b/include/linux/journal-head.h
@@ -41,6 +41,13 @@ struct journal_head {
         unsigned b_modified;
 
         /*
+         * This feild tracks the last transaction id in which this buffer
+         * has been cowed
+         * [jbd_lock_bh_state()]
+         */
+        unsigned b_cow_tid;
+
+        /*
          * Copy of the buffer data frozen for writing to the log.
          * [jbd_lock_bh_state()]
          */
diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
index 092e4250a458..10ca03d0a250 100644
--- a/include/linux/kgdb.h
+++ b/include/linux/kgdb.h
@@ -297,6 +297,7 @@ extern int
 kgdb_handle_exception(int ex_vector, int signo, int err_code,
                       struct pt_regs *regs);
 extern int kgdb_nmicallback(int cpu, void *regs);
+extern void gdbstub_exit(int status);
 
 extern int                      kgdb_single_step;
 extern atomic_t                 kgdb_active;
diff --git a/include/linux/media.h b/include/linux/media.h
new file mode 100644
index 000000000000..0ef883327de2
--- /dev/null
+++ b/include/linux/media.h
@@ -0,0 +1,132 @@
+/*
+ * Multimedia device API
+ *
+ * Copyright (C) 2010 Nokia Corporation
+ *
+ * Contacts: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ *           Sakari Ailus <sakari.ailus@iki.fi>
+ *
+ * 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
+ * published by the Free Software Foundation.
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LINUX_MEDIA_H
+#define __LINUX_MEDIA_H
+
+#include <linux/ioctl.h>
+#include <linux/types.h>
+#include <linux/version.h>
+
+#define MEDIA_API_VERSION       KERNEL_VERSION(0, 1, 0)
+
+struct media_device_info {
+        char driver[16];
+        char model[32];
+        char serial[40];
+        char bus_info[32];
+        __u32 media_version;
+        __u32 hw_revision;
+        __u32 driver_version;
+        __u32 reserved[31];
+};
+
+#define MEDIA_ENT_ID_FLAG_NEXT          (1 << 31)
+
+#define MEDIA_ENT_TYPE_SHIFT            16
+#define MEDIA_ENT_TYPE_MASK             0x00ff0000
+#define MEDIA_ENT_SUBTYPE_MASK          0x0000ffff
+
+#define MEDIA_ENT_T_DEVNODE             (1 << MEDIA_ENT_TYPE_SHIFT)
+#define MEDIA_ENT_T_DEVNODE_V4L         (MEDIA_ENT_T_DEVNODE + 1)
+#define MEDIA_ENT_T_DEVNODE_FB          (MEDIA_ENT_T_DEVNODE + 2)
+#define MEDIA_ENT_T_DEVNODE_ALSA        (MEDIA_ENT_T_DEVNODE + 3)
+#define MEDIA_ENT_T_DEVNODE_DVB         (MEDIA_ENT_T_DEVNODE + 4)
+
+#define MEDIA_ENT_T_V4L2_SUBDEV         (2 << MEDIA_ENT_TYPE_SHIFT)
+#define MEDIA_ENT_T_V4L2_SUBDEV_SENSOR  (MEDIA_ENT_T_V4L2_SUBDEV + 1)
+#define MEDIA_ENT_T_V4L2_SUBDEV_FLASH   (MEDIA_ENT_T_V4L2_SUBDEV + 2)
+#define MEDIA_ENT_T_V4L2_SUBDEV_LENS    (MEDIA_ENT_T_V4L2_SUBDEV + 3)
+
+#define MEDIA_ENT_FL_DEFAULT            (1 << 0)
+
+struct media_entity_desc {
+        __u32 id;
+        char name[32];
+        __u32 type;
+        __u32 revision;
+        __u32 flags;
+        __u32 group_id;
+        __u16 pads;
+        __u16 links;
+
+        __u32 reserved[4];
+
+        union {
+                /* Node specifications */
+                struct {
+                        __u32 major;
+                        __u32 minor;
+                } v4l;
+                struct {
+                        __u32 major;
+                        __u32 minor;
+                } fb;
+                struct {
+                        __u32 card;
+                        __u32 device;
+                        __u32 subdevice;
+                } alsa;
+                int dvb;
+
+                /* Sub-device specifications */
+                /* Nothing needed yet */
+                __u8 raw[184];
+        };
+};
+
+#define MEDIA_PAD_FL_SINK               (1 << 0)
+#define MEDIA_PAD_FL_SOURCE             (1 << 1)
+
+struct media_pad_desc {
+        __u32 entity;           /* entity ID */
+        __u16 index;            /* pad index */
+        __u32 flags;            /* pad flags */
+        __u32 reserved[2];
+};
+
+#define MEDIA_LNK_FL_ENABLED            (1 << 0)
+#define MEDIA_LNK_FL_IMMUTABLE          (1 << 1)
+#define MEDIA_LNK_FL_DYNAMIC            (1 << 2)
+
+struct media_link_desc {
+        struct media_pad_desc source;
+        struct media_pad_desc sink;
+        __u32 flags;
+        __u32 reserved[2];
+};
+
+struct media_links_enum {
+        __u32 entity;
+        /* Should have enough room for pads elements */
+        struct media_pad_desc __user *pads;
+        /* Should have enough room for links elements */
+        struct media_link_desc __user *links;
+        __u32 reserved[4];
+};
+
+#define MEDIA_IOC_DEVICE_INFO           _IOWR('|', 0x00, struct media_device_info)
+#define MEDIA_IOC_ENUM_ENTITIES         _IOWR('|', 0x01, struct media_entity_desc)
+#define MEDIA_IOC_ENUM_LINKS            _IOWR('|', 0x02, struct media_links_enum)
+#define MEDIA_IOC_SETUP_LINK            _IOWR('|', 0x03, struct media_link_desc)
+
+#endif /* __LINUX_MEDIA_H */
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 5bb7be2628ca..5a5ce7055839 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -151,6 +151,10 @@ u64 mem_cgroup_get_limit(struct mem_cgroup *mem);
 void mem_cgroup_split_huge_fixup(struct page *head, struct page *tail);
 #endif
 
+#ifdef CONFIG_DEBUG_VM
+bool mem_cgroup_bad_page_check(struct page *page);
+void mem_cgroup_print_bad_page(struct page *page);
+#endif
 #else /* CONFIG_CGROUP_MEM_RES_CTLR */
 struct mem_cgroup;
 
@@ -352,5 +356,18 @@ static inline void mem_cgroup_split_huge_fixup(struct page *head,
 
 #endif /* CONFIG_CGROUP_MEM_CONT */
 
+#if !defined(CONFIG_CGROUP_MEM_RES_CTLR) || !defined(CONFIG_DEBUG_VM)
+static inline bool
+mem_cgroup_bad_page_check(struct page *page)
+{
+        return false;
+}
+
+static inline void
+mem_cgroup_print_bad_page(struct page *page)
+{
+}
+#endif
+
 #endif /* _LINUX_MEMCONTROL_H */
 
diff --git a/include/linux/mfd/88pm860x.h b/include/linux/mfd/88pm860x.h
index 4db1fbd8969e..8fba7972ff5f 100644
--- a/include/linux/mfd/88pm860x.h
+++ b/include/linux/mfd/88pm860x.h
@@ -131,9 +131,11 @@ enum {
         PM8607_ID_LDO8,
         PM8607_ID_LDO9,
         PM8607_ID_LDO10,
+        PM8607_ID_LDO11,
         PM8607_ID_LDO12,
         PM8607_ID_LDO13,
         PM8607_ID_LDO14,
+        PM8607_ID_LDO15,
 
         PM8607_ID_RG_MAX,
 };
@@ -310,8 +312,6 @@ struct pm860x_chip {
 
 };
 
-#define PM8607_MAX_REGULATOR    PM8607_ID_RG_MAX        /* 3 Bucks, 13 LDOs */
-
 enum {
         GI2C_PORT = 0,
         PI2C_PORT,
@@ -351,23 +351,31 @@ struct pm860x_platform_data {
         struct pm860x_led_pdata         *led;
         struct pm860x_touch_pdata       *touch;
         struct pm860x_power_pdata       *power;
+        struct regulator_init_data      *regulator;
 
         unsigned short  companion_addr; /* I2C address of companion chip */
         int             i2c_port;       /* Controlled by GI2C or PI2C */
         int             irq_mode;       /* Clear interrupt by read/write(0/1) */
         int             irq_base;       /* IRQ base number of 88pm860x */
-        struct regulator_init_data *regulator[PM8607_MAX_REGULATOR];
+        int             num_leds;
+        int             num_backlights;
+        int             num_regulators;
 };
 
-extern char pm860x_backlight_name[][MFD_NAME_SIZE];
-extern char pm860x_led_name[][MFD_NAME_SIZE];
-
 extern int pm860x_reg_read(struct i2c_client *, int);
 extern int pm860x_reg_write(struct i2c_client *, int, unsigned char);
 extern int pm860x_bulk_read(struct i2c_client *, int, int, unsigned char *);
 extern int pm860x_bulk_write(struct i2c_client *, int, int, unsigned char *);
 extern int pm860x_set_bits(struct i2c_client *, int, unsigned char,
                            unsigned char);
+extern int pm860x_page_reg_read(struct i2c_client *, int);
+extern int pm860x_page_reg_write(struct i2c_client *, int, unsigned char);
+extern int pm860x_page_bulk_read(struct i2c_client *, int, int,
+                                 unsigned char *);
+extern int pm860x_page_bulk_write(struct i2c_client *, int, int,
+                                  unsigned char *);
+extern int pm860x_page_set_bits(struct i2c_client *, int, unsigned char,
+                                unsigned char);
 
 extern int pm860x_device_init(struct pm860x_chip *chip,
                               struct pm860x_platform_data *pdata) __devinit ;
diff --git a/include/linux/mfd/ab8500.h b/include/linux/mfd/ab8500.h
index 37f56b7c4c15..56f8dea72152 100644
--- a/include/linux/mfd/ab8500.h
+++ b/include/linux/mfd/ab8500.h
@@ -111,8 +111,8 @@
  * @dev: parent device
  * @lock: read/write operations lock
  * @irq_lock: genirq bus lock
- * @revision: chip revision
  * @irq: irq line
+ * @chip_id: chip revision id
  * @write: register write
  * @read: register read
  * @rx_buf: rx buf for SPI
@@ -124,7 +124,7 @@ struct ab8500 {
         struct device   *dev;
         struct mutex    lock;
         struct mutex    irq_lock;
-        int             revision;
+
         int             irq_base;
         int             irq;
         u8              chip_id;
diff --git a/include/linux/mfd/ab8500/gpadc.h b/include/linux/mfd/ab8500/gpadc.h
new file mode 100644
index 000000000000..46b954011f16
--- /dev/null
+++ b/include/linux/mfd/ab8500/gpadc.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2010 ST-Ericsson SA
+ * Licensed under GPLv2.
+ *
+ * Author: Arun R Murthy <arun.murthy@stericsson.com>
+ * Author: Daniel Willerud <daniel.willerud@stericsson.com>
+ */
+
+#ifndef _AB8500_GPADC_H
+#define _AB8500_GPADC_H
+
+/* GPADC source: From datasheet(ADCSwSel[4:0] in GPADCCtrl2) */
+#define BAT_CTRL        0x01
+#define BTEMP_BALL      0x02
+#define MAIN_CHARGER_V  0x03
+#define ACC_DETECT1     0x04
+#define ACC_DETECT2     0x05
+#define ADC_AUX1        0x06
+#define ADC_AUX2        0x07
+#define MAIN_BAT_V      0x08
+#define VBUS_V          0x09
+#define MAIN_CHARGER_C  0x0A
+#define USB_CHARGER_C   0x0B
+#define BK_BAT_V        0x0C
+#define DIE_TEMP        0x0D
+
+struct ab8500_gpadc;
+
+struct ab8500_gpadc *ab8500_gpadc_get(char *name);
+int ab8500_gpadc_convert(struct ab8500_gpadc *gpadc, u8 input);
+
+#endif /* _AB8500_GPADC_H */
diff --git a/include/linux/mfd/ab8500/sysctrl.h b/include/linux/mfd/ab8500/sysctrl.h
new file mode 100644
index 000000000000..10da0291f8f8
--- /dev/null
+++ b/include/linux/mfd/ab8500/sysctrl.h
@@ -0,0 +1,254 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2010
+ * Author: Mattias Nilsson <mattias.i.nilsson@stericsson.com> for ST Ericsson.
+ * License terms: GNU General Public License (GPL) version 2
+ */
+#ifndef __AB8500_SYSCTRL_H
+#define __AB8500_SYSCTRL_H
+
+#include <linux/bitops.h>
+
+#ifdef CONFIG_AB8500_CORE
+
+int ab8500_sysctrl_read(u16 reg, u8 *value);
+int ab8500_sysctrl_write(u16 reg, u8 mask, u8 value);
+
+#else
+
+static inline int ab8500_sysctrl_read(u16 reg, u8 *value)
+{
+        return 0;
+}
+
+static inline int ab8500_sysctrl_write(u16 reg, u8 mask, u8 value)
+{
+        return 0;
+}
+
+#endif /* CONFIG_AB8500_CORE */
+
+static inline int ab8500_sysctrl_set(u16 reg, u8 bits)
+{
+        return ab8500_sysctrl_write(reg, bits, bits);
+}
+
+static inline int ab8500_sysctrl_clear(u16 reg, u8 bits)
+{
+        return ab8500_sysctrl_write(reg, bits, 0);
+}
+
+/* Registers */
+#define AB8500_TURNONSTATUS             0x100
+#define AB8500_RESETSTATUS              0x101
+#define AB8500_PONKEY1PRESSSTATUS       0x102
+#define AB8500_SYSCLKREQSTATUS          0x142
+#define AB8500_STW4500CTRL1             0x180
+#define AB8500_STW4500CTRL2             0x181
+#define AB8500_STW4500CTRL3             0x200
+#define AB8500_MAINWDOGCTRL             0x201
+#define AB8500_MAINWDOGTIMER            0x202
+#define AB8500_LOWBAT                   0x203
+#define AB8500_BATTOK                   0x204
+#define AB8500_SYSCLKTIMER              0x205
+#define AB8500_SMPSCLKCTRL              0x206
+#define AB8500_SMPSCLKSEL1              0x207
+#define AB8500_SMPSCLKSEL2              0x208
+#define AB8500_SMPSCLKSEL3              0x209
+#define AB8500_SYSULPCLKCONF            0x20A
+#define AB8500_SYSULPCLKCTRL1           0x20B
+#define AB8500_SYSCLKCTRL               0x20C
+#define AB8500_SYSCLKREQ1VALID          0x20D
+#define AB8500_SYSTEMCTRLSUP            0x20F
+#define AB8500_SYSCLKREQ1RFCLKBUF       0x210
+#define AB8500_SYSCLKREQ2RFCLKBUF       0x211
+#define AB8500_SYSCLKREQ3RFCLKBUF       0x212
+#define AB8500_SYSCLKREQ4RFCLKBUF       0x213
+#define AB8500_SYSCLKREQ5RFCLKBUF       0x214
+#define AB8500_SYSCLKREQ6RFCLKBUF       0x215
+#define AB8500_SYSCLKREQ7RFCLKBUF       0x216
+#define AB8500_SYSCLKREQ8RFCLKBUF       0x217
+#define AB8500_DITHERCLKCTRL            0x220
+#define AB8500_SWATCTRL                 0x230
+#define AB8500_HIQCLKCTRL               0x232
+#define AB8500_VSIMSYSCLKCTRL           0x233
+
+/* Bits */
+#define AB8500_TURNONSTATUS_PORNVBAT BIT(0)
+#define AB8500_TURNONSTATUS_PONKEY1DBF BIT(1)
+#define AB8500_TURNONSTATUS_PONKEY2DBF BIT(2)
+#define AB8500_TURNONSTATUS_RTCALARM BIT(3)
+#define AB8500_TURNONSTATUS_MAINCHDET BIT(4)
+#define AB8500_TURNONSTATUS_VBUSDET BIT(5)
+#define AB8500_TURNONSTATUS_USBIDDETECT BIT(6)
+
+#define AB8500_RESETSTATUS_RESETN4500NSTATUS BIT(0)
+#define AB8500_RESETSTATUS_SWRESETN4500NSTATUS BIT(2)
+
+#define AB8500_PONKEY1PRESSSTATUS_PONKEY1PRESSTIME_MASK 0x7F
+#define AB8500_PONKEY1PRESSSTATUS_PONKEY1PRESSTIME_SHIFT 0
+
+#define AB8500_SYSCLKREQSTATUS_SYSCLKREQ1STATUS BIT(0)
+#define AB8500_SYSCLKREQSTATUS_SYSCLKREQ2STATUS BIT(1)
+#define AB8500_SYSCLKREQSTATUS_SYSCLKREQ3STATUS BIT(2)
+#define AB8500_SYSCLKREQSTATUS_SYSCLKREQ4STATUS BIT(3)
+#define AB8500_SYSCLKREQSTATUS_SYSCLKREQ5STATUS BIT(4)
+#define AB8500_SYSCLKREQSTATUS_SYSCLKREQ6STATUS BIT(5)
+#define AB8500_SYSCLKREQSTATUS_SYSCLKREQ7STATUS BIT(6)
+#define AB8500_SYSCLKREQSTATUS_SYSCLKREQ8STATUS BIT(7)
+
+#define AB8500_STW4500CTRL1_SWOFF BIT(0)
+#define AB8500_STW4500CTRL1_SWRESET4500N BIT(1)
+#define AB8500_STW4500CTRL1_THDB8500SWOFF BIT(2)
+
+#define AB8500_STW4500CTRL2_RESETNVAUX1VALID BIT(0)
+#define AB8500_STW4500CTRL2_RESETNVAUX2VALID BIT(1)
+#define AB8500_STW4500CTRL2_RESETNVAUX3VALID BIT(2)
+#define AB8500_STW4500CTRL2_RESETNVMODVALID BIT(3)
+#define AB8500_STW4500CTRL2_RESETNVEXTSUPPLY1VALID BIT(4)
+#define AB8500_STW4500CTRL2_RESETNVEXTSUPPLY2VALID BIT(5)
+#define AB8500_STW4500CTRL2_RESETNVEXTSUPPLY3VALID BIT(6)
+#define AB8500_STW4500CTRL2_RESETNVSMPS1VALID BIT(7)
+
+#define AB8500_STW4500CTRL3_CLK32KOUT2DIS BIT(0)
+#define AB8500_STW4500CTRL3_RESETAUDN BIT(1)
+#define AB8500_STW4500CTRL3_RESETDENCN BIT(2)
+#define AB8500_STW4500CTRL3_THSDENA BIT(3)
+
+#define AB8500_MAINWDOGCTRL_MAINWDOGENA BIT(0)
+#define AB8500_MAINWDOGCTRL_MAINWDOGKICK BIT(1)
+#define AB8500_MAINWDOGCTRL_WDEXPTURNONVALID BIT(4)
+
+#define AB8500_MAINWDOGTIMER_MAINWDOGTIMER_MASK 0x7F
+#define AB8500_MAINWDOGTIMER_MAINWDOGTIMER_SHIFT 0
+
+#define AB8500_LOWBAT_LOWBATENA BIT(0)
+#define AB8500_LOWBAT_LOWBAT_MASK 0x7E
+#define AB8500_LOWBAT_LOWBAT_SHIFT 1
+
+#define AB8500_BATTOK_BATTOKSEL0THF_MASK 0x0F
+#define AB8500_BATTOK_BATTOKSEL0THF_SHIFT 0
+#define AB8500_BATTOK_BATTOKSEL1THF_MASK 0xF0
+#define AB8500_BATTOK_BATTOKSEL1THF_SHIFT 4
+
+#define AB8500_SYSCLKTIMER_SYSCLKTIMER_MASK 0x0F
+#define AB8500_SYSCLKTIMER_SYSCLKTIMER_SHIFT 0
+#define AB8500_SYSCLKTIMER_SYSCLKTIMERADJ_MASK 0xF0
+#define AB8500_SYSCLKTIMER_SYSCLKTIMERADJ_SHIFT 4
+
+#define AB8500_SMPSCLKCTRL_SMPSCLKINTSEL_MASK 0x03
+#define AB8500_SMPSCLKCTRL_SMPSCLKINTSEL_SHIFT 0
+#define AB8500_SMPSCLKCTRL_3M2CLKINTENA BIT(2)
+
+#define AB8500_SMPSCLKSEL1_VARMCLKSEL_MASK 0x07
+#define AB8500_SMPSCLKSEL1_VARMCLKSEL_SHIFT 0
+#define AB8500_SMPSCLKSEL1_VAPECLKSEL_MASK 0x38
+#define AB8500_SMPSCLKSEL1_VAPECLKSEL_SHIFT 3
+
+#define AB8500_SMPSCLKSEL2_VMODCLKSEL_MASK 0x07
+#define AB8500_SMPSCLKSEL2_VMODCLKSEL_SHIFT 0
+#define AB8500_SMPSCLKSEL2_VSMPS1CLKSEL_MASK 0x38
+#define AB8500_SMPSCLKSEL2_VSMPS1CLKSEL_SHIFT 3
+
+#define AB8500_SMPSCLKSEL3_VSMPS2CLKSEL_MASK 0x07
+#define AB8500_SMPSCLKSEL3_VSMPS2CLKSEL_SHIFT 0
+#define AB8500_SMPSCLKSEL3_VSMPS3CLKSEL_MASK 0x38
+#define AB8500_SMPSCLKSEL3_VSMPS3CLKSEL_SHIFT 3
+
+#define AB8500_SYSULPCLKCONF_ULPCLKCONF_MASK 0x03
+#define AB8500_SYSULPCLKCONF_ULPCLKCONF_SHIFT 0
+#define AB8500_SYSULPCLKCONF_CLK27MHZSTRE BIT(2)
+#define AB8500_SYSULPCLKCONF_TVOUTCLKDELN BIT(3)
+#define AB8500_SYSULPCLKCONF_TVOUTCLKINV BIT(4)
+#define AB8500_SYSULPCLKCONF_ULPCLKSTRE BIT(5)
+#define AB8500_SYSULPCLKCONF_CLK27MHZBUFENA BIT(6)
+#define AB8500_SYSULPCLKCONF_CLK27MHZPDENA BIT(7)
+
+#define AB8500_SYSULPCLKCTRL1_SYSULPCLKINTSEL_MASK 0x03
+#define AB8500_SYSULPCLKCTRL1_SYSULPCLKINTSEL_SHIFT 0
+#define AB8500_SYSULPCLKCTRL1_ULPCLKREQ BIT(2)
+#define AB8500_SYSULPCLKCTRL1_4500SYSCLKREQ BIT(3)
+#define AB8500_SYSULPCLKCTRL1_AUDIOCLKENA BIT(4)
+#define AB8500_SYSULPCLKCTRL1_SYSCLKBUF2REQ BIT(5)
+#define AB8500_SYSULPCLKCTRL1_SYSCLKBUF3REQ BIT(6)
+#define AB8500_SYSULPCLKCTRL1_SYSCLKBUF4REQ BIT(7)
+
+#define AB8500_SYSCLKCTRL_TVOUTPLLENA BIT(0)
+#define AB8500_SYSCLKCTRL_TVOUTCLKENA BIT(1)
+#define AB8500_SYSCLKCTRL_USBCLKENA BIT(2)
+
+#define AB8500_SYSCLKREQ1VALID_SYSCLKREQ1VALID BIT(0)
+#define AB8500_SYSCLKREQ1VALID_ULPCLKREQ1VALID BIT(1)
+#define AB8500_SYSCLKREQ1VALID_USBSYSCLKREQ1VALID BIT(2)
+
+#define AB8500_SYSTEMCTRLSUP_EXTSUP12LPNCLKSEL_MASK 0x03
+#define AB8500_SYSTEMCTRLSUP_EXTSUP12LPNCLKSEL_SHIFT 0
+#define AB8500_SYSTEMCTRLSUP_EXTSUP3LPNCLKSEL_MASK 0x0C
+#define AB8500_SYSTEMCTRLSUP_EXTSUP3LPNCLKSEL_SHIFT 2
+#define AB8500_SYSTEMCTRLSUP_INTDB8500NOD BIT(4)
+
+#define AB8500_SYSCLKREQ1RFCLKBUF_SYSCLKREQ1RFCLKBUF2 BIT(2)
+#define AB8500_SYSCLKREQ1RFCLKBUF_SYSCLKREQ1RFCLKBUF3 BIT(3)
+#define AB8500_SYSCLKREQ1RFCLKBUF_SYSCLKREQ1RFCLKBUF4 BIT(4)
+
+#define AB8500_SYSCLKREQ2RFCLKBUF_SYSCLKREQ2RFCLKBUF2 BIT(2)
+#define AB8500_SYSCLKREQ2RFCLKBUF_SYSCLKREQ2RFCLKBUF3 BIT(3)
+#define AB8500_SYSCLKREQ2RFCLKBUF_SYSCLKREQ2RFCLKBUF4 BIT(4)
+
+#define AB8500_SYSCLKREQ3RFCLKBUF_SYSCLKREQ3RFCLKBUF2 BIT(2)
+#define AB8500_SYSCLKREQ3RFCLKBUF_SYSCLKREQ3RFCLKBUF3 BIT(3)
+#define AB8500_SYSCLKREQ3RFCLKBUF_SYSCLKREQ3RFCLKBUF4 BIT(4)
+
+#define AB8500_SYSCLKREQ4RFCLKBUF_SYSCLKREQ4RFCLKBUF2 BIT(2)
+#define AB8500_SYSCLKREQ4RFCLKBUF_SYSCLKREQ4RFCLKBUF3 BIT(3)
+#define AB8500_SYSCLKREQ4RFCLKBUF_SYSCLKREQ4RFCLKBUF4 BIT(4)
+
+#define AB8500_SYSCLKREQ5RFCLKBUF_SYSCLKREQ5RFCLKBUF2 BIT(2)
+#define AB8500_SYSCLKREQ5RFCLKBUF_SYSCLKREQ5RFCLKBUF3 BIT(3)
+#define AB8500_SYSCLKREQ5RFCLKBUF_SYSCLKREQ5RFCLKBUF4 BIT(4)
+
+#define AB8500_SYSCLKREQ6RFCLKBUF_SYSCLKREQ6RFCLKBUF2 BIT(2)
+#define AB8500_SYSCLKREQ6RFCLKBUF_SYSCLKREQ6RFCLKBUF3 BIT(3)
+#define AB8500_SYSCLKREQ6RFCLKBUF_SYSCLKREQ6RFCLKBUF4 BIT(4)
+
+#define AB8500_SYSCLKREQ7RFCLKBUF_SYSCLKREQ7RFCLKBUF2 BIT(2)
+#define AB8500_SYSCLKREQ7RFCLKBUF_SYSCLKREQ7RFCLKBUF3 BIT(3)
+#define AB8500_SYSCLKREQ7RFCLKBUF_SYSCLKREQ7RFCLKBUF4 BIT(4)
+
+#define AB8500_SYSCLKREQ8RFCLKBUF_SYSCLKREQ8RFCLKBUF2 BIT(2)
+#define AB8500_SYSCLKREQ8RFCLKBUF_SYSCLKREQ8RFCLKBUF3 BIT(3)
+#define AB8500_SYSCLKREQ8RFCLKBUF_SYSCLKREQ8RFCLKBUF4 BIT(4)
+
+#define AB8500_DITHERCLKCTRL_VARMDITHERENA BIT(0)
+#define AB8500_DITHERCLKCTRL_VSMPS3DITHERENA BIT(1)
+#define AB8500_DITHERCLKCTRL_VSMPS1DITHERENA BIT(2)
+#define AB8500_DITHERCLKCTRL_VSMPS2DITHERENA BIT(3)
+#define AB8500_DITHERCLKCTRL_VMODDITHERENA BIT(4)
+#define AB8500_DITHERCLKCTRL_VAPEDITHERENA BIT(5)
+#define AB8500_DITHERCLKCTRL_DITHERDEL_MASK 0xC0
+#define AB8500_DITHERCLKCTRL_DITHERDEL_SHIFT 6
+
+#define AB8500_SWATCTRL_UPDATERF BIT(0)
+#define AB8500_SWATCTRL_SWATENABLE BIT(1)
+#define AB8500_SWATCTRL_RFOFFTIMER_MASK 0x1C
+#define AB8500_SWATCTRL_RFOFFTIMER_SHIFT 2
+#define AB8500_SWATCTRL_SWATBIT5 BIT(6)
+
+#define AB8500_HIQCLKCTRL_SYSCLKREQ1HIQENAVALID BIT(0)
+#define AB8500_HIQCLKCTRL_SYSCLKREQ2HIQENAVALID BIT(1)
+#define AB8500_HIQCLKCTRL_SYSCLKREQ3HIQENAVALID BIT(2)
+#define AB8500_HIQCLKCTRL_SYSCLKREQ4HIQENAVALID BIT(3)
+#define AB8500_HIQCLKCTRL_SYSCLKREQ5HIQENAVALID BIT(4)
+#define AB8500_HIQCLKCTRL_SYSCLKREQ6HIQENAVALID BIT(5)
+#define AB8500_HIQCLKCTRL_SYSCLKREQ7HIQENAVALID BIT(6)
+#define AB8500_HIQCLKCTRL_SYSCLKREQ8HIQENAVALID BIT(7)
+
+#define AB8500_VSIMSYSCLKCTRL_VSIMSYSCLKREQ1VALID BIT(0)
+#define AB8500_VSIMSYSCLKCTRL_VSIMSYSCLKREQ2VALID BIT(1)
+#define AB8500_VSIMSYSCLKCTRL_VSIMSYSCLKREQ3VALID BIT(2)
+#define AB8500_VSIMSYSCLKCTRL_VSIMSYSCLKREQ4VALID BIT(3)
+#define AB8500_VSIMSYSCLKCTRL_VSIMSYSCLKREQ5VALID BIT(4)
+#define AB8500_VSIMSYSCLKCTRL_VSIMSYSCLKREQ6VALID BIT(5)
+#define AB8500_VSIMSYSCLKCTRL_VSIMSYSCLKREQ7VALID BIT(6)
+#define AB8500_VSIMSYSCLKCTRL_VSIMSYSCLKREQ8VALID BIT(7)
+
+#endif /* __AB8500_SYSCTRL_H */
diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
index 67bd6f7ecf32..7d9b6ae1c203 100644
--- a/include/linux/mfd/abx500.h
+++ b/include/linux/mfd/abx500.h
@@ -186,7 +186,6 @@ struct abx500_init_settings {
 struct ab3550_platform_data {
         struct {unsigned int base; unsigned int count; } irq;
         void *dev_data[AB3550_NUM_DEVICES];
-        size_t dev_data_sz[AB3550_NUM_DEVICES];
         struct abx500_init_settings *init_settings;
         unsigned int init_settings_sz;
 };
diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
index 835996e167e1..1408bf8eed5f 100644
--- a/include/linux/mfd/core.h
+++ b/include/linux/mfd/core.h
@@ -25,22 +25,20 @@ struct mfd_cell {
         const char              *name;
         int                     id;
 
+        /* refcounting for multiple drivers to use a single cell */
+        atomic_t                *usage_count;
         int                     (*enable)(struct platform_device *dev);
         int                     (*disable)(struct platform_device *dev);
+
         int                     (*suspend)(struct platform_device *dev);
         int                     (*resume)(struct platform_device *dev);
 
-        /* driver-specific data for MFD-aware "cell" drivers */
-        void                    *driver_data;
-
-        /* platform_data can be used to either pass data to "generic"
-           driver or as a hook to mfd_cell for the "cell" drivers */
-        void                    *platform_data;
-        size_t                  data_size;
+        /* mfd_data can be used to pass data to client drivers */
+        void                    *mfd_data;
 
         /*
-         * This resources can be specified relatively to the parent device.
-         * For accessing device you should use resources from device
+         * These resources can be specified relative to the parent device.
+         * For accessing hardware you should use resources from the platform dev
          */
         int                     num_resources;
         const struct resource   *resources;
@@ -55,11 +53,47 @@ struct mfd_cell {
         bool                    pm_runtime_no_callbacks;
 };
 
+/*
+ * Convenience functions for clients using shared cells.  Refcounting
+ * happens automatically, with the cell's enable/disable callbacks
+ * being called only when a device is first being enabled or no other
+ * clients are making use of it.
+ */
+extern int mfd_cell_enable(struct platform_device *pdev);
+extern int mfd_cell_disable(struct platform_device *pdev);
+
+/*
+ * Given a platform device that's been created by mfd_add_devices(), fetch
+ * the mfd_cell that created it.
+ */
+static inline const struct mfd_cell *mfd_get_cell(struct platform_device *pdev)
+{
+        return pdev->dev.platform_data;
+}
+
+/*
+ * Given a platform device that's been created by mfd_add_devices(), fetch
+ * the .mfd_data entry from the mfd_cell that created it.
+ */
+static inline void *mfd_get_data(struct platform_device *pdev)
+{
+        return mfd_get_cell(pdev)->mfd_data;
+}
+
 extern int mfd_add_devices(struct device *parent, int id,
-                           const struct mfd_cell *cells, int n_devs,
+                           struct mfd_cell *cells, int n_devs,
                            struct resource *mem_base,
                            int irq_base);
 
 extern void mfd_remove_devices(struct device *parent);
 
+/*
+ * For MFD drivers with clients sharing access to resources, these create
+ * multiple platform devices per cell.  Contention handling must still be
+ * handled via drivers (ie, with enable/disable hooks).
+ */
+extern int mfd_shared_platform_driver_register(struct platform_driver *drv,
+                const char *cellname);
+extern void mfd_shared_platform_driver_unregister(struct platform_driver *drv);
+
 #endif
diff --git a/include/linux/mfd/max8997-private.h b/include/linux/mfd/max8997-private.h
new file mode 100644
index 000000000000..93a9477e075f
--- /dev/null
+++ b/include/linux/mfd/max8997-private.h
@@ -0,0 +1,347 @@
+/*
+ * max8997.h - Voltage regulator driver for the Maxim 8997
+ *
+ *  Copyright (C) 2010 Samsung Electrnoics
+ *  MyungJoo Ham <myungjoo.ham@samsung.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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LINUX_MFD_MAX8997_PRIV_H
+#define __LINUX_MFD_MAX8997_PRIV_H
+
+#include <linux/i2c.h>
+
+enum max8997_pmic_reg {
+        MAX8997_REG_PMIC_ID0    = 0x00,
+        MAX8997_REG_PMIC_ID1    = 0x01,
+        MAX8997_REG_INTSRC      = 0x02,
+        MAX8997_REG_INT1        = 0x03,
+        MAX8997_REG_INT2        = 0x04,
+        MAX8997_REG_INT3        = 0x05,
+        MAX8997_REG_INT4        = 0x06,
+
+        MAX8997_REG_INT1MSK     = 0x08,
+        MAX8997_REG_INT2MSK     = 0x09,
+        MAX8997_REG_INT3MSK     = 0x0a,
+        MAX8997_REG_INT4MSK     = 0x0b,
+
+        MAX8997_REG_STATUS1     = 0x0d,
+        MAX8997_REG_STATUS2     = 0x0e,
+        MAX8997_REG_STATUS3     = 0x0f,
+        MAX8997_REG_STATUS4     = 0x10,
+
+        MAX8997_REG_MAINCON1    = 0x13,
+        MAX8997_REG_MAINCON2    = 0x14,
+        MAX8997_REG_BUCKRAMP    = 0x15,
+
+        MAX8997_REG_BUCK1CTRL   = 0x18,
+        MAX8997_REG_BUCK1DVS1   = 0x19,
+        MAX8997_REG_BUCK1DVS2   = 0x1a,
+        MAX8997_REG_BUCK1DVS3   = 0x1b,
+        MAX8997_REG_BUCK1DVS4   = 0x1c,
+        MAX8997_REG_BUCK1DVS5   = 0x1d,
+        MAX8997_REG_BUCK1DVS6   = 0x1e,
+        MAX8997_REG_BUCK1DVS7   = 0x1f,
+        MAX8997_REG_BUCK1DVS8   = 0x20,
+        MAX8997_REG_BUCK2CTRL   = 0x21,
+        MAX8997_REG_BUCK2DVS1   = 0x22,
+        MAX8997_REG_BUCK2DVS2   = 0x23,
+        MAX8997_REG_BUCK2DVS3   = 0x24,
+        MAX8997_REG_BUCK2DVS4   = 0x25,
+        MAX8997_REG_BUCK2DVS5   = 0x26,
+        MAX8997_REG_BUCK2DVS6   = 0x27,
+        MAX8997_REG_BUCK2DVS7   = 0x28,
+        MAX8997_REG_BUCK2DVS8   = 0x29,
+        MAX8997_REG_BUCK3CTRL   = 0x2a,
+        MAX8997_REG_BUCK3DVS    = 0x2b,
+        MAX8997_REG_BUCK4CTRL   = 0x2c,
+        MAX8997_REG_BUCK4DVS    = 0x2d,
+        MAX8997_REG_BUCK5CTRL   = 0x2e,
+        MAX8997_REG_BUCK5DVS1   = 0x2f,
+        MAX8997_REG_BUCK5DVS2   = 0x30,
+        MAX8997_REG_BUCK5DVS3   = 0x31,
+        MAX8997_REG_BUCK5DVS4   = 0x32,
+        MAX8997_REG_BUCK5DVS5   = 0x33,
+        MAX8997_REG_BUCK5DVS6   = 0x34,
+        MAX8997_REG_BUCK5DVS7   = 0x35,
+        MAX8997_REG_BUCK5DVS8   = 0x36,
+        MAX8997_REG_BUCK6CTRL   = 0x37,
+        MAX8997_REG_BUCK6BPSKIPCTRL     = 0x38,
+        MAX8997_REG_BUCK7CTRL   = 0x39,
+        MAX8997_REG_BUCK7DVS    = 0x3a,
+        MAX8997_REG_LDO1CTRL    = 0x3b,
+        MAX8997_REG_LDO2CTRL    = 0x3c,
+        MAX8997_REG_LDO3CTRL    = 0x3d,
+        MAX8997_REG_LDO4CTRL    = 0x3e,
+        MAX8997_REG_LDO5CTRL    = 0x3f,
+        MAX8997_REG_LDO6CTRL    = 0x40,
+        MAX8997_REG_LDO7CTRL    = 0x41,
+        MAX8997_REG_LDO8CTRL    = 0x42,
+        MAX8997_REG_LDO9CTRL    = 0x43,
+        MAX8997_REG_LDO10CTRL   = 0x44,
+        MAX8997_REG_LDO11CTRL   = 0x45,
+        MAX8997_REG_LDO12CTRL   = 0x46,
+        MAX8997_REG_LDO13CTRL   = 0x47,
+        MAX8997_REG_LDO14CTRL   = 0x48,
+        MAX8997_REG_LDO15CTRL   = 0x49,
+        MAX8997_REG_LDO16CTRL   = 0x4a,
+        MAX8997_REG_LDO17CTRL   = 0x4b,
+        MAX8997_REG_LDO18CTRL   = 0x4c,
+        MAX8997_REG_LDO21CTRL   = 0x4d,
+
+        MAX8997_REG_MBCCTRL1    = 0x50,
+        MAX8997_REG_MBCCTRL2    = 0x51,
+        MAX8997_REG_MBCCTRL3    = 0x52,
+        MAX8997_REG_MBCCTRL4    = 0x53,
+        MAX8997_REG_MBCCTRL5    = 0x54,
+        MAX8997_REG_MBCCTRL6    = 0x55,
+        MAX8997_REG_OTPCGHCVS   = 0x56,
+
+        MAX8997_REG_SAFEOUTCTRL = 0x5a,
+
+        MAX8997_REG_LBCNFG1     = 0x5e,
+        MAX8997_REG_LBCNFG2     = 0x5f,
+        MAX8997_REG_BBCCTRL     = 0x60,
+
+        MAX8997_REG_FLASH1_CUR  = 0x63, /* 0x63 ~ 0x6e for FLASH */
+        MAX8997_REG_FLASH2_CUR  = 0x64,
+        MAX8997_REG_MOVIE_CUR   = 0x65,
+        MAX8997_REG_GSMB_CUR    = 0x66,
+        MAX8997_REG_BOOST_CNTL  = 0x67,
+        MAX8997_REG_LEN_CNTL    = 0x68,
+        MAX8997_REG_FLASH_CNTL  = 0x69,
+        MAX8997_REG_WDT_CNTL    = 0x6a,
+        MAX8997_REG_MAXFLASH1   = 0x6b,
+        MAX8997_REG_MAXFLASH2   = 0x6c,
+        MAX8997_REG_FLASHSTATUS = 0x6d,
+        MAX8997_REG_FLASHSTATUSMASK     = 0x6e,
+
+        MAX8997_REG_GPIOCNTL1   = 0x70,
+        MAX8997_REG_GPIOCNTL2   = 0x71,
+        MAX8997_REG_GPIOCNTL3   = 0x72,
+        MAX8997_REG_GPIOCNTL4   = 0x73,
+        MAX8997_REG_GPIOCNTL5   = 0x74,
+        MAX8997_REG_GPIOCNTL6   = 0x75,
+        MAX8997_REG_GPIOCNTL7   = 0x76,
+        MAX8997_REG_GPIOCNTL8   = 0x77,
+        MAX8997_REG_GPIOCNTL9   = 0x78,
+        MAX8997_REG_GPIOCNTL10  = 0x79,
+        MAX8997_REG_GPIOCNTL11  = 0x7a,
+        MAX8997_REG_GPIOCNTL12  = 0x7b,
+
+        MAX8997_REG_LDO1CONFIG  = 0x80,
+        MAX8997_REG_LDO2CONFIG  = 0x81,
+        MAX8997_REG_LDO3CONFIG  = 0x82,
+        MAX8997_REG_LDO4CONFIG  = 0x83,
+        MAX8997_REG_LDO5CONFIG  = 0x84,
+        MAX8997_REG_LDO6CONFIG  = 0x85,
+        MAX8997_REG_LDO7CONFIG  = 0x86,
+        MAX8997_REG_LDO8CONFIG  = 0x87,
+        MAX8997_REG_LDO9CONFIG  = 0x88,
+        MAX8997_REG_LDO10CONFIG = 0x89,
+        MAX8997_REG_LDO11CONFIG = 0x8a,
+        MAX8997_REG_LDO12CONFIG = 0x8b,
+        MAX8997_REG_LDO13CONFIG = 0x8c,
+        MAX8997_REG_LDO14CONFIG = 0x8d,
+        MAX8997_REG_LDO15CONFIG = 0x8e,
+        MAX8997_REG_LDO16CONFIG = 0x8f,
+        MAX8997_REG_LDO17CONFIG = 0x90,
+        MAX8997_REG_LDO18CONFIG = 0x91,
+        MAX8997_REG_LDO21CONFIG = 0x92,
+
+        MAX8997_REG_DVSOKTIMER1 = 0x97,
+        MAX8997_REG_DVSOKTIMER2 = 0x98,
+        MAX8997_REG_DVSOKTIMER4 = 0x99,
+        MAX8997_REG_DVSOKTIMER5 = 0x9a,
+
+        MAX8997_REG_PMIC_END    = 0x9b,
+};
+
+enum max8997_muic_reg {
+        MAX8997_MUIC_REG_ID             = 0x0,
+        MAX8997_MUIC_REG_INT1           = 0x1,
+        MAX8997_MUIC_REG_INT2           = 0x2,
+        MAX8997_MUIC_REG_INT3           = 0x3,
+        MAX8997_MUIC_REG_STATUS1        = 0x4,
+        MAX8997_MUIC_REG_STATUS2        = 0x5,
+        MAX8997_MUIC_REG_STATUS3        = 0x6,
+        MAX8997_MUIC_REG_INTMASK1       = 0x7,
+        MAX8997_MUIC_REG_INTMASK2       = 0x8,
+        MAX8997_MUIC_REG_INTMASK3       = 0x9,
+        MAX8997_MUIC_REG_CDETCTRL       = 0xa,
+
+        MAX8997_MUIC_REG_CONTROL1       = 0xc,
+        MAX8997_MUIC_REG_CONTROL2       = 0xd,
+        MAX8997_MUIC_REG_CONTROL3       = 0xe,
+
+        MAX8997_MUIC_REG_END            = 0xf,
+};
+
+enum max8997_haptic_reg {
+        MAX8997_HAPTIC_REG_GENERAL      = 0x00,
+        MAX8997_HAPTIC_REG_CONF1        = 0x01,
+        MAX8997_HAPTIC_REG_CONF2        = 0x02,
+        MAX8997_HAPTIC_REG_DRVCONF      = 0x03,
+        MAX8997_HAPTIC_REG_CYCLECONF1   = 0x04,
+        MAX8997_HAPTIC_REG_CYCLECONF2   = 0x05,
+        MAX8997_HAPTIC_REG_SIGCONF1     = 0x06,
+        MAX8997_HAPTIC_REG_SIGCONF2     = 0x07,
+        MAX8997_HAPTIC_REG_SIGCONF3     = 0x08,
+        MAX8997_HAPTIC_REG_SIGCONF4     = 0x09,
+        MAX8997_HAPTIC_REG_SIGDC1       = 0x0a,
+        MAX8997_HAPTIC_REG_SIGDC2       = 0x0b,
+        MAX8997_HAPTIC_REG_SIGPWMDC1    = 0x0c,
+        MAX8997_HAPTIC_REG_SIGPWMDC2    = 0x0d,
+        MAX8997_HAPTIC_REG_SIGPWMDC3    = 0x0e,
+        MAX8997_HAPTIC_REG_SIGPWMDC4    = 0x0f,
+        MAX8997_HAPTIC_REG_MTR_REV      = 0x10,
+
+        MAX8997_HAPTIC_REG_END          = 0x11,
+};
+
+/* slave addr = 0x0c: using "2nd part" of rev4 datasheet */
+enum max8997_rtc_reg {
+        MAX8997_RTC_CTRLMASK            = 0x02,
+        MAX8997_RTC_CTRL                = 0x03,
+        MAX8997_RTC_UPDATE1             = 0x04,
+        MAX8997_RTC_UPDATE2             = 0x05,
+        MAX8997_RTC_WTSR_SMPL           = 0x06,
+
+        MAX8997_RTC_SEC                 = 0x10,
+        MAX8997_RTC_MIN                 = 0x11,
+        MAX8997_RTC_HOUR                = 0x12,
+        MAX8997_RTC_DAY_OF_WEEK         = 0x13,
+        MAX8997_RTC_MONTH               = 0x14,
+        MAX8997_RTC_YEAR                = 0x15,
+        MAX8997_RTC_DAY_OF_MONTH        = 0x16,
+        MAX8997_RTC_ALARM1_SEC          = 0x17,
+        MAX8997_RTC_ALARM1_MIN          = 0x18,
+        MAX8997_RTC_ALARM1_HOUR         = 0x19,
+        MAX8997_RTC_ALARM1_DAY_OF_WEEK  = 0x1a,
+        MAX8997_RTC_ALARM1_MONTH        = 0x1b,
+        MAX8997_RTC_ALARM1_YEAR         = 0x1c,
+        MAX8997_RTC_ALARM1_DAY_OF_MONTH = 0x1d,
+        MAX8997_RTC_ALARM2_SEC          = 0x1e,
+        MAX8997_RTC_ALARM2_MIN          = 0x1f,
+        MAX8997_RTC_ALARM2_HOUR         = 0x20,
+        MAX8997_RTC_ALARM2_DAY_OF_WEEK  = 0x21,
+        MAX8997_RTC_ALARM2_MONTH        = 0x22,
+        MAX8997_RTC_ALARM2_YEAR         = 0x23,
+        MAX8997_RTC_ALARM2_DAY_OF_MONTH = 0x24,
+};
+
+enum max8997_irq_source {
+        PMIC_INT1 = 0,
+        PMIC_INT2,
+        PMIC_INT3,
+        PMIC_INT4,
+
+        FUEL_GAUGE, /* Ignored (MAX17042 driver handles) */
+
+        MUIC_INT1,
+        MUIC_INT2,
+        MUIC_INT3,
+
+        GPIO_LOW, /* Not implemented */
+        GPIO_HI, /* Not implemented */
+
+        FLASH_STATUS, /* Not implemented */
+
+        MAX8997_IRQ_GROUP_NR,
+};
+
+enum max8997_irq {
+        MAX8997_PMICIRQ_PWRONR,
+        MAX8997_PMICIRQ_PWRONF,
+        MAX8997_PMICIRQ_PWRON1SEC,
+        MAX8997_PMICIRQ_JIGONR,
+        MAX8997_PMICIRQ_JIGONF,
+        MAX8997_PMICIRQ_LOWBAT2,
+        MAX8997_PMICIRQ_LOWBAT1,
+
+        MAX8997_PMICIRQ_JIGR,
+        MAX8997_PMICIRQ_JIGF,
+        MAX8997_PMICIRQ_MR,
+        MAX8997_PMICIRQ_DVS1OK,
+        MAX8997_PMICIRQ_DVS2OK,
+        MAX8997_PMICIRQ_DVS3OK,
+        MAX8997_PMICIRQ_DVS4OK,
+
+        MAX8997_PMICIRQ_CHGINS,
+        MAX8997_PMICIRQ_CHGRM,
+        MAX8997_PMICIRQ_DCINOVP,
+        MAX8997_PMICIRQ_TOPOFFR,
+        MAX8997_PMICIRQ_CHGRSTF,
+        MAX8997_PMICIRQ_MBCHGTMEXPD,
+
+        MAX8997_PMICIRQ_RTC60S,
+        MAX8997_PMICIRQ_RTCA1,
+        MAX8997_PMICIRQ_RTCA2,
+        MAX8997_PMICIRQ_SMPL_INT,
+        MAX8997_PMICIRQ_RTC1S,
+        MAX8997_PMICIRQ_WTSR,
+
+        MAX8997_MUICIRQ_ADCError,
+        MAX8997_MUICIRQ_ADCLow,
+        MAX8997_MUICIRQ_ADC,
+
+        MAX8997_MUICIRQ_VBVolt,
+        MAX8997_MUICIRQ_DBChg,
+        MAX8997_MUICIRQ_DCDTmr,
+        MAX8997_MUICIRQ_ChgDetRun,
+        MAX8997_MUICIRQ_ChgTyp,
+
+        MAX8997_MUICIRQ_OVP,
+
+        MAX8997_IRQ_NR,
+};
+
+#define MAX8997_REG_BUCK1DVS(x) (MAX8997_REG_BUCK1DVS1 + (x) - 1)
+#define MAX8997_REG_BUCK2DVS(x) (MAX8997_REG_BUCK2DVS1 + (x) - 1)
+#define MAX8997_REG_BUCK5DVS(x) (MAX8997_REG_BUCK5DVS1 + (x) - 1)
+
+struct max8997_dev {
+        struct device *dev;
+        struct i2c_client *i2c; /* 0xcc / PMIC, Battery Control, and FLASH */
+        struct i2c_client *rtc; /* slave addr 0x0c */
+        struct i2c_client *haptic; /* slave addr 0x90 */
+        struct i2c_client *muic; /* slave addr 0x4a */
+        struct mutex iolock;
+
+        int type;
+        struct platform_device *battery; /* battery control (not fuel gauge) */
+
+        bool wakeup;
+
+        /* For hibernation */
+        u8 reg_dump[MAX8997_REG_PMIC_END + MAX8997_MUIC_REG_END +
+                MAX8997_HAPTIC_REG_END];
+};
+
+enum max8997_types {
+        TYPE_MAX8997,
+        TYPE_MAX8966,
+};
+
+extern int max8997_read_reg(struct i2c_client *i2c, u8 reg, u8 *dest);
+extern int max8997_bulk_read(struct i2c_client *i2c, u8 reg, int count,
+                                u8 *buf);
+extern int max8997_write_reg(struct i2c_client *i2c, u8 reg, u8 value);
+extern int max8997_bulk_write(struct i2c_client *i2c, u8 reg, int count,
+                                u8 *buf);
+extern int max8997_update_reg(struct i2c_client *i2c, u8 reg, u8 val, u8 mask);
+
+#endif /*  __LINUX_MFD_MAX8997_PRIV_H */
diff --git a/include/linux/mfd/max8997.h b/include/linux/mfd/max8997.h
new file mode 100644
index 000000000000..cb671b3451bf
--- /dev/null
+++ b/include/linux/mfd/max8997.h
@@ -0,0 +1,114 @@
+/*
+ * max8997.h - Driver for the Maxim 8997/8966
+ *
+ *  Copyright (C) 2009-2010 Samsung Electrnoics
+ *  MyungJoo Ham <myungjoo.ham@samsung.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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * This driver is based on max8998.h
+ *
+ * MAX8997 has PMIC, MUIC, HAPTIC, RTC, FLASH, and Fuel Gauge devices.
+ * Except Fuel Gauge, every device shares the same I2C bus and included in
+ * this mfd driver. Although the fuel gauge is included in the chip, it is
+ * excluded from the driver because a) it has a different I2C bus from
+ * others and b) it can be enabled simply by using MAX17042 driver.
+ */
+
+#ifndef __LINUX_MFD_MAX8998_H
+#define __LINUX_MFD_MAX8998_H
+
+#include <linux/regulator/consumer.h>
+
+/* MAX8997/8966 regulator IDs */
+enum max8998_regulators {
+        MAX8997_LDO1 = 0,
+        MAX8997_LDO2,
+        MAX8997_LDO3,
+        MAX8997_LDO4,
+        MAX8997_LDO5,
+        MAX8997_LDO6,
+        MAX8997_LDO7,
+        MAX8997_LDO8,
+        MAX8997_LDO9,
+        MAX8997_LDO10,
+        MAX8997_LDO11,
+        MAX8997_LDO12,
+        MAX8997_LDO13,
+        MAX8997_LDO14,
+        MAX8997_LDO15,
+        MAX8997_LDO16,
+        MAX8997_LDO17,
+        MAX8997_LDO18,
+        MAX8997_LDO21,
+        MAX8997_BUCK1,
+        MAX8997_BUCK2,
+        MAX8997_BUCK3,
+        MAX8997_BUCK4,
+        MAX8997_BUCK5,
+        MAX8997_BUCK6,
+        MAX8997_BUCK7,
+        MAX8997_EN32KHZ_AP,
+        MAX8997_EN32KHZ_CP,
+        MAX8997_ENVICHG,
+        MAX8997_ESAFEOUT1,
+        MAX8997_ESAFEOUT2,
+        MAX8997_CHARGER_CV, /* control MBCCV of MBCCTRL3 */
+        MAX8997_CHARGER, /* charger current, MBCCTRL4 */
+        MAX8997_CHARGER_TOPOFF, /* MBCCTRL5 */
+
+        MAX8997_REG_MAX,
+};
+
+struct max8997_regulator_data {
+        int id;
+        struct regulator_init_data *initdata;
+};
+
+struct max8997_platform_data {
+        bool wakeup;
+        /* IRQ: Not implemented */
+        /* ---- PMIC ---- */
+        struct max8997_regulator_data *regulators;
+        int num_regulators;
+
+        /*
+         * SET1~3 DVS GPIOs control Buck1, 2, and 5 simultaneously. Therefore,
+         * With buckx_gpiodvs enabled, the buckx cannot be controlled
+         * independently. To control buckx (of 1, 2, and 5) independently,
+         * disable buckx_gpiodvs and control with BUCKxDVS1 register.
+         *
+         * When buckx_gpiodvs and bucky_gpiodvs are both enabled, set_voltage
+         * on buckx will change the voltage of bucky at the same time.
+         *
+         */
+        bool ignore_gpiodvs_side_effect;
+        int buck125_gpios[3]; /* GPIO of [0]SET1, [1]SET2, [2]SET3 */
+        int buck125_default_idx; /* Default value of SET1, 2, 3 */
+        unsigned int buck1_voltage[8]; /* buckx_voltage in uV */
+        bool buck1_gpiodvs;
+        unsigned int buck2_voltage[8];
+        bool buck2_gpiodvs;
+        unsigned int buck5_voltage[8];
+        bool buck5_gpiodvs;
+
+        /* MUIC: Not implemented */
+        /* HAPTIC: Not implemented */
+        /* RTC: Not implemented */
+        /* Flash: Not implemented */
+        /* Charger control: Not implemented */
+};
+
+#endif /* __LINUX_MFD_MAX8998_H */
diff --git a/include/linux/mfd/mc13xxx.h b/include/linux/mfd/mc13xxx.h
index a1d391b40e68..c064beaaccb7 100644
--- a/include/linux/mfd/mc13xxx.h
+++ b/include/linux/mfd/mc13xxx.h
@@ -146,8 +146,7 @@ struct mc13xxx_platform_data {
 #define MC13XXX_USE_LED         (1 << 5)
         unsigned int flags;
 
-        int num_regulators;
-        struct mc13xxx_regulator_init_data *regulators;
+        struct mc13xxx_regulator_platform_data regulators;
         struct mc13xxx_leds_platform_data *leds;
 };
 
diff --git a/include/linux/mfd/tps6105x.h b/include/linux/mfd/tps6105x.h
new file mode 100644
index 000000000000..386743dd931c
--- /dev/null
+++ b/include/linux/mfd/tps6105x.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2011 ST-Ericsson SA
+ * Written on behalf of Linaro for ST-Ericsson
+ *
+ * Author: Linus Walleij <linus.walleij@linaro.org>
+ *
+ * License terms: GNU General Public License (GPL) version 2
+ */
+#ifndef MFD_TPS6105X_H
+#define MFD_TPS6105X_H
+
+#include <linux/i2c.h>
+#include <linux/regulator/machine.h>
+
+/*
+ * Register definitions to all subdrivers
+ */
+#define TPS6105X_REG_0                  0x00
+#define TPS6105X_REG0_MODE_SHIFT        6
+#define TPS6105X_REG0_MODE_MASK         (0x03<<6)
+/* These defines for both reg0 and reg1 */
+#define TPS6105X_REG0_MODE_SHUTDOWN     0x00
+#define TPS6105X_REG0_MODE_TORCH        0x01
+#define TPS6105X_REG0_MODE_TORCH_FLASH  0x02
+#define TPS6105X_REG0_MODE_VOLTAGE      0x03
+#define TPS6105X_REG0_VOLTAGE_SHIFT     4
+#define TPS6105X_REG0_VOLTAGE_MASK      (3<<4)
+#define TPS6105X_REG0_VOLTAGE_450       0
+#define TPS6105X_REG0_VOLTAGE_500       1
+#define TPS6105X_REG0_VOLTAGE_525       2
+#define TPS6105X_REG0_VOLTAGE_500_2     3
+#define TPS6105X_REG0_DIMMING_SHIFT     3
+#define TPS6105X_REG0_TORCHC_SHIFT      0
+#define TPS6105X_REG0_TORCHC_MASK       (7<<0)
+#define TPS6105X_REG0_TORCHC_0          0x00
+#define TPS6105X_REG0_TORCHC_50         0x01
+#define TPS6105X_REG0_TORCHC_75         0x02
+#define TPS6105X_REG0_TORCHC_100        0x03
+#define TPS6105X_REG0_TORCHC_150        0x04
+#define TPS6105X_REG0_TORCHC_200        0x05
+#define TPS6105X_REG0_TORCHC_250_400    0x06
+#define TPS6105X_REG0_TORCHC_250_500    0x07
+#define TPS6105X_REG_1                  0x01
+#define TPS6105X_REG1_MODE_SHIFT        6
+#define TPS6105X_REG1_MODE_MASK         (0x03<<6)
+#define TPS6105X_REG1_MODE_SHUTDOWN     0x00
+#define TPS6105X_REG1_MODE_TORCH        0x01
+#define TPS6105X_REG1_MODE_TORCH_FLASH  0x02
+#define TPS6105X_REG1_MODE_VOLTAGE      0x03
+#define TPS6105X_REG_2                  0x02
+#define TPS6105X_REG_3                  0x03
+
+/**
+ * enum tps6105x_mode - desired mode for the TPS6105x
+ * @TPS6105X_MODE_SHUTDOWN: this instance is inactive, not used for anything
+ * @TPS61905X_MODE_TORCH: this instance is used as a LED, usually a while
+ *      LED, for example as backlight or flashlight. If this is set, the
+ *      TPS6105X will register to the LED framework
+ * @TPS6105X_MODE_TORCH_FLASH: this instance is used as a flashgun, usually
+ *      in a camera
+ * @TPS6105X_MODE_VOLTAGE: this instance is used as a voltage regulator and
+ *      will register to the regulator framework
+ */
+enum tps6105x_mode {
+        TPS6105X_MODE_SHUTDOWN,
+        TPS6105X_MODE_TORCH,
+        TPS6105X_MODE_TORCH_FLASH,
+        TPS6105X_MODE_VOLTAGE,
+};
+
+/**
+ * struct tps6105x_platform_data - TPS61905x platform data
+ * @mode: what mode this instance shall be operated in,
+ *      this is not selectable at runtime
+ * @regulator_data: initialization data for the voltage
+ *      regulator if used as a voltage source
+ */
+struct tps6105x_platform_data {
+        enum tps6105x_mode mode;
+        struct regulator_init_data *regulator_data;
+};
+
+/**
+ * struct tps6105x - state holder for the TPS6105x drivers
+ * @mutex: mutex to serialize I2C accesses
+ * @i2c_client: corresponding I2C client
+ * @regulator: regulator device if used in voltage mode
+ */
+struct tps6105x {
+        struct tps6105x_platform_data *pdata;
+        struct mutex            lock;
+        struct i2c_client       *client;
+        struct regulator_dev    *regulator;
+};
+
+extern int tps6105x_set(struct tps6105x *tps6105x, u8 reg, u8 value);
+extern int tps6105x_get(struct tps6105x *tps6105x, u8 reg, u8 *buf);
+extern int tps6105x_mask_and_set(struct tps6105x *tps6105x, u8 reg,
+                                 u8 bitmask, u8 bitvalues);
+
+#endif
diff --git a/include/linux/mfd/wl1273-core.h b/include/linux/mfd/wl1273-core.h
index 9787293eae5f..db2f3f454a1b 100644
--- a/include/linux/mfd/wl1273-core.h
+++ b/include/linux/mfd/wl1273-core.h
@@ -280,7 +280,9 @@ struct wl1273_core {
 
         struct i2c_client *client;
 
+        int (*read)(struct wl1273_core *core, u8, u16 *);
         int (*write)(struct wl1273_core *core, u8, u16);
+        int (*write_data)(struct wl1273_core *core, u8 *, u16);
         int (*set_audio)(struct wl1273_core *core, unsigned int);
         int (*set_volume)(struct wl1273_core *core, unsigned int);
 };
diff --git a/include/linux/mfd/wm831x/pdata.h b/include/linux/mfd/wm831x/pdata.h
index 173086d42af4..afe4db49402d 100644
--- a/include/linux/mfd/wm831x/pdata.h
+++ b/include/linux/mfd/wm831x/pdata.h
@@ -104,11 +104,17 @@ struct wm831x_watchdog_pdata {
 #define WM831X_MAX_ISINK  2
 
 struct wm831x_pdata {
+        /** Used to distinguish multiple WM831x chips */
+        int wm831x_num;
+
         /** Called before subdevices are set up */
         int (*pre_init)(struct wm831x *wm831x);
         /** Called after subdevices are set up */
         int (*post_init)(struct wm831x *wm831x);
 
+        /** Put the /IRQ line into CMOS mode */
+        bool irq_cmos;
+
         int irq_base;
         int gpio_base;
         struct wm831x_backlight_pdata *backlight;
diff --git a/include/linux/mfd/wm8994/core.h b/include/linux/mfd/wm8994/core.h
index ef4f0b6083a3..f0b69cdae41c 100644
--- a/include/linux/mfd/wm8994/core.h
+++ b/include/linux/mfd/wm8994/core.h
@@ -59,7 +59,7 @@ struct wm8994 {
         int (*read_dev)(struct wm8994 *wm8994, unsigned short reg,
                         int bytes, void *dest);
         int (*write_dev)(struct wm8994 *wm8994, unsigned short reg,
-                         int bytes, void *src);
+                         int bytes, const void *src);
 
         void *control_data;
 
@@ -88,6 +88,8 @@ int wm8994_set_bits(struct wm8994 *wm8994, unsigned short reg,
                     unsigned short mask, unsigned short val);
 int wm8994_bulk_read(struct wm8994 *wm8994, unsigned short reg,
                      int count, u16 *buf);
+int wm8994_bulk_write(struct wm8994 *wm8994, unsigned short reg,
+                     int count, const u16 *buf);
 
 
 /* Helper to save on boilerplate */
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 294104e0891d..7606d7db96c9 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -861,7 +861,7 @@ extern void pagefault_out_of_memory(void);
 #define offset_in_page(p)       ((unsigned long)(p) & ~PAGE_MASK)
 
 /*
- * Flags passed to __show_mem() and __show_free_areas() to suppress output in
+ * Flags passed to show_mem() and __show_free_areas() to suppress output in
  * various contexts.
  */
 #define SHOW_MEM_FILTER_NODES   (0x0001u)       /* filter disallowed nodes */
@@ -982,6 +982,8 @@ static inline int handle_mm_fault(struct mm_struct *mm,
 
 extern int make_pages_present(unsigned long addr, unsigned long end);
 extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
+extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
+                void *buf, int len, int write);
 
 int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
                      unsigned long start, int len, unsigned int foll_flags,
@@ -1358,8 +1360,7 @@ extern void setup_per_zone_wmarks(void);
 extern void calculate_zone_inactive_ratio(struct zone *zone);
 extern void mem_init(void);
 extern void __init mmap_init(void);
-extern void show_mem(void);
-extern void __show_mem(unsigned int flags);
+extern void show_mem(unsigned int flags);
 extern void si_meminfo(struct sysinfo * val);
 extern void si_meminfo_node(struct sysinfo *val, int nid);
 extern int after_bootmem;
@@ -1592,13 +1593,13 @@ static inline bool kernel_page_present(struct page *page) { return true; }
 #endif /* CONFIG_HIBERNATION */
 #endif
 
-extern struct vm_area_struct *get_gate_vma(struct task_struct *tsk);
+extern struct vm_area_struct *get_gate_vma(struct mm_struct *mm);
 #ifdef  __HAVE_ARCH_GATE_AREA
-int in_gate_area_no_task(unsigned long addr);
-int in_gate_area(struct task_struct *task, unsigned long addr);
+int in_gate_area_no_mm(unsigned long addr);
+int in_gate_area(struct mm_struct *mm, unsigned long addr);
 #else
-int in_gate_area_no_task(unsigned long addr);
-#define in_gate_area(task, addr) ({(void)task; in_gate_area_no_task(addr);})
+int in_gate_area_no_mm(unsigned long addr);
+#define in_gate_area(mm, addr) ({(void)mm; in_gate_area_no_mm(addr);})
 #endif  /* __HAVE_ARCH_GATE_AREA */
 
 int drop_caches_sysctl_handler(struct ctl_table *, int,
diff --git a/include/linux/mmc/boot.h b/include/linux/mmc/boot.h
new file mode 100644
index 000000000000..39d787c229cb
--- /dev/null
+++ b/include/linux/mmc/boot.h
@@ -0,0 +1,7 @@
+#ifndef MMC_BOOT_H
+#define MMC_BOOT_H
+
+enum { MMC_PROGRESS_ENTER, MMC_PROGRESS_INIT,
+       MMC_PROGRESS_LOAD, MMC_PROGRESS_DONE };
+
+#endif
diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h
index 38d393092812..9eb9b4b96f55 100644
--- a/include/linux/mmc/sh_mmcif.h
+++ b/include/linux/mmc/sh_mmcif.h
@@ -104,9 +104,6 @@ static inline void sh_mmcif_writel(void __iomem *addr, int reg, u32 val)
 
 #define SH_MMCIF_BBS 512 /* boot block size */
 
-enum { MMCIF_PROGRESS_ENTER, MMCIF_PROGRESS_INIT,
-       MMCIF_PROGRESS_LOAD, MMCIF_PROGRESS_DONE };
-
 static inline void sh_mmcif_boot_cmd_send(void __iomem *base,
                                           unsigned long cmd, unsigned long arg)
 {
diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index 17c7e21c0bd7..fb51ae38cea7 100644
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
@@ -52,9 +52,6 @@ extern struct platform_device *of_platform_device_create(struct device_node *np,
                                                    const char *bus_id,
                                                    struct device *parent);
 
-/* pseudo "matches" value to not do deep probe */
-#define OF_NO_DEEP_PROBE ((struct of_device_id *)-1)
-
 extern int of_platform_bus_probe(struct device_node *root,
                                  const struct of_device_id *matches,
                                  struct device *parent);
diff --git a/include/linux/omap3isp.h b/include/linux/omap3isp.h
new file mode 100644
index 000000000000..150822b4dbff
--- /dev/null
+++ b/include/linux/omap3isp.h
@@ -0,0 +1,646 @@
+/*
+ * omap3isp.h
+ *
+ * TI OMAP3 ISP - User-space API
+ *
+ * Copyright (C) 2010 Nokia Corporation
+ * Copyright (C) 2009 Texas Instruments, Inc.
+ *
+ * Contacts: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ *           Sakari Ailus <sakari.ailus@iki.fi>
+ *
+ * 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
+ * published by the Free Software Foundation.
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifndef OMAP3_ISP_USER_H
+#define OMAP3_ISP_USER_H
+
+#include <linux/types.h>
+
+/*
+ * Private IOCTLs
+ *
+ * VIDIOC_OMAP3ISP_CCDC_CFG: Set CCDC configuration
+ * VIDIOC_OMAP3ISP_PRV_CFG: Set preview engine configuration
+ * VIDIOC_OMAP3ISP_AEWB_CFG: Set AEWB module configuration
+ * VIDIOC_OMAP3ISP_HIST_CFG: Set histogram module configuration
+ * VIDIOC_OMAP3ISP_AF_CFG: Set auto-focus module configuration
+ * VIDIOC_OMAP3ISP_STAT_REQ: Read statistics (AEWB/AF/histogram) data
+ * VIDIOC_OMAP3ISP_STAT_EN: Enable/disable a statistics module
+ */
+
+#define VIDIOC_OMAP3ISP_CCDC_CFG \
+        _IOWR('V', BASE_VIDIOC_PRIVATE + 1, struct omap3isp_ccdc_update_config)
+#define VIDIOC_OMAP3ISP_PRV_CFG \
+        _IOWR('V', BASE_VIDIOC_PRIVATE + 2, struct omap3isp_prev_update_config)
+#define VIDIOC_OMAP3ISP_AEWB_CFG \
+        _IOWR('V', BASE_VIDIOC_PRIVATE + 3, struct omap3isp_h3a_aewb_config)
+#define VIDIOC_OMAP3ISP_HIST_CFG \
+        _IOWR('V', BASE_VIDIOC_PRIVATE + 4, struct omap3isp_hist_config)
+#define VIDIOC_OMAP3ISP_AF_CFG \
+        _IOWR('V', BASE_VIDIOC_PRIVATE + 5, struct omap3isp_h3a_af_config)
+#define VIDIOC_OMAP3ISP_STAT_REQ \
+        _IOWR('V', BASE_VIDIOC_PRIVATE + 6, struct omap3isp_stat_data)
+#define VIDIOC_OMAP3ISP_STAT_EN \
+        _IOWR('V', BASE_VIDIOC_PRIVATE + 7, unsigned long)
+
+/*
+ * Events
+ *
+ * V4L2_EVENT_OMAP3ISP_AEWB: AEWB statistics data ready
+ * V4L2_EVENT_OMAP3ISP_AF: AF statistics data ready
+ * V4L2_EVENT_OMAP3ISP_HIST: Histogram statistics data ready
+ * V4L2_EVENT_OMAP3ISP_HS_VS: Horizontal/vertical synchronization detected
+ */
+
+#define V4L2_EVENT_OMAP3ISP_CLASS       (V4L2_EVENT_PRIVATE_START | 0x100)
+#define V4L2_EVENT_OMAP3ISP_AEWB        (V4L2_EVENT_OMAP3ISP_CLASS | 0x1)
+#define V4L2_EVENT_OMAP3ISP_AF          (V4L2_EVENT_OMAP3ISP_CLASS | 0x2)
+#define V4L2_EVENT_OMAP3ISP_HIST        (V4L2_EVENT_OMAP3ISP_CLASS | 0x3)
+#define V4L2_EVENT_OMAP3ISP_HS_VS       (V4L2_EVENT_OMAP3ISP_CLASS | 0x4)
+
+struct omap3isp_stat_event_status {
+        __u32 frame_number;
+        __u16 config_counter;
+        __u8 buf_err;
+};
+
+/* AE/AWB related structures and flags*/
+
+/* H3A Range Constants */
+#define OMAP3ISP_AEWB_MAX_SATURATION_LIM        1023
+#define OMAP3ISP_AEWB_MIN_WIN_H                 2
+#define OMAP3ISP_AEWB_MAX_WIN_H                 256
+#define OMAP3ISP_AEWB_MIN_WIN_W                 6
+#define OMAP3ISP_AEWB_MAX_WIN_W                 256
+#define OMAP3ISP_AEWB_MIN_WINVC                 1
+#define OMAP3ISP_AEWB_MIN_WINHC                 1
+#define OMAP3ISP_AEWB_MAX_WINVC                 128
+#define OMAP3ISP_AEWB_MAX_WINHC                 36
+#define OMAP3ISP_AEWB_MAX_WINSTART              4095
+#define OMAP3ISP_AEWB_MIN_SUB_INC               2
+#define OMAP3ISP_AEWB_MAX_SUB_INC               32
+#define OMAP3ISP_AEWB_MAX_BUF_SIZE              83600
+
+#define OMAP3ISP_AF_IIRSH_MIN                   0
+#define OMAP3ISP_AF_IIRSH_MAX                   4095
+#define OMAP3ISP_AF_PAXEL_HORIZONTAL_COUNT_MIN  1
+#define OMAP3ISP_AF_PAXEL_HORIZONTAL_COUNT_MAX  36
+#define OMAP3ISP_AF_PAXEL_VERTICAL_COUNT_MIN    1
+#define OMAP3ISP_AF_PAXEL_VERTICAL_COUNT_MAX    128
+#define OMAP3ISP_AF_PAXEL_INCREMENT_MIN         2
+#define OMAP3ISP_AF_PAXEL_INCREMENT_MAX         32
+#define OMAP3ISP_AF_PAXEL_HEIGHT_MIN            2
+#define OMAP3ISP_AF_PAXEL_HEIGHT_MAX            256
+#define OMAP3ISP_AF_PAXEL_WIDTH_MIN             16
+#define OMAP3ISP_AF_PAXEL_WIDTH_MAX             256
+#define OMAP3ISP_AF_PAXEL_HZSTART_MIN           1
+#define OMAP3ISP_AF_PAXEL_HZSTART_MAX           4095
+#define OMAP3ISP_AF_PAXEL_VTSTART_MIN           0
+#define OMAP3ISP_AF_PAXEL_VTSTART_MAX           4095
+#define OMAP3ISP_AF_THRESHOLD_MAX               255
+#define OMAP3ISP_AF_COEF_MAX                    4095
+#define OMAP3ISP_AF_PAXEL_SIZE                  48
+#define OMAP3ISP_AF_MAX_BUF_SIZE                221184
+
+/**
+ * struct omap3isp_h3a_aewb_config - AE AWB configuration reset values
+ * saturation_limit: Saturation limit.
+ * @win_height: Window Height. Range 2 - 256, even values only.
+ * @win_width: Window Width. Range 6 - 256, even values only.
+ * @ver_win_count: Vertical Window Count. Range 1 - 128.
+ * @hor_win_count: Horizontal Window Count. Range 1 - 36.
+ * @ver_win_start: Vertical Window Start. Range 0 - 4095.
+ * @hor_win_start: Horizontal Window Start. Range 0 - 4095.
+ * @blk_ver_win_start: Black Vertical Windows Start. Range 0 - 4095.
+ * @blk_win_height: Black Window Height. Range 2 - 256, even values only.
+ * @subsample_ver_inc: Subsample Vertical points increment Range 2 - 32, even
+ *                     values only.
+ * @subsample_hor_inc: Subsample Horizontal points increment Range 2 - 32, even
+ *                     values only.
+ * @alaw_enable: AEW ALAW EN flag.
+ */
+struct omap3isp_h3a_aewb_config {
+        /*
+         * Common fields.
+         * They should be the first ones and must be in the same order as in
+         * ispstat_generic_config struct.
+         */
+        __u32 buf_size;
+        __u16 config_counter;
+
+        /* Private fields */
+        __u16 saturation_limit;
+        __u16 win_height;
+        __u16 win_width;
+        __u16 ver_win_count;
+        __u16 hor_win_count;
+        __u16 ver_win_start;
+        __u16 hor_win_start;
+        __u16 blk_ver_win_start;
+        __u16 blk_win_height;
+        __u16 subsample_ver_inc;
+        __u16 subsample_hor_inc;
+        __u8 alaw_enable;
+};
+
+/**
+ * struct omap3isp_stat_data - Statistic data sent to or received from user
+ * @ts: Timestamp of returned framestats.
+ * @buf: Pointer to pass to user.
+ * @frame_number: Frame number of requested stats.
+ * @cur_frame: Current frame number being processed.
+ * @config_counter: Number of the configuration associated with the data.
+ */
+struct omap3isp_stat_data {
+        struct timeval ts;
+        void __user *buf;
+        __u32 buf_size;
+        __u16 frame_number;
+        __u16 cur_frame;
+        __u16 config_counter;
+};
+
+
+/* Histogram related structs */
+
+/* Flags for number of bins */
+#define OMAP3ISP_HIST_BINS_32           0
+#define OMAP3ISP_HIST_BINS_64           1
+#define OMAP3ISP_HIST_BINS_128          2
+#define OMAP3ISP_HIST_BINS_256          3
+
+/* Number of bins * 4 colors * 4-bytes word */
+#define OMAP3ISP_HIST_MEM_SIZE_BINS(n)  ((1 << ((n)+5))*4*4)
+
+#define OMAP3ISP_HIST_MEM_SIZE          1024
+#define OMAP3ISP_HIST_MIN_REGIONS       1
+#define OMAP3ISP_HIST_MAX_REGIONS       4
+#define OMAP3ISP_HIST_MAX_WB_GAIN       255
+#define OMAP3ISP_HIST_MIN_WB_GAIN       0
+#define OMAP3ISP_HIST_MAX_BIT_WIDTH     14
+#define OMAP3ISP_HIST_MIN_BIT_WIDTH     8
+#define OMAP3ISP_HIST_MAX_WG            4
+#define OMAP3ISP_HIST_MAX_BUF_SIZE      4096
+
+/* Source */
+#define OMAP3ISP_HIST_SOURCE_CCDC       0
+#define OMAP3ISP_HIST_SOURCE_MEM        1
+
+/* CFA pattern */
+#define OMAP3ISP_HIST_CFA_BAYER         0
+#define OMAP3ISP_HIST_CFA_FOVEONX3      1
+
+struct omap3isp_hist_region {
+        __u16 h_start;
+        __u16 h_end;
+        __u16 v_start;
+        __u16 v_end;
+};
+
+struct omap3isp_hist_config {
+        /*
+         * Common fields.
+         * They should be the first ones and must be in the same order as in
+         * ispstat_generic_config struct.
+         */
+        __u32 buf_size;
+        __u16 config_counter;
+
+        __u8 num_acc_frames;    /* Num of image frames to be processed and
+                                   accumulated for each histogram frame */
+        __u16 hist_bins;        /* number of bins: 32, 64, 128, or 256 */
+        __u8 cfa;               /* BAYER or FOVEON X3 */
+        __u8 wg[OMAP3ISP_HIST_MAX_WG];  /* White Balance Gain */
+        __u8 num_regions;       /* number of regions to be configured */
+        struct omap3isp_hist_region region[OMAP3ISP_HIST_MAX_REGIONS];
+};
+
+/* Auto Focus related structs */
+
+#define OMAP3ISP_AF_NUM_COEF            11
+
+enum omap3isp_h3a_af_fvmode {
+        OMAP3ISP_AF_MODE_SUMMED = 0,
+        OMAP3ISP_AF_MODE_PEAK = 1
+};
+
+/* Red, Green, and blue pixel location in the AF windows */
+enum omap3isp_h3a_af_rgbpos {
+        OMAP3ISP_AF_GR_GB_BAYER = 0,    /* GR and GB as Bayer pattern */
+        OMAP3ISP_AF_RG_GB_BAYER = 1,    /* RG and GB as Bayer pattern */
+        OMAP3ISP_AF_GR_BG_BAYER = 2,    /* GR and BG as Bayer pattern */
+        OMAP3ISP_AF_RG_BG_BAYER = 3,    /* RG and BG as Bayer pattern */
+        OMAP3ISP_AF_GG_RB_CUSTOM = 4,   /* GG and RB as custom pattern */
+        OMAP3ISP_AF_RB_GG_CUSTOM = 5    /* RB and GG as custom pattern */
+};
+
+/* Contains the information regarding the Horizontal Median Filter */
+struct omap3isp_h3a_af_hmf {
+        __u8 enable;    /* Status of Horizontal Median Filter */
+        __u8 threshold; /* Threshhold Value for Horizontal Median Filter */
+};
+
+/* Contains the information regarding the IIR Filters */
+struct omap3isp_h3a_af_iir {
+        __u16 h_start;                  /* IIR horizontal start */
+        __u16 coeff_set0[OMAP3ISP_AF_NUM_COEF]; /* Filter coefficient, set 0 */
+        __u16 coeff_set1[OMAP3ISP_AF_NUM_COEF]; /* Filter coefficient, set 1 */
+};
+
+/* Contains the information regarding the Paxels Structure in AF Engine */
+struct omap3isp_h3a_af_paxel {
+        __u16 h_start;  /* Horizontal Start Position */
+        __u16 v_start;  /* Vertical Start Position */
+        __u8 width;     /* Width of the Paxel */
+        __u8 height;    /* Height of the Paxel */
+        __u8 h_cnt;     /* Horizontal Count */
+        __u8 v_cnt;     /* vertical Count */
+        __u8 line_inc;  /* Line Increment */
+};
+
+/* Contains the parameters required for hardware set up of AF Engine */
+struct omap3isp_h3a_af_config {
+        /*
+         * Common fields.
+         * They should be the first ones and must be in the same order as in
+         * ispstat_generic_config struct.
+         */
+        __u32 buf_size;
+        __u16 config_counter;
+
+        struct omap3isp_h3a_af_hmf hmf;         /* HMF configurations */
+        struct omap3isp_h3a_af_iir iir;         /* IIR filter configurations */
+        struct omap3isp_h3a_af_paxel paxel;     /* Paxel parameters */
+        enum omap3isp_h3a_af_rgbpos rgb_pos;    /* RGB Positions */
+        enum omap3isp_h3a_af_fvmode fvmode;     /* Accumulator mode */
+        __u8 alaw_enable;                       /* AF ALAW status */
+};
+
+/* ISP CCDC structs */
+
+/* Abstraction layer CCDC configurations */
+#define OMAP3ISP_CCDC_ALAW              (1 << 0)
+#define OMAP3ISP_CCDC_LPF               (1 << 1)
+#define OMAP3ISP_CCDC_BLCLAMP           (1 << 2)
+#define OMAP3ISP_CCDC_BCOMP             (1 << 3)
+#define OMAP3ISP_CCDC_FPC               (1 << 4)
+#define OMAP3ISP_CCDC_CULL              (1 << 5)
+#define OMAP3ISP_CCDC_CONFIG_LSC        (1 << 7)
+#define OMAP3ISP_CCDC_TBL_LSC           (1 << 8)
+
+#define OMAP3ISP_RGB_MAX                3
+
+/* Enumeration constants for Alaw input width */
+enum omap3isp_alaw_ipwidth {
+        OMAP3ISP_ALAW_BIT12_3 = 0x3,
+        OMAP3ISP_ALAW_BIT11_2 = 0x4,
+        OMAP3ISP_ALAW_BIT10_1 = 0x5,
+        OMAP3ISP_ALAW_BIT9_0 = 0x6
+};
+
+/**
+ * struct omap3isp_ccdc_lsc_config - LSC configuration
+ * @offset: Table Offset of the gain table.
+ * @gain_mode_n: Vertical dimension of a paxel in LSC configuration.
+ * @gain_mode_m: Horizontal dimension of a paxel in LSC configuration.
+ * @gain_format: Gain table format.
+ * @fmtsph: Start pixel horizontal from start of the HS sync pulse.
+ * @fmtlnh: Number of pixels in horizontal direction to use for the data
+ *          reformatter.
+ * @fmtslv: Start line from start of VS sync pulse for the data reformatter.
+ * @fmtlnv: Number of lines in vertical direction for the data reformatter.
+ * @initial_x: X position, in pixels, of the first active pixel in reference
+ *             to the first active paxel. Must be an even number.
+ * @initial_y: Y position, in pixels, of the first active pixel in reference
+ *             to the first active paxel. Must be an even number.
+ * @size: Size of LSC gain table. Filled when loaded from userspace.
+ */
+struct omap3isp_ccdc_lsc_config {
+        __u16 offset;
+        __u8 gain_mode_n;
+        __u8 gain_mode_m;
+        __u8 gain_format;
+        __u16 fmtsph;
+        __u16 fmtlnh;
+        __u16 fmtslv;
+        __u16 fmtlnv;
+        __u8 initial_x;
+        __u8 initial_y;
+        __u32 size;
+};
+
+/**
+ * struct omap3isp_ccdc_bclamp - Optical & Digital black clamp subtract
+ * @obgain: Optical black average gain.
+ * @obstpixel: Start Pixel w.r.t. HS pulse in Optical black sample.
+ * @oblines: Optical Black Sample lines.
+ * @oblen: Optical Black Sample Length.
+ * @dcsubval: Digital Black Clamp subtract value.
+ */
+struct omap3isp_ccdc_bclamp {
+        __u8 obgain;
+        __u8 obstpixel;
+        __u8 oblines;
+        __u8 oblen;
+        __u16 dcsubval;
+};
+
+/**
+ * struct omap3isp_ccdc_fpc - Faulty Pixels Correction
+ * @fpnum: Number of faulty pixels to be corrected in the frame.
+ * @fpcaddr: Memory address of the FPC Table
+ */
+struct omap3isp_ccdc_fpc {
+        __u16 fpnum;
+        __u32 fpcaddr;
+};
+
+/**
+ * struct omap3isp_ccdc_blcomp - Black Level Compensation parameters
+ * @b_mg: B/Mg pixels. 2's complement. -128 to +127.
+ * @gb_g: Gb/G pixels. 2's complement. -128 to +127.
+ * @gr_cy: Gr/Cy pixels. 2's complement. -128 to +127.
+ * @r_ye: R/Ye pixels. 2's complement. -128 to +127.
+ */
+struct omap3isp_ccdc_blcomp {
+        __u8 b_mg;
+        __u8 gb_g;
+        __u8 gr_cy;
+        __u8 r_ye;
+};
+
+/**
+ * omap3isp_ccdc_culling - Culling parameters
+ * @v_pattern: Vertical culling pattern.
+ * @h_odd: Horizontal Culling pattern for odd lines.
+ * @h_even: Horizontal Culling pattern for even lines.
+ */
+struct omap3isp_ccdc_culling {
+        __u8 v_pattern;
+        __u16 h_odd;
+        __u16 h_even;
+};
+
+/**
+ * omap3isp_ccdc_update_config - CCDC configuration
+ * @update: Specifies which CCDC registers should be updated.
+ * @flag: Specifies which CCDC functions should be enabled.
+ * @alawip: Enable/Disable A-Law compression.
+ * @bclamp: Black clamp control register.
+ * @blcomp: Black level compensation value for RGrGbB Pixels. 2's complement.
+ * @fpc: Number of faulty pixels corrected in the frame, address of FPC table.
+ * @cull: Cull control register.
+ * @lsc: Pointer to LSC gain table.
+ */
+struct omap3isp_ccdc_update_config {
+        __u16 update;
+        __u16 flag;
+        enum omap3isp_alaw_ipwidth alawip;
+        struct omap3isp_ccdc_bclamp __user *bclamp;
+        struct omap3isp_ccdc_blcomp __user *blcomp;
+        struct omap3isp_ccdc_fpc __user *fpc;
+        struct omap3isp_ccdc_lsc_config __user *lsc_cfg;
+        struct omap3isp_ccdc_culling __user *cull;
+        __u8 __user *lsc;
+};
+
+/* Preview configurations */
+#define OMAP3ISP_PREV_LUMAENH           (1 << 0)
+#define OMAP3ISP_PREV_INVALAW           (1 << 1)
+#define OMAP3ISP_PREV_HRZ_MED           (1 << 2)
+#define OMAP3ISP_PREV_CFA               (1 << 3)
+#define OMAP3ISP_PREV_CHROMA_SUPP       (1 << 4)
+#define OMAP3ISP_PREV_WB                (1 << 5)
+#define OMAP3ISP_PREV_BLKADJ            (1 << 6)
+#define OMAP3ISP_PREV_RGB2RGB           (1 << 7)
+#define OMAP3ISP_PREV_COLOR_CONV        (1 << 8)
+#define OMAP3ISP_PREV_YC_LIMIT          (1 << 9)
+#define OMAP3ISP_PREV_DEFECT_COR        (1 << 10)
+#define OMAP3ISP_PREV_GAMMABYPASS       (1 << 11)
+#define OMAP3ISP_PREV_DRK_FRM_CAPTURE   (1 << 12)
+#define OMAP3ISP_PREV_DRK_FRM_SUBTRACT  (1 << 13)
+#define OMAP3ISP_PREV_LENS_SHADING      (1 << 14)
+#define OMAP3ISP_PREV_NF                (1 << 15)
+#define OMAP3ISP_PREV_GAMMA             (1 << 16)
+
+#define OMAP3ISP_PREV_NF_TBL_SIZE       64
+#define OMAP3ISP_PREV_CFA_TBL_SIZE      576
+#define OMAP3ISP_PREV_GAMMA_TBL_SIZE    1024
+#define OMAP3ISP_PREV_YENH_TBL_SIZE     128
+
+#define OMAP3ISP_PREV_DETECT_CORRECT_CHANNELS   4
+
+/**
+ * struct omap3isp_prev_hmed - Horizontal Median Filter
+ * @odddist: Distance between consecutive pixels of same color in the odd line.
+ * @evendist: Distance between consecutive pixels of same color in the even
+ *            line.
+ * @thres: Horizontal median filter threshold.
+ */
+struct omap3isp_prev_hmed {
+        __u8 odddist;
+        __u8 evendist;
+        __u8 thres;
+};
+
+/*
+ * Enumeration for CFA Formats supported by preview
+ */
+enum omap3isp_cfa_fmt {
+        OMAP3ISP_CFAFMT_BAYER,
+        OMAP3ISP_CFAFMT_SONYVGA,
+        OMAP3ISP_CFAFMT_RGBFOVEON,
+        OMAP3ISP_CFAFMT_DNSPL,
+        OMAP3ISP_CFAFMT_HONEYCOMB,
+        OMAP3ISP_CFAFMT_RRGGBBFOVEON
+};
+
+/**
+ * struct omap3isp_prev_cfa - CFA Interpolation
+ * @format: CFA Format Enum value supported by preview.
+ * @gradthrs_vert: CFA Gradient Threshold - Vertical.
+ * @gradthrs_horz: CFA Gradient Threshold - Horizontal.
+ * @table: Pointer to the CFA table.
+ */
+struct omap3isp_prev_cfa {
+        enum omap3isp_cfa_fmt format;
+        __u8 gradthrs_vert;
+        __u8 gradthrs_horz;
+        __u32 table[OMAP3ISP_PREV_CFA_TBL_SIZE];
+};
+
+/**
+ * struct omap3isp_prev_csup - Chrominance Suppression
+ * @gain: Gain.
+ * @thres: Threshold.
+ * @hypf_en: Flag to enable/disable the High Pass Filter.
+ */
+struct omap3isp_prev_csup {
+        __u8 gain;
+        __u8 thres;
+        __u8 hypf_en;
+};
+
+/**
+ * struct omap3isp_prev_wbal - White Balance
+ * @dgain: Digital gain (U10Q8).
+ * @coef3: White balance gain - COEF 3 (U8Q5).
+ * @coef2: White balance gain - COEF 2 (U8Q5).
+ * @coef1: White balance gain - COEF 1 (U8Q5).
+ * @coef0: White balance gain - COEF 0 (U8Q5).
+ */
+struct omap3isp_prev_wbal {
+        __u16 dgain;
+        __u8 coef3;
+        __u8 coef2;
+        __u8 coef1;
+        __u8 coef0;
+};
+
+/**
+ * struct omap3isp_prev_blkadj - Black Level Adjustment
+ * @red: Black level offset adjustment for Red in 2's complement format
+ * @green: Black level offset adjustment for Green in 2's complement format
+ * @blue: Black level offset adjustment for Blue in 2's complement format
+ */
+struct omap3isp_prev_blkadj {
+        /*Black level offset adjustment for Red in 2's complement format */
+        __u8 red;
+        /*Black level offset adjustment for Green in 2's complement format */
+        __u8 green;
+        /* Black level offset adjustment for Blue in 2's complement format */
+        __u8 blue;
+};
+
+/**
+ * struct omap3isp_prev_rgbtorgb - RGB to RGB Blending
+ * @matrix: Blending values(S12Q8 format)
+ *              [RR] [GR] [BR]
+ *              [RG] [GG] [BG]
+ *              [RB] [GB] [BB]
+ * @offset: Blending offset value for R,G,B in 2's complement integer format.
+ */
+struct omap3isp_prev_rgbtorgb {
+        __u16 matrix[OMAP3ISP_RGB_MAX][OMAP3ISP_RGB_MAX];
+        __u16 offset[OMAP3ISP_RGB_MAX];
+};
+
+/**
+ * struct omap3isp_prev_csc - Color Space Conversion from RGB-YCbYCr
+ * @matrix: Color space conversion coefficients(S10Q8)
+ *              [CSCRY]  [CSCGY]  [CSCBY]
+ *              [CSCRCB] [CSCGCB] [CSCBCB]
+ *              [CSCRCR] [CSCGCR] [CSCBCR]
+ * @offset: CSC offset values for Y offset, CB offset and CR offset respectively
+ */
+struct omap3isp_prev_csc {
+        __u16 matrix[OMAP3ISP_RGB_MAX][OMAP3ISP_RGB_MAX];
+        __s16 offset[OMAP3ISP_RGB_MAX];
+};
+
+/**
+ * struct omap3isp_prev_yclimit - Y, C Value Limit
+ * @minC: Minimum C value
+ * @maxC: Maximum C value
+ * @minY: Minimum Y value
+ * @maxY: Maximum Y value
+ */
+struct omap3isp_prev_yclimit {
+        __u8 minC;
+        __u8 maxC;
+        __u8 minY;
+        __u8 maxY;
+};
+
+/**
+ * struct omap3isp_prev_dcor - Defect correction
+ * @couplet_mode_en: Flag to enable or disable the couplet dc Correction in NF
+ * @detect_correct: Thresholds for correction bit 0:10 detect 16:25 correct
+ */
+struct omap3isp_prev_dcor {
+        __u8 couplet_mode_en;
+        __u32 detect_correct[OMAP3ISP_PREV_DETECT_CORRECT_CHANNELS];
+};
+
+/**
+ * struct omap3isp_prev_nf - Noise Filter
+ * @spread: Spread value to be used in Noise Filter
+ * @table: Pointer to the Noise Filter table
+ */
+struct omap3isp_prev_nf {
+        __u8 spread;
+        __u32 table[OMAP3ISP_PREV_NF_TBL_SIZE];
+};
+
+/**
+ * struct omap3isp_prev_gtables - Gamma correction tables
+ * @red: Array for red gamma table.
+ * @green: Array for green gamma table.
+ * @blue: Array for blue gamma table.
+ */
+struct omap3isp_prev_gtables {
+        __u32 red[OMAP3ISP_PREV_GAMMA_TBL_SIZE];
+        __u32 green[OMAP3ISP_PREV_GAMMA_TBL_SIZE];
+        __u32 blue[OMAP3ISP_PREV_GAMMA_TBL_SIZE];
+};
+
+/**
+ * struct omap3isp_prev_luma - Luma enhancement
+ * @table: Array for luma enhancement table.
+ */
+struct omap3isp_prev_luma {
+        __u32 table[OMAP3ISP_PREV_YENH_TBL_SIZE];
+};
+
+/**
+ * struct omap3isp_prev_update_config - Preview engine configuration (user)
+ * @update: Specifies which ISP Preview registers should be updated.
+ * @flag: Specifies which ISP Preview functions should be enabled.
+ * @shading_shift: 3bit value of shift used in shading compensation.
+ * @luma: Pointer to luma enhancement structure.
+ * @hmed: Pointer to structure containing the odd and even distance.
+ *        between the pixels in the image along with the filter threshold.
+ * @cfa: Pointer to structure containing the CFA interpolation table, CFA.
+ *       format in the image, vertical and horizontal gradient threshold.
+ * @csup: Pointer to Structure for Chrominance Suppression coefficients.
+ * @wbal: Pointer to structure for White Balance.
+ * @blkadj: Pointer to structure for Black Adjustment.
+ * @rgb2rgb: Pointer to structure for RGB to RGB Blending.
+ * @csc: Pointer to structure for Color Space Conversion from RGB-YCbYCr.
+ * @yclimit: Pointer to structure for Y, C Value Limit.
+ * @dcor: Pointer to structure for defect correction.
+ * @nf: Pointer to structure for Noise Filter
+ * @gamma: Pointer to gamma structure.
+ */
+struct omap3isp_prev_update_config {
+        __u32 update;
+        __u32 flag;
+        __u32 shading_shift;
+        struct omap3isp_prev_luma __user *luma;
+        struct omap3isp_prev_hmed __user *hmed;
+        struct omap3isp_prev_cfa __user *cfa;
+        struct omap3isp_prev_csup __user *csup;
+        struct omap3isp_prev_wbal __user *wbal;
+        struct omap3isp_prev_blkadj __user *blkadj;
+        struct omap3isp_prev_rgbtorgb __user *rgb2rgb;
+        struct omap3isp_prev_csc __user *csc;
+        struct omap3isp_prev_yclimit __user *yclimit;
+        struct omap3isp_prev_dcor __user *dcor;
+        struct omap3isp_prev_nf __user *nf;
+        struct omap3isp_prev_gtables __user *gamma;
+};
+
+#endif  /* OMAP3_ISP_USER_H */
diff --git a/include/linux/page_cgroup.h b/include/linux/page_cgroup.h
index 6d6cb7a57bb3..f5de21de31dd 100644
--- a/include/linux/page_cgroup.h
+++ b/include/linux/page_cgroup.h
@@ -1,8 +1,26 @@
 #ifndef __LINUX_PAGE_CGROUP_H
 #define __LINUX_PAGE_CGROUP_H
 
+enum {
+        /* flags for mem_cgroup */
+        PCG_LOCK,  /* Lock for pc->mem_cgroup and following bits. */
+        PCG_CACHE, /* charged as cache */
+        PCG_USED, /* this object is in use. */
+        PCG_MIGRATION, /* under page migration */
+        /* flags for mem_cgroup and file and I/O status */
+        PCG_MOVE_LOCK, /* For race between move_account v.s. following bits */
+        PCG_FILE_MAPPED, /* page is accounted as "mapped" */
+        /* No lock in page_cgroup */
+        PCG_ACCT_LRU, /* page has been accounted for (under lru_lock) */
+        __NR_PCG_FLAGS,
+};
+
+#ifndef __GENERATING_BOUNDS_H
+#include <generated/bounds.h>
+
 #ifdef CONFIG_CGROUP_MEM_RES_CTLR
 #include <linux/bit_spinlock.h>
+
 /*
  * Page Cgroup can be considered as an extended mem_map.
  * A page_cgroup page is associated with every page descriptor. The
@@ -13,7 +31,6 @@
 struct page_cgroup {
         unsigned long flags;
         struct mem_cgroup *mem_cgroup;
-        struct page *page;
         struct list_head lru;           /* per cgroup LRU list */
 };
 
@@ -32,19 +49,7 @@ static inline void __init page_cgroup_init(void)
 #endif
 
 struct page_cgroup *lookup_page_cgroup(struct page *page);
-
-enum {
-        /* flags for mem_cgroup */
-        PCG_LOCK,  /* Lock for pc->mem_cgroup and following bits. */
-        PCG_CACHE, /* charged as cache */
-        PCG_USED, /* this object is in use. */
-        PCG_MIGRATION, /* under page migration */
-        /* flags for mem_cgroup and file and I/O status */
-        PCG_MOVE_LOCK, /* For race between move_account v.s. following bits */
-        PCG_FILE_MAPPED, /* page is accounted as "mapped" */
-        /* No lock in page_cgroup */
-        PCG_ACCT_LRU, /* page has been accounted for (under lru_lock) */
-};
+struct page *lookup_cgroup_page(struct page_cgroup *pc);
 
 #define TESTPCGFLAG(uname, lname)                       \
 static inline int PageCgroup##uname(struct page_cgroup *pc)     \
@@ -85,16 +90,6 @@ SETPCGFLAG(Migration, MIGRATION)
 CLEARPCGFLAG(Migration, MIGRATION)
 TESTPCGFLAG(Migration, MIGRATION)
 
-static inline int page_cgroup_nid(struct page_cgroup *pc)
-{
-        return page_to_nid(pc->page);
-}
-
-static inline enum zone_type page_cgroup_zid(struct page_cgroup *pc)
-{
-        return page_zonenum(pc->page);
-}
-
 static inline void lock_page_cgroup(struct page_cgroup *pc)
 {
         /*
@@ -109,11 +104,6 @@ static inline void unlock_page_cgroup(struct page_cgroup *pc)
         bit_spin_unlock(PCG_LOCK, &pc->flags);
 }
 
-static inline int page_is_cgroup_locked(struct page_cgroup *pc)
-{
-        return bit_spin_is_locked(PCG_LOCK, &pc->flags);
-}
-
 static inline void move_lock_page_cgroup(struct page_cgroup *pc,
         unsigned long *flags)
 {
@@ -132,6 +122,39 @@ static inline void move_unlock_page_cgroup(struct page_cgroup *pc,
         local_irq_restore(*flags);
 }
 
+#ifdef CONFIG_SPARSEMEM
+#define PCG_ARRAYID_WIDTH       SECTIONS_SHIFT
+#else
+#define PCG_ARRAYID_WIDTH       NODES_SHIFT
+#endif
+
+#if (PCG_ARRAYID_WIDTH > BITS_PER_LONG - NR_PCG_FLAGS)
+#error Not enough space left in pc->flags to store page_cgroup array IDs
+#endif
+
+/* pc->flags: ARRAY-ID | FLAGS */
+
+#define PCG_ARRAYID_MASK        ((1UL << PCG_ARRAYID_WIDTH) - 1)
+
+#define PCG_ARRAYID_OFFSET      (BITS_PER_LONG - PCG_ARRAYID_WIDTH)
+/*
+ * Zero the shift count for non-existant fields, to prevent compiler
+ * warnings and ensure references are optimized away.
+ */
+#define PCG_ARRAYID_SHIFT       (PCG_ARRAYID_OFFSET * (PCG_ARRAYID_WIDTH != 0))
+
+static inline void set_page_cgroup_array_id(struct page_cgroup *pc,
+                                            unsigned long id)
+{
+        pc->flags &= ~(PCG_ARRAYID_MASK << PCG_ARRAYID_SHIFT);
+        pc->flags |= (id & PCG_ARRAYID_MASK) << PCG_ARRAYID_SHIFT;
+}
+
+static inline unsigned long page_cgroup_array_id(struct page_cgroup *pc)
+{
+        return (pc->flags >> PCG_ARRAYID_SHIFT) & PCG_ARRAYID_MASK;
+}
+
 #else /* CONFIG_CGROUP_MEM_RES_CTLR */
 struct page_cgroup;
 
@@ -152,7 +175,7 @@ static inline void __init page_cgroup_init_flatmem(void)
 {
 }
 
-#endif
+#endif /* CONFIG_CGROUP_MEM_RES_CTLR */
 
 #include <linux/swap.h>
 
@@ -188,5 +211,8 @@ static inline void swap_cgroup_swapoff(int type)
         return;
 }
 
-#endif
-#endif
+#endif /* CONFIG_CGROUP_MEM_RES_CTLR_SWAP */
+
+#endif /* !__GENERATING_BOUNDS_H */
+
+#endif /* __LINUX_PAGE_CGROUP_H */
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 29ebba54c238..c11950652646 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -298,7 +298,6 @@ static inline pgoff_t linear_page_index(struct vm_area_struct *vma,
 
 extern void __lock_page(struct page *page);
 extern int __lock_page_killable(struct page *page);
-extern void __lock_page_nosync(struct page *page);
 extern int __lock_page_or_retry(struct page *page, struct mm_struct *mm,
                                 unsigned int flags);
 extern void unlock_page(struct page *page);
@@ -342,17 +341,6 @@ static inline int lock_page_killable(struct page *page)
 }
 
 /*
- * lock_page_nosync should only be used if we can't pin the page's inode.
- * Doesn't play quite so well with block device plugging.
- */
-static inline void lock_page_nosync(struct page *page)
-{
-        might_sleep();
-        if (!trylock_page(page))
-                __lock_page_nosync(page);
-}
-        
-/*
  * lock_page_or_retry - Lock the page, unless this would block and the
  * caller indicated that it can handle a retry.
  */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index bda221dfaf0a..11fd38151cc9 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2737,6 +2737,7 @@
 #define PCI_DEVICE_ID_INTEL_82372FB_1   0x7601
 #define PCI_DEVICE_ID_INTEL_SCH_LPC     0x8119
 #define PCI_DEVICE_ID_INTEL_SCH_IDE     0x811a
+#define PCI_DEVICE_ID_INTEL_ITC_LPC     0x8186
 #define PCI_DEVICE_ID_INTEL_82454GX     0x84c4
 #define PCI_DEVICE_ID_INTEL_82450GX     0x84c5
 #define PCI_DEVICE_ID_INTEL_82451NX     0x84ca
diff --git a/include/linux/pid.h b/include/linux/pid.h
index 49f1c2f66e95..efceda0a51b1 100644
--- a/include/linux/pid.h
+++ b/include/linux/pid.h
@@ -141,6 +141,17 @@ static inline struct pid_namespace *ns_of_pid(struct pid *pid)
 }
 
 /*
+ * is_child_reaper returns true if the pid is the init process
+ * of the current namespace. As this one could be checked before
+ * pid_ns->child_reaper is assigned in copy_process, we check
+ * with the pid number.
+ */
+static inline bool is_child_reaper(struct pid *pid)
+{
+        return pid->numbers[pid->level].nr == 1;
+}
+
+/*
  * the helpers to get the pid's id seen from different namespaces
  *
  * pid_nr()    : global id, i.e. the id seen from the init namespace;
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 379eaed72d4b..838c1149251a 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -50,7 +50,7 @@ typedef	int (write_proc_t)(struct file *file, const char __user *buffer,
 
 struct proc_dir_entry {
         unsigned int low_ino;
-        unsigned short namelen;
+        unsigned int namelen;
         const char *name;
         mode_t mode;
         nlink_t nlink;
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
index eb354f6f26b3..26f9e3612e0f 100644
--- a/include/linux/quotaops.h
+++ b/include/linux/quotaops.h
@@ -277,7 +277,7 @@ static inline int dquot_alloc_space(struct inode *inode, qsize_t nr)
                 /*
                  * Mark inode fully dirty. Since we are allocating blocks, inode
                  * would become fully dirty soon anyway and it reportedly
-                 * reduces inode_lock contention.
+                 * reduces lock contention.
                  */
                 mark_inode_dirty(inode);
         }
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index c21072adbfad..0a3842aacba9 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -1124,15 +1124,18 @@ struct reiserfs_de_head {
 #   define aligned_address(addr)           ((void *)((long)(addr) & ~((1UL << ADDR_UNALIGNED_BITS) - 1)))
 #   define unaligned_offset(addr)          (((int)((long)(addr) & ((1 << ADDR_UNALIGNED_BITS) - 1))) << 3)
 
-#   define set_bit_unaligned(nr, addr)     ext2_set_bit((nr) + unaligned_offset(addr), aligned_address(addr))
-#   define clear_bit_unaligned(nr, addr)   ext2_clear_bit((nr) + unaligned_offset(addr), aligned_address(addr))
-#   define test_bit_unaligned(nr, addr)    ext2_test_bit((nr) + unaligned_offset(addr), aligned_address(addr))
+#   define set_bit_unaligned(nr, addr)  \
+        __test_and_set_bit_le((nr) + unaligned_offset(addr), aligned_address(addr))
+#   define clear_bit_unaligned(nr, addr)        \
+        __test_and_clear_bit_le((nr) + unaligned_offset(addr), aligned_address(addr))
+#   define test_bit_unaligned(nr, addr) \
+        test_bit_le((nr) + unaligned_offset(addr), aligned_address(addr))
 
 #else
 
-#   define set_bit_unaligned(nr, addr)     ext2_set_bit(nr, addr)
-#   define clear_bit_unaligned(nr, addr)   ext2_clear_bit(nr, addr)
-#   define test_bit_unaligned(nr, addr)    ext2_test_bit(nr, addr)
+#   define set_bit_unaligned(nr, addr)  __test_and_set_bit_le(nr, addr)
+#   define clear_bit_unaligned(nr, addr)        __test_and_clear_bit_le(nr, addr)
+#   define test_bit_unaligned(nr, addr) test_bit_le(nr, addr)
 
 #endif
 
@@ -2329,14 +2332,10 @@ __u32 keyed_hash(const signed char *msg, int len);
 __u32 yura_hash(const signed char *msg, int len);
 __u32 r5_hash(const signed char *msg, int len);
 
-/* the ext2 bit routines adjust for big or little endian as
-** appropriate for the arch, so in our laziness we use them rather
-** than using the bit routines they call more directly.  These
-** routines must be used when changing on disk bitmaps.  */
-#define reiserfs_test_and_set_le_bit   ext2_set_bit
-#define reiserfs_test_and_clear_le_bit ext2_clear_bit
-#define reiserfs_test_le_bit           ext2_test_bit
-#define reiserfs_find_next_zero_le_bit ext2_find_next_zero_bit
+#define reiserfs_test_and_set_le_bit    __test_and_set_bit_le
+#define reiserfs_test_and_clear_le_bit  __test_and_clear_bit_le
+#define reiserfs_test_le_bit            test_bit_le
+#define reiserfs_find_next_zero_le_bit  find_next_zero_bit_le
 
 /* sometimes reiserfs_truncate may require to allocate few new blocks
    to perform indirect2direct conversion. People probably used to
diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h
index a5930cb66145..c9d625ca659e 100644
--- a/include/linux/res_counter.h
+++ b/include/linux/res_counter.h
@@ -129,20 +129,22 @@ int __must_check res_counter_charge(struct res_counter *counter,
 void res_counter_uncharge_locked(struct res_counter *counter, unsigned long val);
 void res_counter_uncharge(struct res_counter *counter, unsigned long val);
 
-static inline bool res_counter_limit_check_locked(struct res_counter *cnt)
-{
-        if (cnt->usage < cnt->limit)
-                return true;
-
-        return false;
-}
-
-static inline bool res_counter_soft_limit_check_locked(struct res_counter *cnt)
+/**
+ * res_counter_margin - calculate chargeable space of a counter
+ * @cnt: the counter
+ *
+ * Returns the difference between the hard limit and the current usage
+ * of resource counter @cnt.
+ */
+static inline unsigned long long res_counter_margin(struct res_counter *cnt)
 {
-        if (cnt->usage < cnt->soft_limit)
-                return true;
+        unsigned long long margin;
+        unsigned long flags;
 
-        return false;
+        spin_lock_irqsave(&cnt->lock, flags);
+        margin = cnt->limit - cnt->usage;
+        spin_unlock_irqrestore(&cnt->lock, flags);
+        return margin;
 }
 
 /**
@@ -167,52 +169,6 @@ res_counter_soft_limit_excess(struct res_counter *cnt)
         return excess;
 }
 
-/*
- * Helper function to detect if the cgroup is within it's limit or
- * not. It's currently called from cgroup_rss_prepare()
- */
-static inline bool res_counter_check_under_limit(struct res_counter *cnt)
-{
-        bool ret;
-        unsigned long flags;
-
-        spin_lock_irqsave(&cnt->lock, flags);
-        ret = res_counter_limit_check_locked(cnt);
-        spin_unlock_irqrestore(&cnt->lock, flags);
-        return ret;
-}
-
-/**
- * res_counter_check_margin - check if the counter allows charging
- * @cnt: the resource counter to check
- * @bytes: the number of bytes to check the remaining space against
- *
- * Returns a boolean value on whether the counter can be charged
- * @bytes or whether this would exceed the limit.
- */
-static inline bool res_counter_check_margin(struct res_counter *cnt,
-                                            unsigned long bytes)
-{
-        bool ret;
-        unsigned long flags;
-
-        spin_lock_irqsave(&cnt->lock, flags);
-        ret = cnt->limit - cnt->usage >= bytes;
-        spin_unlock_irqrestore(&cnt->lock, flags);
-        return ret;
-}
-
-static inline bool res_counter_check_under_soft_limit(struct res_counter *cnt)
-{
-        bool ret;
-        unsigned long flags;
-
-        spin_lock_irqsave(&cnt->lock, flags);
-        ret = res_counter_soft_limit_check_locked(cnt);
-        spin_unlock_irqrestore(&cnt->lock, flags);
-        return ret;
-}
-
 static inline void res_counter_reset_max(struct res_counter *cnt)
 {
         unsigned long flags;
diff --git a/include/linux/rio.h b/include/linux/rio.h
index ff681ebba585..4e37a7cfa726 100644
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
@@ -24,6 +24,7 @@
 #define RIO_NO_HOPCOUNT         -1
 #define RIO_INVALID_DESTID      0xffff
 
+#define RIO_MAX_MPORTS          8
 #define RIO_MAX_MPORT_RESOURCES 16
 #define RIO_MAX_DEV_RESOURCES   16
 
@@ -241,7 +242,7 @@ struct rio_mport {
         struct rio_msg inb_msg[RIO_MAX_MBOX];
         struct rio_msg outb_msg[RIO_MAX_MBOX];
         int host_deviceid;      /* Host device ID */
-        struct rio_ops *ops;    /* maintenance transaction functions */
+        struct rio_ops *ops;    /* low-level architecture-dependent routines */
         unsigned char id;       /* port ID, unique among all ports */
         unsigned char index;    /* port index, unique among all port
                                    interfaces of the same type */
@@ -285,6 +286,13 @@ struct rio_net {
  * @cwrite: Callback to perform network write of config space.
  * @dsend: Callback to send a doorbell message.
  * @pwenable: Callback to enable/disable port-write message handling.
+ * @open_outb_mbox: Callback to initialize outbound mailbox.
+ * @close_outb_mbox: Callback to shut down outbound mailbox.
+ * @open_inb_mbox: Callback to initialize inbound mailbox.
+ * @close_inb_mbox: Callback to shut down inbound mailbox.
+ * @add_outb_message: Callback to add a message to an outbound mailbox queue.
+ * @add_inb_buffer: Callback to add a buffer to an inbound mailbox queue.
+ * @get_inb_message: Callback to get a message from an inbound mailbox queue.
  */
 struct rio_ops {
         int (*lcread) (struct rio_mport *mport, int index, u32 offset, int len,
@@ -297,6 +305,16 @@ struct rio_ops {
                         u8 hopcount, u32 offset, int len, u32 data);
         int (*dsend) (struct rio_mport *mport, int index, u16 destid, u16 data);
         int (*pwenable) (struct rio_mport *mport, int enable);
+        int (*open_outb_mbox)(struct rio_mport *mport, void *dev_id,
+                              int mbox, int entries);
+        void (*close_outb_mbox)(struct rio_mport *mport, int mbox);
+        int  (*open_inb_mbox)(struct rio_mport *mport, void *dev_id,
+                             int mbox, int entries);
+        void (*close_inb_mbox)(struct rio_mport *mport, int mbox);
+        int  (*add_outb_message)(struct rio_mport *mport, struct rio_dev *rdev,
+                                 int mbox, void *buffer, size_t len);
+        int (*add_inb_buffer)(struct rio_mport *mport, int mbox, void *buf);
+        void *(*get_inb_message)(struct rio_mport *mport, int mbox);
 };
 
 #define RIO_RESOURCE_MEM        0x00000100
@@ -378,12 +396,7 @@ union rio_pw_msg {
 };
 
 /* Architecture and hardware-specific functions */
-extern int rio_init_mports(void);
 extern void rio_register_mport(struct rio_mport *);
-extern int rio_hw_add_outb_message(struct rio_mport *, struct rio_dev *, int,
-                                   void *, size_t);
-extern int rio_hw_add_inb_buffer(struct rio_mport *, int, void *);
-extern void *rio_hw_get_inb_message(struct rio_mport *, int);
 extern int rio_open_inb_mbox(struct rio_mport *, void *, int, int);
 extern void rio_close_inb_mbox(struct rio_mport *, int);
 extern int rio_open_outb_mbox(struct rio_mport *, void *, int, int);
diff --git a/include/linux/rio_drv.h b/include/linux/rio_drv.h
index e09e565c4bce..229b3ca23134 100644
--- a/include/linux/rio_drv.h
+++ b/include/linux/rio_drv.h
@@ -317,7 +317,8 @@ static inline int rio_add_outb_message(struct rio_mport *mport,
                                        struct rio_dev *rdev, int mbox,
                                        void *buffer, size_t len)
 {
-        return rio_hw_add_outb_message(mport, rdev, mbox, buffer, len);
+        return mport->ops->add_outb_message(mport, rdev, mbox,
+                                                   buffer, len);
 }
 
 extern int rio_request_inb_mbox(struct rio_mport *, void *, int, int,
@@ -336,7 +337,7 @@ extern int rio_release_inb_mbox(struct rio_mport *, int);
 static inline int rio_add_inb_buffer(struct rio_mport *mport, int mbox,
                                      void *buffer)
 {
-        return rio_hw_add_inb_buffer(mport, mbox, buffer);
+        return mport->ops->add_inb_buffer(mport, mbox, buffer);
 }
 
 /**
@@ -348,7 +349,7 @@ static inline int rio_add_inb_buffer(struct rio_mport *mport, int mbox,
  */
 static inline void *rio_get_inb_message(struct rio_mport *mport, int mbox)
 {
-        return rio_hw_get_inb_message(mport, mbox);
+        return mport->ops->get_inb_message(mport, mbox);
 }
 
 /* Doorbell management */
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 4b601be3dace..b8369d522bf8 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -99,6 +99,7 @@ struct robust_list_head;
 struct bio_list;
 struct fs_struct;
 struct perf_event_context;
+struct blk_plug;
 
 /*
  * List of flags we want to share for kernel threads,
@@ -1428,6 +1429,11 @@ struct task_struct {
 /* stacked block device info */
         struct bio_list *bio_list;
 
+#ifdef CONFIG_BLOCK
+/* stack plugging */
+        struct blk_plug *plug;
+#endif
+
 /* VM state */
         struct reclaim_state *reclaim_state;
 
@@ -1524,8 +1530,8 @@ struct task_struct {
         struct memcg_batch_info {
                 int do_batch;   /* incremented when batch uncharge started */
                 struct mem_cgroup *memcg; /* target memcg of uncharge */
-                unsigned long bytes;            /* uncharged usage */
-                unsigned long memsw_bytes; /* uncharged mem+swap usage */
+                unsigned long nr_pages; /* uncharged usage */
+                unsigned long memsw_nr_pages; /* uncharged mem+swap usage */
         } memcg_batch;
 #endif
 };
diff --git a/include/linux/security.h b/include/linux/security.h
index 56cac520d014..ca02f1716736 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -47,13 +47,14 @@
 
 struct ctl_table;
 struct audit_krule;
+struct user_namespace;
 
 /*
  * These functions are in security/capability.c and are used
  * as the default capabilities functions
  */
 extern int cap_capable(struct task_struct *tsk, const struct cred *cred,
-                       int cap, int audit);
+                       struct user_namespace *ns, int cap, int audit);
 extern int cap_settime(const struct timespec *ts, const struct timezone *tz);
 extern int cap_ptrace_access_check(struct task_struct *child, unsigned int mode);
 extern int cap_ptrace_traceme(struct task_struct *parent);
@@ -1262,6 +1263,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *      credentials.
  *      @tsk contains the task_struct for the process.
  *      @cred contains the credentials to use.
+ *      @ns contains the user namespace we want the capability in
  *      @cap contains the capability <include/linux/capability.h>.
  *      @audit: Whether to write an audit message or not
  *      Return 0 if the capability is granted for @tsk.
@@ -1384,7 +1386,7 @@ struct security_operations {
                        const kernel_cap_t *inheritable,
                        const kernel_cap_t *permitted);
         int (*capable) (struct task_struct *tsk, const struct cred *cred,
-                        int cap, int audit);
+                        struct user_namespace *ns, int cap, int audit);
         int (*quotactl) (int cmds, int type, int id, struct super_block *sb);
         int (*quota_on) (struct dentry *dentry);
         int (*syslog) (int type);
@@ -1665,9 +1667,12 @@ int security_capset(struct cred *new, const struct cred *old,
                     const kernel_cap_t *effective,
                     const kernel_cap_t *inheritable,
                     const kernel_cap_t *permitted);
-int security_capable(const struct cred *cred, int cap);
-int security_real_capable(struct task_struct *tsk, int cap);
-int security_real_capable_noaudit(struct task_struct *tsk, int cap);
+int security_capable(struct user_namespace *ns, const struct cred *cred,
+                        int cap);
+int security_real_capable(struct task_struct *tsk, struct user_namespace *ns,
+                        int cap);
+int security_real_capable_noaudit(struct task_struct *tsk,
+                        struct user_namespace *ns, int cap);
 int security_quotactl(int cmds, int type, int id, struct super_block *sb);
 int security_quota_on(struct dentry *dentry);
 int security_syslog(int type);
@@ -1860,28 +1865,29 @@ static inline int security_capset(struct cred *new,
         return cap_capset(new, old, effective, inheritable, permitted);
 }
 
-static inline int security_capable(const struct cred *cred, int cap)
+static inline int security_capable(struct user_namespace *ns,
+                                   const struct cred *cred, int cap)
 {
-        return cap_capable(current, cred, cap, SECURITY_CAP_AUDIT);
+        return cap_capable(current, cred, ns, cap, SECURITY_CAP_AUDIT);
 }
 
-static inline int security_real_capable(struct task_struct *tsk, int cap)
+static inline int security_real_capable(struct task_struct *tsk, struct user_namespace *ns, int cap)
 {
         int ret;
 
         rcu_read_lock();
-        ret = cap_capable(tsk, __task_cred(tsk), cap, SECURITY_CAP_AUDIT);
+        ret = cap_capable(tsk, __task_cred(tsk), ns, cap, SECURITY_CAP_AUDIT);
         rcu_read_unlock();
         return ret;
 }
 
 static inline
-int security_real_capable_noaudit(struct task_struct *tsk, int cap)
+int security_real_capable_noaudit(struct task_struct *tsk, struct user_namespace *ns, int cap)
 {
         int ret;
 
         rcu_read_lock();
-        ret = cap_capable(tsk, __task_cred(tsk), cap,
+        ret = cap_capable(tsk, __task_cred(tsk), ns, cap,
                                SECURITY_CAP_NOAUDIT);
         rcu_read_unlock();
         return ret;
diff --git a/include/linux/sm501.h b/include/linux/sm501.h
index 214f93209b8c..02fde50a79a5 100644
--- a/include/linux/sm501.h
+++ b/include/linux/sm501.h
@@ -172,3 +172,11 @@ struct sm501_platdata {
         struct sm501_platdata_gpio_i2c  *gpio_i2c;
         unsigned int                     gpio_i2c_nr;
 };
+
+#if defined(CONFIG_PPC32)
+#define smc501_readl(addr)              ioread32be((addr))
+#define smc501_writel(val, addr)        iowrite32be((val), (addr))
+#else
+#define smc501_readl(addr)              readl(addr)
+#define smc501_writel(val, addr)        writel(val, addr)
+#endif
diff --git a/include/linux/svga.h b/include/linux/svga.h
index c59a51a2b0e7..bfa68e837d6a 100644
--- a/include/linux/svga.h
+++ b/include/linux/svga.h
@@ -67,25 +67,25 @@ struct svga_pll {
 
 /* Write a value to the attribute register */
 
-static inline void svga_wattr(u8 index, u8 data)
+static inline void svga_wattr(void __iomem *regbase, u8 index, u8 data)
 {
-        inb(0x3DA);
-        outb(index, 0x3C0);
-        outb(data, 0x3C0);
+        vga_r(regbase, VGA_IS1_RC);
+        vga_w(regbase, VGA_ATT_IW, index);
+        vga_w(regbase, VGA_ATT_W, data);
 }
 
 /* Write a value to a sequence register with a mask */
 
-static inline void svga_wseq_mask(u8 index, u8 data, u8 mask)
+static inline void svga_wseq_mask(void __iomem *regbase, u8 index, u8 data, u8 mask)
 {
-        vga_wseq(NULL, index, (data & mask) | (vga_rseq(NULL, index) & ~mask));
+        vga_wseq(regbase, index, (data & mask) | (vga_rseq(regbase, index) & ~mask));
 }
 
 /* Write a value to a CRT register with a mask */
 
-static inline void svga_wcrt_mask(u8 index, u8 data, u8 mask)
+static inline void svga_wcrt_mask(void __iomem *regbase, u8 index, u8 data, u8 mask)
 {
-        vga_wcrt(NULL, index, (data & mask) | (vga_rcrt(NULL, index) & ~mask));
+        vga_wcrt(regbase, index, (data & mask) | (vga_rcrt(regbase, index) & ~mask));
 }
 
 static inline int svga_primary_device(struct pci_dev *dev)
@@ -96,27 +96,27 @@ static inline int svga_primary_device(struct pci_dev *dev)
 }
 
 
-void svga_wcrt_multi(const struct vga_regset *regset, u32 value);
-void svga_wseq_multi(const struct vga_regset *regset, u32 value);
+void svga_wcrt_multi(void __iomem *regbase, const struct vga_regset *regset, u32 value);
+void svga_wseq_multi(void __iomem *regbase, const struct vga_regset *regset, u32 value);
 
-void svga_set_default_gfx_regs(void);
-void svga_set_default_atc_regs(void);
-void svga_set_default_seq_regs(void);
-void svga_set_default_crt_regs(void);
-void svga_set_textmode_vga_regs(void);
+void svga_set_default_gfx_regs(void __iomem *regbase);
+void svga_set_default_atc_regs(void __iomem *regbase);
+void svga_set_default_seq_regs(void __iomem *regbase);
+void svga_set_default_crt_regs(void __iomem *regbase);
+void svga_set_textmode_vga_regs(void __iomem *regbase);
 
 void svga_settile(struct fb_info *info, struct fb_tilemap *map);
 void svga_tilecopy(struct fb_info *info, struct fb_tilearea *area);
 void svga_tilefill(struct fb_info *info, struct fb_tilerect *rect);
 void svga_tileblit(struct fb_info *info, struct fb_tileblit *blit);
-void svga_tilecursor(struct fb_info *info, struct fb_tilecursor *cursor);
+void svga_tilecursor(void __iomem *regbase, struct fb_info *info, struct fb_tilecursor *cursor);
 int svga_get_tilemax(struct fb_info *info);
 void svga_get_caps(struct fb_info *info, struct fb_blit_caps *caps,
                    struct fb_var_screeninfo *var);
 
 int svga_compute_pll(const struct svga_pll *pll, u32 f_wanted, u16 *m, u16 *n, u16 *r, int node);
 int svga_check_timings(const struct svga_timing_regs *tm, struct fb_var_screeninfo *var, int node);
-void svga_set_timings(const struct svga_timing_regs *tm, struct fb_var_screeninfo *var, u32 hmul, u32 hdiv, u32 vmul, u32 vdiv, u32 hborder, int node);
+void svga_set_timings(void __iomem *regbase, const struct svga_timing_regs *tm, struct fb_var_screeninfo *var, u32 hmul, u32 hdiv, u32 vmul, u32 vdiv, u32 hborder, int node);
 
 int svga_match_format(const struct svga_fb_format *frm, struct fb_var_screeninfo *var, struct fb_fix_screeninfo *fix);
 
diff --git a/include/linux/swap.h b/include/linux/swap.h
index ed6ebe690f4a..a5c6da5d8df8 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -309,8 +309,6 @@ extern void mem_cgroup_get_shmem_target(struct inode *inode, pgoff_t pgoff,
                                         struct page **pagep, swp_entry_t *ent);
 #endif
 
-extern void swap_unplug_io_fn(struct backing_dev_info *, struct page *);
-
 #ifdef CONFIG_SWAP
 /* linux/mm/page_io.c */
 extern int swap_readpage(struct page *);
diff --git a/include/linux/utsname.h b/include/linux/utsname.h
index 69f39974c041..4e5b0213fdc1 100644
--- a/include/linux/utsname.h
+++ b/include/linux/utsname.h
@@ -37,9 +37,13 @@ struct new_utsname {
 #include <linux/nsproxy.h>
 #include <linux/err.h>
 
+struct user_namespace;
+extern struct user_namespace init_user_ns;
+
 struct uts_namespace {
         struct kref kref;
         struct new_utsname name;
+        struct user_namespace *user_ns;
 };
 extern struct uts_namespace init_uts_ns;
 
@@ -50,7 +54,7 @@ static inline void get_uts_ns(struct uts_namespace *ns)
 }
 
 extern struct uts_namespace *copy_utsname(unsigned long flags,
-                                        struct uts_namespace *ns);
+                                          struct task_struct *tsk);
 extern void free_uts_ns(struct kref *kref);
 
 static inline void put_uts_ns(struct uts_namespace *ns)
@@ -67,12 +71,12 @@ static inline void put_uts_ns(struct uts_namespace *ns)
 }
 
 static inline struct uts_namespace *copy_utsname(unsigned long flags,
-                                        struct uts_namespace *ns)
+                                                 struct task_struct *tsk)
 {
         if (flags & CLONE_NEWUTS)
                 return ERR_PTR(-EINVAL);
 
-        return ns;
+        return tsk->nsproxy->uts_ns;
 }
 #endif
 
diff --git a/include/linux/v4l2-mediabus.h b/include/linux/v4l2-mediabus.h
new file mode 100644
index 000000000000..7054a7a8065e
--- /dev/null
+++ b/include/linux/v4l2-mediabus.h
@@ -0,0 +1,108 @@
+/*
+ * Media Bus API header
+ *
+ * Copyright (C) 2009, Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+ *
+ * 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
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __LINUX_V4L2_MEDIABUS_H
+#define __LINUX_V4L2_MEDIABUS_H
+
+#include <linux/types.h>
+#include <linux/videodev2.h>
+
+/*
+ * These pixel codes uniquely identify data formats on the media bus. Mostly
+ * they correspond to similarly named V4L2_PIX_FMT_* formats, format 0 is
+ * reserved, V4L2_MBUS_FMT_FIXED shall be used by host-client pairs, where the
+ * data format is fixed. Additionally, "2X8" means that one pixel is transferred
+ * in two 8-bit samples, "BE" or "LE" specify in which order those samples are
+ * transferred over the bus: "LE" means that the least significant bits are
+ * transferred first, "BE" means that the most significant bits are transferred
+ * first, and "PADHI" and "PADLO" define which bits - low or high, in the
+ * incomplete high byte, are filled with padding bits.
+ *
+ * The pixel codes are grouped by type, bus_width, bits per component, samples
+ * per pixel and order of subsamples. Numerical values are sorted using generic
+ * numerical sort order (8 thus comes before 10).
+ *
+ * As their value can't change when a new pixel code is inserted in the
+ * enumeration, the pixel codes are explicitly given a numerical value. The next
+ * free values for each category are listed below, update them when inserting
+ * new pixel codes.
+ */
+enum v4l2_mbus_pixelcode {
+        V4L2_MBUS_FMT_FIXED = 0x0001,
+
+        /* RGB - next is 0x1009 */
+        V4L2_MBUS_FMT_RGB444_2X8_PADHI_BE = 0x1001,
+        V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE = 0x1002,
+        V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE = 0x1003,
+        V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE = 0x1004,
+        V4L2_MBUS_FMT_BGR565_2X8_BE = 0x1005,
+        V4L2_MBUS_FMT_BGR565_2X8_LE = 0x1006,
+        V4L2_MBUS_FMT_RGB565_2X8_BE = 0x1007,
+        V4L2_MBUS_FMT_RGB565_2X8_LE = 0x1008,
+
+        /* YUV (including grey) - next is 0x2013 */
+        V4L2_MBUS_FMT_Y8_1X8 = 0x2001,
+        V4L2_MBUS_FMT_UYVY8_1_5X8 = 0x2002,
+        V4L2_MBUS_FMT_VYUY8_1_5X8 = 0x2003,
+        V4L2_MBUS_FMT_YUYV8_1_5X8 = 0x2004,
+        V4L2_MBUS_FMT_YVYU8_1_5X8 = 0x2005,
+        V4L2_MBUS_FMT_UYVY8_2X8 = 0x2006,
+        V4L2_MBUS_FMT_VYUY8_2X8 = 0x2007,
+        V4L2_MBUS_FMT_YUYV8_2X8 = 0x2008,
+        V4L2_MBUS_FMT_YVYU8_2X8 = 0x2009,
+        V4L2_MBUS_FMT_Y10_1X10 = 0x200a,
+        V4L2_MBUS_FMT_YUYV10_2X10 = 0x200b,
+        V4L2_MBUS_FMT_YVYU10_2X10 = 0x200c,
+        V4L2_MBUS_FMT_UYVY8_1X16 = 0x200f,
+        V4L2_MBUS_FMT_VYUY8_1X16 = 0x2010,
+        V4L2_MBUS_FMT_YUYV8_1X16 = 0x2011,
+        V4L2_MBUS_FMT_YVYU8_1X16 = 0x2012,
+        V4L2_MBUS_FMT_YUYV10_1X20 = 0x200d,
+        V4L2_MBUS_FMT_YVYU10_1X20 = 0x200e,
+
+        /* Bayer - next is 0x3013 */
+        V4L2_MBUS_FMT_SBGGR8_1X8 = 0x3001,
+        V4L2_MBUS_FMT_SGRBG8_1X8 = 0x3002,
+        V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8 = 0x300b,
+        V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8 = 0x300c,
+        V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8 = 0x3009,
+        V4L2_MBUS_FMT_SRGGB10_DPCM8_1X8 = 0x300d,
+        V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE = 0x3003,
+        V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE = 0x3004,
+        V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE = 0x3005,
+        V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE = 0x3006,
+        V4L2_MBUS_FMT_SBGGR10_1X10 = 0x3007,
+        V4L2_MBUS_FMT_SGBRG10_1X10 = 0x300e,
+        V4L2_MBUS_FMT_SGRBG10_1X10 = 0x300a,
+        V4L2_MBUS_FMT_SRGGB10_1X10 = 0x300f,
+        V4L2_MBUS_FMT_SBGGR12_1X12 = 0x3008,
+        V4L2_MBUS_FMT_SGBRG12_1X12 = 0x3010,
+        V4L2_MBUS_FMT_SGRBG12_1X12 = 0x3011,
+        V4L2_MBUS_FMT_SRGGB12_1X12 = 0x3012,
+};
+
+/**
+ * struct v4l2_mbus_framefmt - frame format on the media bus
+ * @width:      frame width
+ * @height:     frame height
+ * @code:       data format code (from enum v4l2_mbus_pixelcode)
+ * @field:      used interlacing type (from enum v4l2_field)
+ * @colorspace: colorspace of the data (from enum v4l2_colorspace)
+ */
+struct v4l2_mbus_framefmt {
+        __u32                   width;
+        __u32                   height;
+        __u32                   code;
+        __u32                   field;
+        __u32                   colorspace;
+        __u32                   reserved[7];
+};
+
+#endif
diff --git a/include/linux/v4l2-subdev.h b/include/linux/v4l2-subdev.h
new file mode 100644
index 000000000000..ed29cbbebfef
--- /dev/null
+++ b/include/linux/v4l2-subdev.h
@@ -0,0 +1,141 @@
+/*
+ * V4L2 subdev userspace API
+ *
+ * Copyright (C) 2010 Nokia Corporation
+ *
+ * Contacts: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ *           Sakari Ailus <sakari.ailus@iki.fi>
+ *
+ * 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
+ * published by the Free Software Foundation.
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LINUX_V4L2_SUBDEV_H
+#define __LINUX_V4L2_SUBDEV_H
+
+#include <linux/ioctl.h>
+#include <linux/types.h>
+#include <linux/v4l2-mediabus.h>
+
+/**
+ * enum v4l2_subdev_format_whence - Media bus format type
+ * @V4L2_SUBDEV_FORMAT_TRY: try format, for negotiation only
+ * @V4L2_SUBDEV_FORMAT_ACTIVE: active format, applied to the device
+ */
+enum v4l2_subdev_format_whence {
+        V4L2_SUBDEV_FORMAT_TRY = 0,
+        V4L2_SUBDEV_FORMAT_ACTIVE = 1,
+};
+
+/**
+ * struct v4l2_subdev_format - Pad-level media bus format
+ * @which: format type (from enum v4l2_subdev_format_whence)
+ * @pad: pad number, as reported by the media API
+ * @format: media bus format (format code and frame size)
+ */
+struct v4l2_subdev_format {
+        __u32 which;
+        __u32 pad;
+        struct v4l2_mbus_framefmt format;
+        __u32 reserved[8];
+};
+
+/**
+ * struct v4l2_subdev_crop - Pad-level crop settings
+ * @which: format type (from enum v4l2_subdev_format_whence)
+ * @pad: pad number, as reported by the media API
+ * @rect: pad crop rectangle boundaries
+ */
+struct v4l2_subdev_crop {
+        __u32 which;
+        __u32 pad;
+        struct v4l2_rect rect;
+        __u32 reserved[8];
+};
+
+/**
+ * struct v4l2_subdev_mbus_code_enum - Media bus format enumeration
+ * @pad: pad number, as reported by the media API
+ * @index: format index during enumeration
+ * @code: format code (from enum v4l2_mbus_pixelcode)
+ */
+struct v4l2_subdev_mbus_code_enum {
+        __u32 pad;
+        __u32 index;
+        __u32 code;
+        __u32 reserved[9];
+};
+
+/**
+ * struct v4l2_subdev_frame_size_enum - Media bus format enumeration
+ * @pad: pad number, as reported by the media API
+ * @index: format index during enumeration
+ * @code: format code (from enum v4l2_mbus_pixelcode)
+ */
+struct v4l2_subdev_frame_size_enum {
+        __u32 index;
+        __u32 pad;
+        __u32 code;
+        __u32 min_width;
+        __u32 max_width;
+        __u32 min_height;
+        __u32 max_height;
+        __u32 reserved[9];
+};
+
+/**
+ * struct v4l2_subdev_frame_interval - Pad-level frame rate
+ * @pad: pad number, as reported by the media API
+ * @interval: frame interval in seconds
+ */
+struct v4l2_subdev_frame_interval {
+        __u32 pad;
+        struct v4l2_fract interval;
+        __u32 reserved[9];
+};
+
+/**
+ * struct v4l2_subdev_frame_interval_enum - Frame interval enumeration
+ * @pad: pad number, as reported by the media API
+ * @index: frame interval index during enumeration
+ * @code: format code (from enum v4l2_mbus_pixelcode)
+ * @width: frame width in pixels
+ * @height: frame height in pixels
+ * @interval: frame interval in seconds
+ */
+struct v4l2_subdev_frame_interval_enum {
+        __u32 index;
+        __u32 pad;
+        __u32 code;
+        __u32 width;
+        __u32 height;
+        struct v4l2_fract interval;
+        __u32 reserved[9];
+};
+
+#define VIDIOC_SUBDEV_G_FMT     _IOWR('V',  4, struct v4l2_subdev_format)
+#define VIDIOC_SUBDEV_S_FMT     _IOWR('V',  5, struct v4l2_subdev_format)
+#define VIDIOC_SUBDEV_G_FRAME_INTERVAL \
+                        _IOWR('V', 21, struct v4l2_subdev_frame_interval)
+#define VIDIOC_SUBDEV_S_FRAME_INTERVAL \
+                        _IOWR('V', 22, struct v4l2_subdev_frame_interval)
+#define VIDIOC_SUBDEV_ENUM_MBUS_CODE \
+                        _IOWR('V',  2, struct v4l2_subdev_mbus_code_enum)
+#define VIDIOC_SUBDEV_ENUM_FRAME_SIZE \
+                        _IOWR('V', 74, struct v4l2_subdev_frame_size_enum)
+#define VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL \
+                        _IOWR('V', 75, struct v4l2_subdev_frame_interval_enum)
+#define VIDIOC_SUBDEV_G_CROP    _IOWR('V', 59, struct v4l2_subdev_crop)
+#define VIDIOC_SUBDEV_S_CROP    _IOWR('V', 60, struct v4l2_subdev_crop)
+
+#endif
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 5f6f47044abf..aa6c393b7ae9 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -70,6 +70,7 @@
  * Moved from videodev.h
  */
 #define VIDEO_MAX_FRAME               32
+#define VIDEO_MAX_PLANES               8
 
 #ifndef __KERNEL__
 
@@ -157,9 +158,23 @@ enum v4l2_buf_type {
         /* Experimental */
         V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY = 8,
 #endif
+        V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE = 9,
+        V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE  = 10,
         V4L2_BUF_TYPE_PRIVATE              = 0x80,
 };
 
+#define V4L2_TYPE_IS_MULTIPLANAR(type)                  \
+        ((type) == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE   \
+         || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
+
+#define V4L2_TYPE_IS_OUTPUT(type)                               \
+        ((type) == V4L2_BUF_TYPE_VIDEO_OUTPUT                   \
+         || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE         \
+         || (type) == V4L2_BUF_TYPE_VIDEO_OVERLAY               \
+         || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY        \
+         || (type) == V4L2_BUF_TYPE_VBI_OUTPUT                  \
+         || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT)
+
 enum v4l2_tuner_type {
         V4L2_TUNER_RADIO             = 1,
         V4L2_TUNER_ANALOG_TV         = 2,
@@ -245,6 +260,11 @@ struct v4l2_capability {
 #define V4L2_CAP_HW_FREQ_SEEK           0x00000400  /* Can do hardware frequency seek  */
 #define V4L2_CAP_RDS_OUTPUT             0x00000800  /* Is an RDS encoder */
 
+/* Is a video capture device that supports multiplanar formats */
+#define V4L2_CAP_VIDEO_CAPTURE_MPLANE   0x00001000
+/* Is a video output device that supports multiplanar formats */
+#define V4L2_CAP_VIDEO_OUTPUT_MPLANE    0x00002000
+
 #define V4L2_CAP_TUNER                  0x00010000  /* has a tuner */
 #define V4L2_CAP_AUDIO                  0x00020000  /* has audio support */
 #define V4L2_CAP_RADIO                  0x00040000  /* is a radio device */
@@ -319,6 +339,13 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_NV16    v4l2_fourcc('N', 'V', '1', '6') /* 16  Y/CbCr 4:2:2  */
 #define V4L2_PIX_FMT_NV61    v4l2_fourcc('N', 'V', '6', '1') /* 16  Y/CrCb 4:2:2  */
 
+/* two non contiguous planes - one Y, one Cr + Cb interleaved  */
+#define V4L2_PIX_FMT_NV12M   v4l2_fourcc('N', 'M', '1', '2') /* 12  Y/CbCr 4:2:0  */
+#define V4L2_PIX_FMT_NV12MT  v4l2_fourcc('T', 'M', '1', '2') /* 12  Y/CbCr 4:2:0 64x32 macroblocks */
+
+/* three non contiguous planes - Y, Cb, Cr */
+#define V4L2_PIX_FMT_YUV420M v4l2_fourcc('Y', 'M', '1', '2') /* 12  YUV420 planar */
+
 /* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */
 #define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B', 'A', '8', '1') /*  8  BGBG.. GRGR.. */
 #define V4L2_PIX_FMT_SGBRG8  v4l2_fourcc('G', 'B', 'R', 'G') /*  8  GBGB.. RGRG.. */
@@ -328,6 +355,10 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_SGBRG10 v4l2_fourcc('G', 'B', '1', '0') /* 10  GBGB.. RGRG.. */
 #define V4L2_PIX_FMT_SGRBG10 v4l2_fourcc('B', 'A', '1', '0') /* 10  GRGR.. BGBG.. */
 #define V4L2_PIX_FMT_SRGGB10 v4l2_fourcc('R', 'G', '1', '0') /* 10  RGRG.. GBGB.. */
+#define V4L2_PIX_FMT_SBGGR12 v4l2_fourcc('B', 'G', '1', '2') /* 12  BGBG.. GRGR.. */
+#define V4L2_PIX_FMT_SGBRG12 v4l2_fourcc('G', 'B', '1', '2') /* 12  GBGB.. RGRG.. */
+#define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') /* 12  GRGR.. BGBG.. */
+#define V4L2_PIX_FMT_SRGGB12 v4l2_fourcc('R', 'G', '1', '2') /* 12  RGRG.. GBGB.. */
         /* 10bit raw bayer DPCM compressed to 8 bits */
 #define V4L2_PIX_FMT_SGRBG10DPCM8 v4l2_fourcc('B', 'D', '1', '0')
         /*
@@ -365,6 +396,7 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_TM6000   v4l2_fourcc('T', 'M', '6', '0') /* tm5600/tm60x0 */
 #define V4L2_PIX_FMT_CIT_YYVYUY v4l2_fourcc('C', 'I', 'T', 'V') /* one line of Y then 1 line of VYUY */
 #define V4L2_PIX_FMT_KONICA420  v4l2_fourcc('K', 'O', 'N', 'I') /* YUV420 planar in blocks of 256 pixels */
+#define V4L2_PIX_FMT_JPGL       v4l2_fourcc('J', 'P', 'G', 'L') /* JPEG-Lite */
 
 /*
  *      F O R M A T   E N U M E R A T I O N
@@ -517,6 +549,62 @@ struct v4l2_requestbuffers {
         __u32                   reserved[2];
 };
 
+/**
+ * struct v4l2_plane - plane info for multi-planar buffers
+ * @bytesused:          number of bytes occupied by data in the plane (payload)
+ * @length:             size of this plane (NOT the payload) in bytes
+ * @mem_offset:         when memory in the associated struct v4l2_buffer is
+ *                      V4L2_MEMORY_MMAP, equals the offset from the start of
+ *                      the device memory for this plane (or is a "cookie" that
+ *                      should be passed to mmap() called on the video node)
+ * @userptr:            when memory is V4L2_MEMORY_USERPTR, a userspace pointer
+ *                      pointing to this plane
+ * @data_offset:        offset in the plane to the start of data; usually 0,
+ *                      unless there is a header in front of the data
+ *
+ * Multi-planar buffers consist of one or more planes, e.g. an YCbCr buffer
+ * with two planes can have one plane for Y, and another for interleaved CbCr
+ * components. Each plane can reside in a separate memory buffer, or even in
+ * a completely separate memory node (e.g. in embedded devices).
+ */
+struct v4l2_plane {
+        __u32                   bytesused;
+        __u32                   length;
+        union {
+                __u32           mem_offset;
+                unsigned long   userptr;
+        } m;
+        __u32                   data_offset;
+        __u32                   reserved[11];
+};
+
+/**
+ * struct v4l2_buffer - video buffer info
+ * @index:      id number of the buffer
+ * @type:       buffer type (type == *_MPLANE for multiplanar buffers)
+ * @bytesused:  number of bytes occupied by data in the buffer (payload);
+ *              unused (set to 0) for multiplanar buffers
+ * @flags:      buffer informational flags
+ * @field:      field order of the image in the buffer
+ * @timestamp:  frame timestamp
+ * @timecode:   frame timecode
+ * @sequence:   sequence count of this frame
+ * @memory:     the method, in which the actual video data is passed
+ * @offset:     for non-multiplanar buffers with memory == V4L2_MEMORY_MMAP;
+ *              offset from the start of the device memory for this plane,
+ *              (or a "cookie" that should be passed to mmap() as offset)
+ * @userptr:    for non-multiplanar buffers with memory == V4L2_MEMORY_USERPTR;
+ *              a userspace pointer pointing to this buffer
+ * @planes:     for multiplanar buffers; userspace pointer to the array of plane
+ *              info structs for this buffer
+ * @length:     size in bytes of the buffer (NOT its payload) for single-plane
+ *              buffers (when type != *_MPLANE); number of elements in the
+ *              planes array for multi-plane buffers
+ * @input:      input number from which the video data has has been captured
+ *
+ * Contains data exchanged by application and driver using one of the Streaming
+ * I/O methods.
+ */
 struct v4l2_buffer {
         __u32                   index;
         enum v4l2_buf_type      type;
@@ -532,6 +620,7 @@ struct v4l2_buffer {
         union {
                 __u32           offset;
                 unsigned long   userptr;
+                struct v4l2_plane *planes;
         } m;
         __u32                   length;
         __u32                   input;
@@ -1622,12 +1711,56 @@ struct v4l2_mpeg_vbi_fmt_ivtv {
  *      A G G R E G A T E   S T R U C T U R E S
  */
 
-/*      Stream data format
+/**
+ * struct v4l2_plane_pix_format - additional, per-plane format definition
+ * @sizeimage:          maximum size in bytes required for data, for which
+ *                      this plane will be used
+ * @bytesperline:       distance in bytes between the leftmost pixels in two
+ *                      adjacent lines
+ */
+struct v4l2_plane_pix_format {
+        __u32           sizeimage;
+        __u16           bytesperline;
+        __u16           reserved[7];
+} __attribute__ ((packed));
+
+/**
+ * struct v4l2_pix_format_mplane - multiplanar format definition
+ * @width:              image width in pixels
+ * @height:             image height in pixels
+ * @pixelformat:        little endian four character code (fourcc)
+ * @field:              field order (for interlaced video)
+ * @colorspace:         supplemental to pixelformat
+ * @plane_fmt:          per-plane information
+ * @num_planes:         number of planes for this format
+ */
+struct v4l2_pix_format_mplane {
+        __u32                           width;
+        __u32                           height;
+        __u32                           pixelformat;
+        enum v4l2_field                 field;
+        enum v4l2_colorspace            colorspace;
+
+        struct v4l2_plane_pix_format    plane_fmt[VIDEO_MAX_PLANES];
+        __u8                            num_planes;
+        __u8                            reserved[11];
+} __attribute__ ((packed));
+
+/**
+ * struct v4l2_format - stream data format
+ * @type:       type of the data stream
+ * @pix:        definition of an image format
+ * @pix_mp:     definition of a multiplanar image format
+ * @win:        definition of an overlaid image
+ * @vbi:        raw VBI capture or output parameters
+ * @sliced:     sliced VBI capture or output parameters
+ * @raw_data:   placeholder for future extensions and custom formats
  */
 struct v4l2_format {
         enum v4l2_buf_type type;
         union {
                 struct v4l2_pix_format          pix;     /* V4L2_BUF_TYPE_VIDEO_CAPTURE */
+                struct v4l2_pix_format_mplane   pix_mp;  /* V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE */
                 struct v4l2_window              win;     /* V4L2_BUF_TYPE_VIDEO_OVERLAY */
                 struct v4l2_vbi_format          vbi;     /* V4L2_BUF_TYPE_VBI_CAPTURE */
                 struct v4l2_sliced_vbi_format   sliced;  /* V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */
@@ -1635,7 +1768,6 @@ struct v4l2_format {
         } fmt;
 };
 
-
 /*      Stream type-dependent parameters
  */
 struct v4l2_streamparm {
@@ -1808,16 +1940,6 @@ struct v4l2_dbg_chip_ident {
 /* Reminder: when adding new ioctls please add support for them to
    drivers/media/video/v4l2-compat-ioctl32.c as well! */
 
-#ifdef __OLD_VIDIOC_
-/* for compatibility, will go away some day */
-#define VIDIOC_OVERLAY_OLD      _IOWR('V', 14, int)
-#define VIDIOC_S_PARM_OLD        _IOW('V', 22, struct v4l2_streamparm)
-#define VIDIOC_S_CTRL_OLD        _IOW('V', 28, struct v4l2_control)
-#define VIDIOC_G_AUDIO_OLD      _IOWR('V', 33, struct v4l2_audio)
-#define VIDIOC_G_AUDOUT_OLD     _IOWR('V', 49, struct v4l2_audioout)
-#define VIDIOC_CROPCAP_OLD       _IOR('V', 58, struct v4l2_cropcap)
-#endif
-
 #define BASE_VIDIOC_PRIVATE     192             /* 192-255 are private */
 
 #endif /* __LINUX_VIDEODEV2_H */
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 0ead399e08b5..17e7ccc322a5 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -9,7 +9,7 @@
 
 struct backing_dev_info;
 
-extern spinlock_t inode_lock;
+extern spinlock_t inode_wb_list_lock;
 
 /*
  * fs/fs-writeback.c
diff --git a/include/media/media-device.h b/include/media/media-device.h
new file mode 100644
index 000000000000..6a27d916c250
--- /dev/null
+++ b/include/media/media-device.h
@@ -0,0 +1,95 @@
+/*
+ * Media device
+ *
+ * Copyright (C) 2010 Nokia Corporation
+ *
+ * Contacts: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ *           Sakari Ailus <sakari.ailus@iki.fi>
+ *
+ * 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
+ * published by the Free Software Foundation.
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _MEDIA_DEVICE_H
+#define _MEDIA_DEVICE_H
+
+#include <linux/device.h>
+#include <linux/list.h>
+#include <linux/mutex.h>
+#include <linux/spinlock.h>
+
+#include <media/media-devnode.h>
+#include <media/media-entity.h>
+
+/**
+ * struct media_device - Media device
+ * @dev:        Parent device
+ * @devnode:    Media device node
+ * @model:      Device model name
+ * @serial:     Device serial number (optional)
+ * @bus_info:   Unique and stable device location identifier
+ * @hw_revision: Hardware device revision
+ * @driver_version: Device driver version
+ * @entity_id:  ID of the next entity to be registered
+ * @entities:   List of registered entities
+ * @lock:       Entities list lock
+ * @graph_mutex: Entities graph operation lock
+ *
+ * This structure represents an abstract high-level media device. It allows easy
+ * access to entities and provides basic media device-level support. The
+ * structure can be allocated directly or embedded in a larger structure.
+ *
+ * The parent @dev is a physical device. It must be set before registering the
+ * media device.
+ *
+ * @model is a descriptive model name exported through sysfs. It doesn't have to
+ * be unique.
+ */
+struct media_device {
+        /* dev->driver_data points to this struct. */
+        struct device *dev;
+        struct media_devnode devnode;
+
+        char model[32];
+        char serial[40];
+        char bus_info[32];
+        u32 hw_revision;
+        u32 driver_version;
+
+        u32 entity_id;
+        struct list_head entities;
+
+        /* Protects the entities list */
+        spinlock_t lock;
+        /* Serializes graph operations. */
+        struct mutex graph_mutex;
+
+        int (*link_notify)(struct media_pad *source,
+                           struct media_pad *sink, u32 flags);
+};
+
+/* media_devnode to media_device */
+#define to_media_device(node) container_of(node, struct media_device, devnode)
+
+int __must_check media_device_register(struct media_device *mdev);
+void media_device_unregister(struct media_device *mdev);
+
+int __must_check media_device_register_entity(struct media_device *mdev,
+                                              struct media_entity *entity);
+void media_device_unregister_entity(struct media_entity *entity);
+
+/* Iterate over all entities. */
+#define media_device_for_each_entity(entity, mdev)                      \
+        list_for_each_entry(entity, &(mdev)->entities, list)
+
+#endif
diff --git a/include/media/media-devnode.h b/include/media/media-devnode.h
new file mode 100644
index 000000000000..f6caafc874cb
--- /dev/null
+++ b/include/media/media-devnode.h
@@ -0,0 +1,97 @@
+/*
+ * Media device node
+ *
+ * Copyright (C) 2010 Nokia Corporation
+ *
+ * Contacts: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ *           Sakari Ailus <sakari.ailus@iki.fi>
+ *
+ * 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
+ * published by the Free Software Foundation.
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * --
+ *
+ * Common functions for media-related drivers to register and unregister media
+ * device nodes.
+ */
+
+#ifndef _MEDIA_DEVNODE_H
+#define _MEDIA_DEVNODE_H
+
+#include <linux/poll.h>
+#include <linux/fs.h>
+#include <linux/device.h>
+#include <linux/cdev.h>
+
+/*
+ * Flag to mark the media_devnode struct as registered. Drivers must not touch
+ * this flag directly, it will be set and cleared by media_devnode_register and
+ * media_devnode_unregister.
+ */
+#define MEDIA_FLAG_REGISTERED   0
+
+struct media_file_operations {
+        struct module *owner;
+        ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
+        ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
+        unsigned int (*poll) (struct file *, struct poll_table_struct *);
+        long (*ioctl) (struct file *, unsigned int, unsigned long);
+        int (*open) (struct file *);
+        int (*release) (struct file *);
+};
+
+/**
+ * struct media_devnode - Media device node
+ * @parent:     parent device
+ * @minor:      device node minor number
+ * @flags:      flags, combination of the MEDIA_FLAG_* constants
+ *
+ * This structure represents a media-related device node.
+ *
+ * The @parent is a physical device. It must be set by core or device drivers
+ * before registering the node.
+ */
+struct media_devnode {
+        /* device ops */
+        const struct media_file_operations *fops;
+
+        /* sysfs */
+        struct device dev;              /* media device */
+        struct cdev cdev;               /* character device */
+        struct device *parent;          /* device parent */
+
+        /* device info */
+        int minor;
+        unsigned long flags;            /* Use bitops to access flags */
+
+        /* callbacks */
+        void (*release)(struct media_devnode *mdev);
+};
+
+/* dev to media_devnode */
+#define to_media_devnode(cd) container_of(cd, struct media_devnode, dev)
+
+int __must_check media_devnode_register(struct media_devnode *mdev);
+void media_devnode_unregister(struct media_devnode *mdev);
+
+static inline struct media_devnode *media_devnode_data(struct file *filp)
+{
+        return filp->private_data;
+}
+
+static inline int media_devnode_is_registered(struct media_devnode *mdev)
+{
+        return test_bit(MEDIA_FLAG_REGISTERED, &mdev->flags);
+}
+
+#endif /* _MEDIA_DEVNODE_H */
diff --git a/include/media/media-entity.h b/include/media/media-entity.h
new file mode 100644
index 000000000000..cd8bca63a502
--- /dev/null
+++ b/include/media/media-entity.h
@@ -0,0 +1,151 @@
+/*
+ * Media entity
+ *
+ * Copyright (C) 2010 Nokia Corporation
+ *
+ * Contacts: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ *           Sakari Ailus <sakari.ailus@iki.fi>
+ *
+ * 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
+ * published by the Free Software Foundation.
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _MEDIA_ENTITY_H
+#define _MEDIA_ENTITY_H
+
+#include <linux/list.h>
+#include <linux/media.h>
+
+struct media_pipeline {
+};
+
+struct media_link {
+        struct media_pad *source;       /* Source pad */
+        struct media_pad *sink;         /* Sink pad  */
+        struct media_link *reverse;     /* Link in the reverse direction */
+        unsigned long flags;            /* Link flags (MEDIA_LNK_FL_*) */
+};
+
+struct media_pad {
+        struct media_entity *entity;    /* Entity this pad belongs to */
+        u16 index;                      /* Pad index in the entity pads array */
+        unsigned long flags;            /* Pad flags (MEDIA_PAD_FL_*) */
+};
+
+struct media_entity_operations {
+        int (*link_setup)(struct media_entity *entity,
+                          const struct media_pad *local,
+                          const struct media_pad *remote, u32 flags);
+};
+
+struct media_entity {
+        struct list_head list;
+        struct media_device *parent;    /* Media device this entity belongs to*/
+        u32 id;                         /* Entity ID, unique in the parent media
+                                         * device context */
+        const char *name;               /* Entity name */
+        u32 type;                       /* Entity type (MEDIA_ENT_T_*) */
+        u32 revision;                   /* Entity revision, driver specific */
+        unsigned long flags;            /* Entity flags (MEDIA_ENT_FL_*) */
+        u32 group_id;                   /* Entity group ID */
+
+        u16 num_pads;                   /* Number of sink and source pads */
+        u16 num_links;                  /* Number of existing links, both
+                                         * enabled and disabled */
+        u16 num_backlinks;              /* Number of backlinks */
+        u16 max_links;                  /* Maximum number of links */
+
+        struct media_pad *pads;         /* Pads array (num_pads elements) */
+        struct media_link *links;       /* Links array (max_links elements)*/
+
+        const struct media_entity_operations *ops;      /* Entity operations */
+
+        /* Reference counts must never be negative, but are signed integers on
+         * purpose: a simple WARN_ON(<0) check can be used to detect reference
+         * count bugs that would make them negative.
+         */
+        int stream_count;               /* Stream count for the entity. */
+        int use_count;                  /* Use count for the entity. */
+
+        struct media_pipeline *pipe;    /* Pipeline this entity belongs to. */
+
+        union {
+                /* Node specifications */
+                struct {
+                        u32 major;
+                        u32 minor;
+                } v4l;
+                struct {
+                        u32 major;
+                        u32 minor;
+                } fb;
+                struct {
+                        u32 card;
+                        u32 device;
+                        u32 subdevice;
+                } alsa;
+                int dvb;
+
+                /* Sub-device specifications */
+                /* Nothing needed yet */
+        };
+};
+
+static inline u32 media_entity_type(struct media_entity *entity)
+{
+        return entity->type & MEDIA_ENT_TYPE_MASK;
+}
+
+static inline u32 media_entity_subtype(struct media_entity *entity)
+{
+        return entity->type & MEDIA_ENT_SUBTYPE_MASK;
+}
+
+#define MEDIA_ENTITY_ENUM_MAX_DEPTH     16
+
+struct media_entity_graph {
+        struct {
+                struct media_entity *entity;
+                int link;
+        } stack[MEDIA_ENTITY_ENUM_MAX_DEPTH];
+        int top;
+};
+
+int media_entity_init(struct media_entity *entity, u16 num_pads,
+                struct media_pad *pads, u16 extra_links);
+void media_entity_cleanup(struct media_entity *entity);
+
+int media_entity_create_link(struct media_entity *source, u16 source_pad,
+                struct media_entity *sink, u16 sink_pad, u32 flags);
+int __media_entity_setup_link(struct media_link *link, u32 flags);
+int media_entity_setup_link(struct media_link *link, u32 flags);
+struct media_link *media_entity_find_link(struct media_pad *source,
+                struct media_pad *sink);
+struct media_pad *media_entity_remote_source(struct media_pad *pad);
+
+struct media_entity *media_entity_get(struct media_entity *entity);
+void media_entity_put(struct media_entity *entity);
+
+void media_entity_graph_walk_start(struct media_entity_graph *graph,
+                struct media_entity *entity);
+struct media_entity *
+media_entity_graph_walk_next(struct media_entity_graph *graph);
+void media_entity_pipeline_start(struct media_entity *entity,
+                struct media_pipeline *pipe);
+void media_entity_pipeline_stop(struct media_entity *entity);
+
+#define media_entity_call(entity, operation, args...)                   \
+        (((entity)->ops && (entity)->ops->operation) ?                  \
+         (entity)->ops->operation((entity) , ##args) : -ENOIOCTLCMD)
+
+#endif
diff --git a/include/media/noon010pc30.h b/include/media/noon010pc30.h
new file mode 100644
index 000000000000..58eafee36b30
--- /dev/null
+++ b/include/media/noon010pc30.h
@@ -0,0 +1,28 @@
+/*
+ * Driver header for NOON010PC30L camera sensor chip.
+ *
+ * Copyright (c) 2010 Samsung Electronics, Co. Ltd
+ * Contact: Sylwester Nawrocki <s.nawrocki@samsung.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.
+ */
+
+#ifndef NOON010PC30_H
+#define NOON010PC30_H
+
+/**
+ * @clk_rate: the clock frequency in Hz
+ * @gpio_nreset: GPIO driving nRESET pin
+ * @gpio_nstby: GPIO driving nSTBY pin
+ */
+
+struct noon010pc30_platform_data {
+        unsigned long clk_rate;
+        int gpio_nreset;
+        int gpio_nstby;
+};
+
+#endif /* NOON010PC30_H */
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index ee9e2f747c76..9184751f19c0 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -94,7 +94,7 @@ void rc_map_init(void);
 #define RC_MAP_GADMEI_RM008Z             "rc-gadmei-rm008z"
 #define RC_MAP_GENIUS_TVGO_A11MCE        "rc-genius-tvgo-a11mce"
 #define RC_MAP_GOTVIEW7135               "rc-gotview7135"
-#define RC_MAP_HAUPPAUGE_NEW             "rc-hauppauge-new"
+#define RC_MAP_HAUPPAUGE_NEW             "rc-hauppauge"
 #define RC_MAP_IMON_MCE                  "rc-imon-mce"
 #define RC_MAP_IMON_PAD                  "rc-imon-pad"
 #define RC_MAP_IODATA_BCTV7E             "rc-iodata-bctv7e"
@@ -125,14 +125,16 @@ void rc_map_init(void);
 #define RC_MAP_PROTEUS_2309              "rc-proteus-2309"
 #define RC_MAP_PURPLETV                  "rc-purpletv"
 #define RC_MAP_PV951                     "rc-pv951"
-#define RC_MAP_RC5_HAUPPAUGE_NEW         "rc-rc5-hauppauge-new"
+#define RC_MAP_HAUPPAUGE                 "rc-hauppauge"
 #define RC_MAP_RC5_TV                    "rc-rc5-tv"
 #define RC_MAP_RC6_MCE                   "rc-rc6-mce"
 #define RC_MAP_REAL_AUDIO_220_32_KEYS    "rc-real-audio-220-32-keys"
 #define RC_MAP_STREAMZAP                 "rc-streamzap"
 #define RC_MAP_TBS_NEC                   "rc-tbs-nec"
+#define RC_MAP_TECHNISAT_USB2            "rc-technisat-usb2"
 #define RC_MAP_TERRATEC_CINERGY_XS       "rc-terratec-cinergy-xs"
 #define RC_MAP_TERRATEC_SLIM             "rc-terratec-slim"
+#define RC_MAP_TERRATEC_SLIM_2           "rc-terratec-slim-2"
 #define RC_MAP_TEVII_NEC                 "rc-tevii-nec"
 #define RC_MAP_TOTAL_MEDIA_IN_HAND       "rc-total-media-in-hand"
 #define RC_MAP_TREKSTOR                  "rc-trekstor"
diff --git a/include/media/s3c_fimc.h b/include/media/s5p_fimc.h
index ca1b6738e4a4..9fdff8a4ed26 100644
--- a/include/media/s3c_fimc.h
+++ b/include/media/s5p_fimc.h
@@ -9,8 +9,8 @@
  * published by the Free Software Foundation.
  */
 
-#ifndef S3C_FIMC_H_
-#define S3C_FIMC_H_
+#ifndef S5P_FIMC_H_
+#define S5P_FIMC_H_
 
 enum cam_bus_type {
         FIMC_ITU_601 = 1,
@@ -27,34 +27,35 @@ enum cam_bus_type {
 struct i2c_board_info;
 
 /**
- * struct s3c_fimc_isp_info - image sensor information required for host
+ * struct s5p_fimc_isp_info - image sensor information required for host
  *                            interace configuration.
  *
  * @board_info: pointer to I2C subdevice's board info
+ * @clk_frequency: frequency of the clock the host interface provides to sensor
  * @bus_type: determines bus type, MIPI, ITU-R BT.601 etc.
+ * @csi_data_align: MIPI-CSI interface data alignment in bits
  * @i2c_bus_num: i2c control bus id the sensor is attached to
  * @mux_id: FIMC camera interface multiplexer index (separate for MIPI and ITU)
- * @bus_width: camera data bus width in bits
  * @flags: flags defining bus signals polarity inversion (High by default)
  */
-struct s3c_fimc_isp_info {
+struct s5p_fimc_isp_info {
         struct i2c_board_info *board_info;
+        unsigned long clk_frequency;
         enum cam_bus_type bus_type;
+        u16 csi_data_align;
         u16 i2c_bus_num;
         u16 mux_id;
-        u16 bus_width;
         u16 flags;
 };
 
-
-#define FIMC_MAX_CAMIF_CLIENTS  2
-
 /**
- * struct s3c_platform_fimc - camera host interface platform data
+ * struct s5p_platform_fimc - camera host interface platform data
  *
  * @isp_info: properties of camera sensor required for host interface setup
+ * @num_clients: the number of attached image sensors
  */
-struct s3c_platform_fimc {
-        struct s3c_fimc_isp_info *isp_info[FIMC_MAX_CAMIF_CLIENTS];
+struct s5p_platform_fimc {
+        struct s5p_fimc_isp_info *isp_info;
+        int num_clients;
 };
-#endif /* S3C_FIMC_H_ */
+#endif /* S5P_FIMC_H_ */
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index 9386db829fb7..f80b5372baf3 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -17,6 +17,7 @@
 #include <linux/pm.h>
 #include <linux/videodev2.h>
 #include <media/videobuf-core.h>
+#include <media/videobuf2-core.h>
 #include <media/v4l2-device.h>
 
 extern struct bus_type soc_camera_bus_type;
@@ -29,6 +30,8 @@ struct soc_camera_device {
         struct device *pdev;            /* Platform device */
         s32 user_width;
         s32 user_height;
+        u32 bytesperline;               /* for padding, zero if unused */
+        u32 sizeimage;
         enum v4l2_colorspace colorspace;
         unsigned char iface;            /* Host number */
         unsigned char devnum;           /* Device number per host */
@@ -44,7 +47,10 @@ struct soc_camera_device {
         int use_count;
         struct mutex video_lock;        /* Protects device data */
         struct file *streamer;          /* stream owner */
-        struct videobuf_queue vb_vidq;
+        union {
+                struct videobuf_queue vb_vidq;
+                struct vb2_queue vb2_vidq;
+        };
 };
 
 struct soc_camera_host {
@@ -78,6 +84,8 @@ struct soc_camera_host_ops {
         int (*try_fmt)(struct soc_camera_device *, struct v4l2_format *);
         void (*init_videobuf)(struct videobuf_queue *,
                               struct soc_camera_device *);
+        int (*init_videobuf2)(struct vb2_queue *,
+                              struct soc_camera_device *);
         int (*reqbufs)(struct soc_camera_device *, struct v4l2_requestbuffers *);
         int (*querycap)(struct soc_camera_host *, struct v4l2_capability *);
         int (*set_bus_param)(struct soc_camera_device *, __u32);
@@ -85,6 +93,7 @@ struct soc_camera_host_ops {
         int (*set_ctrl)(struct soc_camera_device *, struct v4l2_control *);
         int (*get_parm)(struct soc_camera_device *, struct v4l2_streamparm *);
         int (*set_parm)(struct soc_camera_device *, struct v4l2_streamparm *);
+        int (*enum_fsizes)(struct soc_camera_device *, struct v4l2_frmsizeenum *);
         unsigned int (*poll)(struct file *, poll_table *);
         const struct v4l2_queryctrl *controls;
         int num_controls;
@@ -299,4 +308,17 @@ static inline struct video_device *soc_camera_i2c_to_vdev(struct i2c_client *cli
         return icd->vdev;
 }
 
+static inline struct soc_camera_device *soc_camera_from_vb2q(struct vb2_queue *vq)
+{
+        return container_of(vq, struct soc_camera_device, vb2_vidq);
+}
+
+static inline struct soc_camera_device *soc_camera_from_vbq(struct videobuf_queue *vq)
+{
+        return container_of(vq, struct soc_camera_device, vb_vidq);
+}
+
+void soc_camera_lock(struct vb2_queue *vq);
+void soc_camera_unlock(struct vb2_queue *vq);
+
 #endif
diff --git a/include/media/soc_mediabus.h b/include/media/soc_mediabus.h
index 037cd7be001e..b338108ec305 100644
--- a/include/media/soc_mediabus.h
+++ b/include/media/soc_mediabus.h
@@ -12,8 +12,7 @@
 #define SOC_MEDIABUS_H
 
 #include <linux/videodev2.h>
-
-#include <media/v4l2-mediabus.h>
+#include <linux/v4l2-mediabus.h>
 
 /**
  * enum soc_mbus_packing - data packing types on the media-bus
@@ -61,5 +60,6 @@ struct soc_mbus_pixelfmt {
 const struct soc_mbus_pixelfmt *soc_mbus_get_fmtdesc(
         enum v4l2_mbus_pixelcode code);
 s32 soc_mbus_bytes_per_line(u32 width, const struct soc_mbus_pixelfmt *mf);
+int soc_mbus_samples_per_pixel(const struct soc_mbus_pixelfmt *mf);
 
 #endif
diff --git a/include/media/tuner.h b/include/media/tuner.h
index 51811eac46f1..963e33471835 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -21,6 +21,7 @@
 
 #ifndef _TUNER_H
 #define _TUNER_H
+#ifdef __KERNEL__
 
 #include <linux/videodev2.h>
 
@@ -131,6 +132,7 @@
 #define TUNER_NXP_TDA18271              83
 #define TUNER_SONY_BTF_PXN01Z           84
 #define TUNER_PHILIPS_FQ1236_MK5        85      /* NTSC, TDA9885, no FM radio */
+#define TUNER_TENA_TNF_5337             86
 
 /* tv card specific */
 #define TDA9887_PRESENT                 (1<<0)
@@ -156,14 +158,10 @@
 #define TDA9887_GAIN_NORMAL             (1<<20)
 #define TDA9887_RIF_41_3                (1<<21)  /* radio IF1 41.3 vs 33.3 */
 
-#ifdef __KERNEL__
-
 enum tuner_mode {
-        T_UNINITIALIZED = 0,
         T_RADIO         = 1 << V4L2_TUNER_RADIO,
         T_ANALOG_TV     = 1 << V4L2_TUNER_ANALOG_TV,
-        T_DIGITAL_TV    = 1 << V4L2_TUNER_DIGITAL_TV,
-        T_STANDBY       = 1 << 31
+        /* Don't need to map V4L2_TUNER_DIGITAL_TV, as tuner-core won't use it */
 };
 
 /* Older boards only had a single tuner device. Nowadays multiple tuner
@@ -193,11 +191,3 @@ struct tuner_setup {
 #endif /* __KERNEL__ */
 
 #endif /* _TUNER_H */
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-basic-offset: 8
- * End:
- */
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index 44fe44ec9ea7..b3edb67a8311 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -75,6 +75,7 @@ enum {
         V4L2_IDENT_OV9640 = 257,
         V4L2_IDENT_OV6650 = 258,
         V4L2_IDENT_OV2640 = 259,
+        V4L2_IDENT_OV9740 = 260,
 
         /* module saa7146: reserved range 300-309 */
         V4L2_IDENT_SAA7146 = 300,
@@ -209,6 +210,9 @@ enum {
         /* module sn9c20x: just ident 10000 */
         V4L2_IDENT_SN9C20X = 10000,
 
+        /* Siliconfile sensors: reserved range 10100 - 10199 */
+        V4L2_IDENT_NOON010PC30  = 10100,
+
         /* module cx231xx and cx25840 */
         V4L2_IDENT_CX2310X_AV = 23099, /* Integrated A/V decoder; not in '100 */
         V4L2_IDENT_CX23100    = 23100,
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index a659319e8582..a298ec49ddc4 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -80,21 +80,6 @@
 
 /* ------------------------------------------------------------------------- */
 
-/* Priority helper functions */
-
-struct v4l2_prio_state {
-        atomic_t prios[4];
-};
-void v4l2_prio_init(struct v4l2_prio_state *global);
-int v4l2_prio_change(struct v4l2_prio_state *global, enum v4l2_priority *local,
-                     enum v4l2_priority new);
-void v4l2_prio_open(struct v4l2_prio_state *global, enum v4l2_priority *local);
-void v4l2_prio_close(struct v4l2_prio_state *global, enum v4l2_priority local);
-enum v4l2_priority v4l2_prio_max(struct v4l2_prio_state *global);
-int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority local);
-
-/* ------------------------------------------------------------------------- */
-
 /* Control helper functions */
 
 int v4l2_ctrl_check(struct v4l2_ext_control *ctrl, struct v4l2_queryctrl *qctrl,
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 15802a067a12..8266d5ade2ff 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -16,12 +16,15 @@
 #include <linux/mutex.h>
 #include <linux/videodev2.h>
 
+#include <media/media-entity.h>
+
 #define VIDEO_MAJOR     81
 
 #define VFL_TYPE_GRABBER        0
 #define VFL_TYPE_VBI            1
 #define VFL_TYPE_RADIO          2
-#define VFL_TYPE_MAX            3
+#define VFL_TYPE_SUBDEV         3
+#define VFL_TYPE_MAX            4
 
 struct v4l2_ioctl_callbacks;
 struct video_device;
@@ -32,7 +35,25 @@ struct v4l2_ctrl_handler;
    Drivers can clear this flag if they want to block all future
    device access. It is cleared by video_unregister_device. */
 #define V4L2_FL_REGISTERED      (0)
+/* file->private_data points to struct v4l2_fh */
 #define V4L2_FL_USES_V4L2_FH    (1)
+/* Use the prio field of v4l2_fh for core priority checking */
+#define V4L2_FL_USE_FH_PRIO     (2)
+
+/* Priority helper functions */
+
+struct v4l2_prio_state {
+        atomic_t prios[4];
+};
+
+void v4l2_prio_init(struct v4l2_prio_state *global);
+int v4l2_prio_change(struct v4l2_prio_state *global, enum v4l2_priority *local,
+                     enum v4l2_priority new);
+void v4l2_prio_open(struct v4l2_prio_state *global, enum v4l2_priority *local);
+void v4l2_prio_close(struct v4l2_prio_state *global, enum v4l2_priority local);
+enum v4l2_priority v4l2_prio_max(struct v4l2_prio_state *global);
+int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority local);
+
 
 struct v4l2_file_operations {
         struct module *owner;
@@ -54,6 +75,9 @@ struct v4l2_file_operations {
 
 struct video_device
 {
+#if defined(CONFIG_MEDIA_CONTROLLER)
+        struct media_entity entity;
+#endif
         /* device ops */
         const struct v4l2_file_operations *fops;
 
@@ -68,6 +92,9 @@ struct video_device
         /* Control handler associated with this device node. May be NULL. */
         struct v4l2_ctrl_handler *ctrl_handler;
 
+        /* Priority state. If NULL, then v4l2_dev->prio will be used. */
+        struct v4l2_prio_state *prio;
+
         /* device info */
         char name[32];
         int vfl_type;
@@ -99,18 +126,31 @@ struct video_device
         struct mutex *lock;
 };
 
+#define media_entity_to_video_device(entity) \
+        container_of(entity, struct video_device, entity)
 /* dev to video-device */
 #define to_video_device(cd) container_of(cd, struct video_device, dev)
 
+int __must_check __video_register_device(struct video_device *vdev, int type,
+                int nr, int warn_if_nr_in_use, struct module *owner);
+
 /* Register video devices. Note that if video_register_device fails,
    the release() callback of the video_device structure is *not* called, so
    the caller is responsible for freeing any data. Usually that means that
    you call video_device_release() on failure. */
-int __must_check video_register_device(struct video_device *vdev, int type, int nr);
+static inline int __must_check video_register_device(struct video_device *vdev,
+                int type, int nr)
+{
+        return __video_register_device(vdev, type, nr, 1, vdev->fops->owner);
+}
 
 /* Same as video_register_device, but no warning is issued if the desired
    device node number was already in use. */
-int __must_check video_register_device_no_warn(struct video_device *vdev, int type, int nr);
+static inline int __must_check video_register_device_no_warn(
+                struct video_device *vdev, int type, int nr)
+{
+        return __video_register_device(vdev, type, nr, 0, vdev->fops->owner);
+}
 
 /* Unregister video devices. Will do nothing if vdev == NULL or
    video_is_registered() returns false. */
diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
index b16f307d471a..bd102cf509ac 100644
--- a/include/media/v4l2-device.h
+++ b/include/media/v4l2-device.h
@@ -21,7 +21,9 @@
 #ifndef _V4L2_DEVICE_H
 #define _V4L2_DEVICE_H
 
+#include <media/media-device.h>
 #include <media/v4l2-subdev.h>
+#include <media/v4l2-dev.h>
 
 /* Each instance of a V4L2 device should create the v4l2_device struct,
    either stand-alone or embedded in a larger struct.
@@ -39,6 +41,9 @@ struct v4l2_device {
            Note: dev might be NULL if there is no parent device
            as is the case with e.g. ISA devices. */
         struct device *dev;
+#if defined(CONFIG_MEDIA_CONTROLLER)
+        struct media_device *mdev;
+#endif
         /* used to keep track of the registered subdevs */
         struct list_head subdevs;
         /* lock this struct; can be used by the driver as well if this
@@ -51,10 +56,23 @@ struct v4l2_device {
                         unsigned int notification, void *arg);
         /* The control handler. May be NULL. */
         struct v4l2_ctrl_handler *ctrl_handler;
+        /* Device's priority state */
+        struct v4l2_prio_state prio;
         /* BKL replacement mutex. Temporary solution only. */
         struct mutex ioctl_lock;
+        /* Keep track of the references to this struct. */
+        struct kref ref;
+        /* Release function that is called when the ref count goes to 0. */
+        void (*release)(struct v4l2_device *v4l2_dev);
 };
 
+static inline void v4l2_device_get(struct v4l2_device *v4l2_dev)
+{
+        kref_get(&v4l2_dev->ref);
+}
+
+int v4l2_device_put(struct v4l2_device *v4l2_dev);
+
 /* Initialize v4l2_dev and make dev->driver_data point to v4l2_dev.
    dev may be NULL in rare cases (ISA devices). In that case you
    must fill in the v4l2_dev->name field before calling this function. */
@@ -96,6 +114,12 @@ int __must_check v4l2_device_register_subdev(struct v4l2_device *v4l2_dev,
    wasn't registered. In that case it will do nothing. */
 void v4l2_device_unregister_subdev(struct v4l2_subdev *sd);
 
+/* Register device nodes for all subdev of the v4l2 device that are marked with
+ * the V4L2_SUBDEV_FL_HAS_DEVNODE flag.
+ */
+int __must_check
+v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev);
+
 /* Iterate over all subdevs. */
 #define v4l2_device_for_each_subdev(sd, v4l2_dev)                       \
         list_for_each_entry(sd, &(v4l2_dev)->subdevs, list)
diff --git a/include/media/v4l2-fh.h b/include/media/v4l2-fh.h
index 1d72dde320bf..0206aa55be24 100644
--- a/include/media/v4l2-fh.h
+++ b/include/media/v4l2-fh.h
@@ -35,6 +35,7 @@ struct v4l2_fh {
         struct list_head        list;
         struct video_device     *vdev;
         struct v4l2_events      *events; /* events, pending and subscribed */
+        enum v4l2_priority      prio;
 };
 
 /*
@@ -50,8 +51,16 @@ int v4l2_fh_init(struct v4l2_fh *fh, struct video_device *vdev);
  */
 void v4l2_fh_add(struct v4l2_fh *fh);
 /*
+ * Can be used as the open() op of v4l2_file_operations.
+ * It allocates a v4l2_fh and inits and adds it to the video_device associated
+ * with the file pointer.
+ */
+int v4l2_fh_open(struct file *filp);
+/*
  * Remove file handle from the list of file handles. Must be called in
  * v4l2_file_operations->release() handler if the driver uses v4l2_fh.
+ * On error filp->private_data will be NULL, otherwise it will point to
+ * the v4l2_fh struct.
  */
 void v4l2_fh_del(struct v4l2_fh *fh);
 /*
@@ -61,5 +70,25 @@ void v4l2_fh_del(struct v4l2_fh *fh);
  * driver uses v4l2_fh.
  */
 void v4l2_fh_exit(struct v4l2_fh *fh);
+/*
+ * Can be used as the release() op of v4l2_file_operations.
+ * It deletes and exits the v4l2_fh associated with the file pointer and
+ * frees it. It will do nothing if filp->private_data (the pointer to the
+ * v4l2_fh struct) is NULL. This function always returns 0.
+ */
+int v4l2_fh_release(struct file *filp);
+/*
+ * Returns 1 if this filehandle is the only filehandle opened for the
+ * associated video_device. If fh is NULL, then it returns 0.
+ */
+int v4l2_fh_is_singular(struct v4l2_fh *fh);
+/*
+ * Helper function with struct file as argument. If filp->private_data is
+ * NULL, then it will return 0.
+ */
+static inline int v4l2_fh_is_singular_file(struct file *filp)
+{
+        return v4l2_fh_is_singular(filp->private_data);
+}
 
 #endif /* V4L2_EVENT_H */
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index 67df37542c68..dd9f1e7b8ff7 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -37,6 +37,10 @@ struct v4l2_ioctl_ops {
                                             struct v4l2_fmtdesc *f);
         int (*vidioc_enum_fmt_vid_out)     (struct file *file, void *fh,
                                             struct v4l2_fmtdesc *f);
+        int (*vidioc_enum_fmt_vid_cap_mplane)(struct file *file, void *fh,
+                                              struct v4l2_fmtdesc *f);
+        int (*vidioc_enum_fmt_vid_out_mplane)(struct file *file, void *fh,
+                                              struct v4l2_fmtdesc *f);
         int (*vidioc_enum_fmt_type_private)(struct file *file, void *fh,
                                             struct v4l2_fmtdesc *f);
 
@@ -57,6 +61,10 @@ struct v4l2_ioctl_ops {
                                         struct v4l2_format *f);
         int (*vidioc_g_fmt_sliced_vbi_out)(struct file *file, void *fh,
                                         struct v4l2_format *f);
+        int (*vidioc_g_fmt_vid_cap_mplane)(struct file *file, void *fh,
+                                           struct v4l2_format *f);
+        int (*vidioc_g_fmt_vid_out_mplane)(struct file *file, void *fh,
+                                           struct v4l2_format *f);
         int (*vidioc_g_fmt_type_private)(struct file *file, void *fh,
                                         struct v4l2_format *f);
 
@@ -77,6 +85,10 @@ struct v4l2_ioctl_ops {
                                         struct v4l2_format *f);
         int (*vidioc_s_fmt_sliced_vbi_out)(struct file *file, void *fh,
                                         struct v4l2_format *f);
+        int (*vidioc_s_fmt_vid_cap_mplane)(struct file *file, void *fh,
+                                           struct v4l2_format *f);
+        int (*vidioc_s_fmt_vid_out_mplane)(struct file *file, void *fh,
+                                           struct v4l2_format *f);
         int (*vidioc_s_fmt_type_private)(struct file *file, void *fh,
                                         struct v4l2_format *f);
 
@@ -97,6 +109,10 @@ struct v4l2_ioctl_ops {
                                           struct v4l2_format *f);
         int (*vidioc_try_fmt_sliced_vbi_out)(struct file *file, void *fh,
                                           struct v4l2_format *f);
+        int (*vidioc_try_fmt_vid_cap_mplane)(struct file *file, void *fh,
+                                             struct v4l2_format *f);
+        int (*vidioc_try_fmt_vid_out_mplane)(struct file *file, void *fh,
+                                             struct v4l2_format *f);
         int (*vidioc_try_fmt_type_private)(struct file *file, void *fh,
                                           struct v4l2_format *f);
 
@@ -254,7 +270,7 @@ struct v4l2_ioctl_ops {
 
         /* For other private ioctls */
         long (*vidioc_default)         (struct file *file, void *fh,
-                                        int cmd, void *arg);
+                                        bool valid_prio, int cmd, void *arg);
 };
 
 
diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h
index 8e6559838ae3..971c7fa29614 100644
--- a/include/media/v4l2-mediabus.h
+++ b/include/media/v4l2-mediabus.h
@@ -11,66 +11,7 @@
 #ifndef V4L2_MEDIABUS_H
 #define V4L2_MEDIABUS_H
 
-/*
- * These pixel codes uniquely identify data formats on the media bus. Mostly
- * they correspond to similarly named V4L2_PIX_FMT_* formats, format 0 is
- * reserved, V4L2_MBUS_FMT_FIXED shall be used by host-client pairs, where the
- * data format is fixed. Additionally, "2X8" means that one pixel is transferred
- * in two 8-bit samples, "BE" or "LE" specify in which order those samples are
- * transferred over the bus: "LE" means that the least significant bits are
- * transferred first, "BE" means that the most significant bits are transferred
- * first, and "PADHI" and "PADLO" define which bits - low or high, in the
- * incomplete high byte, are filled with padding bits.
- */
-enum v4l2_mbus_pixelcode {
-        V4L2_MBUS_FMT_FIXED = 1,
-        V4L2_MBUS_FMT_YUYV8_2X8,
-        V4L2_MBUS_FMT_YVYU8_2X8,
-        V4L2_MBUS_FMT_UYVY8_2X8,
-        V4L2_MBUS_FMT_VYUY8_2X8,
-        V4L2_MBUS_FMT_YVYU10_2X10,
-        V4L2_MBUS_FMT_YUYV10_2X10,
-        V4L2_MBUS_FMT_YVYU10_1X20,
-        V4L2_MBUS_FMT_YUYV10_1X20,
-        V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE,
-        V4L2_MBUS_FMT_RGB444_2X8_PADHI_BE,
-        V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE,
-        V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE,
-        V4L2_MBUS_FMT_RGB565_2X8_LE,
-        V4L2_MBUS_FMT_RGB565_2X8_BE,
-        V4L2_MBUS_FMT_BGR565_2X8_LE,
-        V4L2_MBUS_FMT_BGR565_2X8_BE,
-        V4L2_MBUS_FMT_SBGGR8_1X8,
-        V4L2_MBUS_FMT_SBGGR10_1X10,
-        V4L2_MBUS_FMT_GREY8_1X8,
-        V4L2_MBUS_FMT_Y10_1X10,
-        V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE,
-        V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE,
-        V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE,
-        V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE,
-        V4L2_MBUS_FMT_SGRBG8_1X8,
-        V4L2_MBUS_FMT_SBGGR12_1X12,
-        V4L2_MBUS_FMT_YUYV8_1_5X8,
-        V4L2_MBUS_FMT_YVYU8_1_5X8,
-        V4L2_MBUS_FMT_UYVY8_1_5X8,
-        V4L2_MBUS_FMT_VYUY8_1_5X8,
-};
-
-/**
- * struct v4l2_mbus_framefmt - frame format on the media bus
- * @width:      frame width
- * @height:     frame height
- * @code:       data format code
- * @field:      used interlacing type
- * @colorspace: colorspace of the data
- */
-struct v4l2_mbus_framefmt {
-        __u32                           width;
-        __u32                           height;
-        enum v4l2_mbus_pixelcode        code;
-        enum v4l2_field                 field;
-        enum v4l2_colorspace            colorspace;
-};
+#include <linux/v4l2-mediabus.h>
 
 static inline void v4l2_fill_pix_format(struct v4l2_pix_format *pix_fmt,
                                 const struct v4l2_mbus_framefmt *mbus_fmt)
diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h
index 8d149f1c58d0..16ac4733e80d 100644
--- a/include/media/v4l2-mem2mem.h
+++ b/include/media/v4l2-mem2mem.h
@@ -5,7 +5,7 @@
  * and destination.
  *
  * Copyright (c) 2009 Samsung Electronics Co., Ltd.
- * Pawel Osciak, <p.osciak@samsung.com>
+ * Pawel Osciak, <pawel@osciak.com>
  * Marek Szyprowski, <m.szyprowski@samsung.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
 #ifndef _MEDIA_V4L2_MEM2MEM_H
 #define _MEDIA_V4L2_MEM2MEM_H
 
-#include <media/videobuf-core.h>
+#include <media/videobuf2-core.h>
 
 /**
  * struct v4l2_m2m_ops - mem-to-mem device driver callbacks
@@ -45,17 +45,20 @@ struct v4l2_m2m_ops {
         void (*device_run)(void *priv);
         int (*job_ready)(void *priv);
         void (*job_abort)(void *priv);
+        void (*lock)(void *priv);
+        void (*unlock)(void *priv);
 };
 
 struct v4l2_m2m_dev;
 
 struct v4l2_m2m_queue_ctx {
 /* private: internal use only */
-        struct videobuf_queue   q;
+        struct vb2_queue        q;
 
         /* Queue for buffers ready to be processed as soon as this
          * instance receives access to the device */
         struct list_head        rdy_queue;
+        spinlock_t              rdy_spinlock;
         u8                      num_rdy;
 };
 
@@ -72,19 +75,31 @@ struct v4l2_m2m_ctx {
         /* For device job queue */
         struct list_head                queue;
         unsigned long                   job_flags;
+        wait_queue_head_t               finished;
 
         /* Instance private data */
         void                            *priv;
 };
 
+struct v4l2_m2m_buffer {
+        struct vb2_buffer       vb;
+        struct list_head        list;
+};
+
 void *v4l2_m2m_get_curr_priv(struct v4l2_m2m_dev *m2m_dev);
 
-struct videobuf_queue *v4l2_m2m_get_vq(struct v4l2_m2m_ctx *m2m_ctx,
+struct vb2_queue *v4l2_m2m_get_vq(struct v4l2_m2m_ctx *m2m_ctx,
                                        enum v4l2_buf_type type);
 
 void v4l2_m2m_job_finish(struct v4l2_m2m_dev *m2m_dev,
                          struct v4l2_m2m_ctx *m2m_ctx);
 
+static inline void
+v4l2_m2m_buf_done(struct vb2_buffer *buf, enum vb2_buffer_state state)
+{
+        vb2_buffer_done(buf, state);
+}
+
 int v4l2_m2m_reqbufs(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
                      struct v4l2_requestbuffers *reqbufs);
 
@@ -110,13 +125,13 @@ int v4l2_m2m_mmap(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
 struct v4l2_m2m_dev *v4l2_m2m_init(struct v4l2_m2m_ops *m2m_ops);
 void v4l2_m2m_release(struct v4l2_m2m_dev *m2m_dev);
 
-struct v4l2_m2m_ctx *v4l2_m2m_ctx_init(void *priv, struct v4l2_m2m_dev *m2m_dev,
-                        void (*vq_init)(void *priv, struct videobuf_queue *,
-                                        enum v4l2_buf_type));
+struct v4l2_m2m_ctx *v4l2_m2m_ctx_init(struct v4l2_m2m_dev *m2m_dev,
+                void *drv_priv,
+                int (*queue_init)(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq));
+
 void v4l2_m2m_ctx_release(struct v4l2_m2m_ctx *m2m_ctx);
 
-void v4l2_m2m_buf_queue(struct v4l2_m2m_ctx *m2m_ctx, struct videobuf_queue *vq,
-                        struct videobuf_buffer *vb);
+void v4l2_m2m_buf_queue(struct v4l2_m2m_ctx *m2m_ctx, struct vb2_buffer *vb);
 
 /**
  * v4l2_m2m_num_src_bufs_ready() - return the number of source buffers ready for
@@ -138,7 +153,7 @@ unsigned int v4l2_m2m_num_dst_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx)
         return m2m_ctx->out_q_ctx.num_rdy;
 }
 
-void *v4l2_m2m_next_buf(struct v4l2_m2m_ctx *m2m_ctx, enum v4l2_buf_type type);
+void *v4l2_m2m_next_buf(struct v4l2_m2m_queue_ctx *q_ctx);
 
 /**
  * v4l2_m2m_next_src_buf() - return next source buffer from the list of ready
@@ -146,7 +161,7 @@ void *v4l2_m2m_next_buf(struct v4l2_m2m_ctx *m2m_ctx, enum v4l2_buf_type type);
  */
 static inline void *v4l2_m2m_next_src_buf(struct v4l2_m2m_ctx *m2m_ctx)
 {
-        return v4l2_m2m_next_buf(m2m_ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
+        return v4l2_m2m_next_buf(&m2m_ctx->out_q_ctx);
 }
 
 /**
@@ -155,29 +170,28 @@ static inline void *v4l2_m2m_next_src_buf(struct v4l2_m2m_ctx *m2m_ctx)
  */
 static inline void *v4l2_m2m_next_dst_buf(struct v4l2_m2m_ctx *m2m_ctx)
 {
-        return v4l2_m2m_next_buf(m2m_ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
+        return v4l2_m2m_next_buf(&m2m_ctx->cap_q_ctx);
 }
 
 /**
- * v4l2_m2m_get_src_vq() - return videobuf_queue for source buffers
+ * v4l2_m2m_get_src_vq() - return vb2_queue for source buffers
  */
 static inline
-struct videobuf_queue *v4l2_m2m_get_src_vq(struct v4l2_m2m_ctx *m2m_ctx)
+struct vb2_queue *v4l2_m2m_get_src_vq(struct v4l2_m2m_ctx *m2m_ctx)
 {
-        return v4l2_m2m_get_vq(m2m_ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
+        return &m2m_ctx->out_q_ctx.q;
 }
 
 /**
- * v4l2_m2m_get_dst_vq() - return videobuf_queue for destination buffers
+ * v4l2_m2m_get_dst_vq() - return vb2_queue for destination buffers
  */
 static inline
-struct videobuf_queue *v4l2_m2m_get_dst_vq(struct v4l2_m2m_ctx *m2m_ctx)
+struct vb2_queue *v4l2_m2m_get_dst_vq(struct v4l2_m2m_ctx *m2m_ctx)
 {
-        return v4l2_m2m_get_vq(m2m_ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
+        return &m2m_ctx->cap_q_ctx.q;
 }
 
-void *v4l2_m2m_buf_remove(struct v4l2_m2m_ctx *m2m_ctx,
-                          enum v4l2_buf_type type);
+void *v4l2_m2m_buf_remove(struct v4l2_m2m_queue_ctx *q_ctx);
 
 /**
  * v4l2_m2m_src_buf_remove() - take off a source buffer from the list of ready
@@ -185,7 +199,7 @@ void *v4l2_m2m_buf_remove(struct v4l2_m2m_ctx *m2m_ctx,
  */
 static inline void *v4l2_m2m_src_buf_remove(struct v4l2_m2m_ctx *m2m_ctx)
 {
-        return v4l2_m2m_buf_remove(m2m_ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
+        return v4l2_m2m_buf_remove(&m2m_ctx->out_q_ctx);
 }
 
 /**
@@ -194,7 +208,7 @@ static inline void *v4l2_m2m_src_buf_remove(struct v4l2_m2m_ctx *m2m_ctx)
  */
 static inline void *v4l2_m2m_dst_buf_remove(struct v4l2_m2m_ctx *m2m_ctx)
 {
-        return v4l2_m2m_buf_remove(m2m_ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
+        return v4l2_m2m_buf_remove(&m2m_ctx->cap_q_ctx);
 }
 
 #endif /* _MEDIA_V4L2_MEM2MEM_H */
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index daf1e57d9b26..1562c4ff3a65 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -21,7 +21,11 @@
 #ifndef _V4L2_SUBDEV_H
 #define _V4L2_SUBDEV_H
 
+#include <linux/v4l2-subdev.h>
+#include <media/media-entity.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-dev.h>
+#include <media/v4l2-fh.h>
 #include <media/v4l2-mediabus.h>
 
 /* generic v4l2_device notify callback notification values */
@@ -36,7 +40,10 @@
 
 struct v4l2_device;
 struct v4l2_ctrl_handler;
+struct v4l2_event_subscription;
+struct v4l2_fh;
 struct v4l2_subdev;
+struct v4l2_subdev_fh;
 struct tuner_setup;
 
 /* decode_vbi_line */
@@ -160,6 +167,10 @@ struct v4l2_subdev_core_ops {
         int (*s_power)(struct v4l2_subdev *sd, int on);
         int (*interrupt_service_routine)(struct v4l2_subdev *sd,
                                                 u32 status, bool *handled);
+        int (*subscribe_event)(struct v4l2_subdev *sd, struct v4l2_fh *fh,
+                               struct v4l2_event_subscription *sub);
+        int (*unsubscribe_event)(struct v4l2_subdev *sd, struct v4l2_fh *fh,
+                                 struct v4l2_event_subscription *sub);
 };
 
 /* s_mode: switch the tuner to a specific tuner mode. Replacement of s_radio.
@@ -257,6 +268,10 @@ struct v4l2_subdev_video_ops {
         int (*s_crop)(struct v4l2_subdev *sd, struct v4l2_crop *crop);
         int (*g_parm)(struct v4l2_subdev *sd, struct v4l2_streamparm *param);
         int (*s_parm)(struct v4l2_subdev *sd, struct v4l2_streamparm *param);
+        int (*g_frame_interval)(struct v4l2_subdev *sd,
+                                struct v4l2_subdev_frame_interval *interval);
+        int (*s_frame_interval)(struct v4l2_subdev *sd,
+                                struct v4l2_subdev_frame_interval *interval);
         int (*enum_framesizes)(struct v4l2_subdev *sd, struct v4l2_frmsizeenum *fsize);
         int (*enum_frameintervals)(struct v4l2_subdev *sd, struct v4l2_frmivalenum *fival);
         int (*enum_dv_presets) (struct v4l2_subdev *sd,
@@ -271,6 +286,8 @@ struct v4l2_subdev_video_ops {
                         struct v4l2_dv_timings *timings);
         int (*enum_mbus_fmt)(struct v4l2_subdev *sd, unsigned int index,
                              enum v4l2_mbus_pixelcode *code);
+        int (*enum_mbus_fsizes)(struct v4l2_subdev *sd,
+                             struct v4l2_frmsizeenum *fsize);
         int (*g_mbus_fmt)(struct v4l2_subdev *sd,
                           struct v4l2_mbus_framefmt *fmt);
         int (*try_mbus_fmt)(struct v4l2_subdev *sd,
@@ -324,9 +341,13 @@ struct v4l2_subdev_vbi_ops {
  *                    This is needed for some sensors, which always corrupt
  *                    several top lines of the output image, or which send their
  *                    metadata in them.
+ * @g_skip_frames: number of frames to skip at stream start. This is needed for
+ *                 buggy sensors that generate faulty frames when they are
+ *                 turned on.
  */
 struct v4l2_subdev_sensor_ops {
         int (*g_skip_top_lines)(struct v4l2_subdev *sd, u32 *lines);
+        int (*g_skip_frames)(struct v4l2_subdev *sd, u32 *frames);
 };
 
 /*
@@ -401,6 +422,25 @@ struct v4l2_subdev_ir_ops {
                                 struct v4l2_subdev_ir_parameters *params);
 };
 
+struct v4l2_subdev_pad_ops {
+        int (*enum_mbus_code)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+                              struct v4l2_subdev_mbus_code_enum *code);
+        int (*enum_frame_size)(struct v4l2_subdev *sd,
+                               struct v4l2_subdev_fh *fh,
+                               struct v4l2_subdev_frame_size_enum *fse);
+        int (*enum_frame_interval)(struct v4l2_subdev *sd,
+                                   struct v4l2_subdev_fh *fh,
+                                   struct v4l2_subdev_frame_interval_enum *fie);
+        int (*get_fmt)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+                       struct v4l2_subdev_format *format);
+        int (*set_fmt)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+                       struct v4l2_subdev_format *format);
+        int (*set_crop)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+                       struct v4l2_subdev_crop *crop);
+        int (*get_crop)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+                       struct v4l2_subdev_crop *crop);
+};
+
 struct v4l2_subdev_ops {
         const struct v4l2_subdev_core_ops       *core;
         const struct v4l2_subdev_tuner_ops      *tuner;
@@ -409,6 +449,7 @@ struct v4l2_subdev_ops {
         const struct v4l2_subdev_vbi_ops        *vbi;
         const struct v4l2_subdev_ir_ops         *ir;
         const struct v4l2_subdev_sensor_ops     *sensor;
+        const struct v4l2_subdev_pad_ops        *pad;
 };
 
 /*
@@ -420,23 +461,36 @@ struct v4l2_subdev_ops {
  *
  * unregistered: called when this subdev is unregistered. When called the
  *      v4l2_dev field is still set to the correct v4l2_device.
+ *
+ * open: called when the subdev device node is opened by an application.
+ *
+ * close: called when the subdev device node is closed.
  */
 struct v4l2_subdev_internal_ops {
         int (*registered)(struct v4l2_subdev *sd);
         void (*unregistered)(struct v4l2_subdev *sd);
+        int (*open)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh);
+        int (*close)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh);
 };
 
 #define V4L2_SUBDEV_NAME_SIZE 32
 
 /* Set this flag if this subdev is a i2c device. */
-#define V4L2_SUBDEV_FL_IS_I2C (1U << 0)
+#define V4L2_SUBDEV_FL_IS_I2C                   (1U << 0)
 /* Set this flag if this subdev is a spi device. */
-#define V4L2_SUBDEV_FL_IS_SPI (1U << 1)
+#define V4L2_SUBDEV_FL_IS_SPI                   (1U << 1)
+/* Set this flag if this subdev needs a device node. */
+#define V4L2_SUBDEV_FL_HAS_DEVNODE              (1U << 2)
+/* Set this flag if this subdev generates events. */
+#define V4L2_SUBDEV_FL_HAS_EVENTS               (1U << 3)
 
 /* Each instance of a subdev driver should create this struct, either
    stand-alone or embedded in a larger struct.
  */
 struct v4l2_subdev {
+#if defined(CONFIG_MEDIA_CONTROLLER)
+        struct media_entity entity;
+#endif
         struct list_head list;
         struct module *owner;
         u32 flags;
@@ -453,8 +507,47 @@ struct v4l2_subdev {
         /* pointer to private data */
         void *dev_priv;
         void *host_priv;
+        /* subdev device node */
+        struct video_device devnode;
+        /* number of events to be allocated on open */
+        unsigned int nevents;
+};
+
+#define media_entity_to_v4l2_subdev(ent) \
+        container_of(ent, struct v4l2_subdev, entity)
+#define vdev_to_v4l2_subdev(vdev) \
+        container_of(vdev, struct v4l2_subdev, devnode)
+
+/*
+ * Used for storing subdev information per file handle
+ */
+struct v4l2_subdev_fh {
+        struct v4l2_fh vfh;
+#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)
+        struct v4l2_mbus_framefmt *try_fmt;
+        struct v4l2_rect *try_crop;
+#endif
 };
 
+#define to_v4l2_subdev_fh(fh)   \
+        container_of(fh, struct v4l2_subdev_fh, vfh)
+
+#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)
+static inline struct v4l2_mbus_framefmt *
+v4l2_subdev_get_try_format(struct v4l2_subdev_fh *fh, unsigned int pad)
+{
+        return &fh->try_fmt[pad];
+}
+
+static inline struct v4l2_rect *
+v4l2_subdev_get_try_crop(struct v4l2_subdev_fh *fh, unsigned int pad)
+{
+        return &fh->try_crop[pad];
+}
+#endif
+
+extern const struct v4l2_file_operations v4l2_subdev_fops;
+
 static inline void v4l2_set_subdevdata(struct v4l2_subdev *sd, void *p)
 {
         sd->dev_priv = p;
@@ -475,20 +568,8 @@ static inline void *v4l2_get_subdev_hostdata(const struct v4l2_subdev *sd)
         return sd->host_priv;
 }
 
-static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
-                                        const struct v4l2_subdev_ops *ops)
-{
-        INIT_LIST_HEAD(&sd->list);
-        /* ops->core MUST be set */
-        BUG_ON(!ops || !ops->core);
-        sd->ops = ops;
-        sd->v4l2_dev = NULL;
-        sd->flags = 0;
-        sd->name[0] = '\0';
-        sd->grp_id = 0;
-        sd->dev_priv = NULL;
-        sd->host_priv = NULL;
-}
+void v4l2_subdev_init(struct v4l2_subdev *sd,
+                      const struct v4l2_subdev_ops *ops);
 
 /* Call an ops of a v4l2_subdev, doing the right checks against
    NULL pointers.
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
new file mode 100644
index 000000000000..f87472acbc51
--- /dev/null
+++ b/include/media/videobuf2-core.h
@@ -0,0 +1,380 @@
+/*
+ * videobuf2-core.h - V4L2 driver helper framework
+ *
+ * Copyright (C) 2010 Samsung Electronics
+ *
+ * Author: Pawel Osciak <pawel@osciak.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.
+ */
+#ifndef _MEDIA_VIDEOBUF2_CORE_H
+#define _MEDIA_VIDEOBUF2_CORE_H
+
+#include <linux/mm_types.h>
+#include <linux/mutex.h>
+#include <linux/poll.h>
+#include <linux/videodev2.h>
+
+struct vb2_alloc_ctx;
+struct vb2_fileio_data;
+
+/**
+ * struct vb2_mem_ops - memory handling/memory allocator operations
+ * @alloc:      allocate video memory and, optionally, allocator private data,
+ *              return NULL on failure or a pointer to allocator private,
+ *              per-buffer data on success; the returned private structure
+ *              will then be passed as buf_priv argument to other ops in this
+ *              structure
+ * @put:        inform the allocator that the buffer will no longer be used;
+ *              usually will result in the allocator freeing the buffer (if
+ *              no other users of this buffer are present); the buf_priv
+ *              argument is the allocator private per-buffer structure
+ *              previously returned from the alloc callback
+ * @get_userptr: acquire userspace memory for a hardware operation; used for
+ *               USERPTR memory types; vaddr is the address passed to the
+ *               videobuf layer when queuing a video buffer of USERPTR type;
+ *               should return an allocator private per-buffer structure
+ *               associated with the buffer on success, NULL on failure;
+ *               the returned private structure will then be passed as buf_priv
+ *               argument to other ops in this structure
+ * @put_userptr: inform the allocator that a USERPTR buffer will no longer
+ *               be used
+ * @vaddr:      return a kernel virtual address to a given memory buffer
+ *              associated with the passed private structure or NULL if no
+ *              such mapping exists
+ * @cookie:     return allocator specific cookie for a given memory buffer
+ *              associated with the passed private structure or NULL if not
+ *              available
+ * @num_users:  return the current number of users of a memory buffer;
+ *              return 1 if the videobuf layer (or actually the driver using
+ *              it) is the only user
+ * @mmap:       setup a userspace mapping for a given memory buffer under
+ *              the provided virtual memory region
+ *
+ * Required ops for USERPTR types: get_userptr, put_userptr.
+ * Required ops for MMAP types: alloc, put, num_users, mmap.
+ * Required ops for read/write access types: alloc, put, num_users, vaddr
+ */
+struct vb2_mem_ops {
+        void            *(*alloc)(void *alloc_ctx, unsigned long size);
+        void            (*put)(void *buf_priv);
+
+        void            *(*get_userptr)(void *alloc_ctx, unsigned long vaddr,
+                                        unsigned long size, int write);
+        void            (*put_userptr)(void *buf_priv);
+
+        void            *(*vaddr)(void *buf_priv);
+        void            *(*cookie)(void *buf_priv);
+
+        unsigned int    (*num_users)(void *buf_priv);
+
+        int             (*mmap)(void *buf_priv, struct vm_area_struct *vma);
+};
+
+struct vb2_plane {
+        void                    *mem_priv;
+        int                     mapped:1;
+};
+
+/**
+ * enum vb2_io_modes - queue access methods
+ * @VB2_MMAP:           driver supports MMAP with streaming API
+ * @VB2_USERPTR:        driver supports USERPTR with streaming API
+ * @VB2_READ:           driver supports read() style access
+ * @VB2_WRITE:          driver supports write() style access
+ */
+enum vb2_io_modes {
+        VB2_MMAP        = (1 << 0),
+        VB2_USERPTR     = (1 << 1),
+        VB2_READ        = (1 << 2),
+        VB2_WRITE       = (1 << 3),
+};
+
+/**
+ * enum vb2_fileio_flags - flags for selecting a mode of the file io emulator,
+ * by default the 'streaming' style is used by the file io emulator
+ * @VB2_FILEIO_READ_ONCE:       report EOF after reading the first buffer
+ * @VB2_FILEIO_WRITE_IMMEDIATELY:       queue buffer after each write() call
+ */
+enum vb2_fileio_flags {
+        VB2_FILEIO_READ_ONCE            = (1 << 0),
+        VB2_FILEIO_WRITE_IMMEDIATELY    = (1 << 1),
+};
+
+/**
+ * enum vb2_buffer_state - current video buffer state
+ * @VB2_BUF_STATE_DEQUEUED:     buffer under userspace control
+ * @VB2_BUF_STATE_QUEUED:       buffer queued in videobuf, but not in driver
+ * @VB2_BUF_STATE_ACTIVE:       buffer queued in driver and possibly used
+ *                              in a hardware operation
+ * @VB2_BUF_STATE_DONE:         buffer returned from driver to videobuf, but
+ *                              not yet dequeued to userspace
+ * @VB2_BUF_STATE_ERROR:        same as above, but the operation on the buffer
+ *                              has ended with an error, which will be reported
+ *                              to the userspace when it is dequeued
+ */
+enum vb2_buffer_state {
+        VB2_BUF_STATE_DEQUEUED,
+        VB2_BUF_STATE_QUEUED,
+        VB2_BUF_STATE_ACTIVE,
+        VB2_BUF_STATE_DONE,
+        VB2_BUF_STATE_ERROR,
+};
+
+struct vb2_queue;
+
+/**
+ * struct vb2_buffer - represents a video buffer
+ * @v4l2_buf:           struct v4l2_buffer associated with this buffer; can
+ *                      be read by the driver and relevant entries can be
+ *                      changed by the driver in case of CAPTURE types
+ *                      (such as timestamp)
+ * @v4l2_planes:        struct v4l2_planes associated with this buffer; can
+ *                      be read by the driver and relevant entries can be
+ *                      changed by the driver in case of CAPTURE types
+ *                      (such as bytesused); NOTE that even for single-planar
+ *                      types, the v4l2_planes[0] struct should be used
+ *                      instead of v4l2_buf for filling bytesused - drivers
+ *                      should use the vb2_set_plane_payload() function for that
+ * @vb2_queue:          the queue to which this driver belongs
+ * @num_planes:         number of planes in the buffer
+ *                      on an internal driver queue
+ * @state:              current buffer state; do not change
+ * @queued_entry:       entry on the queued buffers list, which holds all
+ *                      buffers queued from userspace
+ * @done_entry:         entry on the list that stores all buffers ready to
+ *                      be dequeued to userspace
+ * @planes:             private per-plane information; do not change
+ * @num_planes_mapped:  number of mapped planes; do not change
+ */
+struct vb2_buffer {
+        struct v4l2_buffer      v4l2_buf;
+        struct v4l2_plane       v4l2_planes[VIDEO_MAX_PLANES];
+
+        struct vb2_queue        *vb2_queue;
+
+        unsigned int            num_planes;
+
+/* Private: internal use only */
+        enum vb2_buffer_state   state;
+
+        struct list_head        queued_entry;
+        struct list_head        done_entry;
+
+        struct vb2_plane        planes[VIDEO_MAX_PLANES];
+        unsigned int            num_planes_mapped;
+};
+
+/**
+ * struct vb2_ops - driver-specific callbacks
+ *
+ * @queue_setup:        called from a VIDIOC_REQBUFS handler, before
+ *                      memory allocation; driver should return the required
+ *                      number of buffers in num_buffers, the required number
+ *                      of planes per buffer in num_planes; the size of each
+ *                      plane should be set in the sizes[] array and optional
+ *                      per-plane allocator specific context in alloc_ctxs[]
+ *                      array
+ * @wait_prepare:       release any locks taken while calling vb2 functions;
+ *                      it is called before an ioctl needs to wait for a new
+ *                      buffer to arrive; required to avoid a deadlock in
+ *                      blocking access type
+ * @wait_finish:        reacquire all locks released in the previous callback;
+ *                      required to continue operation after sleeping while
+ *                      waiting for a new buffer to arrive
+ * @buf_init:           called once after allocating a buffer (in MMAP case)
+ *                      or after acquiring a new USERPTR buffer; drivers may
+ *                      perform additional buffer-related initialization;
+ *                      initialization failure (return != 0) will prevent
+ *                      queue setup from completing successfully; optional
+ * @buf_prepare:        called every time the buffer is queued from userspace;
+ *                      drivers may perform any initialization required before
+ *                      each hardware operation in this callback;
+ *                      if an error is returned, the buffer will not be queued
+ *                      in driver; optional
+ * @buf_finish:         called before every dequeue of the buffer back to
+ *                      userspace; drivers may perform any operations required
+ *                      before userspace accesses the buffer; optional
+ * @buf_cleanup:        called once before the buffer is freed; drivers may
+ *                      perform any additional cleanup; optional
+ * @start_streaming:    called once before entering 'streaming' state; enables
+ *                      driver to receive buffers over buf_queue() callback
+ * @stop_streaming:     called when 'streaming' state must be disabled; driver
+ *                      should stop any DMA transactions or wait until they
+ *                      finish and give back all buffers it got from buf_queue()
+ *                      callback; may use vb2_wait_for_all_buffers() function
+ * @buf_queue:          passes buffer vb to the driver; driver may start
+ *                      hardware operation on this buffer; driver should give
+ *                      the buffer back by calling vb2_buffer_done() function
+ */
+struct vb2_ops {
+        int (*queue_setup)(struct vb2_queue *q, unsigned int *num_buffers,
+                           unsigned int *num_planes, unsigned long sizes[],
+                           void *alloc_ctxs[]);
+
+        void (*wait_prepare)(struct vb2_queue *q);
+        void (*wait_finish)(struct vb2_queue *q);
+
+        int (*buf_init)(struct vb2_buffer *vb);
+        int (*buf_prepare)(struct vb2_buffer *vb);
+        int (*buf_finish)(struct vb2_buffer *vb);
+        void (*buf_cleanup)(struct vb2_buffer *vb);
+
+        int (*start_streaming)(struct vb2_queue *q);
+        int (*stop_streaming)(struct vb2_queue *q);
+
+        void (*buf_queue)(struct vb2_buffer *vb);
+};
+
+/**
+ * struct vb2_queue - a videobuf queue
+ *
+ * @type:       queue type (see V4L2_BUF_TYPE_* in linux/videodev2.h
+ * @io_modes:   supported io methods (see vb2_io_modes enum)
+ * @io_flags:   additional io flags (see vb2_fileio_flags enum)
+ * @ops:        driver-specific callbacks
+ * @mem_ops:    memory allocator specific callbacks
+ * @drv_priv:   driver private data
+ * @buf_struct_size: size of the driver-specific buffer structure;
+ *              "0" indicates the driver doesn't want to use a custom buffer
+ *              structure type, so sizeof(struct vb2_buffer) will is used
+ *
+ * @memory:     current memory type used
+ * @bufs:       videobuf buffer structures
+ * @num_buffers: number of allocated/used buffers
+ * @queued_list: list of buffers currently queued from userspace
+ * @queued_count: number of buffers owned by the driver
+ * @done_list:  list of buffers ready to be dequeued to userspace
+ * @done_lock:  lock to protect done_list list
+ * @done_wq:    waitqueue for processes waiting for buffers ready to be dequeued
+ * @alloc_ctx:  memory type/allocator-specific contexts for each plane
+ * @streaming:  current streaming state
+ * @fileio:     file io emulator internal data, used only if emulator is active
+ */
+struct vb2_queue {
+        enum v4l2_buf_type              type;
+        unsigned int                    io_modes;
+        unsigned int                    io_flags;
+
+        const struct vb2_ops            *ops;
+        const struct vb2_mem_ops        *mem_ops;
+        void                            *drv_priv;
+        unsigned int                    buf_struct_size;
+
+/* private: internal use only */
+        enum v4l2_memory                memory;
+        struct vb2_buffer               *bufs[VIDEO_MAX_FRAME];
+        unsigned int                    num_buffers;
+
+        struct list_head                queued_list;
+
+        atomic_t                        queued_count;
+        struct list_head                done_list;
+        spinlock_t                      done_lock;
+        wait_queue_head_t               done_wq;
+
+        void                            *alloc_ctx[VIDEO_MAX_PLANES];
+
+        unsigned int                    streaming:1;
+
+        struct vb2_fileio_data          *fileio;
+};
+
+void *vb2_plane_vaddr(struct vb2_buffer *vb, unsigned int plane_no);
+void *vb2_plane_cookie(struct vb2_buffer *vb, unsigned int plane_no);
+
+void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state);
+int vb2_wait_for_all_buffers(struct vb2_queue *q);
+
+int vb2_querybuf(struct vb2_queue *q, struct v4l2_buffer *b);
+int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req);
+
+int vb2_queue_init(struct vb2_queue *q);
+
+void vb2_queue_release(struct vb2_queue *q);
+
+int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b);
+int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking);
+
+int vb2_streamon(struct vb2_queue *q, enum v4l2_buf_type type);
+int vb2_streamoff(struct vb2_queue *q, enum v4l2_buf_type type);
+
+int vb2_mmap(struct vb2_queue *q, struct vm_area_struct *vma);
+unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait);
+size_t vb2_read(struct vb2_queue *q, char __user *data, size_t count,
+                loff_t *ppos, int nonblock);
+size_t vb2_write(struct vb2_queue *q, char __user *data, size_t count,
+                loff_t *ppos, int nonblock);
+
+/**
+ * vb2_is_streaming() - return streaming status of the queue
+ * @q:          videobuf queue
+ */
+static inline bool vb2_is_streaming(struct vb2_queue *q)
+{
+        return q->streaming;
+}
+
+/**
+ * vb2_is_busy() - return busy status of the queue
+ * @q:          videobuf queue
+ *
+ * This function checks if queue has any buffers allocated.
+ */
+static inline bool vb2_is_busy(struct vb2_queue *q)
+{
+        return (q->num_buffers > 0);
+}
+
+/**
+ * vb2_get_drv_priv() - return driver private data associated with the queue
+ * @q:          videobuf queue
+ */
+static inline void *vb2_get_drv_priv(struct vb2_queue *q)
+{
+        return q->drv_priv;
+}
+
+/**
+ * vb2_set_plane_payload() - set bytesused for the plane plane_no
+ * @vb:         buffer for which plane payload should be set
+ * @plane_no:   plane number for which payload should be set
+ * @size:       payload in bytes
+ */
+static inline void vb2_set_plane_payload(struct vb2_buffer *vb,
+                                 unsigned int plane_no, unsigned long size)
+{
+        if (plane_no < vb->num_planes)
+                vb->v4l2_planes[plane_no].bytesused = size;
+}
+
+/**
+ * vb2_get_plane_payload() - get bytesused for the plane plane_no
+ * @vb:         buffer for which plane payload should be set
+ * @plane_no:   plane number for which payload should be set
+ * @size:       payload in bytes
+ */
+static inline unsigned long vb2_get_plane_payload(struct vb2_buffer *vb,
+                                 unsigned int plane_no)
+{
+        if (plane_no < vb->num_planes)
+                return vb->v4l2_planes[plane_no].bytesused;
+        return 0;
+}
+
+/**
+ * vb2_plane_size() - return plane size in bytes
+ * @vb:         buffer for which plane size should be returned
+ * @plane_no:   plane number for which size should be returned
+ */
+static inline unsigned long
+vb2_plane_size(struct vb2_buffer *vb, unsigned int plane_no)
+{
+        if (plane_no < vb->num_planes)
+                return vb->v4l2_planes[plane_no].length;
+        return 0;
+}
+
+#endif /* _MEDIA_VIDEOBUF2_CORE_H */
diff --git a/include/media/videobuf2-dma-contig.h b/include/media/videobuf2-dma-contig.h
new file mode 100644
index 000000000000..7e6c68b23773
--- /dev/null
+++ b/include/media/videobuf2-dma-contig.h
@@ -0,0 +1,32 @@
+/*
+ * videobuf2-dma-coherent.h - DMA coherent memory allocator for videobuf2
+ *
+ * Copyright (C) 2010 Samsung Electronics
+ *
+ * Author: Pawel Osciak <pawel@osciak.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.
+ */
+
+#ifndef _MEDIA_VIDEOBUF2_DMA_COHERENT_H
+#define _MEDIA_VIDEOBUF2_DMA_COHERENT_H
+
+#include <media/videobuf2-core.h>
+#include <linux/dma-mapping.h>
+
+static inline dma_addr_t
+vb2_dma_contig_plane_paddr(struct vb2_buffer *vb, unsigned int plane_no)
+{
+        dma_addr_t *paddr = vb2_plane_cookie(vb, plane_no);
+
+        return *paddr;
+}
+
+void *vb2_dma_contig_init_ctx(struct device *dev);
+void vb2_dma_contig_cleanup_ctx(void *alloc_ctx);
+
+extern const struct vb2_mem_ops vb2_dma_contig_memops;
+
+#endif
diff --git a/include/media/videobuf2-dma-sg.h b/include/media/videobuf2-dma-sg.h
new file mode 100644
index 000000000000..0038526b8ef7
--- /dev/null
+++ b/include/media/videobuf2-dma-sg.h
@@ -0,0 +1,32 @@
+/*
+ * videobuf2-dma-sg.h - DMA scatter/gather memory allocator for videobuf2
+ *
+ * Copyright (C) 2010 Samsung Electronics
+ *
+ * Author: Andrzej Pietrasiewicz <andrzej.p@samsung.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.
+ */
+
+#ifndef _MEDIA_VIDEOBUF2_DMA_SG_H
+#define _MEDIA_VIDEOBUF2_DMA_SG_H
+
+#include <media/videobuf2-core.h>
+
+struct vb2_dma_sg_desc {
+        unsigned long           size;
+        unsigned int            num_pages;
+        struct scatterlist      *sglist;
+};
+
+static inline struct vb2_dma_sg_desc *vb2_dma_sg_plane_desc(
+                struct vb2_buffer *vb, unsigned int plane_no)
+{
+        return (struct vb2_dma_sg_desc *)vb2_plane_cookie(vb, plane_no);
+}
+
+extern const struct vb2_mem_ops vb2_dma_sg_memops;
+
+#endif
diff --git a/include/media/videobuf2-memops.h b/include/media/videobuf2-memops.h
new file mode 100644
index 000000000000..84e1f6c031c5
--- /dev/null
+++ b/include/media/videobuf2-memops.h
@@ -0,0 +1,45 @@
+/*
+ * videobuf2-memops.h - generic memory handling routines for videobuf2
+ *
+ * Copyright (C) 2010 Samsung Electronics
+ *
+ * Author: Pawel Osciak <pawel@osciak.com>
+ *         Marek Szyprowski <m.szyprowski@samsung.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.
+ */
+
+#ifndef _MEDIA_VIDEOBUF2_MEMOPS_H
+#define _MEDIA_VIDEOBUF2_MEMOPS_H
+
+#include <media/videobuf2-core.h>
+
+/**
+ * vb2_vmarea_handler - common vma refcount tracking handler
+ * @refcount:   pointer to refcount entry in the buffer
+ * @put:        callback to function that decreases buffer refcount
+ * @arg:        argument for @put callback
+ */
+struct vb2_vmarea_handler {
+        atomic_t                *refcount;
+        void                    (*put)(void *arg);
+        void                    *arg;
+};
+
+extern const struct vm_operations_struct vb2_common_vm_ops;
+
+int vb2_get_contig_userptr(unsigned long vaddr, unsigned long size,
+                           struct vm_area_struct **res_vma, dma_addr_t *res_pa);
+
+int vb2_mmap_pfn_range(struct vm_area_struct *vma, unsigned long paddr,
+                                unsigned long size,
+                                const struct vm_operations_struct *vm_ops,
+                                void *priv);
+
+struct vm_area_struct *vb2_get_vma(struct vm_area_struct *vma);
+void vb2_put_vma(struct vm_area_struct *vma);
+
+
+#endif
diff --git a/include/media/videobuf2-vmalloc.h b/include/media/videobuf2-vmalloc.h
new file mode 100644
index 000000000000..93a76b43038d
--- /dev/null
+++ b/include/media/videobuf2-vmalloc.h
@@ -0,0 +1,20 @@
+/*
+ * videobuf2-vmalloc.h - vmalloc memory allocator for videobuf2
+ *
+ * Copyright (C) 2010 Samsung Electronics
+ *
+ * Author: Pawel Osciak <pawel@osciak.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.
+ */
+
+#ifndef _MEDIA_VIDEOBUF2_VMALLOC_H
+#define _MEDIA_VIDEOBUF2_VMALLOC_H
+
+#include <media/videobuf2-core.h>
+
+extern const struct vb2_mem_ops vb2_vmalloc_memops;
+
+#endif
diff --git a/include/media/wm8775.h b/include/media/wm8775.h
index 60739c5a23ae..d0e801a9935c 100644
--- a/include/media/wm8775.h
+++ b/include/media/wm8775.h
@@ -32,4 +32,13 @@
 #define WM8775_AIN3 4
 #define WM8775_AIN4 8
 
+
+struct wm8775_platform_data {
+        /*
+         * FIXME: Instead, we should parametrize the params
+         * that need different settings between ivtv, pvrusb2, and Nova-S
+         */
+        bool is_nova_s;
+};
+
 #endif
diff --git a/include/staging/altera.h b/include/staging/altera.h
new file mode 100644
index 000000000000..94c0c6181daf
--- /dev/null
+++ b/include/staging/altera.h
@@ -0,0 +1,49 @@
+/*
+ * altera.h
+ *
+ * altera FPGA driver
+ *
+ * Copyright (C) Altera Corporation 1998-2001
+ * Copyright (C) 2010 NetUP Inc.
+ * Copyright (C) 2010 Igor M. Liplianin <liplianin@netup.ru>
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _ALTERA_H_
+#define _ALTERA_H_
+
+struct altera_config {
+        void *dev;
+        u8 *action;
+        int (*jtag_io) (void *dev, int tms, int tdi, int tdo);
+};
+
+#if defined(CONFIG_ALTERA_STAPL) || \
+                (defined(CONFIG_ALTERA_STAPL_MODULE) && defined(MODULE))
+
+extern int altera_init(struct altera_config *config, const struct firmware *fw);
+#else
+
+static inline int altera_init(struct altera_config *config,
+                                                const struct firmware *fw)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return 0;
+}
+#endif /* CONFIG_ALTERA_STAPL */
+
+#endif /* _ALTERA_H_ */
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index e5e345fb2a5c..e09592d2f916 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -21,8 +21,7 @@ TRACE_EVENT(ext4_free_inode,
         TP_ARGS(inode),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        umode_t, mode                   )
                 __field(        uid_t,  uid                     )
@@ -31,8 +30,7 @@ TRACE_EVENT(ext4_free_inode,
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
-                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
+                __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
                 __entry->mode   = inode->i_mode;
                 __entry->uid    = inode->i_uid;
@@ -41,9 +39,9 @@ TRACE_EVENT(ext4_free_inode,
         ),
 
         TP_printk("dev %d,%d ino %lu mode 0%o uid %u gid %u blocks %llu",
-                  __entry->dev_major, __entry->dev_minor,
-                  (unsigned long) __entry->ino, __entry->mode,
-                  __entry->uid, __entry->gid,
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->mode, __entry->uid, __entry->gid,
                   (unsigned long long) __entry->blocks)
 );
 
@@ -53,21 +51,19 @@ TRACE_EVENT(ext4_request_inode,
         TP_ARGS(dir, mode),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  dir                     )
                 __field(        umode_t, mode                   )
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(dir->i_sb->s_dev);
-                __entry->dev_minor = MINOR(dir->i_sb->s_dev);
+                __entry->dev    = dir->i_sb->s_dev;
                 __entry->dir    = dir->i_ino;
                 __entry->mode   = mode;
         ),
 
         TP_printk("dev %d,%d dir %lu mode 0%o",
-                  __entry->dev_major, __entry->dev_minor,
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->dir, __entry->mode)
 );
 
@@ -77,23 +73,21 @@ TRACE_EVENT(ext4_allocate_inode,
         TP_ARGS(inode, dir, mode),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        ino_t,  dir                     )
                 __field(        umode_t, mode                   )
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
-                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
+                __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
                 __entry->dir    = dir->i_ino;
                 __entry->mode   = mode;
         ),
 
         TP_printk("dev %d,%d ino %lu dir %lu mode 0%o",
-                  __entry->dev_major, __entry->dev_minor,
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino,
                   (unsigned long) __entry->dir, __entry->mode)
 );
@@ -104,21 +98,19 @@ TRACE_EVENT(ext4_evict_inode,
         TP_ARGS(inode),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        int,    nlink                   )
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
-                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
+                __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
                 __entry->nlink  = inode->i_nlink;
         ),
 
         TP_printk("dev %d,%d ino %lu nlink %d",
-                  __entry->dev_major, __entry->dev_minor,
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino, __entry->nlink)
 );
 
@@ -128,21 +120,19 @@ TRACE_EVENT(ext4_drop_inode,
         TP_ARGS(inode, drop),
 
         TP_STRUCT__entry(
-                __field(        int,    dev_major               )
-                __field(        int,    dev_minor               )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        int,    drop                    )
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
-                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
+                __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
                 __entry->drop   = drop;
         ),
 
         TP_printk("dev %d,%d ino %lu drop %d",
-                  __entry->dev_major, __entry->dev_minor,
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino, __entry->drop)
 );
 
@@ -152,21 +142,19 @@ TRACE_EVENT(ext4_mark_inode_dirty,
         TP_ARGS(inode, IP),
 
         TP_STRUCT__entry(
-                __field(        int,    dev_major               )
-                __field(        int,    dev_minor               )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(unsigned long,  ip                      )
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
-                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
+                __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
                 __entry->ip     = IP;
         ),
 
         TP_printk("dev %d,%d ino %lu caller %pF",
-                  __entry->dev_major, __entry->dev_minor,
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino, (void *)__entry->ip)
 );
 
@@ -176,21 +164,19 @@ TRACE_EVENT(ext4_begin_ordered_truncate,
         TP_ARGS(inode, new_size),
 
         TP_STRUCT__entry(
-                __field(        int,    dev_major               )
-                __field(        int,    dev_minor               )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        loff_t, new_size                )
         ),
 
         TP_fast_assign(
-                __entry->dev_major      = MAJOR(inode->i_sb->s_dev);
-                __entry->dev_minor      = MINOR(inode->i_sb->s_dev);
+                __entry->dev            = inode->i_sb->s_dev;
                 __entry->ino            = inode->i_ino;
                 __entry->new_size       = new_size;
         ),
 
         TP_printk("dev %d,%d ino %lu new_size %lld",
-                  __entry->dev_major, __entry->dev_minor,
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino,
                   (long long) __entry->new_size)
 );
@@ -203,8 +189,7 @@ DECLARE_EVENT_CLASS(ext4__write_begin,
         TP_ARGS(inode, pos, len, flags),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        loff_t, pos                     )
                 __field(        unsigned int, len               )
@@ -212,8 +197,7 @@ DECLARE_EVENT_CLASS(ext4__write_begin,
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
-                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
+                __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
                 __entry->pos    = pos;
                 __entry->len    = len;
@@ -221,7 +205,7 @@ DECLARE_EVENT_CLASS(ext4__write_begin,
         ),
 
         TP_printk("dev %d,%d ino %lu pos %llu len %u flags %u",
-                  __entry->dev_major, __entry->dev_minor,
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino,
                   __entry->pos, __entry->len, __entry->flags)
 );
@@ -249,8 +233,7 @@ DECLARE_EVENT_CLASS(ext4__write_end,
         TP_ARGS(inode, pos, len, copied),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        loff_t, pos                     )
                 __field(        unsigned int, len               )
@@ -258,8 +241,7 @@ DECLARE_EVENT_CLASS(ext4__write_end,
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
-                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
+                __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
                 __entry->pos    = pos;
                 __entry->len    = len;
@@ -267,9 +249,9 @@ DECLARE_EVENT_CLASS(ext4__write_end,
         ),
 
         TP_printk("dev %d,%d ino %lu pos %llu len %u copied %u",
-                  __entry->dev_major, __entry->dev_minor,
-                  (unsigned long) __entry->ino, __entry->pos,
-                  __entry->len, __entry->copied)
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->pos, __entry->len, __entry->copied)
 );
 
 DEFINE_EVENT(ext4__write_end, ext4_ordered_write_end,
@@ -310,22 +292,20 @@ TRACE_EVENT(ext4_writepage,
         TP_ARGS(inode, page),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        pgoff_t, index                  )
 
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
-                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
+                __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
                 __entry->index  = page->index;
         ),
 
         TP_printk("dev %d,%d ino %lu page_index %lu",
-                  __entry->dev_major, __entry->dev_minor,
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino, __entry->index)
 );
 
@@ -335,43 +315,39 @@ TRACE_EVENT(ext4_da_writepages,
         TP_ARGS(inode, wbc),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        long,   nr_to_write             )
                 __field(        long,   pages_skipped           )
                 __field(        loff_t, range_start             )
                 __field(        loff_t, range_end               )
+                __field(        int,    sync_mode               )
                 __field(        char,   for_kupdate             )
-                __field(        char,   for_reclaim             )
                 __field(        char,   range_cyclic            )
                 __field(       pgoff_t, writeback_index         )
         ),
 
         TP_fast_assign(
-                __entry->dev_major      = MAJOR(inode->i_sb->s_dev);
-                __entry->dev_minor      = MINOR(inode->i_sb->s_dev);
+                __entry->dev            = inode->i_sb->s_dev;
                 __entry->ino            = inode->i_ino;
                 __entry->nr_to_write    = wbc->nr_to_write;
                 __entry->pages_skipped  = wbc->pages_skipped;
                 __entry->range_start    = wbc->range_start;
                 __entry->range_end      = wbc->range_end;
+                __entry->sync_mode      = wbc->sync_mode;
                 __entry->for_kupdate    = wbc->for_kupdate;
-                __entry->for_reclaim    = wbc->for_reclaim;
                 __entry->range_cyclic   = wbc->range_cyclic;
                 __entry->writeback_index = inode->i_mapping->writeback_index;
         ),
 
         TP_printk("dev %d,%d ino %lu nr_to_write %ld pages_skipped %ld "
-                  "range_start %llu range_end %llu "
-                  "for_kupdate %d for_reclaim %d "
-                  "range_cyclic %d writeback_index %lu",
-                  __entry->dev_major, __entry->dev_minor,
+                  "range_start %llu range_end %llu sync_mode %d"
+                  "for_kupdate %d range_cyclic %d writeback_index %lu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino, __entry->nr_to_write,
                   __entry->pages_skipped, __entry->range_start,
-                  __entry->range_end,
-                  __entry->for_kupdate, __entry->for_reclaim,
-                  __entry->range_cyclic,
+                  __entry->range_end, __entry->sync_mode,
+                  __entry->for_kupdate, __entry->range_cyclic,
                   (unsigned long) __entry->writeback_index)
 );
 
@@ -381,8 +357,7 @@ TRACE_EVENT(ext4_da_write_pages,
         TP_ARGS(inode, mpd),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        __u64,  b_blocknr               )
                 __field(        __u32,  b_size                  )
@@ -390,11 +365,11 @@ TRACE_EVENT(ext4_da_write_pages,
                 __field(        unsigned long,  first_page      )
                 __field(        int,    io_done                 )
                 __field(        int,    pages_written           )
+                __field(        int,    sync_mode               )
         ),
 
         TP_fast_assign(
-                __entry->dev_major      = MAJOR(inode->i_sb->s_dev);
-                __entry->dev_minor      = MINOR(inode->i_sb->s_dev);
+                __entry->dev            = inode->i_sb->s_dev;
                 __entry->ino            = inode->i_ino;
                 __entry->b_blocknr      = mpd->b_blocknr;
                 __entry->b_size         = mpd->b_size;
@@ -402,14 +377,18 @@ TRACE_EVENT(ext4_da_write_pages,
                 __entry->first_page     = mpd->first_page;
                 __entry->io_done        = mpd->io_done;
                 __entry->pages_written  = mpd->pages_written;
+                __entry->sync_mode      = mpd->wbc->sync_mode;
         ),
 
-        TP_printk("dev %d,%d ino %lu b_blocknr %llu b_size %u b_state 0x%04x first_page %lu io_done %d pages_written %d",
-                  __entry->dev_major, __entry->dev_minor,
+        TP_printk("dev %d,%d ino %lu b_blocknr %llu b_size %u b_state 0x%04x "
+                  "first_page %lu io_done %d pages_written %d sync_mode %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino,
                   __entry->b_blocknr, __entry->b_size,
                   __entry->b_state, __entry->first_page,
-                  __entry->io_done, __entry->pages_written)
+                  __entry->io_done, __entry->pages_written,
+                  __entry->sync_mode
+                  )
 );
 
 TRACE_EVENT(ext4_da_writepages_result,
@@ -419,35 +398,100 @@ TRACE_EVENT(ext4_da_writepages_result,
         TP_ARGS(inode, wbc, ret, pages_written),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        int,    ret                     )
                 __field(        int,    pages_written           )
                 __field(        long,   pages_skipped           )
+                __field(        int,    sync_mode               )
                 __field(        char,   more_io                 )       
                 __field(       pgoff_t, writeback_index         )
         ),
 
         TP_fast_assign(
-                __entry->dev_major      = MAJOR(inode->i_sb->s_dev);
-                __entry->dev_minor      = MINOR(inode->i_sb->s_dev);
+                __entry->dev            = inode->i_sb->s_dev;
                 __entry->ino            = inode->i_ino;
                 __entry->ret            = ret;
                 __entry->pages_written  = pages_written;
                 __entry->pages_skipped  = wbc->pages_skipped;
+                __entry->sync_mode      = wbc->sync_mode;
                 __entry->more_io        = wbc->more_io;
                 __entry->writeback_index = inode->i_mapping->writeback_index;
         ),
 
-        TP_printk("dev %d,%d ino %lu ret %d pages_written %d pages_skipped %ld more_io %d writeback_index %lu",
-                  __entry->dev_major, __entry->dev_minor,
+        TP_printk("dev %d,%d ino %lu ret %d pages_written %d pages_skipped %ld "
+                  " more_io %d sync_mode %d writeback_index %lu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino, __entry->ret,
                   __entry->pages_written, __entry->pages_skipped,
-                  __entry->more_io,
+                  __entry->more_io, __entry->sync_mode,
                   (unsigned long) __entry->writeback_index)
 );
 
+DECLARE_EVENT_CLASS(ext4__page_op,
+        TP_PROTO(struct page *page),
+
+        TP_ARGS(page),
+
+        TP_STRUCT__entry(
+                __field(        pgoff_t, index                  )
+                __field(        ino_t,  ino                     )
+                __field(        dev_t,  dev                     )
+
+        ),
+
+        TP_fast_assign(
+                __entry->index  = page->index;
+                __entry->ino    = page->mapping->host->i_ino;
+                __entry->dev    = page->mapping->host->i_sb->s_dev;
+        ),
+
+        TP_printk("dev %d,%d ino %lu page_index %lu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->index)
+);
+
+DEFINE_EVENT(ext4__page_op, ext4_readpage,
+
+        TP_PROTO(struct page *page),
+
+        TP_ARGS(page)
+);
+
+DEFINE_EVENT(ext4__page_op, ext4_releasepage,
+
+        TP_PROTO(struct page *page),
+
+        TP_ARGS(page)
+);
+
+TRACE_EVENT(ext4_invalidatepage,
+        TP_PROTO(struct page *page, unsigned long offset),
+
+        TP_ARGS(page, offset),
+
+        TP_STRUCT__entry(
+                __field(        pgoff_t, index                  )
+                __field(        unsigned long, offset           )
+                __field(        ino_t,  ino                     )
+                __field(        dev_t,  dev                     )
+
+        ),
+
+        TP_fast_assign(
+                __entry->index  = page->index;
+                __entry->offset = offset;
+                __entry->ino    = page->mapping->host->i_ino;
+                __entry->dev    = page->mapping->host->i_sb->s_dev;
+        ),
+
+        TP_printk("dev %d,%d ino %lu page_index %lu offset %lu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->index, __entry->offset)
+);
+
 TRACE_EVENT(ext4_discard_blocks,
         TP_PROTO(struct super_block *sb, unsigned long long blk,
                         unsigned long long count),
@@ -455,22 +499,20 @@ TRACE_EVENT(ext4_discard_blocks,
         TP_ARGS(sb, blk, count),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        __u64,  blk                     )
                 __field(        __u64,  count                   )
 
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(sb->s_dev);
-                __entry->dev_minor = MINOR(sb->s_dev);
+                __entry->dev    = sb->s_dev;
                 __entry->blk    = blk;
                 __entry->count  = count;
         ),
 
         TP_printk("dev %d,%d blk %llu count %llu",
-                  __entry->dev_major, __entry->dev_minor,
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   __entry->blk, __entry->count)
 );
 
@@ -481,8 +523,7 @@ DECLARE_EVENT_CLASS(ext4__mb_new_pa,
         TP_ARGS(ac, pa),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        __u64,  pa_pstart               )
                 __field(        __u32,  pa_len                  )
@@ -491,8 +532,7 @@ DECLARE_EVENT_CLASS(ext4__mb_new_pa,
         ),
 
         TP_fast_assign(
-                __entry->dev_major      = MAJOR(ac->ac_sb->s_dev);
-                __entry->dev_minor      = MINOR(ac->ac_sb->s_dev);
+                __entry->dev            = ac->ac_sb->s_dev;
                 __entry->ino            = ac->ac_inode->i_ino;
                 __entry->pa_pstart      = pa->pa_pstart;
                 __entry->pa_len         = pa->pa_len;
@@ -500,9 +540,9 @@ DECLARE_EVENT_CLASS(ext4__mb_new_pa,
         ),
 
         TP_printk("dev %d,%d ino %lu pstart %llu len %u lstart %llu",
-                  __entry->dev_major, __entry->dev_minor,
-                  (unsigned long) __entry->ino, __entry->pa_pstart,
-                  __entry->pa_len, __entry->pa_lstart)
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->pa_pstart, __entry->pa_len, __entry->pa_lstart)
 );
 
 DEFINE_EVENT(ext4__mb_new_pa, ext4_mb_new_inode_pa,
@@ -530,8 +570,7 @@ TRACE_EVENT(ext4_mb_release_inode_pa,
         TP_ARGS(sb, inode, pa, block, count),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        __u64,  block                   )
                 __field(        __u32,  count                   )
@@ -539,16 +578,16 @@ TRACE_EVENT(ext4_mb_release_inode_pa,
         ),
 
         TP_fast_assign(
-                __entry->dev_major      = MAJOR(sb->s_dev);
-                __entry->dev_minor      = MINOR(sb->s_dev);
+                __entry->dev            = sb->s_dev;
                 __entry->ino            = inode->i_ino;
                 __entry->block          = block;
                 __entry->count          = count;
         ),
 
         TP_printk("dev %d,%d ino %lu block %llu count %u",
-                  __entry->dev_major, __entry->dev_minor,
-                  (unsigned long) __entry->ino, __entry->block, __entry->count)
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->block, __entry->count)
 );
 
 TRACE_EVENT(ext4_mb_release_group_pa,
@@ -558,22 +597,20 @@ TRACE_EVENT(ext4_mb_release_group_pa,
         TP_ARGS(sb, pa),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        __u64,  pa_pstart               )
                 __field(        __u32,  pa_len                  )
 
         ),
 
         TP_fast_assign(
-                __entry->dev_major      = MAJOR(sb->s_dev);
-                __entry->dev_minor      = MINOR(sb->s_dev);
+                __entry->dev            = sb->s_dev;
                 __entry->pa_pstart      = pa->pa_pstart;
                 __entry->pa_len         = pa->pa_len;
         ),
 
         TP_printk("dev %d,%d pstart %llu len %u",
-                  __entry->dev_major, __entry->dev_minor,
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   __entry->pa_pstart, __entry->pa_len)
 );
 
@@ -583,20 +620,18 @@ TRACE_EVENT(ext4_discard_preallocations,
         TP_ARGS(inode),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
 
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
-                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
+                __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
         ),
 
         TP_printk("dev %d,%d ino %lu",
-                  __entry->dev_major, __entry->dev_minor,
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino)
 );
 
@@ -606,20 +641,19 @@ TRACE_EVENT(ext4_mb_discard_preallocations,
         TP_ARGS(sb, needed),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        int,    needed                  )
 
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(sb->s_dev);
-                __entry->dev_minor = MINOR(sb->s_dev);
+                __entry->dev    = sb->s_dev;
                 __entry->needed = needed;
         ),
 
         TP_printk("dev %d,%d needed %d",
-                  __entry->dev_major, __entry->dev_minor, __entry->needed)
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->needed)
 );
 
 TRACE_EVENT(ext4_request_blocks,
@@ -628,8 +662,7 @@ TRACE_EVENT(ext4_request_blocks,
         TP_ARGS(ar),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        unsigned int, flags             )
                 __field(        unsigned int, len               )
@@ -642,8 +675,7 @@ TRACE_EVENT(ext4_request_blocks,
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(ar->inode->i_sb->s_dev);
-                __entry->dev_minor = MINOR(ar->inode->i_sb->s_dev);
+                __entry->dev    = ar->inode->i_sb->s_dev;
                 __entry->ino    = ar->inode->i_ino;
                 __entry->flags  = ar->flags;
                 __entry->len    = ar->len;
@@ -655,8 +687,9 @@ TRACE_EVENT(ext4_request_blocks,
                 __entry->pright = ar->pright;
         ),
 
-        TP_printk("dev %d,%d ino %lu flags %u len %u lblk %llu goal %llu lleft %llu lright %llu pleft %llu pright %llu ",
-                  __entry->dev_major, __entry->dev_minor,
+        TP_printk("dev %d,%d ino %lu flags %u len %u lblk %llu goal %llu "
+                  "lleft %llu lright %llu pleft %llu pright %llu ",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino,
                   __entry->flags, __entry->len,
                   (unsigned long long) __entry->logical,
@@ -673,8 +706,7 @@ TRACE_EVENT(ext4_allocate_blocks,
         TP_ARGS(ar, block),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        __u64,  block                   )
                 __field(        unsigned int, flags             )
@@ -688,8 +720,7 @@ TRACE_EVENT(ext4_allocate_blocks,
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(ar->inode->i_sb->s_dev);
-                __entry->dev_minor = MINOR(ar->inode->i_sb->s_dev);
+                __entry->dev    = ar->inode->i_sb->s_dev;
                 __entry->ino    = ar->inode->i_ino;
                 __entry->block  = block;
                 __entry->flags  = ar->flags;
@@ -702,10 +733,11 @@ TRACE_EVENT(ext4_allocate_blocks,
                 __entry->pright = ar->pright;
         ),
 
-        TP_printk("dev %d,%d ino %lu flags %u len %u block %llu lblk %llu goal %llu lleft %llu lright %llu pleft %llu pright %llu ",
-                  __entry->dev_major, __entry->dev_minor,
-                  (unsigned long) __entry->ino, __entry->flags,
-                  __entry->len, __entry->block,
+        TP_printk("dev %d,%d ino %lu flags %u len %u block %llu lblk %llu "
+                  "goal %llu lleft %llu lright %llu pleft %llu pright %llu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->flags, __entry->len, __entry->block,
                   (unsigned long long) __entry->logical,
                   (unsigned long long) __entry->goal,
                   (unsigned long long) __entry->lleft,
@@ -721,8 +753,7 @@ TRACE_EVENT(ext4_free_blocks,
         TP_ARGS(inode, block, count, flags),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(      umode_t, mode                     )
                 __field(        __u64,  block                   )
@@ -731,8 +762,7 @@ TRACE_EVENT(ext4_free_blocks,
         ),
 
         TP_fast_assign(
-                __entry->dev_major      = MAJOR(inode->i_sb->s_dev);
-                __entry->dev_minor      = MINOR(inode->i_sb->s_dev);
+                __entry->dev            = inode->i_sb->s_dev;
                 __entry->ino            = inode->i_ino;
                 __entry->mode           = inode->i_mode;
                 __entry->block          = block;
@@ -741,20 +771,19 @@ TRACE_EVENT(ext4_free_blocks,
         ),
 
         TP_printk("dev %d,%d ino %lu mode 0%o block %llu count %lu flags %d",
-                  __entry->dev_major, __entry->dev_minor,
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino,
                   __entry->mode, __entry->block, __entry->count,
                   __entry->flags)
 );
 
-TRACE_EVENT(ext4_sync_file,
+TRACE_EVENT(ext4_sync_file_enter,
         TP_PROTO(struct file *file, int datasync),
 
         TP_ARGS(file, datasync),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        ino_t,  parent                  )
                 __field(        int,    datasync                )
@@ -763,39 +792,60 @@ TRACE_EVENT(ext4_sync_file,
         TP_fast_assign(
                 struct dentry *dentry = file->f_path.dentry;
 
-                __entry->dev_major      = MAJOR(dentry->d_inode->i_sb->s_dev);
-                __entry->dev_minor      = MINOR(dentry->d_inode->i_sb->s_dev);
+                __entry->dev            = dentry->d_inode->i_sb->s_dev;
                 __entry->ino            = dentry->d_inode->i_ino;
                 __entry->datasync       = datasync;
                 __entry->parent         = dentry->d_parent->d_inode->i_ino;
         ),
 
         TP_printk("dev %d,%d ino %ld parent %ld datasync %d ",
-                  __entry->dev_major, __entry->dev_minor,
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino,
                   (unsigned long) __entry->parent, __entry->datasync)
 );
 
+TRACE_EVENT(ext4_sync_file_exit,
+        TP_PROTO(struct inode *inode, int ret),
+
+        TP_ARGS(inode, ret),
+
+        TP_STRUCT__entry(
+                __field(        int,    ret                     )
+                __field(        ino_t,  ino                     )
+                __field(        dev_t,  dev                     )
+        ),
+
+        TP_fast_assign(
+                __entry->ret            = ret;
+                __entry->ino            = inode->i_ino;
+                __entry->dev            = inode->i_sb->s_dev;
+        ),
+
+        TP_printk("dev %d,%d ino %ld ret %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->ret)
+);
+
 TRACE_EVENT(ext4_sync_fs,
         TP_PROTO(struct super_block *sb, int wait),
 
         TP_ARGS(sb, wait),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        int,    wait                    )
 
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(sb->s_dev);
-                __entry->dev_minor = MINOR(sb->s_dev);
+                __entry->dev    = sb->s_dev;
                 __entry->wait   = wait;
         ),
 
-        TP_printk("dev %d,%d wait %d", __entry->dev_major,
-                  __entry->dev_minor, __entry->wait)
+        TP_printk("dev %d,%d wait %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->wait)
 );
 
 TRACE_EVENT(ext4_alloc_da_blocks,
@@ -804,23 +854,21 @@ TRACE_EVENT(ext4_alloc_da_blocks,
         TP_ARGS(inode),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field( unsigned int,  data_blocks     )
                 __field( unsigned int,  meta_blocks     )
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
-                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
+                __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
                 __entry->data_blocks = EXT4_I(inode)->i_reserved_data_blocks;
                 __entry->meta_blocks = EXT4_I(inode)->i_reserved_meta_blocks;
         ),
 
         TP_printk("dev %d,%d ino %lu data_blocks %u meta_blocks %u",
-                  __entry->dev_major, __entry->dev_minor,
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino,
                   __entry->data_blocks, __entry->meta_blocks)
 );
@@ -831,8 +879,7 @@ TRACE_EVENT(ext4_mballoc_alloc,
         TP_ARGS(ac),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        __u16,  found                   )
                 __field(        __u16,  groups                  )
@@ -855,8 +902,7 @@ TRACE_EVENT(ext4_mballoc_alloc,
         ),
 
         TP_fast_assign(
-                __entry->dev_major      = MAJOR(ac->ac_inode->i_sb->s_dev);
-                __entry->dev_minor      = MINOR(ac->ac_inode->i_sb->s_dev);
+                __entry->dev            = ac->ac_inode->i_sb->s_dev;
                 __entry->ino            = ac->ac_inode->i_ino;
                 __entry->found          = ac->ac_found;
                 __entry->flags          = ac->ac_flags;
@@ -881,7 +927,7 @@ TRACE_EVENT(ext4_mballoc_alloc,
         TP_printk("dev %d,%d inode %lu orig %u/%d/%u@%u goal %u/%d/%u@%u "
                   "result %u/%d/%u@%u blks %u grps %u cr %u flags 0x%04x "
                   "tail %u broken %u",
-                  __entry->dev_major, __entry->dev_minor,
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino,
                   __entry->orig_group, __entry->orig_start,
                   __entry->orig_len, __entry->orig_logical,
@@ -900,8 +946,7 @@ TRACE_EVENT(ext4_mballoc_prealloc,
         TP_ARGS(ac),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        __u32,  orig_logical            )
                 __field(          int,  orig_start              )
@@ -914,8 +959,7 @@ TRACE_EVENT(ext4_mballoc_prealloc,
         ),
 
         TP_fast_assign(
-                __entry->dev_major      = MAJOR(ac->ac_inode->i_sb->s_dev);
-                __entry->dev_minor      = MINOR(ac->ac_inode->i_sb->s_dev);
+                __entry->dev            = ac->ac_inode->i_sb->s_dev;
                 __entry->ino            = ac->ac_inode->i_ino;
                 __entry->orig_logical   = ac->ac_o_ex.fe_logical;
                 __entry->orig_start     = ac->ac_o_ex.fe_start;
@@ -928,7 +972,7 @@ TRACE_EVENT(ext4_mballoc_prealloc,
         ),
 
         TP_printk("dev %d,%d inode %lu orig %u/%d/%u@%u result %u/%d/%u@%u",
-                  __entry->dev_major, __entry->dev_minor,
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino,
                   __entry->orig_group, __entry->orig_start,
                   __entry->orig_len, __entry->orig_logical,
@@ -946,8 +990,7 @@ DECLARE_EVENT_CLASS(ext4__mballoc,
         TP_ARGS(sb, inode, group, start, len),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(          int,  result_start            )
                 __field(        __u32,  result_group            )
@@ -955,8 +998,7 @@ DECLARE_EVENT_CLASS(ext4__mballoc,
         ),
 
         TP_fast_assign(
-                __entry->dev_major      = MAJOR(sb->s_dev);
-                __entry->dev_minor      = MINOR(sb->s_dev);
+                __entry->dev            = sb->s_dev;
                 __entry->ino            = inode ? inode->i_ino : 0;
                 __entry->result_start   = start;
                 __entry->result_group   = group;
@@ -964,7 +1006,7 @@ DECLARE_EVENT_CLASS(ext4__mballoc,
         ),
 
         TP_printk("dev %d,%d inode %lu extent %u/%d/%u ",
-                  __entry->dev_major, __entry->dev_minor,
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino,
                   __entry->result_group, __entry->result_start,
                   __entry->result_len)
@@ -998,8 +1040,7 @@ TRACE_EVENT(ext4_forget,
         TP_ARGS(inode, is_metadata, block),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        umode_t, mode                   )
                 __field(        int,    is_metadata             )
@@ -1007,8 +1048,7 @@ TRACE_EVENT(ext4_forget,
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
-                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
+                __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
                 __entry->mode   = inode->i_mode;
                 __entry->is_metadata = is_metadata;
@@ -1016,9 +1056,9 @@ TRACE_EVENT(ext4_forget,
         ),
 
         TP_printk("dev %d,%d ino %lu mode 0%o is_metadata %d block %llu",
-                  __entry->dev_major, __entry->dev_minor,
-                  (unsigned long) __entry->ino, __entry->mode,
-                  __entry->is_metadata, __entry->block)
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->mode, __entry->is_metadata, __entry->block)
 );
 
 TRACE_EVENT(ext4_da_update_reserve_space,
@@ -1027,8 +1067,7 @@ TRACE_EVENT(ext4_da_update_reserve_space,
         TP_ARGS(inode, used_blocks),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        umode_t, mode                   )
                 __field(        __u64,  i_blocks                )
@@ -1039,8 +1078,7 @@ TRACE_EVENT(ext4_da_update_reserve_space,
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
-                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
+                __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
                 __entry->mode   = inode->i_mode;
                 __entry->i_blocks = inode->i_blocks;
@@ -1050,10 +1088,12 @@ TRACE_EVENT(ext4_da_update_reserve_space,
                 __entry->allocated_meta_blocks = EXT4_I(inode)->i_allocated_meta_blocks;
         ),
 
-        TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu used_blocks %d reserved_data_blocks %d reserved_meta_blocks %d allocated_meta_blocks %d",
-                  __entry->dev_major, __entry->dev_minor,
-                  (unsigned long) __entry->ino, __entry->mode,
-                  (unsigned long long) __entry->i_blocks,
+        TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu used_blocks %d "
+                  "reserved_data_blocks %d reserved_meta_blocks %d "
+                  "allocated_meta_blocks %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->mode,  (unsigned long long) __entry->i_blocks,
                   __entry->used_blocks, __entry->reserved_data_blocks,
                   __entry->reserved_meta_blocks, __entry->allocated_meta_blocks)
 );
@@ -1064,8 +1104,7 @@ TRACE_EVENT(ext4_da_reserve_space,
         TP_ARGS(inode, md_needed),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        umode_t, mode                   )
                 __field(        __u64,  i_blocks                )
@@ -1075,8 +1114,7 @@ TRACE_EVENT(ext4_da_reserve_space,
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
-                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
+                __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
                 __entry->mode   = inode->i_mode;
                 __entry->i_blocks = inode->i_blocks;
@@ -1085,8 +1123,9 @@ TRACE_EVENT(ext4_da_reserve_space,
                 __entry->reserved_meta_blocks = EXT4_I(inode)->i_reserved_meta_blocks;
         ),
 
-        TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu md_needed %d reserved_data_blocks %d reserved_meta_blocks %d",
-                  __entry->dev_major, __entry->dev_minor,
+        TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu md_needed %d "
+                  "reserved_data_blocks %d reserved_meta_blocks %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino,
                   __entry->mode, (unsigned long long) __entry->i_blocks,
                   __entry->md_needed, __entry->reserved_data_blocks,
@@ -1099,8 +1138,7 @@ TRACE_EVENT(ext4_da_release_space,
         TP_ARGS(inode, freed_blocks),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        umode_t, mode                   )
                 __field(        __u64,  i_blocks                )
@@ -1111,8 +1149,7 @@ TRACE_EVENT(ext4_da_release_space,
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
-                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
+                __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
                 __entry->mode   = inode->i_mode;
                 __entry->i_blocks = inode->i_blocks;
@@ -1122,8 +1159,10 @@ TRACE_EVENT(ext4_da_release_space,
                 __entry->allocated_meta_blocks = EXT4_I(inode)->i_allocated_meta_blocks;
         ),
 
-        TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu freed_blocks %d reserved_data_blocks %d reserved_meta_blocks %d allocated_meta_blocks %d",
-                  __entry->dev_major, __entry->dev_minor,
+        TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu freed_blocks %d "
+                  "reserved_data_blocks %d reserved_meta_blocks %d "
+                  "allocated_meta_blocks %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino,
                   __entry->mode, (unsigned long long) __entry->i_blocks,
                   __entry->freed_blocks, __entry->reserved_data_blocks,
@@ -1136,20 +1175,19 @@ DECLARE_EVENT_CLASS(ext4__bitmap_load,
         TP_ARGS(sb, group),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        __u32,  group                   )
 
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(sb->s_dev);
-                __entry->dev_minor = MINOR(sb->s_dev);
+                __entry->dev    = sb->s_dev;
                 __entry->group  = group;
         ),
 
         TP_printk("dev %d,%d group %u",
-                  __entry->dev_major, __entry->dev_minor, __entry->group)
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->group)
 );
 
 DEFINE_EVENT(ext4__bitmap_load, ext4_mb_bitmap_load,
@@ -1166,6 +1204,349 @@ DEFINE_EVENT(ext4__bitmap_load, ext4_mb_buddy_bitmap_load,
         TP_ARGS(sb, group)
 );
 
+DEFINE_EVENT(ext4__bitmap_load, ext4_read_block_bitmap_load,
+
+        TP_PROTO(struct super_block *sb, unsigned long group),
+
+        TP_ARGS(sb, group)
+);
+
+DEFINE_EVENT(ext4__bitmap_load, ext4_load_inode_bitmap,
+
+        TP_PROTO(struct super_block *sb, unsigned long group),
+
+        TP_ARGS(sb, group)
+);
+
+TRACE_EVENT(ext4_direct_IO_enter,
+        TP_PROTO(struct inode *inode, loff_t offset, unsigned long len, int rw),
+
+        TP_ARGS(inode, offset, len, rw),
+
+        TP_STRUCT__entry(
+                __field(        ino_t,  ino                     )
+                __field(        dev_t,  dev                     )
+                __field(        loff_t, pos                     )
+                __field(        unsigned long,  len             )
+                __field(        int,    rw                      )
+        ),
+
+        TP_fast_assign(
+                __entry->ino    = inode->i_ino;
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->pos    = offset;
+                __entry->len    = len;
+                __entry->rw     = rw;
+        ),
+
+        TP_printk("dev %d,%d ino %lu pos %llu len %lu rw %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  (unsigned long long) __entry->pos, __entry->len, __entry->rw)
+);
+
+TRACE_EVENT(ext4_direct_IO_exit,
+        TP_PROTO(struct inode *inode, loff_t offset, unsigned long len, int rw, int ret),
+
+        TP_ARGS(inode, offset, len, rw, ret),
+
+        TP_STRUCT__entry(
+                __field(        ino_t,  ino                     )
+                __field(        dev_t,  dev                     )
+                __field(        loff_t, pos                     )
+                __field(        unsigned long,  len             )
+                __field(        int,    rw                      )
+                __field(        int,    ret                     )
+        ),
+
+        TP_fast_assign(
+                __entry->ino    = inode->i_ino;
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->pos    = offset;
+                __entry->len    = len;
+                __entry->rw     = rw;
+                __entry->ret    = ret;
+        ),
+
+        TP_printk("dev %d,%d ino %lu pos %llu len %lu rw %d ret %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  (unsigned long long) __entry->pos, __entry->len,
+                  __entry->rw, __entry->ret)
+);
+
+TRACE_EVENT(ext4_fallocate_enter,
+        TP_PROTO(struct inode *inode, loff_t offset, loff_t len, int mode),
+
+        TP_ARGS(inode, offset, len, mode),
+
+        TP_STRUCT__entry(
+                __field(        ino_t,  ino                     )
+                __field(        dev_t,  dev                     )
+                __field(        loff_t, pos                     )
+                __field(        loff_t, len                     )
+                __field(        int,    mode                    )
+        ),
+
+        TP_fast_assign(
+                __entry->ino    = inode->i_ino;
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->pos    = offset;
+                __entry->len    = len;
+                __entry->mode   = mode;
+        ),
+
+        TP_printk("dev %d,%d ino %ld pos %llu len %llu mode %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  (unsigned long long) __entry->pos,
+                  (unsigned long long) __entry->len, __entry->mode)
+);
+
+TRACE_EVENT(ext4_fallocate_exit,
+        TP_PROTO(struct inode *inode, loff_t offset, unsigned int max_blocks, int ret),
+
+        TP_ARGS(inode, offset, max_blocks, ret),
+
+        TP_STRUCT__entry(
+                __field(        ino_t,  ino                     )
+                __field(        dev_t,  dev                     )
+                __field(        loff_t, pos                     )
+                __field(        unsigned,       blocks          )
+                __field(        int,    ret                     )
+        ),
+
+        TP_fast_assign(
+                __entry->ino    = inode->i_ino;
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->pos    = offset;
+                __entry->blocks = max_blocks;
+                __entry->ret    = ret;
+        ),
+
+        TP_printk("dev %d,%d ino %ld pos %llu blocks %d ret %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  (unsigned long long) __entry->pos, __entry->blocks,
+                  __entry->ret)
+);
+
+TRACE_EVENT(ext4_unlink_enter,
+        TP_PROTO(struct inode *parent, struct dentry *dentry),
+
+        TP_ARGS(parent, dentry),
+
+        TP_STRUCT__entry(
+                __field(        ino_t,  parent                  )
+                __field(        ino_t,  ino                     )
+                __field(        loff_t, size                    )
+                __field(        dev_t,  dev                     )
+        ),
+
+        TP_fast_assign(
+                __entry->parent         = parent->i_ino;
+                __entry->ino            = dentry->d_inode->i_ino;
+                __entry->size           = dentry->d_inode->i_size;
+                __entry->dev            = dentry->d_inode->i_sb->s_dev;
+        ),
+
+        TP_printk("dev %d,%d ino %ld size %lld parent %ld",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino, __entry->size,
+                  (unsigned long) __entry->parent)
+);
+
+TRACE_EVENT(ext4_unlink_exit,
+        TP_PROTO(struct dentry *dentry, int ret),
+
+        TP_ARGS(dentry, ret),
+
+        TP_STRUCT__entry(
+                __field(        ino_t,  ino                     )
+                __field(        dev_t,  dev                     )
+                __field(        int,    ret                     )
+        ),
+
+        TP_fast_assign(
+                __entry->ino            = dentry->d_inode->i_ino;
+                __entry->dev            = dentry->d_inode->i_sb->s_dev;
+                __entry->ret            = ret;
+        ),
+
+        TP_printk("dev %d,%d ino %ld ret %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->ret)
+);
+
+DECLARE_EVENT_CLASS(ext4__truncate,
+        TP_PROTO(struct inode *inode),
+
+        TP_ARGS(inode),
+
+        TP_STRUCT__entry(
+                __field(        ino_t,          ino             )
+                __field(        dev_t,          dev             )
+                __field(        blkcnt_t,       blocks          )
+        ),
+
+        TP_fast_assign(
+                __entry->ino    = inode->i_ino;
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->blocks = inode->i_blocks;
+        ),
+
+        TP_printk("dev %d,%d ino %lu blocks %lu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino, (unsigned long) __entry->blocks)
+);
+
+DEFINE_EVENT(ext4__truncate, ext4_truncate_enter,
+
+        TP_PROTO(struct inode *inode),
+
+        TP_ARGS(inode)
+);
+
+DEFINE_EVENT(ext4__truncate, ext4_truncate_exit,
+
+        TP_PROTO(struct inode *inode),
+
+        TP_ARGS(inode)
+);
+
+DECLARE_EVENT_CLASS(ext4__map_blocks_enter,
+        TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
+                 unsigned len, unsigned flags),
+
+        TP_ARGS(inode, lblk, len, flags),
+
+        TP_STRUCT__entry(
+                __field(        ino_t,          ino             )
+                __field(        dev_t,          dev             )
+                __field(        ext4_lblk_t,    lblk            )
+                __field(        unsigned,       len             )
+                __field(        unsigned,       flags           )
+        ),
+
+        TP_fast_assign(
+                __entry->ino    = inode->i_ino;
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->lblk   = lblk;
+                __entry->len    = len;
+                __entry->flags  = flags;
+        ),
+
+        TP_printk("dev %d,%d ino %lu lblk %u len %u flags %u",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  (unsigned) __entry->lblk, __entry->len, __entry->flags)
+);
+
+DEFINE_EVENT(ext4__map_blocks_enter, ext4_ext_map_blocks_enter,
+        TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
+                 unsigned len, unsigned flags),
+
+        TP_ARGS(inode, lblk, len, flags)
+);
+
+DEFINE_EVENT(ext4__map_blocks_enter, ext4_ind_map_blocks_enter,
+        TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
+                 unsigned len, unsigned flags),
+
+        TP_ARGS(inode, lblk, len, flags)
+);
+
+DECLARE_EVENT_CLASS(ext4__map_blocks_exit,
+        TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
+                 ext4_fsblk_t pblk, unsigned len, int ret),
+
+        TP_ARGS(inode, lblk, pblk, len, ret),
+
+        TP_STRUCT__entry(
+                __field(        ino_t,          ino             )
+                __field(        dev_t,          dev             )
+                __field(        ext4_lblk_t,    lblk            )
+                __field(        ext4_fsblk_t,   pblk            )
+                __field(        unsigned,       len             )
+                __field(        int,            ret             )
+        ),
+
+        TP_fast_assign(
+                __entry->ino    = inode->i_ino;
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->lblk   = lblk;
+                __entry->pblk   = pblk;
+                __entry->len    = len;
+                __entry->ret    = ret;
+        ),
+
+        TP_printk("dev %d,%d ino %lu lblk %u pblk %llu len %u ret %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  (unsigned) __entry->lblk, (unsigned long long) __entry->pblk,
+                  __entry->len, __entry->ret)
+);
+
+DEFINE_EVENT(ext4__map_blocks_exit, ext4_ext_map_blocks_exit,
+        TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
+                 ext4_fsblk_t pblk, unsigned len, int ret),
+
+        TP_ARGS(inode, lblk, pblk, len, ret)
+);
+
+DEFINE_EVENT(ext4__map_blocks_exit, ext4_ind_map_blocks_exit,
+        TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
+                 ext4_fsblk_t pblk, unsigned len, int ret),
+
+        TP_ARGS(inode, lblk, pblk, len, ret)
+);
+
+TRACE_EVENT(ext4_ext_load_extent,
+        TP_PROTO(struct inode *inode, ext4_lblk_t lblk, ext4_fsblk_t pblk),
+
+        TP_ARGS(inode, lblk, pblk),
+
+        TP_STRUCT__entry(
+                __field(        ino_t,          ino             )
+                __field(        dev_t,          dev             )
+                __field(        ext4_lblk_t,    lblk            )
+                __field(        ext4_fsblk_t,   pblk            )
+        ),
+
+        TP_fast_assign(
+                __entry->ino    = inode->i_ino;
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->lblk   = lblk;
+                __entry->pblk   = pblk;
+        ),
+
+        TP_printk("dev %d,%d ino %lu lblk %u pblk %llu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  (unsigned) __entry->lblk, (unsigned long long) __entry->pblk)
+);
+
+TRACE_EVENT(ext4_load_inode,
+        TP_PROTO(struct inode *inode),
+
+        TP_ARGS(inode),
+
+        TP_STRUCT__entry(
+                __field(        ino_t,  ino             )
+                __field(        dev_t,  dev             )
+        ),
+
+        TP_fast_assign(
+                __entry->ino            = inode->i_ino;
+                __entry->dev            = inode->i_sb->s_dev;
+        ),
+
+        TP_printk("dev %d,%d ino %ld",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino)
+);
+
 #endif /* _TRACE_EXT4_H */
 
 /* This part must be outside protection */
diff --git a/include/trace/events/jbd2.h b/include/trace/events/jbd2.h
index 7447ea9305b5..bf16545cc977 100644
--- a/include/trace/events/jbd2.h
+++ b/include/trace/events/jbd2.h
@@ -17,19 +17,17 @@ TRACE_EVENT(jbd2_checkpoint,
         TP_ARGS(journal, result),
 
         TP_STRUCT__entry(
-                __field(        int,    dev_major               )
-                __field(        int,    dev_minor               )
+                __field(        dev_t,  dev                     )
                 __field(        int,    result                  )
         ),
 
         TP_fast_assign(
-                __entry->dev_major      = MAJOR(journal->j_fs_dev->bd_dev);
-                __entry->dev_minor      = MINOR(journal->j_fs_dev->bd_dev);
+                __entry->dev            = journal->j_fs_dev->bd_dev;
                 __entry->result         = result;
         ),
 
-        TP_printk("dev %d,%d result %d",
-                  __entry->dev_major, __entry->dev_minor, __entry->result)
+        TP_printk("dev %s result %d",
+                  jbd2_dev_to_name(__entry->dev), __entry->result)
 );
 
 DECLARE_EVENT_CLASS(jbd2_commit,
@@ -39,22 +37,20 @@ DECLARE_EVENT_CLASS(jbd2_commit,
         TP_ARGS(journal, commit_transaction),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        char,   sync_commit               )
                 __field(        int,    transaction               )
         ),
 
         TP_fast_assign(
-                __entry->dev_major      = MAJOR(journal->j_fs_dev->bd_dev);
-                __entry->dev_minor      = MINOR(journal->j_fs_dev->bd_dev);
+                __entry->dev            = journal->j_fs_dev->bd_dev;
                 __entry->sync_commit = commit_transaction->t_synchronous_commit;
                 __entry->transaction    = commit_transaction->t_tid;
         ),
 
-        TP_printk("dev %d,%d transaction %d sync %d",
-                  __entry->dev_major, __entry->dev_minor,
-                  __entry->transaction, __entry->sync_commit)
+        TP_printk("dev %s transaction %d sync %d",
+                  jbd2_dev_to_name(__entry->dev), __entry->transaction,
+                  __entry->sync_commit)
 );
 
 DEFINE_EVENT(jbd2_commit, jbd2_start_commit,
@@ -91,24 +87,22 @@ TRACE_EVENT(jbd2_end_commit,
         TP_ARGS(journal, commit_transaction),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        char,   sync_commit               )
                 __field(        int,    transaction               )
                 __field(        int,    head                      )
         ),
 
         TP_fast_assign(
-                __entry->dev_major      = MAJOR(journal->j_fs_dev->bd_dev);
-                __entry->dev_minor      = MINOR(journal->j_fs_dev->bd_dev);
+                __entry->dev            = journal->j_fs_dev->bd_dev;
                 __entry->sync_commit = commit_transaction->t_synchronous_commit;
                 __entry->transaction    = commit_transaction->t_tid;
                 __entry->head           = journal->j_tail_sequence;
         ),
 
-        TP_printk("dev %d,%d transaction %d sync %d head %d",
-                  __entry->dev_major, __entry->dev_minor,
-                  __entry->transaction, __entry->sync_commit, __entry->head)
+        TP_printk("dev %s transaction %d sync %d head %d",
+                  jbd2_dev_to_name(__entry->dev), __entry->transaction,
+                  __entry->sync_commit, __entry->head)
 );
 
 TRACE_EVENT(jbd2_submit_inode_data,
@@ -117,20 +111,17 @@ TRACE_EVENT(jbd2_submit_inode_data,
         TP_ARGS(inode),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
         ),
 
         TP_fast_assign(
-                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
-                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
+                __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
         ),
 
-        TP_printk("dev %d,%d ino %lu",
-                  __entry->dev_major, __entry->dev_minor,
-                  (unsigned long) __entry->ino)
+        TP_printk("dev %s ino %lu",
+                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino)
 );
 
 TRACE_EVENT(jbd2_run_stats,
@@ -140,8 +131,7 @@ TRACE_EVENT(jbd2_run_stats,
         TP_ARGS(dev, tid, stats),
 
         TP_STRUCT__entry(
-                __field(                  int,  dev_major       )
-                __field(                  int,  dev_minor       )
+                __field(                dev_t,  dev             )
                 __field(        unsigned long,  tid             )
                 __field(        unsigned long,  wait            )
                 __field(        unsigned long,  running         )
@@ -154,8 +144,7 @@ TRACE_EVENT(jbd2_run_stats,
         ),
 
         TP_fast_assign(
-                __entry->dev_major      = MAJOR(dev);
-                __entry->dev_minor      = MINOR(dev);
+                __entry->dev            = dev;
                 __entry->tid            = tid;
                 __entry->wait           = stats->rs_wait;
                 __entry->running        = stats->rs_running;
@@ -167,9 +156,9 @@ TRACE_EVENT(jbd2_run_stats,
                 __entry->blocks_logged  = stats->rs_blocks_logged;
         ),
 
-        TP_printk("dev %d,%d tid %lu wait %u running %u locked %u flushing %u "
+        TP_printk("dev %s tid %lu wait %u running %u locked %u flushing %u "
                   "logging %u handle_count %u blocks %u blocks_logged %u",
-                  __entry->dev_major, __entry->dev_minor, __entry->tid,
+                  jbd2_dev_to_name(__entry->dev), __entry->tid,
                   jiffies_to_msecs(__entry->wait),
                   jiffies_to_msecs(__entry->running),
                   jiffies_to_msecs(__entry->locked),
@@ -186,8 +175,7 @@ TRACE_EVENT(jbd2_checkpoint_stats,
         TP_ARGS(dev, tid, stats),
 
         TP_STRUCT__entry(
-                __field(                  int,  dev_major       )
-                __field(                  int,  dev_minor       )
+                __field(                dev_t,  dev             )
                 __field(        unsigned long,  tid             )
                 __field(        unsigned long,  chp_time        )
                 __field(                __u32,  forced_to_close )
@@ -196,8 +184,7 @@ TRACE_EVENT(jbd2_checkpoint_stats,
         ),
 
         TP_fast_assign(
-                __entry->dev_major      = MAJOR(dev);
-                __entry->dev_minor      = MINOR(dev);
+                __entry->dev            = dev;
                 __entry->tid            = tid;
                 __entry->chp_time       = stats->cs_chp_time;
                 __entry->forced_to_close= stats->cs_forced_to_close;
@@ -205,9 +192,9 @@ TRACE_EVENT(jbd2_checkpoint_stats,
                 __entry->dropped        = stats->cs_dropped;
         ),
 
-        TP_printk("dev %d,%d tid %lu chp_time %u forced_to_close %u "
+        TP_printk("dev %s tid %lu chp_time %u forced_to_close %u "
                   "written %u dropped %u",
-                  __entry->dev_major, __entry->dev_minor, __entry->tid,
+                  jbd2_dev_to_name(__entry->dev), __entry->tid,
                   jiffies_to_msecs(__entry->chp_time),
                   __entry->forced_to_close, __entry->written, __entry->dropped)
 );
@@ -220,8 +207,7 @@ TRACE_EVENT(jbd2_cleanup_journal_tail,
         TP_ARGS(journal, first_tid, block_nr, freed),
 
         TP_STRUCT__entry(
-                __field(        int,   dev_major                )
-                __field(        int,   dev_minor                )
+                __field(        dev_t,  dev                     )
                 __field(        tid_t,  tail_sequence           )
                 __field(        tid_t,  first_tid               )
                 __field(unsigned long,  block_nr                )
@@ -229,18 +215,16 @@ TRACE_EVENT(jbd2_cleanup_journal_tail,
         ),
 
         TP_fast_assign(
-                __entry->dev_major      = MAJOR(journal->j_fs_dev->bd_dev);
-                __entry->dev_minor      = MINOR(journal->j_fs_dev->bd_dev);
+                __entry->dev            = journal->j_fs_dev->bd_dev;
                 __entry->tail_sequence  = journal->j_tail_sequence;
                 __entry->first_tid      = first_tid;
                 __entry->block_nr       = block_nr;
                 __entry->freed          = freed;
         ),
 
-        TP_printk("dev %d,%d from %u to %u offset %lu freed %lu",
-                  __entry->dev_major, __entry->dev_minor,
-                  __entry->tail_sequence, __entry->first_tid,
-                  __entry->block_nr, __entry->freed)
+        TP_printk("dev %s from %u to %u offset %lu freed %lu",
+                  jbd2_dev_to_name(__entry->dev), __entry->tail_sequence,
+                  __entry->first_tid, __entry->block_nr, __entry->freed)
 );
 
 #endif /* _TRACE_JBD2_H */
diff --git a/include/video/atmel_lcdc.h b/include/video/atmel_lcdc.h
index 0c864db1a466..28447f1594fa 100644
--- a/include/video/atmel_lcdc.h
+++ b/include/video/atmel_lcdc.h
@@ -52,6 +52,7 @@ struct atmel_lcdfb_info {
         u8                      bl_power;
 #endif
         bool                    lcdcon_is_backlight;
+        bool                    lcdcon_pol_negative;
         u8                      saved_lcdcon;
 
         u8                      default_bpp;