520 files changed, 16226 insertions, 4723 deletions

diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index f1c8ca60e824..9e6e1c6eb60a 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -51,6 +51,37 @@ acpi_evaluate_reference(acpi_handle handle,
                         struct acpi_object_list *arguments,
                         struct acpi_handle_list *list);
 
+struct acpi_pld {
+        unsigned int revision:7; /* 0 */
+        unsigned int ignore_colour:1; /* 7 */
+        unsigned int colour:24; /* 8 */
+        unsigned int width:16; /* 32 */
+        unsigned int height:16; /* 48 */
+        unsigned int user_visible:1; /* 64 */
+        unsigned int dock:1; /* 65 */
+        unsigned int lid:1; /* 66 */
+        unsigned int panel:3; /* 67 */
+        unsigned int vertical_pos:2; /* 70 */
+        unsigned int horizontal_pos:2; /* 72 */
+        unsigned int shape:4; /* 74 */
+        unsigned int group_orientation:1; /* 78 */
+        unsigned int group_token:8; /* 79 */
+        unsigned int group_position:8; /* 87 */
+        unsigned int bay:1; /* 95 */
+        unsigned int ejectable:1; /* 96 */
+        unsigned int ospm_eject_required:1; /* 97 */
+        unsigned int cabinet_number:8; /* 98 */
+        unsigned int card_cage_number:8; /* 106 */
+        unsigned int reference:1; /* 114 */
+        unsigned int rotation:4; /* 115 */
+        unsigned int order:5; /* 119 */
+        unsigned int reserved:4; /* 124 */
+        unsigned int vertical_offset:16; /* 128 */
+        unsigned int horizontal_offset:16; /* 144 */
+} __attribute__((__packed__));
+
+acpi_status
+acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld *pld);
 #ifdef CONFIG_ACPI
 
 #include <linux/proc_fs.h>
@@ -407,6 +438,11 @@ static inline int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
 }
 #endif
 
+#else   /* CONFIG_ACPI */
+
+static inline int register_acpi_bus_type(void *bus) { return 0; }
+static inline int unregister_acpi_bus_type(void *bus) { return 0; }
+
 #endif                          /* CONFIG_ACPI */
 
 #endif /*__ACPI_BUS_H__*/
diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
index 53f91b1ae53a..2c85a0f647b7 100644
--- a/include/asm-generic/Kbuild
+++ b/include/asm-generic/Kbuild
@@ -8,6 +8,7 @@ header-y += int-ll64.h
 header-y += ioctl.h
 header-y += ioctls.h
 header-y += ipcbuf.h
+header-y += kvm_para.h
 header-y += mman-common.h
 header-y += mman.h
 header-y += msgbuf.h
diff --git a/include/asm-generic/bitsperlong.h b/include/asm-generic/bitsperlong.h
index 4ae54e07de83..a7b0914348fd 100644
--- a/include/asm-generic/bitsperlong.h
+++ b/include/asm-generic/bitsperlong.h
@@ -28,5 +28,9 @@
 #error Inconsistent word size. Check asm/bitsperlong.h
 #endif
 
+#ifndef BITS_PER_LONG_LONG
+#define BITS_PER_LONG_LONG 64
+#endif
+
 #endif /* __KERNEL__ */
 #endif /* __ASM_GENERIC_BITS_PER_LONG */
diff --git a/include/asm-generic/dma-coherent.h b/include/asm-generic/dma-coherent.h
index 85a3ffaa0242..abfb2682de7f 100644
--- a/include/asm-generic/dma-coherent.h
+++ b/include/asm-generic/dma-coherent.h
@@ -3,13 +3,15 @@
 
 #ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT
 /*
- * These two functions are only for dma allocator.
+ * These three functions are only for dma allocator.
  * Don't use them in device drivers.
  */
 int dma_alloc_from_coherent(struct device *dev, ssize_t size,
                                        dma_addr_t *dma_handle, void **ret);
 int dma_release_from_coherent(struct device *dev, int order, void *vaddr);
 
+int dma_mmap_from_coherent(struct device *dev, struct vm_area_struct *vma,
+                            void *cpu_addr, size_t size, int *ret);
 /*
  * Standard interface
  */
diff --git a/include/asm-generic/dma-contiguous.h b/include/asm-generic/dma-contiguous.h
new file mode 100644
index 000000000000..c544356b374b
--- /dev/null
+++ b/include/asm-generic/dma-contiguous.h
@@ -0,0 +1,28 @@
+#ifndef ASM_DMA_CONTIGUOUS_H
+#define ASM_DMA_CONTIGUOUS_H
+
+#ifdef __KERNEL__
+#ifdef CONFIG_CMA
+
+#include <linux/device.h>
+#include <linux/dma-contiguous.h>
+
+static inline struct cma *dev_get_cma_area(struct device *dev)
+{
+        if (dev && dev->cma_area)
+                return dev->cma_area;
+        return dma_contiguous_default_area;
+}
+
+static inline void dev_set_cma_area(struct device *dev, struct cma *cma)
+{
+        if (dev)
+                dev->cma_area = cma;
+        if (!dev || !dma_contiguous_default_area)
+                dma_contiguous_default_area = cma;
+}
+
+#endif
+#endif
+
+#endif
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index 5f52690c3c8f..365ea09ed3b0 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -142,9 +142,9 @@ extern int __must_check gpiochip_reserve(int start, int ngpio);
 /* add/remove chips */
 extern int gpiochip_add(struct gpio_chip *chip);
 extern int __must_check gpiochip_remove(struct gpio_chip *chip);
-extern struct gpio_chip *gpiochip_find(const void *data,
+extern struct gpio_chip *gpiochip_find(void *data,
                                         int (*match)(struct gpio_chip *chip,
-                                                     const void *data));
+                                                     void *data));
 
 
 /* Always use the library code for GPIO management calls,
@@ -179,6 +179,8 @@ extern void gpio_free_array(const struct gpio *array, size_t num);
 
 /* bindings for managed devices that want to request gpios */
 int devm_gpio_request(struct device *dev, unsigned gpio, const char *label);
+int devm_gpio_request_one(struct device *dev, unsigned gpio,
+                          unsigned long flags, const char *label);
 void devm_gpio_free(struct device *dev, unsigned int gpio);
 
 #ifdef CONFIG_GPIO_SYSFS
diff --git a/include/asm-generic/kvm_para.h b/include/asm-generic/kvm_para.h
new file mode 100644
index 000000000000..5cba37f9eae1
--- /dev/null
+++ b/include/asm-generic/kvm_para.h
@@ -0,0 +1,22 @@
+#ifndef _ASM_GENERIC_KVM_PARA_H
+#define _ASM_GENERIC_KVM_PARA_H
+
+#ifdef __KERNEL__
+
+/*
+ * This function is used by architectures that support kvm to avoid issuing
+ * false soft lockup messages.
+ */
+static inline bool kvm_check_and_clear_guest_paused(void)
+{
+        return false;
+}
+
+static inline unsigned int kvm_arch_para_features(void)
+{
+        return 0;
+}
+
+#endif  /* _KERNEL__ */
+
+#endif
diff --git a/include/asm-generic/pci-bridge.h b/include/asm-generic/pci-bridge.h
index a5b5d5a89a4f..20db2e5a0a69 100644
--- a/include/asm-generic/pci-bridge.h
+++ b/include/asm-generic/pci-bridge.h
@@ -30,6 +30,12 @@ enum {
         PCI_ENABLE_PROC_DOMAINS = 0x00000010,
         /* ... except for domain 0 */
         PCI_COMPAT_DOMAIN_0     = 0x00000020,
+
+        /* PCIe downstream ports are bridges that normally lead to only a
+         * device 0, but if this is set, we scan all possible devices, not
+         * just device 0.
+         */
+        PCI_SCAN_ALL_PCIE_DEVS  = 0x00000040,
 };
 
 #ifdef CONFIG_PCI
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index 125c54e98517..6f2b45a9b6bc 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -158,9 +158,8 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
 #endif
 
 #ifndef __HAVE_ARCH_PMDP_SPLITTING_FLUSH
-extern pmd_t pmdp_splitting_flush(struct vm_area_struct *vma,
-                                  unsigned long address,
-                                  pmd_t *pmdp);
+extern void pmdp_splitting_flush(struct vm_area_struct *vma,
+                                 unsigned long address, pmd_t *pmdp);
 #endif
 
 #ifndef __HAVE_ARCH_PTE_SAME
@@ -446,6 +445,18 @@ static inline int pmd_write(pmd_t pmd)
 #endif /* __HAVE_ARCH_PMD_WRITE */
 #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
 
+#ifndef pmd_read_atomic
+static inline pmd_t pmd_read_atomic(pmd_t *pmdp)
+{
+        /*
+         * Depend on compiler for an atomic pmd read. NOTE: this is
+         * only going to work, if the pmdval_t isn't larger than
+         * an unsigned long.
+         */
+        return *pmdp;
+}
+#endif
+
 /*
  * This function is meant to be used by sites walking pagetables with
  * the mmap_sem hold in read mode to protect against MADV_DONTNEED and
@@ -459,11 +470,17 @@ static inline int pmd_write(pmd_t pmd)
  * undefined so behaving like if the pmd was none is safe (because it
  * can return none anyway). The compiler level barrier() is critically
  * important to compute the two checks atomically on the same pmdval.
+ *
+ * For 32bit kernels with a 64bit large pmd_t this automatically takes
+ * care of reading the pmd atomically to avoid SMP race conditions
+ * against pmd_populate() when the mmap_sem is hold for reading by the
+ * caller (a special atomic read not done by "gcc" as in the generic
+ * version above, is also needed when THP is disabled because the page
+ * fault can populate the pmd from under us).
  */
 static inline int pmd_none_or_trans_huge_or_clear_bad(pmd_t *pmd)
 {
-        /* depend on compiler for an atomic pmd read */
-        pmd_t pmdval = *pmd;
+        pmd_t pmdval = pmd_read_atomic(pmd);
         /*
          * The barrier will stabilize the pmdval in a register or on
          * the stack so that it will stop changing under the code.
diff --git a/include/asm-generic/posix_types.h b/include/asm-generic/posix_types.h
index 91d44bd4dde3..fe74fccf18db 100644
--- a/include/asm-generic/posix_types.h
+++ b/include/asm-generic/posix_types.h
@@ -23,10 +23,6 @@ typedef __kernel_ulong_t __kernel_ino_t;
 typedef unsigned int    __kernel_mode_t;
 #endif
 
-#ifndef __kernel_nlink_t
-typedef __kernel_ulong_t __kernel_nlink_t;
-#endif
-
 #ifndef __kernel_pid_t
 typedef int             __kernel_pid_t;
 #endif
diff --git a/include/asm-generic/siginfo.h b/include/asm-generic/siginfo.h
index 5e5e3865f1ed..8ed67779fc09 100644
--- a/include/asm-generic/siginfo.h
+++ b/include/asm-generic/siginfo.h
@@ -98,9 +98,18 @@ typedef struct siginfo {
                         __ARCH_SI_BAND_T _band; /* POLL_IN, POLL_OUT, POLL_MSG */
                         int _fd;
                 } _sigpoll;
+
+                /* SIGSYS */
+                struct {
+                        void __user *_call_addr; /* calling user insn */
+                        int _syscall;   /* triggering system call number */
+                        unsigned int _arch;     /* AUDIT_ARCH_* of syscall */
+                } _sigsys;
         } _sifields;
 } __ARCH_SI_ATTRIBUTES siginfo_t;
 
+/* If the arch shares siginfo, then it has SIGSYS. */
+#define __ARCH_SIGSYS
 #endif
 
 /*
@@ -124,6 +133,11 @@ typedef struct siginfo {
 #define si_addr_lsb     _sifields._sigfault._addr_lsb
 #define si_band         _sifields._sigpoll._band
 #define si_fd           _sifields._sigpoll._fd
+#ifdef __ARCH_SIGSYS
+#define si_call_addr    _sifields._sigsys._call_addr
+#define si_syscall      _sifields._sigsys._syscall
+#define si_arch         _sifields._sigsys._arch
+#endif
 
 #ifdef __KERNEL__
 #define __SI_MASK       0xffff0000u
@@ -134,6 +148,7 @@ typedef struct siginfo {
 #define __SI_CHLD       (4 << 16)
 #define __SI_RT         (5 << 16)
 #define __SI_MESGQ      (6 << 16)
+#define __SI_SYS        (7 << 16)
 #define __SI_CODE(T,N)  ((T) | ((N) & 0xffff))
 #else
 #define __SI_KILL       0
@@ -143,6 +158,7 @@ typedef struct siginfo {
 #define __SI_CHLD       0
 #define __SI_RT         0
 #define __SI_MESGQ      0
+#define __SI_SYS        0
 #define __SI_CODE(T,N)  (N)
 #endif
 
@@ -240,6 +256,12 @@ typedef struct siginfo {
 #define NSIGPOLL        6
 
 /*
+ * SIGSYS si_codes
+ */
+#define SYS_SECCOMP             (__SI_SYS|1)    /* seccomp triggered */
+#define NSIGSYS 1
+
+/*
  * sigevent definitions
  * 
  * It seems likely that SIGEV_THREAD will have to be handled from 
diff --git a/include/asm-generic/syscall.h b/include/asm-generic/syscall.h
index 5c122ae6bfa6..5b09392db673 100644
--- a/include/asm-generic/syscall.h
+++ b/include/asm-generic/syscall.h
@@ -142,4 +142,18 @@ void syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,
                            unsigned int i, unsigned int n,
                            const unsigned long *args);
 
+/**
+ * syscall_get_arch - return the AUDIT_ARCH for the current system call
+ * @task:       task of interest, must be in system call entry tracing
+ * @regs:       task_pt_regs() of @task
+ *
+ * Returns the AUDIT_ARCH_* based on the system call convention in use.
+ *
+ * It's only valid to call this when @task is stopped on entry to a system
+ * call, due to %TIF_SYSCALL_TRACE, %TIF_SYSCALL_AUDIT, or %TIF_SECCOMP.
+ *
+ * Architectures which permit CONFIG_HAVE_ARCH_SECCOMP_FILTER must
+ * provide an implementation of this.
+ */
+int syscall_get_arch(struct task_struct *task, struct pt_regs *regs);
 #endif  /* _ASM_SYSCALL_H */
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 8aeadf6b553a..4e2e1cc505ab 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -486,8 +486,8 @@
         CPU_DISCARD(init.data)                                          \
         MEM_DISCARD(init.data)                                          \
         KERNEL_CTORS()                                                  \
-        *(.init.rodata)                                                 \
         MCOUNT_REC()                                                    \
+        *(.init.rodata)                                                 \
         FTRACE_EVENTS()                                                 \
         TRACE_SYSCALLS()                                                \
         DEV_DISCARD(init.rodata)                                        \
diff --git a/include/asm-generic/word-at-a-time.h b/include/asm-generic/word-at-a-time.h
new file mode 100644
index 000000000000..3f21f1b72e45
--- /dev/null
+++ b/include/asm-generic/word-at-a-time.h
@@ -0,0 +1,52 @@
+#ifndef _ASM_WORD_AT_A_TIME_H
+#define _ASM_WORD_AT_A_TIME_H
+
+/*
+ * This says "generic", but it's actually big-endian only.
+ * Little-endian can use more efficient versions of these
+ * interfaces, see for example
+ *       arch/x86/include/asm/word-at-a-time.h
+ * for those.
+ */
+
+#include <linux/kernel.h>
+
+struct word_at_a_time {
+        const unsigned long high_bits, low_bits;
+};
+
+#define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0xfe) + 1, REPEAT_BYTE(0x7f) }
+
+/* Bit set in the bytes that have a zero */
+static inline long prep_zero_mask(unsigned long val, unsigned long rhs, const struct word_at_a_time *c)
+{
+        unsigned long mask = (val & c->low_bits) + c->low_bits;
+        return ~(mask | rhs);
+}
+
+#define create_zero_mask(mask) (mask)
+
+static inline long find_zero(unsigned long mask)
+{
+        long byte = 0;
+#ifdef CONFIG_64BIT
+        if (mask >> 32)
+                mask >>= 32;
+        else
+                byte = 4;
+#endif
+        if (mask >> 16)
+                mask >>= 16;
+        else
+                byte += 2;
+        return (mask >> 8) ? byte : byte + 1;
+}
+
+static inline bool has_zero(unsigned long val, unsigned long *data, const struct word_at_a_time *c)
+{
+        unsigned long rhs = val | c->low_bits;
+        *data = rhs;
+        return (val + c->high_bits) & ~rhs;
+}
+
+#endif /* _ASM_WORD_AT_A_TIME_H */
diff --git a/include/drm/drm.h b/include/drm/drm.h
index 64ff02d5b730..e51035a3757f 100644
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
@@ -730,6 +730,8 @@ struct drm_prime_handle {
 #define DRM_IOCTL_MODE_GETPLANE DRM_IOWR(0xB6, struct drm_mode_get_plane)
 #define DRM_IOCTL_MODE_SETPLANE DRM_IOWR(0xB7, struct drm_mode_set_plane)
 #define DRM_IOCTL_MODE_ADDFB2           DRM_IOWR(0xB8, struct drm_mode_fb_cmd2)
+#define DRM_IOCTL_MODE_OBJ_GETPROPERTIES        DRM_IOWR(0xB9, struct drm_mode_obj_get_properties)
+#define DRM_IOCTL_MODE_OBJ_SETPROPERTY  DRM_IOWR(0xBA, struct drm_mode_obj_set_property)
 
 /**
  * Device specific ioctls should only be in their respective headers
@@ -775,6 +777,10 @@ struct drm_event_vblank {
 #define DRM_CAP_VBLANK_HIGH_CRTC 0x2
 #define DRM_CAP_DUMB_PREFERRED_DEPTH 0x3
 #define DRM_CAP_DUMB_PREFER_SHADOW 0x4
+#define DRM_CAP_PRIME 0x5
+
+#define DRM_PRIME_CAP_IMPORT 0x1
+#define DRM_PRIME_CAP_EXPORT 0x2
 
 /* typedef area */
 #ifndef __KERNEL__
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index dd731043fecd..31ad880ca2ef 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -755,11 +755,11 @@ struct drm_driver {
          * @dev: DRM device
          * @crtc: counter to fetch
          *
-         * Driver callback for fetching a raw hardware vblank counter
-         * for @crtc.  If a device doesn't have a hardware counter, the
-         * driver can simply return the value of drm_vblank_count and
-         * make the enable_vblank() and disable_vblank() hooks into no-ops,
-         * leaving interrupts enabled at all times.
+         * Driver callback for fetching a raw hardware vblank counter for @crtc.
+         * If a device doesn't have a hardware counter, the driver can simply
+         * return the value of drm_vblank_count. The DRM core will account for
+         * missed vblank events while interrupts where disabled based on system
+         * timestamps.
          *
          * Wraparound handling and loss of events due to modesetting is dealt
          * with in the DRM core code.
@@ -941,7 +941,7 @@ struct drm_driver {
                             uint32_t handle);
 
         /* Driver private ops for this object */
-        struct vm_operations_struct *gem_vm_ops;
+        const struct vm_operations_struct *gem_vm_ops;
 
         int major;
         int minor;
@@ -1309,8 +1309,8 @@ extern int drm_release(struct inode *inode, struct file *filp);
                                 /* Mapping support (drm_vm.h) */
 extern int drm_mmap(struct file *filp, struct vm_area_struct *vma);
 extern int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma);
-extern void drm_vm_open_locked(struct vm_area_struct *vma);
-extern void drm_vm_close_locked(struct vm_area_struct *vma);
+extern void drm_vm_open_locked(struct drm_device *dev, struct vm_area_struct *vma);
+extern void drm_vm_close_locked(struct drm_device *dev, struct vm_area_struct *vma);
 extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait);
 
                                 /* Memory management support (drm_memory.h) */
@@ -1378,6 +1378,7 @@ extern int drm_remove_magic(struct drm_master *master, drm_magic_t magic);
 
 /* Cache management (drm_cache.c) */
 void drm_clflush_pages(struct page *pages[], unsigned long num_pages);
+void drm_clflush_virt_range(char *addr, unsigned long length);
 
                                 /* Locking IOCTL support (drm_lock.h) */
 extern int drm_lock(struct drm_device *dev, void *data,
@@ -1557,6 +1558,8 @@ extern int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data,
 extern int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data,
                                         struct drm_file *file_priv);
 
+extern int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages,
+                                            dma_addr_t *addrs, int max_pages);
 extern struct sg_table *drm_prime_pages_to_sg(struct page **pages, int nr_pages);
 extern void drm_prime_gem_destroy(struct drm_gem_object *obj, struct sg_table *sg);
 
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index e250eda4e3a8..73e45600f95d 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -36,6 +36,7 @@
 struct drm_device;
 struct drm_mode_set;
 struct drm_framebuffer;
+struct drm_object_properties;
 
 
 #define DRM_MODE_OBJECT_CRTC 0xcccccccc
@@ -50,6 +51,14 @@ struct drm_framebuffer;
 struct drm_mode_object {
         uint32_t id;
         uint32_t type;
+        struct drm_object_properties *properties;
+};
+
+#define DRM_OBJECT_MAX_PROPERTY 16
+struct drm_object_properties {
+        int count;
+        uint32_t ids[DRM_OBJECT_MAX_PROPERTY];
+        uint64_t values[DRM_OBJECT_MAX_PROPERTY];
 };
 
 /*
@@ -285,19 +294,16 @@ struct drm_plane;
 
 /**
  * drm_crtc_funcs - control CRTCs for a given device
- * @reset: reset CRTC after state has been invalidate (e.g. resume)
- * @dpms: control display power levels
  * @save: save CRTC state
- * @resore: restore CRTC state
- * @lock: lock the CRTC
- * @unlock: unlock the CRTC
- * @shadow_allocate: allocate shadow pixmap
- * @shadow_create: create shadow pixmap for rotation support
- * @shadow_destroy: free shadow pixmap
- * @mode_fixup: fixup proposed mode
- * @mode_set: set the desired mode on the CRTC
+ * @restore: restore CRTC state
+ * @reset: reset CRTC after state has been invalidate (e.g. resume)
+ * @cursor_set: setup the cursor
+ * @cursor_move: move the cursor
  * @gamma_set: specify color ramp for CRTC
- * @destroy: deinit and free object.
+ * @destroy: deinit and free object
+ * @set_property: called when a property is changed
+ * @set_config: apply a new CRTC configuration
+ * @page_flip: initiate a page flip
  *
  * The drm_crtc_funcs structure is the central CRTC management structure
  * in the DRM.  Each CRTC controls one or more connectors (note that the name
@@ -341,6 +347,9 @@ struct drm_crtc_funcs {
         int (*page_flip)(struct drm_crtc *crtc,
                          struct drm_framebuffer *fb,
                          struct drm_pending_vblank_event *event);
+
+        int (*set_property)(struct drm_crtc *crtc,
+                            struct drm_property *property, uint64_t val);
 };
 
 /**
@@ -360,6 +369,7 @@ struct drm_crtc_funcs {
  * @framedur_ns: precise line timing
  * @pixeldur_ns: precise pixel timing
  * @helper_private: mid-layer private data
+ * @properties: property tracking for this CRTC
  *
  * Each CRTC may have one or more connectors associated with it.  This structure
  * allows the CRTC to be controlled.
@@ -395,6 +405,8 @@ struct drm_crtc {
 
         /* if you are using the helper */
         void *helper_private;
+
+        struct drm_object_properties properties;
 };
 
 
@@ -404,11 +416,8 @@ struct drm_crtc {
  * @save: save connector state
  * @restore: restore connector state
  * @reset: reset connector after state has been invalidate (e.g. resume)
- * @mode_valid: is this mode valid on the given connector?
- * @mode_fixup: try to fixup proposed mode for this connector
- * @mode_set: set this mode
  * @detect: is this connector active?
- * @get_modes: get mode list for this connector
+ * @fill_modes: fill mode list for this connector
  * @set_property: property for this connector may need update
  * @destroy: make object go away
  * @force: notify the driver the connector is forced on
@@ -451,7 +460,6 @@ struct drm_encoder_funcs {
 };
 
 #define DRM_CONNECTOR_MAX_UMODES 16
-#define DRM_CONNECTOR_MAX_PROPERTY 16
 #define DRM_CONNECTOR_LEN 32
 #define DRM_CONNECTOR_MAX_ENCODER 3
 
@@ -520,8 +528,7 @@ enum drm_connector_force {
  * @funcs: connector control functions
  * @user_modes: user added mode list
  * @edid_blob_ptr: DRM property containing EDID if present
- * @property_ids: property tracking for this connector
- * @property_values: value pointers or data for properties
+ * @properties: property tracking for this connector
  * @polled: a %DRM_CONNECTOR_POLL_<foo> value for core driven polling
  * @dpms: current dpms state
  * @helper_private: mid-layer private data
@@ -565,8 +572,7 @@ struct drm_connector {
 
         struct list_head user_modes;
         struct drm_property_blob *edid_blob_ptr;
-        u32 property_ids[DRM_CONNECTOR_MAX_PROPERTY];
-        uint64_t property_values[DRM_CONNECTOR_MAX_PROPERTY];
+        struct drm_object_properties properties;
 
         uint8_t polled; /* DRM_CONNECTOR_POLL_* */
 
@@ -595,6 +601,7 @@ struct drm_connector {
  * @update_plane: update the plane configuration
  * @disable_plane: shut down the plane
  * @destroy: clean up plane resources
+ * @set_property: called when a property is changed
  */
 struct drm_plane_funcs {
         int (*update_plane)(struct drm_plane *plane,
@@ -605,6 +612,9 @@ struct drm_plane_funcs {
                             uint32_t src_w, uint32_t src_h);
         int (*disable_plane)(struct drm_plane *plane);
         void (*destroy)(struct drm_plane *plane);
+
+        int (*set_property)(struct drm_plane *plane,
+                            struct drm_property *property, uint64_t val);
 };
 
 /**
@@ -622,6 +632,7 @@ struct drm_plane_funcs {
  * @enabled: enabled flag
  * @funcs: helper functions
  * @helper_private: storage for drver layer
+ * @properties: property tracking for this plane
  */
 struct drm_plane {
         struct drm_device *dev;
@@ -644,6 +655,8 @@ struct drm_plane {
 
         const struct drm_plane_funcs *funcs;
         void *helper_private;
+
+        struct drm_object_properties properties;
 };
 
 /**
@@ -761,7 +774,7 @@ struct drm_mode_config {
 
         int min_width, min_height;
         int max_width, max_height;
-        struct drm_mode_config_funcs *funcs;
+        const struct drm_mode_config_funcs *funcs;
         resource_size_t fb_base;
 
         /* output poll support */
@@ -898,6 +911,12 @@ extern int drm_connector_property_set_value(struct drm_connector *connector,
 extern int drm_connector_property_get_value(struct drm_connector *connector,
                                          struct drm_property *property,
                                          uint64_t *value);
+extern int drm_object_property_set_value(struct drm_mode_object *obj,
+                                         struct drm_property *property,
+                                         uint64_t val);
+extern int drm_object_property_get_value(struct drm_mode_object *obj,
+                                         struct drm_property *property,
+                                         uint64_t *value);
 extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
 extern void drm_framebuffer_set_object(struct drm_device *dev,
                                        unsigned long handle);
@@ -910,14 +929,21 @@ extern int drmfb_remove(struct drm_device *dev, struct drm_framebuffer *fb);
 extern void drm_crtc_probe_connector_modes(struct drm_device *dev, int maxX, int maxY);
 extern bool drm_crtc_in_use(struct drm_crtc *crtc);
 
-extern int drm_connector_attach_property(struct drm_connector *connector,
-                                      struct drm_property *property, uint64_t init_val);
+extern void drm_connector_attach_property(struct drm_connector *connector,
+                                          struct drm_property *property, uint64_t init_val);
+extern void drm_object_attach_property(struct drm_mode_object *obj,
+                                       struct drm_property *property,
+                                       uint64_t init_val);
 extern struct drm_property *drm_property_create(struct drm_device *dev, int flags,
                                                 const char *name, int num_values);
 extern struct drm_property *drm_property_create_enum(struct drm_device *dev, int flags,
                                          const char *name,
                                          const struct drm_prop_enum_list *props,
                                          int num_values);
+struct drm_property *drm_property_create_bitmask(struct drm_device *dev,
+                                         int flags, const char *name,
+                                         const struct drm_prop_enum_list *props,
+                                         int num_values);
 struct drm_property *drm_property_create_range(struct drm_device *dev, int flags,
                                          const char *name,
                                          uint64_t min, uint64_t max);
@@ -1012,10 +1038,11 @@ extern int drm_add_modes_noedid(struct drm_connector *connector,
                                 int hdisplay, int vdisplay);
 
 extern int drm_edid_header_is_valid(const u8 *raw_edid);
-extern bool drm_edid_block_valid(u8 *raw_edid);
+extern bool drm_edid_block_valid(u8 *raw_edid, int block);
 extern bool drm_edid_is_valid(struct edid *edid);
 struct drm_display_mode *drm_mode_find_dmt(struct drm_device *dev,
-                                           int hsize, int vsize, int fresh);
+                                           int hsize, int vsize, int fresh,
+                                           bool rb);
 
 extern int drm_mode_create_dumb_ioctl(struct drm_device *dev,
                                       void *data, struct drm_file *file_priv);
@@ -1023,7 +1050,16 @@ extern int drm_mode_mmap_dumb_ioctl(struct drm_device *dev,
                                     void *data, struct drm_file *file_priv);
 extern int drm_mode_destroy_dumb_ioctl(struct drm_device *dev,
                                       void *data, struct drm_file *file_priv);
+extern int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data,
+                                             struct drm_file *file_priv);
+extern int drm_mode_obj_set_property_ioctl(struct drm_device *dev, void *data,
+                                           struct drm_file *file_priv);
 
 extern void drm_fb_get_bpp_depth(uint32_t format, unsigned int *depth,
                                  int *bpp);
+extern int drm_format_num_planes(uint32_t format);
+extern int drm_format_plane_cpp(uint32_t format, int plane);
+extern int drm_format_horz_chroma_subsampling(uint32_t format);
+extern int drm_format_vert_chroma_subsampling(uint32_t format);
+
 #endif /* __DRM_CRTC_H__ */
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
index 37515d1afab3..7988e55c98d0 100644
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
@@ -44,6 +44,13 @@ enum mode_set_atomic {
         ENTER_ATOMIC_MODE_SET,
 };
 
+/**
+ * drm_crtc_helper_funcs - helper operations for CRTCs
+ * @mode_fixup: try to fixup proposed mode for this connector
+ * @mode_set: set this mode
+ *
+ * The helper operations are called by the mid-layer CRTC helper.
+ */
 struct drm_crtc_helper_funcs {
         /*
          * Control power levels on the CRTC.  If the mode passed in is
@@ -76,6 +83,13 @@ struct drm_crtc_helper_funcs {
         void (*disable)(struct drm_crtc *crtc);
 };
 
+/**
+ * drm_encoder_helper_funcs - helper operations for encoders
+ * @mode_fixup: try to fixup proposed mode for this connector
+ * @mode_set: set this mode
+ *
+ * The helper operations are called by the mid-layer CRTC helper.
+ */
 struct drm_encoder_helper_funcs {
         void (*dpms)(struct drm_encoder *encoder, int mode);
         void (*save)(struct drm_encoder *encoder);
@@ -97,6 +111,13 @@ struct drm_encoder_helper_funcs {
         void (*disable)(struct drm_encoder *encoder);
 };
 
+/**
+ * drm_connector_helper_funcs - helper operations for connectors
+ * @get_modes: get mode list for this connector
+ * @mode_valid: is this mode valid on the given connector?
+ *
+ * The helper operations are called by the mid-layer CRTC helper.
+ */
 struct drm_connector_helper_funcs {
         int (*get_modes)(struct drm_connector *connector);
         int (*mode_valid)(struct drm_connector *connector,
@@ -145,6 +166,4 @@ extern void drm_helper_hpd_irq_event(struct drm_device *dev);
 extern void drm_kms_helper_poll_disable(struct drm_device *dev);
 extern void drm_kms_helper_poll_enable(struct drm_device *dev);
 
-extern int drm_format_num_planes(uint32_t format);
-
 #endif
diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h
index 93df2d72750b..1744b18c06b3 100644
--- a/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
@@ -72,6 +72,10 @@
 
 #define DP_MAIN_LINK_CHANNEL_CODING         0x006
 
+#define DP_DOWN_STREAM_PORT_COUNT           0x007
+#define  DP_PORT_COUNT_MASK                 0x0f
+#define  DP_OUI_SUPPORT                     (1 << 7)
+
 #define DP_EDP_CONFIGURATION_CAP            0x00d
 #define DP_TRAINING_AUX_RD_INTERVAL         0x00e
 
@@ -213,6 +217,10 @@
 # define DP_TEST_NAK                        (1 << 1)
 # define DP_TEST_EDID_CHECKSUM_WRITE        (1 << 2)
 
+#define DP_SOURCE_OUI                       0x300
+#define DP_SINK_OUI                         0x400
+#define DP_BRANCH_OUI                       0x500
+
 #define DP_SET_POWER                        0x600
 # define DP_SET_POWER_D0                    0x1
 # define DP_SET_POWER_D3                    0x2
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index bcb9a66baa8c..0cac551c5347 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -90,12 +90,26 @@ struct detailed_data_monitor_range {
         u8 min_hfreq_khz;
         u8 max_hfreq_khz;
         u8 pixel_clock_mhz; /* need to multiply by 10 */
-        __le16 sec_gtf_toggle; /* A000=use above, 20=use below */
-        u8 hfreq_start_khz; /* need to multiply by 2 */
-        u8 c; /* need to divide by 2 */
-        __le16 m;
-        u8 k;
-        u8 j; /* need to divide by 2 */
+        u8 flags;
+        union {
+                struct {
+                        u8 reserved;
+                        u8 hfreq_start_khz; /* need to multiply by 2 */
+                        u8 c; /* need to divide by 2 */
+                        __le16 m;
+                        u8 k;
+                        u8 j; /* need to divide by 2 */
+                } __attribute__((packed)) gtf2;
+                struct {
+                        u8 version;
+                        u8 data1; /* high 6 bits: extra clock resolution */
+                        u8 data2; /* plus low 2 of above: max hactive */
+                        u8 supported_aspects;
+                        u8 flags; /* preferred aspect and blanking support */
+                        u8 supported_scalings;
+                        u8 preferred_refresh;
+                } __attribute__((packed)) cvt;
+        } formula;
 } __attribute__((packed));
 
 struct detailed_data_wpindex {
diff --git a/include/drm/drm_fixed.h b/include/drm/drm_fixed.h
index 4a08a664ff1f..0ead502e17d2 100644
--- a/include/drm/drm_fixed.h
+++ b/include/drm/drm_fixed.h
@@ -37,6 +37,7 @@ typedef union dfixed {
 #define dfixed_init(A) { .full = dfixed_const((A)) }
 #define dfixed_init_half(A) { .full = dfixed_const_half((A)) }
 #define dfixed_trunc(A) ((A).full >> 12)
+#define dfixed_frac(A) ((A).full & ((1 << 12) - 1))
 
 static inline u32 dfixed_floor(fixed20_12 A)
 {
diff --git a/include/drm/drm_mem_util.h b/include/drm/drm_mem_util.h
index 6bd325fedc87..19a240446fca 100644
--- a/include/drm/drm_mem_util.h
+++ b/include/drm/drm_mem_util.h
@@ -31,7 +31,7 @@
 
 static __inline__ void *drm_calloc_large(size_t nmemb, size_t size)
 {
-        if (size != 0 && nmemb > ULONG_MAX / size)
+        if (size != 0 && nmemb > SIZE_MAX / size)
                 return NULL;
 
         if (size * nmemb <= PAGE_SIZE)
@@ -44,7 +44,7 @@ static __inline__ void *drm_calloc_large(size_t nmemb, size_t size)
 /* Modeled after cairo's malloc_ab, it's like calloc but without the zeroing. */
 static __inline__ void *drm_malloc_ab(size_t nmemb, size_t size)
 {
-        if (size != 0 && nmemb > ULONG_MAX / size)
+        if (size != 0 && nmemb > SIZE_MAX / size)
                 return NULL;
 
         if (size * nmemb <= PAGE_SIZE)
diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
index 4a0aae38e160..5581980b14f6 100644
--- a/include/drm/drm_mode.h
+++ b/include/drm/drm_mode.h
@@ -230,6 +230,7 @@ struct drm_mode_get_connector {
 #define DRM_MODE_PROP_IMMUTABLE (1<<2)
 #define DRM_MODE_PROP_ENUM      (1<<3) /* enumerated type with text strings */
 #define DRM_MODE_PROP_BLOB      (1<<4)
+#define DRM_MODE_PROP_BITMASK   (1<<5) /* bitmask of enumerated types */
 
 struct drm_mode_property_enum {
         __u64 value;
@@ -254,6 +255,21 @@ struct drm_mode_connector_set_property {
         __u32 connector_id;
 };
 
+struct drm_mode_obj_get_properties {
+        __u64 props_ptr;
+        __u64 prop_values_ptr;
+        __u32 count_props;
+        __u32 obj_id;
+        __u32 obj_type;
+};
+
+struct drm_mode_obj_set_property {
+        __u64 value;
+        __u32 prop_id;
+        __u32 obj_id;
+        __u32 obj_type;
+};
+
 struct drm_mode_get_blob {
         __u32 blob_id;
         __u32 length;
diff --git a/include/drm/exynos_drm.h b/include/drm/exynos_drm.h
index e478de4e5d56..b6d7ce92eadd 100644
--- a/include/drm/exynos_drm.h
+++ b/include/drm/exynos_drm.h
@@ -29,6 +29,8 @@
 #ifndef _EXYNOS_DRM_H_
 #define _EXYNOS_DRM_H_
 
+#include "drm.h"
+
 /**
  * User-desired buffer creation information structure.
  *
@@ -75,6 +77,21 @@ struct drm_exynos_gem_mmap {
 };
 
 /**
+ * A structure to gem information.
+ *
+ * @handle: a handle to gem object created.
+ * @flags: flag value including memory type and cache attribute and
+ *      this value would be set by driver.
+ * @size: size to memory region allocated by gem and this size would
+ *      be set by driver.
+ */
+struct drm_exynos_gem_info {
+        unsigned int handle;
+        unsigned int flags;
+        uint64_t size;
+};
+
+/**
  * A structure for user connection request of virtual display.
  *
  * @connection: indicate whether doing connetion or not by user.
@@ -95,18 +112,64 @@ struct drm_exynos_plane_set_zpos {
 
 /* memory type definitions. */
 enum e_drm_exynos_gem_mem_type {
+        /* Physically Continuous memory and used as default. */
+        EXYNOS_BO_CONTIG        = 0 << 0,
         /* Physically Non-Continuous memory. */
         EXYNOS_BO_NONCONTIG     = 1 << 0,
-        EXYNOS_BO_MASK          = EXYNOS_BO_NONCONTIG
+        /* non-cachable mapping and used as default. */
+        EXYNOS_BO_NONCACHABLE   = 0 << 1,
+        /* cachable mapping. */
+        EXYNOS_BO_CACHABLE      = 1 << 1,
+        /* write-combine mapping. */
+        EXYNOS_BO_WC            = 1 << 2,
+        EXYNOS_BO_MASK          = EXYNOS_BO_NONCONTIG | EXYNOS_BO_CACHABLE |
+                                        EXYNOS_BO_WC
+};
+
+struct drm_exynos_g2d_get_ver {
+        __u32   major;
+        __u32   minor;
+};
+
+struct drm_exynos_g2d_cmd {
+        __u32   offset;
+        __u32   data;
+};
+
+enum drm_exynos_g2d_event_type {
+        G2D_EVENT_NOT,
+        G2D_EVENT_NONSTOP,
+        G2D_EVENT_STOP,         /* not yet */
+};
+
+struct drm_exynos_g2d_set_cmdlist {
+        __u64                                   cmd;
+        __u64                                   cmd_gem;
+        __u32                                   cmd_nr;
+        __u32                                   cmd_gem_nr;
+
+        /* for g2d event */
+        __u64                                   event_type;
+        __u64                                   user_data;
+};
+
+struct drm_exynos_g2d_exec {
+        __u64                                   async;
 };
 
 #define DRM_EXYNOS_GEM_CREATE           0x00
 #define DRM_EXYNOS_GEM_MAP_OFFSET       0x01
 #define DRM_EXYNOS_GEM_MMAP             0x02
 /* Reserved 0x03 ~ 0x05 for exynos specific gem ioctl */
+#define DRM_EXYNOS_GEM_GET              0x04
 #define DRM_EXYNOS_PLANE_SET_ZPOS       0x06
 #define DRM_EXYNOS_VIDI_CONNECTION      0x07
 
+/* G2D */
+#define DRM_EXYNOS_G2D_GET_VER          0x20
+#define DRM_EXYNOS_G2D_SET_CMDLIST      0x21
+#define DRM_EXYNOS_G2D_EXEC             0x22
+
 #define DRM_IOCTL_EXYNOS_GEM_CREATE             DRM_IOWR(DRM_COMMAND_BASE + \
                 DRM_EXYNOS_GEM_CREATE, struct drm_exynos_gem_create)
 
@@ -116,12 +179,34 @@ enum e_drm_exynos_gem_mem_type {
 #define DRM_IOCTL_EXYNOS_GEM_MMAP       DRM_IOWR(DRM_COMMAND_BASE + \
                 DRM_EXYNOS_GEM_MMAP, struct drm_exynos_gem_mmap)
 
+#define DRM_IOCTL_EXYNOS_GEM_GET        DRM_IOWR(DRM_COMMAND_BASE + \
+                DRM_EXYNOS_GEM_GET,     struct drm_exynos_gem_info)
+
 #define DRM_IOCTL_EXYNOS_PLANE_SET_ZPOS DRM_IOWR(DRM_COMMAND_BASE + \
                 DRM_EXYNOS_PLANE_SET_ZPOS, struct drm_exynos_plane_set_zpos)
 
 #define DRM_IOCTL_EXYNOS_VIDI_CONNECTION        DRM_IOWR(DRM_COMMAND_BASE + \
                 DRM_EXYNOS_VIDI_CONNECTION, struct drm_exynos_vidi_connection)
 
+#define DRM_IOCTL_EXYNOS_G2D_GET_VER            DRM_IOWR(DRM_COMMAND_BASE + \
+                DRM_EXYNOS_G2D_GET_VER, struct drm_exynos_g2d_get_ver)
+#define DRM_IOCTL_EXYNOS_G2D_SET_CMDLIST        DRM_IOWR(DRM_COMMAND_BASE + \
+                DRM_EXYNOS_G2D_SET_CMDLIST, struct drm_exynos_g2d_set_cmdlist)
+#define DRM_IOCTL_EXYNOS_G2D_EXEC               DRM_IOWR(DRM_COMMAND_BASE + \
+                DRM_EXYNOS_G2D_EXEC, struct drm_exynos_g2d_exec)
+
+/* EXYNOS specific events */
+#define DRM_EXYNOS_G2D_EVENT            0x80000000
+
+struct drm_exynos_g2d_event {
+        struct drm_event        base;
+        __u64                   user_data;
+        __u32                   tv_sec;
+        __u32                   tv_usec;
+        __u32                   cmdlist_no;
+        __u32                   reserved;
+};
+
 #ifdef __KERNEL__
 
 /**
@@ -169,16 +254,14 @@ struct exynos_drm_common_hdmi_pd {
 /**
  * Platform Specific Structure for DRM based HDMI core.
  *
- * @timing: default video mode for initializing
- * @default_win: default window layer number to be used for UI.
- * @bpp: default bit per pixel.
  * @is_v13: set if hdmi version 13 is.
+ * @cfg_hpd: function pointer to configure hdmi hotplug detection pin
+ * @get_hpd: function pointer to get value of hdmi hotplug detection pin
  */
 struct exynos_drm_hdmi_pdata {
-        struct fb_videomode             timing;
-        unsigned int                    default_win;
-        unsigned int                    bpp;
-        unsigned int                    is_v13:1;
+        bool is_v13;
+        void (*cfg_hpd)(bool external);
+        int (*get_hpd)(void);
 };
 
 #endif  /* __KERNEL__ */
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index da929bb5b788..f3f82242bf1d 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -296,7 +296,8 @@ typedef struct drm_i915_irq_wait {
 #define I915_PARAM_HAS_EXEC_CONSTANTS    14
 #define I915_PARAM_HAS_RELAXED_DELTA     15
 #define I915_PARAM_HAS_GEN7_SOL_RESET    16
-#define I915_PARAM_HAS_LLC       17
+#define I915_PARAM_HAS_LLC               17
+#define I915_PARAM_HAS_ALIASING_PPGTT    18
 
 typedef struct drm_i915_getparam {
         int param;
diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
index 7c491b4bcf65..58056865b8e9 100644
--- a/include/drm/radeon_drm.h
+++ b/include/drm/radeon_drm.h
@@ -926,7 +926,6 @@ struct drm_radeon_cs_chunk {
 };
 
 /* drm_radeon_cs_reloc.flags */
-#define RADEON_RELOC_DONT_SYNC          0x01
 
 struct drm_radeon_cs_reloc {
         uint32_t                handle;
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
index 974c8f801c39..e15f2a89a270 100644
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -124,11 +124,15 @@ struct ttm_mem_reg {
  *
  * @ttm_bo_type_kernel: These buffers are like ttm_bo_type_device buffers,
  * but they cannot be accessed from user-space. For kernel-only use.
+ *
+ * @ttm_bo_type_sg: Buffer made from dmabuf sg table shared with another
+ * driver.
  */
 
 enum ttm_bo_type {
         ttm_bo_type_device,
-        ttm_bo_type_kernel
+        ttm_bo_type_kernel,
+        ttm_bo_type_sg
 };
 
 struct ttm_tt;
@@ -271,6 +275,8 @@ struct ttm_buffer_object {
 
         unsigned long offset;
         uint32_t cur_placement;
+
+        struct sg_table *sg;
 };
 
 /**
@@ -503,6 +509,7 @@ extern int ttm_bo_init(struct ttm_bo_device *bdev,
                         bool interrubtible,
                         struct file *persistent_swap_storage,
                         size_t acc_size,
+                        struct sg_table *sg,
                         void (*destroy) (struct ttm_buffer_object *));
 
 /**
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index d43e892307ff..a05f1b55714d 100644
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -81,6 +81,7 @@ struct ttm_backend_func {
 #define TTM_PAGE_FLAG_PERSISTENT_SWAP (1 << 5)
 #define TTM_PAGE_FLAG_ZERO_ALLOC      (1 << 6)
 #define TTM_PAGE_FLAG_DMA32           (1 << 7)
+#define TTM_PAGE_FLAG_SG              (1 << 8)
 
 enum ttm_caching_state {
         tt_uncached,
@@ -116,6 +117,7 @@ struct ttm_tt {
         struct page **pages;
         uint32_t page_flags;
         unsigned long num_pages;
+        struct sg_table *sg; /* for SG objects via dma-buf */
         struct ttm_bo_global *glob;
         struct ttm_backend *be;
         struct file *swap_storage;
diff --git a/include/keys/keyring-type.h b/include/keys/keyring-type.h
index 843f872a4b63..cf49159b0e3a 100644
--- a/include/keys/keyring-type.h
+++ b/include/keys/keyring-type.h
@@ -24,7 +24,7 @@ struct keyring_list {
         unsigned short  maxkeys;        /* max keys this list can hold */
         unsigned short  nkeys;          /* number of keys currently held */
         unsigned short  delkey;         /* key to be unlinked by RCU */
-        struct key      *keys[0];
+        struct key __rcu *keys[0];
 };
 
 
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 3c9b616c834a..8760be30b375 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -167,7 +167,6 @@ header-y += if_arp.h
 header-y += if_bonding.h
 header-y += if_bridge.h
 header-y += if_cablemodem.h
-header-y += if_ec.h
 header-y += if_eql.h
 header-y += if_ether.h
 header-y += if_fc.h
@@ -186,7 +185,6 @@ header-y += if_pppox.h
 header-y += if_slip.h
 header-y += if_strip.h
 header-y += if_team.h
-header-y += if_tr.h
 header-y += if_tun.h
 header-y += if_tunnel.h
 header-y += if_vlan.h
@@ -227,6 +225,8 @@ header-y += kd.h
 header-y += kdev_t.h
 header-y += kernel.h
 header-y += kernelcapi.h
+header-y += kernel-page-flags.h
+header-y += kexec.h
 header-y += keyboard.h
 header-y += keyctl.h
 header-y += l2tp.h
@@ -240,6 +240,7 @@ header-y += map_to_7segment.h
 header-y += matroxfb.h
 header-y += mdio.h
 header-y += media.h
+header-y += mei.h
 header-y += mempolicy.h
 header-y += meye.h
 header-y += mii.h
@@ -271,6 +272,7 @@ header-y += netfilter_ipv4.h
 header-y += netfilter_ipv6.h
 header-y += netlink.h
 header-y += netrom.h
+header-y += nfc.h
 header-y += nfs.h
 header-y += nfs2.h
 header-y += nfs3.h
@@ -332,6 +334,7 @@ header-y += scc.h
 header-y += sched.h
 header-y += screen_info.h
 header-y += sdla.h
+header-y += seccomp.h
 header-y += securebits.h
 header-y += selinux_netlink.h
 header-y += sem.h
@@ -381,7 +384,9 @@ header-y += unistd.h
 header-y += usbdevice_fs.h
 header-y += utime.h
 header-y += utsname.h
+header-y += uuid.h
 header-y += uvcvideo.h
+header-y += v4l2-dv-timings.h
 header-y += v4l2-mediabus.h
 header-y += v4l2-subdev.h
 header-y += veth.h
diff --git a/include/linux/alarmtimer.h b/include/linux/alarmtimer.h
index 975009e1cbe6..96c5c249b086 100644
--- a/include/linux/alarmtimer.h
+++ b/include/linux/alarmtimer.h
@@ -76,4 +76,7 @@ static inline int alarmtimer_callback_running(struct alarm *timer)
 }
 
 
+/* Provide way to access the rtc device being used by alarmtimers */
+struct rtc_device *alarmtimer_get_rtcdev(void);
+
 #endif
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index 8d54f79457ba..d36417158d8f 100644
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -63,6 +63,14 @@ struct amba_device *amba_device_alloc(const char *, resource_size_t, size_t);
 void amba_device_put(struct amba_device *);
 int amba_device_add(struct amba_device *, struct resource *);
 int amba_device_register(struct amba_device *, struct resource *);
+struct amba_device *amba_apb_device_add(struct device *parent, const char *name,
+                                        resource_size_t base, size_t size,
+                                        int irq1, int irq2, void *pdata,
+                                        unsigned int periphid);
+struct amba_device *amba_ahb_device_add(struct device *parent, const char *name,
+                                        resource_size_t base, size_t size,
+                                        int irq1, int irq2, void *pdata,
+                                        unsigned int periphid);
 void amba_device_unregister(struct amba_device *);
 struct amba_device *amba_find_device(const char *, struct device *, unsigned int, unsigned int);
 int amba_request_regions(struct amba_device *, const char *);
diff --git a/include/linux/amba/pl08x.h b/include/linux/amba/pl08x.h
index e64ce2cfee99..02549017212a 100644
--- a/include/linux/amba/pl08x.h
+++ b/include/linux/amba/pl08x.h
@@ -92,6 +92,8 @@ struct pl08x_bus_data {
  * right now
  * @serving: the virtual channel currently being served by this physical
  * channel
+ * @locked: channel unavailable for the system, e.g. dedicated to secure
+ * world
  */
 struct pl08x_phy_chan {
         unsigned int id;
@@ -99,6 +101,7 @@ struct pl08x_phy_chan {
         spinlock_t lock;
         int signal;
         struct pl08x_dma_chan *serving;
+        bool locked;
 };
 
 /**
diff --git a/include/linux/apple_bl.h b/include/linux/apple_bl.h
index 47bedc0eee69..0a95e730fcea 100644
--- a/include/linux/apple_bl.h
+++ b/include/linux/apple_bl.h
@@ -5,7 +5,7 @@
 #ifndef _LINUX_APPLE_BL_H
 #define _LINUX_APPLE_BL_H
 
-#ifdef CONFIG_BACKLIGHT_APPLE
+#if defined(CONFIG_BACKLIGHT_APPLE) || defined(CONFIG_BACKLIGHT_APPLE_MODULE)
 
 extern int apple_bl_register(void);
 extern void apple_bl_unregister(void);
diff --git a/include/linux/atmlec.h b/include/linux/atmlec.h
index 39c917fd1b96..302791e3ab2b 100644
--- a/include/linux/atmlec.h
+++ b/include/linux/atmlec.h
@@ -21,13 +21,6 @@
 /* Maximum number of LEC interfaces (tweakable) */
 #define MAX_LEC_ITF 48
 
-/*
- * From the total of MAX_LEC_ITF, last NUM_TR_DEVS are reserved for Token Ring.
- * E.g. if MAX_LEC_ITF = 48 and NUM_TR_DEVS = 8, then lec0-lec39 are for
- * Ethernet ELANs and lec40-lec47 are for Token Ring ELANS.
- */
-#define NUM_TR_DEVS 8
-
 typedef enum {
         l_set_mac_addr,
         l_del_mac_addr,
diff --git a/include/linux/audit.h b/include/linux/audit.h
index ed3ef1972496..22f292a917a3 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -463,7 +463,7 @@ extern void audit_putname(const char *name);
 extern void __audit_inode(const char *name, const struct dentry *dentry);
 extern void __audit_inode_child(const struct dentry *dentry,
                                 const struct inode *parent);
-extern void __audit_seccomp(unsigned long syscall);
+extern void __audit_seccomp(unsigned long syscall, long signr, int code);
 extern void __audit_ptrace(struct task_struct *t);
 
 static inline int audit_dummy_context(void)
@@ -508,10 +508,10 @@ static inline void audit_inode_child(const struct dentry *dentry,
 }
 void audit_core_dumps(long signr);
 
-static inline void audit_seccomp(unsigned long syscall)
+static inline void audit_seccomp(unsigned long syscall, long signr, int code)
 {
         if (unlikely(!audit_dummy_context()))
-                __audit_seccomp(syscall);
+                __audit_seccomp(syscall, signr, code);
 }
 
 static inline void audit_ptrace(struct task_struct *t)
@@ -634,7 +634,7 @@ extern int audit_signals;
 #define audit_inode(n,d) do { (void)(d); } while (0)
 #define audit_inode_child(i,p) do { ; } while (0)
 #define audit_core_dumps(i) do { ; } while (0)
-#define audit_seccomp(i) do { ; } while (0)
+#define audit_seccomp(i,s,c) do { ; } while (0)
 #define auditsc_get_stamp(c,t,s) (0)
 #define audit_get_loginuid(t) (-1)
 #define audit_get_sessionid(t) (-1)
diff --git a/include/linux/basic_mmio_gpio.h b/include/linux/basic_mmio_gpio.h
index feb912196745..1c504ca5bdb3 100644
--- a/include/linux/basic_mmio_gpio.h
+++ b/include/linux/basic_mmio_gpio.h
@@ -67,6 +67,10 @@ int bgpio_remove(struct bgpio_chip *bgc);
 int bgpio_init(struct bgpio_chip *bgc, struct device *dev,
                unsigned long sz, void __iomem *dat, void __iomem *set,
                void __iomem *clr, void __iomem *dirout, void __iomem *dirin,
-               bool big_endian);
+               unsigned long flags);
+
+#define BGPIOF_BIG_ENDIAN               BIT(0)
+#define BGPIOF_UNREADABLE_REG_SET       BIT(1) /* reg_set is unreadable */
+#define BGPIOF_UNREADABLE_REG_DIR       BIT(2) /* reg_dir is unreadable */
 
 #endif /* __BASIC_MMIO_GPIO_H */
diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index 5af9a075498f..8deaf6d050c3 100644
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
@@ -26,6 +26,11 @@ struct bcma_chipinfo {
         u8 pkg;
 };
 
+struct bcma_boardinfo {
+        u16 vendor;
+        u16 type;
+};
+
 enum bcma_clkmode {
         BCMA_CLKMODE_FAST,
         BCMA_CLKMODE_DYNAMIC,
@@ -139,6 +144,7 @@ struct bcma_device {
         u8 core_unit;
 
         u32 addr;
+        u32 addr1;
         u32 wrap;
 
         void __iomem *io_addr;
@@ -198,6 +204,8 @@ struct bcma_bus {
 
         struct bcma_chipinfo chipinfo;
 
+        struct bcma_boardinfo boardinfo;
+
         struct bcma_device *mapped_core;
         struct list_head cores;
         u8 nr_cores;
diff --git a/include/linux/bcma/bcma_driver_pci.h b/include/linux/bcma/bcma_driver_pci.h
index 46c71e27d31f..41da581e1612 100644
--- a/include/linux/bcma/bcma_driver_pci.h
+++ b/include/linux/bcma/bcma_driver_pci.h
@@ -87,6 +87,13 @@ struct pci_dev;
 #define BCMA_CORE_PCI_PCICFG2                   0x0600  /* PCI config space 2 (rev >= 8) */
 #define BCMA_CORE_PCI_PCICFG3                   0x0700  /* PCI config space 3 (rev >= 8) */
 #define BCMA_CORE_PCI_SPROM(wordoffset)         (0x0800 + ((wordoffset) * 2)) /* SPROM shadow area (72 bytes) */
+#define  BCMA_CORE_PCI_SPROM_PI_OFFSET          0       /* first word */
+#define   BCMA_CORE_PCI_SPROM_PI_MASK           0xf000  /* bit 15:12 */
+#define   BCMA_CORE_PCI_SPROM_PI_SHIFT          12      /* bit 15:12 */
+#define  BCMA_CORE_PCI_SPROM_MISC_CONFIG        5       /* word 5 */
+#define   BCMA_CORE_PCI_SPROM_L23READY_EXIT_NOPERST     0x8000  /* bit 15 */
+#define   BCMA_CORE_PCI_SPROM_CLKREQ_OFFSET_REV5        20      /* word 20 for srom rev <= 5 */
+#define   BCMA_CORE_PCI_SPROM_CLKREQ_ENB        0x0800  /* bit 11 */
 
 /* SBtoPCIx */
 #define BCMA_CORE_PCI_SBTOPCI_MEM               0x00000000
@@ -133,6 +140,7 @@ struct pci_dev;
 #define BCMA_CORE_PCI_DLLP_LRREG                0x120   /* Link Replay */
 #define BCMA_CORE_PCI_DLLP_LACKTOREG            0x124   /* Link Ack Timeout */
 #define BCMA_CORE_PCI_DLLP_PMTHRESHREG          0x128   /* Power Management Threshold */
+#define  BCMA_CORE_PCI_ASPMTIMER_EXTEND         0x01000000 /* > rev7: enable extend ASPM timer */
 #define BCMA_CORE_PCI_DLLP_RTRYWPREG            0x12C   /* Retry buffer write ptr */
 #define BCMA_CORE_PCI_DLLP_RTRYRPREG            0x130   /* Retry buffer Read ptr */
 #define BCMA_CORE_PCI_DLLP_RTRYPPREG            0x134   /* Retry buffer Purged ptr */
@@ -201,12 +209,15 @@ struct bcma_drv_pci {
 };
 
 /* Register access */
+#define pcicore_read16(pc, offset)              bcma_read16((pc)->core, offset)
 #define pcicore_read32(pc, offset)              bcma_read32((pc)->core, offset)
+#define pcicore_write16(pc, offset, val)        bcma_write16((pc)->core, offset, val)
 #define pcicore_write32(pc, offset, val)        bcma_write32((pc)->core, offset, val)
 
 extern void __devinit bcma_core_pci_init(struct bcma_drv_pci *pc);
 extern int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc,
                                  struct bcma_device *core, bool enable);
+extern void bcma_core_pci_extend_L1timer(struct bcma_drv_pci *pc, bool extend);
 
 extern int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev);
 extern int bcma_core_pci_plat_dev_init(struct pci_dev *dev);
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 4d94eb8bcbcc..26435890dc87 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -269,6 +269,14 @@ extern struct bio_vec *bvec_alloc_bs(gfp_t, int, unsigned long *, struct bio_set
 extern void bvec_free_bs(struct bio_set *, struct bio_vec *, unsigned int);
 extern unsigned int bvec_nr_vecs(unsigned short idx);
 
+#ifdef CONFIG_BLK_CGROUP
+int bio_associate_current(struct bio *bio);
+void bio_disassociate_task(struct bio *bio);
+#else   /* CONFIG_BLK_CGROUP */
+static inline int bio_associate_current(struct bio *bio) { return -ENOENT; }
+static inline void bio_disassociate_task(struct bio *bio) { }
+#endif  /* CONFIG_BLK_CGROUP */
+
 /*
  * bio_set is used to allow other portions of the IO system to
  * allocate their own private memory pools for bio and iovec structures.
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index 4053cbd4490e..0edb65dd8edd 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -14,6 +14,8 @@ struct bio;
 struct bio_integrity_payload;
 struct page;
 struct block_device;
+struct io_context;
+struct cgroup_subsys_state;
 typedef void (bio_end_io_t) (struct bio *, int);
 typedef void (bio_destructor_t) (struct bio *);
 
@@ -66,6 +68,14 @@ struct bio {
         bio_end_io_t            *bi_end_io;
 
         void                    *bi_private;
+#ifdef CONFIG_BLK_CGROUP
+        /*
+         * Optional ioc and css associated with this bio.  Put on bio
+         * release.  Read comment on top of bio_associate_current().
+         */
+        struct io_context       *bi_ioc;
+        struct cgroup_subsys_state *bi_css;
+#endif
 #if defined(CONFIG_BLK_DEV_INTEGRITY)
         struct bio_integrity_payload *bi_integrity;  /* data integrity */
 #endif
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 4d4ac24a263e..ba43f408baa3 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -32,10 +32,17 @@ struct blk_trace;
 struct request;
 struct sg_io_hdr;
 struct bsg_job;
+struct blkcg_gq;
 
 #define BLKDEV_MIN_RQ   4
 #define BLKDEV_MAX_RQ   128     /* Default maximum */
 
+/*
+ * Maximum number of blkcg policies allowed to be registered concurrently.
+ * Defined here to simplify include dependency.
+ */
+#define BLKCG_MAX_POLS          2
+
 struct request;
 typedef void (rq_end_io_fn)(struct request *, int);
 
@@ -363,6 +370,11 @@ struct request_queue {
         struct list_head        timeout_list;
 
         struct list_head        icq_list;
+#ifdef CONFIG_BLK_CGROUP
+        DECLARE_BITMAP          (blkcg_pols, BLKCG_MAX_POLS);
+        struct blkcg_gq         *root_blkg;
+        struct list_head        blkg_list;
+#endif
 
         struct queue_limits     limits;
 
@@ -390,12 +402,17 @@ struct request_queue {
 
         struct mutex            sysfs_lock;
 
+        int                     bypass_depth;
+
 #if defined(CONFIG_BLK_DEV_BSG)
         bsg_job_fn              *bsg_job_fn;
         int                     bsg_job_size;
         struct bsg_class_device bsg_dev;
 #endif
 
+#ifdef CONFIG_BLK_CGROUP
+        struct list_head        all_q_node;
+#endif
 #ifdef CONFIG_BLK_DEV_THROTTLING
         /* Throttle data */
         struct throtl_data *td;
@@ -407,7 +424,7 @@ struct request_queue {
 #define QUEUE_FLAG_SYNCFULL     3       /* read queue has been filled */
 #define QUEUE_FLAG_ASYNCFULL    4       /* write queue has been filled */
 #define QUEUE_FLAG_DEAD         5       /* queue being torn down */
-#define QUEUE_FLAG_ELVSWITCH    6       /* don't use elevator, just do FIFO */
+#define QUEUE_FLAG_BYPASS       6       /* act as dumb FIFO queue */
 #define QUEUE_FLAG_BIDI         7       /* queue supports bidi requests */
 #define QUEUE_FLAG_NOMERGES     8       /* disable merge attempts */
 #define QUEUE_FLAG_SAME_COMP    9       /* complete on same CPU-group */
@@ -491,6 +508,7 @@ static inline void queue_flag_clear(unsigned int flag, struct request_queue *q)
 #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_dead(q)       test_bit(QUEUE_FLAG_DEAD, &(q)->queue_flags)
+#define blk_queue_bypass(q)     test_bit(QUEUE_FLAG_BYPASS, &(q)->queue_flags)
 #define blk_queue_nomerges(q)   test_bit(QUEUE_FLAG_NOMERGES, &(q)->queue_flags)
 #define blk_queue_noxmerges(q)  \
         test_bit(QUEUE_FLAG_NOXMERGES, &(q)->queue_flags)
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
index 66d3e954eb6c..324fe08ea3b1 100644
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
@@ -135,9 +135,6 @@ extern void *__alloc_bootmem_low_node(pg_data_t *pgdat,
 extern int reserve_bootmem_generic(unsigned long addr, unsigned long size,
                                    int flags);
 
-extern void *alloc_bootmem_section(unsigned long size,
-                                   unsigned long section_nr);
-
 #ifdef CONFIG_HAVE_ARCH_ALLOC_REMAP
 extern void *alloc_remap(int nid, unsigned long size);
 #else
@@ -154,7 +151,8 @@ extern void *alloc_large_system_hash(const char *tablename,
                                      int flags,
                                      unsigned int *_hash_shift,
                                      unsigned int *_hash_mask,
-                                     unsigned long limit);
+                                     unsigned long low_limit,
+                                     unsigned long high_limit);
 
 #define HASH_EARLY      0x00000001      /* Allocating during early boot? */
 #define HASH_SMALL      0x00000002      /* sub-page allocation allowed, min
diff --git a/include/linux/bug.h b/include/linux/bug.h
index 72961c39576a..aaac4bba6f5c 100644
--- a/include/linux/bug.h
+++ b/include/linux/bug.h
@@ -30,6 +30,13 @@ struct pt_regs;
 #define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
 #define BUILD_BUG_ON_NULL(e) ((void *)sizeof(struct { int:-!!(e); }))
 
+/*
+ * BUILD_BUG_ON_INVALID() permits the compiler to check the validity of the
+ * expression but avoids the generation of any code, even if that expression
+ * has side-effects.
+ */
+#define BUILD_BUG_ON_INVALID(e) ((void)(sizeof((__force long)(e))))
+
 /**
  * BUILD_BUG_ON - break compile if a condition is true.
  * @condition: the condition which the compiler should know is false.
diff --git a/include/linux/capability.h b/include/linux/capability.h
index 12d52dedb229..68d56effc328 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -360,8 +360,11 @@ struct cpu_vfs_cap_data {
 
 #define CAP_WAKE_ALARM            35
 
+/* Allow preventing system suspends while epoll events are pending */
 
-#define CAP_LAST_CAP         CAP_WAKE_ALARM
+#define CAP_EPOLLWAKEUP      36
+
+#define CAP_LAST_CAP         CAP_EPOLLWAKEUP
 
 #define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
 
@@ -374,6 +377,7 @@ struct cpu_vfs_cap_data {
 
 #ifdef __KERNEL__
 
+struct inode;
 struct dentry;
 struct user_namespace;
 
@@ -548,6 +552,7 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
 extern bool capable(int cap);
 extern bool ns_capable(struct user_namespace *ns, int cap);
 extern bool nsown_capable(int cap);
+extern bool inode_capable(const struct inode *inode, int cap);
 
 /* audit system wants to get cap info from files as well */
 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
diff --git a/include/linux/ceph/auth.h b/include/linux/ceph/auth.h
index aa13392a7efb..d4080f309b56 100644
--- a/include/linux/ceph/auth.h
+++ b/include/linux/ceph/auth.h
@@ -14,6 +14,14 @@
 struct ceph_auth_client;
 struct ceph_authorizer;
 
+struct ceph_auth_handshake {
+        struct ceph_authorizer *authorizer;
+        void *authorizer_buf;
+        size_t authorizer_buf_len;
+        void *authorizer_reply_buf;
+        size_t authorizer_reply_buf_len;
+};
+
 struct ceph_auth_client_ops {
         const char *name;
 
@@ -43,9 +51,7 @@ struct ceph_auth_client_ops {
          * the response to authenticate the service.
          */
         int (*create_authorizer)(struct ceph_auth_client *ac, int peer_type,
-                                 struct ceph_authorizer **a,
-                                 void **buf, size_t *len,
-                                 void **reply_buf, size_t *reply_len);
+                                 struct ceph_auth_handshake *auth);
         int (*verify_authorizer_reply)(struct ceph_auth_client *ac,
                                        struct ceph_authorizer *a, size_t len);
         void (*destroy_authorizer)(struct ceph_auth_client *ac,
diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h
index b8c60694b2b0..e81ab30d4896 100644
--- a/include/linux/ceph/ceph_fs.h
+++ b/include/linux/ceph/ceph_fs.h
@@ -65,7 +65,7 @@ struct ceph_file_layout {
         __le32 fl_object_stripe_unit;  /* UNUSED.  for per-object parity, if any */
 
         /* object -> pg layout */
-        __le32 fl_pg_preferred; /* preferred primary for pg (-1 for none) */
+        __le32 fl_unused;       /* unused; used to be preferred primary (-1) */
         __le32 fl_pg_pool;      /* namespace, crush ruleset, rep level */
 } __attribute__ ((packed));
 
@@ -384,7 +384,7 @@ union ceph_mds_request_args {
                 __le32 stripe_count;         /* ... */
                 __le32 object_size;
                 __le32 file_replication;
-                __le32 preferred;
+                __le32 unused;               /* used to be preferred osd */
         } __attribute__ ((packed)) open;
         struct {
                 __le32 flags;
diff --git a/include/linux/ceph/decode.h b/include/linux/ceph/decode.h
index 220ae21e819b..d8615dee5808 100644
--- a/include/linux/ceph/decode.h
+++ b/include/linux/ceph/decode.h
@@ -46,9 +46,14 @@ static inline void ceph_decode_copy(void **p, void *pv, size_t n)
 /*
  * bounds check input.
  */
+static inline int ceph_has_room(void **p, void *end, size_t n)
+{
+        return end >= *p && n <= end - *p;
+}
+
 #define ceph_decode_need(p, end, n, bad)                \
         do {                                            \
-                if (unlikely(*(p) + (n) > (end)))       \
+                if (!likely(ceph_has_room(p, end, n)))  \
                         goto bad;                       \
         } while (0)
 
@@ -167,7 +172,7 @@ static inline void ceph_encode_string(void **p, void *end,
 
 #define ceph_encode_need(p, end, n, bad)                \
         do {                                            \
-                if (unlikely(*(p) + (n) > (end)))       \
+                if (!likely(ceph_has_room(p, end, n)))  \
                         goto bad;                       \
         } while (0)
 
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h
index 3bff047f6b0f..2521a95fa6d9 100644
--- a/include/linux/ceph/messenger.h
+++ b/include/linux/ceph/messenger.h
@@ -25,9 +25,9 @@ struct ceph_connection_operations {
         void (*dispatch) (struct ceph_connection *con, struct ceph_msg *m);
 
         /* authorize an outgoing connection */
-        int (*get_authorizer) (struct ceph_connection *con,
-                               void **buf, int *len, int *proto,
-                               void **reply_buf, int *reply_len, int force_new);
+        struct ceph_auth_handshake *(*get_authorizer) (
+                                struct ceph_connection *con,
+                               int *proto, int force_new);
         int (*verify_authorizer_reply) (struct ceph_connection *con, int len);
         int (*invalidate_authorizer)(struct ceph_connection *con);
 
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index 7c05ac202d90..cedfb1a8434a 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -6,9 +6,10 @@
 #include <linux/mempool.h>
 #include <linux/rbtree.h>
 
-#include "types.h"
-#include "osdmap.h"
-#include "messenger.h"
+#include <linux/ceph/types.h>
+#include <linux/ceph/osdmap.h>
+#include <linux/ceph/messenger.h>
+#include <linux/ceph/auth.h>
 
 /* 
  * Maximum object name size 
@@ -40,9 +41,7 @@ struct ceph_osd {
         struct list_head o_requests;
         struct list_head o_linger_requests;
         struct list_head o_osd_lru;
-        struct ceph_authorizer *o_authorizer;
-        void *o_authorizer_buf, *o_authorizer_reply_buf;
-        size_t o_authorizer_buf_len, o_authorizer_reply_buf_len;
+        struct ceph_auth_handshake o_auth;
         unsigned long lru_ttl;
         int o_marked_for_keepalive;
         struct list_head o_keepalive_item;
diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h
index ba4c205cbb01..311ef8d6aa9e 100644
--- a/include/linux/ceph/osdmap.h
+++ b/include/linux/ceph/osdmap.h
@@ -65,8 +65,6 @@ struct ceph_osdmap {
 #define ceph_file_layout_cas_hash(l) ((__s32)le32_to_cpu((l).fl_cas_hash))
 #define ceph_file_layout_object_su(l) \
         ((__s32)le32_to_cpu((l).fl_object_stripe_unit))
-#define ceph_file_layout_pg_preferred(l) \
-        ((__s32)le32_to_cpu((l).fl_pg_preferred))
 #define ceph_file_layout_pg_pool(l) \
         ((__s32)le32_to_cpu((l).fl_pg_pool))
 
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 5a85b3415c1b..d3f5fba2c159 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -16,6 +16,7 @@
 #include <linux/prio_heap.h>
 #include <linux/rwsem.h>
 #include <linux/idr.h>
+#include <linux/workqueue.h>
 
 #ifdef CONFIG_CGROUPS
 
@@ -76,12 +77,16 @@ struct cgroup_subsys_state {
         unsigned long flags;
         /* ID for this css, if possible */
         struct css_id __rcu *id;
+
+        /* Used to put @cgroup->dentry on the last css_put() */
+        struct work_struct dput_work;
 };
 
 /* bits in struct cgroup_subsys_state flags field */
 enum {
         CSS_ROOT, /* This CSS is the root of the subsystem */
         CSS_REMOVED, /* This CSS is dead */
+        CSS_CLEAR_CSS_REFS,             /* @ss->__DEPRECATED_clear_css_refs */
 };
 
 /* Caller must verify that the css is not for root cgroup */
@@ -115,16 +120,12 @@ static inline bool css_is_removed(struct cgroup_subsys_state *css)
  * the css has been destroyed.
  */
 
+extern bool __css_tryget(struct cgroup_subsys_state *css);
 static inline bool css_tryget(struct cgroup_subsys_state *css)
 {
         if (test_bit(CSS_ROOT, &css->flags))
                 return true;
-        while (!atomic_inc_not_zero(&css->refcnt)) {
-                if (test_bit(CSS_REMOVED, &css->flags))
-                        return false;
-                cpu_relax();
-        }
-        return true;
+        return __css_tryget(css);
 }
 
 /*
@@ -132,11 +133,11 @@ static inline bool css_tryget(struct cgroup_subsys_state *css)
  * css_get() or css_tryget()
  */
 
-extern void __css_put(struct cgroup_subsys_state *css, int count);
+extern void __css_put(struct cgroup_subsys_state *css);
 static inline void css_put(struct cgroup_subsys_state *css)
 {
         if (!test_bit(CSS_ROOT, &css->flags))
-                __css_put(css, 1);
+                __css_put(css);
 }
 
 /* bits in struct cgroup flags field */
@@ -175,6 +176,7 @@ struct cgroup {
          */
         struct list_head sibling;       /* my parent's children */
         struct list_head children;      /* my children */
+        struct list_head files;         /* my files */
 
         struct cgroup *parent;          /* my parent */
         struct dentry __rcu *dentry;    /* cgroup fs entry, RCU protected */
@@ -191,6 +193,9 @@ struct cgroup {
          */
         struct list_head css_sets;
 
+        struct list_head allcg_node;    /* cgroupfs_root->allcg_list */
+        struct list_head cft_q_node;    /* used during cftype add/rm */
+
         /*
          * Linked list running through all cgroups that can
          * potentially be reaped by the release agent. Protected by
@@ -275,11 +280,17 @@ struct cgroup_map_cb {
  *      - the 'cftype' of the file is file->f_dentry->d_fsdata
  */
 
-#define MAX_CFTYPE_NAME 64
+/* cftype->flags */
+#define CFTYPE_ONLY_ON_ROOT     (1U << 0)       /* only create on root cg */
+#define CFTYPE_NOT_ON_ROOT      (1U << 1)       /* don't create onp root cg */
+
+#define MAX_CFTYPE_NAME         64
+
 struct cftype {
         /*
          * By convention, the name should begin with the name of the
-         * subsystem, followed by a period
+         * subsystem, followed by a period.  Zero length string indicates
+         * end of cftype array.
          */
         char name[MAX_CFTYPE_NAME];
         int private;
@@ -295,6 +306,9 @@ struct cftype {
          */
         size_t max_write_len;
 
+        /* CFTYPE_* flags */
+        unsigned int flags;
+
         int (*open)(struct inode *inode, struct file *file);
         ssize_t (*read)(struct cgroup *cgrp, struct cftype *cft,
                         struct file *file,
@@ -373,6 +387,16 @@ struct cftype {
                         struct eventfd_ctx *eventfd);
 };
 
+/*
+ * cftype_sets describe cftypes belonging to a subsystem and are chained at
+ * cgroup_subsys->cftsets.  Each cftset points to an array of cftypes
+ * terminated by zero length name.
+ */
+struct cftype_set {
+        struct list_head                node;   /* chained at subsys->cftsets */
+        const struct cftype             *cfts;
+};
+
 struct cgroup_scanner {
         struct cgroup *cg;
         int (*test_task)(struct task_struct *p, struct cgroup_scanner *scan);
@@ -382,21 +406,8 @@ struct cgroup_scanner {
         void *data;
 };
 
-/*
- * Add a new file to the given cgroup directory. Should only be
- * called by subsystems from within a populate() method
- */
-int cgroup_add_file(struct cgroup *cgrp, struct cgroup_subsys *subsys,
-                       const struct cftype *cft);
-
-/*
- * Add a set of new files to the given cgroup directory. Should
- * only be called by subsystems from within a populate() method
- */
-int cgroup_add_files(struct cgroup *cgrp,
-                        struct cgroup_subsys *subsys,
-                        const struct cftype cft[],
-                        int count);
+int cgroup_add_cftypes(struct cgroup_subsys *ss, const struct cftype *cfts);
+int cgroup_rm_cftypes(struct cgroup_subsys *ss, const struct cftype *cfts);
 
 int cgroup_is_removed(const struct cgroup *cgrp);
 
@@ -461,7 +472,6 @@ struct cgroup_subsys {
         void (*fork)(struct task_struct *task);
         void (*exit)(struct cgroup *cgrp, struct cgroup *old_cgrp,
                      struct task_struct *task);
-        int (*populate)(struct cgroup_subsys *ss, struct cgroup *cgrp);
         void (*post_clone)(struct cgroup *cgrp);
         void (*bind)(struct cgroup *root);
 
@@ -474,6 +484,18 @@ struct cgroup_subsys {
          * (not available in early_init time.)
          */
         bool use_id;
+
+        /*
+         * If %true, cgroup removal will try to clear css refs by retrying
+         * ss->pre_destroy() until there's no css ref left.  This behavior
+         * is strictly for backward compatibility and will be removed as
+         * soon as the current user (memcg) is updated.
+         *
+         * If %false, ss->pre_destroy() can't fail and cgroup removal won't
+         * wait for css refs to drop to zero before proceeding.
+         */
+        bool __DEPRECATED_clear_css_refs;
+
 #define MAX_CGROUP_TYPE_NAMELEN 32
         const char *name;
 
@@ -500,6 +522,13 @@ struct cgroup_subsys {
         struct idr idr;
         spinlock_t id_lock;
 
+        /* list of cftype_sets */
+        struct list_head cftsets;
+
+        /* base cftypes, automatically [de]registered with subsys itself */
+        struct cftype *base_cftypes;
+        struct cftype_set base_cftset;
+
         /* should be defined only by modular subsystems */
         struct module *module;
 };
diff --git a/include/linux/clk-private.h b/include/linux/clk-private.h
index 5e4312b6f5cc..eb3f84bc5325 100644
--- a/include/linux/clk-private.h
+++ b/include/linux/clk-private.h
@@ -30,7 +30,7 @@ struct clk {
         const struct clk_ops    *ops;
         struct clk_hw           *hw;
         struct clk              *parent;
-        char                    **parent_names;
+        const char              **parent_names;
         struct clk              **parents;
         u8                      num_parents;
         unsigned long           rate;
@@ -55,12 +55,22 @@ struct clk {
  * alternative macro for static initialization
  */
 
-extern struct clk_ops clk_fixed_rate_ops;
+#define DEFINE_CLK(_name, _ops, _flags, _parent_names,          \
+                _parents)                                       \
+        static struct clk _name = {                             \
+                .name = #_name,                                 \
+                .ops = &_ops,                                   \
+                .hw = &_name##_hw.hw,                           \
+                .parent_names = _parent_names,                  \
+                .num_parents = ARRAY_SIZE(_parent_names),       \
+                .parents = _parents,                            \
+                .flags = _flags,                                \
+        }
 
 #define DEFINE_CLK_FIXED_RATE(_name, _flags, _rate,             \
                                 _fixed_rate_flags)              \
         static struct clk _name;                                \
-        static char *_name##_parent_names[] = {};               \
+        static const char *_name##_parent_names[] = {};         \
         static struct clk_fixed_rate _name##_hw = {             \
                 .hw = {                                         \
                         .clk = &_name,                          \
@@ -68,23 +78,14 @@ extern struct clk_ops clk_fixed_rate_ops;
                 .fixed_rate = _rate,                            \
                 .flags = _fixed_rate_flags,                     \
         };                                                      \
-        static struct clk _name = {                             \
-                .name = #_name,                                 \
-                .ops = &clk_fixed_rate_ops,                     \
-                .hw = &_name##_hw.hw,                           \
-                .parent_names = _name##_parent_names,           \
-                .num_parents =                                  \
-                        ARRAY_SIZE(_name##_parent_names),       \
-                .flags = _flags,                                \
-        };
-
-extern struct clk_ops clk_gate_ops;
+        DEFINE_CLK(_name, clk_fixed_rate_ops, _flags,           \
+                        _name##_parent_names, NULL);
 
 #define DEFINE_CLK_GATE(_name, _parent_name, _parent_ptr,       \
                                 _flags, _reg, _bit_idx,         \
                                 _gate_flags, _lock)             \
         static struct clk _name;                                \
-        static char *_name##_parent_names[] = {                 \
+        static const char *_name##_parent_names[] = {           \
                 _parent_name,                                   \
         };                                                      \
         static struct clk *_name##_parents[] = {                \
@@ -99,24 +100,14 @@ extern struct clk_ops clk_gate_ops;
                 .flags = _gate_flags,                           \
                 .lock = _lock,                                  \
         };                                                      \
-        static struct clk _name = {                             \
-                .name = #_name,                                 \
-                .ops = &clk_gate_ops,                           \
-                .hw = &_name##_hw.hw,                           \
-                .parent_names = _name##_parent_names,           \
-                .num_parents =                                  \
-                        ARRAY_SIZE(_name##_parent_names),       \
-                .parents = _name##_parents,                     \
-                .flags = _flags,                                \
-        };
-
-extern struct clk_ops clk_divider_ops;
+        DEFINE_CLK(_name, clk_gate_ops, _flags,                 \
+                        _name##_parent_names, _name##_parents);
 
 #define DEFINE_CLK_DIVIDER(_name, _parent_name, _parent_ptr,    \
                                 _flags, _reg, _shift, _width,   \
                                 _divider_flags, _lock)          \
         static struct clk _name;                                \
-        static char *_name##_parent_names[] = {                 \
+        static const char *_name##_parent_names[] = {           \
                 _parent_name,                                   \
         };                                                      \
         static struct clk *_name##_parents[] = {                \
@@ -132,18 +123,8 @@ extern struct clk_ops clk_divider_ops;
                 .flags = _divider_flags,                        \
                 .lock = _lock,                                  \
         };                                                      \
-        static struct clk _name = {                             \
-                .name = #_name,                                 \
-                .ops = &clk_divider_ops,                        \
-                .hw = &_name##_hw.hw,                           \
-                .parent_names = _name##_parent_names,           \
-                .num_parents =                                  \
-                        ARRAY_SIZE(_name##_parent_names),       \
-                .parents = _name##_parents,                     \
-                .flags = _flags,                                \
-        };
-
-extern struct clk_ops clk_mux_ops;
+        DEFINE_CLK(_name, clk_divider_ops, _flags,              \
+                        _name##_parent_names, _name##_parents);
 
 #define DEFINE_CLK_MUX(_name, _parent_names, _parents, _flags,  \
                                 _reg, _shift, _width,           \
@@ -159,16 +140,28 @@ extern struct clk_ops clk_mux_ops;
                 .flags = _mux_flags,                            \
                 .lock = _lock,                                  \
         };                                                      \
-        static struct clk _name = {                             \
-                .name = #_name,                                 \
-                .ops = &clk_mux_ops,                            \
-                .hw = &_name##_hw.hw,                           \
-                .parent_names = _parent_names,                  \
-                .num_parents =                                  \
-                        ARRAY_SIZE(_parent_names),              \
-                .parents = _parents,                            \
-                .flags = _flags,                                \
-        };
+        DEFINE_CLK(_name, clk_mux_ops, _flags, _parent_names,   \
+                        _parents);
+
+#define DEFINE_CLK_FIXED_FACTOR(_name, _parent_name,            \
+                                _parent_ptr, _flags,            \
+                                _mult, _div)                    \
+        static struct clk _name;                                \
+        static const char *_name##_parent_names[] = {           \
+                _parent_name,                                   \
+        };                                                      \
+        static struct clk *_name##_parents[] = {                \
+                _parent_ptr,                                    \
+        };                                                      \
+        static struct clk_fixed_factor _name##_hw = {           \
+                .hw = {                                         \
+                        .clk = &_name,                          \
+                },                                              \
+                .mult = _mult,                                  \
+                .div = _div,                                    \
+        };                                                      \
+        DEFINE_CLK(_name, clk_fixed_factor_ops, _flags,         \
+                        _name##_parent_names, _name##_parents);
 
 /**
  * __clk_init - initialize the data structures in a struct clk
@@ -189,8 +182,12 @@ extern struct clk_ops clk_mux_ops;
  *
  * It is not necessary to call clk_register if __clk_init is used directly with
  * statically initialized clock data.
+ *
+ * Returns 0 on success, otherwise an error code.
  */
-void __clk_init(struct device *dev, struct clk *clk);
+int __clk_init(struct device *dev, struct clk *clk);
+
+struct clk *__clk_register(struct device *dev, struct clk_hw *hw);
 
 #endif /* CONFIG_COMMON_CLK */
 #endif /* CLK_PRIVATE_H */
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 5508897ad376..4a0b483986c3 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -15,19 +15,6 @@
 
 #ifdef CONFIG_COMMON_CLK
 
-/**
- * struct clk_hw - handle for traversing from a struct clk to its corresponding
- * hardware-specific structure.  struct clk_hw should be declared within struct
- * clk_foo and then referenced by the struct clk instance that uses struct
- * clk_foo's clk_ops
- *
- * clk: pointer to the struct clk instance that points back to this struct
- * clk_hw instance
- */
-struct clk_hw {
-        struct clk *clk;
-};
-
 /*
  * flags used across common struct clk.  these flags should only affect the
  * top-level framework.  custom flags for dealing with hardware specifics
@@ -39,6 +26,8 @@ struct clk_hw {
 #define CLK_IGNORE_UNUSED       BIT(3) /* do not gate even if unused */
 #define CLK_IS_ROOT             BIT(4) /* root clk, has no parent */
 
+struct clk_hw;
+
 /**
  * struct clk_ops -  Callback operations for hardware clocks; these are to
  * be provided by the clock implementation, and will be called by drivers
@@ -88,19 +77,11 @@ struct clk_hw {
  *              array index into the value programmed into the hardware.
  *              Returns 0 on success, -EERROR otherwise.
  *
- * @set_rate:   Change the rate of this clock. If this callback returns
- *              CLK_SET_RATE_PARENT, the rate change will be propagated to the
- *              parent clock (which may propagate again if the parent clock
- *              also sets this flag). The requested rate of the parent is
- *              passed back from the callback in the second 'unsigned long *'
- *              argument.  Note that it is up to the hardware clock's set_rate
- *              implementation to insure that clocks do not run out of spec
- *              when propgating the call to set_rate up to the parent.  One way
- *              to do this is to gate the clock (via clk_disable and/or
- *              clk_unprepare) before calling clk_set_rate, then ungating it
- *              afterward.  If your clock also has the CLK_GATE_SET_RATE flag
- *              set then this will insure safety.  Returns 0 on success,
- *              -EERROR otherwise.
+ * @set_rate:   Change the rate of this clock. The requested rate is specified
+ *              by the second argument, which should typically be the return
+ *              of .round_rate call.  The third argument gives the parent rate
+ *              which is likely helpful for most .set_rate implementation.
+ *              Returns 0 on success, -EERROR otherwise.
  *
  * The clk_enable/clk_disable and clk_prepare/clk_unprepare pairs allow
  * implementations to split any work between atomic (enable) and sleepable
@@ -125,10 +106,46 @@ struct clk_ops {
                                         unsigned long *);
         int             (*set_parent)(struct clk_hw *hw, u8 index);
         u8              (*get_parent)(struct clk_hw *hw);
-        int             (*set_rate)(struct clk_hw *hw, unsigned long);
+        int             (*set_rate)(struct clk_hw *hw, unsigned long,
+                                    unsigned long);
         void            (*init)(struct clk_hw *hw);
 };
 
+/**
+ * struct clk_init_data - holds init data that's common to all clocks and is
+ * shared between the clock provider and the common clock framework.
+ *
+ * @name: clock name
+ * @ops: operations this clock supports
+ * @parent_names: array of string names for all possible parents
+ * @num_parents: number of possible parents
+ * @flags: framework-level hints and quirks
+ */
+struct clk_init_data {
+        const char              *name;
+        const struct clk_ops    *ops;
+        const char              **parent_names;
+        u8                      num_parents;
+        unsigned long           flags;
+};
+
+/**
+ * struct clk_hw - handle for traversing from a struct clk to its corresponding
+ * hardware-specific structure.  struct clk_hw should be declared within struct
+ * clk_foo and then referenced by the struct clk instance that uses struct
+ * clk_foo's clk_ops
+ *
+ * @clk: pointer to the struct clk instance that points back to this struct
+ * clk_hw instance
+ *
+ * @init: pointer to struct clk_init_data that contains the init data shared
+ * with the common clock framework.
+ */
+struct clk_hw {
+        struct clk *clk;
+        struct clk_init_data *init;
+};
+
 /*
  * DOC: Basic clock implementations common to many platforms
  *
@@ -149,6 +166,7 @@ struct clk_fixed_rate {
         u8              flags;
 };
 
+extern const struct clk_ops clk_fixed_rate_ops;
 struct clk *clk_register_fixed_rate(struct device *dev, const char *name,
                 const char *parent_name, unsigned long flags,
                 unsigned long fixed_rate);
@@ -165,7 +183,7 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name,
  * Clock which can gate its output.  Implements .enable & .disable
  *
  * Flags:
- * CLK_GATE_SET_DISABLE - by default this clock sets the bit at bit_idx to
+ * CLK_GATE_SET_TO_DISABLE - by default this clock sets the bit at bit_idx to
  *      enable the clock.  Setting this flag does the opposite: setting the bit
  *      disable the clock and clearing it enables the clock
  */
@@ -175,11 +193,11 @@ struct clk_gate {
         u8              bit_idx;
         u8              flags;
         spinlock_t      *lock;
-        char            *parent[1];
 };
 
 #define CLK_GATE_SET_TO_DISABLE         BIT(0)
 
+extern const struct clk_ops clk_gate_ops;
 struct clk *clk_register_gate(struct device *dev, const char *name,
                 const char *parent_name, unsigned long flags,
                 void __iomem *reg, u8 bit_idx,
@@ -212,12 +230,12 @@ struct clk_divider {
         u8              width;
         u8              flags;
         spinlock_t      *lock;
-        char            *parent[1];
 };
 
 #define CLK_DIVIDER_ONE_BASED           BIT(0)
 #define CLK_DIVIDER_POWER_OF_TWO        BIT(1)
 
+extern const struct clk_ops clk_divider_ops;
 struct clk *clk_register_divider(struct device *dev, const char *name,
                 const char *parent_name, unsigned long flags,
                 void __iomem *reg, u8 shift, u8 width,
@@ -238,7 +256,7 @@ struct clk *clk_register_divider(struct device *dev, const char *name,
  *
  * Flags:
  * CLK_MUX_INDEX_ONE - register index starts at 1, not 0
- * CLK_MUX_INDEX_BITWISE - register index is a single bit (power of two)
+ * CLK_MUX_INDEX_BIT - register index is a single bit (power of two)
  */
 struct clk_mux {
         struct clk_hw   hw;
@@ -252,29 +270,49 @@ struct clk_mux {
 #define CLK_MUX_INDEX_ONE               BIT(0)
 #define CLK_MUX_INDEX_BIT               BIT(1)
 
+extern const struct clk_ops clk_mux_ops;
 struct clk *clk_register_mux(struct device *dev, const char *name,
-                char **parent_names, u8 num_parents, unsigned long flags,
+                const char **parent_names, u8 num_parents, unsigned long flags,
                 void __iomem *reg, u8 shift, u8 width,
                 u8 clk_mux_flags, spinlock_t *lock);
 
 /**
+ * struct clk_fixed_factor - fixed multiplier and divider clock
+ *
+ * @hw:         handle between common and hardware-specific interfaces
+ * @mult:       multiplier
+ * @div:        divider
+ *
+ * Clock with a fixed multiplier and divider. The output frequency is the
+ * parent clock rate divided by div and multiplied by mult.
+ * Implements .recalc_rate, .set_rate and .round_rate
+ */
+
+struct clk_fixed_factor {
+        struct clk_hw   hw;
+        unsigned int    mult;
+        unsigned int    div;
+};
+
+extern struct clk_ops clk_fixed_factor_ops;
+struct clk *clk_register_fixed_factor(struct device *dev, const char *name,
+                const char *parent_name, unsigned long flags,
+                unsigned int mult, unsigned int div);
+
+/**
  * clk_register - allocate a new clock, register it and return an opaque cookie
  * @dev: device that is registering this clock
- * @name: clock name
- * @ops: operations this clock supports
  * @hw: link to hardware-specific clock data
- * @parent_names: array of string names for all possible parents
- * @num_parents: number of possible parents
- * @flags: framework-level hints and quirks
  *
  * clk_register is the primary interface for populating the clock tree with new
  * clock nodes.  It returns a pointer to the newly allocated struct clk which
  * cannot be dereferenced by driver code but may be used in conjuction with the
- * rest of the clock API.
+ * rest of the clock API.  In the event of an error clk_register will return an
+ * error code; drivers must test for an error code after calling clk_register.
  */
-struct clk *clk_register(struct device *dev, const char *name,
-                const struct clk_ops *ops, struct clk_hw *hw,
-                char **parent_names, u8 num_parents, unsigned long flags);
+struct clk *clk_register(struct device *dev, struct clk_hw *hw);
+
+void clk_unregister(struct clk *clk);
 
 /* helper functions */
 const char *__clk_get_name(struct clk *clk);
diff --git a/include/linux/clk.h b/include/linux/clk.h
index b0252726df61..ad5c43e8ae8a 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -81,7 +81,7 @@ int clk_notifier_register(struct clk *clk, struct notifier_block *nb);
 
 int clk_notifier_unregister(struct clk *clk, struct notifier_block *nb);
 
-#endif /* !CONFIG_COMMON_CLK */
+#endif
 
 /**
  * clk_get - lookup and obtain a reference to a clock producer.
@@ -101,6 +101,26 @@ int clk_notifier_unregister(struct clk *clk, struct notifier_block *nb);
 struct clk *clk_get(struct device *dev, const char *id);
 
 /**
+ * devm_clk_get - lookup and obtain a managed reference to a clock producer.
+ * @dev: device for clock "consumer"
+ * @id: clock comsumer ID
+ *
+ * Returns a struct clk corresponding to the clock producer, or
+ * valid IS_ERR() condition containing errno.  The implementation
+ * uses @dev and @id to determine the clock consumer, and thereby
+ * the clock producer.  (IOW, @id may be identical strings, but
+ * clk_get may return different clock producers depending on @dev.)
+ *
+ * Drivers must assume that the clock source is not enabled.
+ *
+ * devm_clk_get should not be called from within interrupt context.
+ *
+ * The clock will automatically be freed when the device is unbound
+ * from the bus.
+ */
+struct clk *devm_clk_get(struct device *dev, const char *id);
+
+/**
  * clk_prepare - prepare a clock source
  * @clk: clock source
  *
@@ -206,6 +226,18 @@ unsigned long clk_get_rate(struct clk *clk);
  */
 void clk_put(struct clk *clk);
 
+/**
+ * devm_clk_put - "free" a managed clock source
+ * @dev: device used to acuqire the clock
+ * @clk: clock source acquired with devm_clk_get()
+ *
+ * Note: drivers must ensure that all clk_enable calls made on this
+ * clock source are balanced by clk_disable calls prior to calling
+ * this function.
+ *
+ * clk_put should not be called from within interrupt context.
+ */
+void devm_clk_put(struct device *dev, struct clk *clk);
 
 /*
  * The remaining APIs are optional for machine class support.
@@ -220,7 +252,7 @@ void clk_put(struct clk *clk);
  * Returns rounded clock rate in Hz, or negative errno.
  */
 long clk_round_rate(struct clk *clk, unsigned long rate);
- 
+
 /**
  * clk_set_rate - set the clock rate for a clock source
  * @clk: clock source
@@ -229,7 +261,7 @@ long clk_round_rate(struct clk *clk, unsigned long rate);
  * Returns success (0) or negative errno.
  */
 int clk_set_rate(struct clk *clk, unsigned long rate);
- 
+
 /**
  * clk_set_parent - set the parent clock source for this clock
  * @clk: clock source
diff --git a/include/linux/clkdev.h b/include/linux/clkdev.h
index d9a4fd028c9d..a6a6f603103b 100644
--- a/include/linux/clkdev.h
+++ b/include/linux/clkdev.h
@@ -40,4 +40,7 @@ void clkdev_drop(struct clk_lookup *cl);
 void clkdev_add_table(struct clk_lookup *, size_t);
 int clk_add_alias(const char *, const char *, char *, struct device *);
 
+int clk_register_clkdev(struct clk *, const char *, const char *, ...);
+int clk_register_clkdevs(struct clk *, struct clk_lookup *, size_t);
+
 #endif
diff --git a/include/linux/compaction.h b/include/linux/compaction.h
index 51a90b7f2d60..e988037abd2a 100644
--- a/include/linux/compaction.h
+++ b/include/linux/compaction.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_COMPACTION_H
 #define _LINUX_COMPACTION_H
 
+#include <linux/node.h>
+
 /* Return values for compact_zone() and try_to_compact_pages() */
 /* compaction didn't start as it was not possible or direct reclaim was more suitable */
 #define COMPACT_SKIPPED         0
@@ -11,6 +13,23 @@
 /* The full zone was compacted */
 #define COMPACT_COMPLETE        3
 
+/*
+ * compaction supports three modes
+ *
+ * COMPACT_ASYNC_MOVABLE uses asynchronous migration and only scans
+ *    MIGRATE_MOVABLE pageblocks as migration sources and targets.
+ * COMPACT_ASYNC_UNMOVABLE uses asynchronous migration and only scans
+ *    MIGRATE_MOVABLE pageblocks as migration sources.
+ *    MIGRATE_UNMOVABLE pageblocks are scanned as potential migration
+ *    targets and convers them to MIGRATE_MOVABLE if possible
+ * COMPACT_SYNC uses synchronous migration and scans all pageblocks
+ */
+enum compact_mode {
+        COMPACT_ASYNC_MOVABLE,
+        COMPACT_ASYNC_UNMOVABLE,
+        COMPACT_SYNC,
+};
+
 #ifdef CONFIG_COMPACTION
 extern int sysctl_compact_memory;
 extern int sysctl_compaction_handler(struct ctl_table *table, int write,
diff --git a/include/linux/compat.h b/include/linux/compat.h
index 5d46217f84ad..4e890394ef99 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -577,8 +577,7 @@ extern ssize_t compat_rw_copy_check_uvector(int type,
                 const struct compat_iovec __user *uvector,
                 unsigned long nr_segs,
                 unsigned long fast_segs, struct iovec *fast_pointer,
-                struct iovec **ret_pointer,
-                int check_access);
+                struct iovec **ret_pointer);
 
 extern void __user *compat_alloc_user_space(unsigned long len);
 
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index ee28844ae68e..2e9b9ebbeb78 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -36,8 +36,6 @@ extern void cpu_remove_dev_attr(struct device_attribute *attr);
 extern int cpu_add_dev_attr_group(struct attribute_group *attrs);
 extern void cpu_remove_dev_attr_group(struct attribute_group *attrs);
 
-extern int sched_create_sysfs_power_savings_entries(struct device *dev);
-
 #ifdef CONFIG_HOTPLUG_CPU
 extern void unregister_cpu(struct cpu *cpu);
 extern ssize_t arch_cpu_probe(const char *, size_t);
@@ -179,6 +177,7 @@ extern void put_online_cpus(void);
 #define hotcpu_notifier(fn, pri)        cpu_notifier(fn, pri)
 #define register_hotcpu_notifier(nb)    register_cpu_notifier(nb)
 #define unregister_hotcpu_notifier(nb)  unregister_cpu_notifier(nb)
+void clear_tasks_mm_cpumask(int cpu);
 int cpu_down(unsigned int cpu);
 
 #ifdef CONFIG_ARCH_CPU_PROBE_RELEASE
diff --git a/include/linux/cred.h b/include/linux/cred.h
index adadf71a7327..ebbed2ce6637 100644
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -17,6 +17,7 @@
 #include <linux/key.h>
 #include <linux/selinux.h>
 #include <linux/atomic.h>
+#include <linux/uidgid.h>
 
 struct user_struct;
 struct cred;
@@ -26,14 +27,14 @@ struct inode;
  * COW Supplementary groups list
  */
 #define NGROUPS_SMALL           32
-#define NGROUPS_PER_BLOCK       ((unsigned int)(PAGE_SIZE / sizeof(gid_t)))
+#define NGROUPS_PER_BLOCK       ((unsigned int)(PAGE_SIZE / sizeof(kgid_t)))
 
 struct group_info {
         atomic_t        usage;
         int             ngroups;
         int             nblocks;
-        gid_t           small_block[NGROUPS_SMALL];
-        gid_t           *blocks[0];
+        kgid_t          small_block[NGROUPS_SMALL];
+        kgid_t          *blocks[0];
 };
 
 /**
@@ -66,14 +67,14 @@ extern struct group_info init_groups;
 extern void groups_free(struct group_info *);
 extern int set_current_groups(struct group_info *);
 extern int set_groups(struct cred *, struct group_info *);
-extern int groups_search(const struct group_info *, gid_t);
+extern int groups_search(const struct group_info *, kgid_t);
 
 /* access the groups "array" with this macro */
 #define GROUP_AT(gi, i) \
         ((gi)->blocks[(i) / NGROUPS_PER_BLOCK][(i) % NGROUPS_PER_BLOCK])
 
-extern int in_group_p(gid_t);
-extern int in_egroup_p(gid_t);
+extern int in_group_p(kgid_t);
+extern int in_egroup_p(kgid_t);
 
 /*
  * The common credentials for a thread group
@@ -122,14 +123,14 @@ struct cred {
 #define CRED_MAGIC      0x43736564
 #define CRED_MAGIC_DEAD 0x44656144
 #endif
-        uid_t           uid;            /* real UID of the task */
-        gid_t           gid;            /* real GID of the task */
-        uid_t           suid;           /* saved UID of the task */
-        gid_t           sgid;           /* saved GID of the task */
-        uid_t           euid;           /* effective UID of the task */
-        gid_t           egid;           /* effective GID of the task */
-        uid_t           fsuid;          /* UID for VFS ops */
-        gid_t           fsgid;          /* GID for VFS ops */
+        kuid_t          uid;            /* real UID of the task */
+        kgid_t          gid;            /* real GID of the task */
+        kuid_t          suid;           /* saved UID of the task */
+        kgid_t          sgid;           /* saved GID of the task */
+        kuid_t          euid;           /* effective UID of the task */
+        kgid_t          egid;           /* effective GID of the task */
+        kuid_t          fsuid;          /* UID for VFS ops */
+        kgid_t          fsgid;          /* GID for VFS ops */
         unsigned        securebits;     /* SUID-less security management */
         kernel_cap_t    cap_inheritable; /* caps our children can inherit */
         kernel_cap_t    cap_permitted;  /* caps we're permitted */
@@ -146,7 +147,7 @@ struct cred {
         void            *security;      /* subjective LSM security */
 #endif
         struct user_struct *user;       /* real user ID subscription */
-        struct user_namespace *user_ns; /* cached user->user_ns */
+        struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
         struct group_info *group_info;  /* supplementary groups for euid/fsgid */
         struct rcu_head rcu;            /* RCU deletion hook */
 };
@@ -276,17 +277,13 @@ static inline void put_cred(const struct cred *_cred)
  * @task: The task to query
  *
  * Access the objective credentials of a task.  The caller must hold the RCU
- * readlock or the task must be dead and unable to change its own credentials.
+ * readlock.
  *
  * The result of this function should not be passed directly to get_cred();
  * rather get_task_cred() should be used instead.
  */
-#define __task_cred(task)                                               \
-        ({                                                              \
-                const struct task_struct *__t = (task);                 \
-                rcu_dereference_check(__t->real_cred,                   \
-                                      task_is_dead(__t));               \
-        })
+#define __task_cred(task)       \
+        rcu_dereference((task)->real_cred)
 
 /**
  * get_current_cred - Get the current task's subjective credentials
@@ -357,11 +354,11 @@ static inline void put_cred(const struct cred *_cred)
 #define current_user()          (current_cred_xxx(user))
 #define current_security()      (current_cred_xxx(security))
 
+extern struct user_namespace init_user_ns;
 #ifdef CONFIG_USER_NS
 #define current_user_ns()       (current_cred_xxx(user_ns))
 #define task_user_ns(task)      (task_cred_xxx((task), user_ns))
 #else
-extern struct user_namespace init_user_ns;
 #define current_user_ns()       (&init_user_ns)
 #define task_user_ns(task)      (&init_user_ns)
 #endif
diff --git a/include/linux/crush/crush.h b/include/linux/crush/crush.h
index 97e435b191f4..7c4750811b96 100644
--- a/include/linux/crush/crush.h
+++ b/include/linux/crush/crush.h
@@ -151,16 +151,6 @@ struct crush_map {
         struct crush_bucket **buckets;
         struct crush_rule **rules;
 
-        /*
-         * Parent pointers to identify the parent bucket a device or
-         * bucket in the hierarchy.  If an item appears more than
-         * once, this is the _last_ time it appeared (where buckets
-         * are processed in bucket id order, from -1 on down to
-         * -max_buckets.
-         */
-        __u32 *bucket_parents;
-        __u32 *device_parents;
-
         __s32 max_buckets;
         __u32 max_rules;
         __s32 max_devices;
@@ -168,8 +158,7 @@ struct crush_map {
 
 
 /* crush.c */
-extern int crush_get_bucket_item_weight(struct crush_bucket *b, int pos);
-extern void crush_calc_parents(struct crush_map *map);
+extern int crush_get_bucket_item_weight(const struct crush_bucket *b, int pos);
 extern void crush_destroy_bucket_uniform(struct crush_bucket_uniform *b);
 extern void crush_destroy_bucket_list(struct crush_bucket_list *b);
 extern void crush_destroy_bucket_tree(struct crush_bucket_tree *b);
@@ -177,4 +166,9 @@ extern void crush_destroy_bucket_straw(struct crush_bucket_straw *b);
 extern void crush_destroy_bucket(struct crush_bucket *b);
 extern void crush_destroy(struct crush_map *map);
 
+static inline int crush_calc_tree_node(int i)
+{
+        return ((i+1) << 1)-1;
+}
+
 #endif
diff --git a/include/linux/crush/mapper.h b/include/linux/crush/mapper.h
index c46b99c18bb0..71d79f44a7d0 100644
--- a/include/linux/crush/mapper.h
+++ b/include/linux/crush/mapper.h
@@ -10,11 +10,10 @@
 
 #include "crush.h"
 
-extern int crush_find_rule(struct crush_map *map, int pool, int type, int size);
-extern int crush_do_rule(struct crush_map *map,
+extern int crush_find_rule(const struct crush_map *map, int ruleset, int type, int size);
+extern int crush_do_rule(const struct crush_map *map,
                          int ruleno,
                          int x, int *result, int result_max,
-                         int forcefeed,    /* -1 for none */
-                         __u32 *weights);
+                         const __u32 *weights);
 
 #endif
diff --git a/include/linux/cs5535.h b/include/linux/cs5535.h
index c077aec3a6ff..cfe83239d7f0 100644
--- a/include/linux/cs5535.h
+++ b/include/linux/cs5535.h
@@ -95,6 +95,7 @@ static inline int cs5535_pic_unreqz_select_high(unsigned int group,
 
 /* CS5536_PM1_STS bits */
 #define CS5536_WAK_FLAG         (1 << 15)
+#define CS5536_RTC_FLAG         (1 << 10)
 #define CS5536_PWRBTN_FLAG      (1 << 8)
 
 /* CS5536_PM1_EN bits */
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index 7e11f1418203..094789ff3e9f 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -25,6 +25,13 @@ struct vfsmount;
 
 #define IS_ROOT(x) ((x) == (x)->d_parent)
 
+/* The hash is always the low bits of hash_len */
+#ifdef __LITTLE_ENDIAN
+ #define HASH_LEN_DECLARE u32 hash; u32 len;
+#else
+ #define HASH_LEN_DECLARE u32 len; u32 hash;
+#endif
+
 /*
  * "quick string" -- eases parameter passing, but more importantly
  * saves "metadata" about the string (ie length and the hash).
@@ -33,11 +40,19 @@ struct vfsmount;
  * dentry.
  */
 struct qstr {
-        unsigned int hash;
-        unsigned int len;
+        union {
+                struct {
+                        HASH_LEN_DECLARE;
+                };
+                u64 hash_len;
+        };
         const unsigned char *name;
 };
 
+#define QSTR_INIT(n,l) { { { .len = l } }, .name = n }
+#define hashlen_hash(hashlen) ((u32) (hashlen))
+#define hashlen_len(hashlen)  ((u32)((hashlen) >> 32))
+
 struct dentry_stat_t {
         int nr_dentry;
         int nr_unused;
@@ -282,7 +297,7 @@ extern struct dentry *d_hash_and_lookup(struct dentry *, struct qstr *);
 extern struct dentry *__d_lookup(struct dentry *, struct qstr *);
 extern struct dentry *__d_lookup_rcu(const struct dentry *parent,
                                 const struct qstr *name,
-                                unsigned *seq, struct inode **inode);
+                                unsigned *seq, struct inode *inode);
 
 /**
  * __d_rcu_to_refcount - take a refcount on dentry if sequence check is ok
diff --git a/include/linux/dcbnl.h b/include/linux/dcbnl.h
index 65a2562f66b4..6bb43382f3f3 100644
--- a/include/linux/dcbnl.h
+++ b/include/linux/dcbnl.h
@@ -67,6 +67,17 @@ struct ieee_ets {
         __u8    reco_prio_tc[IEEE_8021QAZ_MAX_TCS];
 };
 
+/* This structure contains rate limit extension to the IEEE 802.1Qaz ETS
+ * managed object.
+ * Values are 64 bits long and specified in Kbps to enable usage over both
+ * slow and very fast networks.
+ *
+ * @tc_maxrate: maximal tc tx bandwidth indexed by traffic class
+ */
+struct ieee_maxrate {
+        __u64   tc_maxrate[IEEE_8021QAZ_MAX_TCS];
+};
+
 /* This structure contains the IEEE 802.1Qaz PFC managed object
  *
  * @pfc_cap: Indicates the number of traffic classes on the local device
@@ -321,6 +332,7 @@ enum ieee_attrs {
         DCB_ATTR_IEEE_PEER_ETS,
         DCB_ATTR_IEEE_PEER_PFC,
         DCB_ATTR_IEEE_PEER_APP,
+        DCB_ATTR_IEEE_MAXRATE,
         __DCB_ATTR_IEEE_MAX
 };
 #define DCB_ATTR_IEEE_MAX (__DCB_ATTR_IEEE_MAX - 1)
diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index eaf95a023af4..d16294e2a118 100644
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
@@ -549,6 +549,8 @@ static inline const char *dccp_role(const struct sock *sk)
         return NULL;
 }
 
+extern void dccp_syn_ack_timeout(struct sock *sk, struct request_sock *req);
+
 #endif /* __KERNEL__ */
 
 #endif /* _LINUX_DCCP_H */
diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h
index ae36b72c22f3..66c434f5dd1e 100644
--- a/include/linux/debugfs.h
+++ b/include/linux/debugfs.h
@@ -93,6 +93,10 @@ struct dentry *debugfs_create_regset32(const char *name, umode_t mode,
 int debugfs_print_regs32(struct seq_file *s, const struct debugfs_reg32 *regs,
                          int nregs, void __iomem *base, char *prefix);
 
+struct dentry *debugfs_create_u32_array(const char *name, umode_t mode,
+                                        struct dentry *parent,
+                                        u32 *array, u32 elements);
+
 bool debugfs_initialized(void);
 
 #else
@@ -219,6 +223,13 @@ static inline bool debugfs_initialized(void)
         return false;
 }
 
+static inline struct dentry *debugfs_create_u32_array(const char *name, umode_t mode,
+                                        struct dentry *parent,
+                                        u32 *array, u32 elements)
+{
+        return ERR_PTR(-ENODEV);
+}
+
 #endif
 
 #endif
diff --git a/include/linux/device.h b/include/linux/device.h
index 5ad17cccdd71..161d96241b1b 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -23,6 +23,7 @@
 #include <linux/mutex.h>
 #include <linux/pm.h>
 #include <linux/atomic.h>
+#include <linux/ratelimit.h>
 #include <asm/device.h>
 
 struct device;
@@ -502,7 +503,10 @@ ssize_t device_store_int(struct device *dev, struct device_attribute *attr,
                 { __ATTR(_name, _mode, device_show_ulong, device_store_ulong), &(_var) }
 #define DEVICE_INT_ATTR(_name, _mode, _var) \
         struct dev_ext_attribute dev_attr_##_name = \
-                { __ATTR(_name, _mode, device_show_ulong, device_store_ulong), &(_var) }
+                { __ATTR(_name, _mode, device_show_int, device_store_int), &(_var) }
+#define DEVICE_ATTR_IGNORE_LOCKDEP(_name, _mode, _show, _store) \
+        struct device_attribute dev_attr_##_name =              \
+                __ATTR_IGNORE_LOCKDEP(_name, _mode, _show, _store)
 
 extern int device_create_file(struct device *device,
                               const struct device_attribute *entry);
@@ -541,6 +545,8 @@ extern void *devres_remove(struct device *dev, dr_release_t release,
                            dr_match_t match, void *match_data);
 extern int devres_destroy(struct device *dev, dr_release_t release,
                           dr_match_t match, void *match_data);
+extern int devres_release(struct device *dev, dr_release_t release,
+                          dr_match_t match, void *match_data);
 
 /* devres group */
 extern void * __must_check devres_open_group(struct device *dev, void *id,
@@ -661,6 +667,10 @@ struct device {
 
         struct dma_coherent_mem *dma_mem; /* internal for coherent mem
                                              override */
+#ifdef CONFIG_CMA
+        struct cma *cma_area;           /* contiguous memory area for dma
+                                           allocations */
+#endif
         /* arch specific additions */
         struct dev_archdata     archdata;
 
@@ -931,6 +941,32 @@ int _dev_info(const struct device *dev, const char *fmt, ...)
 
 #endif
 
+#define dev_level_ratelimited(dev_level, dev, fmt, ...)                 \
+do {                                                                    \
+        static DEFINE_RATELIMIT_STATE(_rs,                              \
+                                      DEFAULT_RATELIMIT_INTERVAL,       \
+                                      DEFAULT_RATELIMIT_BURST);         \
+        if (__ratelimit(&_rs))                                          \
+                dev_level(dev, fmt, ##__VA_ARGS__);                     \
+} while (0)
+
+#define dev_emerg_ratelimited(dev, fmt, ...)                            \
+        dev_level_ratelimited(dev_emerg, dev, fmt, ##__VA_ARGS__)
+#define dev_alert_ratelimited(dev, fmt, ...)                            \
+        dev_level_ratelimited(dev_alert, dev, fmt, ##__VA_ARGS__)
+#define dev_crit_ratelimited(dev, fmt, ...)                             \
+        dev_level_ratelimited(dev_crit, dev, fmt, ##__VA_ARGS__)
+#define dev_err_ratelimited(dev, fmt, ...)                              \
+        dev_level_ratelimited(dev_err, dev, fmt, ##__VA_ARGS__)
+#define dev_warn_ratelimited(dev, fmt, ...)                             \
+        dev_level_ratelimited(dev_warn, dev, fmt, ##__VA_ARGS__)
+#define dev_notice_ratelimited(dev, fmt, ...)                           \
+        dev_level_ratelimited(dev_notice, dev, fmt, ##__VA_ARGS__)
+#define dev_info_ratelimited(dev, fmt, ...)                             \
+        dev_level_ratelimited(dev_info, dev, fmt, ##__VA_ARGS__)
+#define dev_dbg_ratelimited(dev, fmt, ...)                              \
+        dev_level_ratelimited(dev_dbg, dev, fmt, ##__VA_ARGS__)
+
 /*
  * Stupid hackaround for existing uses of non-printk uses dev_info
  *
diff --git a/include/linux/dlm.h b/include/linux/dlm.h
index 6c7f6e9546c7..520152411cd1 100644
--- a/include/linux/dlm.h
+++ b/include/linux/dlm.h
@@ -67,7 +67,6 @@ struct dlm_lksb {
 
 /* dlm_new_lockspace() flags */
 
-#define DLM_LSFL_NODIR          0x00000001
 #define DLM_LSFL_TIMEWARN       0x00000002
 #define DLM_LSFL_FS             0x00000004
 #define DLM_LSFL_NEWEXCL        0x00000008
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
index 3efbfc2145c3..eb48f3816df9 100644
--- a/include/linux/dma-buf.h
+++ b/include/linux/dma-buf.h
@@ -61,6 +61,13 @@ struct dma_buf_attachment;
  *                 This Callback must not sleep.
  * @kmap: maps a page from the buffer into kernel address space.
  * @kunmap: [optional] unmaps a page from the buffer.
+ * @mmap: used to expose the backing storage to userspace. Note that the
+ *        mapping needs to be coherent - if the exporter doesn't directly
+ *        support this, it needs to fake coherency by shooting down any ptes
+ *        when transitioning away from the cpu domain.
+ * @vmap: [optional] creates a virtual mapping for the buffer into kernel
+ *        address space. Same restrictions as for vmap and friends apply.
+ * @vunmap: [optional] unmaps a vmap from the buffer
  */
 struct dma_buf_ops {
         int (*attach)(struct dma_buf *, struct device *,
@@ -92,6 +99,11 @@ struct dma_buf_ops {
         void (*kunmap_atomic)(struct dma_buf *, unsigned long, void *);
         void *(*kmap)(struct dma_buf *, unsigned long);
         void (*kunmap)(struct dma_buf *, unsigned long, void *);
+
+        int (*mmap)(struct dma_buf *, struct vm_area_struct *vma);
+
+        void *(*vmap)(struct dma_buf *);
+        void (*vunmap)(struct dma_buf *, void *vaddr);
 };
 
 /**
@@ -167,6 +179,11 @@ void *dma_buf_kmap_atomic(struct dma_buf *, unsigned long);
 void dma_buf_kunmap_atomic(struct dma_buf *, unsigned long, void *);
 void *dma_buf_kmap(struct dma_buf *, unsigned long);
 void dma_buf_kunmap(struct dma_buf *, unsigned long, void *);
+
+int dma_buf_mmap(struct dma_buf *, struct vm_area_struct *,
+                 unsigned long);
+void *dma_buf_vmap(struct dma_buf *);
+void dma_buf_vunmap(struct dma_buf *, void *vaddr);
 #else
 
 static inline struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf,
@@ -248,6 +265,22 @@ static inline void dma_buf_kunmap(struct dma_buf *dmabuf,
                                   unsigned long pnum, void *vaddr)
 {
 }
+
+static inline int dma_buf_mmap(struct dma_buf *dmabuf,
+                               struct vm_area_struct *vma,
+                               unsigned long pgoff)
+{
+        return -ENODEV;
+}
+
+static inline void *dma_buf_vmap(struct dma_buf *dmabuf)
+{
+        return NULL;
+}
+
+static inline void dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr)
+{
+}
 #endif /* CONFIG_DMA_SHARED_BUFFER */
 
 #endif /* __DMA_BUF_H__ */
diff --git a/include/linux/dma-contiguous.h b/include/linux/dma-contiguous.h
new file mode 100644
index 000000000000..2f303e4b7ed3
--- /dev/null
+++ b/include/linux/dma-contiguous.h
@@ -0,0 +1,110 @@
+#ifndef __LINUX_CMA_H
+#define __LINUX_CMA_H
+
+/*
+ * Contiguous Memory Allocator for DMA mapping framework
+ * Copyright (c) 2010-2011 by Samsung Electronics.
+ * Written by:
+ *      Marek Szyprowski <m.szyprowski@samsung.com>
+ *      Michal Nazarewicz <mina86@mina86.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 optional) any later version of the license.
+ */
+
+/*
+ * Contiguous Memory Allocator
+ *
+ *   The Contiguous Memory Allocator (CMA) makes it possible to
+ *   allocate big contiguous chunks of memory after the system has
+ *   booted.
+ *
+ * Why is it needed?
+ *
+ *   Various devices on embedded systems have no scatter-getter and/or
+ *   IO map support and require contiguous blocks of memory to
+ *   operate.  They include devices such as cameras, hardware video
+ *   coders, etc.
+ *
+ *   Such devices often require big memory buffers (a full HD frame
+ *   is, for instance, more then 2 mega pixels large, i.e. more than 6
+ *   MB of memory), which makes mechanisms such as kmalloc() or
+ *   alloc_page() ineffective.
+ *
+ *   At the same time, a solution where a big memory region is
+ *   reserved for a device is suboptimal since often more memory is
+ *   reserved then strictly required and, moreover, the memory is
+ *   inaccessible to page system even if device drivers don't use it.
+ *
+ *   CMA tries to solve this issue by operating on memory regions
+ *   where only movable pages can be allocated from.  This way, kernel
+ *   can use the memory for pagecache and when device driver requests
+ *   it, allocated pages can be migrated.
+ *
+ * Driver usage
+ *
+ *   CMA should not be used by the device drivers directly. It is
+ *   only a helper framework for dma-mapping subsystem.
+ *
+ *   For more information, see kernel-docs in drivers/base/dma-contiguous.c
+ */
+
+#ifdef __KERNEL__
+
+struct cma;
+struct page;
+struct device;
+
+#ifdef CONFIG_CMA
+
+/*
+ * There is always at least global CMA area and a few optional device
+ * private areas configured in kernel .config.
+ */
+#define MAX_CMA_AREAS   (1 + CONFIG_CMA_AREAS)
+
+extern struct cma *dma_contiguous_default_area;
+
+void dma_contiguous_reserve(phys_addr_t addr_limit);
+int dma_declare_contiguous(struct device *dev, unsigned long size,
+                           phys_addr_t base, phys_addr_t limit);
+
+struct page *dma_alloc_from_contiguous(struct device *dev, int count,
+                                       unsigned int order);
+bool dma_release_from_contiguous(struct device *dev, struct page *pages,
+                                 int count);
+
+#else
+
+#define MAX_CMA_AREAS   (0)
+
+static inline void dma_contiguous_reserve(phys_addr_t limit) { }
+
+static inline
+int dma_declare_contiguous(struct device *dev, unsigned long size,
+                           phys_addr_t base, phys_addr_t limit)
+{
+        return -ENOSYS;
+}
+
+static inline
+struct page *dma_alloc_from_contiguous(struct device *dev, int count,
+                                       unsigned int order)
+{
+        return NULL;
+}
+
+static inline
+bool dma_release_from_contiguous(struct device *dev, struct page *pages,
+                                 int count)
+{
+        return false;
+}
+
+#endif
+
+#endif
+
+#endif
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index f9a2e5e67a54..56377df39124 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -615,11 +615,13 @@ static inline int dmaengine_slave_config(struct dma_chan *chan,
 }
 
 static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_single(
-        struct dma_chan *chan, void *buf, size_t len,
+        struct dma_chan *chan, dma_addr_t buf, size_t len,
         enum dma_transfer_direction dir, unsigned long flags)
 {
         struct scatterlist sg;
-        sg_init_one(&sg, buf, len);
+        sg_init_table(&sg, 1);
+        sg_dma_address(&sg) = buf;
+        sg_dma_len(&sg) = len;
 
         return chan->device->device_prep_slave_sg(chan, &sg, 1,
                                                   dir, flags, NULL);
@@ -633,6 +635,18 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_sg(
                                                   dir, flags, NULL);
 }
 
+#ifdef CONFIG_RAPIDIO_DMA_ENGINE
+struct rio_dma_ext;
+static inline struct dma_async_tx_descriptor *dmaengine_prep_rio_sg(
+        struct dma_chan *chan, struct scatterlist *sgl, unsigned int sg_len,
+        enum dma_transfer_direction dir, unsigned long flags,
+        struct rio_dma_ext *rio_ext)
+{
+        return chan->device->device_prep_slave_sg(chan, sgl, sg_len,
+                                                  dir, flags, rio_ext);
+}
+#endif
+
 static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_cyclic(
                 struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
                 size_t period_len, enum dma_transfer_direction dir)
diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index 731a60975101..b029d1aa2d12 100644
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
@@ -114,91 +114,6 @@ struct irte {
         };
 };
 
-#ifdef CONFIG_IRQ_REMAP
-extern int intr_remapping_enabled;
-extern int intr_remapping_supported(void);
-extern int enable_intr_remapping(void);
-extern void disable_intr_remapping(void);
-extern int reenable_intr_remapping(int);
-
-extern int get_irte(int irq, struct irte *entry);
-extern int modify_irte(int irq, struct irte *irte_modified);
-extern int alloc_irte(struct intel_iommu *iommu, int irq, u16 count);
-extern int set_irte_irq(int irq, struct intel_iommu *iommu, u16 index,
-                        u16 sub_handle);
-extern int map_irq_to_irte_handle(int irq, u16 *sub_handle);
-extern int free_irte(int irq);
-
-extern struct intel_iommu *map_dev_to_ir(struct pci_dev *dev);
-extern struct intel_iommu *map_ioapic_to_ir(int apic);
-extern struct intel_iommu *map_hpet_to_ir(u8 id);
-extern int set_ioapic_sid(struct irte *irte, int apic);
-extern int set_hpet_sid(struct irte *irte, u8 id);
-extern int set_msi_sid(struct irte *irte, struct pci_dev *dev);
-#else
-static inline int alloc_irte(struct intel_iommu *iommu, int irq, u16 count)
-{
-        return -1;
-}
-static inline int modify_irte(int irq, struct irte *irte_modified)
-{
-        return -1;
-}
-static inline int free_irte(int irq)
-{
-        return -1;
-}
-static inline int map_irq_to_irte_handle(int irq, u16 *sub_handle)
-{
-        return -1;
-}
-static inline int set_irte_irq(int irq, struct intel_iommu *iommu, u16 index,
-                               u16 sub_handle)
-{
-        return -1;
-}
-static inline struct intel_iommu *map_dev_to_ir(struct pci_dev *dev)
-{
-        return NULL;
-}
-static inline struct intel_iommu *map_ioapic_to_ir(int apic)
-{
-        return NULL;
-}
-static inline struct intel_iommu *map_hpet_to_ir(unsigned int hpet_id)
-{
-        return NULL;
-}
-static inline int set_ioapic_sid(struct irte *irte, int apic)
-{
-        return 0;
-}
-static inline int set_hpet_sid(struct irte *irte, u8 id)
-{
-        return -1;
-}
-static inline int set_msi_sid(struct irte *irte, struct pci_dev *dev)
-{
-        return 0;
-}
-
-#define intr_remapping_enabled          (0)
-
-static inline int enable_intr_remapping(void)
-{
-        return -1;
-}
-
-static inline void disable_intr_remapping(void)
-{
-}
-
-static inline int reenable_intr_remapping(int eim)
-{
-        return 0;
-}
-#endif
-
 enum {
         IRQ_REMAP_XAPIC_MODE,
         IRQ_REMAP_X2APIC_MODE,
diff --git a/include/linux/drbd.h b/include/linux/drbd.h
index 9e5f5607eba3..47e3d4850584 100644
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
@@ -53,7 +53,7 @@
 
 
 extern const char *drbd_buildtag(void);
-#define REL_VERSION "8.3.11"
+#define REL_VERSION "8.3.13"
 #define API_VERSION 88
 #define PRO_VERSION_MIN 86
 #define PRO_VERSION_MAX 96
@@ -112,8 +112,8 @@ enum drbd_ret_code {
         ERR_OPEN_MD_DISK        = 105,
         ERR_DISK_NOT_BDEV       = 107,
         ERR_MD_NOT_BDEV         = 108,
-        ERR_DISK_TO_SMALL       = 111,
-        ERR_MD_DISK_TO_SMALL    = 112,
+        ERR_DISK_TOO_SMALL      = 111,
+        ERR_MD_DISK_TOO_SMALL   = 112,
         ERR_BDCLAIM_DISK        = 114,
         ERR_BDCLAIM_MD_DISK     = 115,
         ERR_MD_IDX_INVALID      = 116,
diff --git a/include/linux/drbd_limits.h b/include/linux/drbd_limits.h
index 447c36752385..fb670bf603f7 100644
--- a/include/linux/drbd_limits.h
+++ b/include/linux/drbd_limits.h
@@ -48,6 +48,11 @@
 #define DRBD_TIMEOUT_MAX 600
 #define DRBD_TIMEOUT_DEF 60       /* 6 seconds */
 
+ /* If backing disk takes longer than disk_timeout, mark the disk as failed */
+#define DRBD_DISK_TIMEOUT_MIN 0    /* 0 = disabled */
+#define DRBD_DISK_TIMEOUT_MAX 6000 /* 10 Minutes */
+#define DRBD_DISK_TIMEOUT_DEF 0    /* disabled */
+
   /* active connection retries when C_WF_CONNECTION */
 #define DRBD_CONNECT_INT_MIN 1
 #define DRBD_CONNECT_INT_MAX 120
@@ -60,7 +65,7 @@
 
  /* timeout for the ping packets.*/
 #define DRBD_PING_TIMEO_MIN  1
-#define DRBD_PING_TIMEO_MAX  100
+#define DRBD_PING_TIMEO_MAX  300
 #define DRBD_PING_TIMEO_DEF  5
 
   /* max number of write requests between write barriers */
diff --git a/include/linux/drbd_nl.h b/include/linux/drbd_nl.h
index ab6159e4fcf0..a8706f08ab36 100644
--- a/include/linux/drbd_nl.h
+++ b/include/linux/drbd_nl.h
@@ -31,9 +31,12 @@ NL_PACKET(disk_conf, 3,
         NL_INTEGER(     56,     T_MAY_IGNORE,   max_bio_bvecs)
         NL_BIT(         57,     T_MAY_IGNORE,   no_disk_barrier)
         NL_BIT(         58,     T_MAY_IGNORE,   no_disk_drain)
+        NL_INTEGER(     89,     T_MAY_IGNORE,   disk_timeout)
 )
 
-NL_PACKET(detach, 4, )
+NL_PACKET(detach, 4,
+        NL_BIT(         88,     T_MANDATORY,    detach_force)
+)
 
 NL_PACKET(net_conf, 5,
         NL_STRING(      8,      T_MANDATORY,    my_addr,        128)
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index cb4428ab81ed..f50d4058c5fb 100644
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -320,7 +320,24 @@ struct dvb_frontend_event {
 
 #define DTV_ENUM_DELSYS         44
 
-#define DTV_MAX_COMMAND                         DTV_ENUM_DELSYS
+/* ATSC-MH */
+#define DTV_ATSCMH_FIC_VER              45
+#define DTV_ATSCMH_PARADE_ID            46
+#define DTV_ATSCMH_NOG                  47
+#define DTV_ATSCMH_TNOG                 48
+#define DTV_ATSCMH_SGN                  49
+#define DTV_ATSCMH_PRC                  50
+#define DTV_ATSCMH_RS_FRAME_MODE        51
+#define DTV_ATSCMH_RS_FRAME_ENSEMBLE    52
+#define DTV_ATSCMH_RS_CODE_MODE_PRI     53
+#define DTV_ATSCMH_RS_CODE_MODE_SEC     54
+#define DTV_ATSCMH_SCCC_BLOCK_MODE      55
+#define DTV_ATSCMH_SCCC_CODE_MODE_A     56
+#define DTV_ATSCMH_SCCC_CODE_MODE_B     57
+#define DTV_ATSCMH_SCCC_CODE_MODE_C     58
+#define DTV_ATSCMH_SCCC_CODE_MODE_D     59
+
+#define DTV_MAX_COMMAND                         DTV_ATSCMH_SCCC_CODE_MODE_D
 
 typedef enum fe_pilot {
         PILOT_ON,
@@ -360,6 +377,38 @@ typedef enum fe_delivery_system {
 
 #define SYS_DVBC_ANNEX_AC       SYS_DVBC_ANNEX_A
 
+/* ATSC-MH */
+
+enum atscmh_sccc_block_mode {
+        ATSCMH_SCCC_BLK_SEP      = 0,
+        ATSCMH_SCCC_BLK_COMB     = 1,
+        ATSCMH_SCCC_BLK_RES      = 2,
+};
+
+enum atscmh_sccc_code_mode {
+        ATSCMH_SCCC_CODE_HLF     = 0,
+        ATSCMH_SCCC_CODE_QTR     = 1,
+        ATSCMH_SCCC_CODE_RES     = 2,
+};
+
+enum atscmh_rs_frame_ensemble {
+        ATSCMH_RSFRAME_ENS_PRI   = 0,
+        ATSCMH_RSFRAME_ENS_SEC   = 1,
+};
+
+enum atscmh_rs_frame_mode {
+        ATSCMH_RSFRAME_PRI_ONLY  = 0,
+        ATSCMH_RSFRAME_PRI_SEC   = 1,
+        ATSCMH_RSFRAME_RES       = 2,
+};
+
+enum atscmh_rs_code_mode {
+        ATSCMH_RSCODE_211_187    = 0,
+        ATSCMH_RSCODE_223_187    = 1,
+        ATSCMH_RSCODE_235_187    = 2,
+        ATSCMH_RSCODE_RES        = 3,
+};
+
 
 struct dtv_cmds_h {
         char    *name;          /* A display name for debugging purposes */
diff --git a/include/linux/dvb/version.h b/include/linux/dvb/version.h
index 0559e2bd38f9..43d9e8d462d4 100644
--- a/include/linux/dvb/version.h
+++ b/include/linux/dvb/version.h
@@ -24,6 +24,6 @@
 #define _DVBVERSION_H_
 
 #define DVB_API_VERSION 5
-#define DVB_API_VERSION_MINOR 5
+#define DVB_API_VERSION_MINOR 6
 
 #endif /*_DVBVERSION_H_*/
diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h
index 7e3c53a900d8..c18257b0fa72 100644
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
@@ -17,8 +17,8 @@ struct _ddebug {
         const char *format;
         unsigned int lineno:18;
         /*
-         * The flags field controls the behaviour at the callsite.
-         * The bits here are changed dynamically when the user
+         * The flags field controls the behaviour at the callsite.
+         * The bits here are changed dynamically when the user
          * writes commands to <debugfs>/dynamic_debug/control
          */
 #define _DPRINTK_FLAGS_NONE     0
@@ -44,6 +44,9 @@ extern int ddebug_remove_module(const char *mod_name);
 extern __printf(2, 3)
 int __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...);
 
+extern int ddebug_dyndbg_module_param_cb(char *param, char *val,
+                                        const char *modname);
+
 struct device;
 
 extern __printf(3, 4)
@@ -94,11 +97,26 @@ do {								\
 
 #else
 
+#include <linux/string.h>
+#include <linux/errno.h>
+
 static inline int ddebug_remove_module(const char *mod)
 {
         return 0;
 }
 
+static inline int ddebug_dyndbg_module_param_cb(char *param, char *val,
+                                                const char *modname)
+{
+        if (strstr(param, "dyndbg")) {
+                /* avoid pr_warn(), which wants pr_fmt() fully defined */
+                printk(KERN_WARNING "dyndbg param is supported only in "
+                        "CONFIG_DYNAMIC_DEBUG builds\n");
+                return 0; /* allow and ignore */
+        }
+        return -EINVAL;
+}
+
 #define dynamic_pr_debug(fmt, ...)                                      \
         do { if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); } while (0)
 #define dynamic_dev_dbg(dev, fmt, ...)                                  \
diff --git a/include/linux/edac.h b/include/linux/edac.h
index c621d762bb2c..91ba3bae42ee 100644
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -71,6 +71,25 @@ enum dev_type {
 #define DEV_FLAG_X64            BIT(DEV_X64)
 
 /**
+ * enum hw_event_mc_err_type - type of the detected error
+ *
+ * @HW_EVENT_ERR_CORRECTED:     Corrected Error - Indicates that an ECC
+ *                              corrected error was detected
+ * @HW_EVENT_ERR_UNCORRECTED:   Uncorrected Error - Indicates an error that
+ *                              can't be corrected by ECC, but it is not
+ *                              fatal (maybe it is on an unused memory area,
+ *                              or the memory controller could recover from
+ *                              it for example, by re-trying the operation).
+ * @HW_EVENT_ERR_FATAL:         Fatal Error - Uncorrected error that could not
+ *                              be recovered.
+ */
+enum hw_event_mc_err_type {
+        HW_EVENT_ERR_CORRECTED,
+        HW_EVENT_ERR_UNCORRECTED,
+        HW_EVENT_ERR_FATAL,
+};
+
+/**
  * enum mem_type - memory types. For a more detailed reference, please see
  *                      http://en.wikipedia.org/wiki/DRAM
  *
@@ -313,38 +332,141 @@ enum scrub_type {
  */
 
 /**
+ * enum edac_mc_layer - memory controller hierarchy layer
+ *
+ * @EDAC_MC_LAYER_BRANCH:       memory layer is named "branch"
+ * @EDAC_MC_LAYER_CHANNEL:      memory layer is named "channel"
+ * @EDAC_MC_LAYER_SLOT:         memory layer is named "slot"
+ * @EDAC_MC_LAYER_CHIP_SELECT:  memory layer is named "chip select"
+ *
+ * This enum is used by the drivers to tell edac_mc_sysfs what name should
+ * be used when describing a memory stick location.
+ */
+enum edac_mc_layer_type {
+        EDAC_MC_LAYER_BRANCH,
+        EDAC_MC_LAYER_CHANNEL,
+        EDAC_MC_LAYER_SLOT,
+        EDAC_MC_LAYER_CHIP_SELECT,
+};
+
+/**
+ * struct edac_mc_layer - describes the memory controller hierarchy
+ * @layer:              layer type
+ * @size:               number of components per layer. For example,
+ *                      if the channel layer has two channels, size = 2
+ * @is_virt_csrow:      This layer is part of the "csrow" when old API
+ *                      compatibility mode is enabled. Otherwise, it is
+ *                      a channel
+ */
+struct edac_mc_layer {
+        enum edac_mc_layer_type type;
+        unsigned                size;
+        bool                    is_virt_csrow;
+};
+
+/*
+ * Maximum number of layers used by the memory controller to uniquely
+ * identify a single memory stick.
+ * NOTE: Changing this constant requires not only to change the constant
+ * below, but also to change the existing code at the core, as there are
+ * some code there that are optimized for 3 layers.
+ */
+#define EDAC_MAX_LAYERS         3
+
+/**
+ * EDAC_DIMM_PTR - Macro responsible to find a pointer inside a pointer array
+ *                 for the element given by [layer0,layer1,layer2] position
+ *
+ * @layers:     a struct edac_mc_layer array, describing how many elements
+ *              were allocated for each layer
+ * @var:        name of the var where we want to get the pointer
+ *              (like mci->dimms)
+ * @n_layers:   Number of layers at the @layers array
+ * @layer0:     layer0 position
+ * @layer1:     layer1 position. Unused if n_layers < 2
+ * @layer2:     layer2 position. Unused if n_layers < 3
+ *
+ * For 1 layer, this macro returns &var[layer0]
+ * For 2 layers, this macro is similar to allocate a bi-dimensional array
+ *              and to return "&var[layer0][layer1]"
+ * For 3 layers, this macro is similar to allocate a tri-dimensional array
+ *              and to return "&var[layer0][layer1][layer2]"
+ *
+ * A loop could be used here to make it more generic, but, as we only have
+ * 3 layers, this is a little faster.
+ * By design, layers can never be 0 or more than 3. If that ever happens,
+ * a NULL is returned, causing an OOPS during the memory allocation routine,
+ * with would point to the developer that he's doing something wrong.
+ */
+#define EDAC_DIMM_PTR(layers, var, nlayers, layer0, layer1, layer2) ({  \
+        typeof(var) __p;                                                \
+        if ((nlayers) == 1)                                             \
+                __p = &var[layer0];                                     \
+        else if ((nlayers) == 2)                                        \
+                __p = &var[(layer1) + ((layers[1]).size * (layer0))];   \
+        else if ((nlayers) == 3)                                        \
+                __p = &var[(layer2) + ((layers[2]).size * ((layer1) +   \
+                            ((layers[1]).size * (layer0))))];           \
+        else                                                            \
+                __p = NULL;                                             \
+        __p;                                                            \
+})
+
+
+/* FIXME: add the proper per-location error counts */
+struct dimm_info {
+        char label[EDAC_MC_LABEL_LEN + 1];      /* DIMM label on motherboard */
+
+        /* Memory location data */
+        unsigned location[EDAC_MAX_LAYERS];
+
+        struct mem_ctl_info *mci;       /* the parent */
+
+        u32 grain;              /* granularity of reported error in bytes */
+        enum dev_type dtype;    /* memory device type */
+        enum mem_type mtype;    /* memory dimm type */
+        enum edac_type edac_mode;       /* EDAC mode for this dimm */
+
+        u32 nr_pages;                   /* number of pages on this dimm */
+
+        unsigned csrow, cschannel;      /* Points to the old API data */
+};
+
+/**
  * struct rank_info - contains the information for one DIMM rank
  *
  * @chan_idx:   channel number where the rank is (typically, 0 or 1)
  * @ce_count:   number of correctable errors for this rank
- * @label:      DIMM label. Different ranks for the same DIMM should be
- *              filled, on userspace, with the same label.
- *              FIXME: The core currently won't enforce it.
  * @csrow:      A pointer to the chip select row structure (the parent
  *              structure). The location of the rank is given by
  *              the (csrow->csrow_idx, chan_idx) vector.
+ * @dimm:       A pointer to the DIMM structure, where the DIMM label
+ *              information is stored.
+ *
+ * FIXME: Currently, the EDAC core model will assume one DIMM per rank.
+ *        This is a bad assumption, but it makes this patch easier. Later
+ *        patches in this series will fix this issue.
  */
 struct rank_info {
         int chan_idx;
-        u32 ce_count;
-        char label[EDAC_MC_LABEL_LEN + 1];
-        struct csrow_info *csrow;       /* the parent */
+        struct csrow_info *csrow;
+        struct dimm_info *dimm;
+
+        u32 ce_count;           /* Correctable Errors for this csrow */
 };
 
 struct csrow_info {
-        unsigned long first_page;       /* first page number in dimm */
-        unsigned long last_page;        /* last page number in dimm */
+        /* Used only by edac_mc_find_csrow_by_page() */
+        unsigned long first_page;       /* first page number in csrow */
+        unsigned long last_page;        /* last page number in csrow */
         unsigned long page_mask;        /* used for interleaving -
-                                         * 0UL for non intlv
-                                         */
-        u32 nr_pages;           /* number of pages in csrow */
-        u32 grain;              /* granularity of reported error in bytes */
-        int csrow_idx;          /* the chip-select row */
-        enum dev_type dtype;    /* memory device type */
+                                         * 0UL for non intlv */
+
+        int csrow_idx;                  /* the chip-select row */
+
         u32 ue_count;           /* Uncorrectable Errors for this csrow */
         u32 ce_count;           /* Correctable Errors for this csrow */
-        enum mem_type mtype;    /* memory csrow type */
-        enum edac_type edac_mode;       /* EDAC mode for this csrow */
+
         struct mem_ctl_info *mci;       /* the parent */
 
         struct kobject kobj;    /* sysfs kobject for this csrow */
@@ -426,8 +548,20 @@ struct mem_ctl_info {
         unsigned long (*ctl_page_to_phys) (struct mem_ctl_info * mci,
                                            unsigned long page);
         int mc_idx;
-        int nr_csrows;
         struct csrow_info *csrows;
+        unsigned nr_csrows, num_cschannel;
+
+        /* Memory Controller hierarchy */
+        unsigned n_layers;
+        struct edac_mc_layer *layers;
+        bool mem_is_per_rank;
+
+        /*
+         * DIMM info. Will eventually remove the entire csrows_info some day
+         */
+        unsigned tot_dimms;
+        struct dimm_info *dimms;
+
         /*
          * FIXME - what about controllers on other busses? - IDs must be
          * unique.  dev pointer should be sufficiently unique, but
@@ -440,12 +574,16 @@ struct mem_ctl_info {
         const char *dev_name;
         char proc_name[MC_PROC_NAME_MAX_LEN + 1];
         void *pvt_info;
-        u32 ue_noinfo_count;    /* Uncorrectable Errors w/o info */
-        u32 ce_noinfo_count;    /* Correctable Errors w/o info */
-        u32 ue_count;           /* Total Uncorrectable Errors for this MC */
-        u32 ce_count;           /* Total Correctable Errors for this MC */
         unsigned long start_time;       /* mci load start time (in jiffies) */
 
+        /*
+         * drivers shouldn't access those fields directly, as the core
+         * already handles that.
+         */
+        u32 ce_noinfo_count, ue_noinfo_count;
+        u32 ue_mc, ce_mc;
+        u32 *ce_per_layer[EDAC_MAX_LAYERS], *ue_per_layer[EDAC_MAX_LAYERS];
+
         struct completion complete;
 
         /* edac sysfs device control */
@@ -458,7 +596,7 @@ struct mem_ctl_info {
          * by the low level driver.
          *
          * Set by the low level driver to provide attributes at the
-         * controller level, same level as 'ue_count' and 'ce_count' above.
+         * controller level.
          * An array of structures, NULL terminated
          *
          * If attributes are desired, then set to array of attributes
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 7d4e0356f329..c03af7687bb4 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -28,12 +28,13 @@ typedef int (elevator_may_queue_fn) (struct request_queue *, int);
 
 typedef void (elevator_init_icq_fn) (struct io_cq *);
 typedef void (elevator_exit_icq_fn) (struct io_cq *);
-typedef int (elevator_set_req_fn) (struct request_queue *, struct request *, gfp_t);
+typedef int (elevator_set_req_fn) (struct request_queue *, struct request *,
+                                   struct bio *, gfp_t);
 typedef void (elevator_put_req_fn) (struct request *);
 typedef void (elevator_activate_req_fn) (struct request_queue *, struct request *);
 typedef void (elevator_deactivate_req_fn) (struct request_queue *, struct request *);
 
-typedef void *(elevator_init_fn) (struct request_queue *);
+typedef int (elevator_init_fn) (struct request_queue *);
 typedef void (elevator_exit_fn) (struct elevator_queue *);
 
 struct elevator_ops
@@ -129,7 +130,8 @@ extern void elv_unregister_queue(struct request_queue *q);
 extern int elv_may_queue(struct request_queue *, int);
 extern void elv_abort_queue(struct request_queue *);
 extern void elv_completed_request(struct request_queue *, struct request *);
-extern int elv_set_request(struct request_queue *, struct request *, gfp_t);
+extern int elv_set_request(struct request_queue *q, struct request *rq,
+                           struct bio *bio, gfp_t gfp_mask);
 extern void elv_put_request(struct request_queue *, struct request *);
 extern void elv_drain_elevator(struct request_queue *);
 
diff --git a/include/linux/errno.h b/include/linux/errno.h
index 2d09bfa5c262..e0de516374da 100644
--- a/include/linux/errno.h
+++ b/include/linux/errno.h
@@ -17,6 +17,7 @@
 #define ENOIOCTLCMD     515     /* No ioctl command */
 #define ERESTART_RESTARTBLOCK 516 /* restart by calling sys_restart_syscall */
 #define EPROBE_DEFER    517     /* Driver requests probe retry */
+#define EOPENSTALE      518     /* open found a stale dentry */
 
 /* Defined for the NFSv3 protocol */
 #define EBADHANDLE      521     /* Illegal NFS file handle */
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index fe5136d81454..3d406e0ede6d 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -18,8 +18,6 @@
  *              as published by the Free Software Foundation; either version
  *              2 of the License, or (at your option) any later version.
  *
- *      WARNING: This move may well be temporary. This file will get merged with others RSN.
- *
  */
 #ifndef _LINUX_ETHERDEVICE_H
 #define _LINUX_ETHERDEVICE_H
@@ -59,7 +57,7 @@ extern struct net_device *alloc_etherdev_mqs(int sizeof_priv, unsigned int txqs,
  *
  * Return true if the address is all zeroes.
  */
-static inline int is_zero_ether_addr(const u8 *addr)
+static inline bool is_zero_ether_addr(const u8 *addr)
 {
         return !(addr[0] | addr[1] | addr[2] | addr[3] | addr[4] | addr[5]);
 }
@@ -71,7 +69,7 @@ static inline int is_zero_ether_addr(const u8 *addr)
  * Return true if the address is a multicast address.
  * By definition the broadcast address is also a multicast address.
  */
-static inline int is_multicast_ether_addr(const u8 *addr)
+static inline bool is_multicast_ether_addr(const u8 *addr)
 {
         return 0x01 & addr[0];
 }
@@ -82,7 +80,7 @@ static inline int is_multicast_ether_addr(const u8 *addr)
  *
  * Return true if the address is a local address.
  */
-static inline int is_local_ether_addr(const u8 *addr)
+static inline bool is_local_ether_addr(const u8 *addr)
 {
         return 0x02 & addr[0];
 }
@@ -93,7 +91,7 @@ static inline int is_local_ether_addr(const u8 *addr)
  *
  * Return true if the address is the broadcast address.
  */
-static inline int is_broadcast_ether_addr(const u8 *addr)
+static inline bool is_broadcast_ether_addr(const u8 *addr)
 {
         return (addr[0] & addr[1] & addr[2] & addr[3] & addr[4] & addr[5]) == 0xff;
 }
@@ -104,7 +102,7 @@ static inline int is_broadcast_ether_addr(const u8 *addr)
  *
  * Return true if the address is a unicast address.
  */
-static inline int is_unicast_ether_addr(const u8 *addr)
+static inline bool is_unicast_ether_addr(const u8 *addr)
 {
         return !is_multicast_ether_addr(addr);
 }
@@ -118,7 +116,7 @@ static inline int is_unicast_ether_addr(const u8 *addr)
  *
  * Return true if the address is valid.
  */
-static inline int is_valid_ether_addr(const u8 *addr)
+static inline bool is_valid_ether_addr(const u8 *addr)
 {
         /* FF:FF:FF:FF:FF:FF is a multicast address so we don't need to
          * explicitly check for it here. */
@@ -159,7 +157,7 @@ static inline void eth_hw_addr_random(struct net_device *dev)
  * @addr1: Pointer to a six-byte array containing the Ethernet address
  * @addr2: Pointer other six-byte array containing the Ethernet address
  *
- * Compare two ethernet addresses, returns 0 if equal, non-zero otherwise.
+ * Compare two Ethernet addresses, returns 0 if equal, non-zero otherwise.
  * Unlike memcmp(), it doesn't return a value suitable for sorting.
  */
 static inline unsigned compare_ether_addr(const u8 *addr1, const u8 *addr2)
@@ -171,6 +169,18 @@ static inline unsigned compare_ether_addr(const u8 *addr1, const u8 *addr2)
         return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) != 0;
 }
 
+/**
+ * ether_addr_equal - Compare two Ethernet addresses
+ * @addr1: Pointer to a six-byte array containing the Ethernet address
+ * @addr2: Pointer other six-byte array containing the Ethernet address
+ *
+ * Compare two Ethernet addresses, returns true if equal
+ */
+static inline bool ether_addr_equal(const u8 *addr1, const u8 *addr2)
+{
+        return !compare_ether_addr(addr1, addr2);
+}
+
 static inline unsigned long zap_last_2bytes(unsigned long value)
 {
 #ifdef __BIG_ENDIAN
@@ -181,34 +191,34 @@ static inline unsigned long zap_last_2bytes(unsigned long value)
 }
 
 /**
- * compare_ether_addr_64bits - Compare two Ethernet addresses
+ * ether_addr_equal_64bits - Compare two Ethernet addresses
  * @addr1: Pointer to an array of 8 bytes
  * @addr2: Pointer to an other array of 8 bytes
  *
- * Compare two ethernet addresses, returns 0 if equal, non-zero otherwise.
- * Unlike memcmp(), it doesn't return a value suitable for sorting.
+ * Compare two Ethernet addresses, returns true if equal, false otherwise.
+ *
  * The function doesn't need any conditional branches and possibly uses
  * word memory accesses on CPU allowing cheap unaligned memory reads.
- * arrays = { byte1, byte2, byte3, byte4, byte6, byte7, pad1, pad2}
+ * arrays = { byte1, byte2, byte3, byte4, byte5, byte6, pad1, pad2 }
  *
- * Please note that alignment of addr1 & addr2 is only guaranted to be 16 bits.
+ * Please note that alignment of addr1 & addr2 are only guaranteed to be 16 bits.
  */
 
-static inline unsigned compare_ether_addr_64bits(const u8 addr1[6+2],
-                                                 const u8 addr2[6+2])
+static inline bool ether_addr_equal_64bits(const u8 addr1[6+2],
+                                           const u8 addr2[6+2])
 {
 #ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
         unsigned long fold = ((*(unsigned long *)addr1) ^
                               (*(unsigned long *)addr2));
 
         if (sizeof(fold) == 8)
-                return zap_last_2bytes(fold) != 0;
+                return zap_last_2bytes(fold) == 0;
 
         fold |= zap_last_2bytes((*(unsigned long *)(addr1 + 4)) ^
                                 (*(unsigned long *)(addr2 + 4)));
-        return fold != 0;
+        return fold == 0;
 #else
-        return compare_ether_addr(addr1, addr2);
+        return ether_addr_equal(addr1, addr2);
 #endif
 }
 
@@ -220,23 +230,23 @@ static inline unsigned compare_ether_addr_64bits(const u8 addr1[6+2],
  * Compare passed address with all addresses of the device. Return true if the
  * address if one of the device addresses.
  *
- * Note that this function calls compare_ether_addr_64bits() so take care of
+ * Note that this function calls ether_addr_equal_64bits() so take care of
  * the right padding.
  */
 static inline bool is_etherdev_addr(const struct net_device *dev,
                                     const u8 addr[6 + 2])
 {
         struct netdev_hw_addr *ha;
-        int res = 1;
+        bool res = false;
 
         rcu_read_lock();
         for_each_dev_addr(dev, ha) {
-                res = compare_ether_addr_64bits(addr, ha->addr);
-                if (!res)
+                res = ether_addr_equal_64bits(addr, ha->addr);
+                if (res)
                         break;
         }
         rcu_read_unlock();
-        return !res;
+        return res;
 }
 #endif  /* __KERNEL__ */
 
@@ -245,7 +255,7 @@ static inline bool is_etherdev_addr(const struct net_device *dev,
  * @a: Pointer to Ethernet header
  * @b: Pointer to Ethernet header
  *
- * Compare two ethernet headers, returns 0 if equal.
+ * Compare two Ethernet headers, returns 0 if equal.
  * This assumes that the network header (i.e., IP header) is 4-byte
  * aligned OR the platform can handle unaligned access.  This is the
  * case for all packets coming into netif_receive_skb or similar
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index f5647b59a90e..e17fa7140588 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -137,6 +137,23 @@ struct ethtool_eeprom {
 };
 
 /**
+ * struct ethtool_modinfo - plugin module eeprom information
+ * @cmd: %ETHTOOL_GMODULEINFO
+ * @type: Standard the module information conforms to %ETH_MODULE_SFF_xxxx
+ * @eeprom_len: Length of the eeprom
+ *
+ * This structure is used to return the information to
+ * properly size memory for a subsequent call to %ETHTOOL_GMODULEEEPROM.
+ * The type code indicates the eeprom data format
+ */
+struct ethtool_modinfo {
+        __u32   cmd;
+        __u32   type;
+        __u32   eeprom_len;
+        __u32   reserved[8];
+};
+
+/**
  * struct ethtool_coalesce - coalescing parameters for IRQs and stats updates
  * @cmd: ETHTOOL_{G,S}COALESCE
  * @rx_coalesce_usecs: How many usecs to delay an RX interrupt after
@@ -661,12 +678,17 @@ struct ethtool_flash {
  *      %ETHTOOL_SET_DUMP
  * @version: FW version of the dump, filled in by driver
  * @flag: driver dependent flag for dump setting, filled in by driver during
- *        get and filled in by ethtool for set operation
+ *        get and filled in by ethtool for set operation.
+ *        flag must be initialized by macro ETH_FW_DUMP_DISABLE value when
+ *        firmware dump is disabled.
  * @len: length of dump data, used as the length of the user buffer on entry to
  *       %ETHTOOL_GET_DUMP_DATA and this is returned as dump length by driver
  *       for %ETHTOOL_GET_DUMP_FLAG command
  * @data: data collected for get dump data operation
  */
+
+#define ETH_FW_DUMP_DISABLE 0
+
 struct ethtool_dump {
         __u32   cmd;
         __u32   version;
@@ -726,6 +748,29 @@ struct ethtool_sfeatures {
         struct ethtool_set_features_block features[0];
 };
 
+/**
+ * struct ethtool_ts_info - holds a device's timestamping and PHC association
+ * @cmd: command number = %ETHTOOL_GET_TS_INFO
+ * @so_timestamping: bit mask of the sum of the supported SO_TIMESTAMPING flags
+ * @phc_index: device index of the associated PHC, or -1 if there is none
+ * @tx_types: bit mask of the supported hwtstamp_tx_types enumeration values
+ * @rx_filters: bit mask of the supported hwtstamp_rx_filters enumeration values
+ *
+ * The bits in the 'tx_types' and 'rx_filters' fields correspond to
+ * the 'hwtstamp_tx_types' and 'hwtstamp_rx_filters' enumeration values,
+ * respectively.  For example, if the device supports HWTSTAMP_TX_ON,
+ * then (1 << HWTSTAMP_TX_ON) in 'tx_types' will be set.
+ */
+struct ethtool_ts_info {
+        __u32   cmd;
+        __u32   so_timestamping;
+        __s32   phc_index;
+        __u32   tx_types;
+        __u32   tx_reserved[3];
+        __u32   rx_filters;
+        __u32   rx_reserved[3];
+};
+
 /*
  * %ETHTOOL_SFEATURES changes features present in features[].valid to the
  * values of corresponding bits in features[].requested. Bits in .requested
@@ -788,6 +833,7 @@ struct net_device;
 
 /* Some generic methods drivers may use in their ethtool_ops */
 u32 ethtool_op_get_link(struct net_device *dev);
+int ethtool_op_get_ts_info(struct net_device *dev, struct ethtool_ts_info *eti);
 
 /**
  * ethtool_rxfh_indir_default - get default value for RX flow hash indirection
@@ -893,6 +939,12 @@ static inline u32 ethtool_rxfh_indir_default(u32 index, u32 n_rx_rings)
  *                 and flag of the device.
  * @get_dump_data: Get dump data.
  * @set_dump: Set dump specific flags to the device.
+ * @get_ts_info: Get the time stamping and PTP hardware clock capabilities.
+ *      Drivers supporting transmit time stamps in software should set this to
+ *      ethtool_op_get_ts_info().
+ * @get_module_info: Get the size and type of the eeprom contained within
+ *      a plug-in module.
+ * @get_module_eeprom: Get the eeprom information from the plug-in module
  *
  * All operations are optional (i.e. the function pointer may be set
  * to %NULL) and callers must take this into account.  Callers must
@@ -954,6 +1006,12 @@ struct ethtool_ops {
         int     (*get_dump_data)(struct net_device *,
                                  struct ethtool_dump *, void *);
         int     (*set_dump)(struct net_device *, struct ethtool_dump *);
+        int     (*get_ts_info)(struct net_device *, struct ethtool_ts_info *);
+        int     (*get_module_info)(struct net_device *,
+                                   struct ethtool_modinfo *);
+        int     (*get_module_eeprom)(struct net_device *,
+                                     struct ethtool_eeprom *, u8 *);
+
 
 };
 #endif /* __KERNEL__ */
@@ -1028,6 +1086,9 @@ struct ethtool_ops {
 #define ETHTOOL_SET_DUMP        0x0000003e /* Set dump settings */
 #define ETHTOOL_GET_DUMP_FLAG   0x0000003f /* Get dump settings */
 #define ETHTOOL_GET_DUMP_DATA   0x00000040 /* Get dump data */
+#define ETHTOOL_GET_TS_INFO     0x00000041 /* Get time stamping and PHC info */
+#define ETHTOOL_GMODULEINFO     0x00000042 /* Get plug-in module information */
+#define ETHTOOL_GMODULEEEPROM   0x00000043 /* Get plug-in module eeprom */
 
 /* compatibility with older code */
 #define SPARC_ETH_GSET          ETHTOOL_GSET
@@ -1177,6 +1238,12 @@ struct ethtool_ops {
 #define RX_CLS_LOC_FIRST        0xfffffffe
 #define RX_CLS_LOC_LAST         0xfffffffd
 
+/* EEPROM Standards for plug in modules */
+#define ETH_MODULE_SFF_8079             0x1
+#define ETH_MODULE_SFF_8079_LEN         256
+#define ETH_MODULE_SFF_8472             0x2
+#define ETH_MODULE_SFF_8472_LEN         512
+
 /* Reset flags */
 /* The reset() operation must clear the flags for the components which
  * were actually reset.  On successful return, the flags indicate the
diff --git a/include/linux/eventfd.h b/include/linux/eventfd.h
index 91bb4f27238c..3c3ef19a625a 100644
--- a/include/linux/eventfd.h
+++ b/include/linux/eventfd.h
@@ -34,7 +34,7 @@ void eventfd_ctx_put(struct eventfd_ctx *ctx);
 struct file *eventfd_fget(int fd);
 struct eventfd_ctx *eventfd_ctx_fdget(int fd);
 struct eventfd_ctx *eventfd_ctx_fileget(struct file *file);
-int eventfd_signal(struct eventfd_ctx *ctx, int n);
+__u64 eventfd_signal(struct eventfd_ctx *ctx, __u64 n);
 ssize_t eventfd_ctx_read(struct eventfd_ctx *ctx, int no_wait, __u64 *cnt);
 int eventfd_ctx_remove_wait_queue(struct eventfd_ctx *ctx, wait_queue_t *wait,
                                   __u64 *cnt);
diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h
index 657ab55beda0..6f8be328770a 100644
--- a/include/linux/eventpoll.h
+++ b/include/linux/eventpoll.h
@@ -26,6 +26,18 @@
 #define EPOLL_CTL_DEL 2
 #define EPOLL_CTL_MOD 3
 
+/*
+ * Request the handling of system wakeup events so as to prevent system suspends
+ * from happening while those events are being processed.
+ *
+ * Assuming neither EPOLLET nor EPOLLONESHOT is set, system suspends will not be
+ * re-allowed until epoll_wait is called again after consuming the wakeup
+ * event(s).
+ *
+ * Requires CAP_EPOLLWAKEUP
+ */
+#define EPOLLWAKEUP (1 << 29)
+
 /* Set the One Shot behaviour for the target file descriptor */
 #define EPOLLONESHOT (1 << 30)
 
diff --git a/include/linux/exportfs.h b/include/linux/exportfs.h
index 3a4cef5322dc..12291a7ee275 100644
--- a/include/linux/exportfs.h
+++ b/include/linux/exportfs.h
@@ -165,8 +165,8 @@ struct fid {
  */
 
 struct export_operations {
-        int (*encode_fh)(struct dentry *de, __u32 *fh, int *max_len,
-                        int connectable);
+        int (*encode_fh)(struct inode *inode, __u32 *fh, int *max_len,
+                        struct inode *parent);
         struct dentry * (*fh_to_dentry)(struct super_block *sb, struct fid *fid,
                         int fh_len, int fh_type);
         struct dentry * (*fh_to_parent)(struct super_block *sb, struct fid *fid,
diff --git a/include/linux/extcon.h b/include/linux/extcon.h
new file mode 100644
index 000000000000..cdd401477656
--- /dev/null
+++ b/include/linux/extcon.h
@@ -0,0 +1,324 @@
+/*
+ *  External connector (extcon) class driver
+ *
+ * Copyright (C) 2012 Samsung Electronics
+ * Author: Donggeun Kim <dg77.kim@samsung.com>
+ * Author: MyungJoo Ham <myungjoo.ham@samsung.com>
+ *
+ * based on switch class driver
+ * Copyright (C) 2008 Google, Inc.
+ * Author: Mike Lockwood <lockwood@android.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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.
+ *
+*/
+
+#ifndef __LINUX_EXTCON_H__
+#define __LINUX_EXTCON_H__
+
+#include <linux/notifier.h>
+
+#define SUPPORTED_CABLE_MAX     32
+#define CABLE_NAME_MAX          30
+
+/*
+ * The standard cable name is to help support general notifier
+ * and notifee device drivers to share the common names.
+ * Please use standard cable names unless your notifier device has
+ * a very unique and abnormal cable or
+ * the cable type is supposed to be used with only one unique
+ * pair of notifier/notifee devices.
+ *
+ * Please add any other "standard" cables used with extcon dev.
+ *
+ * You may add a dot and number to specify version or specification
+ * of the specific cable if it is required. (e.g., "Fast-charger.18"
+ * and "Fast-charger.10" for 1.8A and 1.0A chargers)
+ * However, the notifee and notifier should be able to handle such
+ * string and if the notifee can negotiate the protocol or idenify,
+ * you don't need such convention. This convention is helpful when
+ * notifier can distinguish but notifiee cannot.
+ */
+enum extcon_cable_name {
+        EXTCON_USB = 0,
+        EXTCON_USB_HOST,
+        EXTCON_TA, /* Travel Adaptor */
+        EXTCON_FAST_CHARGER,
+        EXTCON_SLOW_CHARGER,
+        EXTCON_CHARGE_DOWNSTREAM, /* Charging an external device */
+        EXTCON_HDMI,
+        EXTCON_MHL,
+        EXTCON_DVI,
+        EXTCON_VGA,
+        EXTCON_DOCK,
+        EXTCON_LINE_IN,
+        EXTCON_LINE_OUT,
+        EXTCON_MIC_IN,
+        EXTCON_HEADPHONE_OUT,
+        EXTCON_SPDIF_IN,
+        EXTCON_SPDIF_OUT,
+        EXTCON_VIDEO_IN,
+        EXTCON_VIDEO_OUT,
+        EXTCON_MECHANICAL,
+};
+extern const char *extcon_cable_name[];
+
+struct extcon_cable;
+
+/**
+ * struct extcon_dev - An extcon device represents one external connector.
+ * @name        The name of this extcon device. Parent device name is used
+ *              if NULL.
+ * @supported_cable     Array of supported cable name ending with NULL.
+ *                      If supported_cable is NULL, cable name related APIs
+ *                      are disabled.
+ * @mutually_exclusive  Array of mutually exclusive set of cables that cannot
+ *                      be attached simultaneously. The array should be
+ *                      ending with NULL or be NULL (no mutually exclusive
+ *                      cables). For example, if it is { 0x7, 0x30, 0}, then,
+ *                      {0, 1}, {0, 1, 2}, {0, 2}, {1, 2}, or {4, 5} cannot
+ *                      be attached simulataneously. {0x7, 0} is equivalent to
+ *                      {0x3, 0x6, 0x5, 0}. If it is {0xFFFFFFFF, 0}, there
+ *                      can be no simultaneous connections.
+ * @print_name  An optional callback to override the method to print the
+ *              name of the extcon device.
+ * @print_state An optional callback to override the method to print the
+ *              status of the extcon device.
+ * @dev         Device of this extcon. Do not provide at register-time.
+ * @state       Attach/detach state of this extcon. Do not provide at
+ *              register-time
+ * @nh  Notifier for the state change events from this extcon
+ * @entry       To support list of extcon devices so that uses can search
+ *              for extcon devices based on the extcon name.
+ * @lock
+ * @max_supported       Internal value to store the number of cables.
+ * @extcon_dev_type     Device_type struct to provide attribute_groups
+ *                      customized for each extcon device.
+ * @cables      Sysfs subdirectories. Each represents one cable.
+ *
+ * In most cases, users only need to provide "User initializing data" of
+ * this struct when registering an extcon. In some exceptional cases,
+ * optional callbacks may be needed. However, the values in "internal data"
+ * are overwritten by register function.
+ */
+struct extcon_dev {
+        /* --- Optional user initializing data --- */
+        const char      *name;
+        const char **supported_cable;
+        const u32       *mutually_exclusive;
+
+        /* --- Optional callbacks to override class functions --- */
+        ssize_t (*print_name)(struct extcon_dev *edev, char *buf);
+        ssize_t (*print_state)(struct extcon_dev *edev, char *buf);
+
+        /* --- Internal data. Please do not set. --- */
+        struct device   *dev;
+        u32             state;
+        struct raw_notifier_head nh;
+        struct list_head entry;
+        spinlock_t lock; /* could be called by irq handler */
+        int max_supported;
+
+        /* /sys/class/extcon/.../cable.n/... */
+        struct device_type extcon_dev_type;
+        struct extcon_cable *cables;
+        /* /sys/class/extcon/.../mutually_exclusive/... */
+        struct attribute_group attr_g_muex;
+        struct attribute **attrs_muex;
+        struct device_attribute *d_attrs_muex;
+};
+
+/**
+ * struct extcon_cable  - An internal data for each cable of extcon device.
+ * @edev        The extcon device
+ * @cable_index Index of this cable in the edev
+ * @attr_g      Attribute group for the cable
+ * @attr_name   "name" sysfs entry
+ * @attr_state  "state" sysfs entry
+ * @attrs       Array pointing to attr_name and attr_state for attr_g
+ */
+struct extcon_cable {
+        struct extcon_dev *edev;
+        int cable_index;
+
+        struct attribute_group attr_g;
+        struct device_attribute attr_name;
+        struct device_attribute attr_state;
+
+        struct attribute *attrs[3]; /* to be fed to attr_g.attrs */
+};
+
+/**
+ * struct extcon_specific_cable_nb - An internal data for
+ *                              extcon_register_interest().
+ * @internal_nb a notifier block bridging extcon notifier and cable notifier.
+ * @user_nb     user provided notifier block for events from a specific cable.
+ * @cable_index the target cable.
+ * @edev        the target extcon device.
+ * @previous_value      the saved previous event value.
+ */
+struct extcon_specific_cable_nb {
+        struct notifier_block internal_nb;
+        struct notifier_block *user_nb;
+        int cable_index;
+        struct extcon_dev *edev;
+        unsigned long previous_value;
+};
+
+#if IS_ENABLED(CONFIG_EXTCON)
+
+/*
+ * Following APIs are for notifiers or configurations.
+ * Notifiers are the external port and connection devices.
+ */
+extern int extcon_dev_register(struct extcon_dev *edev, struct device *dev);
+extern void extcon_dev_unregister(struct extcon_dev *edev);
+extern struct extcon_dev *extcon_get_extcon_dev(const char *extcon_name);
+
+/*
+ * get/set/update_state access the 32b encoded state value, which represents
+ * states of all possible cables of the multistate port. For example, if one
+ * calls extcon_set_state(edev, 0x7), it may mean that all the three cables
+ * are attached to the port.
+ */
+static inline u32 extcon_get_state(struct extcon_dev *edev)
+{
+        return edev->state;
+}
+
+extern int extcon_set_state(struct extcon_dev *edev, u32 state);
+extern int extcon_update_state(struct extcon_dev *edev, u32 mask, u32 state);
+
+/*
+ * get/set_cable_state access each bit of the 32b encoded state value.
+ * They are used to access the status of each cable based on the cable_name
+ * or cable_index, which is retrived by extcon_find_cable_index
+ */
+extern int extcon_find_cable_index(struct extcon_dev *sdev,
+                                   const char *cable_name);
+extern int extcon_get_cable_state_(struct extcon_dev *edev, int cable_index);
+extern int extcon_set_cable_state_(struct extcon_dev *edev, int cable_index,
+                                   bool cable_state);
+
+extern int extcon_get_cable_state(struct extcon_dev *edev,
+                                  const char *cable_name);
+extern int extcon_set_cable_state(struct extcon_dev *edev,
+                                  const char *cable_name, bool cable_state);
+
+/*
+ * Following APIs are for notifiees (those who want to be notified)
+ * to register a callback for events from a specific cable of the extcon.
+ * Notifiees are the connected device drivers wanting to get notified by
+ * a specific external port of a connection device.
+ */
+extern int extcon_register_interest(struct extcon_specific_cable_nb *obj,
+                                    const char *extcon_name,
+                                    const char *cable_name,
+                                    struct notifier_block *nb);
+extern int extcon_unregister_interest(struct extcon_specific_cable_nb *nb);
+
+/*
+ * Following APIs are to monitor every action of a notifier.
+ * Registerer gets notified for every external port of a connection device.
+ * Probably this could be used to debug an action of notifier; however,
+ * we do not recommend to use this at normal 'notifiee' device drivers who
+ * want to be notified by a specific external port of the notifier.
+ */
+extern int extcon_register_notifier(struct extcon_dev *edev,
+                                    struct notifier_block *nb);
+extern int extcon_unregister_notifier(struct extcon_dev *edev,
+                                      struct notifier_block *nb);
+#else /* CONFIG_EXTCON */
+static inline int extcon_dev_register(struct extcon_dev *edev,
+                                      struct device *dev)
+{
+        return 0;
+}
+
+static inline void extcon_dev_unregister(struct extcon_dev *edev) { }
+
+static inline u32 extcon_get_state(struct extcon_dev *edev)
+{
+        return 0;
+}
+
+static inline int extcon_set_state(struct extcon_dev *edev, u32 state)
+{
+        return 0;
+}
+
+static inline int extcon_update_state(struct extcon_dev *edev, u32 mask,
+                                       u32 state)
+{
+        return 0;
+}
+
+static inline int extcon_find_cable_index(struct extcon_dev *edev,
+                                          const char *cable_name)
+{
+        return 0;
+}
+
+static inline int extcon_get_cable_state_(struct extcon_dev *edev,
+                                          int cable_index)
+{
+        return 0;
+}
+
+static inline int extcon_set_cable_state_(struct extcon_dev *edev,
+                                          int cable_index, bool cable_state)
+{
+        return 0;
+}
+
+static inline int extcon_get_cable_state(struct extcon_dev *edev,
+                        const char *cable_name)
+{
+        return 0;
+}
+
+static inline int extcon_set_cable_state(struct extcon_dev *edev,
+                        const char *cable_name, int state)
+{
+        return 0;
+}
+
+static inline struct extcon_dev *extcon_get_extcon_dev(const char *extcon_name)
+{
+        return NULL;
+}
+
+static inline int extcon_register_notifier(struct extcon_dev *edev,
+                                           struct notifier_block *nb)
+{
+        return 0;
+}
+
+static inline int extcon_unregister_notifier(struct extcon_dev *edev,
+                                             struct notifier_block *nb)
+{
+        return 0;
+}
+
+static inline int extcon_register_interest(struct extcon_specific_cable_nb *obj,
+                                           const char *extcon_name,
+                                           const char *cable_name,
+                                           struct notifier_block *nb)
+{
+        return 0;
+}
+
+static inline int extcon_unregister_interest(struct extcon_specific_cable_nb
+                                                    *obj)
+{
+        return 0;
+}
+#endif /* CONFIG_EXTCON */
+#endif /* __LINUX_EXTCON_H__ */
diff --git a/include/linux/extcon/extcon_gpio.h b/include/linux/extcon/extcon_gpio.h
new file mode 100644
index 000000000000..a2129b73dcb1
--- /dev/null
+++ b/include/linux/extcon/extcon_gpio.h
@@ -0,0 +1,52 @@
+/*
+ *  External connector (extcon) class generic GPIO driver
+ *
+ * Copyright (C) 2012 Samsung Electronics
+ * Author: MyungJoo Ham <myungjoo.ham@samsung.com>
+ *
+ * based on switch class driver
+ * Copyright (C) 2008 Google, Inc.
+ * Author: Mike Lockwood <lockwood@android.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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.
+ *
+*/
+#ifndef __EXTCON_GPIO_H__
+#define __EXTCON_GPIO_H__ __FILE__
+
+#include <linux/extcon.h>
+
+/**
+ * struct gpio_extcon_platform_data - A simple GPIO-controlled extcon device.
+ * @name        The name of this GPIO extcon device.
+ * @gpio        Corresponding GPIO.
+ * @debounce    Debounce time for GPIO IRQ in ms.
+ * @irq_flags   IRQ Flags (e.g., IRQF_TRIGGER_LOW).
+ * @state_on    print_state is overriden with state_on if attached. If Null,
+ *              default method of extcon class is used.
+ * @state_off   print_state is overriden with state_on if dettached. If Null,
+ *              default method of extcon class is used.
+ *
+ * Note that in order for state_on or state_off to be valid, both state_on
+ * and state_off should be not NULL. If at least one of them is NULL,
+ * the print_state is not overriden.
+ */
+struct gpio_extcon_platform_data {
+        const char *name;
+        unsigned gpio;
+        unsigned long debounce;
+        unsigned long irq_flags;
+
+        /* if NULL, "0" or "1" will be printed */
+        const char *state_on;
+        const char *state_off;
+};
+
+#endif /* __EXTCON_GPIO_H__ */
diff --git a/include/linux/fb.h b/include/linux/fb.h
index d31cb682e173..ac3f1c605843 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -554,6 +554,10 @@ struct fb_cursor_user {
 #define FB_EVENT_FB_UNBIND              0x0E
 /*      CONSOLE-SPECIFIC: remap all consoles to new fb - for vga switcheroo */
 #define FB_EVENT_REMAP_ALL_CONSOLE      0x0F
+/*      A hardware display blank early change occured */
+#define FB_EARLY_EVENT_BLANK            0x10
+/*      A hardware display blank revert early change occured */
+#define FB_R_EARLY_EVENT_BLANK          0x11
 
 struct fb_event {
         struct fb_info *info;
@@ -607,6 +611,7 @@ struct fb_deferred_io {
         struct mutex lock; /* mutex that protects the page list */
         struct list_head pagelist; /* list of touched pages */
         /* callback */
+        void (*first_io)(struct fb_info *info);
         void (*deferred_io)(struct fb_info *info, struct list_head *pagelist);
 };
 #endif
diff --git a/include/linux/filter.h b/include/linux/filter.h
index 8eeb205f298b..82b01357af8b 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -10,6 +10,7 @@
 
 #ifdef __KERNEL__
 #include <linux/atomic.h>
+#include <linux/compat.h>
 #endif
 
 /*
@@ -126,12 +127,23 @@ struct sock_fprog {	/* Required for SO_ATTACH_FILTER. */
 #define SKF_AD_HATYPE   28
 #define SKF_AD_RXHASH   32
 #define SKF_AD_CPU      36
-#define SKF_AD_MAX      40
+#define SKF_AD_ALU_XOR_X        40
+#define SKF_AD_MAX      44
 #define SKF_NET_OFF   (-0x100000)
 #define SKF_LL_OFF    (-0x200000)
 
 #ifdef __KERNEL__
 
+#ifdef CONFIG_COMPAT
+/*
+ * A struct sock_filter is architecture independent.
+ */
+struct compat_sock_fprog {
+        u16             len;
+        compat_uptr_t   filter;         /* struct sock_filter * */
+};
+#endif
+
 struct sk_buff;
 struct sock;
 
@@ -153,6 +165,9 @@ static inline unsigned int sk_filter_len(const struct sk_filter *fp)
 extern int sk_filter(struct sock *sk, struct sk_buff *skb);
 extern unsigned int sk_run_filter(const struct sk_buff *skb,
                                   const struct sock_filter *filter);
+extern int sk_unattached_filter_create(struct sk_filter **pfp,
+                                       struct sock_fprog *fprog);
+extern void sk_unattached_filter_destroy(struct sk_filter *fp);
 extern int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk);
 extern int sk_detach_filter(struct sock *sk);
 extern int sk_chk_filter(struct sock_filter *filter, unsigned int flen);
@@ -228,6 +243,8 @@ enum {
         BPF_S_ANC_HATYPE,
         BPF_S_ANC_RXHASH,
         BPF_S_ANC_CPU,
+        BPF_S_ANC_ALU_XOR_X,
+        BPF_S_ANC_SECCOMP_LD_W,
 };
 
 #endif /* __KERNEL__ */
diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index cdc9b719e9c7..7edcf1031718 100644
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -135,6 +135,20 @@ struct fw_card {
         __be32 maint_utility_register;
 };
 
+static inline struct fw_card *fw_card_get(struct fw_card *card)
+{
+        kref_get(&card->kref);
+
+        return card;
+}
+
+void fw_card_release(struct kref *kref);
+
+static inline void fw_card_put(struct fw_card *card)
+{
+        kref_put(&card->kref, fw_card_release);
+}
+
 struct fw_attribute_group {
         struct attribute_group *groups[2];
         struct attribute_group group;
@@ -325,6 +339,7 @@ int fw_core_add_address_handler(struct fw_address_handler *handler,
 void fw_core_remove_address_handler(struct fw_address_handler *handler);
 void fw_send_response(struct fw_card *card,
                       struct fw_request *request, int rcode);
+int fw_get_request_speed(struct fw_request *request);
 void fw_send_request(struct fw_card *card, struct fw_transaction *t,
                      int tcode, int destination_id, int generation, int speed,
                      unsigned long long offset, void *payload, size_t length,
@@ -334,6 +349,7 @@ int fw_cancel_transaction(struct fw_card *card,
 int fw_run_transaction(struct fw_card *card, int tcode, int destination_id,
                        int generation, int speed, unsigned long long offset,
                        void *payload, size_t length);
+const char *fw_rcode_string(int rcode);
 
 static inline int fw_stream_packet_destination_id(int tag, int channel, int sy)
 {
@@ -391,6 +407,7 @@ struct fw_iso_buffer {
         enum dma_data_direction direction;
         struct page **pages;
         int page_count;
+        int page_count_mapped;
 };
 
 int fw_iso_buffer_init(struct fw_iso_buffer *buffer, struct fw_card *card,
diff --git a/include/linux/fixp-arith.h b/include/linux/fixp-arith.h
new file mode 100644
index 000000000000..3089d7382325
--- /dev/null
+++ b/include/linux/fixp-arith.h
@@ -0,0 +1,87 @@
+#ifndef _FIXP_ARITH_H
+#define _FIXP_ARITH_H
+
+/*
+ * Simplistic fixed-point arithmetics.
+ * Hmm, I'm probably duplicating some code :(
+ *
+ * Copyright (c) 2002 Johann Deneux
+ */
+
+/*
+ * 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
+ *
+ * Should you need to contact me, the author, you can do so by
+ * e-mail - mail your message to <johann.deneux@gmail.com>
+ */
+
+#include <linux/types.h>
+
+/* The type representing fixed-point values */
+typedef s16 fixp_t;
+
+#define FRAC_N 8
+#define FRAC_MASK ((1<<FRAC_N)-1)
+
+/* Not to be used directly. Use fixp_{cos,sin} */
+static const fixp_t cos_table[46] = {
+        0x0100, 0x00FF, 0x00FF, 0x00FE, 0x00FD, 0x00FC, 0x00FA, 0x00F8,
+        0x00F6, 0x00F3, 0x00F0, 0x00ED, 0x00E9, 0x00E6, 0x00E2, 0x00DD,
+        0x00D9, 0x00D4, 0x00CF, 0x00C9, 0x00C4, 0x00BE, 0x00B8, 0x00B1,
+        0x00AB, 0x00A4, 0x009D, 0x0096, 0x008F, 0x0087, 0x0080, 0x0078,
+        0x0070, 0x0068, 0x005F, 0x0057, 0x004F, 0x0046, 0x003D, 0x0035,
+        0x002C, 0x0023, 0x001A, 0x0011, 0x0008, 0x0000
+};
+
+
+/* a: 123 -> 123.0 */
+static inline fixp_t fixp_new(s16 a)
+{
+        return a<<FRAC_N;
+}
+
+/* a: 0xFFFF -> -1.0
+      0x8000 -> 1.0
+      0x0000 -> 0.0
+*/
+static inline fixp_t fixp_new16(s16 a)
+{
+        return ((s32)a)>>(16-FRAC_N);
+}
+
+static inline fixp_t fixp_cos(unsigned int degrees)
+{
+        int quadrant = (degrees / 90) & 3;
+        unsigned int i = degrees % 90;
+
+        if (quadrant == 1 || quadrant == 3)
+                i = 90 - i;
+
+        i >>= 1;
+
+        return (quadrant == 1 || quadrant == 2)? -cos_table[i] : cos_table[i];
+}
+
+static inline fixp_t fixp_sin(unsigned int degrees)
+{
+        return -fixp_cos(degrees + 90);
+}
+
+static inline fixp_t fixp_mult(fixp_t a, fixp_t b)
+{
+        return ((s32)(a*b))>>FRAC_N;
+}
+
+#endif
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 25c40b9f848a..51978ed43e97 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -173,6 +173,15 @@ struct inodes_stat_t {
 #define WRITE_FUA               (WRITE | REQ_SYNC | REQ_NOIDLE | REQ_FUA)
 #define WRITE_FLUSH_FUA         (WRITE | REQ_SYNC | REQ_NOIDLE | REQ_FLUSH | REQ_FUA)
 
+
+/*
+ * Flag for rw_copy_check_uvector and compat_rw_copy_check_uvector
+ * that indicates that they should check the contents of the iovec are
+ * valid, but not check the memory that the iovec elements
+ * points too.
+ */
+#define CHECK_IOVEC_ONLY -1
+
 #define SEL_IN          1
 #define SEL_OUT         2
 #define SEL_EX          4
@@ -402,6 +411,7 @@ struct inodes_stat_t {
 #include <linux/atomic.h>
 #include <linux/shrinker.h>
 #include <linux/migrate_mode.h>
+#include <linux/uidgid.h>
 
 #include <asm/byteorder.h>
 
@@ -469,8 +479,8 @@ typedef void (dio_iodone_t)(struct kiocb *iocb, loff_t offset,
 struct iattr {
         unsigned int    ia_valid;
         umode_t         ia_mode;
-        uid_t           ia_uid;
-        gid_t           ia_gid;
+        kuid_t          ia_uid;
+        kgid_t          ia_gid;
         loff_t          ia_size;
         struct timespec ia_atime;
         struct timespec ia_mtime;
@@ -761,8 +771,8 @@ struct posix_acl;
 struct inode {
         umode_t                 i_mode;
         unsigned short          i_opflags;
-        uid_t                   i_uid;
-        gid_t                   i_gid;
+        kuid_t                  i_uid;
+        kgid_t                  i_gid;
         unsigned int            i_flags;
 
 #ifdef CONFIG_FS_POSIX_ACL
@@ -927,6 +937,31 @@ static inline void i_size_write(struct inode *inode, loff_t i_size)
 #endif
 }
 
+/* Helper functions so that in most cases filesystems will
+ * not need to deal directly with kuid_t and kgid_t and can
+ * instead deal with the raw numeric values that are stored
+ * in the filesystem.
+ */
+static inline uid_t i_uid_read(const struct inode *inode)
+{
+        return from_kuid(&init_user_ns, inode->i_uid);
+}
+
+static inline gid_t i_gid_read(const struct inode *inode)
+{
+        return from_kgid(&init_user_ns, inode->i_gid);
+}
+
+static inline void i_uid_write(struct inode *inode, uid_t uid)
+{
+        inode->i_uid = make_kuid(&init_user_ns, uid);
+}
+
+static inline void i_gid_write(struct inode *inode, gid_t gid)
+{
+        inode->i_gid = make_kgid(&init_user_ns, gid);
+}
+
 static inline unsigned iminor(const struct inode *inode)
 {
         return MINOR(inode->i_rdev);
@@ -943,7 +978,7 @@ struct fown_struct {
         rwlock_t lock;          /* protects pid, uid, euid fields */
         struct pid *pid;        /* pid or -pgrp where SIGIO should be sent */
         enum pid_type pid_type; /* Kind of process group SIGIO should be sent to */
-        uid_t uid, euid;        /* uid/euid of process setting the owner */
+        kuid_t uid, euid;       /* uid/euid of process setting the owner */
         int signum;             /* posix.1b rt signal to be delivered on IO */
 };
 
@@ -1527,12 +1562,6 @@ enum {
 #define vfs_check_frozen(sb, level) \
         wait_event((sb)->s_wait_unfrozen, ((sb)->s_frozen < (level)))
 
-/*
- * 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... */
@@ -1661,9 +1690,9 @@ struct inode_operations {
         ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
         ssize_t (*listxattr) (struct dentry *, char *, size_t);
         int (*removexattr) (struct dentry *, const char *);
-        void (*truncate_range)(struct inode *, loff_t, loff_t);
         int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
                       u64 len);
+        int (*update_time)(struct inode *, struct timespec *, int);
 } ____cacheline_aligned;
 
 struct seq_file;
@@ -1671,8 +1700,7 @@ struct seq_file;
 ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
                               unsigned long nr_segs, unsigned long fast_segs,
                               struct iovec *fast_pointer,
-                              struct iovec **ret_pointer,
-                              int check_access);
+                              struct iovec **ret_pointer);
 
 extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
 extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
@@ -1744,8 +1772,8 @@ struct super_operations {
  * I_FREEING            Set when inode is about to be freed but still has dirty
  *                      pages or buffers attached or the inode itself is still
  *                      dirty.
- * I_CLEAR              Added by end_writeback().  In this state the inode is clean
- *                      and can be destroyed.  Inode keeps I_FREEING.
+ * I_CLEAR              Added by clear_inode().  In this state the inode is
+ *                      clean and can be destroyed.  Inode keeps I_FREEING.
  *
  *                      Inodes that are I_WILL_FREE, I_FREEING or I_CLEAR are
  *                      prohibited for many purposes.  iget() must wait for
@@ -1753,9 +1781,10 @@ struct super_operations {
  *                      anew.  Other functions will just ignore such inodes,
  *                      if appropriate.  I_NEW is used for waiting.
  *
- * I_SYNC               Synchonized write of dirty inode data.  The bits is
- *                      set during data writeback, and cleared with a wakeup
- *                      on the bit address once it is done.
+ * I_SYNC               Writeback of inode is running. The bit is set during
+ *                      data writeback, and cleared with a wakeup on the bit
+ *                      address once it is done. The bit is also used to pin
+ *                      the inode in memory for flusher thread.
  *
  * I_REFERENCED         Marks the inode as recently references on the LRU list.
  *
@@ -1822,6 +1851,13 @@ static inline void inode_inc_iversion(struct inode *inode)
        spin_unlock(&inode->i_lock);
 }
 
+enum file_time_flags {
+        S_ATIME = 1,
+        S_MTIME = 2,
+        S_CTIME = 4,
+        S_VERSION = 8,
+};
+
 extern void touch_atime(struct path *);
 static inline void file_accessed(struct file *file)
 {
@@ -2329,7 +2365,7 @@ extern unsigned int get_next_ino(void);
 
 extern void __iget(struct inode * inode);
 extern void iget_failed(struct inode *);
-extern void end_writeback(struct inode *);
+extern void clear_inode(struct inode *);
 extern void __destroy_inode(struct inode *);
 extern struct inode *new_inode_pseudo(struct super_block *sb);
 extern struct inode *new_inode(struct super_block *sb);
@@ -2433,8 +2469,6 @@ enum {
 };
 
 void dio_end_io(struct bio *bio, int error);
-void inode_dio_wait(struct inode *inode);
-void inode_dio_done(struct inode *inode);
 
 ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
         struct block_device *bdev, const struct iovec *iov, loff_t offset,
@@ -2449,12 +2483,11 @@ static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb,
                                     offset, nr_segs, get_block, NULL, NULL,
                                     DIO_LOCKING | DIO_SKIP_HOLES);
 }
-#else
-static inline void inode_dio_wait(struct inode *inode)
-{
-}
 #endif
 
+void inode_dio_wait(struct inode *inode);
+void inode_dio_done(struct inode *inode);
+
 extern const struct file_operations generic_ro_fops;
 
 #define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))
@@ -2558,7 +2591,7 @@ extern int inode_change_ok(const struct inode *, struct iattr *);
 extern int inode_newsize_ok(const struct inode *, loff_t offset);
 extern void setattr_copy(struct inode *inode, const struct iattr *attr);
 
-extern void file_update_time(struct file *file);
+extern int file_update_time(struct file *file);
 
 extern int generic_show_options(struct seq_file *m, struct dentry *root);
 extern void save_mount_options(struct super_block *sb, char *options);
diff --git a/include/linux/fsl/mxs-dma.h b/include/linux/fsl/mxs-dma.h
index 203d7c4a3e11..55d870238399 100644
--- a/include/linux/fsl/mxs-dma.h
+++ b/include/linux/fsl/mxs-dma.h
@@ -15,14 +15,6 @@ struct mxs_dma_data {
         int chan_irq;
 };
 
-static inline int mxs_dma_is_apbh(struct dma_chan *chan)
-{
-        return !strcmp(dev_name(chan->device->dev), "mxs-dma-apbh");
-}
-
-static inline int mxs_dma_is_apbx(struct dma_chan *chan)
-{
-        return !strcmp(dev_name(chan->device->dev), "mxs-dma-apbx");
-}
-
+extern int mxs_dma_is_apbh(struct dma_chan *chan);
+extern int mxs_dma_is_apbx(struct dma_chan *chan);
 #endif /* __MACH_MXS_DMA_H__ */
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index fffdf00f87b9..15be561e7397 100644
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -6,7 +6,7 @@
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
  *
- * Copyright 2004 Freescale Semiconductor, Inc
+ * Copyright 2004,2012 Freescale Semiconductor, Inc
  *
  * 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
@@ -17,6 +17,12 @@
 #ifndef _FSL_DEVICE_H_
 #define _FSL_DEVICE_H_
 
+#define FSL_UTMI_PHY_DLY        10      /*As per P1010RM, delay for UTMI
+                                PHY CLK to become stable - 10ms*/
+#define FSL_USB_VER_OLD         0
+#define FSL_USB_VER_1_6         1
+#define FSL_USB_VER_2_2         2
+
 #include <linux/types.h>
 
 /*
@@ -63,6 +69,7 @@ struct platform_device;
 
 struct fsl_usb2_platform_data {
         /* board specific information */
+        int                             controller_ver;
         enum fsl_usb2_operating_modes   operating_mode;
         enum fsl_usb2_phy_modes         phy_mode;
         unsigned int                    port_enables;
diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
index 91d0e0a34ef3..63d966d5c2ea 100644
--- a/include/linux/fsnotify_backend.h
+++ b/include/linux/fsnotify_backend.h
@@ -60,7 +60,7 @@
 #define FS_EVENTS_POSS_ON_CHILD   (FS_ACCESS | FS_MODIFY | FS_ATTRIB |\
                                    FS_CLOSE_WRITE | FS_CLOSE_NOWRITE | FS_OPEN |\
                                    FS_MOVED_FROM | FS_MOVED_TO | FS_CREATE |\
-                                   FS_DELETE)
+                                   FS_DELETE | FS_OPEN_PERM | FS_ACCESS_PERM)
 
 #define FS_MOVE                 (FS_MOVED_FROM | FS_MOVED_TO)
 
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 72a6cabb4d5b..55e6d63d46d0 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -286,10 +286,16 @@ struct ftrace_rec_iter *ftrace_rec_iter_start(void);
 struct ftrace_rec_iter *ftrace_rec_iter_next(struct ftrace_rec_iter *iter);
 struct dyn_ftrace *ftrace_rec_iter_record(struct ftrace_rec_iter *iter);
 
+#define for_ftrace_rec_iter(iter)               \
+        for (iter = ftrace_rec_iter_start();    \
+             iter;                              \
+             iter = ftrace_rec_iter_next(iter))
+
+
 int ftrace_update_record(struct dyn_ftrace *rec, int enable);
 int ftrace_test_record(struct dyn_ftrace *rec, int enable);
 void ftrace_run_stop_machine(int command);
-int ftrace_location(unsigned long ip);
+unsigned long ftrace_location(unsigned long ip);
 
 extern ftrace_func_t ftrace_trace_function;
 
@@ -308,11 +314,14 @@ ftrace_set_early_filter(struct ftrace_ops *ops, char *buf, int enable);
 /* defined in arch */
 extern int ftrace_ip_converted(unsigned long ip);
 extern int ftrace_dyn_arch_init(void *data);
+extern void ftrace_replace_code(int enable);
 extern int ftrace_update_ftrace_func(ftrace_func_t func);
 extern void ftrace_caller(void);
 extern void ftrace_call(void);
 extern void mcount_call(void);
 
+void ftrace_modify_all_code(int command);
+
 #ifndef FTRACE_ADDR
 #define FTRACE_ADDR ((unsigned long)ftrace_caller)
 #endif
@@ -485,8 +494,12 @@ static inline void __ftrace_enabled_restore(int enabled)
   extern void trace_preempt_on(unsigned long a0, unsigned long a1);
   extern void trace_preempt_off(unsigned long a0, unsigned long a1);
 #else
-  static inline void trace_preempt_on(unsigned long a0, unsigned long a1) { }
-  static inline void trace_preempt_off(unsigned long a0, unsigned long a1) { }
+/*
+ * Use defines instead of static inlines because some arches will make code out
+ * of the CALLER_ADDR, when we really want these to be a real nop.
+ */
+# define trace_preempt_on(a0, a1) do { } while (0)
+# define trace_preempt_off(a0, a1) do { } while (0)
 #endif
 
 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
diff --git a/include/linux/gameport.h b/include/linux/gameport.h
index b456b08d70ed..b986be513406 100644
--- a/include/linux/gameport.h
+++ b/include/linux/gameport.h
@@ -153,6 +153,19 @@ int __must_check __gameport_register_driver(struct gameport_driver *drv,
 
 void gameport_unregister_driver(struct gameport_driver *drv);
 
+/**
+ * module_gameport_driver() - Helper macro for registering a gameport driver
+ * @__gameport_driver: gameport_driver struct
+ *
+ * Helper macro for gameport drivers which do not do anything special in
+ * module init/exit. This eliminates a lot of boilerplate. Each module may
+ * only use this macro once, and calling it replaces module_init() and
+ * module_exit().
+ */
+#define module_gameport_driver(__gameport_driver) \
+        module_driver(__gameport_driver, gameport_register_driver, \
+                       gameport_unregister_driver)
+
 #endif /* __KERNEL__ */
 
 #define GAMEPORT_MODE_DISABLED          0
diff --git a/include/linux/generic_serial.h b/include/linux/generic_serial.h
index fadff28505bb..79b3eb37243a 100644
--- a/include/linux/generic_serial.h
+++ b/include/linux/generic_serial.h
@@ -4,7 +4,6 @@
  *  Copyright (C) 1998 R.E.Wolff@BitWizard.nl
  *
  *  written for the SX serial driver.
- *     Contains the code that should be shared over all the serial drivers.
  *
  *  Version 0.1 -- December, 1998.
  */
@@ -12,45 +11,8 @@
 #ifndef GENERIC_SERIAL_H
 #define GENERIC_SERIAL_H
 
-#ifdef __KERNEL__
-#include <linux/mutex.h>
-#include <linux/tty.h>
-
-struct real_driver {
-  void                    (*disable_tx_interrupts) (void *);
-  void                    (*enable_tx_interrupts) (void *);
-  void                    (*disable_rx_interrupts) (void *);
-  void                    (*enable_rx_interrupts) (void *);
-  void                    (*shutdown_port) (void*);
-  int                     (*set_real_termios) (void*);
-  int                     (*chars_in_buffer) (void*);
-  void                    (*close) (void*);
-  void                    (*hungup) (void*);
-  void                    (*getserial) (void*, struct serial_struct *sp);
-};
-
-
-
-struct gs_port {
-  int                     magic;
-  struct tty_port         port;
-  unsigned char           *xmit_buf; 
-  int                     xmit_head;
-  int                     xmit_tail;
-  int                     xmit_cnt;
-  struct mutex            port_write_mutex;
-  unsigned long           event;
-  unsigned short          closing_wait;
-  int                     close_delay;
-  struct real_driver      *rd;
-  int                     wakeup_chars;
-  int                     baud_base;
-  int                     baud;
-  int                     custom_divisor;
-  spinlock_t              driver_lock;
-};
-
-#endif /* __KERNEL__ */
+#warning Use of this header is deprecated.
+#warning Since nobody sets the constants defined here for you, you should not, in any case, use them. Including the header is thus pointless.
 
 /* Flags */
 /* Warning: serial.h defines some ASYNC_ flags, they say they are "only"
@@ -60,8 +22,6 @@ struct gs_port {
 #define GS_RX_INTEN      0x00400000
 #define GS_ACTIVE        0x00200000
 
-
-
 #define GS_TYPE_NORMAL   1
 
 #define GS_DEBUG_FLUSH   0x00000001
@@ -72,24 +32,4 @@ struct gs_port {
 #define GS_DEBUG_FLOW    0x00000020
 #define GS_DEBUG_WRITE   0x00000040
 
-#ifdef __KERNEL__
-int gs_put_char(struct tty_struct *tty, unsigned char ch);
-int  gs_write(struct tty_struct *tty, 
-             const unsigned char *buf, int count);
-int  gs_write_room(struct tty_struct *tty);
-int  gs_chars_in_buffer(struct tty_struct *tty);
-void gs_flush_buffer(struct tty_struct *tty);
-void gs_flush_chars(struct tty_struct *tty);
-void gs_stop(struct tty_struct *tty);
-void gs_start(struct tty_struct *tty);
-void gs_hangup(struct tty_struct *tty);
-int  gs_block_til_ready(void *port, struct file *filp);
-void gs_close(struct tty_struct *tty, struct file *filp);
-void gs_set_termios (struct tty_struct * tty, 
-                     struct ktermios * old_termios);
-int  gs_init_port(struct gs_port *port);
-int  gs_setserial(struct gs_port *port, struct serial_struct __user *sp);
-int  gs_getserial(struct gs_port *port, struct serial_struct __user *sp);
-void gs_got_break(struct gs_port *port);
-#endif /* __KERNEL__ */
 #endif
diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h
index 73c28dea10ae..7a114016ac7d 100644
--- a/include/linux/genetlink.h
+++ b/include/linux/genetlink.h
@@ -110,6 +110,9 @@ extern int lockdep_genl_is_held(void);
 #define genl_dereference(p)                                     \
         rcu_dereference_protected(p, lockdep_genl_is_held())
 
+#define MODULE_ALIAS_GENL_FAMILY(family)\
+ MODULE_ALIAS_NET_PF_PROTO_NAME(PF_NETLINK, NETLINK_GENERIC, "-family-" family)
+
 #endif /* __KERNEL__ */
 
 #endif  /* __LINUX_GENERIC_NETLINK_H */
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index 581e74b7df95..1e49be49d324 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -391,4 +391,16 @@ static inline bool pm_suspended_storage(void)
 }
 #endif /* CONFIG_PM_SLEEP */
 
+#ifdef CONFIG_CMA
+
+/* The below functions must be run on a range from a single zone. */
+extern int alloc_contig_range(unsigned long start, unsigned long end,
+                              unsigned migratetype);
+extern void free_contig_range(unsigned long pfn, unsigned nr_pages);
+
+/* CMA stuff */
+extern void init_cma_reserved_pageblock(struct page *page);
+
+#endif
+
 #endif /* __LINUX_GFP_H */
diff --git a/include/linux/gpio.h b/include/linux/gpio.h
index 6155ecf192b0..f07fc2d08159 100644
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
@@ -1,6 +1,8 @@
 #ifndef __LINUX_GPIO_H
 #define __LINUX_GPIO_H
 
+#include <linux/errno.h>
+
 /* see Documentation/gpio.txt */
 
 /* make these flag values available regardless of GPIO kconfig options */
@@ -20,6 +22,11 @@
 /* Gpio pin is open source */
 #define GPIOF_OPEN_SOURCE       (1 << 3)
 
+#define GPIOF_EXPORT            (1 << 2)
+#define GPIOF_EXPORT_CHANGEABLE (1 << 3)
+#define GPIOF_EXPORT_DIR_FIXED  (GPIOF_EXPORT)
+#define GPIOF_EXPORT_DIR_CHANGEABLE (GPIOF_EXPORT | GPIOF_EXPORT_CHANGEABLE)
+
 /**
  * struct gpio - a structure describing a GPIO with configuration
  * @gpio:       the GPIO number
@@ -33,7 +40,39 @@ struct gpio {
 };
 
 #ifdef CONFIG_GENERIC_GPIO
+
+#ifdef CONFIG_ARCH_HAVE_CUSTOM_GPIO_H
 #include <asm/gpio.h>
+#else
+
+#include <asm-generic/gpio.h>
+
+static inline int gpio_get_value(unsigned int gpio)
+{
+        return __gpio_get_value(gpio);
+}
+
+static inline void gpio_set_value(unsigned int gpio, int value)
+{
+        __gpio_set_value(gpio, value);
+}
+
+static inline int gpio_cansleep(unsigned int gpio)
+{
+        return __gpio_cansleep(gpio);
+}
+
+static inline int gpio_to_irq(unsigned int gpio)
+{
+        return __gpio_to_irq(gpio);
+}
+
+static inline int irq_to_gpio(unsigned int irq)
+{
+        return -EINVAL;
+}
+
+#endif
 
 #else
 
@@ -55,12 +94,24 @@ static inline int gpio_request(unsigned gpio, const char *label)
         return -ENOSYS;
 }
 
+static inline int devm_gpio_request(struct device *dev, unsigned gpio,
+                                    const char *label)
+{
+        return -ENOSYS;
+}
+
 static inline int gpio_request_one(unsigned gpio,
                                         unsigned long flags, const char *label)
 {
         return -ENOSYS;
 }
 
+static inline int devm_gpio_request_one(struct device *dev, unsigned gpio,
+                                        unsigned long flags, const char *label)
+{
+        return -ENOSYS;
+}
+
 static inline int gpio_request_array(const struct gpio *array, size_t num)
 {
         return -ENOSYS;
@@ -74,6 +125,14 @@ static inline void gpio_free(unsigned gpio)
         WARN_ON(1);
 }
 
+static inline void devm_gpio_free(struct device *dev, unsigned gpio)
+{
+        might_sleep();
+
+        /* GPIO can never have been requested */
+        WARN_ON(1);
+}
+
 static inline void gpio_free_array(const struct gpio *array, size_t num)
 {
         might_sleep();
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 3a95da60fd3e..449fa385703d 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -317,7 +317,6 @@ struct hid_item {
 #define HID_QUIRK_BADPAD                        0x00000020
 #define HID_QUIRK_MULTI_INPUT                   0x00000040
 #define HID_QUIRK_HIDINPUT_FORCE                0x00000080
-#define HID_QUIRK_MULTITOUCH                    0x00000100
 #define HID_QUIRK_SKIP_OUTPUT_REPORTS           0x00010000
 #define HID_QUIRK_FULLSPEED_INTERVAL            0x10000000
 #define HID_QUIRK_NO_INIT_REPORTS               0x20000000
@@ -325,6 +324,12 @@ struct hid_item {
 #define HID_QUIRK_NO_INPUT_SYNC                 0x80000000
 
 /*
+ * HID device groups
+ */
+#define HID_GROUP_GENERIC                       0x0001
+#define HID_GROUP_MULTITOUCH                    0x0002
+
+/*
  * This is the global environment of the parser. This information is
  * persistent for main-items. The global environment can be saved and
  * restored with PUSH/POP statements.
@@ -467,6 +472,8 @@ struct hid_driver;
 struct hid_ll_driver;
 
 struct hid_device {                                                     /* device report descriptor */
+        __u8 *dev_rdesc;
+        unsigned dev_rsize;
         __u8 *rdesc;
         unsigned rsize;
         struct hid_collection *collection;                              /* List of HID collections */
@@ -474,6 +481,7 @@ struct hid_device {							/* device report descriptor */
         unsigned maxcollection;                                         /* Number of parsed collections */
         unsigned maxapplication;                                        /* Number of applications */
         __u16 bus;                                                      /* BUS ID */
+        __u16 group;                                                    /* Report group */
         __u32 vendor;                                                   /* Vendor ID */
         __u32 product;                                                  /* Product ID */
         __u32 version;                                                  /* HID version */
@@ -578,12 +586,12 @@ struct hid_descriptor {
         struct hid_class_descriptor desc[1];
 } __attribute__ ((packed));
 
-#define HID_DEVICE(b, ven, prod) \
-        .bus = (b), \
-        .vendor = (ven), .product = (prod)
-
-#define HID_USB_DEVICE(ven, prod)       HID_DEVICE(BUS_USB, ven, prod)
-#define HID_BLUETOOTH_DEVICE(ven, prod) HID_DEVICE(BUS_BLUETOOTH, ven, prod)
+#define HID_DEVICE(b, g, ven, prod)                                     \
+        .bus = (b), .group = (g), .vendor = (ven), .product = (prod)
+#define HID_USB_DEVICE(ven, prod)                               \
+        .bus = BUS_USB, .vendor = (ven), .product = (prod)
+#define HID_BLUETOOTH_DEVICE(ven, prod)                                 \
+        .bus = BUS_BLUETOOTH, .vendor = (ven), .product = (prod)
 
 #define HID_REPORT_ID(rep) \
         .report_type = (rep)
@@ -735,6 +743,7 @@ void hid_output_report(struct hid_report *report, __u8 *data);
 struct hid_device *hid_allocate_device(void);
 struct hid_report *hid_register_report(struct hid_device *device, unsigned type, unsigned id);
 int hid_parse_report(struct hid_device *hid, __u8 *start, unsigned size);
+int hid_open_report(struct hid_device *device);
 int hid_check_keys_pressed(struct hid_device *hid);
 int hid_connect(struct hid_device *hid, unsigned int connect_mask);
 void hid_disconnect(struct hid_device *hid);
@@ -805,16 +814,7 @@ static inline void hid_map_usage_clear(struct hid_input *hidinput,
  */
 static inline int __must_check hid_parse(struct hid_device *hdev)
 {
-        int ret;
-
-        if (hdev->status & HID_STAT_PARSED)
-                return 0;
-
-        ret = hdev->ll_driver->parse(hdev);
-        if (!ret)
-                hdev->status |= HID_STAT_PARSED;
-
-        return ret;
+        return hid_open_report(hdev);
 }
 
 /**
@@ -896,7 +896,7 @@ static inline int hid_hw_power(struct hid_device *hdev, int level)
         return hdev->ll_driver->power ? hdev->ll_driver->power(hdev, level) : 0;
 }
 
-void hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size,
+int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size,
                 int interrupt);
 
 extern int hid_generic_init(void);
diff --git a/include/linux/hidraw.h b/include/linux/hidraw.h
index 4b88e697c4e9..45e9fcb8d877 100644
--- a/include/linux/hidraw.h
+++ b/include/linux/hidraw.h
@@ -76,13 +76,13 @@ struct hidraw_list {
 #ifdef CONFIG_HIDRAW
 int hidraw_init(void);
 void hidraw_exit(void);
-void hidraw_report_event(struct hid_device *, u8 *, int);
+int hidraw_report_event(struct hid_device *, u8 *, int);
 int hidraw_connect(struct hid_device *);
 void hidraw_disconnect(struct hid_device *);
 #else
 static inline int hidraw_init(void) { return 0; }
 static inline void hidraw_exit(void) { }
-static inline void hidraw_report_event(struct hid_device *hid, u8 *data, int len) { }
+static inline int hidraw_report_event(struct hid_device *hid, u8 *data, int len) { return 0; }
 static inline int hidraw_connect(struct hid_device *hid) { return -1; }
 static inline void hidraw_disconnect(struct hid_device *hid) { }
 #endif
diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
index c8af7a2efb52..4c59b1131187 100644
--- a/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
@@ -59,6 +59,8 @@ extern pmd_t *page_check_address_pmd(struct page *page,
 #define HPAGE_PMD_MASK HPAGE_MASK
 #define HPAGE_PMD_SIZE HPAGE_SIZE
 
+extern bool is_vma_temporary_stack(struct vm_area_struct *vma);
+
 #define transparent_hugepage_enabled(__vma)                             \
         ((transparent_hugepage_flags &                                  \
           (1<<TRANSPARENT_HUGEPAGE_FLAG) ||                             \
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 000837e126e6..d5d6bbe2259e 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -284,6 +284,14 @@ static inline unsigned int blocks_per_huge_page(struct hstate *h)
 
 #include <asm/hugetlb.h>
 
+#ifndef arch_make_huge_pte
+static inline pte_t arch_make_huge_pte(pte_t entry, struct vm_area_struct *vma,
+                                       struct page *page, int writable)
+{
+        return entry;
+}
+#endif
+
 static inline struct hstate *page_hstate(struct page *page)
 {
         return size_to_hstate(PAGE_SIZE << compound_order(page));
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index 5852545e6bba..68ed7f7e1fc9 100644
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -274,6 +274,33 @@ struct hv_ring_buffer_debug_info {
         u32 bytes_avail_towrite;
 };
 
+
+/*
+ *
+ * hv_get_ringbuffer_availbytes()
+ *
+ * Get number of bytes available to read and to write to
+ * for the specified ring buffer
+ */
+static inline void
+hv_get_ringbuffer_availbytes(struct hv_ring_buffer_info *rbi,
+                          u32 *read, u32 *write)
+{
+        u32 read_loc, write_loc, dsize;
+
+        smp_read_barrier_depends();
+
+        /* Capture the read/write indices before they changed */
+        read_loc = rbi->ring_buffer->read_index;
+        write_loc = rbi->ring_buffer->write_index;
+        dsize = rbi->ring_datasize;
+
+        *write = write_loc >= read_loc ? dsize - (write_loc - read_loc) :
+                read_loc - write_loc;
+        *read = dsize - *write;
+}
+
+
 /*
  * We use the same version numbering for all Hyper-V modules.
  *
@@ -1035,8 +1062,10 @@ struct hyperv_service_callback {
         void (*callback) (void *context);
 };
 
+#define MAX_SRV_VER     0x7ffffff
 extern void vmbus_prep_negotiate_resp(struct icmsg_hdr *,
-                                      struct icmsg_negotiate *, u8 *);
+                                        struct icmsg_negotiate *, u8 *, int,
+                                        int);
 
 int hv_kvp_init(struct hv_util_service *);
 void hv_kvp_deinit(void);
diff --git a/include/linux/gpio-i2cmux.h b/include/linux/i2c-mux-gpio.h
index 4a333bb0bd0d..a36343a37ebc 100644
--- a/include/linux/gpio-i2cmux.h
+++ b/include/linux/i2c-mux-gpio.h
@@ -1,5 +1,5 @@
 /*
- * gpio-i2cmux interface to platform code
+ * i2c-mux-gpio interface to platform code
  *
  * Peter Korsgaard <peter.korsgaard@barco.com>
  *
@@ -8,14 +8,14 @@
  * published by the Free Software Foundation.
  */
 
-#ifndef _LINUX_GPIO_I2CMUX_H
-#define _LINUX_GPIO_I2CMUX_H
+#ifndef _LINUX_I2C_MUX_GPIO_H
+#define _LINUX_I2C_MUX_GPIO_H
 
 /* MUX has no specific idle mode */
-#define GPIO_I2CMUX_NO_IDLE     ((unsigned)-1)
+#define I2C_MUX_GPIO_NO_IDLE    ((unsigned)-1)
 
 /**
- * struct gpio_i2cmux_platform_data - Platform-dependent data for gpio-i2cmux
+ * struct i2c_mux_gpio_platform_data - Platform-dependent data for i2c-mux-gpio
  * @parent: Parent I2C bus adapter number
  * @base_nr: Base I2C bus number to number adapters from or zero for dynamic
  * @values: Array of bitmasks of GPIO settings (low/high) for each
@@ -25,7 +25,7 @@
  * @n_gpios: Number of GPIOs used to control MUX
  * @idle: Bitmask to write to MUX when idle or GPIO_I2CMUX_NO_IDLE if not used
  */
-struct gpio_i2cmux_platform_data {
+struct i2c_mux_gpio_platform_data {
         int parent;
         int base_nr;
         const unsigned *values;
@@ -35,4 +35,4 @@ struct gpio_i2cmux_platform_data {
         unsigned idle;
 };
 
-#endif /* _LINUX_GPIO_I2CMUX_H */
+#endif /* _LINUX_I2C_MUX_GPIO_H */
diff --git a/include/linux/i2c-mux.h b/include/linux/i2c-mux.h
index 747f0cde4164..c79083830014 100644
--- a/include/linux/i2c-mux.h
+++ b/include/linux/i2c-mux.h
@@ -34,7 +34,8 @@
  * mux control.
  */
 struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent,
-                                void *mux_dev, u32 force_nr, u32 chan_id,
+                                struct device *mux_dev,
+                                void *mux_priv, u32 force_nr, u32 chan_id,
                                 int (*select) (struct i2c_adapter *,
                                                void *mux_dev, u32 chan_id),
                                 int (*deselect) (struct i2c_adapter *,
diff --git a/include/linux/i2c-pnx.h b/include/linux/i2c-pnx.h
index a87124d4d533..1bc74afe7a35 100644
--- a/include/linux/i2c-pnx.h
+++ b/include/linux/i2c-pnx.h
@@ -29,14 +29,10 @@ struct i2c_pnx_algo_data {
         struct i2c_pnx_mif      mif;
         int                     last;
         struct clk              *clk;
-        struct i2c_pnx_data     *i2c_pnx;
         struct i2c_adapter      adapter;
-};
-
-struct i2c_pnx_data {
-        const char *name;
-        u32 base;
-        int irq;
+        phys_addr_t             base;
+        int                     irq;
+        u32                     timeout;
 };
 
 #endif /* __I2C_PNX_H__ */
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 195d8b3d9cfb..ddfa04108baf 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -232,6 +232,7 @@ struct i2c_client {
 #define to_i2c_client(d) container_of(d, struct i2c_client, dev)
 
 extern struct i2c_client *i2c_verify_client(struct device *dev);
+extern struct i2c_adapter *i2c_verify_adapter(struct device *dev);
 
 static inline struct i2c_client *kobj_to_i2c_client(struct kobject *kobj)
 {
@@ -540,7 +541,7 @@ struct i2c_msg {
         __u16 flags;
 #define I2C_M_TEN               0x0010  /* this is a ten bit chip address */
 #define I2C_M_RD                0x0001  /* read data, from slave to master */
-#define I2C_M_NOSTART           0x4000  /* if I2C_FUNC_PROTOCOL_MANGLING */
+#define I2C_M_NOSTART           0x4000  /* if I2C_FUNC_NOSTART */
 #define I2C_M_REV_DIR_ADDR      0x2000  /* if I2C_FUNC_PROTOCOL_MANGLING */
 #define I2C_M_IGNORE_NAK        0x1000  /* if I2C_FUNC_PROTOCOL_MANGLING */
 #define I2C_M_NO_RD_ACK         0x0800  /* if I2C_FUNC_PROTOCOL_MANGLING */
@@ -553,8 +554,9 @@ struct i2c_msg {
 
 #define I2C_FUNC_I2C                    0x00000001
 #define I2C_FUNC_10BIT_ADDR             0x00000002
-#define I2C_FUNC_PROTOCOL_MANGLING      0x00000004 /* I2C_M_NOSTART etc. */
+#define I2C_FUNC_PROTOCOL_MANGLING      0x00000004 /* I2C_M_IGNORE_NAK etc. */
 #define I2C_FUNC_SMBUS_PEC              0x00000008
+#define I2C_FUNC_NOSTART                0x00000010 /* I2C_M_NOSTART */
 #define I2C_FUNC_SMBUS_BLOCK_PROC_CALL  0x00008000 /* SMBus 2.0 */
 #define I2C_FUNC_SMBUS_QUICK            0x00010000
 #define I2C_FUNC_SMBUS_READ_BYTE        0x00020000
diff --git a/include/linux/i2c/adp5588.h b/include/linux/i2c/adp5588.h
index cec17cf6cac2..d8341cb47b60 100644
--- a/include/linux/i2c/adp5588.h
+++ b/include/linux/i2c/adp5588.h
@@ -157,6 +157,7 @@ struct i2c_client; /* forward declaration */
 
 struct adp5588_gpio_platform_data {
         int gpio_start;         /* GPIO Chip base # */
+        const char *const *names;
         unsigned irq_base;      /* interrupt base # */
         unsigned pullup_dis_mask; /* Pull-Up Disable Mask */
         int     (*setup)(struct i2c_client *client,
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index 1f90de0cfdbe..3993477103a5 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -171,8 +171,6 @@ static inline int twl_class_is_ ##class(void)	\
 TWL_CLASS_IS(4030, TWL4030_CLASS_ID)
 TWL_CLASS_IS(6030, TWL6030_CLASS_ID)
 
-#define TWL6025_SUBCLASS        BIT(4)  /* TWL6025 has changed registers */
-
 /*
  * Read and write single 8-bit registers
  */
@@ -746,6 +744,17 @@ struct twl_regulator_driver_data {
         void            *data;
         unsigned long   features;
 };
+/* chip-specific feature flags, for twl_regulator_driver_data.features */
+#define TWL4030_VAUX2           BIT(0)  /* pre-5030 voltage ranges */
+#define TPS_SUBSET              BIT(1)  /* tps659[23]0 have fewer LDOs */
+#define TWL5031                 BIT(2)  /* twl5031 has different registers */
+#define TWL6030_CLASS           BIT(3)  /* TWL6030 class */
+#define TWL6025_SUBCLASS        BIT(4)  /* TWL6025 has changed registers */
+#define TWL4030_ALLOW_UNSUPPORTED BIT(5) /* Some voltages are possible
+                                          * but not officially supported.
+                                          * This flag is necessary to
+                                          * enable them.
+                                          */
 
 /*----------------------------------------------------------------------*/
 
diff --git a/include/linux/i2o-dev.h b/include/linux/i2o-dev.h
index a0b23dd45239..a8093bfec3a6 100644
--- a/include/linux/i2o-dev.h
+++ b/include/linux/i2o-dev.h
@@ -124,7 +124,7 @@ typedef struct i2o_sg_io_hdr {
 #define I2O_BUS_LOCAL   0
 #define I2O_BUS_ISA     1
 #define I2O_BUS_EISA    2
-#define I2O_BUS_MCA     3
+/* was  I2O_BUS_MCA     3 */
 #define I2O_BUS_PCI     4
 #define I2O_BUS_PCMCIA  5
 #define I2O_BUS_NUBUS   6
diff --git a/include/linux/ibmtr.h b/include/linux/ibmtr.h
deleted file mode 100644
index 06695b74d405..000000000000
--- a/include/linux/ibmtr.h
+++ /dev/null
@@ -1,373 +0,0 @@
-#ifndef __LINUX_IBMTR_H__
-#define __LINUX_IBMTR_H__
-
-/* Definitions for an IBM Token Ring card. */
-/* This file is distributed under the GNU GPL   */
-
-/* ported to the Alpha architecture 02/20/96 (just used the HZ macro) */
-
-#define TR_RETRY_INTERVAL       (30*HZ) /* 500 on PC = 5 s */
-#define TR_RST_TIME             (msecs_to_jiffies(50))  /* 5 on PC = 50 ms */
-#define TR_BUSY_INTERVAL        (msecs_to_jiffies(200)) /* 5 on PC = 200 ms */
-#define TR_SPIN_INTERVAL        (3*HZ)  /* 3 seconds before init timeout */
-
-#define TR_ISA 1
-#define TR_MCA 2
-#define TR_ISAPNP 3
-#define NOTOK 0
-
-#define IBMTR_SHARED_RAM_SIZE 0x10000
-#define IBMTR_IO_EXTENT 4
-#define IBMTR_MAX_ADAPTERS 4
-
-#define CHANNEL_ID      0X1F30
-#define AIP             0X1F00
-#define AIPADAPTYPE     0X1FA0
-#define AIPDATARATE     0X1FA2
-#define AIPEARLYTOKEN   0X1FA4
-#define AIPAVAILSHRAM   0X1FA6
-#define AIPSHRAMPAGE    0X1FA8
-#define AIP4MBDHB       0X1FAA
-#define AIP16MBDHB      0X1FAC
-#define AIPFID          0X1FBA
-
-#define ADAPTRESET      0x1     /* Control Adapter reset (add to base) */
-#define ADAPTRESETREL   0x2     /* Release Adapter from reset ( """)  */
-#define ADAPTINTREL     0x3     /* Adapter interrupt release */
-
-#define GLOBAL_INT_ENABLE 0x02f0
-
-/* MMIO bits 0-4 select register */
-#define RRR_EVEN       0x00 /* Shared RAM relocation registers - even and odd */
-/* Used to set the starting address of shared RAM  */
-/* Bits 1 through 7 of this register map to bits 13 through 19 of the shared
-   RAM address.*/
-/* ie: 0x02 sets RAM address to ...ato!  issy su wazzoo !! GODZILLA!!! */
-#define RRR_ODD         0x01
-/* Bits 2 and 3 of this register can be read to determine shared RAM size */
-/* 00 for 8k, 01 for 16k, 10 for 32k, 11 for 64k  */
-#define WRBR_EVEN       0x02    /* Write region base registers - even and odd */
-#define WRBR_ODD        0x03
-#define WWOR_EVEN       0x04    /* Write window open registers - even and odd */
-#define WWOR_ODD        0x05
-#define WWCR_EVEN       0x06   /* Write window close registers - even and odd */
-#define WWCR_ODD        0x07
-
-/* Interrupt status registers - PC system  - even and odd */
-#define ISRP_EVEN       0x08
-
-#define TCR_INT    0x10    /* Bit 4 - Timer interrupt.  The TVR_EVEN timer has
-                                                                   expired. */
-#define ERR_INT    0x08    /* Bit 3 - Error interrupt.  The adapter has had an
-                                                            internal error. */
-#define ACCESS_INT 0x04    /* Bit 2 - Access interrupt.  You have attempted to
-                                      write to an invalid area of shared RAM
-                                      or an invalid register within the MMIO. */
-/* In addition, the following bits within ISRP_EVEN can be turned on or off   */
-/* by you to control the interrupt processing:   */
-#define INT_ENABLE 0x40 /* Bit 6 - Interrupt enable.  If 0, no interrupts will
-                                   occur.  If 1, interrupts will occur normally.
-                                                         Normally set to 1.  */
-/* Bit 0 - Primary or alternate adapter.  Set to zero if this adapter is the
-                primary adapter, 1 if this adapter is the alternate adapter. */
-
-
-#define ISRP_ODD        0x09
-
-#define ADAP_CHK_INT 0x40 /* Bit 6 - Adapter check.  the adapter has
-                             encountered a serious problem and has closed
-                             itself.  Whoa.  */
-#define SRB_RESP_INT 0x20 /* Bit 5 - SRB response.  The adapter has accepted
-                             an SRB request and set the return code within
-                             the SRB. */
-#define ASB_FREE_INT 0x10 /* Bit 4 - ASB free.  The adapter has read the ASB
-                             and this area can be safely reused. This interrupt
-                             is only used if your application has set the ASB
-                             free request bit in ISRA_ODD or if an error was
-                             detected in your response. */
-#define ARB_CMD_INT  0x08 /* Bit 3 - ARB command.  The adapter has given you a
-                             command for action.  The command is located in the
-                             ARB area of shared memory. */
-#define SSB_RESP_INT 0x04 /* Bit 2 - SSB response.  The adapter has posted a
-                             response to your SRB (the response is located in
-                             the SSB area of shared memory). */
-/* Bit 1 - Bridge frame forward complete. */
-
-
-
-#define ISRA_EVEN 0x0A /*Interrupt status registers - adapter  - even and odd */
-/* Bit 7 - Internal parity error (on adapter's internal bus) */
-/* Bit 6 - Timer interrupt pending */
-/* Bit 5 - Access interrupt (attempt by adapter to access illegal address) */
-/* Bit 4 - Adapter microcode problem (microcode dead-man timer expired) */
-/* Bit 3 - Adapter processor check status */
-/* Bit 2 - Reserved */
-/* Bit 1 - Adapter hardware interrupt mask (prevents internal interrupts) */
-/* Bit 0 - Adapter software interrupt mask (prevents internal software ints) */
-
-#define ISRA_ODD        0x0B
-#define CMD_IN_SRB  0x20 /* Bit 5  - Indicates that you have placed a new
-                           command in the SRB and are ready for the adapter to
-                           process the command. */
-#define RESP_IN_ASB 0x10 /* Bit 4 - Indicates that you have placed a response
-                            (an ASB) in the shared RAM which is available for
-                            the adapter's use. */
-/* Bit 3 - Indicates that you are ready to put an SRB in the shared RAM, but
-        that a previous command is still pending.  The adapter will then
-        interrupt you when the previous command is completed */
-/* Bit 2 - Indicates that you are ready to put an ASB in the shared RAM, but
-        that a previous ASB is still pending.  The adapter will then interrupt
-        you when the previous ASB is copied.  */
-#define ARB_FREE 0x2
-#define SSB_FREE 0x1
-
-#define TCR_EVEN        0x0C    /* Timer control registers - even and odd */
-#define TCR_ODD         0x0D
-#define TVR_EVEN        0x0E    /* Timer value registers - even and odd */
-#define TVR_ODD         0x0F
-#define SRPR_EVEN       0x18    /* Shared RAM paging registers - even and odd */
-#define SRPR_ENABLE_PAGING 0xc0
-#define SRPR_ODD        0x19    /* Not used. */
-#define TOKREAD         0x60
-#define TOKOR           0x40
-#define TOKAND          0x20
-#define TOKWRITE        0x00
-
-/* MMIO bits 5-6 select operation */
-/* 00 is used to write to a register */
-/* 01 is used to bitwise AND a byte with a register */
-/* 10 is used to bitwise OR a byte with a register  */
-/* 11 is used to read from a register */
-
-/* MMIO bits 7-8 select area of interest.. see below */
-/* 00 selects attachment control area. */
-/* 01 is reserved. */
-/* 10 selects adapter identification area A containing the adapter encoded
-        address. */
-/* 11 selects the adapter identification area B containing test patterns. */
-
-#define PCCHANNELID 5049434F3631313039393020
-#define MCCHANNELID 4D4152533633583435313820
-
-#define ACA_OFFSET 0x1e00
-#define ACA_SET 0x40
-#define ACA_RESET 0x20
-#define ACA_RW 0x00
-
-#ifdef ENABLE_PAGING
-#define SET_PAGE(x) (writeb((x), ti->mmio + ACA_OFFSET+ ACA_RW + SRPR_EVEN))
-#else
-#define SET_PAGE(x)
-#endif
-
-/* do_tok_int possible values */
-#define FIRST_INT 1
-#define NOT_FIRST 2
-
-typedef enum {  CLOSED, OPEN } open_state;
-//staic const char *printstate[] = { "CLOSED","OPEN"};
-
-struct tok_info {
-        unsigned char irq;
-        void __iomem *mmio;
-        unsigned char hw_address[32];
-        unsigned char adapter_type;
-        unsigned char data_rate;
-        unsigned char token_release;
-        unsigned char avail_shared_ram;
-        unsigned char shared_ram_paging;
-        unsigned char turbo;
-        unsigned short dhb_size4mb;
-        unsigned short rbuf_len4;
-        unsigned short rbuf_cnt4;
-        unsigned short maxmtu4;
-        unsigned short dhb_size16mb;
-        unsigned short rbuf_len16;
-        unsigned short rbuf_cnt16;
-        unsigned short maxmtu16;
-        /* Additions by David Morris       */
-        unsigned char do_tok_int;
-        wait_queue_head_t wait_for_reset;
-        unsigned char sram_base;
-        /* Additions by Peter De Schrijver */
-        unsigned char page_mask;          /* mask to select RAM page to Map*/
-        unsigned char mapped_ram_size;    /* size of RAM page */
-        __u32 sram_phys;          /* Shared memory base address */
-        void __iomem *sram_virt;          /* Shared memory base address */
-        void __iomem *init_srb;   /* Initial System Request Block address */
-        void __iomem *srb;                /* System Request Block address */
-        void __iomem *ssb;                /* System Status Block address */
-        void __iomem *arb;                /* Adapter Request Block address */
-        void __iomem *asb;                /* Adapter Status Block address */
-        __u8  init_srb_page;
-        __u8  srb_page;
-        __u8  ssb_page;
-        __u8  arb_page;
-        __u8  asb_page;
-        unsigned short exsap_station_id;
-        unsigned short global_int_enable;
-        struct sk_buff *current_skb;
-
-        unsigned char auto_speedsave;
-        open_state                      open_status, sap_status;
-        enum {MANUAL, AUTOMATIC}        open_mode;
-        enum {FAIL, RESTART, REOPEN}    open_action;
-        enum {NO, YES}                  open_failure;
-        unsigned char readlog_pending;
-        unsigned short adapter_int_enable; /* Adapter-specific int enable */
-        struct timer_list tr_timer;
-        unsigned char ring_speed;
-        spinlock_t lock;                /* SMP protection */
-};
-
-/* token ring adapter commands */
-#define DIR_INTERRUPT           0x00 /* struct srb_interrupt */
-#define DIR_MOD_OPEN_PARAMS     0x01
-#define DIR_OPEN_ADAPTER        0x03 /* struct dir_open_adapter */
-#define DIR_CLOSE_ADAPTER       0x04
-#define DIR_SET_GRP_ADDR        0x06
-#define DIR_SET_FUNC_ADDR       0x07 /* struct srb_set_funct_addr */
-#define DIR_READ_LOG            0x08 /* struct srb_read_log */
-#define DLC_OPEN_SAP            0x15 /* struct dlc_open_sap */
-#define DLC_CLOSE_SAP           0x16
-#define DATA_LOST               0x20 /* struct asb_rec */
-#define REC_DATA                0x81 /* struct arb_rec_req */
-#define XMIT_DATA_REQ           0x82 /* struct arb_xmit_req */
-#define DLC_STATUS              0x83 /* struct arb_dlc_status */
-#define RING_STAT_CHANGE        0x84 /* struct dlc_open_sap ??? */
-
-/* DIR_OPEN_ADAPTER options */
-#define OPEN_PASS_BCON_MAC 0x0100
-#define NUM_RCV_BUF 2
-#define RCV_BUF_LEN 1024
-#define DHB_LENGTH 2048
-#define NUM_DHB 2
-#define DLC_MAX_SAP 2
-#define DLC_MAX_STA 1
-
-/* DLC_OPEN_SAP options */
-#define MAX_I_FIELD 0x0088
-#define SAP_OPEN_IND_SAP 0x04
-#define SAP_OPEN_PRIORITY 0x20
-#define SAP_OPEN_STATION_CNT 0x1
-#define XMIT_DIR_FRAME 0x0A
-#define XMIT_UI_FRAME  0x0d
-#define XMIT_XID_CMD   0x0e
-#define XMIT_TEST_CMD  0x11
-
-/* srb close return code */
-#define SIGNAL_LOSS  0x8000
-#define HARD_ERROR   0x4000
-#define XMIT_BEACON  0x1000
-#define LOBE_FAULT   0x0800
-#define AUTO_REMOVAL 0x0400
-#define REMOVE_RECV  0x0100
-#define LOG_OVERFLOW 0x0080
-#define RING_RECOVER 0x0020
-
-struct srb_init_response {
-        unsigned char command;
-        unsigned char init_status;
-        unsigned char init_status_2;
-        unsigned char reserved[3];
-        __u16 bring_up_code;
-        __u16 encoded_address;
-        __u16 level_address;
-        __u16 adapter_address;
-        __u16 parms_address;
-        __u16 mac_address;
-};
-
-struct dir_open_adapter {
-        unsigned char command;
-        char reserved[7];
-        __u16 open_options;
-        unsigned char node_address[6];
-        unsigned char group_address[4];
-        unsigned char funct_address[4];
-        __u16 num_rcv_buf;
-        __u16 rcv_buf_len;
-        __u16 dhb_length;
-        unsigned char num_dhb;
-        char reserved2;
-        unsigned char dlc_max_sap;
-        unsigned char dlc_max_sta;
-        unsigned char dlc_max_gsap;
-        unsigned char dlc_max_gmem;
-        unsigned char dlc_t1_tick_1;
-        unsigned char dlc_t2_tick_1;
-        unsigned char dlc_ti_tick_1;
-        unsigned char dlc_t1_tick_2;
-        unsigned char dlc_t2_tick_2;
-        unsigned char dlc_ti_tick_2;
-        unsigned char product_id[18];
-};
-
-struct dlc_open_sap {
-        unsigned char command;
-        unsigned char reserved1;
-        unsigned char ret_code;
-        unsigned char reserved2;
-        __u16 station_id;
-        unsigned char timer_t1;
-        unsigned char timer_t2;
-        unsigned char timer_ti;
-        unsigned char maxout;
-        unsigned char maxin;
-        unsigned char maxout_incr;
-        unsigned char max_retry_count;
-        unsigned char gsap_max_mem;
-        __u16 max_i_field;
-        unsigned char sap_value;
-        unsigned char sap_options;
-        unsigned char station_count;
-        unsigned char sap_gsap_mem;
-        unsigned char gsap[0];
-};
-
-struct srb_xmit {
-        unsigned char command;
-        unsigned char cmd_corr;
-        unsigned char ret_code;
-        unsigned char reserved1;
-        __u16 station_id;
-};
-
-struct arb_rec_req {
-        unsigned char command;
-        unsigned char reserved1[3];
-        __u16 station_id;
-        __u16 rec_buf_addr;
-        unsigned char lan_hdr_len;
-        unsigned char dlc_hdr_len;
-        __u16 frame_len;
-        unsigned char msg_type;
-};
-
-struct asb_rec {
-        unsigned char command;
-        unsigned char reserved1;
-        unsigned char ret_code;
-        unsigned char reserved2;
-        __u16 station_id;
-        __u16 rec_buf_addr;
-};
-
-struct rec_buf {
-        unsigned char reserved1[2];
-        __u16 buf_ptr;
-        unsigned char reserved2;
-        unsigned char receive_fs;
-        __u16 buf_len;
-        unsigned char data[0];
-};
-
-struct srb_set_funct_addr {
-        unsigned char command;
-        unsigned char reserved1;
-        unsigned char ret_code;
-        unsigned char reserved2[3];
-        unsigned char funct_address[4];
-};
-
-#endif
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 210e2c325534..ce9af8918514 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -640,9 +640,9 @@ struct ieee80211_rann_ie {
         u8 rann_hopcount;
         u8 rann_ttl;
         u8 rann_addr[6];
-        u32 rann_seq;
-        u32 rann_interval;
-        u32 rann_metric;
+        __le32 rann_seq;
+        __le32 rann_interval;
+        __le32 rann_metric;
 } __attribute__ ((packed));
 
 enum ieee80211_rann_flags {
@@ -1007,13 +1007,13 @@ enum ieee80211_min_mpdu_spacing {
 };
 
 /**
- * struct ieee80211_ht_info - HT information
+ * struct ieee80211_ht_operation - HT operation IE
  *
- * This structure is the "HT information element" as
- * described in 802.11n D5.0 7.3.2.58
+ * This structure is the "HT operation element" as
+ * described in 802.11n-2009 7.3.2.57
  */
-struct ieee80211_ht_info {
-        u8 control_chan;
+struct ieee80211_ht_operation {
+        u8 primary_chan;
         u8 ht_param;
         __le16 operation_mode;
         __le16 stbc_param;
@@ -1027,8 +1027,6 @@ struct ieee80211_ht_info {
 #define         IEEE80211_HT_PARAM_CHA_SEC_BELOW        0x03
 #define IEEE80211_HT_PARAM_CHAN_WIDTH_ANY               0x04
 #define IEEE80211_HT_PARAM_RIFS_MODE                    0x08
-#define IEEE80211_HT_PARAM_SPSMP_SUPPORT                0x10
-#define IEEE80211_HT_PARAM_SERV_INTERVAL_GRAN           0xE0
 
 /* for operation_mode */
 #define IEEE80211_HT_OP_MODE_PROTECTION                 0x0003
@@ -1301,7 +1299,7 @@ enum ieee80211_eid {
         WLAN_EID_EXT_SUPP_RATES = 50,
 
         WLAN_EID_HT_CAPABILITY = 45,
-        WLAN_EID_HT_INFORMATION = 61,
+        WLAN_EID_HT_OPERATION = 61,
 
         WLAN_EID_RSN = 48,
         WLAN_EID_MMIE = 76,
@@ -1441,6 +1439,18 @@ enum ieee80211_tdls_actioncode {
 #define WLAN_TDLS_SNAP_RFTYPE   0x2
 
 /**
+ * enum - mesh synchronization method identifier
+ *
+ * @IEEE80211_SYNC_METHOD_NEIGHBOR_OFFSET: the default synchronization method
+ * @IEEE80211_SYNC_METHOD_VENDOR: a vendor specific synchronization method
+ * that will be specified in a vendor specific information element
+ */
+enum {
+        IEEE80211_SYNC_METHOD_NEIGHBOR_OFFSET = 1,
+        IEEE80211_SYNC_METHOD_VENDOR = 255,
+};
+
+/**
  * enum - mesh path selection protocol identifier
  *
  * @IEEE80211_PATH_PROTOCOL_HWMP: the default path selection protocol
@@ -1448,7 +1458,7 @@ enum ieee80211_tdls_actioncode {
  * be specified in a vendor specific information element
  */
 enum {
-        IEEE80211_PATH_PROTOCOL_HWMP = 0,
+        IEEE80211_PATH_PROTOCOL_HWMP = 1,
         IEEE80211_PATH_PROTOCOL_VENDOR = 255,
 };
 
@@ -1460,7 +1470,7 @@ enum {
  * specified in a vendor specific information element
  */
 enum {
-        IEEE80211_PATH_METRIC_AIRTIME = 0,
+        IEEE80211_PATH_METRIC_AIRTIME = 1,
         IEEE80211_PATH_METRIC_VENDOR = 255,
 };
 
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index 6d722f41ee7c..f0e69c6e8208 100644
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
@@ -87,6 +87,7 @@
 #define ARPHRD_IEEE80211_PRISM 802      /* IEEE 802.11 + Prism2 header  */
 #define ARPHRD_IEEE80211_RADIOTAP 803   /* IEEE 802.11 + radiotap header */
 #define ARPHRD_IEEE802154         804
+#define ARPHRD_IEEE802154_MONITOR 805   /* IEEE 802.15.4 network monitor */
 
 #define ARPHRD_PHONET   820             /* PhoNet media type            */
 #define ARPHRD_PHONET_PIPE 821          /* PhoNet pipe header           */
diff --git a/include/linux/if_ec.h b/include/linux/if_ec.h
deleted file mode 100644
index d85f9f48129f..000000000000
--- a/include/linux/if_ec.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Definitions for Econet sockets. */
-
-#ifndef __LINUX_IF_EC
-#define __LINUX_IF_EC
-
-/* User visible stuff. Glibc provides its own but libc5 folk will use these */
-
-struct ec_addr {
-  unsigned char station;                /* Station number.  */
-  unsigned char net;                    /* Network number.  */
-};
-
-struct sockaddr_ec {
-  unsigned short sec_family;
-  unsigned char port;                   /* Port number.  */
-  unsigned char cb;                     /* Control/flag byte.  */
-  unsigned char type;                   /* Type of message.  */
-  struct ec_addr addr;
-  unsigned long cookie;
-};
-
-#define ECTYPE_PACKET_RECEIVED          0       /* Packet received */
-#define ECTYPE_TRANSMIT_STATUS          0x10    /* Transmit completed, 
-                                                   low nibble holds status */
-
-#define ECTYPE_TRANSMIT_OK              1
-#define ECTYPE_TRANSMIT_NOT_LISTENING   2
-#define ECTYPE_TRANSMIT_NET_ERROR       3
-#define ECTYPE_TRANSMIT_NO_CLOCK        4
-#define ECTYPE_TRANSMIT_LINE_JAMMED     5
-#define ECTYPE_TRANSMIT_NOT_PRESENT     6
-
-#ifdef __KERNEL__
-
-#define EC_HLEN                         6
-
-/* This is what an Econet frame looks like on the wire. */
-struct ec_framehdr {
-  unsigned char dst_stn;
-  unsigned char dst_net;
-  unsigned char src_stn;
-  unsigned char src_net;
-  unsigned char cb;
-  unsigned char port;
-};
-
-struct econet_sock {
-  /* struct sock has to be the first member of econet_sock */
-  struct sock   sk;
-  unsigned char cb;
-  unsigned char port;
-  unsigned char station;
-  unsigned char net;
-  unsigned short num;
-};
-
-static inline struct econet_sock *ec_sk(const struct sock *sk)
-{
-        return (struct econet_sock *)sk;
-}
-
-struct ec_device {
-  unsigned char station, net;           /* Econet protocol address */
-};
-
-#endif
-
-#endif
diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 4b24ff453aee..f715750d0b87 100644
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -138,6 +138,8 @@ enum {
         IFLA_GROUP,             /* Group the device belongs to */
         IFLA_NET_NS_FD,
         IFLA_EXT_MASK,          /* Extended info mask, VFs, etc */
+        IFLA_PROMISCUITY,       /* Promiscuity count: > 0 means acts PROMISC */
+#define IFLA_PROMISCUITY IFLA_PROMISCUITY
         __IFLA_MAX
 };
 
@@ -253,6 +255,7 @@ struct ifla_vlan_qos_mapping {
 enum {
         IFLA_MACVLAN_UNSPEC,
         IFLA_MACVLAN_MODE,
+        IFLA_MACVLAN_FLAGS,
         __IFLA_MACVLAN_MAX,
 };
 
@@ -265,6 +268,8 @@ enum macvlan_mode {
         MACVLAN_MODE_PASSTHRU = 8,/* take over the underlying device */
 };
 
+#define MACVLAN_FLAG_NOPROMISC  1
+
 /* SR-IOV virtual function management section */
 
 enum {
diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h
index d103dca5c563..f65e8d250f7e 100644
--- a/include/linux/if_macvlan.h
+++ b/include/linux/if_macvlan.h
@@ -60,6 +60,7 @@ struct macvlan_dev {
         struct net_device       *lowerdev;
         struct macvlan_pcpu_stats __percpu *pcpu_stats;
         enum macvlan_mode       mode;
+        u16                     flags;
         int (*receive)(struct sk_buff *skb);
         int (*forward)(struct net_device *dev, struct sk_buff *skb);
         struct macvtap_queue    *taps[MAX_MACVTAP_QUEUES];
diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h
index 23cefa1111bf..b4775418d525 100644
--- a/include/linux/if_pppol2tp.h
+++ b/include/linux/if_pppol2tp.h
@@ -19,10 +19,11 @@
 
 #ifdef __KERNEL__
 #include <linux/in.h>
+#include <linux/in6.h>
 #endif
 
 /* Structure used to connect() the socket to a particular tunnel UDP
- * socket.
+ * socket over IPv4.
  */
 struct pppol2tp_addr {
         __kernel_pid_t  pid;            /* pid that owns the fd.
@@ -35,6 +36,20 @@ struct pppol2tp_addr {
         __u16 d_tunnel, d_session;      /* For sending outgoing packets */
 };
 
+/* Structure used to connect() the socket to a particular tunnel UDP
+ * socket over IPv6.
+ */
+struct pppol2tpin6_addr {
+        __kernel_pid_t  pid;            /* pid that owns the fd.
+                                         * 0 => current */
+        int     fd;                     /* FD of UDP socket to use */
+
+        __u16 s_tunnel, s_session;      /* For matching incoming packets */
+        __u16 d_tunnel, d_session;      /* For sending outgoing packets */
+
+        struct sockaddr_in6 addr;       /* IP address and port to send to */
+};
+
 /* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
  * bits. So we need a different sockaddr structure.
  */
@@ -49,6 +64,17 @@ struct pppol2tpv3_addr {
         __u32 d_tunnel, d_session;      /* For sending outgoing packets */
 };
 
+struct pppol2tpv3in6_addr {
+        __kernel_pid_t  pid;            /* pid that owns the fd.
+                                         * 0 => current */
+        int     fd;                     /* FD of UDP or IP socket to use */
+
+        __u32 s_tunnel, s_session;      /* For matching incoming packets */
+        __u32 d_tunnel, d_session;      /* For sending outgoing packets */
+
+        struct sockaddr_in6 addr;       /* IP address and port to send to */
+};
+
 /* Socket options:
  * DEBUG        - bitmask of debug message categories
  * SENDSEQ      - 0 => don't send packets with sequence numbers
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index b5f927f59f26..09c474c480cd 100644
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -70,7 +70,7 @@ struct sockaddr_pppox {
                 struct pppoe_addr  pppoe;
                 struct pptp_addr   pptp;
         } sa_addr;
-} __attribute__((packed));
+} __packed;
 
 /* The use of the above union isn't viable because the size of this
  * struct must stay fixed over time -- applications use sizeof(struct
@@ -81,7 +81,13 @@ struct sockaddr_pppol2tp {
         __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
         unsigned int    sa_protocol;    /* protocol identifier */
         struct pppol2tp_addr pppol2tp;
-} __attribute__((packed));
+} __packed;
+
+struct sockaddr_pppol2tpin6 {
+        __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
+        unsigned int    sa_protocol;    /* protocol identifier */
+        struct pppol2tpin6_addr pppol2tp;
+} __packed;
 
 /* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
  * bits. So we need a different sockaddr structure.
@@ -90,7 +96,13 @@ struct sockaddr_pppol2tpv3 {
         __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
         unsigned int    sa_protocol;    /* protocol identifier */
         struct pppol2tpv3_addr pppol2tp;
-} __attribute__((packed));
+} __packed;
+
+struct sockaddr_pppol2tpv3in6 {
+        __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
+        unsigned int    sa_protocol;    /* protocol identifier */
+        struct pppol2tpv3in6_addr pppol2tp;
+} __packed;
 
 /*********************************************************************
  *
@@ -140,7 +152,7 @@ struct pppoe_hdr {
         __be16 sid;
         __be16 length;
         struct pppoe_tag tag[0];
-} __attribute__((packed));
+} __packed;
 
 /* Length of entire PPPoE + PPP header */
 #define PPPOE_SES_HLEN  8
diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index 58404b0c5010..8185f57a9c7f 100644
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
@@ -28,10 +28,28 @@ struct team;
 
 struct team_port {
         struct net_device *dev;
-        struct hlist_node hlist; /* node in hash list */
+        struct hlist_node hlist; /* node in enabled ports hash list */
         struct list_head list; /* node in ordinary list */
         struct team *team;
-        int index;
+        int index; /* index of enabled port. If disabled, it's set to -1 */
+
+        bool linkup; /* either state.linkup or user.linkup */
+
+        struct {
+                bool linkup;
+                u32 speed;
+                u8 duplex;
+        } state;
+
+        /* Values set by userspace */
+        struct {
+                bool linkup;
+                bool linkup_enabled;
+        } user;
+
+        /* Custom gennetlink interface related flags */
+        bool changed;
+        bool removed;
 
         /*
          * A place for storing original values of the device before it
@@ -42,14 +60,6 @@ struct team_port {
                 unsigned int mtu;
         } orig;
 
-        bool linkup;
-        u32 speed;
-        u8 duplex;
-
-        /* Custom gennetlink interface related flags */
-        bool changed;
-        bool removed;
-
         struct rcu_head rcu;
 };
 
@@ -68,18 +78,30 @@ struct team_mode_ops {
 enum team_option_type {
         TEAM_OPTION_TYPE_U32,
         TEAM_OPTION_TYPE_STRING,
+        TEAM_OPTION_TYPE_BINARY,
+        TEAM_OPTION_TYPE_BOOL,
+};
+
+struct team_gsetter_ctx {
+        union {
+                u32 u32_val;
+                const char *str_val;
+                struct {
+                        const void *ptr;
+                        u32 len;
+                } bin_val;
+                bool bool_val;
+        } data;
+        struct team_port *port;
 };
 
 struct team_option {
         struct list_head list;
         const char *name;
+        bool per_port;
         enum team_option_type type;
-        int (*getter)(struct team *team, void *arg);
-        int (*setter)(struct team *team, void *arg);
-
-        /* Custom gennetlink interface related flags */
-        bool changed;
-        bool removed;
+        int (*getter)(struct team *team, struct team_gsetter_ctx *ctx);
+        int (*setter)(struct team *team, struct team_gsetter_ctx *ctx);
 };
 
 struct team_mode {
@@ -103,13 +125,15 @@ struct team {
         struct mutex lock; /* used for overall locking, e.g. port lists write */
 
         /*
-         * port lists with port count
+         * List of enabled ports and their count
          */
-        int port_count;
-        struct hlist_head port_hlist[TEAM_PORT_HASHENTRIES];
-        struct list_head port_list;
+        int en_port_count;
+        struct hlist_head en_port_hlist[TEAM_PORT_HASHENTRIES];
+
+        struct list_head port_list; /* list of all ports */
 
         struct list_head option_list;
+        struct list_head option_inst_list; /* list of option instances */
 
         const struct team_mode *mode;
         struct team_mode_ops ops;
@@ -119,7 +143,7 @@ struct team {
 static inline struct hlist_head *team_port_index_hash(struct team *team,
                                                       int port_index)
 {
-        return &team->port_hlist[port_index & (TEAM_PORT_HASHENTRIES - 1)];
+        return &team->en_port_hlist[port_index & (TEAM_PORT_HASHENTRIES - 1)];
 }
 
 static inline struct team_port *team_get_port_by_index(struct team *team,
@@ -216,6 +240,7 @@ enum {
         TEAM_ATTR_OPTION_TYPE,          /* u8 */
         TEAM_ATTR_OPTION_DATA,          /* dynamic */
         TEAM_ATTR_OPTION_REMOVED,       /* flag */
+        TEAM_ATTR_OPTION_PORT_IFINDEX,  /* u32 */ /* for per-port options */
 
         __TEAM_ATTR_OPTION_MAX,
         TEAM_ATTR_OPTION_MAX = __TEAM_ATTR_OPTION_MAX - 1,
diff --git a/include/linux/if_tr.h b/include/linux/if_tr.h
deleted file mode 100644
index fc23aeb0f201..000000000000
--- a/include/linux/if_tr.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * INET         An implementation of the TCP/IP protocol suite for the LINUX
- *              operating system.  INET is implemented using the  BSD Socket
- *              interface as the means of communication with the user level.
- *
- *              Global definitions for the Token-Ring IEEE 802.5 interface.
- *
- * Version:     @(#)if_tr.h     0.0     07/11/94
- *
- * Author:      Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *              Donald Becker, <becker@super.org>
- *              Peter De Schrijver, <stud11@cc4.kuleuven.ac.be>
- *
- *              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 _LINUX_IF_TR_H
-#define _LINUX_IF_TR_H
-
-#include <linux/types.h>
-#include <asm/byteorder.h>      /* For __be16 */
-
-/* IEEE 802.5 Token-Ring magic constants.  The frame sizes omit the preamble
-   and FCS/CRC (frame check sequence). */
-#define TR_ALEN         6               /* Octets in one token-ring addr */
-#define TR_HLEN         (sizeof(struct trh_hdr)+sizeof(struct trllc))
-#define AC              0x10
-#define LLC_FRAME       0x40
-
-/* LLC and SNAP constants */
-#define EXTENDED_SAP    0xAA
-#define UI_CMD          0x03
-
-/* This is an Token-Ring frame header. */
-struct trh_hdr {
-        __u8  ac;                       /* access control field */
-        __u8  fc;                       /* frame control field */
-        __u8  daddr[TR_ALEN];           /* destination address */
-        __u8  saddr[TR_ALEN];           /* source address */
-        __be16 rcf;                     /* route control field */
-        __be16 rseg[8];                 /* routing registers */
-};
-
-#ifdef __KERNEL__
-#include <linux/skbuff.h>
-
-static inline struct trh_hdr *tr_hdr(const struct sk_buff *skb)
-{
-        return (struct trh_hdr *)skb_mac_header(skb);
-}
-#endif
-
-/* This is an Token-Ring LLC structure */
-struct trllc {
-        __u8  dsap;                     /* destination SAP */
-        __u8  ssap;                     /* source SAP */
-        __u8  llc;                      /* LLC control field */
-        __u8  protid[3];                /* protocol id */
-        __be16 ethertype;               /* ether type field */
-};
-
-/* Token-Ring statistics collection data. */
-struct tr_statistics {
-        unsigned long rx_packets;       /* total packets received       */
-        unsigned long tx_packets;       /* total packets transmitted    */
-        unsigned long rx_bytes;         /* total bytes received         */
-        unsigned long tx_bytes;         /* total bytes transmitted      */
-        unsigned long rx_errors;        /* bad packets received         */
-        unsigned long tx_errors;        /* packet transmit problems     */
-        unsigned long rx_dropped;       /* no space in linux buffers    */
-        unsigned long tx_dropped;       /* no space available in linux  */
-        unsigned long multicast;        /* multicast packets received   */
-        unsigned long transmit_collision;
-
-        /* detailed Token-Ring errors. See IBM Token-Ring Network
-           Architecture for more info */
-
-        unsigned long line_errors;
-        unsigned long internal_errors;
-        unsigned long burst_errors;
-        unsigned long A_C_errors;
-        unsigned long abort_delimiters;
-        unsigned long lost_frames;
-        unsigned long recv_congest_count;
-        unsigned long frame_copied_errors;
-        unsigned long frequency_errors;
-        unsigned long token_errors;
-        unsigned long dummy1;
-};
-
-/* source routing stuff */
-#define TR_RII                  0x80
-#define TR_RCF_DIR_BIT          0x80
-#define TR_RCF_LEN_MASK         0x1f00
-#define TR_RCF_BROADCAST        0x8000  /* all-routes broadcast */
-#define TR_RCF_LIMITED_BROADCAST 0xC000 /* single-route broadcast */
-#define TR_RCF_FRAME2K          0x20
-#define TR_RCF_BROADCAST_MASK   0xC000
-#define TR_MAXRIFLEN            18
-
-#endif  /* _LINUX_IF_TR_H */
diff --git a/include/linux/iio/buffer.h b/include/linux/iio/buffer.h
new file mode 100644
index 000000000000..fb0fe46fd659
--- /dev/null
+++ b/include/linux/iio/buffer.h
@@ -0,0 +1,191 @@
+/* The industrial I/O core - generic buffer interfaces.
+ *
+ * Copyright (c) 2008 Jonathan Cameron
+ *
+ * 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 _IIO_BUFFER_GENERIC_H_
+#define _IIO_BUFFER_GENERIC_H_
+#include <linux/sysfs.h>
+#include <linux/iio/iio.h>
+
+#ifdef CONFIG_IIO_BUFFER
+
+struct iio_buffer;
+
+/**
+ * struct iio_buffer_access_funcs - access functions for buffers.
+ * @store_to:           actually store stuff to the buffer
+ * @read_first_n:       try to get a specified number of bytes (must exist)
+ * @request_update:     if a parameter change has been marked, update underlying
+ *                      storage.
+ * @get_bytes_per_datum:get current bytes per datum
+ * @set_bytes_per_datum:set number of bytes per datum
+ * @get_length:         get number of datums in buffer
+ * @set_length:         set number of datums in buffer
+ *
+ * The purpose of this structure is to make the buffer element
+ * modular as event for a given driver, different usecases may require
+ * different buffer designs (space efficiency vs speed for example).
+ *
+ * It is worth noting that a given buffer implementation may only support a
+ * small proportion of these functions.  The core code 'should' cope fine with
+ * any of them not existing.
+ **/
+struct iio_buffer_access_funcs {
+        int (*store_to)(struct iio_buffer *buffer, u8 *data, s64 timestamp);
+        int (*read_first_n)(struct iio_buffer *buffer,
+                            size_t n,
+                            char __user *buf);
+
+        int (*request_update)(struct iio_buffer *buffer);
+
+        int (*get_bytes_per_datum)(struct iio_buffer *buffer);
+        int (*set_bytes_per_datum)(struct iio_buffer *buffer, size_t bpd);
+        int (*get_length)(struct iio_buffer *buffer);
+        int (*set_length)(struct iio_buffer *buffer, int length);
+};
+
+/**
+ * struct iio_buffer - general buffer structure
+ * @length:             [DEVICE] number of datums in buffer
+ * @bytes_per_datum:    [DEVICE] size of individual datum including timestamp
+ * @scan_el_attrs:      [DRIVER] control of scan elements if that scan mode
+ *                      control method is used
+ * @scan_mask:          [INTERN] bitmask used in masking scan mode elements
+ * @scan_timestamp:     [INTERN] does the scan mode include a timestamp
+ * @access:             [DRIVER] buffer access functions associated with the
+ *                      implementation.
+ * @scan_el_dev_attr_list:[INTERN] list of scan element related attributes.
+ * @scan_el_group:      [DRIVER] attribute group for those attributes not
+ *                      created from the iio_chan_info array.
+ * @pollq:              [INTERN] wait queue to allow for polling on the buffer.
+ * @stufftoread:        [INTERN] flag to indicate new data.
+ * @demux_list:         [INTERN] list of operations required to demux the scan.
+ * @demux_bounce:       [INTERN] buffer for doing gather from incoming scan.
+ **/
+struct iio_buffer {
+        int                                     length;
+        int                                     bytes_per_datum;
+        struct attribute_group                  *scan_el_attrs;
+        long                                    *scan_mask;
+        bool                                    scan_timestamp;
+        const struct iio_buffer_access_funcs    *access;
+        struct list_head                        scan_el_dev_attr_list;
+        struct attribute_group                  scan_el_group;
+        wait_queue_head_t                       pollq;
+        bool                                    stufftoread;
+        const struct attribute_group *attrs;
+        struct list_head                        demux_list;
+        unsigned char                           *demux_bounce;
+};
+
+/**
+ * iio_buffer_init() - Initialize the buffer structure
+ * @buffer: buffer to be initialized
+ **/
+void iio_buffer_init(struct iio_buffer *buffer);
+
+/**
+ * __iio_update_buffer() - update common elements of buffers
+ * @buffer:             buffer that is the event source
+ * @bytes_per_datum:    size of individual datum including timestamp
+ * @length:             number of datums in buffer
+ **/
+static inline void __iio_update_buffer(struct iio_buffer *buffer,
+                                       int bytes_per_datum, int length)
+{
+        buffer->bytes_per_datum = bytes_per_datum;
+        buffer->length = length;
+}
+
+int iio_scan_mask_query(struct iio_dev *indio_dev,
+                        struct iio_buffer *buffer, int bit);
+
+/**
+ * iio_scan_mask_set() - set particular bit in the scan mask
+ * @buffer: the buffer whose scan mask we are interested in
+ * @bit: the bit to be set.
+ **/
+int iio_scan_mask_set(struct iio_dev *indio_dev,
+                      struct iio_buffer *buffer, int bit);
+
+/**
+ * iio_push_to_buffer() - push to a registered buffer.
+ * @buffer:             IIO buffer structure for device
+ * @scan:               Full scan.
+ * @timestamp:
+ */
+int iio_push_to_buffer(struct iio_buffer *buffer, unsigned char *data,
+                       s64 timestamp);
+
+int iio_update_demux(struct iio_dev *indio_dev);
+
+/**
+ * iio_buffer_register() - register the buffer with IIO core
+ * @indio_dev: device with the buffer to be registered
+ **/
+int iio_buffer_register(struct iio_dev *indio_dev,
+                        const struct iio_chan_spec *channels,
+                        int num_channels);
+
+/**
+ * iio_buffer_unregister() - unregister the buffer from IIO core
+ * @indio_dev: the device with the buffer to be unregistered
+ **/
+void iio_buffer_unregister(struct iio_dev *indio_dev);
+
+/**
+ * iio_buffer_read_length() - attr func to get number of datums in the buffer
+ **/
+ssize_t iio_buffer_read_length(struct device *dev,
+                               struct device_attribute *attr,
+                               char *buf);
+/**
+ * iio_buffer_write_length() - attr func to set number of datums in the buffer
+ **/
+ssize_t iio_buffer_write_length(struct device *dev,
+                              struct device_attribute *attr,
+                              const char *buf,
+                              size_t len);
+/**
+ * iio_buffer_store_enable() - attr to turn the buffer on
+ **/
+ssize_t iio_buffer_store_enable(struct device *dev,
+                                struct device_attribute *attr,
+                                const char *buf,
+                                size_t len);
+/**
+ * iio_buffer_show_enable() - attr to see if the buffer is on
+ **/
+ssize_t iio_buffer_show_enable(struct device *dev,
+                               struct device_attribute *attr,
+                               char *buf);
+#define IIO_BUFFER_LENGTH_ATTR DEVICE_ATTR(length, S_IRUGO | S_IWUSR,   \
+                                           iio_buffer_read_length,      \
+                                           iio_buffer_write_length)
+
+#define IIO_BUFFER_ENABLE_ATTR DEVICE_ATTR(enable, S_IRUGO | S_IWUSR,   \
+                                           iio_buffer_show_enable,      \
+                                           iio_buffer_store_enable)
+
+int iio_sw_buffer_preenable(struct iio_dev *indio_dev);
+
+#else /* CONFIG_IIO_BUFFER */
+
+static inline int iio_buffer_register(struct iio_dev *indio_dev,
+                                           struct iio_chan_spec *channels,
+                                           int num_channels)
+{
+        return 0;
+}
+
+static inline void iio_buffer_unregister(struct iio_dev *indio_dev)
+{};
+
+#endif /* CONFIG_IIO_BUFFER */
+
+#endif /* _IIO_BUFFER_GENERIC_H_ */
diff --git a/include/linux/iio/consumer.h b/include/linux/iio/consumer.h
new file mode 100644
index 000000000000..1a15e560a5a1
--- /dev/null
+++ b/include/linux/iio/consumer.h
@@ -0,0 +1,96 @@
+/*
+ * Industrial I/O in kernel consumer interface
+ *
+ * Copyright (c) 2011 Jonathan Cameron
+ *
+ * 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 _IIO_INKERN_CONSUMER_H_
+#define _IIO_INKERN_CONSUMER_H
+#include <linux/iio/types.h>
+
+struct iio_dev;
+struct iio_chan_spec;
+
+/**
+ * struct iio_channel - everything needed for a consumer to use a channel
+ * @indio_dev:          Device on which the channel exists.
+ * @channel:            Full description of the channel.
+ */
+struct iio_channel {
+        struct iio_dev *indio_dev;
+        const struct iio_chan_spec *channel;
+};
+
+/**
+ * iio_channel_get() - get description of all that is needed to access channel.
+ * @name:               Unique name of the device as provided in the iio_map
+ *                      with which the desired provider to consumer mapping
+ *                      was registered.
+ * @consumer_channel:   Unique name to identify the channel on the consumer
+ *                      side. This typically describes the channels use within
+ *                      the consumer. E.g. 'battery_voltage'
+ */
+struct iio_channel *iio_st_channel_get(const char *name,
+                                       const char *consumer_channel);
+
+/**
+ * iio_st_channel_release() - release channels obtained via iio_st_channel_get
+ * @chan:               The channel to be released.
+ */
+void iio_st_channel_release(struct iio_channel *chan);
+
+/**
+ * iio_st_channel_get_all() - get all channels associated with a client
+ * @name:               name of consumer device.
+ *
+ * Returns an array of iio_channel structures terminated with one with
+ * null iio_dev pointer.
+ * This function is used by fairly generic consumers to get all the
+ * channels registered as having this consumer.
+ */
+struct iio_channel *iio_st_channel_get_all(const char *name);
+
+/**
+ * iio_st_channel_release_all() - reverse iio_st_get_all
+ * @chan:               Array of channels to be released.
+ */
+void iio_st_channel_release_all(struct iio_channel *chan);
+
+/**
+ * iio_st_read_channel_raw() - read from a given channel
+ * @channel:            The channel being queried.
+ * @val:                Value read back.
+ *
+ * Note raw reads from iio channels are in adc counts and hence
+ * scale will need to be applied if standard units required.
+ */
+int iio_st_read_channel_raw(struct iio_channel *chan,
+                            int *val);
+
+/**
+ * iio_st_get_channel_type() - get the type of a channel
+ * @channel:            The channel being queried.
+ * @type:               The type of the channel.
+ *
+ * returns the enum iio_chan_type of the channel
+ */
+int iio_st_get_channel_type(struct iio_channel *channel,
+                            enum iio_chan_type *type);
+
+/**
+ * iio_st_read_channel_scale() - read the scale value for a channel
+ * @channel:            The channel being queried.
+ * @val:                First part of value read back.
+ * @val2:               Second part of value read back.
+ *
+ * Note returns a description of what is in val and val2, such
+ * as IIO_VAL_INT_PLUS_MICRO telling us we have a value of val
+ * + val2/1e6
+ */
+int iio_st_read_channel_scale(struct iio_channel *chan, int *val,
+                              int *val2);
+
+#endif
diff --git a/include/linux/iio/driver.h b/include/linux/iio/driver.h
new file mode 100644
index 000000000000..a4f8b2e05af5
--- /dev/null
+++ b/include/linux/iio/driver.h
@@ -0,0 +1,34 @@
+/*
+ * Industrial I/O in kernel access map interface.
+ *
+ * Copyright (c) 2011 Jonathan Cameron
+ *
+ * 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 _IIO_INKERN_H_
+#define _IIO_INKERN_H_
+
+struct iio_map;
+
+/**
+ * iio_map_array_register() - tell the core about inkernel consumers
+ * @indio_dev:  provider device
+ * @map:        array of mappings specifying association of channel with client
+ */
+int iio_map_array_register(struct iio_dev *indio_dev,
+                           struct iio_map *map);
+
+/**
+ * iio_map_array_unregister() - tell the core to remove consumer mappings
+ * @indio_dev:  provider device
+ * @map:        array of mappings to remove. Note these must have same memory
+ *              addresses as those originally added not just equal parameter
+ *              values.
+ */
+int iio_map_array_unregister(struct iio_dev *indio_dev,
+                             struct iio_map *map);
+
+#endif
diff --git a/include/linux/iio/events.h b/include/linux/iio/events.h
new file mode 100644
index 000000000000..b5acbf93c5da
--- /dev/null
+++ b/include/linux/iio/events.h
@@ -0,0 +1,105 @@
+/* The industrial I/O - event passing to userspace
+ *
+ * Copyright (c) 2008-2011 Jonathan Cameron
+ *
+ * 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 _IIO_EVENTS_H_
+#define _IIO_EVENTS_H_
+
+#include <linux/ioctl.h>
+#include <linux/types.h>
+#include <linux/iio/types.h>
+
+/**
+ * struct iio_event_data - The actual event being pushed to userspace
+ * @id:         event identifier
+ * @timestamp:  best estimate of time of event occurrence (often from
+ *              the interrupt handler)
+ */
+struct iio_event_data {
+        __u64   id;
+        __s64   timestamp;
+};
+
+#define IIO_GET_EVENT_FD_IOCTL _IOR('i', 0x90, int)
+
+enum iio_event_type {
+        IIO_EV_TYPE_THRESH,
+        IIO_EV_TYPE_MAG,
+        IIO_EV_TYPE_ROC,
+        IIO_EV_TYPE_THRESH_ADAPTIVE,
+        IIO_EV_TYPE_MAG_ADAPTIVE,
+};
+
+enum iio_event_direction {
+        IIO_EV_DIR_EITHER,
+        IIO_EV_DIR_RISING,
+        IIO_EV_DIR_FALLING,
+};
+
+/**
+ * IIO_EVENT_CODE() - create event identifier
+ * @chan_type:  Type of the channel. Should be one of enum iio_chan_type.
+ * @diff:       Whether the event is for an differential channel or not.
+ * @modifier:   Modifier for the channel. Should be one of enum iio_modifier.
+ * @direction:  Direction of the event. One of enum iio_event_direction.
+ * @type:       Type of the event. Should be one enum iio_event_type.
+ * @chan:       Channel number for non-differential channels.
+ * @chan1:      First channel number for differential channels.
+ * @chan2:      Second channel number for differential channels.
+ */
+
+#define IIO_EVENT_CODE(chan_type, diff, modifier, direction,            \
+                       type, chan, chan1, chan2)                        \
+        (((u64)type << 56) | ((u64)diff << 55) |                        \
+         ((u64)direction << 48) | ((u64)modifier << 40) |               \
+         ((u64)chan_type << 32) | (((u16)chan2) << 16) | ((u16)chan1) | \
+         ((u16)chan))
+
+
+#define IIO_EV_DIR_MAX 4
+#define IIO_EV_BIT(type, direction)                     \
+        (1 << (type*IIO_EV_DIR_MAX + direction))
+
+/**
+ * IIO_MOD_EVENT_CODE() - create event identifier for modified channels
+ * @chan_type:  Type of the channel. Should be one of enum iio_chan_type.
+ * @number:     Channel number.
+ * @modifier:   Modifier for the channel. Should be one of enum iio_modifier.
+ * @type:       Type of the event. Should be one enum iio_event_type.
+ * @direction:  Direction of the event. One of enum iio_event_direction.
+ */
+
+#define IIO_MOD_EVENT_CODE(chan_type, number, modifier,         \
+                           type, direction)                             \
+        IIO_EVENT_CODE(chan_type, 0, modifier, direction, type, number, 0, 0)
+
+/**
+ * IIO_UNMOD_EVENT_CODE() - create event identifier for unmodified channels
+ * @chan_type:  Type of the channel. Should be one of enum iio_chan_type.
+ * @number:     Channel number.
+ * @type:       Type of the event. Should be one enum iio_event_type.
+ * @direction:  Direction of the event. One of enum iio_event_direction.
+ */
+
+#define IIO_UNMOD_EVENT_CODE(chan_type, number, type, direction)        \
+        IIO_EVENT_CODE(chan_type, 0, 0, direction, type, number, 0, 0)
+
+#define IIO_EVENT_CODE_EXTRACT_TYPE(mask) ((mask >> 56) & 0xFF)
+
+#define IIO_EVENT_CODE_EXTRACT_DIR(mask) ((mask >> 48) & 0xCF)
+
+#define IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(mask) ((mask >> 32) & 0xFF)
+
+/* Event code number extraction depends on which type of event we have.
+ * Perhaps review this function in the future*/
+#define IIO_EVENT_CODE_EXTRACT_CHAN(mask) ((__s16)(mask & 0xFFFF))
+#define IIO_EVENT_CODE_EXTRACT_CHAN2(mask) ((__s16)(((mask) >> 16) & 0xFFFF))
+
+#define IIO_EVENT_CODE_EXTRACT_MODIFIER(mask) ((mask >> 40) & 0xFF)
+#define IIO_EVENT_CODE_EXTRACT_DIFF(mask) (((mask) >> 55) & 0x1)
+
+#endif
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
new file mode 100644
index 000000000000..3a4f6a3ab80d
--- /dev/null
+++ b/include/linux/iio/iio.h
@@ -0,0 +1,492 @@
+
+/* The industrial I/O core
+ *
+ * Copyright (c) 2008 Jonathan Cameron
+ *
+ * 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 _INDUSTRIAL_IO_H_
+#define _INDUSTRIAL_IO_H_
+
+#include <linux/device.h>
+#include <linux/cdev.h>
+#include <linux/iio/types.h>
+/* IIO TODO LIST */
+/*
+ * Provide means of adjusting timer accuracy.
+ * Currently assumes nano seconds.
+ */
+
+enum iio_chan_info_enum {
+        IIO_CHAN_INFO_RAW = 0,
+        IIO_CHAN_INFO_PROCESSED,
+        IIO_CHAN_INFO_SCALE,
+        IIO_CHAN_INFO_OFFSET,
+        IIO_CHAN_INFO_CALIBSCALE,
+        IIO_CHAN_INFO_CALIBBIAS,
+        IIO_CHAN_INFO_PEAK,
+        IIO_CHAN_INFO_PEAK_SCALE,
+        IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW,
+        IIO_CHAN_INFO_AVERAGE_RAW,
+        IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY,
+        IIO_CHAN_INFO_SAMP_FREQ,
+        IIO_CHAN_INFO_FREQUENCY,
+        IIO_CHAN_INFO_PHASE,
+        IIO_CHAN_INFO_HARDWAREGAIN,
+};
+
+#define IIO_CHAN_INFO_SHARED_BIT(type) BIT(type*2)
+#define IIO_CHAN_INFO_SEPARATE_BIT(type) BIT(type*2 + 1)
+
+#define IIO_CHAN_INFO_RAW_SEPARATE_BIT                  \
+        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_RAW)
+#define IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT                    \
+        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_PROCESSED)
+#define IIO_CHAN_INFO_SCALE_SEPARATE_BIT                \
+        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_SCALE)
+#define IIO_CHAN_INFO_SCALE_SHARED_BIT                  \
+        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_SCALE)
+#define IIO_CHAN_INFO_OFFSET_SEPARATE_BIT                       \
+        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_OFFSET)
+#define IIO_CHAN_INFO_OFFSET_SHARED_BIT                 \
+        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_OFFSET)
+#define IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT                   \
+        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_CALIBSCALE)
+#define IIO_CHAN_INFO_CALIBSCALE_SHARED_BIT                     \
+        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_CALIBSCALE)
+#define IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT                    \
+        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_CALIBBIAS)
+#define IIO_CHAN_INFO_CALIBBIAS_SHARED_BIT                      \
+        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_CALIBBIAS)
+#define IIO_CHAN_INFO_PEAK_SEPARATE_BIT                 \
+        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_PEAK)
+#define IIO_CHAN_INFO_PEAK_SHARED_BIT                   \
+        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_PEAK)
+#define IIO_CHAN_INFO_PEAKSCALE_SEPARATE_BIT                    \
+        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_PEAKSCALE)
+#define IIO_CHAN_INFO_PEAKSCALE_SHARED_BIT                      \
+        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_PEAKSCALE)
+#define IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SEPARATE_BIT    \
+        IIO_CHAN_INFO_SEPARATE_BIT(                             \
+                IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW)
+#define IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SHARED_BIT      \
+        IIO_CHAN_INFO_SHARED_BIT(                               \
+                IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW)
+#define IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE_BIT                  \
+        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_AVERAGE_RAW)
+#define IIO_CHAN_INFO_AVERAGE_RAW_SHARED_BIT                    \
+        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_AVERAGE_RAW)
+#define IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT \
+        IIO_CHAN_INFO_SHARED_BIT(                              \
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY)
+#define IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SEPARATE_BIT \
+        IIO_CHAN_INFO_SEPARATE_BIT(                            \
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY)
+#define IIO_CHAN_INFO_SAMP_FREQ_SEPARATE_BIT            \
+        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_SAMP_FREQ)
+#define IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT                      \
+        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_SAMP_FREQ)
+#define IIO_CHAN_INFO_FREQUENCY_SEPARATE_BIT                    \
+        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_FREQUENCY)
+#define IIO_CHAN_INFO_FREQUENCY_SHARED_BIT                      \
+        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_FREQUENCY)
+#define IIO_CHAN_INFO_PHASE_SEPARATE_BIT                        \
+        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_PHASE)
+#define IIO_CHAN_INFO_PHASE_SHARED_BIT                  \
+        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_PHASE)
+#define IIO_CHAN_INFO_HARDWAREGAIN_SEPARATE_BIT                 \
+        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_HARDWAREGAIN)
+#define IIO_CHAN_INFO_HARDWAREGAIN_SHARED_BIT                   \
+        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_HARDWAREGAIN)
+
+enum iio_endian {
+        IIO_CPU,
+        IIO_BE,
+        IIO_LE,
+};
+
+struct iio_chan_spec;
+struct iio_dev;
+
+/**
+ * struct iio_chan_spec_ext_info - Extended channel info attribute
+ * @name:       Info attribute name
+ * @shared:     Whether this attribute is shared between all channels.
+ * @read:       Read callback for this info attribute, may be NULL.
+ * @write:      Write callback for this info attribute, may be NULL.
+ * @private:    Data private to the driver.
+ */
+struct iio_chan_spec_ext_info {
+        const char *name;
+        bool shared;
+        ssize_t (*read)(struct iio_dev *, uintptr_t private,
+                        struct iio_chan_spec const *, char *buf);
+        ssize_t (*write)(struct iio_dev *, uintptr_t private,
+                         struct iio_chan_spec const *, const char *buf,
+                         size_t len);
+        uintptr_t private;
+};
+
+/**
+ * struct iio_chan_spec - specification of a single channel
+ * @type:               What type of measurement is the channel making.
+ * @channel:            What number or name do we wish to assign the channel.
+ * @channel2:           If there is a second number for a differential
+ *                      channel then this is it. If modified is set then the
+ *                      value here specifies the modifier.
+ * @address:            Driver specific identifier.
+ * @scan_index: Monotonic index to give ordering in scans when read
+ *                      from a buffer.
+ * @scan_type:          Sign:           's' or 'u' to specify signed or unsigned
+ *                      realbits:       Number of valid bits of data
+ *                      storage_bits:   Realbits + padding
+ *                      shift:          Shift right by this before masking out
+ *                                      realbits.
+ *                      endianness:     little or big endian
+ * @info_mask:          What information is to be exported about this channel.
+ *                      This includes calibbias, scale etc.
+ * @event_mask: What events can this channel produce.
+ * @ext_info:           Array of extended info attributes for this channel.
+ *                      The array is NULL terminated, the last element should
+ *                      have it's name field set to NULL.
+ * @extend_name:        Allows labeling of channel attributes with an
+ *                      informative name. Note this has no effect codes etc,
+ *                      unlike modifiers.
+ * @datasheet_name:     A name used in in kernel mapping of channels. It should
+ *                      correspond to the first name that the channel is referred
+ *                      to by in the datasheet (e.g. IND), or the nearest
+ *                      possible compound name (e.g. IND-INC).
+ * @modified:           Does a modifier apply to this channel. What these are
+ *                      depends on the channel type.  Modifier is set in
+ *                      channel2. Examples are IIO_MOD_X for axial sensors about
+ *                      the 'x' axis.
+ * @indexed:            Specify the channel has a numerical index. If not,
+ *                      the value in channel will be suppressed for attribute
+ *                      but not for event codes. Typically set it to 0 when
+ *                      the index is false.
+ * @differential:       Channel is differential.
+ */
+struct iio_chan_spec {
+        enum iio_chan_type      type;
+        int                     channel;
+        int                     channel2;
+        unsigned long           address;
+        int                     scan_index;
+        struct {
+                char    sign;
+                u8      realbits;
+                u8      storagebits;
+                u8      shift;
+                enum iio_endian endianness;
+        } scan_type;
+        long                    info_mask;
+        long                    event_mask;
+        const struct iio_chan_spec_ext_info *ext_info;
+        const char              *extend_name;
+        const char              *datasheet_name;
+        unsigned                modified:1;
+        unsigned                indexed:1;
+        unsigned                output:1;
+        unsigned                differential:1;
+};
+
+#define IIO_ST(si, rb, sb, sh)                                          \
+        { .sign = si, .realbits = rb, .storagebits = sb, .shift = sh }
+
+#define IIO_CHAN_SOFT_TIMESTAMP(_si)                                    \
+        { .type = IIO_TIMESTAMP, .channel = -1,                         \
+                        .scan_index = _si, .scan_type = IIO_ST('s', 64, 64, 0) }
+
+/**
+ * iio_get_time_ns() - utility function to get a time stamp for events etc
+ **/
+static inline s64 iio_get_time_ns(void)
+{
+        struct timespec ts;
+        /*
+         * calls getnstimeofday.
+         * If hrtimers then up to ns accurate, if not microsecond.
+         */
+        ktime_get_real_ts(&ts);
+
+        return timespec_to_ns(&ts);
+}
+
+/* Device operating modes */
+#define INDIO_DIRECT_MODE               0x01
+#define INDIO_BUFFER_TRIGGERED          0x02
+#define INDIO_BUFFER_HARDWARE           0x08
+
+#define INDIO_ALL_BUFFER_MODES                                  \
+        (INDIO_BUFFER_TRIGGERED | INDIO_BUFFER_HARDWARE)
+
+struct iio_trigger; /* forward declaration */
+struct iio_dev;
+
+/**
+ * struct iio_info - constant information about device
+ * @driver_module:      module structure used to ensure correct
+ *                      ownership of chrdevs etc
+ * @event_attrs:        event control attributes
+ * @attrs:              general purpose device attributes
+ * @read_raw:           function to request a value from the device.
+ *                      mask specifies which value. Note 0 means a reading of
+ *                      the channel in question.  Return value will specify the
+ *                      type of value returned by the device. val and val2 will
+ *                      contain the elements making up the returned value.
+ * @write_raw:          function to write a value to the device.
+ *                      Parameters are the same as for read_raw.
+ * @write_raw_get_fmt:  callback function to query the expected
+ *                      format/precision. If not set by the driver, write_raw
+ *                      returns IIO_VAL_INT_PLUS_MICRO.
+ * @read_event_config:  find out if the event is enabled.
+ * @write_event_config: set if the event is enabled.
+ * @read_event_value:   read a value associated with the event. Meaning
+ *                      is event dependant. event_code specifies which event.
+ * @write_event_value:  write the value associated with the event.
+ *                      Meaning is event dependent.
+ * @validate_trigger:   function to validate the trigger when the
+ *                      current trigger gets changed.
+ **/
+struct iio_info {
+        struct module                   *driver_module;
+        struct attribute_group          *event_attrs;
+        const struct attribute_group    *attrs;
+
+        int (*read_raw)(struct iio_dev *indio_dev,
+                        struct iio_chan_spec const *chan,
+                        int *val,
+                        int *val2,
+                        long mask);
+
+        int (*write_raw)(struct iio_dev *indio_dev,
+                         struct iio_chan_spec const *chan,
+                         int val,
+                         int val2,
+                         long mask);
+
+        int (*write_raw_get_fmt)(struct iio_dev *indio_dev,
+                         struct iio_chan_spec const *chan,
+                         long mask);
+
+        int (*read_event_config)(struct iio_dev *indio_dev,
+                                 u64 event_code);
+
+        int (*write_event_config)(struct iio_dev *indio_dev,
+                                  u64 event_code,
+                                  int state);
+
+        int (*read_event_value)(struct iio_dev *indio_dev,
+                                u64 event_code,
+                                int *val);
+        int (*write_event_value)(struct iio_dev *indio_dev,
+                                 u64 event_code,
+                                 int val);
+        int (*validate_trigger)(struct iio_dev *indio_dev,
+                                struct iio_trigger *trig);
+        int (*update_scan_mode)(struct iio_dev *indio_dev,
+                                const unsigned long *scan_mask);
+        int (*debugfs_reg_access)(struct iio_dev *indio_dev,
+                                  unsigned reg, unsigned writeval,
+                                  unsigned *readval);
+};
+
+/**
+ * struct iio_buffer_setup_ops - buffer setup related callbacks
+ * @preenable:          [DRIVER] function to run prior to marking buffer enabled
+ * @postenable:         [DRIVER] function to run after marking buffer enabled
+ * @predisable:         [DRIVER] function to run prior to marking buffer
+ *                      disabled
+ * @postdisable:        [DRIVER] function to run after marking buffer disabled
+ */
+struct iio_buffer_setup_ops {
+        int                             (*preenable)(struct iio_dev *);
+        int                             (*postenable)(struct iio_dev *);
+        int                             (*predisable)(struct iio_dev *);
+        int                             (*postdisable)(struct iio_dev *);
+};
+
+/**
+ * struct iio_dev - industrial I/O device
+ * @id:                 [INTERN] used to identify device internally
+ * @modes:              [DRIVER] operating modes supported by device
+ * @currentmode:        [DRIVER] current operating mode
+ * @dev:                [DRIVER] device structure, should be assigned a parent
+ *                      and owner
+ * @event_interface:    [INTERN] event chrdevs associated with interrupt lines
+ * @buffer:             [DRIVER] any buffer present
+ * @scan_bytes:         [INTERN] num bytes captured to be fed to buffer demux
+ * @mlock:              [INTERN] lock used to prevent simultaneous device state
+ *                      changes
+ * @available_scan_masks: [DRIVER] optional array of allowed bitmasks
+ * @masklength:         [INTERN] the length of the mask established from
+ *                      channels
+ * @active_scan_mask:   [INTERN] union of all scan masks requested by buffers
+ * @scan_timestamp:     [INTERN] set if any buffers have requested timestamp
+ * @scan_index_timestamp:[INTERN] cache of the index to the timestamp
+ * @trig:               [INTERN] current device trigger (buffer modes)
+ * @pollfunc:           [DRIVER] function run on trigger being received
+ * @channels:           [DRIVER] channel specification structure table
+ * @num_channels:       [DRIVER] number of chanels specified in @channels.
+ * @channel_attr_list:  [INTERN] keep track of automatically created channel
+ *                      attributes
+ * @chan_attr_group:    [INTERN] group for all attrs in base directory
+ * @name:               [DRIVER] name of the device.
+ * @info:               [DRIVER] callbacks and constant info from driver
+ * @info_exist_lock:    [INTERN] lock to prevent use during removal
+ * @setup_ops:          [DRIVER] callbacks to call before and after buffer
+ *                      enable/disable
+ * @chrdev:             [INTERN] associated character device
+ * @groups:             [INTERN] attribute groups
+ * @groupcounter:       [INTERN] index of next attribute group
+ * @flags:              [INTERN] file ops related flags including busy flag.
+ * @debugfs_dentry:     [INTERN] device specific debugfs dentry.
+ * @cached_reg_addr:    [INTERN] cached register address for debugfs reads.
+ */
+struct iio_dev {
+        int                             id;
+
+        int                             modes;
+        int                             currentmode;
+        struct device                   dev;
+
+        struct iio_event_interface      *event_interface;
+
+        struct iio_buffer               *buffer;
+        int                             scan_bytes;
+        struct mutex                    mlock;
+
+        const unsigned long             *available_scan_masks;
+        unsigned                        masklength;
+        const unsigned long             *active_scan_mask;
+        bool                            scan_timestamp;
+        unsigned                        scan_index_timestamp;
+        struct iio_trigger              *trig;
+        struct iio_poll_func            *pollfunc;
+
+        struct iio_chan_spec const      *channels;
+        int                             num_channels;
+
+        struct list_head                channel_attr_list;
+        struct attribute_group          chan_attr_group;
+        const char                      *name;
+        const struct iio_info           *info;
+        struct mutex                    info_exist_lock;
+        const struct iio_buffer_setup_ops       *setup_ops;
+        struct cdev                     chrdev;
+#define IIO_MAX_GROUPS 6
+        const struct attribute_group    *groups[IIO_MAX_GROUPS + 1];
+        int                             groupcounter;
+
+        unsigned long                   flags;
+#if defined(CONFIG_DEBUG_FS)
+        struct dentry                   *debugfs_dentry;
+        unsigned                        cached_reg_addr;
+#endif
+};
+
+/**
+ * iio_find_channel_from_si() - get channel from its scan index
+ * @indio_dev:          device
+ * @si:                 scan index to match
+ */
+const struct iio_chan_spec
+*iio_find_channel_from_si(struct iio_dev *indio_dev, int si);
+
+/**
+ * iio_device_register() - register a device with the IIO subsystem
+ * @indio_dev:          Device structure filled by the device driver
+ **/
+int iio_device_register(struct iio_dev *indio_dev);
+
+/**
+ * iio_device_unregister() - unregister a device from the IIO subsystem
+ * @indio_dev:          Device structure representing the device.
+ **/
+void iio_device_unregister(struct iio_dev *indio_dev);
+
+/**
+ * iio_push_event() - try to add event to the list for userspace reading
+ * @indio_dev:          IIO device structure
+ * @ev_code:            What event
+ * @timestamp:          When the event occurred
+ **/
+int iio_push_event(struct iio_dev *indio_dev, u64 ev_code, s64 timestamp);
+
+extern struct bus_type iio_bus_type;
+
+/**
+ * iio_device_put() - reference counted deallocation of struct device
+ * @dev: the iio_device containing the device
+ **/
+static inline void iio_device_put(struct iio_dev *indio_dev)
+{
+        if (indio_dev)
+                put_device(&indio_dev->dev);
+};
+
+/**
+ * dev_to_iio_dev() - Get IIO device struct from a device struct
+ * @dev: The device embedded in the IIO device
+ *
+ * Note: The device must be a IIO device, otherwise the result is undefined.
+ */
+static inline struct iio_dev *dev_to_iio_dev(struct device *dev)
+{
+        return container_of(dev, struct iio_dev, dev);
+}
+
+/* Can we make this smaller? */
+#define IIO_ALIGN L1_CACHE_BYTES
+/**
+ * iio_device_alloc() - allocate an iio_dev from a driver
+ * @sizeof_priv: Space to allocate for private structure.
+ **/
+struct iio_dev *iio_device_alloc(int sizeof_priv);
+
+static inline void *iio_priv(const struct iio_dev *indio_dev)
+{
+        return (char *)indio_dev + ALIGN(sizeof(struct iio_dev), IIO_ALIGN);
+}
+
+static inline struct iio_dev *iio_priv_to_dev(void *priv)
+{
+        return (struct iio_dev *)((char *)priv -
+                                  ALIGN(sizeof(struct iio_dev), IIO_ALIGN));
+}
+
+/**
+ * iio_device_free() - free an iio_dev from a driver
+ * @dev: the iio_dev associated with the device
+ **/
+void iio_device_free(struct iio_dev *indio_dev);
+
+/**
+ * iio_buffer_enabled() - helper function to test if the buffer is enabled
+ * @indio_dev:          IIO device info structure for device
+ **/
+static inline bool iio_buffer_enabled(struct iio_dev *indio_dev)
+{
+        return indio_dev->currentmode
+                & (INDIO_BUFFER_TRIGGERED | INDIO_BUFFER_HARDWARE);
+};
+
+/**
+ * iio_get_debugfs_dentry() - helper function to get the debugfs_dentry
+ * @indio_dev:          IIO device info structure for device
+ **/
+#if defined(CONFIG_DEBUG_FS)
+static inline struct dentry *iio_get_debugfs_dentry(struct iio_dev *indio_dev)
+{
+        return indio_dev->debugfs_dentry;
+};
+#else
+static inline struct dentry *iio_get_debugfs_dentry(struct iio_dev *indio_dev)
+{
+        return NULL;
+};
+#endif
+
+#endif /* _INDUSTRIAL_IO_H_ */
diff --git a/include/linux/iio/kfifo_buf.h b/include/linux/iio/kfifo_buf.h
new file mode 100644
index 000000000000..014d5a13b32b
--- /dev/null
+++ b/include/linux/iio/kfifo_buf.h
@@ -0,0 +1,8 @@
+
+#include <linux/kfifo.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/buffer.h>
+
+struct iio_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev);
+void iio_kfifo_free(struct iio_buffer *r);
+
diff --git a/include/linux/iio/machine.h b/include/linux/iio/machine.h
new file mode 100644
index 000000000000..0b1f19bfdc44
--- /dev/null
+++ b/include/linux/iio/machine.h
@@ -0,0 +1,24 @@
+/*
+ * Industrial I/O in kernel access map definitions for board files.
+ *
+ * Copyright (c) 2011 Jonathan Cameron
+ *
+ * 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.
+ */
+
+/**
+ * struct iio_map - description of link between consumer and device channels
+ * @adc_channel_label:  Label used to identify the channel on the provider.
+ *                      This is matched against the datasheet_name element
+ *                      of struct iio_chan_spec.
+ * @consumer_dev_name:  Name to uniquely identify the consumer device.
+ * @consumer_channel:   Unique name used to idenitify the channel on the
+ *                      consumer side.
+ */
+struct iio_map {
+        const char *adc_channel_label;
+        const char *consumer_dev_name;
+        const char *consumer_channel;
+};
diff --git a/include/linux/iio/sysfs.h b/include/linux/iio/sysfs.h
new file mode 100644
index 000000000000..bfedb73b850e
--- /dev/null
+++ b/include/linux/iio/sysfs.h
@@ -0,0 +1,117 @@
+/* The industrial I/O core
+ *
+ *Copyright (c) 2008 Jonathan Cameron
+ *
+ * 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.
+ *
+ * General attributes
+ */
+
+#ifndef _INDUSTRIAL_IO_SYSFS_H_
+#define _INDUSTRIAL_IO_SYSFS_H_
+
+struct iio_chan_spec;
+
+/**
+ * struct iio_dev_attr - iio specific device attribute
+ * @dev_attr:   underlying device attribute
+ * @address:    associated register address
+ * @l:          list head for maintaining list of dynamically created attrs.
+ */
+struct iio_dev_attr {
+        struct device_attribute dev_attr;
+        u64 address;
+        struct list_head l;
+        struct iio_chan_spec const *c;
+};
+
+#define to_iio_dev_attr(_dev_attr)                              \
+        container_of(_dev_attr, struct iio_dev_attr, dev_attr)
+
+ssize_t iio_read_const_attr(struct device *dev,
+                            struct device_attribute *attr,
+                            char *len);
+
+/**
+ * struct iio_const_attr - constant device specific attribute
+ *                         often used for things like available modes
+ * @string:     attribute string
+ * @dev_attr:   underlying device attribute
+ */
+struct iio_const_attr {
+        const char *string;
+        struct device_attribute dev_attr;
+};
+
+#define to_iio_const_attr(_dev_attr) \
+        container_of(_dev_attr, struct iio_const_attr, dev_attr)
+
+/* Some attributes will be hard coded (device dependent) and not require an
+   address, in these cases pass a negative */
+#define IIO_ATTR(_name, _mode, _show, _store, _addr)            \
+        { .dev_attr = __ATTR(_name, _mode, _show, _store),      \
+          .address = _addr }
+
+#define IIO_DEVICE_ATTR(_name, _mode, _show, _store, _addr)     \
+        struct iio_dev_attr iio_dev_attr_##_name                \
+        = IIO_ATTR(_name, _mode, _show, _store, _addr)
+
+#define IIO_DEVICE_ATTR_NAMED(_vname, _name, _mode, _show, _store, _addr) \
+        struct iio_dev_attr iio_dev_attr_##_vname                       \
+        = IIO_ATTR(_name, _mode, _show, _store, _addr)
+
+#define IIO_CONST_ATTR(_name, _string)                                  \
+        struct iio_const_attr iio_const_attr_##_name                    \
+        = { .string = _string,                                          \
+            .dev_attr = __ATTR(_name, S_IRUGO, iio_read_const_attr, NULL)}
+
+#define IIO_CONST_ATTR_NAMED(_vname, _name, _string)                    \
+        struct iio_const_attr iio_const_attr_##_vname                   \
+        = { .string = _string,                                          \
+            .dev_attr = __ATTR(_name, S_IRUGO, iio_read_const_attr, NULL)}
+
+/* Generic attributes of onetype or another */
+/**
+ * IIO_DEV_ATTR_RESET: resets the device
+ **/
+#define IIO_DEV_ATTR_RESET(_store)                      \
+        IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, _store, 0)
+
+/**
+ * IIO_DEV_ATTR_SAMP_FREQ - sets any internal clock frequency
+ * @_mode: sysfs file mode/permissions
+ * @_show: output method for the attribute
+ * @_store: input method for the attribute
+ **/
+#define IIO_DEV_ATTR_SAMP_FREQ(_mode, _show, _store)                    \
+        IIO_DEVICE_ATTR(sampling_frequency, _mode, _show, _store, 0)
+
+/**
+ * IIO_DEV_ATTR_SAMP_FREQ_AVAIL - list available sampling frequencies
+ * @_show: output method for the attribute
+ *
+ * May be mode dependent on some devices
+ **/
+#define IIO_DEV_ATTR_SAMP_FREQ_AVAIL(_show)                             \
+        IIO_DEVICE_ATTR(sampling_frequency_available, S_IRUGO, _show, NULL, 0)
+/**
+ * IIO_CONST_ATTR_AVAIL_SAMP_FREQ - list available sampling frequencies
+ * @_string: frequency string for the attribute
+ *
+ * Constant version
+ **/
+#define IIO_CONST_ATTR_SAMP_FREQ_AVAIL(_string)                 \
+        IIO_CONST_ATTR(sampling_frequency_available, _string)
+
+#define IIO_DEV_ATTR_TEMP_RAW(_show)                    \
+        IIO_DEVICE_ATTR(in_temp_raw, S_IRUGO, _show, NULL, 0)
+
+#define IIO_CONST_ATTR_TEMP_OFFSET(_string)             \
+        IIO_CONST_ATTR(in_temp_offset, _string)
+
+#define IIO_CONST_ATTR_TEMP_SCALE(_string)              \
+        IIO_CONST_ATTR(in_temp_scale, _string)
+
+#endif /* _INDUSTRIAL_IO_SYSFS_H_ */
diff --git a/include/linux/iio/trigger.h b/include/linux/iio/trigger.h
new file mode 100644
index 000000000000..a9819940a84c
--- /dev/null
+++ b/include/linux/iio/trigger.h
@@ -0,0 +1,119 @@
+/* The industrial I/O core, trigger handling functions
+ *
+ * Copyright (c) 2008 Jonathan Cameron
+ *
+ * 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.
+ */
+#include <linux/irq.h>
+#include <linux/module.h>
+
+#ifndef _IIO_TRIGGER_H_
+#define _IIO_TRIGGER_H_
+
+struct iio_subirq {
+        bool enabled;
+};
+
+/**
+ * struct iio_trigger_ops - operations structure for an iio_trigger.
+ * @owner:              used to monitor usage count of the trigger.
+ * @set_trigger_state:  switch on/off the trigger on demand
+ * @try_reenable:       function to reenable the trigger when the
+ *                      use count is zero (may be NULL)
+ * @validate_device:    function to validate the device when the
+ *                      current trigger gets changed.
+ *
+ * This is typically static const within a driver and shared by
+ * instances of a given device.
+ **/
+struct iio_trigger_ops {
+        struct module                   *owner;
+        int (*set_trigger_state)(struct iio_trigger *trig, bool state);
+        int (*try_reenable)(struct iio_trigger *trig);
+        int (*validate_device)(struct iio_trigger *trig,
+                               struct iio_dev *indio_dev);
+};
+
+
+/**
+ * struct iio_trigger - industrial I/O trigger device
+ *
+ * @id:                 [INTERN] unique id number
+ * @name:               [DRIVER] unique name
+ * @dev:                [DRIVER] associated device (if relevant)
+ * @private_data:       [DRIVER] device specific data
+ * @list:               [INTERN] used in maintenance of global trigger list
+ * @alloc_list:         [DRIVER] used for driver specific trigger list
+ * @use_count:          use count for the trigger
+ * @subirq_chip:        [INTERN] associate 'virtual' irq chip.
+ * @subirq_base:        [INTERN] base number for irqs provided by trigger.
+ * @subirqs:            [INTERN] information about the 'child' irqs.
+ * @pool:               [INTERN] bitmap of irqs currently in use.
+ * @pool_lock:          [INTERN] protection of the irq pool.
+ **/
+struct iio_trigger {
+        const struct iio_trigger_ops    *ops;
+        int                             id;
+        const char                      *name;
+        struct device                   dev;
+
+        void                            *private_data;
+        struct list_head                list;
+        struct list_head                alloc_list;
+        int use_count;
+
+        struct irq_chip                 subirq_chip;
+        int                             subirq_base;
+
+        struct iio_subirq subirqs[CONFIG_IIO_CONSUMERS_PER_TRIGGER];
+        unsigned long pool[BITS_TO_LONGS(CONFIG_IIO_CONSUMERS_PER_TRIGGER)];
+        struct mutex                    pool_lock;
+};
+
+
+static inline struct iio_trigger *to_iio_trigger(struct device *d)
+{
+        return container_of(d, struct iio_trigger, dev);
+};
+
+static inline void iio_trigger_put(struct iio_trigger *trig)
+{
+        module_put(trig->ops->owner);
+        put_device(&trig->dev);
+};
+
+static inline void iio_trigger_get(struct iio_trigger *trig)
+{
+        get_device(&trig->dev);
+        __module_get(trig->ops->owner);
+};
+
+/**
+ * iio_trigger_register() - register a trigger with the IIO core
+ * @trig_info:  trigger to be registered
+ **/
+int iio_trigger_register(struct iio_trigger *trig_info);
+
+/**
+ * iio_trigger_unregister() - unregister a trigger from the core
+ * @trig_info:  trigger to be unregistered
+ **/
+void iio_trigger_unregister(struct iio_trigger *trig_info);
+
+/**
+ * iio_trigger_poll() - called on a trigger occurring
+ * @trig: trigger which occurred
+ *
+ * Typically called in relevant hardware interrupt handler.
+ **/
+void iio_trigger_poll(struct iio_trigger *trig, s64 time);
+void iio_trigger_poll_chained(struct iio_trigger *trig, s64 time);
+
+irqreturn_t iio_trigger_generic_data_rdy_poll(int irq, void *private);
+
+__printf(1, 2) struct iio_trigger *iio_trigger_alloc(const char *fmt, ...);
+void iio_trigger_free(struct iio_trigger *trig);
+
+#endif /* _IIO_TRIGGER_H_ */
diff --git a/include/linux/iio/trigger_consumer.h b/include/linux/iio/trigger_consumer.h
new file mode 100644
index 000000000000..60d64b356945
--- /dev/null
+++ b/include/linux/iio/trigger_consumer.h
@@ -0,0 +1,52 @@
+/* The industrial I/O core, trigger consumer functions
+ *
+ * Copyright (c) 2008-2011 Jonathan Cameron
+ *
+ * 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.
+ */
+
+/**
+ * struct iio_poll_func - poll function pair
+ *
+ * @indio_dev:                  data specific to device (passed into poll func)
+ * @h:                          the function that is actually run on trigger
+ * @thread:                     threaded interrupt part
+ * @type:                       the type of interrupt (basically if oneshot)
+ * @name:                       name used to identify the trigger consumer.
+ * @irq:                        the corresponding irq as allocated from the
+ *                              trigger pool
+ * @timestamp:                  some devices need a timestamp grabbed as soon
+ *                              as possible after the trigger - hence handler
+ *                              passes it via here.
+ **/
+struct iio_poll_func {
+        struct iio_dev *indio_dev;
+        irqreturn_t (*h)(int irq, void *p);
+        irqreturn_t (*thread)(int irq, void *p);
+        int type;
+        char *name;
+        int irq;
+        s64 timestamp;
+};
+
+
+struct iio_poll_func
+*iio_alloc_pollfunc(irqreturn_t (*h)(int irq, void *p),
+                    irqreturn_t (*thread)(int irq, void *p),
+                    int type,
+                    struct iio_dev *indio_dev,
+                    const char *fmt,
+                    ...);
+void iio_dealloc_pollfunc(struct iio_poll_func *pf);
+irqreturn_t iio_pollfunc_store_time(int irq, void *p);
+
+void iio_trigger_notify_done(struct iio_trigger *trig);
+
+/*
+ * Two functions for common case where all that happens is a pollfunc
+ * is attached and detached from a trigger
+ */
+int iio_triggered_buffer_postenable(struct iio_dev *indio_dev);
+int iio_triggered_buffer_predisable(struct iio_dev *indio_dev);
diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h
new file mode 100644
index 000000000000..1b073b1cc7c2
--- /dev/null
+++ b/include/linux/iio/types.h
@@ -0,0 +1,55 @@
+/* industrial I/O data types needed both in and out of kernel
+ *
+ * Copyright (c) 2008 Jonathan Cameron
+ *
+ * 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 _IIO_TYPES_H_
+#define _IIO_TYPES_H_
+
+enum iio_chan_type {
+        /* real channel types */
+        IIO_VOLTAGE,
+        IIO_CURRENT,
+        IIO_POWER,
+        IIO_ACCEL,
+        IIO_ANGL_VEL,
+        IIO_MAGN,
+        IIO_LIGHT,
+        IIO_INTENSITY,
+        IIO_PROXIMITY,
+        IIO_TEMP,
+        IIO_INCLI,
+        IIO_ROT,
+        IIO_ANGL,
+        IIO_TIMESTAMP,
+        IIO_CAPACITANCE,
+        IIO_ALTVOLTAGE,
+};
+
+enum iio_modifier {
+        IIO_NO_MOD,
+        IIO_MOD_X,
+        IIO_MOD_Y,
+        IIO_MOD_Z,
+        IIO_MOD_X_AND_Y,
+        IIO_MOD_X_AND_Z,
+        IIO_MOD_Y_AND_Z,
+        IIO_MOD_X_AND_Y_AND_Z,
+        IIO_MOD_X_OR_Y,
+        IIO_MOD_X_OR_Z,
+        IIO_MOD_Y_OR_Z,
+        IIO_MOD_X_OR_Y_OR_Z,
+        IIO_MOD_LIGHT_BOTH,
+        IIO_MOD_LIGHT_IR,
+};
+
+#define IIO_VAL_INT 1
+#define IIO_VAL_INT_PLUS_MICRO 2
+#define IIO_VAL_INT_PLUS_NANO 3
+#define IIO_VAL_INT_PLUS_MICRO_DB 4
+
+#endif /* _IIO_TYPES_H_ */
diff --git a/include/linux/in6.h b/include/linux/in6.h
index 5c83d9e3eb8f..cba469ba11a4 100644
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -142,7 +142,7 @@ struct in6_flowlabel_req {
 /*
  *      IPv6 TLV options.
  */
-#define IPV6_TLV_PAD0           0
+#define IPV6_TLV_PAD1           0
 #define IPV6_TLV_PADN           1
 #define IPV6_TLV_ROUTERALERT    5
 #define IPV6_TLV_JUMBO          194
diff --git a/include/linux/input/lm8333.h b/include/linux/input/lm8333.h
new file mode 100644
index 000000000000..79f918c6e8c5
--- /dev/null
+++ b/include/linux/input/lm8333.h
@@ -0,0 +1,24 @@
+/*
+ * public include for LM8333 keypad driver - same license as driver
+ * Copyright (C) 2012 Wolfram Sang, Pengutronix <w.sang@pengutronix.de>
+ */
+
+#ifndef _LM8333_H
+#define _LM8333_H
+
+struct lm8333;
+
+struct lm8333_platform_data {
+        /* Keymap data */
+        const struct matrix_keymap_data *matrix_data;
+        /* Active timeout before enter HALT mode in microseconds */
+        unsigned active_time;
+        /* Debounce interval in microseconds */
+        unsigned debounce_time;
+};
+
+extern int lm8333_read8(struct lm8333 *lm8333, u8 cmd);
+extern int lm8333_write8(struct lm8333 *lm8333, u8 cmd, u8 val);
+extern int lm8333_read_block(struct lm8333 *lm8333, u8 cmd, u8 len, u8 *buf);
+
+#endif /* _LM8333_H */
diff --git a/include/linux/input/matrix_keypad.h b/include/linux/input/matrix_keypad.h
index 6c07ced0af81..5f3aa6b11bfa 100644
--- a/include/linux/input/matrix_keypad.h
+++ b/include/linux/input/matrix_keypad.h
@@ -75,54 +75,10 @@ struct matrix_keypad_platform_data {
         bool            no_autorepeat;
 };
 
-/**
- * matrix_keypad_build_keymap - convert platform keymap into matrix keymap
- * @keymap_data: keymap supplied by the platform code
- * @row_shift: number of bits to shift row value by to advance to the next
- * line in the keymap
- * @keymap: expanded version of keymap that is suitable for use by
- * matrix keyboad driver
- * @keybit: pointer to bitmap of keys supported by input device
- *
- * This function converts platform keymap (encoded with KEY() macro) into
- * an array of keycodes that is suitable for using in a standard matrix
- * keyboard driver that uses row and col as indices.
- */
-static inline void
-matrix_keypad_build_keymap(const struct matrix_keymap_data *keymap_data,
-                           unsigned int row_shift,
-                           unsigned short *keymap, unsigned long *keybit)
-{
-        int i;
-
-        for (i = 0; i < keymap_data->keymap_size; i++) {
-                unsigned int key = keymap_data->keymap[i];
-                unsigned int row = KEY_ROW(key);
-                unsigned int col = KEY_COL(key);
-                unsigned short code = KEY_VAL(key);
-
-                keymap[MATRIX_SCAN_CODE(row, col, row_shift)] = code;
-                __set_bit(code, keybit);
-        }
-        __clear_bit(KEY_RESERVED, keybit);
-}
-
-#ifdef CONFIG_INPUT_OF_MATRIX_KEYMAP
-struct matrix_keymap_data *
-matrix_keyboard_of_fill_keymap(struct device_node *np, const char *propname);
-
-void matrix_keyboard_of_free_keymap(const struct matrix_keymap_data *kd);
-#else
-static inline struct matrix_keymap_data *
-matrix_keyboard_of_fill_keymap(struct device_node *np, const char *propname)
-{
-        return NULL;
-}
-
-static inline void
-matrix_keyboard_of_free_keymap(const struct matrix_keymap_data *kd)
-{
-}
-#endif
+int matrix_keypad_build_keymap(const struct matrix_keymap_data *keymap_data,
+                               const char *keymap_name,
+                               unsigned int rows, unsigned int cols,
+                               unsigned short *keymap,
+                               struct input_dev *input_dev);
 
 #endif /* _MATRIX_KEYPAD_H */
diff --git a/include/linux/input/navpoint.h b/include/linux/input/navpoint.h
new file mode 100644
index 000000000000..45050eb34de3
--- /dev/null
+++ b/include/linux/input/navpoint.h
@@ -0,0 +1,12 @@
+/*
+ *  Copyright (C) 2012 Paul Parsons <lost.distance@yahoo.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.
+ */
+
+struct navpoint_platform_data {
+        int             port;           /* PXA SSP port for pxa_ssp_request() */
+        int             gpio;           /* GPIO for power on/off */
+};
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 2aea5d22db07..e68a8e53bb59 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -93,27 +93,27 @@ typedef irqreturn_t (*irq_handler_t)(int, void *);
 /**
  * struct irqaction - per interrupt action descriptor
  * @handler:    interrupt handler function
- * @flags:      flags (see IRQF_* above)
  * @name:       name of the device
  * @dev_id:     cookie to identify the device
  * @percpu_dev_id:      cookie to identify the device
  * @next:       pointer to the next irqaction for shared interrupts
  * @irq:        interrupt number
- * @dir:        pointer to the proc/irq/NN/name entry
+ * @flags:      flags (see IRQF_* above)
  * @thread_fn:  interrupt handler function for threaded interrupts
  * @thread:     thread pointer for threaded interrupts
  * @thread_flags:       flags related to @thread
  * @thread_mask:        bitmask for keeping track of @thread activity
+ * @dir:        pointer to the proc/irq/NN/name entry
  */
 struct irqaction {
         irq_handler_t           handler;
-        unsigned long           flags;
         void                    *dev_id;
         void __percpu           *percpu_dev_id;
         struct irqaction        *next;
-        int                     irq;
         irq_handler_t           thread_fn;
         struct task_struct      *thread;
+        unsigned int            irq;
+        unsigned int            flags;
         unsigned long           thread_flags;
         unsigned long           thread_mask;
         const char              *name;
@@ -142,8 +142,6 @@ request_any_context_irq(unsigned int irq, irq_handler_t handler,
 extern int __must_check
 request_percpu_irq(unsigned int irq, irq_handler_t handler,
                    const char *devname, void __percpu *percpu_dev_id);
-
-extern void exit_irq_thread(void);
 #else
 
 extern int __must_check
@@ -177,8 +175,6 @@ request_percpu_irq(unsigned int irq, irq_handler_t handler,
 {
         return request_irq(irq, handler, 0, devname, percpu_dev_id);
 }
-
-static inline void exit_irq_thread(void) { }
 #endif
 
 extern void free_irq(unsigned int, void *);
diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h
index 1a3018063034..df38db2ef45b 100644
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
@@ -6,11 +6,7 @@
 #include <linux/workqueue.h>
 
 enum {
-        ICQ_IOPRIO_CHANGED      = 1 << 0,
-        ICQ_CGROUP_CHANGED      = 1 << 1,
         ICQ_EXITED              = 1 << 2,
-
-        ICQ_CHANGED_MASK        = ICQ_IOPRIO_CHANGED | ICQ_CGROUP_CHANGED,
 };
 
 /*
@@ -100,6 +96,7 @@ struct io_cq {
  */
 struct io_context {
         atomic_long_t refcount;
+        atomic_t active_ref;
         atomic_t nr_tasks;
 
         /* all the fields below are protected by this lock */
@@ -120,29 +117,37 @@ struct io_context {
         struct work_struct release_work;
 };
 
-static inline struct io_context *ioc_task_link(struct io_context *ioc)
+/**
+ * get_io_context_active - get active reference on ioc
+ * @ioc: ioc of interest
+ *
+ * Only iocs with active reference can issue new IOs.  This function
+ * acquires an active reference on @ioc.  The caller must already have an
+ * active reference on @ioc.
+ */
+static inline void get_io_context_active(struct io_context *ioc)
 {
-        /*
-         * if ref count is zero, don't allow sharing (ioc is going away, it's
-         * a race).
-         */
-        if (ioc && atomic_long_inc_not_zero(&ioc->refcount)) {
-                atomic_inc(&ioc->nr_tasks);
-                return ioc;
-        }
+        WARN_ON_ONCE(atomic_long_read(&ioc->refcount) <= 0);
+        WARN_ON_ONCE(atomic_read(&ioc->active_ref) <= 0);
+        atomic_long_inc(&ioc->refcount);
+        atomic_inc(&ioc->active_ref);
+}
+
+static inline void ioc_task_link(struct io_context *ioc)
+{
+        get_io_context_active(ioc);
 
-        return NULL;
+        WARN_ON_ONCE(atomic_read(&ioc->nr_tasks) <= 0);
+        atomic_inc(&ioc->nr_tasks);
 }
 
 struct task_struct;
 #ifdef CONFIG_BLOCK
 void put_io_context(struct io_context *ioc);
+void put_io_context_active(struct io_context *ioc);
 void exit_io_context(struct task_struct *task);
 struct io_context *get_task_io_context(struct task_struct *task,
                                        gfp_t gfp_flags, int node);
-void ioc_ioprio_changed(struct io_context *ioc, int ioprio);
-void ioc_cgroup_changed(struct io_context *ioc);
-unsigned int icq_get_changed(struct io_cq *icq);
 #else
 struct io_context;
 static inline void put_io_context(struct io_context *ioc) { }
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index d937580417ba..450293f6d68b 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -35,12 +35,13 @@ struct iommu_domain;
 #define IOMMU_FAULT_WRITE       0x1
 
 typedef int (*iommu_fault_handler_t)(struct iommu_domain *,
-                                struct device *, unsigned long, int);
+                        struct device *, unsigned long, int, void *);
 
 struct iommu_domain {
         struct iommu_ops *ops;
         void *priv;
         iommu_fault_handler_t handler;
+        void *handler_token;
 };
 
 #define IOMMU_CAP_CACHE_COHERENCY       0x1
@@ -95,7 +96,7 @@ extern phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain,
 extern int iommu_domain_has_cap(struct iommu_domain *domain,
                                 unsigned long cap);
 extern void iommu_set_fault_handler(struct iommu_domain *domain,
-                                        iommu_fault_handler_t handler);
+                        iommu_fault_handler_t handler, void *token);
 extern int iommu_device_group(struct device *dev, unsigned int *groupid);
 
 /**
@@ -132,7 +133,8 @@ static inline int report_iommu_fault(struct iommu_domain *domain,
          * invoke it.
          */
         if (domain->handler)
-                ret = domain->handler(domain, dev, iova, flags);
+                ret = domain->handler(domain, dev, iova, flags,
+                                                domain->handler_token);
 
         return ret;
 }
@@ -191,7 +193,7 @@ static inline int domain_has_cap(struct iommu_domain *domain,
 }
 
 static inline void iommu_set_fault_handler(struct iommu_domain *domain,
-                                        iommu_fault_handler_t handler)
+                                iommu_fault_handler_t handler, void *token)
 {
 }
 
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index e885ba23de70..589e0e75efae 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -223,5 +223,12 @@ extern int
 walk_system_ram_range(unsigned long start_pfn, unsigned long nr_pages,
                 void *arg, int (*func)(unsigned long, unsigned long, void *));
 
+/* True if any part of r1 overlaps r2 */
+static inline bool resource_overlaps(struct resource *r1, struct resource *r2)
+{
+       return (r1->start <= r2->end && r1->end >= r2->start);
+}
+
+
 #endif /* __ASSEMBLY__ */
 #endif  /* _LINUX_IOPORT_H */
diff --git a/include/linux/ioprio.h b/include/linux/ioprio.h
index 76dad4808847..beb9ce1c2c23 100644
--- a/include/linux/ioprio.h
+++ b/include/linux/ioprio.h
@@ -42,26 +42,14 @@ enum {
 };
 
 /*
- * if process has set io priority explicitly, use that. if not, convert
- * the cpu scheduler nice value to an io priority
+ * Fallback BE priority
  */
 #define IOPRIO_NORM     (4)
-static inline int task_ioprio(struct io_context *ioc)
-{
-        if (ioprio_valid(ioc->ioprio))
-                return IOPRIO_PRIO_DATA(ioc->ioprio);
-
-        return IOPRIO_NORM;
-}
-
-static inline int task_ioprio_class(struct io_context *ioc)
-{
-        if (ioprio_valid(ioc->ioprio))
-                return IOPRIO_PRIO_CLASS(ioc->ioprio);
-
-        return IOPRIO_CLASS_BE;
-}
 
+/*
+ * if process has set io priority explicitly, use that. if not, convert
+ * the cpu scheduler nice value to an io priority
+ */
 static inline int task_nice_ioprio(struct task_struct *task)
 {
         return (task_nice(task) + 20) / 5;
diff --git a/include/linux/ip_vs.h b/include/linux/ip_vs.h
index 4deb3834d62c..8a2d438dc499 100644
--- a/include/linux/ip_vs.h
+++ b/include/linux/ip_vs.h
@@ -89,6 +89,7 @@
 #define IP_VS_CONN_F_TEMPLATE   0x1000          /* template, not connection */
 #define IP_VS_CONN_F_ONE_PACKET 0x2000          /* forward only one packet */
 
+/* Initial bits allowed in backup server */
 #define IP_VS_CONN_F_BACKUP_MASK (IP_VS_CONN_F_FWD_MASK | \
                                   IP_VS_CONN_F_NOOUTPUT | \
                                   IP_VS_CONN_F_INACTIVE | \
@@ -97,6 +98,10 @@
                                   IP_VS_CONN_F_TEMPLATE \
                                  )
 
+/* Bits allowed to update in backup server */
+#define IP_VS_CONN_F_BACKUP_UPD_MASK (IP_VS_CONN_F_INACTIVE | \
+                                      IP_VS_CONN_F_SEQ_MASK)
+
 /* Flags that are not sent to backup server start from bit 16 */
 #define IP_VS_CONN_F_NFCT       (1 << 16)       /* use netfilter conntrack */
 
@@ -125,8 +130,8 @@ struct ip_vs_service_user {
 
         /* virtual service options */
         char                    sched_name[IP_VS_SCHEDNAME_MAXLEN];
-        unsigned                flags;          /* virtual service flags */
-        unsigned                timeout;        /* persistent timeout in sec */
+        unsigned int            flags;          /* virtual service flags */
+        unsigned int            timeout;        /* persistent timeout in sec */
         __be32                  netmask;        /* persistent netmask */
 };
 
@@ -137,7 +142,7 @@ struct ip_vs_dest_user {
         __be16                  port;
 
         /* real server options */
-        unsigned                conn_flags;     /* connection flags */
+        unsigned int            conn_flags;     /* connection flags */
         int                     weight;         /* destination weight */
 
         /* thresholds for active connections */
@@ -187,8 +192,8 @@ struct ip_vs_service_entry {
 
         /* service options */
         char                    sched_name[IP_VS_SCHEDNAME_MAXLEN];
-        unsigned                flags;          /* virtual service flags */
-        unsigned                timeout;        /* persistent timeout */
+        unsigned int            flags;          /* virtual service flags */
+        unsigned int            timeout;        /* persistent timeout */
         __be32                  netmask;        /* persistent netmask */
 
         /* number of real servers */
@@ -202,7 +207,7 @@ struct ip_vs_service_entry {
 struct ip_vs_dest_entry {
         __be32                  addr;           /* destination address */
         __be16                  port;
-        unsigned                conn_flags;     /* connection flags */
+        unsigned int            conn_flags;     /* connection flags */
         int                     weight;         /* destination weight */
 
         __u32           u_threshold;    /* upper threshold */
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
index 8a297a5e794c..5499c92a9153 100644
--- a/include/linux/ipc_namespace.h
+++ b/include/linux/ipc_namespace.h
@@ -62,6 +62,8 @@ struct ipc_namespace {
         unsigned int    mq_queues_max;   /* initialized to DFLT_QUEUESMAX */
         unsigned int    mq_msg_max;      /* initialized to DFLT_MSGMAX */
         unsigned int    mq_msgsize_max;  /* initialized to DFLT_MSGSIZEMAX */
+        unsigned int    mq_msg_default;
+        unsigned int    mq_msgsize_default;
 
         /* user_ns which owns the ipc ns */
         struct user_namespace *user_ns;
@@ -90,11 +92,41 @@ static inline void shm_destroy_orphaned(struct ipc_namespace *ns) {}
 
 #ifdef CONFIG_POSIX_MQUEUE
 extern int mq_init_ns(struct ipc_namespace *ns);
-/* default values */
-#define DFLT_QUEUESMAX 256     /* max number of message queues */
-#define DFLT_MSGMAX    10      /* max number of messages in each queue */
-#define HARD_MSGMAX    (32768*sizeof(void *)/4)
-#define DFLT_MSGSIZEMAX 8192   /* max message size */
+/*
+ * POSIX Message Queue default values:
+ *
+ * MIN_*: Lowest value an admin can set the maximum unprivileged limit to
+ * DFLT_*MAX: Default values for the maximum unprivileged limits
+ * DFLT_{MSG,MSGSIZE}: Default values used when the user doesn't supply
+ *   an attribute to the open call and the queue must be created
+ * HARD_*: Highest value the maximums can be set to.  These are enforced
+ *   on CAP_SYS_RESOURCE apps as well making them inviolate (so make them
+ *   suitably high)
+ *
+ * POSIX Requirements:
+ *   Per app minimum openable message queues - 8.  This does not map well
+ *     to the fact that we limit the number of queues on a per namespace
+ *     basis instead of a per app basis.  So, make the default high enough
+ *     that no given app should have a hard time opening 8 queues.
+ *   Minimum maximum for HARD_MSGMAX - 32767.  I bumped this to 65536.
+ *   Minimum maximum for HARD_MSGSIZEMAX - POSIX is silent on this.  However,
+ *     we have run into a situation where running applications in the wild
+ *     require this to be at least 5MB, and preferably 10MB, so I set the
+ *     value to 16MB in hopes that this user is the worst of the bunch and
+ *     the new maximum will handle anyone else.  I may have to revisit this
+ *     in the future.
+ */
+#define MIN_QUEUESMAX                   1
+#define DFLT_QUEUESMAX                256
+#define HARD_QUEUESMAX               1024
+#define MIN_MSGMAX                      1
+#define DFLT_MSG                       10U
+#define DFLT_MSGMAX                    10
+#define HARD_MSGMAX                 65536
+#define MIN_MSGSIZEMAX                128
+#define DFLT_MSGSIZE                 8192U
+#define DFLT_MSGSIZEMAX              8192
+#define HARD_MSGSIZEMAX     (16*1024*1024)
 #else
 static inline int mq_init_ns(struct ipc_namespace *ns) { return 0; }
 #endif
diff --git a/include/linux/irq.h b/include/linux/irq.h
index b27cfcfd3a59..61f5cec031e0 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -335,11 +335,6 @@ struct irq_chip {
         void            (*irq_print_chip)(struct irq_data *data, struct seq_file *p);
 
         unsigned long   flags;
-
-        /* Currently used only by UML, might disappear one day.*/
-#ifdef CONFIG_IRQ_RELEASE_METHOD
-        void            (*release)(unsigned int irq, void *dev_id);
-#endif
 };
 
 /*
diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index c65740d76e66..5abb533eb8eb 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -141,9 +141,8 @@ static inline struct irq_domain *irq_domain_add_legacy_isa(
         return irq_domain_add_legacy(of_node, NUM_ISA_INTERRUPTS, 0, 0, ops,
                                      host_data);
 }
-extern struct irq_domain *irq_find_host(struct device_node *node);
-extern void irq_set_default_host(struct irq_domain *host);
 
+extern void irq_domain_remove(struct irq_domain *host);
 
 extern unsigned int irq_create_mapping(struct irq_domain *host,
                                        irq_hw_number_t hwirq);
diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index 292f27a793d4..215c41602af8 100644
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -15,6 +15,7 @@
 #define __ISDN_H__
 
 #include <linux/ioctl.h>
+#include <linux/tty.h>
 
 #define ISDN_MAX_DRIVERS    32
 #define ISDN_MAX_CHANNELS   64
@@ -392,21 +393,8 @@ typedef struct isdn_net_dev_s {
 /*======================= Start of ISDN-tty stuff ===========================*/
 
 #define ISDN_ASYNC_MAGIC          0x49344C01 /* for paranoia-checking        */
-#define ISDN_ASYNC_INITIALIZED    0x80000000 /* port was initialized         */
-#define ISDN_ASYNC_CALLOUT_ACTIVE 0x40000000 /* Call out device active       */
-#define ISDN_ASYNC_NORMAL_ACTIVE  0x20000000 /* Normal device active         */
-#define ISDN_ASYNC_CLOSING        0x08000000 /* Serial port is closing       */
-#define ISDN_ASYNC_CTS_FLOW       0x04000000 /* Do CTS flow control          */
-#define ISDN_ASYNC_CHECK_CD       0x02000000 /* i.e., CLOCAL                 */
-#define ISDN_ASYNC_HUP_NOTIFY         0x0001 /* Notify tty on hangups/closes */
-#define ISDN_ASYNC_SESSION_LOCKOUT    0x0100 /* Lock cua opens on session    */
-#define ISDN_ASYNC_PGRP_LOCKOUT       0x0200 /* Lock cua opens on pgrp       */
-#define ISDN_ASYNC_CALLOUT_NOHUP      0x0400 /* No hangup for cui            */
-#define ISDN_ASYNC_SPLIT_TERMIOS      0x0008 /* Sep. termios for dialin/out  */
 #define ISDN_SERIAL_XMIT_SIZE           1024 /* Default bufsize for write    */
 #define ISDN_SERIAL_XMIT_MAX            4000 /* Maximum bufsize for write    */
-#define ISDN_SERIAL_TYPE_NORMAL            1
-#define ISDN_SERIAL_TYPE_CALLOUT           2
 
 #ifdef CONFIG_ISDN_AUDIO
 /* For using sk_buffs with audio we need some private variables
@@ -448,17 +436,12 @@ typedef struct atemu {
 /* Private data (similar to async_struct in <linux/serial.h>) */
 typedef struct modem_info {
   int                   magic;
-  struct module         *owner;
-  int                   flags;           /* defined in tty.h               */
+  struct tty_port       port;
   int                   x_char;          /* xon/xoff character             */
   int                   mcr;             /* Modem control register         */
   int                   msr;             /* Modem status register          */
   int                   lsr;             /* Line status register           */
   int                   line;
-  int                   count;           /* # of fd on device              */
-  int                   blocked_open;    /* # of blocked opens             */
-  long                  session;         /* Session of opening process     */
-  long                  pgrp;            /* pgrp of opening process        */
   int                   online;          /* 1 = B-Channel is up, drop data */
                                          /* 2 = B-Channel is up, deliver d.*/
   int                   dialing;         /* Dial in progress or ATA        */
@@ -478,7 +461,6 @@ typedef struct modem_info {
   int                   send_outstanding;/* # of outstanding send-requests */
   int                   xmit_size;       /* max. # of chars in xmit_buf    */
   int                   xmit_count;      /* # of chars in xmit_buf         */
-  unsigned char         *xmit_buf;       /* transmit buffer                */
   struct sk_buff_head   xmit_queue;      /* transmit queue                 */
   atomic_t              xmit_lock;       /* Semaphore for isdn_tty_write   */
 #ifdef CONFIG_ISDN_AUDIO
@@ -496,11 +478,7 @@ typedef struct modem_info {
   struct T30_s          *fax;            /* T30 Fax Group 3 data/interface */
   int                   faxonline;       /* Fax-channel status             */
 #endif
-  struct tty_struct     *tty;            /* Pointer to corresponding tty   */
   atemu                 emu;             /* AT-emulator data               */
-  struct ktermios       normal_termios;  /* For saving termios structs     */
-  struct ktermios       callout_termios;
-  wait_queue_head_t     open_wait, close_wait;
   spinlock_t            readlock;
 } modem_info;
 
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index d211732b9e99..c8f32975f0e4 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -479,12 +479,6 @@ struct transaction_s
          * How many handles used this transaction? [t_handle_lock]
          */
         int t_handle_count;
-
-        /*
-         * This transaction is being forced and some process is
-         * waiting for it to finish.
-         */
-        unsigned int t_synchronous_commit:1;
 };
 
 /**
@@ -531,6 +525,8 @@ struct transaction_s
  *  transaction
  * @j_commit_request: Sequence number of the most recent transaction wanting
  *     commit
+ * @j_commit_waited: Sequence number of the most recent transaction someone
+ *     is waiting for to commit.
  * @j_uuid: Uuid of client object.
  * @j_task: Pointer to the current commit thread for this journal
  * @j_max_transaction_buffers:  Maximum number of metadata buffers to allow in a
@@ -696,6 +692,13 @@ struct journal_s
         tid_t                   j_commit_request;
 
         /*
+         * Sequence number of the most recent transaction someone is waiting
+         * for to commit.
+         * [j_state_lock]
+         */
+        tid_t                   j_commit_waited;
+
+        /*
          * Journal uuid: identifies the object (filesystem, LVM volume etc)
          * backed by this journal.  This will eventually be replaced by an array
          * of uuids, allowing us to index multiple devices within a single
@@ -861,7 +864,8 @@ extern int	   journal_destroy    (journal_t *);
 extern int         journal_recover    (journal_t *journal);
 extern int         journal_wipe       (journal_t *, int);
 extern int         journal_skip_recovery        (journal_t *);
-extern void        journal_update_superblock    (journal_t *, int);
+extern void        journal_update_sb_log_tail   (journal_t *, tid_t, unsigned int,
+                                                 int);
 extern void        journal_abort      (journal_t *, int);
 extern int         journal_errno      (journal_t *);
 extern void        journal_ack_err    (journal_t *);
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index 912c30a8ddb1..f334c7fab967 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -31,6 +31,7 @@
 #include <linux/mutex.h>
 #include <linux/timer.h>
 #include <linux/slab.h>
+#include <crypto/hash.h>
 #endif
 
 #define journal_oom_retry 1
@@ -147,12 +148,24 @@ typedef struct journal_header_s
 #define JBD2_CRC32_CHKSUM   1
 #define JBD2_MD5_CHKSUM     2
 #define JBD2_SHA1_CHKSUM    3
+#define JBD2_CRC32C_CHKSUM  4
 
 #define JBD2_CRC32_CHKSUM_SIZE 4
 
 #define JBD2_CHECKSUM_BYTES (32 / sizeof(u32))
 /*
  * Commit block header for storing transactional checksums:
+ *
+ * NOTE: If FEATURE_COMPAT_CHECKSUM (checksum v1) is set, the h_chksum*
+ * fields are used to store a checksum of the descriptor and data blocks.
+ *
+ * If FEATURE_INCOMPAT_CSUM_V2 (checksum v2) is set, then the h_chksum
+ * field is used to store crc32c(uuid+commit_block).  Each journal metadata
+ * block gets its own checksum, and data block checksums are stored in
+ * journal_block_tag (in the descriptor).  The other h_chksum* fields are
+ * not used.
+ *
+ * Checksum v1 and v2 are mutually exclusive features.
  */
 struct commit_header {
         __be32          h_magic;
@@ -175,13 +188,19 @@ struct commit_header {
 typedef struct journal_block_tag_s
 {
         __be32          t_blocknr;      /* The on-disk block number */
-        __be32          t_flags;        /* See below */
+        __be16          t_checksum;     /* truncated crc32c(uuid+seq+block) */
+        __be16          t_flags;        /* See below */
         __be32          t_blocknr_high; /* most-significant high 32bits. */
 } journal_block_tag_t;
 
 #define JBD2_TAG_SIZE32 (offsetof(journal_block_tag_t, t_blocknr_high))
 #define JBD2_TAG_SIZE64 (sizeof(journal_block_tag_t))
 
+/* Tail of descriptor block, for checksumming */
+struct jbd2_journal_block_tail {
+        __be32          t_checksum;     /* crc32c(uuid+descr_block) */
+};
+
 /*
  * The revoke descriptor: used on disk to describe a series of blocks to
  * be revoked from the log
@@ -192,6 +211,10 @@ typedef struct jbd2_journal_revoke_header_s
         __be32           r_count;       /* Count of bytes used in the block */
 } jbd2_journal_revoke_header_t;
 
+/* Tail of revoke block, for checksumming */
+struct jbd2_journal_revoke_tail {
+        __be32          r_checksum;     /* crc32c(uuid+revoke_block) */
+};
 
 /* Definitions for the journal tag flags word: */
 #define JBD2_FLAG_ESCAPE                1       /* on-disk block is escaped */
@@ -241,7 +264,10 @@ typedef struct journal_superblock_s
         __be32  s_max_trans_data;       /* Limit of data blocks per trans. */
 
 /* 0x0050 */
-        __u32   s_padding[44];
+        __u8    s_checksum_type;        /* checksum type */
+        __u8    s_padding2[3];
+        __u32   s_padding[42];
+        __be32  s_checksum;             /* crc32c(superblock) */
 
 /* 0x0100 */
         __u8    s_users[16*48];         /* ids of all fs'es sharing the log */
@@ -263,13 +289,15 @@ typedef struct journal_superblock_s
 #define JBD2_FEATURE_INCOMPAT_REVOKE            0x00000001
 #define JBD2_FEATURE_INCOMPAT_64BIT             0x00000002
 #define JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT      0x00000004
+#define JBD2_FEATURE_INCOMPAT_CSUM_V2           0x00000008
 
 /* Features known to this kernel version: */
 #define JBD2_KNOWN_COMPAT_FEATURES      JBD2_FEATURE_COMPAT_CHECKSUM
 #define JBD2_KNOWN_ROCOMPAT_FEATURES    0
 #define JBD2_KNOWN_INCOMPAT_FEATURES    (JBD2_FEATURE_INCOMPAT_REVOKE | \
                                         JBD2_FEATURE_INCOMPAT_64BIT | \
-                                        JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT)
+                                        JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT | \
+                                        JBD2_FEATURE_INCOMPAT_CSUM_V2)
 
 #ifdef __KERNEL__
 
@@ -939,6 +967,12 @@ struct journal_s
          * superblock pointer here
          */
         void *j_private;
+
+        /* Reference to checksum algorithm driver via cryptoapi */
+        struct crypto_shash *j_chksum_driver;
+
+        /* Precomputed journal UUID checksum for seeding other checksums */
+        __u32 j_csum_seed;
 };
 
 /*
@@ -1268,6 +1302,25 @@ static inline int jbd_space_needed(journal_t *journal)
 
 extern int jbd_blocks_per_page(struct inode *inode);
 
+static inline u32 jbd2_chksum(journal_t *journal, u32 crc,
+                              const void *address, unsigned int length)
+{
+        struct {
+                struct shash_desc shash;
+                char ctx[crypto_shash_descsize(journal->j_chksum_driver)];
+        } desc;
+        int err;
+
+        desc.shash.tfm = journal->j_chksum_driver;
+        desc.shash.flags = 0;
+        *(u32 *)desc.ctx = crc;
+
+        err = crypto_shash_update(&desc.shash, address, length);
+        BUG_ON(err);
+
+        return *(u32 *)desc.ctx;
+}
+
 #ifdef __KERNEL__
 
 #define buffer_trace_init(bh)   do {} while (0)
diff --git a/include/linux/jbd_common.h b/include/linux/jbd_common.h
index 6230f8556a4e..6133679bc4c0 100644
--- a/include/linux/jbd_common.h
+++ b/include/linux/jbd_common.h
@@ -12,6 +12,7 @@ enum jbd_state_bits {
         BH_State,               /* Pins most journal_head state */
         BH_JournalHead,         /* Pins bh->b_private and jh->b_bh */
         BH_Unshadow,            /* Dummy bit, for BJ_Shadow wakeup filtering */
+        BH_Verified,            /* Metadata block has been verified ok */
         BH_JBDPrivateStart,     /* First bit available for private use by FS */
 };
 
@@ -24,6 +25,7 @@ TAS_BUFFER_FNS(Revoked, revoked)
 BUFFER_FNS(RevokeValid, revokevalid)
 TAS_BUFFER_FNS(RevokeValid, revokevalid)
 BUFFER_FNS(Freed, freed)
+BUFFER_FNS(Verified, verified)
 
 static inline struct buffer_head *jh2bh(struct journal_head *jh)
 {
diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
index 387571959dd9..6883e197acb9 100644
--- a/include/linux/kallsyms.h
+++ b/include/linux/kallsyms.h
@@ -36,6 +36,7 @@ const char *kallsyms_lookup(unsigned long addr,
 
 /* Look up a kernel symbol and return it in a text buffer. */
 extern int sprint_symbol(char *buffer, unsigned long address);
+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
 extern int sprint_backtrace(char *buffer, unsigned long address);
 
 /* Look up a kernel symbol and print it to the kernel messages. */
@@ -80,6 +81,12 @@ static inline int sprint_symbol(char *buffer, unsigned long addr)
         return 0;
 }
 
+static inline int sprint_symbol_no_offset(char *buffer, unsigned long addr)
+{
+        *buffer = '\0';
+        return 0;
+}
+
 static inline int sprint_backtrace(char *buffer, unsigned long addr)
 {
         *buffer = '\0';
diff --git a/include/linux/kcmp.h b/include/linux/kcmp.h
new file mode 100644
index 000000000000..2dcd1b3aafc8
--- /dev/null
+++ b/include/linux/kcmp.h
@@ -0,0 +1,17 @@
+#ifndef _LINUX_KCMP_H
+#define _LINUX_KCMP_H
+
+/* Comparison type */
+enum kcmp_type {
+        KCMP_FILE,
+        KCMP_VM,
+        KCMP_FILES,
+        KCMP_FS,
+        KCMP_SIGHAND,
+        KCMP_IO,
+        KCMP_SYSVSEM,
+
+        KCMP_TYPES,
+};
+
+#endif /* _LINUX_KCMP_H */
diff --git a/include/linux/kernel-page-flags.h b/include/linux/kernel-page-flags.h
index 26a65711676f..a1bdf6966357 100644
--- a/include/linux/kernel-page-flags.h
+++ b/include/linux/kernel-page-flags.h
@@ -32,6 +32,8 @@
 #define KPF_KSM                 21
 #define KPF_THP                 22
 
+#ifdef __KERNEL__
+
 /* kernel hacking assistances
  * WARNING: subject to change, never rely on them!
  */
@@ -44,4 +46,6 @@
 #define KPF_ARCH                38
 #define KPF_UNCACHED            39
 
+#endif /* __KERNEL__ */
+
 #endif /* LINUX_KERNEL_PAGE_FLAGS_H */
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 645231c373c8..e07f5e0c5df4 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -35,9 +35,12 @@
 #define LLONG_MAX       ((long long)(~0ULL>>1))
 #define LLONG_MIN       (-LLONG_MAX - 1)
 #define ULLONG_MAX      (~0ULL)
+#define SIZE_MAX        (~(size_t)0)
 
 #define STACK_MAGIC     0xdeadbeef
 
+#define REPEAT_BYTE(x)  ((~0ul / 0xff) * (x))
+
 #define ALIGN(x, a)             __ALIGN_KERNEL((x), (a))
 #define __ALIGN_MASK(x, mask)   __ALIGN_KERNEL_MASK((x), (mask))
 #define PTR_ALIGN(p, a)         ((typeof(p))ALIGN((unsigned long)(p), (a)))
@@ -480,15 +483,16 @@ do {									\
 
 #define trace_printk(fmt, args...)                                      \
 do {                                                                    \
+        static const char *trace_printk_fmt                             \
+                __attribute__((section("__trace_printk_fmt"))) =        \
+                __builtin_constant_p(fmt) ? fmt : NULL;                 \
+                                                                        \
         __trace_printk_check_format(fmt, ##args);                       \
-        if (__builtin_constant_p(fmt)) {                                \
-                static const char *trace_printk_fmt                     \
-                  __attribute__((section("__trace_printk_fmt"))) =      \
-                        __builtin_constant_p(fmt) ? fmt : NULL;         \
                                                                         \
+        if (__builtin_constant_p(fmt))                                  \
                 __trace_bprintk(_THIS_IP_, trace_printk_fmt, ##args);   \
-        } else                                                          \
-                __trace_printk(_THIS_IP_, fmt, ##args);         \
+        else                                                            \
+                __trace_printk(_THIS_IP_, fmt, ##args);                 \
 } while (0)
 
 extern __printf(2, 3)
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index 0d7d6a1b172f..37c5f7261142 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -1,8 +1,58 @@
 #ifndef LINUX_KEXEC_H
 #define LINUX_KEXEC_H
 
-#ifdef CONFIG_KEXEC
+/* kexec system call -  It loads the new kernel to boot into.
+ * kexec does not sync, or unmount filesystems so if you need
+ * that to happen you need to do that yourself.
+ */
+
 #include <linux/types.h>
+
+/* kexec flags for different usage scenarios */
+#define KEXEC_ON_CRASH          0x00000001
+#define KEXEC_PRESERVE_CONTEXT  0x00000002
+#define KEXEC_ARCH_MASK         0xffff0000
+
+/* These values match the ELF architecture values.
+ * Unless there is a good reason that should continue to be the case.
+ */
+#define KEXEC_ARCH_DEFAULT ( 0 << 16)
+#define KEXEC_ARCH_386     ( 3 << 16)
+#define KEXEC_ARCH_X86_64  (62 << 16)
+#define KEXEC_ARCH_PPC     (20 << 16)
+#define KEXEC_ARCH_PPC64   (21 << 16)
+#define KEXEC_ARCH_IA_64   (50 << 16)
+#define KEXEC_ARCH_ARM     (40 << 16)
+#define KEXEC_ARCH_S390    (22 << 16)
+#define KEXEC_ARCH_SH      (42 << 16)
+#define KEXEC_ARCH_MIPS_LE (10 << 16)
+#define KEXEC_ARCH_MIPS    ( 8 << 16)
+
+/* The artificial cap on the number of segments passed to kexec_load. */
+#define KEXEC_SEGMENT_MAX 16
+
+#ifndef __KERNEL__
+/*
+ * This structure is used to hold the arguments that are used when
+ * loading  kernel binaries.
+ */
+struct kexec_segment {
+        const void *buf;
+        size_t bufsz;
+        const void *mem;
+        size_t memsz;
+};
+
+/* Load a new kernel image as described by the kexec_segment array
+ * consisting of passed number of segments at the entry-point address.
+ * The flags allow different useage types.
+ */
+extern int kexec_load(void *, size_t, struct kexec_segment *,
+                unsigned long int);
+#endif /* __KERNEL__ */
+
+#ifdef __KERNEL__
+#ifdef CONFIG_KEXEC
 #include <linux/list.h>
 #include <linux/linkage.h>
 #include <linux/compat.h>
@@ -67,11 +117,10 @@ typedef unsigned long kimage_entry_t;
 #define IND_DONE         0x4
 #define IND_SOURCE       0x8
 
-#define KEXEC_SEGMENT_MAX 16
 struct kexec_segment {
         void __user *buf;
         size_t bufsz;
-        unsigned long mem;      /* User space sees this as a (void *) ... */
+        unsigned long mem;
         size_t memsz;
 };
 
@@ -175,25 +224,6 @@ extern struct kimage *kexec_crash_image;
 #define kexec_flush_icache_page(page)
 #endif
 
-#define KEXEC_ON_CRASH          0x00000001
-#define KEXEC_PRESERVE_CONTEXT  0x00000002
-#define KEXEC_ARCH_MASK         0xffff0000
-
-/* These values match the ELF architecture values.
- * Unless there is a good reason that should continue to be the case.
- */
-#define KEXEC_ARCH_DEFAULT ( 0 << 16)
-#define KEXEC_ARCH_386     ( 3 << 16)
-#define KEXEC_ARCH_X86_64  (62 << 16)
-#define KEXEC_ARCH_PPC     (20 << 16)
-#define KEXEC_ARCH_PPC64   (21 << 16)
-#define KEXEC_ARCH_IA_64   (50 << 16)
-#define KEXEC_ARCH_ARM     (40 << 16)
-#define KEXEC_ARCH_S390    (22 << 16)
-#define KEXEC_ARCH_SH      (42 << 16)
-#define KEXEC_ARCH_MIPS_LE (10 << 16)
-#define KEXEC_ARCH_MIPS    ( 8 << 16)
-
 /* List of defined/legal kexec flags */
 #ifndef CONFIG_KEXEC_JUMP
 #define KEXEC_FLAGS    KEXEC_ON_CRASH
@@ -228,4 +258,5 @@ struct task_struct;
 static inline void crash_kexec(struct pt_regs *regs) { }
 static inline int kexec_should_crash(struct task_struct *p) { return 0; }
 #endif /* CONFIG_KEXEC */
+#endif /* __KERNEL__ */
 #endif /* LINUX_KEXEC_H */
diff --git a/include/linux/key.h b/include/linux/key.h
index 96933b1e5d24..4cd22ed627ef 100644
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -124,7 +124,10 @@ static inline unsigned long is_key_possessed(const key_ref_t key_ref)
 struct key {
         atomic_t                usage;          /* number of references */
         key_serial_t            serial;         /* key serial number */
-        struct rb_node          serial_node;
+        union {
+                struct list_head graveyard_link;
+                struct rb_node  serial_node;
+        };
         struct key_type         *type;          /* type of key */
         struct rw_semaphore     sem;            /* change vs change sem */
         struct key_user         *user;          /* owner of this key */
@@ -133,6 +136,7 @@ struct key {
                 time_t          expiry;         /* time at which key expires (or 0) */
                 time_t          revoked_at;     /* time at which key was revoked */
         };
+        time_t                  last_used_at;   /* last time used for LRU keyring discard */
         uid_t                   uid;
         gid_t                   gid;
         key_perm_t              perm;           /* access permissions */
@@ -156,6 +160,7 @@ struct key {
 #define KEY_FLAG_USER_CONSTRUCT 4       /* set if key is being constructed in userspace */
 #define KEY_FLAG_NEGATIVE       5       /* set if key is negative */
 #define KEY_FLAG_ROOT_CAN_CLEAR 6       /* set if key can be cleared by root without permission */
+#define KEY_FLAG_INVALIDATED    7       /* set if key has been invalidated */
 
         /* the description string
          * - this is used to match a key against search criteria
@@ -199,6 +204,7 @@ extern struct key *key_alloc(struct key_type *type,
 #define KEY_ALLOC_NOT_IN_QUOTA  0x0002  /* not in quota */
 
 extern void key_revoke(struct key *key);
+extern void key_invalidate(struct key *key);
 extern void key_put(struct key *key);
 
 static inline struct key *key_get(struct key *key)
@@ -236,7 +242,7 @@ extern struct key *request_key_async_with_auxdata(struct key_type *type,
 
 extern int wait_for_key_construction(struct key *key, bool intr);
 
-extern int key_validate(struct key *key);
+extern int key_validate(const struct key *key);
 
 extern key_ref_t key_create_or_update(key_ref_t keyring,
                                       const char *type,
@@ -302,9 +308,6 @@ static inline bool key_is_instantiated(const struct key *key)
 #ifdef CONFIG_SYSCTL
 extern ctl_table key_sysctls[];
 #endif
-
-extern void key_replace_session_keyring(void);
-
 /*
  * the userspace interface
  */
@@ -319,6 +322,7 @@ extern void key_init(void);
 #define key_serial(k)                   0
 #define key_get(k)                      ({ NULL; })
 #define key_revoke(k)                   do { } while(0)
+#define key_invalidate(k)               do { } while(0)
 #define key_put(k)                      do { } while(0)
 #define key_ref_put(k)                  do { } while(0)
 #define make_key_ref(k, p)              NULL
@@ -327,7 +331,6 @@ extern void key_init(void);
 #define key_fsuid_changed(t)            do { } while(0)
 #define key_fsgid_changed(t)            do { } while(0)
 #define key_init()                      do { } while(0)
-#define key_replace_session_keyring()   do { } while(0)
 
 #endif /* CONFIG_KEYS */
 #endif /* __KERNEL__ */
diff --git a/include/linux/keyctl.h b/include/linux/keyctl.h
index 9b0b865ce622..c9b7f4faf97a 100644
--- a/include/linux/keyctl.h
+++ b/include/linux/keyctl.h
@@ -55,5 +55,6 @@
 #define KEYCTL_SESSION_TO_PARENT        18      /* apply session keyring to parent process */
 #define KEYCTL_REJECT                   19      /* reject a partially constructed key */
 #define KEYCTL_INSTANTIATE_IOV          20      /* instantiate a partially constructed key */
+#define KEYCTL_INVALIDATE               21      /* invalidate a key */
 
 #endif /*  _LINUX_KEYCTL_H */
diff --git a/include/linux/kmod.h b/include/linux/kmod.h
index dd99c329e161..5398d5807075 100644
--- a/include/linux/kmod.h
+++ b/include/linux/kmod.h
@@ -66,40 +66,10 @@ struct subprocess_info {
         void *data;
 };
 
-/* Allocate a subprocess_info structure */
-struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
-                                                  char **envp, gfp_t gfp_mask);
-
-/* Set various pieces of state into the subprocess_info structure */
-void call_usermodehelper_setfns(struct subprocess_info *info,
-                    int (*init)(struct subprocess_info *info, struct cred *new),
-                    void (*cleanup)(struct subprocess_info *info),
-                    void *data);
-
-/* Actually execute the sub-process */
-int call_usermodehelper_exec(struct subprocess_info *info, int wait);
-
-/* Free the subprocess_info. This is only needed if you're not going
-   to call call_usermodehelper_exec */
-void call_usermodehelper_freeinfo(struct subprocess_info *info);
-
-static inline int
+extern int
 call_usermodehelper_fns(char *path, char **argv, char **envp, int wait,
                         int (*init)(struct subprocess_info *info, struct cred *new),
-                        void (*cleanup)(struct subprocess_info *), void *data)
-{
-        struct subprocess_info *info;
-        gfp_t gfp_mask = (wait == UMH_NO_WAIT) ? GFP_ATOMIC : GFP_KERNEL;
-
-        info = call_usermodehelper_setup(path, argv, envp, gfp_mask);
-
-        if (info == NULL)
-                return -ENOMEM;
-
-        call_usermodehelper_setfns(info, init, cleanup, data);
-
-        return call_usermodehelper_exec(info, wait);
-}
+                        void (*cleanup)(struct subprocess_info *), void *data);
 
 static inline int
 call_usermodehelper(char *path, char **argv, char **envp, int wait)
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 6c322a90b92f..09f2b3aa2da7 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -449,6 +449,30 @@ struct kvm_ppc_pvinfo {
         __u8  pad[108];
 };
 
+/* for KVM_PPC_GET_SMMU_INFO */
+#define KVM_PPC_PAGE_SIZES_MAX_SZ       8
+
+struct kvm_ppc_one_page_size {
+        __u32 page_shift;       /* Page shift (or 0) */
+        __u32 pte_enc;          /* Encoding in the HPTE (>>12) */
+};
+
+struct kvm_ppc_one_seg_page_size {
+        __u32 page_shift;       /* Base page shift of segment (or 0) */
+        __u32 slb_enc;          /* SLB encoding for BookS */
+        struct kvm_ppc_one_page_size enc[KVM_PPC_PAGE_SIZES_MAX_SZ];
+};
+
+#define KVM_PPC_PAGE_SIZES_REAL         0x00000001
+#define KVM_PPC_1T_SEGMENTS             0x00000002
+
+struct kvm_ppc_smmu_info {
+        __u64 flags;
+        __u32 slb_size;
+        __u32 pad;
+        struct kvm_ppc_one_seg_page_size sps[KVM_PPC_PAGE_SIZES_MAX_SZ];
+};
+
 #define KVMIO 0xAE
 
 /* machine type bits, to be used as argument to KVM_CREATE_VM */
@@ -589,6 +613,10 @@ struct kvm_ppc_pvinfo {
 #define KVM_CAP_S390_UCONTROL 73
 #define KVM_CAP_SYNC_REGS 74
 #define KVM_CAP_PCI_2_3 75
+#define KVM_CAP_KVMCLOCK_CTRL 76
+#define KVM_CAP_SIGNAL_MSI 77
+#define KVM_CAP_PPC_GET_SMMU_INFO 78
+#define KVM_CAP_S390_COW 79
 
 #ifdef KVM_CAP_IRQ_ROUTING
 
@@ -714,6 +742,14 @@ struct kvm_one_reg {
         __u64 addr;
 };
 
+struct kvm_msi {
+        __u32 address_lo;
+        __u32 address_hi;
+        __u32 data;
+        __u32 flags;
+        __u8  pad[16];
+};
+
 /*
  * ioctls for VM fds
  */
@@ -788,6 +824,10 @@ struct kvm_s390_ucas_mapping {
 /* Available with KVM_CAP_PCI_2_3 */
 #define KVM_ASSIGN_SET_INTX_MASK  _IOW(KVMIO,  0xa4, \
                                        struct kvm_assigned_pci_dev)
+/* Available with KVM_CAP_SIGNAL_MSI */
+#define KVM_SIGNAL_MSI            _IOW(KVMIO,  0xa5, struct kvm_msi)
+/* Available with KVM_CAP_PPC_GET_SMMU_INFO */
+#define KVM_PPC_GET_SMMU_INFO     _IOR(KVMIO,  0xa6, struct kvm_ppc_smmu_info)
 
 /*
  * ioctls for vcpu fds
@@ -859,6 +899,8 @@ struct kvm_s390_ucas_mapping {
 /* Available with KVM_CAP_ONE_REG */
 #define KVM_GET_ONE_REG           _IOW(KVMIO,  0xab, struct kvm_one_reg)
 #define KVM_SET_ONE_REG           _IOW(KVMIO,  0xac, struct kvm_one_reg)
+/* VM is being stopped by host */
+#define KVM_KVMCLOCK_CTRL         _IO(KVMIO,   0xad)
 
 #define KVM_DEV_ASSIGN_ENABLE_IOMMU     (1 << 0)
 #define KVM_DEV_ASSIGN_PCI_2_3          (1 << 1)
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 72cbf08d45fb..c4464356b35b 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -35,6 +35,20 @@
 #endif
 
 /*
+ * If we support unaligned MMIO, at most one fragment will be split into two:
+ */
+#ifdef KVM_UNALIGNED_MMIO
+#  define KVM_EXTRA_MMIO_FRAGMENTS 1
+#else
+#  define KVM_EXTRA_MMIO_FRAGMENTS 0
+#endif
+
+#define KVM_USER_MMIO_SIZE 8
+
+#define KVM_MAX_MMIO_FRAGMENTS \
+        (KVM_MMIO_SIZE / KVM_USER_MMIO_SIZE + KVM_EXTRA_MMIO_FRAGMENTS)
+
+/*
  * vcpu->requests bit members
  */
 #define KVM_REQ_TLB_FLUSH          0
@@ -68,10 +82,11 @@ struct kvm_io_range {
         struct kvm_io_device *dev;
 };
 
+#define NR_IOBUS_DEVS 1000
+
 struct kvm_io_bus {
         int                   dev_count;
-#define NR_IOBUS_DEVS 300
-        struct kvm_io_range range[NR_IOBUS_DEVS];
+        struct kvm_io_range range[];
 };
 
 enum kvm_bus {
@@ -113,7 +128,18 @@ int kvm_async_pf_wakeup_all(struct kvm_vcpu *vcpu);
 enum {
         OUTSIDE_GUEST_MODE,
         IN_GUEST_MODE,
-        EXITING_GUEST_MODE
+        EXITING_GUEST_MODE,
+        READING_SHADOW_PAGE_TABLES,
+};
+
+/*
+ * Sometimes a large or cross-page mmio needs to be broken up into separate
+ * exits for userspace servicing.
+ */
+struct kvm_mmio_fragment {
+        gpa_t gpa;
+        void *data;
+        unsigned len;
 };
 
 struct kvm_vcpu {
@@ -143,10 +169,9 @@ struct kvm_vcpu {
         int mmio_needed;
         int mmio_read_completed;
         int mmio_is_write;
-        int mmio_size;
-        int mmio_index;
-        unsigned char mmio_data[KVM_MMIO_SIZE];
-        gpa_t mmio_phys_addr;
+        int mmio_cur_fragment;
+        int mmio_nr_fragments;
+        struct kvm_mmio_fragment mmio_fragments[KVM_MAX_MMIO_FRAGMENTS];
 #endif
 
 #ifdef CONFIG_KVM_ASYNC_PF
@@ -178,8 +203,6 @@ struct kvm_memory_slot {
         unsigned long flags;
         unsigned long *rmap;
         unsigned long *dirty_bitmap;
-        unsigned long *dirty_bitmap_head;
-        unsigned long nr_dirty_pages;
         struct kvm_arch_memory_slot arch;
         unsigned long userspace_addr;
         int user_alloc;
@@ -438,6 +461,8 @@ void mark_page_dirty_in_slot(struct kvm *kvm, struct kvm_memory_slot *memslot,
                              gfn_t gfn);
 
 void kvm_vcpu_block(struct kvm_vcpu *vcpu);
+void kvm_vcpu_kick(struct kvm_vcpu *vcpu);
+bool kvm_vcpu_yield_to(struct kvm_vcpu *target);
 void kvm_vcpu_on_spin(struct kvm_vcpu *vcpu);
 void kvm_resched(struct kvm_vcpu *vcpu);
 void kvm_load_guest_fpu(struct kvm_vcpu *vcpu);
@@ -506,6 +531,7 @@ int kvm_arch_hardware_setup(void);
 void kvm_arch_hardware_unsetup(void);
 void kvm_arch_check_processor_compat(void *rtn);
 int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu);
+int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu);
 
 void kvm_free_physmem(struct kvm *kvm);
 
@@ -521,6 +547,15 @@ static inline void kvm_arch_free_vm(struct kvm *kvm)
 }
 #endif
 
+static inline wait_queue_head_t *kvm_arch_vcpu_wq(struct kvm_vcpu *vcpu)
+{
+#ifdef __KVM_HAVE_ARCH_WQP
+        return vcpu->arch.wqp;
+#else
+        return &vcpu->wq;
+#endif
+}
+
 int kvm_arch_init_vm(struct kvm *kvm, unsigned long type);
 void kvm_arch_destroy_vm(struct kvm *kvm);
 void kvm_free_all_assigned_devices(struct kvm *kvm);
@@ -769,6 +804,8 @@ int kvm_set_irq_routing(struct kvm *kvm,
                         unsigned flags);
 void kvm_free_irq_routing(struct kvm *kvm);
 
+int kvm_send_userspace_msi(struct kvm *kvm, struct kvm_msi *msi);
+
 #else
 
 static inline void kvm_free_irq_routing(struct kvm *kvm) {}
diff --git a/include/linux/l2tp.h b/include/linux/l2tp.h
index e77d7f9bb246..7eab668f60f3 100644
--- a/include/linux/l2tp.h
+++ b/include/linux/l2tp.h
@@ -11,6 +11,7 @@
 #include <linux/socket.h>
 #ifdef __KERNEL__
 #include <linux/in.h>
+#include <linux/in6.h>
 #else
 #include <netinet/in.h>
 #endif
@@ -39,6 +40,22 @@ struct sockaddr_l2tpip {
                               sizeof(__u32)];
 };
 
+/**
+ * struct sockaddr_l2tpip6 - the sockaddr structure for L2TP-over-IPv6 sockets
+ * @l2tp_family:  address family number AF_L2TPIP.
+ * @l2tp_addr:    protocol specific address information
+ * @l2tp_conn_id: connection id of tunnel
+ */
+struct sockaddr_l2tpip6 {
+        /* The first fields must match struct sockaddr_in6 */
+        __kernel_sa_family_t l2tp_family; /* AF_INET6 */
+        __be16          l2tp_unused;    /* INET port number (unused) */
+        __be32          l2tp_flowinfo;  /* IPv6 flow information */
+        struct in6_addr l2tp_addr;      /* IPv6 address */
+        __u32           l2tp_scope_id;  /* scope id (new in RFC2553) */
+        __u32           l2tp_conn_id;   /* Connection ID of tunnel */
+};
+
 /*****************************************************************************
  *  NETLINK_GENERIC netlink family.
  *****************************************************************************/
@@ -108,6 +125,8 @@ enum {
         L2TP_ATTR_MTU,                  /* u16 */
         L2TP_ATTR_MRU,                  /* u16 */
         L2TP_ATTR_STATS,                /* nested */
+        L2TP_ATTR_IP6_SADDR,            /* struct in6_addr */
+        L2TP_ATTR_IP6_DADDR,            /* struct in6_addr */
         __L2TP_ATTR_MAX,
 };
 
diff --git a/include/linux/lcd.h b/include/linux/lcd.h
index 8877123f2d6e..e00c3b0ebc6b 100644
--- a/include/linux/lcd.h
+++ b/include/linux/lcd.h
@@ -40,6 +40,16 @@ struct lcd_ops {
         /* Get the LCD panel power status (0: full on, 1..3: controller
            power on, flat panel power off, 4: full off), see FB_BLANK_XXX */
         int (*get_power)(struct lcd_device *);
+        /*
+         * Enable or disable power to the LCD(0: on; 4: off, see FB_BLANK_XXX)
+         * and this callback would be called proir to fb driver's callback.
+         *
+         * P.S. note that if early_set_power is not NULL then early fb notifier
+         *      would be registered.
+         */
+        int (*early_set_power)(struct lcd_device *, int power);
+        /* revert the effects of the early blank event. */
+        int (*r_early_set_power)(struct lcd_device *, int power);
         /* Enable or disable power to the LCD (0: on; 4: off, see FB_BLANK_XXX) */
         int (*set_power)(struct lcd_device *, int power);
         /* Get the current contrast setting (0-max_contrast) */
diff --git a/include/linux/led-lm3530.h b/include/linux/led-lm3530.h
index eeae6e742471..4b133479d6ea 100644
--- a/include/linux/led-lm3530.h
+++ b/include/linux/led-lm3530.h
@@ -92,7 +92,7 @@ struct lm3530_pwm_data {
  * @als2_resistor_sel: internal resistance from ALS2 input to ground
  * @als_vmin: als input voltage calibrated for max brightness in mV
  * @als_vmax: als input voltage calibrated for min brightness in mV
- * @brt_val: brightness value (0-255)
+ * @brt_val: brightness value (0-127)
  * @pwm_data: PWM control functions (only valid when the mode is PWM)
  */
 struct lm3530_platform_data {
diff --git a/include/linux/leds.h b/include/linux/leds.h
index 5884def15a24..39eee41d8c6f 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -73,6 +73,8 @@ struct led_classdev {
         struct led_trigger      *trigger;
         struct list_head         trig_list;
         void                    *trigger_data;
+        /* true if activated - deactivate routine uses it to do cleanup */
+        bool                    activated;
 #endif
 };
 
diff --git a/include/linux/lglock.h b/include/linux/lglock.h
index 87f402ccec55..f01e5f6d1f07 100644
--- a/include/linux/lglock.h
+++ b/include/linux/lglock.h
@@ -23,28 +23,17 @@
 #include <linux/lockdep.h>
 #include <linux/percpu.h>
 #include <linux/cpu.h>
+#include <linux/notifier.h>
 
 /* can make br locks by using local lock for read side, global lock for write */
-#define br_lock_init(name)      name##_lock_init()
-#define br_read_lock(name)      name##_local_lock()
-#define br_read_unlock(name)    name##_local_unlock()
-#define br_write_lock(name)     name##_global_lock_online()
-#define br_write_unlock(name)   name##_global_unlock_online()
+#define br_lock_init(name)      lg_lock_init(name, #name)
+#define br_read_lock(name)      lg_local_lock(name)
+#define br_read_unlock(name)    lg_local_unlock(name)
+#define br_write_lock(name)     lg_global_lock(name)
+#define br_write_unlock(name)   lg_global_unlock(name)
 
-#define DECLARE_BRLOCK(name)    DECLARE_LGLOCK(name)
 #define DEFINE_BRLOCK(name)     DEFINE_LGLOCK(name)
 
-
-#define lg_lock_init(name)      name##_lock_init()
-#define lg_local_lock(name)     name##_local_lock()
-#define lg_local_unlock(name)   name##_local_unlock()
-#define lg_local_lock_cpu(name, cpu)    name##_local_lock_cpu(cpu)
-#define lg_local_unlock_cpu(name, cpu)  name##_local_unlock_cpu(cpu)
-#define lg_global_lock(name)    name##_global_lock()
-#define lg_global_unlock(name)  name##_global_unlock()
-#define lg_global_lock_online(name) name##_global_lock_online()
-#define lg_global_unlock_online(name) name##_global_unlock_online()
-
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
 #define LOCKDEP_INIT_MAP lockdep_init_map
 
@@ -59,142 +48,26 @@
 #define DEFINE_LGLOCK_LOCKDEP(name)
 #endif
 
-
-#define DECLARE_LGLOCK(name)                                            \
- extern void name##_lock_init(void);                                    \
- extern void name##_local_lock(void);                                   \
- extern void name##_local_unlock(void);                                 \
- extern void name##_local_lock_cpu(int cpu);                            \
- extern void name##_local_unlock_cpu(int cpu);                          \
- extern void name##_global_lock(void);                                  \
- extern void name##_global_unlock(void);                                \
- extern void name##_global_lock_online(void);                           \
- extern void name##_global_unlock_online(void);                         \
+struct lglock {
+        arch_spinlock_t __percpu *lock;
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+        struct lock_class_key lock_key;
+        struct lockdep_map    lock_dep_map;
+#endif
+};
 
 #define DEFINE_LGLOCK(name)                                             \
-                                                                        \
- DEFINE_SPINLOCK(name##_cpu_lock);                                      \
- cpumask_t name##_cpus __read_mostly;                                   \
- DEFINE_PER_CPU(arch_spinlock_t, name##_lock);                          \
- DEFINE_LGLOCK_LOCKDEP(name);                                           \
-                                                                        \
- static int                                                             \
- name##_lg_cpu_callback(struct notifier_block *nb,                      \
-                                unsigned long action, void *hcpu)       \
- {                                                                      \
-        switch (action & ~CPU_TASKS_FROZEN) {                           \
-        case CPU_UP_PREPARE:                                            \
-                spin_lock(&name##_cpu_lock);                            \
-                cpu_set((unsigned long)hcpu, name##_cpus);              \
-                spin_unlock(&name##_cpu_lock);                          \
-                break;                                                  \
-        case CPU_UP_CANCELED: case CPU_DEAD:                            \
-                spin_lock(&name##_cpu_lock);                            \
-                cpu_clear((unsigned long)hcpu, name##_cpus);            \
-                spin_unlock(&name##_cpu_lock);                          \
-        }                                                               \
-        return NOTIFY_OK;                                               \
- }                                                                      \
- static struct notifier_block name##_lg_cpu_notifier = {                \
-        .notifier_call = name##_lg_cpu_callback,                        \
- };                                                                     \
- void name##_lock_init(void) {                                          \
-        int i;                                                          \
-        LOCKDEP_INIT_MAP(&name##_lock_dep_map, #name, &name##_lock_key, 0); \
-        for_each_possible_cpu(i) {                                      \
-                arch_spinlock_t *lock;                                  \
-                lock = &per_cpu(name##_lock, i);                        \
-                *lock = (arch_spinlock_t)__ARCH_SPIN_LOCK_UNLOCKED;     \
-        }                                                               \
-        register_hotcpu_notifier(&name##_lg_cpu_notifier);              \
-        get_online_cpus();                                              \
-        for_each_online_cpu(i)                                          \
-                cpu_set(i, name##_cpus);                                \
-        put_online_cpus();                                              \
- }                                                                      \
- EXPORT_SYMBOL(name##_lock_init);                                       \
-                                                                        \
- void name##_local_lock(void) {                                         \
-        arch_spinlock_t *lock;                                          \
-        preempt_disable();                                              \
-        rwlock_acquire_read(&name##_lock_dep_map, 0, 0, _THIS_IP_);     \
-        lock = &__get_cpu_var(name##_lock);                             \
-        arch_spin_lock(lock);                                           \
- }                                                                      \
- EXPORT_SYMBOL(name##_local_lock);                                      \
-                                                                        \
- void name##_local_unlock(void) {                                       \
-        arch_spinlock_t *lock;                                          \
-        rwlock_release(&name##_lock_dep_map, 1, _THIS_IP_);             \
-        lock = &__get_cpu_var(name##_lock);                             \
-        arch_spin_unlock(lock);                                         \
-        preempt_enable();                                               \
- }                                                                      \
- EXPORT_SYMBOL(name##_local_unlock);                                    \
-                                                                        \
- void name##_local_lock_cpu(int cpu) {                                  \
-        arch_spinlock_t *lock;                                          \
-        preempt_disable();                                              \
-        rwlock_acquire_read(&name##_lock_dep_map, 0, 0, _THIS_IP_);     \
-        lock = &per_cpu(name##_lock, cpu);                              \
-        arch_spin_lock(lock);                                           \
- }                                                                      \
- EXPORT_SYMBOL(name##_local_lock_cpu);                                  \
-                                                                        \
- void name##_local_unlock_cpu(int cpu) {                                \
-        arch_spinlock_t *lock;                                          \
-        rwlock_release(&name##_lock_dep_map, 1, _THIS_IP_);             \
-        lock = &per_cpu(name##_lock, cpu);                              \
-        arch_spin_unlock(lock);                                         \
-        preempt_enable();                                               \
- }                                                                      \
- EXPORT_SYMBOL(name##_local_unlock_cpu);                                \
-                                                                        \
- void name##_global_lock_online(void) {                                 \
-        int i;                                                          \
-        spin_lock(&name##_cpu_lock);                                    \
-        rwlock_acquire(&name##_lock_dep_map, 0, 0, _RET_IP_);           \
-        for_each_cpu(i, &name##_cpus) {                                 \
-                arch_spinlock_t *lock;                                  \
-                lock = &per_cpu(name##_lock, i);                        \
-                arch_spin_lock(lock);                                   \
-        }                                                               \
- }                                                                      \
- EXPORT_SYMBOL(name##_global_lock_online);                              \
-                                                                        \
- void name##_global_unlock_online(void) {                               \
-        int i;                                                          \
-        rwlock_release(&name##_lock_dep_map, 1, _RET_IP_);              \
-        for_each_cpu(i, &name##_cpus) {                                 \
-                arch_spinlock_t *lock;                                  \
-                lock = &per_cpu(name##_lock, i);                        \
-                arch_spin_unlock(lock);                                 \
-        }                                                               \
-        spin_unlock(&name##_cpu_lock);                                  \
- }                                                                      \
- EXPORT_SYMBOL(name##_global_unlock_online);                            \
-                                                                        \
- void name##_global_lock(void) {                                        \
-        int i;                                                          \
-        preempt_disable();                                              \
-        rwlock_acquire(&name##_lock_dep_map, 0, 0, _RET_IP_);           \
-        for_each_possible_cpu(i) {                                      \
-                arch_spinlock_t *lock;                                  \
-                lock = &per_cpu(name##_lock, i);                        \
-                arch_spin_lock(lock);                                   \
-        }                                                               \
- }                                                                      \
- EXPORT_SYMBOL(name##_global_lock);                                     \
-                                                                        \
- void name##_global_unlock(void) {                                      \
-        int i;                                                          \
-        rwlock_release(&name##_lock_dep_map, 1, _RET_IP_);              \
-        for_each_possible_cpu(i) {                                      \
-                arch_spinlock_t *lock;                                  \
-                lock = &per_cpu(name##_lock, i);                        \
-                arch_spin_unlock(lock);                                 \
-        }                                                               \
-        preempt_enable();                                               \
- }                                                                      \
- EXPORT_SYMBOL(name##_global_unlock);
+        DEFINE_LGLOCK_LOCKDEP(name);                                    \
+        DEFINE_PER_CPU(arch_spinlock_t, name ## _lock)                  \
+        = __ARCH_SPIN_LOCK_UNLOCKED;                                    \
+        struct lglock name = { .lock = &name ## _lock }
+
+void lg_lock_init(struct lglock *lg, char *name);
+void lg_local_lock(struct lglock *lg);
+void lg_local_unlock(struct lglock *lg);
+void lg_local_lock_cpu(struct lglock *lg, int cpu);
+void lg_local_unlock_cpu(struct lglock *lg, int cpu);
+void lg_global_lock(struct lglock *lg);
+void lg_global_unlock(struct lglock *lg);
+
 #endif
diff --git a/include/linux/libata.h b/include/linux/libata.h
index e926df7b54c9..6e887c742a27 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -247,6 +247,7 @@ enum {
         ATA_HOST_SIMPLEX        = (1 << 0),     /* Host is simplex, one DMA channel per host only */
         ATA_HOST_STARTED        = (1 << 1),     /* Host started */
         ATA_HOST_PARALLEL_SCAN  = (1 << 2),     /* Ports on this host can be scanned in parallel */
+        ATA_HOST_IGNORE_ATA     = (1 << 3),     /* Ignore ATA devices on this host. */
 
         /* bits 24:31 of host->flags are reserved for LLD specific flags */
 
diff --git a/include/linux/lockd/bind.h b/include/linux/lockd/bind.h
index 11a966e5f829..4d24d64578c4 100644
--- a/include/linux/lockd/bind.h
+++ b/include/linux/lockd/bind.h
@@ -54,7 +54,7 @@ extern void	nlmclnt_done(struct nlm_host *host);
 
 extern int      nlmclnt_proc(struct nlm_host *host, int cmd,
                                         struct file_lock *fl);
-extern int      lockd_up(void);
-extern void     lockd_down(void);
+extern int      lockd_up(struct net *net);
+extern void     lockd_down(struct net *net);
 
 #endif /* LINUX_LOCKD_BIND_H */
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index d36619ead3ba..00e46376e28f 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -157,6 +157,24 @@ struct lockdep_map {
 #endif
 };
 
+static inline void lockdep_copy_map(struct lockdep_map *to,
+                                    struct lockdep_map *from)
+{
+        int i;
+
+        *to = *from;
+        /*
+         * Since the class cache can be modified concurrently we could observe
+         * half pointers (64bit arch using 32bit copy insns). Therefore clear
+         * the caches and take the performance hit.
+         *
+         * XXX it doesn't work well with lockdep_set_class_and_subclass(), since
+         *     that relies on cache abuse.
+         */
+        for (i = 0; i < NR_LOCKDEP_CACHING_CLASSES; i++)
+                to->class_cache[i] = NULL;
+}
+
 /*
  * Every lock has a list of other locks that were taken after it.
  * We only grow the list, never remove from it:
diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h
index fad48aab893b..1cc89e9df480 100644
--- a/include/linux/lsm_audit.h
+++ b/include/linux/lsm_audit.h
@@ -53,7 +53,6 @@ struct common_audit_data {
 #define LSM_AUDIT_DATA_KMOD     8
 #define LSM_AUDIT_DATA_INODE    9
 #define LSM_AUDIT_DATA_DENTRY   10
-        struct task_struct *tsk;
         union   {
                 struct path path;
                 struct dentry *dentry;
@@ -93,11 +92,6 @@ int ipv4_skb_to_auditdata(struct sk_buff *skb,
 int ipv6_skb_to_auditdata(struct sk_buff *skb,
                 struct common_audit_data *ad, u8 *proto);
 
-/* Initialize an LSM audit data structure. */
-#define COMMON_AUDIT_DATA_INIT(_d, _t) \
-        { memset((_d), 0, sizeof(struct common_audit_data)); \
-         (_d)->type = LSM_AUDIT_DATA_##_t; }
-
 void common_lsm_audit(struct common_audit_data *a,
         void (*pre_audit)(struct audit_buffer *, void *),
         void (*post_audit)(struct audit_buffer *, void *));
diff --git a/include/linux/mISDNhw.h b/include/linux/mISDNhw.h
index 4af841408fb5..d0752eca9b44 100644
--- a/include/linux/mISDNhw.h
+++ b/include/linux/mISDNhw.h
@@ -72,7 +72,9 @@
 #define FLG_LL_OK               24
 #define FLG_LL_CONN             25
 #define FLG_DTMFSEND            26
-
+#define FLG_TX_EMPTY            27
+/* stop sending received data upstream */
+#define FLG_RX_OFF              28
 /* workq events */
 #define FLG_RECVQUEUE           30
 #define FLG_PHCHANGE            31
@@ -135,10 +137,14 @@ extern int	create_l1(struct dchannel *, dchannel_l1callback *);
 #define HW_TESTRX_RAW   0x9602
 #define HW_TESTRX_HDLC  0x9702
 #define HW_TESTRX_OFF   0x9802
+#define HW_TIMER3_IND   0x9902
+#define HW_TIMER3_VALUE 0x9a00
+#define HW_TIMER3_VMASK 0x00FF
 
 struct layer1;
 extern int      l1_event(struct layer1 *, u_int);
 
+#define MISDN_BCH_FILL_SIZE     4
 
 struct bchannel {
         struct mISDNchannel     ch;
@@ -150,8 +156,14 @@ struct bchannel {
         int                     slot;   /* multiport card channel slot */
         struct timer_list       timer;
         /* receive data */
+        u8                      fill[MISDN_BCH_FILL_SIZE];
         struct sk_buff          *rx_skb;
-        int                     maxlen;
+        unsigned short          maxlen;
+        unsigned short          init_maxlen; /* initial value */
+        unsigned short          next_maxlen; /* pending value */
+        unsigned short          minlen; /* for transparent data */
+        unsigned short          init_minlen; /* initial value */
+        unsigned short          next_minlen; /* pending value */
         /* send data */
         struct sk_buff          *next_skb;
         struct sk_buff          *tx_skb;
@@ -163,23 +175,26 @@ struct bchannel {
         int                     err_crc;
         int                     err_tx;
         int                     err_rx;
+        int                     dropcnt;
 };
 
 extern int      mISDN_initdchannel(struct dchannel *, int, void *);
-extern int      mISDN_initbchannel(struct bchannel *, int);
+extern int      mISDN_initbchannel(struct bchannel *, unsigned short,
+                                   unsigned short);
 extern int      mISDN_freedchannel(struct dchannel *);
 extern void     mISDN_clear_bchannel(struct bchannel *);
 extern int      mISDN_freebchannel(struct bchannel *);
+extern int      mISDN_ctrl_bchannel(struct bchannel *, struct mISDN_ctrl_req *);
 extern void     queue_ch_frame(struct mISDNchannel *, u_int,
                         int, struct sk_buff *);
 extern int      dchannel_senddata(struct dchannel *, struct sk_buff *);
 extern int      bchannel_senddata(struct bchannel *, struct sk_buff *);
+extern int      bchannel_get_rxbuf(struct bchannel *, int);
 extern void     recv_Dchannel(struct dchannel *);
 extern void     recv_Echannel(struct dchannel *, struct dchannel *);
-extern void     recv_Bchannel(struct bchannel *, unsigned int id);
+extern void     recv_Bchannel(struct bchannel *, unsigned int, bool);
 extern void     recv_Dchannel_skb(struct dchannel *, struct sk_buff *);
 extern void     recv_Bchannel_skb(struct bchannel *, struct sk_buff *);
-extern void     confirm_Bsend(struct bchannel *bch);
 extern int      get_next_bframe(struct bchannel *);
 extern int      get_next_dframe(struct dchannel *);
 
diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h
index b5e7f2202484..246a3529ecf6 100644
--- a/include/linux/mISDNif.h
+++ b/include/linux/mISDNif.h
@@ -37,7 +37,7 @@
  */
 #define MISDN_MAJOR_VERSION     1
 #define MISDN_MINOR_VERSION     1
-#define MISDN_RELEASE           21
+#define MISDN_RELEASE           29
 
 /* primitives for information exchange
  * generell format
@@ -115,6 +115,11 @@
 #define MDL_ERROR_IND           0x1F04
 #define MDL_ERROR_RSP           0x5F04
 
+/* intern layer 2 */
+#define DL_TIMER200_IND         0x7004
+#define DL_TIMER203_IND         0x7304
+#define DL_INTERN_MSG           0x7804
+
 /* DL_INFORMATION_IND types */
 #define DL_INFO_L2_CONNECT      0x0001
 #define DL_INFO_L2_REMOVED      0x0002
@@ -360,6 +365,7 @@ clear_channelmap(u_int nr, u_char *map)
 #define MISDN_CTRL_LOOP                 0x0001
 #define MISDN_CTRL_CONNECT              0x0002
 #define MISDN_CTRL_DISCONNECT           0x0004
+#define MISDN_CTRL_RX_BUFFER            0x0008
 #define MISDN_CTRL_PCMCONNECT           0x0010
 #define MISDN_CTRL_PCMDISCONNECT        0x0020
 #define MISDN_CTRL_SETPEER              0x0040
@@ -367,6 +373,7 @@ clear_channelmap(u_int nr, u_char *map)
 #define MISDN_CTRL_RX_OFF               0x0100
 #define MISDN_CTRL_FILL_EMPTY           0x0200
 #define MISDN_CTRL_GETPEER              0x0400
+#define MISDN_CTRL_L1_TIMER3            0x0800
 #define MISDN_CTRL_HW_FEATURES_OP       0x2000
 #define MISDN_CTRL_HW_FEATURES          0x2001
 #define MISDN_CTRL_HFC_OP               0x4000
@@ -381,6 +388,12 @@ clear_channelmap(u_int nr, u_char *map)
 #define MISDN_CTRL_HFC_WD_INIT          0x4009
 #define MISDN_CTRL_HFC_WD_RESET         0x400A
 
+/* special RX buffer value for MISDN_CTRL_RX_BUFFER request.p1 is the minimum
+ * buffer size request.p2 the maximum. Using  MISDN_CTRL_RX_SIZE_IGNORE will
+ * not change the value, but still read back the actual stetting.
+ */
+#define MISDN_CTRL_RX_SIZE_IGNORE       -1
+
 /* socket options */
 #define MISDN_TIME_STAMP                0x0001
 
@@ -585,6 +598,7 @@ static inline struct mISDNdevice *dev_to_mISDN(struct device *dev)
 extern void     set_channel_address(struct mISDNchannel *, u_int, u_int);
 extern void     mISDN_clock_update(struct mISDNclock *, int, struct timeval *);
 extern unsigned short mISDN_clock_get(void);
+extern const char *mISDNDevName4ch(struct mISDNchannel *);
 
 #endif /* __KERNEL__ */
 #endif /* mISDNIF_H */
diff --git a/include/linux/mca-legacy.h b/include/linux/mca-legacy.h
deleted file mode 100644
index 7a3aea845902..000000000000
--- a/include/linux/mca-legacy.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8 -*- */
-
-/* This is the function prototypes for the old legacy MCA interface
- *
- * Please move your driver to the new sysfs based one instead */
-
-#ifndef _LINUX_MCA_LEGACY_H
-#define _LINUX_MCA_LEGACY_H
-
-#include <linux/mca.h>
-
-#warning "MCA legacy - please move your driver to the new sysfs api"
-
-/* MCA_NOTFOUND is an error condition.  The other two indicate
- * motherboard POS registers contain the adapter.  They might be
- * returned by the mca_find_adapter() function, and can be used as
- * arguments to mca_read_stored_pos().  I'm not going to allow direct
- * access to the motherboard registers until we run across an adapter
- * that requires it.  We don't know enough about them to know if it's
- * safe.
- *
- * See Documentation/mca.txt or one of the existing drivers for
- * more information.
- */
-#define MCA_NOTFOUND    (-1)
-
-
-
-/* Returns the slot of the first enabled adapter matching id.  User can
- * specify a starting slot beyond zero, to deal with detecting multiple
- * devices.  Returns MCA_NOTFOUND if id not found.  Also checks the
- * integrated adapters.
- */
-extern int mca_find_adapter(int id, int start);
-extern int mca_find_unused_adapter(int id, int start);
-
-extern int mca_mark_as_used(int slot);
-extern void mca_mark_as_unused(int slot);
-
-/* gets a byte out of POS register (stored in memory) */
-extern unsigned char mca_read_stored_pos(int slot, int reg);
-
-/* This can be expanded later.  Right now, it gives us a way of
- * getting meaningful information into the MCA_info structure,
- * so we can have a more interesting /proc/mca.
- */
-extern void mca_set_adapter_name(int slot, char* name);
-
-/* These routines actually mess with the hardware POS registers.  They
- * temporarily disable the device (and interrupts), so make sure you know
- * what you're doing if you use them.  Furthermore, writing to a POS may
- * result in two devices trying to share a resource, which in turn can
- * result in multiple devices sharing memory spaces, IRQs, or even trashing
- * hardware.  YOU HAVE BEEN WARNED.
- *
- * You can only access slots with this.  Motherboard registers are off
- * limits.
- */
-
-/* read a byte from the specified POS register. */
-extern unsigned char mca_read_pos(int slot, int reg);
-
-/* write a byte to the specified POS register. */
-extern void mca_write_pos(int slot, int reg, unsigned char byte);
-
-#endif
diff --git a/include/linux/mca.h b/include/linux/mca.h
deleted file mode 100644
index 37972704617f..000000000000
--- a/include/linux/mca.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Header for Microchannel Architecture Bus
- * Written by Martin Kolinek, February 1996
- */
-
-#ifndef _LINUX_MCA_H
-#define _LINUX_MCA_H
-
-#include <linux/device.h>
-
-#ifdef CONFIG_MCA
-#include <asm/mca.h>
-
-extern int MCA_bus;
-#else
-#define MCA_bus 0
-#endif
-
-/* This sets up an information callback for /proc/mca/slot?.  The
- * function is called with the buffer, slot, and device pointer (or
- * some equally informative context information, or nothing, if you
- * prefer), and is expected to put useful information into the
- * buffer.  The adapter name, id, and POS registers get printed
- * before this is called though, so don't do it again.
- *
- * This should be called with a NULL procfn when a module
- * unregisters, thus preventing kernel crashes and other such
- * nastiness.
- */
-typedef int (*MCA_ProcFn)(char* buf, int slot, void* dev);
-
-/* Should only be called by the NMI interrupt handler, this will do some
- * fancy stuff to figure out what might have generated a NMI.
- */
-extern void mca_handle_nmi(void);
-
-enum MCA_AdapterStatus {
-        MCA_ADAPTER_NORMAL = 0,
-        MCA_ADAPTER_NONE = 1,
-        MCA_ADAPTER_DISABLED = 2,
-        MCA_ADAPTER_ERROR = 3
-};
-
-struct mca_device {
-        u64                     dma_mask;
-        int                     pos_id;
-        int                     slot;
-
-        /* index into id_table, set by the bus match routine */
-        int                     index;
-
-        /* is there a driver installed? 0 - No, 1 - Yes */
-        int                     driver_loaded;
-        /* POS registers */
-        unsigned char           pos[8];
-        /* if a pseudo adapter of the motherboard, this is the motherboard
-         * register value to use for setup cycles */
-        short                   pos_register;
-        
-        enum MCA_AdapterStatus  status;
-#ifdef CONFIG_MCA_PROC_FS
-        /* name of the proc/mca file */
-        char                    procname[8];
-        /* /proc info callback */
-        MCA_ProcFn              procfn;
-        /* device/context info for proc callback */
-        void                    *proc_dev;
-#endif
-        struct device           dev;
-        char                    name[32];
-};
-#define to_mca_device(mdev) container_of(mdev, struct mca_device, dev)
-
-struct mca_bus_accessor_functions {
-        unsigned char   (*mca_read_pos)(struct mca_device *, int reg);
-        void            (*mca_write_pos)(struct mca_device *, int reg,
-                                         unsigned char byte);
-        int             (*mca_transform_irq)(struct mca_device *, int irq);
-        int             (*mca_transform_ioport)(struct mca_device *,
-                                                  int region);
-        void *          (*mca_transform_memory)(struct mca_device *,
-                                                void *memory);
-};
-
-struct mca_bus {
-        u64                     default_dma_mask;
-        int                     number;
-        struct mca_bus_accessor_functions f;
-        struct device           dev;
-        char                    name[32];
-};
-#define to_mca_bus(mdev) container_of(mdev, struct mca_bus, dev)
-
-struct mca_driver {
-        const short             *id_table;
-        void                    *driver_data;
-        int                     integrated_id;
-        struct device_driver    driver;
-};
-#define to_mca_driver(mdriver) container_of(mdriver, struct mca_driver, driver)
-
-/* Ongoing supported API functions */
-extern struct mca_device *mca_find_device_by_slot(int slot);
-extern int mca_system_init(void);
-extern struct mca_bus *mca_attach_bus(int);
-
-extern unsigned char mca_device_read_stored_pos(struct mca_device *mca_dev,
-                                                int reg);
-extern unsigned char mca_device_read_pos(struct mca_device *mca_dev, int reg);
-extern void mca_device_write_pos(struct mca_device *mca_dev, int reg,
-                                 unsigned char byte);
-extern int mca_device_transform_irq(struct mca_device *mca_dev, int irq);
-extern int mca_device_transform_ioport(struct mca_device *mca_dev, int port);
-extern void *mca_device_transform_memory(struct mca_device *mca_dev,
-                                         void *mem);
-extern int mca_device_claimed(struct mca_device *mca_dev);
-extern void mca_device_set_claim(struct mca_device *mca_dev, int val);
-extern void mca_device_set_name(struct mca_device *mca_dev, const char *name);
-static inline char *mca_device_get_name(struct mca_device *mca_dev)
-{
-        return mca_dev ? mca_dev->name : NULL;
-}
-
-extern enum MCA_AdapterStatus mca_device_status(struct mca_device *mca_dev);
-
-extern struct bus_type mca_bus_type;
-
-extern int mca_register_driver(struct mca_driver *drv);
-extern int mca_register_driver_integrated(struct mca_driver *, int);
-extern void mca_unregister_driver(struct mca_driver *drv);
-
-/* WARNING: only called by the boot time device setup */
-extern int mca_register_device(int bus, struct mca_device *mca_dev);
-
-#ifdef CONFIG_MCA_PROC_FS
-extern void mca_do_proc_init(void);
-extern void mca_set_adapter_procfn(int slot, MCA_ProcFn, void* dev);
-#else
-static inline void mca_do_proc_init(void)
-{
-}
-
-static inline void mca_set_adapter_procfn(int slot, MCA_ProcFn fn, void* dev)
-{
-}
-#endif
-
-#endif /* _LINUX_MCA_H */
diff --git a/include/linux/mdio-mux.h b/include/linux/mdio-mux.h
new file mode 100644
index 000000000000..a243dbba8659
--- /dev/null
+++ b/include/linux/mdio-mux.h
@@ -0,0 +1,21 @@
+/*
+ * MDIO bus multiplexer framwork.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2011, 2012 Cavium, Inc.
+ */
+#ifndef __LINUX_MDIO_MUX_H
+#define __LINUX_MDIO_MUX_H
+#include <linux/device.h>
+
+int mdio_mux_init(struct device *dev,
+                  int (*switch_fn) (int cur, int desired, void *data),
+                  void **mux_handle,
+                  void *data);
+
+void mdio_mux_uninit(void *mux_handle);
+
+#endif /* __LINUX_MDIO_MUX_H */
diff --git a/include/linux/mei.h b/include/linux/mei.h
new file mode 100644
index 000000000000..bc0d8b69c49e
--- /dev/null
+++ b/include/linux/mei.h
@@ -0,0 +1,110 @@
+/******************************************************************************
+ * Intel Management Engine Interface (Intel MEI) Linux driver
+ * Intel MEI Interface Header
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License 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 Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ *      Intel Corporation.
+ *      linux-mei@linux.intel.com
+ *      http://www.intel.com
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *****************************************************************************/
+
+#ifndef _LINUX_MEI_H
+#define _LINUX_MEI_H
+
+#include <linux/uuid.h>
+
+/*
+ * This IOCTL is used to associate the current file descriptor with a
+ * FW Client (given by UUID). This opens a communication channel
+ * between a host client and a FW client. From this point every read and write
+ * will communicate with the associated FW client.
+ * Only in close() (file_operation release()) the communication between
+ * the clients is disconnected
+ *
+ * The IOCTL argument is a struct with a union that contains
+ * the input parameter and the output parameter for this IOCTL.
+ *
+ * The input parameter is UUID of the FW Client.
+ * The output parameter is the properties of the FW client
+ * (FW protocol version and max message size).
+ *
+ */
+#define IOCTL_MEI_CONNECT_CLIENT \
+        _IOWR('H' , 0x01, struct mei_connect_client_data)
+
+/*
+ * Intel MEI client information struct
+ */
+struct mei_client {
+        __u32 max_msg_length;
+        __u8 protocol_version;
+        __u8 reserved[3];
+};
+
+/*
+ * IOCTL Connect Client Data structure
+ */
+struct mei_connect_client_data {
+        union {
+                uuid_le in_client_uuid;
+                struct mei_client out_client_properties;
+        };
+};
+
+#endif /* _LINUX_MEI_H  */
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index f94efd2f6c27..83e7ba90d6e5 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -63,12 +63,7 @@ extern int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm,
                                         gfp_t gfp_mask);
 
 struct lruvec *mem_cgroup_zone_lruvec(struct zone *, struct mem_cgroup *);
-struct lruvec *mem_cgroup_lru_add_list(struct zone *, struct page *,
-                                       enum lru_list);
-void mem_cgroup_lru_del_list(struct page *, enum lru_list);
-void mem_cgroup_lru_del(struct page *);
-struct lruvec *mem_cgroup_lru_move_lists(struct zone *, struct page *,
-                                         enum lru_list, enum lru_list);
+struct lruvec *mem_cgroup_page_lruvec(struct page *, struct zone *);
 
 /* For coalescing uncharge for reducing memcg' overhead*/
 extern void mem_cgroup_uncharge_start(void);
@@ -79,6 +74,8 @@ extern void mem_cgroup_uncharge_cache_page(struct page *page);
 
 extern void mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,
                                      int order);
+bool __mem_cgroup_same_or_subtree(const struct mem_cgroup *root_memcg,
+                                  struct mem_cgroup *memcg);
 int task_in_mem_cgroup(struct task_struct *task, const struct mem_cgroup *memcg);
 
 extern struct mem_cgroup *try_get_mem_cgroup_from_page(struct page *page);
@@ -92,10 +89,13 @@ static inline
 int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
 {
         struct mem_cgroup *memcg;
+        int match;
+
         rcu_read_lock();
         memcg = mem_cgroup_from_task(rcu_dereference((mm)->owner));
+        match = __mem_cgroup_same_or_subtree(cgroup, memcg);
         rcu_read_unlock();
-        return cgroup == memcg;
+        return match;
 }
 
 extern struct cgroup_subsys_state *mem_cgroup_css(struct mem_cgroup *memcg);
@@ -114,17 +114,11 @@ void mem_cgroup_iter_break(struct mem_cgroup *, struct mem_cgroup *);
 /*
  * For memory reclaim.
  */
-int mem_cgroup_inactive_anon_is_low(struct mem_cgroup *memcg,
-                                    struct zone *zone);
-int mem_cgroup_inactive_file_is_low(struct mem_cgroup *memcg,
-                                    struct zone *zone);
+int mem_cgroup_inactive_anon_is_low(struct lruvec *lruvec);
+int mem_cgroup_inactive_file_is_low(struct lruvec *lruvec);
 int mem_cgroup_select_victim_node(struct mem_cgroup *memcg);
-unsigned long mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg,
-                                        int nid, int zid, unsigned int lrumask);
-struct zone_reclaim_stat *mem_cgroup_get_reclaim_stat(struct mem_cgroup *memcg,
-                                                      struct zone *zone);
-struct zone_reclaim_stat*
-mem_cgroup_get_reclaim_stat_from_page(struct page *page);
+unsigned long mem_cgroup_get_lru_size(struct lruvec *lruvec, enum lru_list);
+void mem_cgroup_update_lru_size(struct lruvec *, enum lru_list, int);
 extern void mem_cgroup_print_oom_info(struct mem_cgroup *memcg,
                                         struct task_struct *p);
 extern void mem_cgroup_replace_page_cache(struct page *oldpage,
@@ -251,25 +245,8 @@ static inline struct lruvec *mem_cgroup_zone_lruvec(struct zone *zone,
         return &zone->lruvec;
 }
 
-static inline struct lruvec *mem_cgroup_lru_add_list(struct zone *zone,
-                                                     struct page *page,
-                                                     enum lru_list lru)
-{
-        return &zone->lruvec;
-}
-
-static inline void mem_cgroup_lru_del_list(struct page *page, enum lru_list lru)
-{
-}
-
-static inline void mem_cgroup_lru_del(struct page *page)
-{
-}
-
-static inline struct lruvec *mem_cgroup_lru_move_lists(struct zone *zone,
-                                                       struct page *page,
-                                                       enum lru_list from,
-                                                       enum lru_list to)
+static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page,
+                                                    struct zone *zone)
 {
         return &zone->lruvec;
 }
@@ -333,35 +310,27 @@ static inline bool mem_cgroup_disabled(void)
 }
 
 static inline int
-mem_cgroup_inactive_anon_is_low(struct mem_cgroup *memcg, struct zone *zone)
+mem_cgroup_inactive_anon_is_low(struct lruvec *lruvec)
 {
         return 1;
 }
 
 static inline int
-mem_cgroup_inactive_file_is_low(struct mem_cgroup *memcg, struct zone *zone)
+mem_cgroup_inactive_file_is_low(struct lruvec *lruvec)
 {
         return 1;
 }
 
 static inline unsigned long
-mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg, int nid, int zid,
-                                unsigned int lru_mask)
+mem_cgroup_get_lru_size(struct lruvec *lruvec, enum lru_list lru)
 {
         return 0;
 }
 
-
-static inline struct zone_reclaim_stat*
-mem_cgroup_get_reclaim_stat(struct mem_cgroup *memcg, struct zone *zone)
-{
-        return NULL;
-}
-
-static inline struct zone_reclaim_stat*
-mem_cgroup_get_reclaim_stat_from_page(struct page *page)
+static inline void
+mem_cgroup_update_lru_size(struct lruvec *lruvec, enum lru_list lru,
+                              int increment)
 {
-        return NULL;
 }
 
 static inline void
diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
index 7c727a90d70d..4aa42732e47f 100644
--- a/include/linux/mempolicy.h
+++ b/include/linux/mempolicy.h
@@ -225,8 +225,8 @@ static inline void check_highest_zone(enum zone_type k)
                 policy_zone = k;
 }
 
-int do_migrate_pages(struct mm_struct *mm,
-        const nodemask_t *from_nodes, const nodemask_t *to_nodes, int flags);
+int do_migrate_pages(struct mm_struct *mm, const nodemask_t *from,
+                     const nodemask_t *to, int flags);
 
 
 #ifdef CONFIG_TMPFS
@@ -354,9 +354,8 @@ static inline bool mempolicy_nodemask_intersects(struct task_struct *tsk,
         return false;
 }
 
-static inline int do_migrate_pages(struct mm_struct *mm,
-                        const nodemask_t *from_nodes,
-                        const nodemask_t *to_nodes, int flags)
+static inline int do_migrate_pages(struct mm_struct *mm, const nodemask_t *from,
+                                   const nodemask_t *to, int flags)
 {
         return 0;
 }
diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
index ee96cd51d8b2..1318ca622633 100644
--- a/include/linux/mfd/abx500.h
+++ b/include/linux/mfd/abx500.h
@@ -6,7 +6,7 @@
  *
  * ABX500 core access functions.
  * The abx500 interface is used for the Analog Baseband chip
- * ab3100, ab5500, and ab8500.
+ * ab3100 and ab8500.
  *
  * Author: Mattias Wallin <mattias.wallin@stericsson.com>
  * Author: Mattias Nilsson <mattias.i.nilsson@stericsson.com>
@@ -30,9 +30,6 @@ struct device;
 #define AB3100_P1G      0xc6
 #define AB3100_R2A      0xc7
 #define AB3100_R2B      0xc8
-#define AB5500_1_0      0x20
-#define AB5500_1_1      0x21
-#define AB5500_2_0      0x24
 
 /*
  * AB3100, EVENTA1, A2 and A3 event register flags
diff --git a/include/linux/mfd/abx500/ab5500.h b/include/linux/mfd/abx500/ab5500.h
deleted file mode 100644
index 54f820ed73bb..000000000000
--- a/include/linux/mfd/abx500/ab5500.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson 2011
- *
- * License Terms: GNU General Public License v2
- */
-#ifndef MFD_AB5500_H
-#define MFD_AB5500_H
-
-struct device;
-
-enum ab5500_devid {
-        AB5500_DEVID_ADC,
-        AB5500_DEVID_LEDS,
-        AB5500_DEVID_POWER,
-        AB5500_DEVID_REGULATORS,
-        AB5500_DEVID_SIM,
-        AB5500_DEVID_RTC,
-        AB5500_DEVID_CHARGER,
-        AB5500_DEVID_FUELGAUGE,
-        AB5500_DEVID_VIBRATOR,
-        AB5500_DEVID_CODEC,
-        AB5500_DEVID_USB,
-        AB5500_DEVID_OTP,
-        AB5500_DEVID_VIDEO,
-        AB5500_DEVID_DBIECI,
-        AB5500_DEVID_ONSWA,
-        AB5500_NUM_DEVICES,
-};
-
-enum ab5500_banks {
-        AB5500_BANK_VIT_IO_I2C_CLK_TST_OTP = 0,
-        AB5500_BANK_VDDDIG_IO_I2C_CLK_TST = 1,
-        AB5500_BANK_VDENC = 2,
-        AB5500_BANK_SIM_USBSIM  = 3,
-        AB5500_BANK_LED = 4,
-        AB5500_BANK_ADC  = 5,
-        AB5500_BANK_RTC  = 6,
-        AB5500_BANK_STARTUP  = 7,
-        AB5500_BANK_DBI_ECI  = 8,
-        AB5500_BANK_CHG  = 9,
-        AB5500_BANK_FG_BATTCOM_ACC = 10,
-        AB5500_BANK_USB = 11,
-        AB5500_BANK_IT = 12,
-        AB5500_BANK_VIBRA = 13,
-        AB5500_BANK_AUDIO_HEADSETUSB = 14,
-        AB5500_NUM_BANKS = 15,
-};
-
-enum ab5500_banks_addr {
-        AB5500_ADDR_VIT_IO_I2C_CLK_TST_OTP = 0x4A,
-        AB5500_ADDR_VDDDIG_IO_I2C_CLK_TST = 0x4B,
-        AB5500_ADDR_VDENC = 0x06,
-        AB5500_ADDR_SIM_USBSIM  = 0x04,
-        AB5500_ADDR_LED = 0x10,
-        AB5500_ADDR_ADC  = 0x0A,
-        AB5500_ADDR_RTC  = 0x0F,
-        AB5500_ADDR_STARTUP  = 0x03,
-        AB5500_ADDR_DBI_ECI  = 0x07,
-        AB5500_ADDR_CHG  = 0x0B,
-        AB5500_ADDR_FG_BATTCOM_ACC = 0x0C,
-        AB5500_ADDR_USB = 0x05,
-        AB5500_ADDR_IT = 0x0E,
-        AB5500_ADDR_VIBRA = 0x02,
-        AB5500_ADDR_AUDIO_HEADSETUSB = 0x0D,
-};
-
-/*
- * Interrupt register offsets
- * Bank : 0x0E
- */
-#define AB5500_IT_SOURCE0_REG           0x20
-#define AB5500_IT_SOURCE1_REG           0x21
-#define AB5500_IT_SOURCE2_REG           0x22
-#define AB5500_IT_SOURCE3_REG           0x23
-#define AB5500_IT_SOURCE4_REG           0x24
-#define AB5500_IT_SOURCE5_REG           0x25
-#define AB5500_IT_SOURCE6_REG           0x26
-#define AB5500_IT_SOURCE7_REG           0x27
-#define AB5500_IT_SOURCE8_REG           0x28
-#define AB5500_IT_SOURCE9_REG           0x29
-#define AB5500_IT_SOURCE10_REG          0x2A
-#define AB5500_IT_SOURCE11_REG          0x2B
-#define AB5500_IT_SOURCE12_REG          0x2C
-#define AB5500_IT_SOURCE13_REG          0x2D
-#define AB5500_IT_SOURCE14_REG          0x2E
-#define AB5500_IT_SOURCE15_REG          0x2F
-#define AB5500_IT_SOURCE16_REG          0x30
-#define AB5500_IT_SOURCE17_REG          0x31
-#define AB5500_IT_SOURCE18_REG          0x32
-#define AB5500_IT_SOURCE19_REG          0x33
-#define AB5500_IT_SOURCE20_REG          0x34
-#define AB5500_IT_SOURCE21_REG          0x35
-#define AB5500_IT_SOURCE22_REG          0x36
-#define AB5500_IT_SOURCE23_REG          0x37
-
-#define AB5500_NUM_IRQ_REGS             23
-
-/**
- * struct ab5500
- * @access_mutex: lock out concurrent accesses to the AB registers
- * @dev: a pointer to the device struct for this chip driver
- * @ab5500_irq: the analog baseband irq
- * @irq_base: the platform configuration irq base for subdevices
- * @chip_name: name of this chip variant
- * @chip_id: 8 bit chip ID for this chip variant
- * @irq_lock: a lock to protect the mask
- * @abb_events: a local bit mask of the prcmu wakeup events
- * @event_mask: a local copy of the mask event registers
- * @last_event_mask: a copy of the last event_mask written to hardware
- * @startup_events: a copy of the first reading of the event registers
- * @startup_events_read: whether the first events have been read
- */
-struct ab5500 {
-        struct mutex access_mutex;
-        struct device *dev;
-        unsigned int ab5500_irq;
-        unsigned int irq_base;
-        char chip_name[32];
-        u8 chip_id;
-        struct mutex irq_lock;
-        u32 abb_events;
-        u8 mask[AB5500_NUM_IRQ_REGS];
-        u8 oldmask[AB5500_NUM_IRQ_REGS];
-        u8 startup_events[AB5500_NUM_IRQ_REGS];
-        bool startup_events_read;
-#ifdef CONFIG_DEBUG_FS
-        unsigned int debug_bank;
-        unsigned int debug_address;
-#endif
-};
-
-struct ab5500_platform_data {
-        struct {unsigned int base; unsigned int count; } irq;
-        void *dev_data[AB5500_NUM_DEVICES];
-        struct abx500_init_settings *init_settings;
-        unsigned int init_settings_sz;
-        bool pm_power_off;
-};
-
-#endif /* MFD_AB5500_H */
diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h
index fccc3002f271..91dd3ef63e99 100644
--- a/include/linux/mfd/abx500/ab8500.h
+++ b/include/linux/mfd/abx500/ab8500.h
@@ -7,6 +7,7 @@
 #ifndef MFD_AB8500_H
 #define MFD_AB8500_H
 
+#include <linux/atomic.h>
 #include <linux/mutex.h>
 
 struct device;
@@ -194,6 +195,14 @@ enum ab8500_version {
 #define AB9540_INT_GPIO52F              123
 #define AB9540_INT_GPIO53F              124
 #define AB9540_INT_GPIO54F              125 /* not 8505 */
+/* ab8500_irq_regoffset[16] -> IT[Source|Latch|Mask]25 */
+#define AB8505_INT_KEYSTUCK             128
+#define AB8505_INT_IKR                  129
+#define AB8505_INT_IKP                  130
+#define AB8505_INT_KP                   131
+#define AB8505_INT_KEYDEGLITCH          132
+#define AB8505_INT_MODPWRSTATUSF        134
+#define AB8505_INT_MODPWRSTATUSR        135
 
 /*
  * AB8500_AB9540_NR_IRQS is used when configuring the IRQ numbers for the
@@ -203,8 +212,8 @@ enum ab8500_version {
  * which is larger.
  */
 #define AB8500_NR_IRQS                  112
-#define AB8505_NR_IRQS                  128
-#define AB9540_NR_IRQS                  128
+#define AB8505_NR_IRQS                  136
+#define AB9540_NR_IRQS                  136
 /* This is set to the roof of any AB8500 chip variant IRQ counts */
 #define AB8500_MAX_NR_IRQS              AB9540_NR_IRQS
 
@@ -216,6 +225,7 @@ enum ab8500_version {
  * @dev: parent device
  * @lock: read/write operations lock
  * @irq_lock: genirq bus lock
+ * @transfer_ongoing: 0 if no transfer ongoing
  * @irq: irq line
  * @version: chip version id (e.g. ab8500 or ab9540)
  * @chip_id: chip revision id
@@ -234,7 +244,7 @@ struct ab8500 {
         struct device   *dev;
         struct mutex    lock;
         struct mutex    irq_lock;
-
+        atomic_t        transfer_ongoing;
         int             irq_base;
         int             irq;
         enum ab8500_version version;
@@ -280,6 +290,8 @@ extern int __devinit ab8500_init(struct ab8500 *ab8500,
                                  enum ab8500_version version);
 extern int __devexit ab8500_exit(struct ab8500 *ab8500);
 
+extern int ab8500_suspend(struct ab8500 *ab8500);
+
 static inline int is_ab8500(struct ab8500 *ab)
 {
         return ab->version == AB8500_VERSION_AB8500;
diff --git a/include/linux/mfd/anatop.h b/include/linux/mfd/anatop.h
index 22c1007d3ec5..7f92acf03d9e 100644
--- a/include/linux/mfd/anatop.h
+++ b/include/linux/mfd/anatop.h
@@ -34,7 +34,7 @@ struct anatop {
         spinlock_t reglock;
 };
 
-extern u32 anatop_get_bits(struct anatop *, u32, int, int);
-extern void anatop_set_bits(struct anatop *, u32, int, int, u32);
+extern u32 anatop_read_reg(struct anatop *, u32);
+extern void anatop_write_reg(struct anatop *, u32, u32, u32);
 
 #endif /*  __LINUX_MFD_ANATOP_H */
diff --git a/include/linux/mfd/asic3.h b/include/linux/mfd/asic3.h
index ed793b77a1c5..e1148d037e7b 100644
--- a/include/linux/mfd/asic3.h
+++ b/include/linux/mfd/asic3.h
@@ -31,6 +31,8 @@ struct asic3_platform_data {
 
         unsigned int gpio_base;
 
+        unsigned int clock_rate;
+
         struct asic3_led *leds;
 };
 
@@ -138,6 +140,7 @@ struct asic3_platform_data {
 #define ASIC3_GPIOC13_nPWAIT            ASIC3_CONFIG_GPIO(45, 1, 1, 0)
 #define ASIC3_GPIOC14_nPIOIS16          ASIC3_CONFIG_GPIO(46, 1, 1, 0)
 #define ASIC3_GPIOC15_nPIOR             ASIC3_CONFIG_GPIO(47, 1, 0, 0)
+#define ASIC3_GPIOD4_CF_nCD             ASIC3_CONFIG_GPIO(52, 1, 0, 0)
 #define ASIC3_GPIOD11_nCIOIS16          ASIC3_CONFIG_GPIO(59, 1, 0, 0)
 #define ASIC3_GPIOD12_nCWAIT            ASIC3_CONFIG_GPIO(60, 1, 0, 0)
 #define ASIC3_GPIOD15_nPIOW             ASIC3_CONFIG_GPIO(63, 1, 0, 0)
diff --git a/include/linux/mfd/da9052/da9052.h b/include/linux/mfd/da9052/da9052.h
index 7ffbd6e9e7fc..0507c4c21a7d 100644
--- a/include/linux/mfd/da9052/da9052.h
+++ b/include/linux/mfd/da9052/da9052.h
@@ -33,6 +33,18 @@
 
 #include <linux/mfd/da9052/reg.h>
 
+/* Common - HWMON Channel Definations */
+#define DA9052_ADC_VDDOUT       0
+#define DA9052_ADC_ICH          1
+#define DA9052_ADC_TBAT 2
+#define DA9052_ADC_VBAT 3
+#define DA9052_ADC_IN4          4
+#define DA9052_ADC_IN5          5
+#define DA9052_ADC_IN6          6
+#define DA9052_ADC_TSI          7
+#define DA9052_ADC_TJUNC        8
+#define DA9052_ADC_VBBAT        9
+
 #define DA9052_IRQ_DCIN 0
 #define DA9052_IRQ_VBUS 1
 #define DA9052_IRQ_DCINREM      2
@@ -79,12 +91,20 @@ struct da9052 {
         struct device *dev;
         struct regmap *regmap;
 
+        struct mutex auxadc_lock;
+        struct completion done;
+
         int irq_base;
+        struct regmap_irq_chip_data *irq_data;
         u8 chip_id;
 
         int chip_irq;
 };
 
+/* ADC API */
+int da9052_adc_manual_read(struct da9052 *da9052, unsigned char channel);
+int da9052_adc_read_temp(struct da9052 *da9052);
+
 /* Device I/O API */
 static inline int da9052_reg_read(struct da9052 *da9052, unsigned char reg)
 {
diff --git a/include/linux/mfd/db5500-prcmu.h b/include/linux/mfd/db5500-prcmu.h
deleted file mode 100644
index 5a049dfaf153..000000000000
--- a/include/linux/mfd/db5500-prcmu.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * License Terms: GNU General Public License v2
- *
- * U5500 PRCMU API.
- */
-#ifndef __MFD_DB5500_PRCMU_H
-#define __MFD_DB5500_PRCMU_H
-
-static inline int prcmu_resetout(u8 resoutn, u8 state)
-{
-        return 0;
-}
-
-static inline int db5500_prcmu_set_epod(u16 epod_id, u8 epod_state)
-{
-        return 0;
-}
-
-static inline int db5500_prcmu_request_clock(u8 clock, bool enable)
-{
-        return 0;
-}
-
-static inline int db5500_prcmu_set_power_state(u8 state, bool keep_ulp_clk,
-        bool keep_ap_pll)
-{
-        return 0;
-}
-
-static inline int db5500_prcmu_config_esram0_deep_sleep(u8 state)
-{
-        return 0;
-}
-
-static inline u16 db5500_prcmu_get_reset_code(void)
-{
-        return 0;
-}
-
-static inline bool db5500_prcmu_is_ac_wake_requested(void)
-{
-        return 0;
-}
-
-static inline int db5500_prcmu_set_arm_opp(u8 opp)
-{
-        return 0;
-}
-
-static inline int db5500_prcmu_get_arm_opp(void)
-{
-        return 0;
-}
-
-static inline void db5500_prcmu_config_abb_event_readout(u32 abb_events) {}
-
-static inline void db5500_prcmu_get_abb_event_buffer(void __iomem **buf) {}
-
-static inline void db5500_prcmu_system_reset(u16 reset_code) {}
-
-static inline void db5500_prcmu_enable_wakeups(u32 wakeups) {}
-
-#ifdef CONFIG_MFD_DB5500_PRCMU
-
-void db5500_prcmu_early_init(void);
-int db5500_prcmu_set_display_clocks(void);
-int db5500_prcmu_disable_dsipll(void);
-int db5500_prcmu_enable_dsipll(void);
-int db5500_prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size);
-int db5500_prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size);
-
-#else /* !CONFIG_UX500_SOC_DB5500 */
-
-static inline void db5500_prcmu_early_init(void) {}
-
-static inline int db5500_prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size)
-{
-        return -ENOSYS;
-}
-
-static inline int db5500_prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size)
-{
-        return -ENOSYS;
-}
-
-static inline int db5500_prcmu_set_display_clocks(void)
-{
-        return 0;
-}
-
-static inline int db5500_prcmu_disable_dsipll(void)
-{
-        return 0;
-}
-
-static inline int db5500_prcmu_enable_dsipll(void)
-{
-        return 0;
-}
-
-#endif /* CONFIG_MFD_DB5500_PRCMU */
-
-#endif /* __MFD_DB5500_PRCMU_H */
diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h
index d7674eb7305f..5a13f93d8f1c 100644
--- a/include/linux/mfd/dbx500-prcmu.h
+++ b/include/linux/mfd/dbx500-prcmu.h
@@ -55,17 +55,6 @@ enum prcmu_wakeup_index {
 #define NUM_EPOD_ID             8
 
 /*
- * DB5500 EPODs
- */
-#define DB5500_EPOD_ID_BASE 0x0100
-#define DB5500_EPOD_ID_SGA (DB5500_EPOD_ID_BASE + 0)
-#define DB5500_EPOD_ID_HVA (DB5500_EPOD_ID_BASE + 1)
-#define DB5500_EPOD_ID_SIA (DB5500_EPOD_ID_BASE + 2)
-#define DB5500_EPOD_ID_DISP (DB5500_EPOD_ID_BASE + 3)
-#define DB5500_EPOD_ID_ESRAM12 (DB5500_EPOD_ID_BASE + 6)
-#define DB5500_NUM_EPOD_ID 7
-
-/*
  * state definition for EPOD (power domain)
  * - EPOD_STATE_NO_CHANGE: The EPOD should remain unchanged
  * - EPOD_STATE_OFF: The EPOD is switched off
@@ -80,29 +69,6 @@ enum prcmu_wakeup_index {
 #define EPOD_STATE_ON_CLK_OFF   0x03
 #define EPOD_STATE_ON           0x04
 
-/* DB5500 CLKOUT IDs */
-enum {
-        DB5500_CLKOUT0 = 0,
-        DB5500_CLKOUT1,
-};
-
-/* DB5500 CLKOUTx sources */
-enum {
-        DB5500_CLKOUT_REF_CLK_SEL0,
-        DB5500_CLKOUT_RTC_CLK0_SEL0,
-        DB5500_CLKOUT_ULP_CLK_SEL0,
-        DB5500_CLKOUT_STATIC0,
-        DB5500_CLKOUT_REFCLK,
-        DB5500_CLKOUT_ULPCLK,
-        DB5500_CLKOUT_ARMCLK,
-        DB5500_CLKOUT_SYSACC0CLK,
-        DB5500_CLKOUT_SOC0PLLCLK,
-        DB5500_CLKOUT_SOC1PLLCLK,
-        DB5500_CLKOUT_DDRPLLCLK,
-        DB5500_CLKOUT_TVCLK,
-        DB5500_CLKOUT_IRDACLK,
-};
-
 /*
  * CLKOUT sources
  */
@@ -248,101 +214,66 @@ enum ddr_pwrst {
 };
 
 #include <linux/mfd/db8500-prcmu.h>
-#include <linux/mfd/db5500-prcmu.h>
 
-#if defined(CONFIG_UX500_SOC_DB8500) || defined(CONFIG_UX500_SOC_DB5500)
+#if defined(CONFIG_UX500_SOC_DB8500)
 
 #include <mach/id.h>
 
 static inline void __init prcmu_early_init(void)
 {
-        if (cpu_is_u5500())
-                return db5500_prcmu_early_init();
-        else
-                return db8500_prcmu_early_init();
+        return db8500_prcmu_early_init();
 }
 
 static inline int prcmu_set_power_state(u8 state, bool keep_ulp_clk,
                 bool keep_ap_pll)
 {
-        if (cpu_is_u5500())
-                return db5500_prcmu_set_power_state(state, keep_ulp_clk,
-                        keep_ap_pll);
-        else
-                return db8500_prcmu_set_power_state(state, keep_ulp_clk,
-                        keep_ap_pll);
+        return db8500_prcmu_set_power_state(state, keep_ulp_clk,
+                keep_ap_pll);
 }
 
 static inline u8 prcmu_get_power_state_result(void)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_get_power_state_result();
+        return db8500_prcmu_get_power_state_result();
 }
 
 static inline int prcmu_gic_decouple(void)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_gic_decouple();
+        return db8500_prcmu_gic_decouple();
 }
 
 static inline int prcmu_gic_recouple(void)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_gic_recouple();
+        return db8500_prcmu_gic_recouple();
 }
 
 static inline bool prcmu_gic_pending_irq(void)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_gic_pending_irq();
+        return db8500_prcmu_gic_pending_irq();
 }
 
 static inline bool prcmu_is_cpu_in_wfi(int cpu)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_is_cpu_in_wfi(cpu);
+        return db8500_prcmu_is_cpu_in_wfi(cpu);
 }
 
 static inline int prcmu_copy_gic_settings(void)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_copy_gic_settings();
+        return db8500_prcmu_copy_gic_settings();
 }
 
 static inline bool prcmu_pending_irq(void)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_pending_irq();
+        return db8500_prcmu_pending_irq();
 }
 
 static inline int prcmu_set_epod(u16 epod_id, u8 epod_state)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_set_epod(epod_id, epod_state);
+        return db8500_prcmu_set_epod(epod_id, epod_state);
 }
 
 static inline void prcmu_enable_wakeups(u32 wakeups)
 {
-        if (cpu_is_u5500())
-                db5500_prcmu_enable_wakeups(wakeups);
-        else
-                db8500_prcmu_enable_wakeups(wakeups);
+        db8500_prcmu_enable_wakeups(wakeups);
 }
 
 static inline void prcmu_disable_wakeups(void)
@@ -352,18 +283,12 @@ static inline void prcmu_disable_wakeups(void)
 
 static inline void prcmu_config_abb_event_readout(u32 abb_events)
 {
-        if (cpu_is_u5500())
-                db5500_prcmu_config_abb_event_readout(abb_events);
-        else
-                db8500_prcmu_config_abb_event_readout(abb_events);
+        db8500_prcmu_config_abb_event_readout(abb_events);
 }
 
 static inline void prcmu_get_abb_event_buffer(void __iomem **buf)
 {
-        if (cpu_is_u5500())
-                db5500_prcmu_get_abb_event_buffer(buf);
-        else
-                db8500_prcmu_get_abb_event_buffer(buf);
+        db8500_prcmu_get_abb_event_buffer(buf);
 }
 
 int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size);
@@ -374,10 +299,7 @@ int prcmu_config_clkout(u8 clkout, u8 source, u8 div);
 
 static inline int prcmu_request_clock(u8 clock, bool enable)
 {
-        if (cpu_is_u5500())
-                return db5500_prcmu_request_clock(clock, enable);
-        else
-                return db8500_prcmu_request_clock(clock, enable);
+        return db8500_prcmu_request_clock(clock, enable);
 }
 
 unsigned long prcmu_clock_rate(u8 clock);
@@ -386,211 +308,133 @@ int prcmu_set_clock_rate(u8 clock, unsigned long rate);
 
 static inline int prcmu_set_ddr_opp(u8 opp)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_set_ddr_opp(opp);
+        return db8500_prcmu_set_ddr_opp(opp);
 }
 static inline int prcmu_get_ddr_opp(void)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_get_ddr_opp();
+        return db8500_prcmu_get_ddr_opp();
 }
 
 static inline int prcmu_set_arm_opp(u8 opp)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_set_arm_opp(opp);
+        return db8500_prcmu_set_arm_opp(opp);
 }
 
 static inline int prcmu_get_arm_opp(void)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_get_arm_opp();
+        return db8500_prcmu_get_arm_opp();
 }
 
 static inline int prcmu_set_ape_opp(u8 opp)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_set_ape_opp(opp);
+        return db8500_prcmu_set_ape_opp(opp);
 }
 
 static inline int prcmu_get_ape_opp(void)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_get_ape_opp();
+        return db8500_prcmu_get_ape_opp();
 }
 
 static inline void prcmu_system_reset(u16 reset_code)
 {
-        if (cpu_is_u5500())
-                return db5500_prcmu_system_reset(reset_code);
-        else
-                return db8500_prcmu_system_reset(reset_code);
+        return db8500_prcmu_system_reset(reset_code);
 }
 
 static inline u16 prcmu_get_reset_code(void)
 {
-        if (cpu_is_u5500())
-                return db5500_prcmu_get_reset_code();
-        else
-                return db8500_prcmu_get_reset_code();
+        return db8500_prcmu_get_reset_code();
 }
 
 void prcmu_ac_wake_req(void);
 void prcmu_ac_sleep_req(void);
 static inline void prcmu_modem_reset(void)
 {
-        if (cpu_is_u5500())
-                return;
-        else
-                return db8500_prcmu_modem_reset();
+        return db8500_prcmu_modem_reset();
 }
 
 static inline bool prcmu_is_ac_wake_requested(void)
 {
-        if (cpu_is_u5500())
-                return db5500_prcmu_is_ac_wake_requested();
-        else
-                return db8500_prcmu_is_ac_wake_requested();
+        return db8500_prcmu_is_ac_wake_requested();
 }
 
 static inline int prcmu_set_display_clocks(void)
 {
-        if (cpu_is_u5500())
-                return db5500_prcmu_set_display_clocks();
-        else
-                return db8500_prcmu_set_display_clocks();
+        return db8500_prcmu_set_display_clocks();
 }
 
 static inline int prcmu_disable_dsipll(void)
 {
-        if (cpu_is_u5500())
-                return db5500_prcmu_disable_dsipll();
-        else
-                return db8500_prcmu_disable_dsipll();
+        return db8500_prcmu_disable_dsipll();
 }
 
 static inline int prcmu_enable_dsipll(void)
 {
-        if (cpu_is_u5500())
-                return db5500_prcmu_enable_dsipll();
-        else
-                return db8500_prcmu_enable_dsipll();
+        return db8500_prcmu_enable_dsipll();
 }
 
 static inline int prcmu_config_esram0_deep_sleep(u8 state)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_config_esram0_deep_sleep(state);
+        return db8500_prcmu_config_esram0_deep_sleep(state);
 }
 
 static inline int prcmu_config_hotdog(u8 threshold)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_config_hotdog(threshold);
+        return db8500_prcmu_config_hotdog(threshold);
 }
 
 static inline int prcmu_config_hotmon(u8 low, u8 high)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_config_hotmon(low, high);
+        return db8500_prcmu_config_hotmon(low, high);
 }
 
 static inline int prcmu_start_temp_sense(u16 cycles32k)
 {
-        if (cpu_is_u5500())
-                return  -EINVAL;
-        else
-                return  db8500_prcmu_start_temp_sense(cycles32k);
+        return  db8500_prcmu_start_temp_sense(cycles32k);
 }
 
 static inline int prcmu_stop_temp_sense(void)
 {
-        if (cpu_is_u5500())
-                return  -EINVAL;
-        else
-                return  db8500_prcmu_stop_temp_sense();
+        return  db8500_prcmu_stop_temp_sense();
 }
 
 static inline u32 prcmu_read(unsigned int reg)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_read(reg);
+        return db8500_prcmu_read(reg);
 }
 
 static inline void prcmu_write(unsigned int reg, u32 value)
 {
-        if (cpu_is_u5500())
-                return;
-        else
-                db8500_prcmu_write(reg, value);
+        db8500_prcmu_write(reg, value);
 }
 
 static inline void prcmu_write_masked(unsigned int reg, u32 mask, u32 value)
 {
-        if (cpu_is_u5500())
-                return;
-        else
-                db8500_prcmu_write_masked(reg, mask, value);
+        db8500_prcmu_write_masked(reg, mask, value);
 }
 
 static inline int prcmu_enable_a9wdog(u8 id)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_enable_a9wdog(id);
+        return db8500_prcmu_enable_a9wdog(id);
 }
 
 static inline int prcmu_disable_a9wdog(u8 id)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_disable_a9wdog(id);
+        return db8500_prcmu_disable_a9wdog(id);
 }
 
 static inline int prcmu_kick_a9wdog(u8 id)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_kick_a9wdog(id);
+        return db8500_prcmu_kick_a9wdog(id);
 }
 
 static inline int prcmu_load_a9wdog(u8 id, u32 timeout)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_load_a9wdog(id, timeout);
+        return db8500_prcmu_load_a9wdog(id, timeout);
 }
 
 static inline int prcmu_config_a9wdog(u8 num, bool sleep_auto_off)
 {
-        if (cpu_is_u5500())
-                return -EINVAL;
-        else
-                return db8500_prcmu_config_a9wdog(num, sleep_auto_off);
+        return db8500_prcmu_config_a9wdog(num, sleep_auto_off);
 }
 #else
 
@@ -768,7 +612,7 @@ static inline void prcmu_clear(unsigned int reg, u32 bits)
         prcmu_write_masked(reg, bits, 0);
 }
 
-#if defined(CONFIG_UX500_SOC_DB8500) || defined(CONFIG_UX500_SOC_DB5500)
+#if defined(CONFIG_UX500_SOC_DB8500)
 
 /**
  * prcmu_enable_spi2 - Enables pin muxing for SPI2 on OtherAlternateC1.
diff --git a/include/linux/mfd/lm3533.h b/include/linux/mfd/lm3533.h
new file mode 100644
index 000000000000..594bc591f256
--- /dev/null
+++ b/include/linux/mfd/lm3533.h
@@ -0,0 +1,104 @@
+/*
+ * lm3533.h -- LM3533 interface
+ *
+ * Copyright (C) 2011-2012 Texas Instruments
+ *
+ * Author: Johan Hovold <jhovold@gmail.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 __LINUX_MFD_LM3533_H
+#define __LINUX_MFD_LM3533_H
+
+#define LM3533_ATTR_RO(_name) \
+        DEVICE_ATTR(_name, S_IRUGO, show_##_name, NULL)
+#define LM3533_ATTR_RW(_name) \
+        DEVICE_ATTR(_name, S_IRUGO | S_IWUSR , show_##_name, store_##_name)
+
+struct device;
+struct regmap;
+
+struct lm3533 {
+        struct device *dev;
+
+        struct regmap *regmap;
+
+        int gpio_hwen;
+        int irq;
+
+        unsigned have_als:1;
+        unsigned have_backlights:1;
+        unsigned have_leds:1;
+};
+
+struct lm3533_ctrlbank {
+        struct lm3533 *lm3533;
+        struct device *dev;
+        int id;
+};
+
+struct lm3533_als_platform_data {
+        unsigned pwm_mode:1;            /* PWM input mode (default analog) */
+        u8 r_select;                    /* 1 - 127 (ignored in PWM-mode) */
+};
+
+struct lm3533_bl_platform_data {
+        char *name;
+        u16 max_current;                /* 5000 - 29800 uA (800 uA step) */
+        u8 default_brightness;          /* 0 - 255 */
+        u8 pwm;                         /* 0 - 0x3f */
+};
+
+struct lm3533_led_platform_data {
+        char *name;
+        const char *default_trigger;
+        u16 max_current;                /* 5000 - 29800 uA (800 uA step) */
+        u8 pwm;                         /* 0 - 0x3f */
+};
+
+enum lm3533_boost_freq {
+        LM3533_BOOST_FREQ_500KHZ,
+        LM3533_BOOST_FREQ_1000KHZ,
+};
+
+enum lm3533_boost_ovp {
+        LM3533_BOOST_OVP_16V,
+        LM3533_BOOST_OVP_24V,
+        LM3533_BOOST_OVP_32V,
+        LM3533_BOOST_OVP_40V,
+};
+
+struct lm3533_platform_data {
+        int gpio_hwen;
+
+        enum lm3533_boost_ovp boost_ovp;
+        enum lm3533_boost_freq boost_freq;
+
+        struct lm3533_als_platform_data *als;
+
+        struct lm3533_bl_platform_data *backlights;
+        int num_backlights;
+
+        struct lm3533_led_platform_data *leds;
+        int num_leds;
+};
+
+extern int lm3533_ctrlbank_enable(struct lm3533_ctrlbank *cb);
+extern int lm3533_ctrlbank_disable(struct lm3533_ctrlbank *cb);
+
+extern int lm3533_ctrlbank_set_brightness(struct lm3533_ctrlbank *cb, u8 val);
+extern int lm3533_ctrlbank_get_brightness(struct lm3533_ctrlbank *cb, u8 *val);
+extern int lm3533_ctrlbank_set_max_current(struct lm3533_ctrlbank *cb,
+                                                                u16 imax);
+extern int lm3533_ctrlbank_set_pwm(struct lm3533_ctrlbank *cb, u8 val);
+extern int lm3533_ctrlbank_get_pwm(struct lm3533_ctrlbank *cb, u8 *val);
+
+extern int lm3533_read(struct lm3533 *lm3533, u8 reg, u8 *val);
+extern int lm3533_write(struct lm3533 *lm3533, u8 reg, u8 val);
+extern int lm3533_update(struct lm3533 *lm3533, u8 reg, u8 val, u8 mask);
+
+#endif  /* __LINUX_MFD_LM3533_H */
diff --git a/include/linux/mfd/lpc_ich.h b/include/linux/mfd/lpc_ich.h
new file mode 100644
index 000000000000..fec5256c3f5d
--- /dev/null
+++ b/include/linux/mfd/lpc_ich.h
@@ -0,0 +1,48 @@
+/*
+ *  linux/drivers/mfd/lpc_ich.h
+ *
+ *  Copyright (c) 2012 Extreme Engineering Solution, Inc.
+ *  Author: Aaron Sierra <asierra@xes-inc.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License 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; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef LPC_ICH_H
+#define LPC_ICH_H
+
+/* Watchdog resources */
+#define ICH_RES_IO_TCO  0
+#define ICH_RES_IO_SMI  1
+#define ICH_RES_MEM_OFF 2
+#define ICH_RES_MEM_GCS 0
+
+/* GPIO resources */
+#define ICH_RES_GPIO    0
+#define ICH_RES_GPE0    1
+
+/* GPIO compatibility */
+#define ICH_I3100_GPIO          0x401
+#define ICH_V5_GPIO             0x501
+#define ICH_V6_GPIO             0x601
+#define ICH_V7_GPIO             0x701
+#define ICH_V9_GPIO             0x801
+#define ICH_V10CORP_GPIO        0xa01
+#define ICH_V10CONS_GPIO        0xa11
+
+struct lpc_ich_info {
+        char name[32];
+        unsigned int iTCO_version;
+        unsigned int gpio_version;
+};
+
+#endif
diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h
new file mode 100644
index 000000000000..68263c5fa53c
--- /dev/null
+++ b/include/linux/mfd/max77693-private.h
@@ -0,0 +1,227 @@
+/*
+ * max77693-private.h - Voltage regulator driver for the Maxim 77693
+ *
+ *  Copyright (C) 2012 Samsung Electrnoics
+ *  SangYoung Son <hello.son@samsung.com>
+ *
+ * This program is not provided / owned by Maxim Integrated Products.
+ *
+ * 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_MAX77693_PRIV_H
+#define __LINUX_MFD_MAX77693_PRIV_H
+
+#include <linux/i2c.h>
+
+#define MAX77693_NUM_IRQ_MUIC_REGS      3
+#define MAX77693_REG_INVALID            (0xff)
+
+/* Slave addr = 0xCC: PMIC, Charger, Flash LED */
+enum max77693_pmic_reg {
+        MAX77693_LED_REG_IFLASH1                        = 0x00,
+        MAX77693_LED_REG_IFLASH2                        = 0x01,
+        MAX77693_LED_REG_ITORCH                         = 0x02,
+        MAX77693_LED_REG_ITORCHTIMER                    = 0x03,
+        MAX77693_LED_REG_FLASH_TIMER                    = 0x04,
+        MAX77693_LED_REG_FLASH_EN                       = 0x05,
+        MAX77693_LED_REG_MAX_FLASH1                     = 0x06,
+        MAX77693_LED_REG_MAX_FLASH2                     = 0x07,
+        MAX77693_LED_REG_MAX_FLASH3                     = 0x08,
+        MAX77693_LED_REG_MAX_FLASH4                     = 0x09,
+        MAX77693_LED_REG_VOUT_CNTL                      = 0x0A,
+        MAX77693_LED_REG_VOUT_FLASH1                    = 0x0B,
+        MAX77693_LED_REG_VOUT_FLASH2                    = 0x0C,
+        MAX77693_LED_REG_FLASH_INT                      = 0x0E,
+        MAX77693_LED_REG_FLASH_INT_MASK                 = 0x0F,
+        MAX77693_LED_REG_FLASH_INT_STATUS               = 0x10,
+
+        MAX77693_PMIC_REG_PMIC_ID1                      = 0x20,
+        MAX77693_PMIC_REG_PMIC_ID2                      = 0x21,
+        MAX77693_PMIC_REG_INTSRC                        = 0x22,
+        MAX77693_PMIC_REG_INTSRC_MASK                   = 0x23,
+        MAX77693_PMIC_REG_TOPSYS_INT                    = 0x24,
+        MAX77693_PMIC_REG_TOPSYS_INT_MASK               = 0x26,
+        MAX77693_PMIC_REG_TOPSYS_STAT                   = 0x28,
+        MAX77693_PMIC_REG_MAINCTRL1                     = 0x2A,
+        MAX77693_PMIC_REG_LSCNFG                        = 0x2B,
+
+        MAX77693_CHG_REG_CHG_INT                        = 0xB0,
+        MAX77693_CHG_REG_CHG_INT_MASK                   = 0xB1,
+        MAX77693_CHG_REG_CHG_INT_OK                     = 0xB2,
+        MAX77693_CHG_REG_CHG_DETAILS_00                 = 0xB3,
+        MAX77693_CHG_REG_CHG_DETAILS_01                 = 0xB4,
+        MAX77693_CHG_REG_CHG_DETAILS_02                 = 0xB5,
+        MAX77693_CHG_REG_CHG_DETAILS_03                 = 0xB6,
+        MAX77693_CHG_REG_CHG_CNFG_00                    = 0xB7,
+        MAX77693_CHG_REG_CHG_CNFG_01                    = 0xB8,
+        MAX77693_CHG_REG_CHG_CNFG_02                    = 0xB9,
+        MAX77693_CHG_REG_CHG_CNFG_03                    = 0xBA,
+        MAX77693_CHG_REG_CHG_CNFG_04                    = 0xBB,
+        MAX77693_CHG_REG_CHG_CNFG_05                    = 0xBC,
+        MAX77693_CHG_REG_CHG_CNFG_06                    = 0xBD,
+        MAX77693_CHG_REG_CHG_CNFG_07                    = 0xBE,
+        MAX77693_CHG_REG_CHG_CNFG_08                    = 0xBF,
+        MAX77693_CHG_REG_CHG_CNFG_09                    = 0xC0,
+        MAX77693_CHG_REG_CHG_CNFG_10                    = 0xC1,
+        MAX77693_CHG_REG_CHG_CNFG_11                    = 0xC2,
+        MAX77693_CHG_REG_CHG_CNFG_12                    = 0xC3,
+        MAX77693_CHG_REG_CHG_CNFG_13                    = 0xC4,
+        MAX77693_CHG_REG_CHG_CNFG_14                    = 0xC5,
+        MAX77693_CHG_REG_SAFEOUT_CTRL                   = 0xC6,
+
+        MAX77693_PMIC_REG_END,
+};
+
+/* Slave addr = 0x4A: MUIC */
+enum max77693_muic_reg {
+        MAX77693_MUIC_REG_ID            = 0x00,
+        MAX77693_MUIC_REG_INT1          = 0x01,
+        MAX77693_MUIC_REG_INT2          = 0x02,
+        MAX77693_MUIC_REG_INT3          = 0x03,
+        MAX77693_MUIC_REG_STATUS1       = 0x04,
+        MAX77693_MUIC_REG_STATUS2       = 0x05,
+        MAX77693_MUIC_REG_STATUS3       = 0x06,
+        MAX77693_MUIC_REG_INTMASK1      = 0x07,
+        MAX77693_MUIC_REG_INTMASK2      = 0x08,
+        MAX77693_MUIC_REG_INTMASK3      = 0x09,
+        MAX77693_MUIC_REG_CDETCTRL1     = 0x0A,
+        MAX77693_MUIC_REG_CDETCTRL2     = 0x0B,
+        MAX77693_MUIC_REG_CTRL1         = 0x0C,
+        MAX77693_MUIC_REG_CTRL2         = 0x0D,
+        MAX77693_MUIC_REG_CTRL3         = 0x0E,
+
+        MAX77693_MUIC_REG_END,
+};
+
+/* Slave addr = 0x90: Haptic */
+enum max77693_haptic_reg {
+        MAX77693_HAPTIC_REG_STATUS              = 0x00,
+        MAX77693_HAPTIC_REG_CONFIG1             = 0x01,
+        MAX77693_HAPTIC_REG_CONFIG2             = 0x02,
+        MAX77693_HAPTIC_REG_CONFIG_CHNL         = 0x03,
+        MAX77693_HAPTIC_REG_CONFG_CYC1          = 0x04,
+        MAX77693_HAPTIC_REG_CONFG_CYC2          = 0x05,
+        MAX77693_HAPTIC_REG_CONFIG_PER1         = 0x06,
+        MAX77693_HAPTIC_REG_CONFIG_PER2         = 0x07,
+        MAX77693_HAPTIC_REG_CONFIG_PER3         = 0x08,
+        MAX77693_HAPTIC_REG_CONFIG_PER4         = 0x09,
+        MAX77693_HAPTIC_REG_CONFIG_DUTY1        = 0x0A,
+        MAX77693_HAPTIC_REG_CONFIG_DUTY2        = 0x0B,
+        MAX77693_HAPTIC_REG_CONFIG_PWM1         = 0x0C,
+        MAX77693_HAPTIC_REG_CONFIG_PWM2         = 0x0D,
+        MAX77693_HAPTIC_REG_CONFIG_PWM3         = 0x0E,
+        MAX77693_HAPTIC_REG_CONFIG_PWM4         = 0x0F,
+        MAX77693_HAPTIC_REG_REV                 = 0x10,
+
+        MAX77693_HAPTIC_REG_END,
+};
+
+enum max77693_irq_source {
+        LED_INT = 0,
+        TOPSYS_INT,
+        CHG_INT,
+        MUIC_INT1,
+        MUIC_INT2,
+        MUIC_INT3,
+
+        MAX77693_IRQ_GROUP_NR,
+};
+
+enum max77693_irq {
+        /* PMIC - FLASH */
+        MAX77693_LED_IRQ_FLED2_OPEN,
+        MAX77693_LED_IRQ_FLED2_SHORT,
+        MAX77693_LED_IRQ_FLED1_OPEN,
+        MAX77693_LED_IRQ_FLED1_SHORT,
+        MAX77693_LED_IRQ_MAX_FLASH,
+
+        /* PMIC - TOPSYS */
+        MAX77693_TOPSYS_IRQ_T120C_INT,
+        MAX77693_TOPSYS_IRQ_T140C_INT,
+        MAX77693_TOPSYS_IRQ_LOWSYS_INT,
+
+        /* PMIC - Charger */
+        MAX77693_CHG_IRQ_BYP_I,
+        MAX77693_CHG_IRQ_THM_I,
+        MAX77693_CHG_IRQ_BAT_I,
+        MAX77693_CHG_IRQ_CHG_I,
+        MAX77693_CHG_IRQ_CHGIN_I,
+
+        /* MUIC INT1 */
+        MAX77693_MUIC_IRQ_INT1_ADC,
+        MAX77693_MUIC_IRQ_INT1_ADC_LOW,
+        MAX77693_MUIC_IRQ_INT1_ADC_ERR,
+        MAX77693_MUIC_IRQ_INT1_ADC1K,
+
+        /* MUIC INT2 */
+        MAX77693_MUIC_IRQ_INT2_CHGTYP,
+        MAX77693_MUIC_IRQ_INT2_CHGDETREUN,
+        MAX77693_MUIC_IRQ_INT2_DCDTMR,
+        MAX77693_MUIC_IRQ_INT2_DXOVP,
+        MAX77693_MUIC_IRQ_INT2_VBVOLT,
+        MAX77693_MUIC_IRQ_INT2_VIDRM,
+
+        /* MUIC INT3 */
+        MAX77693_MUIC_IRQ_INT3_EOC,
+        MAX77693_MUIC_IRQ_INT3_CGMBC,
+        MAX77693_MUIC_IRQ_INT3_OVP,
+        MAX77693_MUIC_IRQ_INT3_MBCCHG_ERR,
+        MAX77693_MUIC_IRQ_INT3_CHG_ENABLED,
+        MAX77693_MUIC_IRQ_INT3_BAT_DET,
+
+        MAX77693_IRQ_NR,
+};
+
+struct max77693_dev {
+        struct device *dev;
+        struct i2c_client *i2c;         /* 0xCC , PMIC, Charger, Flash LED */
+        struct i2c_client *muic;        /* 0x4A , MUIC */
+        struct i2c_client *haptic;      /* 0x90 , Haptic */
+        struct mutex iolock;
+
+        int type;
+
+        struct regmap *regmap;
+        struct regmap *regmap_muic;
+        struct regmap *regmap_haptic;
+
+        struct irq_domain *irq_domain;
+
+        int irq;
+        int irq_gpio;
+        bool wakeup;
+        struct mutex irqlock;
+        int irq_masks_cur[MAX77693_IRQ_GROUP_NR];
+        int irq_masks_cache[MAX77693_IRQ_GROUP_NR];
+};
+
+enum max77693_types {
+        TYPE_MAX77693,
+};
+
+extern int max77693_read_reg(struct regmap *map, u8 reg, u8 *dest);
+extern int max77693_bulk_read(struct regmap *map, u8 reg, int count,
+                                u8 *buf);
+extern int max77693_write_reg(struct regmap *map, u8 reg, u8 value);
+extern int max77693_bulk_write(struct regmap *map, u8 reg, int count,
+                                u8 *buf);
+extern int max77693_update_reg(struct regmap *map, u8 reg, u8 val, u8 mask);
+
+extern int max77693_irq_init(struct max77693_dev *max77686);
+extern void max77693_irq_exit(struct max77693_dev *max77686);
+extern int max77693_irq_resume(struct max77693_dev *max77686);
+
+#endif /*  __LINUX_MFD_MAX77693_PRIV_H */
diff --git a/include/linux/mfd/max77693.h b/include/linux/mfd/max77693.h
new file mode 100644
index 000000000000..1d28ae90384e
--- /dev/null
+++ b/include/linux/mfd/max77693.h
@@ -0,0 +1,36 @@
+/*
+ * max77693.h - Driver for the Maxim 77693
+ *
+ *  Copyright (C) 2012 Samsung Electrnoics
+ *  SangYoung Son <hello.son@samsung.com>
+ *
+ * This program is not provided / owned by Maxim Integrated Products.
+ *
+ * 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 max8997.h
+ *
+ * MAX77693 has PMIC, Charger, Flash LED, Haptic, MUIC devices.
+ * The devices share the same I2C bus and included in
+ * this mfd driver.
+ */
+
+#ifndef __LINUX_MFD_MAX77693_H
+#define __LINUX_MFD_MAX77693_H
+
+struct max77693_platform_data {
+        int wakeup;
+};
+#endif  /* __LINUX_MFD_MAX77693_H */
diff --git a/include/linux/mfd/max8997.h b/include/linux/mfd/max8997.h
index 28726dd540f2..b40c08cd30bc 100644
--- a/include/linux/mfd/max8997.h
+++ b/include/linux/mfd/max8997.h
@@ -99,34 +99,11 @@ struct max8997_muic_reg_data {
 
 /**
  * struct max8997_muic_platform_data
- * @usb_callback: callback function for USB
- *                inform callee of USB type (HOST or DEVICE)
- *                and attached state(true or false)
- * @charger_callback: callback function for charger
- *                inform callee of charger_type
- *                and attached state(true or false)
- * @deskdock_callback: callback function for desk dock
- *                inform callee of attached state(true or false)
- * @cardock_callback: callback function for car dock
- *                inform callee of attached state(true or false)
- * @mhl_callback: callback function for MHL (Mobile High-definition Link)
- *                inform callee of attached state(true or false)
- * @uart_callback: callback function for JIG UART
- *                 inform callee of attached state(true or false)
  * @init_data: array of max8997_muic_reg_data
  *             used for initializing registers of MAX8997 MUIC device
  * @num_init_data: array size of init_data
  */
 struct max8997_muic_platform_data {
-        void (*usb_callback)(enum max8997_muic_usb_type usb_type,
-                bool attached);
-        void (*charger_callback)(bool attached,
-                enum max8997_muic_charger_type charger_type);
-        void (*deskdock_callback) (bool attached);
-        void (*cardock_callback) (bool attached);
-        void (*mhl_callback) (bool attached);
-        void (*uart_callback) (bool attached);
-
         struct max8997_muic_reg_data *init_data;
         int num_init_data;
 };
diff --git a/include/linux/mfd/mc13xxx.h b/include/linux/mfd/mc13xxx.h
index 10e038bac8dd..bf070755982e 100644
--- a/include/linux/mfd/mc13xxx.h
+++ b/include/linux/mfd/mc13xxx.h
@@ -170,6 +170,16 @@ struct mc13xxx_ts_platform_data {
         bool atox;
 };
 
+enum mc13783_ssi_port {
+        MC13783_SSI1_PORT,
+        MC13783_SSI2_PORT,
+};
+
+struct mc13xxx_codec_platform_data {
+        enum mc13783_ssi_port adc_ssi_port;
+        enum mc13783_ssi_port dac_ssi_port;
+};
+
 struct mc13xxx_platform_data {
 #define MC13XXX_USE_TOUCHSCREEN (1 << 0)
 #define MC13XXX_USE_CODEC       (1 << 1)
@@ -181,6 +191,7 @@ struct mc13xxx_platform_data {
         struct mc13xxx_leds_platform_data *leds;
         struct mc13xxx_buttons_platform_data *buttons;
         struct mc13xxx_ts_platform_data touch;
+        struct mc13xxx_codec_platform_data *codec;
 };
 
 #define MC13XXX_ADC_MODE_TS             1
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
new file mode 100644
index 000000000000..9cbc642d40ad
--- /dev/null
+++ b/include/linux/mfd/palmas.h
@@ -0,0 +1,2620 @@
+/*
+ * TI Palmas
+ *
+ * Copyright 2011 Texas Instruments Inc.
+ *
+ * Author: Graeme Gregory <gg@slimlogic.co.uk>
+ *
+ *  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 __LINUX_MFD_PALMAS_H
+#define __LINUX_MFD_PALMAS_H
+
+#include <linux/usb/otg.h>
+#include <linux/leds.h>
+#include <linux/regmap.h>
+#include <linux/regulator/driver.h>
+
+#define PALMAS_NUM_CLIENTS              3
+
+struct palmas_pmic;
+
+struct palmas {
+        struct device *dev;
+
+        struct i2c_client *i2c_clients[PALMAS_NUM_CLIENTS];
+        struct regmap *regmap[PALMAS_NUM_CLIENTS];
+
+        /* Stored chip id */
+        int id;
+
+        /* IRQ Data */
+        int irq;
+        u32 irq_mask;
+        struct mutex irq_lock;
+        struct regmap_irq_chip_data *irq_data;
+
+        /* Child Devices */
+        struct palmas_pmic *pmic;
+
+        /* GPIO MUXing */
+        u8 gpio_muxed;
+        u8 led_muxed;
+        u8 pwm_muxed;
+};
+
+struct palmas_reg_init {
+        /* warm_rest controls the voltage levels after a warm reset
+         *
+         * 0: reload default values from OTP on warm reset
+         * 1: maintain voltage from VSEL on warm reset
+         */
+        int warm_reset;
+
+        /* roof_floor controls whether the regulator uses the i2c style
+         * of DVS or uses the method where a GPIO or other control method is
+         * attached to the NSLEEP/ENABLE1/ENABLE2 pins
+         *
+         * For SMPS
+         *
+         * 0: i2c selection of voltage
+         * 1: pin selection of voltage.
+         *
+         * For LDO unused
+         */
+        int roof_floor;
+
+        /* sleep_mode is the mode loaded to MODE_SLEEP bits as defined in
+         * the data sheet.
+         *
+         * For SMPS
+         *
+         * 0: Off
+         * 1: AUTO
+         * 2: ECO
+         * 3: Forced PWM
+         *
+         * For LDO
+         *
+         * 0: Off
+         * 1: On
+         */
+        int mode_sleep;
+
+        /* tstep is the timestep loaded to the TSTEP register
+         *
+         * For SMPS
+         *
+         * 0: Jump (no slope control)
+         * 1: 10mV/us
+         * 2: 5mV/us
+         * 3: 2.5mV/us
+         *
+         * For LDO unused
+         */
+        int tstep;
+
+        /* voltage_sel is the bitfield loaded onto the SMPSX_VOLTAGE
+         * register. Set this is the default voltage set in OTP needs
+         * to be overridden.
+         */
+        u8 vsel;
+
+};
+
+struct palmas_pmic_platform_data {
+        /* An array of pointers to regulator init data indexed by regulator
+         * ID
+         */
+        struct regulator_init_data **reg_data;
+
+        /* An array of pointers to structures containing sleep mode and DVS
+         * configuration for regulators indexed by ID
+         */
+        struct palmas_reg_init **reg_init;
+
+        /* use LDO6 for vibrator control */
+        int ldo6_vibrator;
+
+
+};
+
+struct palmas_platform_data {
+        int gpio_base;
+
+        /* bit value to be loaded to the POWER_CTRL register */
+        u8 power_ctrl;
+
+        /*
+         * boolean to select if we want to configure muxing here
+         * then the two value to load into the registers if true
+         */
+        int mux_from_pdata;
+        u8 pad1, pad2;
+
+        struct palmas_pmic_platform_data *pmic_pdata;
+};
+
+/* Define the palmas IRQ numbers */
+enum palmas_irqs {
+        /* INT1 registers */
+        PALMAS_CHARG_DET_N_VBUS_OVV_IRQ,
+        PALMAS_PWRON_IRQ,
+        PALMAS_LONG_PRESS_KEY_IRQ,
+        PALMAS_RPWRON_IRQ,
+        PALMAS_PWRDOWN_IRQ,
+        PALMAS_HOTDIE_IRQ,
+        PALMAS_VSYS_MON_IRQ,
+        PALMAS_VBAT_MON_IRQ,
+        /* INT2 registers */
+        PALMAS_RTC_ALARM_IRQ,
+        PALMAS_RTC_TIMER_IRQ,
+        PALMAS_WDT_IRQ,
+        PALMAS_BATREMOVAL_IRQ,
+        PALMAS_RESET_IN_IRQ,
+        PALMAS_FBI_BB_IRQ,
+        PALMAS_SHORT_IRQ,
+        PALMAS_VAC_ACOK_IRQ,
+        /* INT3 registers */
+        PALMAS_GPADC_AUTO_0_IRQ,
+        PALMAS_GPADC_AUTO_1_IRQ,
+        PALMAS_GPADC_EOC_SW_IRQ,
+        PALMAS_GPADC_EOC_RT_IRQ,
+        PALMAS_ID_OTG_IRQ,
+        PALMAS_ID_IRQ,
+        PALMAS_VBUS_OTG_IRQ,
+        PALMAS_VBUS_IRQ,
+        /* INT4 registers */
+        PALMAS_GPIO_0_IRQ,
+        PALMAS_GPIO_1_IRQ,
+        PALMAS_GPIO_2_IRQ,
+        PALMAS_GPIO_3_IRQ,
+        PALMAS_GPIO_4_IRQ,
+        PALMAS_GPIO_5_IRQ,
+        PALMAS_GPIO_6_IRQ,
+        PALMAS_GPIO_7_IRQ,
+        /* Total Number IRQs */
+        PALMAS_NUM_IRQ,
+};
+
+enum palmas_regulators {
+        /* SMPS regulators */
+        PALMAS_REG_SMPS12,
+        PALMAS_REG_SMPS123,
+        PALMAS_REG_SMPS3,
+        PALMAS_REG_SMPS45,
+        PALMAS_REG_SMPS457,
+        PALMAS_REG_SMPS6,
+        PALMAS_REG_SMPS7,
+        PALMAS_REG_SMPS8,
+        PALMAS_REG_SMPS9,
+        PALMAS_REG_SMPS10,
+        /* LDO regulators */
+        PALMAS_REG_LDO1,
+        PALMAS_REG_LDO2,
+        PALMAS_REG_LDO3,
+        PALMAS_REG_LDO4,
+        PALMAS_REG_LDO5,
+        PALMAS_REG_LDO6,
+        PALMAS_REG_LDO7,
+        PALMAS_REG_LDO8,
+        PALMAS_REG_LDO9,
+        PALMAS_REG_LDOLN,
+        PALMAS_REG_LDOUSB,
+        /* Total number of regulators */
+        PALMAS_NUM_REGS,
+};
+
+struct palmas_pmic {
+        struct palmas *palmas;
+        struct device *dev;
+        struct regulator_desc desc[PALMAS_NUM_REGS];
+        struct regulator_dev *rdev[PALMAS_NUM_REGS];
+        struct mutex mutex;
+
+        int smps123;
+        int smps457;
+
+        int range[PALMAS_REG_SMPS10];
+};
+
+/* defines so we can store the mux settings */
+#define PALMAS_GPIO_0_MUXED                                     (1 << 0)
+#define PALMAS_GPIO_1_MUXED                                     (1 << 1)
+#define PALMAS_GPIO_2_MUXED                                     (1 << 2)
+#define PALMAS_GPIO_3_MUXED                                     (1 << 3)
+#define PALMAS_GPIO_4_MUXED                                     (1 << 4)
+#define PALMAS_GPIO_5_MUXED                                     (1 << 5)
+#define PALMAS_GPIO_6_MUXED                                     (1 << 6)
+#define PALMAS_GPIO_7_MUXED                                     (1 << 7)
+
+#define PALMAS_LED1_MUXED                                       (1 << 0)
+#define PALMAS_LED2_MUXED                                       (1 << 1)
+
+#define PALMAS_PWM1_MUXED                                       (1 << 0)
+#define PALMAS_PWM2_MUXED                                       (1 << 1)
+
+/* helper macro to get correct slave number */
+#define PALMAS_BASE_TO_SLAVE(x)         ((x >> 8) - 1)
+#define PALMAS_BASE_TO_REG(x, y)        ((x & 0xff) + y)
+
+/* Base addresses of IP blocks in Palmas */
+#define PALMAS_SMPS_DVS_BASE                                    0x20
+#define PALMAS_RTC_BASE                                         0x100
+#define PALMAS_VALIDITY_BASE                                    0x118
+#define PALMAS_SMPS_BASE                                        0x120
+#define PALMAS_LDO_BASE                                         0x150
+#define PALMAS_DVFS_BASE                                        0x180
+#define PALMAS_PMU_CONTROL_BASE                                 0x1A0
+#define PALMAS_RESOURCE_BASE                                    0x1D4
+#define PALMAS_PU_PD_OD_BASE                                    0x1F4
+#define PALMAS_LED_BASE                                         0x200
+#define PALMAS_INTERRUPT_BASE                                   0x210
+#define PALMAS_USB_OTG_BASE                                     0x250
+#define PALMAS_VIBRATOR_BASE                                    0x270
+#define PALMAS_GPIO_BASE                                        0x280
+#define PALMAS_USB_BASE                                         0x290
+#define PALMAS_GPADC_BASE                                       0x2C0
+#define PALMAS_TRIM_GPADC_BASE                                  0x3CD
+
+/* Registers for function RTC */
+#define PALMAS_SECONDS_REG                                      0x0
+#define PALMAS_MINUTES_REG                                      0x1
+#define PALMAS_HOURS_REG                                        0x2
+#define PALMAS_DAYS_REG                                         0x3
+#define PALMAS_MONTHS_REG                                       0x4
+#define PALMAS_YEARS_REG                                        0x5
+#define PALMAS_WEEKS_REG                                        0x6
+#define PALMAS_ALARM_SECONDS_REG                                0x8
+#define PALMAS_ALARM_MINUTES_REG                                0x9
+#define PALMAS_ALARM_HOURS_REG                                  0xA
+#define PALMAS_ALARM_DAYS_REG                                   0xB
+#define PALMAS_ALARM_MONTHS_REG                                 0xC
+#define PALMAS_ALARM_YEARS_REG                                  0xD
+#define PALMAS_RTC_CTRL_REG                                     0x10
+#define PALMAS_RTC_STATUS_REG                                   0x11
+#define PALMAS_RTC_INTERRUPTS_REG                               0x12
+#define PALMAS_RTC_COMP_LSB_REG                                 0x13
+#define PALMAS_RTC_COMP_MSB_REG                                 0x14
+#define PALMAS_RTC_RES_PROG_REG                                 0x15
+#define PALMAS_RTC_RESET_STATUS_REG                             0x16
+
+/* Bit definitions for SECONDS_REG */
+#define PALMAS_SECONDS_REG_SEC1_MASK                            0x70
+#define PALMAS_SECONDS_REG_SEC1_SHIFT                           4
+#define PALMAS_SECONDS_REG_SEC0_MASK                            0x0f
+#define PALMAS_SECONDS_REG_SEC0_SHIFT                           0
+
+/* Bit definitions for MINUTES_REG */
+#define PALMAS_MINUTES_REG_MIN1_MASK                            0x70
+#define PALMAS_MINUTES_REG_MIN1_SHIFT                           4
+#define PALMAS_MINUTES_REG_MIN0_MASK                            0x0f
+#define PALMAS_MINUTES_REG_MIN0_SHIFT                           0
+
+/* Bit definitions for HOURS_REG */
+#define PALMAS_HOURS_REG_PM_NAM                                 0x80
+#define PALMAS_HOURS_REG_PM_NAM_SHIFT                           7
+#define PALMAS_HOURS_REG_HOUR1_MASK                             0x30
+#define PALMAS_HOURS_REG_HOUR1_SHIFT                            4
+#define PALMAS_HOURS_REG_HOUR0_MASK                             0x0f
+#define PALMAS_HOURS_REG_HOUR0_SHIFT                            0
+
+/* Bit definitions for DAYS_REG */
+#define PALMAS_DAYS_REG_DAY1_MASK                               0x30
+#define PALMAS_DAYS_REG_DAY1_SHIFT                              4
+#define PALMAS_DAYS_REG_DAY0_MASK                               0x0f
+#define PALMAS_DAYS_REG_DAY0_SHIFT                              0
+
+/* Bit definitions for MONTHS_REG */
+#define PALMAS_MONTHS_REG_MONTH1                                0x10
+#define PALMAS_MONTHS_REG_MONTH1_SHIFT                          4
+#define PALMAS_MONTHS_REG_MONTH0_MASK                           0x0f
+#define PALMAS_MONTHS_REG_MONTH0_SHIFT                          0
+
+/* Bit definitions for YEARS_REG */
+#define PALMAS_YEARS_REG_YEAR1_MASK                             0xf0
+#define PALMAS_YEARS_REG_YEAR1_SHIFT                            4
+#define PALMAS_YEARS_REG_YEAR0_MASK                             0x0f
+#define PALMAS_YEARS_REG_YEAR0_SHIFT                            0
+
+/* Bit definitions for WEEKS_REG */
+#define PALMAS_WEEKS_REG_WEEK_MASK                              0x07
+#define PALMAS_WEEKS_REG_WEEK_SHIFT                             0
+
+/* Bit definitions for ALARM_SECONDS_REG */
+#define PALMAS_ALARM_SECONDS_REG_ALARM_SEC1_MASK                0x70
+#define PALMAS_ALARM_SECONDS_REG_ALARM_SEC1_SHIFT               4
+#define PALMAS_ALARM_SECONDS_REG_ALARM_SEC0_MASK                0x0f
+#define PALMAS_ALARM_SECONDS_REG_ALARM_SEC0_SHIFT               0
+
+/* Bit definitions for ALARM_MINUTES_REG */
+#define PALMAS_ALARM_MINUTES_REG_ALARM_MIN1_MASK                0x70
+#define PALMAS_ALARM_MINUTES_REG_ALARM_MIN1_SHIFT               4
+#define PALMAS_ALARM_MINUTES_REG_ALARM_MIN0_MASK                0x0f
+#define PALMAS_ALARM_MINUTES_REG_ALARM_MIN0_SHIFT               0
+
+/* Bit definitions for ALARM_HOURS_REG */
+#define PALMAS_ALARM_HOURS_REG_ALARM_PM_NAM                     0x80
+#define PALMAS_ALARM_HOURS_REG_ALARM_PM_NAM_SHIFT               7
+#define PALMAS_ALARM_HOURS_REG_ALARM_HOUR1_MASK                 0x30
+#define PALMAS_ALARM_HOURS_REG_ALARM_HOUR1_SHIFT                4
+#define PALMAS_ALARM_HOURS_REG_ALARM_HOUR0_MASK                 0x0f
+#define PALMAS_ALARM_HOURS_REG_ALARM_HOUR0_SHIFT                0
+
+/* Bit definitions for ALARM_DAYS_REG */
+#define PALMAS_ALARM_DAYS_REG_ALARM_DAY1_MASK                   0x30
+#define PALMAS_ALARM_DAYS_REG_ALARM_DAY1_SHIFT                  4
+#define PALMAS_ALARM_DAYS_REG_ALARM_DAY0_MASK                   0x0f
+#define PALMAS_ALARM_DAYS_REG_ALARM_DAY0_SHIFT                  0
+
+/* Bit definitions for ALARM_MONTHS_REG */
+#define PALMAS_ALARM_MONTHS_REG_ALARM_MONTH1                    0x10
+#define PALMAS_ALARM_MONTHS_REG_ALARM_MONTH1_SHIFT              4
+#define PALMAS_ALARM_MONTHS_REG_ALARM_MONTH0_MASK               0x0f
+#define PALMAS_ALARM_MONTHS_REG_ALARM_MONTH0_SHIFT              0
+
+/* Bit definitions for ALARM_YEARS_REG */
+#define PALMAS_ALARM_YEARS_REG_ALARM_YEAR1_MASK                 0xf0
+#define PALMAS_ALARM_YEARS_REG_ALARM_YEAR1_SHIFT                4
+#define PALMAS_ALARM_YEARS_REG_ALARM_YEAR0_MASK                 0x0f
+#define PALMAS_ALARM_YEARS_REG_ALARM_YEAR0_SHIFT                0
+
+/* Bit definitions for RTC_CTRL_REG */
+#define PALMAS_RTC_CTRL_REG_RTC_V_OPT                           0x80
+#define PALMAS_RTC_CTRL_REG_RTC_V_OPT_SHIFT                     7
+#define PALMAS_RTC_CTRL_REG_GET_TIME                            0x40
+#define PALMAS_RTC_CTRL_REG_GET_TIME_SHIFT                      6
+#define PALMAS_RTC_CTRL_REG_SET_32_COUNTER                      0x20
+#define PALMAS_RTC_CTRL_REG_SET_32_COUNTER_SHIFT                5
+#define PALMAS_RTC_CTRL_REG_TEST_MODE                           0x10
+#define PALMAS_RTC_CTRL_REG_TEST_MODE_SHIFT                     4
+#define PALMAS_RTC_CTRL_REG_MODE_12_24                          0x08
+#define PALMAS_RTC_CTRL_REG_MODE_12_24_SHIFT                    3
+#define PALMAS_RTC_CTRL_REG_AUTO_COMP                           0x04
+#define PALMAS_RTC_CTRL_REG_AUTO_COMP_SHIFT                     2
+#define PALMAS_RTC_CTRL_REG_ROUND_30S                           0x02
+#define PALMAS_RTC_CTRL_REG_ROUND_30S_SHIFT                     1
+#define PALMAS_RTC_CTRL_REG_STOP_RTC                            0x01
+#define PALMAS_RTC_CTRL_REG_STOP_RTC_SHIFT                      0
+
+/* Bit definitions for RTC_STATUS_REG */
+#define PALMAS_RTC_STATUS_REG_POWER_UP                          0x80
+#define PALMAS_RTC_STATUS_REG_POWER_UP_SHIFT                    7
+#define PALMAS_RTC_STATUS_REG_ALARM                             0x40
+#define PALMAS_RTC_STATUS_REG_ALARM_SHIFT                       6
+#define PALMAS_RTC_STATUS_REG_EVENT_1D                          0x20
+#define PALMAS_RTC_STATUS_REG_EVENT_1D_SHIFT                    5
+#define PALMAS_RTC_STATUS_REG_EVENT_1H                          0x10
+#define PALMAS_RTC_STATUS_REG_EVENT_1H_SHIFT                    4
+#define PALMAS_RTC_STATUS_REG_EVENT_1M                          0x08
+#define PALMAS_RTC_STATUS_REG_EVENT_1M_SHIFT                    3
+#define PALMAS_RTC_STATUS_REG_EVENT_1S                          0x04
+#define PALMAS_RTC_STATUS_REG_EVENT_1S_SHIFT                    2
+#define PALMAS_RTC_STATUS_REG_RUN                               0x02
+#define PALMAS_RTC_STATUS_REG_RUN_SHIFT                         1
+
+/* Bit definitions for RTC_INTERRUPTS_REG */
+#define PALMAS_RTC_INTERRUPTS_REG_IT_SLEEP_MASK_EN              0x10
+#define PALMAS_RTC_INTERRUPTS_REG_IT_SLEEP_MASK_EN_SHIFT        4
+#define PALMAS_RTC_INTERRUPTS_REG_IT_ALARM                      0x08
+#define PALMAS_RTC_INTERRUPTS_REG_IT_ALARM_SHIFT                3
+#define PALMAS_RTC_INTERRUPTS_REG_IT_TIMER                      0x04
+#define PALMAS_RTC_INTERRUPTS_REG_IT_TIMER_SHIFT                2
+#define PALMAS_RTC_INTERRUPTS_REG_EVERY_MASK                    0x03
+#define PALMAS_RTC_INTERRUPTS_REG_EVERY_SHIFT                   0
+
+/* Bit definitions for RTC_COMP_LSB_REG */
+#define PALMAS_RTC_COMP_LSB_REG_RTC_COMP_LSB_MASK               0xff
+#define PALMAS_RTC_COMP_LSB_REG_RTC_COMP_LSB_SHIFT              0
+
+/* Bit definitions for RTC_COMP_MSB_REG */
+#define PALMAS_RTC_COMP_MSB_REG_RTC_COMP_MSB_MASK               0xff
+#define PALMAS_RTC_COMP_MSB_REG_RTC_COMP_MSB_SHIFT              0
+
+/* Bit definitions for RTC_RES_PROG_REG */
+#define PALMAS_RTC_RES_PROG_REG_SW_RES_PROG_MASK                0x3f
+#define PALMAS_RTC_RES_PROG_REG_SW_RES_PROG_SHIFT               0
+
+/* Bit definitions for RTC_RESET_STATUS_REG */
+#define PALMAS_RTC_RESET_STATUS_REG_RESET_STATUS                0x01
+#define PALMAS_RTC_RESET_STATUS_REG_RESET_STATUS_SHIFT          0
+
+/* Registers for function BACKUP */
+#define PALMAS_BACKUP0                                          0x0
+#define PALMAS_BACKUP1                                          0x1
+#define PALMAS_BACKUP2                                          0x2
+#define PALMAS_BACKUP3                                          0x3
+#define PALMAS_BACKUP4                                          0x4
+#define PALMAS_BACKUP5                                          0x5
+#define PALMAS_BACKUP6                                          0x6
+#define PALMAS_BACKUP7                                          0x7
+
+/* Bit definitions for BACKUP0 */
+#define PALMAS_BACKUP0_BACKUP_MASK                              0xff
+#define PALMAS_BACKUP0_BACKUP_SHIFT                             0
+
+/* Bit definitions for BACKUP1 */
+#define PALMAS_BACKUP1_BACKUP_MASK                              0xff
+#define PALMAS_BACKUP1_BACKUP_SHIFT                             0
+
+/* Bit definitions for BACKUP2 */
+#define PALMAS_BACKUP2_BACKUP_MASK                              0xff
+#define PALMAS_BACKUP2_BACKUP_SHIFT                             0
+
+/* Bit definitions for BACKUP3 */
+#define PALMAS_BACKUP3_BACKUP_MASK                              0xff
+#define PALMAS_BACKUP3_BACKUP_SHIFT                             0
+
+/* Bit definitions for BACKUP4 */
+#define PALMAS_BACKUP4_BACKUP_MASK                              0xff
+#define PALMAS_BACKUP4_BACKUP_SHIFT                             0
+
+/* Bit definitions for BACKUP5 */
+#define PALMAS_BACKUP5_BACKUP_MASK                              0xff
+#define PALMAS_BACKUP5_BACKUP_SHIFT                             0
+
+/* Bit definitions for BACKUP6 */
+#define PALMAS_BACKUP6_BACKUP_MASK                              0xff
+#define PALMAS_BACKUP6_BACKUP_SHIFT                             0
+
+/* Bit definitions for BACKUP7 */
+#define PALMAS_BACKUP7_BACKUP_MASK                              0xff
+#define PALMAS_BACKUP7_BACKUP_SHIFT                             0
+
+/* Registers for function SMPS */
+#define PALMAS_SMPS12_CTRL                                      0x0
+#define PALMAS_SMPS12_TSTEP                                     0x1
+#define PALMAS_SMPS12_FORCE                                     0x2
+#define PALMAS_SMPS12_VOLTAGE                                   0x3
+#define PALMAS_SMPS3_CTRL                                       0x4
+#define PALMAS_SMPS3_VOLTAGE                                    0x7
+#define PALMAS_SMPS45_CTRL                                      0x8
+#define PALMAS_SMPS45_TSTEP                                     0x9
+#define PALMAS_SMPS45_FORCE                                     0xA
+#define PALMAS_SMPS45_VOLTAGE                                   0xB
+#define PALMAS_SMPS6_CTRL                                       0xC
+#define PALMAS_SMPS6_TSTEP                                      0xD
+#define PALMAS_SMPS6_FORCE                                      0xE
+#define PALMAS_SMPS6_VOLTAGE                                    0xF
+#define PALMAS_SMPS7_CTRL                                       0x10
+#define PALMAS_SMPS7_VOLTAGE                                    0x13
+#define PALMAS_SMPS8_CTRL                                       0x14
+#define PALMAS_SMPS8_TSTEP                                      0x15
+#define PALMAS_SMPS8_FORCE                                      0x16
+#define PALMAS_SMPS8_VOLTAGE                                    0x17
+#define PALMAS_SMPS9_CTRL                                       0x18
+#define PALMAS_SMPS9_VOLTAGE                                    0x1B
+#define PALMAS_SMPS10_CTRL                                      0x1C
+#define PALMAS_SMPS10_STATUS                                    0x1F
+#define PALMAS_SMPS_CTRL                                        0x24
+#define PALMAS_SMPS_PD_CTRL                                     0x25
+#define PALMAS_SMPS_DITHER_EN                                   0x26
+#define PALMAS_SMPS_THERMAL_EN                                  0x27
+#define PALMAS_SMPS_THERMAL_STATUS                              0x28
+#define PALMAS_SMPS_SHORT_STATUS                                0x29
+#define PALMAS_SMPS_NEGATIVE_CURRENT_LIMIT_EN                   0x2A
+#define PALMAS_SMPS_POWERGOOD_MASK1                             0x2B
+#define PALMAS_SMPS_POWERGOOD_MASK2                             0x2C
+
+/* Bit definitions for SMPS12_CTRL */
+#define PALMAS_SMPS12_CTRL_WR_S                                 0x80
+#define PALMAS_SMPS12_CTRL_WR_S_SHIFT                           7
+#define PALMAS_SMPS12_CTRL_ROOF_FLOOR_EN                        0x40
+#define PALMAS_SMPS12_CTRL_ROOF_FLOOR_EN_SHIFT                  6
+#define PALMAS_SMPS12_CTRL_STATUS_MASK                          0x30
+#define PALMAS_SMPS12_CTRL_STATUS_SHIFT                         4
+#define PALMAS_SMPS12_CTRL_MODE_SLEEP_MASK                      0x0c
+#define PALMAS_SMPS12_CTRL_MODE_SLEEP_SHIFT                     2
+#define PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK                     0x03
+#define PALMAS_SMPS12_CTRL_MODE_ACTIVE_SHIFT                    0
+
+/* Bit definitions for SMPS12_TSTEP */
+#define PALMAS_SMPS12_TSTEP_TSTEP_MASK                          0x03
+#define PALMAS_SMPS12_TSTEP_TSTEP_SHIFT                         0
+
+/* Bit definitions for SMPS12_FORCE */
+#define PALMAS_SMPS12_FORCE_CMD                                 0x80
+#define PALMAS_SMPS12_FORCE_CMD_SHIFT                           7
+#define PALMAS_SMPS12_FORCE_VSEL_MASK                           0x7f
+#define PALMAS_SMPS12_FORCE_VSEL_SHIFT                          0
+
+/* Bit definitions for SMPS12_VOLTAGE */
+#define PALMAS_SMPS12_VOLTAGE_RANGE                             0x80
+#define PALMAS_SMPS12_VOLTAGE_RANGE_SHIFT                       7
+#define PALMAS_SMPS12_VOLTAGE_VSEL_MASK                         0x7f
+#define PALMAS_SMPS12_VOLTAGE_VSEL_SHIFT                        0
+
+/* Bit definitions for SMPS3_CTRL */
+#define PALMAS_SMPS3_CTRL_WR_S                                  0x80
+#define PALMAS_SMPS3_CTRL_WR_S_SHIFT                            7
+#define PALMAS_SMPS3_CTRL_STATUS_MASK                           0x30
+#define PALMAS_SMPS3_CTRL_STATUS_SHIFT                          4
+#define PALMAS_SMPS3_CTRL_MODE_SLEEP_MASK                       0x0c
+#define PALMAS_SMPS3_CTRL_MODE_SLEEP_SHIFT                      2
+#define PALMAS_SMPS3_CTRL_MODE_ACTIVE_MASK                      0x03
+#define PALMAS_SMPS3_CTRL_MODE_ACTIVE_SHIFT                     0
+
+/* Bit definitions for SMPS3_VOLTAGE */
+#define PALMAS_SMPS3_VOLTAGE_RANGE                              0x80
+#define PALMAS_SMPS3_VOLTAGE_RANGE_SHIFT                        7
+#define PALMAS_SMPS3_VOLTAGE_VSEL_MASK                          0x7f
+#define PALMAS_SMPS3_VOLTAGE_VSEL_SHIFT                         0
+
+/* Bit definitions for SMPS45_CTRL */
+#define PALMAS_SMPS45_CTRL_WR_S                                 0x80
+#define PALMAS_SMPS45_CTRL_WR_S_SHIFT                           7
+#define PALMAS_SMPS45_CTRL_ROOF_FLOOR_EN                        0x40
+#define PALMAS_SMPS45_CTRL_ROOF_FLOOR_EN_SHIFT                  6
+#define PALMAS_SMPS45_CTRL_STATUS_MASK                          0x30
+#define PALMAS_SMPS45_CTRL_STATUS_SHIFT                         4
+#define PALMAS_SMPS45_CTRL_MODE_SLEEP_MASK                      0x0c
+#define PALMAS_SMPS45_CTRL_MODE_SLEEP_SHIFT                     2
+#define PALMAS_SMPS45_CTRL_MODE_ACTIVE_MASK                     0x03
+#define PALMAS_SMPS45_CTRL_MODE_ACTIVE_SHIFT                    0
+
+/* Bit definitions for SMPS45_TSTEP */
+#define PALMAS_SMPS45_TSTEP_TSTEP_MASK                          0x03
+#define PALMAS_SMPS45_TSTEP_TSTEP_SHIFT                         0
+
+/* Bit definitions for SMPS45_FORCE */
+#define PALMAS_SMPS45_FORCE_CMD                                 0x80
+#define PALMAS_SMPS45_FORCE_CMD_SHIFT                           7
+#define PALMAS_SMPS45_FORCE_VSEL_MASK                           0x7f
+#define PALMAS_SMPS45_FORCE_VSEL_SHIFT                          0
+
+/* Bit definitions for SMPS45_VOLTAGE */
+#define PALMAS_SMPS45_VOLTAGE_RANGE                             0x80
+#define PALMAS_SMPS45_VOLTAGE_RANGE_SHIFT                       7
+#define PALMAS_SMPS45_VOLTAGE_VSEL_MASK                         0x7f
+#define PALMAS_SMPS45_VOLTAGE_VSEL_SHIFT                        0
+
+/* Bit definitions for SMPS6_CTRL */
+#define PALMAS_SMPS6_CTRL_WR_S                                  0x80
+#define PALMAS_SMPS6_CTRL_WR_S_SHIFT                            7
+#define PALMAS_SMPS6_CTRL_ROOF_FLOOR_EN                         0x40
+#define PALMAS_SMPS6_CTRL_ROOF_FLOOR_EN_SHIFT                   6
+#define PALMAS_SMPS6_CTRL_STATUS_MASK                           0x30
+#define PALMAS_SMPS6_CTRL_STATUS_SHIFT                          4
+#define PALMAS_SMPS6_CTRL_MODE_SLEEP_MASK                       0x0c
+#define PALMAS_SMPS6_CTRL_MODE_SLEEP_SHIFT                      2
+#define PALMAS_SMPS6_CTRL_MODE_ACTIVE_MASK                      0x03
+#define PALMAS_SMPS6_CTRL_MODE_ACTIVE_SHIFT                     0
+
+/* Bit definitions for SMPS6_TSTEP */
+#define PALMAS_SMPS6_TSTEP_TSTEP_MASK                           0x03
+#define PALMAS_SMPS6_TSTEP_TSTEP_SHIFT                          0
+
+/* Bit definitions for SMPS6_FORCE */
+#define PALMAS_SMPS6_FORCE_CMD                                  0x80
+#define PALMAS_SMPS6_FORCE_CMD_SHIFT                            7
+#define PALMAS_SMPS6_FORCE_VSEL_MASK                            0x7f
+#define PALMAS_SMPS6_FORCE_VSEL_SHIFT                           0
+
+/* Bit definitions for SMPS6_VOLTAGE */
+#define PALMAS_SMPS6_VOLTAGE_RANGE                              0x80
+#define PALMAS_SMPS6_VOLTAGE_RANGE_SHIFT                        7
+#define PALMAS_SMPS6_VOLTAGE_VSEL_MASK                          0x7f
+#define PALMAS_SMPS6_VOLTAGE_VSEL_SHIFT                         0
+
+/* Bit definitions for SMPS7_CTRL */
+#define PALMAS_SMPS7_CTRL_WR_S                                  0x80
+#define PALMAS_SMPS7_CTRL_WR_S_SHIFT                            7
+#define PALMAS_SMPS7_CTRL_STATUS_MASK                           0x30
+#define PALMAS_SMPS7_CTRL_STATUS_SHIFT                          4
+#define PALMAS_SMPS7_CTRL_MODE_SLEEP_MASK                       0x0c
+#define PALMAS_SMPS7_CTRL_MODE_SLEEP_SHIFT                      2
+#define PALMAS_SMPS7_CTRL_MODE_ACTIVE_MASK                      0x03
+#define PALMAS_SMPS7_CTRL_MODE_ACTIVE_SHIFT                     0
+
+/* Bit definitions for SMPS7_VOLTAGE */
+#define PALMAS_SMPS7_VOLTAGE_RANGE                              0x80
+#define PALMAS_SMPS7_VOLTAGE_RANGE_SHIFT                        7
+#define PALMAS_SMPS7_VOLTAGE_VSEL_MASK                          0x7f
+#define PALMAS_SMPS7_VOLTAGE_VSEL_SHIFT                         0
+
+/* Bit definitions for SMPS8_CTRL */
+#define PALMAS_SMPS8_CTRL_WR_S                                  0x80
+#define PALMAS_SMPS8_CTRL_WR_S_SHIFT                            7
+#define PALMAS_SMPS8_CTRL_ROOF_FLOOR_EN                         0x40
+#define PALMAS_SMPS8_CTRL_ROOF_FLOOR_EN_SHIFT                   6
+#define PALMAS_SMPS8_CTRL_STATUS_MASK                           0x30
+#define PALMAS_SMPS8_CTRL_STATUS_SHIFT                          4
+#define PALMAS_SMPS8_CTRL_MODE_SLEEP_MASK                       0x0c
+#define PALMAS_SMPS8_CTRL_MODE_SLEEP_SHIFT                      2
+#define PALMAS_SMPS8_CTRL_MODE_ACTIVE_MASK                      0x03
+#define PALMAS_SMPS8_CTRL_MODE_ACTIVE_SHIFT                     0
+
+/* Bit definitions for SMPS8_TSTEP */
+#define PALMAS_SMPS8_TSTEP_TSTEP_MASK                           0x03
+#define PALMAS_SMPS8_TSTEP_TSTEP_SHIFT                          0
+
+/* Bit definitions for SMPS8_FORCE */
+#define PALMAS_SMPS8_FORCE_CMD                                  0x80
+#define PALMAS_SMPS8_FORCE_CMD_SHIFT                            7
+#define PALMAS_SMPS8_FORCE_VSEL_MASK                            0x7f
+#define PALMAS_SMPS8_FORCE_VSEL_SHIFT                           0
+
+/* Bit definitions for SMPS8_VOLTAGE */
+#define PALMAS_SMPS8_VOLTAGE_RANGE                              0x80
+#define PALMAS_SMPS8_VOLTAGE_RANGE_SHIFT                        7
+#define PALMAS_SMPS8_VOLTAGE_VSEL_MASK                          0x7f
+#define PALMAS_SMPS8_VOLTAGE_VSEL_SHIFT                         0
+
+/* Bit definitions for SMPS9_CTRL */
+#define PALMAS_SMPS9_CTRL_WR_S                                  0x80
+#define PALMAS_SMPS9_CTRL_WR_S_SHIFT                            7
+#define PALMAS_SMPS9_CTRL_STATUS_MASK                           0x30
+#define PALMAS_SMPS9_CTRL_STATUS_SHIFT                          4
+#define PALMAS_SMPS9_CTRL_MODE_SLEEP_MASK                       0x0c
+#define PALMAS_SMPS9_CTRL_MODE_SLEEP_SHIFT                      2
+#define PALMAS_SMPS9_CTRL_MODE_ACTIVE_MASK                      0x03
+#define PALMAS_SMPS9_CTRL_MODE_ACTIVE_SHIFT                     0
+
+/* Bit definitions for SMPS9_VOLTAGE */
+#define PALMAS_SMPS9_VOLTAGE_RANGE                              0x80
+#define PALMAS_SMPS9_VOLTAGE_RANGE_SHIFT                        7
+#define PALMAS_SMPS9_VOLTAGE_VSEL_MASK                          0x7f
+#define PALMAS_SMPS9_VOLTAGE_VSEL_SHIFT                         0
+
+/* Bit definitions for SMPS10_CTRL */
+#define PALMAS_SMPS10_CTRL_MODE_SLEEP_MASK                      0xf0
+#define PALMAS_SMPS10_CTRL_MODE_SLEEP_SHIFT                     4
+#define PALMAS_SMPS10_CTRL_MODE_ACTIVE_MASK                     0x0f
+#define PALMAS_SMPS10_CTRL_MODE_ACTIVE_SHIFT                    0
+
+/* Bit definitions for SMPS10_STATUS */
+#define PALMAS_SMPS10_STATUS_STATUS_MASK                        0x0f
+#define PALMAS_SMPS10_STATUS_STATUS_SHIFT                       0
+
+/* Bit definitions for SMPS_CTRL */
+#define PALMAS_SMPS_CTRL_SMPS45_SMPS457_EN                      0x20
+#define PALMAS_SMPS_CTRL_SMPS45_SMPS457_EN_SHIFT                5
+#define PALMAS_SMPS_CTRL_SMPS12_SMPS123_EN                      0x10
+#define PALMAS_SMPS_CTRL_SMPS12_SMPS123_EN_SHIFT                4
+#define PALMAS_SMPS_CTRL_SMPS45_PHASE_CTRL_MASK                 0x0c
+#define PALMAS_SMPS_CTRL_SMPS45_PHASE_CTRL_SHIFT                2
+#define PALMAS_SMPS_CTRL_SMPS123_PHASE_CTRL_MASK                0x03
+#define PALMAS_SMPS_CTRL_SMPS123_PHASE_CTRL_SHIFT               0
+
+/* Bit definitions for SMPS_PD_CTRL */
+#define PALMAS_SMPS_PD_CTRL_SMPS9                               0x40
+#define PALMAS_SMPS_PD_CTRL_SMPS9_SHIFT                         6
+#define PALMAS_SMPS_PD_CTRL_SMPS8                               0x20
+#define PALMAS_SMPS_PD_CTRL_SMPS8_SHIFT                         5
+#define PALMAS_SMPS_PD_CTRL_SMPS7                               0x10
+#define PALMAS_SMPS_PD_CTRL_SMPS7_SHIFT                         4
+#define PALMAS_SMPS_PD_CTRL_SMPS6                               0x08
+#define PALMAS_SMPS_PD_CTRL_SMPS6_SHIFT                         3
+#define PALMAS_SMPS_PD_CTRL_SMPS45                              0x04
+#define PALMAS_SMPS_PD_CTRL_SMPS45_SHIFT                        2
+#define PALMAS_SMPS_PD_CTRL_SMPS3                               0x02
+#define PALMAS_SMPS_PD_CTRL_SMPS3_SHIFT                         1
+#define PALMAS_SMPS_PD_CTRL_SMPS12                              0x01
+#define PALMAS_SMPS_PD_CTRL_SMPS12_SHIFT                        0
+
+/* Bit definitions for SMPS_THERMAL_EN */
+#define PALMAS_SMPS_THERMAL_EN_SMPS9                            0x40
+#define PALMAS_SMPS_THERMAL_EN_SMPS9_SHIFT                      6
+#define PALMAS_SMPS_THERMAL_EN_SMPS8                            0x20
+#define PALMAS_SMPS_THERMAL_EN_SMPS8_SHIFT                      5
+#define PALMAS_SMPS_THERMAL_EN_SMPS6                            0x08
+#define PALMAS_SMPS_THERMAL_EN_SMPS6_SHIFT                      3
+#define PALMAS_SMPS_THERMAL_EN_SMPS457                          0x04
+#define PALMAS_SMPS_THERMAL_EN_SMPS457_SHIFT                    2
+#define PALMAS_SMPS_THERMAL_EN_SMPS123                          0x01
+#define PALMAS_SMPS_THERMAL_EN_SMPS123_SHIFT                    0
+
+/* Bit definitions for SMPS_THERMAL_STATUS */
+#define PALMAS_SMPS_THERMAL_STATUS_SMPS9                        0x40
+#define PALMAS_SMPS_THERMAL_STATUS_SMPS9_SHIFT                  6
+#define PALMAS_SMPS_THERMAL_STATUS_SMPS8                        0x20
+#define PALMAS_SMPS_THERMAL_STATUS_SMPS8_SHIFT                  5
+#define PALMAS_SMPS_THERMAL_STATUS_SMPS6                        0x08
+#define PALMAS_SMPS_THERMAL_STATUS_SMPS6_SHIFT                  3
+#define PALMAS_SMPS_THERMAL_STATUS_SMPS457                      0x04
+#define PALMAS_SMPS_THERMAL_STATUS_SMPS457_SHIFT                2
+#define PALMAS_SMPS_THERMAL_STATUS_SMPS123                      0x01
+#define PALMAS_SMPS_THERMAL_STATUS_SMPS123_SHIFT                0
+
+/* Bit definitions for SMPS_SHORT_STATUS */
+#define PALMAS_SMPS_SHORT_STATUS_SMPS10                         0x80
+#define PALMAS_SMPS_SHORT_STATUS_SMPS10_SHIFT                   7
+#define PALMAS_SMPS_SHORT_STATUS_SMPS9                          0x40
+#define PALMAS_SMPS_SHORT_STATUS_SMPS9_SHIFT                    6
+#define PALMAS_SMPS_SHORT_STATUS_SMPS8                          0x20
+#define PALMAS_SMPS_SHORT_STATUS_SMPS8_SHIFT                    5
+#define PALMAS_SMPS_SHORT_STATUS_SMPS7                          0x10
+#define PALMAS_SMPS_SHORT_STATUS_SMPS7_SHIFT                    4
+#define PALMAS_SMPS_SHORT_STATUS_SMPS6                          0x08
+#define PALMAS_SMPS_SHORT_STATUS_SMPS6_SHIFT                    3
+#define PALMAS_SMPS_SHORT_STATUS_SMPS45                         0x04
+#define PALMAS_SMPS_SHORT_STATUS_SMPS45_SHIFT                   2
+#define PALMAS_SMPS_SHORT_STATUS_SMPS3                          0x02
+#define PALMAS_SMPS_SHORT_STATUS_SMPS3_SHIFT                    1
+#define PALMAS_SMPS_SHORT_STATUS_SMPS12                         0x01
+#define PALMAS_SMPS_SHORT_STATUS_SMPS12_SHIFT                   0
+
+/* Bit definitions for SMPS_NEGATIVE_CURRENT_LIMIT_EN */
+#define PALMAS_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS9             0x40
+#define PALMAS_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS9_SHIFT       6
+#define PALMAS_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS8             0x20
+#define PALMAS_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS8_SHIFT       5
+#define PALMAS_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS7             0x10
+#define PALMAS_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS7_SHIFT       4
+#define PALMAS_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS6             0x08
+#define PALMAS_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS6_SHIFT       3
+#define PALMAS_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS45            0x04
+#define PALMAS_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS45_SHIFT      2
+#define PALMAS_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS3             0x02
+#define PALMAS_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS3_SHIFT       1
+#define PALMAS_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS12            0x01
+#define PALMAS_SMPS_NEGATIVE_CURRENT_LIMIT_EN_SMPS12_SHIFT      0
+
+/* Bit definitions for SMPS_POWERGOOD_MASK1 */
+#define PALMAS_SMPS_POWERGOOD_MASK1_SMPS10                      0x80
+#define PALMAS_SMPS_POWERGOOD_MASK1_SMPS10_SHIFT                7
+#define PALMAS_SMPS_POWERGOOD_MASK1_SMPS9                       0x40
+#define PALMAS_SMPS_POWERGOOD_MASK1_SMPS9_SHIFT                 6
+#define PALMAS_SMPS_POWERGOOD_MASK1_SMPS8                       0x20
+#define PALMAS_SMPS_POWERGOOD_MASK1_SMPS8_SHIFT                 5
+#define PALMAS_SMPS_POWERGOOD_MASK1_SMPS7                       0x10
+#define PALMAS_SMPS_POWERGOOD_MASK1_SMPS7_SHIFT                 4
+#define PALMAS_SMPS_POWERGOOD_MASK1_SMPS6                       0x08
+#define PALMAS_SMPS_POWERGOOD_MASK1_SMPS6_SHIFT                 3
+#define PALMAS_SMPS_POWERGOOD_MASK1_SMPS45                      0x04
+#define PALMAS_SMPS_POWERGOOD_MASK1_SMPS45_SHIFT                2
+#define PALMAS_SMPS_POWERGOOD_MASK1_SMPS3                       0x02
+#define PALMAS_SMPS_POWERGOOD_MASK1_SMPS3_SHIFT                 1
+#define PALMAS_SMPS_POWERGOOD_MASK1_SMPS12                      0x01
+#define PALMAS_SMPS_POWERGOOD_MASK1_SMPS12_SHIFT                0
+
+/* Bit definitions for SMPS_POWERGOOD_MASK2 */
+#define PALMAS_SMPS_POWERGOOD_MASK2_POWERGOOD_TYPE_SELECT       0x80
+#define PALMAS_SMPS_POWERGOOD_MASK2_POWERGOOD_TYPE_SELECT_SHIFT 7
+#define PALMAS_SMPS_POWERGOOD_MASK2_GPIO_7                      0x04
+#define PALMAS_SMPS_POWERGOOD_MASK2_GPIO_7_SHIFT                2
+#define PALMAS_SMPS_POWERGOOD_MASK2_VBUS                        0x02
+#define PALMAS_SMPS_POWERGOOD_MASK2_VBUS_SHIFT                  1
+#define PALMAS_SMPS_POWERGOOD_MASK2_ACOK                        0x01
+#define PALMAS_SMPS_POWERGOOD_MASK2_ACOK_SHIFT                  0
+
+/* Registers for function LDO */
+#define PALMAS_LDO1_CTRL                                        0x0
+#define PALMAS_LDO1_VOLTAGE                                     0x1
+#define PALMAS_LDO2_CTRL                                        0x2
+#define PALMAS_LDO2_VOLTAGE                                     0x3
+#define PALMAS_LDO3_CTRL                                        0x4
+#define PALMAS_LDO3_VOLTAGE                                     0x5
+#define PALMAS_LDO4_CTRL                                        0x6
+#define PALMAS_LDO4_VOLTAGE                                     0x7
+#define PALMAS_LDO5_CTRL                                        0x8
+#define PALMAS_LDO5_VOLTAGE                                     0x9
+#define PALMAS_LDO6_CTRL                                        0xA
+#define PALMAS_LDO6_VOLTAGE                                     0xB
+#define PALMAS_LDO7_CTRL                                        0xC
+#define PALMAS_LDO7_VOLTAGE                                     0xD
+#define PALMAS_LDO8_CTRL                                        0xE
+#define PALMAS_LDO8_VOLTAGE                                     0xF
+#define PALMAS_LDO9_CTRL                                        0x10
+#define PALMAS_LDO9_VOLTAGE                                     0x11
+#define PALMAS_LDOLN_CTRL                                       0x12
+#define PALMAS_LDOLN_VOLTAGE                                    0x13
+#define PALMAS_LDOUSB_CTRL                                      0x14
+#define PALMAS_LDOUSB_VOLTAGE                                   0x15
+#define PALMAS_LDO_CTRL                                         0x1A
+#define PALMAS_LDO_PD_CTRL1                                     0x1B
+#define PALMAS_LDO_PD_CTRL2                                     0x1C
+#define PALMAS_LDO_SHORT_STATUS1                                0x1D
+#define PALMAS_LDO_SHORT_STATUS2                                0x1E
+
+/* Bit definitions for LDO1_CTRL */
+#define PALMAS_LDO1_CTRL_WR_S                                   0x80
+#define PALMAS_LDO1_CTRL_WR_S_SHIFT                             7
+#define PALMAS_LDO1_CTRL_STATUS                                 0x10
+#define PALMAS_LDO1_CTRL_STATUS_SHIFT                           4
+#define PALMAS_LDO1_CTRL_MODE_SLEEP                             0x04
+#define PALMAS_LDO1_CTRL_MODE_SLEEP_SHIFT                       2
+#define PALMAS_LDO1_CTRL_MODE_ACTIVE                            0x01
+#define PALMAS_LDO1_CTRL_MODE_ACTIVE_SHIFT                      0
+
+/* Bit definitions for LDO1_VOLTAGE */
+#define PALMAS_LDO1_VOLTAGE_VSEL_MASK                           0x3f
+#define PALMAS_LDO1_VOLTAGE_VSEL_SHIFT                          0
+
+/* Bit definitions for LDO2_CTRL */
+#define PALMAS_LDO2_CTRL_WR_S                                   0x80
+#define PALMAS_LDO2_CTRL_WR_S_SHIFT                             7
+#define PALMAS_LDO2_CTRL_STATUS                                 0x10
+#define PALMAS_LDO2_CTRL_STATUS_SHIFT                           4
+#define PALMAS_LDO2_CTRL_MODE_SLEEP                             0x04
+#define PALMAS_LDO2_CTRL_MODE_SLEEP_SHIFT                       2
+#define PALMAS_LDO2_CTRL_MODE_ACTIVE                            0x01
+#define PALMAS_LDO2_CTRL_MODE_ACTIVE_SHIFT                      0
+
+/* Bit definitions for LDO2_VOLTAGE */
+#define PALMAS_LDO2_VOLTAGE_VSEL_MASK                           0x3f
+#define PALMAS_LDO2_VOLTAGE_VSEL_SHIFT                          0
+
+/* Bit definitions for LDO3_CTRL */
+#define PALMAS_LDO3_CTRL_WR_S                                   0x80
+#define PALMAS_LDO3_CTRL_WR_S_SHIFT                             7
+#define PALMAS_LDO3_CTRL_STATUS                                 0x10
+#define PALMAS_LDO3_CTRL_STATUS_SHIFT                           4
+#define PALMAS_LDO3_CTRL_MODE_SLEEP                             0x04
+#define PALMAS_LDO3_CTRL_MODE_SLEEP_SHIFT                       2
+#define PALMAS_LDO3_CTRL_MODE_ACTIVE                            0x01
+#define PALMAS_LDO3_CTRL_MODE_ACTIVE_SHIFT                      0
+
+/* Bit definitions for LDO3_VOLTAGE */
+#define PALMAS_LDO3_VOLTAGE_VSEL_MASK                           0x3f
+#define PALMAS_LDO3_VOLTAGE_VSEL_SHIFT                          0
+
+/* Bit definitions for LDO4_CTRL */
+#define PALMAS_LDO4_CTRL_WR_S                                   0x80
+#define PALMAS_LDO4_CTRL_WR_S_SHIFT                             7
+#define PALMAS_LDO4_CTRL_STATUS                                 0x10
+#define PALMAS_LDO4_CTRL_STATUS_SHIFT                           4
+#define PALMAS_LDO4_CTRL_MODE_SLEEP                             0x04
+#define PALMAS_LDO4_CTRL_MODE_SLEEP_SHIFT                       2
+#define PALMAS_LDO4_CTRL_MODE_ACTIVE                            0x01
+#define PALMAS_LDO4_CTRL_MODE_ACTIVE_SHIFT                      0
+
+/* Bit definitions for LDO4_VOLTAGE */
+#define PALMAS_LDO4_VOLTAGE_VSEL_MASK                           0x3f
+#define PALMAS_LDO4_VOLTAGE_VSEL_SHIFT                          0
+
+/* Bit definitions for LDO5_CTRL */
+#define PALMAS_LDO5_CTRL_WR_S                                   0x80
+#define PALMAS_LDO5_CTRL_WR_S_SHIFT                             7
+#define PALMAS_LDO5_CTRL_STATUS                                 0x10
+#define PALMAS_LDO5_CTRL_STATUS_SHIFT                           4
+#define PALMAS_LDO5_CTRL_MODE_SLEEP                             0x04
+#define PALMAS_LDO5_CTRL_MODE_SLEEP_SHIFT                       2
+#define PALMAS_LDO5_CTRL_MODE_ACTIVE                            0x01
+#define PALMAS_LDO5_CTRL_MODE_ACTIVE_SHIFT                      0
+
+/* Bit definitions for LDO5_VOLTAGE */
+#define PALMAS_LDO5_VOLTAGE_VSEL_MASK                           0x3f
+#define PALMAS_LDO5_VOLTAGE_VSEL_SHIFT                          0
+
+/* Bit definitions for LDO6_CTRL */
+#define PALMAS_LDO6_CTRL_WR_S                                   0x80
+#define PALMAS_LDO6_CTRL_WR_S_SHIFT                             7
+#define PALMAS_LDO6_CTRL_LDO_VIB_EN                             0x40
+#define PALMAS_LDO6_CTRL_LDO_VIB_EN_SHIFT                       6
+#define PALMAS_LDO6_CTRL_STATUS                                 0x10
+#define PALMAS_LDO6_CTRL_STATUS_SHIFT                           4
+#define PALMAS_LDO6_CTRL_MODE_SLEEP                             0x04
+#define PALMAS_LDO6_CTRL_MODE_SLEEP_SHIFT                       2
+#define PALMAS_LDO6_CTRL_MODE_ACTIVE                            0x01
+#define PALMAS_LDO6_CTRL_MODE_ACTIVE_SHIFT                      0
+
+/* Bit definitions for LDO6_VOLTAGE */
+#define PALMAS_LDO6_VOLTAGE_VSEL_MASK                           0x3f
+#define PALMAS_LDO6_VOLTAGE_VSEL_SHIFT                          0
+
+/* Bit definitions for LDO7_CTRL */
+#define PALMAS_LDO7_CTRL_WR_S                                   0x80
+#define PALMAS_LDO7_CTRL_WR_S_SHIFT                             7
+#define PALMAS_LDO7_CTRL_STATUS                                 0x10
+#define PALMAS_LDO7_CTRL_STATUS_SHIFT                           4
+#define PALMAS_LDO7_CTRL_MODE_SLEEP                             0x04
+#define PALMAS_LDO7_CTRL_MODE_SLEEP_SHIFT                       2
+#define PALMAS_LDO7_CTRL_MODE_ACTIVE                            0x01
+#define PALMAS_LDO7_CTRL_MODE_ACTIVE_SHIFT                      0
+
+/* Bit definitions for LDO7_VOLTAGE */
+#define PALMAS_LDO7_VOLTAGE_VSEL_MASK                           0x3f
+#define PALMAS_LDO7_VOLTAGE_VSEL_SHIFT                          0
+
+/* Bit definitions for LDO8_CTRL */
+#define PALMAS_LDO8_CTRL_WR_S                                   0x80
+#define PALMAS_LDO8_CTRL_WR_S_SHIFT                             7
+#define PALMAS_LDO8_CTRL_LDO_TRACKING_EN                        0x40
+#define PALMAS_LDO8_CTRL_LDO_TRACKING_EN_SHIFT                  6
+#define PALMAS_LDO8_CTRL_STATUS                                 0x10
+#define PALMAS_LDO8_CTRL_STATUS_SHIFT                           4
+#define PALMAS_LDO8_CTRL_MODE_SLEEP                             0x04
+#define PALMAS_LDO8_CTRL_MODE_SLEEP_SHIFT                       2
+#define PALMAS_LDO8_CTRL_MODE_ACTIVE                            0x01
+#define PALMAS_LDO8_CTRL_MODE_ACTIVE_SHIFT                      0
+
+/* Bit definitions for LDO8_VOLTAGE */
+#define PALMAS_LDO8_VOLTAGE_VSEL_MASK                           0x3f
+#define PALMAS_LDO8_VOLTAGE_VSEL_SHIFT                          0
+
+/* Bit definitions for LDO9_CTRL */
+#define PALMAS_LDO9_CTRL_WR_S                                   0x80
+#define PALMAS_LDO9_CTRL_WR_S_SHIFT                             7
+#define PALMAS_LDO9_CTRL_LDO_BYPASS_EN                          0x40
+#define PALMAS_LDO9_CTRL_LDO_BYPASS_EN_SHIFT                    6
+#define PALMAS_LDO9_CTRL_STATUS                                 0x10
+#define PALMAS_LDO9_CTRL_STATUS_SHIFT                           4
+#define PALMAS_LDO9_CTRL_MODE_SLEEP                             0x04
+#define PALMAS_LDO9_CTRL_MODE_SLEEP_SHIFT                       2
+#define PALMAS_LDO9_CTRL_MODE_ACTIVE                            0x01
+#define PALMAS_LDO9_CTRL_MODE_ACTIVE_SHIFT                      0
+
+/* Bit definitions for LDO9_VOLTAGE */
+#define PALMAS_LDO9_VOLTAGE_VSEL_MASK                           0x3f
+#define PALMAS_LDO9_VOLTAGE_VSEL_SHIFT                          0
+
+/* Bit definitions for LDOLN_CTRL */
+#define PALMAS_LDOLN_CTRL_WR_S                                  0x80
+#define PALMAS_LDOLN_CTRL_WR_S_SHIFT                            7
+#define PALMAS_LDOLN_CTRL_STATUS                                0x10
+#define PALMAS_LDOLN_CTRL_STATUS_SHIFT                          4
+#define PALMAS_LDOLN_CTRL_MODE_SLEEP                            0x04
+#define PALMAS_LDOLN_CTRL_MODE_SLEEP_SHIFT                      2
+#define PALMAS_LDOLN_CTRL_MODE_ACTIVE                           0x01
+#define PALMAS_LDOLN_CTRL_MODE_ACTIVE_SHIFT                     0
+
+/* Bit definitions for LDOLN_VOLTAGE */
+#define PALMAS_LDOLN_VOLTAGE_VSEL_MASK                          0x3f
+#define PALMAS_LDOLN_VOLTAGE_VSEL_SHIFT                         0
+
+/* Bit definitions for LDOUSB_CTRL */
+#define PALMAS_LDOUSB_CTRL_WR_S                                 0x80
+#define PALMAS_LDOUSB_CTRL_WR_S_SHIFT                           7
+#define PALMAS_LDOUSB_CTRL_STATUS                               0x10
+#define PALMAS_LDOUSB_CTRL_STATUS_SHIFT                         4
+#define PALMAS_LDOUSB_CTRL_MODE_SLEEP                           0x04
+#define PALMAS_LDOUSB_CTRL_MODE_SLEEP_SHIFT                     2
+#define PALMAS_LDOUSB_CTRL_MODE_ACTIVE                          0x01
+#define PALMAS_LDOUSB_CTRL_MODE_ACTIVE_SHIFT                    0
+
+/* Bit definitions for LDOUSB_VOLTAGE */
+#define PALMAS_LDOUSB_VOLTAGE_VSEL_MASK                         0x3f
+#define PALMAS_LDOUSB_VOLTAGE_VSEL_SHIFT                        0
+
+/* Bit definitions for LDO_CTRL */
+#define PALMAS_LDO_CTRL_LDOUSB_ON_VBUS_VSYS                     0x01
+#define PALMAS_LDO_CTRL_LDOUSB_ON_VBUS_VSYS_SHIFT               0
+
+/* Bit definitions for LDO_PD_CTRL1 */
+#define PALMAS_LDO_PD_CTRL1_LDO8                                0x80
+#define PALMAS_LDO_PD_CTRL1_LDO8_SHIFT                          7
+#define PALMAS_LDO_PD_CTRL1_LDO7                                0x40
+#define PALMAS_LDO_PD_CTRL1_LDO7_SHIFT                          6
+#define PALMAS_LDO_PD_CTRL1_LDO6                                0x20
+#define PALMAS_LDO_PD_CTRL1_LDO6_SHIFT                          5
+#define PALMAS_LDO_PD_CTRL1_LDO5                                0x10
+#define PALMAS_LDO_PD_CTRL1_LDO5_SHIFT                          4
+#define PALMAS_LDO_PD_CTRL1_LDO4                                0x08
+#define PALMAS_LDO_PD_CTRL1_LDO4_SHIFT                          3
+#define PALMAS_LDO_PD_CTRL1_LDO3                                0x04
+#define PALMAS_LDO_PD_CTRL1_LDO3_SHIFT                          2
+#define PALMAS_LDO_PD_CTRL1_LDO2                                0x02
+#define PALMAS_LDO_PD_CTRL1_LDO2_SHIFT                          1
+#define PALMAS_LDO_PD_CTRL1_LDO1                                0x01
+#define PALMAS_LDO_PD_CTRL1_LDO1_SHIFT                          0
+
+/* Bit definitions for LDO_PD_CTRL2 */
+#define PALMAS_LDO_PD_CTRL2_LDOUSB                              0x04
+#define PALMAS_LDO_PD_CTRL2_LDOUSB_SHIFT                        2
+#define PALMAS_LDO_PD_CTRL2_LDOLN                               0x02
+#define PALMAS_LDO_PD_CTRL2_LDOLN_SHIFT                         1
+#define PALMAS_LDO_PD_CTRL2_LDO9                                0x01
+#define PALMAS_LDO_PD_CTRL2_LDO9_SHIFT                          0
+
+/* Bit definitions for LDO_SHORT_STATUS1 */
+#define PALMAS_LDO_SHORT_STATUS1_LDO8                           0x80
+#define PALMAS_LDO_SHORT_STATUS1_LDO8_SHIFT                     7
+#define PALMAS_LDO_SHORT_STATUS1_LDO7                           0x40
+#define PALMAS_LDO_SHORT_STATUS1_LDO7_SHIFT                     6
+#define PALMAS_LDO_SHORT_STATUS1_LDO6                           0x20
+#define PALMAS_LDO_SHORT_STATUS1_LDO6_SHIFT                     5
+#define PALMAS_LDO_SHORT_STATUS1_LDO5                           0x10
+#define PALMAS_LDO_SHORT_STATUS1_LDO5_SHIFT                     4
+#define PALMAS_LDO_SHORT_STATUS1_LDO4                           0x08
+#define PALMAS_LDO_SHORT_STATUS1_LDO4_SHIFT                     3
+#define PALMAS_LDO_SHORT_STATUS1_LDO3                           0x04
+#define PALMAS_LDO_SHORT_STATUS1_LDO3_SHIFT                     2
+#define PALMAS_LDO_SHORT_STATUS1_LDO2                           0x02
+#define PALMAS_LDO_SHORT_STATUS1_LDO2_SHIFT                     1
+#define PALMAS_LDO_SHORT_STATUS1_LDO1                           0x01
+#define PALMAS_LDO_SHORT_STATUS1_LDO1_SHIFT                     0
+
+/* Bit definitions for LDO_SHORT_STATUS2 */
+#define PALMAS_LDO_SHORT_STATUS2_LDOVANA                        0x08
+#define PALMAS_LDO_SHORT_STATUS2_LDOVANA_SHIFT                  3
+#define PALMAS_LDO_SHORT_STATUS2_LDOUSB                         0x04
+#define PALMAS_LDO_SHORT_STATUS2_LDOUSB_SHIFT                   2
+#define PALMAS_LDO_SHORT_STATUS2_LDOLN                          0x02
+#define PALMAS_LDO_SHORT_STATUS2_LDOLN_SHIFT                    1
+#define PALMAS_LDO_SHORT_STATUS2_LDO9                           0x01
+#define PALMAS_LDO_SHORT_STATUS2_LDO9_SHIFT                     0
+
+/* Registers for function PMU_CONTROL */
+#define PALMAS_DEV_CTRL                                         0x0
+#define PALMAS_POWER_CTRL                                       0x1
+#define PALMAS_VSYS_LO                                          0x2
+#define PALMAS_VSYS_MON                                         0x3
+#define PALMAS_VBAT_MON                                         0x4
+#define PALMAS_WATCHDOG                                         0x5
+#define PALMAS_BOOT_STATUS                                      0x6
+#define PALMAS_BATTERY_BOUNCE                                   0x7
+#define PALMAS_BACKUP_BATTERY_CTRL                              0x8
+#define PALMAS_LONG_PRESS_KEY                                   0x9
+#define PALMAS_OSC_THERM_CTRL                                   0xA
+#define PALMAS_BATDEBOUNCING                                    0xB
+#define PALMAS_SWOFF_HWRST                                      0xF
+#define PALMAS_SWOFF_COLDRST                                    0x10
+#define PALMAS_SWOFF_STATUS                                     0x11
+#define PALMAS_PMU_CONFIG                                       0x12
+#define PALMAS_SPARE                                            0x14
+#define PALMAS_PMU_SECONDARY_INT                                0x15
+#define PALMAS_SW_REVISION                                      0x17
+#define PALMAS_EXT_CHRG_CTRL                                    0x18
+#define PALMAS_PMU_SECONDARY_INT2                               0x19
+
+/* Bit definitions for DEV_CTRL */
+#define PALMAS_DEV_CTRL_DEV_STATUS_MASK                         0x0c
+#define PALMAS_DEV_CTRL_DEV_STATUS_SHIFT                        2
+#define PALMAS_DEV_CTRL_SW_RST                                  0x02
+#define PALMAS_DEV_CTRL_SW_RST_SHIFT                            1
+#define PALMAS_DEV_CTRL_DEV_ON                                  0x01
+#define PALMAS_DEV_CTRL_DEV_ON_SHIFT                            0
+
+/* Bit definitions for POWER_CTRL */
+#define PALMAS_POWER_CTRL_ENABLE2_MASK                          0x04
+#define PALMAS_POWER_CTRL_ENABLE2_MASK_SHIFT                    2
+#define PALMAS_POWER_CTRL_ENABLE1_MASK                          0x02
+#define PALMAS_POWER_CTRL_ENABLE1_MASK_SHIFT                    1
+#define PALMAS_POWER_CTRL_NSLEEP_MASK                           0x01
+#define PALMAS_POWER_CTRL_NSLEEP_MASK_SHIFT                     0
+
+/* Bit definitions for VSYS_LO */
+#define PALMAS_VSYS_LO_THRESHOLD_MASK                           0x1f
+#define PALMAS_VSYS_LO_THRESHOLD_SHIFT                          0
+
+/* Bit definitions for VSYS_MON */
+#define PALMAS_VSYS_MON_ENABLE                                  0x80
+#define PALMAS_VSYS_MON_ENABLE_SHIFT                            7
+#define PALMAS_VSYS_MON_THRESHOLD_MASK                          0x3f
+#define PALMAS_VSYS_MON_THRESHOLD_SHIFT                         0
+
+/* Bit definitions for VBAT_MON */
+#define PALMAS_VBAT_MON_ENABLE                                  0x80
+#define PALMAS_VBAT_MON_ENABLE_SHIFT                            7
+#define PALMAS_VBAT_MON_THRESHOLD_MASK                          0x3f
+#define PALMAS_VBAT_MON_THRESHOLD_SHIFT                         0
+
+/* Bit definitions for WATCHDOG */
+#define PALMAS_WATCHDOG_LOCK                                    0x20
+#define PALMAS_WATCHDOG_LOCK_SHIFT                              5
+#define PALMAS_WATCHDOG_ENABLE                                  0x10
+#define PALMAS_WATCHDOG_ENABLE_SHIFT                            4
+#define PALMAS_WATCHDOG_MODE                                    0x08
+#define PALMAS_WATCHDOG_MODE_SHIFT                              3
+#define PALMAS_WATCHDOG_TIMER_MASK                              0x07
+#define PALMAS_WATCHDOG_TIMER_SHIFT                             0
+
+/* Bit definitions for BOOT_STATUS */
+#define PALMAS_BOOT_STATUS_BOOT1                                0x02
+#define PALMAS_BOOT_STATUS_BOOT1_SHIFT                          1
+#define PALMAS_BOOT_STATUS_BOOT0                                0x01
+#define PALMAS_BOOT_STATUS_BOOT0_SHIFT                          0
+
+/* Bit definitions for BATTERY_BOUNCE */
+#define PALMAS_BATTERY_BOUNCE_BB_DELAY_MASK                     0x3f
+#define PALMAS_BATTERY_BOUNCE_BB_DELAY_SHIFT                    0
+
+/* Bit definitions for BACKUP_BATTERY_CTRL */
+#define PALMAS_BACKUP_BATTERY_CTRL_VRTC_18_15                   0x80
+#define PALMAS_BACKUP_BATTERY_CTRL_VRTC_18_15_SHIFT             7
+#define PALMAS_BACKUP_BATTERY_CTRL_VRTC_EN_SLP                  0x40
+#define PALMAS_BACKUP_BATTERY_CTRL_VRTC_EN_SLP_SHIFT            6
+#define PALMAS_BACKUP_BATTERY_CTRL_VRTC_EN_OFF                  0x20
+#define PALMAS_BACKUP_BATTERY_CTRL_VRTC_EN_OFF_SHIFT            5
+#define PALMAS_BACKUP_BATTERY_CTRL_VRTC_PWEN                    0x10
+#define PALMAS_BACKUP_BATTERY_CTRL_VRTC_PWEN_SHIFT              4
+#define PALMAS_BACKUP_BATTERY_CTRL_BBS_BBC_LOW_ICHRG            0x08
+#define PALMAS_BACKUP_BATTERY_CTRL_BBS_BBC_LOW_ICHRG_SHIFT      3
+#define PALMAS_BACKUP_BATTERY_CTRL_BB_SEL_MASK                  0x06
+#define PALMAS_BACKUP_BATTERY_CTRL_BB_SEL_SHIFT                 1
+#define PALMAS_BACKUP_BATTERY_CTRL_BB_CHG_EN                    0x01
+#define PALMAS_BACKUP_BATTERY_CTRL_BB_CHG_EN_SHIFT              0
+
+/* Bit definitions for LONG_PRESS_KEY */
+#define PALMAS_LONG_PRESS_KEY_LPK_LOCK                          0x80
+#define PALMAS_LONG_PRESS_KEY_LPK_LOCK_SHIFT                    7
+#define PALMAS_LONG_PRESS_KEY_LPK_INT_CLR                       0x10
+#define PALMAS_LONG_PRESS_KEY_LPK_INT_CLR_SHIFT                 4
+#define PALMAS_LONG_PRESS_KEY_LPK_TIME_MASK                     0x0c
+#define PALMAS_LONG_PRESS_KEY_LPK_TIME_SHIFT                    2
+#define PALMAS_LONG_PRESS_KEY_PWRON_DEBOUNCE_MASK               0x03
+#define PALMAS_LONG_PRESS_KEY_PWRON_DEBOUNCE_SHIFT              0
+
+/* Bit definitions for OSC_THERM_CTRL */
+#define PALMAS_OSC_THERM_CTRL_VANA_ON_IN_SLEEP                  0x80
+#define PALMAS_OSC_THERM_CTRL_VANA_ON_IN_SLEEP_SHIFT            7
+#define PALMAS_OSC_THERM_CTRL_INT_MASK_IN_SLEEP                 0x40
+#define PALMAS_OSC_THERM_CTRL_INT_MASK_IN_SLEEP_SHIFT           6
+#define PALMAS_OSC_THERM_CTRL_RC15MHZ_ON_IN_SLEEP               0x20
+#define PALMAS_OSC_THERM_CTRL_RC15MHZ_ON_IN_SLEEP_SHIFT         5
+#define PALMAS_OSC_THERM_CTRL_THERM_OFF_IN_SLEEP                0x10
+#define PALMAS_OSC_THERM_CTRL_THERM_OFF_IN_SLEEP_SHIFT          4
+#define PALMAS_OSC_THERM_CTRL_THERM_HD_SEL_MASK                 0x0c
+#define PALMAS_OSC_THERM_CTRL_THERM_HD_SEL_SHIFT                2
+#define PALMAS_OSC_THERM_CTRL_OSC_BYPASS                        0x02
+#define PALMAS_OSC_THERM_CTRL_OSC_BYPASS_SHIFT                  1
+#define PALMAS_OSC_THERM_CTRL_OSC_HPMODE                        0x01
+#define PALMAS_OSC_THERM_CTRL_OSC_HPMODE_SHIFT                  0
+
+/* Bit definitions for BATDEBOUNCING */
+#define PALMAS_BATDEBOUNCING_BAT_DEB_BYPASS                     0x80
+#define PALMAS_BATDEBOUNCING_BAT_DEB_BYPASS_SHIFT               7
+#define PALMAS_BATDEBOUNCING_BINS_DEB_MASK                      0x78
+#define PALMAS_BATDEBOUNCING_BINS_DEB_SHIFT                     3
+#define PALMAS_BATDEBOUNCING_BEXT_DEB_MASK                      0x07
+#define PALMAS_BATDEBOUNCING_BEXT_DEB_SHIFT                     0
+
+/* Bit definitions for SWOFF_HWRST */
+#define PALMAS_SWOFF_HWRST_PWRON_LPK                            0x80
+#define PALMAS_SWOFF_HWRST_PWRON_LPK_SHIFT                      7
+#define PALMAS_SWOFF_HWRST_PWRDOWN                              0x40
+#define PALMAS_SWOFF_HWRST_PWRDOWN_SHIFT                        6
+#define PALMAS_SWOFF_HWRST_WTD                                  0x20
+#define PALMAS_SWOFF_HWRST_WTD_SHIFT                            5
+#define PALMAS_SWOFF_HWRST_TSHUT                                0x10
+#define PALMAS_SWOFF_HWRST_TSHUT_SHIFT                          4
+#define PALMAS_SWOFF_HWRST_RESET_IN                             0x08
+#define PALMAS_SWOFF_HWRST_RESET_IN_SHIFT                       3
+#define PALMAS_SWOFF_HWRST_SW_RST                               0x04
+#define PALMAS_SWOFF_HWRST_SW_RST_SHIFT                         2
+#define PALMAS_SWOFF_HWRST_VSYS_LO                              0x02
+#define PALMAS_SWOFF_HWRST_VSYS_LO_SHIFT                        1
+#define PALMAS_SWOFF_HWRST_GPADC_SHUTDOWN                       0x01
+#define PALMAS_SWOFF_HWRST_GPADC_SHUTDOWN_SHIFT                 0
+
+/* Bit definitions for SWOFF_COLDRST */
+#define PALMAS_SWOFF_COLDRST_PWRON_LPK                          0x80
+#define PALMAS_SWOFF_COLDRST_PWRON_LPK_SHIFT                    7
+#define PALMAS_SWOFF_COLDRST_PWRDOWN                            0x40
+#define PALMAS_SWOFF_COLDRST_PWRDOWN_SHIFT                      6
+#define PALMAS_SWOFF_COLDRST_WTD                                0x20
+#define PALMAS_SWOFF_COLDRST_WTD_SHIFT                          5
+#define PALMAS_SWOFF_COLDRST_TSHUT                              0x10
+#define PALMAS_SWOFF_COLDRST_TSHUT_SHIFT                        4
+#define PALMAS_SWOFF_COLDRST_RESET_IN                           0x08
+#define PALMAS_SWOFF_COLDRST_RESET_IN_SHIFT                     3
+#define PALMAS_SWOFF_COLDRST_SW_RST                             0x04
+#define PALMAS_SWOFF_COLDRST_SW_RST_SHIFT                       2
+#define PALMAS_SWOFF_COLDRST_VSYS_LO                            0x02
+#define PALMAS_SWOFF_COLDRST_VSYS_LO_SHIFT                      1
+#define PALMAS_SWOFF_COLDRST_GPADC_SHUTDOWN                     0x01
+#define PALMAS_SWOFF_COLDRST_GPADC_SHUTDOWN_SHIFT               0
+
+/* Bit definitions for SWOFF_STATUS */
+#define PALMAS_SWOFF_STATUS_PWRON_LPK                           0x80
+#define PALMAS_SWOFF_STATUS_PWRON_LPK_SHIFT                     7
+#define PALMAS_SWOFF_STATUS_PWRDOWN                             0x40
+#define PALMAS_SWOFF_STATUS_PWRDOWN_SHIFT                       6
+#define PALMAS_SWOFF_STATUS_WTD                                 0x20
+#define PALMAS_SWOFF_STATUS_WTD_SHIFT                           5
+#define PALMAS_SWOFF_STATUS_TSHUT                               0x10
+#define PALMAS_SWOFF_STATUS_TSHUT_SHIFT                         4
+#define PALMAS_SWOFF_STATUS_RESET_IN                            0x08
+#define PALMAS_SWOFF_STATUS_RESET_IN_SHIFT                      3
+#define PALMAS_SWOFF_STATUS_SW_RST                              0x04
+#define PALMAS_SWOFF_STATUS_SW_RST_SHIFT                        2
+#define PALMAS_SWOFF_STATUS_VSYS_LO                             0x02
+#define PALMAS_SWOFF_STATUS_VSYS_LO_SHIFT                       1
+#define PALMAS_SWOFF_STATUS_GPADC_SHUTDOWN                      0x01
+#define PALMAS_SWOFF_STATUS_GPADC_SHUTDOWN_SHIFT                0
+
+/* Bit definitions for PMU_CONFIG */
+#define PALMAS_PMU_CONFIG_MULTI_CELL_EN                         0x40
+#define PALMAS_PMU_CONFIG_MULTI_CELL_EN_SHIFT                   6
+#define PALMAS_PMU_CONFIG_SPARE_MASK                            0x30
+#define PALMAS_PMU_CONFIG_SPARE_SHIFT                           4
+#define PALMAS_PMU_CONFIG_SWOFF_DLY_MASK                        0x0c
+#define PALMAS_PMU_CONFIG_SWOFF_DLY_SHIFT                       2
+#define PALMAS_PMU_CONFIG_GATE_RESET_OUT                        0x02
+#define PALMAS_PMU_CONFIG_GATE_RESET_OUT_SHIFT                  1
+#define PALMAS_PMU_CONFIG_AUTODEVON                             0x01
+#define PALMAS_PMU_CONFIG_AUTODEVON_SHIFT                       0
+
+/* Bit definitions for SPARE */
+#define PALMAS_SPARE_SPARE_MASK                                 0xf8
+#define PALMAS_SPARE_SPARE_SHIFT                                3
+#define PALMAS_SPARE_REGEN3_OD                                  0x04
+#define PALMAS_SPARE_REGEN3_OD_SHIFT                            2
+#define PALMAS_SPARE_REGEN2_OD                                  0x02
+#define PALMAS_SPARE_REGEN2_OD_SHIFT                            1
+#define PALMAS_SPARE_REGEN1_OD                                  0x01
+#define PALMAS_SPARE_REGEN1_OD_SHIFT                            0
+
+/* Bit definitions for PMU_SECONDARY_INT */
+#define PALMAS_PMU_SECONDARY_INT_VBUS_OVV_INT_SRC               0x80
+#define PALMAS_PMU_SECONDARY_INT_VBUS_OVV_INT_SRC_SHIFT         7
+#define PALMAS_PMU_SECONDARY_INT_CHARG_DET_N_INT_SRC            0x40
+#define PALMAS_PMU_SECONDARY_INT_CHARG_DET_N_INT_SRC_SHIFT      6
+#define PALMAS_PMU_SECONDARY_INT_BB_INT_SRC                     0x20
+#define PALMAS_PMU_SECONDARY_INT_BB_INT_SRC_SHIFT               5
+#define PALMAS_PMU_SECONDARY_INT_FBI_INT_SRC                    0x10
+#define PALMAS_PMU_SECONDARY_INT_FBI_INT_SRC_SHIFT              4
+#define PALMAS_PMU_SECONDARY_INT_VBUS_OVV_MASK                  0x08
+#define PALMAS_PMU_SECONDARY_INT_VBUS_OVV_MASK_SHIFT            3
+#define PALMAS_PMU_SECONDARY_INT_CHARG_DET_N_MASK               0x04
+#define PALMAS_PMU_SECONDARY_INT_CHARG_DET_N_MASK_SHIFT         2
+#define PALMAS_PMU_SECONDARY_INT_BB_MASK                        0x02
+#define PALMAS_PMU_SECONDARY_INT_BB_MASK_SHIFT                  1
+#define PALMAS_PMU_SECONDARY_INT_FBI_MASK                       0x01
+#define PALMAS_PMU_SECONDARY_INT_FBI_MASK_SHIFT                 0
+
+/* Bit definitions for SW_REVISION */
+#define PALMAS_SW_REVISION_SW_REVISION_MASK                     0xff
+#define PALMAS_SW_REVISION_SW_REVISION_SHIFT                    0
+
+/* Bit definitions for EXT_CHRG_CTRL */
+#define PALMAS_EXT_CHRG_CTRL_VBUS_OVV_STATUS                    0x80
+#define PALMAS_EXT_CHRG_CTRL_VBUS_OVV_STATUS_SHIFT              7
+#define PALMAS_EXT_CHRG_CTRL_CHARG_DET_N_STATUS                 0x40
+#define PALMAS_EXT_CHRG_CTRL_CHARG_DET_N_STATUS_SHIFT           6
+#define PALMAS_EXT_CHRG_CTRL_VSYS_DEBOUNCE_DELAY                0x08
+#define PALMAS_EXT_CHRG_CTRL_VSYS_DEBOUNCE_DELAY_SHIFT          3
+#define PALMAS_EXT_CHRG_CTRL_CHRG_DET_N                         0x04
+#define PALMAS_EXT_CHRG_CTRL_CHRG_DET_N_SHIFT                   2
+#define PALMAS_EXT_CHRG_CTRL_AUTO_ACA_EN                        0x02
+#define PALMAS_EXT_CHRG_CTRL_AUTO_ACA_EN_SHIFT                  1
+#define PALMAS_EXT_CHRG_CTRL_AUTO_LDOUSB_EN                     0x01
+#define PALMAS_EXT_CHRG_CTRL_AUTO_LDOUSB_EN_SHIFT               0
+
+/* Bit definitions for PMU_SECONDARY_INT2 */
+#define PALMAS_PMU_SECONDARY_INT2_DVFS2_INT_SRC                 0x20
+#define PALMAS_PMU_SECONDARY_INT2_DVFS2_INT_SRC_SHIFT           5
+#define PALMAS_PMU_SECONDARY_INT2_DVFS1_INT_SRC                 0x10
+#define PALMAS_PMU_SECONDARY_INT2_DVFS1_INT_SRC_SHIFT           4
+#define PALMAS_PMU_SECONDARY_INT2_DVFS2_MASK                    0x02
+#define PALMAS_PMU_SECONDARY_INT2_DVFS2_MASK_SHIFT              1
+#define PALMAS_PMU_SECONDARY_INT2_DVFS1_MASK                    0x01
+#define PALMAS_PMU_SECONDARY_INT2_DVFS1_MASK_SHIFT              0
+
+/* Registers for function RESOURCE */
+#define PALMAS_CLK32KG_CTRL                                     0x0
+#define PALMAS_CLK32KGAUDIO_CTRL                                0x1
+#define PALMAS_REGEN1_CTRL                                      0x2
+#define PALMAS_REGEN2_CTRL                                      0x3
+#define PALMAS_SYSEN1_CTRL                                      0x4
+#define PALMAS_SYSEN2_CTRL                                      0x5
+#define PALMAS_NSLEEP_RES_ASSIGN                                0x6
+#define PALMAS_NSLEEP_SMPS_ASSIGN                               0x7
+#define PALMAS_NSLEEP_LDO_ASSIGN1                               0x8
+#define PALMAS_NSLEEP_LDO_ASSIGN2                               0x9
+#define PALMAS_ENABLE1_RES_ASSIGN                               0xA
+#define PALMAS_ENABLE1_SMPS_ASSIGN                              0xB
+#define PALMAS_ENABLE1_LDO_ASSIGN1                              0xC
+#define PALMAS_ENABLE1_LDO_ASSIGN2                              0xD
+#define PALMAS_ENABLE2_RES_ASSIGN                               0xE
+#define PALMAS_ENABLE2_SMPS_ASSIGN                              0xF
+#define PALMAS_ENABLE2_LDO_ASSIGN1                              0x10
+#define PALMAS_ENABLE2_LDO_ASSIGN2                              0x11
+#define PALMAS_REGEN3_CTRL                                      0x12
+
+/* Bit definitions for CLK32KG_CTRL */
+#define PALMAS_CLK32KG_CTRL_STATUS                              0x10
+#define PALMAS_CLK32KG_CTRL_STATUS_SHIFT                        4
+#define PALMAS_CLK32KG_CTRL_MODE_SLEEP                          0x04
+#define PALMAS_CLK32KG_CTRL_MODE_SLEEP_SHIFT                    2
+#define PALMAS_CLK32KG_CTRL_MODE_ACTIVE                         0x01
+#define PALMAS_CLK32KG_CTRL_MODE_ACTIVE_SHIFT                   0
+
+/* Bit definitions for CLK32KGAUDIO_CTRL */
+#define PALMAS_CLK32KGAUDIO_CTRL_STATUS                         0x10
+#define PALMAS_CLK32KGAUDIO_CTRL_STATUS_SHIFT                   4
+#define PALMAS_CLK32KGAUDIO_CTRL_RESERVED3                      0x08
+#define PALMAS_CLK32KGAUDIO_CTRL_RESERVED3_SHIFT                3
+#define PALMAS_CLK32KGAUDIO_CTRL_MODE_SLEEP                     0x04
+#define PALMAS_CLK32KGAUDIO_CTRL_MODE_SLEEP_SHIFT               2
+#define PALMAS_CLK32KGAUDIO_CTRL_MODE_ACTIVE                    0x01
+#define PALMAS_CLK32KGAUDIO_CTRL_MODE_ACTIVE_SHIFT              0
+
+/* Bit definitions for REGEN1_CTRL */
+#define PALMAS_REGEN1_CTRL_STATUS                               0x10
+#define PALMAS_REGEN1_CTRL_STATUS_SHIFT                         4
+#define PALMAS_REGEN1_CTRL_MODE_SLEEP                           0x04
+#define PALMAS_REGEN1_CTRL_MODE_SLEEP_SHIFT                     2
+#define PALMAS_REGEN1_CTRL_MODE_ACTIVE                          0x01
+#define PALMAS_REGEN1_CTRL_MODE_ACTIVE_SHIFT                    0
+
+/* Bit definitions for REGEN2_CTRL */
+#define PALMAS_REGEN2_CTRL_STATUS                               0x10
+#define PALMAS_REGEN2_CTRL_STATUS_SHIFT                         4
+#define PALMAS_REGEN2_CTRL_MODE_SLEEP                           0x04
+#define PALMAS_REGEN2_CTRL_MODE_SLEEP_SHIFT                     2
+#define PALMAS_REGEN2_CTRL_MODE_ACTIVE                          0x01
+#define PALMAS_REGEN2_CTRL_MODE_ACTIVE_SHIFT                    0
+
+/* Bit definitions for SYSEN1_CTRL */
+#define PALMAS_SYSEN1_CTRL_STATUS                               0x10
+#define PALMAS_SYSEN1_CTRL_STATUS_SHIFT                         4
+#define PALMAS_SYSEN1_CTRL_MODE_SLEEP                           0x04
+#define PALMAS_SYSEN1_CTRL_MODE_SLEEP_SHIFT                     2
+#define PALMAS_SYSEN1_CTRL_MODE_ACTIVE                          0x01
+#define PALMAS_SYSEN1_CTRL_MODE_ACTIVE_SHIFT                    0
+
+/* Bit definitions for SYSEN2_CTRL */
+#define PALMAS_SYSEN2_CTRL_STATUS                               0x10
+#define PALMAS_SYSEN2_CTRL_STATUS_SHIFT                         4
+#define PALMAS_SYSEN2_CTRL_MODE_SLEEP                           0x04
+#define PALMAS_SYSEN2_CTRL_MODE_SLEEP_SHIFT                     2
+#define PALMAS_SYSEN2_CTRL_MODE_ACTIVE                          0x01
+#define PALMAS_SYSEN2_CTRL_MODE_ACTIVE_SHIFT                    0
+
+/* Bit definitions for NSLEEP_RES_ASSIGN */
+#define PALMAS_NSLEEP_RES_ASSIGN_REGEN3                         0x40
+#define PALMAS_NSLEEP_RES_ASSIGN_REGEN3_SHIFT                   6
+#define PALMAS_NSLEEP_RES_ASSIGN_CLK32KGAUDIO                   0x20
+#define PALMAS_NSLEEP_RES_ASSIGN_CLK32KGAUDIO_SHIFT             5
+#define PALMAS_NSLEEP_RES_ASSIGN_CLK32KG                        0x10
+#define PALMAS_NSLEEP_RES_ASSIGN_CLK32KG_SHIFT                  4
+#define PALMAS_NSLEEP_RES_ASSIGN_SYSEN2                         0x08
+#define PALMAS_NSLEEP_RES_ASSIGN_SYSEN2_SHIFT                   3
+#define PALMAS_NSLEEP_RES_ASSIGN_SYSEN1                         0x04
+#define PALMAS_NSLEEP_RES_ASSIGN_SYSEN1_SHIFT                   2
+#define PALMAS_NSLEEP_RES_ASSIGN_REGEN2                         0x02
+#define PALMAS_NSLEEP_RES_ASSIGN_REGEN2_SHIFT                   1
+#define PALMAS_NSLEEP_RES_ASSIGN_REGEN1                         0x01
+#define PALMAS_NSLEEP_RES_ASSIGN_REGEN1_SHIFT                   0
+
+/* Bit definitions for NSLEEP_SMPS_ASSIGN */
+#define PALMAS_NSLEEP_SMPS_ASSIGN_SMPS10                        0x80
+#define PALMAS_NSLEEP_SMPS_ASSIGN_SMPS10_SHIFT                  7
+#define PALMAS_NSLEEP_SMPS_ASSIGN_SMPS9                         0x40
+#define PALMAS_NSLEEP_SMPS_ASSIGN_SMPS9_SHIFT                   6
+#define PALMAS_NSLEEP_SMPS_ASSIGN_SMPS8                         0x20
+#define PALMAS_NSLEEP_SMPS_ASSIGN_SMPS8_SHIFT                   5
+#define PALMAS_NSLEEP_SMPS_ASSIGN_SMPS7                         0x10
+#define PALMAS_NSLEEP_SMPS_ASSIGN_SMPS7_SHIFT                   4
+#define PALMAS_NSLEEP_SMPS_ASSIGN_SMPS6                         0x08
+#define PALMAS_NSLEEP_SMPS_ASSIGN_SMPS6_SHIFT                   3
+#define PALMAS_NSLEEP_SMPS_ASSIGN_SMPS45                        0x04
+#define PALMAS_NSLEEP_SMPS_ASSIGN_SMPS45_SHIFT                  2
+#define PALMAS_NSLEEP_SMPS_ASSIGN_SMPS3                         0x02
+#define PALMAS_NSLEEP_SMPS_ASSIGN_SMPS3_SHIFT                   1
+#define PALMAS_NSLEEP_SMPS_ASSIGN_SMPS12                        0x01
+#define PALMAS_NSLEEP_SMPS_ASSIGN_SMPS12_SHIFT                  0
+
+/* Bit definitions for NSLEEP_LDO_ASSIGN1 */
+#define PALMAS_NSLEEP_LDO_ASSIGN1_LDO8                          0x80
+#define PALMAS_NSLEEP_LDO_ASSIGN1_LDO8_SHIFT                    7
+#define PALMAS_NSLEEP_LDO_ASSIGN1_LDO7                          0x40
+#define PALMAS_NSLEEP_LDO_ASSIGN1_LDO7_SHIFT                    6
+#define PALMAS_NSLEEP_LDO_ASSIGN1_LDO6                          0x20
+#define PALMAS_NSLEEP_LDO_ASSIGN1_LDO6_SHIFT                    5
+#define PALMAS_NSLEEP_LDO_ASSIGN1_LDO5                          0x10
+#define PALMAS_NSLEEP_LDO_ASSIGN1_LDO5_SHIFT                    4
+#define PALMAS_NSLEEP_LDO_ASSIGN1_LDO4                          0x08
+#define PALMAS_NSLEEP_LDO_ASSIGN1_LDO4_SHIFT                    3
+#define PALMAS_NSLEEP_LDO_ASSIGN1_LDO3                          0x04
+#define PALMAS_NSLEEP_LDO_ASSIGN1_LDO3_SHIFT                    2
+#define PALMAS_NSLEEP_LDO_ASSIGN1_LDO2                          0x02
+#define PALMAS_NSLEEP_LDO_ASSIGN1_LDO2_SHIFT                    1
+#define PALMAS_NSLEEP_LDO_ASSIGN1_LDO1                          0x01
+#define PALMAS_NSLEEP_LDO_ASSIGN1_LDO1_SHIFT                    0
+
+/* Bit definitions for NSLEEP_LDO_ASSIGN2 */
+#define PALMAS_NSLEEP_LDO_ASSIGN2_LDOUSB                        0x04
+#define PALMAS_NSLEEP_LDO_ASSIGN2_LDOUSB_SHIFT                  2
+#define PALMAS_NSLEEP_LDO_ASSIGN2_LDOLN                         0x02
+#define PALMAS_NSLEEP_LDO_ASSIGN2_LDOLN_SHIFT                   1
+#define PALMAS_NSLEEP_LDO_ASSIGN2_LDO9                          0x01
+#define PALMAS_NSLEEP_LDO_ASSIGN2_LDO9_SHIFT                    0
+
+/* Bit definitions for ENABLE1_RES_ASSIGN */
+#define PALMAS_ENABLE1_RES_ASSIGN_REGEN3                        0x40
+#define PALMAS_ENABLE1_RES_ASSIGN_REGEN3_SHIFT                  6
+#define PALMAS_ENABLE1_RES_ASSIGN_CLK32KGAUDIO                  0x20
+#define PALMAS_ENABLE1_RES_ASSIGN_CLK32KGAUDIO_SHIFT            5
+#define PALMAS_ENABLE1_RES_ASSIGN_CLK32KG                       0x10
+#define PALMAS_ENABLE1_RES_ASSIGN_CLK32KG_SHIFT                 4
+#define PALMAS_ENABLE1_RES_ASSIGN_SYSEN2                        0x08
+#define PALMAS_ENABLE1_RES_ASSIGN_SYSEN2_SHIFT                  3
+#define PALMAS_ENABLE1_RES_ASSIGN_SYSEN1                        0x04
+#define PALMAS_ENABLE1_RES_ASSIGN_SYSEN1_SHIFT                  2
+#define PALMAS_ENABLE1_RES_ASSIGN_REGEN2                        0x02
+#define PALMAS_ENABLE1_RES_ASSIGN_REGEN2_SHIFT                  1
+#define PALMAS_ENABLE1_RES_ASSIGN_REGEN1                        0x01
+#define PALMAS_ENABLE1_RES_ASSIGN_REGEN1_SHIFT                  0
+
+/* Bit definitions for ENABLE1_SMPS_ASSIGN */
+#define PALMAS_ENABLE1_SMPS_ASSIGN_SMPS10                       0x80
+#define PALMAS_ENABLE1_SMPS_ASSIGN_SMPS10_SHIFT                 7
+#define PALMAS_ENABLE1_SMPS_ASSIGN_SMPS9                        0x40
+#define PALMAS_ENABLE1_SMPS_ASSIGN_SMPS9_SHIFT                  6
+#define PALMAS_ENABLE1_SMPS_ASSIGN_SMPS8                        0x20
+#define PALMAS_ENABLE1_SMPS_ASSIGN_SMPS8_SHIFT                  5
+#define PALMAS_ENABLE1_SMPS_ASSIGN_SMPS7                        0x10
+#define PALMAS_ENABLE1_SMPS_ASSIGN_SMPS7_SHIFT                  4
+#define PALMAS_ENABLE1_SMPS_ASSIGN_SMPS6                        0x08
+#define PALMAS_ENABLE1_SMPS_ASSIGN_SMPS6_SHIFT                  3
+#define PALMAS_ENABLE1_SMPS_ASSIGN_SMPS45                       0x04
+#define PALMAS_ENABLE1_SMPS_ASSIGN_SMPS45_SHIFT                 2
+#define PALMAS_ENABLE1_SMPS_ASSIGN_SMPS3                        0x02
+#define PALMAS_ENABLE1_SMPS_ASSIGN_SMPS3_SHIFT                  1
+#define PALMAS_ENABLE1_SMPS_ASSIGN_SMPS12                       0x01
+#define PALMAS_ENABLE1_SMPS_ASSIGN_SMPS12_SHIFT                 0
+
+/* Bit definitions for ENABLE1_LDO_ASSIGN1 */
+#define PALMAS_ENABLE1_LDO_ASSIGN1_LDO8                         0x80
+#define PALMAS_ENABLE1_LDO_ASSIGN1_LDO8_SHIFT                   7
+#define PALMAS_ENABLE1_LDO_ASSIGN1_LDO7                         0x40
+#define PALMAS_ENABLE1_LDO_ASSIGN1_LDO7_SHIFT                   6
+#define PALMAS_ENABLE1_LDO_ASSIGN1_LDO6                         0x20
+#define PALMAS_ENABLE1_LDO_ASSIGN1_LDO6_SHIFT                   5
+#define PALMAS_ENABLE1_LDO_ASSIGN1_LDO5                         0x10
+#define PALMAS_ENABLE1_LDO_ASSIGN1_LDO5_SHIFT                   4
+#define PALMAS_ENABLE1_LDO_ASSIGN1_LDO4                         0x08
+#define PALMAS_ENABLE1_LDO_ASSIGN1_LDO4_SHIFT                   3
+#define PALMAS_ENABLE1_LDO_ASSIGN1_LDO3                         0x04
+#define PALMAS_ENABLE1_LDO_ASSIGN1_LDO3_SHIFT                   2
+#define PALMAS_ENABLE1_LDO_ASSIGN1_LDO2                         0x02
+#define PALMAS_ENABLE1_LDO_ASSIGN1_LDO2_SHIFT                   1
+#define PALMAS_ENABLE1_LDO_ASSIGN1_LDO1                         0x01
+#define PALMAS_ENABLE1_LDO_ASSIGN1_LDO1_SHIFT                   0
+
+/* Bit definitions for ENABLE1_LDO_ASSIGN2 */
+#define PALMAS_ENABLE1_LDO_ASSIGN2_LDOUSB                       0x04
+#define PALMAS_ENABLE1_LDO_ASSIGN2_LDOUSB_SHIFT                 2
+#define PALMAS_ENABLE1_LDO_ASSIGN2_LDOLN                        0x02
+#define PALMAS_ENABLE1_LDO_ASSIGN2_LDOLN_SHIFT                  1
+#define PALMAS_ENABLE1_LDO_ASSIGN2_LDO9                         0x01
+#define PALMAS_ENABLE1_LDO_ASSIGN2_LDO9_SHIFT                   0
+
+/* Bit definitions for ENABLE2_RES_ASSIGN */
+#define PALMAS_ENABLE2_RES_ASSIGN_REGEN3                        0x40
+#define PALMAS_ENABLE2_RES_ASSIGN_REGEN3_SHIFT                  6
+#define PALMAS_ENABLE2_RES_ASSIGN_CLK32KGAUDIO                  0x20
+#define PALMAS_ENABLE2_RES_ASSIGN_CLK32KGAUDIO_SHIFT            5
+#define PALMAS_ENABLE2_RES_ASSIGN_CLK32KG                       0x10
+#define PALMAS_ENABLE2_RES_ASSIGN_CLK32KG_SHIFT                 4
+#define PALMAS_ENABLE2_RES_ASSIGN_SYSEN2                        0x08
+#define PALMAS_ENABLE2_RES_ASSIGN_SYSEN2_SHIFT                  3
+#define PALMAS_ENABLE2_RES_ASSIGN_SYSEN1                        0x04
+#define PALMAS_ENABLE2_RES_ASSIGN_SYSEN1_SHIFT                  2
+#define PALMAS_ENABLE2_RES_ASSIGN_REGEN2                        0x02
+#define PALMAS_ENABLE2_RES_ASSIGN_REGEN2_SHIFT                  1
+#define PALMAS_ENABLE2_RES_ASSIGN_REGEN1                        0x01
+#define PALMAS_ENABLE2_RES_ASSIGN_REGEN1_SHIFT                  0
+
+/* Bit definitions for ENABLE2_SMPS_ASSIGN */
+#define PALMAS_ENABLE2_SMPS_ASSIGN_SMPS10                       0x80
+#define PALMAS_ENABLE2_SMPS_ASSIGN_SMPS10_SHIFT                 7
+#define PALMAS_ENABLE2_SMPS_ASSIGN_SMPS9                        0x40
+#define PALMAS_ENABLE2_SMPS_ASSIGN_SMPS9_SHIFT                  6
+#define PALMAS_ENABLE2_SMPS_ASSIGN_SMPS8                        0x20
+#define PALMAS_ENABLE2_SMPS_ASSIGN_SMPS8_SHIFT                  5
+#define PALMAS_ENABLE2_SMPS_ASSIGN_SMPS7                        0x10
+#define PALMAS_ENABLE2_SMPS_ASSIGN_SMPS7_SHIFT                  4
+#define PALMAS_ENABLE2_SMPS_ASSIGN_SMPS6                        0x08
+#define PALMAS_ENABLE2_SMPS_ASSIGN_SMPS6_SHIFT                  3
+#define PALMAS_ENABLE2_SMPS_ASSIGN_SMPS45                       0x04
+#define PALMAS_ENABLE2_SMPS_ASSIGN_SMPS45_SHIFT                 2
+#define PALMAS_ENABLE2_SMPS_ASSIGN_SMPS3                        0x02
+#define PALMAS_ENABLE2_SMPS_ASSIGN_SMPS3_SHIFT                  1
+#define PALMAS_ENABLE2_SMPS_ASSIGN_SMPS12                       0x01
+#define PALMAS_ENABLE2_SMPS_ASSIGN_SMPS12_SHIFT                 0
+
+/* Bit definitions for ENABLE2_LDO_ASSIGN1 */
+#define PALMAS_ENABLE2_LDO_ASSIGN1_LDO8                         0x80
+#define PALMAS_ENABLE2_LDO_ASSIGN1_LDO8_SHIFT                   7
+#define PALMAS_ENABLE2_LDO_ASSIGN1_LDO7                         0x40
+#define PALMAS_ENABLE2_LDO_ASSIGN1_LDO7_SHIFT                   6
+#define PALMAS_ENABLE2_LDO_ASSIGN1_LDO6                         0x20
+#define PALMAS_ENABLE2_LDO_ASSIGN1_LDO6_SHIFT                   5
+#define PALMAS_ENABLE2_LDO_ASSIGN1_LDO5                         0x10
+#define PALMAS_ENABLE2_LDO_ASSIGN1_LDO5_SHIFT                   4
+#define PALMAS_ENABLE2_LDO_ASSIGN1_LDO4                         0x08
+#define PALMAS_ENABLE2_LDO_ASSIGN1_LDO4_SHIFT                   3
+#define PALMAS_ENABLE2_LDO_ASSIGN1_LDO3                         0x04
+#define PALMAS_ENABLE2_LDO_ASSIGN1_LDO3_SHIFT                   2
+#define PALMAS_ENABLE2_LDO_ASSIGN1_LDO2                         0x02
+#define PALMAS_ENABLE2_LDO_ASSIGN1_LDO2_SHIFT                   1
+#define PALMAS_ENABLE2_LDO_ASSIGN1_LDO1                         0x01
+#define PALMAS_ENABLE2_LDO_ASSIGN1_LDO1_SHIFT                   0
+
+/* Bit definitions for ENABLE2_LDO_ASSIGN2 */
+#define PALMAS_ENABLE2_LDO_ASSIGN2_LDOUSB                       0x04
+#define PALMAS_ENABLE2_LDO_ASSIGN2_LDOUSB_SHIFT                 2
+#define PALMAS_ENABLE2_LDO_ASSIGN2_LDOLN                        0x02
+#define PALMAS_ENABLE2_LDO_ASSIGN2_LDOLN_SHIFT                  1
+#define PALMAS_ENABLE2_LDO_ASSIGN2_LDO9                         0x01
+#define PALMAS_ENABLE2_LDO_ASSIGN2_LDO9_SHIFT                   0
+
+/* Bit definitions for REGEN3_CTRL */
+#define PALMAS_REGEN3_CTRL_STATUS                               0x10
+#define PALMAS_REGEN3_CTRL_STATUS_SHIFT                         4
+#define PALMAS_REGEN3_CTRL_MODE_SLEEP                           0x04
+#define PALMAS_REGEN3_CTRL_MODE_SLEEP_SHIFT                     2
+#define PALMAS_REGEN3_CTRL_MODE_ACTIVE                          0x01
+#define PALMAS_REGEN3_CTRL_MODE_ACTIVE_SHIFT                    0
+
+/* Registers for function PAD_CONTROL */
+#define PALMAS_PU_PD_INPUT_CTRL1                                0x0
+#define PALMAS_PU_PD_INPUT_CTRL2                                0x1
+#define PALMAS_PU_PD_INPUT_CTRL3                                0x2
+#define PALMAS_OD_OUTPUT_CTRL                                   0x4
+#define PALMAS_POLARITY_CTRL                                    0x5
+#define PALMAS_PRIMARY_SECONDARY_PAD1                           0x6
+#define PALMAS_PRIMARY_SECONDARY_PAD2                           0x7
+#define PALMAS_I2C_SPI                                          0x8
+#define PALMAS_PU_PD_INPUT_CTRL4                                0x9
+#define PALMAS_PRIMARY_SECONDARY_PAD3                           0xA
+
+/* Bit definitions for PU_PD_INPUT_CTRL1 */
+#define PALMAS_PU_PD_INPUT_CTRL1_RESET_IN_PD                    0x40
+#define PALMAS_PU_PD_INPUT_CTRL1_RESET_IN_PD_SHIFT              6
+#define PALMAS_PU_PD_INPUT_CTRL1_GPADC_START_PU                 0x20
+#define PALMAS_PU_PD_INPUT_CTRL1_GPADC_START_PU_SHIFT           5
+#define PALMAS_PU_PD_INPUT_CTRL1_GPADC_START_PD                 0x10
+#define PALMAS_PU_PD_INPUT_CTRL1_GPADC_START_PD_SHIFT           4
+#define PALMAS_PU_PD_INPUT_CTRL1_PWRDOWN_PD                     0x04
+#define PALMAS_PU_PD_INPUT_CTRL1_PWRDOWN_PD_SHIFT               2
+#define PALMAS_PU_PD_INPUT_CTRL1_NRESWARM_PU                    0x02
+#define PALMAS_PU_PD_INPUT_CTRL1_NRESWARM_PU_SHIFT              1
+
+/* Bit definitions for PU_PD_INPUT_CTRL2 */
+#define PALMAS_PU_PD_INPUT_CTRL2_ENABLE2_PU                     0x20
+#define PALMAS_PU_PD_INPUT_CTRL2_ENABLE2_PU_SHIFT               5
+#define PALMAS_PU_PD_INPUT_CTRL2_ENABLE2_PD                     0x10
+#define PALMAS_PU_PD_INPUT_CTRL2_ENABLE2_PD_SHIFT               4
+#define PALMAS_PU_PD_INPUT_CTRL2_ENABLE1_PU                     0x08
+#define PALMAS_PU_PD_INPUT_CTRL2_ENABLE1_PU_SHIFT               3
+#define PALMAS_PU_PD_INPUT_CTRL2_ENABLE1_PD                     0x04
+#define PALMAS_PU_PD_INPUT_CTRL2_ENABLE1_PD_SHIFT               2
+#define PALMAS_PU_PD_INPUT_CTRL2_NSLEEP_PU                      0x02
+#define PALMAS_PU_PD_INPUT_CTRL2_NSLEEP_PU_SHIFT                1
+#define PALMAS_PU_PD_INPUT_CTRL2_NSLEEP_PD                      0x01
+#define PALMAS_PU_PD_INPUT_CTRL2_NSLEEP_PD_SHIFT                0
+
+/* Bit definitions for PU_PD_INPUT_CTRL3 */
+#define PALMAS_PU_PD_INPUT_CTRL3_ACOK_PD                        0x40
+#define PALMAS_PU_PD_INPUT_CTRL3_ACOK_PD_SHIFT                  6
+#define PALMAS_PU_PD_INPUT_CTRL3_CHRG_DET_N_PD                  0x10
+#define PALMAS_PU_PD_INPUT_CTRL3_CHRG_DET_N_PD_SHIFT            4
+#define PALMAS_PU_PD_INPUT_CTRL3_POWERHOLD_PD                   0x04
+#define PALMAS_PU_PD_INPUT_CTRL3_POWERHOLD_PD_SHIFT             2
+#define PALMAS_PU_PD_INPUT_CTRL3_MSECURE_PD                     0x01
+#define PALMAS_PU_PD_INPUT_CTRL3_MSECURE_PD_SHIFT               0
+
+/* Bit definitions for OD_OUTPUT_CTRL */
+#define PALMAS_OD_OUTPUT_CTRL_PWM_2_OD                          0x80
+#define PALMAS_OD_OUTPUT_CTRL_PWM_2_OD_SHIFT                    7
+#define PALMAS_OD_OUTPUT_CTRL_VBUSDET_OD                        0x40
+#define PALMAS_OD_OUTPUT_CTRL_VBUSDET_OD_SHIFT                  6
+#define PALMAS_OD_OUTPUT_CTRL_PWM_1_OD                          0x20
+#define PALMAS_OD_OUTPUT_CTRL_PWM_1_OD_SHIFT                    5
+#define PALMAS_OD_OUTPUT_CTRL_INT_OD                            0x08
+#define PALMAS_OD_OUTPUT_CTRL_INT_OD_SHIFT                      3
+
+/* Bit definitions for POLARITY_CTRL */
+#define PALMAS_POLARITY_CTRL_INT_POLARITY                       0x80
+#define PALMAS_POLARITY_CTRL_INT_POLARITY_SHIFT                 7
+#define PALMAS_POLARITY_CTRL_ENABLE2_POLARITY                   0x40
+#define PALMAS_POLARITY_CTRL_ENABLE2_POLARITY_SHIFT             6
+#define PALMAS_POLARITY_CTRL_ENABLE1_POLARITY                   0x20
+#define PALMAS_POLARITY_CTRL_ENABLE1_POLARITY_SHIFT             5
+#define PALMAS_POLARITY_CTRL_NSLEEP_POLARITY                    0x10
+#define PALMAS_POLARITY_CTRL_NSLEEP_POLARITY_SHIFT              4
+#define PALMAS_POLARITY_CTRL_RESET_IN_POLARITY                  0x08
+#define PALMAS_POLARITY_CTRL_RESET_IN_POLARITY_SHIFT            3
+#define PALMAS_POLARITY_CTRL_GPIO_3_CHRG_DET_N_POLARITY         0x04
+#define PALMAS_POLARITY_CTRL_GPIO_3_CHRG_DET_N_POLARITY_SHIFT   2
+#define PALMAS_POLARITY_CTRL_POWERGOOD_USB_PSEL_POLARITY        0x02
+#define PALMAS_POLARITY_CTRL_POWERGOOD_USB_PSEL_POLARITY_SHIFT  1
+#define PALMAS_POLARITY_CTRL_PWRDOWN_POLARITY                   0x01
+#define PALMAS_POLARITY_CTRL_PWRDOWN_POLARITY_SHIFT             0
+
+/* Bit definitions for PRIMARY_SECONDARY_PAD1 */
+#define PALMAS_PRIMARY_SECONDARY_PAD1_GPIO_3                    0x80
+#define PALMAS_PRIMARY_SECONDARY_PAD1_GPIO_3_SHIFT              7
+#define PALMAS_PRIMARY_SECONDARY_PAD1_GPIO_2_MASK               0x60
+#define PALMAS_PRIMARY_SECONDARY_PAD1_GPIO_2_SHIFT              5
+#define PALMAS_PRIMARY_SECONDARY_PAD1_GPIO_1_MASK               0x18
+#define PALMAS_PRIMARY_SECONDARY_PAD1_GPIO_1_SHIFT              3
+#define PALMAS_PRIMARY_SECONDARY_PAD1_GPIO_0                    0x04
+#define PALMAS_PRIMARY_SECONDARY_PAD1_GPIO_0_SHIFT              2
+#define PALMAS_PRIMARY_SECONDARY_PAD1_VAC                       0x02
+#define PALMAS_PRIMARY_SECONDARY_PAD1_VAC_SHIFT                 1
+#define PALMAS_PRIMARY_SECONDARY_PAD1_POWERGOOD                 0x01
+#define PALMAS_PRIMARY_SECONDARY_PAD1_POWERGOOD_SHIFT           0
+
+/* Bit definitions for PRIMARY_SECONDARY_PAD2 */
+#define PALMAS_PRIMARY_SECONDARY_PAD2_GPIO_7_MASK               0x30
+#define PALMAS_PRIMARY_SECONDARY_PAD2_GPIO_7_SHIFT              4
+#define PALMAS_PRIMARY_SECONDARY_PAD2_GPIO_6                    0x08
+#define PALMAS_PRIMARY_SECONDARY_PAD2_GPIO_6_SHIFT              3
+#define PALMAS_PRIMARY_SECONDARY_PAD2_GPIO_5_MASK               0x06
+#define PALMAS_PRIMARY_SECONDARY_PAD2_GPIO_5_SHIFT              1
+#define PALMAS_PRIMARY_SECONDARY_PAD2_GPIO_4                    0x01
+#define PALMAS_PRIMARY_SECONDARY_PAD2_GPIO_4_SHIFT              0
+
+/* Bit definitions for I2C_SPI */
+#define PALMAS_I2C_SPI_I2C2OTP_EN                               0x80
+#define PALMAS_I2C_SPI_I2C2OTP_EN_SHIFT                         7
+#define PALMAS_I2C_SPI_I2C2OTP_PAGESEL                          0x40
+#define PALMAS_I2C_SPI_I2C2OTP_PAGESEL_SHIFT                    6
+#define PALMAS_I2C_SPI_ID_I2C2                                  0x20
+#define PALMAS_I2C_SPI_ID_I2C2_SHIFT                            5
+#define PALMAS_I2C_SPI_I2C_SPI                                  0x10
+#define PALMAS_I2C_SPI_I2C_SPI_SHIFT                            4
+#define PALMAS_I2C_SPI_ID_I2C1_MASK                             0x0f
+#define PALMAS_I2C_SPI_ID_I2C1_SHIFT                            0
+
+/* Bit definitions for PU_PD_INPUT_CTRL4 */
+#define PALMAS_PU_PD_INPUT_CTRL4_DVFS2_DAT_PD                   0x40
+#define PALMAS_PU_PD_INPUT_CTRL4_DVFS2_DAT_PD_SHIFT             6
+#define PALMAS_PU_PD_INPUT_CTRL4_DVFS2_CLK_PD                   0x10
+#define PALMAS_PU_PD_INPUT_CTRL4_DVFS2_CLK_PD_SHIFT             4
+#define PALMAS_PU_PD_INPUT_CTRL4_DVFS1_DAT_PD                   0x04
+#define PALMAS_PU_PD_INPUT_CTRL4_DVFS1_DAT_PD_SHIFT             2
+#define PALMAS_PU_PD_INPUT_CTRL4_DVFS1_CLK_PD                   0x01
+#define PALMAS_PU_PD_INPUT_CTRL4_DVFS1_CLK_PD_SHIFT             0
+
+/* Bit definitions for PRIMARY_SECONDARY_PAD3 */
+#define PALMAS_PRIMARY_SECONDARY_PAD3_DVFS2                     0x02
+#define PALMAS_PRIMARY_SECONDARY_PAD3_DVFS2_SHIFT               1
+#define PALMAS_PRIMARY_SECONDARY_PAD3_DVFS1                     0x01
+#define PALMAS_PRIMARY_SECONDARY_PAD3_DVFS1_SHIFT               0
+
+/* Registers for function LED_PWM */
+#define PALMAS_LED_PERIOD_CTRL                                  0x0
+#define PALMAS_LED_CTRL                                         0x1
+#define PALMAS_PWM_CTRL1                                        0x2
+#define PALMAS_PWM_CTRL2                                        0x3
+
+/* Bit definitions for LED_PERIOD_CTRL */
+#define PALMAS_LED_PERIOD_CTRL_LED_2_PERIOD_MASK                0x38
+#define PALMAS_LED_PERIOD_CTRL_LED_2_PERIOD_SHIFT               3
+#define PALMAS_LED_PERIOD_CTRL_LED_1_PERIOD_MASK                0x07
+#define PALMAS_LED_PERIOD_CTRL_LED_1_PERIOD_SHIFT               0
+
+/* Bit definitions for LED_CTRL */
+#define PALMAS_LED_CTRL_LED_2_SEQ                               0x20
+#define PALMAS_LED_CTRL_LED_2_SEQ_SHIFT                         5
+#define PALMAS_LED_CTRL_LED_1_SEQ                               0x10
+#define PALMAS_LED_CTRL_LED_1_SEQ_SHIFT                         4
+#define PALMAS_LED_CTRL_LED_2_ON_TIME_MASK                      0x0c
+#define PALMAS_LED_CTRL_LED_2_ON_TIME_SHIFT                     2
+#define PALMAS_LED_CTRL_LED_1_ON_TIME_MASK                      0x03
+#define PALMAS_LED_CTRL_LED_1_ON_TIME_SHIFT                     0
+
+/* Bit definitions for PWM_CTRL1 */
+#define PALMAS_PWM_CTRL1_PWM_FREQ_EN                            0x02
+#define PALMAS_PWM_CTRL1_PWM_FREQ_EN_SHIFT                      1
+#define PALMAS_PWM_CTRL1_PWM_FREQ_SEL                           0x01
+#define PALMAS_PWM_CTRL1_PWM_FREQ_SEL_SHIFT                     0
+
+/* Bit definitions for PWM_CTRL2 */
+#define PALMAS_PWM_CTRL2_PWM_DUTY_SEL_MASK                      0xff
+#define PALMAS_PWM_CTRL2_PWM_DUTY_SEL_SHIFT                     0
+
+/* Registers for function INTERRUPT */
+#define PALMAS_INT1_STATUS                                      0x0
+#define PALMAS_INT1_MASK                                        0x1
+#define PALMAS_INT1_LINE_STATE                                  0x2
+#define PALMAS_INT1_EDGE_DETECT1_RESERVED                       0x3
+#define PALMAS_INT1_EDGE_DETECT2_RESERVED                       0x4
+#define PALMAS_INT2_STATUS                                      0x5
+#define PALMAS_INT2_MASK                                        0x6
+#define PALMAS_INT2_LINE_STATE                                  0x7
+#define PALMAS_INT2_EDGE_DETECT1_RESERVED                       0x8
+#define PALMAS_INT2_EDGE_DETECT2_RESERVED                       0x9
+#define PALMAS_INT3_STATUS                                      0xA
+#define PALMAS_INT3_MASK                                        0xB
+#define PALMAS_INT3_LINE_STATE                                  0xC
+#define PALMAS_INT3_EDGE_DETECT1_RESERVED                       0xD
+#define PALMAS_INT3_EDGE_DETECT2_RESERVED                       0xE
+#define PALMAS_INT4_STATUS                                      0xF
+#define PALMAS_INT4_MASK                                        0x10
+#define PALMAS_INT4_LINE_STATE                                  0x11
+#define PALMAS_INT4_EDGE_DETECT1                                0x12
+#define PALMAS_INT4_EDGE_DETECT2                                0x13
+#define PALMAS_INT_CTRL                                         0x14
+
+/* Bit definitions for INT1_STATUS */
+#define PALMAS_INT1_STATUS_VBAT_MON                             0x80
+#define PALMAS_INT1_STATUS_VBAT_MON_SHIFT                       7
+#define PALMAS_INT1_STATUS_VSYS_MON                             0x40
+#define PALMAS_INT1_STATUS_VSYS_MON_SHIFT                       6
+#define PALMAS_INT1_STATUS_HOTDIE                               0x20
+#define PALMAS_INT1_STATUS_HOTDIE_SHIFT                         5
+#define PALMAS_INT1_STATUS_PWRDOWN                              0x10
+#define PALMAS_INT1_STATUS_PWRDOWN_SHIFT                        4
+#define PALMAS_INT1_STATUS_RPWRON                               0x08
+#define PALMAS_INT1_STATUS_RPWRON_SHIFT                         3
+#define PALMAS_INT1_STATUS_LONG_PRESS_KEY                       0x04
+#define PALMAS_INT1_STATUS_LONG_PRESS_KEY_SHIFT                 2
+#define PALMAS_INT1_STATUS_PWRON                                0x02
+#define PALMAS_INT1_STATUS_PWRON_SHIFT                          1
+#define PALMAS_INT1_STATUS_CHARG_DET_N_VBUS_OVV                 0x01
+#define PALMAS_INT1_STATUS_CHARG_DET_N_VBUS_OVV_SHIFT           0
+
+/* Bit definitions for INT1_MASK */
+#define PALMAS_INT1_MASK_VBAT_MON                               0x80
+#define PALMAS_INT1_MASK_VBAT_MON_SHIFT                         7
+#define PALMAS_INT1_MASK_VSYS_MON                               0x40
+#define PALMAS_INT1_MASK_VSYS_MON_SHIFT                         6
+#define PALMAS_INT1_MASK_HOTDIE                                 0x20
+#define PALMAS_INT1_MASK_HOTDIE_SHIFT                           5
+#define PALMAS_INT1_MASK_PWRDOWN                                0x10
+#define PALMAS_INT1_MASK_PWRDOWN_SHIFT                          4
+#define PALMAS_INT1_MASK_RPWRON                                 0x08
+#define PALMAS_INT1_MASK_RPWRON_SHIFT                           3
+#define PALMAS_INT1_MASK_LONG_PRESS_KEY                         0x04
+#define PALMAS_INT1_MASK_LONG_PRESS_KEY_SHIFT                   2
+#define PALMAS_INT1_MASK_PWRON                                  0x02
+#define PALMAS_INT1_MASK_PWRON_SHIFT                            1
+#define PALMAS_INT1_MASK_CHARG_DET_N_VBUS_OVV                   0x01
+#define PALMAS_INT1_MASK_CHARG_DET_N_VBUS_OVV_SHIFT             0
+
+/* Bit definitions for INT1_LINE_STATE */
+#define PALMAS_INT1_LINE_STATE_VBAT_MON                         0x80
+#define PALMAS_INT1_LINE_STATE_VBAT_MON_SHIFT                   7
+#define PALMAS_INT1_LINE_STATE_VSYS_MON                         0x40
+#define PALMAS_INT1_LINE_STATE_VSYS_MON_SHIFT                   6
+#define PALMAS_INT1_LINE_STATE_HOTDIE                           0x20
+#define PALMAS_INT1_LINE_STATE_HOTDIE_SHIFT                     5
+#define PALMAS_INT1_LINE_STATE_PWRDOWN                          0x10
+#define PALMAS_INT1_LINE_STATE_PWRDOWN_SHIFT                    4
+#define PALMAS_INT1_LINE_STATE_RPWRON                           0x08
+#define PALMAS_INT1_LINE_STATE_RPWRON_SHIFT                     3
+#define PALMAS_INT1_LINE_STATE_LONG_PRESS_KEY                   0x04
+#define PALMAS_INT1_LINE_STATE_LONG_PRESS_KEY_SHIFT             2
+#define PALMAS_INT1_LINE_STATE_PWRON                            0x02
+#define PALMAS_INT1_LINE_STATE_PWRON_SHIFT                      1
+#define PALMAS_INT1_LINE_STATE_CHARG_DET_N_VBUS_OVV             0x01
+#define PALMAS_INT1_LINE_STATE_CHARG_DET_N_VBUS_OVV_SHIFT       0
+
+/* Bit definitions for INT2_STATUS */
+#define PALMAS_INT2_STATUS_VAC_ACOK                             0x80
+#define PALMAS_INT2_STATUS_VAC_ACOK_SHIFT                       7
+#define PALMAS_INT2_STATUS_SHORT                                0x40
+#define PALMAS_INT2_STATUS_SHORT_SHIFT                          6
+#define PALMAS_INT2_STATUS_FBI_BB                               0x20
+#define PALMAS_INT2_STATUS_FBI_BB_SHIFT                         5
+#define PALMAS_INT2_STATUS_RESET_IN                             0x10
+#define PALMAS_INT2_STATUS_RESET_IN_SHIFT                       4
+#define PALMAS_INT2_STATUS_BATREMOVAL                           0x08
+#define PALMAS_INT2_STATUS_BATREMOVAL_SHIFT                     3
+#define PALMAS_INT2_STATUS_WDT                                  0x04
+#define PALMAS_INT2_STATUS_WDT_SHIFT                            2
+#define PALMAS_INT2_STATUS_RTC_TIMER                            0x02
+#define PALMAS_INT2_STATUS_RTC_TIMER_SHIFT                      1
+#define PALMAS_INT2_STATUS_RTC_ALARM                            0x01
+#define PALMAS_INT2_STATUS_RTC_ALARM_SHIFT                      0
+
+/* Bit definitions for INT2_MASK */
+#define PALMAS_INT2_MASK_VAC_ACOK                               0x80
+#define PALMAS_INT2_MASK_VAC_ACOK_SHIFT                         7
+#define PALMAS_INT2_MASK_SHORT                                  0x40
+#define PALMAS_INT2_MASK_SHORT_SHIFT                            6
+#define PALMAS_INT2_MASK_FBI_BB                                 0x20
+#define PALMAS_INT2_MASK_FBI_BB_SHIFT                           5
+#define PALMAS_INT2_MASK_RESET_IN                               0x10
+#define PALMAS_INT2_MASK_RESET_IN_SHIFT                         4
+#define PALMAS_INT2_MASK_BATREMOVAL                             0x08
+#define PALMAS_INT2_MASK_BATREMOVAL_SHIFT                       3
+#define PALMAS_INT2_MASK_WDT                                    0x04
+#define PALMAS_INT2_MASK_WDT_SHIFT                              2
+#define PALMAS_INT2_MASK_RTC_TIMER                              0x02
+#define PALMAS_INT2_MASK_RTC_TIMER_SHIFT                        1
+#define PALMAS_INT2_MASK_RTC_ALARM                              0x01
+#define PALMAS_INT2_MASK_RTC_ALARM_SHIFT                        0
+
+/* Bit definitions for INT2_LINE_STATE */
+#define PALMAS_INT2_LINE_STATE_VAC_ACOK                         0x80
+#define PALMAS_INT2_LINE_STATE_VAC_ACOK_SHIFT                   7
+#define PALMAS_INT2_LINE_STATE_SHORT                            0x40
+#define PALMAS_INT2_LINE_STATE_SHORT_SHIFT                      6
+#define PALMAS_INT2_LINE_STATE_FBI_BB                           0x20
+#define PALMAS_INT2_LINE_STATE_FBI_BB_SHIFT                     5
+#define PALMAS_INT2_LINE_STATE_RESET_IN                         0x10
+#define PALMAS_INT2_LINE_STATE_RESET_IN_SHIFT                   4
+#define PALMAS_INT2_LINE_STATE_BATREMOVAL                       0x08
+#define PALMAS_INT2_LINE_STATE_BATREMOVAL_SHIFT                 3
+#define PALMAS_INT2_LINE_STATE_WDT                              0x04
+#define PALMAS_INT2_LINE_STATE_WDT_SHIFT                        2
+#define PALMAS_INT2_LINE_STATE_RTC_TIMER                        0x02
+#define PALMAS_INT2_LINE_STATE_RTC_TIMER_SHIFT                  1
+#define PALMAS_INT2_LINE_STATE_RTC_ALARM                        0x01
+#define PALMAS_INT2_LINE_STATE_RTC_ALARM_SHIFT                  0
+
+/* Bit definitions for INT3_STATUS */
+#define PALMAS_INT3_STATUS_VBUS                                 0x80
+#define PALMAS_INT3_STATUS_VBUS_SHIFT                           7
+#define PALMAS_INT3_STATUS_VBUS_OTG                             0x40
+#define PALMAS_INT3_STATUS_VBUS_OTG_SHIFT                       6
+#define PALMAS_INT3_STATUS_ID                                   0x20
+#define PALMAS_INT3_STATUS_ID_SHIFT                             5
+#define PALMAS_INT3_STATUS_ID_OTG                               0x10
+#define PALMAS_INT3_STATUS_ID_OTG_SHIFT                         4
+#define PALMAS_INT3_STATUS_GPADC_EOC_RT                         0x08
+#define PALMAS_INT3_STATUS_GPADC_EOC_RT_SHIFT                   3
+#define PALMAS_INT3_STATUS_GPADC_EOC_SW                         0x04
+#define PALMAS_INT3_STATUS_GPADC_EOC_SW_SHIFT                   2
+#define PALMAS_INT3_STATUS_GPADC_AUTO_1                         0x02
+#define PALMAS_INT3_STATUS_GPADC_AUTO_1_SHIFT                   1
+#define PALMAS_INT3_STATUS_GPADC_AUTO_0                         0x01
+#define PALMAS_INT3_STATUS_GPADC_AUTO_0_SHIFT                   0
+
+/* Bit definitions for INT3_MASK */
+#define PALMAS_INT3_MASK_VBUS                                   0x80
+#define PALMAS_INT3_MASK_VBUS_SHIFT                             7
+#define PALMAS_INT3_MASK_VBUS_OTG                               0x40
+#define PALMAS_INT3_MASK_VBUS_OTG_SHIFT                         6
+#define PALMAS_INT3_MASK_ID                                     0x20
+#define PALMAS_INT3_MASK_ID_SHIFT                               5
+#define PALMAS_INT3_MASK_ID_OTG                                 0x10
+#define PALMAS_INT3_MASK_ID_OTG_SHIFT                           4
+#define PALMAS_INT3_MASK_GPADC_EOC_RT                           0x08
+#define PALMAS_INT3_MASK_GPADC_EOC_RT_SHIFT                     3
+#define PALMAS_INT3_MASK_GPADC_EOC_SW                           0x04
+#define PALMAS_INT3_MASK_GPADC_EOC_SW_SHIFT                     2
+#define PALMAS_INT3_MASK_GPADC_AUTO_1                           0x02
+#define PALMAS_INT3_MASK_GPADC_AUTO_1_SHIFT                     1
+#define PALMAS_INT3_MASK_GPADC_AUTO_0                           0x01
+#define PALMAS_INT3_MASK_GPADC_AUTO_0_SHIFT                     0
+
+/* Bit definitions for INT3_LINE_STATE */
+#define PALMAS_INT3_LINE_STATE_VBUS                             0x80
+#define PALMAS_INT3_LINE_STATE_VBUS_SHIFT                       7
+#define PALMAS_INT3_LINE_STATE_VBUS_OTG                         0x40
+#define PALMAS_INT3_LINE_STATE_VBUS_OTG_SHIFT                   6
+#define PALMAS_INT3_LINE_STATE_ID                               0x20
+#define PALMAS_INT3_LINE_STATE_ID_SHIFT                         5
+#define PALMAS_INT3_LINE_STATE_ID_OTG                           0x10
+#define PALMAS_INT3_LINE_STATE_ID_OTG_SHIFT                     4
+#define PALMAS_INT3_LINE_STATE_GPADC_EOC_RT                     0x08
+#define PALMAS_INT3_LINE_STATE_GPADC_EOC_RT_SHIFT               3
+#define PALMAS_INT3_LINE_STATE_GPADC_EOC_SW                     0x04
+#define PALMAS_INT3_LINE_STATE_GPADC_EOC_SW_SHIFT               2
+#define PALMAS_INT3_LINE_STATE_GPADC_AUTO_1                     0x02
+#define PALMAS_INT3_LINE_STATE_GPADC_AUTO_1_SHIFT               1
+#define PALMAS_INT3_LINE_STATE_GPADC_AUTO_0                     0x01
+#define PALMAS_INT3_LINE_STATE_GPADC_AUTO_0_SHIFT               0
+
+/* Bit definitions for INT4_STATUS */
+#define PALMAS_INT4_STATUS_GPIO_7                               0x80
+#define PALMAS_INT4_STATUS_GPIO_7_SHIFT                         7
+#define PALMAS_INT4_STATUS_GPIO_6                               0x40
+#define PALMAS_INT4_STATUS_GPIO_6_SHIFT                         6
+#define PALMAS_INT4_STATUS_GPIO_5                               0x20
+#define PALMAS_INT4_STATUS_GPIO_5_SHIFT                         5
+#define PALMAS_INT4_STATUS_GPIO_4                               0x10
+#define PALMAS_INT4_STATUS_GPIO_4_SHIFT                         4
+#define PALMAS_INT4_STATUS_GPIO_3                               0x08
+#define PALMAS_INT4_STATUS_GPIO_3_SHIFT                         3
+#define PALMAS_INT4_STATUS_GPIO_2                               0x04
+#define PALMAS_INT4_STATUS_GPIO_2_SHIFT                         2
+#define PALMAS_INT4_STATUS_GPIO_1                               0x02
+#define PALMAS_INT4_STATUS_GPIO_1_SHIFT                         1
+#define PALMAS_INT4_STATUS_GPIO_0                               0x01
+#define PALMAS_INT4_STATUS_GPIO_0_SHIFT                         0
+
+/* Bit definitions for INT4_MASK */
+#define PALMAS_INT4_MASK_GPIO_7                                 0x80
+#define PALMAS_INT4_MASK_GPIO_7_SHIFT                           7
+#define PALMAS_INT4_MASK_GPIO_6                                 0x40
+#define PALMAS_INT4_MASK_GPIO_6_SHIFT                           6
+#define PALMAS_INT4_MASK_GPIO_5                                 0x20
+#define PALMAS_INT4_MASK_GPIO_5_SHIFT                           5
+#define PALMAS_INT4_MASK_GPIO_4                                 0x10
+#define PALMAS_INT4_MASK_GPIO_4_SHIFT                           4
+#define PALMAS_INT4_MASK_GPIO_3                                 0x08
+#define PALMAS_INT4_MASK_GPIO_3_SHIFT                           3
+#define PALMAS_INT4_MASK_GPIO_2                                 0x04
+#define PALMAS_INT4_MASK_GPIO_2_SHIFT                           2
+#define PALMAS_INT4_MASK_GPIO_1                                 0x02
+#define PALMAS_INT4_MASK_GPIO_1_SHIFT                           1
+#define PALMAS_INT4_MASK_GPIO_0                                 0x01
+#define PALMAS_INT4_MASK_GPIO_0_SHIFT                           0
+
+/* Bit definitions for INT4_LINE_STATE */
+#define PALMAS_INT4_LINE_STATE_GPIO_7                           0x80
+#define PALMAS_INT4_LINE_STATE_GPIO_7_SHIFT                     7
+#define PALMAS_INT4_LINE_STATE_GPIO_6                           0x40
+#define PALMAS_INT4_LINE_STATE_GPIO_6_SHIFT                     6
+#define PALMAS_INT4_LINE_STATE_GPIO_5                           0x20
+#define PALMAS_INT4_LINE_STATE_GPIO_5_SHIFT                     5
+#define PALMAS_INT4_LINE_STATE_GPIO_4                           0x10
+#define PALMAS_INT4_LINE_STATE_GPIO_4_SHIFT                     4
+#define PALMAS_INT4_LINE_STATE_GPIO_3                           0x08
+#define PALMAS_INT4_LINE_STATE_GPIO_3_SHIFT                     3
+#define PALMAS_INT4_LINE_STATE_GPIO_2                           0x04
+#define PALMAS_INT4_LINE_STATE_GPIO_2_SHIFT                     2
+#define PALMAS_INT4_LINE_STATE_GPIO_1                           0x02
+#define PALMAS_INT4_LINE_STATE_GPIO_1_SHIFT                     1
+#define PALMAS_INT4_LINE_STATE_GPIO_0                           0x01
+#define PALMAS_INT4_LINE_STATE_GPIO_0_SHIFT                     0
+
+/* Bit definitions for INT4_EDGE_DETECT1 */
+#define PALMAS_INT4_EDGE_DETECT1_GPIO_3_RISING                  0x80
+#define PALMAS_INT4_EDGE_DETECT1_GPIO_3_RISING_SHIFT            7
+#define PALMAS_INT4_EDGE_DETECT1_GPIO_3_FALLING                 0x40
+#define PALMAS_INT4_EDGE_DETECT1_GPIO_3_FALLING_SHIFT           6
+#define PALMAS_INT4_EDGE_DETECT1_GPIO_2_RISING                  0x20
+#define PALMAS_INT4_EDGE_DETECT1_GPIO_2_RISING_SHIFT            5
+#define PALMAS_INT4_EDGE_DETECT1_GPIO_2_FALLING                 0x10
+#define PALMAS_INT4_EDGE_DETECT1_GPIO_2_FALLING_SHIFT           4
+#define PALMAS_INT4_EDGE_DETECT1_GPIO_1_RISING                  0x08
+#define PALMAS_INT4_EDGE_DETECT1_GPIO_1_RISING_SHIFT            3
+#define PALMAS_INT4_EDGE_DETECT1_GPIO_1_FALLING                 0x04
+#define PALMAS_INT4_EDGE_DETECT1_GPIO_1_FALLING_SHIFT           2
+#define PALMAS_INT4_EDGE_DETECT1_GPIO_0_RISING                  0x02
+#define PALMAS_INT4_EDGE_DETECT1_GPIO_0_RISING_SHIFT            1
+#define PALMAS_INT4_EDGE_DETECT1_GPIO_0_FALLING                 0x01
+#define PALMAS_INT4_EDGE_DETECT1_GPIO_0_FALLING_SHIFT           0
+
+/* Bit definitions for INT4_EDGE_DETECT2 */
+#define PALMAS_INT4_EDGE_DETECT2_GPIO_7_RISING                  0x80
+#define PALMAS_INT4_EDGE_DETECT2_GPIO_7_RISING_SHIFT            7
+#define PALMAS_INT4_EDGE_DETECT2_GPIO_7_FALLING                 0x40
+#define PALMAS_INT4_EDGE_DETECT2_GPIO_7_FALLING_SHIFT           6
+#define PALMAS_INT4_EDGE_DETECT2_GPIO_6_RISING                  0x20
+#define PALMAS_INT4_EDGE_DETECT2_GPIO_6_RISING_SHIFT            5
+#define PALMAS_INT4_EDGE_DETECT2_GPIO_6_FALLING                 0x10
+#define PALMAS_INT4_EDGE_DETECT2_GPIO_6_FALLING_SHIFT           4
+#define PALMAS_INT4_EDGE_DETECT2_GPIO_5_RISING                  0x08
+#define PALMAS_INT4_EDGE_DETECT2_GPIO_5_RISING_SHIFT            3
+#define PALMAS_INT4_EDGE_DETECT2_GPIO_5_FALLING                 0x04
+#define PALMAS_INT4_EDGE_DETECT2_GPIO_5_FALLING_SHIFT           2
+#define PALMAS_INT4_EDGE_DETECT2_GPIO_4_RISING                  0x02
+#define PALMAS_INT4_EDGE_DETECT2_GPIO_4_RISING_SHIFT            1
+#define PALMAS_INT4_EDGE_DETECT2_GPIO_4_FALLING                 0x01
+#define PALMAS_INT4_EDGE_DETECT2_GPIO_4_FALLING_SHIFT           0
+
+/* Bit definitions for INT_CTRL */
+#define PALMAS_INT_CTRL_INT_PENDING                             0x04
+#define PALMAS_INT_CTRL_INT_PENDING_SHIFT                       2
+#define PALMAS_INT_CTRL_INT_CLEAR                               0x01
+#define PALMAS_INT_CTRL_INT_CLEAR_SHIFT                         0
+
+/* Registers for function USB_OTG */
+#define PALMAS_USB_WAKEUP                                       0x3
+#define PALMAS_USB_VBUS_CTRL_SET                                0x4
+#define PALMAS_USB_VBUS_CTRL_CLR                                0x5
+#define PALMAS_USB_ID_CTRL_SET                                  0x6
+#define PALMAS_USB_ID_CTRL_CLEAR                                0x7
+#define PALMAS_USB_VBUS_INT_SRC                                 0x8
+#define PALMAS_USB_VBUS_INT_LATCH_SET                           0x9
+#define PALMAS_USB_VBUS_INT_LATCH_CLR                           0xA
+#define PALMAS_USB_VBUS_INT_EN_LO_SET                           0xB
+#define PALMAS_USB_VBUS_INT_EN_LO_CLR                           0xC
+#define PALMAS_USB_VBUS_INT_EN_HI_SET                           0xD
+#define PALMAS_USB_VBUS_INT_EN_HI_CLR                           0xE
+#define PALMAS_USB_ID_INT_SRC                                   0xF
+#define PALMAS_USB_ID_INT_LATCH_SET                             0x10
+#define PALMAS_USB_ID_INT_LATCH_CLR                             0x11
+#define PALMAS_USB_ID_INT_EN_LO_SET                             0x12
+#define PALMAS_USB_ID_INT_EN_LO_CLR                             0x13
+#define PALMAS_USB_ID_INT_EN_HI_SET                             0x14
+#define PALMAS_USB_ID_INT_EN_HI_CLR                             0x15
+#define PALMAS_USB_OTG_ADP_CTRL                                 0x16
+#define PALMAS_USB_OTG_ADP_HIGH                                 0x17
+#define PALMAS_USB_OTG_ADP_LOW                                  0x18
+#define PALMAS_USB_OTG_ADP_RISE                                 0x19
+#define PALMAS_USB_OTG_REVISION                                 0x1A
+
+/* Bit definitions for USB_WAKEUP */
+#define PALMAS_USB_WAKEUP_ID_WK_UP_COMP                         0x01
+#define PALMAS_USB_WAKEUP_ID_WK_UP_COMP_SHIFT                   0
+
+/* Bit definitions for USB_VBUS_CTRL_SET */
+#define PALMAS_USB_VBUS_CTRL_SET_VBUS_CHRG_VSYS                 0x80
+#define PALMAS_USB_VBUS_CTRL_SET_VBUS_CHRG_VSYS_SHIFT           7
+#define PALMAS_USB_VBUS_CTRL_SET_VBUS_DISCHRG                   0x20
+#define PALMAS_USB_VBUS_CTRL_SET_VBUS_DISCHRG_SHIFT             5
+#define PALMAS_USB_VBUS_CTRL_SET_VBUS_IADP_SRC                  0x10
+#define PALMAS_USB_VBUS_CTRL_SET_VBUS_IADP_SRC_SHIFT            4
+#define PALMAS_USB_VBUS_CTRL_SET_VBUS_IADP_SINK                 0x08
+#define PALMAS_USB_VBUS_CTRL_SET_VBUS_IADP_SINK_SHIFT           3
+#define PALMAS_USB_VBUS_CTRL_SET_VBUS_ACT_COMP                  0x04
+#define PALMAS_USB_VBUS_CTRL_SET_VBUS_ACT_COMP_SHIFT            2
+
+/* Bit definitions for USB_VBUS_CTRL_CLR */
+#define PALMAS_USB_VBUS_CTRL_CLR_VBUS_CHRG_VSYS                 0x80
+#define PALMAS_USB_VBUS_CTRL_CLR_VBUS_CHRG_VSYS_SHIFT           7
+#define PALMAS_USB_VBUS_CTRL_CLR_VBUS_DISCHRG                   0x20
+#define PALMAS_USB_VBUS_CTRL_CLR_VBUS_DISCHRG_SHIFT             5
+#define PALMAS_USB_VBUS_CTRL_CLR_VBUS_IADP_SRC                  0x10
+#define PALMAS_USB_VBUS_CTRL_CLR_VBUS_IADP_SRC_SHIFT            4
+#define PALMAS_USB_VBUS_CTRL_CLR_VBUS_IADP_SINK                 0x08
+#define PALMAS_USB_VBUS_CTRL_CLR_VBUS_IADP_SINK_SHIFT           3
+#define PALMAS_USB_VBUS_CTRL_CLR_VBUS_ACT_COMP                  0x04
+#define PALMAS_USB_VBUS_CTRL_CLR_VBUS_ACT_COMP_SHIFT            2
+
+/* Bit definitions for USB_ID_CTRL_SET */
+#define PALMAS_USB_ID_CTRL_SET_ID_PU_220K                       0x80
+#define PALMAS_USB_ID_CTRL_SET_ID_PU_220K_SHIFT                 7
+#define PALMAS_USB_ID_CTRL_SET_ID_PU_100K                       0x40
+#define PALMAS_USB_ID_CTRL_SET_ID_PU_100K_SHIFT                 6
+#define PALMAS_USB_ID_CTRL_SET_ID_GND_DRV                       0x20
+#define PALMAS_USB_ID_CTRL_SET_ID_GND_DRV_SHIFT                 5
+#define PALMAS_USB_ID_CTRL_SET_ID_SRC_16U                       0x10
+#define PALMAS_USB_ID_CTRL_SET_ID_SRC_16U_SHIFT                 4
+#define PALMAS_USB_ID_CTRL_SET_ID_SRC_5U                        0x08
+#define PALMAS_USB_ID_CTRL_SET_ID_SRC_5U_SHIFT                  3
+#define PALMAS_USB_ID_CTRL_SET_ID_ACT_COMP                      0x04
+#define PALMAS_USB_ID_CTRL_SET_ID_ACT_COMP_SHIFT                2
+
+/* Bit definitions for USB_ID_CTRL_CLEAR */
+#define PALMAS_USB_ID_CTRL_CLEAR_ID_PU_220K                     0x80
+#define PALMAS_USB_ID_CTRL_CLEAR_ID_PU_220K_SHIFT               7
+#define PALMAS_USB_ID_CTRL_CLEAR_ID_PU_100K                     0x40
+#define PALMAS_USB_ID_CTRL_CLEAR_ID_PU_100K_SHIFT               6
+#define PALMAS_USB_ID_CTRL_CLEAR_ID_GND_DRV                     0x20
+#define PALMAS_USB_ID_CTRL_CLEAR_ID_GND_DRV_SHIFT               5
+#define PALMAS_USB_ID_CTRL_CLEAR_ID_SRC_16U                     0x10
+#define PALMAS_USB_ID_CTRL_CLEAR_ID_SRC_16U_SHIFT               4
+#define PALMAS_USB_ID_CTRL_CLEAR_ID_SRC_5U                      0x08
+#define PALMAS_USB_ID_CTRL_CLEAR_ID_SRC_5U_SHIFT                3
+#define PALMAS_USB_ID_CTRL_CLEAR_ID_ACT_COMP                    0x04
+#define PALMAS_USB_ID_CTRL_CLEAR_ID_ACT_COMP_SHIFT              2
+
+/* Bit definitions for USB_VBUS_INT_SRC */
+#define PALMAS_USB_VBUS_INT_SRC_VOTG_SESS_VLD                   0x80
+#define PALMAS_USB_VBUS_INT_SRC_VOTG_SESS_VLD_SHIFT             7
+#define PALMAS_USB_VBUS_INT_SRC_VADP_PRB                        0x40
+#define PALMAS_USB_VBUS_INT_SRC_VADP_PRB_SHIFT                  6
+#define PALMAS_USB_VBUS_INT_SRC_VADP_SNS                        0x20
+#define PALMAS_USB_VBUS_INT_SRC_VADP_SNS_SHIFT                  5
+#define PALMAS_USB_VBUS_INT_SRC_VA_VBUS_VLD                     0x08
+#define PALMAS_USB_VBUS_INT_SRC_VA_VBUS_VLD_SHIFT               3
+#define PALMAS_USB_VBUS_INT_SRC_VA_SESS_VLD                     0x04
+#define PALMAS_USB_VBUS_INT_SRC_VA_SESS_VLD_SHIFT               2
+#define PALMAS_USB_VBUS_INT_SRC_VB_SESS_VLD                     0x02
+#define PALMAS_USB_VBUS_INT_SRC_VB_SESS_VLD_SHIFT               1
+#define PALMAS_USB_VBUS_INT_SRC_VB_SESS_END                     0x01
+#define PALMAS_USB_VBUS_INT_SRC_VB_SESS_END_SHIFT               0
+
+/* Bit definitions for USB_VBUS_INT_LATCH_SET */
+#define PALMAS_USB_VBUS_INT_LATCH_SET_VOTG_SESS_VLD             0x80
+#define PALMAS_USB_VBUS_INT_LATCH_SET_VOTG_SESS_VLD_SHIFT       7
+#define PALMAS_USB_VBUS_INT_LATCH_SET_VADP_PRB                  0x40
+#define PALMAS_USB_VBUS_INT_LATCH_SET_VADP_PRB_SHIFT            6
+#define PALMAS_USB_VBUS_INT_LATCH_SET_VADP_SNS                  0x20
+#define PALMAS_USB_VBUS_INT_LATCH_SET_VADP_SNS_SHIFT            5
+#define PALMAS_USB_VBUS_INT_LATCH_SET_ADP                       0x10
+#define PALMAS_USB_VBUS_INT_LATCH_SET_ADP_SHIFT                 4
+#define PALMAS_USB_VBUS_INT_LATCH_SET_VA_VBUS_VLD               0x08
+#define PALMAS_USB_VBUS_INT_LATCH_SET_VA_VBUS_VLD_SHIFT         3
+#define PALMAS_USB_VBUS_INT_LATCH_SET_VA_SESS_VLD               0x04
+#define PALMAS_USB_VBUS_INT_LATCH_SET_VA_SESS_VLD_SHIFT         2
+#define PALMAS_USB_VBUS_INT_LATCH_SET_VB_SESS_VLD               0x02
+#define PALMAS_USB_VBUS_INT_LATCH_SET_VB_SESS_VLD_SHIFT         1
+#define PALMAS_USB_VBUS_INT_LATCH_SET_VB_SESS_END               0x01
+#define PALMAS_USB_VBUS_INT_LATCH_SET_VB_SESS_END_SHIFT         0
+
+/* Bit definitions for USB_VBUS_INT_LATCH_CLR */
+#define PALMAS_USB_VBUS_INT_LATCH_CLR_VOTG_SESS_VLD             0x80
+#define PALMAS_USB_VBUS_INT_LATCH_CLR_VOTG_SESS_VLD_SHIFT       7
+#define PALMAS_USB_VBUS_INT_LATCH_CLR_VADP_PRB                  0x40
+#define PALMAS_USB_VBUS_INT_LATCH_CLR_VADP_PRB_SHIFT            6
+#define PALMAS_USB_VBUS_INT_LATCH_CLR_VADP_SNS                  0x20
+#define PALMAS_USB_VBUS_INT_LATCH_CLR_VADP_SNS_SHIFT            5
+#define PALMAS_USB_VBUS_INT_LATCH_CLR_ADP                       0x10
+#define PALMAS_USB_VBUS_INT_LATCH_CLR_ADP_SHIFT                 4
+#define PALMAS_USB_VBUS_INT_LATCH_CLR_VA_VBUS_VLD               0x08
+#define PALMAS_USB_VBUS_INT_LATCH_CLR_VA_VBUS_VLD_SHIFT         3
+#define PALMAS_USB_VBUS_INT_LATCH_CLR_VA_SESS_VLD               0x04
+#define PALMAS_USB_VBUS_INT_LATCH_CLR_VA_SESS_VLD_SHIFT         2
+#define PALMAS_USB_VBUS_INT_LATCH_CLR_VB_SESS_VLD               0x02
+#define PALMAS_USB_VBUS_INT_LATCH_CLR_VB_SESS_VLD_SHIFT         1
+#define PALMAS_USB_VBUS_INT_LATCH_CLR_VB_SESS_END               0x01
+#define PALMAS_USB_VBUS_INT_LATCH_CLR_VB_SESS_END_SHIFT         0
+
+/* Bit definitions for USB_VBUS_INT_EN_LO_SET */
+#define PALMAS_USB_VBUS_INT_EN_LO_SET_VOTG_SESS_VLD             0x80
+#define PALMAS_USB_VBUS_INT_EN_LO_SET_VOTG_SESS_VLD_SHIFT       7
+#define PALMAS_USB_VBUS_INT_EN_LO_SET_VADP_PRB                  0x40
+#define PALMAS_USB_VBUS_INT_EN_LO_SET_VADP_PRB_SHIFT            6
+#define PALMAS_USB_VBUS_INT_EN_LO_SET_VADP_SNS                  0x20
+#define PALMAS_USB_VBUS_INT_EN_LO_SET_VADP_SNS_SHIFT            5
+#define PALMAS_USB_VBUS_INT_EN_LO_SET_VA_VBUS_VLD               0x08
+#define PALMAS_USB_VBUS_INT_EN_LO_SET_VA_VBUS_VLD_SHIFT         3
+#define PALMAS_USB_VBUS_INT_EN_LO_SET_VA_SESS_VLD               0x04
+#define PALMAS_USB_VBUS_INT_EN_LO_SET_VA_SESS_VLD_SHIFT         2
+#define PALMAS_USB_VBUS_INT_EN_LO_SET_VB_SESS_VLD               0x02
+#define PALMAS_USB_VBUS_INT_EN_LO_SET_VB_SESS_VLD_SHIFT         1
+#define PALMAS_USB_VBUS_INT_EN_LO_SET_VB_SESS_END               0x01
+#define PALMAS_USB_VBUS_INT_EN_LO_SET_VB_SESS_END_SHIFT         0
+
+/* Bit definitions for USB_VBUS_INT_EN_LO_CLR */
+#define PALMAS_USB_VBUS_INT_EN_LO_CLR_VOTG_SESS_VLD             0x80
+#define PALMAS_USB_VBUS_INT_EN_LO_CLR_VOTG_SESS_VLD_SHIFT       7
+#define PALMAS_USB_VBUS_INT_EN_LO_CLR_VADP_PRB                  0x40
+#define PALMAS_USB_VBUS_INT_EN_LO_CLR_VADP_PRB_SHIFT            6
+#define PALMAS_USB_VBUS_INT_EN_LO_CLR_VADP_SNS                  0x20
+#define PALMAS_USB_VBUS_INT_EN_LO_CLR_VADP_SNS_SHIFT            5
+#define PALMAS_USB_VBUS_INT_EN_LO_CLR_VA_VBUS_VLD               0x08
+#define PALMAS_USB_VBUS_INT_EN_LO_CLR_VA_VBUS_VLD_SHIFT         3
+#define PALMAS_USB_VBUS_INT_EN_LO_CLR_VA_SESS_VLD               0x04
+#define PALMAS_USB_VBUS_INT_EN_LO_CLR_VA_SESS_VLD_SHIFT         2
+#define PALMAS_USB_VBUS_INT_EN_LO_CLR_VB_SESS_VLD               0x02
+#define PALMAS_USB_VBUS_INT_EN_LO_CLR_VB_SESS_VLD_SHIFT         1
+#define PALMAS_USB_VBUS_INT_EN_LO_CLR_VB_SESS_END               0x01
+#define PALMAS_USB_VBUS_INT_EN_LO_CLR_VB_SESS_END_SHIFT         0
+
+/* Bit definitions for USB_VBUS_INT_EN_HI_SET */
+#define PALMAS_USB_VBUS_INT_EN_HI_SET_VOTG_SESS_VLD             0x80
+#define PALMAS_USB_VBUS_INT_EN_HI_SET_VOTG_SESS_VLD_SHIFT       7
+#define PALMAS_USB_VBUS_INT_EN_HI_SET_VADP_PRB                  0x40
+#define PALMAS_USB_VBUS_INT_EN_HI_SET_VADP_PRB_SHIFT            6
+#define PALMAS_USB_VBUS_INT_EN_HI_SET_VADP_SNS                  0x20
+#define PALMAS_USB_VBUS_INT_EN_HI_SET_VADP_SNS_SHIFT            5
+#define PALMAS_USB_VBUS_INT_EN_HI_SET_ADP                       0x10
+#define PALMAS_USB_VBUS_INT_EN_HI_SET_ADP_SHIFT                 4
+#define PALMAS_USB_VBUS_INT_EN_HI_SET_VA_VBUS_VLD               0x08
+#define PALMAS_USB_VBUS_INT_EN_HI_SET_VA_VBUS_VLD_SHIFT         3
+#define PALMAS_USB_VBUS_INT_EN_HI_SET_VA_SESS_VLD               0x04
+#define PALMAS_USB_VBUS_INT_EN_HI_SET_VA_SESS_VLD_SHIFT         2
+#define PALMAS_USB_VBUS_INT_EN_HI_SET_VB_SESS_VLD               0x02
+#define PALMAS_USB_VBUS_INT_EN_HI_SET_VB_SESS_VLD_SHIFT         1
+#define PALMAS_USB_VBUS_INT_EN_HI_SET_VB_SESS_END               0x01
+#define PALMAS_USB_VBUS_INT_EN_HI_SET_VB_SESS_END_SHIFT         0
+
+/* Bit definitions for USB_VBUS_INT_EN_HI_CLR */
+#define PALMAS_USB_VBUS_INT_EN_HI_CLR_VOTG_SESS_VLD             0x80
+#define PALMAS_USB_VBUS_INT_EN_HI_CLR_VOTG_SESS_VLD_SHIFT       7
+#define PALMAS_USB_VBUS_INT_EN_HI_CLR_VADP_PRB                  0x40
+#define PALMAS_USB_VBUS_INT_EN_HI_CLR_VADP_PRB_SHIFT            6
+#define PALMAS_USB_VBUS_INT_EN_HI_CLR_VADP_SNS                  0x20
+#define PALMAS_USB_VBUS_INT_EN_HI_CLR_VADP_SNS_SHIFT            5
+#define PALMAS_USB_VBUS_INT_EN_HI_CLR_ADP                       0x10
+#define PALMAS_USB_VBUS_INT_EN_HI_CLR_ADP_SHIFT                 4
+#define PALMAS_USB_VBUS_INT_EN_HI_CLR_VA_VBUS_VLD               0x08
+#define PALMAS_USB_VBUS_INT_EN_HI_CLR_VA_VBUS_VLD_SHIFT         3
+#define PALMAS_USB_VBUS_INT_EN_HI_CLR_VA_SESS_VLD               0x04
+#define PALMAS_USB_VBUS_INT_EN_HI_CLR_VA_SESS_VLD_SHIFT         2
+#define PALMAS_USB_VBUS_INT_EN_HI_CLR_VB_SESS_VLD               0x02
+#define PALMAS_USB_VBUS_INT_EN_HI_CLR_VB_SESS_VLD_SHIFT         1
+#define PALMAS_USB_VBUS_INT_EN_HI_CLR_VB_SESS_END               0x01
+#define PALMAS_USB_VBUS_INT_EN_HI_CLR_VB_SESS_END_SHIFT         0
+
+/* Bit definitions for USB_ID_INT_SRC */
+#define PALMAS_USB_ID_INT_SRC_ID_FLOAT                          0x10
+#define PALMAS_USB_ID_INT_SRC_ID_FLOAT_SHIFT                    4
+#define PALMAS_USB_ID_INT_SRC_ID_A                              0x08
+#define PALMAS_USB_ID_INT_SRC_ID_A_SHIFT                        3
+#define PALMAS_USB_ID_INT_SRC_ID_B                              0x04
+#define PALMAS_USB_ID_INT_SRC_ID_B_SHIFT                        2
+#define PALMAS_USB_ID_INT_SRC_ID_C                              0x02
+#define PALMAS_USB_ID_INT_SRC_ID_C_SHIFT                        1
+#define PALMAS_USB_ID_INT_SRC_ID_GND                            0x01
+#define PALMAS_USB_ID_INT_SRC_ID_GND_SHIFT                      0
+
+/* Bit definitions for USB_ID_INT_LATCH_SET */
+#define PALMAS_USB_ID_INT_LATCH_SET_ID_FLOAT                    0x10
+#define PALMAS_USB_ID_INT_LATCH_SET_ID_FLOAT_SHIFT              4
+#define PALMAS_USB_ID_INT_LATCH_SET_ID_A                        0x08
+#define PALMAS_USB_ID_INT_LATCH_SET_ID_A_SHIFT                  3
+#define PALMAS_USB_ID_INT_LATCH_SET_ID_B                        0x04
+#define PALMAS_USB_ID_INT_LATCH_SET_ID_B_SHIFT                  2
+#define PALMAS_USB_ID_INT_LATCH_SET_ID_C                        0x02
+#define PALMAS_USB_ID_INT_LATCH_SET_ID_C_SHIFT                  1
+#define PALMAS_USB_ID_INT_LATCH_SET_ID_GND                      0x01
+#define PALMAS_USB_ID_INT_LATCH_SET_ID_GND_SHIFT                0
+
+/* Bit definitions for USB_ID_INT_LATCH_CLR */
+#define PALMAS_USB_ID_INT_LATCH_CLR_ID_FLOAT                    0x10
+#define PALMAS_USB_ID_INT_LATCH_CLR_ID_FLOAT_SHIFT              4
+#define PALMAS_USB_ID_INT_LATCH_CLR_ID_A                        0x08
+#define PALMAS_USB_ID_INT_LATCH_CLR_ID_A_SHIFT                  3
+#define PALMAS_USB_ID_INT_LATCH_CLR_ID_B                        0x04
+#define PALMAS_USB_ID_INT_LATCH_CLR_ID_B_SHIFT                  2
+#define PALMAS_USB_ID_INT_LATCH_CLR_ID_C                        0x02
+#define PALMAS_USB_ID_INT_LATCH_CLR_ID_C_SHIFT                  1
+#define PALMAS_USB_ID_INT_LATCH_CLR_ID_GND                      0x01
+#define PALMAS_USB_ID_INT_LATCH_CLR_ID_GND_SHIFT                0
+
+/* Bit definitions for USB_ID_INT_EN_LO_SET */
+#define PALMAS_USB_ID_INT_EN_LO_SET_ID_FLOAT                    0x10
+#define PALMAS_USB_ID_INT_EN_LO_SET_ID_FLOAT_SHIFT              4
+#define PALMAS_USB_ID_INT_EN_LO_SET_ID_A                        0x08
+#define PALMAS_USB_ID_INT_EN_LO_SET_ID_A_SHIFT                  3
+#define PALMAS_USB_ID_INT_EN_LO_SET_ID_B                        0x04
+#define PALMAS_USB_ID_INT_EN_LO_SET_ID_B_SHIFT                  2
+#define PALMAS_USB_ID_INT_EN_LO_SET_ID_C                        0x02
+#define PALMAS_USB_ID_INT_EN_LO_SET_ID_C_SHIFT                  1
+#define PALMAS_USB_ID_INT_EN_LO_SET_ID_GND                      0x01
+#define PALMAS_USB_ID_INT_EN_LO_SET_ID_GND_SHIFT                0
+
+/* Bit definitions for USB_ID_INT_EN_LO_CLR */
+#define PALMAS_USB_ID_INT_EN_LO_CLR_ID_FLOAT                    0x10
+#define PALMAS_USB_ID_INT_EN_LO_CLR_ID_FLOAT_SHIFT              4
+#define PALMAS_USB_ID_INT_EN_LO_CLR_ID_A                        0x08
+#define PALMAS_USB_ID_INT_EN_LO_CLR_ID_A_SHIFT                  3
+#define PALMAS_USB_ID_INT_EN_LO_CLR_ID_B                        0x04
+#define PALMAS_USB_ID_INT_EN_LO_CLR_ID_B_SHIFT                  2
+#define PALMAS_USB_ID_INT_EN_LO_CLR_ID_C                        0x02
+#define PALMAS_USB_ID_INT_EN_LO_CLR_ID_C_SHIFT                  1
+#define PALMAS_USB_ID_INT_EN_LO_CLR_ID_GND                      0x01
+#define PALMAS_USB_ID_INT_EN_LO_CLR_ID_GND_SHIFT                0
+
+/* Bit definitions for USB_ID_INT_EN_HI_SET */
+#define PALMAS_USB_ID_INT_EN_HI_SET_ID_FLOAT                    0x10
+#define PALMAS_USB_ID_INT_EN_HI_SET_ID_FLOAT_SHIFT              4
+#define PALMAS_USB_ID_INT_EN_HI_SET_ID_A                        0x08
+#define PALMAS_USB_ID_INT_EN_HI_SET_ID_A_SHIFT                  3
+#define PALMAS_USB_ID_INT_EN_HI_SET_ID_B                        0x04
+#define PALMAS_USB_ID_INT_EN_HI_SET_ID_B_SHIFT                  2
+#define PALMAS_USB_ID_INT_EN_HI_SET_ID_C                        0x02
+#define PALMAS_USB_ID_INT_EN_HI_SET_ID_C_SHIFT                  1
+#define PALMAS_USB_ID_INT_EN_HI_SET_ID_GND                      0x01
+#define PALMAS_USB_ID_INT_EN_HI_SET_ID_GND_SHIFT                0
+
+/* Bit definitions for USB_ID_INT_EN_HI_CLR */
+#define PALMAS_USB_ID_INT_EN_HI_CLR_ID_FLOAT                    0x10
+#define PALMAS_USB_ID_INT_EN_HI_CLR_ID_FLOAT_SHIFT              4
+#define PALMAS_USB_ID_INT_EN_HI_CLR_ID_A                        0x08
+#define PALMAS_USB_ID_INT_EN_HI_CLR_ID_A_SHIFT                  3
+#define PALMAS_USB_ID_INT_EN_HI_CLR_ID_B                        0x04
+#define PALMAS_USB_ID_INT_EN_HI_CLR_ID_B_SHIFT                  2
+#define PALMAS_USB_ID_INT_EN_HI_CLR_ID_C                        0x02
+#define PALMAS_USB_ID_INT_EN_HI_CLR_ID_C_SHIFT                  1
+#define PALMAS_USB_ID_INT_EN_HI_CLR_ID_GND                      0x01
+#define PALMAS_USB_ID_INT_EN_HI_CLR_ID_GND_SHIFT                0
+
+/* Bit definitions for USB_OTG_ADP_CTRL */
+#define PALMAS_USB_OTG_ADP_CTRL_ADP_EN                          0x04
+#define PALMAS_USB_OTG_ADP_CTRL_ADP_EN_SHIFT                    2
+#define PALMAS_USB_OTG_ADP_CTRL_ADP_MODE_MASK                   0x03
+#define PALMAS_USB_OTG_ADP_CTRL_ADP_MODE_SHIFT                  0
+
+/* Bit definitions for USB_OTG_ADP_HIGH */
+#define PALMAS_USB_OTG_ADP_HIGH_T_ADP_HIGH_MASK                 0xff
+#define PALMAS_USB_OTG_ADP_HIGH_T_ADP_HIGH_SHIFT                0
+
+/* Bit definitions for USB_OTG_ADP_LOW */
+#define PALMAS_USB_OTG_ADP_LOW_T_ADP_LOW_MASK                   0xff
+#define PALMAS_USB_OTG_ADP_LOW_T_ADP_LOW_SHIFT                  0
+
+/* Bit definitions for USB_OTG_ADP_RISE */
+#define PALMAS_USB_OTG_ADP_RISE_T_ADP_RISE_MASK                 0xff
+#define PALMAS_USB_OTG_ADP_RISE_T_ADP_RISE_SHIFT                0
+
+/* Bit definitions for USB_OTG_REVISION */
+#define PALMAS_USB_OTG_REVISION_OTG_REV                         0x01
+#define PALMAS_USB_OTG_REVISION_OTG_REV_SHIFT                   0
+
+/* Registers for function VIBRATOR */
+#define PALMAS_VIBRA_CTRL                                       0x0
+
+/* Bit definitions for VIBRA_CTRL */
+#define PALMAS_VIBRA_CTRL_PWM_DUTY_SEL_MASK                     0x06
+#define PALMAS_VIBRA_CTRL_PWM_DUTY_SEL_SHIFT                    1
+#define PALMAS_VIBRA_CTRL_PWM_FREQ_SEL                          0x01
+#define PALMAS_VIBRA_CTRL_PWM_FREQ_SEL_SHIFT                    0
+
+/* Registers for function GPIO */
+#define PALMAS_GPIO_DATA_IN                                     0x0
+#define PALMAS_GPIO_DATA_DIR                                    0x1
+#define PALMAS_GPIO_DATA_OUT                                    0x2
+#define PALMAS_GPIO_DEBOUNCE_EN                                 0x3
+#define PALMAS_GPIO_CLEAR_DATA_OUT                              0x4
+#define PALMAS_GPIO_SET_DATA_OUT                                0x5
+#define PALMAS_PU_PD_GPIO_CTRL1                                 0x6
+#define PALMAS_PU_PD_GPIO_CTRL2                                 0x7
+#define PALMAS_OD_OUTPUT_GPIO_CTRL                              0x8
+
+/* Bit definitions for GPIO_DATA_IN */
+#define PALMAS_GPIO_DATA_IN_GPIO_7_IN                           0x80
+#define PALMAS_GPIO_DATA_IN_GPIO_7_IN_SHIFT                     7
+#define PALMAS_GPIO_DATA_IN_GPIO_6_IN                           0x40
+#define PALMAS_GPIO_DATA_IN_GPIO_6_IN_SHIFT                     6
+#define PALMAS_GPIO_DATA_IN_GPIO_5_IN                           0x20
+#define PALMAS_GPIO_DATA_IN_GPIO_5_IN_SHIFT                     5
+#define PALMAS_GPIO_DATA_IN_GPIO_4_IN                           0x10
+#define PALMAS_GPIO_DATA_IN_GPIO_4_IN_SHIFT                     4
+#define PALMAS_GPIO_DATA_IN_GPIO_3_IN                           0x08
+#define PALMAS_GPIO_DATA_IN_GPIO_3_IN_SHIFT                     3
+#define PALMAS_GPIO_DATA_IN_GPIO_2_IN                           0x04
+#define PALMAS_GPIO_DATA_IN_GPIO_2_IN_SHIFT                     2
+#define PALMAS_GPIO_DATA_IN_GPIO_1_IN                           0x02
+#define PALMAS_GPIO_DATA_IN_GPIO_1_IN_SHIFT                     1
+#define PALMAS_GPIO_DATA_IN_GPIO_0_IN                           0x01
+#define PALMAS_GPIO_DATA_IN_GPIO_0_IN_SHIFT                     0
+
+/* Bit definitions for GPIO_DATA_DIR */
+#define PALMAS_GPIO_DATA_DIR_GPIO_7_DIR                         0x80
+#define PALMAS_GPIO_DATA_DIR_GPIO_7_DIR_SHIFT                   7
+#define PALMAS_GPIO_DATA_DIR_GPIO_6_DIR                         0x40
+#define PALMAS_GPIO_DATA_DIR_GPIO_6_DIR_SHIFT                   6
+#define PALMAS_GPIO_DATA_DIR_GPIO_5_DIR                         0x20
+#define PALMAS_GPIO_DATA_DIR_GPIO_5_DIR_SHIFT                   5
+#define PALMAS_GPIO_DATA_DIR_GPIO_4_DIR                         0x10
+#define PALMAS_GPIO_DATA_DIR_GPIO_4_DIR_SHIFT                   4
+#define PALMAS_GPIO_DATA_DIR_GPIO_3_DIR                         0x08
+#define PALMAS_GPIO_DATA_DIR_GPIO_3_DIR_SHIFT                   3
+#define PALMAS_GPIO_DATA_DIR_GPIO_2_DIR                         0x04
+#define PALMAS_GPIO_DATA_DIR_GPIO_2_DIR_SHIFT                   2
+#define PALMAS_GPIO_DATA_DIR_GPIO_1_DIR                         0x02
+#define PALMAS_GPIO_DATA_DIR_GPIO_1_DIR_SHIFT                   1
+#define PALMAS_GPIO_DATA_DIR_GPIO_0_DIR                         0x01
+#define PALMAS_GPIO_DATA_DIR_GPIO_0_DIR_SHIFT                   0
+
+/* Bit definitions for GPIO_DATA_OUT */
+#define PALMAS_GPIO_DATA_OUT_GPIO_7_OUT                         0x80
+#define PALMAS_GPIO_DATA_OUT_GPIO_7_OUT_SHIFT                   7
+#define PALMAS_GPIO_DATA_OUT_GPIO_6_OUT                         0x40
+#define PALMAS_GPIO_DATA_OUT_GPIO_6_OUT_SHIFT                   6
+#define PALMAS_GPIO_DATA_OUT_GPIO_5_OUT                         0x20
+#define PALMAS_GPIO_DATA_OUT_GPIO_5_OUT_SHIFT                   5
+#define PALMAS_GPIO_DATA_OUT_GPIO_4_OUT                         0x10
+#define PALMAS_GPIO_DATA_OUT_GPIO_4_OUT_SHIFT                   4
+#define PALMAS_GPIO_DATA_OUT_GPIO_3_OUT                         0x08
+#define PALMAS_GPIO_DATA_OUT_GPIO_3_OUT_SHIFT                   3
+#define PALMAS_GPIO_DATA_OUT_GPIO_2_OUT                         0x04
+#define PALMAS_GPIO_DATA_OUT_GPIO_2_OUT_SHIFT                   2
+#define PALMAS_GPIO_DATA_OUT_GPIO_1_OUT                         0x02
+#define PALMAS_GPIO_DATA_OUT_GPIO_1_OUT_SHIFT                   1
+#define PALMAS_GPIO_DATA_OUT_GPIO_0_OUT                         0x01
+#define PALMAS_GPIO_DATA_OUT_GPIO_0_OUT_SHIFT                   0
+
+/* Bit definitions for GPIO_DEBOUNCE_EN */
+#define PALMAS_GPIO_DEBOUNCE_EN_GPIO_7_DEBOUNCE_EN              0x80
+#define PALMAS_GPIO_DEBOUNCE_EN_GPIO_7_DEBOUNCE_EN_SHIFT        7
+#define PALMAS_GPIO_DEBOUNCE_EN_GPIO_6_DEBOUNCE_EN              0x40
+#define PALMAS_GPIO_DEBOUNCE_EN_GPIO_6_DEBOUNCE_EN_SHIFT        6
+#define PALMAS_GPIO_DEBOUNCE_EN_GPIO_5_DEBOUNCE_EN              0x20
+#define PALMAS_GPIO_DEBOUNCE_EN_GPIO_5_DEBOUNCE_EN_SHIFT        5
+#define PALMAS_GPIO_DEBOUNCE_EN_GPIO_4_DEBOUNCE_EN              0x10
+#define PALMAS_GPIO_DEBOUNCE_EN_GPIO_4_DEBOUNCE_EN_SHIFT        4
+#define PALMAS_GPIO_DEBOUNCE_EN_GPIO_3_DEBOUNCE_EN              0x08
+#define PALMAS_GPIO_DEBOUNCE_EN_GPIO_3_DEBOUNCE_EN_SHIFT        3
+#define PALMAS_GPIO_DEBOUNCE_EN_GPIO_2_DEBOUNCE_EN              0x04
+#define PALMAS_GPIO_DEBOUNCE_EN_GPIO_2_DEBOUNCE_EN_SHIFT        2
+#define PALMAS_GPIO_DEBOUNCE_EN_GPIO_1_DEBOUNCE_EN              0x02
+#define PALMAS_GPIO_DEBOUNCE_EN_GPIO_1_DEBOUNCE_EN_SHIFT        1
+#define PALMAS_GPIO_DEBOUNCE_EN_GPIO_0_DEBOUNCE_EN              0x01
+#define PALMAS_GPIO_DEBOUNCE_EN_GPIO_0_DEBOUNCE_EN_SHIFT        0
+
+/* Bit definitions for GPIO_CLEAR_DATA_OUT */
+#define PALMAS_GPIO_CLEAR_DATA_OUT_GPIO_7_CLEAR_DATA_OUT        0x80
+#define PALMAS_GPIO_CLEAR_DATA_OUT_GPIO_7_CLEAR_DATA_OUT_SHIFT  7
+#define PALMAS_GPIO_CLEAR_DATA_OUT_GPIO_6_CLEAR_DATA_OUT        0x40
+#define PALMAS_GPIO_CLEAR_DATA_OUT_GPIO_6_CLEAR_DATA_OUT_SHIFT  6
+#define PALMAS_GPIO_CLEAR_DATA_OUT_GPIO_5_CLEAR_DATA_OUT        0x20
+#define PALMAS_GPIO_CLEAR_DATA_OUT_GPIO_5_CLEAR_DATA_OUT_SHIFT  5
+#define PALMAS_GPIO_CLEAR_DATA_OUT_GPIO_4_CLEAR_DATA_OUT        0x10
+#define PALMAS_GPIO_CLEAR_DATA_OUT_GPIO_4_CLEAR_DATA_OUT_SHIFT  4
+#define PALMAS_GPIO_CLEAR_DATA_OUT_GPIO_3_CLEAR_DATA_OUT        0x08
+#define PALMAS_GPIO_CLEAR_DATA_OUT_GPIO_3_CLEAR_DATA_OUT_SHIFT  3
+#define PALMAS_GPIO_CLEAR_DATA_OUT_GPIO_2_CLEAR_DATA_OUT        0x04
+#define PALMAS_GPIO_CLEAR_DATA_OUT_GPIO_2_CLEAR_DATA_OUT_SHIFT  2
+#define PALMAS_GPIO_CLEAR_DATA_OUT_GPIO_1_CLEAR_DATA_OUT        0x02
+#define PALMAS_GPIO_CLEAR_DATA_OUT_GPIO_1_CLEAR_DATA_OUT_SHIFT  1
+#define PALMAS_GPIO_CLEAR_DATA_OUT_GPIO_0_CLEAR_DATA_OUT        0x01
+#define PALMAS_GPIO_CLEAR_DATA_OUT_GPIO_0_CLEAR_DATA_OUT_SHIFT  0
+
+/* Bit definitions for GPIO_SET_DATA_OUT */
+#define PALMAS_GPIO_SET_DATA_OUT_GPIO_7_SET_DATA_OUT            0x80
+#define PALMAS_GPIO_SET_DATA_OUT_GPIO_7_SET_DATA_OUT_SHIFT      7
+#define PALMAS_GPIO_SET_DATA_OUT_GPIO_6_SET_DATA_OUT            0x40
+#define PALMAS_GPIO_SET_DATA_OUT_GPIO_6_SET_DATA_OUT_SHIFT      6
+#define PALMAS_GPIO_SET_DATA_OUT_GPIO_5_SET_DATA_OUT            0x20
+#define PALMAS_GPIO_SET_DATA_OUT_GPIO_5_SET_DATA_OUT_SHIFT      5
+#define PALMAS_GPIO_SET_DATA_OUT_GPIO_4_SET_DATA_OUT            0x10
+#define PALMAS_GPIO_SET_DATA_OUT_GPIO_4_SET_DATA_OUT_SHIFT      4
+#define PALMAS_GPIO_SET_DATA_OUT_GPIO_3_SET_DATA_OUT            0x08
+#define PALMAS_GPIO_SET_DATA_OUT_GPIO_3_SET_DATA_OUT_SHIFT      3
+#define PALMAS_GPIO_SET_DATA_OUT_GPIO_2_SET_DATA_OUT            0x04
+#define PALMAS_GPIO_SET_DATA_OUT_GPIO_2_SET_DATA_OUT_SHIFT      2
+#define PALMAS_GPIO_SET_DATA_OUT_GPIO_1_SET_DATA_OUT            0x02
+#define PALMAS_GPIO_SET_DATA_OUT_GPIO_1_SET_DATA_OUT_SHIFT      1
+#define PALMAS_GPIO_SET_DATA_OUT_GPIO_0_SET_DATA_OUT            0x01
+#define PALMAS_GPIO_SET_DATA_OUT_GPIO_0_SET_DATA_OUT_SHIFT      0
+
+/* Bit definitions for PU_PD_GPIO_CTRL1 */
+#define PALMAS_PU_PD_GPIO_CTRL1_GPIO_3_PD                       0x40
+#define PALMAS_PU_PD_GPIO_CTRL1_GPIO_3_PD_SHIFT                 6
+#define PALMAS_PU_PD_GPIO_CTRL1_GPIO_2_PU                       0x20
+#define PALMAS_PU_PD_GPIO_CTRL1_GPIO_2_PU_SHIFT                 5
+#define PALMAS_PU_PD_GPIO_CTRL1_GPIO_2_PD                       0x10
+#define PALMAS_PU_PD_GPIO_CTRL1_GPIO_2_PD_SHIFT                 4
+#define PALMAS_PU_PD_GPIO_CTRL1_GPIO_1_PU                       0x08
+#define PALMAS_PU_PD_GPIO_CTRL1_GPIO_1_PU_SHIFT                 3
+#define PALMAS_PU_PD_GPIO_CTRL1_GPIO_1_PD                       0x04
+#define PALMAS_PU_PD_GPIO_CTRL1_GPIO_1_PD_SHIFT                 2
+#define PALMAS_PU_PD_GPIO_CTRL1_GPIO_0_PD                       0x01
+#define PALMAS_PU_PD_GPIO_CTRL1_GPIO_0_PD_SHIFT                 0
+
+/* Bit definitions for PU_PD_GPIO_CTRL2 */
+#define PALMAS_PU_PD_GPIO_CTRL2_GPIO_7_PD                       0x40
+#define PALMAS_PU_PD_GPIO_CTRL2_GPIO_7_PD_SHIFT                 6
+#define PALMAS_PU_PD_GPIO_CTRL2_GPIO_6_PU                       0x20
+#define PALMAS_PU_PD_GPIO_CTRL2_GPIO_6_PU_SHIFT                 5
+#define PALMAS_PU_PD_GPIO_CTRL2_GPIO_6_PD                       0x10
+#define PALMAS_PU_PD_GPIO_CTRL2_GPIO_6_PD_SHIFT                 4
+#define PALMAS_PU_PD_GPIO_CTRL2_GPIO_5_PU                       0x08
+#define PALMAS_PU_PD_GPIO_CTRL2_GPIO_5_PU_SHIFT                 3
+#define PALMAS_PU_PD_GPIO_CTRL2_GPIO_5_PD                       0x04
+#define PALMAS_PU_PD_GPIO_CTRL2_GPIO_5_PD_SHIFT                 2
+#define PALMAS_PU_PD_GPIO_CTRL2_GPIO_4_PU                       0x02
+#define PALMAS_PU_PD_GPIO_CTRL2_GPIO_4_PU_SHIFT                 1
+#define PALMAS_PU_PD_GPIO_CTRL2_GPIO_4_PD                       0x01
+#define PALMAS_PU_PD_GPIO_CTRL2_GPIO_4_PD_SHIFT                 0
+
+/* Bit definitions for OD_OUTPUT_GPIO_CTRL */
+#define PALMAS_OD_OUTPUT_GPIO_CTRL_GPIO_5_OD                    0x20
+#define PALMAS_OD_OUTPUT_GPIO_CTRL_GPIO_5_OD_SHIFT              5
+#define PALMAS_OD_OUTPUT_GPIO_CTRL_GPIO_2_OD                    0x04
+#define PALMAS_OD_OUTPUT_GPIO_CTRL_GPIO_2_OD_SHIFT              2
+#define PALMAS_OD_OUTPUT_GPIO_CTRL_GPIO_1_OD                    0x02
+#define PALMAS_OD_OUTPUT_GPIO_CTRL_GPIO_1_OD_SHIFT              1
+
+/* Registers for function GPADC */
+#define PALMAS_GPADC_CTRL1                                      0x0
+#define PALMAS_GPADC_CTRL2                                      0x1
+#define PALMAS_GPADC_RT_CTRL                                    0x2
+#define PALMAS_GPADC_AUTO_CTRL                                  0x3
+#define PALMAS_GPADC_STATUS                                     0x4
+#define PALMAS_GPADC_RT_SELECT                                  0x5
+#define PALMAS_GPADC_RT_CONV0_LSB                               0x6
+#define PALMAS_GPADC_RT_CONV0_MSB                               0x7
+#define PALMAS_GPADC_AUTO_SELECT                                0x8
+#define PALMAS_GPADC_AUTO_CONV0_LSB                             0x9
+#define PALMAS_GPADC_AUTO_CONV0_MSB                             0xA
+#define PALMAS_GPADC_AUTO_CONV1_LSB                             0xB
+#define PALMAS_GPADC_AUTO_CONV1_MSB                             0xC
+#define PALMAS_GPADC_SW_SELECT                                  0xD
+#define PALMAS_GPADC_SW_CONV0_LSB                               0xE
+#define PALMAS_GPADC_SW_CONV0_MSB                               0xF
+#define PALMAS_GPADC_THRES_CONV0_LSB                            0x10
+#define PALMAS_GPADC_THRES_CONV0_MSB                            0x11
+#define PALMAS_GPADC_THRES_CONV1_LSB                            0x12
+#define PALMAS_GPADC_THRES_CONV1_MSB                            0x13
+#define PALMAS_GPADC_SMPS_ILMONITOR_EN                          0x14
+#define PALMAS_GPADC_SMPS_VSEL_MONITORING                       0x15
+
+/* Bit definitions for GPADC_CTRL1 */
+#define PALMAS_GPADC_CTRL1_RESERVED_MASK                        0xc0
+#define PALMAS_GPADC_CTRL1_RESERVED_SHIFT                       6
+#define PALMAS_GPADC_CTRL1_CURRENT_SRC_CH3_MASK                 0x30
+#define PALMAS_GPADC_CTRL1_CURRENT_SRC_CH3_SHIFT                4
+#define PALMAS_GPADC_CTRL1_CURRENT_SRC_CH0_MASK                 0x0c
+#define PALMAS_GPADC_CTRL1_CURRENT_SRC_CH0_SHIFT                2
+#define PALMAS_GPADC_CTRL1_BAT_REMOVAL_DET                      0x02
+#define PALMAS_GPADC_CTRL1_BAT_REMOVAL_DET_SHIFT                1
+#define PALMAS_GPADC_CTRL1_GPADC_FORCE                          0x01
+#define PALMAS_GPADC_CTRL1_GPADC_FORCE_SHIFT                    0
+
+/* Bit definitions for GPADC_CTRL2 */
+#define PALMAS_GPADC_CTRL2_RESERVED_MASK                        0x06
+#define PALMAS_GPADC_CTRL2_RESERVED_SHIFT                       1
+
+/* Bit definitions for GPADC_RT_CTRL */
+#define PALMAS_GPADC_RT_CTRL_EXTEND_DELAY                       0x02
+#define PALMAS_GPADC_RT_CTRL_EXTEND_DELAY_SHIFT                 1
+#define PALMAS_GPADC_RT_CTRL_START_POLARITY                     0x01
+#define PALMAS_GPADC_RT_CTRL_START_POLARITY_SHIFT               0
+
+/* Bit definitions for GPADC_AUTO_CTRL */
+#define PALMAS_GPADC_AUTO_CTRL_SHUTDOWN_CONV1                   0x80
+#define PALMAS_GPADC_AUTO_CTRL_SHUTDOWN_CONV1_SHIFT             7
+#define PALMAS_GPADC_AUTO_CTRL_SHUTDOWN_CONV0                   0x40
+#define PALMAS_GPADC_AUTO_CTRL_SHUTDOWN_CONV0_SHIFT             6
+#define PALMAS_GPADC_AUTO_CTRL_AUTO_CONV1_EN                    0x20
+#define PALMAS_GPADC_AUTO_CTRL_AUTO_CONV1_EN_SHIFT              5
+#define PALMAS_GPADC_AUTO_CTRL_AUTO_CONV0_EN                    0x10
+#define PALMAS_GPADC_AUTO_CTRL_AUTO_CONV0_EN_SHIFT              4
+#define PALMAS_GPADC_AUTO_CTRL_COUNTER_CONV_MASK                0x0f
+#define PALMAS_GPADC_AUTO_CTRL_COUNTER_CONV_SHIFT               0
+
+/* Bit definitions for GPADC_STATUS */
+#define PALMAS_GPADC_STATUS_GPADC_AVAILABLE                     0x10
+#define PALMAS_GPADC_STATUS_GPADC_AVAILABLE_SHIFT               4
+
+/* Bit definitions for GPADC_RT_SELECT */
+#define PALMAS_GPADC_RT_SELECT_RT_CONV_EN                       0x80
+#define PALMAS_GPADC_RT_SELECT_RT_CONV_EN_SHIFT                 7
+#define PALMAS_GPADC_RT_SELECT_RT_CONV0_SEL_MASK                0x0f
+#define PALMAS_GPADC_RT_SELECT_RT_CONV0_SEL_SHIFT               0
+
+/* Bit definitions for GPADC_RT_CONV0_LSB */
+#define PALMAS_GPADC_RT_CONV0_LSB_RT_CONV0_LSB_MASK             0xff
+#define PALMAS_GPADC_RT_CONV0_LSB_RT_CONV0_LSB_SHIFT            0
+
+/* Bit definitions for GPADC_RT_CONV0_MSB */
+#define PALMAS_GPADC_RT_CONV0_MSB_RT_CONV0_MSB_MASK             0x0f
+#define PALMAS_GPADC_RT_CONV0_MSB_RT_CONV0_MSB_SHIFT            0
+
+/* Bit definitions for GPADC_AUTO_SELECT */
+#define PALMAS_GPADC_AUTO_SELECT_AUTO_CONV1_SEL_MASK            0xf0
+#define PALMAS_GPADC_AUTO_SELECT_AUTO_CONV1_SEL_SHIFT           4
+#define PALMAS_GPADC_AUTO_SELECT_AUTO_CONV0_SEL_MASK            0x0f
+#define PALMAS_GPADC_AUTO_SELECT_AUTO_CONV0_SEL_SHIFT           0
+
+/* Bit definitions for GPADC_AUTO_CONV0_LSB */
+#define PALMAS_GPADC_AUTO_CONV0_LSB_AUTO_CONV0_LSB_MASK         0xff
+#define PALMAS_GPADC_AUTO_CONV0_LSB_AUTO_CONV0_LSB_SHIFT        0
+
+/* Bit definitions for GPADC_AUTO_CONV0_MSB */
+#define PALMAS_GPADC_AUTO_CONV0_MSB_AUTO_CONV0_MSB_MASK         0x0f
+#define PALMAS_GPADC_AUTO_CONV0_MSB_AUTO_CONV0_MSB_SHIFT        0
+
+/* Bit definitions for GPADC_AUTO_CONV1_LSB */
+#define PALMAS_GPADC_AUTO_CONV1_LSB_AUTO_CONV1_LSB_MASK         0xff
+#define PALMAS_GPADC_AUTO_CONV1_LSB_AUTO_CONV1_LSB_SHIFT        0
+
+/* Bit definitions for GPADC_AUTO_CONV1_MSB */
+#define PALMAS_GPADC_AUTO_CONV1_MSB_AUTO_CONV1_MSB_MASK         0x0f
+#define PALMAS_GPADC_AUTO_CONV1_MSB_AUTO_CONV1_MSB_SHIFT        0
+
+/* Bit definitions for GPADC_SW_SELECT */
+#define PALMAS_GPADC_SW_SELECT_SW_CONV_EN                       0x80
+#define PALMAS_GPADC_SW_SELECT_SW_CONV_EN_SHIFT                 7
+#define PALMAS_GPADC_SW_SELECT_SW_START_CONV0                   0x10
+#define PALMAS_GPADC_SW_SELECT_SW_START_CONV0_SHIFT             4
+#define PALMAS_GPADC_SW_SELECT_SW_CONV0_SEL_MASK                0x0f
+#define PALMAS_GPADC_SW_SELECT_SW_CONV0_SEL_SHIFT               0
+
+/* Bit definitions for GPADC_SW_CONV0_LSB */
+#define PALMAS_GPADC_SW_CONV0_LSB_SW_CONV0_LSB_MASK             0xff
+#define PALMAS_GPADC_SW_CONV0_LSB_SW_CONV0_LSB_SHIFT            0
+
+/* Bit definitions for GPADC_SW_CONV0_MSB */
+#define PALMAS_GPADC_SW_CONV0_MSB_SW_CONV0_MSB_MASK             0x0f
+#define PALMAS_GPADC_SW_CONV0_MSB_SW_CONV0_MSB_SHIFT            0
+
+/* Bit definitions for GPADC_THRES_CONV0_LSB */
+#define PALMAS_GPADC_THRES_CONV0_LSB_THRES_CONV0_LSB_MASK       0xff
+#define PALMAS_GPADC_THRES_CONV0_LSB_THRES_CONV0_LSB_SHIFT      0
+
+/* Bit definitions for GPADC_THRES_CONV0_MSB */
+#define PALMAS_GPADC_THRES_CONV0_MSB_THRES_CONV0_POL            0x80
+#define PALMAS_GPADC_THRES_CONV0_MSB_THRES_CONV0_POL_SHIFT      7
+#define PALMAS_GPADC_THRES_CONV0_MSB_THRES_CONV0_MSB_MASK       0x0f
+#define PALMAS_GPADC_THRES_CONV0_MSB_THRES_CONV0_MSB_SHIFT      0
+
+/* Bit definitions for GPADC_THRES_CONV1_LSB */
+#define PALMAS_GPADC_THRES_CONV1_LSB_THRES_CONV1_LSB_MASK       0xff
+#define PALMAS_GPADC_THRES_CONV1_LSB_THRES_CONV1_LSB_SHIFT      0
+
+/* Bit definitions for GPADC_THRES_CONV1_MSB */
+#define PALMAS_GPADC_THRES_CONV1_MSB_THRES_CONV1_POL            0x80
+#define PALMAS_GPADC_THRES_CONV1_MSB_THRES_CONV1_POL_SHIFT      7
+#define PALMAS_GPADC_THRES_CONV1_MSB_THRES_CONV1_MSB_MASK       0x0f
+#define PALMAS_GPADC_THRES_CONV1_MSB_THRES_CONV1_MSB_SHIFT      0
+
+/* Bit definitions for GPADC_SMPS_ILMONITOR_EN */
+#define PALMAS_GPADC_SMPS_ILMONITOR_EN_SMPS_ILMON_EN            0x20
+#define PALMAS_GPADC_SMPS_ILMONITOR_EN_SMPS_ILMON_EN_SHIFT      5
+#define PALMAS_GPADC_SMPS_ILMONITOR_EN_SMPS_ILMON_REXT          0x10
+#define PALMAS_GPADC_SMPS_ILMONITOR_EN_SMPS_ILMON_REXT_SHIFT    4
+#define PALMAS_GPADC_SMPS_ILMONITOR_EN_SMPS_ILMON_SEL_MASK      0x0f
+#define PALMAS_GPADC_SMPS_ILMONITOR_EN_SMPS_ILMON_SEL_SHIFT     0
+
+/* Bit definitions for GPADC_SMPS_VSEL_MONITORING */
+#define PALMAS_GPADC_SMPS_VSEL_MONITORING_ACTIVE_PHASE          0x80
+#define PALMAS_GPADC_SMPS_VSEL_MONITORING_ACTIVE_PHASE_SHIFT    7
+#define PALMAS_GPADC_SMPS_VSEL_MONITORING_SMPS_VSEL_MONITORING_MASK     0x7f
+#define PALMAS_GPADC_SMPS_VSEL_MONITORING_SMPS_VSEL_MONITORING_SHIFT    0
+
+/* Registers for function GPADC */
+#define PALMAS_GPADC_TRIM1                                      0x0
+#define PALMAS_GPADC_TRIM2                                      0x1
+#define PALMAS_GPADC_TRIM3                                      0x2
+#define PALMAS_GPADC_TRIM4                                      0x3
+#define PALMAS_GPADC_TRIM5                                      0x4
+#define PALMAS_GPADC_TRIM6                                      0x5
+#define PALMAS_GPADC_TRIM7                                      0x6
+#define PALMAS_GPADC_TRIM8                                      0x7
+#define PALMAS_GPADC_TRIM9                                      0x8
+#define PALMAS_GPADC_TRIM10                                     0x9
+#define PALMAS_GPADC_TRIM11                                     0xA
+#define PALMAS_GPADC_TRIM12                                     0xB
+#define PALMAS_GPADC_TRIM13                                     0xC
+#define PALMAS_GPADC_TRIM14                                     0xD
+#define PALMAS_GPADC_TRIM15                                     0xE
+#define PALMAS_GPADC_TRIM16                                     0xF
+
+#endif /*  __LINUX_MFD_PALMAS_H */
diff --git a/include/linux/mfd/rc5t583.h b/include/linux/mfd/rc5t583.h
index 0b64b19d81ab..3661c59aa1e9 100644
--- a/include/linux/mfd/rc5t583.h
+++ b/include/linux/mfd/rc5t583.h
@@ -250,6 +250,26 @@ enum {
         RC5T583_EXT_PWRREQ2_CONTROL = 0x2,
 };
 
+enum {
+        RC5T583_REGULATOR_DC0,
+        RC5T583_REGULATOR_DC1,
+        RC5T583_REGULATOR_DC2,
+        RC5T583_REGULATOR_DC3,
+        RC5T583_REGULATOR_LDO0,
+        RC5T583_REGULATOR_LDO1,
+        RC5T583_REGULATOR_LDO2,
+        RC5T583_REGULATOR_LDO3,
+        RC5T583_REGULATOR_LDO4,
+        RC5T583_REGULATOR_LDO5,
+        RC5T583_REGULATOR_LDO6,
+        RC5T583_REGULATOR_LDO7,
+        RC5T583_REGULATOR_LDO8,
+        RC5T583_REGULATOR_LDO9,
+
+        /* Should be last entry */
+        RC5T583_REGULATOR_MAX,
+};
+
 struct rc5t583 {
         struct device   *dev;
         struct regmap   *regmap;
@@ -272,12 +292,23 @@ struct rc5t583 {
  * rc5t583_platform_data: Platform data for ricoh rc5t583 pmu.
  * The board specific data is provided through this structure.
  * @irq_base: Irq base number on which this device registers their interrupts.
+ * @gpio_base: GPIO base from which gpio of this device will start.
  * @enable_shutdown: Enable shutdown through the input pin "shutdown".
+ * @regulator_deepsleep_slot: The slot number on which device goes to sleep
+ *              in device sleep mode.
+ * @regulator_ext_pwr_control: External power request regulator control. The
+ *              regulator output enable/disable is controlled by the external
+ *              power request input state.
+ * @reg_init_data: Regulator init data.
  */
 
 struct rc5t583_platform_data {
         int             irq_base;
+        int             gpio_base;
         bool            enable_shutdown;
+        int             regulator_deepsleep_slot[RC5T583_REGULATOR_MAX];
+        unsigned long   regulator_ext_pwr_control[RC5T583_REGULATOR_MAX];
+        struct regulator_init_data *reg_init_data[RC5T583_REGULATOR_MAX];
 };
 
 static inline int rc5t583_write(struct device *dev, uint8_t reg, uint8_t val)
diff --git a/include/linux/mfd/s5m87xx/s5m-core.h b/include/linux/mfd/s5m87xx/s5m-core.h
index a7480b57f92d..21603b42f22f 100644
--- a/include/linux/mfd/s5m87xx/s5m-core.h
+++ b/include/linux/mfd/s5m87xx/s5m-core.h
@@ -335,6 +335,7 @@ extern int s5m_reg_update(struct s5m87xx_dev *s5m87xx, u8 reg, u8 val, u8 mask);
 
 struct s5m_platform_data {
         struct s5m_regulator_data       *regulators;
+        struct s5m_opmode_data          *opmode;
         int                             device_type;
         int                             num_regulators;
 
diff --git a/include/linux/mfd/s5m87xx/s5m-pmic.h b/include/linux/mfd/s5m87xx/s5m-pmic.h
index a72a5d27e62e..7c719f20f58a 100644
--- a/include/linux/mfd/s5m87xx/s5m-pmic.h
+++ b/include/linux/mfd/s5m87xx/s5m-pmic.h
@@ -58,6 +58,8 @@ enum s5m8767_regulators {
         S5M8767_REG_MAX,
 };
 
+#define S5M8767_ENCTRL_SHIFT  6
+
 /* S5M8763 regulator ids */
 enum s5m8763_regulators {
         S5M8763_LDO1,
@@ -97,4 +99,31 @@ struct s5m_regulator_data {
         struct regulator_init_data      *initdata;
 };
 
+/*
+ * s5m_opmode_data - regulator operation mode data
+ * @id: regulator id
+ * @mode: regulator operation mode
+ */
+struct s5m_opmode_data {
+        int id;
+        int mode;
+};
+
+/*
+ * s5m regulator operation mode
+ * S5M_OPMODE_OFF       Regulator always OFF
+ * S5M_OPMODE_ON        Regulator always ON
+ * S5M_OPMODE_LOWPOWER  Regulator is on in low-power mode
+ * S5M_OPMODE_SUSPEND   Regulator is changed by PWREN pin
+ *                      If PWREN is high, regulator is on
+ *                      If PWREN is low, regulator is off
+ */
+
+enum s5m_opmode {
+        S5M_OPMODE_OFF,
+        S5M_OPMODE_ON,
+        S5M_OPMODE_LOWPOWER,
+        S5M_OPMODE_SUSPEND,
+};
+
 #endif /*  __LINUX_MFD_S5M_PMIC_H */
diff --git a/include/linux/mfd/sta2x11-mfd.h b/include/linux/mfd/sta2x11-mfd.h
new file mode 100644
index 000000000000..d179227e866f
--- /dev/null
+++ b/include/linux/mfd/sta2x11-mfd.h
@@ -0,0 +1,324 @@
+/*
+ * Copyright (c) 2009-2011 Wind River Systems, Inc.
+ * Copyright (c) 2011 ST Microelectronics (Alessandro Rubini)
+ *
+ * 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
+ *
+ * The STMicroelectronics ConneXt (STA2X11) chip has several unrelated
+ * functions in one PCI endpoint functions. This driver simply
+ * registers the platform devices in this iomemregion and exports a few
+ * functions to access common registers
+ */
+
+#ifndef __STA2X11_MFD_H
+#define __STA2X11_MFD_H
+#include <linux/types.h>
+#include <linux/pci.h>
+
+/*
+ * The MFD PCI block includes the GPIO peripherals and other register blocks.
+ * For GPIO, we have 32*4 bits (I use "gsta" for "gpio sta2x11".)
+ */
+#define GSTA_GPIO_PER_BLOCK     32
+#define GSTA_NR_BLOCKS          4
+#define GSTA_NR_GPIO            (GSTA_GPIO_PER_BLOCK * GSTA_NR_BLOCKS)
+
+/* Pinconfig is set by the board definition: altfunc, pull-up, pull-down */
+struct sta2x11_gpio_pdata {
+        unsigned pinconfig[GSTA_NR_GPIO];
+};
+
+/* Macros below lifted from sh_pfc.h, with minor differences */
+#define PINMUX_TYPE_NONE                0
+#define PINMUX_TYPE_FUNCTION            1
+#define PINMUX_TYPE_OUTPUT_LOW          2
+#define PINMUX_TYPE_OUTPUT_HIGH         3
+#define PINMUX_TYPE_INPUT               4
+#define PINMUX_TYPE_INPUT_PULLUP        5
+#define PINMUX_TYPE_INPUT_PULLDOWN      6
+
+/* Give names to GPIO pins, like PXA does, taken from the manual */
+#define STA2X11_GPIO0                   0
+#define STA2X11_GPIO1                   1
+#define STA2X11_GPIO2                   2
+#define STA2X11_GPIO3                   3
+#define STA2X11_GPIO4                   4
+#define STA2X11_GPIO5                   5
+#define STA2X11_GPIO6                   6
+#define STA2X11_GPIO7                   7
+#define STA2X11_GPIO8_RGBOUT_RED7       8
+#define STA2X11_GPIO9_RGBOUT_RED6       9
+#define STA2X11_GPIO10_RGBOUT_RED5      10
+#define STA2X11_GPIO11_RGBOUT_RED4      11
+#define STA2X11_GPIO12_RGBOUT_RED3      12
+#define STA2X11_GPIO13_RGBOUT_RED2      13
+#define STA2X11_GPIO14_RGBOUT_RED1      14
+#define STA2X11_GPIO15_RGBOUT_RED0      15
+#define STA2X11_GPIO16_RGBOUT_GREEN7    16
+#define STA2X11_GPIO17_RGBOUT_GREEN6    17
+#define STA2X11_GPIO18_RGBOUT_GREEN5    18
+#define STA2X11_GPIO19_RGBOUT_GREEN4    19
+#define STA2X11_GPIO20_RGBOUT_GREEN3    20
+#define STA2X11_GPIO21_RGBOUT_GREEN2    21
+#define STA2X11_GPIO22_RGBOUT_GREEN1    22
+#define STA2X11_GPIO23_RGBOUT_GREEN0    23
+#define STA2X11_GPIO24_RGBOUT_BLUE7     24
+#define STA2X11_GPIO25_RGBOUT_BLUE6     25
+#define STA2X11_GPIO26_RGBOUT_BLUE5     26
+#define STA2X11_GPIO27_RGBOUT_BLUE4     27
+#define STA2X11_GPIO28_RGBOUT_BLUE3     28
+#define STA2X11_GPIO29_RGBOUT_BLUE2     29
+#define STA2X11_GPIO30_RGBOUT_BLUE1     30
+#define STA2X11_GPIO31_RGBOUT_BLUE0     31
+#define STA2X11_GPIO32_RGBOUT_VSYNCH    32
+#define STA2X11_GPIO33_RGBOUT_HSYNCH    33
+#define STA2X11_GPIO34_RGBOUT_DEN       34
+#define STA2X11_GPIO35_ETH_CRS_DV       35
+#define STA2X11_GPIO36_ETH_TXD1         36
+#define STA2X11_GPIO37_ETH_TXD0         37
+#define STA2X11_GPIO38_ETH_TX_EN        38
+#define STA2X11_GPIO39_MDIO             39
+#define STA2X11_GPIO40_ETH_REF_CLK      40
+#define STA2X11_GPIO41_ETH_RXD1         41
+#define STA2X11_GPIO42_ETH_RXD0         42
+#define STA2X11_GPIO43_MDC              43
+#define STA2X11_GPIO44_CAN_TX           44
+#define STA2X11_GPIO45_CAN_RX           45
+#define STA2X11_GPIO46_MLB_DAT          46
+#define STA2X11_GPIO47_MLB_SIG          47
+#define STA2X11_GPIO48_SPI0_CLK         48
+#define STA2X11_GPIO49_SPI0_TXD         49
+#define STA2X11_GPIO50_SPI0_RXD         50
+#define STA2X11_GPIO51_SPI0_FRM         51
+#define STA2X11_GPIO52_SPI1_CLK         52
+#define STA2X11_GPIO53_SPI1_TXD         53
+#define STA2X11_GPIO54_SPI1_RXD         54
+#define STA2X11_GPIO55_SPI1_FRM         55
+#define STA2X11_GPIO56_SPI2_CLK         56
+#define STA2X11_GPIO57_SPI2_TXD         57
+#define STA2X11_GPIO58_SPI2_RXD         58
+#define STA2X11_GPIO59_SPI2_FRM         59
+#define STA2X11_GPIO60_I2C0_SCL         60
+#define STA2X11_GPIO61_I2C0_SDA         61
+#define STA2X11_GPIO62_I2C1_SCL         62
+#define STA2X11_GPIO63_I2C1_SDA         63
+#define STA2X11_GPIO64_I2C2_SCL         64
+#define STA2X11_GPIO65_I2C2_SDA         65
+#define STA2X11_GPIO66_I2C3_SCL         66
+#define STA2X11_GPIO67_I2C3_SDA         67
+#define STA2X11_GPIO68_MSP0_RCK         68
+#define STA2X11_GPIO69_MSP0_RXD         69
+#define STA2X11_GPIO70_MSP0_RFS         70
+#define STA2X11_GPIO71_MSP0_TCK         71
+#define STA2X11_GPIO72_MSP0_TXD         72
+#define STA2X11_GPIO73_MSP0_TFS         73
+#define STA2X11_GPIO74_MSP0_SCK         74
+#define STA2X11_GPIO75_MSP1_CK          75
+#define STA2X11_GPIO76_MSP1_RXD         76
+#define STA2X11_GPIO77_MSP1_FS          77
+#define STA2X11_GPIO78_MSP1_TXD         78
+#define STA2X11_GPIO79_MSP2_CK          79
+#define STA2X11_GPIO80_MSP2_RXD         80
+#define STA2X11_GPIO81_MSP2_FS          81
+#define STA2X11_GPIO82_MSP2_TXD         82
+#define STA2X11_GPIO83_MSP3_CK          83
+#define STA2X11_GPIO84_MSP3_RXD         84
+#define STA2X11_GPIO85_MSP3_FS          85
+#define STA2X11_GPIO86_MSP3_TXD         86
+#define STA2X11_GPIO87_MSP4_CK          87
+#define STA2X11_GPIO88_MSP4_RXD         88
+#define STA2X11_GPIO89_MSP4_FS          89
+#define STA2X11_GPIO90_MSP4_TXD         90
+#define STA2X11_GPIO91_MSP5_CK          91
+#define STA2X11_GPIO92_MSP5_RXD         92
+#define STA2X11_GPIO93_MSP5_FS          93
+#define STA2X11_GPIO94_MSP5_TXD         94
+#define STA2X11_GPIO95_SDIO3_DAT3       95
+#define STA2X11_GPIO96_SDIO3_DAT2       96
+#define STA2X11_GPIO97_SDIO3_DAT1       97
+#define STA2X11_GPIO98_SDIO3_DAT0       98
+#define STA2X11_GPIO99_SDIO3_CLK        99
+#define STA2X11_GPIO100_SDIO3_CMD       100
+#define STA2X11_GPIO101                 101
+#define STA2X11_GPIO102                 102
+#define STA2X11_GPIO103                 103
+#define STA2X11_GPIO104                 104
+#define STA2X11_GPIO105_SDIO2_DAT3      105
+#define STA2X11_GPIO106_SDIO2_DAT2      106
+#define STA2X11_GPIO107_SDIO2_DAT1      107
+#define STA2X11_GPIO108_SDIO2_DAT0      108
+#define STA2X11_GPIO109_SDIO2_CLK       109
+#define STA2X11_GPIO110_SDIO2_CMD       110
+#define STA2X11_GPIO111                 111
+#define STA2X11_GPIO112                 112
+#define STA2X11_GPIO113                 113
+#define STA2X11_GPIO114                 114
+#define STA2X11_GPIO115_SDIO1_DAT3      115
+#define STA2X11_GPIO116_SDIO1_DAT2      116
+#define STA2X11_GPIO117_SDIO1_DAT1      117
+#define STA2X11_GPIO118_SDIO1_DAT0      118
+#define STA2X11_GPIO119_SDIO1_CLK       119
+#define STA2X11_GPIO120_SDIO1_CMD       120
+#define STA2X11_GPIO121                 121
+#define STA2X11_GPIO122                 122
+#define STA2X11_GPIO123                 123
+#define STA2X11_GPIO124                 124
+#define STA2X11_GPIO125_UART2_TXD       125
+#define STA2X11_GPIO126_UART2_RXD       126
+#define STA2X11_GPIO127_UART3_TXD       127
+
+/*
+ * The APB bridge has its own registers, needed by our users as well.
+ * They are accessed with the following read/mask/write function.
+ */
+u32 sta2x11_apbreg_mask(struct pci_dev *pdev, u32 reg, u32 mask, u32 val);
+
+/* CAN and MLB */
+#define APBREG_BSR      0x00    /* Bridge Status Reg */
+#define APBREG_PAER     0x08    /* Peripherals Address Error Reg */
+#define APBREG_PWAC     0x20    /* Peripheral Write Access Control reg */
+#define APBREG_PRAC     0x40    /* Peripheral Read Access Control reg */
+#define APBREG_PCG      0x60    /* Peripheral Clock Gating Reg */
+#define APBREG_PUR      0x80    /* Peripheral Under Reset Reg */
+#define APBREG_EMU_PCG  0xA0    /* Emulator Peripheral Clock Gating Reg */
+
+#define APBREG_CAN      (1 << 1)
+#define APBREG_MLB      (1 << 3)
+
+/* SARAC */
+#define APBREG_BSR_SARAC     0x100 /* Bridge Status Reg */
+#define APBREG_PAER_SARAC    0x108 /* Peripherals Address Error Reg */
+#define APBREG_PWAC_SARAC    0x120 /* Peripheral Write Access Control reg */
+#define APBREG_PRAC_SARAC    0x140 /* Peripheral Read Access Control reg */
+#define APBREG_PCG_SARAC     0x160 /* Peripheral Clock Gating Reg */
+#define APBREG_PUR_SARAC     0x180 /* Peripheral Under Reset Reg */
+#define APBREG_EMU_PCG_SARAC 0x1A0 /* Emulator Peripheral Clock Gating Reg */
+
+#define APBREG_SARAC    (1 << 2)
+
+/*
+ * The system controller has its own registers. Some of these are accessed
+ * by out users as well, using the following read/mask/write/function
+ */
+u32 sta2x11_sctl_mask(struct pci_dev *pdev, u32 reg, u32 mask, u32 val);
+
+#define SCTL_SCCTL              0x00    /* System controller control register */
+#define SCTL_ARMCFG             0x04    /* ARM configuration register */
+#define SCTL_SCPLLCTL           0x08    /* PLL control status register */
+#define SCTL_SCPLLFCTRL         0x0c    /* PLL frequency control register */
+#define SCTL_SCRESFRACT         0x10    /* PLL fractional input register */
+#define SCTL_SCRESCTRL1         0x14    /* Peripheral reset control 1 */
+#define SCTL_SCRESXTRL2         0x18    /* Peripheral reset control 2 */
+#define SCTL_SCPEREN0           0x1c    /* Peripheral clock enable register 0 */
+#define SCTL_SCPEREN1           0x20    /* Peripheral clock enable register 1 */
+#define SCTL_SCPEREN2           0x24    /* Peripheral clock enable register 2 */
+#define SCTL_SCGRST             0x28    /* Peripheral global reset */
+#define SCTL_SCPCIPMCR1         0x30    /* PCI power management control 1 */
+#define SCTL_SCPCIPMCR2         0x34    /* PCI power management control 2 */
+#define SCTL_SCPCIPMSR1         0x38    /* PCI power management status 1 */
+#define SCTL_SCPCIPMSR2         0x3c    /* PCI power management status 2 */
+#define SCTL_SCPCIPMSR3         0x40    /* PCI power management status 3 */
+#define SCTL_SCINTREN           0x44    /* Interrupt enable */
+#define SCTL_SCRISR             0x48    /* RAW interrupt status */
+#define SCTL_SCCLKSTAT0         0x4c    /* Peripheral clocks status 0 */
+#define SCTL_SCCLKSTAT1         0x50    /* Peripheral clocks status 1 */
+#define SCTL_SCCLKSTAT2         0x54    /* Peripheral clocks status 2 */
+#define SCTL_SCRSTSTA           0x58    /* Reset status register */
+
+#define SCTL_SCRESCTRL1_USB_PHY_POR     (1 << 0)
+#define SCTL_SCRESCTRL1_USB_OTG (1 << 1)
+#define SCTL_SCRESCTRL1_USB_HRST        (1 << 2)
+#define SCTL_SCRESCTRL1_USB_PHY_HOST    (1 << 3)
+#define SCTL_SCRESCTRL1_SATAII  (1 << 4)
+#define SCTL_SCRESCTRL1_VIP             (1 << 5)
+#define SCTL_SCRESCTRL1_PER_MMC0        (1 << 6)
+#define SCTL_SCRESCTRL1_PER_MMC1        (1 << 7)
+#define SCTL_SCRESCTRL1_PER_GPIO0       (1 << 8)
+#define SCTL_SCRESCTRL1_PER_GPIO1       (1 << 9)
+#define SCTL_SCRESCTRL1_PER_GPIO2       (1 << 10)
+#define SCTL_SCRESCTRL1_PER_GPIO3       (1 << 11)
+#define SCTL_SCRESCTRL1_PER_MTU0        (1 << 12)
+#define SCTL_SCRESCTRL1_KER_SPI0        (1 << 13)
+#define SCTL_SCRESCTRL1_KER_SPI1        (1 << 14)
+#define SCTL_SCRESCTRL1_KER_SPI2        (1 << 15)
+#define SCTL_SCRESCTRL1_KER_MCI0        (1 << 16)
+#define SCTL_SCRESCTRL1_KER_MCI1        (1 << 17)
+#define SCTL_SCRESCTRL1_PRE_HSI2C0      (1 << 18)
+#define SCTL_SCRESCTRL1_PER_HSI2C1      (1 << 19)
+#define SCTL_SCRESCTRL1_PER_HSI2C2      (1 << 20)
+#define SCTL_SCRESCTRL1_PER_HSI2C3      (1 << 21)
+#define SCTL_SCRESCTRL1_PER_MSP0        (1 << 22)
+#define SCTL_SCRESCTRL1_PER_MSP1        (1 << 23)
+#define SCTL_SCRESCTRL1_PER_MSP2        (1 << 24)
+#define SCTL_SCRESCTRL1_PER_MSP3        (1 << 25)
+#define SCTL_SCRESCTRL1_PER_MSP4        (1 << 26)
+#define SCTL_SCRESCTRL1_PER_MSP5        (1 << 27)
+#define SCTL_SCRESCTRL1_PER_MMC (1 << 28)
+#define SCTL_SCRESCTRL1_KER_MSP0        (1 << 29)
+#define SCTL_SCRESCTRL1_KER_MSP1        (1 << 30)
+#define SCTL_SCRESCTRL1_KER_MSP2        (1 << 31)
+
+#define SCTL_SCPEREN0_UART0             (1 << 0)
+#define SCTL_SCPEREN0_UART1             (1 << 1)
+#define SCTL_SCPEREN0_UART2             (1 << 2)
+#define SCTL_SCPEREN0_UART3             (1 << 3)
+#define SCTL_SCPEREN0_MSP0              (1 << 4)
+#define SCTL_SCPEREN0_MSP1              (1 << 5)
+#define SCTL_SCPEREN0_MSP2              (1 << 6)
+#define SCTL_SCPEREN0_MSP3              (1 << 7)
+#define SCTL_SCPEREN0_MSP4              (1 << 8)
+#define SCTL_SCPEREN0_MSP5              (1 << 9)
+#define SCTL_SCPEREN0_SPI0              (1 << 10)
+#define SCTL_SCPEREN0_SPI1              (1 << 11)
+#define SCTL_SCPEREN0_SPI2              (1 << 12)
+#define SCTL_SCPEREN0_I2C0              (1 << 13)
+#define SCTL_SCPEREN0_I2C1              (1 << 14)
+#define SCTL_SCPEREN0_I2C2              (1 << 15)
+#define SCTL_SCPEREN0_I2C3              (1 << 16)
+#define SCTL_SCPEREN0_SVDO_LVDS         (1 << 17)
+#define SCTL_SCPEREN0_USB_HOST          (1 << 18)
+#define SCTL_SCPEREN0_USB_OTG           (1 << 19)
+#define SCTL_SCPEREN0_MCI0              (1 << 20)
+#define SCTL_SCPEREN0_MCI1              (1 << 21)
+#define SCTL_SCPEREN0_MCI2              (1 << 22)
+#define SCTL_SCPEREN0_MCI3              (1 << 23)
+#define SCTL_SCPEREN0_SATA              (1 << 24)
+#define SCTL_SCPEREN0_ETHERNET          (1 << 25)
+#define SCTL_SCPEREN0_VIC               (1 << 26)
+#define SCTL_SCPEREN0_DMA_AUDIO         (1 << 27)
+#define SCTL_SCPEREN0_DMA_SOC           (1 << 28)
+#define SCTL_SCPEREN0_RAM               (1 << 29)
+#define SCTL_SCPEREN0_VIP               (1 << 30)
+#define SCTL_SCPEREN0_ARM               (1 << 31)
+
+#define SCTL_SCPEREN1_UART0             (1 << 0)
+#define SCTL_SCPEREN1_UART1             (1 << 1)
+#define SCTL_SCPEREN1_UART2             (1 << 2)
+#define SCTL_SCPEREN1_UART3             (1 << 3)
+#define SCTL_SCPEREN1_MSP0              (1 << 4)
+#define SCTL_SCPEREN1_MSP1              (1 << 5)
+#define SCTL_SCPEREN1_MSP2              (1 << 6)
+#define SCTL_SCPEREN1_MSP3              (1 << 7)
+#define SCTL_SCPEREN1_MSP4              (1 << 8)
+#define SCTL_SCPEREN1_MSP5              (1 << 9)
+#define SCTL_SCPEREN1_SPI0              (1 << 10)
+#define SCTL_SCPEREN1_SPI1              (1 << 11)
+#define SCTL_SCPEREN1_SPI2              (1 << 12)
+#define SCTL_SCPEREN1_I2C0              (1 << 13)
+#define SCTL_SCPEREN1_I2C1              (1 << 14)
+#define SCTL_SCPEREN1_I2C2              (1 << 15)
+#define SCTL_SCPEREN1_I2C3              (1 << 16)
+#define SCTL_SCPEREN1_USB_PHY           (1 << 17)
+
+#endif /* __STA2X11_MFD_H */
diff --git a/include/linux/mfd/stmpe.h b/include/linux/mfd/stmpe.h
index 8516fd1eaabc..f8d5b4d5843f 100644
--- a/include/linux/mfd/stmpe.h
+++ b/include/linux/mfd/stmpe.h
@@ -117,7 +117,7 @@ struct matrix_keymap_data;
  * @no_autorepeat: disable key autorepeat
  */
 struct stmpe_keypad_platform_data {
-        struct matrix_keymap_data *keymap_data;
+        const struct matrix_keymap_data *keymap_data;
         unsigned int debounce_ms;
         unsigned int scan_count;
         bool no_autorepeat;
diff --git a/include/linux/mfd/tps65090.h b/include/linux/mfd/tps65090.h
index 38e31c55adbb..6bc31d854626 100644
--- a/include/linux/mfd/tps65090.h
+++ b/include/linux/mfd/tps65090.h
@@ -22,6 +22,19 @@
 #ifndef __LINUX_MFD_TPS65090_H
 #define __LINUX_MFD_TPS65090_H
 
+#include <linux/irq.h>
+
+struct tps65090 {
+        struct mutex            lock;
+        struct device           *dev;
+        struct i2c_client       *client;
+        struct regmap           *rmap;
+        struct irq_chip         irq_chip;
+        struct mutex            irq_lock;
+        int                     irq_base;
+        unsigned int            id;
+};
+
 struct tps65090_subdev_info {
         int             id;
         const char      *name;
diff --git a/include/linux/mfd/tps6586x.h b/include/linux/mfd/tps6586x.h
index b19176eab44d..f350fd0ba1df 100644
--- a/include/linux/mfd/tps6586x.h
+++ b/include/linux/mfd/tps6586x.h
@@ -68,6 +68,7 @@ struct tps6586x_subdev_info {
         int             id;
         const char      *name;
         void            *platform_data;
+        struct device_node *of_node;
 };
 
 struct tps6586x_platform_data {
diff --git a/include/linux/mfd/tps65910.h b/include/linux/mfd/tps65910.h
index 1c6c2860d1a6..dd8dc0a6c462 100644
--- a/include/linux/mfd/tps65910.h
+++ b/include/linux/mfd/tps65910.h
@@ -18,6 +18,7 @@
 #define __LINUX_MFD_TPS65910_H
 
 #include <linux/gpio.h>
+#include <linux/regmap.h>
 
 /* TPS chip id list */
 #define TPS65910                        0
@@ -783,6 +784,18 @@
 #define TPS65910_SLEEP_CONTROL_EXT_INPUT_EN3            0x4
 #define TPS65911_SLEEP_CONTROL_EXT_INPUT_SLEEP          0x8
 
+/*
+ * Sleep keepon data: Maintains the state in sleep mode
+ * @therm_keepon: Keep on the thermal monitoring in sleep state.
+ * @clkout32k_keepon: Keep on the 32KHz clock output in sleep state.
+ * @i2chs_keepon: Keep on high speed internal clock in sleep state.
+ */
+struct tps65910_sleep_keepon_data {
+        unsigned therm_keepon:1;
+        unsigned clkout32k_keepon:1;
+        unsigned i2chs_keepon:1;
+};
+
 /**
  * struct tps65910_board
  * Board platform data may be used to initialize regulators.
@@ -794,6 +807,8 @@ struct tps65910_board {
         int irq_base;
         int vmbch_threshold;
         int vmbch2_threshold;
+        bool en_dev_slp;
+        struct tps65910_sleep_keepon_data *slp_keepon;
         bool en_gpio_sleep[TPS6591X_MAX_NUM_GPIO];
         unsigned long regulator_ext_sleep_control[TPS65910_NUM_REGS];
         struct regulator_init_data *tps65910_pmic_init_data[TPS65910_NUM_REGS];
@@ -809,16 +824,14 @@ struct tps65910 {
         struct regmap *regmap;
         struct mutex io_mutex;
         unsigned int id;
-        int (*read)(struct tps65910 *tps65910, u8 reg, int size, void *dest);
-        int (*write)(struct tps65910 *tps65910, u8 reg, int size, void *src);
 
         /* Client devices */
         struct tps65910_pmic *pmic;
         struct tps65910_rtc *rtc;
         struct tps65910_power *power;
 
-        /* GPIO Handling */
-        struct gpio_chip gpio;
+        /* Device node parsed board data */
+        struct tps65910_board *of_plat_data;
 
         /* IRQ Handling */
         struct mutex irq_lock;
@@ -826,6 +839,7 @@ struct tps65910 {
         int irq_base;
         int irq_num;
         u32 irq_mask;
+        struct irq_domain *domain;
 };
 
 struct tps65910_platform_data {
@@ -833,9 +847,6 @@ struct tps65910_platform_data {
         int irq_base;
 };
 
-int tps65910_set_bits(struct tps65910 *tps65910, u8 reg, u8 mask);
-int tps65910_clear_bits(struct tps65910 *tps65910, u8 reg, u8 mask);
-void tps65910_gpio_init(struct tps65910 *tps65910, int gpio_base);
 int tps65910_irq_init(struct tps65910 *tps65910, int irq,
                 struct tps65910_platform_data *pdata);
 int tps65910_irq_exit(struct tps65910 *tps65910);
@@ -845,4 +856,28 @@ static inline int tps65910_chip_id(struct tps65910 *tps65910)
         return tps65910->id;
 }
 
+static inline int tps65910_reg_read(struct tps65910 *tps65910, u8 reg,
+                unsigned int *val)
+{
+        return regmap_read(tps65910->regmap, reg, val);
+}
+
+static inline int tps65910_reg_write(struct tps65910 *tps65910, u8 reg,
+                unsigned int val)
+{
+        return regmap_write(tps65910->regmap, reg, val);
+}
+
+static inline int tps65910_reg_set_bits(struct tps65910 *tps65910, u8 reg,
+                u8 mask)
+{
+        return regmap_update_bits(tps65910->regmap, reg, mask, mask);
+}
+
+static inline int tps65910_reg_clear_bits(struct tps65910 *tps65910, u8 reg,
+                u8 mask)
+{
+        return regmap_update_bits(tps65910->regmap, reg, mask, 0);
+}
+
 #endif /*  __LINUX_MFD_TPS65910_H */
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
index b15b5f03f5c4..6659487c31e7 100644
--- a/include/linux/mfd/twl6040.h
+++ b/include/linux/mfd/twl6040.h
@@ -27,6 +27,7 @@
 
 #include <linux/interrupt.h>
 #include <linux/mfd/core.h>
+#include <linux/regulator/consumer.h>
 
 #define TWL6040_REG_ASICID              0x01
 #define TWL6040_REG_ASICREV             0x02
@@ -203,6 +204,7 @@ struct regmap;
 struct twl6040 {
         struct device *dev;
         struct regmap *regmap;
+        struct regulator_bulk_data supplies[2]; /* supplies for vio, v2v1 */
         struct mutex mutex;
         struct mutex io_mutex;
         struct mutex irq_mutex;
diff --git a/include/linux/mfd/wm831x/core.h b/include/linux/mfd/wm831x/core.h
index 4b1211859f74..4a3b83a77614 100644
--- a/include/linux/mfd/wm831x/core.h
+++ b/include/linux/mfd/wm831x/core.h
@@ -17,6 +17,7 @@
 
 #include <linux/completion.h>
 #include <linux/interrupt.h>
+#include <linux/irqdomain.h>
 #include <linux/list.h>
 #include <linux/regmap.h>
 
@@ -338,6 +339,7 @@
 #define WM831X_FLL_CLK_SRC_WIDTH                     2  /* FLL_CLK_SRC - [1:0] */
 
 struct regulator_dev;
+struct irq_domain;
 
 #define WM831X_NUM_IRQ_REGS 5
 #define WM831X_NUM_GPIO_REGS 16
@@ -367,7 +369,7 @@ struct wm831x {
 
         int irq;  /* Our chip IRQ */
         struct mutex irq_lock;
-        int irq_base;
+        struct irq_domain *irq_domain;
         int irq_masks_cur[WM831X_NUM_IRQ_REGS];   /* Currently active value */
         int irq_masks_cache[WM831X_NUM_IRQ_REGS]; /* Cached hardware value */
 
@@ -382,7 +384,8 @@ struct wm831x {
 
         /* Used by the interrupt controller code to post writes */
         int gpio_update[WM831X_NUM_GPIO_REGS];
-        bool gpio_level[WM831X_NUM_GPIO_REGS];
+        bool gpio_level_high[WM831X_NUM_GPIO_REGS];
+        bool gpio_level_low[WM831X_NUM_GPIO_REGS];
 
         struct mutex auxadc_lock;
         struct list_head auxadc_pending;
@@ -417,6 +420,11 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq);
 void wm831x_irq_exit(struct wm831x *wm831x);
 void wm831x_auxadc_init(struct wm831x *wm831x);
 
+static inline int wm831x_irq(struct wm831x *wm831x, int irq)
+{
+        return irq_create_mapping(wm831x->irq_domain, irq);
+}
+
 extern struct regmap_config wm831x_regmap_config;
 
 #endif
diff --git a/include/linux/mfd/wm831x/pdata.h b/include/linux/mfd/wm831x/pdata.h
index 1d7a3f7b3b5d..dcc9631b3052 100644
--- a/include/linux/mfd/wm831x/pdata.h
+++ b/include/linux/mfd/wm831x/pdata.h
@@ -26,7 +26,7 @@ struct wm831x_backlight_pdata {
 struct wm831x_backup_pdata {
         int charger_enable;
         int no_constant_voltage;  /** Disable constant voltage charging */
-        int vlim;   /** Voltage limit in milivolts */
+        int vlim;   /** Voltage limit in millivolts */
         int ilim;   /** Current limit in microamps */
 };
 
diff --git a/include/linux/mfd/wm8350/core.h b/include/linux/mfd/wm8350/core.h
index 98fcc977e82b..9192b6404a73 100644
--- a/include/linux/mfd/wm8350/core.h
+++ b/include/linux/mfd/wm8350/core.h
@@ -602,6 +602,7 @@ extern const u16 wm8352_mode2_defaults[];
 extern const u16 wm8352_mode3_defaults[];
 
 struct wm8350;
+struct regmap;
 
 struct wm8350_hwmon {
         struct platform_device *pdev;
@@ -612,13 +613,7 @@ struct wm8350 {
         struct device *dev;
 
         /* device IO */
-        union {
-                struct i2c_client *i2c_client;
-                struct spi_device *spi_device;
-        };
-        int (*read_dev)(struct wm8350 *wm8350, char reg, int size, void *dest);
-        int (*write_dev)(struct wm8350 *wm8350, char reg, int size,
-                         void *src);
+        struct regmap *regmap;
         u16 *reg_cache;
 
         struct mutex auxadc_mutex;
diff --git a/include/linux/mfd/wm8400-private.h b/include/linux/mfd/wm8400-private.h
index 0147b6968510..2de565b94d0c 100644
--- a/include/linux/mfd/wm8400-private.h
+++ b/include/linux/mfd/wm8400-private.h
@@ -24,19 +24,14 @@
 #include <linux/mfd/wm8400.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
-
-struct regmap;
+#include <linux/regmap.h>
 
 #define WM8400_REGISTER_COUNT 0x55
 
 struct wm8400 {
         struct device *dev;
-
-        struct mutex io_lock;
         struct regmap *regmap;
 
-        u16 reg_cache[WM8400_REGISTER_COUNT];
-
         struct platform_device regulators[6];
 };
 
@@ -930,6 +925,11 @@ struct wm8400 {
 
 u16 wm8400_reg_read(struct wm8400 *wm8400, u8 reg);
 int wm8400_block_read(struct wm8400 *wm8400, u8 reg, int count, u16 *data);
-int wm8400_set_bits(struct wm8400 *wm8400, u8 reg, u16 mask, u16 val);
+
+static inline int wm8400_set_bits(struct wm8400 *wm8400, u8 reg,
+                                  u16 mask, u16 val)
+{
+        return regmap_update_bits(wm8400->regmap, reg, mask, val);
+}
 
 #endif
diff --git a/include/linux/mfd/wm8994/core.h b/include/linux/mfd/wm8994/core.h
index 9eff2a351ec5..1f173306bf05 100644
--- a/include/linux/mfd/wm8994/core.h
+++ b/include/linux/mfd/wm8994/core.h
@@ -17,6 +17,7 @@
 
 #include <linux/mutex.h>
 #include <linux/interrupt.h>
+#include <linux/regmap.h>
 
 enum wm8994_type {
         WM8994 = 0,
@@ -26,7 +27,6 @@ enum wm8994_type {
 
 struct regulator_dev;
 struct regulator_bulk_data;
-struct regmap;
 
 #define WM8994_NUM_GPIO_REGS 11
 #define WM8994_NUM_LDO_REGS   2
@@ -57,6 +57,7 @@ struct wm8994 {
 
         enum wm8994_type type;
         int revision;
+        int cust_id;
 
         struct device *dev;
         struct regmap *regmap;
@@ -94,17 +95,17 @@ static inline int wm8994_request_irq(struct wm8994 *wm8994, int irq,
                                      irq_handler_t handler, const char *name,
                                      void *data)
 {
-        if (!wm8994->irq_base)
+        if (!wm8994->irq_data)
                 return -EINVAL;
-        return request_threaded_irq(wm8994->irq_base + irq, NULL, handler,
-                                    IRQF_TRIGGER_RISING, name,
+        return request_threaded_irq(regmap_irq_get_virq(wm8994->irq_data, irq),
+                                    NULL, handler, IRQF_TRIGGER_RISING, name,
                                     data);
 }
 static inline void wm8994_free_irq(struct wm8994 *wm8994, int irq, void *data)
 {
-        if (!wm8994->irq_base)
+        if (!wm8994->irq_data)
                 return;
-        free_irq(wm8994->irq_base + irq, data);
+        free_irq(regmap_irq_get_virq(wm8994->irq_data, irq), data);
 }
 
 int wm8994_irq_init(struct wm8994 *wm8994);
diff --git a/include/linux/mfd/wm8994/registers.h b/include/linux/mfd/wm8994/registers.h
index 86e6a032a078..053548961c15 100644
--- a/include/linux/mfd/wm8994/registers.h
+++ b/include/linux/mfd/wm8994/registers.h
@@ -2212,6 +2212,9 @@
 /*
  * R256 (0x100) - Chip Revision
  */
+#define WM8994_CUST_ID_MASK                     0xFF00  /* CUST_ID - [15:8] */
+#define WM8994_CUST_ID_SHIFT                         8  /* CUST_ID - [15:8] */
+#define WM8994_CUST_ID_WIDTH                         8  /* CUST_ID - [15:8] */
 #define WM8994_CHIP_REV_MASK                    0x000F  /* CHIP_REV - [3:0] */
 #define WM8994_CHIP_REV_SHIFT                        0  /* CHIP_REV - [3:0] */
 #define WM8994_CHIP_REV_WIDTH                        4  /* CHIP_REV - [3:0] */
diff --git a/include/linux/micrel_phy.h b/include/linux/micrel_phy.h
index dd8da342a991..61f0905bdc48 100644
--- a/include/linux/micrel_phy.h
+++ b/include/linux/micrel_phy.h
@@ -3,7 +3,7 @@
 
 #define MICREL_PHY_ID_MASK      0x00fffff0
 
-#define PHY_ID_KSZ9021          0x00221611
+#define PHY_ID_KSZ9021          0x00221610
 #define PHY_ID_KS8737           0x00221720
 #define PHY_ID_KS8041           0x00221510
 #define PHY_ID_KS8051           0x00221550
diff --git a/include/linux/mlx4/cmd.h b/include/linux/mlx4/cmd.h
index 9958ff2cad3c..1f3860a8a109 100644
--- a/include/linux/mlx4/cmd.h
+++ b/include/linux/mlx4/cmd.h
@@ -150,6 +150,10 @@ enum {
         /* statistics commands */
         MLX4_CMD_QUERY_IF_STAT   = 0X54,
         MLX4_CMD_SET_IF_STAT     = 0X55,
+
+        /* set port opcode modifiers */
+        MLX4_SET_PORT_PRIO2TC = 0x8,
+        MLX4_SET_PORT_SCHEDULER  = 0x9,
 };
 
 enum {
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 834c96c5d879..6a8f002b8ed3 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -64,6 +64,7 @@ enum {
         MLX4_MAX_NUM_PF         = 16,
         MLX4_MAX_NUM_VF         = 64,
         MLX4_MFUNC_MAX          = 80,
+        MLX4_MAX_EQ_NUM         = 1024,
         MLX4_MFUNC_EQ_NUM       = 4,
         MLX4_MFUNC_MAX_EQES     = 8,
         MLX4_MFUNC_EQE_MASK     = (MLX4_MFUNC_MAX_EQES - 1)
@@ -98,6 +99,12 @@ enum {
         MLX4_DEV_CAP_FLAG_SENSE_SUPPORT = 1LL << 55
 };
 
+enum {
+        MLX4_DEV_CAP_FLAG2_RSS                  = 1LL <<  0,
+        MLX4_DEV_CAP_FLAG2_RSS_TOP              = 1LL <<  1,
+        MLX4_DEV_CAP_FLAG2_RSS_XOR              = 1LL <<  2
+};
+
 #define MLX4_ATTR_EXTENDED_PORT_INFO    cpu_to_be16(0xff90)
 
 enum {
@@ -233,6 +240,10 @@ static inline u64 mlx4_fw_ver(u64 major, u64 minor, u64 subminor)
         return (major << 32) | (minor << 16) | subminor;
 }
 
+struct mlx4_phys_caps {
+        u32                     num_phys_eqs;
+};
+
 struct mlx4_caps {
         u64                     fw_ver;
         u32                     function;
@@ -292,11 +303,13 @@ struct mlx4_caps {
         u32                     max_msg_sz;
         u32                     page_size_cap;
         u64                     flags;
+        u64                     flags2;
         u32                     bmme_flags;
         u32                     reserved_lkey;
         u16                     stat_rate_support;
         u8                      port_width_cap[MLX4_MAX_PORTS + 1];
         int                     max_gso_sz;
+        int                     max_rss_tbl_sz;
         int                     reserved_qps_cnt[MLX4_NUM_QP_REGION];
         int                     reserved_qps;
         int                     reserved_qps_base[MLX4_NUM_QP_REGION];
@@ -491,6 +504,7 @@ struct mlx4_dev {
         unsigned long           flags;
         unsigned long           num_slaves;
         struct mlx4_caps        caps;
+        struct mlx4_phys_caps   phys_caps;
         struct radix_tree_root  qp_table_tree;
         u8                      rev_id;
         char                    board_id[MLX4_BOARD_ID_LEN];
@@ -628,6 +642,9 @@ int mlx4_SET_PORT_general(struct mlx4_dev *dev, u8 port, int mtu,
                           u8 pptx, u8 pfctx, u8 pprx, u8 pfcrx);
 int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,
                            u8 promisc);
+int mlx4_SET_PORT_PRIO2TC(struct mlx4_dev *dev, u8 port, u8 *prio2tc);
+int mlx4_SET_PORT_SCHEDULER(struct mlx4_dev *dev, u8 port, u8 *tc_tx_bw,
+                u8 *pg, u16 *ratelimit);
 int mlx4_find_cached_vlan(struct mlx4_dev *dev, u8 port, u16 vid, int *idx);
 int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index);
 void mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, int index);
diff --git a/include/linux/mlx4/qp.h b/include/linux/mlx4/qp.h
index 091f9e7dc8b9..338388ba260a 100644
--- a/include/linux/mlx4/qp.h
+++ b/include/linux/mlx4/qp.h
@@ -139,7 +139,8 @@ struct mlx4_qp_path {
         u8                      rgid[16];
         u8                      sched_queue;
         u8                      vlan_index;
-        u8                      reserved3[2];
+        u8                      feup;
+        u8                      reserved3;
         u8                      reserved4[2];
         u8                      dmac[6];
 };
@@ -233,7 +234,8 @@ struct mlx4_wqe_mlx_seg {
         u8                      owner;
         u8                      reserved1[2];
         u8                      opcode;
-        u8                      reserved2[3];
+        __be16                  sched_prio;
+        u8                      reserved2;
         u8                      size;
         /*
          * [17]    VL15
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 74aa71bea1e4..b36d08ce5c57 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -321,6 +321,7 @@ static inline int is_vmalloc_or_module_addr(const void *x)
 static inline void compound_lock(struct page *page)
 {
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
+        VM_BUG_ON(PageSlab(page));
         bit_spin_lock(PG_compound_lock, &page->flags);
 #endif
 }
@@ -328,6 +329,7 @@ static inline void compound_lock(struct page *page)
 static inline void compound_unlock(struct page *page)
 {
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
+        VM_BUG_ON(PageSlab(page));
         bit_spin_unlock(PG_compound_lock, &page->flags);
 #endif
 }
@@ -871,8 +873,6 @@ extern void pagefault_out_of_memory(void);
 extern void show_free_areas(unsigned int flags);
 extern bool skip_free_areas_node(unsigned int flags, int nid);
 
-int shmem_lock(struct file *file, int lock, struct user_struct *user);
-struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
 int shmem_zero_setup(struct vm_area_struct *);
 
 extern int can_do_mlock(void);
@@ -896,10 +896,8 @@ int zap_vma_ptes(struct vm_area_struct *vma, unsigned long address,
                 unsigned long size);
 void zap_page_range(struct vm_area_struct *vma, unsigned long address,
                 unsigned long size, struct zap_details *);
-void unmap_vmas(struct mmu_gather *tlb,
-                struct vm_area_struct *start_vma, unsigned long start_addr,
-                unsigned long end_addr, unsigned long *nr_accounted,
-                struct zap_details *);
+void unmap_vmas(struct mmu_gather *tlb, struct vm_area_struct *start_vma,
+                unsigned long start, unsigned long end);
 
 /**
  * mm_walk - callbacks for walk_page_range
@@ -953,11 +951,9 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
 extern void truncate_pagecache(struct inode *inode, loff_t old, loff_t new);
 extern void truncate_setsize(struct inode *inode, loff_t newsize);
 extern int vmtruncate(struct inode *inode, loff_t offset);
-extern int vmtruncate_range(struct inode *inode, loff_t offset, loff_t end);
 void truncate_pagecache_range(struct inode *inode, loff_t offset, loff_t end);
 int truncate_inode_page(struct address_space *mapping, struct page *page);
 int generic_error_remove_page(struct address_space *mapping, struct page *page);
-
 int invalidate_inode_page(struct page *page);
 
 #ifdef CONFIG_MMU
@@ -1396,7 +1392,7 @@ extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned lo
 extern unsigned long mmap_region(struct file *file, unsigned long addr,
         unsigned long len, unsigned long flags,
         vm_flags_t vm_flags, unsigned long pgoff);
-extern unsigned long do_mmap(struct file *, unsigned long,
+extern unsigned long do_mmap_pgoff(struct file *, unsigned long,
         unsigned long, unsigned long,
         unsigned long, unsigned long);
 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h
index 227fd3e9a9c9..1397ccf81e91 100644
--- a/include/linux/mm_inline.h
+++ b/include/linux/mm_inline.h
@@ -21,22 +21,22 @@ static inline int page_is_file_cache(struct page *page)
         return !PageSwapBacked(page);
 }
 
-static inline void
-add_page_to_lru_list(struct zone *zone, struct page *page, enum lru_list lru)
+static __always_inline void add_page_to_lru_list(struct page *page,
+                                struct lruvec *lruvec, enum lru_list lru)
 {
-        struct lruvec *lruvec;
-
-        lruvec = mem_cgroup_lru_add_list(zone, page, lru);
+        int nr_pages = hpage_nr_pages(page);
+        mem_cgroup_update_lru_size(lruvec, lru, nr_pages);
         list_add(&page->lru, &lruvec->lists[lru]);
-        __mod_zone_page_state(zone, NR_LRU_BASE + lru, hpage_nr_pages(page));
+        __mod_zone_page_state(lruvec_zone(lruvec), NR_LRU_BASE + lru, nr_pages);
 }
 
-static inline void
-del_page_from_lru_list(struct zone *zone, struct page *page, enum lru_list lru)
+static __always_inline void del_page_from_lru_list(struct page *page,
+                                struct lruvec *lruvec, enum lru_list lru)
 {
-        mem_cgroup_lru_del_list(page, lru);
+        int nr_pages = hpage_nr_pages(page);
+        mem_cgroup_update_lru_size(lruvec, lru, -nr_pages);
         list_del(&page->lru);
-        __mod_zone_page_state(zone, NR_LRU_BASE + lru, -hpage_nr_pages(page));
+        __mod_zone_page_state(lruvec_zone(lruvec), NR_LRU_BASE + lru, -nr_pages);
 }
 
 /**
@@ -61,7 +61,7 @@ static inline enum lru_list page_lru_base_type(struct page *page)
  * Returns the LRU list a page was on, as an index into the array of LRU
  * lists; and clears its Unevictable or Active flags, ready for freeing.
  */
-static inline enum lru_list page_off_lru(struct page *page)
+static __always_inline enum lru_list page_off_lru(struct page *page)
 {
         enum lru_list lru;
 
@@ -85,7 +85,7 @@ static inline enum lru_list page_off_lru(struct page *page)
  * Returns the LRU list a page should be on, as an index
  * into the array of LRU lists.
  */
-static inline enum lru_list page_lru(struct page *page)
+static __always_inline enum lru_list page_lru(struct page *page)
 {
         enum lru_list lru;
 
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 3cc3062b3767..dad95bdd06d7 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -12,6 +12,7 @@
 #include <linux/completion.h>
 #include <linux/cpumask.h>
 #include <linux/page-debug-flags.h>
+#include <linux/uprobes.h>
 #include <asm/page.h>
 #include <asm/mmu.h>
 
@@ -344,17 +345,6 @@ struct mm_struct {
         /* Architecture-specific MM context */
         mm_context_t context;
 
-        /* Swap token stuff */
-        /*
-         * Last value of global fault stamp as seen by this process.
-         * In other words, this value gives an indication of how long
-         * it has been since this task got the token.
-         * Look at mm/thrash.c
-         */
-        unsigned int faultstamp;
-        unsigned int token_priority;
-        unsigned int last_interval;
-
         unsigned long flags; /* Must use atomic bitops to access the bits */
 
         struct core_state *core_state; /* coredumping support */
@@ -388,6 +378,7 @@ struct mm_struct {
 #ifdef CONFIG_CPUMASK_OFFSTACK
         struct cpumask cpumask_allocation;
 #endif
+        struct uprobes_state uprobes_state;
 };
 
 static inline void mm_init_cpumask(struct mm_struct *mm)
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 629b823f8836..d76513b5b263 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -58,6 +58,10 @@ struct mmc_ext_csd {
         unsigned int            generic_cmd6_time;      /* Units: 10ms */
         unsigned int            power_off_longtime;     /* Units: ms */
         unsigned int            hs_max_dtr;
+#define MMC_HIGH_26_MAX_DTR     26000000
+#define MMC_HIGH_52_MAX_DTR     52000000
+#define MMC_HIGH_DDR_MAX_DTR    52000000
+#define MMC_HS200_MAX_DTR       200000000
         unsigned int            sectors;
         unsigned int            card_type;
         unsigned int            hc_erase_size;          /* In sectors */
diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h
index 8f66e28f5a0f..7a7ebd367cfd 100644
--- a/include/linux/mmc/dw_mmc.h
+++ b/include/linux/mmc/dw_mmc.h
@@ -125,6 +125,7 @@ struct dw_mci {
         struct mmc_request      *mrq;
         struct mmc_command      *cmd;
         struct mmc_data         *data;
+        struct workqueue_struct *card_workqueue;
 
         /* DMA interface members*/
         int                     use_dma;
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index cbde4b7e675e..0707d228d7f1 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -297,6 +297,7 @@ struct mmc_host {
 
         unsigned int            sdio_irqs;
         struct task_struct      *sdio_irq_thread;
+        bool                    sdio_irq_pending;
         atomic_t                sdio_irq_thread_abort;
 
         mmc_pm_flag_t           pm_flags;       /* requested pm features */
@@ -352,6 +353,7 @@ extern int mmc_cache_ctrl(struct mmc_host *, u8);
 static inline void mmc_signal_sdio_irq(struct mmc_host *host)
 {
         host->ops->enable_sdio_irq(host, 0);
+        host->sdio_irq_pending = true;
         wake_up_process(host->sdio_irq_thread);
 }
 
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index b822a2cb6008..d425cab144d9 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -354,66 +354,6 @@ struct _mmc_csd {
 #define EXT_CSD_CARD_TYPE_SDR_1_2V      (1<<5)  /* Card can run at 200MHz */
                                                 /* SDR mode @1.2V I/O */
 
-#define EXT_CSD_CARD_TYPE_SDR_200       (EXT_CSD_CARD_TYPE_SDR_1_8V | \
-                                         EXT_CSD_CARD_TYPE_SDR_1_2V)
-
-#define EXT_CSD_CARD_TYPE_SDR_ALL       (EXT_CSD_CARD_TYPE_SDR_200 | \
-                                         EXT_CSD_CARD_TYPE_52 | \
-                                         EXT_CSD_CARD_TYPE_26)
-
-#define EXT_CSD_CARD_TYPE_SDR_1_2V_ALL  (EXT_CSD_CARD_TYPE_SDR_1_2V | \
-                                         EXT_CSD_CARD_TYPE_52 | \
-                                         EXT_CSD_CARD_TYPE_26)
-
-#define EXT_CSD_CARD_TYPE_SDR_1_8V_ALL  (EXT_CSD_CARD_TYPE_SDR_1_8V | \
-                                         EXT_CSD_CARD_TYPE_52 | \
-                                         EXT_CSD_CARD_TYPE_26)
-
-#define EXT_CSD_CARD_TYPE_SDR_1_2V_DDR_1_8V     (EXT_CSD_CARD_TYPE_SDR_1_2V | \
-                                                 EXT_CSD_CARD_TYPE_DDR_1_8V | \
-                                                 EXT_CSD_CARD_TYPE_52 | \
-                                                 EXT_CSD_CARD_TYPE_26)
-
-#define EXT_CSD_CARD_TYPE_SDR_1_8V_DDR_1_8V     (EXT_CSD_CARD_TYPE_SDR_1_8V | \
-                                                 EXT_CSD_CARD_TYPE_DDR_1_8V | \
-                                                 EXT_CSD_CARD_TYPE_52 | \
-                                                 EXT_CSD_CARD_TYPE_26)
-
-#define EXT_CSD_CARD_TYPE_SDR_1_2V_DDR_1_2V     (EXT_CSD_CARD_TYPE_SDR_1_2V | \
-                                                 EXT_CSD_CARD_TYPE_DDR_1_2V | \
-                                                 EXT_CSD_CARD_TYPE_52 | \
-                                                 EXT_CSD_CARD_TYPE_26)
-
-#define EXT_CSD_CARD_TYPE_SDR_1_8V_DDR_1_2V     (EXT_CSD_CARD_TYPE_SDR_1_8V | \
-                                                 EXT_CSD_CARD_TYPE_DDR_1_2V | \
-                                                 EXT_CSD_CARD_TYPE_52 | \
-                                                 EXT_CSD_CARD_TYPE_26)
-
-#define EXT_CSD_CARD_TYPE_SDR_1_2V_DDR_52       (EXT_CSD_CARD_TYPE_SDR_1_2V | \
-                                                 EXT_CSD_CARD_TYPE_DDR_52 | \
-                                                 EXT_CSD_CARD_TYPE_52 | \
-                                                 EXT_CSD_CARD_TYPE_26)
-
-#define EXT_CSD_CARD_TYPE_SDR_1_8V_DDR_52       (EXT_CSD_CARD_TYPE_SDR_1_8V | \
-                                                 EXT_CSD_CARD_TYPE_DDR_52 | \
-                                                 EXT_CSD_CARD_TYPE_52 | \
-                                                 EXT_CSD_CARD_TYPE_26)
-
-#define EXT_CSD_CARD_TYPE_SDR_ALL_DDR_1_8V      (EXT_CSD_CARD_TYPE_SDR_200 | \
-                                                 EXT_CSD_CARD_TYPE_DDR_1_8V | \
-                                                 EXT_CSD_CARD_TYPE_52 | \
-                                                 EXT_CSD_CARD_TYPE_26)
-
-#define EXT_CSD_CARD_TYPE_SDR_ALL_DDR_1_2V      (EXT_CSD_CARD_TYPE_SDR_200 | \
-                                                 EXT_CSD_CARD_TYPE_DDR_1_2V | \
-                                                 EXT_CSD_CARD_TYPE_52 | \
-                                                 EXT_CSD_CARD_TYPE_26)
-
-#define EXT_CSD_CARD_TYPE_SDR_ALL_DDR_52        (EXT_CSD_CARD_TYPE_SDR_200 | \
-                                                 EXT_CSD_CARD_TYPE_DDR_52 | \
-                                                 EXT_CSD_CARD_TYPE_52 | \
-                                                 EXT_CSD_CARD_TYPE_26)
-
 #define EXT_CSD_BUS_WIDTH_1     0       /* Card is in 1 bit mode */
 #define EXT_CSD_BUS_WIDTH_4     1       /* Card is in 4 bit mode */
 #define EXT_CSD_BUS_WIDTH_8     2       /* Card is in 8 bit mode */
diff --git a/include/linux/mmc/mxs-mmc.h b/include/linux/mmc/mxs-mmc.h
new file mode 100644
index 000000000000..7c2ad3a7f2f3
--- /dev/null
+++ b/include/linux/mmc/mxs-mmc.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * 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_MMC_MXS_MMC_H__
+#define __LINUX_MMC_MXS_MMC_H__
+
+struct mxs_mmc_platform_data {
+        int wp_gpio;    /* write protect pin */
+        unsigned int flags;
+#define SLOTF_4_BIT_CAPABLE     (1 << 0)
+#define SLOTF_8_BIT_CAPABLE     (1 << 1)
+};
+
+#endif /* __LINUX_MMC_MXS_MMC_H__ */
diff --git a/include/linux/mmdebug.h b/include/linux/mmdebug.h
index c04ecfe03f7f..580bd587d916 100644
--- a/include/linux/mmdebug.h
+++ b/include/linux/mmdebug.h
@@ -4,7 +4,7 @@
 #ifdef CONFIG_DEBUG_VM
 #define VM_BUG_ON(cond) BUG_ON(cond)
 #else
-#define VM_BUG_ON(cond) do { (void)(cond); } while (0)
+#define VM_BUG_ON(cond) BUILD_BUG_ON_INVALID(cond)
 #endif
 
 #ifdef CONFIG_DEBUG_VIRTUAL
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index dff711509661..2427706f78b4 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -30,18 +30,44 @@
 /*
  * PAGE_ALLOC_COSTLY_ORDER is the order at which allocations are deemed
  * costly to service.  That is between allocation orders which should
- * coelesce naturally under reasonable reclaim pressure and those which
+ * coalesce naturally under reasonable reclaim pressure and those which
  * will not.
  */
 #define PAGE_ALLOC_COSTLY_ORDER 3
 
-#define MIGRATE_UNMOVABLE     0
-#define MIGRATE_RECLAIMABLE   1
-#define MIGRATE_MOVABLE       2
-#define MIGRATE_PCPTYPES      3 /* the number of types on the pcp lists */
-#define MIGRATE_RESERVE       3
-#define MIGRATE_ISOLATE       4 /* can't allocate from here */
-#define MIGRATE_TYPES         5
+enum {
+        MIGRATE_UNMOVABLE,
+        MIGRATE_RECLAIMABLE,
+        MIGRATE_MOVABLE,
+        MIGRATE_PCPTYPES,       /* the number of types on the pcp lists */
+        MIGRATE_RESERVE = MIGRATE_PCPTYPES,
+#ifdef CONFIG_CMA
+        /*
+         * MIGRATE_CMA migration type is designed to mimic the way
+         * ZONE_MOVABLE works.  Only movable pages can be allocated
+         * from MIGRATE_CMA pageblocks and page allocator never
+         * implicitly change migration type of MIGRATE_CMA pageblock.
+         *
+         * The way to use it is to change migratetype of a range of
+         * pageblocks to MIGRATE_CMA which can be done by
+         * __free_pageblock_cma() function.  What is important though
+         * is that a range of pageblocks must be aligned to
+         * MAX_ORDER_NR_PAGES should biggest page be bigger then
+         * a single pageblock.
+         */
+        MIGRATE_CMA,
+#endif
+        MIGRATE_ISOLATE,        /* can't allocate from here */
+        MIGRATE_TYPES
+};
+
+#ifdef CONFIG_CMA
+#  define is_migrate_cma(migratetype) unlikely((migratetype) == MIGRATE_CMA)
+#  define cma_wmark_pages(zone) zone->min_cma_pages
+#else
+#  define is_migrate_cma(migratetype) false
+#  define cma_wmark_pages(zone) 0
+#endif
 
 #define for_each_migratetype_order(order, type) \
         for (order = 0; order < MAX_ORDER; order++) \
@@ -159,8 +185,25 @@ static inline int is_unevictable_lru(enum lru_list lru)
         return (lru == LRU_UNEVICTABLE);
 }
 
+struct zone_reclaim_stat {
+        /*
+         * The pageout code in vmscan.c keeps track of how many of the
+         * mem/swap backed and file backed pages are refeferenced.
+         * The higher the rotated/scanned ratio, the more valuable
+         * that cache is.
+         *
+         * The anon LRU stats live in [0], file LRU stats in [1]
+         */
+        unsigned long           recent_rotated[2];
+        unsigned long           recent_scanned[2];
+};
+
 struct lruvec {
         struct list_head lists[NR_LRU_LISTS];
+        struct zone_reclaim_stat reclaim_stat;
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR
+        struct zone *zone;
+#endif
 };
 
 /* Mask used at gathering information at once (see memcontrol.c) */
@@ -169,16 +212,12 @@ struct lruvec {
 #define LRU_ALL_EVICTABLE (LRU_ALL_FILE | LRU_ALL_ANON)
 #define LRU_ALL      ((1 << NR_LRU_LISTS) - 1)
 
-/* Isolate inactive pages */
-#define ISOLATE_INACTIVE        ((__force isolate_mode_t)0x1)
-/* Isolate active pages */
-#define ISOLATE_ACTIVE          ((__force isolate_mode_t)0x2)
 /* Isolate clean file */
-#define ISOLATE_CLEAN           ((__force isolate_mode_t)0x4)
+#define ISOLATE_CLEAN           ((__force isolate_mode_t)0x1)
 /* Isolate unmapped file */
-#define ISOLATE_UNMAPPED        ((__force isolate_mode_t)0x8)
+#define ISOLATE_UNMAPPED        ((__force isolate_mode_t)0x2)
 /* Isolate for asynchronous migration */
-#define ISOLATE_ASYNC_MIGRATE   ((__force isolate_mode_t)0x10)
+#define ISOLATE_ASYNC_MIGRATE   ((__force isolate_mode_t)0x4)
 
 /* LRU Isolation modes. */
 typedef unsigned __bitwise__ isolate_mode_t;
@@ -287,19 +326,6 @@ enum zone_type {
 #error ZONES_SHIFT -- too many zones configured adjust calculation
 #endif
 
-struct zone_reclaim_stat {
-        /*
-         * The pageout code in vmscan.c keeps track of how many of the
-         * mem/swap backed and file backed pages are refeferenced.
-         * The higher the rotated/scanned ratio, the more valuable
-         * that cache is.
-         *
-         * The anon LRU stats live in [0], file LRU stats in [1]
-         */
-        unsigned long           recent_rotated[2];
-        unsigned long           recent_scanned[2];
-};
-
 struct zone {
         /* Fields commonly accessed by the page allocator */
 
@@ -347,6 +373,13 @@ struct zone {
         /* see spanned/present_pages for more description */
         seqlock_t               span_seqlock;
 #endif
+#ifdef CONFIG_CMA
+        /*
+         * CMA needs to increase watermark levels during the allocation
+         * process to make sure that the system is not starved.
+         */
+        unsigned long           min_cma_pages;
+#endif
         struct free_area        free_area[MAX_ORDER];
 
 #ifndef CONFIG_SPARSEMEM
@@ -374,8 +407,6 @@ struct zone {
         spinlock_t              lru_lock;
         struct lruvec           lruvec;
 
-        struct zone_reclaim_stat reclaim_stat;
-
         unsigned long           pages_scanned;     /* since last reclaim */
         unsigned long           flags;             /* zone flags, see below */
 
@@ -701,6 +732,17 @@ extern int init_currently_empty_zone(struct zone *zone, unsigned long start_pfn,
                                      unsigned long size,
                                      enum memmap_context context);
 
+extern void lruvec_init(struct lruvec *lruvec, struct zone *zone);
+
+static inline struct zone *lruvec_zone(struct lruvec *lruvec)
+{
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR
+        return lruvec->zone;
+#else
+        return container_of(lruvec, struct zone, lruvec);
+#endif
+}
+
 #ifdef CONFIG_HAVE_MEMORY_PRESENT
 void memory_present(int nid, unsigned long start, unsigned long end);
 #else
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 501da4cb8a6d..5db93821f9c7 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -132,10 +132,12 @@ struct usb_device_id {
 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL        0x0200
 
 #define HID_ANY_ID                              (~0)
+#define HID_BUS_ANY                             0xffff
+#define HID_GROUP_ANY                           0x0000
 
 struct hid_device_id {
         __u16 bus;
-        __u16 pad1;
+        __u16 group;
         __u32 vendor;
         __u32 product;
         kernel_ulong_t driver_data
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index ea36486378d8..1b14d25162cb 100644
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -320,7 +320,8 @@ extern int parse_args(const char *name,
                       unsigned num,
                       s16 level_min,
                       s16 level_max,
-                      int (*unknown)(char *param, char *val));
+                      int (*unknown)(char *param, char *val,
+                              const char *doing));
 
 /* Called by module remove. */
 #ifdef CONFIG_SYSFS
diff --git a/include/linux/msdos_fs.h b/include/linux/msdos_fs.h
index 34066e65fdeb..11cc2ac67e75 100644
--- a/include/linux/msdos_fs.h
+++ b/include/linux/msdos_fs.h
@@ -21,8 +21,9 @@
 #define CT_LE_W(v)      cpu_to_le16(v)
 #define CT_LE_L(v)      cpu_to_le32(v)
 
+#define MSDOS_ROOT_INO   1      /* The root inode number */
+#define MSDOS_FSINFO_INO 2      /* Used for managing the FSINFO block */
 
-#define MSDOS_ROOT_INO  1       /* == MINIX_ROOT_INO */
 #define MSDOS_DIR_BITS  5       /* log2(sizeof(struct msdos_dir_entry)) */
 
 /* directory limit */
diff --git a/include/linux/mtd/gpmi-nand.h b/include/linux/mtd/gpmi-nand.h
index 69b6dbf46b5e..ed3c4e09f3d1 100644
--- a/include/linux/mtd/gpmi-nand.h
+++ b/include/linux/mtd/gpmi-nand.h
@@ -23,12 +23,12 @@
 #define GPMI_NAND_RES_SIZE      6
 
 /* Resource names for the GPMI NAND driver. */
-#define GPMI_NAND_GPMI_REGS_ADDR_RES_NAME  "GPMI NAND GPMI Registers"
+#define GPMI_NAND_GPMI_REGS_ADDR_RES_NAME  "gpmi-nand"
 #define GPMI_NAND_GPMI_INTERRUPT_RES_NAME  "GPMI NAND GPMI Interrupt"
-#define GPMI_NAND_BCH_REGS_ADDR_RES_NAME   "GPMI NAND BCH Registers"
-#define GPMI_NAND_BCH_INTERRUPT_RES_NAME   "GPMI NAND BCH Interrupt"
+#define GPMI_NAND_BCH_REGS_ADDR_RES_NAME   "bch"
+#define GPMI_NAND_BCH_INTERRUPT_RES_NAME   "bch"
 #define GPMI_NAND_DMA_CHANNELS_RES_NAME    "GPMI NAND DMA Channels"
-#define GPMI_NAND_DMA_INTERRUPT_RES_NAME   "GPMI NAND DMA Interrupt"
+#define GPMI_NAND_DMA_INTERRUPT_RES_NAME   "gpmi-dma"
 
 /**
  * struct gpmi_nand_platform_data - GPMI NAND driver platform data.
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index cf5ea8cdcf8e..63dadc0dfb62 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -157,6 +157,15 @@ struct mtd_info {
         unsigned int erasesize_mask;
         unsigned int writesize_mask;
 
+        /*
+         * read ops return -EUCLEAN if max number of bitflips corrected on any
+         * one region comprising an ecc step equals or exceeds this value.
+         * Settable by driver, else defaults to ecc_strength.  User can override
+         * in sysfs.  N.B. The meaning of the -EUCLEAN return code has changed;
+         * see Documentation/ABI/testing/sysfs-class-mtd for more detail.
+         */
+        unsigned int bitflip_threshold;
+
         // Kernel-only stuff starts here.
         const char *name;
         int index;
@@ -164,7 +173,7 @@ struct mtd_info {
         /* ECC layout structure pointer - read only! */
         struct nand_ecclayout *ecclayout;
 
-        /* max number of correctible bit errors per writesize */
+        /* max number of correctible bit errors per ecc step */
         unsigned int ecc_strength;
 
         /* Data for variable erase regions. If numeraseregions is zero,
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 1482340d3d9f..57977c640529 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -161,8 +161,6 @@ typedef enum {
  * Option constants for bizarre disfunctionality and real
  * features.
  */
-/* Chip can not auto increment pages */
-#define NAND_NO_AUTOINCR        0x00000001
 /* Buswidth is 16 bit */
 #define NAND_BUSWIDTH_16        0x00000002
 /* Device supports partial programming without padding */
@@ -207,7 +205,6 @@ typedef enum {
         (NAND_NO_PADDING | NAND_CACHEPRG | NAND_COPYBACK)
 
 /* Macros to identify the above */
-#define NAND_CANAUTOINCR(chip) (!(chip->options & NAND_NO_AUTOINCR))
 #define NAND_MUST_PAD(chip) (!(chip->options & NAND_NO_PADDING))
 #define NAND_HAS_CACHEPROG(chip) ((chip->options & NAND_CACHEPRG))
 #define NAND_HAS_COPYBACK(chip) ((chip->options & NAND_COPYBACK))
@@ -216,7 +213,7 @@ typedef enum {
                                         && (chip->page_shift > 9))
 
 /* Mask to zero out the chip options, which come from the id table */
-#define NAND_CHIPOPTIONS_MSK    (0x0000ffff & ~NAND_NO_AUTOINCR)
+#define NAND_CHIPOPTIONS_MSK    0x0000ffff
 
 /* Non chip related options */
 /* This option skips the bbt scan during initialization. */
@@ -363,21 +360,20 @@ struct nand_ecc_ctrl {
         int (*correct)(struct mtd_info *mtd, uint8_t *dat, uint8_t *read_ecc,
                         uint8_t *calc_ecc);
         int (*read_page_raw)(struct mtd_info *mtd, struct nand_chip *chip,
-                        uint8_t *buf, int page);
+                        uint8_t *buf, int oob_required, int page);
         void (*write_page_raw)(struct mtd_info *mtd, struct nand_chip *chip,
-                        const uint8_t *buf);
+                        const uint8_t *buf, int oob_required);
         int (*read_page)(struct mtd_info *mtd, struct nand_chip *chip,
-                        uint8_t *buf, int page);
+                        uint8_t *buf, int oob_required, int page);
         int (*read_subpage)(struct mtd_info *mtd, struct nand_chip *chip,
                         uint32_t offs, uint32_t len, uint8_t *buf);
         void (*write_page)(struct mtd_info *mtd, struct nand_chip *chip,
-                        const uint8_t *buf);
+                        const uint8_t *buf, int oob_required);
         int (*write_oob_raw)(struct mtd_info *mtd, struct nand_chip *chip,
                         int page);
         int (*read_oob_raw)(struct mtd_info *mtd, struct nand_chip *chip,
-                        int page, int sndcmd);
-        int (*read_oob)(struct mtd_info *mtd, struct nand_chip *chip, int page,
-                        int sndcmd);
+                        int page);
+        int (*read_oob)(struct mtd_info *mtd, struct nand_chip *chip, int page);
         int (*write_oob)(struct mtd_info *mtd, struct nand_chip *chip,
                         int page);
 };
@@ -459,6 +455,8 @@ struct nand_buffers {
  * @pagemask:           [INTERN] page number mask = number of (pages / chip) - 1
  * @pagebuf:            [INTERN] holds the pagenumber which is currently in
  *                      data_buf.
+ * @pagebuf_bitflips:   [INTERN] holds the bitflip count for the page which is
+ *                      currently in data_buf.
  * @subpagesize:        [INTERN] holds the subpagesize
  * @onfi_version:       [INTERN] holds the chip ONFI version (BCD encoded),
  *                      non 0 if ONFI supported.
@@ -505,7 +503,8 @@ struct nand_chip {
         int (*errstat)(struct mtd_info *mtd, struct nand_chip *this, int state,
                         int status, int page);
         int (*write_page)(struct mtd_info *mtd, struct nand_chip *chip,
-                        const uint8_t *buf, int page, int cached, int raw);
+                        const uint8_t *buf, int oob_required, int page,
+                        int cached, int raw);
 
         int chip_delay;
         unsigned int options;
@@ -519,6 +518,7 @@ struct nand_chip {
         uint64_t chipsize;
         int pagemask;
         int pagebuf;
+        unsigned int pagebuf_bitflips;
         int subpagesize;
         uint8_t cellinfo;
         int badblockpos;
@@ -654,6 +654,7 @@ struct platform_nand_ctrl {
         void (*cmd_ctrl)(struct mtd_info *mtd, int dat, unsigned int ctrl);
         void (*write_buf)(struct mtd_info *mtd, const uint8_t *buf, int len);
         void (*read_buf)(struct mtd_info *mtd, uint8_t *buf, int len);
+        unsigned char (*read_byte)(struct mtd_info *mtd);
         void *priv;
 };
 
diff --git a/include/linux/mtd/ubi.h b/include/linux/mtd/ubi.h
index db4836bed514..c3918a0684fe 100644
--- a/include/linux/mtd/ubi.h
+++ b/include/linux/mtd/ubi.h
@@ -25,6 +25,9 @@
 #include <linux/types.h>
 #include <mtd/ubi-user.h>
 
+/* All voumes/LEBs */
+#define UBI_ALL -1
+
 /*
  * enum ubi_open_mode - UBI volume open mode constants.
  *
@@ -208,14 +211,15 @@ void ubi_close_volume(struct ubi_volume_desc *desc);
 int ubi_leb_read(struct ubi_volume_desc *desc, int lnum, char *buf, int offset,
                  int len, int check);
 int ubi_leb_write(struct ubi_volume_desc *desc, int lnum, const void *buf,
-                  int offset, int len, int dtype);
+                  int offset, int len);
 int ubi_leb_change(struct ubi_volume_desc *desc, int lnum, const void *buf,
-                   int len, int dtype);
+                   int len);
 int ubi_leb_erase(struct ubi_volume_desc *desc, int lnum);
 int ubi_leb_unmap(struct ubi_volume_desc *desc, int lnum);
-int ubi_leb_map(struct ubi_volume_desc *desc, int lnum, int dtype);
+int ubi_leb_map(struct ubi_volume_desc *desc, int lnum);
 int ubi_is_mapped(struct ubi_volume_desc *desc, int lnum);
 int ubi_sync(int ubi_num);
+int ubi_flush(int ubi_num, int vol_id, int lnum);
 
 /*
  * This function is the same as the 'ubi_leb_read()' function, but it does not
@@ -226,25 +230,4 @@ static inline int ubi_read(struct ubi_volume_desc *desc, int lnum, char *buf,
 {
         return ubi_leb_read(desc, lnum, buf, offset, len, 0);
 }
-
-/*
- * This function is the same as the 'ubi_leb_write()' functions, but it does
- * not have the data type argument.
- */
-static inline int ubi_write(struct ubi_volume_desc *desc, int lnum,
-                            const void *buf, int offset, int len)
-{
-        return ubi_leb_write(desc, lnum, buf, offset, len, UBI_UNKNOWN);
-}
-
-/*
- * This function is the same as the 'ubi_leb_change()' functions, but it does
- * not have the data type argument.
- */
-static inline int ubi_change(struct ubi_volume_desc *desc, int lnum,
-                                    const void *buf, int len)
-{
-        return ubi_leb_change(desc, lnum, buf, len, UBI_UNKNOWN);
-}
-
 #endif /* !__LINUX_UBI_H__ */
diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h
index 30b0c4e78f91..51bf8ada6dc0 100644
--- a/include/linux/mv643xx_eth.h
+++ b/include/linux/mv643xx_eth.h
@@ -18,7 +18,6 @@
 struct mv643xx_eth_shared_platform_data {
         struct mbus_dram_target_info    *dram;
         struct platform_device  *shared_smi;
-        unsigned int            t_clk;
         /*
          * Max packet size for Tx IP/Layer 4 checksum, when set to 0, default
          * limit of 9KiB will be used.
diff --git a/include/linux/neighbour.h b/include/linux/neighbour.h
index b188f68a08c9..275e5d65dcb2 100644
--- a/include/linux/neighbour.h
+++ b/include/linux/neighbour.h
@@ -33,6 +33,9 @@ enum {
 #define NTF_PROXY       0x08    /* == ATF_PUBL */
 #define NTF_ROUTER      0x80
 
+#define NTF_SELF        0x02
+#define NTF_MASTER      0x04
+
 /*
  *      Neighbor Cache Entry States.
  */
diff --git a/include/linux/net.h b/include/linux/net.h
index be60c7f5e145..e9ac2df079ba 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -250,6 +250,29 @@ extern struct socket *sockfd_lookup(int fd, int *err);
 #define              sockfd_put(sock) fput(sock->file)
 extern int           net_ratelimit(void);
 
+#define net_ratelimited_function(function, ...)                 \
+do {                                                            \
+        if (net_ratelimit())                                    \
+                function(__VA_ARGS__);                          \
+} while (0)
+
+#define net_emerg_ratelimited(fmt, ...)                         \
+        net_ratelimited_function(pr_emerg, fmt, ##__VA_ARGS__)
+#define net_alert_ratelimited(fmt, ...)                         \
+        net_ratelimited_function(pr_alert, fmt, ##__VA_ARGS__)
+#define net_crit_ratelimited(fmt, ...)                          \
+        net_ratelimited_function(pr_crit, fmt, ##__VA_ARGS__)
+#define net_err_ratelimited(fmt, ...)                           \
+        net_ratelimited_function(pr_err, fmt, ##__VA_ARGS__)
+#define net_notice_ratelimited(fmt, ...)                        \
+        net_ratelimited_function(pr_notice, fmt, ##__VA_ARGS__)
+#define net_warn_ratelimited(fmt, ...)                          \
+        net_ratelimited_function(pr_warn, fmt, ##__VA_ARGS__)
+#define net_info_ratelimited(fmt, ...)                          \
+        net_ratelimited_function(pr_info, fmt, ##__VA_ARGS__)
+#define net_dbg_ratelimited(fmt, ...)                           \
+        net_ratelimited_function(pr_debug, fmt, ##__VA_ARGS__)
+
 #define net_random()            random32()
 #define net_srandom(seed)       srandom32((__force u32)seed)
 
@@ -290,5 +313,8 @@ extern int kernel_sock_shutdown(struct socket *sock,
         MODULE_ALIAS("net-pf-" __stringify(pf) "-proto-" __stringify(proto) \
                      "-type-" __stringify(type))
 
+#define MODULE_ALIAS_NET_PF_PROTO_NAME(pf, proto, name) \
+        MODULE_ALIAS("net-pf-" __stringify(pf) "-proto-" __stringify(proto) \
+                     name)
 #endif /* __KERNEL__ */
 #endif  /* _LINUX_NET_H */
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 33900a53c990..d94cb1431519 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -54,6 +54,7 @@
 #include <net/netprio_cgroup.h>
 
 #include <linux/netdev_features.h>
+#include <linux/neighbour.h>
 
 struct netpoll_info;
 struct device;
@@ -288,7 +289,7 @@ struct hh_cache {
 struct header_ops {
         int     (*create) (struct sk_buff *skb, struct net_device *dev,
                            unsigned short type, const void *daddr,
-                           const void *saddr, unsigned len);
+                           const void *saddr, unsigned int len);
         int     (*parse)(const struct sk_buff *skb, unsigned char *haddr);
         int     (*rebuild)(struct sk_buff *skb);
         int     (*cache)(const struct neighbour *neigh, struct hh_cache *hh, __be16 type);
@@ -905,6 +906,16 @@ struct netdev_fcoe_hbainfo {
  *      feature set might be less than what was returned by ndo_fix_features()).
  *      Must return >0 or -errno if it changed dev->features itself.
  *
+ * int (*ndo_fdb_add)(struct ndmsg *ndm, struct net_device *dev,
+ *                    unsigned char *addr, u16 flags)
+ *      Adds an FDB entry to dev for addr.
+ * int (*ndo_fdb_del)(struct ndmsg *ndm, struct net_device *dev,
+ *                    unsigned char *addr)
+ *      Deletes the FDB entry from dev coresponding to addr.
+ * int (*ndo_fdb_dump)(struct sk_buff *skb, struct netlink_callback *cb,
+ *                     struct net_device *dev, int idx)
+ *      Used to add FDB entries to dump requests. Implementers should add
+ *      entries to skb and update idx with the number of entries.
  */
 struct net_device_ops {
         int                     (*ndo_init)(struct net_device *dev);
@@ -1002,6 +1013,18 @@ struct net_device_ops {
                                                     netdev_features_t features);
         int                     (*ndo_neigh_construct)(struct neighbour *n);
         void                    (*ndo_neigh_destroy)(struct neighbour *n);
+
+        int                     (*ndo_fdb_add)(struct ndmsg *ndm,
+                                               struct net_device *dev,
+                                               unsigned char *addr,
+                                               u16 flags);
+        int                     (*ndo_fdb_del)(struct ndmsg *ndm,
+                                               struct net_device *dev,
+                                               unsigned char *addr);
+        int                     (*ndo_fdb_dump)(struct sk_buff *skb,
+                                                struct netlink_callback *cb,
+                                                struct net_device *dev,
+                                                int idx);
 };
 
 /*
@@ -1132,7 +1155,6 @@ struct net_device {
         struct in_device __rcu  *ip_ptr;        /* IPv4 specific data   */
         struct dn_dev __rcu     *dn_ptr;        /* DECnet specific data */
         struct inet6_dev __rcu  *ip6_ptr;       /* IPv6 specific data */
-        void                    *ec_ptr;        /* Econet specific data */
         void                    *ax25_ptr;      /* AX.25 specific data */
         struct wireless_dev     *ieee80211_ptr; /* IEEE 802.11 specific data,
                                                    assign before registering */
@@ -1477,6 +1499,8 @@ struct napi_gro_cb {
 
         /* Free the skb? */
         int free;
+#define NAPI_GRO_FREE             1
+#define NAPI_GRO_FREE_STOLEN_HEAD 2
 };
 
 #define NAPI_GRO_CB(skb) ((struct napi_gro_cb *)(skb)->cb)
@@ -1680,7 +1704,7 @@ static inline void *skb_gro_network_header(struct sk_buff *skb)
 static inline int dev_hard_header(struct sk_buff *skb, struct net_device *dev,
                                   unsigned short type,
                                   const void *daddr, const void *saddr,
-                                  unsigned len)
+                                  unsigned int len)
 {
         if (!dev->header_ops || !dev->header_ops->create)
                 return 0;
@@ -1731,7 +1755,7 @@ struct softnet_data {
         unsigned int            input_queue_head;
         unsigned int            input_queue_tail;
 #endif
-        unsigned                dropped;
+        unsigned int            dropped;
         struct sk_buff_head     input_pkt_queue;
         struct napi_struct      backlog;
 };
@@ -1916,7 +1940,7 @@ static inline void netdev_sent_queue(struct net_device *dev, unsigned int bytes)
 }
 
 static inline void netdev_tx_completed_queue(struct netdev_queue *dev_queue,
-                                             unsigned pkts, unsigned bytes)
+                                             unsigned int pkts, unsigned int bytes)
 {
 #ifdef CONFIG_BQL
         if (unlikely(!bytes))
@@ -1940,7 +1964,7 @@ static inline void netdev_tx_completed_queue(struct netdev_queue *dev_queue,
 }
 
 static inline void netdev_completed_queue(struct net_device *dev,
-                                          unsigned pkts, unsigned bytes)
+                                          unsigned int pkts, unsigned int bytes)
 {
         netdev_tx_completed_queue(netdev_get_tx_queue(dev, 0), pkts, bytes);
 }
@@ -2118,7 +2142,6 @@ extern struct sk_buff *	napi_get_frags(struct napi_struct *napi);
 extern gro_result_t     napi_frags_finish(struct napi_struct *napi,
                                           struct sk_buff *skb,
                                           gro_result_t ret);
-extern struct sk_buff * napi_frags_skb(struct napi_struct *napi);
 extern gro_result_t     napi_gro_frags(struct napi_struct *napi);
 
 static inline void napi_free_frags(struct napi_struct *napi)
@@ -2135,9 +2158,9 @@ extern void netdev_rx_handler_unregister(struct net_device *dev);
 extern bool             dev_valid_name(const char *name);
 extern int              dev_ioctl(struct net *net, unsigned int cmd, void __user *);
 extern int              dev_ethtool(struct net *net, struct ifreq *);
-extern unsigned         dev_get_flags(const struct net_device *);
+extern unsigned int     dev_get_flags(const struct net_device *);
 extern int              __dev_change_flags(struct net_device *, unsigned int flags);
-extern int              dev_change_flags(struct net_device *, unsigned);
+extern int              dev_change_flags(struct net_device *, unsigned int);
 extern void             __dev_notify_flags(struct net_device *, unsigned int old_flags);
 extern int              dev_change_name(struct net_device *, const char *);
 extern int              dev_set_alias(struct net_device *, const char *, size_t);
@@ -2537,6 +2560,7 @@ extern int dev_addr_init(struct net_device *dev);
 
 /* Functions used for unicast addresses handling */
 extern int dev_uc_add(struct net_device *dev, unsigned char *addr);
+extern int dev_uc_add_excl(struct net_device *dev, unsigned char *addr);
 extern int dev_uc_del(struct net_device *dev, unsigned char *addr);
 extern int dev_uc_sync(struct net_device *to, struct net_device *from);
 extern void dev_uc_unsync(struct net_device *to, struct net_device *from);
@@ -2546,6 +2570,7 @@ extern void dev_uc_init(struct net_device *dev);
 /* Functions used for multicast addresses handling */
 extern int dev_mc_add(struct net_device *dev, unsigned char *addr);
 extern int dev_mc_add_global(struct net_device *dev, unsigned char *addr);
+extern int dev_mc_add_excl(struct net_device *dev, unsigned char *addr);
 extern int dev_mc_del(struct net_device *dev, unsigned char *addr);
 extern int dev_mc_del_global(struct net_device *dev, unsigned char *addr);
 extern int dev_mc_sync(struct net_device *to, struct net_device *from);
@@ -2770,15 +2795,15 @@ do {								\
 #define netif_info(priv, type, dev, fmt, args...)               \
         netif_level(info, priv, type, dev, fmt, ##args)
 
-#if defined(DEBUG)
-#define netif_dbg(priv, type, dev, format, args...)             \
-        netif_printk(priv, type, KERN_DEBUG, dev, format, ##args)
-#elif defined(CONFIG_DYNAMIC_DEBUG)
+#if defined(CONFIG_DYNAMIC_DEBUG)
 #define netif_dbg(priv, type, netdev, format, args...)          \
 do {                                                            \
         if (netif_msg_##type(priv))                             \
                 dynamic_netdev_dbg(netdev, format, ##args);     \
 } while (0)
+#elif defined(DEBUG)
+#define netif_dbg(priv, type, dev, format, args...)             \
+        netif_printk(priv, type, KERN_DEBUG, dev, format, ##args)
 #else
 #define netif_dbg(priv, type, dev, format, args...)                     \
 ({                                                                      \
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 29734be334c1..ff9c84c29b28 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -154,12 +154,6 @@ void nf_unregister_hooks(struct nf_hook_ops *reg, unsigned int n);
 int nf_register_sockopt(struct nf_sockopt_ops *reg);
 void nf_unregister_sockopt(struct nf_sockopt_ops *reg);
 
-#ifdef CONFIG_SYSCTL
-/* Sysctl registration */
-extern struct ctl_path nf_net_netfilter_sysctl_path[];
-extern struct ctl_path nf_net_ipv4_netfilter_sysctl_path[];
-#endif /* CONFIG_SYSCTL */
-
 extern struct list_head nf_hooks[NFPROTO_NUMPROTO][NF_MAX_HOOKS];
 
 #if defined(CONFIG_JUMP_LABEL)
diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h
index 2f8e18a23227..2edc64cab739 100644
--- a/include/linux/netfilter/ipset/ip_set.h
+++ b/include/linux/netfilter/ipset/ip_set.h
@@ -411,26 +411,32 @@ ip_set_get_h16(const struct nlattr *attr)
 #define ipset_nest_start(skb, attr) nla_nest_start(skb, attr | NLA_F_NESTED)
 #define ipset_nest_end(skb, start)  nla_nest_end(skb, start)
 
-#define NLA_PUT_IPADDR4(skb, type, ipaddr)                      \
-do {                                                            \
-        struct nlattr *__nested = ipset_nest_start(skb, type);  \
-                                                                \
-        if (!__nested)                                          \
-                goto nla_put_failure;                           \
-        NLA_PUT_NET32(skb, IPSET_ATTR_IPADDR_IPV4, ipaddr);     \
-        ipset_nest_end(skb, __nested);                          \
-} while (0)
-
-#define NLA_PUT_IPADDR6(skb, type, ipaddrptr)                   \
-do {                                                            \
-        struct nlattr *__nested = ipset_nest_start(skb, type);  \
-                                                                \
-        if (!__nested)                                          \
-                goto nla_put_failure;                           \
-        NLA_PUT(skb, IPSET_ATTR_IPADDR_IPV6,                    \
-                sizeof(struct in6_addr), ipaddrptr);            \
-        ipset_nest_end(skb, __nested);                          \
-} while (0)
+static inline int nla_put_ipaddr4(struct sk_buff *skb, int type, __be32 ipaddr)
+{
+        struct nlattr *__nested = ipset_nest_start(skb, type);
+        int ret;
+
+        if (!__nested)
+                return -EMSGSIZE;
+        ret = nla_put_net32(skb, IPSET_ATTR_IPADDR_IPV4, ipaddr);
+        if (!ret)
+                ipset_nest_end(skb, __nested);
+        return ret;
+}
+
+static inline int nla_put_ipaddr6(struct sk_buff *skb, int type, const struct in6_addr *ipaddrptr)
+{
+        struct nlattr *__nested = ipset_nest_start(skb, type);
+        int ret;
+
+        if (!__nested)
+                return -EMSGSIZE;
+        ret = nla_put(skb, IPSET_ATTR_IPADDR_IPV6,
+                      sizeof(struct in6_addr), ipaddrptr);
+        if (!ret)
+                ipset_nest_end(skb, __nested);
+        return ret;
+}
 
 /* Get address from skbuff */
 static inline __be32
@@ -472,8 +478,8 @@ union ip_set_name_index {
 
 #define IP_SET_OP_GET_BYNAME    0x00000006      /* Get set index by name */
 struct ip_set_req_get_set {
-        unsigned op;
-        unsigned version;
+        unsigned int op;
+        unsigned int version;
         union ip_set_name_index set;
 };
 
@@ -482,8 +488,8 @@ struct ip_set_req_get_set {
 
 #define IP_SET_OP_VERSION       0x00000100      /* Ask kernel version */
 struct ip_set_req_version {
-        unsigned op;
-        unsigned version;
+        unsigned int op;
+        unsigned int version;
 };
 
 #endif /*_IP_SET_H */
diff --git a/include/linux/netfilter/ipset/ip_set_ahash.h b/include/linux/netfilter/ipset/ip_set_ahash.h
index 230a290e1973..b114d35aea5e 100644
--- a/include/linux/netfilter/ipset/ip_set_ahash.h
+++ b/include/linux/netfilter/ipset/ip_set_ahash.h
@@ -610,17 +610,20 @@ type_pf_head(struct ip_set *set, struct sk_buff *skb)
         nested = ipset_nest_start(skb, IPSET_ATTR_DATA);
         if (!nested)
                 goto nla_put_failure;
-        NLA_PUT_NET32(skb, IPSET_ATTR_HASHSIZE,
-                      htonl(jhash_size(h->table->htable_bits)));
-        NLA_PUT_NET32(skb, IPSET_ATTR_MAXELEM, htonl(h->maxelem));
+        if (nla_put_net32(skb, IPSET_ATTR_HASHSIZE,
+                          htonl(jhash_size(h->table->htable_bits))) ||
+            nla_put_net32(skb, IPSET_ATTR_MAXELEM, htonl(h->maxelem)))
+                goto nla_put_failure;
 #ifdef IP_SET_HASH_WITH_NETMASK
-        if (h->netmask != HOST_MASK)
-                NLA_PUT_U8(skb, IPSET_ATTR_NETMASK, h->netmask);
+        if (h->netmask != HOST_MASK &&
+            nla_put_u8(skb, IPSET_ATTR_NETMASK, h->netmask))
+                goto nla_put_failure;
 #endif
-        NLA_PUT_NET32(skb, IPSET_ATTR_REFERENCES, htonl(set->ref - 1));
-        NLA_PUT_NET32(skb, IPSET_ATTR_MEMSIZE, htonl(memsize));
-        if (with_timeout(h->timeout))
-                NLA_PUT_NET32(skb, IPSET_ATTR_TIMEOUT, htonl(h->timeout));
+        if (nla_put_net32(skb, IPSET_ATTR_REFERENCES, htonl(set->ref - 1)) ||
+            nla_put_net32(skb, IPSET_ATTR_MEMSIZE, htonl(memsize)) ||
+            (with_timeout(h->timeout) &&
+             nla_put_net32(skb, IPSET_ATTR_TIMEOUT, htonl(h->timeout))))
+                goto nla_put_failure;
         ipset_nest_end(skb, nested);
 
         return 0;
diff --git a/include/linux/netfilter/ipset/ip_set_timeout.h b/include/linux/netfilter/ipset/ip_set_timeout.h
index 47923205a4ad..41d9cfa08167 100644
--- a/include/linux/netfilter/ipset/ip_set_timeout.h
+++ b/include/linux/netfilter/ipset/ip_set_timeout.h
@@ -30,6 +30,10 @@ ip_set_timeout_uget(struct nlattr *tb)
 {
         unsigned int timeout = ip_set_get_h32(tb);
 
+        /* Normalize to fit into jiffies */
+        if (timeout > UINT_MAX/MSEC_PER_SEC)
+                timeout = UINT_MAX/MSEC_PER_SEC;
+
         /* Userspace supplied TIMEOUT parameter: adjust crazy size */
         return timeout == IPSET_NO_TIMEOUT ? IPSET_NO_TIMEOUT - 1 : timeout;
 }
diff --git a/include/linux/netfilter/nf_conntrack_common.h b/include/linux/netfilter/nf_conntrack_common.h
index 0d3dd66322ec..d146872a0b91 100644
--- a/include/linux/netfilter/nf_conntrack_common.h
+++ b/include/linux/netfilter/nf_conntrack_common.h
@@ -83,6 +83,10 @@ enum ip_conntrack_status {
         /* Conntrack is a fake untracked entry */
         IPS_UNTRACKED_BIT = 12,
         IPS_UNTRACKED = (1 << IPS_UNTRACKED_BIT),
+
+        /* Conntrack got a helper explicitly attached via CT target. */
+        IPS_HELPER_BIT = 13,
+        IPS_HELPER = (1 << IPS_HELPER_BIT),
 };
 
 /* Connection tracking event types */
diff --git a/include/linux/netfilter/nf_conntrack_h323_types.h b/include/linux/netfilter/nf_conntrack_h323_types.h
index f35b6b4801e7..b0821f45fbe4 100644
--- a/include/linux/netfilter/nf_conntrack_h323_types.h
+++ b/include/linux/netfilter/nf_conntrack_h323_types.h
@@ -7,12 +7,12 @@
 
 typedef struct TransportAddress_ipAddress {     /* SEQUENCE */
         int options;            /* No use */
-        unsigned ip;
+        unsigned int ip;
 } TransportAddress_ipAddress;
 
 typedef struct TransportAddress_ip6Address {    /* SEQUENCE */
         int options;            /* No use */
-        unsigned ip;
+        unsigned int ip;
 } TransportAddress_ip6Address;
 
 typedef struct TransportAddress {       /* CHOICE */
@@ -96,12 +96,12 @@ typedef struct DataType {	/* CHOICE */
 
 typedef struct UnicastAddress_iPAddress {       /* SEQUENCE */
         int options;            /* No use */
-        unsigned network;
+        unsigned int network;
 } UnicastAddress_iPAddress;
 
 typedef struct UnicastAddress_iP6Address {      /* SEQUENCE */
         int options;            /* No use */
-        unsigned network;
+        unsigned int network;
 } UnicastAddress_iP6Address;
 
 typedef struct UnicastAddress { /* CHOICE */
@@ -698,7 +698,7 @@ typedef struct RegistrationRequest {	/* SEQUENCE */
         } options;
         RegistrationRequest_callSignalAddress callSignalAddress;
         RegistrationRequest_rasAddress rasAddress;
-        unsigned timeToLive;
+        unsigned int timeToLive;
 } RegistrationRequest;
 
 typedef struct RegistrationConfirm_callSignalAddress {  /* SEQUENCE OF */
@@ -730,7 +730,7 @@ typedef struct RegistrationConfirm {	/* SEQUENCE */
                 eRegistrationConfirm_genericData = (1 << 12),
         } options;
         RegistrationConfirm_callSignalAddress callSignalAddress;
-        unsigned timeToLive;
+        unsigned int timeToLive;
 } RegistrationConfirm;
 
 typedef struct UnregistrationRequest_callSignalAddress {        /* SEQUENCE OF */
diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
index 6fd1f0d07e64..a1048c1587d1 100644
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
@@ -80,7 +80,7 @@ extern int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n);
 extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n);
 
 extern int nfnetlink_has_listeners(struct net *net, unsigned int group);
-extern int nfnetlink_send(struct sk_buff *skb, struct net *net, u32 pid, unsigned group,
+extern int nfnetlink_send(struct sk_buff *skb, struct net *net, u32 pid, unsigned int group,
                           int echo, gfp_t flags);
 extern int nfnetlink_set_err(struct net *net, u32 pid, u32 group, int error);
 extern int nfnetlink_unicast(struct sk_buff *skb, struct net *net, u_int32_t pid, int flags);
diff --git a/include/linux/netfilter/xt_HMARK.h b/include/linux/netfilter/xt_HMARK.h
new file mode 100644
index 000000000000..abb1650940d2
--- /dev/null
+++ b/include/linux/netfilter/xt_HMARK.h
@@ -0,0 +1,45 @@
+#ifndef XT_HMARK_H_
+#define XT_HMARK_H_
+
+#include <linux/types.h>
+
+enum {
+        XT_HMARK_SADDR_MASK,
+        XT_HMARK_DADDR_MASK,
+        XT_HMARK_SPI,
+        XT_HMARK_SPI_MASK,
+        XT_HMARK_SPORT,
+        XT_HMARK_DPORT,
+        XT_HMARK_SPORT_MASK,
+        XT_HMARK_DPORT_MASK,
+        XT_HMARK_PROTO_MASK,
+        XT_HMARK_RND,
+        XT_HMARK_MODULUS,
+        XT_HMARK_OFFSET,
+        XT_HMARK_CT,
+        XT_HMARK_METHOD_L3,
+        XT_HMARK_METHOD_L3_4,
+};
+#define XT_HMARK_FLAG(flag)     (1 << flag)
+
+union hmark_ports {
+        struct {
+                __u16   src;
+                __u16   dst;
+        } p16;
+        __u32   v32;
+};
+
+struct xt_hmark_info {
+        union nf_inet_addr      src_mask;
+        union nf_inet_addr      dst_mask;
+        union hmark_ports       port_mask;
+        union hmark_ports       port_set;
+        __u32                   flags;
+        __u16                   proto_mask;
+        __u32                   hashrnd;
+        __u32                   hmodulus;
+        __u32                   hoffset;        /* Mark offset to start from */
+};
+
+#endif /* XT_HMARK_H_ */
diff --git a/include/linux/netfilter/xt_hashlimit.h b/include/linux/netfilter/xt_hashlimit.h
index b1925b5925e9..c42e52f39f8f 100644
--- a/include/linux/netfilter/xt_hashlimit.h
+++ b/include/linux/netfilter/xt_hashlimit.h
@@ -6,7 +6,11 @@
 /* timings are in milliseconds. */
 #define XT_HASHLIMIT_SCALE 10000
 /* 1/10,000 sec period => max of 10,000/sec.  Min rate is then 429490
-   seconds, or one every 59 hours. */
+ * seconds, or one packet every 59 hours.
+ */
+
+/* packet length accounting is done in 16-byte steps */
+#define XT_HASHLIMIT_BYTE_SHIFT 4
 
 /* details of this structure hidden by the implementation */
 struct xt_hashlimit_htable;
@@ -17,7 +21,13 @@ enum {
         XT_HASHLIMIT_HASH_SIP = 1 << 2,
         XT_HASHLIMIT_HASH_SPT = 1 << 3,
         XT_HASHLIMIT_INVERT   = 1 << 4,
+        XT_HASHLIMIT_BYTES    = 1 << 5,
 };
+#ifdef __KERNEL__
+#define XT_HASHLIMIT_ALL (XT_HASHLIMIT_HASH_DIP | XT_HASHLIMIT_HASH_DPT | \
+                          XT_HASHLIMIT_HASH_SIP | XT_HASHLIMIT_HASH_SPT | \
+                          XT_HASHLIMIT_INVERT | XT_HASHLIMIT_BYTES)
+#endif
 
 struct hashlimit_cfg {
         __u32 mode;       /* bitmask of XT_HASHLIMIT_HASH_* */
diff --git a/include/linux/netfilter_ipv4/Kbuild b/include/linux/netfilter_ipv4/Kbuild
index 31f8bec95650..c61b8fb1a9ef 100644
--- a/include/linux/netfilter_ipv4/Kbuild
+++ b/include/linux/netfilter_ipv4/Kbuild
@@ -1,4 +1,3 @@
-header-y += ip_queue.h
 header-y += ip_tables.h
 header-y += ipt_CLUSTERIP.h
 header-y += ipt_ECN.h
diff --git a/include/linux/netfilter_ipv4/ip_queue.h b/include/linux/netfilter_ipv4/ip_queue.h
deleted file mode 100644
index a03507f465f8..000000000000
--- a/include/linux/netfilter_ipv4/ip_queue.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * This is a module which is used for queueing IPv4 packets and
- * communicating with userspace via netlink.
- *
- * (C) 2000 James Morris, this code is GPL.
- */
-#ifndef _IP_QUEUE_H
-#define _IP_QUEUE_H
-
-#ifdef __KERNEL__
-#ifdef DEBUG_IPQ
-#define QDEBUG(x...) printk(KERN_DEBUG ## x)
-#else
-#define QDEBUG(x...)
-#endif  /* DEBUG_IPQ */
-#else
-#include <net/if.h>
-#endif  /* ! __KERNEL__ */
-
-/* Messages sent from kernel */
-typedef struct ipq_packet_msg {
-        unsigned long packet_id;        /* ID of queued packet */
-        unsigned long mark;             /* Netfilter mark value */
-        long timestamp_sec;             /* Packet arrival time (seconds) */
-        long timestamp_usec;            /* Packet arrvial time (+useconds) */
-        unsigned int hook;              /* Netfilter hook we rode in on */
-        char indev_name[IFNAMSIZ];      /* Name of incoming interface */
-        char outdev_name[IFNAMSIZ];     /* Name of outgoing interface */
-        __be16 hw_protocol;             /* Hardware protocol (network order) */
-        unsigned short hw_type;         /* Hardware type */
-        unsigned char hw_addrlen;       /* Hardware address length */
-        unsigned char hw_addr[8];       /* Hardware address */
-        size_t data_len;                /* Length of packet data */
-        unsigned char payload[0];       /* Optional packet data */
-} ipq_packet_msg_t;
-
-/* Messages sent from userspace */
-typedef struct ipq_mode_msg {
-        unsigned char value;            /* Requested mode */
-        size_t range;                   /* Optional range of packet requested */
-} ipq_mode_msg_t;
-
-typedef struct ipq_verdict_msg {
-        unsigned int value;             /* Verdict to hand to netfilter */
-        unsigned long id;               /* Packet ID for this verdict */
-        size_t data_len;                /* Length of replacement data */
-        unsigned char payload[0];       /* Optional replacement packet */
-} ipq_verdict_msg_t;
-
-typedef struct ipq_peer_msg {
-        union {
-                ipq_verdict_msg_t verdict;
-                ipq_mode_msg_t mode;
-        } msg;
-} ipq_peer_msg_t;
-
-/* Packet delivery modes */
-enum {
-        IPQ_COPY_NONE,          /* Initial mode, packets are dropped */
-        IPQ_COPY_META,          /* Copy metadata */
-        IPQ_COPY_PACKET         /* Copy metadata + packet (range) */
-};
-#define IPQ_COPY_MAX IPQ_COPY_PACKET
-
-/* Types of messages */
-#define IPQM_BASE       0x10    /* standard netlink messages below this */
-#define IPQM_MODE       (IPQM_BASE + 1)         /* Mode request from peer */
-#define IPQM_VERDICT    (IPQM_BASE + 2)         /* Verdict from peer */ 
-#define IPQM_PACKET     (IPQM_BASE + 3)         /* Packet from kernel */
-#define IPQM_MAX        (IPQM_BASE + 4)
-
-#endif /*_IP_QUEUE_H*/
diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h
index 1bc898b14a80..08c2cbbaa32b 100644
--- a/include/linux/netfilter_ipv6/ip6_tables.h
+++ b/include/linux/netfilter_ipv6/ip6_tables.h
@@ -298,9 +298,14 @@ ip6t_ext_hdr(u8 nexthdr)
                (nexthdr == IPPROTO_DSTOPTS);
 }
 
+enum {
+        IP6T_FH_F_FRAG  = (1 << 0),
+        IP6T_FH_F_AUTH  = (1 << 1),
+};
+
 /* find specified header and get offset to it */
 extern int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
-                         int target, unsigned short *fragoff);
+                         int target, unsigned short *fragoff, int *fragflg);
 
 #ifdef CONFIG_COMPAT
 #include <net/compat.h>
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index a2092f582a78..0f628ffa420c 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -7,7 +7,7 @@
 #define NETLINK_ROUTE           0       /* Routing/device hook                          */
 #define NETLINK_UNUSED          1       /* Unused number                                */
 #define NETLINK_USERSOCK        2       /* Reserved for user mode socket protocols      */
-#define NETLINK_FIREWALL        3       /* Firewalling hook                             */
+#define NETLINK_FIREWALL        3       /* Unused number, formerly ip_queue             */
 #define NETLINK_SOCK_DIAG       4       /* socket monitoring                            */
 #define NETLINK_NFLOG           5       /* netfilter/iptables ULOG */
 #define NETLINK_XFRM            6       /* ipsec */
diff --git a/include/linux/nfc.h b/include/linux/nfc.h
index 39c1fcf089c0..0ae9b5857c83 100644
--- a/include/linux/nfc.h
+++ b/include/linux/nfc.h
@@ -70,6 +70,7 @@ enum nfc_commands {
         NFC_EVENT_TARGETS_FOUND,
         NFC_EVENT_DEVICE_ADDED,
         NFC_EVENT_DEVICE_REMOVED,
+        NFC_EVENT_TARGET_LOST,
 /* private: internal use only */
         __NFC_CMD_AFTER_LAST
 };
diff --git a/include/linux/nfc/pn544.h b/include/linux/nfc/pn544.h
index 7ab8521f2347..9890bbaf4328 100644
--- a/include/linux/nfc/pn544.h
+++ b/include/linux/nfc/pn544.h
@@ -84,6 +84,12 @@ struct pn544_fw_packet {
 };
 
 #ifdef __KERNEL__
+enum {
+        NFC_GPIO_ENABLE,
+        NFC_GPIO_FW_RESET,
+        NFC_GPIO_IRQ
+};
+
 /* board config */
 struct pn544_nfc_platform_data {
         int (*request_resources) (struct i2c_client *client);
@@ -91,6 +97,7 @@ struct pn544_nfc_platform_data {
         void (*enable) (int fw);
         int (*test) (void);
         void (*disable) (void);
+        int (*get_gpio)(int type);
 };
 #endif /* __KERNEL__ */
 
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index 0987146b0637..af2d2fa30eee 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -69,6 +69,10 @@
 #define NFS4_CDFC4_FORE_OR_BOTH 0x3
 #define NFS4_CDFC4_BACK_OR_BOTH 0x7
 
+#define NFS4_CDFS4_FORE 0x1
+#define NFS4_CDFS4_BACK 0x2
+#define NFS4_CDFS4_BOTH 0x3
+
 #define NFS4_SET_TO_SERVER_TIME 0
 #define NFS4_SET_TO_CLIENT_TIME 1
 
@@ -526,6 +530,13 @@ enum lock_type4 {
 #define FATTR4_WORD1_MOUNTED_ON_FILEID  (1UL << 23)
 #define FATTR4_WORD1_FS_LAYOUT_TYPES    (1UL << 30)
 #define FATTR4_WORD2_LAYOUT_BLKSIZE     (1UL << 1)
+#define FATTR4_WORD2_MDSTHRESHOLD       (1UL << 4)
+
+/* MDS threshold bitmap bits */
+#define THRESHOLD_RD                    (1UL << 0)
+#define THRESHOLD_WR                    (1UL << 1)
+#define THRESHOLD_RD_IO                 (1UL << 2)
+#define THRESHOLD_WR_IO                 (1UL << 3)
 
 #define NFSPROC4_NULL 0
 #define NFSPROC4_COMPOUND 1
@@ -596,6 +607,8 @@ enum {
         NFSPROC4_CLNT_TEST_STATEID,
         NFSPROC4_CLNT_FREE_STATEID,
         NFSPROC4_CLNT_GETDEVICELIST,
+        NFSPROC4_CLNT_BIND_CONN_TO_SESSION,
+        NFSPROC4_CLNT_DESTROY_CLIENTID,
 };
 
 /* nfs41 types */
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 52a1bdb4ee2b..b23cfc120edb 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -102,6 +102,7 @@ struct nfs_open_context {
         int error;
 
         struct list_head list;
+        struct nfs4_threshold   *mdsthreshold;
 };
 
 struct nfs_open_dir_context {
@@ -179,8 +180,7 @@ struct nfs_inode {
         __be32                  cookieverf[2];
 
         unsigned long           npages;
-        unsigned long           ncommit;
-        struct list_head        commit_list;
+        struct nfs_mds_commit_info commit_info;
 
         /* Open contexts for shared mmap writes */
         struct list_head        open_files;
@@ -201,8 +201,10 @@ struct nfs_inode {
 
         /* pNFS layout information */
         struct pnfs_layout_hdr *layout;
-        atomic_t                commits_outstanding;
 #endif /* CONFIG_NFS_V4*/
+        /* how many bytes have been written/read and how many bytes queued up */
+        __u64 write_io;
+        __u64 read_io;
 #ifdef CONFIG_NFS_FSCACHE
         struct fscache_cookie   *fscache;
 #endif
@@ -230,7 +232,6 @@ struct nfs_inode {
 #define NFS_INO_FSCACHE         (5)             /* inode can be cached by FS-Cache */
 #define NFS_INO_FSCACHE_LOCK    (6)             /* FS-Cache cookie management lock */
 #define NFS_INO_COMMIT          (7)             /* inode is committing unstable writes */
-#define NFS_INO_PNFS_COMMIT     (8)             /* use pnfs code for commit */
 #define NFS_INO_LAYOUTCOMMIT    (9)             /* layoutcommit required */
 #define NFS_INO_LAYOUTCOMMITTING (10)           /* layoutcommit inflight */
 
@@ -317,11 +318,6 @@ static inline int nfs_server_capable(struct inode *inode, int cap)
         return NFS_SERVER(inode)->caps & cap;
 }
 
-static inline int NFS_USE_READDIRPLUS(struct inode *inode)
-{
-        return test_bit(NFS_INO_ADVISE_RDPLUS, &NFS_I(inode)->flags);
-}
-
 static inline void nfs_set_verifier(struct dentry * dentry, unsigned long verf)
 {
         dentry->d_time = verf;
@@ -552,8 +548,8 @@ extern int nfs_wb_page(struct inode *inode, struct page* page);
 extern int nfs_wb_page_cancel(struct inode *inode, struct page* page);
 #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
 extern int  nfs_commit_inode(struct inode *, int);
-extern struct nfs_write_data *nfs_commitdata_alloc(void);
-extern void nfs_commit_free(struct nfs_write_data *wdata);
+extern struct nfs_commit_data *nfs_commitdata_alloc(void);
+extern void nfs_commit_free(struct nfs_commit_data *data);
 #else
 static inline int
 nfs_commit_inode(struct inode *inode, int how)
@@ -569,12 +565,6 @@ nfs_have_writebacks(struct inode *inode)
 }
 
 /*
- * Allocate nfs_write_data structures
- */
-extern struct nfs_write_data *nfs_writedata_alloc(unsigned int npages);
-extern void nfs_writedata_free(struct nfs_write_data *);
-
-/*
  * linux/fs/nfs/read.c
  */
 extern int  nfs_readpage(struct file *, struct page *);
@@ -585,12 +575,6 @@ extern int  nfs_readpage_async(struct nfs_open_context *, struct inode *,
                                struct page *);
 
 /*
- * Allocate nfs_read_data structures
- */
-extern struct nfs_read_data *nfs_readdata_alloc(unsigned int npages);
-extern void nfs_readdata_free(struct nfs_read_data *);
-
-/*
  * linux/fs/nfs3proc.c
  */
 #ifdef CONFIG_NFS_V3_ACL
@@ -654,6 +638,7 @@ nfs_fileid_to_ino_t(u64 fileid)
 #define NFSDBG_FSCACHE          0x0800
 #define NFSDBG_PNFS             0x1000
 #define NFSDBG_PNFS_LD          0x2000
+#define NFSDBG_STATE            0x4000
 #define NFSDBG_ALL              0xFFFF
 
 #ifdef __KERNEL__
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 7073fc74481c..fbb78fb09bd2 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -17,7 +17,7 @@ struct nfs4_sequence_args;
 struct nfs4_sequence_res;
 struct nfs_server;
 struct nfs4_minor_version_ops;
-struct server_scope;
+struct nfs41_server_scope;
 struct nfs41_impl_id;
 
 /*
@@ -35,6 +35,9 @@ struct nfs_client {
 #define NFS_CS_RENEWD           3               /* - renewd started */
 #define NFS_CS_STOP_RENEW       4               /* no more state to renew */
 #define NFS_CS_CHECK_LEASE_TIME 5               /* need to check lease time */
+        unsigned long           cl_flags;       /* behavior switches */
+#define NFS_CS_NORESVPORT       0               /* - use ephemeral src port */
+#define NFS_CS_DISCRTRY         1               /* - disconnect on RPC retry */
         struct sockaddr_storage cl_addr;        /* server identifier */
         size_t                  cl_addrlen;
         char *                  cl_hostname;    /* hostname of server */
@@ -61,9 +64,6 @@ struct nfs_client {
 
         struct rpc_wait_queue   cl_rpcwaitq;
 
-        /* used for the setclientid verifier */
-        struct timespec         cl_boot_time;
-
         /* idmapper */
         struct idmap *          cl_idmap;
 
@@ -79,16 +79,17 @@ struct nfs_client {
         u32                     cl_seqid;
         /* The flags used for obtaining the clientid during EXCHANGE_ID */
         u32                     cl_exchange_flags;
-        struct nfs4_session     *cl_session;    /* sharred session */
+        struct nfs4_session     *cl_session;    /* shared session */
+        struct nfs41_server_owner *cl_serverowner;
+        struct nfs41_server_scope *cl_serverscope;
+        struct nfs41_impl_id    *cl_implid;
 #endif /* CONFIG_NFS_V4 */
 
 #ifdef CONFIG_NFS_FSCACHE
         struct fscache_cookie   *fscache;       /* client index cache cookie */
 #endif
 
-        struct server_scope     *server_scope;  /* from exchange_id */
-        struct nfs41_impl_id    *impl_id;       /* from exchange_id */
-        struct net              *net;
+        struct net              *cl_net;
 };
 
 /*
diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h
index eac30d6bec17..88d166b555e8 100644
--- a/include/linux/nfs_page.h
+++ b/include/linux/nfs_page.h
@@ -27,7 +27,6 @@ enum {
         PG_CLEAN,
         PG_NEED_COMMIT,
         PG_NEED_RESCHED,
-        PG_PARTIAL_READ_FAILED,
         PG_COMMIT_TO_DS,
 };
 
@@ -37,7 +36,6 @@ struct nfs_page {
         struct page             *wb_page;       /* page to read in/write out */
         struct nfs_open_context *wb_context;    /* File state context info */
         struct nfs_lock_context *wb_lock_context;       /* lock context info */
-        atomic_t                wb_complete;    /* i/os we're waiting for */
         pgoff_t                 wb_index;       /* Offset >> PAGE_CACHE_SHIFT */
         unsigned int            wb_offset,      /* Offset & ~PAGE_CACHE_MASK */
                                 wb_pgbase,      /* Start of page data */
@@ -68,7 +66,9 @@ struct nfs_pageio_descriptor {
         int                     pg_ioflags;
         int                     pg_error;
         const struct rpc_call_ops *pg_rpc_callops;
+        const struct nfs_pgio_completion_ops *pg_completion_ops;
         struct pnfs_layout_segment *pg_lseg;
+        struct nfs_direct_req   *pg_dreq;
 };
 
 #define NFS_WBACK_BUSY(req)     (test_bit(PG_BUSY,&(req)->wb_flags))
@@ -84,6 +84,7 @@ extern	void nfs_release_request(struct nfs_page *req);
 extern  void nfs_pageio_init(struct nfs_pageio_descriptor *desc,
                              struct inode *inode,
                              const struct nfs_pageio_ops *pg_ops,
+                             const struct nfs_pgio_completion_ops *compl_ops,
                              size_t bsize,
                              int how);
 extern  int nfs_pageio_add_request(struct nfs_pageio_descriptor *,
@@ -95,26 +96,17 @@ extern bool nfs_generic_pg_test(struct nfs_pageio_descriptor *desc,
                                 struct nfs_page *req);
 extern  int nfs_wait_on_request(struct nfs_page *);
 extern  void nfs_unlock_request(struct nfs_page *req);
+extern  void nfs_unlock_and_release_request(struct nfs_page *req);
 
 /*
- * Lock the page of an asynchronous request without getting a new reference
+ * Lock the page of an asynchronous request
  */
 static inline int
-nfs_lock_request_dontget(struct nfs_page *req)
-{
-        return !test_and_set_bit(PG_BUSY, &req->wb_flags);
-}
-
-static inline int
 nfs_lock_request(struct nfs_page *req)
 {
-        if (test_and_set_bit(PG_BUSY, &req->wb_flags))
-                return 0;
-        kref_get(&req->wb_kref);
-        return 1;
+        return !test_and_set_bit(PG_BUSY, &req->wb_flags);
 }
 
-
 /**
  * nfs_list_add_request - Insert a request into a list
  * @req: request
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 7ba3551a0414..d1a7bf51c326 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -35,6 +35,15 @@ static inline int nfs_fsid_equal(const struct nfs_fsid *a, const struct nfs_fsid
         return a->major == b->major && a->minor == b->minor;
 }
 
+struct nfs4_threshold {
+        __u32   bm;
+        __u32   l_type;
+        __u64   rd_sz;
+        __u64   wr_sz;
+        __u64   rd_io_sz;
+        __u64   wr_io_sz;
+};
+
 struct nfs_fattr {
         unsigned int            valid;          /* which fields are valid */
         umode_t                 mode;
@@ -67,6 +76,7 @@ struct nfs_fattr {
         unsigned long           gencount;
         struct nfs4_string      *owner_name;
         struct nfs4_string      *group_name;
+        struct nfs4_threshold   *mdsthreshold;  /* pNFS threshold hints */
 };
 
 #define NFS_ATTR_FATTR_TYPE             (1U << 0)
@@ -106,14 +116,14 @@ struct nfs_fattr {
                 | NFS_ATTR_FATTR_FILEID \
                 | NFS_ATTR_FATTR_ATIME \
                 | NFS_ATTR_FATTR_MTIME \
-                | NFS_ATTR_FATTR_CTIME)
+                | NFS_ATTR_FATTR_CTIME \
+                | NFS_ATTR_FATTR_CHANGE)
 #define NFS_ATTR_FATTR_V2 (NFS_ATTR_FATTR \
                 | NFS_ATTR_FATTR_BLOCKS_USED)
 #define NFS_ATTR_FATTR_V3 (NFS_ATTR_FATTR \
                 | NFS_ATTR_FATTR_SPACE_USED)
 #define NFS_ATTR_FATTR_V4 (NFS_ATTR_FATTR \
-                | NFS_ATTR_FATTR_SPACE_USED \
-                | NFS_ATTR_FATTR_CHANGE)
+                | NFS_ATTR_FATTR_SPACE_USED)
 
 /*
  * Info on the file system
@@ -338,7 +348,6 @@ struct nfs_openargs {
         const struct qstr *     name;
         const struct nfs_server *server;         /* Needed for ID mapping */
         const u32 *             bitmask;
-        const u32 *             dir_bitmask;
         __u32                   claim;
         struct nfs4_sequence_args       seq_args;
 };
@@ -349,7 +358,6 @@ struct nfs_openres {
         struct nfs4_change_info cinfo;
         __u32                   rflags;
         struct nfs_fattr *      f_attr;
-        struct nfs_fattr *      dir_attr;
         struct nfs_seqid *      seqid;
         const struct nfs_server *server;
         fmode_t                 delegation_type;
@@ -519,12 +527,29 @@ struct nfs_writeres {
 };
 
 /*
+ * Arguments to the commit call.
+ */
+struct nfs_commitargs {
+        struct nfs_fh           *fh;
+        __u64                   offset;
+        __u32                   count;
+        const u32               *bitmask;
+        struct nfs4_sequence_args       seq_args;
+};
+
+struct nfs_commitres {
+        struct nfs_fattr        *fattr;
+        struct nfs_writeverf    *verf;
+        const struct nfs_server *server;
+        struct nfs4_sequence_res        seq_res;
+};
+
+/*
  * Common arguments to the unlink call
  */
 struct nfs_removeargs {
         const struct nfs_fh     *fh;
         struct qstr             name;
-        const u32 *             bitmask;
         struct nfs4_sequence_args       seq_args;
 };
 
@@ -543,7 +568,6 @@ struct nfs_renameargs {
         const struct nfs_fh             *new_dir;
         const struct qstr               *old_name;
         const struct qstr               *new_name;
-        const u32                       *bitmask;
         struct nfs4_sequence_args       seq_args;
 };
 
@@ -839,7 +863,6 @@ struct nfs4_create_res {
         struct nfs_fh *                 fh;
         struct nfs_fattr *              fattr;
         struct nfs4_change_info         dir_cinfo;
-        struct nfs_fattr *              dir_fattr;
         struct nfs4_sequence_res        seq_res;
 };
 
@@ -1061,6 +1084,21 @@ struct nfstime4 {
 };
 
 #ifdef CONFIG_NFS_V4_1
+
+struct pnfs_commit_bucket {
+        struct list_head written;
+        struct list_head committing;
+        struct pnfs_layout_segment *wlseg;
+        struct pnfs_layout_segment *clseg;
+};
+
+struct pnfs_ds_commit_info {
+        int nwritten;
+        int ncommitting;
+        int nbuckets;
+        struct pnfs_commit_bucket *buckets;
+};
+
 #define NFS4_EXCHANGE_ID_LEN    (48)
 struct nfs41_exchange_id_args {
         struct nfs_client               *client;
@@ -1070,13 +1108,13 @@ struct nfs41_exchange_id_args {
         u32                             flags;
 };
 
-struct server_owner {
+struct nfs41_server_owner {
         uint64_t                        minor_id;
         uint32_t                        major_id_sz;
         char                            major_id[NFS4_OPAQUE_LIMIT];
 };
 
-struct server_scope {
+struct nfs41_server_scope {
         uint32_t                        server_scope_sz;
         char                            server_scope[NFS4_OPAQUE_LIMIT];
 };
@@ -1087,10 +1125,18 @@ struct nfs41_impl_id {
         struct nfstime4                 date;
 };
 
+struct nfs41_bind_conn_to_session_res {
+        struct nfs4_session             *session;
+        u32                             dir;
+        bool                            use_conn_in_rdma_mode;
+};
+
 struct nfs41_exchange_id_res {
-        struct nfs_client               *client;
+        u64                             clientid;
+        u32                             seqid;
         u32                             flags;
-        struct server_scope             *server_scope;
+        struct nfs41_server_owner       *server_owner;
+        struct nfs41_server_scope       *server_scope;
         struct nfs41_impl_id            *impl_id;
 };
 
@@ -1143,35 +1189,114 @@ struct nfs41_free_stateid_res {
         struct nfs4_sequence_res        seq_res;
 };
 
+#else
+
+struct pnfs_ds_commit_info {
+};
+
 #endif /* CONFIG_NFS_V4_1 */
 
 struct nfs_page;
 
 #define NFS_PAGEVEC_SIZE        (8U)
 
+struct nfs_page_array {
+        struct page             **pagevec;
+        unsigned int            npages;         /* Max length of pagevec */
+        struct page             *page_array[NFS_PAGEVEC_SIZE];
+};
+
 struct nfs_read_data {
+        struct nfs_pgio_header  *header;
+        struct list_head        list;
         struct rpc_task         task;
-        struct inode            *inode;
-        struct rpc_cred         *cred;
         struct nfs_fattr        fattr;  /* fattr storage */
-        struct list_head        pages;  /* Coalesced read requests */
-        struct list_head        list;   /* lists of struct nfs_read_data */
-        struct nfs_page         *req;   /* multi ops per nfs_page */
-        struct page             **pagevec;
-        unsigned int            npages; /* Max length of pagevec */
         struct nfs_readargs args;
         struct nfs_readres  res;
         unsigned long           timestamp;      /* For lease renewal */
-        struct pnfs_layout_segment *lseg;
-        struct nfs_client       *ds_clp;        /* pNFS data server */
-        const struct rpc_call_ops *mds_ops;
         int (*read_done_cb) (struct rpc_task *task, struct nfs_read_data *data);
         __u64                   mds_offset;
+        struct nfs_page_array   pages;
+        struct nfs_client       *ds_clp;        /* pNFS data server */
+};
+
+/* used as flag bits in nfs_pgio_header */
+enum {
+        NFS_IOHDR_ERROR = 0,
+        NFS_IOHDR_EOF,
+        NFS_IOHDR_REDO,
+        NFS_IOHDR_NEED_COMMIT,
+        NFS_IOHDR_NEED_RESCHED,
+};
+
+struct nfs_pgio_header {
+        struct inode            *inode;
+        struct rpc_cred         *cred;
+        struct list_head        pages;
+        struct list_head        rpc_list;
+        atomic_t                refcnt;
+        struct nfs_page         *req;
+        struct pnfs_layout_segment *lseg;
+        loff_t                  io_start;
+        const struct rpc_call_ops *mds_ops;
+        void (*release) (struct nfs_pgio_header *hdr);
+        const struct nfs_pgio_completion_ops *completion_ops;
+        struct nfs_direct_req   *dreq;
+        spinlock_t              lock;
+        /* fields protected by lock */
         int                     pnfs_error;
-        struct page             *page_array[NFS_PAGEVEC_SIZE];
+        int                     error;          /* merge with pnfs_error */
+        unsigned long           good_bytes;     /* boundary of good data */
+        unsigned long           flags;
+};
+
+struct nfs_read_header {
+        struct nfs_pgio_header  header;
+        struct nfs_read_data    rpc_data;
 };
 
 struct nfs_write_data {
+        struct nfs_pgio_header  *header;
+        struct list_head        list;
+        struct rpc_task         task;
+        struct nfs_fattr        fattr;
+        struct nfs_writeverf    verf;
+        struct nfs_writeargs    args;           /* argument struct */
+        struct nfs_writeres     res;            /* result struct */
+        unsigned long           timestamp;      /* For lease renewal */
+        int (*write_done_cb) (struct rpc_task *task, struct nfs_write_data *data);
+        __u64                   mds_offset;     /* Filelayout dense stripe */
+        struct nfs_page_array   pages;
+        struct nfs_client       *ds_clp;        /* pNFS data server */
+};
+
+struct nfs_write_header {
+        struct nfs_pgio_header  header;
+        struct nfs_write_data   rpc_data;
+};
+
+struct nfs_mds_commit_info {
+        atomic_t rpcs_out;
+        unsigned long           ncommit;
+        struct list_head        list;
+};
+
+struct nfs_commit_data;
+struct nfs_inode;
+struct nfs_commit_completion_ops {
+        void (*error_cleanup) (struct nfs_inode *nfsi);
+        void (*completion) (struct nfs_commit_data *data);
+};
+
+struct nfs_commit_info {
+        spinlock_t                      *lock;
+        struct nfs_mds_commit_info      *mds;
+        struct pnfs_ds_commit_info      *ds;
+        struct nfs_direct_req           *dreq;  /* O_DIRECT request */
+        const struct nfs_commit_completion_ops *completion_ops;
+};
+
+struct nfs_commit_data {
         struct rpc_task         task;
         struct inode            *inode;
         struct rpc_cred         *cred;
@@ -1179,22 +1304,22 @@ struct nfs_write_data {
         struct nfs_writeverf    verf;
         struct list_head        pages;          /* Coalesced requests we wish to flush */
         struct list_head        list;           /* lists of struct nfs_write_data */
-        struct nfs_page         *req;           /* multi ops per nfs_page */
-        struct page             **pagevec;
-        unsigned int            npages;         /* Max length of pagevec */
-        struct nfs_writeargs    args;           /* argument struct */
-        struct nfs_writeres     res;            /* result struct */
+        struct nfs_direct_req   *dreq;          /* O_DIRECT request */
+        struct nfs_commitargs   args;           /* argument struct */
+        struct nfs_commitres    res;            /* result struct */
+        struct nfs_open_context *context;
         struct pnfs_layout_segment *lseg;
         struct nfs_client       *ds_clp;        /* pNFS data server */
         int                     ds_commit_index;
         const struct rpc_call_ops *mds_ops;
-        int (*write_done_cb) (struct rpc_task *task, struct nfs_write_data *data);
-#ifdef CONFIG_NFS_V4
-        unsigned long           timestamp;      /* For lease renewal */
-#endif
-        __u64                   mds_offset;     /* Filelayout dense stripe */
-        int                     pnfs_error;
-        struct page             *page_array[NFS_PAGEVEC_SIZE];
+        const struct nfs_commit_completion_ops *completion_ops;
+        int (*commit_done_cb) (struct rpc_task *task, struct nfs_commit_data *data);
+};
+
+struct nfs_pgio_completion_ops {
+        void    (*error_cleanup)(struct list_head *head);
+        void    (*init_hdr)(struct nfs_pgio_header *hdr);
+        void    (*completion)(struct nfs_pgio_header *hdr);
 };
 
 struct nfs_unlinkdata {
@@ -1234,11 +1359,13 @@ struct nfs_rpc_ops {
 
         int     (*getroot) (struct nfs_server *, struct nfs_fh *,
                             struct nfs_fsinfo *);
+        struct vfsmount *(*submount) (struct nfs_server *, struct dentry *,
+                                      struct nfs_fh *, struct nfs_fattr *);
         int     (*getattr) (struct nfs_server *, struct nfs_fh *,
                             struct nfs_fattr *);
         int     (*setattr) (struct dentry *, struct nfs_fattr *,
                             struct iattr *);
-        int     (*lookup)  (struct rpc_clnt *clnt, struct inode *, struct qstr *,
+        int     (*lookup)  (struct inode *, struct qstr *,
                             struct nfs_fh *, struct nfs_fattr *);
         int     (*access)  (struct inode *, struct nfs_access_entry *);
         int     (*readlink)(struct inode *, struct page *, unsigned int,
@@ -1277,8 +1404,9 @@ struct nfs_rpc_ops {
         void    (*write_setup)  (struct nfs_write_data *, struct rpc_message *);
         void    (*write_rpc_prepare)(struct rpc_task *, struct nfs_write_data *);
         int     (*write_done)  (struct rpc_task *, struct nfs_write_data *);
-        void    (*commit_setup) (struct nfs_write_data *, struct rpc_message *);
-        int     (*commit_done) (struct rpc_task *, struct nfs_write_data *);
+        void    (*commit_setup) (struct nfs_commit_data *, struct rpc_message *);
+        void    (*commit_rpc_prepare)(struct rpc_task *, struct nfs_commit_data *);
+        int     (*commit_done) (struct rpc_task *, struct nfs_commit_data *);
         int     (*lock)(struct file *, int, struct file_lock *);
         int     (*lock_check_bounds)(const struct file_lock *);
         void    (*clear_acl_cache)(struct inode *);
@@ -1287,9 +1415,9 @@ struct nfs_rpc_ops {
                                 struct nfs_open_context *ctx,
                                 int open_flags,
                                 struct iattr *iattr);
-        int     (*init_client) (struct nfs_client *, const struct rpc_timeout *,
-                                const char *, rpc_authflavor_t, int);
-        int     (*secinfo)(struct inode *, const struct qstr *, struct nfs4_secinfo_flavors *);
+        struct nfs_client *
+                (*init_client) (struct nfs_client *, const struct rpc_timeout *,
+                                const char *, rpc_authflavor_t);
 };
 
 /*
diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h
index f85308e688fd..e33f747b173c 100644
--- a/include/linux/nfsd/export.h
+++ b/include/linux/nfsd/export.h
@@ -103,6 +103,7 @@ struct svc_export {
         struct nfsd4_fs_locations ex_fslocs;
         int                     ex_nflavors;
         struct exp_flavor_info  ex_flavors[MAX_SECINFO_LIST];
+        struct cache_detail     *cd;
 };
 
 /* an "export key" (expkey) maps a filehandlefragement to an
@@ -129,24 +130,22 @@ __be32 check_nfsd_access(struct svc_export *exp, struct svc_rqst *rqstp);
 /*
  * Function declarations
  */
-int                     nfsd_export_init(void);
-void                    nfsd_export_shutdown(void);
-void                    nfsd_export_flush(void);
+int                     nfsd_export_init(struct net *);
+void                    nfsd_export_shutdown(struct net *);
+void                    nfsd_export_flush(struct net *);
 struct svc_export *     rqst_exp_get_by_name(struct svc_rqst *,
                                              struct path *);
 struct svc_export *     rqst_exp_parent(struct svc_rqst *,
                                         struct path *);
 struct svc_export *     rqst_find_fsidzero_export(struct svc_rqst *);
-int                     exp_rootfh(struct auth_domain *, 
+int                     exp_rootfh(struct net *, struct auth_domain *,
                                         char *path, struct knfsd_fh *, int maxsize);
 __be32                  exp_pseudoroot(struct svc_rqst *, struct svc_fh *);
 __be32                  nfserrno(int errno);
 
-extern struct cache_detail svc_export_cache;
-
 static inline void exp_put(struct svc_export *exp)
 {
-        cache_put(&exp->h, &svc_export_cache);
+        cache_put(&exp->h, exp->cd);
 }
 
 static inline void exp_get(struct svc_export *exp)
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index e474f6e780cc..a6959f72745e 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -548,6 +548,11 @@
  * @NL80211_CMD_SET_NOACK_MAP: sets a bitmap for the individual TIDs whether
  *      No Acknowledgement Policy should be applied.
  *
+ * @NL80211_CMD_CH_SWITCH_NOTIFY: An AP or GO may decide to switch channels
+ *      independently of the userspace SME, send this event indicating
+ *      %NL80211_ATTR_IFINDEX is now on %NL80211_ATTR_WIPHY_FREQ with
+ *      %NL80211_ATTR_WIPHY_CHANNEL_TYPE.
+ *
  * @NL80211_CMD_MAX: highest used command number
  * @__NL80211_CMD_AFTER_LAST: internal use
  */
@@ -689,6 +694,8 @@ enum nl80211_commands {
 
         NL80211_CMD_SET_NOACK_MAP,
 
+        NL80211_CMD_CH_SWITCH_NOTIFY,
+
         /* add new commands above here */
 
         /* used to define NL80211_CMD_MAX below */
@@ -1587,6 +1594,8 @@ enum nl80211_sta_flags {
         NL80211_STA_FLAG_MAX = __NL80211_STA_FLAG_AFTER_LAST - 1
 };
 
+#define NL80211_STA_FLAG_MAX_OLD_API    NL80211_STA_FLAG_TDLS_PEER
+
 /**
  * struct nl80211_sta_flag_update - station flags mask/set
  * @mask: mask of station flags to set
@@ -1685,6 +1694,7 @@ enum nl80211_sta_bss_param {
  * @NL80211_STA_INFO_CONNECTED_TIME: time since the station is last connected
  * @NL80211_STA_INFO_STA_FLAGS: Contains a struct nl80211_sta_flag_update.
  * @NL80211_STA_INFO_BEACON_LOSS: count of times beacon loss was detected (u32)
+ * @NL80211_STA_INFO_T_OFFSET: timing offset with respect to this STA (s64)
  * @__NL80211_STA_INFO_AFTER_LAST: internal
  * @NL80211_STA_INFO_MAX: highest possible station info attribute
  */
@@ -1708,6 +1718,7 @@ enum nl80211_sta_info {
         NL80211_STA_INFO_CONNECTED_TIME,
         NL80211_STA_INFO_STA_FLAGS,
         NL80211_STA_INFO_BEACON_LOSS,
+        NL80211_STA_INFO_T_OFFSET,
 
         /* keep last */
         __NL80211_STA_INFO_AFTER_LAST,
@@ -1985,9 +1996,9 @@ enum nl80211_reg_rule_flags {
  * enum nl80211_dfs_regions - regulatory DFS regions
  *
  * @NL80211_DFS_UNSET: Country has no DFS master region specified
- * @NL80211_DFS_FCC_: Country follows DFS master rules from FCC
- * @NL80211_DFS_FCC_: Country follows DFS master rules from ETSI
- * @NL80211_DFS_JP_: Country follows DFS master rules from JP/MKK/Telec
+ * @NL80211_DFS_FCC: Country follows DFS master rules from FCC
+ * @NL80211_DFS_ETSI: Country follows DFS master rules from ETSI
+ * @NL80211_DFS_JP: Country follows DFS master rules from JP/MKK/Telec
  */
 enum nl80211_dfs_regions {
         NL80211_DFS_UNSET       = 0,
@@ -2142,6 +2153,11 @@ enum nl80211_mntr_flags {
  *
  * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute
  *
+ * @NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR: maximum number of neighbors
+ * to synchronize to for 11s default synchronization method (see 11C.12.2.2)
+ *
+ * @NL80211_MESHCONF_HT_OPMODE: set mesh HT protection mode.
+ *
  * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
  */
 enum nl80211_meshconf_params {
@@ -2166,6 +2182,8 @@ enum nl80211_meshconf_params {
         NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL,
         NL80211_MESHCONF_FORWARDING,
         NL80211_MESHCONF_RSSI_THRESHOLD,
+        NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR,
+        NL80211_MESHCONF_HT_OPMODE,
 
         /* keep last */
         __NL80211_MESHCONF_ATTR_AFTER_LAST,
@@ -2205,6 +2223,11 @@ enum nl80211_meshconf_params {
  * complete (unsecured) mesh peering without the need of a userspace daemon.
  *
  * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number
+ *
+ * @NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC: Enable this option to use a
+ * vendor specific synchronization method or disable it to use the default
+ * neighbor offset synchronization
+ *
  * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use
  */
 enum nl80211_mesh_setup_params {
@@ -2214,6 +2237,7 @@ enum nl80211_mesh_setup_params {
         NL80211_MESH_SETUP_IE,
         NL80211_MESH_SETUP_USERSPACE_AUTH,
         NL80211_MESH_SETUP_USERSPACE_AMPE,
+        NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC,
 
         /* keep last */
         __NL80211_MESH_SETUP_ATTR_AFTER_LAST,
@@ -2223,7 +2247,7 @@ enum nl80211_mesh_setup_params {
 /**
  * enum nl80211_txq_attr - TX queue parameter attributes
  * @__NL80211_TXQ_ATTR_INVALID: Attribute number 0 is reserved
- * @NL80211_TXQ_ATTR_QUEUE: TX queue identifier (NL80211_TXQ_Q_*)
+ * @NL80211_TXQ_ATTR_AC: AC identifier (NL80211_AC_*)
  * @NL80211_TXQ_ATTR_TXOP: Maximum burst time in units of 32 usecs, 0 meaning
  *      disabled
  * @NL80211_TXQ_ATTR_CWMIN: Minimum contention window [a value of the form
@@ -2236,7 +2260,7 @@ enum nl80211_mesh_setup_params {
  */
 enum nl80211_txq_attr {
         __NL80211_TXQ_ATTR_INVALID,
-        NL80211_TXQ_ATTR_QUEUE,
+        NL80211_TXQ_ATTR_AC,
         NL80211_TXQ_ATTR_TXOP,
         NL80211_TXQ_ATTR_CWMIN,
         NL80211_TXQ_ATTR_CWMAX,
@@ -2247,13 +2271,21 @@ enum nl80211_txq_attr {
         NL80211_TXQ_ATTR_MAX = __NL80211_TXQ_ATTR_AFTER_LAST - 1
 };
 
-enum nl80211_txq_q {
-        NL80211_TXQ_Q_VO,
-        NL80211_TXQ_Q_VI,
-        NL80211_TXQ_Q_BE,
-        NL80211_TXQ_Q_BK
+enum nl80211_ac {
+        NL80211_AC_VO,
+        NL80211_AC_VI,
+        NL80211_AC_BE,
+        NL80211_AC_BK,
+        NL80211_NUM_ACS
 };
 
+/* backward compat */
+#define NL80211_TXQ_ATTR_QUEUE  NL80211_TXQ_ATTR_AC
+#define NL80211_TXQ_Q_VO        NL80211_AC_VO
+#define NL80211_TXQ_Q_VI        NL80211_AC_VI
+#define NL80211_TXQ_Q_BE        NL80211_AC_BE
+#define NL80211_TXQ_Q_BK        NL80211_AC_BK
+
 enum nl80211_channel_type {
         NL80211_CHAN_NO_HT,
         NL80211_CHAN_HT20,
diff --git a/include/linux/nl802154.h b/include/linux/nl802154.h
index 33d9f5175109..5a3db3aa5f17 100644
--- a/include/linux/nl802154.h
+++ b/include/linux/nl802154.h
@@ -68,6 +68,7 @@ enum {
         IEEE802154_ATTR_CHANNEL_PAGE_LIST,
 
         IEEE802154_ATTR_PHY_NAME,
+        IEEE802154_ATTR_DEV_TYPE,
 
         __IEEE802154_ATTR_MAX,
 };
@@ -126,4 +127,23 @@ enum {
 
 #define IEEE802154_CMD_MAX (__IEEE802154_CMD_MAX - 1)
 
+enum {
+        __IEEE802154_DEV_INVALID = -1,
+
+         /* TODO:
+         * Nowadays three device types supported by this stack at linux-zigbee
+         * project: WPAN = 0, MONITOR = 1 and SMAC = 2.
+         *
+         * Since this stack implementation exists many years, it's definitely
+         * bad idea to change the assigned values due to they are already used
+         * by third-party userspace software like: iz-tools, wireshark...
+         *
+         * Currently only monitor device is added and initialized by '1' for
+         * compatibility.
+         */
+        IEEE802154_DEV_MONITOR = 1,
+
+        __IEEE802154_DEV_MAX,
+};
+
 #endif
diff --git a/include/linux/of.h b/include/linux/of.h
index fa7fb1d97458..2ec1083af7ff 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -193,6 +193,17 @@ extern struct device_node *of_get_next_child(const struct device_node *node,
         for (child = of_get_next_child(parent, NULL); child != NULL; \
              child = of_get_next_child(parent, child))
 
+static inline int of_get_child_count(const struct device_node *np)
+{
+        struct device_node *child;
+        int num = 0;
+
+        for_each_child_of_node(np, child)
+                num++;
+
+        return num;
+}
+
 extern struct device_node *of_find_node_with_property(
         struct device_node *from, const char *prop_name);
 #define for_each_node_with_property(dn, prop_name) \
@@ -259,6 +270,37 @@ extern void of_detach_node(struct device_node *);
 #endif
 
 #define of_match_ptr(_ptr)      (_ptr)
+
+/*
+ * struct property *prop;
+ * const __be32 *p;
+ * u32 u;
+ *
+ * of_property_for_each_u32(np, "propname", prop, p, u)
+ *         printk("U32 value: %x\n", u);
+ */
+const __be32 *of_prop_next_u32(struct property *prop, const __be32 *cur,
+                               u32 *pu);
+#define of_property_for_each_u32(np, propname, prop, p, u)      \
+        for (prop = of_find_property(np, propname, NULL),       \
+                p = of_prop_next_u32(prop, NULL, &u);           \
+                p;                                              \
+                p = of_prop_next_u32(prop, p, &u))
+
+/*
+ * struct property *prop;
+ * const char *s;
+ *
+ * of_property_for_each_string(np, "propname", prop, s)
+ *         printk("String value: %s\n", s);
+ */
+const char *of_prop_next_string(struct property *prop, const char *cur);
+#define of_property_for_each_string(np, propname, prop, s)      \
+        for (prop = of_find_property(np, propname, NULL),       \
+                s = of_prop_next_string(prop, NULL);            \
+                s;                                              \
+                s = of_prop_next_string(prop, s))
+
 #else /* CONFIG_OF */
 
 static inline bool of_have_populated_dt(void)
@@ -269,6 +311,11 @@ static inline bool of_have_populated_dt(void)
 #define for_each_child_of_node(parent, child) \
         while (0)
 
+static inline int of_get_child_count(const struct device_node *np)
+{
+        return 0;
+}
+
 static inline int of_device_is_compatible(const struct device_node *device,
                                           const char *name)
 {
@@ -349,6 +396,10 @@ static inline int of_machine_is_compatible(const char *compat)
 
 #define of_match_ptr(_ptr)      NULL
 #define of_match_node(_matches, _node)  NULL
+#define of_property_for_each_u32(np, propname, prop, p, u) \
+        while (0)
+#define of_property_for_each_string(np, propname, prop, s) \
+        while (0)
 #endif /* CONFIG_OF */
 
 /**
diff --git a/include/linux/of_gpio.h b/include/linux/of_gpio.h
index 81733d12cbea..c454f5796747 100644
--- a/include/linux/of_gpio.h
+++ b/include/linux/of_gpio.h
@@ -58,7 +58,6 @@ extern int of_mm_gpiochip_add(struct device_node *np,
 
 extern void of_gpiochip_add(struct gpio_chip *gc);
 extern void of_gpiochip_remove(struct gpio_chip *gc);
-extern struct gpio_chip *of_node_to_gpiochip(struct device_node *np);
 extern int of_gpio_simple_xlate(struct gpio_chip *gc,
                                 const struct of_phandle_args *gpiospec,
                                 u32 *flags);
diff --git a/include/linux/of_i2c.h b/include/linux/of_i2c.h
index 0efe8d465f55..1cb775f8e663 100644
--- a/include/linux/of_i2c.h
+++ b/include/linux/of_i2c.h
@@ -20,6 +20,10 @@ extern void of_i2c_register_devices(struct i2c_adapter *adap);
 /* must call put_device() when done with returned i2c_client device */
 extern struct i2c_client *of_find_i2c_device_by_node(struct device_node *node);
 
+/* must call put_device() when done with returned i2c_adapter device */
+extern struct i2c_adapter *of_find_i2c_adapter_by_node(
+                                                struct device_node *node);
+
 #else
 static inline void of_i2c_register_devices(struct i2c_adapter *adap)
 {
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
index d229ad3edee0..1717cd935e1c 100644
--- a/include/linux/of_irq.h
+++ b/include/linux/of_irq.h
@@ -11,7 +11,7 @@ struct of_irq;
 #include <linux/of.h>
 
 /*
- * irq_of_parse_and_map() is used ba all OF enabled platforms; but SPARC
+ * irq_of_parse_and_map() is used by all OF enabled platforms; but SPARC
  * implements it differently.  However, the prototype is the same for all,
  * so declare it here regardless of the CONFIG_OF_IRQ setting.
  */
@@ -76,5 +76,13 @@ extern struct device_node *of_irq_find_parent(struct device_node *child);
 extern void of_irq_init(const struct of_device_id *matches);
 
 #endif /* CONFIG_OF_IRQ */
-#endif /* CONFIG_OF */
+
+#else /* !CONFIG_OF */
+static inline unsigned int irq_of_parse_and_map(struct device_node *dev,
+                                                int index)
+{
+        return 0;
+}
+#endif /* !CONFIG_OF */
+
 #endif /* __OF_IRQ_H */
diff --git a/include/linux/of_mdio.h b/include/linux/of_mdio.h
index 53b94e025c7c..912c27a0f7ee 100644
--- a/include/linux/of_mdio.h
+++ b/include/linux/of_mdio.h
@@ -22,4 +22,6 @@ extern struct phy_device *of_phy_connect_fixed_link(struct net_device *dev,
                                          void (*hndlr)(struct net_device *),
                                          phy_interface_t iface);
 
+extern struct mii_bus *of_mdio_find_bus(struct device_node *mdio_np);
+
 #endif /* __LINUX_OF_MDIO_H */
diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h
index f93e21700d3e..bb115deb7612 100644
--- a/include/linux/of_pci.h
+++ b/include/linux/of_pci.h
@@ -5,7 +5,7 @@
 
 struct pci_dev;
 struct of_irq;
-int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq);
+int of_irq_map_pci(const struct pci_dev *pdev, struct of_irq *out_irq);
 
 struct device_node;
 struct device_node *of_pci_find_child_device(struct device_node *parent,
diff --git a/include/linux/of_serial.h b/include/linux/of_serial.h
new file mode 100644
index 000000000000..4a73ed80b4c0
--- /dev/null
+++ b/include/linux/of_serial.h
@@ -0,0 +1,17 @@
+#ifndef __LINUX_OF_SERIAL_H
+#define __LINUX_OF_SERIAL_H
+
+/*
+ * FIXME remove this file when tegra finishes conversion to open firmware,
+ * expectation is that all quirks will then be self-contained in
+ * drivers/tty/serial/of_serial.c.
+ */
+#ifdef CONFIG_ARCH_TEGRA
+extern void tegra_serial_handle_break(struct uart_port *port);
+#else
+static inline void tegra_serial_handle_break(struct uart_port *port)
+{
+}
+#endif
+
+#endif /* __LINUX_OF_SERIAL */
diff --git a/include/linux/of_spi.h b/include/linux/of_spi.h
deleted file mode 100644
index 9e3e70f78ae6..000000000000
--- a/include/linux/of_spi.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * OpenFirmware SPI support routines
- * Copyright (C) 2008 Secret Lab Technologies Ltd.
- *
- * Support routines for deriving SPI device attachments from the device
- * tree.
- */
-
-#ifndef __LINUX_OF_SPI_H
-#define __LINUX_OF_SPI_H
-
-#include <linux/spi/spi.h>
-
-#if defined(CONFIG_OF_SPI) || defined(CONFIG_OF_SPI_MODULE)
-extern void of_register_spi_devices(struct spi_master *master);
-#else
-static inline void of_register_spi_devices(struct spi_master *master)
-{
-        return;
-}
-#endif /* CONFIG_OF_SPI */
-
-#endif /* __LINUX_OF_SPI */
diff --git a/include/linux/oom.h b/include/linux/oom.h
index 3d7647536b03..e4c29bc72e70 100644
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
@@ -43,8 +43,9 @@ enum oom_constraint {
 extern void compare_swap_oom_score_adj(int old_val, int new_val);
 extern int test_set_oom_score_adj(int new_val);
 
-extern unsigned int oom_badness(struct task_struct *p, struct mem_cgroup *memcg,
-                        const nodemask_t *nodemask, unsigned long totalpages);
+extern unsigned long oom_badness(struct task_struct *p,
+                struct mem_cgroup *memcg, const nodemask_t *nodemask,
+                unsigned long totalpages);
 extern int try_set_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags);
 extern void clear_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags);
 
diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h
index 051c1b1ede4e..3bdcab30ca41 100644
--- a/include/linux/page-isolation.h
+++ b/include/linux/page-isolation.h
@@ -3,7 +3,7 @@
 
 /*
  * Changes migrate type in [start_pfn, end_pfn) to be MIGRATE_ISOLATE.
- * If specified range includes migrate types other than MOVABLE,
+ * If specified range includes migrate types other than MOVABLE or CMA,
  * this will fail with -EBUSY.
  *
  * For isolating all pages in the range finally, the caller have to
@@ -11,27 +11,27 @@
  * test it.
  */
 extern int
-start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn);
+start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,
+                         unsigned migratetype);
 
 /*
  * Changes MIGRATE_ISOLATE to MIGRATE_MOVABLE.
  * target range is [start_pfn, end_pfn)
  */
 extern int
-undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn);
+undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,
+                        unsigned migratetype);
 
 /*
- * test all pages in [start_pfn, end_pfn)are isolated or not.
+ * Test all pages in [start_pfn, end_pfn) are isolated or not.
  */
-extern int
-test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn);
+int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn);
 
 /*
- * Internal funcs.Changes pageblock's migrate type.
- * Please use make_pagetype_isolated()/make_pagetype_movable().
+ * Internal functions. Changes pageblock's migrate type.
  */
 extern int set_migratetype_isolate(struct page *page);
-extern void unset_migratetype_isolate(struct page *page);
+extern void unset_migratetype_isolate(struct page *page, unsigned migratetype);
 
 
 #endif
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index cfaaa6949b8b..7cfad3bbb0cc 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -426,7 +426,7 @@ static inline int fault_in_pages_writeable(char __user *uaddr, int size)
                  */
                 if (((unsigned long)uaddr & PAGE_MASK) !=
                                 ((unsigned long)end & PAGE_MASK))
-                        ret = __put_user(0, end);
+                        ret = __put_user(0, end);
         }
         return ret;
 }
@@ -445,13 +445,73 @@ static inline int fault_in_pages_readable(const char __user *uaddr, int size)
 
                 if (((unsigned long)uaddr & PAGE_MASK) !=
                                 ((unsigned long)end & PAGE_MASK)) {
-                        ret = __get_user(c, end);
+                        ret = __get_user(c, end);
                         (void)c;
                 }
         }
         return ret;
 }
 
+/*
+ * Multipage variants of the above prefault helpers, useful if more than
+ * PAGE_SIZE of data needs to be prefaulted. These are separate from the above
+ * functions (which only handle up to PAGE_SIZE) to avoid clobbering the
+ * filemap.c hotpaths.
+ */
+static inline int fault_in_multipages_writeable(char __user *uaddr, int size)
+{
+        int ret = 0;
+        char __user *end = uaddr + size - 1;
+
+        if (unlikely(size == 0))
+                return ret;
+
+        /*
+         * Writing zeroes into userspace here is OK, because we know that if
+         * the zero gets there, we'll be overwriting it.
+         */
+        while (uaddr <= end) {
+                ret = __put_user(0, uaddr);
+                if (ret != 0)
+                        return ret;
+                uaddr += PAGE_SIZE;
+        }
+
+        /* Check whether the range spilled into the next page. */
+        if (((unsigned long)uaddr & PAGE_MASK) ==
+                        ((unsigned long)end & PAGE_MASK))
+                ret = __put_user(0, end);
+
+        return ret;
+}
+
+static inline int fault_in_multipages_readable(const char __user *uaddr,
+                                               int size)
+{
+        volatile char c;
+        int ret = 0;
+        const char __user *end = uaddr + size - 1;
+
+        if (unlikely(size == 0))
+                return ret;
+
+        while (uaddr <= end) {
+                ret = __get_user(c, uaddr);
+                if (ret != 0)
+                        return ret;
+                uaddr += PAGE_SIZE;
+        }
+
+        /* Check whether the range spilled into the next page. */
+        if (((unsigned long)uaddr & PAGE_MASK) ==
+                        ((unsigned long)end & PAGE_MASK)) {
+                ret = __get_user(c, end);
+                (void)c;
+        }
+
+        return ret;
+}
+
 int add_to_page_cache_locked(struct page *page, struct address_space *mapping,
                                 pgoff_t index, gfp_t gfp_mask);
 int add_to_page_cache_lru(struct page *page, struct address_space *mapping,
diff --git a/include/linux/pci.h b/include/linux/pci.h
index e444f5b49118..d8c379dba6ad 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -375,11 +375,18 @@ struct pci_host_bridge_window {
 };
 
 struct pci_host_bridge {
-        struct list_head list;
+        struct device dev;
         struct pci_bus *bus;            /* root bus */
         struct list_head windows;       /* pci_host_bridge_windows */
+        void (*release_fn)(struct pci_host_bridge *);
+        void *release_data;
 };
 
+#define to_pci_host_bridge(n) container_of(n, struct pci_host_bridge, dev)
+void pci_set_host_bridge_release(struct pci_host_bridge *bridge,
+                     void (*release_fn)(struct pci_host_bridge *),
+                     void *release_data);
+
 /*
  * The first PCI_BRIDGE_RESOURCE_NUM PCI bus resources (those that correspond
  * to P2P or CardBus bridge windows) go in a table.  Additional ones (for
@@ -680,7 +687,7 @@ int __must_check pci_bus_add_device(struct pci_dev *dev);
 void pci_read_bridge_bases(struct pci_bus *child);
 struct resource *pci_find_parent_resource(const struct pci_dev *dev,
                                           struct resource *res);
-u8 pci_swizzle_interrupt_pin(struct pci_dev *dev, u8 pin);
+u8 pci_swizzle_interrupt_pin(const struct pci_dev *dev, u8 pin);
 int pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge);
 u8 pci_common_swizzle(struct pci_dev *dev, u8 *pinp);
 extern struct pci_dev *pci_dev_get(struct pci_dev *dev);
@@ -1685,7 +1692,8 @@ extern void pci_release_bus_of_node(struct pci_bus *bus);
 /* Arch may override this (weak) */
 extern struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus);
 
-static inline struct device_node *pci_device_to_OF_node(struct pci_dev *pdev)
+static inline struct device_node *
+pci_device_to_OF_node(const struct pci_dev *pdev)
 {
         return pdev ? pdev->dev.of_node : NULL;
 }
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 3329965ed63f..ab741b0d0074 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2506,6 +2506,7 @@
 #define PCI_DEVICE_ID_INTEL_MRST_SD2    0x084F
 #define PCI_DEVICE_ID_INTEL_I960        0x0960
 #define PCI_DEVICE_ID_INTEL_I960RM      0x0962
+#define PCI_DEVICE_ID_INTEL_CENTERTON_ILB       0x0c60
 #define PCI_DEVICE_ID_INTEL_8257X_SOL   0x1062
 #define PCI_DEVICE_ID_INTEL_82573E_SOL  0x1085
 #define PCI_DEVICE_ID_INTEL_82573L_SOL  0x108F
diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index 21638ae14e07..2b9f82c037c9 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -166,60 +166,6 @@ extern phys_addr_t per_cpu_ptr_to_phys(void *addr);
         (typeof(type) __percpu *)__alloc_percpu(sizeof(type), __alignof__(type))
 
 /*
- * Optional methods for optimized non-lvalue per-cpu variable access.
- *
- * @var can be a percpu variable or a field of it and its size should
- * equal char, int or long.  percpu_read() evaluates to a lvalue and
- * all others to void.
- *
- * These operations are guaranteed to be atomic.
- * The generic versions disable interrupts.  Archs are
- * encouraged to implement single-instruction alternatives which don't
- * require protection.
- */
-#ifndef percpu_read
-# define percpu_read(var)                                               \
-  ({                                                                    \
-        typeof(var) *pr_ptr__ = &(var);                                 \
-        typeof(var) pr_ret__;                                           \
-        pr_ret__ = get_cpu_var(*pr_ptr__);                              \
-        put_cpu_var(*pr_ptr__);                                         \
-        pr_ret__;                                                       \
-  })
-#endif
-
-#define __percpu_generic_to_op(var, val, op)                            \
-do {                                                                    \
-        typeof(var) *pgto_ptr__ = &(var);                               \
-        get_cpu_var(*pgto_ptr__) op val;                                \
-        put_cpu_var(*pgto_ptr__);                                       \
-} while (0)
-
-#ifndef percpu_write
-# define percpu_write(var, val)         __percpu_generic_to_op(var, (val), =)
-#endif
-
-#ifndef percpu_add
-# define percpu_add(var, val)           __percpu_generic_to_op(var, (val), +=)
-#endif
-
-#ifndef percpu_sub
-# define percpu_sub(var, val)           __percpu_generic_to_op(var, (val), -=)
-#endif
-
-#ifndef percpu_and
-# define percpu_and(var, val)           __percpu_generic_to_op(var, (val), &=)
-#endif
-
-#ifndef percpu_or
-# define percpu_or(var, val)            __percpu_generic_to_op(var, (val), |=)
-#endif
-
-#ifndef percpu_xor
-# define percpu_xor(var, val)           __percpu_generic_to_op(var, (val), ^=)
-#endif
-
-/*
  * Branching function to split up a function into a set of functions that
  * are called for different scalar sizes of the objects handled.
  */
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index ddbb6a901f65..f32578634d9d 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -1132,11 +1132,14 @@ struct perf_sample_data {
         struct perf_branch_stack        *br_stack;
 };
 
-static inline void perf_sample_data_init(struct perf_sample_data *data, u64 addr)
+static inline void perf_sample_data_init(struct perf_sample_data *data,
+                                         u64 addr, u64 period)
 {
+        /* remaining struct members initialized in perf_prepare_sample() */
         data->addr = addr;
         data->raw  = NULL;
         data->br_stack = NULL;
+        data->period    = period;
 }
 
 extern void perf_output_sample(struct perf_output_handle *handle,
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 6fe0a37d4abf..c291cae8ce32 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -412,6 +412,9 @@ struct phy_driver {
         /* Clears up any memory if needed */
         void (*remove)(struct phy_device *phydev);
 
+        /* Handles ethtool queries for hardware time stamping. */
+        int (*ts_info)(struct phy_device *phydev, struct ethtool_ts_info *ti);
+
         /* Handles SIOCSHWTSTAMP ioctl for hardware time stamping. */
         int  (*hwtstamp)(struct phy_device *phydev, struct ifreq *ifr);
 
@@ -477,7 +480,6 @@ static inline int phy_write(struct phy_device *phydev, u32 regnum, u16 val)
         return mdiobus_write(phydev->bus, phydev->addr, regnum, val);
 }
 
-int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id);
 struct phy_device* get_phy_device(struct mii_bus *bus, int addr);
 int phy_device_register(struct phy_device *phy);
 int phy_init_hw(struct phy_device *phydev);
diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
index b067bd8c49d0..00474b047145 100644
--- a/include/linux/pid_namespace.h
+++ b/include/linux/pid_namespace.h
@@ -31,7 +31,7 @@ struct pid_namespace {
 #ifdef CONFIG_BSD_PROCESS_ACCT
         struct bsd_acct_struct *bacct;
 #endif
-        gid_t pid_gid;
+        kgid_t pid_gid;
         int hide_pid;
         int reboot;     /* group exit code if this pidns was rebooted */
 };
diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h
index 191e72688481..6dd96fb45482 100644
--- a/include/linux/pinctrl/consumer.h
+++ b/include/linux/pinctrl/consumer.h
@@ -36,6 +36,9 @@ extern struct pinctrl_state * __must_check pinctrl_lookup_state(
                                                         const char *name);
 extern int pinctrl_select_state(struct pinctrl *p, struct pinctrl_state *s);
 
+extern struct pinctrl * __must_check devm_pinctrl_get(struct device *dev);
+extern void devm_pinctrl_put(struct pinctrl *p);
+
 #else /* !CONFIG_PINCTRL */
 
 static inline int pinctrl_request_gpio(unsigned gpio)
@@ -79,6 +82,15 @@ static inline int pinctrl_select_state(struct pinctrl *p,
         return 0;
 }
 
+static inline struct pinctrl * __must_check devm_pinctrl_get(struct device *dev)
+{
+        return NULL;
+}
+
+static inline void devm_pinctrl_put(struct pinctrl *p)
+{
+}
+
 #endif /* CONFIG_PINCTRL */
 
 static inline struct pinctrl * __must_check pinctrl_get_select(
@@ -113,6 +125,38 @@ static inline struct pinctrl * __must_check pinctrl_get_select_default(
         return pinctrl_get_select(dev, PINCTRL_STATE_DEFAULT);
 }
 
+static inline struct pinctrl * __must_check devm_pinctrl_get_select(
+                                        struct device *dev, const char *name)
+{
+        struct pinctrl *p;
+        struct pinctrl_state *s;
+        int ret;
+
+        p = devm_pinctrl_get(dev);
+        if (IS_ERR(p))
+                return p;
+
+        s = pinctrl_lookup_state(p, name);
+        if (IS_ERR(s)) {
+                devm_pinctrl_put(p);
+                return ERR_PTR(PTR_ERR(s));
+        }
+
+        ret = pinctrl_select_state(p, s);
+        if (ret < 0) {
+                devm_pinctrl_put(p);
+                return ERR_PTR(ret);
+        }
+
+        return p;
+}
+
+static inline struct pinctrl * __must_check devm_pinctrl_get_select_default(
+                                        struct device *dev)
+{
+        return devm_pinctrl_get_select(dev, PINCTRL_STATE_DEFAULT);
+}
+
 #ifdef CONFIG_PINCONF
 
 extern int pin_config_get(const char *dev_name, const char *name,
diff --git a/include/linux/pinctrl/machine.h b/include/linux/pinctrl/machine.h
index e4d1de742502..7d22ab00343f 100644
--- a/include/linux/pinctrl/machine.h
+++ b/include/linux/pinctrl/machine.h
@@ -154,7 +154,7 @@ struct pinctrl_map {
 
 extern int pinctrl_register_mappings(struct pinctrl_map const *map,
                                 unsigned num_maps);
-
+extern void pinctrl_provide_dummies(void);
 #else
 
 static inline int pinctrl_register_mappings(struct pinctrl_map const *map,
@@ -163,5 +163,8 @@ static inline int pinctrl_register_mappings(struct pinctrl_map const *map,
         return 0;
 }
 
-#endif /* !CONFIG_PINMUX */
+static inline void pinctrl_provide_dummies(void)
+{
+}
+#endif /* !CONFIG_PINCTRL */
 #endif
diff --git a/include/linux/pinctrl/pinconf.h b/include/linux/pinctrl/pinconf.h
index ec431f03362d..e7a720104a47 100644
--- a/include/linux/pinctrl/pinconf.h
+++ b/include/linux/pinctrl/pinconf.h
@@ -25,7 +25,6 @@ struct seq_file;
  * @pin_config_get: get the config of a certain pin, if the requested config
  *      is not available on this controller this should return -ENOTSUPP
  *      and if it is available but disabled it should return -EINVAL
- * @pin_config_get: get the config of a certain pin
  * @pin_config_set: configure an individual pin
  * @pin_config_group_get: get configurations for an entire pin group
  * @pin_config_group_set: configure all pins in a group
@@ -33,6 +32,8 @@ struct seq_file;
  *      per-device info for a certain pin in debugfs
  * @pin_config_group_dbg_show: optional debugfs display hook that will provide
  *      per-device info for a certain group in debugfs
+ * @pin_config_config_dbg_show: optional debugfs display hook that will decode
+ *      and display a driver's pin configuration parameter
  */
 struct pinconf_ops {
 #ifdef CONFIG_GENERIC_PINCONF
@@ -56,6 +57,9 @@ struct pinconf_ops {
         void (*pin_config_group_dbg_show) (struct pinctrl_dev *pctldev,
                                            struct seq_file *s,
                                            unsigned selector);
+        void (*pin_config_config_dbg_show) (struct pinctrl_dev *pctldev,
+                                            struct seq_file *s,
+                                            unsigned long config);
 };
 
 #endif
diff --git a/include/linux/pinctrl/pinctrl-state.h b/include/linux/pinctrl/pinctrl-state.h
index 3920e28b4da7..634608dc6c89 100644
--- a/include/linux/pinctrl/pinctrl-state.h
+++ b/include/linux/pinctrl/pinctrl-state.h
@@ -2,5 +2,18 @@
  * Standard pin control state definitions
  */
 
+/**
+ * @PINCTRL_STATE_DEFAULT: the state the pinctrl handle shall be put
+ *      into as default, usually this means the pins are up and ready to
+ *      be used by the device driver. This state is commonly used by
+ *      hogs to configure muxing and pins at boot.
+ * @PINCTRL_STATE_IDLE: the state the pinctrl handle shall be put into
+ *      when the pins are idle. Could typically be set from a
+ *      pm_runtime_suspend() operation.
+ * @PINCTRL_STATE_SLEEP: the state the pinctrl handle shall be put into
+ *      when the pins are sleeping. Could typically be set from a
+ *      common suspend() function.
+ */
 #define PINCTRL_STATE_DEFAULT "default"
 #define PINCTRL_STATE_IDLE "idle"
+#define PINCTRL_STATE_SLEEP "sleep"
diff --git a/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h
index 4e9f0788c221..3b894a668d32 100644
--- a/include/linux/pinctrl/pinctrl.h
+++ b/include/linux/pinctrl/pinctrl.h
@@ -21,9 +21,11 @@
 
 struct device;
 struct pinctrl_dev;
+struct pinctrl_map;
 struct pinmux_ops;
 struct pinconf_ops;
 struct gpio_chip;
+struct device_node;
 
 /**
  * struct pinctrl_pin_desc - boards/machines provide information on their
@@ -64,17 +66,24 @@ struct pinctrl_gpio_range {
 /**
  * struct pinctrl_ops - global pin control operations, to be implemented by
  * pin controller drivers.
- * @list_groups: list the number of selectable named groups available
- *      in this pinmux driver, the core will begin on 0 and call this
- *      repeatedly as long as it returns >= 0 to enumerate the groups
+ * @get_groups_count: Returns the count of total number of groups registered.
  * @get_group_name: return the group name of the pin group
  * @get_group_pins: return an array of pins corresponding to a certain
  *      group selector @pins, and the size of the array in @num_pins
  * @pin_dbg_show: optional debugfs display hook that will provide per-device
  *      info for a certain pin in debugfs
+ * @dt_node_to_map: parse a device tree "pin configuration node", and create
+ *      mapping table entries for it. These are returned through the @map and
+ *      @num_maps output parameters. This function is optional, and may be
+ *      omitted for pinctrl drivers that do not support device tree.
+ * @dt_free_map: free mapping table entries created via @dt_node_to_map. The
+ *      top-level @map pointer must be freed, along with any dynamically
+ *      allocated members of the mapping table entries themselves. This
+ *      function is optional, and may be omitted for pinctrl drivers that do
+ *      not support device tree.
  */
 struct pinctrl_ops {
-        int (*list_groups) (struct pinctrl_dev *pctldev, unsigned selector);
+        int (*get_groups_count) (struct pinctrl_dev *pctldev);
         const char *(*get_group_name) (struct pinctrl_dev *pctldev,
                                        unsigned selector);
         int (*get_group_pins) (struct pinctrl_dev *pctldev,
@@ -83,6 +92,11 @@ struct pinctrl_ops {
                                unsigned *num_pins);
         void (*pin_dbg_show) (struct pinctrl_dev *pctldev, struct seq_file *s,
                           unsigned offset);
+        int (*dt_node_to_map) (struct pinctrl_dev *pctldev,
+                               struct device_node *np_config,
+                               struct pinctrl_map **map, unsigned *num_maps);
+        void (*dt_free_map) (struct pinctrl_dev *pctldev,
+                             struct pinctrl_map *map, unsigned num_maps);
 };
 
 /**
diff --git a/include/linux/pinctrl/pinmux.h b/include/linux/pinctrl/pinmux.h
index 47e9237edd47..1818dcbdd9ab 100644
--- a/include/linux/pinctrl/pinmux.h
+++ b/include/linux/pinctrl/pinmux.h
@@ -23,15 +23,14 @@ struct pinctrl_dev;
 /**
  * struct pinmux_ops - pinmux operations, to be implemented by pin controller
  * drivers that support pinmuxing
- * @request: called by the core to see if a certain pin can be made available
+ * @request: called by the core to see if a certain pin can be made
  *      available for muxing. This is called by the core to acquire the pins
  *      before selecting any actual mux setting across a function. The driver
  *      is allowed to answer "no" by returning a negative error code
  * @free: the reverse function of the request() callback, frees a pin after
  *      being requested
- * @list_functions: list the number of selectable named functions available
- *      in this pinmux driver, the core will begin on 0 and call this
- *      repeatedly as long as it returns >= 0 to enumerate mux settings
+ * @get_functions_count: returns number of selectable named functions available
+ *      in this pinmux driver
  * @get_function_name: return the function name of the muxing selector,
  *      called by the core to figure out which mux setting it shall map a
  *      certain device to
@@ -62,7 +61,7 @@ struct pinctrl_dev;
 struct pinmux_ops {
         int (*request) (struct pinctrl_dev *pctldev, unsigned offset);
         int (*free) (struct pinctrl_dev *pctldev, unsigned offset);
-        int (*list_functions) (struct pinctrl_dev *pctldev, unsigned selector);
+        int (*get_functions_count) (struct pinctrl_dev *pctldev);
         const char *(*get_function_name) (struct pinctrl_dev *pctldev,
                                           unsigned selector);
         int (*get_function_groups) (struct pinctrl_dev *pctldev,
diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index 410b33d014d2..32aef0a439ef 100644
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -509,6 +509,7 @@ enum {
         TCA_NETEM_CORRUPT,
         TCA_NETEM_LOSS,
         TCA_NETEM_RATE,
+        TCA_NETEM_ECN,
         __TCA_NETEM_MAX,
 };
 
@@ -654,4 +655,84 @@ struct tc_qfq_stats {
         __u32 lmax;
 };
 
+/* CODEL */
+
+enum {
+        TCA_CODEL_UNSPEC,
+        TCA_CODEL_TARGET,
+        TCA_CODEL_LIMIT,
+        TCA_CODEL_INTERVAL,
+        TCA_CODEL_ECN,
+        __TCA_CODEL_MAX
+};
+
+#define TCA_CODEL_MAX   (__TCA_CODEL_MAX - 1)
+
+struct tc_codel_xstats {
+        __u32   maxpacket; /* largest packet we've seen so far */
+        __u32   count;     /* how many drops we've done since the last time we
+                            * entered dropping state
+                            */
+        __u32   lastcount; /* count at entry to dropping state */
+        __u32   ldelay;    /* in-queue delay seen by most recently dequeued packet */
+        __s32   drop_next; /* time to drop next packet */
+        __u32   drop_overlimit; /* number of time max qdisc packet limit was hit */
+        __u32   ecn_mark;  /* number of packets we ECN marked instead of dropped */
+        __u32   dropping;  /* are we in dropping state ? */
+};
+
+/* FQ_CODEL */
+
+enum {
+        TCA_FQ_CODEL_UNSPEC,
+        TCA_FQ_CODEL_TARGET,
+        TCA_FQ_CODEL_LIMIT,
+        TCA_FQ_CODEL_INTERVAL,
+        TCA_FQ_CODEL_ECN,
+        TCA_FQ_CODEL_FLOWS,
+        TCA_FQ_CODEL_QUANTUM,
+        __TCA_FQ_CODEL_MAX
+};
+
+#define TCA_FQ_CODEL_MAX        (__TCA_FQ_CODEL_MAX - 1)
+
+enum {
+        TCA_FQ_CODEL_XSTATS_QDISC,
+        TCA_FQ_CODEL_XSTATS_CLASS,
+};
+
+struct tc_fq_codel_qd_stats {
+        __u32   maxpacket;      /* largest packet we've seen so far */
+        __u32   drop_overlimit; /* number of time max qdisc
+                                 * packet limit was hit
+                                 */
+        __u32   ecn_mark;       /* number of packets we ECN marked
+                                 * instead of being dropped
+                                 */
+        __u32   new_flow_count; /* number of time packets
+                                 * created a 'new flow'
+                                 */
+        __u32   new_flows_len;  /* count of flows in new list */
+        __u32   old_flows_len;  /* count of flows in old list */
+};
+
+struct tc_fq_codel_cl_stats {
+        __s32   deficit;
+        __u32   ldelay;         /* in-queue delay seen by most recently
+                                 * dequeued packet
+                                 */
+        __u32   count;
+        __u32   lastcount;
+        __u32   dropping;
+        __s32   drop_next;
+};
+
+struct tc_fq_codel_xstats {
+        __u32   type;
+        union {
+                struct tc_fq_codel_qd_stats qdisc_stats;
+                struct tc_fq_codel_cl_stats class_stats;
+        };
+};
+
 #endif
diff --git a/include/linux/platform_data/at91_adc.h b/include/linux/platform_data/at91_adc.h
new file mode 100644
index 000000000000..e15745b4f3a5
--- /dev/null
+++ b/include/linux/platform_data/at91_adc.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2011 Free Electrons
+ *
+ * Licensed under the GPLv2 or later.
+ */
+
+#ifndef _AT91_ADC_H_
+#define _AT91_ADC_H_
+
+/**
+ * struct at91_adc_reg_desc - Various informations relative to registers
+ * @channel_base:       Base offset for the channel data registers
+ * @drdy_mask:          Mask of the DRDY field in the relevant registers
+                        (Interruptions registers mostly)
+ * @status_register:    Offset of the Interrupt Status Register
+ * @trigger_register:   Offset of the Trigger setup register
+ */
+struct at91_adc_reg_desc {
+        u8      channel_base;
+        u32     drdy_mask;
+        u8      status_register;
+        u8      trigger_register;
+};
+
+/**
+ * struct at91_adc_trigger - description of triggers
+ * @name:               name of the trigger advertised to the user
+ * @value:              value to set in the ADC's trigger setup register
+                        to enable the trigger
+ * @is_external:        Does the trigger rely on an external pin?
+ */
+struct at91_adc_trigger {
+        const char      *name;
+        u8              value;
+        bool            is_external;
+};
+
+/**
+ * struct at91_adc_data - platform data for ADC driver
+ * @channels_used:              channels in use on the board as a bitmask
+ * @num_channels:               global number of channels available on the board
+ * @registers:                  Registers definition on the board
+ * @startup_time:               startup time of the ADC in microseconds
+ * @trigger_list:               Triggers available in the ADC
+ * @trigger_number:             Number of triggers available in the ADC
+ * @use_external_triggers:      does the board has external triggers availables
+ * @vref:                       Reference voltage for the ADC in millivolts
+ */
+struct at91_adc_data {
+        unsigned long                   channels_used;
+        u8                              num_channels;
+        struct at91_adc_reg_desc        *registers;
+        u8                              startup_time;
+        struct at91_adc_trigger         *trigger_list;
+        u8                              trigger_number;
+        bool                            use_external_triggers;
+        u16                             vref;
+};
+
+extern void __init at91_add_device_adc(struct at91_adc_data *data);
+#endif
diff --git a/include/linux/platform_data/ehci-sh.h b/include/linux/platform_data/ehci-sh.h
new file mode 100644
index 000000000000..5c15a738e116
--- /dev/null
+++ b/include/linux/platform_data/ehci-sh.h
@@ -0,0 +1,28 @@
+/*
+ * EHCI SuperH driver platform data
+ *
+ * Copyright (C) 2012  Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
+ * Copyright (C) 2012  Renesas Solutions Corp.
+ *
+ * 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; version 2 of the License.
+ *
+ * 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 __USB_EHCI_SH_H
+#define __USB_EHCI_SH_H
+
+struct ehci_sh_platdata {
+        void (*phy_init)(void); /* Phy init function */
+};
+
+#endif /* __USB_EHCI_SH_H */
diff --git a/include/linux/platform_data/emif_plat.h b/include/linux/platform_data/emif_plat.h
new file mode 100644
index 000000000000..03378ca84061
--- /dev/null
+++ b/include/linux/platform_data/emif_plat.h
@@ -0,0 +1,128 @@
+/*
+ * Definitions for TI EMIF device platform data
+ *
+ * Copyright (C) 2012 Texas Instruments, Inc.
+ *
+ * Aneesh V <aneesh@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.
+ */
+#ifndef __EMIF_PLAT_H
+#define __EMIF_PLAT_H
+
+/* Low power modes - EMIF_PWR_MGMT_CTRL */
+#define EMIF_LP_MODE_DISABLE                            0
+#define EMIF_LP_MODE_CLOCK_STOP                         1
+#define EMIF_LP_MODE_SELF_REFRESH                       2
+#define EMIF_LP_MODE_PWR_DN                             4
+
+/* Hardware capabilities */
+#define EMIF_HW_CAPS_LL_INTERFACE                       0x00000001
+
+/*
+ * EMIF IP Revisions
+ *      EMIF4D  - Used in OMAP4
+ *      EMIF4D5 - Used in OMAP5
+ */
+#define EMIF_4D                                         1
+#define EMIF_4D5                                        2
+
+/*
+ * PHY types
+ *      ATTILAPHY  - Used in OMAP4
+ *      INTELLIPHY - Used in OMAP5
+ */
+#define EMIF_PHY_TYPE_ATTILAPHY                         1
+#define EMIF_PHY_TYPE_INTELLIPHY                        2
+
+/* Custom config requests */
+#define EMIF_CUSTOM_CONFIG_LPMODE                       0x00000001
+#define EMIF_CUSTOM_CONFIG_TEMP_ALERT_POLL_INTERVAL     0x00000002
+
+#ifndef __ASSEMBLY__
+/**
+ * struct ddr_device_info - All information about the DDR device except AC
+ *              timing parameters
+ * @type:       Device type (LPDDR2-S4, LPDDR2-S2 etc)
+ * @density:    Device density
+ * @io_width:   Bus width
+ * @cs1_used:   Whether there is a DDR device attached to the second
+ *              chip-select(CS1) of this EMIF instance
+ * @cal_resistors_per_cs: Whether there is one calibration resistor per
+ *              chip-select or whether it's a single one for both
+ * @manufacturer: Manufacturer name string
+ */
+struct ddr_device_info {
+        u32     type;
+        u32     density;
+        u32     io_width;
+        u32     cs1_used;
+        u32     cal_resistors_per_cs;
+        char    manufacturer[10];
+};
+
+/**
+ * struct emif_custom_configs - Custom configuration parameters/policies
+ *              passed from the platform layer
+ * @mask:       Mask to indicate which configs are requested
+ * @lpmode:     LPMODE to be used in PWR_MGMT_CTRL register
+ * @lpmode_timeout_performance: Timeout before LPMODE entry when higher
+ *              performance is desired at the cost of power (typically
+ *              at higher OPPs)
+ * @lpmode_timeout_power: Timeout before LPMODE entry when better power
+ *              savings is desired and performance is not important
+ *              (typically at lower loads indicated by lower OPPs)
+ * @lpmode_freq_threshold: The DDR frequency threshold to identify between
+ *              the above two cases:
+ *              timeout = (freq >= lpmode_freq_threshold) ?
+ *                      lpmode_timeout_performance :
+ *                      lpmode_timeout_power;
+ * @temp_alert_poll_interval_ms: LPDDR2 MR4 polling interval at nominal
+ *              temperature(in milliseconds). When temperature is high
+ *              polling is done 4 times as frequently.
+ */
+struct emif_custom_configs {
+        u32 mask;
+        u32 lpmode;
+        u32 lpmode_timeout_performance;
+        u32 lpmode_timeout_power;
+        u32 lpmode_freq_threshold;
+        u32 temp_alert_poll_interval_ms;
+};
+
+/**
+ * struct emif_platform_data - Platform data passed on EMIF platform
+ *                              device creation. Used by the driver.
+ * @hw_caps:            Hw capabilities of the EMIF IP in the respective SoC
+ * @device_info:        Device info structure containing information such
+ *                      as type, bus width, density etc
+ * @timings:            Timings information from device datasheet passed
+ *                      as an array of 'struct lpddr2_timings'. Can be NULL
+ *                      if if default timings are ok
+ * @timings_arr_size:   Size of the timings array. Depends on the number
+ *                      of different frequencies for which timings data
+ *                      is provided
+ * @min_tck:            Minimum value of some timing parameters in terms
+ *                      of number of cycles. Can be NULL if default values
+ *                      are ok
+ * @custom_configs:     Custom configurations requested by SoC or board
+ *                      code and the data for them. Can be NULL if default
+ *                      configurations done by the driver are ok. See
+ *                      documentation for 'struct emif_custom_configs' for
+ *                      more details
+ */
+struct emif_platform_data {
+        u32 hw_caps;
+        struct ddr_device_info *device_info;
+        const struct lpddr2_timings *timings;
+        u32 timings_arr_size;
+        const struct lpddr2_min_tck *min_tck;
+        struct emif_custom_configs *custom_configs;
+        u32 ip_rev;
+        u32 phy_type;
+};
+#endif /* __ASSEMBLY__ */
+
+#endif /* __LINUX_EMIF_H */
diff --git a/include/linux/platform_data/gpio-em.h b/include/linux/platform_data/gpio-em.h
new file mode 100644
index 000000000000..573edfb046c4
--- /dev/null
+++ b/include/linux/platform_data/gpio-em.h
@@ -0,0 +1,10 @@
+#ifndef __GPIO_EM_H__
+#define __GPIO_EM_H__
+
+struct gpio_em_config {
+        unsigned int gpio_base;
+        unsigned int irq_base;
+        unsigned int number_of_pins;
+};
+
+#endif /* __GPIO_EM_H__ */
diff --git a/include/linux/platform_data/ina2xx.h b/include/linux/platform_data/ina2xx.h
new file mode 100644
index 000000000000..9abc0ca7259b
--- /dev/null
+++ b/include/linux/platform_data/ina2xx.h
@@ -0,0 +1,19 @@
+/*
+ * Driver for Texas Instruments INA219, INA226 power monitor chips
+ *
+ * Copyright (C) 2012 Lothar Felten <l-felten@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.
+ *
+ * For further information, see the Documentation/hwmon/ina2xx file.
+ */
+
+/**
+ * struct ina2xx_platform_data - ina2xx info
+ * @shunt_uohms         shunt resistance in microohms
+ */
+struct ina2xx_platform_data {
+        long shunt_uohms;
+};
diff --git a/include/linux/platform_data/s3c-hsotg.h b/include/linux/platform_data/s3c-hsotg.h
new file mode 100644
index 000000000000..97ec12c2ded4
--- /dev/null
+++ b/include/linux/platform_data/s3c-hsotg.h
@@ -0,0 +1,35 @@
+/* include/linux/platform_data/s3c-hsotg.h
+ *
+ * Copyright 2008 Openmoko, Inc.
+ * Copyright 2008 Simtec Electronics
+ *      Ben Dooks <ben@simtec.co.uk>
+ *      http://armlinux.simtec.co.uk/
+ *
+ * S3C USB2.0 High-speed / OtG platform information
+ *
+ * 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.
+*/
+
+enum s3c_hsotg_dmamode {
+        S3C_HSOTG_DMA_NONE,     /* do not use DMA at-all */
+        S3C_HSOTG_DMA_ONLY,     /* always use DMA */
+        S3C_HSOTG_DMA_DRV,      /* DMA is chosen by driver */
+};
+
+/**
+ * struct s3c_hsotg_plat - platform data for high-speed otg/udc
+ * @dma: Whether to use DMA or not.
+ * @is_osc: The clock source is an oscillator, not a crystal
+ */
+struct s3c_hsotg_plat {
+        enum s3c_hsotg_dmamode  dma;
+        unsigned int            is_osc:1;
+        int                     phy_type;
+
+        int (*phy_init)(struct platform_device *pdev, int type);
+        int (*phy_exit)(struct platform_device *pdev, int type);
+};
+
+extern void s3c_hsotg_set_platdata(struct s3c_hsotg_plat *pd);
diff --git a/include/linux/platform_data/tegra_usb.h b/include/linux/platform_data/tegra_usb.h
index 6bca5b569acb..66c673fef408 100644
--- a/include/linux/platform_data/tegra_usb.h
+++ b/include/linux/platform_data/tegra_usb.h
@@ -26,6 +26,7 @@ struct tegra_ehci_platform_data {
         /* power down the phy on bus suspend */
         int power_down_on_bus_suspend;
         void *phy_config;
+        int vbus_gpio;
 };
 
 #endif /* _TEGRA_USB_H_ */
diff --git a/include/linux/platform_data/wiznet.h b/include/linux/platform_data/wiznet.h
new file mode 100644
index 000000000000..b5d8c192d84d
--- /dev/null
+++ b/include/linux/platform_data/wiznet.h
@@ -0,0 +1,24 @@
+/*
+ * Ethernet driver for the WIZnet W5x00 chip.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#ifndef PLATFORM_DATA_WIZNET_H
+#define PLATFORM_DATA_WIZNET_H
+
+#include <linux/if_ether.h>
+
+struct wiznet_platform_data {
+        int     link_gpio;
+        u8      mac_addr[ETH_ALEN];
+};
+
+#ifndef CONFIG_WIZNET_BUS_SHIFT
+#define CONFIG_WIZNET_BUS_SHIFT 0
+#endif
+
+#define W5100_BUS_DIRECT_SIZE   (0x8000 << CONFIG_WIZNET_BUS_SHIFT)
+#define W5300_BUS_DIRECT_SIZE   (0x0400 << CONFIG_WIZNET_BUS_SHIFT)
+
+#endif /* PLATFORM_DATA_WIZNET_H */
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 715305e05123..f067e60a3832 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -544,8 +544,6 @@ struct dev_pm_info {
         unsigned long           active_jiffies;
         unsigned long           suspended_jiffies;
         unsigned long           accounting_timestamp;
-        ktime_t                 suspend_time;
-        s64                     max_time_suspended_ns;
         struct dev_pm_qos_request *pq_req;
 #endif
         struct pm_subsys_data   *subsys_data;  /* Owned by the subsystem. */
diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
index 91f8286106ea..30f794eb3826 100644
--- a/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h
@@ -14,6 +14,7 @@
 #include <linux/pm.h>
 #include <linux/err.h>
 #include <linux/of.h>
+#include <linux/notifier.h>
 
 enum gpd_status {
         GPD_STATE_ACTIVE = 0,   /* PM domain is active */
@@ -70,9 +71,9 @@ struct generic_pm_domain {
         int (*power_on)(struct generic_pm_domain *domain);
         s64 power_on_latency_ns;
         struct gpd_dev_ops dev_ops;
-        s64 break_even_ns;      /* Power break even for the entire domain. */
         s64 max_off_time_ns;    /* Maximum allowed "suspended" time. */
-        ktime_t power_off_time;
+        bool max_off_time_changed;
+        bool cached_power_down_ok;
         struct device_node *of_node; /* Node in device tree */
 };
 
@@ -93,13 +94,17 @@ struct gpd_timing_data {
         s64 start_latency_ns;
         s64 save_state_latency_ns;
         s64 restore_state_latency_ns;
-        s64 break_even_ns;
+        s64 effective_constraint_ns;
+        bool constraint_changed;
+        bool cached_stop_ok;
 };
 
 struct generic_pm_domain_data {
         struct pm_domain_data base;
         struct gpd_dev_ops ops;
         struct gpd_timing_data td;
+        struct notifier_block nb;
+        struct mutex lock;
         bool need_restore;
         bool always_on;
 };
@@ -141,6 +146,7 @@ static inline int pm_genpd_of_add_device(struct device_node *genpd_node,
 extern int pm_genpd_remove_device(struct generic_pm_domain *genpd,
                                   struct device *dev);
 extern void pm_genpd_dev_always_on(struct device *dev, bool val);
+extern void pm_genpd_dev_need_restore(struct device *dev, bool val);
 extern int pm_genpd_add_subdomain(struct generic_pm_domain *genpd,
                                   struct generic_pm_domain *new_subdomain);
 extern int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd,
@@ -184,6 +190,7 @@ static inline int pm_genpd_remove_device(struct generic_pm_domain *genpd,
         return -ENOSYS;
 }
 static inline void pm_genpd_dev_always_on(struct device *dev, bool val) {}
+static inline void pm_genpd_dev_need_restore(struct device *dev, bool val) {}
 static inline int pm_genpd_add_subdomain(struct generic_pm_domain *genpd,
                                          struct generic_pm_domain *new_sd)
 {
diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
index 609daae7a014..f271860c78d5 100644
--- a/include/linux/pm_runtime.h
+++ b/include/linux/pm_runtime.h
@@ -150,9 +150,6 @@ static inline void pm_runtime_set_autosuspend_delay(struct device *dev,
 static inline unsigned long pm_runtime_autosuspend_expiration(
                                 struct device *dev) { return 0; }
 
-static inline void pm_runtime_update_max_time_suspended(struct device *dev,
-                                                        s64 delta_ns) {}
-
 #endif /* !CONFIG_PM_RUNTIME */
 
 static inline int pm_runtime_idle(struct device *dev)
diff --git a/include/linux/pm_wakeup.h b/include/linux/pm_wakeup.h
index d9f05113e5fb..569781faa504 100644
--- a/include/linux/pm_wakeup.h
+++ b/include/linux/pm_wakeup.h
@@ -33,12 +33,15 @@
  *
  * @total_time: Total time this wakeup source has been active.
  * @max_time: Maximum time this wakeup source has been continuously active.
- * @last_time: Monotonic clock when the wakeup source's was activated last time.
+ * @last_time: Monotonic clock when the wakeup source's was touched last time.
+ * @prevent_sleep_time: Total time this source has been preventing autosleep.
  * @event_count: Number of signaled wakeup events.
  * @active_count: Number of times the wakeup sorce was activated.
  * @relax_count: Number of times the wakeup sorce was deactivated.
- * @hit_count: Number of times the wakeup sorce might abort system suspend.
+ * @expire_count: Number of times the wakeup source's timeout has expired.
+ * @wakeup_count: Number of times the wakeup source might abort suspend.
  * @active: Status of the wakeup source.
+ * @has_timeout: The wakeup source has been activated with a timeout.
  */
 struct wakeup_source {
         const char              *name;
@@ -49,11 +52,15 @@ struct wakeup_source {
         ktime_t total_time;
         ktime_t max_time;
         ktime_t last_time;
+        ktime_t start_prevent_time;
+        ktime_t prevent_sleep_time;
         unsigned long           event_count;
         unsigned long           active_count;
         unsigned long           relax_count;
-        unsigned long           hit_count;
-        unsigned int            active:1;
+        unsigned long           expire_count;
+        unsigned long           wakeup_count;
+        bool                    active:1;
+        bool                    autosleep_enabled:1;
 };
 
 #ifdef CONFIG_PM_SLEEP
diff --git a/include/linux/power/charger-manager.h b/include/linux/power/charger-manager.h
index 4f75e531c112..241065c9ce51 100644
--- a/include/linux/power/charger-manager.h
+++ b/include/linux/power/charger-manager.h
@@ -18,6 +18,8 @@
 #include <linux/power_supply.h>
 
 enum data_source {
+        CM_BATTERY_PRESENT,
+        CM_NO_BATTERY,
         CM_FUEL_GAUGE,
         CM_CHARGER_STAT,
 };
@@ -29,6 +31,16 @@ enum polling_modes {
         CM_POLL_CHARGING_ONLY,
 };
 
+enum cm_event_types {
+        CM_EVENT_UNKNOWN = 0,
+        CM_EVENT_BATT_FULL,
+        CM_EVENT_BATT_IN,
+        CM_EVENT_BATT_OUT,
+        CM_EVENT_EXT_PWR_IN_OUT,
+        CM_EVENT_CHG_START_STOP,
+        CM_EVENT_OTHERS,
+};
+
 /**
  * struct charger_global_desc
  * @rtc_name: the name of RTC used to wake up the system from suspend.
@@ -38,11 +50,18 @@ enum polling_modes {
  *      rtc_only_wakeup() returning false.
  *      If the RTC given to CM is the only wakeup reason,
  *      rtc_only_wakeup should return true.
+ * @assume_timer_stops_in_suspend:
+ *      Assume that the jiffy timer stops in suspend-to-RAM.
+ *      When enabled, CM does not rely on jiffies value in
+ *      suspend_again and assumes that jiffies value does not
+ *      change during suspend.
  */
 struct charger_global_desc {
         char *rtc_name;
 
         bool (*rtc_only_wakeup)(void);
+
+        bool assume_timer_stops_in_suspend;
 };
 
 /**
@@ -50,6 +69,11 @@ struct charger_global_desc {
  * @psy_name: the name of power-supply-class for charger manager
  * @polling_mode:
  *      Determine which polling mode will be used
+ * @fullbatt_vchkdrop_ms:
+ * @fullbatt_vchkdrop_uV:
+ *      Check voltage drop after the battery is fully charged.
+ *      If it has dropped more than fullbatt_vchkdrop_uV after
+ *      fullbatt_vchkdrop_ms, CM will restart charging.
  * @fullbatt_uV: voltage in microvolt
  *      If it is not being charged and VBATT >= fullbatt_uV,
  *      it is assumed to be full.
@@ -76,6 +100,8 @@ struct charger_desc {
         enum polling_modes polling_mode;
         unsigned int polling_interval_ms;
 
+        unsigned int fullbatt_vchkdrop_ms;
+        unsigned int fullbatt_vchkdrop_uV;
         unsigned int fullbatt_uV;
 
         enum data_source battery_present;
@@ -101,6 +127,11 @@ struct charger_desc {
  * @fuel_gauge: power_supply for fuel gauge
  * @charger_stat: array of power_supply for chargers
  * @charger_enabled: the state of charger
+ * @fullbatt_vchk_jiffies_at:
+ *      jiffies at the time full battery check will occur.
+ * @fullbatt_vchk_uV: voltage in microvolt
+ *      criteria for full battery
+ * @fullbatt_vchk_work: work queue for full battery check
  * @emergency_stop:
  *      When setting true, stop charging
  * @last_temp_mC: the measured temperature in milli-Celsius
@@ -121,6 +152,10 @@ struct charger_manager {
 
         bool charger_enabled;
 
+        unsigned long fullbatt_vchk_jiffies_at;
+        unsigned int fullbatt_vchk_uV;
+        struct delayed_work fullbatt_vchk_work;
+
         int emergency_stop;
         int last_temp_mC;
 
@@ -134,14 +169,13 @@ struct charger_manager {
 #ifdef CONFIG_CHARGER_MANAGER
 extern int setup_charger_manager(struct charger_global_desc *gd);
 extern bool cm_suspend_again(void);
+extern void cm_notify_event(struct power_supply *psy,
+                                enum cm_event_types type, char *msg);
 #else
-static void __maybe_unused setup_charger_manager(struct charger_global_desc *gd)
-{ }
-
-static bool __maybe_unused cm_suspend_again(void)
-{
-        return false;
-}
+static inline int setup_charger_manager(struct charger_global_desc *gd)
+{ return 0; }
+static inline bool cm_suspend_again(void) { return false; }
+static inline void cm_notify_event(struct power_supply *psy,
+                                enum cm_event_types type, char *msg) { }
 #endif
-
 #endif /* _CHARGER_MANAGER_H */
diff --git a/include/linux/power/max17042_battery.h b/include/linux/power/max17042_battery.h
index e01b167e66f0..89dd84f47c6e 100644
--- a/include/linux/power/max17042_battery.h
+++ b/include/linux/power/max17042_battery.h
@@ -116,6 +116,18 @@ enum max17042_register {
         MAX17042_VFSOC          = 0xFF,
 };
 
+/* Registers specific to max17047/50 */
+enum max17047_register {
+        MAX17047_QRTbl00        = 0x12,
+        MAX17047_FullSOCThr     = 0x13,
+        MAX17047_QRTbl10        = 0x22,
+        MAX17047_QRTbl20        = 0x32,
+        MAX17047_V_empty        = 0x3A,
+        MAX17047_QRTbl30        = 0x42,
+};
+
+enum max170xx_chip_type {MAX17042, MAX17047};
+
 /*
  * used for setting a register to a desired value
  * addr : address for a register
@@ -144,6 +156,7 @@ struct max17042_config_data {
         u16     shdntimer;      /* 0x03F */
 
         /* App data */
+        u16     full_soc_thresh;        /* 0x13 */
         u16     design_cap;     /* 0x18 */
         u16     ichgt_term;     /* 0x1E */
 
@@ -162,6 +175,10 @@ struct max17042_config_data {
         u16     lavg_empty;     /* 0x36 */
         u16     dqacc;          /* 0x45 */
         u16     dpacc;          /* 0x46 */
+        u16     qrtbl00;        /* 0x12 */
+        u16     qrtbl10;        /* 0x22 */
+        u16     qrtbl20;        /* 0x32 */
+        u16     qrtbl30;        /* 0x42 */
 
         /* Cell technology from power_supply.h */
         u16     cell_technology;
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index c38c13db8832..3b912bee28d1 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -96,6 +96,7 @@ enum power_supply_property {
         POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
         POWER_SUPPLY_PROP_VOLTAGE_NOW,
         POWER_SUPPLY_PROP_VOLTAGE_AVG,
+        POWER_SUPPLY_PROP_VOLTAGE_OCV,
         POWER_SUPPLY_PROP_CURRENT_MAX,
         POWER_SUPPLY_PROP_CURRENT_NOW,
         POWER_SUPPLY_PROP_CURRENT_AVG,
@@ -211,7 +212,7 @@ extern void power_supply_changed(struct power_supply *psy);
 extern int power_supply_am_i_supplied(struct power_supply *psy);
 extern int power_supply_set_battery_charged(struct power_supply *psy);
 
-#if defined(CONFIG_POWER_SUPPLY) || defined(CONFIG_POWER_SUPPLY_MODULE)
+#ifdef CONFIG_POWER_SUPPLY
 extern int power_supply_is_system_supplied(void);
 #else
 static inline int power_supply_is_system_supplied(void) { return -ENOSYS; }
@@ -261,6 +262,7 @@ static inline bool power_supply_is_watt_property(enum power_supply_property psp)
         case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
         case POWER_SUPPLY_PROP_VOLTAGE_NOW:
         case POWER_SUPPLY_PROP_VOLTAGE_AVG:
+        case POWER_SUPPLY_PROP_VOLTAGE_OCV:
         case POWER_SUPPLY_PROP_POWER_NOW:
                 return 1;
         default:
diff --git a/include/linux/prctl.h b/include/linux/prctl.h
index e0cfec2490aa..711e0a30aacc 100644
--- a/include/linux/prctl.h
+++ b/include/linux/prctl.h
@@ -113,6 +113,12 @@
 # define PR_SET_MM_START_STACK          5
 # define PR_SET_MM_START_BRK            6
 # define PR_SET_MM_BRK                  7
+# define PR_SET_MM_ARG_START            8
+# define PR_SET_MM_ARG_END              9
+# define PR_SET_MM_ENV_START            10
+# define PR_SET_MM_ENV_END              11
+# define PR_SET_MM_AUXV                 12
+# define PR_SET_MM_EXE_FILE             13
 
 /*
  * Set specific pid that is allowed to ptrace the current task.
@@ -124,4 +130,19 @@
 #define PR_SET_CHILD_SUBREAPER 36
 #define PR_GET_CHILD_SUBREAPER 37
 
+/*
+ * If no_new_privs is set, then operations that grant new privileges (i.e.
+ * execve) will either fail or not grant them.  This affects suid/sgid,
+ * file capabilities, and LSMs.
+ *
+ * Operations that merely manipulate or drop existing privileges (setresuid,
+ * capset, etc.) will still work.  Drop those privileges if you want them gone.
+ *
+ * Changing LSM security domain is considered a new privilege.  So, for example,
+ * asking selinux for a specific new context (e.g. with runcon) will result
+ * in execve returning -EPERM.
+ */
+#define PR_SET_NO_NEW_PRIVS 38
+#define PR_GET_NO_NEW_PRIVS 39
+
 #endif /* _LINUX_PRCTL_H */
diff --git a/include/linux/printk.h b/include/linux/printk.h
index 0525927f203f..1bec2f7a2d42 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -95,8 +95,19 @@ extern int printk_needs_cpu(int cpu);
 extern void printk_tick(void);
 
 #ifdef CONFIG_PRINTK
+asmlinkage __printf(5, 0)
+int vprintk_emit(int facility, int level,
+                 const char *dict, size_t dictlen,
+                 const char *fmt, va_list args);
+
 asmlinkage __printf(1, 0)
 int vprintk(const char *fmt, va_list args);
+
+asmlinkage __printf(5, 6) __cold
+asmlinkage int printk_emit(int facility, int level,
+                           const char *dict, size_t dictlen,
+                           const char *fmt, ...);
+
 asmlinkage __printf(1, 2) __cold
 int printk(const char *fmt, ...);
 
@@ -289,6 +300,8 @@ extern void dump_stack(void) __cold;
         no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
 #endif
 
+extern const struct file_operations kmsg_fops;
+
 enum {
         DUMP_PREFIX_NONE,
         DUMP_PREFIX_ADDRESS,
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 85c507306239..3fd2e871ff1b 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -52,8 +52,8 @@ struct proc_dir_entry {
         unsigned int low_ino;
         umode_t mode;
         nlink_t nlink;
-        uid_t uid;
-        gid_t gid;
+        kuid_t uid;
+        kgid_t gid;
         loff_t size;
         const struct inode_operations *proc_iops;
         /*
diff --git a/include/linux/pstore_ram.h b/include/linux/pstore_ram.h
new file mode 100644
index 000000000000..7ed7fd4dba49
--- /dev/null
+++ b/include/linux/pstore_ram.h
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2010 Marco Stornelli <marco.stornelli@gmail.com>
+ * Copyright (C) 2011 Kees Cook <keescook@chromium.org>
+ * Copyright (C) 2011 Google, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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.
+ *
+ */
+
+#ifndef __LINUX_PSTORE_RAM_H__
+#define __LINUX_PSTORE_RAM_H__
+
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/list.h>
+#include <linux/types.h>
+#include <linux/init.h>
+
+struct persistent_ram_buffer;
+
+struct persistent_ram_descriptor {
+        const char      *name;
+        phys_addr_t     size;
+};
+
+struct persistent_ram {
+        phys_addr_t     start;
+        phys_addr_t     size;
+
+        int                                     num_descs;
+        struct persistent_ram_descriptor        *descs;
+
+        struct list_head node;
+};
+
+struct persistent_ram_zone {
+        phys_addr_t paddr;
+        size_t size;
+        void *vaddr;
+        struct persistent_ram_buffer *buffer;
+        size_t buffer_size;
+
+        /* ECC correction */
+        bool ecc;
+        char *par_buffer;
+        char *par_header;
+        struct rs_control *rs_decoder;
+        int corrected_bytes;
+        int bad_blocks;
+        int ecc_block_size;
+        int ecc_size;
+        int ecc_symsize;
+        int ecc_poly;
+
+        char *old_log;
+        size_t old_log_size;
+};
+
+int persistent_ram_early_init(struct persistent_ram *ram);
+
+struct persistent_ram_zone * __init persistent_ram_new(phys_addr_t start,
+                                                       size_t size,
+                                                       bool ecc);
+void persistent_ram_free(struct persistent_ram_zone *prz);
+struct persistent_ram_zone *persistent_ram_init_ringbuffer(struct device *dev,
+                bool ecc);
+
+int persistent_ram_write(struct persistent_ram_zone *prz, const void *s,
+        unsigned int count);
+
+size_t persistent_ram_old_size(struct persistent_ram_zone *prz);
+void *persistent_ram_old(struct persistent_ram_zone *prz);
+void persistent_ram_free_old(struct persistent_ram_zone *prz);
+ssize_t persistent_ram_ecc_string(struct persistent_ram_zone *prz,
+        char *str, size_t len);
+
+/*
+ * Ramoops platform data
+ * @mem_size    memory size for ramoops
+ * @mem_address physical memory address to contain ramoops
+ */
+
+struct ramoops_platform_data {
+        unsigned long   mem_size;
+        unsigned long   mem_address;
+        unsigned long   record_size;
+        int             dump_oops;
+        bool            ecc;
+};
+
+#endif
diff --git a/include/linux/ptp_clock_kernel.h b/include/linux/ptp_clock_kernel.h
index dd2e44fba63e..945704c2ed65 100644
--- a/include/linux/ptp_clock_kernel.h
+++ b/include/linux/ptp_clock_kernel.h
@@ -136,4 +136,12 @@ struct ptp_clock_event {
 extern void ptp_clock_event(struct ptp_clock *ptp,
                             struct ptp_clock_event *event);
 
+/**
+ * ptp_clock_index() - obtain the device index of a PTP clock
+ *
+ * @ptp:    The clock obtained from ptp_clock_register().
+ */
+
+extern int ptp_clock_index(struct ptp_clock *ptp);
+
 #endif
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index 5c719627c2aa..597e4fdb97fe 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -58,6 +58,7 @@
 #define PTRACE_EVENT_EXEC       4
 #define PTRACE_EVENT_VFORK_DONE 5
 #define PTRACE_EVENT_EXIT       6
+#define PTRACE_EVENT_SECCOMP    7
 /* Extended result codes which enabled by means other than options.  */
 #define PTRACE_EVENT_STOP       128
 
@@ -69,8 +70,9 @@
 #define PTRACE_O_TRACEEXEC      (1 << PTRACE_EVENT_EXEC)
 #define PTRACE_O_TRACEVFORKDONE (1 << PTRACE_EVENT_VFORK_DONE)
 #define PTRACE_O_TRACEEXIT      (1 << PTRACE_EVENT_EXIT)
+#define PTRACE_O_TRACESECCOMP   (1 << PTRACE_EVENT_SECCOMP)
 
-#define PTRACE_O_MASK           0x0000007f
+#define PTRACE_O_MASK           0x000000ff
 
 #include <asm/ptrace.h>
 
@@ -98,6 +100,7 @@
 #define PT_TRACE_EXEC           PT_EVENT_FLAG(PTRACE_EVENT_EXEC)
 #define PT_TRACE_VFORK_DONE     PT_EVENT_FLAG(PTRACE_EVENT_VFORK_DONE)
 #define PT_TRACE_EXIT           PT_EVENT_FLAG(PTRACE_EVENT_EXIT)
+#define PT_TRACE_SECCOMP        PT_EVENT_FLAG(PTRACE_EVENT_SECCOMP)
 
 /* single stepping state bits (used on ARM and PA-RISC) */
 #define PT_SINGLESTEP_BIT       31
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
index d93f95e6177c..17b977304a09 100644
--- a/include/linux/quotaops.h
+++ b/include/linux/quotaops.h
@@ -22,8 +22,8 @@ static inline struct quota_info *sb_dqopt(struct super_block *sb)
 static inline bool is_quota_modification(struct inode *inode, struct iattr *ia)
 {
         return (ia->ia_valid & ATTR_SIZE && ia->ia_size != inode->i_size) ||
-                (ia->ia_valid & ATTR_UID && ia->ia_uid != inode->i_uid) ||
-                (ia->ia_valid & ATTR_GID && ia->ia_gid != inode->i_gid);
+                (ia->ia_valid & ATTR_UID && !uid_eq(ia->ia_uid, inode->i_uid)) ||
+                (ia->ia_valid & ATTR_GID && !gid_eq(ia->ia_gid, inode->i_gid));
 }
 
 #if defined(CONFIG_QUOTA)
diff --git a/include/linux/raid/md_p.h b/include/linux/raid/md_p.h
index 8c0a3adc5df5..ee753536ab70 100644
--- a/include/linux/raid/md_p.h
+++ b/include/linux/raid/md_p.h
@@ -233,7 +233,10 @@ struct mdp_superblock_1 {
         __le32  delta_disks;    /* change in number of raid_disks               */
         __le32  new_layout;     /* new layout                                   */
         __le32  new_chunk;      /* new chunk size (512byte sectors)             */
-        __u8    pad1[128-124];  /* set to 0 when written */
+        __le32  new_offset;     /* signed number to add to data_offset in new
+                                 * layout.  0 == no-change.  This can be
+                                 * different on each device in the array.
+                                 */
 
         /* constant this-device information - 64 bytes */
         __le64  data_offset;    /* sector start of data, often 0 */
@@ -281,10 +284,18 @@ struct mdp_superblock_1 {
                                             * active device with same 'role'.
                                             * 'recovery_offset' is also set.
                                             */
+#define MD_FEATURE_RESHAPE_BACKWARDS    32 /* Reshape doesn't change number
+                                            * of devices, but is going
+                                            * backwards anyway.
+                                            */
+#define MD_FEATURE_NEW_OFFSET           64 /* new_offset must be honoured */
 #define MD_FEATURE_ALL                  (MD_FEATURE_BITMAP_OFFSET       \
                                         |MD_FEATURE_RECOVERY_OFFSET     \
                                         |MD_FEATURE_RESHAPE_ACTIVE      \
                                         |MD_FEATURE_BAD_BLOCKS          \
-                                        |MD_FEATURE_REPLACEMENT)
+                                        |MD_FEATURE_REPLACEMENT         \
+                                        |MD_FEATURE_RESHAPE_BACKWARDS   \
+                                        |MD_FEATURE_NEW_OFFSET          \
+                                        )
 
 #endif 
diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h
index 53272e9860a7..640c69ceec96 100644
--- a/include/linux/raid/pq.h
+++ b/include/linux/raid/pq.h
@@ -99,8 +99,20 @@ extern const struct raid6_calls raid6_altivec2;
 extern const struct raid6_calls raid6_altivec4;
 extern const struct raid6_calls raid6_altivec8;
 
+struct raid6_recov_calls {
+        void (*data2)(int, size_t, int, int, void **);
+        void (*datap)(int, size_t, int, void **);
+        int  (*valid)(void);
+        const char *name;
+        int priority;
+};
+
+extern const struct raid6_recov_calls raid6_recov_intx1;
+extern const struct raid6_recov_calls raid6_recov_ssse3;
+
 /* Algorithm list */
 extern const struct raid6_calls * const raid6_algos[];
+extern const struct raid6_recov_calls *const raid6_recov_algos[];
 int raid6_select_algo(void);
 
 /* Return values from chk_syndrome */
@@ -111,14 +123,16 @@ int raid6_select_algo(void);
 
 /* Galois field tables */
 extern const u8 raid6_gfmul[256][256] __attribute__((aligned(256)));
+extern const u8 raid6_vgfmul[256][32] __attribute__((aligned(256)));
 extern const u8 raid6_gfexp[256]      __attribute__((aligned(256)));
 extern const u8 raid6_gfinv[256]      __attribute__((aligned(256)));
 extern const u8 raid6_gfexi[256]      __attribute__((aligned(256)));
 
 /* Recovery routines */
-void raid6_2data_recov(int disks, size_t bytes, int faila, int failb,
+extern void (*raid6_2data_recov)(int disks, size_t bytes, int faila, int failb,
                        void **ptrs);
-void raid6_datap_recov(int disks, size_t bytes, int faila, void **ptrs);
+extern void (*raid6_datap_recov)(int disks, size_t bytes, int faila,
+                        void **ptrs);
 void raid6_dual_recov(int disks, size_t bytes, int faila, int failb,
                       void **ptrs);
 
diff --git a/include/linux/ramoops.h b/include/linux/ramoops.h
deleted file mode 100644
index 484fef81cd3a..000000000000
--- a/include/linux/ramoops.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __RAMOOPS_H
-#define __RAMOOPS_H
-
-/*
- * Ramoops platform data
- * @mem_size    memory size for ramoops
- * @mem_address physical memory address to contain ramoops
- */
-
-struct ramoops_platform_data {
-        unsigned long   mem_size;
-        unsigned long   mem_address;
-        unsigned long   record_size;
-        int             dump_oops;
-};
-
-#endif
diff --git a/include/linux/rational.h b/include/linux/rational.h
index 4f532fcd9eea..bfa6a2bcfb32 100644
--- a/include/linux/rational.h
+++ b/include/linux/rational.h
@@ -1,7 +1,7 @@
 /*
  * rational fractions
  *
- * Copyright (C) 2009 emlix GmbH, Oskar Schirmer <os@emlix.com>
+ * Copyright (C) 2009 emlix GmbH, Oskar Schirmer <oskar@scara.com>
  *
  * helper functions when coping with rational numbers,
  * e.g. when calculating optimum numerator/denominator pairs for
diff --git a/include/linux/rculist.h b/include/linux/rculist.h
index d079290843a9..e0f0fab20415 100644
--- a/include/linux/rculist.h
+++ b/include/linux/rculist.h
@@ -30,6 +30,7 @@
  * This is only for internal list manipulation where we know
  * the prev/next entries already!
  */
+#ifndef CONFIG_DEBUG_LIST
 static inline void __list_add_rcu(struct list_head *new,
                 struct list_head *prev, struct list_head *next)
 {
@@ -38,6 +39,10 @@ static inline void __list_add_rcu(struct list_head *new,
         rcu_assign_pointer(list_next_rcu(prev), new);
         next->prev = new;
 }
+#else
+extern void __list_add_rcu(struct list_head *new,
+                struct list_head *prev, struct list_head *next);
+#endif
 
 /**
  * list_add_rcu - add a new entry to rcu-protected list
@@ -108,7 +113,7 @@ static inline void list_add_tail_rcu(struct list_head *new,
  */
 static inline void list_del_rcu(struct list_head *entry)
 {
-        __list_del(entry->prev, entry->next);
+        __list_del_entry(entry);
         entry->prev = LIST_POISON2;
 }
 
@@ -228,18 +233,43 @@ static inline void list_splice_init_rcu(struct list_head *list,
         })
 
 /**
- * list_first_entry_rcu - get the first element from a list
+ * Where are list_empty_rcu() and list_first_entry_rcu()?
+ *
+ * Implementing those functions following their counterparts list_empty() and
+ * list_first_entry() is not advisable because they lead to subtle race
+ * conditions as the following snippet shows:
+ *
+ * if (!list_empty_rcu(mylist)) {
+ *      struct foo *bar = list_first_entry_rcu(mylist, struct foo, list_member);
+ *      do_something(bar);
+ * }
+ *
+ * The list may not be empty when list_empty_rcu checks it, but it may be when
+ * list_first_entry_rcu rereads the ->next pointer.
+ *
+ * Rereading the ->next pointer is not a problem for list_empty() and
+ * list_first_entry() because they would be protected by a lock that blocks
+ * writers.
+ *
+ * See list_first_or_null_rcu for an alternative.
+ */
+
+/**
+ * list_first_or_null_rcu - get the first element from a list
  * @ptr:        the list head to take the element from.
  * @type:       the type of the struct this is embedded in.
  * @member:     the name of the list_struct within the struct.
  *
- * Note, that list is expected to be not empty.
+ * Note that if the list is empty, it returns NULL.
  *
  * This primitive may safely run concurrently with the _rcu list-mutation
  * primitives such as list_add_rcu() as long as it's guarded by rcu_read_lock().
  */
-#define list_first_entry_rcu(ptr, type, member) \
-        list_entry_rcu((ptr)->next, type, member)
+#define list_first_or_null_rcu(ptr, type, member) \
+        ({struct list_head *__ptr = (ptr); \
+          struct list_head __rcu *__next = list_next_rcu(__ptr); \
+          likely(__ptr != __next) ? container_of(__next, type, member) : NULL; \
+        })
 
 /**
  * list_for_each_entry_rcu      -       iterate over rcu list of given type
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index 20fb776a1d4a..26d1a47591f1 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -184,12 +184,14 @@ static inline int rcu_preempt_depth(void)
 /* Internal to kernel */
 extern void rcu_sched_qs(int cpu);
 extern void rcu_bh_qs(int cpu);
+extern void rcu_preempt_note_context_switch(void);
 extern void rcu_check_callbacks(int cpu, int user);
 struct notifier_block;
 extern void rcu_idle_enter(void);
 extern void rcu_idle_exit(void);
 extern void rcu_irq_enter(void);
 extern void rcu_irq_exit(void);
+extern void exit_rcu(void);
 
 /**
  * RCU_NONIDLE - Indicate idle-loop code that needs RCU readers
@@ -922,6 +924,21 @@ void __kfree_rcu(struct rcu_head *head, unsigned long offset)
         kfree_call_rcu(head, (rcu_callback)offset);
 }
 
+/*
+ * Does the specified offset indicate that the corresponding rcu_head
+ * structure can be handled by kfree_rcu()?
+ */
+#define __is_kfree_rcu_offset(offset) ((offset) < 4096)
+
+/*
+ * Helper macro for kfree_rcu() to prevent argument-expansion eyestrain.
+ */
+#define __kfree_rcu(head, offset) \
+        do { \
+                BUILD_BUG_ON(!__is_kfree_rcu_offset(offset)); \
+                call_rcu(head, (void (*)(struct rcu_head *))(unsigned long)(offset)); \
+        } while (0)
+
 /**
  * kfree_rcu() - kfree an object after a grace period.
  * @ptr:        pointer to kfree
@@ -944,6 +961,9 @@ void __kfree_rcu(struct rcu_head *head, unsigned long offset)
  *
  * Note that the allowable offset might decrease in the future, for example,
  * to allow something like kmem_cache_free_rcu().
+ *
+ * The BUILD_BUG_ON check must not involve any function calls, hence the
+ * checks are done in macros here.
  */
 #define kfree_rcu(ptr, rcu_head)                                        \
         __kfree_rcu(&((ptr)->rcu_head), offsetof(typeof(*(ptr)), rcu_head))
diff --git a/include/linux/rcutiny.h b/include/linux/rcutiny.h
index e93df77176d1..adb5e5a38cae 100644
--- a/include/linux/rcutiny.h
+++ b/include/linux/rcutiny.h
@@ -87,14 +87,6 @@ static inline void kfree_call_rcu(struct rcu_head *head,
 
 #ifdef CONFIG_TINY_RCU
 
-static inline void rcu_preempt_note_context_switch(void)
-{
-}
-
-static inline void exit_rcu(void)
-{
-}
-
 static inline int rcu_needs_cpu(int cpu)
 {
         return 0;
@@ -102,8 +94,6 @@ static inline int rcu_needs_cpu(int cpu)
 
 #else /* #ifdef CONFIG_TINY_RCU */
 
-void rcu_preempt_note_context_switch(void);
-extern void exit_rcu(void);
 int rcu_preempt_needs_cpu(void);
 
 static inline int rcu_needs_cpu(int cpu)
@@ -116,7 +106,6 @@ static inline int rcu_needs_cpu(int cpu)
 static inline void rcu_note_context_switch(int cpu)
 {
         rcu_sched_qs(cpu);
-        rcu_preempt_note_context_switch();
 }
 
 /*
diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h
index e8ee5dd0854c..3c6083cde4fc 100644
--- a/include/linux/rcutree.h
+++ b/include/linux/rcutree.h
@@ -45,18 +45,6 @@ static inline void rcu_virt_note_context_switch(int cpu)
         rcu_note_context_switch(cpu);
 }
 
-#ifdef CONFIG_TREE_PREEMPT_RCU
-
-extern void exit_rcu(void);
-
-#else /* #ifdef CONFIG_TREE_PREEMPT_RCU */
-
-static inline void exit_rcu(void)
-{
-}
-
-#endif /* #else #ifdef CONFIG_TREE_PREEMPT_RCU */
-
 extern void synchronize_rcu_bh(void);
 extern void synchronize_sched_expedited(void);
 extern void synchronize_rcu_expedited(void);
@@ -98,13 +86,6 @@ extern void rcu_force_quiescent_state(void);
 extern void rcu_bh_force_quiescent_state(void);
 extern void rcu_sched_force_quiescent_state(void);
 
-/* A context switch is a grace period for RCU-sched and RCU-bh. */
-static inline int rcu_blocking_is_gp(void)
-{
-        might_sleep();  /* Check for RCU read-side critical section. */
-        return num_online_cpus() == 1;
-}
-
 extern void rcu_scheduler_starting(void);
 extern int rcu_scheduler_active __read_mostly;
 
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index a90abb6bfa64..56af22ec9aba 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -46,7 +46,13 @@ struct reg_default {
 /**
  * Configuration for the register map of a device.
  *
+ * @name: Optional name of the regmap. Useful when a device has multiple
+ *        register regions.
+ *
  * @reg_bits: Number of bits in a register address, mandatory.
+ * @reg_stride: The register address stride. Valid register addresses are a
+ *              multiple of this value. If set to 0, a value of 1 will be
+ *              used.
  * @pad_bits: Number of bits of padding between register and value.
  * @val_bits: Number of bits in a register value, mandatory.
  *
@@ -70,6 +76,9 @@ struct reg_default {
  * @write_flag_mask: Mask to be set in the top byte of the register when doing
  *                   a write. If both read_flag_mask and write_flag_mask are
  *                   empty the regmap_bus default masks are used.
+ * @use_single_rw: If set, converts the bulk read and write operations into
+ *                  a series of single read and write operations. This is useful
+ *                  for device that does not support bulk read and write.
  *
  * @cache_type: The actual cache type.
  * @reg_defaults_raw: Power on reset values for registers (for use with
@@ -77,7 +86,10 @@ struct reg_default {
  * @num_reg_defaults_raw: Number of elements in reg_defaults_raw.
  */
 struct regmap_config {
+        const char *name;
+
         int reg_bits;
+        int reg_stride;
         int pad_bits;
         int val_bits;
 
@@ -95,20 +107,25 @@ struct regmap_config {
 
         u8 read_flag_mask;
         u8 write_flag_mask;
+
+        bool use_single_rw;
 };
 
-typedef int (*regmap_hw_write)(struct device *dev, const void *data,
+typedef int (*regmap_hw_write)(void *context, const void *data,
                                size_t count);
-typedef int (*regmap_hw_gather_write)(struct device *dev,
+typedef int (*regmap_hw_gather_write)(void *context,
                                       const void *reg, size_t reg_len,
                                       const void *val, size_t val_len);
-typedef int (*regmap_hw_read)(struct device *dev,
+typedef int (*regmap_hw_read)(void *context,
                               const void *reg_buf, size_t reg_size,
                               void *val_buf, size_t val_size);
+typedef void (*regmap_hw_free_context)(void *context);
 
 /**
  * Description of a hardware bus for the register map infrastructure.
  *
+ * @fast_io: Register IO is fast. Use a spinlock instead of a mutex
+ *           to perform locking.
  * @write: Write operation.
  * @gather_write: Write operation with split register/value, return -ENOTSUPP
  *                if not implemented  on a given device.
@@ -118,31 +135,42 @@ typedef int (*regmap_hw_read)(struct device *dev,
  *                  a read.
  */
 struct regmap_bus {
+        bool fast_io;
         regmap_hw_write write;
         regmap_hw_gather_write gather_write;
         regmap_hw_read read;
+        regmap_hw_free_context free_context;
         u8 read_flag_mask;
 };
 
 struct regmap *regmap_init(struct device *dev,
                            const struct regmap_bus *bus,
+                           void *bus_context,
                            const struct regmap_config *config);
 struct regmap *regmap_init_i2c(struct i2c_client *i2c,
                                const struct regmap_config *config);
 struct regmap *regmap_init_spi(struct spi_device *dev,
                                const struct regmap_config *config);
+struct regmap *regmap_init_mmio(struct device *dev,
+                                void __iomem *regs,
+                                const struct regmap_config *config);
 
 struct regmap *devm_regmap_init(struct device *dev,
                                 const struct regmap_bus *bus,
+                                void *bus_context,
                                 const struct regmap_config *config);
 struct regmap *devm_regmap_init_i2c(struct i2c_client *i2c,
                                     const struct regmap_config *config);
 struct regmap *devm_regmap_init_spi(struct spi_device *dev,
                                     const struct regmap_config *config);
+struct regmap *devm_regmap_init_mmio(struct device *dev,
+                                     void __iomem *regs,
+                                     const struct regmap_config *config);
 
 void regmap_exit(struct regmap *map);
 int regmap_reinit_cache(struct regmap *map,
                         const struct regmap_config *config);
+struct regmap *dev_get_regmap(struct device *dev, const char *name);
 int regmap_write(struct regmap *map, unsigned int reg, unsigned int val);
 int regmap_raw_write(struct regmap *map, unsigned int reg,
                      const void *val, size_t val_len);
@@ -191,6 +219,7 @@ struct regmap_irq {
  * @status_base: Base status register address.
  * @mask_base:   Base mask register address.
  * @ack_base:    Base ack address.  If zero then the chip is clear on read.
+ * @irq_reg_stride:  Stride to use for chips where registers are not contiguous.
  *
  * @num_regs:    Number of registers in each control bank.
  * @irqs:        Descriptors for individual IRQs.  Interrupt numbers are
@@ -203,6 +232,7 @@ struct regmap_irq_chip {
         unsigned int status_base;
         unsigned int mask_base;
         unsigned int ack_base;
+        unsigned int irq_reg_stride;
 
         int num_regs;
 
@@ -217,6 +247,7 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
                         struct regmap_irq_chip_data **data);
 void regmap_del_irq_chip(int irq, struct regmap_irq_chip_data *data);
 int regmap_irq_chip_get_base(struct regmap_irq_chip_data *data);
+int regmap_irq_get_virq(struct regmap_irq_chip_data *data, int irq);
 
 #else
 
@@ -327,6 +358,13 @@ static inline int regmap_register_patch(struct regmap *map,
         return -EINVAL;
 }
 
+static inline struct regmap *dev_get_regmap(struct device *dev,
+                                            const char *name)
+{
+        WARN_ONCE(1, "regmap API is disabled");
+        return NULL;
+}
+
 #endif
 
 #endif
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index fa8b55b8191c..b0432cc2b169 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -19,6 +19,7 @@
 #include <linux/notifier.h>
 #include <linux/regulator/consumer.h>
 
+struct regmap;
 struct regulator_dev;
 struct regulator_init_data;
 
@@ -45,6 +46,7 @@ enum regulator_status {
  *               The driver should select the voltage closest to min_uV.
  * @set_voltage_sel: Set the voltage for the regulator using the specified
  *                   selector.
+ * @map_voltage: Convert a voltage into a selector
  * @get_voltage: Return the currently configured voltage for the regulator.
  * @get_voltage_sel: Return the currently configured voltage selector for the
  *                   regulator.
@@ -90,6 +92,7 @@ struct regulator_ops {
         /* get/set regulator voltage */
         int (*set_voltage) (struct regulator_dev *, int min_uV, int max_uV,
                             unsigned *selector);
+        int (*map_voltage)(struct regulator_dev *, int min_uV, int max_uV);
         int (*set_voltage_sel) (struct regulator_dev *, unsigned selector);
         int (*get_voltage) (struct regulator_dev *);
         int (*get_voltage_sel) (struct regulator_dev *);
@@ -148,19 +151,30 @@ enum regulator_type {
 };
 
 /**
- * struct regulator_desc - Regulator descriptor
+ * struct regulator_desc - Static regulator descriptor
  *
- * Each regulator registered with the core is described with a structure of
- * this type.
+ * Each regulator registered with the core is described with a
+ * structure of this type and a struct regulator_config.  This
+ * structure contains the non-varying parts of the regulator
+ * description.
  *
  * @name: Identifying name for the regulator.
  * @supply_name: Identifying the regulator supply
  * @id: Numerical identifier for the regulator.
- * @n_voltages: Number of selectors available for ops.list_voltage().
  * @ops: Regulator operations table.
  * @irq: Interrupt number for the regulator.
  * @type: Indicates if the regulator is a voltage or current regulator.
  * @owner: Module providing the regulator, used for refcounting.
+ *
+ * @n_voltages: Number of selectors available for ops.list_voltage().
+ *
+ * @min_uV: Voltage given by the lowest selector (if linear mapping)
+ * @uV_step: Voltage increase with each selector (if linear mapping)
+ *
+ * @vsel_reg: Register for selector when using regulator_regmap_X_voltage_
+ * @vsel_mask: Mask for register bitfield used for selector
+ * @enable_reg: Register for control when using regmap enable/disable ops
+ * @enable_mask: Mask for control when using regmap enable/disable ops
  */
 struct regulator_desc {
         const char *name;
@@ -171,6 +185,36 @@ struct regulator_desc {
         int irq;
         enum regulator_type type;
         struct module *owner;
+
+        unsigned int min_uV;
+        unsigned int uV_step;
+
+        unsigned int vsel_reg;
+        unsigned int vsel_mask;
+        unsigned int enable_reg;
+        unsigned int enable_mask;
+};
+
+/**
+ * struct regulator_config - Dynamic regulator descriptor
+ *
+ * Each regulator registered with the core is described with a
+ * structure of this type and a struct regulator_desc.  This structure
+ * contains the runtime variable parts of the regulator description.
+ *
+ * @dev: struct device for the regulator
+ * @init_data: platform provided init data, passed through by driver
+ * @driver_data: private regulator data
+ * @of_node: OpenFirmware node to parse for device tree bindings (may be
+ *           NULL).
+ * @regmap: regmap to use for core regmap helpers
+ */
+struct regulator_config {
+        struct device *dev;
+        const struct regulator_init_data *init_data;
+        void *driver_data;
+        struct device_node *of_node;
+        struct regmap *regmap;
 };
 
 /*
@@ -184,7 +228,7 @@ struct regulator_desc {
  * no other direct access).
  */
 struct regulator_dev {
-        struct regulator_desc *desc;
+        const struct regulator_desc *desc;
         int exclusive;
         u32 use_count;
         u32 open_count;
@@ -201,6 +245,7 @@ struct regulator_dev {
         struct device dev;
         struct regulation_constraints *constraints;
         struct regulator *supply;       /* for tree */
+        struct regmap *regmap;
 
         struct delayed_work disable_work;
         int deferred_disables;
@@ -210,9 +255,9 @@ struct regulator_dev {
         struct dentry *debugfs;
 };
 
-struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
-        struct device *dev, const struct regulator_init_data *init_data,
-        void *driver_data, struct device_node *of_node);
+struct regulator_dev *
+regulator_register(const struct regulator_desc *regulator_desc,
+                   const struct regulator_config *config);
 void regulator_unregister(struct regulator_dev *rdev);
 
 int regulator_notifier_call_chain(struct regulator_dev *rdev,
@@ -224,6 +269,18 @@ int rdev_get_id(struct regulator_dev *rdev);
 
 int regulator_mode_to_status(unsigned int);
 
+int regulator_list_voltage_linear(struct regulator_dev *rdev,
+                                  unsigned int selector);
+int regulator_map_voltage_linear(struct regulator_dev *rdev,
+                                  int min_uV, int max_uV);
+int regulator_map_voltage_iterate(struct regulator_dev *rdev,
+                                  int min_uV, int max_uV);
+int regulator_get_voltage_sel_regmap(struct regulator_dev *rdev);
+int regulator_set_voltage_sel_regmap(struct regulator_dev *rdev, unsigned sel);
+int regulator_is_enabled_regmap(struct regulator_dev *rdev);
+int regulator_enable_regmap(struct regulator_dev *rdev);
+int regulator_disable_regmap(struct regulator_dev *rdev);
+
 void *regulator_get_init_drvdata(struct regulator_init_data *reg_init_data);
 
 #endif
diff --git a/include/linux/regulator/fixed.h b/include/linux/regulator/fixed.h
index 936a7d8c11a9..f83f7440b488 100644
--- a/include/linux/regulator/fixed.h
+++ b/include/linux/regulator/fixed.h
@@ -26,6 +26,12 @@ struct regulator_init_data;
  * @gpio:               GPIO to use for enable control
  *                      set to -EINVAL if not used
  * @startup_delay:      Start-up time in microseconds
+ * @gpio_is_open_drain: Gpio pin is open drain or normal type.
+ *                      If it is open drain type then HIGH will be set
+ *                      through PULL-UP with setting gpio as input
+ *                      and low will be set as gpio-output with driven
+ *                      to low. For non-open-drain case, the gpio will
+ *                      will be in output and drive to low/high accordingly.
  * @enable_high:        Polarity of enable GPIO
  *                      1 = Active high, 0 = Active low
  * @enabled_at_boot:    Whether regulator has been enabled at
@@ -43,6 +49,7 @@ struct fixed_voltage_config {
         int microvolts;
         int gpio;
         unsigned startup_delay;
+        unsigned gpio_is_open_drain:1;
         unsigned enable_high:1;
         unsigned enabled_at_boot:1;
         struct regulator_init_data *init_data;
diff --git a/include/linux/regulator/of_regulator.h b/include/linux/regulator/of_regulator.h
index 769704f296e5..f9217965aaa3 100644
--- a/include/linux/regulator/of_regulator.h
+++ b/include/linux/regulator/of_regulator.h
@@ -6,10 +6,20 @@
 #ifndef __LINUX_OF_REG_H
 #define __LINUX_OF_REG_H
 
+struct of_regulator_match {
+        const char *name;
+        void *driver_data;
+        struct regulator_init_data *init_data;
+        struct device_node *of_node;
+};
+
 #if defined(CONFIG_OF)
 extern struct regulator_init_data
         *of_get_regulator_init_data(struct device *dev,
                                     struct device_node *node);
+extern int of_regulator_match(struct device *dev, struct device_node *node,
+                              struct of_regulator_match *matches,
+                              unsigned int num_matches);
 #else
 static inline struct regulator_init_data
         *of_get_regulator_init_data(struct device *dev,
@@ -17,6 +27,14 @@ static inline struct regulator_init_data
 {
         return NULL;
 }
+
+static inline int of_regulator_match(struct device *dev,
+                                     struct device_node *node,
+                                     struct of_regulator_match *matches,
+                                     unsigned int num_matches)
+{
+        return 0;
+}
 #endif /* CONFIG_OF */
 
 #endif /* __LINUX_OF_REG_H */
diff --git a/include/linux/regulator/tps62360.h b/include/linux/regulator/tps62360.h
index 6a5c1b2c751e..a4c49394c497 100644
--- a/include/linux/regulator/tps62360.h
+++ b/include/linux/regulator/tps62360.h
@@ -26,13 +26,10 @@
 #ifndef __LINUX_REGULATOR_TPS62360_H
 #define __LINUX_REGULATOR_TPS62360_H
 
-#include <linux/regulator/machine.h>
-
 /*
  * struct tps62360_regulator_platform_data - tps62360 regulator platform data.
  *
  * @reg_init_data: The regulator init data.
- * @en_force_pwm: Enable force pwm or not.
  * @en_discharge: Enable discharge the output capacitor via internal
  *                register.
  * @en_internal_pulldn: internal pull down enable or not.
@@ -44,8 +41,7 @@
  * @vsel1_def_state: Default state of vsel1. 1 if it is high else 0.
  */
 struct tps62360_regulator_platform_data {
-        struct regulator_init_data reg_init_data;
-        bool en_force_pwm;
+        struct regulator_init_data *reg_init_data;
         bool en_discharge;
         bool en_internal_pulldn;
         int vsel0_gpio;
diff --git a/include/linux/regulator/tps65090-regulator.h b/include/linux/regulator/tps65090-regulator.h
new file mode 100644
index 000000000000..0fa04b64db3e
--- /dev/null
+++ b/include/linux/regulator/tps65090-regulator.h
@@ -0,0 +1,50 @@
+/*
+ * Regulator driver interface for TI TPS65090 PMIC family
+ *
+ * Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __REGULATOR_TPS65090_H
+#define __REGULATOR_TPS65090_H
+
+#include <linux/regulator/machine.h>
+
+#define tps65090_rails(_name) "tps65090_"#_name
+
+enum {
+        TPS65090_ID_DCDC1,
+        TPS65090_ID_DCDC2,
+        TPS65090_ID_DCDC3,
+        TPS65090_ID_FET1,
+        TPS65090_ID_FET2,
+        TPS65090_ID_FET3,
+        TPS65090_ID_FET4,
+        TPS65090_ID_FET5,
+        TPS65090_ID_FET6,
+        TPS65090_ID_FET7,
+};
+
+/*
+ * struct tps65090_regulator_platform_data
+ *
+ * @regulator: The regulator init data.
+ * @slew_rate_uV_per_us: Slew rate microvolt per microsec.
+ */
+
+struct tps65090_regulator_platform_data {
+        struct regulator_init_data regulator;
+};
+
+#endif  /* __REGULATOR_TPS65090_H */
diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h
index da81af086eaf..7d7fbe2ef782 100644
--- a/include/linux/res_counter.h
+++ b/include/linux/res_counter.h
@@ -116,10 +116,10 @@ void res_counter_init(struct res_counter *counter, struct res_counter *parent);
  */
 
 int __must_check res_counter_charge_locked(struct res_counter *counter,
-                unsigned long val);
+                                           unsigned long val, bool force);
 int __must_check res_counter_charge(struct res_counter *counter,
                 unsigned long val, struct res_counter **limit_fail_at);
-int __must_check res_counter_charge_nofail(struct res_counter *counter,
+int res_counter_charge_nofail(struct res_counter *counter,
                 unsigned long val, struct res_counter **limit_fail_at);
 
 /*
@@ -135,6 +135,9 @@ int __must_check res_counter_charge_nofail(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);
 
+void res_counter_uncharge_until(struct res_counter *counter,
+                                struct res_counter *top,
+                                unsigned long val);
 /**
  * res_counter_margin - calculate chargeable space of a counter
  * @cnt: the counter
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h
index 7be2e88f23fd..6c8835f74f79 100644
--- a/include/linux/ring_buffer.h
+++ b/include/linux/ring_buffer.h
@@ -96,9 +96,11 @@ __ring_buffer_alloc(unsigned long size, unsigned flags, struct lock_class_key *k
         __ring_buffer_alloc((size), (flags), &__key);   \
 })
 
+#define RING_BUFFER_ALL_CPUS -1
+
 void ring_buffer_free(struct ring_buffer *buffer);
 
-int ring_buffer_resize(struct ring_buffer *buffer, unsigned long size);
+int ring_buffer_resize(struct ring_buffer *buffer, unsigned long size, int cpu);
 
 void ring_buffer_change_overwrite(struct ring_buffer *buffer, int val);
 
@@ -129,7 +131,7 @@ ring_buffer_read(struct ring_buffer_iter *iter, u64 *ts);
 void ring_buffer_iter_reset(struct ring_buffer_iter *iter);
 int ring_buffer_iter_empty(struct ring_buffer_iter *iter);
 
-unsigned long ring_buffer_size(struct ring_buffer *buffer);
+unsigned long ring_buffer_size(struct ring_buffer *buffer, int cpu);
 
 void ring_buffer_reset_cpu(struct ring_buffer *buffer, int cpu);
 void ring_buffer_reset(struct ring_buffer *buffer);
diff --git a/include/linux/rio.h b/include/linux/rio.h
index 4d50611112ba..a90ebadd9da0 100644
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
@@ -20,6 +20,9 @@
 #include <linux/errno.h>
 #include <linux/device.h>
 #include <linux/rio_regs.h>
+#ifdef CONFIG_RAPIDIO_DMA_ENGINE
+#include <linux/dmaengine.h>
+#endif
 
 #define RIO_NO_HOPCOUNT         -1
 #define RIO_INVALID_DESTID      0xffff
@@ -254,6 +257,9 @@ struct rio_mport {
         u32 phys_efptr;
         unsigned char name[40];
         void *priv;             /* Master port private data */
+#ifdef CONFIG_RAPIDIO_DMA_ENGINE
+        struct dma_device       dma;
+#endif
 };
 
 /**
@@ -395,6 +401,47 @@ union rio_pw_msg {
         u32 raw[RIO_PW_MSG_SIZE/sizeof(u32)];
 };
 
+#ifdef CONFIG_RAPIDIO_DMA_ENGINE
+
+/**
+ * enum rio_write_type - RIO write transaction types used in DMA transfers
+ *
+ * Note: RapidIO specification defines write (NWRITE) and
+ * write-with-response (NWRITE_R) data transfer operations.
+ * Existing DMA controllers that service RapidIO may use one of these operations
+ * for entire data transfer or their combination with only the last data packet
+ * requires response.
+ */
+enum rio_write_type {
+        RDW_DEFAULT,            /* default method used by DMA driver */
+        RDW_ALL_NWRITE,         /* all packets use NWRITE */
+        RDW_ALL_NWRITE_R,       /* all packets use NWRITE_R */
+        RDW_LAST_NWRITE_R,      /* last packet uses NWRITE_R, others - NWRITE */
+};
+
+struct rio_dma_ext {
+        u16 destid;
+        u64 rio_addr;   /* low 64-bits of 66-bit RapidIO address */
+        u8  rio_addr_u;  /* upper 2-bits of 66-bit RapidIO address */
+        enum rio_write_type wr_type; /* preferred RIO write operation type */
+};
+
+struct rio_dma_data {
+        /* Local data (as scatterlist) */
+        struct scatterlist      *sg;    /* I/O scatter list */
+        unsigned int            sg_len; /* size of scatter list */
+        /* Remote device address (flat buffer) */
+        u64 rio_addr;   /* low 64-bits of 66-bit RapidIO address */
+        u8  rio_addr_u;  /* upper 2-bits of 66-bit RapidIO address */
+        enum rio_write_type wr_type; /* preferred RIO write operation type */
+};
+
+static inline struct rio_mport *dma_to_mport(struct dma_device *ddev)
+{
+        return container_of(ddev, struct rio_mport, dma);
+}
+#endif /* CONFIG_RAPIDIO_DMA_ENGINE */
+
 /* Architecture and hardware-specific functions */
 extern int rio_register_mport(struct rio_mport *);
 extern int rio_open_inb_mbox(struct rio_mport *, void *, int, int);
diff --git a/include/linux/rio_drv.h b/include/linux/rio_drv.h
index 7f07470e1ed9..31ad146be316 100644
--- a/include/linux/rio_drv.h
+++ b/include/linux/rio_drv.h
@@ -377,6 +377,15 @@ void rio_unregister_driver(struct rio_driver *);
 struct rio_dev *rio_dev_get(struct rio_dev *);
 void rio_dev_put(struct rio_dev *);
 
+#ifdef CONFIG_RAPIDIO_DMA_ENGINE
+extern struct dma_chan *rio_request_dma(struct rio_dev *rdev);
+extern void rio_release_dma(struct dma_chan *dchan);
+extern struct dma_async_tx_descriptor *rio_dma_prep_slave_sg(
+                struct rio_dev *rdev, struct dma_chan *dchan,
+                struct rio_dma_data *data,
+                enum dma_transfer_direction direction, unsigned long flags);
+#endif
+
 /**
  * rio_name - Get the unique RIO device identifier
  * @rdev: RIO device
diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index fd07c4542cee..3fce545df394 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -173,8 +173,6 @@ enum ttu_flags {
 };
 #define TTU_ACTION(x) ((x) & TTU_ACTION_MASK)
 
-bool is_vma_temporary_stack(struct vm_area_struct *vma);
-
 int try_to_unmap(struct page *, enum ttu_flags flags);
 int try_to_unmap_one(struct page *, struct vm_area_struct *,
                         unsigned long address, enum ttu_flags flags);
diff --git a/include/linux/rndis.h b/include/linux/rndis.h
new file mode 100644
index 000000000000..0c8dc7195cdb
--- /dev/null
+++ b/include/linux/rndis.h
@@ -0,0 +1,390 @@
+/*
+ * Remote Network Driver Interface Specification (RNDIS)
+ * definitions of the magic numbers used by this protocol
+ */
+
+/* Remote NDIS Versions */
+#define RNDIS_MAJOR_VERSION             0x00000001
+#define RNDIS_MINOR_VERSION             0x00000000
+
+/* Device Flags */
+#define RNDIS_DF_CONNECTIONLESS         0x00000001U
+#define RNDIS_DF_CONNECTION_ORIENTED    0x00000002U
+#define RNDIS_DF_RAW_DATA               0x00000004U
+
+/*
+ * Codes for "msg_type" field of rndis messages;
+ * only the data channel uses packet messages (maybe batched);
+ * everything else goes on the control channel.
+ */
+#define RNDIS_MSG_COMPLETION    0x80000000
+#define RNDIS_MSG_PACKET        0x00000001      /* 1-N packets */
+#define RNDIS_MSG_INIT          0x00000002
+#define RNDIS_MSG_INIT_C        (RNDIS_MSG_INIT|RNDIS_MSG_COMPLETION)
+#define RNDIS_MSG_HALT          0x00000003
+#define RNDIS_MSG_QUERY         0x00000004
+#define RNDIS_MSG_QUERY_C       (RNDIS_MSG_QUERY|RNDIS_MSG_COMPLETION)
+#define RNDIS_MSG_SET           0x00000005
+#define RNDIS_MSG_SET_C         (RNDIS_MSG_SET|RNDIS_MSG_COMPLETION)
+#define RNDIS_MSG_RESET         0x00000006
+#define RNDIS_MSG_RESET_C       (RNDIS_MSG_RESET|RNDIS_MSG_COMPLETION)
+#define RNDIS_MSG_INDICATE      0x00000007
+#define RNDIS_MSG_KEEPALIVE     0x00000008
+#define RNDIS_MSG_KEEPALIVE_C   (RNDIS_MSG_KEEPALIVE|RNDIS_MSG_COMPLETION)
+/*
+ * Reserved message type for private communication between lower-layer host
+ * driver and remote device, if necessary.
+ */
+#define RNDIS_MSG_BUS           0xff000001
+
+/* codes for "status" field of completion messages */
+#define RNDIS_STATUS_SUCCESS                    0x00000000
+#define RNDIS_STATUS_PENDING                    0x00000103
+
+/*  Status codes */
+#define RNDIS_STATUS_NOT_RECOGNIZED             0x00010001
+#define RNDIS_STATUS_NOT_COPIED                 0x00010002
+#define RNDIS_STATUS_NOT_ACCEPTED               0x00010003
+#define RNDIS_STATUS_CALL_ACTIVE                0x00010007
+
+#define RNDIS_STATUS_ONLINE                     0x40010003
+#define RNDIS_STATUS_RESET_START                0x40010004
+#define RNDIS_STATUS_RESET_END                  0x40010005
+#define RNDIS_STATUS_RING_STATUS                0x40010006
+#define RNDIS_STATUS_CLOSED                     0x40010007
+#define RNDIS_STATUS_WAN_LINE_UP                0x40010008
+#define RNDIS_STATUS_WAN_LINE_DOWN              0x40010009
+#define RNDIS_STATUS_WAN_FRAGMENT               0x4001000A
+#define RNDIS_STATUS_MEDIA_CONNECT              0x4001000B
+#define RNDIS_STATUS_MEDIA_DISCONNECT           0x4001000C
+#define RNDIS_STATUS_HARDWARE_LINE_UP           0x4001000D
+#define RNDIS_STATUS_HARDWARE_LINE_DOWN         0x4001000E
+#define RNDIS_STATUS_INTERFACE_UP               0x4001000F
+#define RNDIS_STATUS_INTERFACE_DOWN             0x40010010
+#define RNDIS_STATUS_MEDIA_BUSY                 0x40010011
+#define RNDIS_STATUS_MEDIA_SPECIFIC_INDICATION  0x40010012
+#define RNDIS_STATUS_WW_INDICATION              RDIA_SPECIFIC_INDICATION
+#define RNDIS_STATUS_LINK_SPEED_CHANGE          0x40010013L
+
+#define RNDIS_STATUS_NOT_RESETTABLE             0x80010001
+#define RNDIS_STATUS_SOFT_ERRORS                0x80010003
+#define RNDIS_STATUS_HARD_ERRORS                0x80010004
+#define RNDIS_STATUS_BUFFER_OVERFLOW            0x80000005
+
+#define RNDIS_STATUS_FAILURE                    0xC0000001
+#define RNDIS_STATUS_RESOURCES                  0xC000009A
+#define RNDIS_STATUS_NOT_SUPPORTED              0xc00000BB
+#define RNDIS_STATUS_CLOSING                    0xC0010002
+#define RNDIS_STATUS_BAD_VERSION                0xC0010004
+#define RNDIS_STATUS_BAD_CHARACTERISTICS        0xC0010005
+#define RNDIS_STATUS_ADAPTER_NOT_FOUND          0xC0010006
+#define RNDIS_STATUS_OPEN_FAILED                0xC0010007
+#define RNDIS_STATUS_DEVICE_FAILED              0xC0010008
+#define RNDIS_STATUS_MULTICAST_FULL             0xC0010009
+#define RNDIS_STATUS_MULTICAST_EXISTS           0xC001000A
+#define RNDIS_STATUS_MULTICAST_NOT_FOUND        0xC001000B
+#define RNDIS_STATUS_REQUEST_ABORTED            0xC001000C
+#define RNDIS_STATUS_RESET_IN_PROGRESS          0xC001000D
+#define RNDIS_STATUS_CLOSING_INDICATING         0xC001000E
+#define RNDIS_STATUS_INVALID_PACKET             0xC001000F
+#define RNDIS_STATUS_OPEN_LIST_FULL             0xC0010010
+#define RNDIS_STATUS_ADAPTER_NOT_READY          0xC0010011
+#define RNDIS_STATUS_ADAPTER_NOT_OPEN           0xC0010012
+#define RNDIS_STATUS_NOT_INDICATING             0xC0010013
+#define RNDIS_STATUS_INVALID_LENGTH             0xC0010014
+#define RNDIS_STATUS_INVALID_DATA               0xC0010015
+#define RNDIS_STATUS_BUFFER_TOO_SHORT           0xC0010016
+#define RNDIS_STATUS_INVALID_OID                0xC0010017
+#define RNDIS_STATUS_ADAPTER_REMOVED            0xC0010018
+#define RNDIS_STATUS_UNSUPPORTED_MEDIA          0xC0010019
+#define RNDIS_STATUS_GROUP_ADDRESS_IN_USE       0xC001001A
+#define RNDIS_STATUS_FILE_NOT_FOUND             0xC001001B
+#define RNDIS_STATUS_ERROR_READING_FILE         0xC001001C
+#define RNDIS_STATUS_ALREADY_MAPPED             0xC001001D
+#define RNDIS_STATUS_RESOURCE_CONFLICT          0xC001001E
+#define RNDIS_STATUS_NO_CABLE                   0xC001001F
+
+#define RNDIS_STATUS_INVALID_SAP                0xC0010020
+#define RNDIS_STATUS_SAP_IN_USE                 0xC0010021
+#define RNDIS_STATUS_INVALID_ADDRESS            0xC0010022
+#define RNDIS_STATUS_VC_NOT_ACTIVATED           0xC0010023
+#define RNDIS_STATUS_DEST_OUT_OF_ORDER          0xC0010024
+#define RNDIS_STATUS_VC_NOT_AVAILABLE           0xC0010025
+#define RNDIS_STATUS_CELLRATE_NOT_AVAILABLE     0xC0010026
+#define RNDIS_STATUS_INCOMPATABLE_QOS           0xC0010027
+#define RNDIS_STATUS_AAL_PARAMS_UNSUPPORTED     0xC0010028
+#define RNDIS_STATUS_NO_ROUTE_TO_DESTINATION    0xC0010029
+
+#define RNDIS_STATUS_TOKEN_RING_OPEN_ERROR      0xC0011000
+
+/* codes for RNDIS_OID_GEN_PHYSICAL_MEDIUM */
+#define RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED       0x00000000
+#define RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN      0x00000001
+#define RNDIS_PHYSICAL_MEDIUM_CABLE_MODEM       0x00000002
+#define RNDIS_PHYSICAL_MEDIUM_PHONE_LINE        0x00000003
+#define RNDIS_PHYSICAL_MEDIUM_POWER_LINE        0x00000004
+#define RNDIS_PHYSICAL_MEDIUM_DSL               0x00000005
+#define RNDIS_PHYSICAL_MEDIUM_FIBRE_CHANNEL     0x00000006
+#define RNDIS_PHYSICAL_MEDIUM_1394              0x00000007
+#define RNDIS_PHYSICAL_MEDIUM_WIRELESS_WAN      0x00000008
+#define RNDIS_PHYSICAL_MEDIUM_MAX               0x00000009
+
+/*  Remote NDIS medium types. */
+#define RNDIS_MEDIUM_UNSPECIFIED                0x00000000
+#define RNDIS_MEDIUM_802_3                      0x00000000
+#define RNDIS_MEDIUM_802_5                      0x00000001
+#define RNDIS_MEDIUM_FDDI                       0x00000002
+#define RNDIS_MEDIUM_WAN                        0x00000003
+#define RNDIS_MEDIUM_LOCAL_TALK                 0x00000004
+#define RNDIS_MEDIUM_ARCNET_RAW                 0x00000006
+#define RNDIS_MEDIUM_ARCNET_878_2               0x00000007
+#define RNDIS_MEDIUM_ATM                        0x00000008
+#define RNDIS_MEDIUM_WIRELESS_LAN               0x00000009
+#define RNDIS_MEDIUM_IRDA                       0x0000000A
+#define RNDIS_MEDIUM_BPC                        0x0000000B
+#define RNDIS_MEDIUM_CO_WAN                     0x0000000C
+#define RNDIS_MEDIUM_1394                       0x0000000D
+/* Not a real medium, defined as an upper-bound */
+#define RNDIS_MEDIUM_MAX                        0x0000000E
+
+/* Remote NDIS medium connection states. */
+#define RNDIS_MEDIA_STATE_CONNECTED             0x00000000
+#define RNDIS_MEDIA_STATE_DISCONNECTED          0x00000001
+
+/* packet filter bits used by RNDIS_OID_GEN_CURRENT_PACKET_FILTER */
+#define RNDIS_PACKET_TYPE_DIRECTED              0x00000001
+#define RNDIS_PACKET_TYPE_MULTICAST             0x00000002
+#define RNDIS_PACKET_TYPE_ALL_MULTICAST         0x00000004
+#define RNDIS_PACKET_TYPE_BROADCAST             0x00000008
+#define RNDIS_PACKET_TYPE_SOURCE_ROUTING        0x00000010
+#define RNDIS_PACKET_TYPE_PROMISCUOUS           0x00000020
+#define RNDIS_PACKET_TYPE_SMT                   0x00000040
+#define RNDIS_PACKET_TYPE_ALL_LOCAL             0x00000080
+#define RNDIS_PACKET_TYPE_GROUP                 0x00001000
+#define RNDIS_PACKET_TYPE_ALL_FUNCTIONAL        0x00002000
+#define RNDIS_PACKET_TYPE_FUNCTIONAL            0x00004000
+#define RNDIS_PACKET_TYPE_MAC_FRAME             0x00008000
+
+/* RNDIS_OID_GEN_MINIPORT_INFO constants */
+#define RNDIS_MINIPORT_BUS_MASTER                       0x00000001
+#define RNDIS_MINIPORT_WDM_DRIVER                       0x00000002
+#define RNDIS_MINIPORT_SG_LIST                          0x00000004
+#define RNDIS_MINIPORT_SUPPORTS_MEDIA_QUERY             0x00000008
+#define RNDIS_MINIPORT_INDICATES_PACKETS                0x00000010
+#define RNDIS_MINIPORT_IGNORE_PACKET_QUEUE              0x00000020
+#define RNDIS_MINIPORT_IGNORE_REQUEST_QUEUE             0x00000040
+#define RNDIS_MINIPORT_IGNORE_TOKEN_RING_ERRORS         0x00000080
+#define RNDIS_MINIPORT_INTERMEDIATE_DRIVER              0x00000100
+#define RNDIS_MINIPORT_IS_NDIS_5                        0x00000200
+#define RNDIS_MINIPORT_IS_CO                            0x00000400
+#define RNDIS_MINIPORT_DESERIALIZE                      0x00000800
+#define RNDIS_MINIPORT_REQUIRES_MEDIA_POLLING           0x00001000
+#define RNDIS_MINIPORT_SUPPORTS_MEDIA_SENSE             0x00002000
+#define RNDIS_MINIPORT_NETBOOT_CARD                     0x00004000
+#define RNDIS_MINIPORT_PM_SUPPORTED                     0x00008000
+#define RNDIS_MINIPORT_SUPPORTS_MAC_ADDRESS_OVERWRITE   0x00010000
+#define RNDIS_MINIPORT_USES_SAFE_BUFFER_APIS            0x00020000
+#define RNDIS_MINIPORT_HIDDEN                           0x00040000
+#define RNDIS_MINIPORT_SWENUM                           0x00080000
+#define RNDIS_MINIPORT_SURPRISE_REMOVE_OK               0x00100000
+#define RNDIS_MINIPORT_NO_HALT_ON_SUSPEND               0x00200000
+#define RNDIS_MINIPORT_HARDWARE_DEVICE                  0x00400000
+#define RNDIS_MINIPORT_SUPPORTS_CANCEL_SEND_PACKETS     0x00800000
+#define RNDIS_MINIPORT_64BITS_DMA                       0x01000000
+
+#define RNDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA            0x00000001
+#define RNDIS_MAC_OPTION_RECEIVE_SERIALIZED             0x00000002
+#define RNDIS_MAC_OPTION_TRANSFERS_NOT_PEND             0x00000004
+#define RNDIS_MAC_OPTION_NO_LOOPBACK                    0x00000008
+#define RNDIS_MAC_OPTION_FULL_DUPLEX                    0x00000010
+#define RNDIS_MAC_OPTION_EOTX_INDICATION                0x00000020
+#define RNDIS_MAC_OPTION_8021P_PRIORITY                 0x00000040
+#define RNDIS_MAC_OPTION_RESERVED                       0x80000000
+
+/* Object Identifiers used by NdisRequest Query/Set Information */
+/* General (Required) Objects */
+#define RNDIS_OID_GEN_SUPPORTED_LIST            0x00010101
+#define RNDIS_OID_GEN_HARDWARE_STATUS           0x00010102
+#define RNDIS_OID_GEN_MEDIA_SUPPORTED           0x00010103
+#define RNDIS_OID_GEN_MEDIA_IN_USE              0x00010104
+#define RNDIS_OID_GEN_MAXIMUM_LOOKAHEAD         0x00010105
+#define RNDIS_OID_GEN_MAXIMUM_FRAME_SIZE        0x00010106
+#define RNDIS_OID_GEN_LINK_SPEED                0x00010107
+#define RNDIS_OID_GEN_TRANSMIT_BUFFER_SPACE     0x00010108
+#define RNDIS_OID_GEN_RECEIVE_BUFFER_SPACE      0x00010109
+#define RNDIS_OID_GEN_TRANSMIT_BLOCK_SIZE       0x0001010A
+#define RNDIS_OID_GEN_RECEIVE_BLOCK_SIZE        0x0001010B
+#define RNDIS_OID_GEN_VENDOR_ID                 0x0001010C
+#define RNDIS_OID_GEN_VENDOR_DESCRIPTION        0x0001010D
+#define RNDIS_OID_GEN_CURRENT_PACKET_FILTER     0x0001010E
+#define RNDIS_OID_GEN_CURRENT_LOOKAHEAD         0x0001010F
+#define RNDIS_OID_GEN_DRIVER_VERSION            0x00010110
+#define RNDIS_OID_GEN_MAXIMUM_TOTAL_SIZE        0x00010111
+#define RNDIS_OID_GEN_PROTOCOL_OPTIONS          0x00010112
+#define RNDIS_OID_GEN_MAC_OPTIONS               0x00010113
+#define RNDIS_OID_GEN_MEDIA_CONNECT_STATUS      0x00010114
+#define RNDIS_OID_GEN_MAXIMUM_SEND_PACKETS      0x00010115
+#define RNDIS_OID_GEN_VENDOR_DRIVER_VERSION     0x00010116
+#define RNDIS_OID_GEN_SUPPORTED_GUIDS           0x00010117
+#define RNDIS_OID_GEN_NETWORK_LAYER_ADDRESSES   0x00010118
+#define RNDIS_OID_GEN_TRANSPORT_HEADER_OFFSET   0x00010119
+#define RNDIS_OID_GEN_PHYSICAL_MEDIUM           0x00010202
+#define RNDIS_OID_GEN_MACHINE_NAME              0x0001021A
+#define RNDIS_OID_GEN_RNDIS_CONFIG_PARAMETER    0x0001021B
+#define RNDIS_OID_GEN_VLAN_ID                   0x0001021C
+
+/* Optional OIDs */
+#define RNDIS_OID_GEN_MEDIA_CAPABILITIES        0x00010201
+
+/* Required statistics OIDs */
+#define RNDIS_OID_GEN_XMIT_OK                   0x00020101
+#define RNDIS_OID_GEN_RCV_OK                    0x00020102
+#define RNDIS_OID_GEN_XMIT_ERROR                0x00020103
+#define RNDIS_OID_GEN_RCV_ERROR                 0x00020104
+#define RNDIS_OID_GEN_RCV_NO_BUFFER             0x00020105
+
+/* Optional statistics OIDs */
+#define RNDIS_OID_GEN_DIRECTED_BYTES_XMIT       0x00020201
+#define RNDIS_OID_GEN_DIRECTED_FRAMES_XMIT      0x00020202
+#define RNDIS_OID_GEN_MULTICAST_BYTES_XMIT      0x00020203
+#define RNDIS_OID_GEN_MULTICAST_FRAMES_XMIT     0x00020204
+#define RNDIS_OID_GEN_BROADCAST_BYTES_XMIT      0x00020205
+#define RNDIS_OID_GEN_BROADCAST_FRAMES_XMIT     0x00020206
+#define RNDIS_OID_GEN_DIRECTED_BYTES_RCV        0x00020207
+#define RNDIS_OID_GEN_DIRECTED_FRAMES_RCV       0x00020208
+#define RNDIS_OID_GEN_MULTICAST_BYTES_RCV       0x00020209
+#define RNDIS_OID_GEN_MULTICAST_FRAMES_RCV      0x0002020A
+#define RNDIS_OID_GEN_BROADCAST_BYTES_RCV       0x0002020B
+#define RNDIS_OID_GEN_BROADCAST_FRAMES_RCV      0x0002020C
+
+#define RNDIS_OID_GEN_RCV_CRC_ERROR             0x0002020D
+#define RNDIS_OID_GEN_TRANSMIT_QUEUE_LENGTH     0x0002020E
+
+#define RNDIS_OID_GEN_GET_TIME_CAPS             0x0002020F
+#define RNDIS_OID_GEN_GET_NETCARD_TIME          0x00020210
+
+#define RNDIS_OID_GEN_NETCARD_LOAD              0x00020211
+#define RNDIS_OID_GEN_DEVICE_PROFILE            0x00020212
+#define RNDIS_OID_GEN_INIT_TIME_MS              0x00020213
+#define RNDIS_OID_GEN_RESET_COUNTS              0x00020214
+#define RNDIS_OID_GEN_MEDIA_SENSE_COUNTS        0x00020215
+#define RNDIS_OID_GEN_FRIENDLY_NAME             0x00020216
+#define RNDIS_OID_GEN_MINIPORT_INFO             0x00020217
+#define RNDIS_OID_GEN_RESET_VERIFY_PARAMETERS   0x00020218
+
+/* These are connection-oriented general OIDs. */
+/* These replace the above OIDs for connection-oriented media. */
+#define RNDIS_OID_GEN_CO_SUPPORTED_LIST         0x00010101
+#define RNDIS_OID_GEN_CO_HARDWARE_STATUS        0x00010102
+#define RNDIS_OID_GEN_CO_MEDIA_SUPPORTED        0x00010103
+#define RNDIS_OID_GEN_CO_MEDIA_IN_USE           0x00010104
+#define RNDIS_OID_GEN_CO_LINK_SPEED             0x00010105
+#define RNDIS_OID_GEN_CO_VENDOR_ID              0x00010106
+#define RNDIS_OID_GEN_CO_VENDOR_DESCRIPTION     0x00010107
+#define RNDIS_OID_GEN_CO_DRIVER_VERSION         0x00010108
+#define RNDIS_OID_GEN_CO_PROTOCOL_OPTIONS       0x00010109
+#define RNDIS_OID_GEN_CO_MAC_OPTIONS            0x0001010A
+#define RNDIS_OID_GEN_CO_MEDIA_CONNECT_STATUS   0x0001010B
+#define RNDIS_OID_GEN_CO_VENDOR_DRIVER_VERSION  0x0001010C
+#define RNDIS_OID_GEN_CO_MINIMUM_LINK_SPEED     0x0001010D
+
+#define RNDIS_OID_GEN_CO_GET_TIME_CAPS          0x00010201
+#define RNDIS_OID_GEN_CO_GET_NETCARD_TIME       0x00010202
+
+/* These are connection-oriented statistics OIDs. */
+#define RNDIS_OID_GEN_CO_XMIT_PDUS_OK           0x00020101
+#define RNDIS_OID_GEN_CO_RCV_PDUS_OK            0x00020102
+#define RNDIS_OID_GEN_CO_XMIT_PDUS_ERROR        0x00020103
+#define RNDIS_OID_GEN_CO_RCV_PDUS_ERROR         0x00020104
+#define RNDIS_OID_GEN_CO_RCV_PDUS_NO_BUFFER     0x00020105
+
+
+#define RNDIS_OID_GEN_CO_RCV_CRC_ERROR          0x00020201
+#define RNDIS_OID_GEN_CO_TRANSMIT_QUEUE_LENGTH  0x00020202
+#define RNDIS_OID_GEN_CO_BYTES_XMIT             0x00020203
+#define RNDIS_OID_GEN_CO_BYTES_RCV              0x00020204
+#define RNDIS_OID_GEN_CO_BYTES_XMIT_OUTSTANDING 0x00020205
+#define RNDIS_OID_GEN_CO_NETCARD_LOAD           0x00020206
+
+/* These are objects for Connection-oriented media call-managers. */
+#define RNDIS_OID_CO_ADD_PVC                    0xFF000001
+#define RNDIS_OID_CO_DELETE_PVC                 0xFF000002
+#define RNDIS_OID_CO_GET_CALL_INFORMATION       0xFF000003
+#define RNDIS_OID_CO_ADD_ADDRESS                0xFF000004
+#define RNDIS_OID_CO_DELETE_ADDRESS             0xFF000005
+#define RNDIS_OID_CO_GET_ADDRESSES              0xFF000006
+#define RNDIS_OID_CO_ADDRESS_CHANGE             0xFF000007
+#define RNDIS_OID_CO_SIGNALING_ENABLED          0xFF000008
+#define RNDIS_OID_CO_SIGNALING_DISABLED         0xFF000009
+
+/* 802.3 Objects (Ethernet) */
+#define RNDIS_OID_802_3_PERMANENT_ADDRESS       0x01010101
+#define RNDIS_OID_802_3_CURRENT_ADDRESS         0x01010102
+#define RNDIS_OID_802_3_MULTICAST_LIST          0x01010103
+#define RNDIS_OID_802_3_MAXIMUM_LIST_SIZE       0x01010104
+#define RNDIS_OID_802_3_MAC_OPTIONS             0x01010105
+
+#define RNDIS_802_3_MAC_OPTION_PRIORITY         0x00000001
+
+#define RNDIS_OID_802_3_RCV_ERROR_ALIGNMENT     0x01020101
+#define RNDIS_OID_802_3_XMIT_ONE_COLLISION      0x01020102
+#define RNDIS_OID_802_3_XMIT_MORE_COLLISIONS    0x01020103
+
+#define RNDIS_OID_802_3_XMIT_DEFERRED           0x01020201
+#define RNDIS_OID_802_3_XMIT_MAX_COLLISIONS     0x01020202
+#define RNDIS_OID_802_3_RCV_OVERRUN             0x01020203
+#define RNDIS_OID_802_3_XMIT_UNDERRUN           0x01020204
+#define RNDIS_OID_802_3_XMIT_HEARTBEAT_FAILURE  0x01020205
+#define RNDIS_OID_802_3_XMIT_TIMES_CRS_LOST     0x01020206
+#define RNDIS_OID_802_3_XMIT_LATE_COLLISIONS    0x01020207
+
+#define RNDIS_OID_802_11_BSSID                          0x0d010101
+#define RNDIS_OID_802_11_SSID                           0x0d010102
+#define RNDIS_OID_802_11_INFRASTRUCTURE_MODE            0x0d010108
+#define RNDIS_OID_802_11_ADD_WEP                        0x0d010113
+#define RNDIS_OID_802_11_REMOVE_WEP                     0x0d010114
+#define RNDIS_OID_802_11_DISASSOCIATE                   0x0d010115
+#define RNDIS_OID_802_11_AUTHENTICATION_MODE            0x0d010118
+#define RNDIS_OID_802_11_PRIVACY_FILTER                 0x0d010119
+#define RNDIS_OID_802_11_BSSID_LIST_SCAN                0x0d01011a
+#define RNDIS_OID_802_11_ENCRYPTION_STATUS              0x0d01011b
+#define RNDIS_OID_802_11_ADD_KEY                        0x0d01011d
+#define RNDIS_OID_802_11_REMOVE_KEY                     0x0d01011e
+#define RNDIS_OID_802_11_ASSOCIATION_INFORMATION        0x0d01011f
+#define RNDIS_OID_802_11_CAPABILITY                     0x0d010122
+#define RNDIS_OID_802_11_PMKID                          0x0d010123
+#define RNDIS_OID_802_11_NETWORK_TYPES_SUPPORTED        0x0d010203
+#define RNDIS_OID_802_11_NETWORK_TYPE_IN_USE            0x0d010204
+#define RNDIS_OID_802_11_TX_POWER_LEVEL                 0x0d010205
+#define RNDIS_OID_802_11_RSSI                           0x0d010206
+#define RNDIS_OID_802_11_RSSI_TRIGGER                   0x0d010207
+#define RNDIS_OID_802_11_FRAGMENTATION_THRESHOLD        0x0d010209
+#define RNDIS_OID_802_11_RTS_THRESHOLD                  0x0d01020a
+#define RNDIS_OID_802_11_SUPPORTED_RATES                0x0d01020e
+#define RNDIS_OID_802_11_CONFIGURATION                  0x0d010211
+#define RNDIS_OID_802_11_POWER_MODE                     0x0d010216
+#define RNDIS_OID_802_11_BSSID_LIST                     0x0d010217
+
+/* Plug and Play capabilities */
+#define RNDIS_OID_PNP_CAPABILITIES              0xFD010100
+#define RNDIS_OID_PNP_SET_POWER                 0xFD010101
+#define RNDIS_OID_PNP_QUERY_POWER               0xFD010102
+#define RNDIS_OID_PNP_ADD_WAKE_UP_PATTERN       0xFD010103
+#define RNDIS_OID_PNP_REMOVE_WAKE_UP_PATTERN    0xFD010104
+#define RNDIS_OID_PNP_ENABLE_WAKE_UP            0xFD010106
+
+/* RNDIS_PNP_CAPABILITIES.Flags constants */
+#define RNDIS_DEVICE_WAKE_UP_ENABLE                     0x00000001
+#define RNDIS_DEVICE_WAKE_ON_PATTERN_MATCH_ENABLE       0x00000002
+#define RNDIS_DEVICE_WAKE_ON_MAGIC_PACKET_ENABLE        0x00000004
+
+#define REMOTE_CONDIS_MP_CREATE_VC_MSG          0x00008001
+#define REMOTE_CONDIS_MP_DELETE_VC_MSG          0x00008002
+#define REMOTE_CONDIS_MP_ACTIVATE_VC_MSG        0x00008005
+#define REMOTE_CONDIS_MP_DEACTIVATE_VC_MSG      0x00008006
+#define REMOTE_CONDIS_INDICATE_STATUS_MSG       0x00008007
+
+#define REMOTE_CONDIS_MP_CREATE_VC_CMPLT        0x80008001
+#define REMOTE_CONDIS_MP_DELETE_VC_CMPLT        0x80008002
+#define REMOTE_CONDIS_MP_ACTIVATE_VC_CMPLT      0x80008005
+#define REMOTE_CONDIS_MP_DEACTIVATE_VC_CMPLT    0x80008006
diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index fcabfb4873c8..f071b3922c67 100644
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -91,6 +91,9 @@ struct rtc_pll_info {
 #define RTC_PLL_GET     _IOR('p', 0x11, struct rtc_pll_info)  /* Get PLL correction */
 #define RTC_PLL_SET     _IOW('p', 0x12, struct rtc_pll_info)  /* Set PLL correction */
 
+#define RTC_VL_READ     _IOR('p', 0x13, int)    /* Voltage low detector */
+#define RTC_VL_CLR      _IO('p', 0x14)          /* Clear voltage low information */
+
 /* interrupt flags */
 #define RTC_IRQF 0x80   /* Any of the following is active */
 #define RTC_PF 0x40     /* Periodic interrupt */
diff --git a/include/linux/rtc/ds1307.h b/include/linux/rtc/ds1307.h
new file mode 100644
index 000000000000..291b1c490367
--- /dev/null
+++ b/include/linux/rtc/ds1307.h
@@ -0,0 +1,22 @@
+/*
+ * ds1307.h - platform_data for the ds1307 (and variants) rtc driver
+ * (C) Copyright 2012 by Wolfram Sang, Pengutronix e.K.
+ * same license as the driver
+ */
+
+#ifndef _LINUX_DS1307_H
+#define _LINUX_DS1307_H
+
+#include <linux/types.h>
+
+#define DS1307_TRICKLE_CHARGER_250_OHM  0x01
+#define DS1307_TRICKLE_CHARGER_2K_OHM   0x02
+#define DS1307_TRICKLE_CHARGER_4K_OHM   0x03
+#define DS1307_TRICKLE_CHARGER_NO_DIODE 0x04
+#define DS1307_TRICKLE_CHARGER_DIODE    0x08
+
+struct ds1307_platform_data {
+        u8 trickle_charger_setup;
+};
+
+#endif /* _LINUX_DS1307_H */
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 577592ea0ea0..2c1de8982c85 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -801,6 +801,10 @@ rtattr_failure:
         return table;
 }
 
+extern int ndo_dflt_fdb_dump(struct sk_buff *skb,
+                             struct netlink_callback *cb,
+                             struct net_device *dev,
+                             int idx);
 #endif /* __KERNEL__ */
 
 
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 81a173c0897d..f34437e835a7 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -90,6 +90,7 @@ struct sched_param {
 #include <linux/latencytop.h>
 #include <linux/cred.h>
 #include <linux/llist.h>
+#include <linux/uidgid.h>
 
 #include <asm/processor.h>
 
@@ -728,8 +729,7 @@ struct user_struct {
 
         /* Hash table maintenance information */
         struct hlist_node uidhash_node;
-        uid_t uid;
-        struct user_namespace *user_ns;
+        kuid_t uid;
 
 #ifdef CONFIG_PERF_EVENTS
         atomic_long_t locked_vm;
@@ -738,7 +738,7 @@ struct user_struct {
 
 extern int uids_sysfs_init(void);
 
-extern struct user_struct *find_user(uid_t);
+extern struct user_struct *find_user(kuid_t);
 
 extern struct user_struct root_user;
 #define INIT_USER (&root_user)
@@ -855,61 +855,14 @@ enum cpu_idle_type {
 #define SD_WAKE_AFFINE          0x0020  /* Wake task to waking CPU */
 #define SD_PREFER_LOCAL         0x0040  /* Prefer to keep tasks local to this domain */
 #define SD_SHARE_CPUPOWER       0x0080  /* Domain members share cpu power */
-#define SD_POWERSAVINGS_BALANCE 0x0100  /* Balance for power savings */
 #define SD_SHARE_PKG_RESOURCES  0x0200  /* Domain members share cpu pkg resources */
 #define SD_SERIALIZE            0x0400  /* Only a single load balancing instance */
 #define SD_ASYM_PACKING         0x0800  /* Place busy groups earlier in the domain */
 #define SD_PREFER_SIBLING       0x1000  /* Prefer to place tasks in a sibling domain */
 #define SD_OVERLAP              0x2000  /* sched_domains of this level overlap */
 
-enum powersavings_balance_level {
-        POWERSAVINGS_BALANCE_NONE = 0,  /* No power saving load balance */
-        POWERSAVINGS_BALANCE_BASIC,     /* Fill one thread/core/package
-                                         * first for long running threads
-                                         */
-        POWERSAVINGS_BALANCE_WAKEUP,    /* Also bias task wakeups to semi-idle
-                                         * cpu package for power savings
-                                         */
-        MAX_POWERSAVINGS_BALANCE_LEVELS
-};
-
-extern int sched_mc_power_savings, sched_smt_power_savings;
-
-static inline int sd_balance_for_mc_power(void)
-{
-        if (sched_smt_power_savings)
-                return SD_POWERSAVINGS_BALANCE;
-
-        if (!sched_mc_power_savings)
-                return SD_PREFER_SIBLING;
-
-        return 0;
-}
-
-static inline int sd_balance_for_package_power(void)
-{
-        if (sched_mc_power_savings | sched_smt_power_savings)
-                return SD_POWERSAVINGS_BALANCE;
-
-        return SD_PREFER_SIBLING;
-}
-
 extern int __weak arch_sd_sibiling_asym_packing(void);
 
-/*
- * Optimise SD flags for power savings:
- * SD_BALANCE_NEWIDLE helps aggressive task consolidation and power savings.
- * Keep default SD flags if sched_{smt,mc}_power_saving=0
- */
-
-static inline int sd_power_saving_flags(void)
-{
-        if (sched_mc_power_savings | sched_smt_power_savings)
-                return SD_BALANCE_NEWIDLE;
-
-        return 0;
-}
-
 struct sched_group_power {
         atomic_t ref;
         /*
@@ -1341,16 +1294,13 @@ struct task_struct {
                                  * execve */
         unsigned in_iowait:1;
 
+        /* task may not gain privileges */
+        unsigned no_new_privs:1;
 
         /* Revert to default priority/policy when forking */
         unsigned sched_reset_on_fork:1;
         unsigned sched_contributes_to_load:1;
 
-#ifdef CONFIG_GENERIC_HARDIRQS
-        /* IRQ handler threads */
-        unsigned irq_thread:1;
-#endif
-
         pid_t pid;
         pid_t tgid;
 
@@ -1358,10 +1308,9 @@ struct task_struct {
         /* Canary value for the -fstack-protector gcc feature */
         unsigned long stack_canary;
 #endif
-
-        /* 
+        /*
          * pointers to (original) parent process, youngest child, younger sibling,
-         * older sibling, respectively.  (p->father can be replaced with 
+         * older sibling, respectively.  (p->father can be replaced with
          * p->real_parent->pid)
          */
         struct task_struct __rcu *real_parent; /* real parent process */
@@ -1408,8 +1357,6 @@ struct task_struct {
                                          * credentials (COW) */
         const struct cred __rcu *cred;  /* effective (overridable) subjective task
                                          * credentials (COW) */
-        struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
-
         char comm[TASK_COMM_LEN]; /* executable name excluding path
                                      - access with [gs]et_task_comm (which lock
                                        it with task_lock())
@@ -1445,12 +1392,14 @@ struct task_struct {
         int (*notifier)(void *priv);
         void *notifier_data;
         sigset_t *notifier_mask;
+        struct hlist_head task_works;
+
         struct audit_context *audit_context;
 #ifdef CONFIG_AUDITSYSCALL
         uid_t loginuid;
         unsigned int sessionid;
 #endif
-        seccomp_t seccomp;
+        struct seccomp seccomp;
 
 /* Thread group tracking */
         u32 parent_exec_id;
@@ -1617,6 +1566,10 @@ struct task_struct {
 #ifdef CONFIG_HAVE_HW_BREAKPOINT
         atomic_t ptrace_bp_refcnt;
 #endif
+#ifdef CONFIG_UPROBES
+        struct uprobe_task *utask;
+        int uprobe_srcu_id;
+#endif
 };
 
 /* Future-safe accessor for struct task_struct's cpus_allowed. */
@@ -1905,12 +1858,22 @@ static inline void rcu_copy_process(struct task_struct *p)
         INIT_LIST_HEAD(&p->rcu_node_entry);
 }
 
+static inline void rcu_switch_from(struct task_struct *prev)
+{
+        if (prev->rcu_read_lock_nesting != 0)
+                rcu_preempt_note_context_switch();
+}
+
 #else
 
 static inline void rcu_copy_process(struct task_struct *p)
 {
 }
 
+static inline void rcu_switch_from(struct task_struct *prev)
+{
+}
+
 #endif
 
 #ifdef CONFIG_SMP
@@ -1950,7 +1913,7 @@ static inline int set_cpus_allowed(struct task_struct *p, cpumask_t new_mask)
  */
 extern unsigned long long notrace sched_clock(void);
 /*
- * See the comment in kernel/sched_clock.c
+ * See the comment in kernel/sched/clock.c
  */
 extern u64 cpu_clock(int cpu);
 extern u64 local_clock(void);
@@ -2177,14 +2140,13 @@ extern struct task_struct *find_task_by_pid_ns(pid_t nr,
 extern void __set_special_pids(struct pid *pid);
 
 /* per-UID process charging. */
-extern struct user_struct * alloc_uid(struct user_namespace *, uid_t);
+extern struct user_struct * alloc_uid(kuid_t);
 static inline struct user_struct *get_uid(struct user_struct *u)
 {
         atomic_inc(&u->__count);
         return u;
 }
 extern void free_uid(struct user_struct *);
-extern void release_uids(struct user_namespace *ns);
 
 #include <asm/current.h>
 
@@ -2245,6 +2207,20 @@ extern int send_sigqueue(struct sigqueue *,  struct task_struct *, int group);
 extern int do_sigaction(int, struct k_sigaction *, struct k_sigaction *);
 extern int do_sigaltstack(const stack_t __user *, stack_t __user *, unsigned long);
 
+static inline void restore_saved_sigmask(void)
+{
+        if (test_and_clear_restore_sigmask())
+                __set_current_blocked(&current->saved_sigmask);
+}
+
+static inline sigset_t *sigmask_to_save(void)
+{
+        sigset_t *res = &current->blocked;
+        if (unlikely(test_restore_sigmask()))
+                res = &current->saved_sigmask;
+        return res;
+}
+
 static inline int kill_cad_pid(int sig, int priv)
 {
         return kill_pid(cad_pid, sig, priv);
diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h
index cc7a4e9cc7ad..84f6320da50f 100644
--- a/include/linux/seccomp.h
+++ b/include/linux/seccomp.h
@@ -1,25 +1,90 @@
 #ifndef _LINUX_SECCOMP_H
 #define _LINUX_SECCOMP_H
 
-
+#include <linux/compiler.h>
+#include <linux/types.h>
+
+
+/* Valid values for seccomp.mode and prctl(PR_SET_SECCOMP, <mode>) */
+#define SECCOMP_MODE_DISABLED   0 /* seccomp is not in use. */
+#define SECCOMP_MODE_STRICT     1 /* uses hard-coded filter. */
+#define SECCOMP_MODE_FILTER     2 /* uses user-supplied filter. */
+
+/*
+ * All BPF programs must return a 32-bit value.
+ * The bottom 16-bits are for optional return data.
+ * The upper 16-bits are ordered from least permissive values to most.
+ *
+ * The ordering ensures that a min_t() over composed return values always
+ * selects the least permissive choice.
+ */
+#define SECCOMP_RET_KILL        0x00000000U /* kill the task immediately */
+#define SECCOMP_RET_TRAP        0x00030000U /* disallow and force a SIGSYS */
+#define SECCOMP_RET_ERRNO       0x00050000U /* returns an errno */
+#define SECCOMP_RET_TRACE       0x7ff00000U /* pass to a tracer or disallow */
+#define SECCOMP_RET_ALLOW       0x7fff0000U /* allow */
+
+/* Masks for the return value sections. */
+#define SECCOMP_RET_ACTION      0x7fff0000U
+#define SECCOMP_RET_DATA        0x0000ffffU
+
+/**
+ * struct seccomp_data - the format the BPF program executes over.
+ * @nr: the system call number
+ * @arch: indicates system call convention as an AUDIT_ARCH_* value
+ *        as defined in <linux/audit.h>.
+ * @instruction_pointer: at the time of the system call.
+ * @args: up to 6 system call arguments always stored as 64-bit values
+ *        regardless of the architecture.
+ */
+struct seccomp_data {
+        int nr;
+        __u32 arch;
+        __u64 instruction_pointer;
+        __u64 args[6];
+};
+
+#ifdef __KERNEL__
 #ifdef CONFIG_SECCOMP
 
 #include <linux/thread_info.h>
 #include <asm/seccomp.h>
 
-typedef struct { int mode; } seccomp_t;
-
-extern void __secure_computing(int);
-static inline void secure_computing(int this_syscall)
+struct seccomp_filter;
+/**
+ * struct seccomp - the state of a seccomp'ed process
+ *
+ * @mode:  indicates one of the valid values above for controlled
+ *         system calls available to a process.
+ * @filter: The metadata and ruleset for determining what system calls
+ *          are allowed for a task.
+ *
+ *          @filter must only be accessed from the context of current as there
+ *          is no locking.
+ */
+struct seccomp {
+        int mode;
+        struct seccomp_filter *filter;
+};
+
+extern int __secure_computing(int);
+static inline int secure_computing(int this_syscall)
 {
         if (unlikely(test_thread_flag(TIF_SECCOMP)))
-                __secure_computing(this_syscall);
+                return  __secure_computing(this_syscall);
+        return 0;
+}
+
+/* A wrapper for architectures supporting only SECCOMP_MODE_STRICT. */
+static inline void secure_computing_strict(int this_syscall)
+{
+        BUG_ON(secure_computing(this_syscall) != 0);
 }
 
 extern long prctl_get_seccomp(void);
-extern long prctl_set_seccomp(unsigned long);
+extern long prctl_set_seccomp(unsigned long, char __user *);
 
-static inline int seccomp_mode(seccomp_t *s)
+static inline int seccomp_mode(struct seccomp *s)
 {
         return s->mode;
 }
@@ -28,25 +93,41 @@ static inline int seccomp_mode(seccomp_t *s)
 
 #include <linux/errno.h>
 
-typedef struct { } seccomp_t;
+struct seccomp { };
+struct seccomp_filter { };
 
-#define secure_computing(x) do { } while (0)
+static inline int secure_computing(int this_syscall) { return 0; }
+static inline void secure_computing_strict(int this_syscall) { return; }
 
 static inline long prctl_get_seccomp(void)
 {
         return -EINVAL;
 }
 
-static inline long prctl_set_seccomp(unsigned long arg2)
+static inline long prctl_set_seccomp(unsigned long arg2, char __user *arg3)
 {
         return -EINVAL;
 }
 
-static inline int seccomp_mode(seccomp_t *s)
+static inline int seccomp_mode(struct seccomp *s)
 {
         return 0;
 }
-
 #endif /* CONFIG_SECCOMP */
 
+#ifdef CONFIG_SECCOMP_FILTER
+extern void put_seccomp_filter(struct task_struct *tsk);
+extern void get_seccomp_filter(struct task_struct *tsk);
+extern u32 seccomp_bpf_load(int off);
+#else  /* CONFIG_SECCOMP_FILTER */
+static inline void put_seccomp_filter(struct task_struct *tsk)
+{
+        return;
+}
+static inline void get_seccomp_filter(struct task_struct *tsk)
+{
+        return;
+}
+#endif /* CONFIG_SECCOMP_FILTER */
+#endif /* __KERNEL__ */
 #endif /* _LINUX_SECCOMP_H */
diff --git a/include/linux/security.h b/include/linux/security.h
index 673afbb8238a..4e5a73cdbbef 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -86,9 +86,9 @@ extern int cap_inode_setxattr(struct dentry *dentry, const char *name,
 extern int cap_inode_removexattr(struct dentry *dentry, const char *name);
 extern int cap_inode_need_killpriv(struct dentry *dentry);
 extern int cap_inode_killpriv(struct dentry *dentry);
-extern int cap_file_mmap(struct file *file, unsigned long reqprot,
-                         unsigned long prot, unsigned long flags,
-                         unsigned long addr, unsigned long addr_only);
+extern int cap_mmap_addr(unsigned long addr);
+extern int cap_mmap_file(struct file *file, unsigned long reqprot,
+                         unsigned long prot, unsigned long flags);
 extern int cap_task_fix_setuid(struct cred *new, const struct cred *old, int flags);
 extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,
                           unsigned long arg4, unsigned long arg5);
@@ -144,6 +144,7 @@ struct request_sock;
 #define LSM_UNSAFE_SHARE        1
 #define LSM_UNSAFE_PTRACE       2
 #define LSM_UNSAFE_PTRACE_CAP   4
+#define LSM_UNSAFE_NO_NEW_PRIVS 8
 
 #ifdef CONFIG_MMU
 extern int mmap_min_addr_handler(struct ctl_table *table, int write,
@@ -585,15 +586,17 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *      simple integer value.  When @arg represents a user space pointer, it
  *      should never be used by the security module.
  *      Return 0 if permission is granted.
- * @file_mmap :
+ * @mmap_addr :
+ *      Check permissions for a mmap operation at @addr.
+ *      @addr contains virtual address that will be used for the operation.
+ *      Return 0 if permission is granted.
+ * @mmap_file :
  *      Check permissions for a mmap operation.  The @file may be NULL, e.g.
  *      if mapping anonymous memory.
  *      @file contains the file structure for file to map (may be NULL).
  *      @reqprot contains the protection requested by the application.
  *      @prot contains the protection that will be applied by the kernel.
  *      @flags contains the operational flags.
- *      @addr contains virtual address that will be used for the operation.
- *      @addr_only contains a boolean: 0 if file-backed VMA, otherwise 1.
  *      Return 0 if permission is granted.
  * @file_mprotect:
  *      Check permissions before changing memory access permissions.
@@ -639,10 +642,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *      to receive an open file descriptor via socket IPC.
  *      @file contains the file structure being received.
  *      Return 0 if permission is granted.
- *
- * Security hook for dentry
- *
- * @dentry_open
+ * @file_open
  *      Save open-time permission checking state for later use upon
  *      file_permission, and recheck access if anything has changed
  *      since inode_permission.
@@ -1483,10 +1483,10 @@ struct security_operations {
         void (*file_free_security) (struct file *file);
         int (*file_ioctl) (struct file *file, unsigned int cmd,
                            unsigned long arg);
-        int (*file_mmap) (struct file *file,
+        int (*mmap_addr) (unsigned long addr);
+        int (*mmap_file) (struct file *file,
                           unsigned long reqprot, unsigned long prot,
-                          unsigned long flags, unsigned long addr,
-                          unsigned long addr_only);
+                          unsigned long flags);
         int (*file_mprotect) (struct vm_area_struct *vma,
                               unsigned long reqprot,
                               unsigned long prot);
@@ -1497,7 +1497,7 @@ struct security_operations {
         int (*file_send_sigiotask) (struct task_struct *tsk,
                                     struct fown_struct *fown, int sig);
         int (*file_receive) (struct file *file);
-        int (*dentry_open) (struct file *file, const struct cred *cred);
+        int (*file_open) (struct file *file, const struct cred *cred);
 
         int (*task_create) (unsigned long clone_flags);
         void (*task_free) (struct task_struct *task);
@@ -1745,9 +1745,9 @@ int security_file_permission(struct file *file, int mask);
 int security_file_alloc(struct file *file);
 void security_file_free(struct file *file);
 int security_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
-int security_file_mmap(struct file *file, unsigned long reqprot,
-                        unsigned long prot, unsigned long flags,
-                        unsigned long addr, unsigned long addr_only);
+int security_mmap_file(struct file *file, unsigned long prot,
+                        unsigned long flags);
+int security_mmap_addr(unsigned long addr);
 int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
                            unsigned long prot);
 int security_file_lock(struct file *file, unsigned int cmd);
@@ -1756,7 +1756,7 @@ int security_file_set_fowner(struct file *file);
 int security_file_send_sigiotask(struct task_struct *tsk,
                                  struct fown_struct *fown, int sig);
 int security_file_receive(struct file *file);
-int security_dentry_open(struct file *file, const struct cred *cred);
+int security_file_open(struct file *file, const struct cred *cred);
 int security_task_create(unsigned long clone_flags);
 void security_task_free(struct task_struct *task);
 int security_cred_alloc_blank(struct cred *cred, gfp_t gfp);
@@ -2183,13 +2183,15 @@ static inline int security_file_ioctl(struct file *file, unsigned int cmd,
         return 0;
 }
 
-static inline int security_file_mmap(struct file *file, unsigned long reqprot,
-                                     unsigned long prot,
-                                     unsigned long flags,
-                                     unsigned long addr,
-                                     unsigned long addr_only)
+static inline int security_mmap_file(struct file *file, unsigned long prot,
+                                     unsigned long flags)
+{
+        return 0;
+}
+
+static inline int security_mmap_addr(unsigned long addr)
 {
-        return cap_file_mmap(file, reqprot, prot, flags, addr, addr_only);
+        return cap_mmap_addr(addr);
 }
 
 static inline int security_file_mprotect(struct vm_area_struct *vma,
@@ -2227,8 +2229,8 @@ static inline int security_file_receive(struct file *file)
         return 0;
 }
 
-static inline int security_dentry_open(struct file *file,
-                                       const struct cred *cred)
+static inline int security_file_open(struct file *file,
+                                     const struct cred *cred)
 {
         return 0;
 }
diff --git a/include/linux/serial.h b/include/linux/serial.h
index 441980ecc4e5..90e9f981358a 100644
--- a/include/linux/serial.h
+++ b/include/linux/serial.h
@@ -130,7 +130,6 @@ struct serial_uart_config {
 #define ASYNCB_CHECK_CD         25 /* i.e., CLOCAL */
 #define ASYNCB_SHARE_IRQ        24 /* for multifunction cards, no longer used */
 #define ASYNCB_CONS_FLOW        23 /* flow control for console  */
-#define ASYNCB_BOOT_ONLYMCA     22 /* Probe only if MCA bus */
 #define ASYNCB_FIRST_KERNEL     22
 
 #define ASYNC_HUP_NOTIFY        (1U << ASYNCB_HUP_NOTIFY)
@@ -166,7 +165,6 @@ struct serial_uart_config {
 #define ASYNC_CHECK_CD          (1U << ASYNCB_CHECK_CD)
 #define ASYNC_SHARE_IRQ         (1U << ASYNCB_SHARE_IRQ)
 #define ASYNC_CONS_FLOW         (1U << ASYNCB_CONS_FLOW)
-#define ASYNC_BOOT_ONLYMCA      (1U << ASYNCB_BOOT_ONLYMCA)
 #define ASYNC_INTERNAL_FLAGS    (~((1U << ASYNCB_FIRST_KERNEL) - 1))
 
 /*
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index 8f012f8ac8e9..a416e92012ef 100644
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -38,6 +38,7 @@ struct plat_serial8250_port {
         int             (*handle_irq)(struct uart_port *);
         void            (*pm)(struct uart_port *, unsigned int state,
                               unsigned old);
+        void            (*handle_break)(struct uart_port *);
 };
 
 /*
@@ -54,7 +55,6 @@ enum {
         PLAT8250_DEV_BOCA,
         PLAT8250_DEV_EXAR_ST16C554,
         PLAT8250_DEV_HUB6,
-        PLAT8250_DEV_MCA,
         PLAT8250_DEV_AU1X00,
         PLAT8250_DEV_SM501,
 };
@@ -68,6 +68,7 @@ enum {
 struct uart_port;
 struct uart_8250_port;
 
+int serial8250_register_8250_port(struct uart_8250_port *);
 int serial8250_register_port(struct uart_port *);
 void serial8250_unregister_port(int line);
 void serial8250_suspend_port(int line);
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 2db407a40051..65db9928e15f 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -310,6 +310,7 @@ struct uart_port {
         int                     (*handle_irq)(struct uart_port *);
         void                    (*pm)(struct uart_port *, unsigned int state,
                                       unsigned int old);
+        void                    (*handle_break)(struct uart_port *);
         unsigned int            irq;                    /* irq number */
         unsigned long           irqflags;               /* irq flags  */
         unsigned int            uartclk;                /* base uart clock */
@@ -533,6 +534,10 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
 static inline int uart_handle_break(struct uart_port *port)
 {
         struct uart_state *state = port->state;
+
+        if (port->handle_break)
+                port->handle_break(port);
+
 #ifdef SUPPORT_SYSRQ
         if (port->cons && port->cons->index == port->line) {
                 if (!port->sysrq) {
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h
index 78779074f6e8..eb763adf9815 100644
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@ -52,6 +52,8 @@ enum {
 /* SCSPTR, optional */
 #define SCSPTR_RTSIO    (1 << 7)
 #define SCSPTR_CTSIO    (1 << 5)
+#define SCSPTR_SPB2IO   (1 << 1)
+#define SCSPTR_SPB2DT   (1 << 0)
 
 /* Offsets into the sci_port->irqs array */
 enum {
diff --git a/include/linux/serio.h b/include/linux/serio.h
index ca82861b0e46..6d6cfd3e94a3 100644
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -96,6 +96,19 @@ int __must_check __serio_register_driver(struct serio_driver *drv,
 
 void serio_unregister_driver(struct serio_driver *drv);
 
+/**
+ * module_serio_driver() - Helper macro for registering a serio driver
+ * @__serio_driver: serio_driver struct
+ *
+ * Helper macro for serio drivers which do not do anything special in
+ * module init/exit. This eliminates a lot of boilerplate. Each module
+ * may only use this macro once, and calling it replaces module_init()
+ * and module_exit().
+ */
+#define module_serio_driver(__serio_driver) \
+        module_driver(__serio_driver, serio_register_driver, \
+                       serio_unregister_driver)
+
 static inline int serio_write(struct serio *serio, unsigned char data)
 {
         if (serio->write)
diff --git a/include/linux/sh_clk.h b/include/linux/sh_clk.h
index 0a9d8f2ac519..c513b73cd7cb 100644
--- a/include/linux/sh_clk.h
+++ b/include/linux/sh_clk.h
@@ -59,7 +59,15 @@ struct clk {
         unsigned int            nr_freqs;
 };
 
-#define CLK_ENABLE_ON_INIT      (1 << 0)
+#define CLK_ENABLE_ON_INIT      BIT(0)
+
+#define CLK_ENABLE_REG_32BIT    BIT(1)  /* default access size */
+#define CLK_ENABLE_REG_16BIT    BIT(2)
+#define CLK_ENABLE_REG_8BIT     BIT(3)
+
+#define CLK_ENABLE_REG_MASK     (CLK_ENABLE_REG_32BIT | \
+                                 CLK_ENABLE_REG_16BIT | \
+                                 CLK_ENABLE_REG_8BIT)
 
 /* drivers/sh/clk.c */
 unsigned long followparent_recalc(struct clk *);
@@ -102,7 +110,7 @@ long clk_round_parent(struct clk *clk, unsigned long target,
                       unsigned long *best_freq, unsigned long *parent_freq,
                       unsigned int div_min, unsigned int div_max);
 
-#define SH_CLK_MSTP32(_parent, _enable_reg, _enable_bit, _flags)        \
+#define SH_CLK_MSTP(_parent, _enable_reg, _enable_bit, _flags)          \
 {                                                                       \
         .parent         = _parent,                                      \
         .enable_reg     = (void __iomem *)_enable_reg,                  \
@@ -110,7 +118,27 @@ long clk_round_parent(struct clk *clk, unsigned long target,
         .flags          = _flags,                                       \
 }
 
-int sh_clk_mstp32_register(struct clk *clks, int nr);
+#define SH_CLK_MSTP32(_p, _r, _b, _f)                                   \
+        SH_CLK_MSTP(_p, _r, _b, _f | CLK_ENABLE_REG_32BIT)
+
+#define SH_CLK_MSTP16(_p, _r, _b, _f)                                   \
+        SH_CLK_MSTP(_p, _r, _b, _f | CLK_ENABLE_REG_16BIT)
+
+#define SH_CLK_MSTP8(_p, _r, _b, _f)                                    \
+        SH_CLK_MSTP(_p, _r, _b, _f | CLK_ENABLE_REG_8BIT)
+
+int sh_clk_mstp_register(struct clk *clks, int nr);
+
+/*
+ * MSTP registration never really cared about access size, despite the
+ * original enable/disable pairs assuming a 32-bit access. Clocks are
+ * responsible for defining their access sizes either directly or via the
+ * clock definition wrappers.
+ */
+static inline int __deprecated sh_clk_mstp32_register(struct clk *clks, int nr)
+{
+        return sh_clk_mstp_register(clks, nr);
+}
 
 #define SH_CLK_DIV4(_parent, _reg, _shift, _div_bitmap, _flags) \
 {                                                               \
diff --git a/include/linux/sh_intc.h b/include/linux/sh_intc.h
index 6aed0805927f..32383285da68 100644
--- a/include/linux/sh_intc.h
+++ b/include/linux/sh_intc.h
@@ -133,7 +133,6 @@ struct intc_desc symbol __initdata = {					\
 }
 
 int register_intc_controller(struct intc_desc *desc);
-void reserve_intc_vectors(struct intc_vect *vectors, unsigned int nr_vecs);
 int intc_set_priority(unsigned int irq, unsigned int prio);
 int intc_irq_lookup(const char *chipname, intc_enum enum_id);
 void intc_finalize(void);
diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
index 79ab2555b3b0..bef2cf00b3be 100644
--- a/include/linux/shmem_fs.h
+++ b/include/linux/shmem_fs.h
@@ -28,8 +28,8 @@ struct shmem_sb_info {
         unsigned long max_inodes;   /* How many inodes are allowed */
         unsigned long free_inodes;  /* How many are left for allocation */
         spinlock_t stat_lock;       /* Serialize shmem_sb_info changes */
-        uid_t uid;                  /* Mount uid for root directory */
-        gid_t gid;                  /* Mount gid for root directory */
+        kuid_t uid;                 /* Mount uid for root directory */
+        kgid_t gid;                 /* Mount gid for root directory */
         umode_t mode;               /* Mount mode for root directory */
         struct mempolicy *mpol;     /* default memory policy for mappings */
 };
diff --git a/include/linux/signal.h b/include/linux/signal.h
index 7987ce74874b..26b424adc842 100644
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -250,11 +250,13 @@ extern long do_sigpending(void __user *, unsigned long);
 extern int do_sigtimedwait(const sigset_t *, siginfo_t *,
                                 const struct timespec *);
 extern int sigprocmask(int, sigset_t *, sigset_t *);
-extern void set_current_blocked(const sigset_t *);
+extern void set_current_blocked(sigset_t *);
+extern void __set_current_blocked(const sigset_t *);
 extern int show_unhandled_signals;
+extern int sigsuspend(sigset_t *);
 
 extern int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka, struct pt_regs *regs, void *cookie);
-extern void block_sigmask(struct k_sigaction *ka, int signr);
+extern void signal_delivered(int sig, siginfo_t *info, struct k_sigaction *ka, struct pt_regs *regs, int stepping);
 extern void exit_signals(struct task_struct *tsk);
 
 extern struct kmem_cache *sighand_cachep;
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 111f26b6e28b..b534a1be540a 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -117,11 +117,11 @@ struct nf_conntrack {
 
 #ifdef CONFIG_BRIDGE_NETFILTER
 struct nf_bridge_info {
-        atomic_t use;
-        struct net_device *physindev;
-        struct net_device *physoutdev;
-        unsigned int mask;
-        unsigned long data[32 / sizeof(unsigned long)];
+        atomic_t                use;
+        unsigned int            mask;
+        struct net_device       *physindev;
+        struct net_device       *physoutdev;
+        unsigned long           data[32 / sizeof(unsigned long)];
 };
 #endif
 
@@ -470,7 +470,8 @@ struct sk_buff {
         __u8                    wifi_acked_valid:1;
         __u8                    wifi_acked:1;
         __u8                    no_fcs:1;
-        /* 9/11 bit hole (depending on ndisc_nodetype presence) */
+        __u8                    head_frag:1;
+        /* 8/10 bit hole (depending on ndisc_nodetype presence) */
         kmemcheck_bitfield_end(flags2);
 
 #ifdef CONFIG_NET_DMA
@@ -560,9 +561,15 @@ static inline struct rtable *skb_rtable(const struct sk_buff *skb)
 extern void kfree_skb(struct sk_buff *skb);
 extern void consume_skb(struct sk_buff *skb);
 extern void            __kfree_skb(struct sk_buff *skb);
+extern struct kmem_cache *skbuff_head_cache;
+
+extern void kfree_skb_partial(struct sk_buff *skb, bool head_stolen);
+extern bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
+                             bool *fragstolen, int *delta_truesize);
+
 extern struct sk_buff *__alloc_skb(unsigned int size,
                                    gfp_t priority, int fclone, int node);
-extern struct sk_buff *build_skb(void *data);
+extern struct sk_buff *build_skb(void *data, unsigned int frag_size);
 static inline struct sk_buff *alloc_skb(unsigned int size,
                                         gfp_t priority)
 {
@@ -643,11 +650,21 @@ static inline unsigned char *skb_end_pointer(const struct sk_buff *skb)
 {
         return skb->head + skb->end;
 }
+
+static inline unsigned int skb_end_offset(const struct sk_buff *skb)
+{
+        return skb->end;
+}
 #else
 static inline unsigned char *skb_end_pointer(const struct sk_buff *skb)
 {
         return skb->end;
 }
+
+static inline unsigned int skb_end_offset(const struct sk_buff *skb)
+{
+        return skb->end - skb->head;
+}
 #endif
 
 /* Internal */
@@ -881,10 +898,11 @@ static inline struct sk_buff *skb_unshare(struct sk_buff *skb,
  */
 static inline struct sk_buff *skb_peek(const struct sk_buff_head *list_)
 {
-        struct sk_buff *list = ((const struct sk_buff *)list_)->next;
-        if (list == (struct sk_buff *)list_)
-                list = NULL;
-        return list;
+        struct sk_buff *skb = list_->next;
+
+        if (skb == (struct sk_buff *)list_)
+                skb = NULL;
+        return skb;
 }
 
 /**
@@ -900,6 +918,7 @@ static inline struct sk_buff *skb_peek_next(struct sk_buff *skb,
                 const struct sk_buff_head *list_)
 {
         struct sk_buff *next = skb->next;
+
         if (next == (struct sk_buff *)list_)
                 next = NULL;
         return next;
@@ -920,10 +939,12 @@ static inline struct sk_buff *skb_peek_next(struct sk_buff *skb,
  */
 static inline struct sk_buff *skb_peek_tail(const struct sk_buff_head *list_)
 {
-        struct sk_buff *list = ((const struct sk_buff *)list_)->prev;
-        if (list == (struct sk_buff *)list_)
-                list = NULL;
-        return list;
+        struct sk_buff *skb = list_->prev;
+
+        if (skb == (struct sk_buff *)list_)
+                skb = NULL;
+        return skb;
+
 }
 
 /**
@@ -1664,31 +1685,11 @@ static inline void __skb_queue_purge(struct sk_buff_head *list)
                 kfree_skb(skb);
 }
 
-/**
- *      __dev_alloc_skb - allocate an skbuff for receiving
- *      @length: length to allocate
- *      @gfp_mask: get_free_pages mask, passed to alloc_skb
- *
- *      Allocate a new &sk_buff and assign it a usage count of one. The
- *      buffer has unspecified headroom built in. Users should allocate
- *      the headroom they think they need without accounting for the
- *      built in space. The built in space is used for optimisations.
- *
- *      %NULL is returned if there is no free memory.
- */
-static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
-                                              gfp_t gfp_mask)
-{
-        struct sk_buff *skb = alloc_skb(length + NET_SKB_PAD, gfp_mask);
-        if (likely(skb))
-                skb_reserve(skb, NET_SKB_PAD);
-        return skb;
-}
-
-extern struct sk_buff *dev_alloc_skb(unsigned int length);
+extern void *netdev_alloc_frag(unsigned int fragsz);
 
 extern struct sk_buff *__netdev_alloc_skb(struct net_device *dev,
-                unsigned int length, gfp_t gfp_mask);
+                                          unsigned int length,
+                                          gfp_t gfp_mask);
 
 /**
  *      netdev_alloc_skb - allocate an skbuff for rx on a specific device
@@ -1704,11 +1705,25 @@ extern struct sk_buff *__netdev_alloc_skb(struct net_device *dev,
  *      allocates memory it can be called from an interrupt.
  */
 static inline struct sk_buff *netdev_alloc_skb(struct net_device *dev,
-                unsigned int length)
+                                               unsigned int length)
 {
         return __netdev_alloc_skb(dev, length, GFP_ATOMIC);
 }
 
+/* legacy helper around __netdev_alloc_skb() */
+static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
+                                              gfp_t gfp_mask)
+{
+        return __netdev_alloc_skb(NULL, length, gfp_mask);
+}
+
+/* legacy helper around netdev_alloc_skb() */
+static inline struct sk_buff *dev_alloc_skb(unsigned int length)
+{
+        return netdev_alloc_skb(NULL, length);
+}
+
+
 static inline struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
                 unsigned int length, gfp_t gfp)
 {
@@ -1881,8 +1896,6 @@ static inline int __skb_cow(struct sk_buff *skb, unsigned int headroom,
 {
         int delta = 0;
 
-        if (headroom < NET_SKB_PAD)
-                headroom = NET_SKB_PAD;
         if (headroom > skb_headroom(skb))
                 delta = headroom - skb_headroom(skb);
 
@@ -1963,8 +1976,8 @@ static inline int skb_add_data(struct sk_buff *skb,
         return -EFAULT;
 }
 
-static inline int skb_can_coalesce(struct sk_buff *skb, int i,
-                                   const struct page *page, int off)
+static inline bool skb_can_coalesce(struct sk_buff *skb, int i,
+                                    const struct page *page, int off)
 {
         if (i) {
                 const struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[i - 1];
@@ -1972,7 +1985,7 @@ static inline int skb_can_coalesce(struct sk_buff *skb, int i,
                 return page == skb_frag_page(frag) &&
                        off == frag->page_offset + skb_frag_size(frag);
         }
-        return 0;
+        return false;
 }
 
 static inline int __skb_linearize(struct sk_buff *skb)
@@ -2552,7 +2565,7 @@ static inline bool skb_is_recycleable(const struct sk_buff *skb, int skb_size)
                 return false;
 
         skb_size = SKB_DATA_ALIGN(skb_size + NET_SKB_PAD);
-        if (skb_end_pointer(skb) - skb->head < skb_size)
+        if (skb_end_offset(skb) < skb_size)
                 return false;
 
         if (skb_shared(skb) || skb_cloned(skb))
@@ -2560,5 +2573,19 @@ static inline bool skb_is_recycleable(const struct sk_buff *skb, int skb_size)
 
         return true;
 }
+
+/**
+ * skb_head_is_locked - Determine if the skb->head is locked down
+ * @skb: skb to check
+ *
+ * The head on skbs build around a head frag can be removed if they are
+ * not cloned.  This function returns true if the skb head is locked down
+ * due to either being allocated via kmalloc, or by being a clone with
+ * multiple references to the head.
+ */
+static inline bool skb_head_is_locked(const struct sk_buff *skb)
+{
+        return !skb->head_frag || skb_cloned(skb);
+}
 #endif  /* __KERNEL__ */
 #endif  /* _LINUX_SKBUFF_H */
diff --git a/include/linux/slab.h b/include/linux/slab.h
index a595dce6b0c7..67d5d94b783a 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -242,7 +242,7 @@ size_t ksize(const void *);
  */
 static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags)
 {
-        if (size != 0 && n > ULONG_MAX / size)
+        if (size != 0 && n > SIZE_MAX / size)
                 return NULL;
         return __kmalloc(n * size, flags);
 }
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 10530d92c04b..717fb746c9a8 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -61,7 +61,7 @@ extern void smp_prepare_cpus(unsigned int max_cpus);
 /*
  * Bring a CPU up
  */
-extern int __cpu_up(unsigned int cpunum);
+extern int __cpu_up(unsigned int cpunum, struct task_struct *tidle);
 
 /*
  * Final polishing of CPUs
@@ -81,6 +81,8 @@ void __smp_call_function_single(int cpuid, struct call_single_data *data,
 int smp_call_function_any(const struct cpumask *mask,
                           smp_call_func_t func, void *info, int wait);
 
+void kick_all_cpus_sync(void);
+
 /*
  * Generic and arch helpers
  */
@@ -192,6 +194,8 @@ smp_call_function_any(const struct cpumask *mask, smp_call_func_t func,
         return smp_call_function_single(0, func, info, wait);
 }
 
+static inline void kick_all_cpus_sync(void) {  }
+
 #endif /* !SMP */
 
 /*
diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
index 251729a47880..db4bae78bda9 100644
--- a/include/linux/sock_diag.h
+++ b/include/linux/sock_diag.h
@@ -32,8 +32,8 @@ struct sock_diag_handler {
         int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
 };
 
-int sock_diag_register(struct sock_diag_handler *h);
-void sock_diag_unregister(struct sock_diag_handler *h);
+int sock_diag_register(const struct sock_diag_handler *h);
+void sock_diag_unregister(const struct sock_diag_handler *h);
 
 void sock_diag_register_inet_compat(int (*fn)(struct sk_buff *skb, struct nlmsghdr *nlh));
 void sock_diag_unregister_inet_compat(int (*fn)(struct sk_buff *skb, struct nlmsghdr *nlh));
diff --git a/include/linux/socket.h b/include/linux/socket.h
index b84bbd48b874..25d6322fb635 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -68,13 +68,13 @@ struct msghdr {
         __kernel_size_t msg_iovlen;     /* Number of blocks             */
         void    *       msg_control;    /* Per protocol magic (eg BSD file descriptor passing) */
         __kernel_size_t msg_controllen; /* Length of cmsg list */
-        unsigned        msg_flags;
+        unsigned int    msg_flags;
 };
 
 /* For recvmmsg/sendmmsg */
 struct mmsghdr {
         struct msghdr   msg_hdr;
-        unsigned        msg_len;
+        unsigned int        msg_len;
 };
 
 /*
diff --git a/include/linux/spi/eeprom.h b/include/linux/spi/eeprom.h
index 306e7b1c69ed..403e007aef68 100644
--- a/include/linux/spi/eeprom.h
+++ b/include/linux/spi/eeprom.h
@@ -20,6 +20,16 @@ struct spi_eeprom {
 #define EE_ADDR3        0x0004                  /* 24 bit addrs */
 #define EE_READONLY     0x0008                  /* disallow writes */
 
+        /*
+         * Certain EEPROMS have a size that is larger than the number of address
+         * bytes would allow (e.g. like M95040 from ST that has 512 Byte size
+         * but uses only one address byte (A0 to A7) for addressing.) For
+         * the extra address bit (A8, A16 or A24) bit 3 of the instruction byte
+         * is used. This instruction bit is normally defined as don't care for
+         * other AT25 like chips.
+         */
+#define EE_INSTR_BIT3_IS_ADDR   0x0010
+
         /* for exporting this chip's data to other kernel code */
         void (*setup)(struct memory_accessor *mem, void *context);
         void *context;
diff --git a/include/linux/spi/orion_spi.h b/include/linux/spi/orion_spi.h
deleted file mode 100644
index b4d9fa6f797c..000000000000
--- a/include/linux/spi/orion_spi.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * orion_spi.h
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#ifndef __LINUX_SPI_ORION_SPI_H
-#define __LINUX_SPI_ORION_SPI_H
-
-struct orion_spi_info {
-        u32     tclk;           /* no <linux/clk.h> support yet */
-};
-
-
-#endif
diff --git a/include/linux/spi/rspi.h b/include/linux/spi/rspi.h
new file mode 100644
index 000000000000..900f0e328235
--- /dev/null
+++ b/include/linux/spi/rspi.h
@@ -0,0 +1,31 @@
+/*
+ * Renesas SPI driver
+ *
+ * Copyright (C) 2012  Renesas Solutions Corp.
+ *
+ * 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; version 2 of the License.
+ *
+ * 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 __LINUX_SPI_RENESAS_SPI_H__
+#define __LINUX_SPI_RENESAS_SPI_H__
+
+struct rspi_plat_data {
+        unsigned int dma_tx_id;
+        unsigned int dma_rx_id;
+
+        unsigned dma_width_16bit:1;     /* DMAC read/write width = 16-bit */
+};
+
+#endif
diff --git a/include/linux/srcu.h b/include/linux/srcu.h
index d3d5fa54f25e..55a5c52cbb25 100644
--- a/include/linux/srcu.h
+++ b/include/linux/srcu.h
@@ -29,26 +29,35 @@
 
 #include <linux/mutex.h>
 #include <linux/rcupdate.h>
+#include <linux/workqueue.h>
 
 struct srcu_struct_array {
-        int c[2];
+        unsigned long c[2];
+        unsigned long seq[2];
+};
+
+struct rcu_batch {
+        struct rcu_head *head, **tail;
 };
 
 struct srcu_struct {
-        int completed;
+        unsigned completed;
         struct srcu_struct_array __percpu *per_cpu_ref;
-        struct mutex mutex;
+        spinlock_t queue_lock; /* protect ->batch_queue, ->running */
+        bool running;
+        /* callbacks just queued */
+        struct rcu_batch batch_queue;
+        /* callbacks try to do the first check_zero */
+        struct rcu_batch batch_check0;
+        /* callbacks done with the first check_zero and the flip */
+        struct rcu_batch batch_check1;
+        struct rcu_batch batch_done;
+        struct delayed_work work;
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
         struct lockdep_map dep_map;
 #endif /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */
 };
 
-#ifndef CONFIG_PREEMPT
-#define srcu_barrier() barrier()
-#else /* #ifndef CONFIG_PREEMPT */
-#define srcu_barrier()
-#endif /* #else #ifndef CONFIG_PREEMPT */
-
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
 
 int __init_srcu_struct(struct srcu_struct *sp, const char *name,
@@ -67,12 +76,33 @@ int init_srcu_struct(struct srcu_struct *sp);
 
 #endif /* #else #ifdef CONFIG_DEBUG_LOCK_ALLOC */
 
+/**
+ * call_srcu() - Queue a callback for invocation after an SRCU grace period
+ * @sp: srcu_struct in queue the callback
+ * @head: structure to be used for queueing the SRCU callback.
+ * @func: function to be invoked after the SRCU grace period
+ *
+ * The callback function will be invoked some time after a full SRCU
+ * grace period elapses, in other words after all pre-existing SRCU
+ * read-side critical sections have completed.  However, the callback
+ * function might well execute concurrently with other SRCU read-side
+ * critical sections that started after call_srcu() was invoked.  SRCU
+ * read-side critical sections are delimited by srcu_read_lock() and
+ * srcu_read_unlock(), and may be nested.
+ *
+ * The callback will be invoked from process context, but must nevertheless
+ * be fast and must not block.
+ */
+void call_srcu(struct srcu_struct *sp, struct rcu_head *head,
+                void (*func)(struct rcu_head *head));
+
 void cleanup_srcu_struct(struct srcu_struct *sp);
 int __srcu_read_lock(struct srcu_struct *sp) __acquires(sp);
 void __srcu_read_unlock(struct srcu_struct *sp, int idx) __releases(sp);
 void synchronize_srcu(struct srcu_struct *sp);
 void synchronize_srcu_expedited(struct srcu_struct *sp);
 long srcu_batches_completed(struct srcu_struct *sp);
+void srcu_barrier(struct srcu_struct *sp);
 
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
 
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
index d27683180025..bc14bd738ade 100644
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -188,7 +188,6 @@ struct ssb_sprom {
 struct ssb_boardinfo {
         u16 vendor;
         u16 type;
-        u8  rev;
 };
 
 
diff --git a/include/linux/ssb/ssb_regs.h b/include/linux/ssb/ssb_regs.h
index 40b1ef8595ee..a0525019e1d1 100644
--- a/include/linux/ssb/ssb_regs.h
+++ b/include/linux/ssb/ssb_regs.h
@@ -228,6 +228,7 @@
 #define  SSB_SPROM1_AGAIN_BG_SHIFT      0
 #define  SSB_SPROM1_AGAIN_A             0xFF00  /* A-PHY */
 #define  SSB_SPROM1_AGAIN_A_SHIFT       8
+#define SSB_SPROM1_CCODE                0x0076
 
 /* SPROM Revision 2 (inherits from rev 1) */
 #define SSB_SPROM2_BFLHI                0x0038  /* Boardflags (high 16 bits) */
@@ -267,6 +268,7 @@
 #define  SSB_SPROM3_OFDMGPO             0x107A  /* G-PHY OFDM Power Offset (4 bytes, BigEndian) */
 
 /* SPROM Revision 4 */
+#define SSB_SPROM4_BOARDREV             0x0042  /* Board revision */
 #define SSB_SPROM4_BFLLO                0x0044  /* Boardflags (low 16 bits) */
 #define SSB_SPROM4_BFLHI                0x0046  /* Board Flags Hi */
 #define SSB_SPROM4_BFL2LO               0x0048  /* Board flags 2 (low 16 bits) */
@@ -389,6 +391,11 @@
 #define  SSB_SPROM8_GPIOB_P2            0x00FF  /* Pin 2 */
 #define  SSB_SPROM8_GPIOB_P3            0xFF00  /* Pin 3 */
 #define  SSB_SPROM8_GPIOB_P3_SHIFT      8
+#define SSB_SPROM8_LEDDC                0x009A
+#define  SSB_SPROM8_LEDDC_ON            0xFF00  /* oncount */
+#define  SSB_SPROM8_LEDDC_ON_SHIFT      8
+#define  SSB_SPROM8_LEDDC_OFF           0x00FF  /* offcount */
+#define  SSB_SPROM8_LEDDC_OFF_SHIFT     0
 #define SSB_SPROM8_ANTAVAIL             0x009C  /* Antenna available bitfields*/
 #define  SSB_SPROM8_ANTAVAIL_A          0xFF00  /* A-PHY bitfield */
 #define  SSB_SPROM8_ANTAVAIL_A_SHIFT    8
@@ -404,6 +411,13 @@
 #define  SSB_SPROM8_AGAIN2_SHIFT        0
 #define  SSB_SPROM8_AGAIN3              0xFF00  /* Antenna 3 */
 #define  SSB_SPROM8_AGAIN3_SHIFT        8
+#define SSB_SPROM8_TXRXC                0x00A2
+#define  SSB_SPROM8_TXRXC_TXCHAIN       0x000f
+#define  SSB_SPROM8_TXRXC_TXCHAIN_SHIFT 0
+#define  SSB_SPROM8_TXRXC_RXCHAIN       0x00f0
+#define  SSB_SPROM8_TXRXC_RXCHAIN_SHIFT 4
+#define  SSB_SPROM8_TXRXC_SWITCH        0xff00
+#define  SSB_SPROM8_TXRXC_SWITCH_SHIFT  8
 #define SSB_SPROM8_RSSIPARM2G           0x00A4  /* RSSI params for 2GHz */
 #define  SSB_SPROM8_RSSISMF2G           0x000F
 #define  SSB_SPROM8_RSSISMC2G           0x00F0
@@ -430,6 +444,7 @@
 #define  SSB_SPROM8_TRI5GH_SHIFT        8
 #define SSB_SPROM8_RXPO                 0x00AC  /* RX power offsets */
 #define  SSB_SPROM8_RXPO2G              0x00FF  /* 2GHz RX power offset */
+#define  SSB_SPROM8_RXPO2G_SHIFT        0
 #define  SSB_SPROM8_RXPO5G              0xFF00  /* 5GHz RX power offset */
 #define  SSB_SPROM8_RXPO5G_SHIFT        8
 #define SSB_SPROM8_FEM2G                0x00AE
@@ -445,10 +460,38 @@
 #define  SSB_SROM8_FEM_ANTSWLUT         0xF800
 #define  SSB_SROM8_FEM_ANTSWLUT_SHIFT   11
 #define SSB_SPROM8_THERMAL              0x00B2
-#define SSB_SPROM8_MPWR_RAWTS           0x00B4
-#define SSB_SPROM8_TS_SLP_OPT_CORRX     0x00B6
-#define SSB_SPROM8_FOC_HWIQ_IQSWP       0x00B8
-#define SSB_SPROM8_PHYCAL_TEMPDELTA     0x00BA
+#define  SSB_SPROM8_THERMAL_OFFSET      0x00ff
+#define  SSB_SPROM8_THERMAL_OFFSET_SHIFT        0
+#define  SSB_SPROM8_THERMAL_TRESH       0xff00
+#define  SSB_SPROM8_THERMAL_TRESH_SHIFT 8
+/* Temp sense related entries */
+#define SSB_SPROM8_RAWTS                0x00B4
+#define  SSB_SPROM8_RAWTS_RAWTEMP       0x01ff
+#define  SSB_SPROM8_RAWTS_RAWTEMP_SHIFT 0
+#define  SSB_SPROM8_RAWTS_MEASPOWER     0xfe00
+#define  SSB_SPROM8_RAWTS_MEASPOWER_SHIFT       9
+#define SSB_SPROM8_OPT_CORRX            0x00B6
+#define  SSB_SPROM8_OPT_CORRX_TEMP_SLOPE        0x00ff
+#define  SSB_SPROM8_OPT_CORRX_TEMP_SLOPE_SHIFT  0
+#define  SSB_SPROM8_OPT_CORRX_TEMPCORRX 0xfc00
+#define  SSB_SPROM8_OPT_CORRX_TEMPCORRX_SHIFT   10
+#define  SSB_SPROM8_OPT_CORRX_TEMP_OPTION       0x0300
+#define  SSB_SPROM8_OPT_CORRX_TEMP_OPTION_SHIFT 8
+/* FOC: freiquency offset correction, HWIQ: H/W IOCAL enable, IQSWP: IQ CAL swap disable */
+#define SSB_SPROM8_HWIQ_IQSWP           0x00B8
+#define  SSB_SPROM8_HWIQ_IQSWP_FREQ_CORR        0x000f
+#define  SSB_SPROM8_HWIQ_IQSWP_FREQ_CORR_SHIFT  0
+#define  SSB_SPROM8_HWIQ_IQSWP_IQCAL_SWP        0x0010
+#define  SSB_SPROM8_HWIQ_IQSWP_IQCAL_SWP_SHIFT  4
+#define  SSB_SPROM8_HWIQ_IQSWP_HW_IQCAL 0x0020
+#define  SSB_SPROM8_HWIQ_IQSWP_HW_IQCAL_SHIFT   5
+#define SSB_SPROM8_TEMPDELTA            0x00BA
+#define  SSB_SPROM8_TEMPDELTA_PHYCAL    0x00ff
+#define  SSB_SPROM8_TEMPDELTA_PHYCAL_SHIFT      0
+#define  SSB_SPROM8_TEMPDELTA_PERIOD    0x0f00
+#define  SSB_SPROM8_TEMPDELTA_PERIOD_SHIFT      8
+#define  SSB_SPROM8_TEMPDELTA_HYSTERESIS        0xf000
+#define  SSB_SPROM8_TEMPDELTA_HYSTERESIS_SHIFT  12
 
 /* There are 4 blocks with power info sharing the same layout */
 #define SSB_SROM8_PWR_INFO_CORE0        0x00C0
@@ -513,6 +556,16 @@
 #define SSB_SPROM8_OFDM5GLPO            0x014A  /* 5.2GHz OFDM power offset */
 #define SSB_SPROM8_OFDM5GHPO            0x014E  /* 5.8GHz OFDM power offset */
 
+#define SSB_SPROM8_2G_MCSPO             0x0152
+#define SSB_SPROM8_5G_MCSPO             0x0162
+#define SSB_SPROM8_5GL_MCSPO            0x0172
+#define SSB_SPROM8_5GH_MCSPO            0x0182
+
+#define SSB_SPROM8_CDDPO                0x0192
+#define SSB_SPROM8_STBCPO               0x0194
+#define SSB_SPROM8_BW40PO               0x0196
+#define SSB_SPROM8_BWDUPPO              0x0198
+
 /* Values for boardflags_lo read from SPROM */
 #define SSB_BFL_BTCOEXIST               0x0001  /* implements Bluetooth coexistance */
 #define SSB_BFL_PACTRL                  0x0002  /* GPIO 9 controlling the PA */
diff --git a/include/linux/stat.h b/include/linux/stat.h
index 611c398dab72..46132409a3f7 100644
--- a/include/linux/stat.h
+++ b/include/linux/stat.h
@@ -58,14 +58,15 @@
 
 #include <linux/types.h>
 #include <linux/time.h>
+#include <linux/uidgid.h>
 
 struct kstat {
         u64             ino;
         dev_t           dev;
         umode_t         mode;
         unsigned int    nlink;
-        uid_t           uid;
-        gid_t           gid;
+        kuid_t          uid;
+        kgid_t          gid;
         dev_t           rdev;
         loff_t          size;
         struct timespec  atime;
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 0dddc9e42b6b..b69bdb1e08b6 100644
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -28,6 +28,51 @@
 
 #include <linux/platform_device.h>
 
+#define STMMAC_RX_COE_NONE      0
+#define STMMAC_RX_COE_TYPE1     1
+#define STMMAC_RX_COE_TYPE2     2
+
+/* Define the macros for CSR clock range parameters to be passed by
+ * platform code.
+ * This could also be configured at run time using CPU freq framework. */
+
+/* MDC Clock Selection define*/
+#define STMMAC_CSR_60_100M      0x0     /* MDC = clk_scr_i/42 */
+#define STMMAC_CSR_100_150M     0x1     /* MDC = clk_scr_i/62 */
+#define STMMAC_CSR_20_35M       0x2     /* MDC = clk_scr_i/16 */
+#define STMMAC_CSR_35_60M       0x3     /* MDC = clk_scr_i/26 */
+#define STMMAC_CSR_150_250M     0x4     /* MDC = clk_scr_i/102 */
+#define STMMAC_CSR_250_300M     0x5     /* MDC = clk_scr_i/122 */
+
+/* The MDC clock could be set higher than the IEEE 802.3
+ * specified frequency limit 0f 2.5 MHz, by programming a clock divider
+ * of value different than the above defined values. The resultant MDIO
+ * clock frequency of 12.5 MHz is applicable for the interfacing chips
+ * supporting higher MDC clocks.
+ * The MDC clock selection macros need to be defined for MDC clock rate
+ * of 12.5 MHz, corresponding to the following selection.
+ */
+#define STMMAC_CSR_I_4          0x8     /* clk_csr_i/4 */
+#define STMMAC_CSR_I_6          0x9     /* clk_csr_i/6 */
+#define STMMAC_CSR_I_8          0xA     /* clk_csr_i/8 */
+#define STMMAC_CSR_I_10         0xB     /* clk_csr_i/10 */
+#define STMMAC_CSR_I_12         0xC     /* clk_csr_i/12 */
+#define STMMAC_CSR_I_14         0xD     /* clk_csr_i/14 */
+#define STMMAC_CSR_I_16         0xE     /* clk_csr_i/16 */
+#define STMMAC_CSR_I_18         0xF     /* clk_csr_i/18 */
+
+/* AXI DMA Burst length suported */
+#define DMA_AXI_BLEN_4          (1 << 1)
+#define DMA_AXI_BLEN_8          (1 << 2)
+#define DMA_AXI_BLEN_16         (1 << 3)
+#define DMA_AXI_BLEN_32         (1 << 4)
+#define DMA_AXI_BLEN_64         (1 << 5)
+#define DMA_AXI_BLEN_128        (1 << 6)
+#define DMA_AXI_BLEN_256        (1 << 7)
+#define DMA_AXI_BLEN_ALL (DMA_AXI_BLEN_4 | DMA_AXI_BLEN_8 | DMA_AXI_BLEN_16 \
+                        | DMA_AXI_BLEN_32 | DMA_AXI_BLEN_64 \
+                        | DMA_AXI_BLEN_128 | DMA_AXI_BLEN_256)
+
 /* Platfrom data for platform device structure's platform_data field */
 
 struct stmmac_mdio_bus_data {
@@ -38,16 +83,25 @@ struct stmmac_mdio_bus_data {
         int probed_phy_irq;
 };
 
+struct stmmac_dma_cfg {
+        int pbl;
+        int fixed_burst;
+        int mixed_burst;
+        int burst_len;
+};
+
 struct plat_stmmacenet_data {
+        char *phy_bus_name;
         int bus_id;
         int phy_addr;
         int interface;
         struct stmmac_mdio_bus_data *mdio_bus_data;
-        int pbl;
+        struct stmmac_dma_cfg *dma_cfg;
         int clk_csr;
         int has_gmac;
         int enh_desc;
         int tx_coe;
+        int rx_coe;
         int bugged_jumbo;
         int pmt;
         int force_sf_dma_mode;
@@ -56,6 +110,7 @@ struct plat_stmmacenet_data {
         int (*init)(struct platform_device *pdev);
         void (*exit)(struct platform_device *pdev);
         void *custom_cfg;
+        void *custom_data;
         void *bsp_priv;
 };
 #endif
diff --git a/include/linux/stmp_device.h b/include/linux/stmp_device.h
new file mode 100644
index 000000000000..6cf7ec9547cf
--- /dev/null
+++ b/include/linux/stmp_device.h
@@ -0,0 +1,20 @@
+/*
+ * basic functions for devices following the "stmp" style register layout
+ *
+ * Copyright (C) 2011 Wolfram Sang, Pengutronix e.K.
+ *
+ * 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 __STMP_DEVICE_H__
+#define __STMP_DEVICE_H__
+
+#define STMP_OFFSET_REG_SET     0x4
+#define STMP_OFFSET_REG_CLR     0x8
+#define STMP_OFFSET_REG_TOG     0xc
+
+extern int stmp_reset_block(void __iomem *);
+#endif /* __STMP_DEVICE_H__ */
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 51b29ac45a8e..40e0a273faea 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -232,7 +232,6 @@ struct svc_rqst {
         struct svc_pool *       rq_pool;        /* thread pool */
         struct svc_procedure *  rq_procinfo;    /* procedure info */
         struct auth_ops *       rq_authop;      /* authentication flavour */
-        u32                     rq_flavor;      /* pseudoflavor */
         struct svc_cred         rq_cred;        /* auth info */
         void *                  rq_xprt_ctxt;   /* transport specific context ptr */
         struct svc_deferred_req*rq_deferred;    /* deferred request we are replaying */
@@ -416,6 +415,7 @@ struct svc_procedure {
  */
 int svc_rpcb_setup(struct svc_serv *serv, struct net *net);
 void svc_rpcb_cleanup(struct svc_serv *serv, struct net *net);
+int svc_bind(struct svc_serv *serv, struct net *net);
 struct svc_serv *svc_create(struct svc_program *, unsigned int,
                             void (*shutdown)(struct svc_serv *, struct net *net));
 struct svc_rqst *svc_prepare_thread(struct svc_serv *serv,
diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
index 548790e9113b..dd74084a9799 100644
--- a/include/linux/sunrpc/svcauth.h
+++ b/include/linux/sunrpc/svcauth.h
@@ -15,14 +15,23 @@
 #include <linux/sunrpc/msg_prot.h>
 #include <linux/sunrpc/cache.h>
 #include <linux/hash.h>
+#include <linux/cred.h>
 
-#define SVC_CRED_NGROUPS        32
 struct svc_cred {
         uid_t                   cr_uid;
         gid_t                   cr_gid;
         struct group_info       *cr_group_info;
+        u32                     cr_flavor; /* pseudoflavor */
+        char                    *cr_principal; /* for gss */
 };
 
+static inline void free_svc_cred(struct svc_cred *cred)
+{
+        if (cred->cr_group_info)
+                put_group_info(cred->cr_group_info);
+        kfree(cred->cr_principal);
+}
+
 struct svc_rqst;                /* forward decl */
 struct in6_addr;
 
@@ -131,7 +140,7 @@ extern struct auth_domain *auth_domain_lookup(char *name, struct auth_domain *ne
 extern struct auth_domain *auth_domain_find(char *name);
 extern struct auth_domain *auth_unix_lookup(struct net *net, struct in6_addr *addr);
 extern int auth_unix_forget_old(struct auth_domain *dom);
-extern void svcauth_unix_purge(void);
+extern void svcauth_unix_purge(struct net *net);
 extern void svcauth_unix_info_release(struct svc_xprt *xpt);
 extern int svcauth_unix_set_client(struct svc_rqst *rqstp);
 
diff --git a/include/linux/sunrpc/svcauth_gss.h b/include/linux/sunrpc/svcauth_gss.h
index 7c32daa025eb..726aff1a5201 100644
--- a/include/linux/sunrpc/svcauth_gss.h
+++ b/include/linux/sunrpc/svcauth_gss.h
@@ -22,7 +22,6 @@ int gss_svc_init_net(struct net *net);
 void gss_svc_shutdown_net(struct net *net);
 int svcauth_gss_register_pseudoflavor(u32 pseudoflavor, char * name);
 u32 svcauth_gss_flavor(struct auth_domain *dom);
-char *svc_gss_principal(struct svc_rqst *);
 
 #endif /* __KERNEL__ */
 #endif /* _LINUX_SUNRPC_SVCAUTH_GSS_H */
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index ac1c114c499d..cd83059fb592 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -356,8 +356,9 @@ extern int unregister_pm_notifier(struct notifier_block *nb);
 extern bool events_check_enabled;
 
 extern bool pm_wakeup_pending(void);
-extern bool pm_get_wakeup_count(unsigned int *count);
+extern bool pm_get_wakeup_count(unsigned int *count, bool block);
 extern bool pm_save_wakeup_count(unsigned int count);
+extern void pm_wakep_autosleep_enabled(bool set);
 
 static inline void lock_system_sleep(void)
 {
@@ -407,6 +408,17 @@ static inline void unlock_system_sleep(void) {}
 
 #endif /* !CONFIG_PM_SLEEP */
 
+#ifdef CONFIG_PM_AUTOSLEEP
+
+/* kernel/power/autosleep.c */
+void queue_up_suspend_work(void);
+
+#else /* !CONFIG_PM_AUTOSLEEP */
+
+static inline void queue_up_suspend_work(void) {}
+
+#endif /* !CONFIG_PM_AUTOSLEEP */
+
 #ifdef CONFIG_ARCH_SAVE_PAGE_KEYS
 /*
  * The ARCH_SAVE_PAGE_KEYS functions can be used by an architecture
diff --git a/include/linux/swap.h b/include/linux/swap.h
index b1fd5c7925fe..b6661933e252 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -221,8 +221,8 @@ extern unsigned int nr_free_pagecache_pages(void);
 /* linux/mm/swap.c */
 extern void __lru_cache_add(struct page *, enum lru_list lru);
 extern void lru_cache_add_lru(struct page *, enum lru_list lru);
-extern void lru_add_page_tail(struct zone* zone,
-                              struct page *page, struct page *page_tail);
+extern void lru_add_page_tail(struct page *page, struct page *page_tail,
+                              struct lruvec *lruvec);
 extern void activate_page(struct page *);
 extern void mark_page_accessed(struct page *);
 extern void lru_add_drain(void);
@@ -251,7 +251,7 @@ static inline void lru_cache_add_file(struct page *page)
 /* linux/mm/vmscan.c */
 extern unsigned long try_to_free_pages(struct zonelist *zonelist, int order,
                                         gfp_t gfp_mask, nodemask_t *mask);
-extern int __isolate_lru_page(struct page *page, isolate_mode_t mode, int file);
+extern int __isolate_lru_page(struct page *page, isolate_mode_t mode);
 extern unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem,
                                                   gfp_t gfp_mask, bool noswap);
 extern unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem,
@@ -351,31 +351,14 @@ extern int swap_type_of(dev_t, sector_t, struct block_device **);
 extern unsigned int count_swap_pages(int, int);
 extern sector_t map_swap_page(struct page *, struct block_device **);
 extern sector_t swapdev_block(int, pgoff_t);
+extern int page_swapcount(struct page *);
 extern int reuse_swap_page(struct page *);
 extern int try_to_free_swap(struct page *);
 struct backing_dev_info;
 
-/* linux/mm/thrash.c */
-extern struct mm_struct *swap_token_mm;
-extern void grab_swap_token(struct mm_struct *);
-extern void __put_swap_token(struct mm_struct *);
-extern void disable_swap_token(struct mem_cgroup *memcg);
-
-static inline int has_swap_token(struct mm_struct *mm)
-{
-        return (mm == swap_token_mm);
-}
-
-static inline void put_swap_token(struct mm_struct *mm)
-{
-        if (has_swap_token(mm))
-                __put_swap_token(mm);
-}
-
 #ifdef CONFIG_CGROUP_MEM_RES_CTLR
 extern void
 mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout);
-extern int mem_cgroup_count_swap_user(swp_entry_t ent, struct page **pagep);
 #else
 static inline void
 mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout)
@@ -462,6 +445,11 @@ static inline void delete_from_swap_cache(struct page *page)
 {
 }
 
+static inline int page_swapcount(struct page *page)
+{
+        return 0;
+}
+
 #define reuse_swap_page(page)   (page_mapcount(page) == 1)
 
 static inline int try_to_free_swap(struct page *page)
@@ -476,37 +464,11 @@ static inline swp_entry_t get_swap_page(void)
         return entry;
 }
 
-/* linux/mm/thrash.c */
-static inline void put_swap_token(struct mm_struct *mm)
-{
-}
-
-static inline void grab_swap_token(struct mm_struct *mm)
-{
-}
-
-static inline int has_swap_token(struct mm_struct *mm)
-{
-        return 0;
-}
-
-static inline void disable_swap_token(struct mem_cgroup *memcg)
-{
-}
-
 static inline void
 mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent)
 {
 }
 
-#ifdef CONFIG_CGROUP_MEM_RES_CTLR
-static inline int
-mem_cgroup_count_swap_user(swp_entry_t ent, struct page **pagep)
-{
-        return 0;
-}
-#endif
-
 #endif /* CONFIG_SWAP */
 #endif /* __KERNEL__*/
 #endif /* _LINUX_SWAP_H */
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 3de3acb84a95..19439c75c5b2 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -858,4 +858,6 @@ asmlinkage long sys_process_vm_writev(pid_t pid,
                                       unsigned long riovcnt,
                                       unsigned long flags);
 
+asmlinkage long sys_kcmp(pid_t pid1, pid_t pid2, int type,
+                         unsigned long idx1, unsigned long idx2);
 #endif
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index 0010009b2f00..381f06db2fe5 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -27,6 +27,7 @@ struct attribute {
         const char              *name;
         umode_t                 mode;
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
+        bool                    ignore_lockdep:1;
         struct lock_class_key   *key;
         struct lock_class_key   skey;
 #endif
@@ -80,6 +81,17 @@ struct attribute_group {
 
 #define __ATTR_NULL { .attr = { .name = NULL } }
 
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+#define __ATTR_IGNORE_LOCKDEP(_name, _mode, _show, _store) {    \
+        .attr = {.name = __stringify(_name), .mode = _mode,     \
+                        .ignore_lockdep = true },               \
+        .show           = _show,                                \
+        .store          = _store,                               \
+}
+#else
+#define __ATTR_IGNORE_LOCKDEP   __ATTR
+#endif
+
 #define attr_name(_attr) (_attr).attr.name
 
 struct file;
diff --git a/include/linux/task_work.h b/include/linux/task_work.h
new file mode 100644
index 000000000000..294d5d5e90b1
--- /dev/null
+++ b/include/linux/task_work.h
@@ -0,0 +1,33 @@
+#ifndef _LINUX_TASK_WORK_H
+#define _LINUX_TASK_WORK_H
+
+#include <linux/list.h>
+#include <linux/sched.h>
+
+struct task_work;
+typedef void (*task_work_func_t)(struct task_work *);
+
+struct task_work {
+        struct hlist_node hlist;
+        task_work_func_t func;
+        void *data;
+};
+
+static inline void
+init_task_work(struct task_work *twork, task_work_func_t func, void *data)
+{
+        twork->func = func;
+        twork->data = data;
+}
+
+int task_work_add(struct task_struct *task, struct task_work *twork, bool);
+struct task_work *task_work_cancel(struct task_struct *, task_work_func_t);
+void task_work_run(void);
+
+static inline void exit_task_work(struct task_struct *task)
+{
+        if (unlikely(!hlist_empty(&task->task_works)))
+                task_work_run();
+}
+
+#endif  /* _LINUX_TASK_WORK_H */
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index b6c62d294380..4c5b63283377 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -106,6 +106,22 @@ enum {
 #define TCP_THIN_LINEAR_TIMEOUTS 16      /* Use linear timeouts for thin streams*/
 #define TCP_THIN_DUPACK         17      /* Fast retrans. after 1 dupack */
 #define TCP_USER_TIMEOUT        18      /* How long for loss retry before timeout */
+#define TCP_REPAIR              19      /* TCP sock is under repair right now */
+#define TCP_REPAIR_QUEUE        20
+#define TCP_QUEUE_SEQ           21
+#define TCP_REPAIR_OPTIONS      22
+
+struct tcp_repair_opt {
+        __u32   opt_code;
+        __u32   opt_val;
+};
+
+enum {
+        TCP_NO_QUEUE,
+        TCP_RECV_QUEUE,
+        TCP_SEND_QUEUE,
+        TCP_QUEUES_NR,
+};
 
 /* for TCP_INFO socket option */
 #define TCPI_OPT_TIMESTAMPS     1
@@ -353,7 +369,11 @@ struct tcp_sock {
         u8      nonagle     : 4,/* Disable Nagle algorithm?             */
                 thin_lto    : 1,/* Use linear timeouts for thin streams */
                 thin_dupack : 1,/* Fast retransmit on first dupack      */
-                unused      : 2;
+                repair      : 1,
+                unused      : 1;
+        u8      repair_queue;
+        u8      do_early_retrans:1,/* Enable RFC5827 early-retransmit  */
+                early_retrans_delayed:1; /* Delayed ER timer installed */
 
 /* RTT measurement */
         u32     srtt;           /* smoothed round trip time << 3        */
@@ -406,7 +426,7 @@ struct tcp_sock {
 
         struct sk_buff_head     out_of_order_queue; /* Out of order segments go here */
 
-        /* SACKs data, these 2 need to be together (see tcp_build_and_update_options) */
+        /* SACKs data, these 2 need to be together (see tcp_options_write) */
         struct tcp_sack_block duplicate_sack[1]; /* D-SACK block */
         struct tcp_sack_block selective_acks[4]; /* The SACKS themselves*/
 
diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
index 8d03f079688c..ccc1899bd62e 100644
--- a/include/linux/thread_info.h
+++ b/include/linux/thread_info.h
@@ -8,6 +8,7 @@
 #define _LINUX_THREAD_INFO_H
 
 #include <linux/types.h>
+#include <linux/bug.h>
 
 struct timespec;
 struct compat_timespec;
@@ -54,6 +55,12 @@ extern long do_no_restart_syscall(struct restart_block *parm);
 
 #ifdef __KERNEL__
 
+#ifdef CONFIG_DEBUG_STACK_USAGE
+# define THREADINFO_GFP         (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO)
+#else
+# define THREADINFO_GFP         (GFP_KERNEL | __GFP_NOTRACK)
+#endif
+
 /*
  * flag set/clear/test wrappers
  * - pass TIF_xxxx constants to these functions
@@ -119,10 +126,26 @@ static inline int test_ti_thread_flag(struct thread_info *ti, int flag)
 static inline void set_restore_sigmask(void)
 {
         set_thread_flag(TIF_RESTORE_SIGMASK);
-        set_thread_flag(TIF_SIGPENDING);
+        WARN_ON(!test_thread_flag(TIF_SIGPENDING));
+}
+static inline void clear_restore_sigmask(void)
+{
+        clear_thread_flag(TIF_RESTORE_SIGMASK);
+}
+static inline bool test_restore_sigmask(void)
+{
+        return test_thread_flag(TIF_RESTORE_SIGMASK);
+}
+static inline bool test_and_clear_restore_sigmask(void)
+{
+        return test_and_clear_thread_flag(TIF_RESTORE_SIGMASK);
 }
 #endif  /* TIF_RESTORE_SIGMASK && !HAVE_SET_RESTORE_SIGMASK */
 
+#ifndef HAVE_SET_RESTORE_SIGMASK
+#error "no set_restore_sigmask() provided and default one won't work"
+#endif
+
 #endif  /* __KERNEL__ */
 
 #endif /* _LINUX_THREAD_INFO_H */
diff --git a/include/linux/ti_wilink_st.h b/include/linux/ti_wilink_st.h
index 2ef4385da6bf..3ca0269dd0b5 100644
--- a/include/linux/ti_wilink_st.h
+++ b/include/linux/ti_wilink_st.h
@@ -25,6 +25,8 @@
 #ifndef TI_WILINK_ST_H
 #define TI_WILINK_ST_H
 
+#include <linux/skbuff.h>
+
 /**
  * enum proto-type - The protocol on WiLink chips which share a
  *      common physical interface like UART.
diff --git a/include/linux/time.h b/include/linux/time.h
index 33a92ead4d88..179f4d6755fc 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -167,7 +167,6 @@ extern void get_monotonic_boottime(struct timespec *ts);
 extern struct timespec timespec_trunc(struct timespec t, unsigned gran);
 extern int timekeeping_valid_for_hres(void);
 extern u64 timekeeping_max_deferment(void);
-extern void timekeeping_leap_insert(int leapsecond);
 extern int timekeeping_inject_offset(struct timespec *ts);
 
 struct tms;
diff --git a/include/linux/topology.h b/include/linux/topology.h
index e26db031303b..e91cd43394df 100644
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -70,7 +70,6 @@ int arch_update_cpu_topology(void);
  * Below are the 3 major initializers used in building sched_domains:
  * SD_SIBLING_INIT, for SMT domains
  * SD_CPU_INIT, for SMP domains
- * SD_NODE_INIT, for NUMA domains
  *
  * Any architecture that cares to do any tuning to these values should do so
  * by defining their own arch-specific initializer in include/asm/topology.h.
@@ -99,7 +98,6 @@ int arch_update_cpu_topology(void);
                                 | 0*SD_BALANCE_WAKE                     \
                                 | 1*SD_WAKE_AFFINE                      \
                                 | 1*SD_SHARE_CPUPOWER                   \
-                                | 0*SD_POWERSAVINGS_BALANCE             \
                                 | 1*SD_SHARE_PKG_RESOURCES              \
                                 | 0*SD_SERIALIZE                        \
                                 | 0*SD_PREFER_SIBLING                   \
@@ -135,8 +133,6 @@ int arch_update_cpu_topology(void);
                                 | 0*SD_SHARE_CPUPOWER                   \
                                 | 1*SD_SHARE_PKG_RESOURCES              \
                                 | 0*SD_SERIALIZE                        \
-                                | sd_balance_for_mc_power()             \
-                                | sd_power_saving_flags()               \
                                 ,                                       \
         .last_balance           = jiffies,                              \
         .balance_interval       = 1,                                    \
@@ -168,56 +164,18 @@ int arch_update_cpu_topology(void);
                                 | 0*SD_SHARE_CPUPOWER                   \
                                 | 0*SD_SHARE_PKG_RESOURCES              \
                                 | 0*SD_SERIALIZE                        \
-                                | sd_balance_for_package_power()        \
-                                | sd_power_saving_flags()               \
                                 ,                                       \
         .last_balance           = jiffies,                              \
         .balance_interval       = 1,                                    \
 }
 #endif
 
-/* sched_domains SD_ALLNODES_INIT for NUMA machines */
-#define SD_ALLNODES_INIT (struct sched_domain) {                        \
-        .min_interval           = 64,                                   \
-        .max_interval           = 64*num_online_cpus(),                 \
-        .busy_factor            = 128,                                  \
-        .imbalance_pct          = 133,                                  \
-        .cache_nice_tries       = 1,                                    \
-        .busy_idx               = 3,                                    \
-        .idle_idx               = 3,                                    \
-        .flags                  = 1*SD_LOAD_BALANCE                     \
-                                | 1*SD_BALANCE_NEWIDLE                  \
-                                | 0*SD_BALANCE_EXEC                     \
-                                | 0*SD_BALANCE_FORK                     \
-                                | 0*SD_BALANCE_WAKE                     \
-                                | 0*SD_WAKE_AFFINE                      \
-                                | 0*SD_SHARE_CPUPOWER                   \
-                                | 0*SD_POWERSAVINGS_BALANCE             \
-                                | 0*SD_SHARE_PKG_RESOURCES              \
-                                | 1*SD_SERIALIZE                        \
-                                | 0*SD_PREFER_SIBLING                   \
-                                ,                                       \
-        .last_balance           = jiffies,                              \
-        .balance_interval       = 64,                                   \
-}
-
-#ifndef SD_NODES_PER_DOMAIN
-#define SD_NODES_PER_DOMAIN 16
-#endif
-
 #ifdef CONFIG_SCHED_BOOK
 #ifndef SD_BOOK_INIT
 #error Please define an appropriate SD_BOOK_INIT in include/asm/topology.h!!!
 #endif
 #endif /* CONFIG_SCHED_BOOK */
 
-#ifdef CONFIG_NUMA
-#ifndef SD_NODE_INIT
-#error Please define an appropriate SD_NODE_INIT in include/asm/topology.h!!!
-#endif
-
-#endif /* CONFIG_NUMA */
-
 #ifdef CONFIG_USE_PERCPU_NUMA_NODE_ID
 DECLARE_PER_CPU(int, numa_node);
 
@@ -239,7 +197,7 @@ static inline int cpu_to_node(int cpu)
 #ifndef set_numa_node
 static inline void set_numa_node(int node)
 {
-        percpu_write(numa_node, node);
+        this_cpu_write(numa_node, node);
 }
 #endif
 
@@ -274,7 +232,7 @@ DECLARE_PER_CPU(int, _numa_mem_);
 #ifndef set_numa_mem
 static inline void set_numa_mem(int node)
 {
-        percpu_write(_numa_mem_, node);
+        this_cpu_write(_numa_mem_, node);
 }
 #endif
 
diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
index 51bd91d911c3..6a4d82bedb03 100644
--- a/include/linux/tracehook.h
+++ b/include/linux/tracehook.h
@@ -49,6 +49,7 @@
 #include <linux/sched.h>
 #include <linux/ptrace.h>
 #include <linux/security.h>
+#include <linux/task_work.h>
 struct linux_binprm;
 
 /*
@@ -153,7 +154,6 @@ static inline void tracehook_signal_handler(int sig, siginfo_t *info,
                 ptrace_notify(SIGTRAP);
 }
 
-#ifdef TIF_NOTIFY_RESUME
 /**
  * set_notify_resume - cause tracehook_notify_resume() to be called
  * @task:               task that will call tracehook_notify_resume()
@@ -165,8 +165,10 @@ static inline void tracehook_signal_handler(int sig, siginfo_t *info,
  */
 static inline void set_notify_resume(struct task_struct *task)
 {
+#ifdef TIF_NOTIFY_RESUME
         if (!test_and_set_tsk_thread_flag(task, TIF_NOTIFY_RESUME))
                 kick_process(task);
+#endif
 }
 
 /**
@@ -184,7 +186,14 @@ static inline void set_notify_resume(struct task_struct *task)
  */
 static inline void tracehook_notify_resume(struct pt_regs *regs)
 {
+        /*
+         * The caller just cleared TIF_NOTIFY_RESUME. This barrier
+         * pairs with task_work_add()->set_notify_resume() after
+         * hlist_add_head(task->task_works);
+         */
+        smp_mb__after_clear_bit();
+        if (unlikely(!hlist_empty(&current->task_works)))
+                task_work_run();
 }
-#endif  /* TIF_NOTIFY_RESUME */
 
 #endif  /* <linux/tracehook.h> */
diff --git a/include/linux/trdevice.h b/include/linux/trdevice.h
deleted file mode 100644
index bfc84a7aecc5..000000000000
--- a/include/linux/trdevice.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * INET         An implementation of the TCP/IP protocol suite for the LINUX
- *              operating system.  NET  is implemented using the  BSD Socket
- *              interface as the means of communication with the user level.
- *
- *              Definitions for the Token-ring handlers.
- *
- * Version:     @(#)eth.h       1.0.4   05/13/93
- *
- * Authors:     Ross Biro
- *              Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *
- *              Relocated to include/linux where it belongs by Alan Cox 
- *                                                      <gw4pts@gw4pts.ampr.org>
- *
- *              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.
- *
- *      WARNING: This move may well be temporary. This file will get merged with others RSN.
- *
- */
-#ifndef _LINUX_TRDEVICE_H
-#define _LINUX_TRDEVICE_H
-
-
-#include <linux/if_tr.h>
-
-#ifdef __KERNEL__
-extern __be16 tr_type_trans(struct sk_buff *skb, struct net_device *dev);
-extern void tr_source_route(struct sk_buff *skb, struct trh_hdr *trh, struct net_device *dev);
-extern struct net_device *alloc_trdev(int sizeof_priv);
-
-#endif
-
-#endif  /* _LINUX_TRDEVICE_H */
diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
index ff7dc08696a8..fb79dd8d1537 100644
--- a/include/linux/tty_ldisc.h
+++ b/include/linux/tty_ldisc.h
@@ -110,6 +110,7 @@
 #include <linux/fs.h>
 #include <linux/wait.h>
 #include <linux/pps_kernel.h>
+#include <linux/wait.h>
 
 struct tty_ldisc_ops {
         int     magic;
@@ -154,6 +155,7 @@ struct tty_ldisc_ops {
 struct tty_ldisc {
         struct tty_ldisc_ops *ops;
         atomic_t users;
+        wait_queue_head_t wq_idle;
 };
 
 #define TTY_LDISC_MAGIC 0x5403
diff --git a/include/linux/types.h b/include/linux/types.h
index 7f480db60231..9c1bd539ea70 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -25,7 +25,7 @@ typedef __kernel_dev_t		dev_t;
 typedef __kernel_ino_t          ino_t;
 typedef __kernel_mode_t         mode_t;
 typedef unsigned short          umode_t;
-typedef __kernel_nlink_t        nlink_t;
+typedef __u32                   nlink_t;
 typedef __kernel_off_t          off_t;
 typedef __kernel_pid_t          pid_t;
 typedef __kernel_daddr_t        daddr_t;
diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
new file mode 100644
index 000000000000..8e522cbcef29
--- /dev/null
+++ b/include/linux/uidgid.h
@@ -0,0 +1,200 @@
+#ifndef _LINUX_UIDGID_H
+#define _LINUX_UIDGID_H
+
+/*
+ * A set of types for the internal kernel types representing uids and gids.
+ *
+ * The types defined in this header allow distinguishing which uids and gids in
+ * the kernel are values used by userspace and which uid and gid values are
+ * the internal kernel values.  With the addition of user namespaces the values
+ * can be different.  Using the type system makes it possible for the compiler
+ * to detect when we overlook these differences.
+ *
+ */
+#include <linux/types.h>
+#include <linux/highuid.h>
+
+struct user_namespace;
+extern struct user_namespace init_user_ns;
+
+#ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
+
+typedef struct {
+        uid_t val;
+} kuid_t;
+
+
+typedef struct {
+        gid_t val;
+} kgid_t;
+
+#define KUIDT_INIT(value) (kuid_t){ value }
+#define KGIDT_INIT(value) (kgid_t){ value }
+
+static inline uid_t __kuid_val(kuid_t uid)
+{
+        return uid.val;
+}
+
+static inline gid_t __kgid_val(kgid_t gid)
+{
+        return gid.val;
+}
+
+#else
+
+typedef uid_t kuid_t;
+typedef gid_t kgid_t;
+
+static inline uid_t __kuid_val(kuid_t uid)
+{
+        return uid;
+}
+
+static inline gid_t __kgid_val(kgid_t gid)
+{
+        return gid;
+}
+
+#define KUIDT_INIT(value) ((kuid_t) value )
+#define KGIDT_INIT(value) ((kgid_t) value )
+
+#endif
+
+#define GLOBAL_ROOT_UID KUIDT_INIT(0)
+#define GLOBAL_ROOT_GID KGIDT_INIT(0)
+
+#define INVALID_UID KUIDT_INIT(-1)
+#define INVALID_GID KGIDT_INIT(-1)
+
+static inline bool uid_eq(kuid_t left, kuid_t right)
+{
+        return __kuid_val(left) == __kuid_val(right);
+}
+
+static inline bool gid_eq(kgid_t left, kgid_t right)
+{
+        return __kgid_val(left) == __kgid_val(right);
+}
+
+static inline bool uid_gt(kuid_t left, kuid_t right)
+{
+        return __kuid_val(left) > __kuid_val(right);
+}
+
+static inline bool gid_gt(kgid_t left, kgid_t right)
+{
+        return __kgid_val(left) > __kgid_val(right);
+}
+
+static inline bool uid_gte(kuid_t left, kuid_t right)
+{
+        return __kuid_val(left) >= __kuid_val(right);
+}
+
+static inline bool gid_gte(kgid_t left, kgid_t right)
+{
+        return __kgid_val(left) >= __kgid_val(right);
+}
+
+static inline bool uid_lt(kuid_t left, kuid_t right)
+{
+        return __kuid_val(left) < __kuid_val(right);
+}
+
+static inline bool gid_lt(kgid_t left, kgid_t right)
+{
+        return __kgid_val(left) < __kgid_val(right);
+}
+
+static inline bool uid_lte(kuid_t left, kuid_t right)
+{
+        return __kuid_val(left) <= __kuid_val(right);
+}
+
+static inline bool gid_lte(kgid_t left, kgid_t right)
+{
+        return __kgid_val(left) <= __kgid_val(right);
+}
+
+static inline bool uid_valid(kuid_t uid)
+{
+        return !uid_eq(uid, INVALID_UID);
+}
+
+static inline bool gid_valid(kgid_t gid)
+{
+        return !gid_eq(gid, INVALID_GID);
+}
+
+#ifdef CONFIG_USER_NS
+
+extern kuid_t make_kuid(struct user_namespace *from, uid_t uid);
+extern kgid_t make_kgid(struct user_namespace *from, gid_t gid);
+
+extern uid_t from_kuid(struct user_namespace *to, kuid_t uid);
+extern gid_t from_kgid(struct user_namespace *to, kgid_t gid);
+extern uid_t from_kuid_munged(struct user_namespace *to, kuid_t uid);
+extern gid_t from_kgid_munged(struct user_namespace *to, kgid_t gid);
+
+static inline bool kuid_has_mapping(struct user_namespace *ns, kuid_t uid)
+{
+        return from_kuid(ns, uid) != (uid_t) -1;
+}
+
+static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
+{
+        return from_kgid(ns, gid) != (gid_t) -1;
+}
+
+#else
+
+static inline kuid_t make_kuid(struct user_namespace *from, uid_t uid)
+{
+        return KUIDT_INIT(uid);
+}
+
+static inline kgid_t make_kgid(struct user_namespace *from, gid_t gid)
+{
+        return KGIDT_INIT(gid);
+}
+
+static inline uid_t from_kuid(struct user_namespace *to, kuid_t kuid)
+{
+        return __kuid_val(kuid);
+}
+
+static inline gid_t from_kgid(struct user_namespace *to, kgid_t kgid)
+{
+        return __kgid_val(kgid);
+}
+
+static inline uid_t from_kuid_munged(struct user_namespace *to, kuid_t kuid)
+{
+        uid_t uid = from_kuid(to, kuid);
+        if (uid == (uid_t)-1)
+                uid = overflowuid;
+        return uid;
+}
+
+static inline gid_t from_kgid_munged(struct user_namespace *to, kgid_t kgid)
+{
+        gid_t gid = from_kgid(to, kgid);
+        if (gid == (gid_t)-1)
+                gid = overflowgid;
+        return gid;
+}
+
+static inline bool kuid_has_mapping(struct user_namespace *ns, kuid_t uid)
+{
+        return true;
+}
+
+static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
+{
+        return true;
+}
+
+#endif /* CONFIG_USER_NS */
+
+#endif /* _LINUX_UIDGID_H */
diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h
new file mode 100644
index 000000000000..efe4b3308c74
--- /dev/null
+++ b/include/linux/uprobes.h
@@ -0,0 +1,165 @@
+#ifndef _LINUX_UPROBES_H
+#define _LINUX_UPROBES_H
+/*
+ * User-space Probes (UProbes)
+ *
+ * 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.
+ *
+ * Copyright (C) IBM Corporation, 2008-2012
+ * Authors:
+ *      Srikar Dronamraju
+ *      Jim Keniston
+ * Copyright (C) 2011-2012 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
+ */
+
+#include <linux/errno.h>
+#include <linux/rbtree.h>
+
+struct vm_area_struct;
+struct mm_struct;
+struct inode;
+
+#ifdef CONFIG_ARCH_SUPPORTS_UPROBES
+# include <asm/uprobes.h>
+#endif
+
+/* flags that denote/change uprobes behaviour */
+
+/* Have a copy of original instruction */
+#define UPROBE_COPY_INSN        0x1
+
+/* Dont run handlers when first register/ last unregister in progress*/
+#define UPROBE_RUN_HANDLER      0x2
+/* Can skip singlestep */
+#define UPROBE_SKIP_SSTEP       0x4
+
+struct uprobe_consumer {
+        int (*handler)(struct uprobe_consumer *self, struct pt_regs *regs);
+        /*
+         * filter is optional; If a filter exists, handler is run
+         * if and only if filter returns true.
+         */
+        bool (*filter)(struct uprobe_consumer *self, struct task_struct *task);
+
+        struct uprobe_consumer *next;
+};
+
+#ifdef CONFIG_UPROBES
+enum uprobe_task_state {
+        UTASK_RUNNING,
+        UTASK_BP_HIT,
+        UTASK_SSTEP,
+        UTASK_SSTEP_ACK,
+        UTASK_SSTEP_TRAPPED,
+};
+
+/*
+ * uprobe_task: Metadata of a task while it singlesteps.
+ */
+struct uprobe_task {
+        enum uprobe_task_state          state;
+        struct arch_uprobe_task         autask;
+
+        struct uprobe                   *active_uprobe;
+
+        unsigned long                   xol_vaddr;
+        unsigned long                   vaddr;
+};
+
+/*
+ * On a breakpoint hit, thread contests for a slot.  It frees the
+ * slot after singlestep. Currently a fixed number of slots are
+ * allocated.
+ */
+struct xol_area {
+        wait_queue_head_t       wq;             /* if all slots are busy */
+        atomic_t                slot_count;     /* number of in-use slots */
+        unsigned long           *bitmap;        /* 0 = free slot */
+        struct page             *page;
+
+        /*
+         * We keep the vma's vm_start rather than a pointer to the vma
+         * itself.  The probed process or a naughty kernel module could make
+         * the vma go away, and we must handle that reasonably gracefully.
+         */
+        unsigned long           vaddr;          /* Page(s) of instruction slots */
+};
+
+struct uprobes_state {
+        struct xol_area         *xol_area;
+        atomic_t                count;
+};
+extern int __weak set_swbp(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long vaddr);
+extern int __weak set_orig_insn(struct arch_uprobe *aup, struct mm_struct *mm,  unsigned long vaddr, bool verify);
+extern bool __weak is_swbp_insn(uprobe_opcode_t *insn);
+extern int uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);
+extern void uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);
+extern int uprobe_mmap(struct vm_area_struct *vma);
+extern void uprobe_munmap(struct vm_area_struct *vma, unsigned long start, unsigned long end);
+extern void uprobe_free_utask(struct task_struct *t);
+extern void uprobe_copy_process(struct task_struct *t);
+extern unsigned long __weak uprobe_get_swbp_addr(struct pt_regs *regs);
+extern int uprobe_post_sstep_notifier(struct pt_regs *regs);
+extern int uprobe_pre_sstep_notifier(struct pt_regs *regs);
+extern void uprobe_notify_resume(struct pt_regs *regs);
+extern bool uprobe_deny_signal(void);
+extern bool __weak arch_uprobe_skip_sstep(struct arch_uprobe *aup, struct pt_regs *regs);
+extern void uprobe_clear_state(struct mm_struct *mm);
+extern void uprobe_reset_state(struct mm_struct *mm);
+#else /* !CONFIG_UPROBES */
+struct uprobes_state {
+};
+static inline int
+uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *uc)
+{
+        return -ENOSYS;
+}
+static inline void
+uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consumer *uc)
+{
+}
+static inline int uprobe_mmap(struct vm_area_struct *vma)
+{
+        return 0;
+}
+static inline void
+uprobe_munmap(struct vm_area_struct *vma, unsigned long start, unsigned long end)
+{
+}
+static inline void uprobe_notify_resume(struct pt_regs *regs)
+{
+}
+static inline bool uprobe_deny_signal(void)
+{
+        return false;
+}
+static inline unsigned long uprobe_get_swbp_addr(struct pt_regs *regs)
+{
+        return 0;
+}
+static inline void uprobe_free_utask(struct task_struct *t)
+{
+}
+static inline void uprobe_copy_process(struct task_struct *t)
+{
+}
+static inline void uprobe_clear_state(struct mm_struct *mm)
+{
+}
+static inline void uprobe_reset_state(struct mm_struct *mm)
+{
+}
+#endif /* !CONFIG_UPROBES */
+#endif  /* _LINUX_UPROBES_H */
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 73b68d1f2cb0..dea39dc551d4 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -351,10 +351,6 @@ struct usb_bus {
         int bandwidth_int_reqs;         /* number of Interrupt requests */
         int bandwidth_isoc_reqs;        /* number of Isoc. requests */
 
-#ifdef CONFIG_USB_DEVICEFS
-        struct dentry *usbfs_dentry;    /* usbfs dentry entry for the bus */
-#endif
-
 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
         struct mon_bus *mon_bus;        /* non-null when associated */
         int monitored;                  /* non-zero when monitored */
@@ -382,6 +378,45 @@ enum usb_device_removable {
         USB_DEVICE_FIXED,
 };
 
+/*
+ * USB 3.0 Link Power Management (LPM) parameters.
+ *
+ * PEL and SEL are USB 3.0 Link PM latencies for device-initiated LPM exit.
+ * MEL is the USB 3.0 Link PM latency for host-initiated LPM exit.
+ * All three are stored in nanoseconds.
+ */
+struct usb3_lpm_parameters {
+        /*
+         * Maximum exit latency (MEL) for the host to send a packet to the
+         * device (either a Ping for isoc endpoints, or a data packet for
+         * interrupt endpoints), the hubs to decode the packet, and for all hubs
+         * in the path to transition the links to U0.
+         */
+        unsigned int mel;
+        /*
+         * Maximum exit latency for a device-initiated LPM transition to bring
+         * all links into U0.  Abbreviated as "PEL" in section 9.4.12 of the USB
+         * 3.0 spec, with no explanation of what "P" stands for.  "Path"?
+         */
+        unsigned int pel;
+
+        /*
+         * The System Exit Latency (SEL) includes PEL, and three other
+         * latencies.  After a device initiates a U0 transition, it will take
+         * some time from when the device sends the ERDY to when it will finally
+         * receive the data packet.  Basically, SEL should be the worse-case
+         * latency from when a device starts initiating a U0 transition to when
+         * it will get data.
+         */
+        unsigned int sel;
+        /*
+         * The idle timeout value that is currently programmed into the parent
+         * hub for this device.  When the timer counts to zero, the parent hub
+         * will initiate an LPM transition to either U1 or U2.
+         */
+        int timeout;
+};
+
 /**
  * struct usb_device - kernel's representation of a USB device
  * @devnum: device number; address on a USB bus
@@ -439,6 +474,12 @@ enum usb_device_removable {
  *      specific data for the device.
  * @slot_id: Slot ID assigned by xHCI
  * @removable: Device can be physically removed from this port
+ * @u1_params: exit latencies for USB3 U1 LPM state, and hub-initiated timeout.
+ * @u2_params: exit latencies for USB3 U2 LPM state, and hub-initiated timeout.
+ * @lpm_disable_count: Ref count used by usb_disable_lpm() and usb_enable_lpm()
+ *      to keep track of the number of functions that require USB 3.0 Link Power
+ *      Management to be disabled for this usb_device.  This count should only
+ *      be manipulated by those functions, with the bandwidth_mutex is held.
  *
  * Notes:
  * Usbcore drivers should not set usbdev->state directly.  Instead use
@@ -485,6 +526,7 @@ struct usb_device {
         unsigned lpm_capable:1;
         unsigned usb2_hw_lpm_capable:1;
         unsigned usb2_hw_lpm_enabled:1;
+        unsigned usb3_lpm_enabled:1;
         int string_langid;
 
         /* static strings from the device */
@@ -493,12 +535,6 @@ struct usb_device {
         char *serial;
 
         struct list_head filelist;
-#ifdef CONFIG_USB_DEVICE_CLASS
-        struct device *usb_classdev;
-#endif
-#ifdef CONFIG_USB_DEVICEFS
-        struct dentry *usbfs_dentry;
-#endif
 
         int maxchild;
         struct usb_device **children;
@@ -517,6 +553,10 @@ struct usb_device {
         struct wusb_dev *wusb_dev;
         int slot_id;
         enum usb_device_removable removable;
+        struct usb3_lpm_parameters u1_params;
+        struct usb3_lpm_parameters u2_params;
+        unsigned lpm_disable_count;
+        unsigned hub_initiated_lpm_disable_count;
 };
 #define to_usb_device(d) container_of(d, struct usb_device, dev)
 
@@ -583,6 +623,12 @@ static inline void usb_mark_last_busy(struct usb_device *udev)
 { }
 #endif
 
+extern int usb_disable_lpm(struct usb_device *udev);
+extern void usb_enable_lpm(struct usb_device *udev);
+/* Same as above, but these functions lock/unlock the bandwidth_mutex. */
+extern int usb_unlocked_disable_lpm(struct usb_device *udev);
+extern void usb_unlocked_enable_lpm(struct usb_device *udev);
+
 /*-------------------------------------------------------------------------*/
 
 /* for drivers using iso endpoints */
@@ -800,6 +846,8 @@ extern ssize_t usb_store_new_id(struct usb_dynids *dynids,
                                 struct device_driver *driver,
                                 const char *buf, size_t count);
 
+extern ssize_t usb_show_dynids(struct usb_dynids *dynids, char *buf);
+
 /**
  * struct usbdrv_wrap - wrapper for driver-model structure
  * @driver: The driver-model core driver structure.
@@ -850,6 +898,9 @@ struct usbdrv_wrap {
  *      for interfaces bound to this driver.
  * @soft_unbind: if set to 1, the USB core will not kill URBs and disable
  *      endpoints before calling the driver's disconnect method.
+ * @disable_hub_initiated_lpm: if set to 0, the USB core will not allow hubs
+ *      to initiate lower power link state transitions when an idle timeout
+ *      occurs.  Device-initiated USB 3.0 link PM will still be allowed.
  *
  * USB interface drivers must provide a name, probe() and disconnect()
  * methods, and an id_table.  Other driver fields are optional.
@@ -890,6 +941,7 @@ struct usb_driver {
         struct usbdrv_wrap drvwrap;
         unsigned int no_dynamic_id:1;
         unsigned int supports_autosuspend:1;
+        unsigned int disable_hub_initiated_lpm:1;
         unsigned int soft_unbind:1;
 };
 #define to_usb_driver(d) container_of(d, struct usb_driver, drvwrap.driver)
@@ -1379,6 +1431,7 @@ extern int usb_unlink_urb(struct urb *urb);
 extern void usb_kill_urb(struct urb *urb);
 extern void usb_poison_urb(struct urb *urb);
 extern void usb_unpoison_urb(struct urb *urb);
+extern void usb_block_urb(struct urb *urb);
 extern void usb_kill_anchored_urbs(struct usb_anchor *anchor);
 extern void usb_poison_anchored_urbs(struct usb_anchor *anchor);
 extern void usb_unpoison_anchored_urbs(struct usb_anchor *anchor);
@@ -1391,6 +1444,8 @@ extern struct urb *usb_get_from_anchor(struct usb_anchor *anchor);
 extern void usb_scuttle_anchored_urbs(struct usb_anchor *anchor);
 extern int usb_anchor_empty(struct usb_anchor *anchor);
 
+#define usb_unblock_urb usb_unpoison_urb
+
 /**
  * usb_urb_dir_in - check if an URB describes an IN transfer
  * @urb: URB to be checked
@@ -1627,6 +1682,7 @@ static inline int usb_translate_errors(int error_code)
         case 0:
         case -ENOMEM:
         case -ENODEV:
+        case -EOPNOTSUPP:
                 return error_code;
         default:
                 return -EIO;
@@ -1652,9 +1708,6 @@ do {									\
 } while (0)
 #endif
 
-#define err(format, arg...)                                     \
-        printk(KERN_ERR KBUILD_MODNAME ": " format "\n", ##arg)
-
 /* debugfs stuff */
 extern struct dentry *usb_debug_root;
 
diff --git a/include/linux/usb/ch11.h b/include/linux/usb/ch11.h
index f1d26b6067f1..b6c2863b2c94 100644
--- a/include/linux/usb/ch11.h
+++ b/include/linux/usb/ch11.h
@@ -76,6 +76,8 @@
 #define USB_PORT_FEAT_C_BH_PORT_RESET           29
 #define USB_PORT_FEAT_FORCE_LINKPM_ACCEPT       30
 
+#define USB_PORT_LPM_TIMEOUT(p)                 (((p) & 0xff) << 8)
+
 /* USB 3.0 hub remote wake mask bits, see table 10-14 */
 #define USB_PORT_FEAT_REMOTE_WAKE_CONNECT       (1 << 8)
 #define USB_PORT_FEAT_REMOTE_WAKE_DISCONNECT    (1 << 9)
diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h
index af21f3115919..d1d732c2838d 100644
--- a/include/linux/usb/ch9.h
+++ b/include/linux/usb/ch9.h
@@ -88,6 +88,8 @@
 #define USB_REQ_GET_INTERFACE           0x0A
 #define USB_REQ_SET_INTERFACE           0x0B
 #define USB_REQ_SYNCH_FRAME             0x0C
+#define USB_REQ_SET_SEL                 0x30
+#define USB_REQ_SET_ISOCH_DELAY         0x31
 
 #define USB_REQ_SET_ENCRYPTION          0x0D    /* Wireless USB */
 #define USB_REQ_GET_ENCRYPTION          0x0E
@@ -390,6 +392,11 @@ struct usb_endpoint_descriptor {
 #define USB_ENDPOINT_XFER_INT           3
 #define USB_ENDPOINT_MAX_ADJUSTABLE     0x80
 
+/* The USB 3.0 spec redefines bits 5:4 of bmAttributes as interrupt ep type. */
+#define USB_ENDPOINT_INTRTYPE           0x30
+#define USB_ENDPOINT_INTR_PERIODIC      (0 << 4)
+#define USB_ENDPOINT_INTR_NOTIFICATION  (1 << 4)
+
 #define USB_ENDPOINT_SYNCTYPE           0x0c
 #define USB_ENDPOINT_SYNC_NONE          (0 << 2)
 #define USB_ENDPOINT_SYNC_ASYNC         (1 << 2)
@@ -592,6 +599,12 @@ static inline int usb_endpoint_maxp(const struct usb_endpoint_descriptor *epd)
         return __le16_to_cpu(epd->wMaxPacketSize);
 }
 
+static inline int usb_endpoint_interrupt_type(
+                const struct usb_endpoint_descriptor *epd)
+{
+        return epd->bmAttributes & USB_ENDPOINT_INTRTYPE;
+}
+
 /*-------------------------------------------------------------------------*/
 
 /* USB_DT_SS_ENDPOINT_COMP: SuperSpeed Endpoint Companion descriptor */
@@ -933,6 +946,51 @@ enum usb_device_state {
          */
 };
 
+enum usb3_link_state {
+        USB3_LPM_U0 = 0,
+        USB3_LPM_U1,
+        USB3_LPM_U2,
+        USB3_LPM_U3
+};
+
+/*
+ * A U1 timeout of 0x0 means the parent hub will reject any transitions to U1.
+ * 0xff means the parent hub will accept transitions to U1, but will not
+ * initiate a transition.
+ *
+ * A U1 timeout of 0x1 to 0x7F also causes the hub to initiate a transition to
+ * U1 after that many microseconds.  Timeouts of 0x80 to 0xFE are reserved
+ * values.
+ *
+ * A U2 timeout of 0x0 means the parent hub will reject any transitions to U2.
+ * 0xff means the parent hub will accept transitions to U2, but will not
+ * initiate a transition.
+ *
+ * A U2 timeout of 0x1 to 0xFE also causes the hub to initiate a transition to
+ * U2 after N*256 microseconds.  Therefore a U2 timeout value of 0x1 means a U2
+ * idle timer of 256 microseconds, 0x2 means 512 microseconds, 0xFE means
+ * 65.024ms.
+ */
+#define USB3_LPM_DISABLED               0x0
+#define USB3_LPM_U1_MAX_TIMEOUT         0x7F
+#define USB3_LPM_U2_MAX_TIMEOUT         0xFE
+#define USB3_LPM_DEVICE_INITIATED       0xFF
+
+struct usb_set_sel_req {
+        __u8    u1_sel;
+        __u8    u1_pel;
+        __le16  u2_sel;
+        __le16  u2_pel;
+} __attribute__ ((packed));
+
+/*
+ * The Set System Exit Latency control transfer provides one byte each for
+ * U1 SEL and U1 PEL, so the max exit latency is 0xFF.  U2 SEL and U2 PEL each
+ * are two bytes long.
+ */
+#define USB3_LPM_MAX_U1_SEL_PEL         0xFF
+#define USB3_LPM_MAX_U2_SEL_PEL         0xFFFF
+
 /*-------------------------------------------------------------------------*/
 
 /*
diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h
new file mode 100644
index 000000000000..edb90d6cfd12
--- /dev/null
+++ b/include/linux/usb/chipidea.h
@@ -0,0 +1,28 @@
+/*
+ * Platform data for the chipidea USB dual role controller
+ */
+
+#ifndef __LINUX_USB_CHIPIDEA_H
+#define __LINUX_USB_CHIPIDEA_H
+
+struct ci13xxx;
+struct ci13xxx_udc_driver {
+        const char      *name;
+        /* offset of the capability registers */
+        uintptr_t        capoffset;
+        unsigned         power_budget;
+        unsigned long    flags;
+#define CI13XXX_REGS_SHARED             BIT(0)
+#define CI13XXX_REQUIRE_TRANSCEIVER     BIT(1)
+#define CI13XXX_PULLUP_ON_VBUS          BIT(2)
+#define CI13XXX_DISABLE_STREAMING       BIT(3)
+
+#define CI13XXX_CONTROLLER_RESET_EVENT          0
+#define CI13XXX_CONTROLLER_STOPPED_EVENT        1
+        void    (*notify_event) (struct ci13xxx *udc, unsigned event);
+};
+
+/* Default offset of capability registers */
+#define DEF_CAPOFFSET           0x100
+
+#endif
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index a316fba73518..9d8c3b634493 100644
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -242,6 +242,9 @@ int usb_add_config(struct usb_composite_dev *,
                 struct usb_configuration *,
                 int (*)(struct usb_configuration *));
 
+void usb_remove_config(struct usb_composite_dev *,
+                struct usb_configuration *);
+
 /**
  * struct usb_composite_driver - groups configurations into a gadget
  * @name: For diagnostics, identifies the driver.
@@ -250,6 +253,8 @@ int usb_add_config(struct usb_composite_dev *,
  * @iManufacturer: Used as iManufacturer override if @dev->iManufacturer is
  *      not set. If NULL a default "<system> <release> with <udc>" value
  *      will be used.
+ * @iSerialNumber: Used as iSerialNumber override if @dev->iSerialNumber is
+ *      not set.
  * @dev: Template descriptor for the device, including default device
  *      identifiers.
  * @strings: tables of strings, keyed by identifiers assigned during bind()
@@ -280,6 +285,7 @@ struct usb_composite_driver {
         const char                              *name;
         const char                              *iProduct;
         const char                              *iManufacturer;
+        const char                              *iSerialNumber;
         const struct usb_device_descriptor      *dev;
         struct usb_gadget_strings               **strings;
         enum usb_device_speed                   max_speed;
diff --git a/include/linux/usb/functionfs.h b/include/linux/usb/functionfs.h
index 7587ef934ba8..a843d0851364 100644
--- a/include/linux/usb/functionfs.h
+++ b/include/linux/usb/functionfs.h
@@ -190,8 +190,10 @@ static int functionfs_ready_callback(struct ffs_data *ffs)
         __attribute__((warn_unused_result, nonnull));
 static void functionfs_closed_callback(struct ffs_data *ffs)
         __attribute__((nonnull));
-static int functionfs_check_dev_callback(const char *dev_name)
+static void *functionfs_acquire_dev_callback(const char *dev_name)
         __attribute__((warn_unused_result, nonnull));
+static void functionfs_release_dev_callback(struct ffs_data *ffs_data)
+        __attribute__((nonnull));
 
 
 #endif
diff --git a/include/linux/usb/gpio_vbus.h b/include/linux/usb/gpio_vbus.h
index d9f03ccc2d60..837bba604a0b 100644
--- a/include/linux/usb/gpio_vbus.h
+++ b/include/linux/usb/gpio_vbus.h
@@ -17,6 +17,7 @@
  * @gpio_pullup: optional D+ or D- pullup GPIO (else negative/invalid)
  * @gpio_vbus_inverted: true if gpio_vbus is active low
  * @gpio_pullup_inverted: true if gpio_pullup is active low
+ * @wakeup: configure gpio_vbus as a wake-up source
  *
  * The VBUS sensing GPIO should have a pulldown, which will normally be
  * part of a resistor ladder turning a 4.0V-5.25V level on VBUS into a
@@ -27,4 +28,5 @@ struct gpio_vbus_mach_info {
         int gpio_pullup;
         bool gpio_vbus_inverted;
         bool gpio_pullup_inverted;
+        bool wakeup;
 };
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index d28cc78a38e4..7f855d50cdf5 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -344,6 +344,15 @@ struct hc_driver {
                  */
         int     (*update_device)(struct usb_hcd *, struct usb_device *);
         int     (*set_usb2_hw_lpm)(struct usb_hcd *, struct usb_device *, int);
+        /* USB 3.0 Link Power Management */
+                /* Returns the USB3 hub-encoded value for the U1/U2 timeout. */
+        int     (*enable_usb3_lpm_timeout)(struct usb_hcd *,
+                        struct usb_device *, enum usb3_link_state state);
+                /* The xHCI host controller can still fail the command to
+                 * disable the LPM timeouts, so this can return an error code.
+                 */
+        int     (*disable_usb3_lpm_timeout)(struct usb_hcd *,
+                        struct usb_device *, enum usb3_link_state state);
 };
 
 extern int usb_hcd_link_urb_to_ep(struct usb_hcd *hcd, struct urb *urb);
@@ -584,29 +593,6 @@ static inline void usb_hcd_resume_root_hub(struct usb_hcd *hcd)
 }
 #endif /* CONFIG_USB_SUSPEND */
 
-
-/*
- * USB device fs stuff
- */
-
-#ifdef CONFIG_USB_DEVICEFS
-
-/*
- * these are expected to be called from the USB core/hub thread
- * with the kernel lock held
- */
-extern void usbfs_update_special(void);
-extern int usbfs_init(void);
-extern void usbfs_cleanup(void);
-
-#else /* CONFIG_USB_DEVICEFS */
-
-static inline void usbfs_update_special(void) {}
-static inline int usbfs_init(void) { return 0; }
-static inline void usbfs_cleanup(void) { }
-
-#endif /* CONFIG_USB_DEVICEFS */
-
 /*-------------------------------------------------------------------------*/
 
 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
diff --git a/include/linux/usb/isp1301.h b/include/linux/usb/isp1301.h
new file mode 100644
index 000000000000..d3a851c28b6a
--- /dev/null
+++ b/include/linux/usb/isp1301.h
@@ -0,0 +1,80 @@
+/*
+ * NXP ISP1301 USB transceiver driver
+ *
+ * Copyright (C) 2012 Roland Stigge <stigge@antcom.de>
+ *
+ * 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; version 2 of the License.
+ *
+ * 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.
+ *
+ */
+
+#ifndef __LINUX_USB_ISP1301_H
+#define __LINUX_USB_ISP1301_H
+
+#include <linux/of.h>
+
+/* I2C Register definitions: */
+
+#define ISP1301_I2C_MODE_CONTROL_1      0x04    /* u8 read, set, +1 clear */
+
+#define MC1_SPEED_REG                   (1 << 0)
+#define MC1_SUSPEND_REG                 (1 << 1)
+#define MC1_DAT_SE0                     (1 << 2)
+#define MC1_TRANSPARENT                 (1 << 3)
+#define MC1_BDIS_ACON_EN                (1 << 4)
+#define MC1_OE_INT_EN                   (1 << 5)
+#define MC1_UART_EN                     (1 << 6)
+#define MC1_MASK                        0x7f
+
+#define ISP1301_I2C_MODE_CONTROL_2      0x12    /* u8 read, set, +1 clear */
+
+#define MC2_GLOBAL_PWR_DN               (1 << 0)
+#define MC2_SPD_SUSP_CTRL               (1 << 1)
+#define MC2_BI_DI                       (1 << 2)
+#define MC2_TRANSP_BDIR0                (1 << 3)
+#define MC2_TRANSP_BDIR1                (1 << 4)
+#define MC2_AUDIO_EN                    (1 << 5)
+#define MC2_PSW_EN                      (1 << 6)
+#define MC2_EN2V7                       (1 << 7)
+
+#define ISP1301_I2C_OTG_CONTROL_1       0x06    /* u8 read, set, +1 clear */
+
+#define OTG1_DP_PULLUP                  (1 << 0)
+#define OTG1_DM_PULLUP                  (1 << 1)
+#define OTG1_DP_PULLDOWN                (1 << 2)
+#define OTG1_DM_PULLDOWN                (1 << 3)
+#define OTG1_ID_PULLDOWN                (1 << 4)
+#define OTG1_VBUS_DRV                   (1 << 5)
+#define OTG1_VBUS_DISCHRG               (1 << 6)
+#define OTG1_VBUS_CHRG                  (1 << 7)
+
+#define ISP1301_I2C_OTG_CONTROL_2       0x10    /* u8 readonly */
+
+#define OTG_B_SESS_END                  (1 << 6)
+#define OTG_B_SESS_VLD                  (1 << 7)
+
+#define ISP1301_I2C_INTERRUPT_SOURCE    0x8
+#define ISP1301_I2C_INTERRUPT_LATCH     0xA
+#define ISP1301_I2C_INTERRUPT_FALLING   0xC
+#define ISP1301_I2C_INTERRUPT_RISING    0xE
+
+#define INT_VBUS_VLD                    (1 << 0)
+#define INT_SESS_VLD                    (1 << 1)
+#define INT_DP_HI                       (1 << 2)
+#define INT_ID_GND                      (1 << 3)
+#define INT_DM_HI                       (1 << 4)
+#define INT_ID_FLOAT                    (1 << 5)
+#define INT_BDIS_ACON                   (1 << 6)
+#define INT_CR_INT                      (1 << 7)
+
+#define ISP1301_I2C_REG_CLEAR_ADDR      1       /* Register Address Modifier */
+
+struct i2c_client *isp1301_get_client(struct device_node *node);
+
+#endif /* __LINUX_USB_ISP1301_H */
diff --git a/include/linux/usb/langwell_udc.h b/include/linux/usb/langwell_udc.h
deleted file mode 100644
index 2d2d1bbad9d2..000000000000
--- a/include/linux/usb/langwell_udc.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * Intel Langwell USB Device Controller driver
- * Copyright (C) 2008-2009, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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 __LANGWELL_UDC_H
-#define __LANGWELL_UDC_H
-
-
-/* MACRO defines */
-#define CAP_REG_OFFSET          0x0
-#define OP_REG_OFFSET           0x28
-
-#define DMA_ADDR_INVALID        (~(dma_addr_t)0)
-
-#define DQH_ALIGNMENT           2048
-#define DTD_ALIGNMENT           64
-#define DMA_BOUNDARY            4096
-
-#define EP0_MAX_PKT_SIZE        64
-#define EP_DIR_IN               1
-#define EP_DIR_OUT              0
-
-#define FLUSH_TIMEOUT           1000
-#define RESET_TIMEOUT           1000
-#define SETUPSTAT_TIMEOUT       100
-#define PRIME_TIMEOUT           100
-
-
-/* device memory space registers */
-
-/* Capability Registers, BAR0 + CAP_REG_OFFSET */
-struct langwell_cap_regs {
-        /* offset: 0x0 */
-        u8      caplength;      /* offset of Operational Register */
-        u8      _reserved3;
-        u16     hciversion;     /* H: BCD encoding of host version */
-        u32     hcsparams;      /* H: host port steering logic capability */
-        u32     hccparams;      /* H: host multiple mode control capability */
-#define HCC_LEN BIT(17)         /* Link power management (LPM) capability */
-        u8      _reserved4[0x20-0xc];
-        /* offset: 0x20 */
-        u16     dciversion;     /* BCD encoding of device version */
-        u8      _reserved5[0x24-0x22];
-        u32     dccparams;      /* overall device controller capability */
-#define HOSTCAP BIT(8)          /* host capable */
-#define DEVCAP  BIT(7)          /* device capable */
-#define DEN(d)  \
-        (((d)>>0)&0x1f)         /* bits 4:0, device endpoint number */
-} __attribute__ ((packed));
-
-
-/* Operational Registers, BAR0 + OP_REG_OFFSET */
-struct langwell_op_regs {
-        /* offset: 0x28 */
-        u32     extsts;
-#define EXTS_TI1        BIT(4)  /* general purpose timer interrupt 1 */
-#define EXTS_TI1TI0     BIT(3)  /* general purpose timer interrupt 0 */
-#define EXTS_TI1UPI     BIT(2)  /* USB host periodic interrupt */
-#define EXTS_TI1UAI     BIT(1)  /* USB host asynchronous interrupt */
-#define EXTS_TI1NAKI    BIT(0)  /* NAK interrupt */
-        u32     extintr;
-#define EXTI_TIE1       BIT(4)  /* general purpose timer interrupt enable 1 */
-#define EXTI_TIE0       BIT(3)  /* general purpose timer interrupt enable 0 */
-#define EXTI_UPIE       BIT(2)  /* USB host periodic interrupt enable */
-#define EXTI_UAIE       BIT(1)  /* USB host asynchronous interrupt enable */
-#define EXTI_NAKE       BIT(0)  /* NAK interrupt enable */
-        /* offset: 0x30 */
-        u32     usbcmd;
-#define CMD_HIRD(u)     \
-        (((u)>>24)&0xf)         /* bits 27:24, host init resume duration */
-#define CMD_ITC(u)      \
-        (((u)>>16)&0xff)        /* bits 23:16, interrupt threshold control */
-#define CMD_PPE         BIT(15) /* per-port change events enable */
-#define CMD_ATDTW       BIT(14) /* add dTD tripwire */
-#define CMD_SUTW        BIT(13) /* setup tripwire */
-#define CMD_ASPE        BIT(11) /* asynchronous schedule park mode enable */
-#define CMD_FS2         BIT(10) /* frame list size */
-#define CMD_ASP1        BIT(9)  /* asynchronous schedule park mode count */
-#define CMD_ASP0        BIT(8)
-#define CMD_LR          BIT(7)  /* light host/device controller reset */
-#define CMD_IAA         BIT(6)  /* interrupt on async advance doorbell */
-#define CMD_ASE         BIT(5)  /* asynchronous schedule enable */
-#define CMD_PSE         BIT(4)  /* periodic schedule enable */
-#define CMD_FS1         BIT(3)
-#define CMD_FS0         BIT(2)
-#define CMD_RST         BIT(1)  /* controller reset */
-#define CMD_RUNSTOP     BIT(0)  /* run/stop */
-        u32     usbsts;
-#define STS_PPCI(u)     \
-        (((u)>>16)&0xffff)      /* bits 31:16, port-n change detect */
-#define STS_AS          BIT(15) /* asynchronous schedule status */
-#define STS_PS          BIT(14) /* periodic schedule status */
-#define STS_RCL         BIT(13) /* reclamation */
-#define STS_HCH         BIT(12) /* HC halted */
-#define STS_ULPII       BIT(10) /* ULPI interrupt */
-#define STS_SLI         BIT(8)  /* DC suspend */
-#define STS_SRI         BIT(7)  /* SOF received */
-#define STS_URI         BIT(6)  /* USB reset received */
-#define STS_AAI         BIT(5)  /* interrupt on async advance */
-#define STS_SEI         BIT(4)  /* system error */
-#define STS_FRI         BIT(3)  /* frame list rollover */
-#define STS_PCI         BIT(2)  /* port change detect */
-#define STS_UEI         BIT(1)  /* USB error interrupt */
-#define STS_UI          BIT(0)  /* USB interrupt */
-        u32     usbintr;
-/* bits 31:16, per-port interrupt enable */
-#define INTR_PPCE(u)    (((u)>>16)&0xffff)
-#define INTR_ULPIE      BIT(10) /* ULPI enable */
-#define INTR_SLE        BIT(8)  /* DC sleep/suspend enable */
-#define INTR_SRE        BIT(7)  /* SOF received enable */
-#define INTR_URE        BIT(6)  /* USB reset enable */
-#define INTR_AAE        BIT(5)  /* interrupt on async advance enable */
-#define INTR_SEE        BIT(4)  /* system error enable */
-#define INTR_FRE        BIT(3)  /* frame list rollover enable */
-#define INTR_PCE        BIT(2)  /* port change detect enable */
-#define INTR_UEE        BIT(1)  /* USB error interrupt enable */
-#define INTR_UE         BIT(0)  /* USB interrupt enable */
-        u32     frindex;        /* frame index */
-#define FRINDEX_MASK    (0x3fff << 0)
-        u32     ctrldssegment;  /* not used */
-        u32     deviceaddr;
-#define USBADR_SHIFT    25
-#define USBADR(d)       \
-        (((d)>>25)&0x7f)        /* bits 31:25, device address */
-#define USBADR_MASK     (0x7f << 25)
-#define USBADRA         BIT(24) /* device address advance */
-        u32     endpointlistaddr;/* endpoint list top memory address */
-/* bits 31:11, endpoint list pointer */
-#define EPBASE(d)       (((d)>>11)&0x1fffff)
-#define ENDPOINTLISTADDR_MASK   (0x1fffff << 11)
-        u32     ttctrl;         /* H: TT operatin, not used */
-        /* offset: 0x50 */
-        u32     burstsize;      /* burst size of data movement */
-#define TXPBURST(b)     \
-        (((b)>>8)&0xff)         /* bits 15:8, TX burst length */
-#define RXPBURST(b)     \
-        (((b)>>0)&0xff)         /* bits 7:0, RX burst length */
-        u32     txfilltuning;   /* TX tuning */
-        u32     txttfilltuning; /* H: TX TT tuning */
-        u32     ic_usb;         /* control the IC_USB FS/LS transceiver */
-        /* offset: 0x60 */
-        u32     ulpi_viewport;  /* indirect access to ULPI PHY */
-#define ULPIWU          BIT(31) /* ULPI wakeup */
-#define ULPIRUN         BIT(30) /* ULPI read/write run */
-#define ULPIRW          BIT(29) /* ULPI read/write control */
-#define ULPISS          BIT(27) /* ULPI sync state */
-#define ULPIPORT(u)     \
-        (((u)>>24)&7)           /* bits 26:24, ULPI port number */
-#define ULPIADDR(u)     \
-        (((u)>>16)&0xff)        /* bits 23:16, ULPI data address */
-#define ULPIDATRD(u)    \
-        (((u)>>8)&0xff)         /* bits 15:8, ULPI data read */
-#define ULPIDATWR(u)    \
-        (((u)>>0)&0xff)         /* bits 7:0, ULPI date write */
-        u8      _reserved6[0x70-0x64];
-        /* offset: 0x70 */
-        u32     configflag;     /* H: not used */
-        u32     portsc1;        /* port status */
-#define DA(p)   \
-        (((p)>>25)&0x7f)        /* bits 31:25, device address */
-#define PORTS_SSTS      (BIT(24) | BIT(23))     /* suspend status */
-#define PORTS_WKOC      BIT(22) /* wake on over-current enable */
-#define PORTS_WKDS      BIT(21) /* wake on disconnect enable */
-#define PORTS_WKCN      BIT(20) /* wake on connect enable */
-#define PORTS_PTC(p)    (((p)>>16)&0xf) /* bits 19:16, port test control */
-#define PORTS_PIC       (BIT(15) | BIT(14))     /* port indicator control */
-#define PORTS_PO        BIT(13) /* port owner */
-#define PORTS_PP        BIT(12) /* port power */
-#define PORTS_LS        (BIT(11) | BIT(10))     /* line status */
-#define PORTS_SLP       BIT(9)  /* suspend using L1 */
-#define PORTS_PR        BIT(8)  /* port reset */
-#define PORTS_SUSP      BIT(7)  /* suspend */
-#define PORTS_FPR       BIT(6)  /* force port resume */
-#define PORTS_OCC       BIT(5)  /* over-current change */
-#define PORTS_OCA       BIT(4)  /* over-current active */
-#define PORTS_PEC       BIT(3)  /* port enable/disable change */
-#define PORTS_PE        BIT(2)  /* port enable/disable */
-#define PORTS_CSC       BIT(1)  /* connect status change */
-#define PORTS_CCS       BIT(0)  /* current connect status */
-        u8      _reserved7[0xb4-0x78];
-        /* offset: 0xb4 */
-        u32     devlc;          /* control LPM and each USB port behavior */
-/* bits 31:29, parallel transceiver select */
-#define LPM_PTS(d)      (((d)>>29)&7)
-#define LPM_STS         BIT(28) /* serial transceiver select */
-#define LPM_PTW         BIT(27) /* parallel transceiver width */
-#define LPM_PSPD(d)     (((d)>>25)&3)   /* bits 26:25, port speed */
-#define LPM_PSPD_MASK   (BIT(26) | BIT(25))
-#define LPM_SPEED_FULL  0
-#define LPM_SPEED_LOW   1
-#define LPM_SPEED_HIGH  2
-#define LPM_SRT         BIT(24) /* shorten reset time */
-#define LPM_PFSC        BIT(23) /* port force full speed connect */
-#define LPM_PHCD        BIT(22) /* PHY low power suspend clock disable */
-#define LPM_STL         BIT(16) /* STALL reply to LPM token */
-#define LPM_BA(d)       \
-        (((d)>>1)&0x7ff)        /* bits 11:1, BmAttributes */
-#define LPM_NYT_ACK     BIT(0)  /* NYET/ACK reply to LPM token */
-        u8      _reserved8[0xf4-0xb8];
-        /* offset: 0xf4 */
-        u32     otgsc;          /* On-The-Go status and control */
-#define OTGSC_DPIE      BIT(30) /* data pulse interrupt enable */
-#define OTGSC_MSE       BIT(29) /* 1 ms timer interrupt enable */
-#define OTGSC_BSEIE     BIT(28) /* B session end interrupt enable */
-#define OTGSC_BSVIE     BIT(27) /* B session valid interrupt enable */
-#define OTGSC_ASVIE     BIT(26) /* A session valid interrupt enable */
-#define OTGSC_AVVIE     BIT(25) /* A VBUS valid interrupt enable */
-#define OTGSC_IDIE      BIT(24) /* USB ID interrupt enable */
-#define OTGSC_DPIS      BIT(22) /* data pulse interrupt status */
-#define OTGSC_MSS       BIT(21) /* 1 ms timer interrupt status */
-#define OTGSC_BSEIS     BIT(20) /* B session end interrupt status */
-#define OTGSC_BSVIS     BIT(19) /* B session valid interrupt status */
-#define OTGSC_ASVIS     BIT(18) /* A session valid interrupt status */
-#define OTGSC_AVVIS     BIT(17) /* A VBUS valid interrupt status */
-#define OTGSC_IDIS      BIT(16) /* USB ID interrupt status */
-#define OTGSC_DPS       BIT(14) /* data bus pulsing status */
-#define OTGSC_MST       BIT(13) /* 1 ms timer toggle */
-#define OTGSC_BSE       BIT(12) /* B session end */
-#define OTGSC_BSV       BIT(11) /* B session valid */
-#define OTGSC_ASV       BIT(10) /* A session valid */
-#define OTGSC_AVV       BIT(9)  /* A VBUS valid */
-#define OTGSC_USBID     BIT(8)  /* USB ID */
-#define OTGSC_HABA      BIT(7)  /* hw assist B-disconnect to A-connect */
-#define OTGSC_HADP      BIT(6)  /* hw assist data pulse */
-#define OTGSC_IDPU      BIT(5)  /* ID pullup */
-#define OTGSC_DP        BIT(4)  /* data pulsing */
-#define OTGSC_OT        BIT(3)  /* OTG termination */
-#define OTGSC_HAAR      BIT(2)  /* hw assist auto reset */
-#define OTGSC_VC        BIT(1)  /* VBUS charge */
-#define OTGSC_VD        BIT(0)  /* VBUS discharge */
-        u32     usbmode;
-#define MODE_VBPS       BIT(5)  /* R/W VBUS power select */
-#define MODE_SDIS       BIT(4)  /* R/W stream disable mode */
-#define MODE_SLOM       BIT(3)  /* R/W setup lockout mode */
-#define MODE_ENSE       BIT(2)  /* endian select */
-#define MODE_CM(u)      (((u)>>0)&3)    /* bits 1:0, controller mode */
-#define MODE_IDLE       0
-#define MODE_DEVICE     2
-#define MODE_HOST       3
-        u8      _reserved9[0x100-0xfc];
-        /* offset: 0x100 */
-        u32     endptnak;
-#define EPTN(e)         \
-        (((e)>>16)&0xffff)      /* bits 31:16, TX endpoint NAK */
-#define EPRN(e)         \
-        (((e)>>0)&0xffff)       /* bits 15:0, RX endpoint NAK */
-        u32     endptnaken;
-#define EPTNE(e)        \
-        (((e)>>16)&0xffff)      /* bits 31:16, TX endpoint NAK enable */
-#define EPRNE(e)        \
-        (((e)>>0)&0xffff)       /* bits 15:0, RX endpoint NAK enable */
-        u32     endptsetupstat;
-#define SETUPSTAT_MASK          (0xffff << 0)   /* bits 15:0 */
-#define EP0SETUPSTAT_MASK       1
-        u32     endptprime;
-/* bits 31:16, prime endpoint transmit buffer */
-#define PETB(e)         (((e)>>16)&0xffff)
-/* bits 15:0, prime endpoint receive buffer */
-#define PERB(e)         (((e)>>0)&0xffff)
-        /* offset: 0x110 */
-        u32     endptflush;
-/* bits 31:16, flush endpoint transmit buffer */
-#define FETB(e)         (((e)>>16)&0xffff)
-/* bits 15:0, flush endpoint receive buffer */
-#define FERB(e)         (((e)>>0)&0xffff)
-        u32     endptstat;
-/* bits 31:16, endpoint transmit buffer ready */
-#define ETBR(e)         (((e)>>16)&0xffff)
-/* bits 15:0, endpoint receive buffer ready */
-#define ERBR(e)         (((e)>>0)&0xffff)
-        u32     endptcomplete;
-/* bits 31:16, endpoint transmit complete event */
-#define ETCE(e)         (((e)>>16)&0xffff)
-/* bits 15:0, endpoint receive complete event */
-#define ERCE(e)         (((e)>>0)&0xffff)
-        /* offset: 0x11c */
-        u32     endptctrl[16];
-#define EPCTRL_TXE      BIT(23) /* TX endpoint enable */
-#define EPCTRL_TXR      BIT(22) /* TX data toggle reset */
-#define EPCTRL_TXI      BIT(21) /* TX data toggle inhibit */
-#define EPCTRL_TXT(e)   (((e)>>18)&3)   /* bits 19:18, TX endpoint type */
-#define EPCTRL_TXT_SHIFT        18
-#define EPCTRL_TXD      BIT(17) /* TX endpoint data source */
-#define EPCTRL_TXS      BIT(16) /* TX endpoint STALL */
-#define EPCTRL_RXE      BIT(7)  /* RX endpoint enable */
-#define EPCTRL_RXR      BIT(6)  /* RX data toggle reset */
-#define EPCTRL_RXI      BIT(5)  /* RX data toggle inhibit */
-#define EPCTRL_RXT(e)   (((e)>>2)&3)    /* bits 3:2, RX endpoint type */
-#define EPCTRL_RXT_SHIFT        2       /* bits 19:18, TX endpoint type */
-#define EPCTRL_RXD      BIT(1)  /* RX endpoint data sink */
-#define EPCTRL_RXS      BIT(0)  /* RX endpoint STALL */
-} __attribute__ ((packed));
-
-#endif /* __LANGWELL_UDC_H */
-
diff --git a/include/linux/usb/rndis_host.h b/include/linux/usb/rndis_host.h
index 88fceb718c77..d44ef85db177 100644
--- a/include/linux/usb/rndis_host.h
+++ b/include/linux/usb/rndis_host.h
@@ -20,6 +20,8 @@
 #ifndef __LINUX_USB_RNDIS_HOST_H
 #define __LINUX_USB_RNDIS_HOST_H
 
+#include <linux/rndis.h>
+
 /*
  * CONTROL uses CDC "encapsulated commands" with funky notifications.
  *  - control-out:  SEND_ENCAPSULATED
@@ -49,47 +51,6 @@ struct rndis_msg_hdr {
  */
 #define RNDIS_CONTROL_TIMEOUT_MS        (5 * 1000)
 
-#define RNDIS_MSG_COMPLETION    cpu_to_le32(0x80000000)
-
-/* codes for "msg_type" field of rndis messages;
- * only the data channel uses packet messages (maybe batched);
- * everything else goes on the control channel.
- */
-#define RNDIS_MSG_PACKET        cpu_to_le32(0x00000001) /* 1-N packets */
-#define RNDIS_MSG_INIT          cpu_to_le32(0x00000002)
-#define RNDIS_MSG_INIT_C        (RNDIS_MSG_INIT|RNDIS_MSG_COMPLETION)
-#define RNDIS_MSG_HALT          cpu_to_le32(0x00000003)
-#define RNDIS_MSG_QUERY         cpu_to_le32(0x00000004)
-#define RNDIS_MSG_QUERY_C       (RNDIS_MSG_QUERY|RNDIS_MSG_COMPLETION)
-#define RNDIS_MSG_SET           cpu_to_le32(0x00000005)
-#define RNDIS_MSG_SET_C         (RNDIS_MSG_SET|RNDIS_MSG_COMPLETION)
-#define RNDIS_MSG_RESET         cpu_to_le32(0x00000006)
-#define RNDIS_MSG_RESET_C       (RNDIS_MSG_RESET|RNDIS_MSG_COMPLETION)
-#define RNDIS_MSG_INDICATE      cpu_to_le32(0x00000007)
-#define RNDIS_MSG_KEEPALIVE     cpu_to_le32(0x00000008)
-#define RNDIS_MSG_KEEPALIVE_C   (RNDIS_MSG_KEEPALIVE|RNDIS_MSG_COMPLETION)
-
-/* codes for "status" field of completion messages */
-#define RNDIS_STATUS_SUCCESS                    cpu_to_le32(0x00000000)
-#define RNDIS_STATUS_FAILURE                    cpu_to_le32(0xc0000001)
-#define RNDIS_STATUS_INVALID_DATA               cpu_to_le32(0xc0010015)
-#define RNDIS_STATUS_NOT_SUPPORTED              cpu_to_le32(0xc00000bb)
-#define RNDIS_STATUS_MEDIA_CONNECT              cpu_to_le32(0x4001000b)
-#define RNDIS_STATUS_MEDIA_DISCONNECT           cpu_to_le32(0x4001000c)
-#define RNDIS_STATUS_MEDIA_SPECIFIC_INDICATION  cpu_to_le32(0x40010012)
-
-/* codes for OID_GEN_PHYSICAL_MEDIUM */
-#define RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED       cpu_to_le32(0x00000000)
-#define RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN      cpu_to_le32(0x00000001)
-#define RNDIS_PHYSICAL_MEDIUM_CABLE_MODEM       cpu_to_le32(0x00000002)
-#define RNDIS_PHYSICAL_MEDIUM_PHONE_LINE        cpu_to_le32(0x00000003)
-#define RNDIS_PHYSICAL_MEDIUM_POWER_LINE        cpu_to_le32(0x00000004)
-#define RNDIS_PHYSICAL_MEDIUM_DSL               cpu_to_le32(0x00000005)
-#define RNDIS_PHYSICAL_MEDIUM_FIBRE_CHANNEL     cpu_to_le32(0x00000006)
-#define RNDIS_PHYSICAL_MEDIUM_1394              cpu_to_le32(0x00000007)
-#define RNDIS_PHYSICAL_MEDIUM_WIRELESS_WAN      cpu_to_le32(0x00000008)
-#define RNDIS_PHYSICAL_MEDIUM_MAX               cpu_to_le32(0x00000009)
-
 struct rndis_data_hdr {
         __le32  msg_type;               /* RNDIS_MSG_PACKET */
         __le32  msg_len;                /* rndis_data_hdr + data_len + pad */
@@ -222,29 +183,6 @@ struct rndis_keepalive_c {	/* IN (optionally OUT) */
         __le32  status;
 } __attribute__ ((packed));
 
-/* NOTE:  about 30 OIDs are "mandatory" for peripherals to support ... and
- * there are gobs more that may optionally be supported.  We'll avoid as much
- * of that mess as possible.
- */
-#define OID_802_3_PERMANENT_ADDRESS     cpu_to_le32(0x01010101)
-#define OID_GEN_MAXIMUM_FRAME_SIZE      cpu_to_le32(0x00010106)
-#define OID_GEN_CURRENT_PACKET_FILTER   cpu_to_le32(0x0001010e)
-#define OID_GEN_PHYSICAL_MEDIUM         cpu_to_le32(0x00010202)
-
-/* packet filter bits used by OID_GEN_CURRENT_PACKET_FILTER */
-#define RNDIS_PACKET_TYPE_DIRECTED              cpu_to_le32(0x00000001)
-#define RNDIS_PACKET_TYPE_MULTICAST             cpu_to_le32(0x00000002)
-#define RNDIS_PACKET_TYPE_ALL_MULTICAST         cpu_to_le32(0x00000004)
-#define RNDIS_PACKET_TYPE_BROADCAST             cpu_to_le32(0x00000008)
-#define RNDIS_PACKET_TYPE_SOURCE_ROUTING        cpu_to_le32(0x00000010)
-#define RNDIS_PACKET_TYPE_PROMISCUOUS           cpu_to_le32(0x00000020)
-#define RNDIS_PACKET_TYPE_SMT                   cpu_to_le32(0x00000040)
-#define RNDIS_PACKET_TYPE_ALL_LOCAL             cpu_to_le32(0x00000080)
-#define RNDIS_PACKET_TYPE_GROUP                 cpu_to_le32(0x00001000)
-#define RNDIS_PACKET_TYPE_ALL_FUNCTIONAL        cpu_to_le32(0x00002000)
-#define RNDIS_PACKET_TYPE_FUNCTIONAL            cpu_to_le32(0x00004000)
-#define RNDIS_PACKET_TYPE_MAC_FRAME             cpu_to_le32(0x00008000)
-
 /* default filter used with RNDIS devices */
 #define RNDIS_DEFAULT_FILTER ( \
         RNDIS_PACKET_TYPE_DIRECTED | \
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index 474283888233..86c0b451745d 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -1,7 +1,7 @@
 /*
  * USB Serial Converter stuff
  *
- *      Copyright (C) 1999 - 2005
+ *      Copyright (C) 1999 - 2012
  *          Greg Kroah-Hartman (greg@kroah.com)
  *
  *      This program is free software; you can redistribute it and/or modify
@@ -249,6 +249,7 @@ struct usb_serial_driver {
 
         int (*suspend)(struct usb_serial *serial, pm_message_t message);
         int (*resume)(struct usb_serial *serial);
+        int (*reset_resume)(struct usb_serial *serial);
 
         /* serial function calls */
         /* Called by console and by the tty layer */
@@ -292,16 +293,11 @@ struct usb_serial_driver {
 #define to_usb_serial_driver(d) \
         container_of(d, struct usb_serial_driver, driver)
 
-extern int usb_serial_register_drivers(struct usb_driver *udriver,
-                struct usb_serial_driver * const serial_drivers[]);
-extern void usb_serial_deregister_drivers(struct usb_driver *udriver,
-                struct usb_serial_driver * const serial_drivers[]);
+extern int usb_serial_register_drivers(struct usb_serial_driver *const serial_drivers[],
+                const char *name, const struct usb_device_id *id_table);
+extern void usb_serial_deregister_drivers(struct usb_serial_driver *const serial_drivers[]);
 extern void usb_serial_port_softint(struct usb_serial_port *port);
 
-extern int usb_serial_probe(struct usb_interface *iface,
-                            const struct usb_device_id *id);
-extern void usb_serial_disconnect(struct usb_interface *iface);
-
 extern int usb_serial_suspend(struct usb_interface *intf, pm_message_t message);
 extern int usb_serial_resume(struct usb_interface *intf);
 
@@ -400,8 +396,8 @@ do {									\
 
 /*
  * module_usb_serial_driver() - Helper macro for registering a USB Serial driver
- * @__usb_driver: usb_driver struct to register
  * @__serial_drivers: list of usb_serial drivers to register
+ * @__ids: all device ids that @__serial_drivers bind to
  *
  * Helper macro for USB serial drivers which do not do anything special
  * in module init/exit. This eliminates a lot of boilerplate. Each
@@ -409,9 +405,21 @@ do {									\
  * module_init() and module_exit()
  *
  */
-#define module_usb_serial_driver(__usb_driver, __serial_drivers)        \
-        module_driver(__usb_driver, usb_serial_register_drivers,        \
-                       usb_serial_deregister_drivers, __serial_drivers)
+#define usb_serial_module_driver(__name, __serial_drivers, __ids)       \
+static int __init usb_serial_module_init(void)                          \
+{                                                                       \
+        return usb_serial_register_drivers(__serial_drivers,            \
+                                           __name, __ids);              \
+}                                                                       \
+module_init(usb_serial_module_init);                                    \
+static void __exit usb_serial_module_exit(void)                         \
+{                                                                       \
+        usb_serial_deregister_drivers(__serial_drivers);                \
+}                                                                       \
+module_exit(usb_serial_module_exit);
+
+#define module_usb_serial_driver(__serial_drivers, __ids)               \
+        usb_serial_module_driver(KBUILD_MODNAME, __serial_drivers, __ids)
 
 #endif /* __LINUX_USB_SERIAL_H */
 
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index faf467944baf..4e72922e5a75 100644
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -6,14 +6,24 @@
 #include <linux/sched.h>
 #include <linux/err.h>
 
-#define UIDHASH_BITS    (CONFIG_BASE_SMALL ? 3 : 7)
-#define UIDHASH_SZ      (1 << UIDHASH_BITS)
+#define UID_GID_MAP_MAX_EXTENTS 5
+
+struct uid_gid_map {    /* 64 bytes -- 1 cache line */
+        u32 nr_extents;
+        struct uid_gid_extent {
+                u32 first;
+                u32 lower_first;
+                u32 count;
+        } extent[UID_GID_MAP_MAX_EXTENTS];
+};
 
 struct user_namespace {
+        struct uid_gid_map      uid_map;
+        struct uid_gid_map      gid_map;
         struct kref             kref;
-        struct hlist_head       uidhash_table[UIDHASH_SZ];
-        struct user_struct      *creator;
-        struct work_struct      destroyer;
+        struct user_namespace   *parent;
+        kuid_t                  owner;
+        kgid_t                  group;
 };
 
 extern struct user_namespace init_user_ns;
@@ -36,9 +46,11 @@ static inline void put_user_ns(struct user_namespace *ns)
                 kref_put(&ns->kref, free_user_ns);
 }
 
-uid_t user_ns_map_uid(struct user_namespace *to, const struct cred *cred, uid_t uid);
-gid_t user_ns_map_gid(struct user_namespace *to, const struct cred *cred, gid_t gid);
-
+struct seq_operations;
+extern struct seq_operations proc_uid_seq_operations;
+extern struct seq_operations proc_gid_seq_operations;
+extern ssize_t proc_uid_map_write(struct file *, const char __user *, size_t, loff_t *);
+extern ssize_t proc_gid_map_write(struct file *, const char __user *, size_t, loff_t *);
 #else
 
 static inline struct user_namespace *get_user_ns(struct user_namespace *ns)
@@ -55,17 +67,6 @@ static inline void put_user_ns(struct user_namespace *ns)
 {
 }
 
-static inline uid_t user_ns_map_uid(struct user_namespace *to,
-        const struct cred *cred, uid_t uid)
-{
-        return uid;
-}
-static inline gid_t user_ns_map_gid(struct user_namespace *to,
-        const struct cred *cred, gid_t gid)
-{
-        return gid;
-}
-
 #endif
 
 #endif /* _LINUX_USER_H */
diff --git a/include/linux/uuid.h b/include/linux/uuid.h
index 5b7efbfcee4e..f86c37bfd4a0 100644
--- a/include/linux/uuid.h
+++ b/include/linux/uuid.h
@@ -54,6 +54,8 @@ typedef struct {
         UUID_BE(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00,     \
                 0x00, 0x00, 0x00, 0x00)
 
+#ifdef __KERNEL__
+
 static inline int uuid_le_cmp(const uuid_le u1, const uuid_le u2)
 {
         return memcmp(&u1, &u2, sizeof(uuid_le));
@@ -67,4 +69,6 @@ static inline int uuid_be_cmp(const uuid_be u1, const uuid_be u2)
 extern void uuid_le_gen(uuid_le *u);
 extern void uuid_be_gen(uuid_be *u);
 
+#endif /* __KERNEL__ */
+
 #endif
diff --git a/include/linux/v4l2-dv-timings.h b/include/linux/v4l2-dv-timings.h
new file mode 100644
index 000000000000..9ef8172e5ed0
--- /dev/null
+++ b/include/linux/v4l2-dv-timings.h
@@ -0,0 +1,816 @@
+/*
+ * V4L2 DV timings header.
+ *
+ * Copyright (C) 2012  Hans Verkuil <hans.verkuil@cisco.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 _V4L2_DV_TIMINGS_H
+#define _V4L2_DV_TIMINGS_H
+
+#if __GNUC__ < 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ < 6))
+/* Sadly gcc versions older than 4.6 have a bug in how they initialize
+   anonymous unions where they require additional curly brackets.
+   This violates the C1x standard. This workaround adds the curly brackets
+   if needed. */
+#define V4L2_INIT_BT_TIMINGS(_width, args...) \
+        { .bt = { _width , ## args } }
+#else
+#define V4L2_INIT_BT_TIMINGS(_width, args...) \
+        .bt = { _width , ## args }
+#endif
+
+/* CEA-861-E timings (i.e. standard HDTV timings) */
+
+#define V4L2_DV_BT_CEA_640X480P59_94 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(640, 480, 0, 0, \
+                25175000, 16, 96, 48, 10, 2, 33, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CEA861, 0) \
+}
+
+#define V4L2_DV_BT_CEA_720X480P59_94 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(720, 480, 0, 0, \
+                27000000, 16, 62, 60, 9, 6, 30, 0, 0, 0, \
+                V4L2_DV_BT_STD_CEA861, 0) \
+}
+
+#define V4L2_DV_BT_CEA_720X576P50 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(720, 576, 0, 0, \
+                27000000, 12, 64, 68, 5, 5, 39, 0, 0, 0, \
+                V4L2_DV_BT_STD_CEA861, 0) \
+}
+
+#define V4L2_DV_BT_CEA_1280X720P24 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 720, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                59400000, 1760, 40, 220, 5, 5, 20, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS) \
+}
+
+#define V4L2_DV_BT_CEA_1280X720P25 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 720, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                74250000, 2420, 40, 220, 5, 5, 20, 0, 0, 0, \
+                V4L2_DV_BT_STD_CEA861, 0) \
+}
+
+#define V4L2_DV_BT_CEA_1280X720P30 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 720, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                74250000, 1760, 40, 220, 5, 5, 20, 0, 0, 0, \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+}
+
+#define V4L2_DV_BT_CEA_1280X720P50 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 720, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                74250000, 440, 40, 220, 5, 5, 20, 0, 0, 0, \
+                V4L2_DV_BT_STD_CEA861, 0) \
+}
+
+#define V4L2_DV_BT_CEA_1280X720P60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 720, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                74250000, 110, 40, 220, 5, 5, 20, 0, 0, 0, \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+}
+
+#define V4L2_DV_BT_CEA_1920X1080P24 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                74250000, 638, 44, 148, 4, 5, 36, 0, 0, 0, \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+}
+
+#define V4L2_DV_BT_CEA_1920X1080P25 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                74250000, 528, 44, 148, 4, 5, 36, 0, 0, 0, \
+                V4L2_DV_BT_STD_CEA861, 0) \
+}
+
+#define V4L2_DV_BT_CEA_1920X1080P30 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                74250000, 88, 44, 148, 4, 5, 36, 0, 0, 0, \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+}
+
+#define V4L2_DV_BT_CEA_1920X1080I50 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1920, 1080, 1, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                74250000, 528, 44, 148, 2, 5, 15, 2, 5, 16, \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_HALF_LINE) \
+}
+
+#define V4L2_DV_BT_CEA_1920X1080P50 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                148500000, 528, 44, 148, 4, 5, 36, 0, 0, 0, \
+                V4L2_DV_BT_STD_CEA861, 0) \
+}
+
+#define V4L2_DV_BT_CEA_1920X1080I60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1920, 1080, 1, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                74250000, 88, 44, 148, 2, 5, 15, 2, 5, 16, \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_HALF_LINE) \
+}
+
+#define V4L2_DV_BT_CEA_1920X1080P60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                148500000, 88, 44, 148, 4, 5, 36, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS) \
+}
+
+
+/* VESA Discrete Monitor Timings as per version 1.0, revision 12 */
+
+#define V4L2_DV_BT_DMT_640X350P85 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(640, 350, 0, V4L2_DV_HSYNC_POS_POL, \
+                31500000, 32, 64, 96, 32, 3, 60, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_640X400P85 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(640, 400, 0, V4L2_DV_VSYNC_POS_POL, \
+                31500000, 32, 64, 96, 1, 3, 41, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_720X400P85 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(720, 400, 0, V4L2_DV_VSYNC_POS_POL, \
+                35500000, 36, 72, 108, 1, 3, 42, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+/* VGA resolutions */
+#define V4L2_DV_BT_DMT_640X480P60 V4L2_DV_BT_CEA_640X480P59_94
+
+#define V4L2_DV_BT_DMT_640X480P72 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(640, 480, 0, 0, \
+                31500000, 24, 40, 128, 9, 3, 28, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_640X480P75 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(640, 480, 0, 0, \
+                31500000, 16, 64, 120, 1, 3, 16, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_640X480P85 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(640, 480, 0, 0, \
+                36000000, 56, 56, 80, 1, 3, 25, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+/* SVGA resolutions */
+#define V4L2_DV_BT_DMT_800X600P56 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(800, 600, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                36000000, 24, 72, 128, 1, 2, 22, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_800X600P60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(800, 600, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                40000000, 40, 128, 88, 1, 4, 23, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_800X600P72 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(800, 600, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                50000000, 56, 120, 64, 37, 6, 23, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_800X600P75 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(800, 600, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                49500000, 16, 80, 160, 1, 3, 21, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_800X600P85 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(800, 600, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                56250000, 32, 64, 152, 1, 3, 27, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_800X600P120_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(800, 600, 0, V4L2_DV_HSYNC_POS_POL, \
+                73250000, 48, 32, 80, 3, 4, 29, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+#define V4L2_DV_BT_DMT_848X480P60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(848, 480, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                33750000, 16, 112, 112, 6, 8, 23, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1024X768I43 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1024, 768, 1, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                44900000, 8, 176, 56, 0, 4, 20, 0, 4, 21, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+/* XGA resolutions */
+#define V4L2_DV_BT_DMT_1024X768P60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1024, 768, 0, 0, \
+                65000000, 24, 136, 160, 3, 6, 29, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1024X768P70 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1024, 768, 0, 0, \
+                75000000, 24, 136, 144, 3, 6, 29, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1024X768P75 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1024, 768, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                78750000, 16, 96, 176, 1, 3, 28, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1024X768P85 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1024, 768, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                94500000, 48, 96, 208, 1, 3, 36, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1024X768P120_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1024, 768, 0, V4L2_DV_HSYNC_POS_POL, \
+                115500000, 48, 32, 80, 3, 4, 38, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+/* XGA+ resolution */
+#define V4L2_DV_BT_DMT_1152X864P75 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1152, 864, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                108000000, 64, 128, 256, 1, 3, 32, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1280X720P60 V4L2_DV_BT_CEA_1280X720P60
+
+/* WXGA resolutions */
+#define V4L2_DV_BT_DMT_1280X768P60_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 768, 0, V4L2_DV_HSYNC_POS_POL, \
+                68250000, 48, 32, 80, 3, 7, 12, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+#define V4L2_DV_BT_DMT_1280X768P60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 768, 0, V4L2_DV_VSYNC_POS_POL, \
+                79500000, 64, 128, 192, 3, 7, 20, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1280X768P75 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 768, 0, V4L2_DV_VSYNC_POS_POL, \
+                102250000, 80, 128, 208, 3, 7, 27, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1280X768P85 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 768, 0, V4L2_DV_VSYNC_POS_POL, \
+                117500000, 80, 136, 216, 3, 7, 31, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1280X768P120_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 768, 0, V4L2_DV_HSYNC_POS_POL, \
+                140250000, 48, 32, 80, 3, 7, 35, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+#define V4L2_DV_BT_DMT_1280X800P60_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 800, 0, V4L2_DV_HSYNC_POS_POL, \
+                71000000, 48, 32, 80, 3, 6, 14, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+#define V4L2_DV_BT_DMT_1280X800P60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 800, 0, V4L2_DV_VSYNC_POS_POL, \
+                83500000, 72, 128, 200, 3, 6, 22, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1280X800P75 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 800, 0, V4L2_DV_VSYNC_POS_POL, \
+                106500000, 80, 128, 208, 3, 6, 29, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1280X800P85 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 800, 0, V4L2_DV_VSYNC_POS_POL, \
+                122500000, 80, 136, 216, 3, 6, 34, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1280X800P120_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 800, 0, V4L2_DV_HSYNC_POS_POL, \
+                146250000, 48, 32, 80, 3, 6, 38, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+#define V4L2_DV_BT_DMT_1280X960P60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 960, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                108000000, 96, 112, 312, 1, 3, 36, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1280X960P85 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 960, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                148500000, 64, 160, 224, 1, 3, 47, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1280X960P120_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 960, 0, V4L2_DV_HSYNC_POS_POL, \
+                175500000, 48, 32, 80, 3, 4, 50, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+/* SXGA resolutions */
+#define V4L2_DV_BT_DMT_1280X1024P60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 1024, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                108000000, 48, 112, 248, 1, 3, 38, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1280X1024P75 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 1024, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                135000000, 16, 144, 248, 1, 3, 38, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1280X1024P85 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 1024, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                157500000, 64, 160, 224, 1, 3, 44, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1280X1024P120_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1280, 1024, 0, V4L2_DV_HSYNC_POS_POL, \
+                187250000, 48, 32, 80, 3, 7, 50, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+#define V4L2_DV_BT_DMT_1360X768P60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1360, 768, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                85500000, 64, 112, 256, 3, 6, 18, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1360X768P120_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1360, 768, 0, V4L2_DV_HSYNC_POS_POL, \
+                148250000, 48, 32, 80, 3, 5, 37, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+#define V4L2_DV_BT_DMT_1366X768P60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1366, 768, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                85500000, 70, 143, 213, 3, 3, 24, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1366X768P60_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1366, 768, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                72000000, 14, 56, 64, 1, 3, 28, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+/* SXGA+ resolutions */
+#define V4L2_DV_BT_DMT_1400X1050P60_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1400, 1050, 0, V4L2_DV_HSYNC_POS_POL, \
+                101000000, 48, 32, 80, 3, 4, 23, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+#define V4L2_DV_BT_DMT_1400X1050P60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1400, 1050, 0, V4L2_DV_VSYNC_POS_POL, \
+                121750000, 88, 144, 232, 3, 4, 32, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1400X1050P75 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1400, 1050, 0, V4L2_DV_VSYNC_POS_POL, \
+                156000000, 104, 144, 248, 3, 4, 42, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1400X1050P85 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1400, 1050, 0, V4L2_DV_VSYNC_POS_POL, \
+                179500000, 104, 152, 256, 3, 4, 48, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1400X1050P120_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1400, 1050, 0, V4L2_DV_HSYNC_POS_POL, \
+                208000000, 48, 32, 80, 3, 4, 55, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+/* WXGA+ resolutions */
+#define V4L2_DV_BT_DMT_1440X900P60_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1440, 900, 0, V4L2_DV_HSYNC_POS_POL, \
+                88750000, 48, 32, 80, 3, 6, 17, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+#define V4L2_DV_BT_DMT_1440X900P60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1440, 900, 0, V4L2_DV_VSYNC_POS_POL, \
+                106500000, 80, 152, 232, 3, 6, 25, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1440X900P75 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1440, 900, 0, V4L2_DV_VSYNC_POS_POL, \
+                136750000, 96, 152, 248, 3, 6, 33, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1440X900P85 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1440, 900, 0, V4L2_DV_VSYNC_POS_POL, \
+                157000000, 104, 152, 256, 3, 6, 39, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1440X900P120_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1440, 900, 0, V4L2_DV_HSYNC_POS_POL, \
+                182750000, 48, 32, 80, 3, 6, 44, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+#define V4L2_DV_BT_DMT_1600X900P60_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1600, 900, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                108000000, 24, 80, 96, 1, 3, 96, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+/* UXGA resolutions */
+#define V4L2_DV_BT_DMT_1600X1200P60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1600, 1200, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                162000000, 64, 192, 304, 1, 3, 46, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1600X1200P65 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1600, 1200, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                175500000, 64, 192, 304, 1, 3, 46, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1600X1200P70 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1600, 1200, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                189000000, 64, 192, 304, 1, 3, 46, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1600X1200P75 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1600, 1200, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                202500000, 64, 192, 304, 1, 3, 46, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1600X1200P85 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1600, 1200, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                229500000, 64, 192, 304, 1, 3, 46, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1600X1200P120_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1600, 1200, 0, V4L2_DV_HSYNC_POS_POL, \
+                268250000, 48, 32, 80, 3, 4, 64, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+/* WSXGA+ resolutions */
+#define V4L2_DV_BT_DMT_1680X1050P60_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1680, 1050, 0, V4L2_DV_HSYNC_POS_POL, \
+                119000000, 48, 32, 80, 3, 6, 21, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+#define V4L2_DV_BT_DMT_1680X1050P60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1680, 1050, 0, V4L2_DV_VSYNC_POS_POL, \
+                146250000, 104, 176, 280, 3, 6, 30, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1680X1050P75 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1680, 1050, 0, V4L2_DV_VSYNC_POS_POL, \
+                187000000, 120, 176, 296, 3, 6, 40, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1680X1050P85 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1680, 1050, 0, V4L2_DV_VSYNC_POS_POL, \
+                214750000, 128, 176, 304, 3, 6, 46, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1680X1050P120_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1680, 1050, 0, V4L2_DV_HSYNC_POS_POL, \
+                245500000, 48, 32, 80, 3, 6, 53, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+#define V4L2_DV_BT_DMT_1792X1344P60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1792, 1344, 0, V4L2_DV_VSYNC_POS_POL, \
+                204750000, 128, 200, 328, 1, 3, 46, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1792X1344P75 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1792, 1344, 0, V4L2_DV_VSYNC_POS_POL, \
+                261000000, 96, 216, 352, 1, 3, 69, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1792X1344P120_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1792, 1344, 0, V4L2_DV_HSYNC_POS_POL, \
+                333250000, 48, 32, 80, 3, 4, 72, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+#define V4L2_DV_BT_DMT_1856X1392P60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1856, 1392, 0, V4L2_DV_VSYNC_POS_POL, \
+                218250000, 96, 224, 352, 1, 3, 43, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1856X1392P75 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1856, 1392, 0, V4L2_DV_VSYNC_POS_POL, \
+                288000000, 128, 224, 352, 1, 3, 104, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1856X1392P120_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1856, 1392, 0, V4L2_DV_HSYNC_POS_POL, \
+                356500000, 48, 32, 80, 3, 4, 75, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+#define V4L2_DV_BT_DMT_1920X1080P60 V4L2_DV_BT_CEA_1920X1080P60
+
+/* WUXGA resolutions */
+#define V4L2_DV_BT_DMT_1920X1200P60_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1920, 1200, 0, V4L2_DV_HSYNC_POS_POL, \
+                154000000, 48, 32, 80, 3, 6, 26, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+#define V4L2_DV_BT_DMT_1920X1200P60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1920, 1200, 0, V4L2_DV_VSYNC_POS_POL, \
+                193250000, 136, 200, 336, 3, 6, 36, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1920X1200P75 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1920, 1200, 0, V4L2_DV_VSYNC_POS_POL, \
+                245250000, 136, 208, 344, 3, 6, 46, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1920X1200P85 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1920, 1200, 0, V4L2_DV_VSYNC_POS_POL, \
+                281250000, 144, 208, 352, 3, 6, 53, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1920X1200P120_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1920, 1200, 0, V4L2_DV_HSYNC_POS_POL, \
+                317000000, 48, 32, 80, 3, 6, 62, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+#define V4L2_DV_BT_DMT_1920X1440P60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1920, 1440, 0, V4L2_DV_VSYNC_POS_POL, \
+                234000000, 128, 208, 344, 1, 3, 56, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1920X1440P75 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1920, 1440, 0, V4L2_DV_VSYNC_POS_POL, \
+                297000000, 144, 224, 352, 1, 3, 56, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_1920X1440P120_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1920, 1440, 0, V4L2_DV_HSYNC_POS_POL, \
+                380500000, 48, 32, 80, 3, 4, 78, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+#define V4L2_DV_BT_DMT_2048X1152P60_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(2048, 1152, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                162000000, 26, 80, 96, 1, 3, 44, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+/* WQXGA resolutions */
+#define V4L2_DV_BT_DMT_2560X1600P60_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(2560, 1600, 0, V4L2_DV_HSYNC_POS_POL, \
+                268500000, 48, 32, 80, 3, 6, 37, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+#define V4L2_DV_BT_DMT_2560X1600P60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(2560, 1600, 0, V4L2_DV_VSYNC_POS_POL, \
+                348500000, 192, 280, 472, 3, 6, 49, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_2560X1600P75 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(2560, 1600, 0, V4L2_DV_VSYNC_POS_POL, \
+                443250000, 208, 280, 488, 3, 6, 63, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_2560X1600P85 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(2560, 1600, 0, V4L2_DV_VSYNC_POS_POL, \
+                505250000, 208, 280, 488, 3, 6, 73, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
+}
+
+#define V4L2_DV_BT_DMT_2560X1600P120_RB { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(2560, 1600, 0, V4L2_DV_HSYNC_POS_POL, \
+                552750000, 48, 32, 80, 3, 6, 85, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
+                V4L2_DV_FL_REDUCED_BLANKING) \
+}
+
+#define V4L2_DV_BT_DMT_1366X768P60 { \
+        .type = V4L2_DV_BT_656_1120, \
+        V4L2_INIT_BT_TIMINGS(1366, 768, 0, \
+                V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
+                85500000, 70, 143, 213, 3, 3, 24, 0, 0, 0, \
+                V4L2_DV_BT_STD_DMT, 0) \
+}
+
+#endif
diff --git a/include/linux/v4l2-subdev.h b/include/linux/v4l2-subdev.h
index ed29cbbebfef..812019ee1e06 100644
--- a/include/linux/v4l2-subdev.h
+++ b/include/linux/v4l2-subdev.h
@@ -123,6 +123,43 @@ struct v4l2_subdev_frame_interval_enum {
         __u32 reserved[9];
 };
 
+#define V4L2_SUBDEV_SEL_FLAG_SIZE_GE                    (1 << 0)
+#define V4L2_SUBDEV_SEL_FLAG_SIZE_LE                    (1 << 1)
+#define V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG                (1 << 2)
+
+/* active cropping area */
+#define V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL                 0x0000
+/* cropping bounds */
+#define V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS                 0x0002
+/* current composing area */
+#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL              0x0100
+/* composing bounds */
+#define V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS              0x0102
+
+
+/**
+ * struct v4l2_subdev_selection - selection info
+ *
+ * @which: either V4L2_SUBDEV_FORMAT_ACTIVE or V4L2_SUBDEV_FORMAT_TRY
+ * @pad: pad number, as reported by the media API
+ * @target: selection target, used to choose one of possible rectangles
+ * @flags: constraint flags
+ * @r: coordinates of the selection window
+ * @reserved: for future use, set to zero for now
+ *
+ * Hardware may use multiple helper windows to process a video stream.
+ * The structure is used to exchange this selection areas between
+ * an application and a driver.
+ */
+struct v4l2_subdev_selection {
+        __u32 which;
+        __u32 pad;
+        __u32 target;
+        __u32 flags;
+        struct v4l2_rect r;
+        __u32 reserved[8];
+};
+
 #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 \
@@ -137,5 +174,9 @@ struct v4l2_subdev_frame_interval_enum {
                         _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)
+#define VIDIOC_SUBDEV_G_SELECTION \
+        _IOWR('V', 61, struct v4l2_subdev_selection)
+#define VIDIOC_SUBDEV_S_SELECTION \
+        _IOWR('V', 62, struct v4l2_subdev_selection)
 
 #endif
diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
index 4b9a7f596f92..b455c7c212eb 100644
--- a/include/linux/vga_switcheroo.h
+++ b/include/linux/vga_switcheroo.h
@@ -28,13 +28,19 @@ struct vga_switcheroo_handler {
         int (*get_client_id)(struct pci_dev *pdev);
 };
 
+struct vga_switcheroo_client_ops {
+        void (*set_gpu_state)(struct pci_dev *dev, enum vga_switcheroo_state);
+        void (*reprobe)(struct pci_dev *dev);
+        bool (*can_switch)(struct pci_dev *dev);
+};
 
 #if defined(CONFIG_VGA_SWITCHEROO)
 void vga_switcheroo_unregister_client(struct pci_dev *dev);
 int vga_switcheroo_register_client(struct pci_dev *dev,
-                                   void (*set_gpu_state)(struct pci_dev *dev, enum vga_switcheroo_state),
-                                   void (*reprobe)(struct pci_dev *dev),
-                                   bool (*can_switch)(struct pci_dev *dev));
+                                   const struct vga_switcheroo_client_ops *ops);
+int vga_switcheroo_register_audio_client(struct pci_dev *pdev,
+                                         const struct vga_switcheroo_client_ops *ops,
+                                         int id, bool active);
 
 void vga_switcheroo_client_fb_set(struct pci_dev *dev,
                                   struct fb_info *info);
@@ -48,11 +54,12 @@ int vga_switcheroo_process_delayed_switch(void);
 
 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
 static inline int vga_switcheroo_register_client(struct pci_dev *dev,
-                                          void (*set_gpu_state)(struct pci_dev *dev, enum vga_switcheroo_state),
-                                          void (*reprobe)(struct pci_dev *dev),
-                                          bool (*can_switch)(struct pci_dev *dev)) { return 0; }
+                const struct vga_switcheroo_client_ops *ops) { return 0; }
 static inline void vga_switcheroo_client_fb_set(struct pci_dev *dev, struct fb_info *info) {}
 static inline int vga_switcheroo_register_handler(struct vga_switcheroo_handler *handler) { return 0; }
+static inline int vga_switcheroo_register_audio_client(struct pci_dev *pdev,
+        const struct vga_switcheroo_client_ops *ops,
+        int id, bool active) { return 0; }
 static inline void vga_switcheroo_unregister_handler(void) {}
 static inline int vga_switcheroo_process_delayed_switch(void) { return 0; }
 
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
index b572f80bdfd5..0ee42d9acdc0 100644
--- a/include/linux/vgaarb.h
+++ b/include/linux/vgaarb.h
@@ -31,6 +31,7 @@
 #ifndef LINUX_VGA_H
 #define LINUX_VGA_H
 
+#include <video/vga.h>
 
 /* Legacy VGA regions */
 #define VGA_RSRC_NONE          0x00
@@ -182,7 +183,13 @@ extern void vga_put(struct pci_dev *pdev, unsigned int rsrc);
  */
 
 #ifndef __ARCH_HAS_VGA_DEFAULT_DEVICE
+#ifdef CONFIG_VGA_ARB
 extern struct pci_dev *vga_default_device(void);
+extern void vga_set_default_device(struct pci_dev *pdev);
+#else
+static inline struct pci_dev *vga_default_device(void) { return NULL; };
+static inline void vga_set_default_device(struct pci_dev *pdev) { };
+#endif
 #endif
 
 /**
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index c9c9a4680cc5..370d11106c11 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -292,10 +292,10 @@ struct v4l2_pix_format {
         __u32                   width;
         __u32                   height;
         __u32                   pixelformat;
-        enum v4l2_field         field;
+        __u32                   field;          /* enum v4l2_field */
         __u32                   bytesperline;   /* for padding, zero if unused */
         __u32                   sizeimage;
-        enum v4l2_colorspace    colorspace;
+        __u32                   colorspace;     /* enum v4l2_colorspace */
         __u32                   priv;           /* private data, depends on pixelformat */
 };
 
@@ -378,7 +378,10 @@ struct v4l2_pix_format {
 #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_SBGGR10DPCM8 v4l2_fourcc('b', 'B', 'A', '8')
+#define V4L2_PIX_FMT_SGBRG10DPCM8 v4l2_fourcc('b', 'G', 'A', '8')
 #define V4L2_PIX_FMT_SGRBG10DPCM8 v4l2_fourcc('B', 'D', '1', '0')
+#define V4L2_PIX_FMT_SRGGB10DPCM8 v4l2_fourcc('b', 'R', 'A', '8')
         /*
          * 10bit raw bayer, expanded to 16 bits
          * xxxxrrrrrrrrrrxxxxgggggggggg xxxxggggggggggxxxxbbbbbbbbbb...
@@ -432,7 +435,7 @@ struct v4l2_pix_format {
  */
 struct v4l2_fmtdesc {
         __u32               index;             /* Format number      */
-        enum v4l2_buf_type  type;              /* buffer type        */
+        __u32               type;              /* enum v4l2_buf_type */
         __u32               flags;
         __u8                description[32];   /* Description string */
         __u32               pixelformat;       /* Format fourcc      */
@@ -573,8 +576,8 @@ struct v4l2_jpegcompression {
  */
 struct v4l2_requestbuffers {
         __u32                   count;
-        enum v4l2_buf_type      type;
-        enum v4l2_memory        memory;
+        __u32                   type;           /* enum v4l2_buf_type */
+        __u32                   memory;         /* enum v4l2_memory */
         __u32                   reserved[2];
 };
 
@@ -610,15 +613,17 @@ struct v4l2_plane {
 /**
  * struct v4l2_buffer - video buffer info
  * @index:      id number of the buffer
- * @type:       buffer type (type == *_MPLANE for multiplanar buffers)
+ * @type:       enum v4l2_buf_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
+ * @field:      enum v4l2_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
+ * @memory:     enum v4l2_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)
@@ -636,16 +641,16 @@ struct v4l2_plane {
  */
 struct v4l2_buffer {
         __u32                   index;
-        enum v4l2_buf_type      type;
+        __u32                   type;
         __u32                   bytesused;
         __u32                   flags;
-        enum v4l2_field         field;
+        __u32                   field;
         struct timeval          timestamp;
         struct v4l2_timecode    timecode;
         __u32                   sequence;
 
         /* memory location */
-        enum v4l2_memory        memory;
+        __u32                   memory;
         union {
                 __u32           offset;
                 unsigned long   userptr;
@@ -708,7 +713,7 @@ struct v4l2_clip {
 
 struct v4l2_window {
         struct v4l2_rect        w;
-        enum v4l2_field         field;
+        __u32                   field;   /* enum v4l2_field */
         __u32                   chromakey;
         struct v4l2_clip        __user *clips;
         __u32                   clipcount;
@@ -745,14 +750,14 @@ struct v4l2_outputparm {
  *      I N P U T   I M A G E   C R O P P I N G
  */
 struct v4l2_cropcap {
-        enum v4l2_buf_type      type;
+        __u32                   type;   /* enum v4l2_buf_type */
         struct v4l2_rect        bounds;
         struct v4l2_rect        defrect;
         struct v4l2_fract       pixelaspect;
 };
 
 struct v4l2_crop {
-        enum v4l2_buf_type      type;
+        __u32                   type;   /* enum v4l2_buf_type */
         struct v4l2_rect        c;
 };
 
@@ -939,6 +944,9 @@ struct v4l2_standard {
         __u32                reserved[4];
 };
 
+/* The DV Preset API is deprecated in favor of the DV Timings API.
+   New drivers shouldn't use this anymore! */
+
 /*
  *      V I D E O       T I M I N G S   D V     P R E S E T
  */
@@ -986,29 +994,56 @@ struct v4l2_dv_enum_preset {
  *      D V     B T     T I M I N G S
  */
 
-/* BT.656/BT.1120 timing data */
+/** struct v4l2_bt_timings - BT.656/BT.1120 timing data
+ * @width:      total width of the active video in pixels
+ * @height:     total height of the active video in lines
+ * @interlaced: Interlaced or progressive
+ * @polarities: Positive or negative polarities
+ * @pixelclock: Pixel clock in HZ. Ex. 74.25MHz->74250000
+ * @hfrontporch:Horizontal front porch in pixels
+ * @hsync:      Horizontal Sync length in pixels
+ * @hbackporch: Horizontal back porch in pixels
+ * @vfrontporch:Vertical front porch in lines
+ * @vsync:      Vertical Sync length in lines
+ * @vbackporch: Vertical back porch in lines
+ * @il_vfrontporch:Vertical front porch for the even field
+ *              (aka field 2) of interlaced field formats
+ * @il_vsync:   Vertical Sync length for the even field
+ *              (aka field 2) of interlaced field formats
+ * @il_vbackporch:Vertical back porch for the even field
+ *              (aka field 2) of interlaced field formats
+ * @standards:  Standards the timing belongs to
+ * @flags:      Flags
+ * @reserved:   Reserved fields, must be zeroed.
+ *
+ * A note regarding vertical interlaced timings: height refers to the total
+ * height of the active video frame (= two fields). The blanking timings refer
+ * to the blanking of each field. So the height of the total frame is
+ * calculated as follows:
+ *
+ * tot_height = height + vfrontporch + vsync + vbackporch +
+ *                       il_vfrontporch + il_vsync + il_vbackporch
+ *
+ * The active height of each field is height / 2.
+ */
 struct v4l2_bt_timings {
-        __u32   width;          /* width in pixels */
-        __u32   height;         /* height in lines */
-        __u32   interlaced;     /* Interlaced or progressive */
-        __u32   polarities;     /* Positive or negative polarity */
-        __u64   pixelclock;     /* Pixel clock in HZ. Ex. 74.25MHz->74250000 */
-        __u32   hfrontporch;    /* Horizpontal front porch in pixels */
-        __u32   hsync;          /* Horizontal Sync length in pixels */
-        __u32   hbackporch;     /* Horizontal back porch in pixels */
-        __u32   vfrontporch;    /* Vertical front porch in pixels */
-        __u32   vsync;          /* Vertical Sync length in lines */
-        __u32   vbackporch;     /* Vertical back porch in lines */
-        __u32   il_vfrontporch; /* Vertical front porch for bottom field of
-                                 * interlaced field formats
-                                 */
-        __u32   il_vsync;       /* Vertical sync length for bottom field of
-                                 * interlaced field formats
-                                 */
-        __u32   il_vbackporch;  /* Vertical back porch for bottom field of
-                                 * interlaced field formats
-                                 */
-        __u32   reserved[16];
+        __u32   width;
+        __u32   height;
+        __u32   interlaced;
+        __u32   polarities;
+        __u64   pixelclock;
+        __u32   hfrontporch;
+        __u32   hsync;
+        __u32   hbackporch;
+        __u32   vfrontporch;
+        __u32   vsync;
+        __u32   vbackporch;
+        __u32   il_vfrontporch;
+        __u32   il_vsync;
+        __u32   il_vbackporch;
+        __u32   standards;
+        __u32   flags;
+        __u32   reserved[14];
 } __attribute__ ((packed));
 
 /* Interlaced or progressive format */
@@ -1019,8 +1054,42 @@ struct v4l2_bt_timings {
 #define V4L2_DV_VSYNC_POS_POL   0x00000001
 #define V4L2_DV_HSYNC_POS_POL   0x00000002
 
-
-/* DV timings */
+/* Timings standards */
+#define V4L2_DV_BT_STD_CEA861   (1 << 0)  /* CEA-861 Digital TV Profile */
+#define V4L2_DV_BT_STD_DMT      (1 << 1)  /* VESA Discrete Monitor Timings */
+#define V4L2_DV_BT_STD_CVT      (1 << 2)  /* VESA Coordinated Video Timings */
+#define V4L2_DV_BT_STD_GTF      (1 << 3)  /* VESA Generalized Timings Formula */
+
+/* Flags */
+
+/* CVT/GTF specific: timing uses reduced blanking (CVT) or the 'Secondary
+   GTF' curve (GTF). In both cases the horizontal and/or vertical blanking
+   intervals are reduced, allowing a higher resolution over the same
+   bandwidth. This is a read-only flag. */
+#define V4L2_DV_FL_REDUCED_BLANKING             (1 << 0)
+/* CEA-861 specific: set for CEA-861 formats with a framerate of a multiple
+   of six. These formats can be optionally played at 1 / 1.001 speed.
+   This is a read-only flag. */
+#define V4L2_DV_FL_CAN_REDUCE_FPS               (1 << 1)
+/* CEA-861 specific: only valid for video transmitters, the flag is cleared
+   by receivers.
+   If the framerate of the format is a multiple of six, then the pixelclock
+   used to set up the transmitter is divided by 1.001 to make it compatible
+   with 60 Hz based standards such as NTSC and PAL-M that use a framerate of
+   29.97 Hz. Otherwise this flag is cleared. If the transmitter can't generate
+   such frequencies, then the flag will also be cleared. */
+#define V4L2_DV_FL_REDUCED_FPS                  (1 << 2)
+/* Specific to interlaced formats: if set, then field 1 is really one half-line
+   longer and field 2 is really one half-line shorter, so each field has
+   exactly the same number of half-lines. Whether half-lines can be detected
+   or used depends on the hardware. */
+#define V4L2_DV_FL_HALF_LINE                    (1 << 0)
+
+
+/** struct v4l2_dv_timings - DV timings
+ * @type:       the type of the timings
+ * @bt: BT656/1120 timings
+ */
 struct v4l2_dv_timings {
         __u32 type;
         union {
@@ -1032,6 +1101,64 @@ struct v4l2_dv_timings {
 /* Values for the type field */
 #define V4L2_DV_BT_656_1120     0       /* BT.656/1120 timing type */
 
+
+/** struct v4l2_enum_dv_timings - DV timings enumeration
+ * @index:      enumeration index
+ * @reserved:   must be zeroed
+ * @timings:    the timings for the given index
+ */
+struct v4l2_enum_dv_timings {
+        __u32 index;
+        __u32 reserved[3];
+        struct v4l2_dv_timings timings;
+};
+
+/** struct v4l2_bt_timings_cap - BT.656/BT.1120 timing capabilities
+ * @min_width:          width in pixels
+ * @max_width:          width in pixels
+ * @min_height:         height in lines
+ * @max_height:         height in lines
+ * @min_pixelclock:     Pixel clock in HZ. Ex. 74.25MHz->74250000
+ * @max_pixelclock:     Pixel clock in HZ. Ex. 74.25MHz->74250000
+ * @standards:          Supported standards
+ * @capabilities:       Supported capabilities
+ * @reserved:           Must be zeroed
+ */
+struct v4l2_bt_timings_cap {
+        __u32   min_width;
+        __u32   max_width;
+        __u32   min_height;
+        __u32   max_height;
+        __u64   min_pixelclock;
+        __u64   max_pixelclock;
+        __u32   standards;
+        __u32   capabilities;
+        __u32   reserved[16];
+} __attribute__ ((packed));
+
+/* Supports interlaced formats */
+#define V4L2_DV_BT_CAP_INTERLACED       (1 << 0)
+/* Supports progressive formats */
+#define V4L2_DV_BT_CAP_PROGRESSIVE      (1 << 1)
+/* Supports CVT/GTF reduced blanking */
+#define V4L2_DV_BT_CAP_REDUCED_BLANKING (1 << 2)
+/* Supports custom formats */
+#define V4L2_DV_BT_CAP_CUSTOM           (1 << 3)
+
+/** struct v4l2_dv_timings_cap - DV timings capabilities
+ * @type:       the type of the timings (same as in struct v4l2_dv_timings)
+ * @bt:         the BT656/1120 timings capabilities
+ */
+struct v4l2_dv_timings_cap {
+        __u32 type;
+        __u32 reserved[3];
+        union {
+                struct v4l2_bt_timings_cap bt;
+                __u32 raw_data[32];
+        };
+};
+
+
 /*
  *      V I D E O   I N P U T S
  */
@@ -1040,7 +1167,7 @@ struct v4l2_input {
         __u8         name[32];          /*  Label */
         __u32        type;              /*  Type of input */
         __u32        audioset;          /*  Associated audios (bitfield) */
-        __u32        tuner;             /*  Associated tuner */
+        __u32        tuner;             /*  enum v4l2_tuner_type */
         v4l2_std_id  std;
         __u32        status;
         __u32        capabilities;
@@ -1137,6 +1264,8 @@ struct v4l2_ext_controls {
 #define V4L2_CTRL_CLASS_FM_TX 0x009b0000        /* FM Modulator control class */
 #define V4L2_CTRL_CLASS_FLASH 0x009c0000        /* Camera flash controls */
 #define V4L2_CTRL_CLASS_JPEG 0x009d0000         /* JPEG-compression controls */
+#define V4L2_CTRL_CLASS_IMAGE_SOURCE 0x009e0000 /* Image source controls */
+#define V4L2_CTRL_CLASS_IMAGE_PROC 0x009f0000   /* Image processing controls */
 
 #define V4L2_CTRL_ID_MASK         (0x0fffffff)
 #define V4L2_CTRL_ID2CLASS(id)    ((id) & 0x0fff0000UL)
@@ -1151,12 +1280,13 @@ enum v4l2_ctrl_type {
         V4L2_CTRL_TYPE_CTRL_CLASS    = 6,
         V4L2_CTRL_TYPE_STRING        = 7,
         V4L2_CTRL_TYPE_BITMASK       = 8,
+        V4L2_CTRL_TYPE_INTEGER_MENU = 9,
 };
 
 /*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
 struct v4l2_queryctrl {
         __u32                id;
-        enum v4l2_ctrl_type  type;
+        __u32                type;      /* enum v4l2_ctrl_type */
         __u8                 name[32];  /* Whatever */
         __s32                minimum;   /* Note signedness */
         __s32                maximum;
@@ -1170,9 +1300,12 @@ struct v4l2_queryctrl {
 struct v4l2_querymenu {
         __u32           id;
         __u32           index;
-        __u8            name[32];       /* Whatever */
+        union {
+                __u8    name[32];       /* Whatever */
+                __s64   value;
+        };
         __u32           reserved;
-};
+} __attribute__ ((packed));
 
 /*  Control flags  */
 #define V4L2_CTRL_FLAG_DISABLED         0x0001
@@ -1237,16 +1370,22 @@ enum v4l2_power_line_frequency {
 #define V4L2_CID_COLOR_KILLER                   (V4L2_CID_BASE+30)
 #define V4L2_CID_COLORFX                        (V4L2_CID_BASE+31)
 enum v4l2_colorfx {
-        V4L2_COLORFX_NONE       = 0,
-        V4L2_COLORFX_BW         = 1,
-        V4L2_COLORFX_SEPIA      = 2,
-        V4L2_COLORFX_NEGATIVE = 3,
-        V4L2_COLORFX_EMBOSS = 4,
-        V4L2_COLORFX_SKETCH = 5,
-        V4L2_COLORFX_SKY_BLUE = 6,
-        V4L2_COLORFX_GRASS_GREEN = 7,
-        V4L2_COLORFX_SKIN_WHITEN = 8,
-        V4L2_COLORFX_VIVID = 9,
+        V4L2_COLORFX_NONE                       = 0,
+        V4L2_COLORFX_BW                         = 1,
+        V4L2_COLORFX_SEPIA                      = 2,
+        V4L2_COLORFX_NEGATIVE                   = 3,
+        V4L2_COLORFX_EMBOSS                     = 4,
+        V4L2_COLORFX_SKETCH                     = 5,
+        V4L2_COLORFX_SKY_BLUE                   = 6,
+        V4L2_COLORFX_GRASS_GREEN                = 7,
+        V4L2_COLORFX_SKIN_WHITEN                = 8,
+        V4L2_COLORFX_VIVID                      = 9,
+        V4L2_COLORFX_AQUA                       = 10,
+        V4L2_COLORFX_ART_FREEZE                 = 11,
+        V4L2_COLORFX_SILHOUETTE                 = 12,
+        V4L2_COLORFX_SOLARIZATION               = 13,
+        V4L2_COLORFX_ANTIQUE                    = 14,
+        V4L2_COLORFX_SET_CBCR                   = 15,
 };
 #define V4L2_CID_AUTOBRIGHTNESS                 (V4L2_CID_BASE+32)
 #define V4L2_CID_BAND_STOP_FILTER               (V4L2_CID_BASE+33)
@@ -1263,9 +1402,10 @@ enum v4l2_colorfx {
 #define V4L2_CID_MIN_BUFFERS_FOR_OUTPUT         (V4L2_CID_BASE+40)
 
 #define V4L2_CID_ALPHA_COMPONENT                (V4L2_CID_BASE+41)
+#define V4L2_CID_COLORFX_CBCR                   (V4L2_CID_BASE+42)
 
 /* last CID + 1 */
-#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+42)
+#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+43)
 
 /*  MPEG-class control IDs defined by V4L2 */
 #define V4L2_CID_MPEG_BASE                      (V4L2_CTRL_CLASS_MPEG | 0x900)
@@ -1689,6 +1829,78 @@ enum  v4l2_exposure_auto_type {
 #define V4L2_CID_IRIS_ABSOLUTE                  (V4L2_CID_CAMERA_CLASS_BASE+17)
 #define V4L2_CID_IRIS_RELATIVE                  (V4L2_CID_CAMERA_CLASS_BASE+18)
 
+#define V4L2_CID_AUTO_EXPOSURE_BIAS             (V4L2_CID_CAMERA_CLASS_BASE+19)
+
+#define V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE    (V4L2_CID_CAMERA_CLASS_BASE+20)
+enum v4l2_auto_n_preset_white_balance {
+        V4L2_WHITE_BALANCE_MANUAL               = 0,
+        V4L2_WHITE_BALANCE_AUTO                 = 1,
+        V4L2_WHITE_BALANCE_INCANDESCENT         = 2,
+        V4L2_WHITE_BALANCE_FLUORESCENT          = 3,
+        V4L2_WHITE_BALANCE_FLUORESCENT_H        = 4,
+        V4L2_WHITE_BALANCE_HORIZON              = 5,
+        V4L2_WHITE_BALANCE_DAYLIGHT             = 6,
+        V4L2_WHITE_BALANCE_FLASH                = 7,
+        V4L2_WHITE_BALANCE_CLOUDY               = 8,
+        V4L2_WHITE_BALANCE_SHADE                = 9,
+};
+
+#define V4L2_CID_WIDE_DYNAMIC_RANGE             (V4L2_CID_CAMERA_CLASS_BASE+21)
+#define V4L2_CID_IMAGE_STABILIZATION            (V4L2_CID_CAMERA_CLASS_BASE+22)
+
+#define V4L2_CID_ISO_SENSITIVITY                (V4L2_CID_CAMERA_CLASS_BASE+23)
+#define V4L2_CID_ISO_SENSITIVITY_AUTO           (V4L2_CID_CAMERA_CLASS_BASE+24)
+enum v4l2_iso_sensitivity_auto_type {
+        V4L2_ISO_SENSITIVITY_MANUAL             = 0,
+        V4L2_ISO_SENSITIVITY_AUTO               = 1,
+};
+
+#define V4L2_CID_EXPOSURE_METERING              (V4L2_CID_CAMERA_CLASS_BASE+25)
+enum v4l2_exposure_metering {
+        V4L2_EXPOSURE_METERING_AVERAGE          = 0,
+        V4L2_EXPOSURE_METERING_CENTER_WEIGHTED  = 1,
+        V4L2_EXPOSURE_METERING_SPOT             = 2,
+};
+
+#define V4L2_CID_SCENE_MODE                     (V4L2_CID_CAMERA_CLASS_BASE+26)
+enum v4l2_scene_mode {
+        V4L2_SCENE_MODE_NONE                    = 0,
+        V4L2_SCENE_MODE_BACKLIGHT               = 1,
+        V4L2_SCENE_MODE_BEACH_SNOW              = 2,
+        V4L2_SCENE_MODE_CANDLE_LIGHT            = 3,
+        V4L2_SCENE_MODE_DAWN_DUSK               = 4,
+        V4L2_SCENE_MODE_FALL_COLORS             = 5,
+        V4L2_SCENE_MODE_FIREWORKS               = 6,
+        V4L2_SCENE_MODE_LANDSCAPE               = 7,
+        V4L2_SCENE_MODE_NIGHT                   = 8,
+        V4L2_SCENE_MODE_PARTY_INDOOR            = 9,
+        V4L2_SCENE_MODE_PORTRAIT                = 10,
+        V4L2_SCENE_MODE_SPORTS                  = 11,
+        V4L2_SCENE_MODE_SUNSET                  = 12,
+        V4L2_SCENE_MODE_TEXT                    = 13,
+};
+
+#define V4L2_CID_3A_LOCK                        (V4L2_CID_CAMERA_CLASS_BASE+27)
+#define V4L2_LOCK_EXPOSURE                      (1 << 0)
+#define V4L2_LOCK_WHITE_BALANCE                 (1 << 1)
+#define V4L2_LOCK_FOCUS                         (1 << 2)
+
+#define V4L2_CID_AUTO_FOCUS_START               (V4L2_CID_CAMERA_CLASS_BASE+28)
+#define V4L2_CID_AUTO_FOCUS_STOP                (V4L2_CID_CAMERA_CLASS_BASE+29)
+#define V4L2_CID_AUTO_FOCUS_STATUS              (V4L2_CID_CAMERA_CLASS_BASE+30)
+#define V4L2_AUTO_FOCUS_STATUS_IDLE             (0 << 0)
+#define V4L2_AUTO_FOCUS_STATUS_BUSY             (1 << 0)
+#define V4L2_AUTO_FOCUS_STATUS_REACHED          (1 << 1)
+#define V4L2_AUTO_FOCUS_STATUS_FAILED           (1 << 2)
+
+#define V4L2_CID_AUTO_FOCUS_RANGE               (V4L2_CID_CAMERA_CLASS_BASE+31)
+enum v4l2_auto_focus_range {
+        V4L2_AUTO_FOCUS_RANGE_AUTO              = 0,
+        V4L2_AUTO_FOCUS_RANGE_NORMAL            = 1,
+        V4L2_AUTO_FOCUS_RANGE_MACRO             = 2,
+        V4L2_AUTO_FOCUS_RANGE_INFINITY          = 3,
+};
+
 /* FM Modulator class control IDs */
 #define V4L2_CID_FM_TX_CLASS_BASE               (V4L2_CTRL_CLASS_FM_TX | 0x900)
 #define V4L2_CID_FM_TX_CLASS                    (V4L2_CTRL_CLASS_FM_TX | 1)
@@ -1782,13 +1994,28 @@ enum v4l2_jpeg_chroma_subsampling {
 #define V4L2_JPEG_ACTIVE_MARKER_DQT             (1 << 17)
 #define V4L2_JPEG_ACTIVE_MARKER_DHT             (1 << 18)
 
+/* Image source controls */
+#define V4L2_CID_IMAGE_SOURCE_CLASS_BASE        (V4L2_CTRL_CLASS_IMAGE_SOURCE | 0x900)
+#define V4L2_CID_IMAGE_SOURCE_CLASS             (V4L2_CTRL_CLASS_IMAGE_SOURCE | 1)
+
+#define V4L2_CID_VBLANK                         (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 1)
+#define V4L2_CID_HBLANK                         (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 2)
+#define V4L2_CID_ANALOGUE_GAIN                  (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 3)
+
+/* Image processing controls */
+#define V4L2_CID_IMAGE_PROC_CLASS_BASE          (V4L2_CTRL_CLASS_IMAGE_PROC | 0x900)
+#define V4L2_CID_IMAGE_PROC_CLASS               (V4L2_CTRL_CLASS_IMAGE_PROC | 1)
+
+#define V4L2_CID_LINK_FREQ                      (V4L2_CID_IMAGE_PROC_CLASS_BASE + 1)
+#define V4L2_CID_PIXEL_RATE                     (V4L2_CID_IMAGE_PROC_CLASS_BASE + 2)
+
 /*
  *      T U N I N G
  */
 struct v4l2_tuner {
         __u32                   index;
         __u8                    name[32];
-        enum v4l2_tuner_type    type;
+        __u32                   type;   /* enum v4l2_tuner_type */
         __u32                   capability;
         __u32                   rangelow;
         __u32                   rangehigh;
@@ -1838,14 +2065,14 @@ struct v4l2_modulator {
 
 struct v4l2_frequency {
         __u32                 tuner;
-        enum v4l2_tuner_type  type;
+        __u32                 type;     /* enum v4l2_tuner_type */
         __u32                 frequency;
         __u32                 reserved[8];
 };
 
 struct v4l2_hw_freq_seek {
         __u32                 tuner;
-        enum v4l2_tuner_type  type;
+        __u32                 type;     /* enum v4l2_tuner_type */
         __u32                 seek_upward;
         __u32                 wrap_around;
         __u32                 spacing;
@@ -2056,7 +2283,7 @@ struct v4l2_sliced_vbi_cap {
                                  (equals frame lines 313-336 for 625 line video
                                   standards, 263-286 for 525 line standards) */
         __u16   service_lines[2][24];
-        enum v4l2_buf_type type;
+        __u32   type;           /* enum v4l2_buf_type */
         __u32   reserved[3];    /* must be 0 */
 };
 
@@ -2137,8 +2364,8 @@ struct v4l2_plane_pix_format {
  * @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
+ * @field:              enum v4l2_field; field order (for interlaced video)
+ * @colorspace:         enum v4l2_colorspace; supplemental to pixelformat
  * @plane_fmt:          per-plane information
  * @num_planes:         number of planes for this format
  */
@@ -2146,8 +2373,8 @@ struct v4l2_pix_format_mplane {
         __u32                           width;
         __u32                           height;
         __u32                           pixelformat;
-        enum v4l2_field                 field;
-        enum v4l2_colorspace            colorspace;
+        __u32                           field;
+        __u32                           colorspace;
 
         struct v4l2_plane_pix_format    plane_fmt[VIDEO_MAX_PLANES];
         __u8                            num_planes;
@@ -2156,7 +2383,7 @@ struct v4l2_pix_format_mplane {
 
 /**
  * struct v4l2_format - stream data format
- * @type:       type of the data stream
+ * @type:       enum v4l2_buf_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
@@ -2165,7 +2392,7 @@ struct v4l2_pix_format_mplane {
  * @raw_data:   placeholder for future extensions and custom formats
  */
 struct v4l2_format {
-        enum v4l2_buf_type type;
+        __u32    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 */
@@ -2179,7 +2406,7 @@ struct v4l2_format {
 /*      Stream type-dependent parameters
  */
 struct v4l2_streamparm {
-        enum v4l2_buf_type type;
+        __u32    type;                  /* enum v4l2_buf_type */
         union {
                 struct v4l2_captureparm capture;
                 struct v4l2_outputparm  output;
@@ -2292,14 +2519,14 @@ struct v4l2_dbg_chip_ident {
  * @index:      on return, index of the first created buffer
  * @count:      entry: number of requested buffers,
  *              return: number of created buffers
- * @memory:     buffer memory type
+ * @memory:     enum v4l2_memory; buffer memory type
  * @format:     frame format, for which buffers are requested
  * @reserved:   future extensions
  */
 struct v4l2_create_buffers {
         __u32                   index;
         __u32                   count;
-        enum v4l2_memory        memory;
+        __u32                   memory;
         struct v4l2_format      format;
         __u32                   reserved[8];
 };
@@ -2356,8 +2583,8 @@ struct v4l2_create_buffers {
 #define VIDIOC_TRY_FMT          _IOWR('V', 64, struct v4l2_format)
 #define VIDIOC_ENUMAUDIO        _IOWR('V', 65, struct v4l2_audio)
 #define VIDIOC_ENUMAUDOUT       _IOWR('V', 66, struct v4l2_audioout)
-#define VIDIOC_G_PRIORITY        _IOR('V', 67, enum v4l2_priority)
-#define VIDIOC_S_PRIORITY        _IOW('V', 68, enum v4l2_priority)
+#define VIDIOC_G_PRIORITY        _IOR('V', 67, __u32) /* enum v4l2_priority */
+#define VIDIOC_S_PRIORITY        _IOW('V', 68, __u32) /* enum v4l2_priority */
 #define VIDIOC_G_SLICED_VBI_CAP _IOWR('V', 69, struct v4l2_sliced_vbi_cap)
 #define VIDIOC_LOG_STATUS         _IO('V', 70)
 #define VIDIOC_G_EXT_CTRLS      _IOWR('V', 71, struct v4l2_ext_controls)
@@ -2384,6 +2611,9 @@ struct v4l2_create_buffers {
 #endif
 
 #define VIDIOC_S_HW_FREQ_SEEK    _IOW('V', 82, struct v4l2_hw_freq_seek)
+
+/* These four DV Preset ioctls are deprecated in favor of the DV Timings
+   ioctls. */
 #define VIDIOC_ENUM_DV_PRESETS  _IOWR('V', 83, struct v4l2_dv_enum_preset)
 #define VIDIOC_S_DV_PRESET      _IOWR('V', 84, struct v4l2_dv_preset)
 #define VIDIOC_G_DV_PRESET      _IOWR('V', 85, struct v4l2_dv_preset)
@@ -2408,6 +2638,12 @@ struct v4l2_create_buffers {
 #define VIDIOC_DECODER_CMD      _IOWR('V', 96, struct v4l2_decoder_cmd)
 #define VIDIOC_TRY_DECODER_CMD  _IOWR('V', 97, struct v4l2_decoder_cmd)
 
+/* Experimental, these three ioctls may change over the next couple of kernel
+   versions. */
+#define VIDIOC_ENUM_DV_TIMINGS  _IOWR('V', 96, struct v4l2_enum_dv_timings)
+#define VIDIOC_QUERY_DV_TIMINGS  _IOR('V', 97, struct v4l2_dv_timings)
+#define VIDIOC_DV_TIMINGS_CAP   _IOWR('V', 98, struct v4l2_dv_timings_cap)
+
 /* Reminder: when adding new ioctls please add support for them to
    drivers/media/video/v4l2-compat-ioctl32.c as well! */
 
diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h
index 7323a3390206..fc457f452f64 100644
--- a/include/linux/virtio_config.h
+++ b/include/linux/virtio_config.h
@@ -74,15 +74,6 @@
  * @set_status: write the status byte
  *      vdev: the virtio_device
  *      status: the new status byte
- * @request_vqs: request the specified number of virtqueues
- *      vdev: the virtio_device
- *      max_vqs: the max number of virtqueues we want
- *      If supplied, must call before any virtqueues are instantiated.
- *      To modify the max number of virtqueues after request_vqs has been
- *      called, call free_vqs and then request_vqs with a new value.
- * @free_vqs: cleanup resources allocated by request_vqs
- *      vdev: the virtio_device
- *      If supplied, must call after all virtqueues have been deleted.
  * @reset: reset the device
  *      vdev: the virtio device
  *      After this, status and feature negotiation must be done again
@@ -156,7 +147,7 @@ static inline bool virtio_has_feature(const struct virtio_device *vdev,
  * @vdev: the virtio device
  * @fbit: the feature bit
  * @offset: the type to search for.
- * @val: a pointer to the value to fill in.
+ * @v: a pointer to the value to fill in.
  *
  * The return value is -ENOENT if the feature doesn't exist.  Otherwise
  * the config value is copied into whatever is pointed to by v. */
diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
index 970d5a2a9047..2470f541af50 100644
--- a/include/linux/virtio_net.h
+++ b/include/linux/virtio_net.h
@@ -49,8 +49,11 @@
 #define VIRTIO_NET_F_CTRL_RX    18      /* Control channel RX mode support */
 #define VIRTIO_NET_F_CTRL_VLAN  19      /* Control channel VLAN filtering */
 #define VIRTIO_NET_F_CTRL_RX_EXTRA 20   /* Extra RX mode control support */
+#define VIRTIO_NET_F_GUEST_ANNOUNCE 21  /* Guest can announce device on the
+                                         * network */
 
 #define VIRTIO_NET_S_LINK_UP    1       /* Link is up */
+#define VIRTIO_NET_S_ANNOUNCE   2       /* Announcement is needed */
 
 struct virtio_net_config {
         /* The config defining mac address (if VIRTIO_NET_F_MAC) */
@@ -152,4 +155,15 @@ struct virtio_net_ctrl_mac {
  #define VIRTIO_NET_CTRL_VLAN_ADD             0
  #define VIRTIO_NET_CTRL_VLAN_DEL             1
 
+/*
+ * Control link announce acknowledgement
+ *
+ * The command VIRTIO_NET_CTRL_ANNOUNCE_ACK is used to indicate that
+ * driver has recevied the notification; device would clear the
+ * VIRTIO_NET_S_ANNOUNCE bit in the status field after it receives
+ * this command.
+ */
+#define VIRTIO_NET_CTRL_ANNOUNCE       3
+ #define VIRTIO_NET_CTRL_ANNOUNCE_ACK         0
+
 #endif /* _LINUX_VIRTIO_NET_H */
diff --git a/include/linux/vme.h b/include/linux/vme.h
new file mode 100644
index 000000000000..c9d65bf14cec
--- /dev/null
+++ b/include/linux/vme.h
@@ -0,0 +1,174 @@
+#ifndef _VME_H_
+#define _VME_H_
+
+/* Resource Type */
+enum vme_resource_type {
+        VME_MASTER,
+        VME_SLAVE,
+        VME_DMA,
+        VME_LM
+};
+
+/* VME Address Spaces */
+#define VME_A16         0x1
+#define VME_A24         0x2
+#define VME_A32         0x4
+#define VME_A64         0x8
+#define VME_CRCSR       0x10
+#define VME_USER1       0x20
+#define VME_USER2       0x40
+#define VME_USER3       0x80
+#define VME_USER4       0x100
+
+#define VME_A16_MAX     0x10000ULL
+#define VME_A24_MAX     0x1000000ULL
+#define VME_A32_MAX     0x100000000ULL
+#define VME_A64_MAX     0x10000000000000000ULL
+#define VME_CRCSR_MAX   0x1000000ULL
+
+
+/* VME Cycle Types */
+#define VME_SCT         0x1
+#define VME_BLT         0x2
+#define VME_MBLT        0x4
+#define VME_2eVME       0x8
+#define VME_2eSST       0x10
+#define VME_2eSSTB      0x20
+
+#define VME_2eSST160    0x100
+#define VME_2eSST267    0x200
+#define VME_2eSST320    0x400
+
+#define VME_SUPER       0x1000
+#define VME_USER        0x2000
+#define VME_PROG        0x4000
+#define VME_DATA        0x8000
+
+/* VME Data Widths */
+#define VME_D8          0x1
+#define VME_D16         0x2
+#define VME_D32         0x4
+#define VME_D64         0x8
+
+/* Arbitration Scheduling Modes */
+#define VME_R_ROBIN_MODE        0x1
+#define VME_PRIORITY_MODE       0x2
+
+#define VME_DMA_PATTERN                 (1<<0)
+#define VME_DMA_PCI                     (1<<1)
+#define VME_DMA_VME                     (1<<2)
+
+#define VME_DMA_PATTERN_BYTE            (1<<0)
+#define VME_DMA_PATTERN_WORD            (1<<1)
+#define VME_DMA_PATTERN_INCREMENT       (1<<2)
+
+#define VME_DMA_VME_TO_MEM              (1<<0)
+#define VME_DMA_MEM_TO_VME              (1<<1)
+#define VME_DMA_VME_TO_VME              (1<<2)
+#define VME_DMA_MEM_TO_MEM              (1<<3)
+#define VME_DMA_PATTERN_TO_VME          (1<<4)
+#define VME_DMA_PATTERN_TO_MEM          (1<<5)
+
+struct vme_dma_attr {
+        u32 type;
+        void *private;
+};
+
+struct vme_resource {
+        enum vme_resource_type type;
+        struct list_head *entry;
+};
+
+extern struct bus_type vme_bus_type;
+
+/* VME_MAX_BRIDGES comes from the type of vme_bus_numbers */
+#define VME_MAX_BRIDGES         (sizeof(unsigned int)*8)
+#define VME_MAX_SLOTS           32
+
+#define VME_SLOT_CURRENT        -1
+#define VME_SLOT_ALL            -2
+
+/**
+ * Structure representing a VME device
+ * @num: The device number
+ * @bridge: Pointer to the bridge device this device is on
+ * @dev: Internal device structure
+ * @drv_list: List of devices (per driver)
+ * @bridge_list: List of devices (per bridge)
+ */
+struct vme_dev {
+        int num;
+        struct vme_bridge *bridge;
+        struct device dev;
+        struct list_head drv_list;
+        struct list_head bridge_list;
+};
+
+struct vme_driver {
+        struct list_head node;
+        const char *name;
+        int (*match)(struct vme_dev *);
+        int (*probe)(struct vme_dev *);
+        int (*remove)(struct vme_dev *);
+        void (*shutdown)(void);
+        struct device_driver driver;
+        struct list_head devices;
+};
+
+void *vme_alloc_consistent(struct vme_resource *, size_t, dma_addr_t *);
+void vme_free_consistent(struct vme_resource *, size_t,  void *,
+        dma_addr_t);
+
+size_t vme_get_size(struct vme_resource *);
+
+struct vme_resource *vme_slave_request(struct vme_dev *, u32, u32);
+int vme_slave_set(struct vme_resource *, int, unsigned long long,
+        unsigned long long, dma_addr_t, u32, u32);
+int vme_slave_get(struct vme_resource *, int *, unsigned long long *,
+        unsigned long long *, dma_addr_t *, u32 *, u32 *);
+void vme_slave_free(struct vme_resource *);
+
+struct vme_resource *vme_master_request(struct vme_dev *, u32, u32, u32);
+int vme_master_set(struct vme_resource *, int, unsigned long long,
+        unsigned long long, u32, u32, u32);
+int vme_master_get(struct vme_resource *, int *, unsigned long long *,
+        unsigned long long *, u32 *, u32 *, u32 *);
+ssize_t vme_master_read(struct vme_resource *, void *, size_t, loff_t);
+ssize_t vme_master_write(struct vme_resource *, void *, size_t, loff_t);
+unsigned int vme_master_rmw(struct vme_resource *, unsigned int, unsigned int,
+        unsigned int, loff_t);
+void vme_master_free(struct vme_resource *);
+
+struct vme_resource *vme_dma_request(struct vme_dev *, u32);
+struct vme_dma_list *vme_new_dma_list(struct vme_resource *);
+struct vme_dma_attr *vme_dma_pattern_attribute(u32, u32);
+struct vme_dma_attr *vme_dma_pci_attribute(dma_addr_t);
+struct vme_dma_attr *vme_dma_vme_attribute(unsigned long long, u32, u32, u32);
+void vme_dma_free_attribute(struct vme_dma_attr *);
+int vme_dma_list_add(struct vme_dma_list *, struct vme_dma_attr *,
+        struct vme_dma_attr *, size_t);
+int vme_dma_list_exec(struct vme_dma_list *);
+int vme_dma_list_free(struct vme_dma_list *);
+int vme_dma_free(struct vme_resource *);
+
+int vme_irq_request(struct vme_dev *, int, int,
+        void (*callback)(int, int, void *), void *);
+void vme_irq_free(struct vme_dev *, int, int);
+int vme_irq_generate(struct vme_dev *, int, int);
+
+struct vme_resource *vme_lm_request(struct vme_dev *);
+int vme_lm_count(struct vme_resource *);
+int vme_lm_set(struct vme_resource *, unsigned long long, u32, u32);
+int vme_lm_get(struct vme_resource *, unsigned long long *, u32 *, u32 *);
+int vme_lm_attach(struct vme_resource *, int, void (*callback)(int));
+int vme_lm_detach(struct vme_resource *, int);
+void vme_lm_free(struct vme_resource *);
+
+int vme_slot_get(struct vme_dev *);
+
+int vme_register_driver(struct vme_driver *, unsigned int);
+void vme_unregister_driver(struct vme_driver *);
+
+
+#endif /* _VME_H_ */
+
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h
index e33d77f15bda..50ae7d0c279e 100644
--- a/include/linux/vt_kern.h
+++ b/include/linux/vt_kern.h
@@ -70,7 +70,6 @@ int con_set_unimap(struct vc_data *vc, ushort ct, struct unipair __user *list);
 int con_get_unimap(struct vc_data *vc, ushort ct, ushort __user *uct, struct unipair __user *list);
 int con_set_default_unimap(struct vc_data *vc);
 void con_free_unimap(struct vc_data *vc);
-void con_protect_unimap(struct vc_data *vc, int rdonly);
 int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc);
 
 #define vc_translate(vc, c) ((vc)->vc_translate[(c) |                   \
diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h
index ac40716b44e9..da70f0facd2b 100644
--- a/include/linux/watchdog.h
+++ b/include/linux/watchdog.h
@@ -45,6 +45,8 @@ struct watchdog_info {
 #define WDIOF_SETTIMEOUT        0x0080  /* Set timeout (in seconds) */
 #define WDIOF_MAGICCLOSE        0x0100  /* Supports magic close char */
 #define WDIOF_PRETIMEOUT        0x0200  /* Pretimeout (in seconds), get/set */
+#define WDIOF_ALARMONLY         0x0400  /* Watchdog triggers a management or
+                                           other external alarm not a reboot */
 #define WDIOF_KEEPALIVEPING     0x8000  /* Keep alive ping reply */
 
 #define WDIOS_DISABLECARD       0x0001  /* Turn off the watchdog timer */
@@ -54,6 +56,8 @@ struct watchdog_info {
 #ifdef __KERNEL__
 
 #include <linux/bitops.h>
+#include <linux/device.h>
+#include <linux/cdev.h>
 
 struct watchdog_ops;
 struct watchdog_device;
@@ -67,6 +71,8 @@ struct watchdog_device;
  * @status:     The routine that shows the status of the watchdog device.
  * @set_timeout:The routine for setting the watchdog devices timeout value.
  * @get_timeleft:The routine that get's the time that's left before a reset.
+ * @ref:        The ref operation for dyn. allocated watchdog_device structs
+ * @unref:      The unref operation for dyn. allocated watchdog_device structs
  * @ioctl:      The routines that handles extra ioctl calls.
  *
  * The watchdog_ops structure contains a list of low-level operations
@@ -84,11 +90,17 @@ struct watchdog_ops {
         unsigned int (*status)(struct watchdog_device *);
         int (*set_timeout)(struct watchdog_device *, unsigned int);
         unsigned int (*get_timeleft)(struct watchdog_device *);
+        void (*ref)(struct watchdog_device *);
+        void (*unref)(struct watchdog_device *);
         long (*ioctl)(struct watchdog_device *, unsigned int, unsigned long);
 };
 
 /** struct watchdog_device - The structure that defines a watchdog device
  *
+ * @id:         The watchdog's ID. (Allocated by watchdog_register_device)
+ * @cdev:       The watchdog's Character device.
+ * @dev:        The device for our watchdog
+ * @parent:     The parent bus device
  * @info:       Pointer to a watchdog_info structure.
  * @ops:        Pointer to the list of watchdog operations.
  * @bootstatus: Status of the watchdog device at boot.
@@ -96,6 +108,7 @@ struct watchdog_ops {
  * @min_timeout:The watchdog devices minimum timeout value.
  * @max_timeout:The watchdog devices maximum timeout value.
  * @driver-data:Pointer to the drivers private data.
+ * @lock:       Lock for watchdog core internal use only.
  * @status:     Field that contains the devices internal status bits.
  *
  * The watchdog_device structure contains all information about a
@@ -103,8 +116,15 @@ struct watchdog_ops {
  *
  * The driver-data field may not be accessed directly. It must be accessed
  * via the watchdog_set_drvdata and watchdog_get_drvdata helpers.
+ *
+ * The lock field is for watchdog core internal use only and should not be
+ * touched.
  */
 struct watchdog_device {
+        int id;
+        struct cdev cdev;
+        struct device *dev;
+        struct device *parent;
         const struct watchdog_info *info;
         const struct watchdog_ops *ops;
         unsigned int bootstatus;
@@ -112,12 +132,14 @@ struct watchdog_device {
         unsigned int min_timeout;
         unsigned int max_timeout;
         void *driver_data;
+        struct mutex lock;
         unsigned long status;
 /* Bit numbers for status flags */
 #define WDOG_ACTIVE             0       /* Is the watchdog running/active */
 #define WDOG_DEV_OPEN           1       /* Opened via /dev/watchdog ? */
 #define WDOG_ALLOW_RELEASE      2       /* Did we receive the magic char ? */
 #define WDOG_NO_WAY_OUT         3       /* Is 'nowayout' feature set ? */
+#define WDOG_UNREGISTERED       4       /* Has the device been unregistered */
 };
 
 #ifdef CONFIG_WATCHDOG_NOWAYOUT
@@ -128,6 +150,12 @@ struct watchdog_device {
 #define WATCHDOG_NOWAYOUT_INIT_STATUS   0
 #endif
 
+/* Use the following function to check wether or not the watchdog is active */
+static inline bool watchdog_active(struct watchdog_device *wdd)
+{
+        return test_bit(WDOG_ACTIVE, &wdd->status);
+}
+
 /* Use the following function to set the nowayout feature */
 static inline void watchdog_set_nowayout(struct watchdog_device *wdd, bool nowayout)
 {
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index a2b84f598e2b..6d0a0fcd80e7 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -58,7 +58,6 @@ extern const char *wb_reason_name[];
  * in a manner such that unspecified fields are set to zero.
  */
 struct writeback_control {
-        enum writeback_sync_modes sync_mode;
         long nr_to_write;               /* Write this many pages, and decrement
                                            this for each page written */
         long pages_skipped;             /* Pages which were not written */
@@ -71,6 +70,8 @@ struct writeback_control {
         loff_t range_start;
         loff_t range_end;
 
+        enum writeback_sync_modes sync_mode;
+
         unsigned for_kupdate:1;         /* A kupdate writeback */
         unsigned for_background:1;      /* A background writeback */
         unsigned tagged_writepages:1;   /* tag-and-write to avoid livelock */
@@ -94,6 +95,7 @@ long writeback_inodes_wb(struct bdi_writeback *wb, long nr_pages,
                                 enum wb_reason reason);
 long wb_do_writeback(struct bdi_writeback *wb, int force_wait);
 void wakeup_flusher_threads(long nr_pages, enum wb_reason reason);
+void inode_wait_for_writeback(struct inode *inode);
 
 /* writeback.h requires fs.h; it, too, is not included from here. */
 static inline void wait_on_inode(struct inode *inode)
@@ -101,12 +103,6 @@ static inline void wait_on_inode(struct inode *inode)
         might_sleep();
         wait_on_bit(&inode->i_state, __I_NEW, inode_wait, TASK_UNINTERRUPTIBLE);
 }
-static inline void inode_sync_wait(struct inode *inode)
-{
-        might_sleep();
-        wait_on_bit(&inode->i_state, __I_SYNC, inode_wait,
-                                                        TASK_UNINTERRUPTIBLE);
-}
 
 
 /*
diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index 29e7bba78ffe..0c16f518ee09 100644
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -46,6 +46,7 @@ struct media_entity_operations {
         int (*link_setup)(struct media_entity *entity,
                           const struct media_pad *local,
                           const struct media_pad *remote, u32 flags);
+        int (*link_validate)(struct media_link *link);
 };
 
 struct media_entity {
@@ -140,8 +141,8 @@ 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);
+__must_check int 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...)                   \
diff --git a/include/media/mt9p031.h b/include/media/mt9p031.h
index 96448c7a318b..0c97b19af293 100644
--- a/include/media/mt9p031.h
+++ b/include/media/mt9p031.h
@@ -3,17 +3,18 @@
 
 struct v4l2_subdev;
 
-enum {
-        MT9P031_COLOR_VERSION,
-        MT9P031_MONOCHROME_VERSION,
-};
-
+/*
+ * struct mt9p031_platform_data - MT9P031 platform data
+ * @set_xclk: Clock frequency set callback
+ * @reset: Chip reset GPIO (set to -1 if not used)
+ * @ext_freq: Input clock frequency
+ * @target_freq: Pixel clock frequency
+ */
 struct mt9p031_platform_data {
         int (*set_xclk)(struct v4l2_subdev *subdev, int hz);
-        int (*reset)(struct v4l2_subdev *subdev, int active);
-        int ext_freq; /* input frequency to the mt9p031 for PLL dividers */
-        int target_freq; /* frequency target for the PLL */
-        int version; /* MT9P031_COLOR_VERSION or MT9P031_MONOCHROME_VERSION */
+        int reset;
+        int ext_freq;
+        int target_freq;
 };
 
 #endif
diff --git a/include/media/omap3isp.h b/include/media/omap3isp.h
index 042849a34640..4d94be5226af 100644
--- a/include/media/omap3isp.h
+++ b/include/media/omap3isp.h
@@ -29,6 +29,10 @@
 struct i2c_board_info;
 struct isp_device;
 
+#define ISP_XCLK_NONE                   0
+#define ISP_XCLK_A                      1
+#define ISP_XCLK_B                      2
+
 enum isp_interface_type {
         ISP_INTERFACE_PARALLEL,
         ISP_INTERFACE_CSI2A_PHY2,
@@ -87,6 +91,29 @@ enum {
 };
 
 /**
+ * struct isp_csiphy_lane: CCP2/CSI2 lane position and polarity
+ * @pos: position of the lane
+ * @pol: polarity of the lane
+ */
+struct isp_csiphy_lane {
+        u8 pos;
+        u8 pol;
+};
+
+#define ISP_CSIPHY1_NUM_DATA_LANES      1
+#define ISP_CSIPHY2_NUM_DATA_LANES      2
+
+/**
+ * struct isp_csiphy_lanes_cfg - CCP2/CSI2 lane configuration
+ * @data: Configuration of one or two data lanes
+ * @clk: Clock lane configuration
+ */
+struct isp_csiphy_lanes_cfg {
+        struct isp_csiphy_lane data[ISP_CSIPHY2_NUM_DATA_LANES];
+        struct isp_csiphy_lane clk;
+};
+
+/**
  * struct isp_ccp2_platform_data - CCP2 interface platform data
  * @strobe_clk_pol: Strobe/clock polarity
  *              0 - Non Inverted, 1 - Inverted
@@ -105,6 +132,7 @@ struct isp_ccp2_platform_data {
         unsigned int ccp2_mode:1;
         unsigned int phy_layer:1;
         unsigned int vpclk_div:2;
+        struct isp_csiphy_lanes_cfg lanecfg;
 };
 
 /**
@@ -115,6 +143,7 @@ struct isp_ccp2_platform_data {
 struct isp_csi2_platform_data {
         unsigned crc:1;
         unsigned vpclk_div:2;
+        struct isp_csiphy_lanes_cfg lanecfg;
 };
 
 struct isp_subdev_i2c_board_info {
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index 8db6741c1256..cfd5163ff7f3 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -62,6 +62,7 @@ void rc_map_init(void);
 #define RC_MAP_ANYSEE                    "rc-anysee"
 #define RC_MAP_APAC_VIEWCOMP             "rc-apac-viewcomp"
 #define RC_MAP_ASUS_PC39                 "rc-asus-pc39"
+#define RC_MAP_ASUS_PS3_100              "rc-asus-ps3-100"
 #define RC_MAP_ATI_TV_WONDER_HD_600      "rc-ati-tv-wonder-hd-600"
 #define RC_MAP_ATI_X10                   "rc-ati-x10"
 #define RC_MAP_AVERMEDIA_A16D            "rc-avermedia-a16d"
@@ -113,6 +114,8 @@ void rc_map_init(void);
 #define RC_MAP_LME2510                   "rc-lme2510"
 #define RC_MAP_MANLI                     "rc-manli"
 #define RC_MAP_MEDION_X10                "rc-medion-x10"
+#define RC_MAP_MEDION_X10_DIGITAINER     "rc-medion-x10-digitainer"
+#define RC_MAP_MEDION_X10_OR2X           "rc-medion-x10-or2x"
 #define RC_MAP_MSI_DIGIVOX_II            "rc-msi-digivox-ii"
 #define RC_MAP_MSI_DIGIVOX_III           "rc-msi-digivox-iii"
 #define RC_MAP_MSI_TVANYWHERE_PLUS       "rc-msi-tvanywhere-plus"
diff --git a/include/media/s5p_fimc.h b/include/media/s5p_fimc.h
index 688fb3f1dc35..8587aaf73646 100644
--- a/include/media/s5p_fimc.h
+++ b/include/media/s5p_fimc.h
@@ -64,4 +64,20 @@ struct s5p_platform_fimc {
  */
 #define S5P_FIMC_TX_END_NOTIFY _IO('e', 0)
 
+enum fimc_subdev_index {
+        IDX_SENSOR,
+        IDX_CSIS,
+        IDX_FLITE,
+        IDX_FIMC,
+        IDX_MAX,
+};
+
+struct media_pipeline;
+struct v4l2_subdev;
+
+struct fimc_pipeline {
+        struct v4l2_subdev *subdevs[IDX_MAX];
+        struct media_pipeline *m_pipeline;
+};
+
 #endif /* S5P_FIMC_H_ */
diff --git a/include/media/saa7146.h b/include/media/saa7146.h
index 0f037e8edf9a..773e527deabe 100644
--- a/include/media/saa7146.h
+++ b/include/media/saa7146.h
@@ -13,12 +13,11 @@
 #include <linux/mutex.h>
 #include <linux/scatterlist.h>
 #include <media/v4l2-device.h>
+#include <media/v4l2-ctrls.h>
 
 #include <linux/vmalloc.h>      /* for vmalloc() */
 #include <linux/mm.h>           /* for vmalloc_to_page() */
 
-#define SAA7146_VERSION_CODE 0x000600   /* 0.6.0 */
-
 #define saa7146_write(sxy,adr,dat)    writel((dat),(sxy->mem+(adr)))
 #define saa7146_read(sxy,adr)         readl(sxy->mem+(adr))
 
@@ -121,6 +120,7 @@ struct saa7146_dev
         struct list_head                item;
 
         struct v4l2_device              v4l2_dev;
+        struct v4l2_ctrl_handler        ctrl_handler;
 
         /* different device locks */
         spinlock_t                      slock;
diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
index 4aeff96ff7d8..944ecdf3530f 100644
--- a/include/media/saa7146_vv.h
+++ b/include/media/saa7146_vv.h
@@ -3,6 +3,7 @@
 
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
+#include <media/v4l2-fh.h>
 #include <media/saa7146.h>
 #include <media/videobuf-dma-sg.h>
 
@@ -84,21 +85,15 @@ struct saa7146_overlay {
 
 /* per open data */
 struct saa7146_fh {
+        /* Must be the first field! */
+        struct v4l2_fh          fh;
         struct saa7146_dev      *dev;
-        /* if this is a vbi or capture open */
-        enum v4l2_buf_type      type;
-
-        /* video overlay */
-        struct saa7146_overlay  ov;
 
         /* video capture */
         struct videobuf_queue   video_q;
-        struct v4l2_pix_format  video_fmt;
 
         /* vbi capture */
         struct videobuf_queue   vbi_q;
-        struct v4l2_vbi_format  vbi_fmt;
-        struct timer_list       vbi_read_timeout;
 
         unsigned int resources; /* resource management for device open */
 };
@@ -109,7 +104,9 @@ struct saa7146_fh {
 struct saa7146_vv
 {
         /* vbi capture */
-        struct saa7146_dmaqueue         vbi_q;
+        struct saa7146_dmaqueue         vbi_dmaq;
+        struct v4l2_vbi_format          vbi_fmt;
+        struct timer_list               vbi_read_timeout;
         /* vbi workaround interrupt queue */
         wait_queue_head_t               vbi_wq;
         int                             vbi_fieldcount;
@@ -119,13 +116,14 @@ struct saa7146_vv
         struct saa7146_fh               *video_fh;
 
         /* video overlay */
+        struct saa7146_overlay          ov;
         struct v4l2_framebuffer         ov_fb;
         struct saa7146_format           *ov_fmt;
-        struct saa7146_overlay          *ov_data;
         struct saa7146_fh               *ov_suspend;
 
         /* video capture */
-        struct saa7146_dmaqueue         video_q;
+        struct saa7146_dmaqueue         video_dmaq;
+        struct v4l2_pix_format          video_fmt;
         enum v4l2_field                 last_field;
 
         /* common: fixme? shouldn't this be in saa7146_fh?
@@ -163,7 +161,8 @@ struct saa7146_ext_vv
         int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
 
         /* the extension can override this */
-        struct v4l2_ioctl_ops ops;
+        struct v4l2_ioctl_ops vid_ops;
+        struct v4l2_ioctl_ops vbi_ops;
         /* pointer to the saa7146 core ops */
         const struct v4l2_ioctl_ops *core_ops;
 
@@ -202,10 +201,12 @@ void saa7146_set_gpio(struct saa7146_dev *saa, u8 pin, u8 data);
 
 /* from saa7146_video.c */
 extern const struct v4l2_ioctl_ops saa7146_video_ioctl_ops;
+extern const struct v4l2_ioctl_ops saa7146_vbi_ioctl_ops;
 extern struct saa7146_use_ops saa7146_video_uops;
 int saa7146_start_preview(struct saa7146_fh *fh);
 int saa7146_stop_preview(struct saa7146_fh *fh);
 long saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *arg);
+int saa7146_s_ctrl(struct v4l2_ctrl *ctrl);
 
 /* from saa7146_vbi.c */
 extern struct saa7146_use_ops saa7146_vbi_uops;
diff --git a/include/media/sh_mobile_ceu.h b/include/media/sh_mobile_ceu.h
index a90a765f18da..6fdb6adf6b2b 100644
--- a/include/media/sh_mobile_ceu.h
+++ b/include/media/sh_mobile_ceu.h
@@ -5,6 +5,7 @@
 #define SH_CEU_FLAG_USE_16BIT_BUS       (1 << 1) /* use 16bit bus width */
 #define SH_CEU_FLAG_HSYNC_LOW           (1 << 2) /* default High if possible */
 #define SH_CEU_FLAG_VSYNC_LOW           (1 << 3) /* default High if possible */
+#define SH_CEU_FLAG_LOWER_8BIT          (1 << 4) /* default upper 8bit */
 
 struct device;
 struct resource;
diff --git a/include/media/smiapp.h b/include/media/smiapp.h
new file mode 100644
index 000000000000..9ab07fd45d5c
--- /dev/null
+++ b/include/media/smiapp.h
@@ -0,0 +1,84 @@
+/*
+ * include/media/smiapp.h
+ *
+ * Generic driver for SMIA/SMIA++ compliant camera modules
+ *
+ * Copyright (C) 2011--2012 Nokia Corporation
+ * Contact: Sakari Ailus <sakari.ailus@maxwell.research.nokia.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 __SMIAPP_H_
+#define __SMIAPP_H_
+
+#include <media/v4l2-subdev.h>
+
+#define SMIAPP_NAME             "smiapp"
+
+#define SMIAPP_DFL_I2C_ADDR     (0x20 >> 1) /* Default I2C Address */
+#define SMIAPP_ALT_I2C_ADDR     (0x6e >> 1) /* Alternate I2C Address */
+
+#define SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_CLOCK      0
+#define SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_STROBE     1
+#define SMIAPP_CSI_SIGNALLING_MODE_CSI2                 2
+
+#define SMIAPP_NO_XSHUTDOWN     -1
+
+/*
+ * Sometimes due to board layout considerations the camera module can be
+ * mounted rotated. The typical rotation used is 180 degrees which can be
+ * corrected by giving a default H-FLIP and V-FLIP in the sensor readout.
+ * FIXME: rotation also changes the bayer pattern.
+ */
+enum smiapp_module_board_orient {
+        SMIAPP_MODULE_BOARD_ORIENT_0 = 0,
+        SMIAPP_MODULE_BOARD_ORIENT_180,
+};
+
+struct smiapp_flash_strobe_parms {
+        u8 mode;
+        u32 strobe_width_high_us;
+        u16 strobe_delay;
+        u16 stobe_start_point;
+        u8 trigger;
+};
+
+struct smiapp_platform_data {
+        /*
+         * Change the cci address if i2c_addr_alt is set.
+         * Both default and alternate cci addr need to be present
+         */
+        unsigned short i2c_addr_dfl;    /* Default i2c addr */
+        unsigned short i2c_addr_alt;    /* Alternate i2c addr */
+
+        unsigned int nvm_size;                  /* bytes */
+        unsigned int ext_clk;                   /* sensor external clk */
+
+        unsigned int lanes;             /* Number of CSI-2 lanes */
+        u8 csi_signalling_mode;         /* SMIAPP_CSI_SIGNALLING_MODE_* */
+        const s64 *op_sys_clock;
+
+        enum smiapp_module_board_orient module_board_orient;
+
+        struct smiapp_flash_strobe_parms *strobe_setup;
+
+        int (*set_xclk)(struct v4l2_subdev *sd, int hz);
+        char *ext_clk_name;
+        int xshutdown;                  /* gpio or SMIAPP_NO_XSHUTDOWN */
+};
+
+#endif /* __SMIAPP_H_  */
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index cad374bdcf4b..d865dcf9879f 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -56,11 +56,15 @@ struct soc_camera_device {
         };
 };
 
+/* Host supports programmable stride */
+#define SOCAM_HOST_CAP_STRIDE           (1 << 0)
+
 struct soc_camera_host {
         struct v4l2_device v4l2_dev;
         struct list_head list;
         struct mutex host_lock;         /* Protect during probing */
         unsigned char nr;               /* Host number */
+        u32 capabilities;
         void *priv;
         const char *drv_name;
         struct soc_camera_host_ops *ops;
@@ -98,7 +102,7 @@ struct soc_camera_host_ops {
         int (*set_bus_param)(struct soc_camera_device *);
         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 *);
+        int (*enum_framesizes)(struct soc_camera_device *, struct v4l2_frmsizeenum *);
         unsigned int (*poll)(struct file *, poll_table *);
 };
 
diff --git a/include/media/soc_mediabus.h b/include/media/soc_mediabus.h
index 73f1e7eb60f3..0dc6f4625b92 100644
--- a/include/media/soc_mediabus.h
+++ b/include/media/soc_mediabus.h
@@ -47,6 +47,24 @@ enum soc_mbus_order {
 };
 
 /**
+ * enum soc_mbus_layout - planes layout in memory
+ * @SOC_MBUS_LAYOUT_PACKED:             color components packed
+ * @SOC_MBUS_LAYOUT_PLANAR_2Y_U_V:      YUV components stored in 3 planes (4:2:2)
+ * @SOC_MBUS_LAYOUT_PLANAR_2Y_C:        YUV components stored in a luma and a
+ *                                      chroma plane (C plane is half the size
+ *                                      of Y plane)
+ * @SOC_MBUS_LAYOUT_PLANAR_Y_C:         YUV components stored in a luma and a
+ *                                      chroma plane (C plane is the same size
+ *                                      as Y plane)
+ */
+enum soc_mbus_layout {
+        SOC_MBUS_LAYOUT_PACKED = 0,
+        SOC_MBUS_LAYOUT_PLANAR_2Y_U_V,
+        SOC_MBUS_LAYOUT_PLANAR_2Y_C,
+        SOC_MBUS_LAYOUT_PLANAR_Y_C,
+};
+
+/**
  * struct soc_mbus_pixelfmt - Data format on the media bus
  * @name:               Name of the format
  * @fourcc:             Fourcc code, that will be obtained if the data is
@@ -60,6 +78,7 @@ struct soc_mbus_pixelfmt {
         u32                     fourcc;
         enum soc_mbus_packing   packing;
         enum soc_mbus_order     order;
+        enum soc_mbus_layout    layout;
         u8                      bits_per_sample;
 };
 
@@ -80,6 +99,8 @@ const struct soc_mbus_pixelfmt *soc_mbus_find_fmtdesc(
 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);
+s32 soc_mbus_image_size(const struct soc_mbus_pixelfmt *mf,
+                        u32 bytes_per_line, u32 height);
 int soc_mbus_samples_per_pixel(const struct soc_mbus_pixelfmt *mf,
                         unsigned int *numerator, unsigned int *denominator);
 unsigned int soc_mbus_config_compatible(const struct v4l2_mbus_config *cfg,
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index 11e67562b3ac..776605f1cbe2 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -25,6 +25,7 @@
 #include <linux/videodev2.h>
 
 /* forward references */
+struct file;
 struct v4l2_ctrl_handler;
 struct v4l2_ctrl_helper;
 struct v4l2_ctrl;
@@ -129,7 +130,10 @@ struct v4l2_ctrl {
                 u32 step;
                 u32 menu_skip_mask;
         };
-        const char * const *qmenu;
+        union {
+                const char * const *qmenu;
+                const s64 *qmenu_int;
+        };
         unsigned long flags;
         union {
                 s32 val;
@@ -164,7 +168,9 @@ struct v4l2_ctrl_ref {
 /** struct v4l2_ctrl_handler - The control handler keeps track of all the
   * controls: both the controls owned by the handler and those inherited
   * from other handlers.
+  * @_lock:     Default for "lock".
   * @lock:      Lock to control access to this handler and its controls.
+  *             May be replaced by the user right after init.
   * @ctrls:     The list of controls owned by this handler.
   * @ctrl_refs: The list of control references.
   * @cached:    The last found control reference. It is common that the same
@@ -175,7 +181,8 @@ struct v4l2_ctrl_ref {
   * @error:     The error code of the first failed control addition.
   */
 struct v4l2_ctrl_handler {
-        struct mutex lock;
+        struct mutex _lock;
+        struct mutex *lock;
         struct list_head ctrls;
         struct list_head ctrl_refs;
         struct v4l2_ctrl_ref *cached;
@@ -219,6 +226,7 @@ struct v4l2_ctrl_config {
         u32 flags;
         u32 menu_skip_mask;
         const char * const *qmenu;
+        const s64 *qmenu_int;
         unsigned int is_private:1;
 };
 
@@ -343,6 +351,23 @@ struct v4l2_ctrl *v4l2_ctrl_new_std_menu(struct v4l2_ctrl_handler *hdl,
                         const struct v4l2_ctrl_ops *ops,
                         u32 id, s32 max, s32 mask, s32 def);
 
+/** v4l2_ctrl_new_int_menu() - Create a new standard V4L2 integer menu control.
+  * @hdl:       The control handler.
+  * @ops:       The control ops.
+  * @id:        The control ID.
+  * @max:       The control's maximum value.
+  * @def:       The control's default value.
+  * @qmenu_int: The control's menu entries.
+  *
+  * Same as v4l2_ctrl_new_std_menu(), but @mask is set to 0 and it additionaly
+  * takes as an argument an array of integers determining the menu items.
+  *
+  * If @id refers to a non-integer-menu control, then this function will return NULL.
+  */
+struct v4l2_ctrl *v4l2_ctrl_new_int_menu(struct v4l2_ctrl_handler *hdl,
+                        const struct v4l2_ctrl_ops *ops,
+                        u32 id, s32 max, s32 def, const s64 *qmenu_int);
+
 /** v4l2_ctrl_add_ctrl() - Add a control from another handler to this handler.
   * @hdl:       The control handler.
   * @ctrl:      The control to add.
@@ -451,7 +476,7 @@ void v4l2_ctrl_grab(struct v4l2_ctrl *ctrl, bool grabbed);
   */
 static inline void v4l2_ctrl_lock(struct v4l2_ctrl *ctrl)
 {
-        mutex_lock(&ctrl->handler->lock);
+        mutex_lock(ctrl->handler->lock);
 }
 
 /** v4l2_ctrl_lock() - Helper function to unlock the handler
@@ -460,7 +485,7 @@ static inline void v4l2_ctrl_lock(struct v4l2_ctrl *ctrl)
   */
 static inline void v4l2_ctrl_unlock(struct v4l2_ctrl *ctrl)
 {
-        mutex_unlock(&ctrl->handler->lock);
+        mutex_unlock(ctrl->handler->lock);
 }
 
 /** v4l2_ctrl_g_ctrl() - Helper function to get the control's value from within a driver.
@@ -487,10 +512,9 @@ s32 v4l2_ctrl_g_ctrl(struct v4l2_ctrl *ctrl);
 int v4l2_ctrl_s_ctrl(struct v4l2_ctrl *ctrl, s32 val);
 
 /* Internal helper functions that deal with control events. */
-void v4l2_ctrl_add_event(struct v4l2_ctrl *ctrl,
-                struct v4l2_subscribed_event *sev);
-void v4l2_ctrl_del_event(struct v4l2_ctrl *ctrl,
-                struct v4l2_subscribed_event *sev);
+extern const struct v4l2_subscribed_event_ops v4l2_ctrl_sub_ev_ops;
+void v4l2_ctrl_replace(struct v4l2_event *old, const struct v4l2_event *new);
+void v4l2_ctrl_merge(const struct v4l2_event *old, struct v4l2_event *new);
 
 /* Can be used as a vidioc_log_status function that just dumps all controls
    associated with the filehandle. */
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 96d22215cc88..a056e6ee1b68 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -39,6 +39,9 @@ struct v4l2_ctrl_handler;
 #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)
+/* If ioctl core locking is in use, then apply that also to all
+   file operations. Don't use this flag in new drivers! */
+#define V4L2_FL_LOCK_ALL_FOPS   (3)
 
 /* Priority helper functions */
 
@@ -126,8 +129,10 @@ struct video_device
 
         /* ioctl callbacks */
         const struct v4l2_ioctl_ops *ioctl_ops;
+        DECLARE_BITMAP(valid_ioctls, BASE_VIDIOC_PRIVATE);
 
         /* serialization lock */
+        DECLARE_BITMAP(disable_locking, BASE_VIDIOC_PRIVATE);
         struct mutex *lock;
 };
 
@@ -173,6 +178,26 @@ void video_device_release(struct video_device *vdev);
    a dubious construction at best. */
 void video_device_release_empty(struct video_device *vdev);
 
+/* returns true if cmd is a known V4L2 ioctl */
+bool v4l2_is_known_ioctl(unsigned int cmd);
+
+/* mark that this command shouldn't use core locking */
+static inline void v4l2_disable_ioctl_locking(struct video_device *vdev, unsigned int cmd)
+{
+        if (_IOC_NR(cmd) < BASE_VIDIOC_PRIVATE)
+                set_bit(_IOC_NR(cmd), vdev->disable_locking);
+}
+
+/* Mark that this command isn't implemented. This must be called before
+   video_device_register. See also the comments in determine_valid_ioctls().
+   This function allows drivers to provide just one v4l2_ioctl_ops struct, but
+   disable ioctls based on the specific card that is actually found. */
+static inline void v4l2_disable_ioctl(struct video_device *vdev, unsigned int cmd)
+{
+        if (_IOC_NR(cmd) < BASE_VIDIOC_PRIVATE)
+                set_bit(_IOC_NR(cmd), vdev->valid_ioctls);
+}
+
 /* helper functions to access driver private data. */
 static inline void *video_get_drvdata(struct video_device *vdev)
 {
diff --git a/include/media/v4l2-event.h b/include/media/v4l2-event.h
index 5f14e8895ce2..2885a810a128 100644
--- a/include/media/v4l2-event.h
+++ b/include/media/v4l2-event.h
@@ -78,6 +78,19 @@ struct v4l2_kevent {
         struct v4l2_event       event;
 };
 
+/** struct v4l2_subscribed_event_ops - Subscribed event operations.
+  * @add:       Optional callback, called when a new listener is added
+  * @del:       Optional callback, called when a listener stops listening
+  * @replace:   Optional callback that can replace event 'old' with event 'new'.
+  * @merge:     Optional callback that can merge event 'old' into event 'new'.
+  */
+struct v4l2_subscribed_event_ops {
+        int  (*add)(struct v4l2_subscribed_event *sev, unsigned elems);
+        void (*del)(struct v4l2_subscribed_event *sev);
+        void (*replace)(struct v4l2_event *old, const struct v4l2_event *new);
+        void (*merge)(const struct v4l2_event *old, struct v4l2_event *new);
+};
+
 /** struct v4l2_subscribed_event - Internal struct representing a subscribed event.
   * @list:      List node for the v4l2_fh->subscribed list.
   * @type:      Event type.
@@ -85,8 +98,7 @@ struct v4l2_kevent {
   * @flags:     Copy of v4l2_event_subscription->flags.
   * @fh:        Filehandle that subscribed to this event.
   * @node:      List node that hooks into the object's event list (if there is one).
-  * @replace:   Optional callback that can replace event 'old' with event 'new'.
-  * @merge:     Optional callback that can merge event 'old' into event 'new'.
+  * @ops:       v4l2_subscribed_event_ops
   * @elems:     The number of elements in the events array.
   * @first:     The index of the events containing the oldest available event.
   * @in_use:    The number of queued events.
@@ -99,10 +111,7 @@ struct v4l2_subscribed_event {
         u32                     flags;
         struct v4l2_fh          *fh;
         struct list_head        node;
-        void                    (*replace)(struct v4l2_event *old,
-                                           const struct v4l2_event *new);
-        void                    (*merge)(const struct v4l2_event *old,
-                                         struct v4l2_event *new);
+        const struct v4l2_subscribed_event_ops *ops;
         unsigned                elems;
         unsigned                first;
         unsigned                in_use;
@@ -115,7 +124,8 @@ void v4l2_event_queue(struct video_device *vdev, const struct v4l2_event *ev);
 void v4l2_event_queue_fh(struct v4l2_fh *fh, const struct v4l2_event *ev);
 int v4l2_event_pending(struct v4l2_fh *fh);
 int v4l2_event_subscribe(struct v4l2_fh *fh,
-                         struct v4l2_event_subscription *sub, unsigned elems);
+                         struct v4l2_event_subscription *sub, unsigned elems,
+                         const struct v4l2_subscribed_event_ops *ops);
 int v4l2_event_unsubscribe(struct v4l2_fh *fh,
                            struct v4l2_event_subscription *sub);
 void v4l2_event_unsubscribe_all(struct v4l2_fh *fh);
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index 3cb939cd03f9..d8b76f7392f8 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -271,6 +271,12 @@ struct v4l2_ioctl_ops {
                                     struct v4l2_dv_timings *timings);
         int (*vidioc_g_dv_timings) (struct file *file, void *fh,
                                     struct v4l2_dv_timings *timings);
+        int (*vidioc_query_dv_timings) (struct file *file, void *fh,
+                                    struct v4l2_dv_timings *timings);
+        int (*vidioc_enum_dv_timings) (struct file *file, void *fh,
+                                    struct v4l2_enum_dv_timings *timings);
+        int (*vidioc_dv_timings_cap) (struct file *file, void *fh,
+                                    struct v4l2_dv_timings_cap *cap);
 
         int (*vidioc_subscribe_event)  (struct v4l2_fh *fh,
                                         struct v4l2_event_subscription *sub);
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index f0f3358d1b1b..c35a3545e273 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -307,6 +307,12 @@ struct v4l2_subdev_video_ops {
                         struct v4l2_dv_timings *timings);
         int (*g_dv_timings)(struct v4l2_subdev *sd,
                         struct v4l2_dv_timings *timings);
+        int (*enum_dv_timings)(struct v4l2_subdev *sd,
+                        struct v4l2_enum_dv_timings *timings);
+        int (*query_dv_timings)(struct v4l2_subdev *sd,
+                        struct v4l2_dv_timings *timings);
+        int (*dv_timings_cap)(struct v4l2_subdev *sd,
+                        struct v4l2_dv_timings_cap *cap);
         int (*enum_mbus_fmt)(struct v4l2_subdev *sd, unsigned int index,
                              enum v4l2_mbus_pixelcode *code);
         int (*enum_mbus_fsizes)(struct v4l2_subdev *sd,
@@ -466,6 +472,15 @@ struct v4l2_subdev_pad_ops {
                        struct v4l2_subdev_crop *crop);
         int (*get_crop)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
                        struct v4l2_subdev_crop *crop);
+        int (*get_selection)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+                             struct v4l2_subdev_selection *sel);
+        int (*set_selection)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+                             struct v4l2_subdev_selection *sel);
+#ifdef CONFIG_MEDIA_CONTROLLER
+        int (*link_validate)(struct v4l2_subdev *sd, struct media_link *link,
+                             struct v4l2_subdev_format *source_fmt,
+                             struct v4l2_subdev_format *sink_fmt);
+#endif /* CONFIG_MEDIA_CONTROLLER */
 };
 
 struct v4l2_subdev_ops {
@@ -541,7 +556,7 @@ struct v4l2_subdev {
 #define media_entity_to_v4l2_subdev(ent) \
         container_of(ent, struct v4l2_subdev, entity)
 #define vdev_to_v4l2_subdev(vdev) \
-        video_get_drvdata(vdev)
+        ((struct v4l2_subdev *)video_get_drvdata(vdev))
 
 /*
  * Used for storing subdev information per file handle
@@ -549,8 +564,11 @@ struct v4l2_subdev {
 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;
+        struct {
+                struct v4l2_mbus_framefmt try_fmt;
+                struct v4l2_rect try_crop;
+                struct v4l2_rect try_compose;
+        } *pad;
 #endif
 };
 
@@ -558,17 +576,19 @@ struct v4l2_subdev_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];
-}
+#define __V4L2_SUBDEV_MK_GET_TRY(rtype, fun_name, field_name)           \
+        static inline struct rtype *                                    \
+        v4l2_subdev_get_try_##fun_name(struct v4l2_subdev_fh *fh,       \
+                                       unsigned int pad)                \
+        {                                                               \
+                BUG_ON(unlikely(pad >= vdev_to_v4l2_subdev(             \
+                                        fh->vfh.vdev)->entity.num_pads)); \
+                return &fh->pad[pad].field_name;                        \
+        }
+
+__V4L2_SUBDEV_MK_GET_TRY(v4l2_mbus_framefmt, format, try_fmt)
+__V4L2_SUBDEV_MK_GET_TRY(v4l2_rect, crop, try_compose)
+__V4L2_SUBDEV_MK_GET_TRY(v4l2_rect, compose, try_compose)
 #endif
 
 extern const struct v4l2_file_operations v4l2_subdev_fops;
@@ -593,6 +613,13 @@ static inline void *v4l2_get_subdev_hostdata(const struct v4l2_subdev *sd)
         return sd->host_priv;
 }
 
+#ifdef CONFIG_MEDIA_CONTROLLER
+int v4l2_subdev_link_validate_default(struct v4l2_subdev *sd,
+                                      struct media_link *link,
+                                      struct v4l2_subdev_format *source_fmt,
+                                      struct v4l2_subdev_format *sink_fmt);
+int v4l2_subdev_link_validate(struct media_link *link);
+#endif /* CONFIG_MEDIA_CONTROLLER */
 void v4l2_subdev_init(struct v4l2_subdev *sd,
                       const struct v4l2_subdev_ops *ops);
 
diff --git a/include/media/videobuf-dma-contig.h b/include/media/videobuf-dma-contig.h
index f0ed82543d9f..f473aeb86d3f 100644
--- a/include/media/videobuf-dma-contig.h
+++ b/include/media/videobuf-dma-contig.h
@@ -26,6 +26,16 @@ void videobuf_queue_dma_contig_init(struct videobuf_queue *q,
                                     void *priv,
                                     struct mutex *ext_lock);
 
+void videobuf_queue_dma_contig_init_cached(struct videobuf_queue *q,
+                                           const struct videobuf_queue_ops *ops,
+                                           struct device *dev,
+                                           spinlock_t *irqlock,
+                                           enum v4l2_buf_type type,
+                                           enum v4l2_field field,
+                                           unsigned int msize,
+                                           void *priv,
+                                           struct mutex *ext_lock);
+
 dma_addr_t videobuf_to_dma_contig(struct videobuf_buffer *buf);
 void videobuf_dma_contig_free(struct videobuf_queue *q,
                               struct videobuf_buffer *buf);
diff --git a/include/memory/jedec_ddr.h b/include/memory/jedec_ddr.h
new file mode 100644
index 000000000000..ddad0f870e5d
--- /dev/null
+++ b/include/memory/jedec_ddr.h
@@ -0,0 +1,175 @@
+/*
+ * Definitions for DDR memories based on JEDEC specs
+ *
+ * Copyright (C) 2012 Texas Instruments, Inc.
+ *
+ * Aneesh V <aneesh@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.
+ */
+#ifndef __LINUX_JEDEC_DDR_H
+#define __LINUX_JEDEC_DDR_H
+
+#include <linux/types.h>
+
+/* DDR Densities */
+#define DDR_DENSITY_64Mb        1
+#define DDR_DENSITY_128Mb       2
+#define DDR_DENSITY_256Mb       3
+#define DDR_DENSITY_512Mb       4
+#define DDR_DENSITY_1Gb         5
+#define DDR_DENSITY_2Gb         6
+#define DDR_DENSITY_4Gb         7
+#define DDR_DENSITY_8Gb         8
+#define DDR_DENSITY_16Gb        9
+#define DDR_DENSITY_32Gb        10
+
+/* DDR type */
+#define DDR_TYPE_DDR2           1
+#define DDR_TYPE_DDR3           2
+#define DDR_TYPE_LPDDR2_S4      3
+#define DDR_TYPE_LPDDR2_S2      4
+#define DDR_TYPE_LPDDR2_NVM     5
+
+/* DDR IO width */
+#define DDR_IO_WIDTH_4          1
+#define DDR_IO_WIDTH_8          2
+#define DDR_IO_WIDTH_16         3
+#define DDR_IO_WIDTH_32         4
+
+/* Number of Row bits */
+#define R9                      9
+#define R10                     10
+#define R11                     11
+#define R12                     12
+#define R13                     13
+#define R14                     14
+#define R15                     15
+#define R16                     16
+
+/* Number of Column bits */
+#define C7                      7
+#define C8                      8
+#define C9                      9
+#define C10                     10
+#define C11                     11
+#define C12                     12
+
+/* Number of Banks */
+#define B1                      0
+#define B2                      1
+#define B4                      2
+#define B8                      3
+
+/* Refresh rate in nano-seconds */
+#define T_REFI_15_6             15600
+#define T_REFI_7_8              7800
+#define T_REFI_3_9              3900
+
+/* tRFC values */
+#define T_RFC_90                90000
+#define T_RFC_110               110000
+#define T_RFC_130               130000
+#define T_RFC_160               160000
+#define T_RFC_210               210000
+#define T_RFC_300               300000
+#define T_RFC_350               350000
+
+/* Mode register numbers */
+#define DDR_MR0                 0
+#define DDR_MR1                 1
+#define DDR_MR2                 2
+#define DDR_MR3                 3
+#define DDR_MR4                 4
+#define DDR_MR5                 5
+#define DDR_MR6                 6
+#define DDR_MR7                 7
+#define DDR_MR8                 8
+#define DDR_MR9                 9
+#define DDR_MR10                10
+#define DDR_MR11                11
+#define DDR_MR16                16
+#define DDR_MR17                17
+#define DDR_MR18                18
+
+/*
+ * LPDDR2 related defines
+ */
+
+/* MR4 register fields */
+#define MR4_SDRAM_REF_RATE_SHIFT                        0
+#define MR4_SDRAM_REF_RATE_MASK                         7
+#define MR4_TUF_SHIFT                                   7
+#define MR4_TUF_MASK                                    (1 << 7)
+
+/* MR4 SDRAM Refresh Rate field values */
+#define SDRAM_TEMP_NOMINAL                              0x3
+#define SDRAM_TEMP_RESERVED_4                           0x4
+#define SDRAM_TEMP_HIGH_DERATE_REFRESH                  0x5
+#define SDRAM_TEMP_HIGH_DERATE_REFRESH_AND_TIMINGS      0x6
+#define SDRAM_TEMP_VERY_HIGH_SHUTDOWN                   0x7
+
+#define NUM_DDR_ADDR_TABLE_ENTRIES                      11
+#define NUM_DDR_TIMING_TABLE_ENTRIES                    4
+
+/* Structure for DDR addressing info from the JEDEC spec */
+struct lpddr2_addressing {
+        u32 num_banks;
+        u32 tREFI_ns;
+        u32 tRFCab_ps;
+};
+
+/*
+ * Structure for timings from the LPDDR2 datasheet
+ * All parameters are in pico seconds(ps) unless explicitly indicated
+ * with a suffix like tRAS_max_ns below
+ */
+struct lpddr2_timings {
+        u32 max_freq;
+        u32 min_freq;
+        u32 tRPab;
+        u32 tRCD;
+        u32 tWR;
+        u32 tRAS_min;
+        u32 tRRD;
+        u32 tWTR;
+        u32 tXP;
+        u32 tRTP;
+        u32 tCKESR;
+        u32 tDQSCK_max;
+        u32 tDQSCK_max_derated;
+        u32 tFAW;
+        u32 tZQCS;
+        u32 tZQCL;
+        u32 tZQinit;
+        u32 tRAS_max_ns;
+};
+
+/*
+ * Min value for some parameters in terms of number of tCK cycles(nCK)
+ * Please set to zero parameters that are not valid for a given memory
+ * type
+ */
+struct lpddr2_min_tck {
+        u32 tRPab;
+        u32 tRCD;
+        u32 tWR;
+        u32 tRASmin;
+        u32 tRRD;
+        u32 tWTR;
+        u32 tXP;
+        u32 tRTP;
+        u32 tCKE;
+        u32 tCKESR;
+        u32 tFAW;
+};
+
+extern const struct lpddr2_addressing
+        lpddr2_jedec_addressing_table[NUM_DDR_ADDR_TABLE_ENTRIES];
+extern const struct lpddr2_timings
+        lpddr2_jedec_timings[NUM_DDR_TIMING_TABLE_ENTRIES];
+extern const struct lpddr2_min_tck lpddr2_jedec_min_tck;
+
+#endif /* __LINUX_JEDEC_DDR_H */
diff --git a/include/mtd/ubi-user.h b/include/mtd/ubi-user.h
index 3c4109777aff..8787349fbafe 100644
--- a/include/mtd/ubi-user.h
+++ b/include/mtd/ubi-user.h
@@ -196,23 +196,6 @@
 #define UBI_MAX_RNVOL 32
 
 /*
- * UBI data type hint constants.
- *
- * UBI_LONGTERM: long-term data
- * UBI_SHORTTERM: short-term data
- * UBI_UNKNOWN: data persistence is unknown
- *
- * These constants are used when data is written to UBI volumes in order to
- * help the UBI wear-leveling unit to find more appropriate physical
- * eraseblocks.
- */
-enum {
-        UBI_LONGTERM  = 1,
-        UBI_SHORTTERM = 2,
-        UBI_UNKNOWN   = 3,
-};
-
-/*
  * UBI volume type constants.
  *
  * @UBI_DYNAMIC_VOLUME: dynamic volume
@@ -375,25 +358,34 @@ struct ubi_rnvol_req {
  *                             requests.
  * @lnum: logical eraseblock number to change
  * @bytes: how many bytes will be written to the logical eraseblock
- * @dtype: data type (%UBI_LONGTERM, %UBI_SHORTTERM, %UBI_UNKNOWN)
+ * @dtype: pass "3" for better compatibility with old kernels
  * @padding: reserved for future, not used, has to be zeroed
+ *
+ * The @dtype field used to inform UBI about what kind of data will be written
+ * to the LEB: long term (value 1), short term (value 2), unknown (value 3).
+ * UBI tried to pick a PEB with lower erase counter for short term data and a
+ * PEB with higher erase counter for long term data. But this was not really
+ * used because users usually do not know this and could easily mislead UBI. We
+ * removed this feature in May 2012. UBI currently just ignores the @dtype
+ * field. But for better compatibility with older kernels it is recommended to
+ * set @dtype to 3 (unknown).
  */
 struct ubi_leb_change_req {
         __s32 lnum;
         __s32 bytes;
-        __s8  dtype;
+        __s8  dtype; /* obsolete, do not use! */
         __s8  padding[7];
 } __packed;
 
 /**
  * struct ubi_map_req - a data structure used in map LEB requests.
+ * @dtype: pass "3" for better compatibility with old kernels
  * @lnum: logical eraseblock number to unmap
- * @dtype: data type (%UBI_LONGTERM, %UBI_SHORTTERM, %UBI_UNKNOWN)
  * @padding: reserved for future, not used, has to be zeroed
  */
 struct ubi_map_req {
         __s32 lnum;
-        __s8  dtype;
+        __s8  dtype; /* obsolete, do not use! */
         __s8  padding[3];
 } __packed;
 
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 757a17638b1b..f2b801c4b555 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -92,7 +92,7 @@ extern void			addrconf_leave_solict(struct inet6_dev *idev,
                                         const struct in6_addr *addr);
 
 static inline unsigned long addrconf_timeout_fixup(u32 timeout,
-                                                    unsigned unit)
+                                                   unsigned int unit)
 {
         if (timeout == 0xffffffff)
                 return ~0UL;
@@ -131,9 +131,9 @@ extern int ipv6_sock_mc_join(struct sock *sk, int ifindex,
 extern int ipv6_sock_mc_drop(struct sock *sk, int ifindex,
                              const struct in6_addr *addr);
 extern void ipv6_sock_mc_close(struct sock *sk);
-extern int inet6_mc_check(struct sock *sk,
-                          const struct in6_addr *mc_addr,
-                          const struct in6_addr *src_addr);
+extern bool inet6_mc_check(struct sock *sk,
+                           const struct in6_addr *mc_addr,
+                           const struct in6_addr *src_addr);
 
 extern int ipv6_dev_mc_inc(struct net_device *dev, const struct in6_addr *addr);
 extern int __ipv6_dev_mc_dec(struct inet6_dev *idev, const struct in6_addr *addr);
@@ -146,10 +146,10 @@ extern void ipv6_mc_init_dev(struct inet6_dev *idev);
 extern void ipv6_mc_destroy_dev(struct inet6_dev *idev);
 extern void addrconf_dad_failure(struct inet6_ifaddr *ifp);
 
-extern int ipv6_chk_mcast_addr(struct net_device *dev,
-                               const struct in6_addr *group,
-                               const struct in6_addr *src_addr);
-extern int ipv6_is_mld(struct sk_buff *skb, int nexthdr);
+extern bool ipv6_chk_mcast_addr(struct net_device *dev,
+                                const struct in6_addr *group,
+                                const struct in6_addr *src_addr);
+extern bool ipv6_is_mld(struct sk_buff *skb, int nexthdr);
 
 extern void addrconf_prefix_rcv(struct net_device *dev,
                                 u8 *opt, int len, bool sllao);
@@ -163,8 +163,8 @@ extern void ipv6_sock_ac_close(struct sock *sk);
 
 extern int ipv6_dev_ac_inc(struct net_device *dev, const struct in6_addr *addr);
 extern int __ipv6_dev_ac_dec(struct inet6_dev *idev, const struct in6_addr *addr);
-extern int ipv6_chk_acast_addr(struct net *net, struct net_device *dev,
-                               const struct in6_addr *addr);
+extern bool ipv6_chk_acast_addr(struct net *net, struct net_device *dev,
+                                const struct in6_addr *addr);
 
 
 /* Device notifier */
diff --git a/include/net/af_unix.h b/include/net/af_unix.h
index ca68e2cef230..2ee33da36a7a 100644
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
@@ -22,7 +22,7 @@ extern struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];
 struct unix_address {
         atomic_t        refcnt;
         int             len;
-        unsigned        hash;
+        unsigned int    hash;
         struct sockaddr_un name[0];
 };
 
diff --git a/include/net/ax25.h b/include/net/ax25.h
index 94e09d361bb1..5d2352154cf6 100644
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -215,7 +215,7 @@ typedef struct ax25_dev {
         struct ax25_dev         *next;
         struct net_device       *dev;
         struct net_device       *forward;
-        struct ctl_table        *systable;
+        struct ctl_table_header *sysheader;
         int                     values[AX25_MAX_VALUES];
 #if defined(CONFIG_AX25_DAMA_SLAVE) || defined(CONFIG_AX25_DAMA_MASTER)
         ax25_dama_info          dama;
@@ -441,11 +441,11 @@ extern void ax25_uid_free(void);
 
 /* sysctl_net_ax25.c */
 #ifdef CONFIG_SYSCTL
-extern void ax25_register_sysctl(void);
-extern void ax25_unregister_sysctl(void);
+extern int ax25_register_dev_sysctl(ax25_dev *ax25_dev);
+extern void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev);
 #else
-static inline void ax25_register_sysctl(void) {};
-static inline void ax25_unregister_sysctl(void) {};
+static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0; }
+static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {}
 #endif /* CONFIG_SYSCTL */
 
 #endif
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index a65910bda381..961669b648fd 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -163,6 +163,11 @@ typedef struct {
         __u8 b[6];
 } __packed bdaddr_t;
 
+/* BD Address type */
+#define BDADDR_BREDR            0x00
+#define BDADDR_LE_PUBLIC        0x01
+#define BDADDR_LE_RANDOM        0x02
+
 #define BDADDR_ANY   (&(bdaddr_t) {{0, 0, 0, 0, 0, 0}})
 #define BDADDR_LOCAL (&(bdaddr_t) {{0, 0, 0, 0xff, 0xff, 0xff}})
 
@@ -178,7 +183,6 @@ static inline void bacpy(bdaddr_t *dst, bdaddr_t *src)
 
 void baswap(bdaddr_t *dst, bdaddr_t *src);
 char *batostr(bdaddr_t *ba);
-bdaddr_t *strtoba(char *str);
 
 /* Common socket structures and functions */
 
@@ -190,8 +194,12 @@ struct bt_sock {
         bdaddr_t    dst;
         struct list_head accept_q;
         struct sock *parent;
-        u32 defer_setup;
-        bool suspended;
+        unsigned long flags;
+};
+
+enum {
+        BT_SK_DEFER_SETUP,
+        BT_SK_SUSPEND,
 };
 
 struct bt_sock_list {
@@ -216,14 +224,24 @@ void bt_accept_unlink(struct sock *sk);
 struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock);
 
 /* Skb helpers */
+struct l2cap_ctrl {
+        unsigned int    sframe  : 1,
+                        poll    : 1,
+                        final   : 1,
+                        fcs     : 1,
+                        sar     : 2,
+                        super   : 2;
+        __u16           reqseq;
+        __u16           txseq;
+        __u8            retries;
+};
+
 struct bt_skb_cb {
         __u8 pkt_type;
         __u8 incoming;
         __u16 expect;
-        __u16 tx_seq;
-        __u8 retries;
-        __u8 sar;
         __u8 force_active;
+        struct l2cap_ctrl control;
 };
 #define bt_cb(skb) ((struct bt_skb_cb *)((skb)->cb))
 
@@ -243,12 +261,10 @@ static inline struct sk_buff *bt_skb_send_alloc(struct sock *sk,
 {
         struct sk_buff *skb;
 
-        release_sock(sk);
         if ((skb = sock_alloc_send_skb(sk, len + BT_SKB_RESERVE, nb, err))) {
                 skb_reserve(skb, BT_SKB_RESERVE);
                 bt_cb(skb)->incoming  = 0;
         }
-        lock_sock(sk);
 
         if (!skb && *err)
                 return NULL;
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index d47e523c9d83..66a7b579e31c 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -102,6 +102,7 @@ enum {
         HCI_DISCOVERABLE,
         HCI_LINK_SECURITY,
         HCI_PENDING_CLASS,
+        HCI_PERIODIC_INQ,
 };
 
 /* HCI ioctl defines */
@@ -324,6 +325,8 @@ struct hci_cp_inquiry {
 
 #define HCI_OP_INQUIRY_CANCEL           0x0402
 
+#define HCI_OP_PERIODIC_INQ             0x0403
+
 #define HCI_OP_EXIT_PERIODIC_INQ        0x0404
 
 #define HCI_OP_CREATE_CONN              0x0405
@@ -717,6 +720,10 @@ struct hci_rp_read_local_oob_data {
 } __packed;
 
 #define HCI_OP_READ_INQ_RSP_TX_POWER    0x0c58
+struct hci_rp_read_inq_rsp_tx_power {
+        __u8     status;
+        __s8     tx_power;
+} __packed;
 
 #define HCI_OP_READ_FLOW_CONTROL_MODE   0x0c66
 struct hci_rp_read_flow_control_mode {
@@ -1431,6 +1438,5 @@ struct hci_inquiry_req {
 #define IREQ_CACHE_FLUSH 0x0001
 
 extern bool enable_hs;
-extern bool enable_le;
 
 #endif /* __HCI_H */
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index db1c5df45224..9fc7728f94e4 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -155,9 +155,14 @@ struct hci_dev {
         __u16           hci_rev;
         __u8            lmp_ver;
         __u16           manufacturer;
-        __le16          lmp_subver;
+        __u16           lmp_subver;
         __u16           voice_setting;
         __u8            io_capability;
+        __s8            inq_tx_power;
+        __u16           devid_source;
+        __u16           devid_vendor;
+        __u16           devid_product;
+        __u16           devid_version;
 
         __u16           pkt_type;
         __u16           esco_type;
@@ -250,9 +255,6 @@ struct hci_dev {
 
         struct list_head        remote_oob_data;
 
-        struct list_head        adv_entries;
-        struct delayed_work     adv_work;
-
         struct hci_dev_stats    stat;
 
         struct sk_buff_head     driver_init;
@@ -263,7 +265,6 @@ struct hci_dev {
 
         struct dentry           *debugfs;
 
-        struct device           *parent;
         struct device           dev;
 
         struct rfkill           *rfkill;
@@ -571,7 +572,7 @@ int hci_chan_del(struct hci_chan *chan);
 void hci_chan_list_flush(struct hci_conn *conn);
 
 struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst,
-                                                __u8 sec_level, __u8 auth_type);
+                             __u8 dst_type, __u8 sec_level, __u8 auth_type);
 int hci_conn_check_link_mode(struct hci_conn *conn);
 int hci_conn_check_secure(struct hci_conn *conn, __u8 sec_level);
 int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type);
@@ -673,8 +674,8 @@ int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key,
                      bdaddr_t *bdaddr, u8 *val, u8 type, u8 pin_len);
 struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, __le16 ediv, u8 rand[8]);
 int hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type, u8 type,
-                int new_key, u8 authenticated, u8 tk[16], u8 enc_size, u16 ediv,
-                u8 rand[8]);
+                int new_key, u8 authenticated, u8 tk[16], u8 enc_size,
+                __le16 ediv, u8 rand[8]);
 struct smp_ltk *hci_find_ltk_by_addr(struct hci_dev *hdev, bdaddr_t *bdaddr,
                                      u8 addr_type);
 int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr);
@@ -688,14 +689,6 @@ int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 *hash,
                                                                 u8 *randomizer);
 int hci_remove_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr);
 
-#define ADV_CLEAR_TIMEOUT (3*60*HZ) /* Three minutes */
-int hci_adv_entries_clear(struct hci_dev *hdev);
-struct adv_entry *hci_find_adv_entry(struct hci_dev *hdev, bdaddr_t *bdaddr);
-int hci_add_adv_entry(struct hci_dev *hdev,
-                                        struct hci_ev_le_advertising_info *ev);
-
-void hci_del_off_timer(struct hci_dev *hdev);
-
 void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb);
 
 int hci_recv_frame(struct sk_buff *skb);
@@ -709,7 +702,7 @@ void hci_conn_init_sysfs(struct hci_conn *conn);
 void hci_conn_add_sysfs(struct hci_conn *conn);
 void hci_conn_del_sysfs(struct hci_conn *conn);
 
-#define SET_HCIDEV_DEV(hdev, pdev) ((hdev)->parent = (pdev))
+#define SET_HCIDEV_DEV(hdev, pdev) ((hdev)->dev.parent = (pdev))
 
 /* ----- LMP capabilities ----- */
 #define lmp_rswitch_capable(dev)   ((dev)->features[0] & LMP_RSWITCH)
@@ -933,6 +926,23 @@ static inline bool eir_has_data_type(u8 *data, size_t data_len, u8 type)
         return false;
 }
 
+static inline size_t eir_get_length(u8 *eir, size_t eir_len)
+{
+        size_t parsed = 0;
+
+        while (parsed < eir_len) {
+                u8 field_len = eir[0];
+
+                if (field_len == 0)
+                        return parsed;
+
+                parsed += field_len + 1;
+                eir += field_len + 1;
+        }
+
+        return eir_len;
+}
+
 static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type, u8 *data,
                                   u8 data_len)
 {
@@ -961,17 +971,12 @@ void hci_send_to_monitor(struct hci_dev *hdev, struct sk_buff *skb);
 void hci_sock_dev_event(struct hci_dev *hdev, int event);
 
 /* Management interface */
-#define MGMT_ADDR_BREDR                 0x00
-#define MGMT_ADDR_LE_PUBLIC             0x01
-#define MGMT_ADDR_LE_RANDOM             0x02
-#define MGMT_ADDR_INVALID               0xff
-
-#define DISCOV_TYPE_BREDR               (BIT(MGMT_ADDR_BREDR))
-#define DISCOV_TYPE_LE                  (BIT(MGMT_ADDR_LE_PUBLIC) | \
-                                                BIT(MGMT_ADDR_LE_RANDOM))
-#define DISCOV_TYPE_INTERLEAVED         (BIT(MGMT_ADDR_BREDR) | \
-                                                BIT(MGMT_ADDR_LE_PUBLIC) | \
-                                                BIT(MGMT_ADDR_LE_RANDOM))
+#define DISCOV_TYPE_BREDR               (BIT(BDADDR_BREDR))
+#define DISCOV_TYPE_LE                  (BIT(BDADDR_LE_PUBLIC) | \
+                                         BIT(BDADDR_LE_RANDOM))
+#define DISCOV_TYPE_INTERLEAVED         (BIT(BDADDR_BREDR) | \
+                                         BIT(BDADDR_LE_PUBLIC) | \
+                                         BIT(BDADDR_LE_RANDOM))
 
 int mgmt_control(struct sock *sk, struct msghdr *msg, size_t len);
 int mgmt_index_added(struct hci_dev *hdev);
@@ -1067,12 +1072,12 @@ void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max,
                                         u16 latency, u16 to_multiplier);
 void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8],
                                                         __u8 ltk[16]);
-void hci_le_ltk_reply(struct hci_conn *conn, u8 ltk[16]);
-void hci_le_ltk_neg_reply(struct hci_conn *conn);
-
 int hci_do_inquiry(struct hci_dev *hdev, u8 length);
 int hci_cancel_inquiry(struct hci_dev *hdev);
 int hci_le_scan(struct hci_dev *hdev, u8 type, u16 interval, u16 window,
                 int timeout);
+int hci_cancel_le_scan(struct hci_dev *hdev);
+
+u8 bdaddr_to_le(u8 bdaddr_type);
 
 #endif /* __HCI_CORE_H */
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 9b242c6bf55b..1c7d1cd5e679 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -44,6 +44,7 @@
 #define L2CAP_DEFAULT_MAX_SDU_SIZE      0xFFFF
 #define L2CAP_DEFAULT_SDU_ITIME         0xFFFFFFFF
 #define L2CAP_DEFAULT_ACC_LAT           0xFFFFFFFF
+#define L2CAP_BREDR_MAX_PAYLOAD         1019    /* 3-DH5 packet */
 
 #define L2CAP_DISC_TIMEOUT              msecs_to_jiffies(100)
 #define L2CAP_DISC_REJ_TIMEOUT          msecs_to_jiffies(5000)
@@ -57,6 +58,7 @@ struct sockaddr_l2 {
         __le16          l2_psm;
         bdaddr_t        l2_bdaddr;
         __le16          l2_cid;
+        __u8            l2_bdaddr_type;
 };
 
 /* L2CAP socket options */
@@ -139,6 +141,8 @@ struct l2cap_conninfo {
 
 #define L2CAP_CTRL_TXSEQ_SHIFT          1
 #define L2CAP_CTRL_SUPER_SHIFT          2
+#define L2CAP_CTRL_POLL_SHIFT           4
+#define L2CAP_CTRL_FINAL_SHIFT          7
 #define L2CAP_CTRL_REQSEQ_SHIFT         8
 #define L2CAP_CTRL_SAR_SHIFT            14
 
@@ -152,9 +156,11 @@ struct l2cap_conninfo {
 #define L2CAP_EXT_CTRL_FINAL            0x00000002
 #define L2CAP_EXT_CTRL_FRAME_TYPE       0x00000001 /* I- or S-Frame */
 
+#define L2CAP_EXT_CTRL_FINAL_SHIFT      1
 #define L2CAP_EXT_CTRL_REQSEQ_SHIFT     2
 #define L2CAP_EXT_CTRL_SAR_SHIFT        16
 #define L2CAP_EXT_CTRL_SUPER_SHIFT      16
+#define L2CAP_EXT_CTRL_POLL_SHIFT       18
 #define L2CAP_EXT_CTRL_TXSEQ_SHIFT      18
 
 /* L2CAP Supervisory Function */
@@ -186,6 +192,8 @@ struct l2cap_hdr {
 #define L2CAP_FCS_SIZE          2
 #define L2CAP_SDULEN_SIZE       2
 #define L2CAP_PSMLEN_SIZE       2
+#define L2CAP_ENH_CTRL_SIZE     2
+#define L2CAP_EXT_CTRL_SIZE     4
 
 struct l2cap_cmd_hdr {
         __u8       code;
@@ -401,6 +409,16 @@ struct l2cap_conn_param_update_rsp {
 #define L2CAP_CONN_PARAM_REJECTED       0x0001
 
 /* ----- L2CAP channels and connections ----- */
+struct l2cap_seq_list {
+        __u16   head;
+        __u16   tail;
+        __u16   mask;
+        __u16   *list;
+};
+
+#define L2CAP_SEQ_LIST_CLEAR    0xFFFF
+#define L2CAP_SEQ_LIST_TAIL     0x8000
+
 struct srej_list {
         __u16   tx_seq;
         struct list_head list;
@@ -446,6 +464,9 @@ struct l2cap_chan {
         __u16           monitor_timeout;
         __u16           mps;
 
+        __u8            tx_state;
+        __u8            rx_state;
+
         unsigned long   conf_state;
         unsigned long   conn_state;
         unsigned long   flags;
@@ -456,9 +477,11 @@ struct l2cap_chan {
         __u16           buffer_seq;
         __u16           buffer_seq_srej;
         __u16           srej_save_reqseq;
+        __u16           last_acked_seq;
         __u16           frames_sent;
         __u16           unacked_frames;
         __u8            retry_count;
+        __u16           srej_queue_next;
         __u8            num_acked;
         __u16           sdu_len;
         struct sk_buff  *sdu;
@@ -490,6 +513,8 @@ struct l2cap_chan {
         struct sk_buff          *tx_send_head;
         struct sk_buff_head     tx_q;
         struct sk_buff_head     srej_q;
+        struct l2cap_seq_list   srej_list;
+        struct l2cap_seq_list   retrans_list;
         struct list_head        srej_l;
 
         struct list_head        list;
@@ -508,8 +533,7 @@ struct l2cap_ops {
         void                    (*close) (void *data);
         void                    (*state_change) (void *data, int state);
         struct sk_buff          *(*alloc_skb) (struct l2cap_chan *chan,
-                                        unsigned long len, int nb, int *err);
-
+                                               unsigned long len, int nb);
 };
 
 struct l2cap_conn {
@@ -600,6 +624,44 @@ enum {
         FLAG_EFS_ENABLE,
 };
 
+enum {
+        L2CAP_TX_STATE_XMIT,
+        L2CAP_TX_STATE_WAIT_F,
+};
+
+enum {
+        L2CAP_RX_STATE_RECV,
+        L2CAP_RX_STATE_SREJ_SENT,
+};
+
+enum {
+        L2CAP_TXSEQ_EXPECTED,
+        L2CAP_TXSEQ_EXPECTED_SREJ,
+        L2CAP_TXSEQ_UNEXPECTED,
+        L2CAP_TXSEQ_UNEXPECTED_SREJ,
+        L2CAP_TXSEQ_DUPLICATE,
+        L2CAP_TXSEQ_DUPLICATE_SREJ,
+        L2CAP_TXSEQ_INVALID,
+        L2CAP_TXSEQ_INVALID_IGNORE,
+};
+
+enum {
+        L2CAP_EV_DATA_REQUEST,
+        L2CAP_EV_LOCAL_BUSY_DETECTED,
+        L2CAP_EV_LOCAL_BUSY_CLEAR,
+        L2CAP_EV_RECV_REQSEQ_AND_FBIT,
+        L2CAP_EV_RECV_FBIT,
+        L2CAP_EV_RETRANS_TO,
+        L2CAP_EV_MONITOR_TO,
+        L2CAP_EV_EXPLICIT_POLL,
+        L2CAP_EV_RECV_IFRAME,
+        L2CAP_EV_RECV_RR,
+        L2CAP_EV_RECV_REJ,
+        L2CAP_EV_RECV_RNR,
+        L2CAP_EV_RECV_SREJ,
+        L2CAP_EV_RECV_FRAME,
+};
+
 static inline void l2cap_chan_hold(struct l2cap_chan *c)
 {
         atomic_inc(&c->refcnt);
@@ -622,21 +684,26 @@ static inline void l2cap_chan_unlock(struct l2cap_chan *chan)
 }
 
 static inline void l2cap_set_timer(struct l2cap_chan *chan,
-                                        struct delayed_work *work, long timeout)
+                                   struct delayed_work *work, long timeout)
 {
         BT_DBG("chan %p state %s timeout %ld", chan,
-                                        state_to_string(chan->state), timeout);
+               state_to_string(chan->state), timeout);
 
+        /* If delayed work cancelled do not hold(chan)
+           since it is already done with previous set_timer */
         if (!cancel_delayed_work(work))
                 l2cap_chan_hold(chan);
+
         schedule_delayed_work(work, timeout);
 }
 
 static inline bool l2cap_clear_timer(struct l2cap_chan *chan,
-                                        struct delayed_work *work)
+                                     struct delayed_work *work)
 {
         bool ret;
 
+        /* put(chan) if delayed work cancelled otherwise it
+           is done in delayed work function */
         ret = cancel_delayed_work(work);
         if (ret)
                 l2cap_chan_put(chan);
@@ -658,13 +725,10 @@ static inline bool l2cap_clear_timer(struct l2cap_chan *chan,
 
 static inline int __seq_offset(struct l2cap_chan *chan, __u16 seq1, __u16 seq2)
 {
-        int offset;
-
-        offset = (seq1 - seq2) % (chan->tx_win_max + 1);
-        if (offset < 0)
-                offset += (chan->tx_win_max + 1);
-
-        return offset;
+        if (seq1 >= seq2)
+                return seq1 - seq2;
+        else
+                return chan->tx_win_max + 1 - seq2 + seq1;
 }
 
 static inline __u16 __next_seq(struct l2cap_chan *chan, __u16 seq)
@@ -852,14 +916,15 @@ int __l2cap_wait_ack(struct sock *sk);
 int l2cap_add_psm(struct l2cap_chan *chan, bdaddr_t *src, __le16 psm);
 int l2cap_add_scid(struct l2cap_chan *chan,  __u16 scid);
 
-struct l2cap_chan *l2cap_chan_create(struct sock *sk);
+struct l2cap_chan *l2cap_chan_create(void);
 void l2cap_chan_close(struct l2cap_chan *chan, int reason);
 void l2cap_chan_destroy(struct l2cap_chan *chan);
 int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
-                                                                bdaddr_t *dst);
+                       bdaddr_t *dst, u8 dst_type);
 int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,
                                                                 u32 priority);
 void l2cap_chan_busy(struct l2cap_chan *chan, int busy);
 int l2cap_chan_check_security(struct l2cap_chan *chan);
+void l2cap_chan_set_defaults(struct l2cap_chan *chan);
 
 #endif /* __L2CAP_H */
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index ebfd91fc20f8..23fd0546fccb 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -341,6 +341,15 @@ struct mgmt_cp_unblock_device {
 } __packed;
 #define MGMT_UNBLOCK_DEVICE_SIZE        MGMT_ADDR_INFO_SIZE
 
+#define MGMT_OP_SET_DEVICE_ID           0x0028
+struct mgmt_cp_set_device_id {
+        __le16  source;
+        __le16  vendor;
+        __le16  product;
+        __le16  version;
+} __packed;
+#define MGMT_SET_DEVICE_ID_SIZE         8
+
 #define MGMT_EV_CMD_COMPLETE            0x0001
 struct mgmt_ev_cmd_complete {
         __le16  opcode;
diff --git a/include/net/bluetooth/smp.h b/include/net/bluetooth/smp.h
index 7b3acdd29134..ca356a734920 100644
--- a/include/net/bluetooth/smp.h
+++ b/include/net/bluetooth/smp.h
@@ -77,7 +77,7 @@ struct smp_cmd_encrypt_info {
 
 #define SMP_CMD_MASTER_IDENT    0x07
 struct smp_cmd_master_ident {
-        __u16   ediv;
+        __le16  ediv;
         __u8    rand[8];
 } __packed;
 
diff --git a/include/net/caif/caif_hsi.h b/include/net/caif/caif_hsi.h
index 6db8ecf52aa2..439dadc8102f 100644
--- a/include/net/caif/caif_hsi.h
+++ b/include/net/caif/caif_hsi.h
@@ -123,12 +123,21 @@ struct cfhsi_rx_state {
         bool piggy_desc;
 };
 
+/* Priority mapping */
+enum {
+        CFHSI_PRIO_CTL = 0,
+        CFHSI_PRIO_VI,
+        CFHSI_PRIO_VO,
+        CFHSI_PRIO_BEBK,
+        CFHSI_PRIO_LAST,
+};
+
 /* Structure implemented by CAIF HSI drivers. */
 struct cfhsi {
         struct caif_dev_common cfdev;
         struct net_device *ndev;
         struct platform_device *pdev;
-        struct sk_buff_head qhead;
+        struct sk_buff_head qhead[CFHSI_PRIO_LAST];
         struct cfhsi_drv drv;
         struct cfhsi_dev *dev;
         int tx_state;
@@ -151,8 +160,14 @@ struct cfhsi {
         wait_queue_head_t wake_up_wait;
         wait_queue_head_t wake_down_wait;
         wait_queue_head_t flush_fifo_wait;
-        struct timer_list timer;
+        struct timer_list inactivity_timer;
         struct timer_list rx_slowpath_timer;
+
+        /* TX aggregation */
+        unsigned long aggregation_timeout;
+        int aggregation_len;
+        struct timer_list aggregation_timer;
+
         unsigned long bits;
 };
 
diff --git a/include/net/caif/cfpkt.h b/include/net/caif/cfpkt.h
index 6bd200a4754a..83a89ba3005b 100644
--- a/include/net/caif/cfpkt.h
+++ b/include/net/caif/cfpkt.h
@@ -188,11 +188,18 @@ struct cfpkt *cfpkt_fromnative(enum caif_direction dir, void *nativepkt);
  */
 void *cfpkt_tonative(struct cfpkt *pkt);
 
-
 /*
  * Returns packet information for a packet.
  * pkt Packet to get info from;
  * @return Packet information
  */
 struct caif_payload_info *cfpkt_info(struct cfpkt *pkt);
+
+/** cfpkt_set_prio - set priority for a CAIF packet.
+ *
+ * @pkt: The CAIF packet to be adjusted.
+ * @prio: one of TC_PRIO_ constants.
+ */
+void cfpkt_set_prio(struct cfpkt *pkt, int prio);
+
 #endif                          /* CFPKT_H_ */
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 83d800c31e3c..0289d4ce7070 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -521,6 +521,7 @@ struct station_parameters {
  * @STATION_INFO_ASSOC_REQ_IES: @assoc_req_ies filled
  * @STATION_INFO_STA_FLAGS: @sta_flags filled
  * @STATION_INFO_BEACON_LOSS_COUNT: @beacon_loss_count filled
+ * @STATION_INFO_T_OFFSET: @t_offset filled
  */
 enum station_info_flags {
         STATION_INFO_INACTIVE_TIME      = 1<<0,
@@ -542,7 +543,8 @@ enum station_info_flags {
         STATION_INFO_CONNECTED_TIME     = 1<<16,
         STATION_INFO_ASSOC_REQ_IES      = 1<<17,
         STATION_INFO_STA_FLAGS          = 1<<18,
-        STATION_INFO_BEACON_LOSS_COUNT  = 1<<19
+        STATION_INFO_BEACON_LOSS_COUNT  = 1<<19,
+        STATION_INFO_T_OFFSET           = 1<<20,
 };
 
 /**
@@ -643,6 +645,7 @@ struct sta_bss_parameters {
  * @assoc_req_ies_len: Length of assoc_req_ies buffer in octets.
  * @sta_flags: station flags mask & values
  * @beacon_loss_count: Number of times beacon loss event has triggered.
+ * @t_offset: Time offset of the station relative to this host.
  */
 struct station_info {
         u32 filled;
@@ -671,6 +674,7 @@ struct station_info {
         size_t assoc_req_ies_len;
 
         u32 beacon_loss_count;
+        s64 t_offset;
 
         /*
          * Note: Add a new enum station_info_flags value for each new field and
@@ -798,6 +802,8 @@ struct mesh_config {
         /* ttl used in path selection information elements */
         u8  element_ttl;
         bool auto_open_plinks;
+        /* neighbor offset synchronization */
+        u32 dot11MeshNbrOffsetMaxNeighbor;
         /* HWMP parameters */
         u8  dot11MeshHWMPmaxPREQretries;
         u32 path_refresh_time;
@@ -815,12 +821,14 @@ struct mesh_config {
         bool  dot11MeshGateAnnouncementProtocol;
         bool dot11MeshForwarding;
         s32 rssi_threshold;
+        u16 ht_opmode;
 };
 
 /**
  * struct mesh_setup - 802.11s mesh setup configuration
  * @mesh_id: the mesh ID
  * @mesh_id_len: length of the mesh ID, at least 1 and at most 32 bytes
+ * @sync_method: which synchronization method to use
  * @path_sel_proto: which path selection protocol to use
  * @path_metric: which metric to use
  * @ie: vendor information elements (optional)
@@ -834,8 +842,9 @@ struct mesh_config {
 struct mesh_setup {
         const u8 *mesh_id;
         u8 mesh_id_len;
-        u8  path_sel_proto;
-        u8  path_metric;
+        u8 sync_method;
+        u8 path_sel_proto;
+        u8 path_metric;
         const u8 *ie;
         u8 ie_len;
         bool is_authenticated;
@@ -845,7 +854,7 @@ struct mesh_setup {
 
 /**
  * struct ieee80211_txq_params - TX queue parameters
- * @queue: TX queue identifier (NL80211_TXQ_Q_*)
+ * @ac: AC identifier
  * @txop: Maximum burst time in units of 32 usecs, 0 meaning disabled
  * @cwmin: Minimum contention window [a value of the form 2^n-1 in the range
  *      1..32767]
@@ -854,7 +863,7 @@ struct mesh_setup {
  * @aifs: Arbitration interframe space [0..255]
  */
 struct ieee80211_txq_params {
-        enum nl80211_txq_q queue;
+        enum nl80211_ac ac;
         u16 txop;
         u16 cwmin;
         u16 cwmax;
@@ -1336,6 +1345,9 @@ struct cfg80211_gtk_rekey_data {
  *      be %NULL or contain the enabled Wake-on-Wireless triggers that are
  *      configured for the device.
  * @resume: wiphy device needs to be resumed
+ * @set_wakeup: Called when WoWLAN is enabled/disabled, use this callback
+ *      to call device_set_wakeup_enable() to enable/disable wakeup from
+ *      the device.
  *
  * @add_virtual_intf: create a new virtual interface with the given name,
  *      must set the struct wireless_dev's iftype. Beware: You must create
@@ -1503,10 +1515,21 @@ struct cfg80211_gtk_rekey_data {
  *      later passes to cfg80211_probe_status().
  *
  * @set_noack_map: Set the NoAck Map for the TIDs.
+ *
+ * @get_et_sset_count:  Ethtool API to get string-set count.
+ *      See @ethtool_ops.get_sset_count
+ *
+ * @get_et_stats:  Ethtool API to get a set of u64 stats.
+ *      See @ethtool_ops.get_ethtool_stats
+ *
+ * @get_et_strings:  Ethtool API to get a set of strings to describe stats
+ *      and perhaps other supported types of ethtool data-sets.
+ *      See @ethtool_ops.get_strings
  */
 struct cfg80211_ops {
         int     (*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow);
         int     (*resume)(struct wiphy *wiphy);
+        void    (*set_wakeup)(struct wiphy *wiphy, bool enabled);
 
         struct net_device * (*add_virtual_intf)(struct wiphy *wiphy,
                                                 char *name,
@@ -1698,7 +1721,15 @@ struct cfg80211_ops {
                                   struct net_device *dev,
                                   u16 noack_map);
 
-        struct ieee80211_channel *(*get_channel)(struct wiphy *wiphy);
+        struct ieee80211_channel *(*get_channel)(struct wiphy *wiphy,
+                                               enum nl80211_channel_type *type);
+
+        int     (*get_et_sset_count)(struct wiphy *wiphy,
+                                     struct net_device *dev, int sset);
+        void    (*get_et_stats)(struct wiphy *wiphy, struct net_device *dev,
+                                struct ethtool_stats *stats, u64 *data);
+        void    (*get_et_strings)(struct wiphy *wiphy, struct net_device *dev,
+                                  u32 sset, u8 *data);
 };
 
 /*
@@ -1732,10 +1763,6 @@ struct cfg80211_ops {
  *      hints read the documenation for regulatory_hint_found_beacon()
  * @WIPHY_FLAG_NETNS_OK: if not set, do not allow changing the netns of this
  *      wiphy at all
- * @WIPHY_FLAG_ENFORCE_COMBINATIONS: Set this flag to enforce interface
- *      combinations for this device. This flag is used for backward
- *      compatibility only until all drivers advertise combinations and
- *      they will always be enforced.
  * @WIPHY_FLAG_PS_ON_BY_DEFAULT: if set to true, powersave will be enabled
  *      by default -- this flag will be set depending on the kernel's default
  *      on wiphy_new(), but can be changed by the driver if it has a good
@@ -1780,7 +1807,7 @@ enum wiphy_flags {
         WIPHY_FLAG_IBSS_RSN                     = BIT(8),
         WIPHY_FLAG_MESH_AUTH                    = BIT(10),
         WIPHY_FLAG_SUPPORTS_SCHED_SCAN          = BIT(11),
-        WIPHY_FLAG_ENFORCE_COMBINATIONS         = BIT(12),
+        /* use hole at 12 */
         WIPHY_FLAG_SUPPORTS_FW_ROAM             = BIT(13),
         WIPHY_FLAG_AP_UAPSD                     = BIT(14),
         WIPHY_FLAG_SUPPORTS_TDLS                = BIT(15),
@@ -3338,9 +3365,20 @@ void cfg80211_report_obss_beacon(struct wiphy *wiphy,
  * @chan: main channel
  * @channel_type: HT mode
  */
-int cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
-                                 struct ieee80211_channel *chan,
-                                 enum nl80211_channel_type channel_type);
+bool cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
+                                  struct ieee80211_channel *chan,
+                                  enum nl80211_channel_type channel_type);
+
+/*
+ * cfg80211_ch_switch_notify - update wdev channel and notify userspace
+ * @dev: the device which switched channels
+ * @freq: new channel frequency (in MHz)
+ * @type: channel type
+ *
+ * Acquires wdev_lock, so must only be called from sleepable driver context!
+ */
+void cfg80211_ch_switch_notify(struct net_device *dev, int freq,
+                               enum nl80211_channel_type type);
 
 /*
  * cfg80211_calculate_bitrate - calculate actual bitrate (in 100Kbps units)
diff --git a/include/net/cipso_ipv4.h b/include/net/cipso_ipv4.h
index 9808877c2ab9..a7a683e30b64 100644
--- a/include/net/cipso_ipv4.h
+++ b/include/net/cipso_ipv4.h
@@ -42,6 +42,7 @@
 #include <net/netlabel.h>
 #include <net/request_sock.h>
 #include <linux/atomic.h>
+#include <asm/unaligned.h>
 
 /* known doi values */
 #define CIPSO_V4_DOI_UNKNOWN          0x00000000
@@ -285,7 +286,33 @@ static inline int cipso_v4_skbuff_getattr(const struct sk_buff *skb,
 static inline int cipso_v4_validate(const struct sk_buff *skb,
                                     unsigned char **option)
 {
-        return -ENOSYS;
+        unsigned char *opt = *option;
+        unsigned char err_offset = 0;
+        u8 opt_len = opt[1];
+        u8 opt_iter;
+
+        if (opt_len < 8) {
+                err_offset = 1;
+                goto out;
+        }
+
+        if (get_unaligned_be32(&opt[2]) == 0) {
+                err_offset = 2;
+                goto out;
+        }
+
+        for (opt_iter = 6; opt_iter < opt_len;) {
+                if (opt[opt_iter + 1] > (opt_len - opt_iter)) {
+                        err_offset = opt_iter + 1;
+                        goto out;
+                }
+                opt_iter += opt[opt_iter + 1];
+        }
+
+out:
+        *option = opt + err_offset;
+        return err_offset;
+
 }
 #endif /* CONFIG_NETLABEL */
 
diff --git a/include/net/codel.h b/include/net/codel.h
new file mode 100644
index 000000000000..550debfc2403
--- /dev/null
+++ b/include/net/codel.h
@@ -0,0 +1,342 @@
+#ifndef __NET_SCHED_CODEL_H
+#define __NET_SCHED_CODEL_H
+
+/*
+ * Codel - The Controlled-Delay Active Queue Management algorithm
+ *
+ *  Copyright (C) 2011-2012 Kathleen Nichols <nichols@pollere.com>
+ *  Copyright (C) 2011-2012 Van Jacobson <van@pollere.net>
+ *  Copyright (C) 2012 Michael D. Taht <dave.taht@bufferbloat.net>
+ *  Copyright (C) 2012 Eric Dumazet <edumazet@google.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The names of the authors may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * Alternatively, provided that this notice is retained in full, this
+ * software may be distributed under the terms of the GNU General
+ * Public License ("GPL") version 2, in which case the provisions of the
+ * GPL apply INSTEAD OF those given above.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ */
+
+#include <linux/types.h>
+#include <linux/ktime.h>
+#include <linux/skbuff.h>
+#include <net/pkt_sched.h>
+#include <net/inet_ecn.h>
+#include <linux/reciprocal_div.h>
+
+/* Controlling Queue Delay (CoDel) algorithm
+ * =========================================
+ * Source : Kathleen Nichols and Van Jacobson
+ * http://queue.acm.org/detail.cfm?id=2209336
+ *
+ * Implemented on linux by Dave Taht and Eric Dumazet
+ */
+
+
+/* CoDel uses a 1024 nsec clock, encoded in u32
+ * This gives a range of 2199 seconds, because of signed compares
+ */
+typedef u32 codel_time_t;
+typedef s32 codel_tdiff_t;
+#define CODEL_SHIFT 10
+#define MS2TIME(a) ((a * NSEC_PER_MSEC) >> CODEL_SHIFT)
+
+static inline codel_time_t codel_get_time(void)
+{
+        u64 ns = ktime_to_ns(ktime_get());
+
+        return ns >> CODEL_SHIFT;
+}
+
+#define codel_time_after(a, b)          ((s32)(a) - (s32)(b) > 0)
+#define codel_time_after_eq(a, b)       ((s32)(a) - (s32)(b) >= 0)
+#define codel_time_before(a, b)         ((s32)(a) - (s32)(b) < 0)
+#define codel_time_before_eq(a, b)      ((s32)(a) - (s32)(b) <= 0)
+
+/* Qdiscs using codel plugin must use codel_skb_cb in their own cb[] */
+struct codel_skb_cb {
+        codel_time_t enqueue_time;
+};
+
+static struct codel_skb_cb *get_codel_cb(const struct sk_buff *skb)
+{
+        qdisc_cb_private_validate(skb, sizeof(struct codel_skb_cb));
+        return (struct codel_skb_cb *)qdisc_skb_cb(skb)->data;
+}
+
+static codel_time_t codel_get_enqueue_time(const struct sk_buff *skb)
+{
+        return get_codel_cb(skb)->enqueue_time;
+}
+
+static void codel_set_enqueue_time(struct sk_buff *skb)
+{
+        get_codel_cb(skb)->enqueue_time = codel_get_time();
+}
+
+static inline u32 codel_time_to_us(codel_time_t val)
+{
+        u64 valns = ((u64)val << CODEL_SHIFT);
+
+        do_div(valns, NSEC_PER_USEC);
+        return (u32)valns;
+}
+
+/**
+ * struct codel_params - contains codel parameters
+ * @target:     target queue size (in time units)
+ * @interval:   width of moving time window
+ * @ecn:        is Explicit Congestion Notification enabled
+ */
+struct codel_params {
+        codel_time_t    target;
+        codel_time_t    interval;
+        bool            ecn;
+};
+
+/**
+ * struct codel_vars - contains codel variables
+ * @count:              how many drops we've done since the last time we
+ *                      entered dropping state
+ * @lastcount:          count at entry to dropping state
+ * @dropping:           set to true if in dropping state
+ * @rec_inv_sqrt:       reciprocal value of sqrt(count) >> 1
+ * @first_above_time:   when we went (or will go) continuously above target
+ *                      for interval
+ * @drop_next:          time to drop next packet, or when we dropped last
+ * @ldelay:             sojourn time of last dequeued packet
+ */
+struct codel_vars {
+        u32             count;
+        u32             lastcount;
+        bool            dropping;
+        u16             rec_inv_sqrt;
+        codel_time_t    first_above_time;
+        codel_time_t    drop_next;
+        codel_time_t    ldelay;
+};
+
+#define REC_INV_SQRT_BITS (8 * sizeof(u16)) /* or sizeof_in_bits(rec_inv_sqrt) */
+/* needed shift to get a Q0.32 number from rec_inv_sqrt */
+#define REC_INV_SQRT_SHIFT (32 - REC_INV_SQRT_BITS)
+
+/**
+ * struct codel_stats - contains codel shared variables and stats
+ * @maxpacket:  largest packet we've seen so far
+ * @drop_count: temp count of dropped packets in dequeue()
+ * ecn_mark:    number of packets we ECN marked instead of dropping
+ */
+struct codel_stats {
+        u32             maxpacket;
+        u32             drop_count;
+        u32             ecn_mark;
+};
+
+static void codel_params_init(struct codel_params *params)
+{
+        params->interval = MS2TIME(100);
+        params->target = MS2TIME(5);
+        params->ecn = false;
+}
+
+static void codel_vars_init(struct codel_vars *vars)
+{
+        memset(vars, 0, sizeof(*vars));
+}
+
+static void codel_stats_init(struct codel_stats *stats)
+{
+        stats->maxpacket = 256;
+}
+
+/*
+ * http://en.wikipedia.org/wiki/Methods_of_computing_square_roots#Iterative_methods_for_reciprocal_square_roots
+ * new_invsqrt = (invsqrt / 2) * (3 - count * invsqrt^2)
+ *
+ * Here, invsqrt is a fixed point number (< 1.0), 32bit mantissa, aka Q0.32
+ */
+static void codel_Newton_step(struct codel_vars *vars)
+{
+        u32 invsqrt = ((u32)vars->rec_inv_sqrt) << REC_INV_SQRT_SHIFT;
+        u32 invsqrt2 = ((u64)invsqrt * invsqrt) >> 32;
+        u64 val = (3LL << 32) - ((u64)vars->count * invsqrt2);
+
+        val >>= 2; /* avoid overflow in following multiply */
+        val = (val * invsqrt) >> (32 - 2 + 1);
+
+        vars->rec_inv_sqrt = val >> REC_INV_SQRT_SHIFT;
+}
+
+/*
+ * CoDel control_law is t + interval/sqrt(count)
+ * We maintain in rec_inv_sqrt the reciprocal value of sqrt(count) to avoid
+ * both sqrt() and divide operation.
+ */
+static codel_time_t codel_control_law(codel_time_t t,
+                                      codel_time_t interval,
+                                      u32 rec_inv_sqrt)
+{
+        return t + reciprocal_divide(interval, rec_inv_sqrt << REC_INV_SQRT_SHIFT);
+}
+
+
+static bool codel_should_drop(const struct sk_buff *skb,
+                              struct Qdisc *sch,
+                              struct codel_vars *vars,
+                              struct codel_params *params,
+                              struct codel_stats *stats,
+                              codel_time_t now)
+{
+        bool ok_to_drop;
+
+        if (!skb) {
+                vars->first_above_time = 0;
+                return false;
+        }
+
+        vars->ldelay = now - codel_get_enqueue_time(skb);
+        sch->qstats.backlog -= qdisc_pkt_len(skb);
+
+        if (unlikely(qdisc_pkt_len(skb) > stats->maxpacket))
+                stats->maxpacket = qdisc_pkt_len(skb);
+
+        if (codel_time_before(vars->ldelay, params->target) ||
+            sch->qstats.backlog <= stats->maxpacket) {
+                /* went below - stay below for at least interval */
+                vars->first_above_time = 0;
+                return false;
+        }
+        ok_to_drop = false;
+        if (vars->first_above_time == 0) {
+                /* just went above from below. If we stay above
+                 * for at least interval we'll say it's ok to drop
+                 */
+                vars->first_above_time = now + params->interval;
+        } else if (codel_time_after(now, vars->first_above_time)) {
+                ok_to_drop = true;
+        }
+        return ok_to_drop;
+}
+
+typedef struct sk_buff * (*codel_skb_dequeue_t)(struct codel_vars *vars,
+                                                struct Qdisc *sch);
+
+static struct sk_buff *codel_dequeue(struct Qdisc *sch,
+                                     struct codel_params *params,
+                                     struct codel_vars *vars,
+                                     struct codel_stats *stats,
+                                     codel_skb_dequeue_t dequeue_func)
+{
+        struct sk_buff *skb = dequeue_func(vars, sch);
+        codel_time_t now;
+        bool drop;
+
+        if (!skb) {
+                vars->dropping = false;
+                return skb;
+        }
+        now = codel_get_time();
+        drop = codel_should_drop(skb, sch, vars, params, stats, now);
+        if (vars->dropping) {
+                if (!drop) {
+                        /* sojourn time below target - leave dropping state */
+                        vars->dropping = false;
+                } else if (codel_time_after_eq(now, vars->drop_next)) {
+                        /* It's time for the next drop. Drop the current
+                         * packet and dequeue the next. The dequeue might
+                         * take us out of dropping state.
+                         * If not, schedule the next drop.
+                         * A large backlog might result in drop rates so high
+                         * that the next drop should happen now,
+                         * hence the while loop.
+                         */
+                        while (vars->dropping &&
+                               codel_time_after_eq(now, vars->drop_next)) {
+                                vars->count++; /* dont care of possible wrap
+                                                * since there is no more divide
+                                                */
+                                codel_Newton_step(vars);
+                                if (params->ecn && INET_ECN_set_ce(skb)) {
+                                        stats->ecn_mark++;
+                                        vars->drop_next =
+                                                codel_control_law(vars->drop_next,
+                                                                  params->interval,
+                                                                  vars->rec_inv_sqrt);
+                                        goto end;
+                                }
+                                qdisc_drop(skb, sch);
+                                stats->drop_count++;
+                                skb = dequeue_func(vars, sch);
+                                if (!codel_should_drop(skb, sch,
+                                                       vars, params, stats, now)) {
+                                        /* leave dropping state */
+                                        vars->dropping = false;
+                                } else {
+                                        /* and schedule the next drop */
+                                        vars->drop_next =
+                                                codel_control_law(vars->drop_next,
+                                                                  params->interval,
+                                                                  vars->rec_inv_sqrt);
+                                }
+                        }
+                }
+        } else if (drop) {
+                if (params->ecn && INET_ECN_set_ce(skb)) {
+                        stats->ecn_mark++;
+                } else {
+                        qdisc_drop(skb, sch);
+                        stats->drop_count++;
+
+                        skb = dequeue_func(vars, sch);
+                        drop = codel_should_drop(skb, sch, vars, params,
+                                                 stats, now);
+                }
+                vars->dropping = true;
+                /* if min went above target close to when we last went below it
+                 * assume that the drop rate that controlled the queue on the
+                 * last cycle is a good starting point to control it now.
+                 */
+                if (codel_time_before(now - vars->drop_next,
+                                      16 * params->interval)) {
+                        vars->count = (vars->count - vars->lastcount) | 1;
+                        /* we dont care if rec_inv_sqrt approximation
+                         * is not very precise :
+                         * Next Newton steps will correct it quadratically.
+                         */
+                        codel_Newton_step(vars);
+                } else {
+                        vars->count = 1;
+                        vars->rec_inv_sqrt = ~0U >> REC_INV_SQRT_SHIFT;
+                }
+                vars->lastcount = vars->count;
+                vars->drop_next = codel_control_law(now, params->interval,
+                                                    vars->rec_inv_sqrt);
+        }
+end:
+        return skb;
+}
+#endif
diff --git a/include/net/compat.h b/include/net/compat.h
index a974ae92d182..6e9565324989 100644
--- a/include/net/compat.h
+++ b/include/net/compat.h
@@ -42,12 +42,12 @@ extern int compat_sock_get_timestampns(struct sock *, struct timespec __user *);
 
 extern int get_compat_msghdr(struct msghdr *, struct compat_msghdr __user *);
 extern int verify_compat_iovec(struct msghdr *, struct iovec *, struct sockaddr_storage *, int);
-extern asmlinkage long compat_sys_sendmsg(int,struct compat_msghdr __user *,unsigned);
+extern asmlinkage long compat_sys_sendmsg(int,struct compat_msghdr __user *,unsigned int);
 extern asmlinkage long compat_sys_sendmmsg(int, struct compat_mmsghdr __user *,
-                                           unsigned, unsigned);
-extern asmlinkage long compat_sys_recvmsg(int,struct compat_msghdr __user *,unsigned);
+                                           unsigned int, unsigned int);
+extern asmlinkage long compat_sys_recvmsg(int,struct compat_msghdr __user *,unsigned int);
 extern asmlinkage long compat_sys_recvmmsg(int, struct compat_mmsghdr __user *,
-                                           unsigned, unsigned,
+                                           unsigned int, unsigned int,
                                            struct compat_timespec __user *);
 extern asmlinkage long compat_sys_getsockopt(int, int, int, char __user *, int __user *);
 extern int put_cmsg_compat(struct msghdr*, int, int, int, void *);
diff --git a/include/net/dcbnl.h b/include/net/dcbnl.h
index f55c980d8e23..fc5d5dcebb00 100644
--- a/include/net/dcbnl.h
+++ b/include/net/dcbnl.h
@@ -48,6 +48,8 @@ struct dcbnl_rtnl_ops {
         /* IEEE 802.1Qaz std */
         int (*ieee_getets) (struct net_device *, struct ieee_ets *);
         int (*ieee_setets) (struct net_device *, struct ieee_ets *);
+        int (*ieee_getmaxrate) (struct net_device *, struct ieee_maxrate *);
+        int (*ieee_setmaxrate) (struct net_device *, struct ieee_maxrate *);
         int (*ieee_getpfc) (struct net_device *, struct ieee_pfc *);
         int (*ieee_setpfc) (struct net_device *, struct ieee_pfc *);
         int (*ieee_getapp) (struct net_device *, struct dcb_app *);
diff --git a/include/net/dn.h b/include/net/dn.h
index 814af0b9387d..c88bf4ebd330 100644
--- a/include/net/dn.h
+++ b/include/net/dn.h
@@ -199,7 +199,7 @@ static inline void dn_sk_ports_copy(struct flowidn *fld, struct dn_scp *scp)
         fld->fld_dport = scp->addrrem;
 }
 
-extern unsigned dn_mss_from_pmtu(struct net_device *dev, int mtu);
+extern unsigned int dn_mss_from_pmtu(struct net_device *dev, int mtu);
 
 #define DN_MENUVER_ACC 0x01
 #define DN_MENUVER_USR 0x02
diff --git a/include/net/dn_fib.h b/include/net/dn_fib.h
index 782ef7cb4930..1ee9d4bda30d 100644
--- a/include/net/dn_fib.h
+++ b/include/net/dn_fib.h
@@ -31,7 +31,7 @@ struct dn_fib_res {
 
 struct dn_fib_nh {
         struct net_device       *nh_dev;
-        unsigned                nh_flags;
+        unsigned int            nh_flags;
         unsigned char           nh_scope;
         int                     nh_weight;
         int                     nh_power;
@@ -45,7 +45,7 @@ struct dn_fib_info {
         int                     fib_treeref;
         atomic_t                fib_clntref;
         int                     fib_dead;
-        unsigned                fib_flags;
+        unsigned int            fib_flags;
         int                     fib_protocol;
         __le16                  fib_prefsrc;
         __u32                   fib_priority;
@@ -140,7 +140,7 @@ extern void dn_fib_table_cleanup(void);
  */
 extern void dn_fib_rules_init(void);
 extern void dn_fib_rules_cleanup(void);
-extern unsigned dnet_addr_type(__le16 addr);
+extern unsigned int dnet_addr_type(__le16 addr);
 extern int dn_fib_lookup(struct flowidn *fld, struct dn_fib_res *res);
 
 extern int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb);
diff --git a/include/net/dn_route.h b/include/net/dn_route.h
index 81712cfa1ddf..c507e05d172f 100644
--- a/include/net/dn_route.h
+++ b/include/net/dn_route.h
@@ -76,8 +76,8 @@ struct dn_route {
         __le16 rt_src_map;
         __le16 rt_dst_map;
 
-        unsigned rt_flags;
-        unsigned rt_type;
+        unsigned int rt_flags;
+        unsigned int rt_type;
 };
 
 static inline bool dn_is_input_route(struct dn_route *rt)
diff --git a/include/net/dst.h b/include/net/dst.h
index bed833d9796a..8197eadca819 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -60,6 +60,7 @@ struct dst_entry {
 #define DST_NOCOUNT             0x0020
 #define DST_NOPEER              0x0040
 #define DST_FAKE_RTABLE         0x0080
+#define DST_XFRM_TUNNEL         0x0100
 
         short                   error;
         short                   obsolete;
diff --git a/include/net/dst_ops.h b/include/net/dst_ops.h
index e1c2ee0eef47..3682a0a076c1 100644
--- a/include/net/dst_ops.h
+++ b/include/net/dst_ops.h
@@ -12,7 +12,7 @@ struct sk_buff;
 struct dst_ops {
         unsigned short          family;
         __be16                  protocol;
-        unsigned                gc_thresh;
+        unsigned int            gc_thresh;
 
         int                     (*gc)(struct dst_ops *ops);
         struct dst_entry *      (*check)(struct dst_entry *, __u32 cookie);
diff --git a/include/net/icmp.h b/include/net/icmp.h
index 75d615649071..9ac2524d1402 100644
--- a/include/net/icmp.h
+++ b/include/net/icmp.h
@@ -25,7 +25,7 @@
 
 struct icmp_err {
   int           errno;
-  unsigned      fatal:1;
+  unsigned int  fatal:1;
 };
 
 extern const struct icmp_err icmp_err_convert[];
@@ -41,7 +41,6 @@ struct net;
 
 extern void     icmp_send(struct sk_buff *skb_in,  int type, int code, __be32 info);
 extern int      icmp_rcv(struct sk_buff *skb);
-extern int      icmp_ioctl(struct sock *sk, int cmd, unsigned long arg);
 extern int      icmp_init(void);
 extern void     icmp_out_count(struct net *net, unsigned char type);
 
diff --git a/include/net/ieee802154_netdev.h b/include/net/ieee802154_netdev.h
index 57430555487a..d104c882fc29 100644
--- a/include/net/ieee802154_netdev.h
+++ b/include/net/ieee802154_netdev.h
@@ -1,7 +1,7 @@
 /*
  * An interface between IEEE802.15.4 device and rest of the kernel.
  *
- * Copyright (C) 2007, 2008, 2009 Siemens AG
+ * Copyright (C) 2007-2012 Siemens AG
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
@@ -21,11 +21,14 @@
  * Maxim Gorbachyov <maxim.gorbachev@siemens.com>
  * Maxim Osipov <maxim.osipov@siemens.com>
  * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+ * Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
  */
 
 #ifndef IEEE802154_NETDEVICE_H
 #define IEEE802154_NETDEVICE_H
 
+#include <net/af_ieee802154.h>
+
 /*
  * A control block of skb passed between the ARPHRD_IEEE802154 device
  * and other stack parts.
@@ -110,12 +113,26 @@ struct ieee802154_mlme_ops {
         u8 (*get_bsn)(const struct net_device *dev);
 };
 
-static inline struct ieee802154_mlme_ops *ieee802154_mlme_ops(
-                const struct net_device *dev)
+/* The IEEE 802.15.4 standard defines 2 type of the devices:
+ * - FFD - full functionality device
+ * - RFD - reduce functionality device
+ *
+ * So 2 sets of mlme operations are needed
+ */
+struct ieee802154_reduced_mlme_ops {
+        struct wpan_phy *(*get_phy)(const struct net_device *dev);
+};
+
+static inline struct ieee802154_mlme_ops *
+ieee802154_mlme_ops(const struct net_device *dev)
 {
         return dev->ml_priv;
 }
 
-#endif
-
+static inline struct ieee802154_reduced_mlme_ops *
+ieee802154_reduced_mlme_ops(const struct net_device *dev)
+{
+        return dev->ml_priv;
+}
 
+#endif
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index 51a7031b4aa3..93563221d29a 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -120,7 +120,7 @@ struct ifmcaddr6 {
         unsigned char           mca_crcount;
         unsigned long           mca_sfcount[2];
         struct timer_list       mca_timer;
-        unsigned                mca_flags;
+        unsigned int            mca_flags;
         int                     mca_users;
         atomic_t                mca_refcnt;
         spinlock_t              mca_lock;
@@ -209,60 +209,6 @@ static inline void ipv6_eth_mc_map(const struct in6_addr *addr, char *buf)
         memcpy(buf + 2, &addr->s6_addr32[3], sizeof(__u32));
 }
 
-static inline void ipv6_tr_mc_map(const struct in6_addr *addr, char *buf)
-{
-        /* All nodes FF01::1, FF02::1, FF02::1:FFxx:xxxx */
-
-        if (((addr->s6_addr[0] == 0xFF) &&
-            ((addr->s6_addr[1] == 0x01) || (addr->s6_addr[1] == 0x02)) &&
-             (addr->s6_addr16[1] == 0) &&
-             (addr->s6_addr32[1] == 0) &&
-             (addr->s6_addr32[2] == 0) &&
-             (addr->s6_addr16[6] == 0) &&
-             (addr->s6_addr[15] == 1)) ||
-            ((addr->s6_addr[0] == 0xFF) &&
-             (addr->s6_addr[1] == 0x02) &&
-             (addr->s6_addr16[1] == 0) &&
-             (addr->s6_addr32[1] == 0) &&
-             (addr->s6_addr16[4] == 0) &&
-             (addr->s6_addr[10] == 0) &&
-             (addr->s6_addr[11] == 1) &&
-             (addr->s6_addr[12] == 0xff)))
-        {
-                buf[0]=0xC0;
-                buf[1]=0x00;
-                buf[2]=0x01;
-                buf[3]=0x00;
-                buf[4]=0x00;
-                buf[5]=0x00;
-        /* All routers FF0x::2 */
-        } else if ((addr->s6_addr[0] ==0xff) &&
-                ((addr->s6_addr[1] & 0xF0) == 0) &&
-                (addr->s6_addr16[1] == 0) &&
-                (addr->s6_addr32[1] == 0) &&
-                (addr->s6_addr32[2] == 0) &&
-                (addr->s6_addr16[6] == 0) &&
-                (addr->s6_addr[15] == 2))
-        {
-                buf[0]=0xC0;
-                buf[1]=0x00;
-                buf[2]=0x02;
-                buf[3]=0x00;
-                buf[4]=0x00;
-                buf[5]=0x00;
-        } else {
-                unsigned char i ; 
-                
-                i = addr->s6_addr[15] & 7 ; 
-                buf[0]=0xC0;
-                buf[1]=0x00;
-                buf[2]=0x00;
-                buf[3]=0x01 << i ; 
-                buf[4]=0x00;
-                buf[5]=0x00;
-        }
-}
-
 static inline void ipv6_arcnet_mc_map(const struct in6_addr *addr, char *buf)
 {
         buf[0] = 0x00;
diff --git a/include/net/inet6_connection_sock.h b/include/net/inet6_connection_sock.h
index 3207e58ee019..1866a676c810 100644
--- a/include/net/inet6_connection_sock.h
+++ b/include/net/inet6_connection_sock.h
@@ -23,7 +23,7 @@ struct sock;
 struct sockaddr;
 
 extern int inet6_csk_bind_conflict(const struct sock *sk,
-                                   const struct inet_bind_bucket *tb);
+                                   const struct inet_bind_bucket *tb, bool relax);
 
 extern struct dst_entry* inet6_csk_route_req(struct sock *sk,
                                              const struct request_sock *req);
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index dbf9aab34c82..7d83f90f203f 100644
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -45,6 +45,7 @@ struct inet_connection_sock_af_ops {
                                       struct dst_entry *dst);
         struct inet_peer *(*get_peer)(struct sock *sk, bool *release_it);
         u16         net_header_len;
+        u16         net_frag_header_len;
         u16         sockaddr_len;
         int         (*setsockopt)(struct sock *sk, int level, int optname, 
                                   char __user *optval, unsigned int optlen);
@@ -60,7 +61,7 @@ struct inet_connection_sock_af_ops {
 #endif
         void        (*addr2sockaddr)(struct sock *sk, struct sockaddr *);
         int         (*bind_conflict)(const struct sock *sk,
-                                     const struct inet_bind_bucket *tb);
+                                     const struct inet_bind_bucket *tb, bool relax);
 };
 
 /** inet_connection_sock - INET connection oriented sock
@@ -245,7 +246,7 @@ extern struct request_sock *inet_csk_search_req(const struct sock *sk,
                                                 const __be32 raddr,
                                                 const __be32 laddr);
 extern int inet_csk_bind_conflict(const struct sock *sk,
-                                  const struct inet_bind_bucket *tb);
+                                  const struct inet_bind_bucket *tb, bool relax);
 extern int inet_csk_get_port(struct sock *sk, unsigned short snum);
 
 extern struct dst_entry* inet_csk_route_req(struct sock *sk,
diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
index 16ff29a7bb30..2431cf83aeca 100644
--- a/include/net/inet_frag.h
+++ b/include/net/inet_frag.h
@@ -46,8 +46,7 @@ struct inet_frags {
                                                 void *arg);
         void                    (*destructor)(struct inet_frag_queue *);
         void                    (*skb_free)(struct sk_buff *);
-        int                     (*match)(struct inet_frag_queue *q,
-                                                void *arg);
+        bool                    (*match)(struct inet_frag_queue *q, void *arg);
         void                    (*frag_expire)(unsigned long data);
 };
 
diff --git a/include/net/ip.h b/include/net/ip.h
index b53d65f24f7b..83e0619f59d0 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -141,23 +141,6 @@ static inline struct sk_buff *ip_finish_skb(struct sock *sk, struct flowi4 *fl4)
 extern int              ip4_datagram_connect(struct sock *sk, 
                                              struct sockaddr *uaddr, int addr_len);
 
-/*
- *      Map a multicast IP onto multicast MAC for type Token Ring.
- *      This conforms to RFC1469 Option 2 Multicasting i.e.
- *      using a functional address to transmit / receive 
- *      multicast packets.
- */
-
-static inline void ip_tr_mc_map(__be32 addr, char *buf)
-{
-        buf[0]=0xC0;
-        buf[1]=0x00;
-        buf[2]=0x00;
-        buf[3]=0x04;
-        buf[4]=0x00;
-        buf[5]=0x00;
-}
-
 struct ip_reply_arg {
         struct kvec iov[1];   
         int         flags;
@@ -222,9 +205,6 @@ static inline int inet_is_reserved_local_port(int port)
 
 extern int sysctl_ip_nonlocal_bind;
 
-extern struct ctl_path net_core_path[];
-extern struct ctl_path net_ipv4_ctl_path[];
-
 /* From inetpeer.c */
 extern int inet_peer_threshold;
 extern int inet_peer_minttl;
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 2ad92ca4e6f3..37c1a1ed82c1 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -146,7 +146,7 @@ struct rt6_rtnl_dump_arg {
 
 extern int rt6_dump_route(struct rt6_info *rt, void *p_arg);
 extern void rt6_ifdown(struct net *net, struct net_device *dev);
-extern void rt6_mtu_change(struct net_device *dev, unsigned mtu);
+extern void rt6_mtu_change(struct net_device *dev, unsigned int mtu);
 extern void rt6_remove_prefsrc(struct inet6_ifaddr *ifp);
 
 
@@ -175,7 +175,7 @@ static inline void ip6_dst_store(struct sock *sk, struct dst_entry *dst,
         spin_unlock(&sk->sk_dst_lock);
 }
 
-static inline int ipv6_unicast_destination(struct sk_buff *skb)
+static inline bool ipv6_unicast_destination(const struct sk_buff *skb)
 {
         struct rt6_info *rt = (struct rt6_info *) skb_dst(skb);
 
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 10422ef14e28..78df0866cc38 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -49,7 +49,7 @@ struct fib_nh {
         struct net_device       *nh_dev;
         struct hlist_node       nh_hash;
         struct fib_info         *nh_parent;
-        unsigned                nh_flags;
+        unsigned int            nh_flags;
         unsigned char           nh_scope;
 #ifdef CONFIG_IP_ROUTE_MULTIPATH
         int                     nh_weight;
@@ -74,7 +74,7 @@ struct fib_info {
         struct net              *fib_net;
         int                     fib_treeref;
         atomic_t                fib_clntref;
-        unsigned                fib_flags;
+        unsigned int            fib_flags;
         unsigned char           fib_dead;
         unsigned char           fib_protocol;
         unsigned char           fib_scope;
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 72522f087375..d6146b4811c2 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -10,7 +10,6 @@
 
 #include <asm/types.h>                  /* for __uXX types */
 
-#include <linux/sysctl.h>               /* for ctl_path */
 #include <linux/list.h>                 /* for struct list_head */
 #include <linux/spinlock.h>             /* for struct rwlock_t */
 #include <linux/atomic.h>                 /* for struct atomic_t */
@@ -505,6 +504,7 @@ struct ip_vs_conn {
                                                  * state transition triggerd
                                                  * synchronization
                                                  */
+        unsigned long           sync_endtime;   /* jiffies + sent_retries */
 
         /* Control members */
         struct ip_vs_conn       *control;       /* Master control connection */
@@ -580,8 +580,8 @@ struct ip_vs_service_user_kern {
         /* virtual service options */
         char                    *sched_name;
         char                    *pe_name;
-        unsigned                flags;          /* virtual service flags */
-        unsigned                timeout;        /* persistent timeout in sec */
+        unsigned int            flags;          /* virtual service flags */
+        unsigned int            timeout;        /* persistent timeout in sec */
         u32                     netmask;        /* persistent netmask */
 };
 
@@ -592,7 +592,7 @@ struct ip_vs_dest_user_kern {
         u16                     port;
 
         /* real server options */
-        unsigned                conn_flags;     /* connection flags */
+        unsigned int            conn_flags;     /* connection flags */
         int                     weight;         /* destination weight */
 
         /* thresholds for active connections */
@@ -616,8 +616,8 @@ struct ip_vs_service {
         union nf_inet_addr      addr;     /* IP address for virtual service */
         __be16                  port;     /* port number for the service */
         __u32                   fwmark;   /* firewall mark of the service */
-        unsigned                flags;    /* service status flags */
-        unsigned                timeout;  /* persistent timeout in ticks */
+        unsigned int            flags;    /* service status flags */
+        unsigned int            timeout;  /* persistent timeout in ticks */
         __be32                  netmask;  /* grouping granularity */
         struct net              *net;
 
@@ -647,7 +647,7 @@ struct ip_vs_dest {
         u16                     af;             /* address family */
         __be16                  port;           /* port number of the server */
         union nf_inet_addr      addr;           /* IP address of the server */
-        volatile unsigned       flags;          /* dest status flags */
+        volatile unsigned int   flags;          /* dest status flags */
         atomic_t                conn_flags;     /* flags to copy to conn */
         atomic_t                weight;         /* server weight */
 
@@ -784,6 +784,16 @@ struct ip_vs_app {
         void (*timeout_change)(struct ip_vs_app *app, int flags);
 };
 
+struct ipvs_master_sync_state {
+        struct list_head        sync_queue;
+        struct ip_vs_sync_buff  *sync_buff;
+        int                     sync_queue_len;
+        unsigned int            sync_queue_delay;
+        struct task_struct      *master_thread;
+        struct delayed_work     master_wakeup_work;
+        struct netns_ipvs       *ipvs;
+};
+
 /* IPVS in network namespace */
 struct netns_ipvs {
         int                     gen;            /* Generation */
@@ -870,10 +880,15 @@ struct netns_ipvs {
 #endif
         int                     sysctl_snat_reroute;
         int                     sysctl_sync_ver;
+        int                     sysctl_sync_ports;
+        int                     sysctl_sync_qlen_max;
+        int                     sysctl_sync_sock_size;
         int                     sysctl_cache_bypass;
         int                     sysctl_expire_nodest_conn;
         int                     sysctl_expire_quiescent_template;
         int                     sysctl_sync_threshold[2];
+        unsigned int            sysctl_sync_refresh_period;
+        int                     sysctl_sync_retries;
         int                     sysctl_nat_icmp_send;
 
         /* ip_vs_lblc */
@@ -889,13 +904,11 @@ struct netns_ipvs {
         spinlock_t              est_lock;
         struct timer_list       est_timer;      /* Estimation timer */
         /* ip_vs_sync */
-        struct list_head        sync_queue;
         spinlock_t              sync_lock;
-        struct ip_vs_sync_buff  *sync_buff;
+        struct ipvs_master_sync_state *ms;
         spinlock_t              sync_buff_lock;
-        struct sockaddr_in      sync_mcast_addr;
-        struct task_struct      *master_thread;
-        struct task_struct      *backup_thread;
+        struct task_struct      **backup_threads;
+        int                     threads_mask;
         int                     send_mesg_maxlen;
         int                     recv_mesg_maxlen;
         volatile int            sync_state;
@@ -912,6 +925,14 @@ struct netns_ipvs {
 #define DEFAULT_SYNC_THRESHOLD  3
 #define DEFAULT_SYNC_PERIOD     50
 #define DEFAULT_SYNC_VER        1
+#define DEFAULT_SYNC_REFRESH_PERIOD     (0U * HZ)
+#define DEFAULT_SYNC_RETRIES            0
+#define IPVS_SYNC_WAKEUP_RATE   8
+#define IPVS_SYNC_QLEN_MAX      (IPVS_SYNC_WAKEUP_RATE * 4)
+#define IPVS_SYNC_SEND_DELAY    (HZ / 50)
+#define IPVS_SYNC_CHECK_PERIOD  HZ
+#define IPVS_SYNC_FLUSH_TIME    (HZ * 2)
+#define IPVS_SYNC_PORTS_MAX     (1 << 6)
 
 #ifdef CONFIG_SYSCTL
 
@@ -922,7 +943,17 @@ static inline int sysctl_sync_threshold(struct netns_ipvs *ipvs)
 
 static inline int sysctl_sync_period(struct netns_ipvs *ipvs)
 {
-        return ipvs->sysctl_sync_threshold[1];
+        return ACCESS_ONCE(ipvs->sysctl_sync_threshold[1]);
+}
+
+static inline unsigned int sysctl_sync_refresh_period(struct netns_ipvs *ipvs)
+{
+        return ACCESS_ONCE(ipvs->sysctl_sync_refresh_period);
+}
+
+static inline int sysctl_sync_retries(struct netns_ipvs *ipvs)
+{
+        return ipvs->sysctl_sync_retries;
 }
 
 static inline int sysctl_sync_ver(struct netns_ipvs *ipvs)
@@ -930,6 +961,21 @@ static inline int sysctl_sync_ver(struct netns_ipvs *ipvs)
         return ipvs->sysctl_sync_ver;
 }
 
+static inline int sysctl_sync_ports(struct netns_ipvs *ipvs)
+{
+        return ACCESS_ONCE(ipvs->sysctl_sync_ports);
+}
+
+static inline int sysctl_sync_qlen_max(struct netns_ipvs *ipvs)
+{
+        return ipvs->sysctl_sync_qlen_max;
+}
+
+static inline int sysctl_sync_sock_size(struct netns_ipvs *ipvs)
+{
+        return ipvs->sysctl_sync_sock_size;
+}
+
 #else
 
 static inline int sysctl_sync_threshold(struct netns_ipvs *ipvs)
@@ -942,18 +988,43 @@ static inline int sysctl_sync_period(struct netns_ipvs *ipvs)
         return DEFAULT_SYNC_PERIOD;
 }
 
+static inline unsigned int sysctl_sync_refresh_period(struct netns_ipvs *ipvs)
+{
+        return DEFAULT_SYNC_REFRESH_PERIOD;
+}
+
+static inline int sysctl_sync_retries(struct netns_ipvs *ipvs)
+{
+        return DEFAULT_SYNC_RETRIES & 3;
+}
+
 static inline int sysctl_sync_ver(struct netns_ipvs *ipvs)
 {
         return DEFAULT_SYNC_VER;
 }
 
+static inline int sysctl_sync_ports(struct netns_ipvs *ipvs)
+{
+        return 1;
+}
+
+static inline int sysctl_sync_qlen_max(struct netns_ipvs *ipvs)
+{
+        return IPVS_SYNC_QLEN_MAX;
+}
+
+static inline int sysctl_sync_sock_size(struct netns_ipvs *ipvs)
+{
+        return 0;
+}
+
 #endif
 
 /*
  *      IPVS core functions
  *      (from ip_vs_core.c)
  */
-extern const char *ip_vs_proto_name(unsigned proto);
+extern const char *ip_vs_proto_name(unsigned int proto);
 extern void ip_vs_init_hash_table(struct list_head *table, int rows);
 #define IP_VS_INIT_HASH_TABLE(t) ip_vs_init_hash_table((t), ARRAY_SIZE((t)))
 
@@ -1014,7 +1085,7 @@ extern void ip_vs_conn_fill_cport(struct ip_vs_conn *cp, __be16 cport);
 
 struct ip_vs_conn *ip_vs_conn_new(const struct ip_vs_conn_param *p,
                                   const union nf_inet_addr *daddr,
-                                  __be16 dport, unsigned flags,
+                                  __be16 dport, unsigned int flags,
                                   struct ip_vs_dest *dest, __u32 fwmark);
 extern void ip_vs_conn_expire_now(struct ip_vs_conn *cp);
 
@@ -1184,10 +1255,8 @@ extern void ip_vs_scheduler_err(struct ip_vs_service *svc, const char *msg);
  *      IPVS control data and functions (from ip_vs_ctl.c)
  */
 extern struct ip_vs_stats ip_vs_stats;
-extern const struct ctl_path net_vs_ctl_path[];
 extern int sysctl_ip_vs_sync_ver;
 
-extern void ip_vs_sync_switch_mode(struct net *net, int mode);
 extern struct ip_vs_service *
 ip_vs_service_get(struct net *net, int af, __u32 fwmark, __u16 protocol,
                   const union nf_inet_addr *vaddr, __be16 vport);
@@ -1221,7 +1290,7 @@ extern struct ip_vs_dest *ip_vs_try_bind_dest(struct ip_vs_conn *cp);
 extern int start_sync_thread(struct net *net, int state, char *mcast_ifn,
                              __u8 syncid);
 extern int stop_sync_thread(struct net *net, int state);
-extern void ip_vs_sync_conn(struct net *net, struct ip_vs_conn *cp);
+extern void ip_vs_sync_conn(struct net *net, struct ip_vs_conn *cp, int pkts);
 
 
 /*
diff --git a/include/net/ipip.h b/include/net/ipip.h
index a32654d52730..a93cf6d7e94b 100644
--- a/include/net/ipip.h
+++ b/include/net/ipip.h
@@ -54,8 +54,10 @@ struct ip_tunnel_prl_entry {
                                                                         \
         err = ip_local_out(skb);                                        \
         if (likely(net_xmit_eval(err) == 0)) {                          \
+                u64_stats_update_begin(&(stats1)->syncp);               \
                 (stats1)->tx_bytes += pkt_len;                          \
                 (stats1)->tx_packets++;                                 \
+                u64_stats_update_end(&(stats1)->syncp);                 \
         } else {                                                        \
                 (stats2)->tx_errors++;                                  \
                 (stats2)->tx_aborted_errors++;                          \
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index e4170a22fc6f..aecf88436abf 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -113,7 +113,6 @@ struct frag_hdr {
 
 /* sysctls */
 extern int sysctl_mld_max_msf;
-extern struct ctl_path net_ipv6_ctl_path[];
 
 #define _DEVINC(net, statname, modifier, idev, field)                   \
 ({                                                                      \
@@ -264,7 +263,7 @@ extern struct ipv6_txoptions *	ipv6_renew_options(struct sock *sk, struct ipv6_t
 struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space,
                                           struct ipv6_txoptions *opt);
 
-extern int ipv6_opt_accepted(struct sock *sk, struct sk_buff *skb);
+extern bool ipv6_opt_accepted(const struct sock *sk, const struct sk_buff *skb);
 
 int ip6_frag_nqueues(struct net *net);
 int ip6_frag_mem(struct net *net);
@@ -333,8 +332,8 @@ static inline void ipv6_addr_set(struct in6_addr *addr,
         addr->s6_addr32[3] = w4;
 }
 
-static inline int ipv6_addr_equal(const struct in6_addr *a1,
-                                  const struct in6_addr *a2)
+static inline bool ipv6_addr_equal(const struct in6_addr *a1,
+                                   const struct in6_addr *a2)
 {
         return ((a1->s6_addr32[0] ^ a2->s6_addr32[0]) |
                 (a1->s6_addr32[1] ^ a2->s6_addr32[1]) |
@@ -342,27 +341,27 @@ static inline int ipv6_addr_equal(const struct in6_addr *a1,
                 (a1->s6_addr32[3] ^ a2->s6_addr32[3])) == 0;
 }
 
-static inline int __ipv6_prefix_equal(const __be32 *a1, const __be32 *a2,
-                                      unsigned int prefixlen)
+static inline bool __ipv6_prefix_equal(const __be32 *a1, const __be32 *a2,
+                                       unsigned int prefixlen)
 {
-        unsigned pdw, pbi;
+        unsigned int pdw, pbi;
 
         /* check complete u32 in prefix */
         pdw = prefixlen >> 5;
         if (pdw && memcmp(a1, a2, pdw << 2))
-                return 0;
+                return false;
 
         /* check incomplete u32 in prefix */
         pbi = prefixlen & 0x1f;
         if (pbi && ((a1[pdw] ^ a2[pdw]) & htonl((0xffffffff) << (32 - pbi))))
-                return 0;
+                return false;
 
-        return 1;
+        return true;
 }
 
-static inline int ipv6_prefix_equal(const struct in6_addr *a1,
-                                    const struct in6_addr *a2,
-                                    unsigned int prefixlen)
+static inline bool ipv6_prefix_equal(const struct in6_addr *a1,
+                                     const struct in6_addr *a2,
+                                     unsigned int prefixlen)
 {
         return __ipv6_prefix_equal(a1->s6_addr32, a2->s6_addr32,
                                    prefixlen);
@@ -388,21 +387,21 @@ struct ip6_create_arg {
 };
 
 void ip6_frag_init(struct inet_frag_queue *q, void *a);
-int ip6_frag_match(struct inet_frag_queue *q, void *a);
+bool ip6_frag_match(struct inet_frag_queue *q, void *a);
 
-static inline int ipv6_addr_any(const struct in6_addr *a)
+static inline bool ipv6_addr_any(const struct in6_addr *a)
 {
         return (a->s6_addr32[0] | a->s6_addr32[1] |
                 a->s6_addr32[2] | a->s6_addr32[3]) == 0;
 }
 
-static inline int ipv6_addr_loopback(const struct in6_addr *a)
+static inline bool ipv6_addr_loopback(const struct in6_addr *a)
 {
         return (a->s6_addr32[0] | a->s6_addr32[1] |
                 a->s6_addr32[2] | (a->s6_addr32[3] ^ htonl(1))) == 0;
 }
 
-static inline int ipv6_addr_v4mapped(const struct in6_addr *a)
+static inline bool ipv6_addr_v4mapped(const struct in6_addr *a)
 {
         return (a->s6_addr32[0] | a->s6_addr32[1] |
                  (a->s6_addr32[2] ^ htonl(0x0000ffff))) == 0;
@@ -412,7 +411,7 @@ static inline int ipv6_addr_v4mapped(const struct in6_addr *a)
  * Check for a RFC 4843 ORCHID address
  * (Overlay Routable Cryptographic Hash Identifiers)
  */
-static inline int ipv6_addr_orchid(const struct in6_addr *a)
+static inline bool ipv6_addr_orchid(const struct in6_addr *a)
 {
         return (a->s6_addr32[0] & htonl(0xfffffff0)) == htonl(0x20010010);
 }
@@ -560,7 +559,7 @@ extern void			ipv6_push_frag_opts(struct sk_buff *skb,
 extern int                      ipv6_skip_exthdr(const struct sk_buff *, int start,
                                                  u8 *nexthdrp, __be16 *frag_offp);
 
-extern int                      ipv6_ext_hdr(u8 nexthdr);
+extern bool                     ipv6_ext_hdr(u8 nexthdr);
 
 extern int ipv6_find_tlv(struct sk_buff *skb, int offset, int type);
 
@@ -661,8 +660,6 @@ extern struct ctl_table *ipv6_icmp_sysctl_init(struct net *net);
 extern struct ctl_table *ipv6_route_sysctl_init(struct net *net);
 extern int ipv6_sysctl_register(void);
 extern void ipv6_sysctl_unregister(void);
-extern int ipv6_static_sysctl_register(void);
-extern void ipv6_static_sysctl_unregister(void);
 #endif
 
 #endif /* _NET_IPV6_H */
diff --git a/include/net/lapb.h b/include/net/lapb.h
index fd2bf572ee1d..df892a94f2c6 100644
--- a/include/net/lapb.h
+++ b/include/net/lapb.h
@@ -149,4 +149,10 @@ extern int  lapb_t1timer_running(struct lapb_cb *lapb);
  */
 #define LAPB_DEBUG      0
 
+#define lapb_dbg(level, fmt, ...)                       \
+do {                                                    \
+        if (level < LAPB_DEBUG)                         \
+                pr_debug(fmt, ##__VA_ARGS__);           \
+} while (0)
+
 #endif
diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
index 23a409381fa9..6ca3113df39e 100644
--- a/include/net/llc_c_ev.h
+++ b/include/net/llc_c_ev.h
@@ -264,6 +264,6 @@ extern int llc_conn_ev_qlfy_set_status_rst_done(struct sock *sk,
 static __inline__ int llc_conn_space(struct sock *sk, struct sk_buff *skb)
 {
         return atomic_read(&sk->sk_rmem_alloc) + skb->truesize <
-               (unsigned)sk->sk_rcvbuf;
+               (unsigned int)sk->sk_rcvbuf;
 }
 #endif /* LLC_C_EV_H */
diff --git a/include/net/llc_pdu.h b/include/net/llc_pdu.h
index f57e7d46a453..5a93d13ac95c 100644
--- a/include/net/llc_pdu.h
+++ b/include/net/llc_pdu.h
@@ -13,7 +13,6 @@
  */
 
 #include <linux/if_ether.h>
-#include <linux/if_tr.h>
 
 /* Lengths of frame formats */
 #define LLC_PDU_LEN_I   4       /* header and 2 control bytes */
@@ -253,10 +252,6 @@ static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa)
 {
         if (skb->protocol == htons(ETH_P_802_2))
                 memcpy(sa, eth_hdr(skb)->h_source, ETH_ALEN);
-        else if (skb->protocol == htons(ETH_P_TR_802_2)) {
-                memcpy(sa, tr_hdr(skb)->saddr, ETH_ALEN);
-                *sa &= 0x7F;
-        }
 }
 
 /**
@@ -270,8 +265,6 @@ static inline void llc_pdu_decode_da(struct sk_buff *skb, u8 *da)
 {
         if (skb->protocol == htons(ETH_P_802_2))
                 memcpy(da, eth_hdr(skb)->h_dest, ETH_ALEN);
-        else if (skb->protocol == htons(ETH_P_TR_802_2))
-                memcpy(da, tr_hdr(skb)->daddr, ETH_ALEN);
 }
 
 /**
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 9210bdc7bd8d..1937c7d98304 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -95,9 +95,11 @@ struct device;
  * @IEEE80211_MAX_QUEUES: Maximum number of regular device queues.
  */
 enum ieee80211_max_queues {
-        IEEE80211_MAX_QUEUES =          4,
+        IEEE80211_MAX_QUEUES =          16,
 };
 
+#define IEEE80211_INVAL_HW_QUEUE        0xff
+
 /**
  * enum ieee80211_ac_numbers - AC numbers as used in mac80211
  * @IEEE80211_AC_VO: voice
@@ -244,7 +246,7 @@ enum ieee80211_rssi_event {
  * @channel_type: Channel type for this BSS -- the hardware might be
  *      configured for HT40+ while this BSS only uses no-HT, for
  *      example.
- * @ht_operation_mode: HT operation mode (like in &struct ieee80211_ht_info).
+ * @ht_operation_mode: HT operation mode like in &struct ieee80211_ht_operation.
  *      This field is only valid when the channel type is one of the HT types.
  * @cqm_rssi_thold: Connection quality monitor RSSI threshold, a zero value
  *      implies disabled
@@ -522,7 +524,7 @@ struct ieee80211_tx_rate {
  *
  * @flags: transmit info flags, defined above
  * @band: the band to transmit on (use for checking for races)
- * @antenna_sel_tx: antenna to use, 0 for automatic diversity
+ * @hw_queue: HW queue to put the frame on, skb_get_queue_mapping() gives the AC
  * @ack_frame_id: internal frame ID for TX status, used internally
  * @control: union for control data
  * @status: union for status data
@@ -538,7 +540,7 @@ struct ieee80211_tx_info {
         u32 flags;
         u8 band;
 
-        u8 antenna_sel_tx;
+        u8 hw_queue;
 
         u16 ack_frame_id;
 
@@ -564,7 +566,8 @@ struct ieee80211_tx_info {
                         u8 ampdu_ack_len;
                         int ack_signal;
                         u8 ampdu_len;
-                        /* 15 bytes free */
+                        u8 antenna;
+                        /* 14 bytes free */
                 } status;
                 struct {
                         struct ieee80211_tx_rate driver_rates[
@@ -664,6 +667,9 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
  * @RX_FLAG_SHORT_GI: Short guard interval was used
  * @RX_FLAG_NO_SIGNAL_VAL: The signal strength value is not present.
  *      Valid only for data frames (mainly A-MPDU)
+ * @RX_FLAG_HT_GF: This frame was received in a HT-greenfield transmission, if
+ *      the driver fills this value it should add %IEEE80211_RADIOTAP_MCS_HAVE_FMT
+ *      to hw.radiotap_mcs_details to advertise that fact
  */
 enum mac80211_rx_flags {
         RX_FLAG_MMIC_ERROR      = 1<<0,
@@ -678,6 +684,7 @@ enum mac80211_rx_flags {
         RX_FLAG_40MHZ           = 1<<10,
         RX_FLAG_SHORT_GI        = 1<<11,
         RX_FLAG_NO_SIGNAL_VAL   = 1<<12,
+        RX_FLAG_HT_GF           = 1<<13,
 };
 
 /**
@@ -888,6 +895,8 @@ enum ieee80211_vif_flags {
  *      these need to be set (or cleared) when the interface is added
  *      or, if supported by the driver, the interface type is changed
  *      at runtime, mac80211 will never touch this field
+ * @hw_queue: hardware queue for each AC
+ * @cab_queue: content-after-beacon (DTIM beacon really) queue, AP mode only
  * @drv_priv: data area for driver use, will always be aligned to
  *      sizeof(void *).
  */
@@ -896,7 +905,12 @@ struct ieee80211_vif {
         struct ieee80211_bss_conf bss_conf;
         u8 addr[ETH_ALEN];
         bool p2p;
+
+        u8 cab_queue;
+        u8 hw_queue[IEEE80211_NUM_ACS];
+
         u32 driver_flags;
+
         /* must be last */
         u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
 };
@@ -929,7 +943,7 @@ static inline bool ieee80211_vif_is_mesh(struct ieee80211_vif *vif)
  *      CCMP key if it requires CCMP encryption of management frames (MFP) to
  *      be done in software.
  * @IEEE80211_KEY_FLAG_PUT_IV_SPACE: This flag should be set by the driver
- *      for a CCMP key if space should be prepared for the IV, but the IV
+ *      if space should be prepared for the IV, but the IV
  *      itself should not be generated. Do not set together with
  *      @IEEE80211_KEY_FLAG_GENERATE_IV on the same key.
  */
@@ -1174,6 +1188,15 @@ enum sta_notify_cmd {
  * @IEEE80211_HW_SCAN_WHILE_IDLE: The device can do hw scan while
  *      being idle (i.e. mac80211 doesn't have to go idle-off during the
  *      the scan).
+ *
+ * @IEEE80211_HW_WANT_MONITOR_VIF: The driver would like to be informed of
+ *      a virtual monitor interface when monitor interfaces are the only
+ *      active interfaces.
+ *
+ * @IEEE80211_HW_QUEUE_CONTROL: The driver wants to control per-interface
+ *      queue mapping in order to use different queues (not just one per AC)
+ *      for different virtual interfaces. See the doc section on HW queue
+ *      control for more details.
  */
 enum ieee80211_hw_flags {
         IEEE80211_HW_HAS_RATE_CONTROL                   = 1<<0,
@@ -1190,13 +1213,13 @@ enum ieee80211_hw_flags {
         IEEE80211_HW_PS_NULLFUNC_STACK                  = 1<<11,
         IEEE80211_HW_SUPPORTS_DYNAMIC_PS                = 1<<12,
         IEEE80211_HW_MFP_CAPABLE                        = 1<<13,
-        /* reuse bit 14 */
+        IEEE80211_HW_WANT_MONITOR_VIF                   = 1<<14,
         IEEE80211_HW_SUPPORTS_STATIC_SMPS               = 1<<15,
         IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS              = 1<<16,
         IEEE80211_HW_SUPPORTS_UAPSD                     = 1<<17,
         IEEE80211_HW_REPORTS_TX_ACK_STATUS              = 1<<18,
         IEEE80211_HW_CONNECTION_MONITOR                 = 1<<19,
-        /* reuse bit 20 */
+        IEEE80211_HW_QUEUE_CONTROL                      = 1<<20,
         IEEE80211_HW_SUPPORTS_PER_STA_GTK               = 1<<21,
         IEEE80211_HW_AP_LINK_PS                         = 1<<22,
         IEEE80211_HW_TX_AMPDU_SETUP_IN_HW               = 1<<23,
@@ -1266,6 +1289,14 @@ enum ieee80211_hw_flags {
  * @max_tx_aggregation_subframes: maximum number of subframes in an
  *      aggregate an HT driver will transmit, used by the peer as a
  *      hint to size its reorder buffer.
+ *
+ * @offchannel_tx_hw_queue: HW queue ID to use for offchannel TX
+ *      (if %IEEE80211_HW_QUEUE_CONTROL is set)
+ *
+ * @radiotap_mcs_details: lists which MCS information can the HW
+ *      reports, by default it is set to _MCS, _GI and _BW but doesn't
+ *      include _FMT. Use %IEEE80211_RADIOTAP_MCS_HAVE_* values, only
+ *      adding _BW is supported today.
  */
 struct ieee80211_hw {
         struct ieee80211_conf conf;
@@ -1286,6 +1317,8 @@ struct ieee80211_hw {
         u8 max_rate_tries;
         u8 max_rx_aggregation_subframes;
         u8 max_tx_aggregation_subframes;
+        u8 offchannel_tx_hw_queue;
+        u8 radiotap_mcs_details;
 };
 
 /**
@@ -1694,6 +1727,61 @@ void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb);
  */
 
 /**
+ * DOC: HW queue control
+ *
+ * Before HW queue control was introduced, mac80211 only had a single static
+ * assignment of per-interface AC software queues to hardware queues. This
+ * was problematic for a few reasons:
+ * 1) off-channel transmissions might get stuck behind other frames
+ * 2) multiple virtual interfaces couldn't be handled correctly
+ * 3) after-DTIM frames could get stuck behind other frames
+ *
+ * To solve this, hardware typically uses multiple different queues for all
+ * the different usages, and this needs to be propagated into mac80211 so it
+ * won't have the same problem with the software queues.
+ *
+ * Therefore, mac80211 now offers the %IEEE80211_HW_QUEUE_CONTROL capability
+ * flag that tells it that the driver implements its own queue control. To do
+ * so, the driver will set up the various queues in each &struct ieee80211_vif
+ * and the offchannel queue in &struct ieee80211_hw. In response, mac80211 will
+ * use those queue IDs in the hw_queue field of &struct ieee80211_tx_info and
+ * if necessary will queue the frame on the right software queue that mirrors
+ * the hardware queue.
+ * Additionally, the driver has to then use these HW queue IDs for the queue
+ * management functions (ieee80211_stop_queue() et al.)
+ *
+ * The driver is free to set up the queue mappings as needed, multiple virtual
+ * interfaces may map to the same hardware queues if needed. The setup has to
+ * happen during add_interface or change_interface callbacks. For example, a
+ * driver supporting station+station and station+AP modes might decide to have
+ * 10 hardware queues to handle different scenarios:
+ *
+ * 4 AC HW queues for 1st vif: 0, 1, 2, 3
+ * 4 AC HW queues for 2nd vif: 4, 5, 6, 7
+ * after-DTIM queue for AP:   8
+ * off-channel queue:         9
+ *
+ * It would then set up the hardware like this:
+ *   hw.offchannel_tx_hw_queue = 9
+ *
+ * and the first virtual interface that is added as follows:
+ *   vif.hw_queue[IEEE80211_AC_VO] = 0
+ *   vif.hw_queue[IEEE80211_AC_VI] = 1
+ *   vif.hw_queue[IEEE80211_AC_BE] = 2
+ *   vif.hw_queue[IEEE80211_AC_BK] = 3
+ *   vif.cab_queue = 8 // if AP mode, otherwise %IEEE80211_INVAL_HW_QUEUE
+ * and the second virtual interface with 4-7.
+ *
+ * If queue 6 gets full, for example, mac80211 would only stop the second
+ * virtual interface's BE queue since virtual interface queues are per AC.
+ *
+ * Note that the vif.cab_queue value should be set to %IEEE80211_INVAL_HW_QUEUE
+ * whenever the queue is not used (i.e. the interface is not in AP mode) if the
+ * queue could potentially be shared since mac80211 will look at cab_queue when
+ * a queue is stopped/woken even if the interface is not in AP mode.
+ */
+
+/**
  * enum ieee80211_filter_flags - hardware filter flags
  *
  * These flags determine what the filter in hardware should be
@@ -1780,6 +1868,18 @@ enum ieee80211_frame_release_type {
 };
 
 /**
+ * enum ieee80211_rate_control_changed - flags to indicate what changed
+ *
+ * @IEEE80211_RC_BW_CHANGED: The bandwidth that can be used to transmit
+ *      to this station changed.
+ * @IEEE80211_RC_SMPS_CHANGED: The SMPS state of the station changed.
+ */
+enum ieee80211_rate_control_changed {
+        IEEE80211_RC_BW_CHANGED         = BIT(0),
+        IEEE80211_RC_SMPS_CHANGED       = BIT(1),
+};
+
+/**
  * struct ieee80211_ops - callbacks from mac80211 to the driver
  *
  * This structure contains various callbacks that the driver may
@@ -1980,6 +2080,14 @@ enum ieee80211_frame_release_type {
  *      up the list of states.
  *      The callback can sleep.
  *
+ * @sta_rc_update: Notifies the driver of changes to the bitrates that can be
+ *      used to transmit to the station. The changes are advertised with bits
+ *      from &enum ieee80211_rate_control_changed and the values are reflected
+ *      in the station data. This callback should only be used when the driver
+ *      uses hardware rate control (%IEEE80211_HW_HAS_RATE_CONTROL) since
+ *      otherwise the rate control algorithm is notified directly.
+ *      Must be atomic.
+ *
  * @conf_tx: Configure TX queue parameters (EDCF (aifs, cw_min, cw_max),
  *      bursting) for a hardware TX queue.
  *      Returns a negative error code on failure.
@@ -2125,6 +2233,14 @@ enum ieee80211_frame_release_type {
  *      The @tids parameter is a bitmap and tells the driver which TIDs the
  *      frames will be on; it will at most have two bits set.
  *      This callback must be atomic.
+ *
+ * @get_et_sset_count:  Ethtool API to get string-set count.
+ *
+ * @get_et_stats:  Ethtool API to get a set of u64 stats.
+ *
+ * @get_et_strings:  Ethtool API to get a set of strings to describe stats
+ *      and perhaps other supported types of ethtool data-sets.
+ *
  */
 struct ieee80211_ops {
         void (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb);
@@ -2135,6 +2251,7 @@ struct ieee80211_ops {
 #ifdef CONFIG_PM
         int (*suspend)(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan);
         int (*resume)(struct ieee80211_hw *hw);
+        void (*set_wakeup)(struct ieee80211_hw *hw, bool enabled);
 #endif
         int (*add_interface)(struct ieee80211_hw *hw,
                              struct ieee80211_vif *vif);
@@ -2196,8 +2313,12 @@ struct ieee80211_ops {
                          struct ieee80211_sta *sta,
                          enum ieee80211_sta_state old_state,
                          enum ieee80211_sta_state new_state);
+        void (*sta_rc_update)(struct ieee80211_hw *hw,
+                              struct ieee80211_vif *vif,
+                              struct ieee80211_sta *sta,
+                              u32 changed);
         int (*conf_tx)(struct ieee80211_hw *hw,
-                       struct ieee80211_vif *vif, u16 queue,
+                       struct ieee80211_vif *vif, u16 ac,
                        const struct ieee80211_tx_queue_params *params);
         u64 (*get_tsf)(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
         void (*set_tsf)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
@@ -2250,6 +2371,15 @@ struct ieee80211_ops {
                                         u16 tids, int num_frames,
                                         enum ieee80211_frame_release_type reason,
                                         bool more_data);
+
+        int     (*get_et_sset_count)(struct ieee80211_hw *hw,
+                                     struct ieee80211_vif *vif, int sset);
+        void    (*get_et_stats)(struct ieee80211_hw *hw,
+                                struct ieee80211_vif *vif,
+                                struct ethtool_stats *stats, u64 *data);
+        void    (*get_et_strings)(struct ieee80211_hw *hw,
+                                  struct ieee80211_vif *vif,
+                                  u32 sset, u8 *data);
 };
 
 /**
@@ -2844,6 +2974,7 @@ __le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw,
  */
 __le16 ieee80211_generic_frame_duration(struct ieee80211_hw *hw,
                                         struct ieee80211_vif *vif,
+                                        enum ieee80211_band band,
                                         size_t frame_len,
                                         struct ieee80211_rate *rate);
 
@@ -3512,19 +3643,6 @@ void ieee80211_send_bar(struct ieee80211_vif *vif, u8 *ra, u16 tid, u16 ssn);
 /* Rate control API */
 
 /**
- * enum rate_control_changed - flags to indicate which parameter changed
- *
- * @IEEE80211_RC_HT_CHANGED: The HT parameters of the operating channel have
- *      changed, rate control algorithm can update its internal state if needed.
- * @IEEE80211_RC_SMPS_CHANGED: The SMPS state of the station changed, the rate
- *      control algorithm needs to adjust accordingly.
- */
-enum rate_control_changed {
-        IEEE80211_RC_HT_CHANGED         = BIT(0),
-        IEEE80211_RC_SMPS_CHANGED       = BIT(1),
-};
-
-/**
  * struct ieee80211_tx_rate_control - rate control information for/from RC algo
  *
  * @hw: The hardware the algorithm is invoked for.
@@ -3569,9 +3687,8 @@ struct rate_control_ops {
         void (*rate_init)(void *priv, struct ieee80211_supported_band *sband,
                           struct ieee80211_sta *sta, void *priv_sta);
         void (*rate_update)(void *priv, struct ieee80211_supported_band *sband,
-                            struct ieee80211_sta *sta,
-                            void *priv_sta, u32 changed,
-                            enum nl80211_channel_type oper_chan_type);
+                            struct ieee80211_sta *sta, void *priv_sta,
+                            u32 changed);
         void (*free_sta)(void *priv, struct ieee80211_sta *sta,
                          void *priv_sta);
 
@@ -3706,8 +3823,20 @@ void ieee80211_enable_rssi_reports(struct ieee80211_vif *vif,
 
 void ieee80211_disable_rssi_reports(struct ieee80211_vif *vif);
 
-int ieee80211_add_srates_ie(struct ieee80211_vif *vif, struct sk_buff *skb);
+int ieee80211_add_srates_ie(struct ieee80211_vif *vif,
+                            struct sk_buff *skb, bool need_basic);
 
 int ieee80211_add_ext_srates_ie(struct ieee80211_vif *vif,
-                                struct sk_buff *skb);
+                                struct sk_buff *skb, bool need_basic);
+
+/**
+ * ieee80211_ave_rssi - report the average rssi for the specified interface
+ *
+ * @vif: the specified virtual interface
+ *
+ * This function return the average rssi value for the requested interface.
+ * It assumes that the given vif is valid.
+ */
+int ieee80211_ave_rssi(struct ieee80211_vif *vif);
+
 #endif /* MAC80211_H */
diff --git a/include/net/mac802154.h b/include/net/mac802154.h
new file mode 100644
index 000000000000..c9f8ab5cc687
--- /dev/null
+++ b/include/net/mac802154.h
@@ -0,0 +1,136 @@
+/*
+ * IEEE802.15.4-2003 specification
+ *
+ * Copyright (C) 2007-2012 Siemens AG
+ *
+ * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef NET_MAC802154_H
+#define NET_MAC802154_H
+
+#include <net/af_ieee802154.h>
+
+/* The following flags are used to indicate changed address settings from
+ * the stack to the hardware.
+ */
+
+/* indicates that the Short Address changed */
+#define IEEE802515_AFILT_SADDR_CHANGED          0x00000001
+/* indicates that the IEEE Address changed */
+#define IEEE802515_AFILT_IEEEADDR_CHANGED       0x00000002
+/* indicates that the PAN ID changed */
+#define IEEE802515_AFILT_PANID_CHANGED          0x00000004
+/* indicates that PAN Coordinator status changed */
+#define IEEE802515_AFILT_PANC_CHANGED           0x00000008
+
+struct ieee802154_hw_addr_filt {
+        __le16  pan_id;         /* Each independent PAN selects a unique
+                                 * identifier. This PAN id allows communication
+                                 * between devices within a network using short
+                                 * addresses and enables transmissions between
+                                 * devices across independent networks.
+                                 */
+        __le16  short_addr;
+        u8      ieee_addr[IEEE802154_ADDR_LEN];
+        u8      pan_coord;
+};
+
+struct ieee802154_dev {
+        /* filled by the driver */
+        int     extra_tx_headroom;
+        u32     flags;
+        struct  device *parent;
+
+        /* filled by mac802154 core */
+        struct  ieee802154_hw_addr_filt hw_filt;
+        void    *priv;
+        struct  wpan_phy *phy;
+};
+
+/* Checksum is in hardware and is omitted from a packet
+ *
+ * These following flags are used to indicate hardware capabilities to
+ * the stack. Generally, flags here should have their meaning
+ * done in a way that the simplest hardware doesn't need setting
+ * any particular flags. There are some exceptions to this rule,
+ * however, so you are advised to review these flags carefully.
+ */
+
+/* Indicates that receiver omits FCS and xmitter will add FCS on it's own. */
+#define IEEE802154_HW_OMIT_CKSUM        0x00000001
+/* Indicates that receiver will autorespond with ACK frames. */
+#define IEEE802154_HW_AACK              0x00000002
+
+/* struct ieee802154_ops - callbacks from mac802154 to the driver
+ *
+ * This structure contains various callbacks that the driver may
+ * handle or, in some cases, must handle, for example to transmit
+ * a frame.
+ *
+ * start: Handler that 802.15.4 module calls for device initialization.
+ *        This function is called before the first interface is attached.
+ *
+ * stop:  Handler that 802.15.4 module calls for device cleanup.
+ *        This function is called after the last interface is removed.
+ *
+ * xmit:  Handler that 802.15.4 module calls for each transmitted frame.
+ *        skb cntains the buffer starting from the IEEE 802.15.4 header.
+ *        The low-level driver should send the frame based on available
+ *        configuration.
+ *        This function should return zero or negative errno. Called with
+ *        pib_lock held.
+ *
+ * ed:    Handler that 802.15.4 module calls for Energy Detection.
+ *        This function should place the value for detected energy
+ *        (usually device-dependant) in the level pointer and return
+ *        either zero or negative errno. Called with pib_lock held.
+ *
+ * set_channel:
+ *        Set radio for listening on specific channel.
+ *        Set the device for listening on specified channel.
+ *        Returns either zero, or negative errno. Called with pib_lock held.
+ *
+ * set_hw_addr_filt:
+ *        Set radio for listening on specific address.
+ *        Set the device for listening on specified address.
+ *        Returns either zero, or negative errno.
+ */
+struct ieee802154_ops {
+        struct module   *owner;
+        int             (*start)(struct ieee802154_dev *dev);
+        void            (*stop)(struct ieee802154_dev *dev);
+        int             (*xmit)(struct ieee802154_dev *dev,
+                                struct sk_buff *skb);
+        int             (*ed)(struct ieee802154_dev *dev, u8 *level);
+        int             (*set_channel)(struct ieee802154_dev *dev,
+                                       int page,
+                                       int channel);
+        int             (*set_hw_addr_filt)(struct ieee802154_dev *dev,
+                                          struct ieee802154_hw_addr_filt *filt,
+                                            unsigned long changed);
+        int             (*ieee_addr)(struct ieee802154_dev *dev,
+                                     u8 addr[IEEE802154_ADDR_LEN]);
+};
+
+/* Basic interface to register ieee802154 device */
+struct ieee802154_dev *
+ieee802154_alloc_device(size_t priv_data_lex, struct ieee802154_ops *ops);
+void ieee802154_free_device(struct ieee802154_dev *dev);
+int ieee802154_register_device(struct ieee802154_dev *dev);
+void ieee802154_unregister_device(struct ieee802154_dev *dev);
+
+void ieee802154_rx_irqsafe(struct ieee802154_dev *dev, struct sk_buff *skb,
+                           u8 lqi);
+
+#endif /* NET_MAC802154_H */
diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index 6f9c25a76cd1..c02b6ad3f6c5 100644
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -34,6 +34,7 @@ enum {
         __ND_OPT_ARRAY_MAX,
         ND_OPT_ROUTE_INFO = 24,         /* RFC4191 */
         ND_OPT_RDNSS = 25,              /* RFC5006 */
+        ND_OPT_DNSSL = 31,              /* RFC6106 */
         __ND_OPT_MAX
 };
 
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 34c996f46181..6cdfeedb650b 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -195,7 +195,6 @@ static inline void *neighbour_priv(const struct neighbour *n)
 #define NEIGH_UPDATE_F_ADMIN                    0x80000000
 
 extern void                     neigh_table_init(struct neigh_table *tbl);
-extern void                     neigh_table_init_no_netlink(struct neigh_table *tbl);
 extern int                      neigh_table_clear(struct neigh_table *tbl);
 extern struct neighbour *       neigh_lookup(struct neigh_table *tbl,
                                              const void *pkey,
@@ -323,7 +322,7 @@ static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
 #ifdef CONFIG_BRIDGE_NETFILTER
 static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb)
 {
-        unsigned seq, hh_alen;
+        unsigned int seq, hh_alen;
 
         do {
                 seq = read_seqbegin(&hh->hh_lock);
@@ -336,7 +335,7 @@ static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb)
 
 static inline int neigh_hh_output(struct hh_cache *hh, struct sk_buff *skb)
 {
-        unsigned seq;
+        unsigned int seq;
         int hh_len;
 
         do {
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index ee547c149810..ac9195e6a062 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -279,14 +279,25 @@ extern void unregister_pernet_subsys(struct pernet_operations *);
 extern int register_pernet_device(struct pernet_operations *);
 extern void unregister_pernet_device(struct pernet_operations *);
 
-struct ctl_path;
 struct ctl_table;
 struct ctl_table_header;
 
-extern struct ctl_table_header *register_net_sysctl_table(struct net *net,
-        const struct ctl_path *path, struct ctl_table *table);
-extern struct ctl_table_header *register_net_sysctl_rotable(
-        const struct ctl_path *path, struct ctl_table *table);
+#ifdef CONFIG_SYSCTL
+extern int net_sysctl_init(void);
+extern struct ctl_table_header *register_net_sysctl(struct net *net,
+        const char *path, struct ctl_table *table);
 extern void unregister_net_sysctl_table(struct ctl_table_header *header);
+#else
+static inline int net_sysctl_init(void) { return 0; }
+static inline struct ctl_table_header *register_net_sysctl(struct net *net,
+        const char *path, struct ctl_table *table)
+{
+        return NULL;
+}
+static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
+{
+}
+#endif
+
 
 #endif /* __NET_NET_NAMESPACE_H */
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index ab86036bbf0c..cce7f6a798bf 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -321,14 +321,8 @@ extern unsigned int nf_conntrack_max;
 extern unsigned int nf_conntrack_hash_rnd;
 void init_nf_conntrack_hash_rnd(void);
 
-#define NF_CT_STAT_INC(net, count)      \
-        __this_cpu_inc((net)->ct.stat->count)
-#define NF_CT_STAT_INC_ATOMIC(net, count)               \
-do {                                                    \
-        local_bh_disable();                             \
-        __this_cpu_inc((net)->ct.stat->count);          \
-        local_bh_enable();                              \
-} while (0)
+#define NF_CT_STAT_INC(net, count)        __this_cpu_inc((net)->ct.stat->count)
+#define NF_CT_STAT_INC_ATOMIC(net, count) this_cpu_inc((net)->ct.stat->count)
 
 #define MODULE_ALIAS_NFCT_HELPER(helper) \
         MODULE_ALIAS("nfct-helper-" helper)
diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h
index 5767dc242dee..1d1889409b9e 100644
--- a/include/net/netfilter/nf_conntrack_helper.h
+++ b/include/net/netfilter/nf_conntrack_helper.h
@@ -60,8 +60,8 @@ static inline struct nf_conn_help *nfct_help(const struct nf_conn *ct)
         return nf_ct_ext_find(ct, NF_CT_EXT_HELPER);
 }
 
-extern int nf_conntrack_helper_init(void);
-extern void nf_conntrack_helper_fini(void);
+extern int nf_conntrack_helper_init(struct net *net);
+extern void nf_conntrack_helper_fini(struct net *net);
 
 extern int nf_conntrack_broadcast_help(struct sk_buff *skb,
                                        unsigned int protoff,
diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h
index e8010f445ae1..9699c028b74b 100644
--- a/include/net/netfilter/nf_conntrack_l3proto.h
+++ b/include/net/netfilter/nf_conntrack_l3proto.h
@@ -65,7 +65,7 @@ struct nf_conntrack_l3proto {
 
 #ifdef CONFIG_SYSCTL
         struct ctl_table_header *ctl_table_header;
-        struct ctl_path         *ctl_table_path;
+        const char              *ctl_table_path;
         struct ctl_table        *ctl_table;
 #endif /* CONFIG_SYSCTL */
 
diff --git a/include/net/netlink.h b/include/net/netlink.h
index f394fe5d7641..785f37a3b44e 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -102,20 +102,6 @@
  *   nla_put_flag(skb, type)            add flag attribute to skb
  *   nla_put_msecs(skb, type, jiffies)  add msecs attribute to skb
  *
- * Exceptions Based Attribute Construction:
- *   NLA_PUT(skb, type, len, data)      add attribute to skb
- *   NLA_PUT_U8(skb, type, value)       add u8 attribute to skb
- *   NLA_PUT_U16(skb, type, value)      add u16 attribute to skb
- *   NLA_PUT_U32(skb, type, value)      add u32 attribute to skb
- *   NLA_PUT_U64(skb, type, value)      add u64 attribute to skb
- *   NLA_PUT_STRING(skb, type, str)     add string attribute to skb
- *   NLA_PUT_FLAG(skb, type)            add flag attribute to skb
- *   NLA_PUT_MSECS(skb, type, jiffies)  add msecs attribute to skb
- *
- *   The meaning of these functions is equal to their lower case
- *   variants but they jump to the label nla_put_failure in case
- *   of a failure.
- *
  * Nested Attributes Construction:
  *   nla_nest_start(skb, type)          start a nested attribute
  *   nla_nest_end(skb, nla)             finalize a nested attribute
@@ -772,6 +758,39 @@ static inline int nla_put_u16(struct sk_buff *skb, int attrtype, u16 value)
 }
 
 /**
+ * nla_put_be16 - Add a __be16 netlink attribute to a socket buffer
+ * @skb: socket buffer to add attribute to
+ * @attrtype: attribute type
+ * @value: numeric value
+ */
+static inline int nla_put_be16(struct sk_buff *skb, int attrtype, __be16 value)
+{
+        return nla_put(skb, attrtype, sizeof(__be16), &value);
+}
+
+/**
+ * nla_put_net16 - Add 16-bit network byte order netlink attribute to a socket buffer
+ * @skb: socket buffer to add attribute to
+ * @attrtype: attribute type
+ * @value: numeric value
+ */
+static inline int nla_put_net16(struct sk_buff *skb, int attrtype, __be16 value)
+{
+        return nla_put_be16(skb, attrtype | NLA_F_NET_BYTEORDER, value);
+}
+
+/**
+ * nla_put_le16 - Add a __le16 netlink attribute to a socket buffer
+ * @skb: socket buffer to add attribute to
+ * @attrtype: attribute type
+ * @value: numeric value
+ */
+static inline int nla_put_le16(struct sk_buff *skb, int attrtype, __le16 value)
+{
+        return nla_put(skb, attrtype, sizeof(__le16), &value);
+}
+
+/**
  * nla_put_u32 - Add a u32 netlink attribute to a socket buffer
  * @skb: socket buffer to add attribute to
  * @attrtype: attribute type
@@ -783,7 +802,40 @@ static inline int nla_put_u32(struct sk_buff *skb, int attrtype, u32 value)
 }
 
 /**
- * nla_put_64 - Add a u64 netlink attribute to a socket buffer
+ * nla_put_be32 - Add a __be32 netlink attribute to a socket buffer
+ * @skb: socket buffer to add attribute to
+ * @attrtype: attribute type
+ * @value: numeric value
+ */
+static inline int nla_put_be32(struct sk_buff *skb, int attrtype, __be32 value)
+{
+        return nla_put(skb, attrtype, sizeof(__be32), &value);
+}
+
+/**
+ * nla_put_net32 - Add 32-bit network byte order netlink attribute to a socket buffer
+ * @skb: socket buffer to add attribute to
+ * @attrtype: attribute type
+ * @value: numeric value
+ */
+static inline int nla_put_net32(struct sk_buff *skb, int attrtype, __be32 value)
+{
+        return nla_put_be32(skb, attrtype | NLA_F_NET_BYTEORDER, value);
+}
+
+/**
+ * nla_put_le32 - Add a __le32 netlink attribute to a socket buffer
+ * @skb: socket buffer to add attribute to
+ * @attrtype: attribute type
+ * @value: numeric value
+ */
+static inline int nla_put_le32(struct sk_buff *skb, int attrtype, __le32 value)
+{
+        return nla_put(skb, attrtype, sizeof(__le32), &value);
+}
+
+/**
+ * nla_put_u64 - Add a u64 netlink attribute to a socket buffer
  * @skb: socket buffer to add attribute to
  * @attrtype: attribute type
  * @value: numeric value
@@ -794,6 +846,39 @@ static inline int nla_put_u64(struct sk_buff *skb, int attrtype, u64 value)
 }
 
 /**
+ * nla_put_be64 - Add a __be64 netlink attribute to a socket buffer
+ * @skb: socket buffer to add attribute to
+ * @attrtype: attribute type
+ * @value: numeric value
+ */
+static inline int nla_put_be64(struct sk_buff *skb, int attrtype, __be64 value)
+{
+        return nla_put(skb, attrtype, sizeof(__be64), &value);
+}
+
+/**
+ * nla_put_net64 - Add 64-bit network byte order netlink attribute to a socket buffer
+ * @skb: socket buffer to add attribute to
+ * @attrtype: attribute type
+ * @value: numeric value
+ */
+static inline int nla_put_net64(struct sk_buff *skb, int attrtype, __be64 value)
+{
+        return nla_put_be64(skb, attrtype | NLA_F_NET_BYTEORDER, value);
+}
+
+/**
+ * nla_put_le64 - Add a __le64 netlink attribute to a socket buffer
+ * @skb: socket buffer to add attribute to
+ * @attrtype: attribute type
+ * @value: numeric value
+ */
+static inline int nla_put_le64(struct sk_buff *skb, int attrtype, __le64 value)
+{
+        return nla_put(skb, attrtype, sizeof(__le64), &value);
+}
+
+/**
  * nla_put_string - Add a string netlink attribute to a socket buffer
  * @skb: socket buffer to add attribute to
  * @attrtype: attribute type
@@ -828,60 +913,6 @@ static inline int nla_put_msecs(struct sk_buff *skb, int attrtype,
         return nla_put(skb, attrtype, sizeof(u64), &tmp);
 }
 
-#define NLA_PUT(skb, attrtype, attrlen, data) \
-        do { \
-                if (unlikely(nla_put(skb, attrtype, attrlen, data) < 0)) \
-                        goto nla_put_failure; \
-        } while(0)
-
-#define NLA_PUT_TYPE(skb, type, attrtype, value) \
-        do { \
-                type __tmp = value; \
-                NLA_PUT(skb, attrtype, sizeof(type), &__tmp); \
-        } while(0)
-
-#define NLA_PUT_U8(skb, attrtype, value) \
-        NLA_PUT_TYPE(skb, u8, attrtype, value)
-
-#define NLA_PUT_U16(skb, attrtype, value) \
-        NLA_PUT_TYPE(skb, u16, attrtype, value)
-
-#define NLA_PUT_LE16(skb, attrtype, value) \
-        NLA_PUT_TYPE(skb, __le16, attrtype, value)
-
-#define NLA_PUT_BE16(skb, attrtype, value) \
-        NLA_PUT_TYPE(skb, __be16, attrtype, value)
-
-#define NLA_PUT_NET16(skb, attrtype, value) \
-        NLA_PUT_BE16(skb, attrtype | NLA_F_NET_BYTEORDER, value)
-
-#define NLA_PUT_U32(skb, attrtype, value) \
-        NLA_PUT_TYPE(skb, u32, attrtype, value)
-
-#define NLA_PUT_BE32(skb, attrtype, value) \
-        NLA_PUT_TYPE(skb, __be32, attrtype, value)
-
-#define NLA_PUT_NET32(skb, attrtype, value) \
-        NLA_PUT_BE32(skb, attrtype | NLA_F_NET_BYTEORDER, value)
-
-#define NLA_PUT_U64(skb, attrtype, value) \
-        NLA_PUT_TYPE(skb, u64, attrtype, value)
-
-#define NLA_PUT_BE64(skb, attrtype, value) \
-        NLA_PUT_TYPE(skb, __be64, attrtype, value)
-
-#define NLA_PUT_NET64(skb, attrtype, value) \
-        NLA_PUT_BE64(skb, attrtype | NLA_F_NET_BYTEORDER, value)
-
-#define NLA_PUT_STRING(skb, attrtype, value) \
-        NLA_PUT(skb, attrtype, strlen(value) + 1, value)
-
-#define NLA_PUT_FLAG(skb, attrtype) \
-        NLA_PUT(skb, attrtype, 0, NULL)
-
-#define NLA_PUT_MSECS(skb, attrtype, jiffies) \
-        NLA_PUT_U64(skb, attrtype, jiffies_to_msecs(jiffies))
-
 /**
  * nla_get_u32 - return payload of u32 attribute
  * @nla: u32 netlink attribute
diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
index 7a911eca0f18..a053a19870cf 100644
--- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h
@@ -26,11 +26,14 @@ struct netns_ct {
         int                     sysctl_tstamp;
         int                     sysctl_checksum;
         unsigned int            sysctl_log_invalid; /* Log invalid packets */
+        int                     sysctl_auto_assign_helper;
+        bool                    auto_assign_helper_warned;
 #ifdef CONFIG_SYSCTL
         struct ctl_table_header *sysctl_header;
         struct ctl_table_header *acct_sysctl_header;
         struct ctl_table_header *tstamp_sysctl_header;
         struct ctl_table_header *event_sysctl_header;
+        struct ctl_table_header *helper_sysctl_header;
 #endif
         char                    *slabname;
 };
diff --git a/include/net/netns/hash.h b/include/net/netns/hash.h
index 548d78f2cc47..c06ac58ca107 100644
--- a/include/net/netns/hash.h
+++ b/include/net/netns/hash.h
@@ -5,7 +5,7 @@
 
 struct net;
 
-static inline unsigned net_hash_mix(struct net *net)
+static inline unsigned int net_hash_mix(struct net *net)
 {
 #ifdef CONFIG_NET_NS
         /*
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 81abfcb2eb4e..b42be53587ba 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -12,7 +12,9 @@ struct ctl_table_header;
 
 struct netns_sysctl_ipv6 {
 #ifdef CONFIG_SYSCTL
-        struct ctl_table_header *table;
+        struct ctl_table_header *hdr;
+        struct ctl_table_header *route_hdr;
+        struct ctl_table_header *icmp_hdr;
         struct ctl_table_header *frags_hdr;
 #endif
         int bindv6only;
diff --git a/include/net/nfc/hci.h b/include/net/nfc/hci.h
new file mode 100644
index 000000000000..4467c9460857
--- /dev/null
+++ b/include/net/nfc/hci.h
@@ -0,0 +1,196 @@
+/*
+ * Copyright (C) 2011  Intel Corporation. All rights reserved.
+ *
+ * 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 __NET_HCI_H
+#define __NET_HCI_H
+
+#include <linux/skbuff.h>
+
+#include <net/nfc/nfc.h>
+
+struct nfc_hci_dev;
+
+struct nfc_hci_ops {
+        int (*open) (struct nfc_hci_dev *hdev);
+        void (*close) (struct nfc_hci_dev *hdev);
+        int (*hci_ready) (struct nfc_hci_dev *hdev);
+        int (*xmit) (struct nfc_hci_dev *hdev, struct sk_buff *skb);
+        int (*start_poll) (struct nfc_hci_dev *hdev, u32 protocols);
+        int (*target_from_gate) (struct nfc_hci_dev *hdev, u8 gate,
+                                 struct nfc_target *target);
+        int (*complete_target_discovered) (struct nfc_hci_dev *hdev, u8 gate,
+                                           struct nfc_target *target);
+        int (*data_exchange) (struct nfc_hci_dev *hdev,
+                              struct nfc_target *target,
+                              struct sk_buff *skb, struct sk_buff **res_skb);
+        int (*check_presence)(struct nfc_hci_dev *hdev,
+                              struct nfc_target *target);
+};
+
+#define NFC_HCI_MAX_CUSTOM_GATES        15
+struct nfc_hci_init_data {
+        u8 gate_count;
+        u8 gates[NFC_HCI_MAX_CUSTOM_GATES];
+        char session_id[9];
+};
+
+typedef int (*xmit) (struct sk_buff *skb, void *cb_data);
+
+#define NFC_HCI_MAX_GATES               256
+
+struct nfc_hci_dev {
+        struct nfc_dev *ndev;
+
+        u32 max_data_link_payload;
+
+        struct mutex msg_tx_mutex;
+
+        struct list_head msg_tx_queue;
+
+        struct workqueue_struct *msg_tx_wq;
+        struct work_struct msg_tx_work;
+
+        struct timer_list cmd_timer;
+        struct hci_msg *cmd_pending_msg;
+
+        struct sk_buff_head rx_hcp_frags;
+
+        struct workqueue_struct *msg_rx_wq;
+        struct work_struct msg_rx_work;
+
+        struct sk_buff_head msg_rx_queue;
+
+        struct nfc_hci_ops *ops;
+
+        struct nfc_hci_init_data init_data;
+
+        void *clientdata;
+
+        u8 gate2pipe[NFC_HCI_MAX_GATES];
+
+        u8 sw_romlib;
+        u8 sw_patch;
+        u8 sw_flashlib_major;
+        u8 sw_flashlib_minor;
+
+        u8 hw_derivative;
+        u8 hw_version;
+        u8 hw_mpw;
+        u8 hw_software;
+        u8 hw_bsid;
+};
+
+/* hci device allocation */
+struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops,
+                                            struct nfc_hci_init_data *init_data,
+                                            u32 protocols,
+                                            int tx_headroom,
+                                            int tx_tailroom,
+                                            int max_link_payload);
+void nfc_hci_free_device(struct nfc_hci_dev *hdev);
+
+int nfc_hci_register_device(struct nfc_hci_dev *hdev);
+void nfc_hci_unregister_device(struct nfc_hci_dev *hdev);
+
+void nfc_hci_set_clientdata(struct nfc_hci_dev *hdev, void *clientdata);
+void *nfc_hci_get_clientdata(struct nfc_hci_dev *hdev);
+
+/* Host IDs */
+#define NFC_HCI_HOST_CONTROLLER_ID      0x00
+#define NFC_HCI_TERMINAL_HOST_ID        0x01
+#define NFC_HCI_UICC_HOST_ID            0x02
+
+/* Host Controller Gates and registry indexes */
+#define NFC_HCI_ADMIN_GATE 0x00
+#define NFC_HCI_ADMIN_SESSION_IDENTITY  0x01
+#define NFC_HCI_ADMIN_MAX_PIPE          0x02
+#define NFC_HCI_ADMIN_WHITELIST         0x03
+#define NFC_HCI_ADMIN_HOST_LIST         0x04
+
+#define NFC_HCI_LOOPBACK_GATE           0x04
+
+#define NFC_HCI_ID_MGMT_GATE            0x05
+#define NFC_HCI_ID_MGMT_VERSION_SW      0x01
+#define NFC_HCI_ID_MGMT_VERSION_HW      0x03
+#define NFC_HCI_ID_MGMT_VENDOR_NAME     0x04
+#define NFC_HCI_ID_MGMT_MODEL_ID        0x05
+#define NFC_HCI_ID_MGMT_HCI_VERSION     0x02
+#define NFC_HCI_ID_MGMT_GATES_LIST      0x06
+
+#define NFC_HCI_LINK_MGMT_GATE          0x06
+#define NFC_HCI_LINK_MGMT_REC_ERROR     0x01
+
+#define NFC_HCI_RF_READER_B_GATE                        0x11
+#define NFC_HCI_RF_READER_B_PUPI                        0x03
+#define NFC_HCI_RF_READER_B_APPLICATION_DATA            0x04
+#define NFC_HCI_RF_READER_B_AFI                         0x02
+#define NFC_HCI_RF_READER_B_HIGHER_LAYER_RESPONSE       0x01
+#define NFC_HCI_RF_READER_B_HIGHER_LAYER_DATA           0x05
+
+#define NFC_HCI_RF_READER_A_GATE                0x13
+#define NFC_HCI_RF_READER_A_UID                 0x02
+#define NFC_HCI_RF_READER_A_ATQA                0x04
+#define NFC_HCI_RF_READER_A_APPLICATION_DATA    0x05
+#define NFC_HCI_RF_READER_A_SAK                 0x03
+#define NFC_HCI_RF_READER_A_FWI_SFGT            0x06
+#define NFC_HCI_RF_READER_A_DATARATE_MAX        0x01
+
+#define NFC_HCI_TYPE_A_SEL_PROT(x)              (((x) & 0x60) >> 5)
+#define NFC_HCI_TYPE_A_SEL_PROT_MIFARE          0
+#define NFC_HCI_TYPE_A_SEL_PROT_ISO14443        1
+#define NFC_HCI_TYPE_A_SEL_PROT_DEP             2
+#define NFC_HCI_TYPE_A_SEL_PROT_ISO14443_DEP    3
+
+/* Generic events */
+#define NFC_HCI_EVT_HCI_END_OF_OPERATION        0x01
+#define NFC_HCI_EVT_POST_DATA                   0x02
+#define NFC_HCI_EVT_HOT_PLUG                    0x03
+
+/* Reader RF gates events */
+#define NFC_HCI_EVT_READER_REQUESTED    0x10
+#define NFC_HCI_EVT_END_OPERATION       0x11
+
+/* Reader Application gate events */
+#define NFC_HCI_EVT_TARGET_DISCOVERED   0x10
+
+/* receiving messages from lower layer */
+void nfc_hci_resp_received(struct nfc_hci_dev *hdev, u8 result,
+                           struct sk_buff *skb);
+void nfc_hci_cmd_received(struct nfc_hci_dev *hdev, u8 pipe, u8 cmd,
+                          struct sk_buff *skb);
+void nfc_hci_event_received(struct nfc_hci_dev *hdev, u8 pipe, u8 event,
+                            struct sk_buff *skb);
+void nfc_hci_recv_frame(struct nfc_hci_dev *hdev, struct sk_buff *skb);
+
+/* connecting to gates and sending hci instructions */
+int nfc_hci_connect_gate(struct nfc_hci_dev *hdev, u8 dest_host, u8 dest_gate);
+int nfc_hci_disconnect_gate(struct nfc_hci_dev *hdev, u8 gate);
+int nfc_hci_disconnect_all_gates(struct nfc_hci_dev *hdev);
+int nfc_hci_get_param(struct nfc_hci_dev *hdev, u8 gate, u8 idx,
+                      struct sk_buff **skb);
+int nfc_hci_set_param(struct nfc_hci_dev *hdev, u8 gate, u8 idx,
+                      const u8 *param, size_t param_len);
+int nfc_hci_send_cmd(struct nfc_hci_dev *hdev, u8 gate, u8 cmd,
+                     const u8 *param, size_t param_len, struct sk_buff **skb);
+int nfc_hci_send_response(struct nfc_hci_dev *hdev, u8 gate, u8 response,
+                          const u8 *param, size_t param_len);
+int nfc_hci_send_event(struct nfc_hci_dev *hdev, u8 gate, u8 event,
+                       const u8 *param, size_t param_len);
+
+#endif /* __NET_HCI_H */
diff --git a/include/net/nfc/nfc.h b/include/net/nfc/nfc.h
index bac070bf3514..b7ca4a2a1d72 100644
--- a/include/net/nfc/nfc.h
+++ b/include/net/nfc/nfc.h
@@ -48,20 +48,24 @@ struct nfc_dev;
 typedef void (*data_exchange_cb_t)(void *context, struct sk_buff *skb,
                                                                 int err);
 
+struct nfc_target;
+
 struct nfc_ops {
         int (*dev_up)(struct nfc_dev *dev);
         int (*dev_down)(struct nfc_dev *dev);
         int (*start_poll)(struct nfc_dev *dev, u32 protocols);
         void (*stop_poll)(struct nfc_dev *dev);
-        int (*dep_link_up)(struct nfc_dev *dev, int target_idx, u8 comm_mode,
-                           u8 *gb, size_t gb_len);
+        int (*dep_link_up)(struct nfc_dev *dev, struct nfc_target *target,
+                           u8 comm_mode, u8 *gb, size_t gb_len);
         int (*dep_link_down)(struct nfc_dev *dev);
-        int (*activate_target)(struct nfc_dev *dev, u32 target_idx,
+        int (*activate_target)(struct nfc_dev *dev, struct nfc_target *target,
                                u32 protocol);
-        void (*deactivate_target)(struct nfc_dev *dev, u32 target_idx);
-        int (*data_exchange)(struct nfc_dev *dev, u32 target_idx,
+        void (*deactivate_target)(struct nfc_dev *dev,
+                                  struct nfc_target *target);
+        int (*data_exchange)(struct nfc_dev *dev, struct nfc_target *target,
                              struct sk_buff *skb, data_exchange_cb_t cb,
                              void *cb_context);
+        int (*check_presence)(struct nfc_dev *dev, struct nfc_target *target);
 };
 
 #define NFC_TARGET_IDX_ANY -1
@@ -78,6 +82,8 @@ struct nfc_target {
         u8 sensb_res[NFC_SENSB_RES_MAXSIZE];
         u8 sensf_res_len;
         u8 sensf_res[NFC_SENSF_RES_MAXSIZE];
+        u8 hci_reader_gate;
+        u8 logical_idx;
 };
 
 struct nfc_genl_data {
@@ -86,15 +92,15 @@ struct nfc_genl_data {
 };
 
 struct nfc_dev {
-        unsigned idx;
+        unsigned int idx;
+        u32 target_next_idx;
         struct nfc_target *targets;
         int n_targets;
         int targets_generation;
-        spinlock_t targets_lock;
         struct device dev;
         bool dev_up;
         bool polling;
-        bool remote_activated;
+        struct nfc_target *active_target;
         bool dep_link_up;
         u32 dep_rf_mode;
         struct nfc_genl_data genl_data;
@@ -103,6 +109,10 @@ struct nfc_dev {
         int tx_headroom;
         int tx_tailroom;
 
+        struct timer_list check_pres_timer;
+        struct workqueue_struct *check_pres_wq;
+        struct work_struct check_pres_work;
+
         struct nfc_ops *ops;
 };
 #define to_nfc_dev(_dev) container_of(_dev, struct nfc_dev, dev)
@@ -181,6 +191,7 @@ int nfc_set_remote_general_bytes(struct nfc_dev *dev,
 
 int nfc_targets_found(struct nfc_dev *dev,
                       struct nfc_target *targets, int ntargets);
+int nfc_target_lost(struct nfc_dev *dev, u32 target_idx);
 
 int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx,
                        u8 comm_mode, u8 rf_mode);
diff --git a/include/net/nfc/shdlc.h b/include/net/nfc/shdlc.h
new file mode 100644
index 000000000000..ab06afd462da
--- /dev/null
+++ b/include/net/nfc/shdlc.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2012  Intel Corporation. All rights reserved.
+ *
+ * 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 __NFC_SHDLC_H
+#define __NFC_SHDLC_H
+
+struct nfc_shdlc;
+
+struct nfc_shdlc_ops {
+        int (*open) (struct nfc_shdlc *shdlc);
+        void (*close) (struct nfc_shdlc *shdlc);
+        int (*hci_ready) (struct nfc_shdlc *shdlc);
+        int (*xmit) (struct nfc_shdlc *shdlc, struct sk_buff *skb);
+        int (*start_poll) (struct nfc_shdlc *shdlc, u32 protocols);
+        int (*target_from_gate) (struct nfc_shdlc *shdlc, u8 gate,
+                                 struct nfc_target *target);
+        int (*complete_target_discovered) (struct nfc_shdlc *shdlc, u8 gate,
+                                           struct nfc_target *target);
+        int (*data_exchange) (struct nfc_shdlc *shdlc,
+                              struct nfc_target *target,
+                              struct sk_buff *skb, struct sk_buff **res_skb);
+        int (*check_presence)(struct nfc_shdlc *shdlc,
+                              struct nfc_target *target);
+};
+
+enum shdlc_state {
+        SHDLC_DISCONNECTED = 0,
+        SHDLC_CONNECTING = 1,
+        SHDLC_NEGOCIATING = 2,
+        SHDLC_CONNECTED = 3
+};
+
+struct nfc_shdlc {
+        struct mutex state_mutex;
+        enum shdlc_state state;
+        int hard_fault;
+
+        struct nfc_hci_dev *hdev;
+
+        wait_queue_head_t *connect_wq;
+        int connect_tries;
+        int connect_result;
+        struct timer_list connect_timer;/* aka T3 in spec 10.6.1 */
+
+        u8 w;                           /* window size */
+        bool srej_support;
+
+        struct timer_list t1_timer;     /* send ack timeout */
+        bool t1_active;
+
+        struct timer_list t2_timer;     /* guard/retransmit timeout */
+        bool t2_active;
+
+        int ns;                         /* next seq num for send */
+        int nr;                         /* next expected seq num for receive */
+        int dnr;                        /* oldest sent unacked seq num */
+
+        struct sk_buff_head rcv_q;
+
+        struct sk_buff_head send_q;
+        bool rnr;                       /* other side is not ready to receive */
+
+        struct sk_buff_head ack_pending_q;
+
+        struct workqueue_struct *sm_wq;
+        struct work_struct sm_work;
+
+        struct nfc_shdlc_ops *ops;
+
+        int client_headroom;
+        int client_tailroom;
+
+        void *clientdata;
+};
+
+void nfc_shdlc_recv_frame(struct nfc_shdlc *shdlc, struct sk_buff *skb);
+
+struct nfc_shdlc *nfc_shdlc_allocate(struct nfc_shdlc_ops *ops,
+                                     struct nfc_hci_init_data *init_data,
+                                     u32 protocols,
+                                     int tx_headroom, int tx_tailroom,
+                                     int max_link_payload, const char *devname);
+
+void nfc_shdlc_free(struct nfc_shdlc *shdlc);
+
+void nfc_shdlc_set_clientdata(struct nfc_shdlc *shdlc, void *clientdata);
+void *nfc_shdlc_get_clientdata(struct nfc_shdlc *shdlc);
+struct nfc_hci_dev *nfc_shdlc_get_hci_dev(struct nfc_shdlc *shdlc);
+
+#endif /* __NFC_SHDLC_H */
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index fffdc603f4c8..66f5ac370f92 100644
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -107,7 +107,7 @@ extern int tc_classify(struct sk_buff *skb, const struct tcf_proto *tp,
 /* Calculate maximal size of packet seen by hard_start_xmit
    routine of this device.
  */
-static inline unsigned psched_mtu(const struct net_device *dev)
+static inline unsigned int psched_mtu(const struct net_device *dev)
 {
         return dev->mtu + dev->hard_header_len;
 }
diff --git a/include/net/rawv6.h b/include/net/rawv6.h
index cf7577234457..e7ea660e4db6 100644
--- a/include/net/rawv6.h
+++ b/include/net/rawv6.h
@@ -5,7 +5,7 @@
 
 void raw6_icmp_error(struct sk_buff *, int nexthdr,
                 u8 type, u8 code, int inner_offset, __be32);
-int raw6_local_deliver(struct sk_buff *, int);
+bool raw6_local_deliver(struct sk_buff *, int);
 
 extern int                      rawv6_rcv(struct sock *sk,
                                           struct sk_buff *skb);
diff --git a/include/net/route.h b/include/net/route.h
index b1c0d5b564c2..ed2b78e2375d 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -50,7 +50,7 @@ struct rtable {
         __be32                  rt_key_src;
 
         int                     rt_genid;
-        unsigned                rt_flags;
+        unsigned int            rt_flags;
         __u16                   rt_type;
         __u8                    rt_key_tos;
 
@@ -185,8 +185,8 @@ extern unsigned short	ip_rt_frag_needed(struct net *net, const struct iphdr *iph
                                           unsigned short new_mtu, struct net_device *dev);
 extern void             ip_rt_send_redirect(struct sk_buff *skb);
 
-extern unsigned         inet_addr_type(struct net *net, __be32 addr);
-extern unsigned         inet_dev_addr_type(struct net *net, const struct net_device *dev, __be32 addr);
+extern unsigned int             inet_addr_type(struct net *net, __be32 addr);
+extern unsigned int             inet_dev_addr_type(struct net *net, const struct net_device *dev, __be32 addr);
 extern void             ip_rt_multicast_event(struct in_device *);
 extern int              ip_rt_ioctl(struct net *, unsigned int cmd, void __user *arg);
 extern void             ip_rt_get_source(u8 *src, struct sk_buff *skb, struct rtable *rt);
diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
index 370293901971..bbcfd0993432 100644
--- a/include/net/rtnetlink.h
+++ b/include/net/rtnetlink.h
@@ -41,9 +41,11 @@ static inline int rtnl_msg_family(const struct nlmsghdr *nlh)
  *      @get_size: Function to calculate required room for dumping device
  *                 specific netlink attributes
  *      @fill_info: Function to dump device specific netlink attributes
- *      @get_xstats_size: Function to calculate required room for dumping devic
+ *      @get_xstats_size: Function to calculate required room for dumping device
  *                        specific statistics
  *      @fill_xstats: Function to dump device specific statistics
+ *      @get_tx_queues: Function to determine number of transmit queues to create when
+ *                      creating a new device.
  */
 struct rtnl_link_ops {
         struct list_head        list;
@@ -75,9 +77,8 @@ struct rtnl_link_ops {
         size_t                  (*get_xstats_size)(const struct net_device *dev);
         int                     (*fill_xstats)(struct sk_buff *skb,
                                                const struct net_device *dev);
-        int                     (*get_tx_queues)(struct net *net, struct nlattr *tb[],
-                                                 unsigned int *tx_queues,
-                                                 unsigned int *real_tx_queues);
+        int                     (*get_tx_queues)(struct net *net,
+                                                 struct nlattr *tb[]);
 };
 
 extern int      __rtnl_link_register(struct rtnl_link_ops *ops);
@@ -94,7 +95,7 @@ extern void	rtnl_link_unregister(struct rtnl_link_ops *ops);
  *      @fill_link_af: Function to fill IFLA_AF_SPEC with address family
  *                     specific netlink attributes.
  *      @get_link_af_size: Function to calculate size of address family specific
- *                         netlink attributes exlusive the container attribute.
+ *                         netlink attributes.
  *      @validate_link_af: Validate a IFLA_AF_SPEC attribute, must check attr
  *                         for invalid configuration settings.
  *      @set_link_af: Function to parse a IFLA_AF_SPEC attribute and modify
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 88949a994538..e4652fe58958 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -1145,10 +1145,10 @@ struct sctp_outq {
         /* Data pending that has never been transmitted.  */
         struct list_head out_chunk_list;
 
-        unsigned out_qlen;      /* Total length of queued data chunks. */
+        unsigned int out_qlen;  /* Total length of queued data chunks. */
 
         /* Error of send failed, may used in SCTP_SEND_FAILED event. */
-        unsigned error;
+        unsigned int error;
 
         /* These are control chunks we want to send.  */
         struct list_head control_chunk_list;
@@ -2000,8 +2000,8 @@ void sctp_assoc_update(struct sctp_association *old,
 __u32 sctp_association_get_next_tsn(struct sctp_association *);
 
 void sctp_assoc_sync_pmtu(struct sctp_association *);
-void sctp_assoc_rwnd_increase(struct sctp_association *, unsigned);
-void sctp_assoc_rwnd_decrease(struct sctp_association *, unsigned);
+void sctp_assoc_rwnd_increase(struct sctp_association *, unsigned int);
+void sctp_assoc_rwnd_decrease(struct sctp_association *, unsigned int);
 void sctp_assoc_set_primary(struct sctp_association *,
                             struct sctp_transport *);
 void sctp_assoc_del_nonprimary_peers(struct sctp_association *,
diff --git a/include/net/sock.h b/include/net/sock.h
index 5a0a58ac4126..4a4521699563 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -46,6 +46,7 @@
 #include <linux/list_nulls.h>
 #include <linux/timer.h>
 #include <linux/cache.h>
+#include <linux/bitops.h>
 #include <linux/lockdep.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>       /* struct sk_buff */
@@ -70,16 +71,16 @@
 struct cgroup;
 struct cgroup_subsys;
 #ifdef CONFIG_NET
-int mem_cgroup_sockets_init(struct cgroup *cgrp, struct cgroup_subsys *ss);
-void mem_cgroup_sockets_destroy(struct cgroup *cgrp);
+int mem_cgroup_sockets_init(struct mem_cgroup *memcg, struct cgroup_subsys *ss);
+void mem_cgroup_sockets_destroy(struct mem_cgroup *memcg);
 #else
 static inline
-int mem_cgroup_sockets_init(struct cgroup *cgrp, struct cgroup_subsys *ss)
+int mem_cgroup_sockets_init(struct mem_cgroup *memcg, struct cgroup_subsys *ss)
 {
         return 0;
 }
 static inline
-void mem_cgroup_sockets_destroy(struct cgroup *cgrp)
+void mem_cgroup_sockets_destroy(struct mem_cgroup *memcg)
 {
 }
 #endif
@@ -97,7 +98,7 @@ void mem_cgroup_sockets_destroy(struct cgroup *cgrp)
 #else
 /* Validate arguments and do nothing */
 static inline __printf(2, 3)
-void SOCK_DEBUG(struct sock *sk, const char *msg, ...)
+void SOCK_DEBUG(const struct sock *sk, const char *msg, ...)
 {
 }
 #endif
@@ -372,11 +373,22 @@ struct sock {
         void                    (*sk_data_ready)(struct sock *sk, int bytes);
         void                    (*sk_write_space)(struct sock *sk);
         void                    (*sk_error_report)(struct sock *sk);
-        int                     (*sk_backlog_rcv)(struct sock *sk,
-                                                  struct sk_buff *skb);  
+        int                     (*sk_backlog_rcv)(struct sock *sk,
+                                                  struct sk_buff *skb);
         void                    (*sk_destruct)(struct sock *sk);
 };
 
+/*
+ * SK_CAN_REUSE and SK_NO_REUSE on a socket mean that the socket is OK
+ * or not whether his port will be reused by someone else. SK_FORCE_REUSE
+ * on a socket means that the socket will reuse everybody else's port
+ * without looking at the other's sk_reuse value.
+ */
+
+#define SK_NO_REUSE     0
+#define SK_CAN_REUSE    1
+#define SK_FORCE_REUSE  2
+
 static inline int sk_peek_offset(struct sock *sk, int flags)
 {
         if ((flags & MSG_PEEK) && (sk->sk_peek_off >= 0))
@@ -443,40 +455,40 @@ static inline struct sock *sk_nulls_next(const struct sock *sk)
                 NULL;
 }
 
-static inline int sk_unhashed(const struct sock *sk)
+static inline bool sk_unhashed(const struct sock *sk)
 {
         return hlist_unhashed(&sk->sk_node);
 }
 
-static inline int sk_hashed(const struct sock *sk)
+static inline bool sk_hashed(const struct sock *sk)
 {
         return !sk_unhashed(sk);
 }
 
-static __inline__ void sk_node_init(struct hlist_node *node)
+static inline void sk_node_init(struct hlist_node *node)
 {
         node->pprev = NULL;
 }
 
-static __inline__ void sk_nulls_node_init(struct hlist_nulls_node *node)
+static inline void sk_nulls_node_init(struct hlist_nulls_node *node)
 {
         node->pprev = NULL;
 }
 
-static __inline__ void __sk_del_node(struct sock *sk)
+static inline void __sk_del_node(struct sock *sk)
 {
         __hlist_del(&sk->sk_node);
 }
 
 /* NB: equivalent to hlist_del_init_rcu */
-static __inline__ int __sk_del_node_init(struct sock *sk)
+static inline bool __sk_del_node_init(struct sock *sk)
 {
         if (sk_hashed(sk)) {
                 __sk_del_node(sk);
                 sk_node_init(&sk->sk_node);
-                return 1;
+                return true;
         }
-        return 0;
+        return false;
 }
 
 /* Grab socket reference count. This operation is valid only
@@ -498,9 +510,9 @@ static inline void __sock_put(struct sock *sk)
         atomic_dec(&sk->sk_refcnt);
 }
 
-static __inline__ int sk_del_node_init(struct sock *sk)
+static inline bool sk_del_node_init(struct sock *sk)
 {
-        int rc = __sk_del_node_init(sk);
+        bool rc = __sk_del_node_init(sk);
 
         if (rc) {
                 /* paranoid for a while -acme */
@@ -511,18 +523,18 @@ static __inline__ int sk_del_node_init(struct sock *sk)
 }
 #define sk_del_node_init_rcu(sk)        sk_del_node_init(sk)
 
-static __inline__ int __sk_nulls_del_node_init_rcu(struct sock *sk)
+static inline bool __sk_nulls_del_node_init_rcu(struct sock *sk)
 {
         if (sk_hashed(sk)) {
                 hlist_nulls_del_init_rcu(&sk->sk_nulls_node);
-                return 1;
+                return true;
         }
-        return 0;
+        return false;
 }
 
-static __inline__ int sk_nulls_del_node_init_rcu(struct sock *sk)
+static inline bool sk_nulls_del_node_init_rcu(struct sock *sk)
 {
-        int rc = __sk_nulls_del_node_init_rcu(sk);
+        bool rc = __sk_nulls_del_node_init_rcu(sk);
 
         if (rc) {
                 /* paranoid for a while -acme */
@@ -532,40 +544,40 @@ static __inline__ int sk_nulls_del_node_init_rcu(struct sock *sk)
         return rc;
 }
 
-static __inline__ void __sk_add_node(struct sock *sk, struct hlist_head *list)
+static inline void __sk_add_node(struct sock *sk, struct hlist_head *list)
 {
         hlist_add_head(&sk->sk_node, list);
 }
 
-static __inline__ void sk_add_node(struct sock *sk, struct hlist_head *list)
+static inline void sk_add_node(struct sock *sk, struct hlist_head *list)
 {
         sock_hold(sk);
         __sk_add_node(sk, list);
 }
 
-static __inline__ void sk_add_node_rcu(struct sock *sk, struct hlist_head *list)
+static inline void sk_add_node_rcu(struct sock *sk, struct hlist_head *list)
 {
         sock_hold(sk);
         hlist_add_head_rcu(&sk->sk_node, list);
 }
 
-static __inline__ void __sk_nulls_add_node_rcu(struct sock *sk, struct hlist_nulls_head *list)
+static inline void __sk_nulls_add_node_rcu(struct sock *sk, struct hlist_nulls_head *list)
 {
         hlist_nulls_add_head_rcu(&sk->sk_nulls_node, list);
 }
 
-static __inline__ void sk_nulls_add_node_rcu(struct sock *sk, struct hlist_nulls_head *list)
+static inline void sk_nulls_add_node_rcu(struct sock *sk, struct hlist_nulls_head *list)
 {
         sock_hold(sk);
         __sk_nulls_add_node_rcu(sk, list);
 }
 
-static __inline__ void __sk_del_bind_node(struct sock *sk)
+static inline void __sk_del_bind_node(struct sock *sk)
 {
         __hlist_del(&sk->sk_bind_node);
 }
 
-static __inline__ void sk_add_bind_node(struct sock *sk,
+static inline void sk_add_bind_node(struct sock *sk,
                                         struct hlist_head *list)
 {
         hlist_add_head(&sk->sk_bind_node, list);
@@ -639,7 +651,7 @@ static inline void sock_reset_flag(struct sock *sk, enum sock_flags flag)
         __clear_bit(flag, &sk->sk_flags);
 }
 
-static inline int sock_flag(struct sock *sk, enum sock_flags flag)
+static inline bool sock_flag(const struct sock *sk, enum sock_flags flag)
 {
         return test_bit(flag, &sk->sk_flags);
 }
@@ -654,7 +666,7 @@ static inline void sk_acceptq_added(struct sock *sk)
         sk->sk_ack_backlog++;
 }
 
-static inline int sk_acceptq_is_full(struct sock *sk)
+static inline bool sk_acceptq_is_full(const struct sock *sk)
 {
         return sk->sk_ack_backlog > sk->sk_max_ack_backlog;
 }
@@ -662,19 +674,19 @@ static inline int sk_acceptq_is_full(struct sock *sk)
 /*
  * Compute minimal free write space needed to queue new packets.
  */
-static inline int sk_stream_min_wspace(struct sock *sk)
+static inline int sk_stream_min_wspace(const struct sock *sk)
 {
         return sk->sk_wmem_queued >> 1;
 }
 
-static inline int sk_stream_wspace(struct sock *sk)
+static inline int sk_stream_wspace(const struct sock *sk)
 {
         return sk->sk_sndbuf - sk->sk_wmem_queued;
 }
 
 extern void sk_stream_write_space(struct sock *sk);
 
-static inline int sk_stream_memory_free(struct sock *sk)
+static inline bool sk_stream_memory_free(const struct sock *sk)
 {
         return sk->sk_wmem_queued < sk->sk_sndbuf;
 }
@@ -699,17 +711,19 @@ static inline void __sk_add_backlog(struct sock *sk, struct sk_buff *skb)
  * Do not take into account this skb truesize,
  * to allow even a single big packet to come.
  */
-static inline bool sk_rcvqueues_full(const struct sock *sk, const struct sk_buff *skb)
+static inline bool sk_rcvqueues_full(const struct sock *sk, const struct sk_buff *skb,
+                                     unsigned int limit)
 {
         unsigned int qsize = sk->sk_backlog.len + atomic_read(&sk->sk_rmem_alloc);
 
-        return qsize > sk->sk_rcvbuf;
+        return qsize > limit;
 }
 
 /* The per-socket spinlock must be held here. */
-static inline __must_check int sk_add_backlog(struct sock *sk, struct sk_buff *skb)
+static inline __must_check int sk_add_backlog(struct sock *sk, struct sk_buff *skb,
+                                              unsigned int limit)
 {
-        if (sk_rcvqueues_full(sk, skb))
+        if (sk_rcvqueues_full(sk, skb, limit))
                 return -ENOBUFS;
 
         __sk_add_backlog(sk, skb);
@@ -796,26 +810,26 @@ struct module;
  * transport -> network interface is defined by struct inet_proto
  */
 struct proto {
-        void                    (*close)(struct sock *sk, 
+        void                    (*close)(struct sock *sk,
                                         long timeout);
         int                     (*connect)(struct sock *sk,
-                                        struct sockaddr *uaddr, 
+                                        struct sockaddr *uaddr,
                                         int addr_len);
         int                     (*disconnect)(struct sock *sk, int flags);
 
-        struct sock *           (*accept) (struct sock *sk, int flags, int *err);
+        struct sock *           (*accept)(struct sock *sk, int flags, int *err);
 
         int                     (*ioctl)(struct sock *sk, int cmd,
                                          unsigned long arg);
         int                     (*init)(struct sock *sk);
         void                    (*destroy)(struct sock *sk);
         void                    (*shutdown)(struct sock *sk, int how);
-        int                     (*setsockopt)(struct sock *sk, int level, 
+        int                     (*setsockopt)(struct sock *sk, int level,
                                         int optname, char __user *optval,
                                         unsigned int optlen);
-        int                     (*getsockopt)(struct sock *sk, int level, 
-                                        int optname, char __user *optval, 
-                                        int __user *option);     
+        int                     (*getsockopt)(struct sock *sk, int level,
+                                        int optname, char __user *optval,
+                                        int __user *option);
 #ifdef CONFIG_COMPAT
         int                     (*compat_setsockopt)(struct sock *sk,
                                         int level,
@@ -832,14 +846,14 @@ struct proto {
                                            struct msghdr *msg, size_t len);
         int                     (*recvmsg)(struct kiocb *iocb, struct sock *sk,
                                            struct msghdr *msg,
-                                        size_t len, int noblock, int flags, 
-                                        int *addr_len);
+                                           size_t len, int noblock, int flags,
+                                           int *addr_len);
         int                     (*sendpage)(struct sock *sk, struct page *page,
                                         int offset, size_t size, int flags);
-        int                     (*bind)(struct sock *sk, 
+        int                     (*bind)(struct sock *sk,
                                         struct sockaddr *uaddr, int addr_len);
 
-        int                     (*backlog_rcv) (struct sock *sk, 
+        int                     (*backlog_rcv) (struct sock *sk,
                                                 struct sk_buff *skb);
 
         /* Keeping track of sk's, looking them up, and port selection methods. */
@@ -901,19 +915,30 @@ struct proto {
          * This function has to setup any files the protocol want to
          * appear in the kmem cgroup filesystem.
          */
-        int                     (*init_cgroup)(struct cgroup *cgrp,
+        int                     (*init_cgroup)(struct mem_cgroup *memcg,
                                                struct cgroup_subsys *ss);
-        void                    (*destroy_cgroup)(struct cgroup *cgrp);
+        void                    (*destroy_cgroup)(struct mem_cgroup *memcg);
         struct cg_proto         *(*proto_cgroup)(struct mem_cgroup *memcg);
 #endif
 };
 
+/*
+ * Bits in struct cg_proto.flags
+ */
+enum cg_proto_flags {
+        /* Currently active and new sockets should be assigned to cgroups */
+        MEMCG_SOCK_ACTIVE,
+        /* It was ever activated; we must disarm static keys on destruction */
+        MEMCG_SOCK_ACTIVATED,
+};
+
 struct cg_proto {
         void                    (*enter_memory_pressure)(struct sock *sk);
         struct res_counter      *memory_allocated;      /* Current allocated memory. */
         struct percpu_counter   *sockets_allocated;     /* Current number of sockets. */
         int                     *memory_pressure;
         long                    *sysctl_mem;
+        unsigned long           flags;
         /*
          * memcg field is used to find which memcg we belong directly
          * Each memcg struct can hold more than one cg_proto, so container_of
@@ -929,6 +954,16 @@ struct cg_proto {
 extern int proto_register(struct proto *prot, int alloc_slab);
 extern void proto_unregister(struct proto *prot);
 
+static inline bool memcg_proto_active(struct cg_proto *cg_proto)
+{
+        return test_bit(MEMCG_SOCK_ACTIVE, &cg_proto->flags);
+}
+
+static inline bool memcg_proto_activated(struct cg_proto *cg_proto)
+{
+        return test_bit(MEMCG_SOCK_ACTIVATED, &cg_proto->flags);
+}
+
 #ifdef SOCK_REFCNT_DEBUG
 static inline void sk_refcnt_debug_inc(struct sock *sk)
 {
@@ -1160,7 +1195,7 @@ proto_memory_pressure(struct proto *prot)
 extern void sock_prot_inuse_add(struct net *net, struct proto *prot, int inc);
 extern int sock_prot_inuse_get(struct net *net, struct proto *proto);
 #else
-static void inline sock_prot_inuse_add(struct net *net, struct proto *prot,
+static inline void sock_prot_inuse_add(struct net *net, struct proto *prot,
                 int inc)
 {
 }
@@ -1247,24 +1282,24 @@ static inline int sk_mem_pages(int amt)
         return (amt + SK_MEM_QUANTUM - 1) >> SK_MEM_QUANTUM_SHIFT;
 }
 
-static inline int sk_has_account(struct sock *sk)
+static inline bool sk_has_account(struct sock *sk)
 {
         /* return true if protocol supports memory accounting */
         return !!sk->sk_prot->memory_allocated;
 }
 
-static inline int sk_wmem_schedule(struct sock *sk, int size)
+static inline bool sk_wmem_schedule(struct sock *sk, int size)
 {
         if (!sk_has_account(sk))
-                return 1;
+                return true;
         return size <= sk->sk_forward_alloc ||
                 __sk_mem_schedule(sk, size, SK_MEM_SEND);
 }
 
-static inline int sk_rmem_schedule(struct sock *sk, int size)
+static inline bool sk_rmem_schedule(struct sock *sk, int size)
 {
         if (!sk_has_account(sk))
-                return 1;
+                return true;
         return size <= sk->sk_forward_alloc ||
                 __sk_mem_schedule(sk, size, SK_MEM_RECV);
 }
@@ -1329,7 +1364,7 @@ static inline void sk_wmem_free_skb(struct sock *sk, struct sk_buff *skb)
  * Mark both the sk_lock and the sk_lock.slock as a
  * per-address-family lock class.
  */
-#define sock_lock_init_class_and_name(sk, sname, skey, name, key)       \
+#define sock_lock_init_class_and_name(sk, sname, skey, name, key)       \
 do {                                                                    \
         sk->sk_lock.owned = 0;                                          \
         init_waitqueue_head(&sk->sk_lock.wq);                           \
@@ -1337,7 +1372,7 @@ do {									\
         debug_check_no_locks_freed((void *)&(sk)->sk_lock,              \
                         sizeof((sk)->sk_lock));                         \
         lockdep_set_class_and_name(&(sk)->sk_lock.slock,                \
-                        (skey), (sname));                               \
+                                (skey), (sname));                               \
         lockdep_init_map(&(sk)->sk_lock.dep_map, (name), (key), 0);     \
 } while (0)
 
@@ -1397,13 +1432,13 @@ extern int			sock_setsockopt(struct socket *sock, int level,
                                                 unsigned int optlen);
 
 extern int                      sock_getsockopt(struct socket *sock, int level,
-                                                int op, char __user *optval, 
+                                                int op, char __user *optval,
                                                 int __user *optlen);
-extern struct sk_buff           *sock_alloc_send_skb(struct sock *sk,
+extern struct sk_buff           *sock_alloc_send_skb(struct sock *sk,
                                                      unsigned long size,
                                                      int noblock,
                                                      int *errcode);
-extern struct sk_buff           *sock_alloc_send_pskb(struct sock *sk,
+extern struct sk_buff           *sock_alloc_send_pskb(struct sock *sk,
                                                       unsigned long header_len,
                                                       unsigned long data_len,
                                                       int noblock,
@@ -1425,7 +1460,7 @@ static inline void sock_update_classid(struct sock *sk)
  * Functions to fill in entries in struct proto_ops when a protocol
  * does not implement a particular function.
  */
-extern int                      sock_no_bind(struct socket *, 
+extern int                      sock_no_bind(struct socket *,
                                              struct sockaddr *, int);
 extern int                      sock_no_connect(struct socket *,
                                                 struct sockaddr *, int, int);
@@ -1454,7 +1489,7 @@ extern int			sock_no_mmap(struct file *file,
                                              struct vm_area_struct *vma);
 extern ssize_t                  sock_no_sendpage(struct socket *sock,
                                                 struct page *page,
-                                                int offset, size_t size, 
+                                                int offset, size_t size,
                                                 int flags);
 
 /*
@@ -1477,7 +1512,7 @@ extern void sk_common_release(struct sock *sk);
 /*
  *      Default socket callbacks and setup code
  */
- 
+
 /* Initialise core socket variables */
 extern void sock_init_data(struct socket *sock, struct sock *sk);
 
@@ -1677,7 +1712,7 @@ extern struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie);
 
 extern struct dst_entry *sk_dst_check(struct sock *sk, u32 cookie);
 
-static inline int sk_can_gso(const struct sock *sk)
+static inline bool sk_can_gso(const struct sock *sk)
 {
         return net_gso_ok(sk->sk_route_caps, sk->sk_gso_type);
 }
@@ -1794,7 +1829,7 @@ static inline int sk_rmem_alloc_get(const struct sock *sk)
  *
  * Returns true if socket has write or read allocations
  */
-static inline int sk_has_allocations(const struct sock *sk)
+static inline bool sk_has_allocations(const struct sock *sk)
 {
         return sk_wmem_alloc_get(sk) || sk_rmem_alloc_get(sk);
 }
@@ -1833,9 +1868,7 @@ static inline int sk_has_allocations(const struct sock *sk)
  */
 static inline bool wq_has_sleeper(struct socket_wq *wq)
 {
-
-        /*
-         * We need to be sure we are in sync with the
+        /* We need to be sure we are in sync with the
          * add_wait_queue modifications to the wait queue.
          *
          * This memory barrier is paired in the sock_poll_wait.
@@ -1857,22 +1890,21 @@ static inline void sock_poll_wait(struct file *filp,
 {
         if (!poll_does_not_wait(p) && wait_address) {
                 poll_wait(filp, wait_address, p);
-                /*
-                 * We need to be sure we are in sync with the
+                /* We need to be sure we are in sync with the
                  * socket flags modification.
                  *
                  * This memory barrier is paired in the wq_has_sleeper.
-                */
+                 */
                 smp_mb();
         }
 }
 
 /*
- *      Queue a received datagram if it will fit. Stream and sequenced
+ *      Queue a received datagram if it will fit. Stream and sequenced
  *      protocols can't normally use this as they need to fit buffers in
  *      and play with them.
  *
- *      Inlined as it's very short and called for pretty much every
+ *      Inlined as it's very short and called for pretty much every
  *      packet ever received.
  */
 
@@ -1898,10 +1930,10 @@ static inline void skb_set_owner_r(struct sk_buff *skb, struct sock *sk)
         sk_mem_charge(sk, skb->truesize);
 }
 
-extern void sk_reset_timer(struct sock *sk, struct timer_list* timer,
+extern void sk_reset_timer(struct sock *sk, struct timer_list *timer,
                            unsigned long expires);
 
-extern void sk_stop_timer(struct sock *sk, struct timer_list* timer);
+extern void sk_stop_timer(struct sock *sk, struct timer_list *timer);
 
 extern int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb);
 
@@ -1910,7 +1942,7 @@ extern int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb);
 /*
  *      Recover an error report and clear atomically
  */
- 
+
 static inline int sock_error(struct sock *sk)
 {
         int err;
@@ -1926,7 +1958,7 @@ static inline unsigned long sock_wspace(struct sock *sk)
 
         if (!(sk->sk_shutdown & SEND_SHUTDOWN)) {
                 amt = sk->sk_sndbuf - atomic_read(&sk->sk_wmem_alloc);
-                if (amt < 0) 
+                if (amt < 0)
                         amt = 0;
         }
         return amt;
@@ -1970,7 +2002,7 @@ static inline struct page *sk_stream_alloc_page(struct sock *sk)
 /*
  *      Default write policy as shown to user space via poll/select/SIGIO
  */
-static inline int sock_writeable(const struct sock *sk) 
+static inline bool sock_writeable(const struct sock *sk)
 {
         return atomic_read(&sk->sk_wmem_alloc) < (sk->sk_sndbuf >> 1);
 }
@@ -1980,12 +2012,12 @@ static inline gfp_t gfp_any(void)
         return in_softirq() ? GFP_ATOMIC : GFP_KERNEL;
 }
 
-static inline long sock_rcvtimeo(const struct sock *sk, int noblock)
+static inline long sock_rcvtimeo(const struct sock *sk, bool noblock)
 {
         return noblock ? 0 : sk->sk_rcvtimeo;
 }
 
-static inline long sock_sndtimeo(const struct sock *sk, int noblock)
+static inline long sock_sndtimeo(const struct sock *sk, bool noblock)
 {
         return noblock ? 0 : sk->sk_sndtimeo;
 }
@@ -2008,7 +2040,7 @@ extern void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
 extern void __sock_recv_wifi_status(struct msghdr *msg, struct sock *sk,
         struct sk_buff *skb);
 
-static __inline__ void
+static inline void
 sock_recv_timestamp(struct msghdr *msg, struct sock *sk, struct sk_buff *skb)
 {
         ktime_t kt = skb->tstamp;
@@ -2049,7 +2081,7 @@ static inline void sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk,
                            (1UL << SOCK_RCVTSTAMP)                      | \
                            (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE)       | \
                            (1UL << SOCK_TIMESTAMPING_SOFTWARE)          | \
-                           (1UL << SOCK_TIMESTAMPING_RAW_HARDWARE)      | \
+                           (1UL << SOCK_TIMESTAMPING_RAW_HARDWARE)      | \
                            (1UL << SOCK_TIMESTAMPING_SYS_HARDWARE))
 
         if (sk->sk_flags & FLAGS_TS_OR_DROPS)
@@ -2078,7 +2110,7 @@ extern int sock_tx_timestamp(struct sock *sk, __u8 *tx_flags);
  * locked so that the sk_buff queue operation is ok.
 */
 #ifdef CONFIG_NET_DMA
-static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb, int copied_early)
+static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb, bool copied_early)
 {
         __skb_unlink(skb, &sk->sk_receive_queue);
         if (!copied_early)
@@ -2087,7 +2119,7 @@ static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb, int copied_e
                 __skb_queue_tail(&sk->sk_async_wait_queue, skb);
 }
 #else
-static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb, int copied_early)
+static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb, bool copied_early)
 {
         __skb_unlink(skb, &sk->sk_receive_queue);
         __kfree_skb(skb);
@@ -2134,8 +2166,8 @@ extern void sock_enable_timestamp(struct sock *sk, int flag);
 extern int sock_get_timestamp(struct sock *, struct timeval __user *);
 extern int sock_get_timestampns(struct sock *, struct timespec __user *);
 
-/* 
- *      Enable debug/info messages 
+/*
+ *      Enable debug/info messages
  */
 extern int net_msg_warn;
 #define NETDEBUG(fmt, args...) \
diff --git a/include/net/tcp.h b/include/net/tcp.h
index f75a04d752cb..e79aa48d9fc1 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -123,7 +123,7 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo);
 #endif
 #define TCP_RTO_MAX     ((unsigned)(120*HZ))
 #define TCP_RTO_MIN     ((unsigned)(HZ/5))
-#define TCP_TIMEOUT_INIT ((unsigned)(1*HZ))     /* RFC2988bis initial RTO value */
+#define TCP_TIMEOUT_INIT ((unsigned)(1*HZ))     /* RFC6298 2.1 initial RTO value        */
 #define TCP_TIMEOUT_FALLBACK ((unsigned)(3*HZ)) /* RFC 1122 initial RTO value, now
                                                  * used as a fallback RTO for the
                                                  * initial data transmission if no
@@ -252,6 +252,7 @@ extern int sysctl_tcp_max_ssthresh;
 extern int sysctl_tcp_cookie_size;
 extern int sysctl_tcp_thin_linear_timeouts;
 extern int sysctl_tcp_thin_dupack;
+extern int sysctl_tcp_early_retrans;
 
 extern atomic_long_t tcp_memory_allocated;
 extern struct percpu_counter tcp_sockets_allocated;
@@ -262,14 +263,14 @@ extern int tcp_memory_pressure;
  * and worry about wraparound (automatic with unsigned arithmetic).
  */
 
-static inline int before(__u32 seq1, __u32 seq2)
+static inline bool before(__u32 seq1, __u32 seq2)
 {
         return (__s32)(seq1-seq2) < 0;
 }
 #define after(seq2, seq1)       before(seq1, seq2)
 
 /* is s2<=s1<=s3 ? */
-static inline int between(__u32 seq1, __u32 seq2, __u32 seq3)
+static inline bool between(__u32 seq1, __u32 seq2, __u32 seq3)
 {
         return seq3 - seq2 >= seq1 - seq2;
 }
@@ -304,7 +305,7 @@ static inline void tcp_synq_overflow(struct sock *sk)
 }
 
 /* syncookies: no recent synqueue overflow on this listening socket? */
-static inline int tcp_synq_no_recent_overflow(const struct sock *sk)
+static inline bool tcp_synq_no_recent_overflow(const struct sock *sk)
 {
         unsigned long last_overflow = tcp_sk(sk)->rx_opt.ts_recent_stamp;
         return time_after(jiffies, last_overflow + TCP_TIMEOUT_FALLBACK);
@@ -366,13 +367,6 @@ static inline void tcp_dec_quickack_mode(struct sock *sk,
 #define TCP_ECN_DEMAND_CWR      4
 #define TCP_ECN_SEEN            8
 
-static __inline__ void
-TCP_ECN_create_request(struct request_sock *req, struct tcphdr *th)
-{
-        if (sysctl_tcp_ecn && th->ece && th->cwr)
-                inet_rsk(req)->ecn_ok = 1;
-}
-
 enum tcp_tw_status {
         TCP_TW_SUCCESS = 0,
         TCP_TW_RST = 1,
@@ -389,12 +383,13 @@ extern struct sock * tcp_check_req(struct sock *sk,struct sk_buff *skb,
                                    struct request_sock **prev);
 extern int tcp_child_process(struct sock *parent, struct sock *child,
                              struct sk_buff *skb);
-extern int tcp_use_frto(struct sock *sk);
+extern bool tcp_use_frto(struct sock *sk);
 extern void tcp_enter_frto(struct sock *sk);
 extern void tcp_enter_loss(struct sock *sk, int how);
 extern void tcp_clear_retrans(struct tcp_sock *tp);
 extern void tcp_update_metrics(struct sock *sk);
 extern void tcp_close(struct sock *sk, long timeout);
+extern void tcp_init_sock(struct sock *sk);
 extern unsigned int tcp_poll(struct file * file, struct socket *sock,
                              struct poll_table_struct *wait);
 extern int tcp_getsockopt(struct sock *sk, int level, int optname,
@@ -435,6 +430,9 @@ extern struct sk_buff * tcp_make_synack(struct sock *sk, struct dst_entry *dst,
                                         struct request_values *rvp);
 extern int tcp_disconnect(struct sock *sk, int flags);
 
+void tcp_connect_init(struct sock *sk);
+void tcp_finish_connect(struct sock *sk, struct sk_buff *skb);
+int tcp_send_rcvq(struct sock *sk, struct msghdr *msg, size_t size);
 
 /* From syncookies.c */
 extern __u32 syncookie_secret[2][16-4+SHA_DIGEST_WORDS];
@@ -472,7 +470,7 @@ static inline __u32 cookie_v6_init_sequence(struct sock *sk,
 
 extern void __tcp_push_pending_frames(struct sock *sk, unsigned int cur_mss,
                                       int nonagle);
-extern int tcp_may_send_now(struct sock *sk);
+extern bool tcp_may_send_now(struct sock *sk);
 extern int tcp_retransmit_skb(struct sock *, struct sk_buff *);
 extern void tcp_retransmit_timer(struct sock *sk);
 extern void tcp_xmit_retransmit_queue(struct sock *);
@@ -486,15 +484,17 @@ extern int tcp_write_wakeup(struct sock *);
 extern void tcp_send_fin(struct sock *sk);
 extern void tcp_send_active_reset(struct sock *sk, gfp_t priority);
 extern int tcp_send_synack(struct sock *);
-extern int tcp_syn_flood_action(struct sock *sk,
-                                const struct sk_buff *skb,
-                                const char *proto);
+extern bool tcp_syn_flood_action(struct sock *sk,
+                                 const struct sk_buff *skb,
+                                 const char *proto);
 extern void tcp_push_one(struct sock *, unsigned int mss_now);
 extern void tcp_send_ack(struct sock *sk);
 extern void tcp_send_delayed_ack(struct sock *sk);
 
 /* tcp_input.c */
 extern void tcp_cwnd_application_limited(struct sock *sk);
+extern void tcp_resume_early_retransmit(struct sock *sk);
+extern void tcp_rearm_rto(struct sock *sk);
 
 /* tcp_timer.c */
 extern void tcp_init_xmit_timers(struct sock *);
@@ -540,8 +540,8 @@ extern int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,
 
 extern void tcp_initialize_rcv_mss(struct sock *sk);
 
-extern int tcp_mtu_to_mss(const struct sock *sk, int pmtu);
-extern int tcp_mss_to_mtu(const struct sock *sk, int mss);
+extern int tcp_mtu_to_mss(struct sock *sk, int pmtu);
+extern int tcp_mss_to_mtu(struct sock *sk, int mss);
 extern void tcp_mtup_init(struct sock *sk);
 extern void tcp_valid_rtt_meas(struct sock *sk, u32 seq_rtt);
 
@@ -609,6 +609,8 @@ static inline u32 tcp_receive_window(const struct tcp_sock *tp)
  */
 extern u32 __tcp_select_window(struct sock *sk);
 
+void tcp_send_window_probe(struct sock *sk);
+
 /* TCP timestamps are only 32-bits, this causes a slight
  * complication on 64-bit systems since we store a snapshot
  * of jiffies in the buffer control blocks below.  We decided
@@ -645,21 +647,38 @@ struct tcp_skb_cb {
         __u32           end_seq;        /* SEQ + FIN + SYN + datalen    */
         __u32           when;           /* used to compute rtt's        */
         __u8            tcp_flags;      /* TCP header flags. (tcp[13])  */
+
         __u8            sacked;         /* State flags for SACK/FACK.   */
 #define TCPCB_SACKED_ACKED      0x01    /* SKB ACK'd by a SACK block    */
 #define TCPCB_SACKED_RETRANS    0x02    /* SKB retransmitted            */
 #define TCPCB_LOST              0x04    /* SKB is lost                  */
 #define TCPCB_TAGBITS           0x07    /* All tag bits                 */
-        __u8            ip_dsfield;     /* IPv4 tos or IPv6 dsfield     */
-        /* 1 byte hole */
 #define TCPCB_EVER_RETRANS      0x80    /* Ever retransmitted frame     */
 #define TCPCB_RETRANS           (TCPCB_SACKED_RETRANS|TCPCB_EVER_RETRANS)
 
+        __u8            ip_dsfield;     /* IPv4 tos or IPv6 dsfield     */
+        /* 1 byte hole */
         __u32           ack_seq;        /* Sequence number ACK'd        */
 };
 
 #define TCP_SKB_CB(__skb)       ((struct tcp_skb_cb *)&((__skb)->cb[0]))
 
+/* RFC3168 : 6.1.1 SYN packets must not have ECT/ECN bits set
+ *
+ * If we receive a SYN packet with these bits set, it means a network is
+ * playing bad games with TOS bits. In order to avoid possible false congestion
+ * notifications, we disable TCP ECN negociation.
+ */
+static inline void
+TCP_ECN_create_request(struct request_sock *req, const struct sk_buff *skb)
+{
+        const struct tcphdr *th = tcp_hdr(skb);
+
+        if (sysctl_tcp_ecn && th->ece && th->cwr &&
+            INET_ECN_is_not_ect(TCP_SKB_CB(skb)->ip_dsfield))
+                inet_rsk(req)->ecn_ok = 1;
+}
+
 /* Due to TSO, an SKB can be composed of multiple actual
  * packets.  To keep these tracked properly, we use this.
  */
@@ -775,12 +794,12 @@ static inline int tcp_is_sack(const struct tcp_sock *tp)
         return tp->rx_opt.sack_ok;
 }
 
-static inline int tcp_is_reno(const struct tcp_sock *tp)
+static inline bool tcp_is_reno(const struct tcp_sock *tp)
 {
         return !tcp_is_sack(tp);
 }
 
-static inline int tcp_is_fack(const struct tcp_sock *tp)
+static inline bool tcp_is_fack(const struct tcp_sock *tp)
 {
         return tp->rx_opt.sack_ok & TCP_FACK_ENABLED;
 }
@@ -790,6 +809,21 @@ static inline void tcp_enable_fack(struct tcp_sock *tp)
         tp->rx_opt.sack_ok |= TCP_FACK_ENABLED;
 }
 
+/* TCP early-retransmit (ER) is similar to but more conservative than
+ * the thin-dupack feature.  Enable ER only if thin-dupack is disabled.
+ */
+static inline void tcp_enable_early_retrans(struct tcp_sock *tp)
+{
+        tp->do_early_retrans = sysctl_tcp_early_retrans &&
+                !sysctl_tcp_thin_dupack && sysctl_tcp_reordering == 3;
+        tp->early_retrans_delayed = 0;
+}
+
+static inline void tcp_disable_early_retrans(struct tcp_sock *tp)
+{
+        tp->do_early_retrans = 0;
+}
+
 static inline unsigned int tcp_left_out(const struct tcp_sock *tp)
 {
         return tp->sacked_out + tp->lost_out;
@@ -867,7 +901,7 @@ static inline u32 tcp_wnd_end(const struct tcp_sock *tp)
 {
         return tp->snd_una + tp->snd_wnd;
 }
-extern int tcp_is_cwnd_limited(const struct sock *sk, u32 in_flight);
+extern bool tcp_is_cwnd_limited(const struct sock *sk, u32 in_flight);
 
 static inline void tcp_minshall_update(struct tcp_sock *tp, unsigned int mss,
                                        const struct sk_buff *skb)
@@ -910,7 +944,7 @@ static inline __sum16 __tcp_checksum_complete(struct sk_buff *skb)
         return __skb_checksum_complete(skb);
 }
 
-static inline int tcp_checksum_complete(struct sk_buff *skb)
+static inline bool tcp_checksum_complete(struct sk_buff *skb)
 {
         return !skb_csum_unnecessary(skb) &&
                 __tcp_checksum_complete(skb);
@@ -940,12 +974,12 @@ static inline void tcp_prequeue_init(struct tcp_sock *tp)
  *
  * NOTE: is this not too big to inline?
  */
-static inline int tcp_prequeue(struct sock *sk, struct sk_buff *skb)
+static inline bool tcp_prequeue(struct sock *sk, struct sk_buff *skb)
 {
         struct tcp_sock *tp = tcp_sk(sk);
 
         if (sysctl_tcp_low_latency || !tp->ucopy.task)
-                return 0;
+                return false;
 
         __skb_queue_tail(&tp->ucopy.prequeue, skb);
         tp->ucopy.memory += skb->truesize;
@@ -969,7 +1003,7 @@ static inline int tcp_prequeue(struct sock *sk, struct sk_buff *skb)
                                                   (3 * tcp_rto_min(sk)) / 4,
                                                   TCP_RTO_MAX);
         }
-        return 1;
+        return true;
 }
 
 
@@ -1074,28 +1108,28 @@ static inline int tcp_fin_time(const struct sock *sk)
         return fin_timeout;
 }
 
-static inline int tcp_paws_check(const struct tcp_options_received *rx_opt,
-                                 int paws_win)
+static inline bool tcp_paws_check(const struct tcp_options_received *rx_opt,
+                                  int paws_win)
 {
         if ((s32)(rx_opt->ts_recent - rx_opt->rcv_tsval) <= paws_win)
-                return 1;
+                return true;
         if (unlikely(get_seconds() >= rx_opt->ts_recent_stamp + TCP_PAWS_24DAYS))
-                return 1;
+                return true;
         /*
          * Some OSes send SYN and SYNACK messages with tsval=0 tsecr=0,
          * then following tcp messages have valid values. Ignore 0 value,
          * or else 'negative' tsval might forbid us to accept their packets.
          */
         if (!rx_opt->ts_recent)
-                return 1;
-        return 0;
+                return true;
+        return false;
 }
 
-static inline int tcp_paws_reject(const struct tcp_options_received *rx_opt,
-                                  int rst)
+static inline bool tcp_paws_reject(const struct tcp_options_received *rx_opt,
+                                   int rst)
 {
         if (tcp_paws_check(rx_opt, 0))
-                return 0;
+                return false;
 
         /* RST segments are not recommended to carry timestamp,
            and, if they do, it is recommended to ignore PAWS because
@@ -1110,8 +1144,8 @@ static inline int tcp_paws_reject(const struct tcp_options_received *rx_opt,
            However, we can relax time bounds for RST segments to MSL.
          */
         if (rst && get_seconds() >= rx_opt->ts_recent_stamp + TCP_PAWS_MSL)
-                return 0;
-        return 1;
+                return false;
+        return true;
 }
 
 static inline void tcp_mib_init(struct net *net)
@@ -1226,7 +1260,7 @@ extern void tcp_put_md5sig_pool(void);
 
 extern int tcp_md5_hash_header(struct tcp_md5sig_pool *, const struct tcphdr *);
 extern int tcp_md5_hash_skb_data(struct tcp_md5sig_pool *, const struct sk_buff *,
-                                 unsigned header_len);
+                                 unsigned int header_len);
 extern int tcp_md5_hash_key(struct tcp_md5sig_pool *hp,
                             const struct tcp_md5sig_key *key);
 
@@ -1349,7 +1383,7 @@ static inline void tcp_unlink_write_queue(struct sk_buff *skb, struct sock *sk)
         __skb_unlink(skb, &sk->sk_write_queue);
 }
 
-static inline int tcp_write_queue_empty(struct sock *sk)
+static inline bool tcp_write_queue_empty(struct sock *sk)
 {
         return skb_queue_empty(&sk->sk_write_queue);
 }
@@ -1406,7 +1440,7 @@ static inline void tcp_highest_sack_combine(struct sock *sk,
 /* Determines whether this is a thin stream (which may suffer from
  * increased latency). Used to trigger latency-reducing mechanisms.
  */
-static inline unsigned int tcp_stream_is_thin(struct tcp_sock *tp)
+static inline bool tcp_stream_is_thin(struct tcp_sock *tp)
 {
         return tp->packets_out < 4 && !tcp_in_initial_slowstart(tp);
 }
diff --git a/include/net/tcp_memcontrol.h b/include/net/tcp_memcontrol.h
index 48410ff25c9e..7df18bc43a97 100644
--- a/include/net/tcp_memcontrol.h
+++ b/include/net/tcp_memcontrol.h
@@ -12,8 +12,8 @@ struct tcp_memcontrol {
 };
 
 struct cg_proto *tcp_proto_cgroup(struct mem_cgroup *memcg);
-int tcp_init_cgroup(struct cgroup *cgrp, struct cgroup_subsys *ss);
-void tcp_destroy_cgroup(struct cgroup *cgrp);
+int tcp_init_cgroup(struct mem_cgroup *memcg, struct cgroup_subsys *ss);
+void tcp_destroy_cgroup(struct mem_cgroup *memcg);
 unsigned long long tcp_max_memory(const struct mem_cgroup *memcg);
 void tcp_prot_mem(struct mem_cgroup *memcg, long val, int idx);
 #endif /* _TCP_MEMCG_H */
diff --git a/include/net/udp.h b/include/net/udp.h
index 5d606d9da9e5..065f379c6503 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -81,7 +81,7 @@ struct udp_table {
 extern struct udp_table udp_table;
 extern void udp_table_init(struct udp_table *, const char *);
 static inline struct udp_hslot *udp_hashslot(struct udp_table *table,
-                                             struct net *net, unsigned num)
+                                             struct net *net, unsigned int num)
 {
         return &table->hash[udp_hashfn(net, num, table->mask)];
 }
@@ -267,4 +267,8 @@ extern void udp_init(void);
 extern int udp4_ufo_send_check(struct sk_buff *skb);
 extern struct sk_buff *udp4_ufo_fragment(struct sk_buff *skb,
         netdev_features_t features);
+extern void udp_encap_enable(void);
+#if IS_ENABLED(CONFIG_IPV6)
+extern void udpv6_encap_enable(void);
+#endif
 #endif  /* _UDP_H */
diff --git a/include/net/wimax.h b/include/net/wimax.h
index 322ff4fbdb4a..bbb74f990cab 100644
--- a/include/net/wimax.h
+++ b/include/net/wimax.h
@@ -423,8 +423,8 @@ struct wimax_dev {
         int (*op_reset)(struct wimax_dev *wimax_dev);
 
         struct rfkill *rfkill;
-        unsigned rf_hw;
-        unsigned rf_sw;
+        unsigned int rf_hw;
+        unsigned int rf_sw;
         char name[32];
 
         struct dentry *debugfs_dentry;
diff --git a/include/net/wpan-phy.h b/include/net/wpan-phy.h
index ff27f1b078d1..b52bda8d13b1 100644
--- a/include/net/wpan-phy.h
+++ b/include/net/wpan-phy.h
@@ -25,6 +25,14 @@
 #include <linux/mutex.h>
 #include <linux/bug.h>
 
+/* According to the IEEE 802.15.4 stadard the upper most significant bits of
+ * the 32-bit channel bitmaps shall be used as an integer value to specify 32
+ * possible channel pages. The lower 27 bits of the channel bit map shall be
+ * used as a bit mask to specify channel numbers within a channel page.
+ */
+#define WPAN_NUM_CHANNELS       27
+#define WPAN_NUM_PAGES          32
+
 struct wpan_phy {
         struct mutex pib_lock;
 
@@ -43,7 +51,7 @@ struct wpan_phy {
         int idx;
 
         struct net_device *(*add_iface)(struct wpan_phy *phy,
-                        const char *name);
+                                        const char *name, int type);
         void (*del_iface)(struct wpan_phy *phy, struct net_device *dev);
 
         char priv[0] __attribute__((__aligned__(NETDEV_ALIGN)));
diff --git a/include/net/x25.h b/include/net/x25.h
index a06119a05129..b4a8a8923128 100644
--- a/include/net/x25.h
+++ b/include/net/x25.h
@@ -305,7 +305,7 @@ static inline void x25_unregister_sysctl(void) {};
 #endif /* CONFIG_SYSCTL */
 
 struct x25_skb_cb {
-        unsigned flags;
+        unsigned int flags;
 };
 #define X25_SKB_CB(s) ((struct x25_skb_cb *) ((s)->cb))
 
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 96239e78e621..e0a55df5bde8 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -886,15 +886,15 @@ __be16 xfrm_flowi_dport(const struct flowi *fl, const union flowi_uli *uli)
         return port;
 }
 
-extern int xfrm_selector_match(const struct xfrm_selector *sel,
-                               const struct flowi *fl,
-                               unsigned short family);
+extern bool xfrm_selector_match(const struct xfrm_selector *sel,
+                                const struct flowi *fl,
+                                unsigned short family);
 
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
 /*      If neither has a context --> match
  *      Otherwise, both must have a context and the sids, doi, alg must match
  */
-static inline int xfrm_sec_ctx_match(struct xfrm_sec_ctx *s1, struct xfrm_sec_ctx *s2)
+static inline bool xfrm_sec_ctx_match(struct xfrm_sec_ctx *s1, struct xfrm_sec_ctx *s2)
 {
         return ((!s1 && !s2) ||
                 (s1 && s2 &&
@@ -903,9 +903,9 @@ static inline int xfrm_sec_ctx_match(struct xfrm_sec_ctx *s1, struct xfrm_sec_ct
                  (s1->ctx_alg == s2->ctx_alg)));
 }
 #else
-static inline int xfrm_sec_ctx_match(struct xfrm_sec_ctx *s1, struct xfrm_sec_ctx *s2)
+static inline bool xfrm_sec_ctx_match(struct xfrm_sec_ctx *s1, struct xfrm_sec_ctx *s2)
 {
-        return 1;
+        return true;
 }
 #endif
 
@@ -1682,8 +1682,9 @@ static inline int xfrm_mark_get(struct nlattr **attrs, struct xfrm_mark *m)
 
 static inline int xfrm_mark_put(struct sk_buff *skb, const struct xfrm_mark *m)
 {
-        if (m->m | m->v)
-                NLA_PUT(skb, XFRMA_MARK, sizeof(struct xfrm_mark), m);
+        if ((m->m | m->v) &&
+            nla_put(skb, XFRMA_MARK, sizeof(struct xfrm_mark), m))
+                goto nla_put_failure;
         return 0;
 
 nla_put_failure:
diff --git a/include/rdma/ib_mad.h b/include/rdma/ib_mad.h
index b513f57e1725..3d81b90cc315 100644
--- a/include/rdma/ib_mad.h
+++ b/include/rdma/ib_mad.h
@@ -160,7 +160,7 @@ struct ib_rmpp_hdr {
 
 typedef u64 __bitwise ib_sa_comp_mask;
 
-#define IB_SA_COMP_MASK(n) ((__force ib_sa_comp_mask) cpu_to_be64(1ull << n))
+#define IB_SA_COMP_MASK(n) ((__force ib_sa_comp_mask) cpu_to_be64(1ull << (n)))
 
 /*
  * ib_sa_hdr and ib_sa_mad structures must be packed because they have
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index c3cca5a4dacd..07996af8265a 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -605,7 +605,7 @@ enum ib_qp_type {
         IB_QPT_UD,
         IB_QPT_RAW_IPV6,
         IB_QPT_RAW_ETHERTYPE,
-        /* Save 8 for RAW_PACKET */
+        IB_QPT_RAW_PACKET = 8,
         IB_QPT_XRC_INI = 9,
         IB_QPT_XRC_TGT,
         IB_QPT_MAX
@@ -964,7 +964,7 @@ struct ib_qp {
         struct ib_srq          *srq;
         struct ib_xrcd         *xrcd; /* XRC TGT QPs only */
         struct list_head        xrcd_list;
-        atomic_t                usecnt; /* count times opened */
+        atomic_t                usecnt; /* count times opened, mcast attaches */
         struct list_head        open_list;
         struct ib_qp           *real_qp;
         struct ib_uobject      *uobject;
diff --git a/include/scsi/fcoe_sysfs.h b/include/scsi/fcoe_sysfs.h
new file mode 100644
index 000000000000..604cb9bb3e76
--- /dev/null
+++ b/include/scsi/fcoe_sysfs.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2011-2012 Intel Corporation.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
+ *
+ * Maintained at www.Open-FCoE.org
+ */
+
+#ifndef FCOE_SYSFS
+#define FCOE_SYSFS
+
+#include <linux/if_ether.h>
+#include <linux/device.h>
+#include <scsi/fc/fc_fcoe.h>
+
+struct fcoe_ctlr_device;
+struct fcoe_fcf_device;
+
+struct fcoe_sysfs_function_template {
+        void (*get_fcoe_ctlr_link_fail)(struct fcoe_ctlr_device *);
+        void (*get_fcoe_ctlr_vlink_fail)(struct fcoe_ctlr_device *);
+        void (*get_fcoe_ctlr_miss_fka)(struct fcoe_ctlr_device *);
+        void (*get_fcoe_ctlr_symb_err)(struct fcoe_ctlr_device *);
+        void (*get_fcoe_ctlr_err_block)(struct fcoe_ctlr_device *);
+        void (*get_fcoe_ctlr_fcs_error)(struct fcoe_ctlr_device *);
+        void (*get_fcoe_ctlr_mode)(struct fcoe_ctlr_device *);
+        void (*get_fcoe_fcf_selected)(struct fcoe_fcf_device *);
+        void (*get_fcoe_fcf_vlan_id)(struct fcoe_fcf_device *);
+};
+
+#define dev_to_ctlr(d)                                  \
+        container_of((d), struct fcoe_ctlr_device, dev)
+
+enum fip_conn_type {
+        FIP_CONN_TYPE_UNKNOWN,
+        FIP_CONN_TYPE_FABRIC,
+        FIP_CONN_TYPE_VN2VN,
+};
+
+struct fcoe_ctlr_device {
+        u32                             id;
+
+        struct device                   dev;
+        struct fcoe_sysfs_function_template *f;
+
+        struct list_head                fcfs;
+        char                            work_q_name[20];
+        struct workqueue_struct         *work_q;
+        char                            devloss_work_q_name[20];
+        struct workqueue_struct         *devloss_work_q;
+        struct mutex                    lock;
+
+        int                             fcf_dev_loss_tmo;
+        enum fip_conn_type              mode;
+
+        /* expected in host order for displaying */
+        struct fcoe_fc_els_lesb         lesb;
+};
+
+static inline void *fcoe_ctlr_device_priv(const struct fcoe_ctlr_device *ctlr)
+{
+        return (void *)(ctlr + 1);
+}
+
+/* fcf states */
+enum fcf_state {
+        FCOE_FCF_STATE_UNKNOWN,
+        FCOE_FCF_STATE_DISCONNECTED,
+        FCOE_FCF_STATE_CONNECTED,
+        FCOE_FCF_STATE_DELETED,
+};
+
+struct fcoe_fcf_device {
+        u32                 id;
+        struct device       dev;
+        struct list_head    peers;
+        struct work_struct  delete_work;
+        struct delayed_work dev_loss_work;
+        u32                 dev_loss_tmo;
+        void                *priv;
+        enum fcf_state      state;
+
+        u64                 fabric_name;
+        u64                 switch_name;
+        u32                 fc_map;
+        u16                 vfid;
+        u8                  mac[ETH_ALEN];
+        u8                  priority;
+        u32                 fka_period;
+        u8                  selected;
+        u16                 vlan_id;
+};
+
+#define dev_to_fcf(d)                                   \
+        container_of((d), struct fcoe_fcf_device, dev)
+/* parentage should never be missing */
+#define fcoe_fcf_dev_to_ctlr_dev(x)             \
+        dev_to_ctlr((x)->dev.parent)
+#define fcoe_fcf_device_priv(x)                 \
+        ((x)->priv)
+
+struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
+                            struct fcoe_sysfs_function_template *f,
+                            int priv_size);
+void fcoe_ctlr_device_delete(struct fcoe_ctlr_device *);
+struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *,
+                                            struct fcoe_fcf_device *);
+void fcoe_fcf_device_delete(struct fcoe_fcf_device *);
+
+int __init fcoe_sysfs_setup(void);
+void __exit fcoe_sysfs_teardown(void);
+
+#endif /* FCOE_SYSFS */
diff --git a/include/scsi/iscsi_proto.h b/include/scsi/iscsi_proto.h
index 988ba06b3ad6..c1260d80ef30 100644
--- a/include/scsi/iscsi_proto.h
+++ b/include/scsi/iscsi_proto.h
@@ -661,6 +661,8 @@ struct iscsi_reject {
 
 #define ISCSI_DEF_TIME2WAIT                     2
 
+#define ISCSI_NAME_LEN                          224
+
 /************************* RFC 3720 End *****************************/
 
 #endif /* ISCSI_PROTO_H */
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index cfdb55f0937e..22b07cc99808 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -29,6 +29,7 @@
 #include <linux/random.h>
 #include <scsi/fc/fc_fcoe.h>
 #include <scsi/libfc.h>
+#include <scsi/fcoe_sysfs.h>
 
 #define FCOE_MAX_CMD_LEN        16      /* Supported CDB length */
 
@@ -159,8 +160,24 @@ struct fcoe_ctlr {
 };
 
 /**
+ * fcoe_ctlr_priv() - Return the private data from a fcoe_ctlr
+ * @cltr: The fcoe_ctlr whose private data will be returned
+ */
+static inline void *fcoe_ctlr_priv(const struct fcoe_ctlr *ctlr)
+{
+        return (void *)(ctlr + 1);
+}
+
+#define fcoe_ctlr_to_ctlr_dev(x)                                        \
+        (struct fcoe_ctlr_device *)(((struct fcoe_ctlr_device *)(x)) - 1)
+
+/**
  * struct fcoe_fcf - Fibre-Channel Forwarder
  * @list:        list linkage
+ * @event_work:  Work for FC Transport actions queue
+ * @event:       The event to be processed
+ * @fip:         The controller that the FCF was discovered on
+ * @fcf_dev:     The associated fcoe_fcf_device instance
  * @time:        system time (jiffies) when an advertisement was last received
  * @switch_name: WWN of switch from advertisement
  * @fabric_name: WWN of fabric from advertisement
@@ -182,6 +199,9 @@ struct fcoe_ctlr {
  */
 struct fcoe_fcf {
         struct list_head list;
+        struct work_struct event_work;
+        struct fcoe_ctlr *fip;
+        struct fcoe_fcf_device *fcf_dev;
         unsigned long time;
 
         u64 switch_name;
@@ -198,6 +218,9 @@ struct fcoe_fcf {
         u8 fd_flags:1;
 };
 
+#define fcoe_fcf_to_fcf_dev(x)                  \
+        ((x)->fcf_dev)
+
 /**
  * struct fcoe_rport - VN2VN remote port
  * @time:       time of create or last beacon packet received from node
@@ -333,6 +356,10 @@ void fcoe_queue_timer(ulong lport);
 int fcoe_get_paged_crc_eof(struct sk_buff *skb, int tlen,
                            struct fcoe_percpu_s *fps);
 
+/* FCoE Sysfs helpers */
+void fcoe_fcf_get_selected(struct fcoe_fcf_device *);
+void fcoe_ctlr_get_fip_mode(struct fcoe_ctlr_device *);
+
 /**
  * struct netdev_list
  * A mapping from netdevice to fcoe_transport
diff --git a/include/scsi/sas.h b/include/scsi/sas.h
index a577a833603d..be3eb0bf1ac0 100644
--- a/include/scsi/sas.h
+++ b/include/scsi/sas.h
@@ -103,6 +103,7 @@ enum sas_dev_type {
 };
 
 enum sas_protocol {
+        SAS_PROTOCOL_NONE               = 0,
         SAS_PROTOCOL_SATA               = 0x01,
         SAS_PROTOCOL_SMP                = 0x02,
         SAS_PROTOCOL_STP                = 0x04,
diff --git a/include/sound/asound.h b/include/sound/asound.h
index a2e4ff5ba9e9..0876a1e76aef 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -70,6 +70,20 @@ struct snd_aes_iec958 {
 
 /****************************************************************************
  *                                                                          *
+ *        CEA-861 Audio InfoFrame. Used in HDMI and DisplayPort             *
+ *                                                                          *
+ ****************************************************************************/
+
+struct snd_cea_861_aud_if {
+        unsigned char db1_ct_cc; /* coding type and channel count */
+        unsigned char db2_sf_ss; /* sample frequency and size */
+        unsigned char db3; /* not used, all zeros */
+        unsigned char db4_ca; /* channel allocation code */
+        unsigned char db5_dminh_lsv; /* downmix inhibit & level-shit values */
+};
+
+/****************************************************************************
+ *                                                                          *
  *      Section for driver hardware dependent interface - /dev/snd/hw?      *
  *                                                                          *
  ****************************************************************************/
diff --git a/include/sound/asoundef.h b/include/sound/asoundef.h
index 20ebf3298eba..bb05c02f89b0 100644
--- a/include/sound/asoundef.h
+++ b/include/sound/asoundef.h
@@ -170,6 +170,47 @@
 #define IEC958_AES5_CON_CGMSA_COPYNOMORE (2<<0) /* condition not be used */
 #define IEC958_AES5_CON_CGMSA_COPYNEVER (3<<0)  /* no copying is permitted */
 
+/****************************************************************************
+ *                                                                          *
+ *        CEA-861 Audio InfoFrame. Used in HDMI and DisplayPort             *
+ *                                                                          *
+ ****************************************************************************/
+#define CEA861_AUDIO_INFOFRAME_DB1CC            (7<<0) /* mask - channel count */
+#define CEA861_AUDIO_INFOFRAME_DB1CT            (0xf<<4) /* mask - coding type */
+#define CEA861_AUDIO_INFOFRAME_DB1CT_FROM_STREAM (0<<4) /* refer to stream */
+#define CEA861_AUDIO_INFOFRAME_DB1CT_IEC60958   (1<<4) /* IEC-60958 L-PCM */
+#define CEA861_AUDIO_INFOFRAME_DB1CT_AC3        (2<<4) /* AC-3 */
+#define CEA861_AUDIO_INFOFRAME_DB1CT_MPEG1      (3<<4) /* MPEG1 Layers 1 & 2 */
+#define CEA861_AUDIO_INFOFRAME_DB1CT_MP3        (4<<4) /* MPEG1 Layer 3 */
+#define CEA861_AUDIO_INFOFRAME_DB1CT_MPEG2_MULTICH (5<<4) /* MPEG2 Multichannel */
+#define CEA861_AUDIO_INFOFRAME_DB1CT_AAC        (6<<4) /* AAC */
+#define CEA861_AUDIO_INFOFRAME_DB1CT_DTS        (7<<4) /* DTS */
+#define CEA861_AUDIO_INFOFRAME_DB1CT_ATRAC      (8<<4) /* ATRAC */
+#define CEA861_AUDIO_INFOFRAME_DB1CT_ONEBIT     (9<<4) /* One Bit Audio */
+#define CEA861_AUDIO_INFOFRAME_DB1CT_DOLBY_DIG_PLUS (10<<4) /* Dolby Digital + */
+#define CEA861_AUDIO_INFOFRAME_DB1CT_DTS_HD     (11<<4) /* DTS-HD */
+#define CEA861_AUDIO_INFOFRAME_DB1CT_MAT        (12<<4) /* MAT (MLP) */
+#define CEA861_AUDIO_INFOFRAME_DB1CT_DST        (13<<4) /* DST */
+#define CEA861_AUDIO_INFOFRAME_DB1CT_WMA_PRO    (14<<4) /* WMA Pro */
+#define CEA861_AUDIO_INFOFRAME_DB2SF            (7<<2) /* mask - sample frequency */
+#define CEA861_AUDIO_INFOFRAME_DB2SF_FROM_STREAM (0<<2) /* refer to stream */
+#define CEA861_AUDIO_INFOFRAME_DB2SF_32000      (1<<2) /* 32kHz */
+#define CEA861_AUDIO_INFOFRAME_DB2SF_44100      (2<<2) /* 44.1kHz */
+#define CEA861_AUDIO_INFOFRAME_DB2SF_48000      (3<<2) /* 48kHz */
+#define CEA861_AUDIO_INFOFRAME_DB2SF_88200      (4<<2) /* 88.2kHz */
+#define CEA861_AUDIO_INFOFRAME_DB2SF_96000      (5<<2) /* 96kHz */
+#define CEA861_AUDIO_INFOFRAME_DB2SF_176400     (6<<2) /* 176.4kHz */
+#define CEA861_AUDIO_INFOFRAME_DB2SF_192000     (7<<2) /* 192kHz */
+#define CEA861_AUDIO_INFOFRAME_DB2SS            (3<<0) /* mask - sample size */
+#define CEA861_AUDIO_INFOFRAME_DB2SS_FROM_STREAM (0<<0) /* refer to stream */
+#define CEA861_AUDIO_INFOFRAME_DB2SS_16BIT      (1<<0) /* 16 bits */
+#define CEA861_AUDIO_INFOFRAME_DB2SS_20BIT      (2<<0) /* 20 bits */
+#define CEA861_AUDIO_INFOFRAME_DB2SS_24BIT      (3<<0) /* 24 bits */
+#define CEA861_AUDIO_INFOFRAME_DB5_DM_INH       (1<<7) /* mask - inhibit downmixing */
+#define CEA861_AUDIO_INFOFRAME_DB5_DM_INH_PERMITTED (0<<7) /* stereo downmix permitted */
+#define CEA861_AUDIO_INFOFRAME_DB5_DM_INH_PROHIBITED (1<<7) /* stereo downmis prohibited */
+#define CEA861_AUDIO_INFOFRAME_DB5_LSV          (0xf<<3) /* mask - level-shift values */
+
 /*****************************************************************************
  *                                                                           *
  *                            MIDI v1.0 interface                            *
diff --git a/include/sound/cs42l52.h b/include/sound/cs42l52.h
new file mode 100644
index 000000000000..4c68955f7330
--- /dev/null
+++ b/include/sound/cs42l52.h
@@ -0,0 +1,36 @@
+/*
+ * linux/sound/cs42l52.h -- Platform data for CS42L52
+ *
+ * Copyright (c) 2012 Cirrus Logic Inc.
+ *
+ * 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 __CS42L52_H
+#define __CS42L52_H
+
+struct cs42l52_platform_data {
+
+        /* MICBIAS Level. Check datasheet Pg48 */
+        unsigned int micbias_lvl;
+
+        /* MICA mode selection 0=Single 1=Differential */
+        unsigned int mica_cfg;
+
+        /* MICB mode selection 0=Single 1=Differential */
+        unsigned int micb_cfg;
+
+        /* MICA Select 0=MIC1A 1=MIC2A */
+        unsigned int mica_sel;
+
+        /* MICB Select 0=MIC2A 1=MIC2B */
+        unsigned int micb_sel;
+
+        /* Charge Pump Freq. Check datasheet Pg73 */
+        unsigned int chgfreq;
+
+};
+
+#endif /* __CS42L52_H */
diff --git a/include/sound/max98095.h b/include/sound/max98095.h
index 7513a42dd4aa..e87ae67b0a55 100644
--- a/include/sound/max98095.h
+++ b/include/sound/max98095.h
@@ -49,6 +49,18 @@ struct max98095_pdata {
          */
         unsigned int digmic_left_mode:1;
         unsigned int digmic_right_mode:1;
+
+        /* Pin5 is the mechanical method of sensing jack insertion
+         * but it is something that might not be supported.
+         * 0 = PIN5 not supported
+         * 1 = PIN5 supported
+         */
+        unsigned int jack_detect_pin5en:1;
+
+        /* Slew amount for jack detection. Calculated as 4 * (delay + 1).
+         * Default delay is 24 to get a time of 100ms.
+         */
+        unsigned int jack_detect_delay;
 };
 
 #endif
diff --git a/include/sound/sh_fsi.h b/include/sound/sh_fsi.h
index b457e87fbd08..906010344dd7 100644
--- a/include/sound/sh_fsi.h
+++ b/include/sound/sh_fsi.h
@@ -21,10 +21,11 @@
 /*
  * flags format
  *
- * 0x000000BA
+ * 0x00000CBA
  *
  * A:  inversion
  * B:  format mode
+ * C:  chip specific
  */
 
 /* A: clock inversion */
@@ -39,6 +40,9 @@
 #define SH_FSI_FMT_DAI          (0 << 4)
 #define SH_FSI_FMT_SPDIF        (1 << 4)
 
+/* C: chip specific */
+#define SH_FSI_OPTION_MASK      0x00000F00
+#define SH_FSI_ENABLE_STREAM_MODE       (1 << 8) /* for 16bit data */
 
 /*
  * set_rate return value
@@ -84,16 +88,4 @@ struct sh_fsi_platform_info {
         struct sh_fsi_port_info port_b;
 };
 
-/*
- * for fsi-ak4642
- */
-struct fsi_ak4642_info {
-        const char *name;
-        const char *card;
-        const char *cpu_dai;
-        const char *codec;
-        const char *platform;
-        int id;
-};
-
 #endif /* __SOUND_FSI_H */
diff --git a/include/sound/simple_card.h b/include/sound/simple_card.h
new file mode 100644
index 000000000000..4b62b8dc6a4f
--- /dev/null
+++ b/include/sound/simple_card.h
@@ -0,0 +1,38 @@
+/*
+ * ASoC simple sound card support
+ *
+ * Copyright (C) 2012 Renesas Solutions Corp.
+ * Kuninori Morimoto <kuninori.morimoto.gx@renesas.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.
+ */
+
+#ifndef __SIMPLE_CARD_H
+#define __SIMPLE_CARD_H
+
+#include <sound/soc.h>
+
+struct asoc_simple_dai_init_info {
+        unsigned int fmt;
+        unsigned int cpu_daifmt;
+        unsigned int codec_daifmt;
+        unsigned int sysclk;
+};
+
+struct asoc_simple_card_info {
+        const char *name;
+        const char *card;
+        const char *cpu_dai;
+        const char *codec;
+        const char *platform;
+        const char *codec_dai;
+        struct asoc_simple_dai_init_info *init; /* for snd_link.init */
+
+        /* used in simple-card.c */
+        struct snd_soc_dai_link snd_link;
+        struct snd_soc_card snd_card;
+};
+
+#endif /* __SIMPLE_CARD_H */
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index c429f248cf4e..1f69e0af2941 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -173,6 +173,8 @@ struct snd_soc_dai_ops {
                 struct snd_soc_dai *);
         int (*trigger)(struct snd_pcm_substream *, int,
                 struct snd_soc_dai *);
+        int (*bespoke_trigger)(struct snd_pcm_substream *, int,
+                struct snd_soc_dai *);
         /*
          * For hardware based FIFO caused delay reporting.
          * Optional.
@@ -196,6 +198,7 @@ struct snd_soc_dai_driver {
         const char *name;
         unsigned int id;
         int ac97_control;
+        unsigned int base;
 
         /* DAI driver callbacks */
         int (*probe)(struct snd_soc_dai *dai);
@@ -241,6 +244,7 @@ struct snd_soc_dai {
 
         struct snd_soc_dapm_widget *playback_widget;
         struct snd_soc_dapm_widget *capture_widget;
+        struct snd_soc_dapm_context dapm;
 
         /* DAI DMA data */
         void *playback_dma_data;
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 8da3c2409060..e3833d9f1914 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -141,10 +141,6 @@ struct device;
 {       .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \
         .invert = winvert, .kcontrol_news = wcontrols, \
         .num_kcontrols = wncontrols, .event = wevent, .event_flags = wflags}
-#define SND_SOC_DAPM_MICBIAS_E(wname, wreg, wshift, winvert, wevent, wflags) \
-{       .id = snd_soc_dapm_micbias, .name = wname, .reg = wreg, .shift = wshift, \
-        .invert = winvert, .kcontrol_news = NULL, .num_kcontrols = 0, \
-        .event = wevent, .event_flags = wflags}
 #define SND_SOC_DAPM_SWITCH_E(wname, wreg, wshift, winvert, wcontrols, \
         wevent, wflags) \
 {       .id = snd_soc_dapm_switch, .name = wname, .reg = wreg, .shift = wshift, \
@@ -324,6 +320,8 @@ struct snd_soc_dapm_path;
 struct snd_soc_dapm_pin;
 struct snd_soc_dapm_route;
 struct snd_soc_dapm_context;
+struct regulator;
+struct snd_soc_dapm_widget_list;
 
 int dapm_reg_event(struct snd_soc_dapm_widget *w,
                    struct snd_kcontrol *kcontrol, int event);
@@ -359,6 +357,10 @@ int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm,
 int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,
                                  struct snd_soc_dai *dai);
 int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card);
+int snd_soc_dapm_new_pcm(struct snd_soc_card *card,
+                         const struct snd_soc_pcm_stream *params,
+                         struct snd_soc_dapm_widget *source,
+                         struct snd_soc_dapm_widget *sink);
 
 /* dapm path setup */
 int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm);
@@ -369,8 +371,8 @@ int snd_soc_dapm_weak_routes(struct snd_soc_dapm_context *dapm,
                              const struct snd_soc_dapm_route *route, int num);
 
 /* dapm events */
-int snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream,
-                              struct snd_soc_dai *dai, int event);
+void snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream,
+        int event);
 void snd_soc_dapm_shutdown(struct snd_soc_card *card);
 
 /* external DAPM widget events */
@@ -402,6 +404,10 @@ void snd_soc_dapm_auto_nc_codec_pins(struct snd_soc_codec *codec);
 /* Mostly internal - should not normally be used */
 void dapm_mark_dirty(struct snd_soc_dapm_widget *w, const char *reason);
 
+/* dapm path query */
+int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream,
+        struct snd_soc_dapm_widget_list **list);
+
 /* dapm widget types */
 enum snd_soc_dapm_type {
         snd_soc_dapm_input = 0,         /* input pin */
@@ -430,6 +436,12 @@ enum snd_soc_dapm_type {
         snd_soc_dapm_aif_out,           /* audio interface output */
         snd_soc_dapm_siggen,            /* signal generator */
         snd_soc_dapm_dai,               /* link to DAI structure */
+        snd_soc_dapm_dai_link,          /* link between two DAI structures */
+};
+
+enum snd_soc_dapm_subclass {
+        SND_SOC_DAPM_CLASS_INIT         = 0,
+        SND_SOC_DAPM_CLASS_RUNTIME      = 1,
 };
 
 /*
@@ -482,9 +494,11 @@ struct snd_soc_dapm_widget {
         struct snd_soc_dapm_context *dapm;
 
         void *priv;                             /* widget specific data */
+        struct regulator *regulator;            /* attached regulator */
+        const struct snd_soc_pcm_stream *params; /* params for dai links */
 
         /* dapm control */
-        short reg;                                              /* negative reg = no direct dapm */
+        int reg;                                /* negative reg = no direct dapm */
         unsigned char shift;                    /* bits to shift */
         unsigned int saved_value;               /* widget saved value */
         unsigned int value;                             /* widget current value */
diff --git a/include/sound/soc-dpcm.h b/include/sound/soc-dpcm.h
new file mode 100644
index 000000000000..04598f1efd77
--- /dev/null
+++ b/include/sound/soc-dpcm.h
@@ -0,0 +1,138 @@
+/*
+ * linux/sound/soc-dpcm.h -- ALSA SoC Dynamic PCM Support
+ *
+ * Author:              Liam Girdwood <lrg@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.
+ */
+
+#ifndef __LINUX_SND_SOC_DPCM_H
+#define __LINUX_SND_SOC_DPCM_H
+
+#include <linux/list.h>
+#include <sound/pcm.h>
+
+struct snd_soc_pcm_runtime;
+
+/*
+ * Types of runtime_update to perform. e.g. originated from FE PCM ops
+ * or audio route changes triggered by muxes/mixers.
+ */
+enum snd_soc_dpcm_update {
+        SND_SOC_DPCM_UPDATE_NO  = 0,
+        SND_SOC_DPCM_UPDATE_BE,
+        SND_SOC_DPCM_UPDATE_FE,
+};
+
+/*
+ * Dynamic PCM Frontend -> Backend link management states.
+ */
+enum snd_soc_dpcm_link_state {
+        SND_SOC_DPCM_LINK_STATE_NEW     = 0,    /* newly created link */
+        SND_SOC_DPCM_LINK_STATE_FREE,           /* link to be dismantled */
+};
+
+/*
+ * Dynamic PCM Frontend -> Backend link PCM states.
+ */
+enum snd_soc_dpcm_state {
+        SND_SOC_DPCM_STATE_NEW  = 0,
+        SND_SOC_DPCM_STATE_OPEN,
+        SND_SOC_DPCM_STATE_HW_PARAMS,
+        SND_SOC_DPCM_STATE_PREPARE,
+        SND_SOC_DPCM_STATE_START,
+        SND_SOC_DPCM_STATE_STOP,
+        SND_SOC_DPCM_STATE_PAUSED,
+        SND_SOC_DPCM_STATE_SUSPEND,
+        SND_SOC_DPCM_STATE_HW_FREE,
+        SND_SOC_DPCM_STATE_CLOSE,
+};
+
+/*
+ * Dynamic PCM trigger ordering. Triggering flexibility is required as some
+ * DSPs require triggering before/after their CPU platform and DAIs.
+ *
+ * i.e. some clients may want to manually order this call in their PCM
+ * trigger() whilst others will just use the regular core ordering.
+ */
+enum snd_soc_dpcm_trigger {
+        SND_SOC_DPCM_TRIGGER_PRE                = 0,
+        SND_SOC_DPCM_TRIGGER_POST,
+        SND_SOC_DPCM_TRIGGER_BESPOKE,
+};
+
+/*
+ * Dynamic PCM link
+ * This links together a FE and BE DAI at runtime and stores the link
+ * state information and the hw_params configuration.
+ */
+struct snd_soc_dpcm {
+        /* FE and BE DAIs*/
+        struct snd_soc_pcm_runtime *be;
+        struct snd_soc_pcm_runtime *fe;
+
+        /* link state */
+        enum snd_soc_dpcm_link_state state;
+
+        /* list of BE and FE for this DPCM link */
+        struct list_head list_be;
+        struct list_head list_fe;
+
+        /* hw params for this link - may be different for each link */
+        struct snd_pcm_hw_params hw_params;
+#ifdef CONFIG_DEBUG_FS
+        struct dentry *debugfs_state;
+#endif
+};
+
+/*
+ * Dynamic PCM runtime data.
+ */
+struct snd_soc_dpcm_runtime {
+        struct list_head be_clients;
+        struct list_head fe_clients;
+
+        int users;
+        struct snd_pcm_runtime *runtime;
+        struct snd_pcm_hw_params hw_params;
+
+        /* state and update */
+        enum snd_soc_dpcm_update runtime_update;
+        enum snd_soc_dpcm_state state;
+};
+
+/* can this BE stop and free */
+int snd_soc_dpcm_can_be_free_stop(struct snd_soc_pcm_runtime *fe,
+                struct snd_soc_pcm_runtime *be, int stream);
+
+/* can this BE perform a hw_params() */
+int snd_soc_dpcm_can_be_params(struct snd_soc_pcm_runtime *fe,
+                struct snd_soc_pcm_runtime *be, int stream);
+
+/* is the current PCM operation for this FE ? */
+int snd_soc_dpcm_fe_can_update(struct snd_soc_pcm_runtime *fe, int stream);
+
+/* is the current PCM operation for this BE ? */
+int snd_soc_dpcm_be_can_update(struct snd_soc_pcm_runtime *fe,
+                struct snd_soc_pcm_runtime *be, int stream);
+
+/* get the substream for this BE */
+struct snd_pcm_substream *
+        snd_soc_dpcm_get_substream(struct snd_soc_pcm_runtime *be, int stream);
+
+/* get the BE runtime state */
+enum snd_soc_dpcm_state
+        snd_soc_dpcm_be_get_state(struct snd_soc_pcm_runtime *be, int stream);
+
+/* set the BE runtime state */
+void snd_soc_dpcm_be_set_state(struct snd_soc_pcm_runtime *be, int stream,
+        enum snd_soc_dpcm_state state);
+
+/* internal use only */
+int soc_dpcm_be_digital_mute(struct snd_soc_pcm_runtime *fe, int mute);
+int soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd);
+int soc_dpcm_runtime_update(struct snd_soc_dapm_widget *);
+
+#endif
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 2ebf7877c148..c703871f5f65 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -55,6 +55,18 @@
         .info = snd_soc_info_volsw, .get = snd_soc_get_volsw,\
         .put = snd_soc_put_volsw, \
         .private_value =  SOC_SINGLE_VALUE(reg, shift, max, invert) }
+#define SOC_SINGLE_SX_TLV(xname, xreg, xshift, xmin, xmax, tlv_array) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+        .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \
+        SNDRV_CTL_ELEM_ACCESS_READWRITE, \
+        .tlv.p  = (tlv_array),\
+        .info = snd_soc_info_volsw, \
+        .get = snd_soc_get_volsw_sx,\
+        .put = snd_soc_put_volsw_sx, \
+        .private_value = (unsigned long)&(struct soc_mixer_control) \
+                {.reg = xreg, .rreg = xreg, \
+                .shift = xshift, .rshift = xshift, \
+                .max = xmax, .min = xmin} }
 #define SOC_DOUBLE(xname, reg, shift_left, shift_right, max, invert) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
         .info = snd_soc_info_volsw, .get = snd_soc_get_volsw, \
@@ -85,6 +97,18 @@
         .get = snd_soc_get_volsw, .put = snd_soc_put_volsw, \
         .private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \
                                             xmax, xinvert) }
+#define SOC_DOUBLE_R_SX_TLV(xname, xreg, xrreg, xshift, xmin, xmax, tlv_array) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
+        .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \
+        SNDRV_CTL_ELEM_ACCESS_READWRITE, \
+        .tlv.p  = (tlv_array), \
+        .info = snd_soc_info_volsw, \
+        .get = snd_soc_get_volsw_sx, \
+        .put = snd_soc_put_volsw_sx, \
+        .private_value = (unsigned long)&(struct soc_mixer_control) \
+                {.reg = xreg, .rreg = xrreg, \
+                .shift = xshift, .rshift = xshift, \
+                .max = xmax, .min = xmin} }
 #define SOC_DOUBLE_S8_TLV(xname, xreg, xmin, xmax, tlv_array) \
 {       .iface  = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
         .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \
@@ -171,20 +195,6 @@
         .get = xhandler_get, .put = xhandler_put, \
         .private_value = (unsigned long)&xenum }
 
-#define SOC_DOUBLE_R_SX_TLV(xname, xreg_left, xreg_right, xshift,\
-                xmin, xmax, tlv_array) \
-{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
-        .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \
-                  SNDRV_CTL_ELEM_ACCESS_READWRITE, \
-        .tlv.p = (tlv_array), \
-        .info = snd_soc_info_volsw_2r_sx, \
-        .get = snd_soc_get_volsw_2r_sx, \
-        .put = snd_soc_put_volsw_2r_sx, \
-        .private_value = (unsigned long)&(struct soc_mixer_control) \
-                {.reg = xreg_left, \
-                 .rreg = xreg_right, .shift = xshift, \
-                 .min = xmin, .max = xmax} }
-
 #define SND_SOC_BYTES(xname, xbase, xregs)                    \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,   \
         .info = snd_soc_bytes_info, .get = snd_soc_bytes_get, \
@@ -200,6 +210,19 @@
                 {.base = xbase, .num_regs = xregs,            \
                  .mask = xmask }) }
 
+#define SOC_SINGLE_XR_SX(xname, xregbase, xregcount, xnbits, \
+                xmin, xmax, xinvert) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
+        .info = snd_soc_info_xr_sx, .get = snd_soc_get_xr_sx, \
+        .put = snd_soc_put_xr_sx, \
+        .private_value = (unsigned long)&(struct soc_mreg_control) \
+                {.regbase = xregbase, .regcount = xregcount, .nbits = xnbits, \
+                .invert = xinvert, .min = xmin, .max = xmax} }
+
+#define SOC_SINGLE_STROBE(xname, xreg, xshift, xinvert) \
+        SOC_SINGLE_EXT(xname, xreg, xshift, 1, xinvert, \
+                snd_soc_get_strobe, snd_soc_put_strobe)
+
 /*
  * Simplified versions of above macros, declaring a struct and calculating
  * ARRAY_SIZE internally
@@ -264,6 +287,7 @@ struct snd_soc_jack_zone;
 struct snd_soc_jack_pin;
 struct snd_soc_cache_ops;
 #include <sound/soc-dapm.h>
+#include <sound/soc-dpcm.h>
 
 #ifdef CONFIG_GPIOLIB
 struct snd_soc_jack_gpio;
@@ -288,6 +312,11 @@ enum snd_soc_pcm_subclass {
         SND_SOC_PCM_CLASS_BE    = 1,
 };
 
+enum snd_soc_card_subclass {
+        SND_SOC_CARD_CLASS_INIT         = 0,
+        SND_SOC_CARD_CLASS_RUNTIME      = 1,
+};
+
 int snd_soc_codec_set_sysclk(struct snd_soc_codec *codec, int clk_id,
                              int source, unsigned int freq, int dir);
 int snd_soc_codec_set_pll(struct snd_soc_codec *codec, int pll_id, int source,
@@ -333,6 +362,11 @@ int snd_soc_platform_write(struct snd_soc_platform *platform,
                                         unsigned int reg, unsigned int val);
 int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num);
 
+struct snd_pcm_substream *snd_soc_get_dai_substream(struct snd_soc_card *card,
+                const char *dai_link, int stream);
+struct snd_soc_pcm_runtime *snd_soc_get_pcm_runtime(struct snd_soc_card *card,
+                const char *dai_link);
+
 /* Utility functions to get clock rates from various things */
 int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);
 int snd_soc_params_to_frame_size(struct snd_pcm_hw_params *params);
@@ -343,6 +377,9 @@ int snd_soc_params_to_bclk(struct snd_pcm_hw_params *parms);
 int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,
         const struct snd_pcm_hardware *hw);
 
+int snd_soc_platform_trigger(struct snd_pcm_substream *substream,
+                int cmd, struct snd_soc_platform *platform);
+
 /* Jack reporting */
 int snd_soc_jack_new(struct snd_soc_codec *codec, const char *id, int type,
                      struct snd_soc_jack *jack);
@@ -413,6 +450,10 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol);
 #define snd_soc_get_volsw_2r snd_soc_get_volsw
 #define snd_soc_put_volsw_2r snd_soc_put_volsw
+int snd_soc_get_volsw_sx(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol);
+int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol);
 int snd_soc_info_volsw_s8(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_info *uinfo);
 int snd_soc_get_volsw_s8(struct snd_kcontrol *kcontrol,
@@ -421,19 +462,22 @@ int snd_soc_put_volsw_s8(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol);
 int snd_soc_limit_volume(struct snd_soc_codec *codec,
         const char *name, int max);
-int snd_soc_info_volsw_2r_sx(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_info *uinfo);
-int snd_soc_get_volsw_2r_sx(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_value *ucontrol);
-int snd_soc_put_volsw_2r_sx(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_value *ucontrol);
 int snd_soc_bytes_info(struct snd_kcontrol *kcontrol,
                        struct snd_ctl_elem_info *uinfo);
 int snd_soc_bytes_get(struct snd_kcontrol *kcontrol,
                       struct snd_ctl_elem_value *ucontrol);
 int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
                       struct snd_ctl_elem_value *ucontrol);
-
+int snd_soc_info_xr_sx(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_info *uinfo);
+int snd_soc_get_xr_sx(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol);
+int snd_soc_put_xr_sx(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol);
+int snd_soc_get_strobe(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol);
+int snd_soc_put_strobe(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol);
 
 /**
  * struct snd_soc_reg_access - Describes whether a given register is
@@ -513,6 +557,7 @@ struct snd_soc_jack_gpio {
 #endif
 
 struct snd_soc_jack {
+        struct mutex mutex;
         struct snd_jack *jack;
         struct snd_soc_codec *codec;
         struct list_head pins;
@@ -711,6 +756,7 @@ struct snd_soc_platform_driver {
         /* platform IO - used for platform DAPM */
         unsigned int (*read)(struct snd_soc_platform *, unsigned int);
         int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
+        int (*bespoke_trigger)(struct snd_pcm_substream *, int);
 };
 
 struct snd_soc_platform {
@@ -746,21 +792,36 @@ struct snd_soc_dai_link {
         const char *cpu_dai_name;
         const struct device_node *cpu_dai_of_node;
         const char *codec_dai_name;
+        int be_id;      /* optional ID for machine driver BE identification */
+
+        const struct snd_soc_pcm_stream *params;
 
         unsigned int dai_fmt;           /* format to set on init */
 
+        enum snd_soc_dpcm_trigger trigger[2]; /* trigger type for DPCM */
+
         /* Keep DAI active over suspend */
         unsigned int ignore_suspend:1;
 
         /* Symmetry requirements */
         unsigned int symmetric_rates:1;
 
+        /* Do not create a PCM for this DAI link (Backend link) */
+        unsigned int no_pcm:1;
+
+        /* This DAI link can route to other DAI links at runtime (Frontend)*/
+        unsigned int dynamic:1;
+
         /* pmdown_time is ignored at stop */
         unsigned int ignore_pmdown_time:1;
 
         /* codec/machine specific init - e.g. add machine controls */
         int (*init)(struct snd_soc_pcm_runtime *rtd);
 
+        /* optional hw_params re-writing for BE and FE sync */
+        int (*be_hw_params_fixup)(struct snd_soc_pcm_runtime *rtd,
+                        struct snd_pcm_hw_params *params);
+
         /* machine stream operations */
         struct snd_soc_ops *ops;
 };
@@ -800,6 +861,7 @@ struct snd_soc_card {
 
         struct list_head list;
         struct mutex mutex;
+        struct mutex dapm_mutex;
 
         bool instantiated;
 
@@ -889,9 +951,11 @@ struct snd_soc_pcm_runtime {
         enum snd_soc_pcm_subclass pcm_subclass;
         struct snd_pcm_ops ops;
 
-        unsigned int complete:1;
         unsigned int dev_registered:1;
 
+        /* Dynamic PCM BE runtime data */
+        struct snd_soc_dpcm_runtime dpcm[2];
+
         long pmdown_time;
 
         /* runtime devices */
@@ -902,6 +966,10 @@ struct snd_soc_pcm_runtime {
         struct snd_soc_dai *cpu_dai;
 
         struct delayed_work delayed_work;
+#ifdef CONFIG_DEBUG_FS
+        struct dentry *debugfs_dpcm_root;
+        struct dentry *debugfs_dpcm_state;
+#endif
 };
 
 /* mixer control */
@@ -916,6 +984,12 @@ struct soc_bytes {
         u32 mask;
 };
 
+/* multi register control */
+struct soc_mreg_control {
+        long min, max;
+        unsigned int regbase, regcount, nbits, invert;
+};
+
 /* enumerated kcontrol */
 struct soc_enum {
         unsigned short reg;
diff --git a/include/target/target_core_backend.h b/include/target/target_core_backend.h
index 8c9ff1b14396..2d7db85e93ae 100644
--- a/include/target/target_core_backend.h
+++ b/include/target/target_core_backend.h
@@ -23,12 +23,11 @@ struct se_subsystem_api {
         struct se_device *(*create_virtdevice)(struct se_hba *,
                                 struct se_subsystem_dev *, void *);
         void (*free_device)(void *);
-        int (*transport_complete)(struct se_task *task);
-        struct se_task *(*alloc_task)(unsigned char *cdb);
-        int (*do_task)(struct se_task *);
+        int (*transport_complete)(struct se_cmd *cmd, struct scatterlist *);
+        int (*execute_cmd)(struct se_cmd *, struct scatterlist *, u32,
+                        enum dma_data_direction);
         int (*do_discard)(struct se_device *, sector_t, u32);
-        void (*do_sync_cache)(struct se_task *);
-        void (*free_task)(struct se_task *);
+        void (*do_sync_cache)(struct se_cmd *);
         ssize_t (*check_configfs_dev_params)(struct se_hba *,
                         struct se_subsystem_dev *);
         ssize_t (*set_configfs_dev_params)(struct se_hba *,
@@ -38,7 +37,7 @@ struct se_subsystem_api {
         u32 (*get_device_rev)(struct se_device *);
         u32 (*get_device_type)(struct se_device *);
         sector_t (*get_blocks)(struct se_device *);
-        unsigned char *(*get_sense_buffer)(struct se_task *);
+        unsigned char *(*get_sense_buffer)(struct se_cmd *);
 };
 
 int     transport_subsystem_register(struct se_subsystem_api *);
@@ -48,10 +47,7 @@ struct se_device *transport_add_device_to_core_hba(struct se_hba *,
                 struct se_subsystem_api *, struct se_subsystem_dev *, u32,
                 void *, struct se_dev_limits *, const char *, const char *);
 
-void    transport_complete_sync_cache(struct se_cmd *, int);
-void    transport_complete_task(struct se_task *, int);
-
-void    target_get_task_cdb(struct se_task *, unsigned char *);
+void    target_complete_cmd(struct se_cmd *, u8);
 
 void    transport_set_vpd_proto_id(struct t10_vpd *, unsigned char *);
 int     transport_set_vpd_assoc(struct t10_vpd *, unsigned char *);
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index aaccc5f5fc9f..dc35d8660aa6 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -73,9 +73,8 @@
 /*
  * struct se_device->dev_flags
  */
-#define DF_READ_ONLY                            0x00000001
-#define DF_SPC2_RESERVATIONS                    0x00000002
-#define DF_SPC2_RESERVATIONS_WITH_ISID          0x00000004
+#define DF_SPC2_RESERVATIONS                    0x00000001
+#define DF_SPC2_RESERVATIONS_WITH_ISID          0x00000002
 
 /* struct se_dev_attrib sanity values */
 /* Default max_unmap_lba_count */
@@ -141,14 +140,6 @@ enum transport_tpg_type_table {
         TRANSPORT_TPG_TYPE_DISCOVERY = 1,
 };
 
-/* struct se_task->task_flags */
-enum se_task_flags {
-        TF_ACTIVE               = (1 << 0),
-        TF_SENT                 = (1 << 1),
-        TF_REQUEST_STOP         = (1 << 2),
-        TF_HAS_SENSE            = (1 << 3),
-};
-
 /* Special transport agnostic struct se_cmd->t_states */
 enum transport_state_table {
         TRANSPORT_NO_STATE      = 0,
@@ -234,6 +225,7 @@ enum tcm_sense_reason_table {
 enum target_sc_flags_table {
         TARGET_SCF_BIDI_OP              = 0x01,
         TARGET_SCF_ACK_KREF             = 0x02,
+        TARGET_SCF_UNKNOWN_SIZE         = 0x04,
 };
 
 /* fabric independent task management function values */
@@ -338,6 +330,7 @@ struct t10_alua_tg_pt_gp {
         int     tg_pt_gp_alua_access_type;
         int     tg_pt_gp_nonop_delay_msecs;
         int     tg_pt_gp_trans_delay_msecs;
+        int     tg_pt_gp_implict_trans_secs;
         int     tg_pt_gp_pref;
         int     tg_pt_gp_write_metadata;
         /* Used by struct t10_alua_tg_pt_gp->tg_pt_gp_md_buf_len */
@@ -485,23 +478,6 @@ struct se_queue_obj {
         wait_queue_head_t       thread_wq;
 };
 
-struct se_task {
-        unsigned long long      task_lba;
-        u32                     task_sectors;
-        u32                     task_size;
-        struct se_cmd           *task_se_cmd;
-        struct scatterlist      *task_sg;
-        u32                     task_sg_nents;
-        u16                     task_flags;
-        u8                      task_scsi_status;
-        enum dma_data_direction task_data_direction;
-        struct list_head        t_list;
-        struct list_head        t_execute_list;
-        struct list_head        t_state_list;
-        bool                    t_state_active;
-        struct completion       task_stop_comp;
-};
-
 struct se_tmr_req {
         /* Task Management function to be performed */
         u8                      function;
@@ -538,6 +514,7 @@ struct se_cmd {
         /* Used to signal cmd->se_tfo->check_release_cmd() usage per cmd */
         unsigned                check_release:1;
         unsigned                cmd_wait_set:1;
+        unsigned                unknown_data_length:1;
         /* See se_cmd_flags_table */
         u32                     se_cmd_flags;
         u32                     se_ordered_id;
@@ -565,18 +542,13 @@ struct se_cmd {
         struct completion       cmd_wait_comp;
         struct kref             cmd_kref;
         struct target_core_fabric_ops *se_tfo;
-        int (*execute_task)(struct se_task *);
+        int (*execute_cmd)(struct se_cmd *);
         void (*transport_complete_callback)(struct se_cmd *);
 
         unsigned char           *t_task_cdb;
         unsigned char           __t_task_cdb[TCM_MAX_COMMAND_SIZE];
         unsigned long long      t_task_lba;
-        u32                     t_tasks_sg_chained_no;
         atomic_t                t_fe_count;
-        atomic_t                t_se_count;
-        atomic_t                t_task_cdbs_left;
-        atomic_t                t_task_cdbs_ex_left;
-        atomic_t                t_task_cdbs_sent;
         unsigned int            transport_state;
 #define CMD_T_ABORTED           (1 << 0)
 #define CMD_T_ACTIVE            (1 << 1)
@@ -588,11 +560,12 @@ struct se_cmd {
 #define CMD_T_LUN_STOP          (1 << 7)
 #define CMD_T_LUN_FE_STOP       (1 << 8)
 #define CMD_T_DEV_ACTIVE        (1 << 9)
+#define CMD_T_REQUEST_STOP      (1 << 10)
+#define CMD_T_BUSY              (1 << 11)
         spinlock_t              t_state_lock;
         struct completion       t_transport_stop_comp;
         struct completion       transport_lun_fe_stop_comp;
         struct completion       transport_lun_stop_comp;
-        struct scatterlist      *t_tasks_sg_chained;
 
         struct work_struct      work;
 
@@ -602,10 +575,15 @@ struct se_cmd {
         struct scatterlist      *t_bidi_data_sg;
         unsigned int            t_bidi_data_nents;
 
-        /* Used for BIDI READ */
-        struct list_head        t_task_list;
-        u32                     t_task_list_num;
+        struct list_head        execute_list;
+        struct list_head        state_list;
+        bool                    state_active;
+
+        /* old task stop completion, consider merging with some of the above */
+        struct completion       task_stop_comp;
 
+        /* backend private data */
+        void                    *priv;
 };
 
 struct se_ua {
@@ -731,7 +709,6 @@ struct se_dev_attrib {
         u32             hw_block_size;
         u32             block_size;
         u32             hw_max_sectors;
-        u32             max_sectors;
         u32             fabric_max_sectors;
         u32             optimal_sectors;
         u32             hw_queue_depth;
@@ -829,8 +806,8 @@ struct se_device {
         struct task_struct      *process_thread;
         struct work_struct      qf_work_queue;
         struct list_head        delayed_cmd_list;
-        struct list_head        execute_task_list;
-        struct list_head        state_task_list;
+        struct list_head        execute_list;
+        struct list_head        state_list;
         struct list_head        qf_cmd_list;
         /* Pointer to associated SE HBA */
         struct se_hba           *se_hba;
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index 10c690809601..116959933f46 100644
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -3,12 +3,6 @@
 
 struct target_core_fabric_ops {
         struct configfs_subsystem *tf_subsys;
-        /*
-         * Optional to signal struct se_task->task_sg[] padding entries
-         * for scatterlist chaining using transport_do_task_sg_link(),
-         * disabled by default
-         */
-        bool task_sg_chaining;
         char *(*get_fabric_name)(void);
         u8 (*get_fabric_proto_ident)(struct se_portal_group *);
         char *(*tpg_get_wwn)(struct se_portal_group *);
@@ -102,7 +96,7 @@ void	__transport_register_session(struct se_portal_group *,
 void    transport_register_session(struct se_portal_group *,
                 struct se_node_acl *, struct se_session *, void *);
 void    target_get_session(struct se_session *);
-int     target_put_session(struct se_session *);
+void    target_put_session(struct se_session *);
 void    transport_free_session(struct se_session *);
 void    target_put_nacl(struct se_node_acl *);
 void    transport_deregister_session_configfs(struct se_session *);
@@ -112,7 +106,7 @@ void	transport_deregister_session(struct se_session *);
 void    transport_init_se_cmd(struct se_cmd *, struct target_core_fabric_ops *,
                 struct se_session *, u32, int, int, unsigned char *);
 int     transport_lookup_cmd_lun(struct se_cmd *, u32);
-int     transport_generic_allocate_tasks(struct se_cmd *, unsigned char *);
+int     target_setup_cmd_from_cdb(struct se_cmd *, unsigned char *);
 void    target_submit_cmd(struct se_cmd *, struct se_session *, unsigned char *,
                 unsigned char *, u32, u32, int, int, int);
 int     target_submit_tmr(struct se_cmd *se_cmd, struct se_session *se_sess,
@@ -124,7 +118,6 @@ int	transport_generic_handle_cdb_map(struct se_cmd *);
 int     transport_generic_handle_data(struct se_cmd *);
 int     transport_generic_map_mem_to_cmd(struct se_cmd *cmd,
                 struct scatterlist *, u32, struct scatterlist *, u32);
-void    transport_do_task_sg_chain(struct se_cmd *);
 int     transport_generic_new_cmd(struct se_cmd *);
 
 void    transport_generic_process_write(struct se_cmd *);
diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h
index ab26f8aa3c78..5fc2dcdd21cd 100644
--- a/include/trace/events/asoc.h
+++ b/include/trace/events/asoc.h
@@ -7,6 +7,8 @@
 #include <linux/ktime.h>
 #include <linux/tracepoint.h>
 
+#define DAPM_DIRECT "(direct)"
+
 struct snd_soc_jack;
 struct snd_soc_codec;
 struct snd_soc_platform;
@@ -241,6 +243,84 @@ TRACE_EVENT(snd_soc_dapm_walk_done,
                   (int)__entry->path_checks, (int)__entry->neighbour_checks)
 );
 
+TRACE_EVENT(snd_soc_dapm_output_path,
+
+        TP_PROTO(struct snd_soc_dapm_widget *widget,
+                struct snd_soc_dapm_path *path),
+
+        TP_ARGS(widget, path),
+
+        TP_STRUCT__entry(
+                __string(       wname,  widget->name            )
+                __string(       pname,  path->name ? path->name : DAPM_DIRECT)
+                __string(       psname, path->sink->name        )
+                __field(        int,    path_sink               )
+                __field(        int,    path_connect            )
+        ),
+
+        TP_fast_assign(
+                __assign_str(wname, widget->name);
+                __assign_str(pname, path->name ? path->name : DAPM_DIRECT);
+                __assign_str(psname, path->sink->name);
+                __entry->path_connect = path->connect;
+                __entry->path_sink = (long)path->sink;
+        ),
+
+        TP_printk("%c%s -> %s -> %s\n",
+                (int) __entry->path_sink &&
+                (int) __entry->path_connect ? '*' : ' ',
+                __get_str(wname), __get_str(pname), __get_str(psname))
+);
+
+TRACE_EVENT(snd_soc_dapm_input_path,
+
+        TP_PROTO(struct snd_soc_dapm_widget *widget,
+                struct snd_soc_dapm_path *path),
+
+        TP_ARGS(widget, path),
+
+        TP_STRUCT__entry(
+                __string(       wname,  widget->name            )
+                __string(       pname,  path->name ? path->name : DAPM_DIRECT)
+                __string(       psname, path->source->name      )
+                __field(        int,    path_source             )
+                __field(        int,    path_connect            )
+        ),
+
+        TP_fast_assign(
+                __assign_str(wname, widget->name);
+                __assign_str(pname, path->name ? path->name : DAPM_DIRECT);
+                __assign_str(psname, path->source->name);
+                __entry->path_connect = path->connect;
+                __entry->path_source = (long)path->source;
+        ),
+
+        TP_printk("%c%s <- %s <- %s\n",
+                (int) __entry->path_source &&
+                (int) __entry->path_connect ? '*' : ' ',
+                __get_str(wname), __get_str(pname), __get_str(psname))
+);
+
+TRACE_EVENT(snd_soc_dapm_connected,
+
+        TP_PROTO(int paths, int stream),
+
+        TP_ARGS(paths, stream),
+
+        TP_STRUCT__entry(
+                __field(        int,    paths           )
+                __field(        int,    stream          )
+        ),
+
+        TP_fast_assign(
+                __entry->paths = paths;
+                __entry->stream = stream;
+        ),
+
+        TP_printk("%s: found %d paths\n",
+                __entry->stream ? "capture" : "playback", __entry->paths)
+);
+
 TRACE_EVENT(snd_soc_jack_irq,
 
         TP_PROTO(const char *name),
diff --git a/include/trace/events/ext3.h b/include/trace/events/ext3.h
index 7b53c0573dc9..15d11a39be47 100644
--- a/include/trace/events/ext3.h
+++ b/include/trace/events/ext3.h
@@ -24,8 +24,8 @@ TRACE_EVENT(ext3_free_inode,
                 __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
                 __entry->mode   = inode->i_mode;
-                __entry->uid    = inode->i_uid;
-                __entry->gid    = inode->i_gid;
+                __entry->uid    = i_uid_read(inode);
+                __entry->gid    = i_gid_read(inode);
                 __entry->blocks = inode->i_blocks;
         ),
 
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 319538bf17d2..69d8a69ea831 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -36,8 +36,8 @@ TRACE_EVENT(ext4_free_inode,
                 __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
                 __entry->mode   = inode->i_mode;
-                __entry->uid    = inode->i_uid;
-                __entry->gid    = inode->i_gid;
+                __entry->uid    = i_uid_read(inode);
+                __entry->gid    = i_gid_read(inode);
                 __entry->blocks = inode->i_blocks;
         ),
 
diff --git a/include/trace/events/jbd.h b/include/trace/events/jbd.h
index aff64d82d713..da6f2591c25e 100644
--- a/include/trace/events/jbd.h
+++ b/include/trace/events/jbd.h
@@ -36,19 +36,17 @@ DECLARE_EVENT_CLASS(jbd_commit,
 
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
-                __field(        char,   sync_commit             )
                 __field(        int,    transaction             )
         ),
 
         TP_fast_assign(
                 __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",
+        TP_printk("dev %d,%d transaction %d",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
-                  __entry->transaction, __entry->sync_commit)
+                  __entry->transaction)
 );
 
 DEFINE_EVENT(jbd_commit, jbd_start_commit,
@@ -87,19 +85,17 @@ TRACE_EVENT(jbd_drop_transaction,
 
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
-                __field(        char,   sync_commit             )
                 __field(        int,    transaction             )
         ),
 
         TP_fast_assign(
                 __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",
+        TP_printk("dev %d,%d transaction %d",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
-                  __entry->transaction, __entry->sync_commit)
+                  __entry->transaction)
 );
 
 TRACE_EVENT(jbd_end_commit,
@@ -109,21 +105,19 @@ TRACE_EVENT(jbd_end_commit,
 
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
-                __field(        char,   sync_commit             )
                 __field(        int,    transaction             )
                 __field(        int,    head                    )
         ),
 
         TP_fast_assign(
                 __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",
+        TP_printk("dev %d,%d transaction %d head %d",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
-                  __entry->transaction, __entry->sync_commit, __entry->head)
+                  __entry->transaction, __entry->head)
 );
 
 TRACE_EVENT(jbd_do_submit_data,
@@ -133,19 +127,17 @@ TRACE_EVENT(jbd_do_submit_data,
 
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
-                __field(        char,   sync_commit             )
                 __field(        int,    transaction             )
         ),
 
         TP_fast_assign(
                 __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",
+        TP_printk("dev %d,%d transaction %d",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
-                   __entry->transaction, __entry->sync_commit)
+                   __entry->transaction)
 );
 
 TRACE_EVENT(jbd_cleanup_journal_tail,
@@ -177,24 +169,23 @@ TRACE_EVENT(jbd_cleanup_journal_tail,
                   __entry->block_nr, __entry->freed)
 );
 
-TRACE_EVENT(jbd_update_superblock_end,
-        TP_PROTO(journal_t *journal, int wait),
+TRACE_EVENT(journal_write_superblock,
+        TP_PROTO(journal_t *journal, int write_op),
 
-        TP_ARGS(journal, wait),
+        TP_ARGS(journal, write_op),
 
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
-                __field(        int,    wait                    )
+                __field(        int,    write_op                )
         ),
 
         TP_fast_assign(
                 __entry->dev            = journal->j_fs_dev->bd_dev;
-                __entry->wait           = wait;
+                __entry->write_op       = write_op;
         ),
 
-        TP_printk("dev %d,%d wait %d",
-                  MAJOR(__entry->dev), MINOR(__entry->dev),
-                   __entry->wait)
+        TP_printk("dev %d,%d write_op %x", MAJOR(__entry->dev),
+                  MINOR(__entry->dev), __entry->write_op)
 );
 
 #endif /* _TRACE_JBD_H */
diff --git a/include/trace/events/power.h b/include/trace/events/power.h
index cae9a94f025d..0c9783841a30 100644
--- a/include/trace/events/power.h
+++ b/include/trace/events/power.h
@@ -65,6 +65,40 @@ TRACE_EVENT(machine_suspend,
         TP_printk("state=%lu", (unsigned long)__entry->state)
 );
 
+DECLARE_EVENT_CLASS(wakeup_source,
+
+        TP_PROTO(const char *name, unsigned int state),
+
+        TP_ARGS(name, state),
+
+        TP_STRUCT__entry(
+                __string(       name,           name            )
+                __field(        u64,            state           )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, name);
+                __entry->state = state;
+        ),
+
+        TP_printk("%s state=0x%lx", __get_str(name),
+                (unsigned long)__entry->state)
+);
+
+DEFINE_EVENT(wakeup_source, wakeup_source_activate,
+
+        TP_PROTO(const char *name, unsigned int state),
+
+        TP_ARGS(name, state)
+);
+
+DEFINE_EVENT(wakeup_source, wakeup_source_deactivate,
+
+        TP_PROTO(const char *name, unsigned int state),
+
+        TP_ARGS(name, state)
+);
+
 #ifdef CONFIG_EVENT_POWER_TRACING_DEPRECATED
 
 /*
diff --git a/include/trace/events/rcu.h b/include/trace/events/rcu.h
index 337099783f37..1480900c511c 100644
--- a/include/trace/events/rcu.h
+++ b/include/trace/events/rcu.h
@@ -292,6 +292,8 @@ TRACE_EVENT(rcu_dyntick,
  *      "More callbacks": Still more callbacks, try again to clear them out.
  *      "Callbacks drained": All callbacks processed, off to dyntick idle!
  *      "Timer": Timer fired to cause CPU to continue processing callbacks.
+ *      "Demigrate": Timer fired on wrong CPU, woke up correct CPU.
+ *      "Cleanup after idle": Idle exited, timer canceled.
  */
 TRACE_EVENT(rcu_prep_idle,
 
diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h
index f64560e204bc..bab3b87e4064 100644
--- a/include/trace/events/vmscan.h
+++ b/include/trace/events/vmscan.h
@@ -13,7 +13,7 @@
 #define RECLAIM_WB_ANON         0x0001u
 #define RECLAIM_WB_FILE         0x0002u
 #define RECLAIM_WB_MIXED        0x0010u
-#define RECLAIM_WB_SYNC         0x0004u
+#define RECLAIM_WB_SYNC         0x0004u /* Unused, all reclaim async */
 #define RECLAIM_WB_ASYNC        0x0008u
 
 #define show_reclaim_flags(flags)                               \
@@ -25,15 +25,15 @@
                 {RECLAIM_WB_ASYNC,      "RECLAIM_WB_ASYNC"}     \
                 ) : "RECLAIM_WB_NONE"
 
-#define trace_reclaim_flags(page, sync) ( \
+#define trace_reclaim_flags(page) ( \
         (page_is_file_cache(page) ? RECLAIM_WB_FILE : RECLAIM_WB_ANON) | \
-        (sync & RECLAIM_MODE_SYNC ? RECLAIM_WB_SYNC : RECLAIM_WB_ASYNC)   \
+        (RECLAIM_WB_ASYNC) \
         )
 
-#define trace_shrink_flags(file, sync) ( \
-        (sync & RECLAIM_MODE_SYNC ? RECLAIM_WB_MIXED : \
-                        (file ? RECLAIM_WB_FILE : RECLAIM_WB_ANON)) |  \
-        (sync & RECLAIM_MODE_SYNC ? RECLAIM_WB_SYNC : RECLAIM_WB_ASYNC) \
+#define trace_shrink_flags(file) \
+        ( \
+                (file ? RECLAIM_WB_FILE : RECLAIM_WB_ANON) | \
+                (RECLAIM_WB_ASYNC) \
         )
 
 TRACE_EVENT(mm_vmscan_kswapd_sleep,
@@ -263,22 +263,16 @@ DECLARE_EVENT_CLASS(mm_vmscan_lru_isolate_template,
                 unsigned long nr_requested,
                 unsigned long nr_scanned,
                 unsigned long nr_taken,
-                unsigned long nr_lumpy_taken,
-                unsigned long nr_lumpy_dirty,
-                unsigned long nr_lumpy_failed,
                 isolate_mode_t isolate_mode,
                 int file),
 
-        TP_ARGS(order, nr_requested, nr_scanned, nr_taken, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, isolate_mode, file),
+        TP_ARGS(order, nr_requested, nr_scanned, nr_taken, isolate_mode, file),
 
         TP_STRUCT__entry(
                 __field(int, order)
                 __field(unsigned long, nr_requested)
                 __field(unsigned long, nr_scanned)
                 __field(unsigned long, nr_taken)
-                __field(unsigned long, nr_lumpy_taken)
-                __field(unsigned long, nr_lumpy_dirty)
-                __field(unsigned long, nr_lumpy_failed)
                 __field(isolate_mode_t, isolate_mode)
                 __field(int, file)
         ),
@@ -288,22 +282,16 @@ DECLARE_EVENT_CLASS(mm_vmscan_lru_isolate_template,
                 __entry->nr_requested = nr_requested;
                 __entry->nr_scanned = nr_scanned;
                 __entry->nr_taken = nr_taken;
-                __entry->nr_lumpy_taken = nr_lumpy_taken;
-                __entry->nr_lumpy_dirty = nr_lumpy_dirty;
-                __entry->nr_lumpy_failed = nr_lumpy_failed;
                 __entry->isolate_mode = isolate_mode;
                 __entry->file = file;
         ),
 
-        TP_printk("isolate_mode=%d order=%d nr_requested=%lu nr_scanned=%lu nr_taken=%lu contig_taken=%lu contig_dirty=%lu contig_failed=%lu file=%d",
+        TP_printk("isolate_mode=%d order=%d nr_requested=%lu nr_scanned=%lu nr_taken=%lu file=%d",
                 __entry->isolate_mode,
                 __entry->order,
                 __entry->nr_requested,
                 __entry->nr_scanned,
                 __entry->nr_taken,
-                __entry->nr_lumpy_taken,
-                __entry->nr_lumpy_dirty,
-                __entry->nr_lumpy_failed,
                 __entry->file)
 );
 
@@ -313,13 +301,10 @@ DEFINE_EVENT(mm_vmscan_lru_isolate_template, mm_vmscan_lru_isolate,
                 unsigned long nr_requested,
                 unsigned long nr_scanned,
                 unsigned long nr_taken,
-                unsigned long nr_lumpy_taken,
-                unsigned long nr_lumpy_dirty,
-                unsigned long nr_lumpy_failed,
                 isolate_mode_t isolate_mode,
                 int file),
 
-        TP_ARGS(order, nr_requested, nr_scanned, nr_taken, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, isolate_mode, file)
+        TP_ARGS(order, nr_requested, nr_scanned, nr_taken, isolate_mode, file)
 
 );
 
@@ -329,13 +314,10 @@ DEFINE_EVENT(mm_vmscan_lru_isolate_template, mm_vmscan_memcg_isolate,
                 unsigned long nr_requested,
                 unsigned long nr_scanned,
                 unsigned long nr_taken,
-                unsigned long nr_lumpy_taken,
-                unsigned long nr_lumpy_dirty,
-                unsigned long nr_lumpy_failed,
                 isolate_mode_t isolate_mode,
                 int file),
 
-        TP_ARGS(order, nr_requested, nr_scanned, nr_taken, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, isolate_mode, file)
+        TP_ARGS(order, nr_requested, nr_scanned, nr_taken, isolate_mode, file)
 
 );
 
@@ -395,88 +377,6 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
                 show_reclaim_flags(__entry->reclaim_flags))
 );
 
-TRACE_EVENT(replace_swap_token,
-        TP_PROTO(struct mm_struct *old_mm,
-                 struct mm_struct *new_mm),
-
-        TP_ARGS(old_mm, new_mm),
-
-        TP_STRUCT__entry(
-                __field(struct mm_struct*,      old_mm)
-                __field(unsigned int,           old_prio)
-                __field(struct mm_struct*,      new_mm)
-                __field(unsigned int,           new_prio)
-        ),
-
-        TP_fast_assign(
-                __entry->old_mm   = old_mm;
-                __entry->old_prio = old_mm ? old_mm->token_priority : 0;
-                __entry->new_mm   = new_mm;
-                __entry->new_prio = new_mm->token_priority;
-        ),
-
-        TP_printk("old_token_mm=%p old_prio=%u new_token_mm=%p new_prio=%u",
-                  __entry->old_mm, __entry->old_prio,
-                  __entry->new_mm, __entry->new_prio)
-);
-
-DECLARE_EVENT_CLASS(put_swap_token_template,
-        TP_PROTO(struct mm_struct *swap_token_mm),
-
-        TP_ARGS(swap_token_mm),
-
-        TP_STRUCT__entry(
-                __field(struct mm_struct*, swap_token_mm)
-        ),
-
-        TP_fast_assign(
-                __entry->swap_token_mm = swap_token_mm;
-        ),
-
-        TP_printk("token_mm=%p", __entry->swap_token_mm)
-);
-
-DEFINE_EVENT(put_swap_token_template, put_swap_token,
-        TP_PROTO(struct mm_struct *swap_token_mm),
-        TP_ARGS(swap_token_mm)
-);
-
-DEFINE_EVENT_CONDITION(put_swap_token_template, disable_swap_token,
-        TP_PROTO(struct mm_struct *swap_token_mm),
-        TP_ARGS(swap_token_mm),
-        TP_CONDITION(swap_token_mm != NULL)
-);
-
-TRACE_EVENT_CONDITION(update_swap_token_priority,
-        TP_PROTO(struct mm_struct *mm,
-                 unsigned int old_prio,
-                 struct mm_struct *swap_token_mm),
-
-        TP_ARGS(mm, old_prio, swap_token_mm),
-
-        TP_CONDITION(mm->token_priority != old_prio),
-
-        TP_STRUCT__entry(
-                __field(struct mm_struct*, mm)
-                __field(unsigned int, old_prio)
-                __field(unsigned int, new_prio)
-                __field(struct mm_struct*, swap_token_mm)
-                __field(unsigned int, swap_token_prio)
-        ),
-
-        TP_fast_assign(
-                __entry->mm             = mm;
-                __entry->old_prio       = old_prio;
-                __entry->new_prio       = mm->token_priority;
-                __entry->swap_token_mm  = swap_token_mm;
-                __entry->swap_token_prio = swap_token_mm ? swap_token_mm->token_priority : 0;
-        ),
-
-        TP_printk("mm=%p old_prio=%u new_prio=%u swap_token_mm=%p token_prio=%u",
-                  __entry->mm, __entry->old_prio, __entry->new_prio,
-                  __entry->swap_token_mm, __entry->swap_token_prio)
-);
-
 #endif /* _TRACE_VMSCAN_H */
 
 /* This part must be outside protection */
diff --git a/include/trace/events/workqueue.h b/include/trace/events/workqueue.h
index 7d497291c85d..4018f5058f27 100644
--- a/include/trace/events/workqueue.h
+++ b/include/trace/events/workqueue.h
@@ -103,7 +103,7 @@ TRACE_EVENT(workqueue_execute_start,
 );
 
 /**
- * workqueue_execute_end - called immediately before the workqueue callback
+ * workqueue_execute_end - called immediately after the workqueue callback
  * @work:       pointer to struct work_struct
  *
  * Allows to track workqueue execution.
diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h
index 7b81887b023f..b453d92c2253 100644
--- a/include/trace/events/writeback.h
+++ b/include/trace/events/writeback.h
@@ -372,6 +372,35 @@ TRACE_EVENT(balance_dirty_pages,
           )
 );
 
+TRACE_EVENT(writeback_sb_inodes_requeue,
+
+        TP_PROTO(struct inode *inode),
+        TP_ARGS(inode),
+
+        TP_STRUCT__entry(
+                __array(char, name, 32)
+                __field(unsigned long, ino)
+                __field(unsigned long, state)
+                __field(unsigned long, dirtied_when)
+        ),
+
+        TP_fast_assign(
+                strncpy(__entry->name,
+                        dev_name(inode_to_bdi(inode)->dev), 32);
+                __entry->ino            = inode->i_ino;
+                __entry->state          = inode->i_state;
+                __entry->dirtied_when   = inode->dirtied_when;
+        ),
+
+        TP_printk("bdi %s: ino=%lu state=%s dirtied_when=%lu age=%lu",
+                  __entry->name,
+                  __entry->ino,
+                  show_inode_state(__entry->state),
+                  __entry->dirtied_when,
+                  (jiffies - __entry->dirtied_when) / HZ
+        )
+);
+
 DECLARE_EVENT_CLASS(writeback_congest_waited_template,
 
         TP_PROTO(unsigned int usec_timeout, unsigned int usec_delayed),
@@ -450,13 +479,6 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template,
         )
 );
 
-DEFINE_EVENT(writeback_single_inode_template, writeback_single_inode_requeue,
-        TP_PROTO(struct inode *inode,
-                 struct writeback_control *wbc,
-                 unsigned long nr_to_write),
-        TP_ARGS(inode, wbc, nr_to_write)
-);
-
 DEFINE_EVENT(writeback_single_inode_template, writeback_single_inode,
         TP_PROTO(struct inode *inode,
                  struct writeback_control *wbc,
diff --git a/include/video/auo_k190xfb.h b/include/video/auo_k190xfb.h
new file mode 100644
index 000000000000..609efe8c686e
--- /dev/null
+++ b/include/video/auo_k190xfb.h
@@ -0,0 +1,106 @@
+/*
+ * Definitions for AUO-K190X framebuffer drivers
+ *
+ * Copyright (C) 2012 Heiko Stuebner <heiko@sntech.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_VIDEO_AUO_K190XFB_H_
+#define _LINUX_VIDEO_AUO_K190XFB_H_
+
+/* Controller standby command needs a param */
+#define AUOK190X_QUIRK_STANDBYPARAM     (1 << 0)
+
+/* Controller standby is completely broken */
+#define AUOK190X_QUIRK_STANDBYBROKEN    (1 << 1)
+
+/*
+ * Resolutions for the displays
+ */
+#define AUOK190X_RESOLUTION_800_600             0
+#define AUOK190X_RESOLUTION_1024_768            1
+
+/*
+ * struct used by auok190x. board specific stuff comes from *board
+ */
+struct auok190xfb_par {
+        struct fb_info *info;
+        struct auok190x_board *board;
+
+        struct regulator *regulator;
+
+        struct mutex io_lock;
+        struct delayed_work work;
+        wait_queue_head_t waitq;
+        int resolution;
+        int rotation;
+        int consecutive_threshold;
+        int update_cnt;
+
+        /* panel and controller informations */
+        int epd_type;
+        int panel_size_int;
+        int panel_size_float;
+        int panel_model;
+        int tcon_version;
+        int lut_version;
+
+        /* individual controller callbacks */
+        void (*update_partial)(struct auok190xfb_par *par, u16 y1, u16 y2);
+        void (*update_all)(struct auok190xfb_par *par);
+        bool (*need_refresh)(struct auok190xfb_par *par);
+        void (*init)(struct auok190xfb_par *par);
+        void (*recover)(struct auok190xfb_par *par);
+
+        int update_mode; /* mode to use for updates */
+        int last_mode; /* update mode last used */
+        int flash;
+
+        /* power management */
+        int autosuspend_delay;
+        bool standby;
+        bool manual_standby;
+};
+
+/**
+ * Board specific platform-data
+ * @init:               initialize the controller interface
+ * @cleanup:            cleanup the controller interface
+ * @wait_for_rdy:       wait until the controller is not busy anymore
+ * @set_ctl:            change an interface control
+ * @set_hdb:            write a value to the data register
+ * @get_hdb:            read a value from the data register
+ * @setup_irq:          method to setup the irq handling on the busy gpio
+ * @gpio_nsleep:        sleep gpio
+ * @gpio_nrst:          reset gpio
+ * @gpio_nbusy:         busy gpio
+ * @resolution:         one of the AUOK190X_RESOLUTION constants
+ * @rotation:           rotation of the framebuffer
+ * @quirks:             controller quirks to honor
+ * @fps:                frames per second for defio
+ */
+struct auok190x_board {
+        int (*init)(struct auok190xfb_par *);
+        void (*cleanup)(struct auok190xfb_par *);
+        int (*wait_for_rdy)(struct auok190xfb_par *);
+
+        void (*set_ctl)(struct auok190xfb_par *, unsigned char, u8);
+        void (*set_hdb)(struct auok190xfb_par *, u16);
+        u16 (*get_hdb)(struct auok190xfb_par *);
+
+        int (*setup_irq)(struct fb_info *);
+
+        int gpio_nsleep;
+        int gpio_nrst;
+        int gpio_nbusy;
+
+        int resolution;
+        int rotation;
+        int quirks;
+        int fps;
+};
+
+#endif
diff --git a/include/video/exynos_dp.h b/include/video/exynos_dp.h
index 8847a9d6dd42..bd8cabd344db 100644
--- a/include/video/exynos_dp.h
+++ b/include/video/exynos_dp.h
@@ -14,7 +14,7 @@
 
 #define DP_TIMEOUT_LOOP_COUNT 100
 #define MAX_CR_LOOP 5
-#define MAX_EQ_LOOP 4
+#define MAX_EQ_LOOP 5
 
 enum link_rate_type {
         LINK_RATE_1_62GBPS = 0x06,
diff --git a/include/video/exynos_mipi_dsim.h b/include/video/exynos_mipi_dsim.h
index 772c770535f1..83ce5e667d47 100644
--- a/include/video/exynos_mipi_dsim.h
+++ b/include/video/exynos_mipi_dsim.h
@@ -315,6 +315,7 @@ struct mipi_dsim_lcd_device {
         int                     id;
         int                     bus_id;
         int                     irq;
+        int                     panel_reverse;
 
         struct mipi_dsim_device *master;
         void                    *platform_data;
diff --git a/include/video/omap-panel-nokia-dsi.h b/include/video/omap-panel-nokia-dsi.h
index 7dc71f9c13e6..04219a295539 100644
--- a/include/video/omap-panel-nokia-dsi.h
+++ b/include/video/omap-panel-nokia-dsi.h
@@ -11,6 +11,7 @@ struct omap_dss_device;
  * @esd_interval: interval of ESD checks, 0 = disabled (ms)
  * @ulps_timeout: time to wait before entering ULPS, 0 = disabled (ms)
  * @use_dsi_backlight: true if panel uses DSI command to control backlight
+ * @pin_config: DSI pin configuration
  */
 struct nokia_dsi_panel_data {
         const char *name;
@@ -24,6 +25,8 @@ struct nokia_dsi_panel_data {
         unsigned ulps_timeout;
 
         bool use_dsi_backlight;
+
+        struct omap_dsi_pin_config pin_config;
 };
 
 #endif /* __OMAP_NOKIA_DSI_PANEL_H */
diff --git a/include/video/omap-panel-dvi.h b/include/video/omap-panel-tfp410.h
index 87ad567b4229..68c31d79c571 100644
--- a/include/video/omap-panel-dvi.h
+++ b/include/video/omap-panel-tfp410.h
@@ -1,5 +1,5 @@
 /*
- * Header for DVI output driver
+ * Header for TFP410 chip driver
  *
  * Copyright (C) 2011 Texas Instruments Inc
  * Author: Tomi Valkeinen <tomi.valkeinen@ti.com>
@@ -17,21 +17,19 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __OMAP_PANEL_DVI_H
-#define __OMAP_PANEL_DVI_H
+#ifndef __OMAP_PANEL_TFP410_H
+#define __OMAP_PANEL_TFP410_H
 
 struct omap_dss_device;
 
 /**
- * struct panel_dvi_platform_data - panel driver configuration data
- * @platform_enable: platform specific panel enable function
- * @platform_disable: platform specific panel disable function
+ * struct tfp410_platform_data - panel driver configuration data
  * @i2c_bus_num: i2c bus id for the panel
+ * @power_down_gpio: gpio number for PD pin (or -1 if not available)
  */
-struct panel_dvi_platform_data {
-        int (*platform_enable)(struct omap_dss_device *dssdev);
-        void (*platform_disable)(struct omap_dss_device *dssdev);
+struct tfp410_platform_data {
         u16 i2c_bus_num;
+        int power_down_gpio;
 };
 
-#endif /* __OMAP_PANEL_DVI_H */
+#endif /* __OMAP_PANEL_TFP410_H */
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 483f67caa7ad..c8e59b4a3364 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -51,6 +51,8 @@
 
 struct omap_dss_device;
 struct omap_overlay_manager;
+struct snd_aes_iec958;
+struct snd_cea_861_aud_if;
 
 enum omap_display_type {
         OMAP_DISPLAY_TYPE_NONE          = 0,
@@ -158,6 +160,13 @@ enum omap_dss_display_state {
         OMAP_DSS_DISPLAY_SUSPENDED,
 };
 
+enum omap_dss_audio_state {
+        OMAP_DSS_AUDIO_DISABLED = 0,
+        OMAP_DSS_AUDIO_ENABLED,
+        OMAP_DSS_AUDIO_CONFIGURED,
+        OMAP_DSS_AUDIO_PLAYING,
+};
+
 /* XXX perhaps this should be removed */
 enum omap_dss_overlay_managers {
         OMAP_DSS_OVL_MGR_LCD,
@@ -166,8 +175,9 @@ enum omap_dss_overlay_managers {
 };
 
 enum omap_dss_rotation_type {
-        OMAP_DSS_ROT_DMA = 0,
-        OMAP_DSS_ROT_VRFB = 1,
+        OMAP_DSS_ROT_DMA        = 1 << 0,
+        OMAP_DSS_ROT_VRFB       = 1 << 1,
+        OMAP_DSS_ROT_TILER      = 1 << 2,
 };
 
 /* clockwise rotation angle */
@@ -309,6 +319,7 @@ struct omap_dss_board_info {
         struct omap_dss_device *default_device;
         int (*dsi_enable_pads)(int dsi_id, unsigned lane_mask);
         void (*dsi_disable_pads)(int dsi_id, unsigned lane_mask);
+        int (*set_min_bus_tput)(struct device *dev, unsigned long r);
 };
 
 /* Init with the board info */
@@ -316,11 +327,6 @@ extern int omap_display_init(struct omap_dss_board_info *board_data);
 /* HDMI mux init*/
 extern int omap_hdmi_init(enum omap_hdmi_flags flags);
 
-struct omap_display_platform_data {
-        struct omap_dss_board_info *board_data;
-        /* TODO: Additional members to be added when PM is considered */
-};
-
 struct omap_video_timings {
         /* Unit: pixels */
         u16 x_res;
@@ -468,6 +474,21 @@ struct omap_overlay_manager {
         int (*wait_for_vsync)(struct omap_overlay_manager *mgr);
 };
 
+/* 22 pins means 1 clk lane and 10 data lanes */
+#define OMAP_DSS_MAX_DSI_PINS 22
+
+struct omap_dsi_pin_config {
+        int num_pins;
+        /*
+         * pin numbers in the following order:
+         * clk+, clk-
+         * data1+, data1-
+         * data2+, data2-
+         * ...
+         */
+        int pins[OMAP_DSS_MAX_DSI_PINS];
+};
+
 struct omap_dss_device {
         struct device dev;
 
@@ -490,17 +511,6 @@ struct omap_dss_device {
                 } sdi;
 
                 struct {
-                        u8 clk_lane;
-                        u8 clk_pol;
-                        u8 data1_lane;
-                        u8 data1_pol;
-                        u8 data2_lane;
-                        u8 data2_pol;
-                        u8 data3_lane;
-                        u8 data3_pol;
-                        u8 data4_lane;
-                        u8 data4_pol;
-
                         int module;
 
                         bool ext_te;
@@ -583,6 +593,8 @@ struct omap_dss_device {
 
         enum omap_dss_display_state state;
 
+        enum omap_dss_audio_state audio_state;
+
         /* platform specific  */
         int (*platform_enable)(struct omap_dss_device *dssdev);
         void (*platform_disable)(struct omap_dss_device *dssdev);
@@ -595,6 +607,11 @@ struct omap_dss_hdmi_data
         int hpd_gpio;
 };
 
+struct omap_dss_audio {
+        struct snd_aes_iec958 *iec;
+        struct snd_cea_861_aud_if *cea;
+};
+
 struct omap_dss_driver {
         struct device_driver driver;
 
@@ -642,6 +659,24 @@ struct omap_dss_driver {
 
         int (*read_edid)(struct omap_dss_device *dssdev, u8 *buf, int len);
         bool (*detect)(struct omap_dss_device *dssdev);
+
+        /*
+         * For display drivers that support audio. This encompasses
+         * HDMI and DisplayPort at the moment.
+         */
+        /*
+         * Note: These functions might sleep. Do not call while
+         * holding a spinlock/readlock.
+         */
+        int (*audio_enable)(struct omap_dss_device *dssdev);
+        void (*audio_disable)(struct omap_dss_device *dssdev);
+        bool (*audio_supported)(struct omap_dss_device *dssdev);
+        int (*audio_config)(struct omap_dss_device *dssdev,
+                struct omap_dss_audio *audio);
+        /* Note: These functions may not sleep */
+        int (*audio_start)(struct omap_dss_device *dssdev);
+        void (*audio_stop)(struct omap_dss_device *dssdev);
+
 };
 
 int omap_dss_register_driver(struct omap_dss_driver *);
@@ -666,6 +701,8 @@ struct omap_overlay *omap_dss_get_overlay(int num);
 void omapdss_default_get_resolution(struct omap_dss_device *dssdev,
                 u16 *xres, u16 *yres);
 int omapdss_default_get_recommended_bpp(struct omap_dss_device *dssdev);
+void omapdss_default_get_timings(struct omap_dss_device *dssdev,
+                struct omap_video_timings *timings);
 
 typedef void (*omap_dispc_isr_t) (void *arg, u32 mask);
 int omap_dispc_register_isr(omap_dispc_isr_t isr, void *arg, u32 mask);
@@ -687,6 +724,8 @@ int omap_dsi_update(struct omap_dss_device *dssdev, int channel,
 int omap_dsi_request_vc(struct omap_dss_device *dssdev, int *channel);
 int omap_dsi_set_vc_id(struct omap_dss_device *dssdev, int channel, int vc_id);
 void omap_dsi_release_vc(struct omap_dss_device *dssdev, int channel);
+int omapdss_dsi_configure_pins(struct omap_dss_device *dssdev,
+                const struct omap_dsi_pin_config *pin_cfg);
 
 int omapdss_dsi_display_enable(struct omap_dss_device *dssdev);
 void omapdss_dsi_display_disable(struct omap_dss_device *dssdev,
diff --git a/include/video/sh_mobile_hdmi.h b/include/video/sh_mobile_hdmi.h
index 728f9de9c258..63d20efa254a 100644
--- a/include/video/sh_mobile_hdmi.h
+++ b/include/video/sh_mobile_hdmi.h
@@ -18,9 +18,11 @@ struct clk;
 /*
  * flags format
  *
- * 0x0000000A
+ * 0x00000CBA
  *
  * A: Audio source select
+ * B: Int output option
+ * C: Chip specific option
  */
 
 /* Audio source select */
@@ -30,6 +32,14 @@ struct clk;
 #define HDMI_SND_SRC_DSD        (2 << 0)
 #define HDMI_SND_SRC_HBR        (3 << 0)
 
+/* Int output option */
+#define HDMI_OUTPUT_PUSH_PULL   (1 << 4) /* System control : output mode */
+#define HDMI_OUTPUT_POLARITY_HI (1 << 5) /* System control : output polarity */
+
+/* Chip specific option */
+#define HDMI_32BIT_REG          (1 << 8)
+#define HDMI_HAS_HTOP1          (1 << 9)
+
 struct sh_mobile_hdmi_info {
         unsigned int                     flags;
         long (*clk_optimize_parent)(unsigned long target, unsigned long *best_freq,
diff --git a/include/video/vga.h b/include/video/vga.h
index 2b8691f7d256..cac567f22e62 100644
--- a/include/video/vga.h
+++ b/include/video/vga.h
@@ -19,29 +19,7 @@
 
 #include <linux/types.h>
 #include <asm/io.h>
-#ifndef CONFIG_AMIGA
 #include <asm/vga.h>
-#else
-/*
- * FIXME
- * Ugh, we don't have PCI space, so map readb() and friends to use Zorro space
- * for MMIO accesses. This should make cirrusfb work again on Amiga
- */
-#undef inb_p
-#undef inw_p
-#undef outb_p
-#undef outw
-#undef readb
-#undef writeb
-#undef writew
-#define inb_p(port)     0
-#define inw_p(port)     0
-#define outb_p(port, val)       do { } while (0)
-#define outw(port, val)         do { } while (0)
-#define readb           z_readb
-#define writeb          z_writeb
-#define writew          z_writew
-#endif
 #include <asm/byteorder.h>
 
 
diff --git a/include/xen/acpi.h b/include/xen/acpi.h
new file mode 100644
index 000000000000..48a9c0171b65
--- /dev/null
+++ b/include/xen/acpi.h
@@ -0,0 +1,58 @@
+/******************************************************************************
+ * acpi.h
+ * acpi file for domain 0 kernel
+ *
+ * Copyright (c) 2011 Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+ * Copyright (c) 2011 Yu Ke <ke.yu@intel.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; or, when distributed
+ * separately from the Linux kernel or incorporated into other
+ * software packages, subject to the following license:
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this source file (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy, modify,
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef _XEN_ACPI_H
+#define _XEN_ACPI_H
+
+#include <linux/types.h>
+
+#ifdef CONFIG_XEN_DOM0
+#include <asm/xen/hypervisor.h>
+#include <xen/xen.h>
+#include <linux/acpi.h>
+
+int xen_acpi_notify_hypervisor_state(u8 sleep_state,
+                                     u32 pm1a_cnt, u32 pm1b_cnd);
+
+static inline void xen_acpi_sleep_register(void)
+{
+        if (xen_initial_domain())
+                acpi_os_set_prepare_sleep(
+                        &xen_acpi_notify_hypervisor_state);
+}
+#else
+static inline void xen_acpi_sleep_register(void)
+{
+}
+#endif
+
+#endif  /* _XEN_ACPI_H */
diff --git a/include/xen/events.h b/include/xen/events.h
index 0f773708e02c..04399b28e821 100644
--- a/include/xen/events.h
+++ b/include/xen/events.h
@@ -103,6 +103,9 @@ int xen_irq_from_pirq(unsigned pirq);
 /* Return the pirq allocated to the irq. */
 int xen_pirq_from_irq(unsigned irq);
 
+/* Return the irq allocated to the gsi */
+int xen_irq_from_gsi(unsigned gsi);
+
 /* Determine whether to ignore this IRQ if it is passed to a guest. */
 int xen_test_irq_shared(int irq);
 
diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
index 15f8a00ff003..11e27c3af3cb 100644
--- a/include/xen/grant_table.h
+++ b/include/xen/grant_table.h
@@ -46,6 +46,8 @@
 
 #include <xen/features.h>
 
+#define GNTTAB_RESERVED_XENSTORE 1
+
 /* NR_GRANT_FRAMES must be less than or equal to that configured in Xen */
 #define NR_GRANT_FRAMES 4
 
diff --git a/include/xen/xenbus_dev.h b/include/xen/xenbus_dev.h
index ac5f0fe47ed9..bbee8c6a349d 100644
--- a/include/xen/xenbus_dev.h
+++ b/include/xen/xenbus_dev.h
@@ -38,4 +38,7 @@
 #define IOCTL_XENBUS_BACKEND_EVTCHN                     \
         _IOC(_IOC_NONE, 'B', 0, 0)
 
+#define IOCTL_XENBUS_BACKEND_SETUP                      \
+        _IOC(_IOC_NONE, 'B', 1, 0)
+
 #endif /* __LINUX_XEN_XENBUS_DEV_H__ */