99 files changed, 2798 insertions, 1697 deletions
diff --git a/include/asm-generic/audit_change_attr.h b/include/asm-generic/audit_change_attr.h
index 50764550a60c..bcbab3e4a3be 100644
--- a/include/asm-generic/audit_change_attr.h
+++ b/include/asm-generic/audit_change_attr.h
@@ -20,3 +20,7 @@ __NR_chown32,
 __NR_fchown32,
 __NR_lchown32,
 #endif
+__NR_link,
+#ifdef __NR_linkat
+__NR_linkat,
+#endif
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 2c0fc10956ba..bd69d79208de 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -640,7 +640,8 @@
        . = ALIGN(4);                                                   \
        VMLINUX_SYMBOL(__initramfs_start) = .;                          \
        *(.init.ramfs)                                                  \
-        VMLINUX_SYMBOL(__initramfs_end) = .;
+        . = ALIGN(8);                                                   \
+        *(.init.ramfs.info)
 #else
 #define INIT_RAM_FS
 #endif
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 831c4634162c..90e3ed3a3144 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -326,10 +326,6 @@ header-y += serio.h
 header-y += shm.h
 header-y += signal.h
 header-y += signalfd.h
-header-y += smb.h
-header-y += smb_fs.h
-header-y += smb_mount.h
-header-y += smbno.h
 header-y += snmp.h
 header-y += socket.h
 header-y += sockios.h
@@ -372,7 +368,6 @@ header-y += veth.h
 header-y += vhost.h
 header-y += videodev.h
 header-y += videodev2.h
-header-y += videotext.h
 header-y += virtio_9p.h
 header-y += virtio_balloon.h
 header-y += virtio_blk.h
diff --git a/include/linux/audit.h b/include/linux/audit.h
index e24afabc548f..8b5c0620abf9 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -102,6 +102,7 @@
 #define AUDIT_EOE               1320    /* End of multi-record event */
 #define AUDIT_BPRM_FCAPS        1321    /* Information about fcaps increasing perms */
 #define AUDIT_CAPSET            1322    /* Record showing argument to sys_capset */
+#define AUDIT_MMAP              1323    /* Record showing descriptor and flags in mmap */
 #define AUDIT_AVC               1400    /* SE Linux avc denial or grant */
 #define AUDIT_SELINUX_ERR       1401    /* Internal SE Linux Errors */
@@ -478,6 +479,7 @@ extern int __audit_log_bprm_fcaps(struct linux_binprm *bprm,
                                  const struct cred *new,
                                  const struct cred *old);
 extern void __audit_log_capset(pid_t pid, const struct cred *new, const struct cred *old);
+extern void __audit_mmap_fd(int fd, int flags);
 static inline void audit_ipc_obj(struct kern_ipc_perm *ipcp)
 {
@@ -531,6 +533,12 @@ static inline void audit_log_capset(pid_t pid, const struct cred *new,
                __audit_log_capset(pid, new, old);
 }
+static inline void audit_mmap_fd(int fd, int flags)
+{
+        if (unlikely(!audit_dummy_context()))
+                __audit_mmap_fd(fd, flags);
+}
 extern int audit_n_rules;
 extern int audit_signals;
 #else
@@ -564,6 +572,7 @@ extern int audit_signals;
 #define audit_mq_getsetattr(d,s) ((void)0)
 #define audit_log_bprm_fcaps(b, ncr, ocr) ({ 0; })
 #define audit_log_capset(pid, ncr, ocr) ((void)0)
+#define audit_mmap_fd(fd, flags) ((void)0)
 #define audit_ptrace(t) ((void)0)
 #define audit_n_rules 0
 #define audit_signals 0
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 646b462d04df..5027a599077d 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -891,6 +891,14 @@ static inline int sb_issue_discard(struct super_block *sb, sector_t block,
                                    nr_blocks << (sb->s_blocksize_bits - 9),
                                    gfp_mask, flags);
 }
+static inline int sb_issue_zeroout(struct super_block *sb, sector_t block,
+                sector_t nr_blocks, gfp_t gfp_mask)
+{
+        return blkdev_issue_zeroout(sb->s_bdev,
+                                    block << (sb->s_blocksize_bits - 9),
+                                    nr_blocks << (sb->s_blocksize_bits - 9),
+                                    gfp_mask);
+}
 extern int blk_verify_command(unsigned char *cmd, fmode_t has_write_perm);
diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index 7187bd8a75f6..749f01ccd26e 100644
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
@@ -462,7 +462,8 @@ struct dccp_ackvec;
 * @dccps_hc_rx_insert_options - receiver wants to add options when acking
 * @dccps_hc_tx_insert_options - sender wants to add options when sending
 * @dccps_server_timewait - server holds timewait state on close (RFC 4340, 8.3)
- * @dccps_xmit_timer - timer for when CCID is not ready to send
+ * @dccps_xmitlet - tasklet scheduled by the TX CCID to dequeue data packets
+ * @dccps_xmit_timer - used by the TX CCID to delay sending (rate-based pacing)
 * @dccps_syn_rtt - RTT sample from Request/Response exchange (in usecs)
 */
 struct dccp_sock {
@@ -502,6 +503,7 @@ struct dccp_sock {
        __u8                            dccps_hc_rx_insert_options:1;
        __u8                            dccps_hc_tx_insert_options:1;
        __u8                            dccps_server_timewait:1;
+        struct tasklet_struct           dccps_xmitlet;
        struct timer_list               dccps_xmit_timer;
 };
diff --git a/include/linux/fs.h b/include/linux/fs.h
index b2a6009cba10..7b7b507ffa1c 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -9,6 +9,7 @@
 #include <linux/limits.h>
 #include <linux/ioctl.h>
 #include <linux/blk_types.h>
+#include <linux/types.h>
 /*
 * It's silly to have NR_OPEN bigger than NR_FILE, but you can change
@@ -32,6 +33,12 @@
 #define SEEK_END        2       /* seek relative to end of file */
 #define SEEK_MAX        SEEK_END
+struct fstrim_range {
+        uint64_t start;
+        uint64_t len;
+        uint64_t minlen;
+};
 /* And dynamically-tunable limits and defaults: */
 struct files_stat_struct {
        unsigned long nr_files;         /* read only */
@@ -317,6 +324,7 @@ struct inodes_stat_t {
 #define FIGETBSZ   _IO(0x00,2)  /* get the block size used for bmap */
 #define FIFREEZE        _IOWR('X', 119, int)    /* Freeze */
 #define FITHAW          _IOWR('X', 120, int)    /* Thaw */
+#define FITRIM          _IOWR('X', 121, struct fstrim_range)    /* Trim */
 #define FS_IOC_GETFLAGS                 _IOR('f', 1, long)
 #define FS_IOC_SETFLAGS                 _IOW('f', 2, long)
@@ -1604,6 +1612,7 @@ struct super_operations {
        ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);
 #endif
        int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
+        int (*trim_fs) (struct super_block *, struct fstrim_range *);
 };
 /*
@@ -1763,6 +1772,8 @@ struct file_system_type {
        int fs_flags;
        int (*get_sb) (struct file_system_type *, int,
                       const char *, void *, struct vfsmount *);
+        struct dentry *(*mount) (struct file_system_type *, int,
+                       const char *, void *);
        void (*kill_sb) (struct super_block *);
        struct module *owner;
        struct file_system_type * next;
@@ -1778,17 +1789,25 @@ struct file_system_type {
        struct lock_class_key i_alloc_sem_key;
 };
-extern int get_sb_ns(struct file_system_type *fs_type, int flags, void *data,
+extern struct dentry *mount_ns(struct file_system_type *fs_type, int flags,
-        int (*fill_super)(struct super_block *, void *, int),
+        void *data, int (*fill_super)(struct super_block *, void *, int));
-        struct vfsmount *mnt);
+extern struct dentry *mount_bdev(struct file_system_type *fs_type,
+        int flags, const char *dev_name, void *data,
+        int (*fill_super)(struct super_block *, void *, int));
 extern int get_sb_bdev(struct file_system_type *fs_type,
        int flags, const char *dev_name, void *data,
        int (*fill_super)(struct super_block *, void *, int),
        struct vfsmount *mnt);
+extern struct dentry *mount_single(struct file_system_type *fs_type,
+        int flags, void *data,
+        int (*fill_super)(struct super_block *, void *, int));
 extern int get_sb_single(struct file_system_type *fs_type,
        int flags, void *data,
        int (*fill_super)(struct super_block *, void *, int),
        struct vfsmount *mnt);
+extern struct dentry *mount_nodev(struct file_system_type *fs_type,
+        int flags, void *data,
+        int (*fill_super)(struct super_block *, void *, int));
 extern int get_sb_nodev(struct file_system_type *fs_type,
        int flags, void *data,
        int (*fill_super)(struct super_block *, void *, int),
@@ -1804,9 +1823,8 @@ struct super_block *sget(struct file_system_type *type,
                        int (*test)(struct super_block *,void *),
                        int (*set)(struct super_block *,void *),
                        void *data);
-extern int get_sb_pseudo(struct file_system_type *, char *,
+extern struct dentry *mount_pseudo(struct file_system_type *, char *,
-        const struct super_operations *ops, unsigned long,
+        const struct super_operations *ops, unsigned long);
-        struct vfsmount *mnt);
 extern void simple_set_mnt(struct vfsmount *mnt, struct super_block *sb);
 static inline void sb_mark_dirty(struct super_block *sb)
@@ -1849,6 +1867,7 @@ extern int current_umask(void);
 /* /sys/fs */
 extern struct kobject *fs_kobj;
+#define MAX_RW_COUNT (INT_MAX & PAGE_CACHE_MASK)
 extern int rw_verify_area(int, struct file *, loff_t *, size_t);
 #define FLOCK_VERIFY_READ  1
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index 4793d8a7f480..c760991b354a 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -141,6 +141,16 @@
 #define TWL6030_CHARGER_CTRL_INT_MASK   0x10
 #define TWL6030_CHARGER_FAULT_INT_MASK  0x60
+#define TWL6030_MMCCTRL         0xEE
+#define VMMC_AUTO_OFF                   (0x1 << 3)
+#define SW_FC                           (0x1 << 2)
+#define STS_MMC                 0x1
+#define TWL6030_CFG_INPUT_PUPD3 0xF2
+#define MMC_PU                          (0x1 << 3)
+#define MMC_PD                          (0x1 << 2)
 #define TWL4030_CLASS_ID                0x4030
 #define TWL6030_CLASS_ID                0x6030
@@ -173,6 +183,27 @@ int twl_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes);
 int twl6030_interrupt_unmask(u8 bit_mask, u8 offset);
 int twl6030_interrupt_mask(u8 bit_mask, u8 offset);
+/* Card detect Configuration for MMC1 Controller on OMAP4 */
+#ifdef CONFIG_TWL4030_CORE
+int twl6030_mmc_card_detect_config(void);
+#else
+static inline int twl6030_mmc_card_detect_config(void)
+{
+        pr_debug("twl6030_mmc_card_detect_config not supported\n");
+        return 0;
+}
+#endif
+/* MMC1 Controller on OMAP4 uses Phoenix irq for Card detect */
+#ifdef CONFIG_TWL4030_CORE
+int twl6030_mmc_card_detect(struct device *dev, int slot);
+#else
+static inline int twl6030_mmc_card_detect(struct device *dev, int slot)
+{
+        pr_debug("Call back twl6030_mmc_card_detect not supported\n");
+        return -EIO;
+}
+#endif
 /*----------------------------------------------------------------------*/
 /*
@@ -357,6 +388,52 @@ int twl6030_interrupt_mask(u8 bit_mask, u8 offset);
 /*----------------------------------------------------------------------*/
+/*
+ * PM Master module register offsets (use TWL4030_MODULE_PM_MASTER)
+ */
+#define TWL4030_PM_MASTER_CFG_P1_TRANSITION     0x00
+#define TWL4030_PM_MASTER_CFG_P2_TRANSITION     0x01
+#define TWL4030_PM_MASTER_CFG_P3_TRANSITION     0x02
+#define TWL4030_PM_MASTER_CFG_P123_TRANSITION   0x03
+#define TWL4030_PM_MASTER_STS_BOOT              0x04
+#define TWL4030_PM_MASTER_CFG_BOOT              0x05
+#define TWL4030_PM_MASTER_SHUNDAN               0x06
+#define TWL4030_PM_MASTER_BOOT_BCI              0x07
+#define TWL4030_PM_MASTER_CFG_PWRANA1           0x08
+#define TWL4030_PM_MASTER_CFG_PWRANA2           0x09
+#define TWL4030_PM_MASTER_BACKUP_MISC_STS       0x0b
+#define TWL4030_PM_MASTER_BACKUP_MISC_CFG       0x0c
+#define TWL4030_PM_MASTER_BACKUP_MISC_TST       0x0d
+#define TWL4030_PM_MASTER_PROTECT_KEY           0x0e
+#define TWL4030_PM_MASTER_STS_HW_CONDITIONS     0x0f
+#define TWL4030_PM_MASTER_P1_SW_EVENTS          0x10
+#define TWL4030_PM_MASTER_P2_SW_EVENTS          0x11
+#define TWL4030_PM_MASTER_P3_SW_EVENTS          0x12
+#define TWL4030_PM_MASTER_STS_P123_STATE        0x13
+#define TWL4030_PM_MASTER_PB_CFG                0x14
+#define TWL4030_PM_MASTER_PB_WORD_MSB           0x15
+#define TWL4030_PM_MASTER_PB_WORD_LSB           0x16
+#define TWL4030_PM_MASTER_SEQ_ADD_W2P           0x1c
+#define TWL4030_PM_MASTER_SEQ_ADD_P2A           0x1d
+#define TWL4030_PM_MASTER_SEQ_ADD_A2W           0x1e
+#define TWL4030_PM_MASTER_SEQ_ADD_A2S           0x1f
+#define TWL4030_PM_MASTER_SEQ_ADD_S2A12         0x20
+#define TWL4030_PM_MASTER_SEQ_ADD_S2A3          0x21
+#define TWL4030_PM_MASTER_SEQ_ADD_WARM          0x22
+#define TWL4030_PM_MASTER_MEMORY_ADDRESS        0x23
+#define TWL4030_PM_MASTER_MEMORY_DATA           0x24
+#define TWL4030_PM_MASTER_KEY_CFG1              0xc0
+#define TWL4030_PM_MASTER_KEY_CFG2              0x0c
+#define TWL4030_PM_MASTER_KEY_TST1              0xe0
+#define TWL4030_PM_MASTER_KEY_TST2              0x0e
+#define TWL4030_PM_MASTER_GLOBAL_TST            0xb6
+/*----------------------------------------------------------------------*/
 /* Power bus message definitions */
 /* The TWL4030/5030 splits its power-management resources (the various
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index b22790268b64..d377ea815d45 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -112,6 +112,7 @@ struct resource_list {
 /* PC/ISA/whatever - the normal PC address spaces: IO and memory */
 extern struct resource ioport_resource;
 extern struct resource iomem_resource;
+extern int resource_alloc_from_bottom;
 extern struct resource *request_resource_conflict(struct resource *root, struct resource *new);
 extern int request_resource(struct resource *root, struct resource *new);
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index 0b52924a0cb6..2ae86aa21fce 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -395,7 +395,7 @@ struct jbd2_inode {
        struct inode *i_vfs_inode;
        /* Flags of inode [j_list_lock] */
-        unsigned int i_flags;
+        unsigned long i_flags;
 };
 struct jbd2_revoke_table_s;
diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
index cc96f0f23e04..092e4250a458 100644
--- a/include/linux/kgdb.h
+++ b/include/linux/kgdb.h
@@ -35,16 +35,6 @@ struct pt_regs;
 */
 extern int kgdb_skipexception(int exception, struct pt_regs *regs);
-/**
- *      kgdb_disable_hw_debug - (optional) Disable hardware debugging hook
- *      @regs: Current &struct pt_regs.
- *
- *      This function will be called if the particular architecture must
- *      disable hardware debugging while it is processing gdb packets or
- *      handling exception.
- */
-extern void kgdb_disable_hw_debug(struct pt_regs *regs);
 struct tasklet_struct;
 struct task_struct;
 struct uart_port;
@@ -243,6 +233,8 @@ extern void kgdb_arch_late(void);
 * breakpoint.
 * @remove_hw_breakpoint: Allow an architecture to specify how to remove a
 * hardware breakpoint.
+ * @disable_hw_break: Allow an architecture to specify how to disable
+ * hardware breakpoints for a single cpu.
 * @remove_all_hw_break: Allow an architecture to specify how to remove all
 * hardware breakpoints.
 * @correct_hw_break: Allow an architecture to specify how to correct the
@@ -256,6 +248,7 @@ struct kgdb_arch {
        int     (*remove_breakpoint)(unsigned long, char *);
        int     (*set_hw_breakpoint)(unsigned long, int, enum kgdb_bptype);
        int     (*remove_hw_breakpoint)(unsigned long, int, enum kgdb_bptype);
+        void    (*disable_hw_break)(struct pt_regs *regs);
        void    (*remove_all_hw_break)(void);
        void    (*correct_hw_break)(void);
 };
diff --git a/include/linux/magic.h b/include/linux/magic.h
index eb9800f05782..ff690d05f129 100644
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -57,5 +57,6 @@
 #define DEVPTS_SUPER_MAGIC      0x1cd1
 #define SOCKFS_MAGIC            0x534F434B
+#define V9FS_MAGIC              0x01021997
 #endif /* __LINUX_MAGIC_H__ */
diff --git a/include/linux/mfd/88pm860x.h b/include/linux/mfd/88pm860x.h
index bfd23bef7363..4db1fbd8969e 100644
--- a/include/linux/mfd/88pm860x.h
+++ b/include/linux/mfd/88pm860x.h
@@ -138,7 +138,7 @@ enum {
        PM8607_ID_RG_MAX,
 };
-#define PM8607_VERSION                  (0x40)  /* 8607 chip ID */
+/* 8607 chip ID is 0x40 or 0x50 */
 #define PM8607_VERSION_MASK             (0xF0)  /* 8607 chip ID mask */
 /* Interrupt Registers */
diff --git a/include/linux/mfd/ab8500.h b/include/linux/mfd/ab8500.h
index f5cec4500f38..d63b6050b183 100644
--- a/include/linux/mfd/ab8500.h
+++ b/include/linux/mfd/ab8500.h
@@ -10,6 +10,29 @@
 #include <linux/device.h>
 /*
+ * AB8500 bank addresses
+ */
+#define AB8500_SYS_CTRL1_BLOCK  0x1
+#define AB8500_SYS_CTRL2_BLOCK  0x2
+#define AB8500_REGU_CTRL1       0x3
+#define AB8500_REGU_CTRL2       0x4
+#define AB8500_USB              0x5
+#define AB8500_TVOUT            0x6
+#define AB8500_DBI              0x7
+#define AB8500_ECI_AV_ACC       0x8
+#define AB8500_RESERVED         0x9
+#define AB8500_GPADC            0xA
+#define AB8500_CHARGER          0xB
+#define AB8500_GAS_GAUGE        0xC
+#define AB8500_AUDIO            0xD
+#define AB8500_INTERRUPT        0xE
+#define AB8500_RTC              0xF
+#define AB8500_MISC             0x10
+#define AB8500_DEBUG            0x12
+#define AB8500_PROD_TEST        0x13
+#define AB8500_OTP_EMUL         0x15
+/*
 * Interrupts
 */
@@ -99,6 +122,7 @@ struct ab8500 {
        int             revision;
        int             irq_base;
        int             irq;
+        u8              chip_id;
        int (*write) (struct ab8500 *a8500, u16 addr, u8 data);
        int (*read) (struct ab8500 *a8500, u16 addr);
@@ -124,10 +148,6 @@ struct ab8500_platform_data {
        struct regulator_init_data *regulator[AB8500_NUM_REGULATORS];
 };
-extern int ab8500_write(struct ab8500 *a8500, u16 addr, u8 data);
-extern int ab8500_read(struct ab8500 *a8500, u16 addr);
-extern int ab8500_set_bits(struct ab8500 *a8500, u16 addr, u8 mask, u8 data);
 extern int __devinit ab8500_init(struct ab8500 *ab8500);
 extern int __devexit ab8500_exit(struct ab8500 *ab8500);
diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
index 390726fcbcb1..67bd6f7ecf32 100644
--- a/include/linux/mfd/abx500.h
+++ b/include/linux/mfd/abx500.h
@@ -6,8 +6,7 @@
 *
 * ABX500 core access functions.
 * The abx500 interface is used for the Analog Baseband chip
- * ab3100, ab3550, ab5500 and possibly comming. It is not used for
+ * ab3100, ab3550, ab5500, and ab8500.
- * ab4500 and ab8500 since they are another family of chip.
 *
 * Author: Mattias Wallin <mattias.wallin@stericsson.com>
 * Author: Mattias Nilsson <mattias.i.nilsson@stericsson.com>
@@ -230,4 +229,5 @@ struct abx500_ops {
 };
 int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops);
+void abx500_remove_ops(struct device *dev);
 #endif
diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
index 11d740b8831d..cb93d80aa642 100644
--- a/include/linux/mfd/core.h
+++ b/include/linux/mfd/core.h
@@ -44,6 +44,9 @@ struct mfd_cell {
         */
        int                     num_resources;
        const struct resource   *resources;
+        /* don't check for resource conflicts */
+        bool                    ignore_resource_conflicts;
 };
 extern int mfd_add_devices(struct device *parent, int id,
diff --git a/include/linux/mfd/max8998-private.h b/include/linux/mfd/max8998-private.h
index 6dc75b3e2d33..7363dea6bbcd 100644
--- a/include/linux/mfd/max8998-private.h
+++ b/include/linux/mfd/max8998-private.h
@@ -1,5 +1,5 @@
 /*
- * max8698.h - Voltage regulator driver for the Maxim 8998
+ * max8998.h - Voltage regulator driver for the Maxim 8998
 *
 *  Copyright (C) 2009-2010 Samsung Electrnoics
 *  Kyungmin Park <kyungmin.park@samsung.com>
@@ -23,6 +23,8 @@
 #ifndef __LINUX_MFD_MAX8998_PRIV_H
 #define __LINUX_MFD_MAX8998_PRIV_H
+#define MAX8998_NUM_IRQ_REGS    4
 /* MAX 8998 registers */
 enum {
        MAX8998_REG_IRQ1,
@@ -46,12 +48,12 @@ enum {
        MAX8998_REG_ONOFF2,
        MAX8998_REG_ONOFF3,
        MAX8998_REG_ONOFF4,
-        MAX8998_REG_BUCK1_DVSARM1,
+        MAX8998_REG_BUCK1_VOLTAGE1,
-        MAX8998_REG_BUCK1_DVSARM2,
+        MAX8998_REG_BUCK1_VOLTAGE2,
-        MAX8998_REG_BUCK1_DVSARM3,
+        MAX8998_REG_BUCK1_VOLTAGE3,
-        MAX8998_REG_BUCK1_DVSARM4,
+        MAX8998_REG_BUCK1_VOLTAGE4,
-        MAX8998_REG_BUCK2_DVSINT1,
+        MAX8998_REG_BUCK2_VOLTAGE1,
-        MAX8998_REG_BUCK2_DVSINT2,
+        MAX8998_REG_BUCK2_VOLTAGE2,
        MAX8998_REG_BUCK3,
        MAX8998_REG_BUCK4,
        MAX8998_REG_LDO2_LDO3,
@@ -72,41 +74,102 @@ enum {
        MAX8998_REG_LBCNFG2,
 };
+/* IRQ definitions */
+enum {
+        MAX8998_IRQ_DCINF,
+        MAX8998_IRQ_DCINR,
+        MAX8998_IRQ_JIGF,
+        MAX8998_IRQ_JIGR,
+        MAX8998_IRQ_PWRONF,
+        MAX8998_IRQ_PWRONR,
+        MAX8998_IRQ_WTSREVNT,
+        MAX8998_IRQ_SMPLEVNT,
+        MAX8998_IRQ_ALARM1,
+        MAX8998_IRQ_ALARM0,
+        MAX8998_IRQ_ONKEY1S,
+        MAX8998_IRQ_TOPOFFR,
+        MAX8998_IRQ_DCINOVPR,
+        MAX8998_IRQ_CHGRSTF,
+        MAX8998_IRQ_DONER,
+        MAX8998_IRQ_CHGFAULT,
+        MAX8998_IRQ_LOBAT1,
+        MAX8998_IRQ_LOBAT2,
+        MAX8998_IRQ_NR,
+};
+/* MAX8998 various variants */
+enum {
+        TYPE_MAX8998 = 0, /* Default */
+        TYPE_LP3974,    /* National version of MAX8998 */
+        TYPE_LP3979,    /* Added AVS */
+};
+#define MAX8998_IRQ_DCINF_MASK          (1 << 2)
+#define MAX8998_IRQ_DCINR_MASK          (1 << 3)
+#define MAX8998_IRQ_JIGF_MASK           (1 << 4)
+#define MAX8998_IRQ_JIGR_MASK           (1 << 5)
+#define MAX8998_IRQ_PWRONF_MASK         (1 << 6)
+#define MAX8998_IRQ_PWRONR_MASK         (1 << 7)
+#define MAX8998_IRQ_WTSREVNT_MASK       (1 << 0)
+#define MAX8998_IRQ_SMPLEVNT_MASK       (1 << 1)
+#define MAX8998_IRQ_ALARM1_MASK         (1 << 2)
+#define MAX8998_IRQ_ALARM0_MASK         (1 << 3)
+#define MAX8998_IRQ_ONKEY1S_MASK        (1 << 0)
+#define MAX8998_IRQ_TOPOFFR_MASK        (1 << 2)
+#define MAX8998_IRQ_DCINOVPR_MASK       (1 << 3)
+#define MAX8998_IRQ_CHGRSTF_MASK        (1 << 4)
+#define MAX8998_IRQ_DONER_MASK          (1 << 5)
+#define MAX8998_IRQ_CHGFAULT_MASK       (1 << 7)
+#define MAX8998_IRQ_LOBAT1_MASK         (1 << 0)
+#define MAX8998_IRQ_LOBAT2_MASK         (1 << 1)
+#define MAX8998_ENRAMP                  (1 << 4)
 /**
 * struct max8998_dev - max8998 master device for sub-drivers
 * @dev: master device of the chip (can be used to access platform data)
- * @i2c_client: i2c client private data
+ * @i2c: i2c client private data for regulator
- * @dev_read(): chip register read function
+ * @rtc: i2c client private data for rtc
- * @dev_write(): chip register write function
- * @dev_update(): chip register update function
 * @iolock: mutex for serializing io access
+ * @irqlock: mutex for buslock
+ * @irq_base: base IRQ number for max8998, required for IRQs
+ * @irq: generic IRQ number for max8998
+ * @ono: power onoff IRQ number for max8998
+ * @irq_masks_cur: currently active value
+ * @irq_masks_cache: cached hardware value
+ * @type: indicate which max8998 "variant" is used
 */
 struct max8998_dev {
        struct device *dev;
-        struct i2c_client *i2c_client;
+        struct i2c_client *i2c;
-        int (*dev_read)(struct max8998_dev *max8998, u8 reg, u8 *dest);
+        struct i2c_client *rtc;
-        int (*dev_write)(struct max8998_dev *max8998, u8 reg, u8 val);
-        int (*dev_update)(struct max8998_dev *max8998, u8 reg, u8 val, u8 mask);
        struct mutex iolock;
+        struct mutex irqlock;
+        int irq_base;
+        int irq;
+        int ono;
+        u8 irq_masks_cur[MAX8998_NUM_IRQ_REGS];
+        u8 irq_masks_cache[MAX8998_NUM_IRQ_REGS];
+        int type;
 };
-static inline int max8998_read_reg(struct max8998_dev *max8998, u8 reg,
+int max8998_irq_init(struct max8998_dev *max8998);
-                                   u8 *value)
+void max8998_irq_exit(struct max8998_dev *max8998);
-{
-        return max8998->dev_read(max8998, reg, value);
+extern int max8998_read_reg(struct i2c_client *i2c, u8 reg, u8 *dest);
-}
+extern int max8998_bulk_read(struct i2c_client *i2c, u8 reg, int count,
+                u8 *buf);
-static inline int max8998_write_reg(struct max8998_dev *max8998, u8 reg,
+extern int max8998_write_reg(struct i2c_client *i2c, u8 reg, u8 value);
-                                    u8 value)
+extern int max8998_bulk_write(struct i2c_client *i2c, u8 reg, int count,
-{
+                u8 *buf);
-        return max8998->dev_write(max8998, reg, value);
+extern int max8998_update_reg(struct i2c_client *i2c, u8 reg, u8 val, u8 mask);
-}
-static inline int max8998_update_reg(struct max8998_dev *max8998, u8 reg,
-                                     u8 value, u8 mask)
-{
-        return max8998->dev_update(max8998, reg, value, mask);
-}
 #endif /*  __LINUX_MFD_MAX8998_PRIV_H */
diff --git a/include/linux/mfd/max8998.h b/include/linux/mfd/max8998.h
index 1d3601a2d853..f8c9f884aff2 100644
--- a/include/linux/mfd/max8998.h
+++ b/include/linux/mfd/max8998.h
@@ -1,5 +1,5 @@
 /*
- * max8698.h - Voltage regulator driver for the Maxim 8998
+ * max8998.h - Voltage regulator driver for the Maxim 8998
 *
 *  Copyright (C) 2009-2010 Samsung Electrnoics
 *  Kyungmin Park <kyungmin.park@samsung.com>
@@ -66,13 +66,28 @@ struct max8998_regulator_data {
 /**
 * struct max8998_board - packages regulator init data
- * @num_regulators: number of regultors used
 * @regulators: array of defined regulators
+ * @num_regulators: number of regultors used
+ * @irq_base: base IRQ number for max8998, required for IRQs
+ * @ono: power onoff IRQ number for max8998
+ * @buck1_max_voltage1: BUCK1 maximum alowed voltage register 1
+ * @buck1_max_voltage2: BUCK1 maximum alowed voltage register 2
+ * @buck2_max_voltage: BUCK2 maximum alowed voltage
+ * @buck1_set1: BUCK1 gpio pin 1 to set output voltage
+ * @buck1_set2: BUCK1 gpio pin 2 to set output voltage
+ * @buck2_set3: BUCK2 gpio pin to set output voltage
 */
 struct max8998_platform_data {
-        int                             num_regulators;
        struct max8998_regulator_data   *regulators;
+        int                             num_regulators;
+        int                             irq_base;
+        int                             ono;
+        int                             buck1_max_voltage1;
+        int                             buck1_max_voltage2;
+        int                             buck2_max_voltage;
+        int                             buck1_set1;
+        int                             buck1_set2;
+        int                             buck2_set3;
 };
 #endif /*  __LINUX_MFD_MAX8998_H */
diff --git a/include/linux/mfd/mc13783.h b/include/linux/mfd/mc13783.h
index 0fa44fb8dd26..b4c741e352c2 100644
--- a/include/linux/mfd/mc13783.h
+++ b/include/linux/mfd/mc13783.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Pengutronix
+ * Copyright 2009-2010 Pengutronix
 * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -9,48 +9,83 @@
 #ifndef __LINUX_MFD_MC13783_H
 #define __LINUX_MFD_MC13783_H
-#include <linux/interrupt.h>
+#include <linux/mfd/mc13xxx.h>
 struct mc13783;
-void mc13783_lock(struct mc13783 *mc13783);
+struct mc13xxx *mc13783_to_mc13xxx(struct mc13783 *mc13783);
-void mc13783_unlock(struct mc13783 *mc13783);
-int mc13783_reg_read(struct mc13783 *mc13783, unsigned int offset, u32 *val);
+static inline void mc13783_lock(struct mc13783 *mc13783)
-int mc13783_reg_write(struct mc13783 *mc13783, unsigned int offset, u32 val);
+{
-int mc13783_reg_rmw(struct mc13783 *mc13783, unsigned int offset,
+        mc13xxx_lock(mc13783_to_mc13xxx(mc13783));
-                u32 mask, u32 val);
+}
+static inline void mc13783_unlock(struct mc13783 *mc13783)
+{
+        mc13xxx_unlock(mc13783_to_mc13xxx(mc13783));
+}
+static inline int mc13783_reg_read(struct mc13783 *mc13783,
+                unsigned int offset, u32 *val)
+{
+        return mc13xxx_reg_read(mc13783_to_mc13xxx(mc13783), offset, val);
+}
+static inline int mc13783_reg_write(struct mc13783 *mc13783,
+                unsigned int offset, u32 val)
+{
+        return mc13xxx_reg_write(mc13783_to_mc13xxx(mc13783), offset, val);
+}
+static inline int mc13783_reg_rmw(struct mc13783 *mc13783,
+                unsigned int offset, u32 mask, u32 val)
+{
+        return mc13xxx_reg_rmw(mc13783_to_mc13xxx(mc13783), offset, mask, val);
+}
-int mc13783_get_flags(struct mc13783 *mc13783);
+static inline int mc13783_get_flags(struct mc13783 *mc13783)
+{
+        return mc13xxx_get_flags(mc13783_to_mc13xxx(mc13783));
+}
-int mc13783_irq_request(struct mc13783 *mc13783, int irq,
+static inline int mc13783_irq_request(struct mc13783 *mc13783, int irq,
-                irq_handler_t handler, const char *name, void *dev);
+                irq_handler_t handler, const char *name, void *dev)
-int mc13783_irq_request_nounmask(struct mc13783 *mc13783, int irq,
+{
-                irq_handler_t handler, const char *name, void *dev);
+        return mc13xxx_irq_request(mc13783_to_mc13xxx(mc13783), irq,
-int mc13783_irq_free(struct mc13783 *mc13783, int irq, void *dev);
+                        handler, name, dev);
+}
-int mc13783_irq_mask(struct mc13783 *mc13783, int irq);
+static inline int mc13783_irq_request_nounmask(struct mc13783 *mc13783, int irq,
-int mc13783_irq_unmask(struct mc13783 *mc13783, int irq);
+                irq_handler_t handler, const char *name, void *dev)
-int mc13783_irq_status(struct mc13783 *mc13783, int irq,
+{
-                int *enabled, int *pending);
+        return mc13xxx_irq_request_nounmask(mc13783_to_mc13xxx(mc13783), irq,
-int mc13783_irq_ack(struct mc13783 *mc13783, int irq);
+                        handler, name, dev);
+}
-static inline int mc13783_mask(struct mc13783 *mc13783, int irq) __deprecated;
+static inline int mc13783_irq_free(struct mc13783 *mc13783, int irq, void *dev)
-static inline int mc13783_mask(struct mc13783 *mc13783, int irq)
 {
-        return mc13783_irq_mask(mc13783, irq);
+        return mc13xxx_irq_free(mc13783_to_mc13xxx(mc13783), irq, dev);
 }
-static inline int mc13783_unmask(struct mc13783 *mc13783, int irq) __deprecated;
+static inline int mc13783_irq_mask(struct mc13783 *mc13783, int irq)
-static inline int mc13783_unmask(struct mc13783 *mc13783, int irq)
 {
-        return mc13783_irq_unmask(mc13783, irq);
+        return mc13xxx_irq_mask(mc13783_to_mc13xxx(mc13783), irq);
 }
-static inline int mc13783_ackirq(struct mc13783 *mc13783, int irq) __deprecated;
+static inline int mc13783_irq_unmask(struct mc13783 *mc13783, int irq)
-static inline int mc13783_ackirq(struct mc13783 *mc13783, int irq)
 {
-        return mc13783_irq_ack(mc13783, irq);
+        return mc13xxx_irq_unmask(mc13783_to_mc13xxx(mc13783), irq);
+}
+static inline int mc13783_irq_status(struct mc13783 *mc13783, int irq,
+                int *enabled, int *pending)
+{
+        return mc13xxx_irq_status(mc13783_to_mc13xxx(mc13783),
+                        irq, enabled, pending);
+}
+static inline int mc13783_irq_ack(struct mc13783 *mc13783, int irq)
+{
+        return mc13xxx_irq_ack(mc13783_to_mc13xxx(mc13783), irq);
 }
 #define MC13783_ADC0            43
@@ -66,96 +101,18 @@ static inline int mc13783_ackirq(struct mc13783 *mc13783, int irq)
                                        MC13783_ADC0_TSMOD1 | \
                                        MC13783_ADC0_TSMOD2)
-struct mc13783_led_platform_data {
+#define mc13783_regulator_init_data mc13xxx_regulator_init_data
-#define MC13783_LED_MD          0
+#define mc13783_regulator_platform_data mc13xxx_regulator_platform_data
-#define MC13783_LED_AD          1
+#define mc13783_led_platform_data mc13xxx_led_platform_data
-#define MC13783_LED_KP          2
+#define mc13783_leds_platform_data mc13xxx_leds_platform_data
-#define MC13783_LED_R1          3
-#define MC13783_LED_G1          4
+#define mc13783_platform_data mc13xxx_platform_data
-#define MC13783_LED_B1          5
+#define MC13783_USE_TOUCHSCREEN MC13XXX_USE_TOUCHSCREEN
-#define MC13783_LED_R2          6
+#define MC13783_USE_CODEC       MC13XXX_USE_CODEC
-#define MC13783_LED_G2          7
+#define MC13783_USE_ADC         MC13XXX_USE_ADC
-#define MC13783_LED_B2          8
+#define MC13783_USE_RTC         MC13XXX_USE_RTC
-#define MC13783_LED_R3          9
+#define MC13783_USE_REGULATOR   MC13XXX_USE_REGULATOR
-#define MC13783_LED_G3          10
+#define MC13783_USE_LED         MC13XXX_USE_LED
-#define MC13783_LED_B3          11
-#define MC13783_LED_MAX MC13783_LED_B3
-        int id;
-        const char *name;
-        const char *default_trigger;
-/* Three or two bits current selection depending on the led */
-        char max_current;
-};
-struct mc13783_leds_platform_data {
-        int num_leds;
-        struct mc13783_led_platform_data *led;
-#define MC13783_LED_TRIODE_MD   (1 << 0)
-#define MC13783_LED_TRIODE_AD   (1 << 1)
-#define MC13783_LED_TRIODE_KP   (1 << 2)
-#define MC13783_LED_BOOST_EN    (1 << 3)
-#define MC13783_LED_TC1HALF     (1 << 4)
-#define MC13783_LED_SLEWLIMTC   (1 << 5)
-#define MC13783_LED_SLEWLIMBL   (1 << 6)
-#define MC13783_LED_TRIODE_TC1  (1 << 7)
-#define MC13783_LED_TRIODE_TC2  (1 << 8)
-#define MC13783_LED_TRIODE_TC3  (1 << 9)
-        int flags;
-#define MC13783_LED_AB_DISABLED         0
-#define MC13783_LED_AB_MD1              1
-#define MC13783_LED_AB_MD12             2
-#define MC13783_LED_AB_MD123            3
-#define MC13783_LED_AB_MD1234           4
-#define MC13783_LED_AB_MD1234_AD1       5
-#define MC13783_LED_AB_MD1234_AD12      6
-#define MC13783_LED_AB_MD1_AD           7
-        char abmode;
-#define MC13783_LED_ABREF_200MV 0
-#define MC13783_LED_ABREF_400MV 1
-#define MC13783_LED_ABREF_600MV 2
-#define MC13783_LED_ABREF_800MV 3
-        char abref;
-#define MC13783_LED_PERIOD_10MS         0
-#define MC13783_LED_PERIOD_100MS        1
-#define MC13783_LED_PERIOD_500MS        2
-#define MC13783_LED_PERIOD_2S           3
-        char bl_period;
-        char tc1_period;
-        char tc2_period;
-        char tc3_period;
-};
-/* to be cleaned up */
-struct regulator_init_data;
-struct mc13783_regulator_init_data {
-        int id;
-        struct regulator_init_data *init_data;
-};
-struct mc13783_regulator_platform_data {
-        int num_regulators;
-        struct mc13783_regulator_init_data *regulators;
-};
-struct mc13783_platform_data {
-        int num_regulators;
-        struct mc13783_regulator_init_data *regulators;
-        struct mc13783_leds_platform_data *leds;
-#define MC13783_USE_TOUCHSCREEN (1 << 0)
-#define MC13783_USE_CODEC       (1 << 1)
-#define MC13783_USE_ADC         (1 << 2)
-#define MC13783_USE_RTC         (1 << 3)
-#define MC13783_USE_REGULATOR   (1 << 4)
-#define MC13783_USE_LED         (1 << 5)
-        unsigned int flags;
-};
 #define MC13783_ADC_MODE_TS             1
 #define MC13783_ADC_MODE_SINGLE_CHAN    2
@@ -199,46 +156,46 @@ int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode,
 #define MC13783_REGU_PWGT1SPI   31
 #define MC13783_REGU_PWGT2SPI   32
-#define MC13783_IRQ_ADCDONE     0
+#define MC13783_IRQ_ADCDONE     MC13XXX_IRQ_ADCDONE
-#define MC13783_IRQ_ADCBISDONE  1
+#define MC13783_IRQ_ADCBISDONE  MC13XXX_IRQ_ADCBISDONE
-#define MC13783_IRQ_TS          2
+#define MC13783_IRQ_TS          MC13XXX_IRQ_TS
 #define MC13783_IRQ_WHIGH       3
 #define MC13783_IRQ_WLOW        4
-#define MC13783_IRQ_CHGDET      6
+#define MC13783_IRQ_CHGDET      MC13XXX_IRQ_CHGDET
 #define MC13783_IRQ_CHGOV       7
-#define MC13783_IRQ_CHGREV      8
+#define MC13783_IRQ_CHGREV      MC13XXX_IRQ_CHGREV
-#define MC13783_IRQ_CHGSHORT    9
+#define MC13783_IRQ_CHGSHORT    MC13XXX_IRQ_CHGSHORT
-#define MC13783_IRQ_CCCV        10
+#define MC13783_IRQ_CCCV        MC13XXX_IRQ_CCCV
-#define MC13783_IRQ_CHGCURR     11
+#define MC13783_IRQ_CHGCURR     MC13XXX_IRQ_CHGCURR
-#define MC13783_IRQ_BPON        12
+#define MC13783_IRQ_BPON        MC13XXX_IRQ_BPON
-#define MC13783_IRQ_LOBATL      13
+#define MC13783_IRQ_LOBATL      MC13XXX_IRQ_LOBATL
-#define MC13783_IRQ_LOBATH      14
+#define MC13783_IRQ_LOBATH      MC13XXX_IRQ_LOBATH
 #define MC13783_IRQ_UDP         15
 #define MC13783_IRQ_USB         16
 #define MC13783_IRQ_ID          19
 #define MC13783_IRQ_SE1         21
 #define MC13783_IRQ_CKDET       22
 #define MC13783_IRQ_UDM         23
-#define MC13783_IRQ_1HZ         24
+#define MC13783_IRQ_1HZ         MC13XXX_IRQ_1HZ
-#define MC13783_IRQ_TODA        25
+#define MC13783_IRQ_TODA        MC13XXX_IRQ_TODA
 #define MC13783_IRQ_ONOFD1      27
 #define MC13783_IRQ_ONOFD2      28
 #define MC13783_IRQ_ONOFD3      29
-#define MC13783_IRQ_SYSRST      30
+#define MC13783_IRQ_SYSRST      MC13XXX_IRQ_SYSRST
-#define MC13783_IRQ_RTCRST      31
+#define MC13783_IRQ_RTCRST      MC13XXX_IRQ_RTCRST
-#define MC13783_IRQ_PC          32
+#define MC13783_IRQ_PC          MC13XXX_IRQ_PC
-#define MC13783_IRQ_WARM        33
+#define MC13783_IRQ_WARM        MC13XXX_IRQ_WARM
-#define MC13783_IRQ_MEMHLD      34
+#define MC13783_IRQ_MEMHLD      MC13XXX_IRQ_MEMHLD
 #define MC13783_IRQ_PWRRDY      35
-#define MC13783_IRQ_THWARNL     36
+#define MC13783_IRQ_THWARNL     MC13XXX_IRQ_THWARNL
-#define MC13783_IRQ_THWARNH     37
+#define MC13783_IRQ_THWARNH     MC13XXX_IRQ_THWARNH
-#define MC13783_IRQ_CLK         38
+#define MC13783_IRQ_CLK         MC13XXX_IRQ_CLK
 #define MC13783_IRQ_SEMAF       39
 #define MC13783_IRQ_MC2B        41
 #define MC13783_IRQ_HSDET       42
 #define MC13783_IRQ_HSL         43
 #define MC13783_IRQ_ALSPTH      44
 #define MC13783_IRQ_AHSSHORT    45
-#define MC13783_NUM_IRQ         46
+#define MC13783_NUM_IRQ         MC13XXX_NUM_IRQ
-#endif /* __LINUX_MFD_MC13783_H */
+#endif /* ifndef __LINUX_MFD_MC13783_H */
diff --git a/include/linux/mfd/mc13xxx.h b/include/linux/mfd/mc13xxx.h
new file mode 100644
index 000000000000..a1d391b40e68
--- /dev/null
+++ b/include/linux/mfd/mc13xxx.h
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2009-2010 Pengutronix
+ * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.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_MFD_MC13XXX_H
+#define __LINUX_MFD_MC13XXX_H
+#include <linux/interrupt.h>
+struct mc13xxx;
+void mc13xxx_lock(struct mc13xxx *mc13xxx);
+void mc13xxx_unlock(struct mc13xxx *mc13xxx);
+int mc13xxx_reg_read(struct mc13xxx *mc13xxx, unsigned int offset, u32 *val);
+int mc13xxx_reg_write(struct mc13xxx *mc13xxx, unsigned int offset, u32 val);
+int mc13xxx_reg_rmw(struct mc13xxx *mc13xxx, unsigned int offset,
+                u32 mask, u32 val);
+int mc13xxx_get_flags(struct mc13xxx *mc13xxx);
+int mc13xxx_irq_request(struct mc13xxx *mc13xxx, int irq,
+                irq_handler_t handler, const char *name, void *dev);
+int mc13xxx_irq_request_nounmask(struct mc13xxx *mc13xxx, int irq,
+                irq_handler_t handler, const char *name, void *dev);
+int mc13xxx_irq_free(struct mc13xxx *mc13xxx, int irq, void *dev);
+int mc13xxx_irq_mask(struct mc13xxx *mc13xxx, int irq);
+int mc13xxx_irq_unmask(struct mc13xxx *mc13xxx, int irq);
+int mc13xxx_irq_status(struct mc13xxx *mc13xxx, int irq,
+                int *enabled, int *pending);
+int mc13xxx_irq_ack(struct mc13xxx *mc13xxx, int irq);
+int mc13xxx_get_flags(struct mc13xxx *mc13xxx);
+#define MC13XXX_IRQ_ADCDONE     0
+#define MC13XXX_IRQ_ADCBISDONE  1
+#define MC13XXX_IRQ_TS          2
+#define MC13XXX_IRQ_CHGDET      6
+#define MC13XXX_IRQ_CHGREV      8
+#define MC13XXX_IRQ_CHGSHORT    9
+#define MC13XXX_IRQ_CCCV        10
+#define MC13XXX_IRQ_CHGCURR     11
+#define MC13XXX_IRQ_BPON        12
+#define MC13XXX_IRQ_LOBATL      13
+#define MC13XXX_IRQ_LOBATH      14
+#define MC13XXX_IRQ_1HZ         24
+#define MC13XXX_IRQ_TODA        25
+#define MC13XXX_IRQ_SYSRST      30
+#define MC13XXX_IRQ_RTCRST      31
+#define MC13XXX_IRQ_PC          32
+#define MC13XXX_IRQ_WARM        33
+#define MC13XXX_IRQ_MEMHLD      34
+#define MC13XXX_IRQ_THWARNL     36
+#define MC13XXX_IRQ_THWARNH     37
+#define MC13XXX_IRQ_CLK         38
+#define MC13XXX_NUM_IRQ         46
+struct regulator_init_data;
+struct mc13xxx_regulator_init_data {
+        int id;
+        struct regulator_init_data *init_data;
+};
+struct mc13xxx_regulator_platform_data {
+        int num_regulators;
+        struct mc13xxx_regulator_init_data *regulators;
+};
+struct mc13xxx_led_platform_data {
+#define MC13783_LED_MD          0
+#define MC13783_LED_AD          1
+#define MC13783_LED_KP          2
+#define MC13783_LED_R1          3
+#define MC13783_LED_G1          4
+#define MC13783_LED_B1          5
+#define MC13783_LED_R2          6
+#define MC13783_LED_G2          7
+#define MC13783_LED_B2          8
+#define MC13783_LED_R3          9
+#define MC13783_LED_G3          10
+#define MC13783_LED_B3          11
+#define MC13783_LED_MAX MC13783_LED_B3
+        int id;
+        const char *name;
+        const char *default_trigger;
+/* Three or two bits current selection depending on the led */
+        char max_current;
+};
+struct mc13xxx_leds_platform_data {
+        int num_leds;
+        struct mc13xxx_led_platform_data *led;
+#define MC13783_LED_TRIODE_MD   (1 << 0)
+#define MC13783_LED_TRIODE_AD   (1 << 1)
+#define MC13783_LED_TRIODE_KP   (1 << 2)
+#define MC13783_LED_BOOST_EN    (1 << 3)
+#define MC13783_LED_TC1HALF     (1 << 4)
+#define MC13783_LED_SLEWLIMTC   (1 << 5)
+#define MC13783_LED_SLEWLIMBL   (1 << 6)
+#define MC13783_LED_TRIODE_TC1  (1 << 7)
+#define MC13783_LED_TRIODE_TC2  (1 << 8)
+#define MC13783_LED_TRIODE_TC3  (1 << 9)
+        int flags;
+#define MC13783_LED_AB_DISABLED         0
+#define MC13783_LED_AB_MD1              1
+#define MC13783_LED_AB_MD12             2
+#define MC13783_LED_AB_MD123            3
+#define MC13783_LED_AB_MD1234           4
+#define MC13783_LED_AB_MD1234_AD1       5
+#define MC13783_LED_AB_MD1234_AD12      6
+#define MC13783_LED_AB_MD1_AD           7
+        char abmode;
+#define MC13783_LED_ABREF_200MV 0
+#define MC13783_LED_ABREF_400MV 1
+#define MC13783_LED_ABREF_600MV 2
+#define MC13783_LED_ABREF_800MV 3
+        char abref;
+#define MC13783_LED_PERIOD_10MS         0
+#define MC13783_LED_PERIOD_100MS        1
+#define MC13783_LED_PERIOD_500MS        2
+#define MC13783_LED_PERIOD_2S           3
+        char bl_period;
+        char tc1_period;
+        char tc2_period;
+        char tc3_period;
+};
+struct mc13xxx_platform_data {
+#define MC13XXX_USE_TOUCHSCREEN (1 << 0)
+#define MC13XXX_USE_CODEC       (1 << 1)
+#define MC13XXX_USE_ADC         (1 << 2)
+#define MC13XXX_USE_RTC         (1 << 3)
+#define MC13XXX_USE_REGULATOR   (1 << 4)
+#define MC13XXX_USE_LED         (1 << 5)
+        unsigned int flags;
+        int num_regulators;
+        struct mc13xxx_regulator_init_data *regulators;
+        struct mc13xxx_leds_platform_data *leds;
+};
+#endif /* ifndef __LINUX_MFD_MC13XXX_H */
diff --git a/include/linux/mfd/pcf50633/core.h b/include/linux/mfd/pcf50633/core.h
index ad411a78870c..50d4a047118d 100644
--- a/include/linux/mfd/pcf50633/core.h
+++ b/include/linux/mfd/pcf50633/core.h
@@ -227,4 +227,11 @@ static inline struct pcf50633 *dev_to_pcf50633(struct device *dev)
        return dev_get_drvdata(dev);
 }
+int pcf50633_irq_init(struct pcf50633 *pcf, int irq);
+void pcf50633_irq_free(struct pcf50633 *pcf);
+#ifdef CONFIG_PM
+int pcf50633_irq_suspend(struct pcf50633 *pcf);
+int pcf50633_irq_resume(struct pcf50633 *pcf);
+#endif
 #endif
diff --git a/include/linux/mfd/sh_mobile_sdhi.h b/include/linux/mfd/sh_mobile_sdhi.h
index 49067802a6d7..c981b959760f 100644
--- a/include/linux/mfd/sh_mobile_sdhi.h
+++ b/include/linux/mfd/sh_mobile_sdhi.h
@@ -7,8 +7,10 @@ struct sh_mobile_sdhi_info {
        int dma_slave_tx;
        int dma_slave_rx;
        unsigned long tmio_flags;
+        unsigned long tmio_caps;
        u32 tmio_ocr_mask;      /* available MMC voltages */
        void (*set_pwr)(struct platform_device *pdev, int state);
+        int (*get_cd)(struct platform_device *pdev);
 };
 #endif /* __SH_MOBILE_SDHI_H__ */
diff --git a/include/linux/mfd/stmpe.h b/include/linux/mfd/stmpe.h
index 39ca7588659b..e762c270d8d4 100644
--- a/include/linux/mfd/stmpe.h
+++ b/include/linux/mfd/stmpe.h
@@ -112,13 +112,19 @@ struct stmpe_keypad_platform_data {
        bool no_autorepeat;
 };
+#define STMPE_GPIO_NOREQ_811_TOUCH      (0xf0)
 /**
 * struct stmpe_gpio_platform_data - STMPE GPIO platform data
 * @gpio_base: first gpio number assigned.  A maximum of
 *             %STMPE_NR_GPIOS GPIOs will be allocated.
+ * @norequest_mask: bitmask specifying which GPIOs should _not_ be
+ *                  requestable due to different usage (e.g. touch, keypad)
+ *                  STMPE_GPIO_NOREQ_* macros can be used here.
 */
 struct stmpe_gpio_platform_data {
        int gpio_base;
+        unsigned norequest_mask;
        void (*setup)(struct stmpe *stmpe, unsigned gpio_base);
        void (*remove)(struct stmpe *stmpe, unsigned gpio_base);
 };
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
index f07425bc3dcd..085f041197dc 100644
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
@@ -52,6 +52,11 @@
 /* tmio MMC platform flags */
 #define TMIO_MMC_WRPROTECT_DISABLE      (1 << 0)
+/*
+ * Some controllers can support a 2-byte block size when the bus width
+ * is configured in 4-bit mode.
+ */
+#define TMIO_MMC_BLKSZ_2BYTES           (1 << 1)
 int tmio_core_mmc_enable(void __iomem *cnf, int shift, unsigned long base);
 int tmio_core_mmc_resume(void __iomem *cnf, int shift, unsigned long base);
@@ -74,6 +79,7 @@ struct tmio_mmc_data {
        struct tmio_mmc_dma             *dma;
        void (*set_pwr)(struct platform_device *host, int state);
        void (*set_clk_div)(struct platform_device *host, int state);
+        int (*get_cd)(struct platform_device *host);
 };
 /*
diff --git a/include/linux/mfd/tps6586x.h b/include/linux/mfd/tps6586x.h
index 772b3ae640af..b6bab1b04e25 100644
--- a/include/linux/mfd/tps6586x.h
+++ b/include/linux/mfd/tps6586x.h
@@ -18,6 +18,36 @@ enum {
        TPS6586X_ID_LDO_RTC,
 };
+enum {
+        TPS6586X_INT_PLDO_0,
+        TPS6586X_INT_PLDO_1,
+        TPS6586X_INT_PLDO_2,
+        TPS6586X_INT_PLDO_3,
+        TPS6586X_INT_PLDO_4,
+        TPS6586X_INT_PLDO_5,
+        TPS6586X_INT_PLDO_6,
+        TPS6586X_INT_PLDO_7,
+        TPS6586X_INT_COMP_DET,
+        TPS6586X_INT_ADC,
+        TPS6586X_INT_PLDO_8,
+        TPS6586X_INT_PLDO_9,
+        TPS6586X_INT_PSM_0,
+        TPS6586X_INT_PSM_1,
+        TPS6586X_INT_PSM_2,
+        TPS6586X_INT_PSM_3,
+        TPS6586X_INT_RTC_ALM1,
+        TPS6586X_INT_ACUSB_OVP,
+        TPS6586X_INT_USB_DET,
+        TPS6586X_INT_AC_DET,
+        TPS6586X_INT_BAT_DET,
+        TPS6586X_INT_CHG_STAT,
+        TPS6586X_INT_CHG_TEMP,
+        TPS6586X_INT_PP,
+        TPS6586X_INT_RESUME,
+        TPS6586X_INT_LOW_SYS,
+        TPS6586X_INT_RTC_ALM2,
+};
 struct tps6586x_subdev_info {
        int             id;
        const char      *name;
@@ -29,6 +59,7 @@ struct tps6586x_platform_data {
        struct tps6586x_subdev_info *subdevs;
        int gpio_base;
+        int irq_base;
 };
 /*
diff --git a/include/linux/mfd/wm831x/core.h b/include/linux/mfd/wm831x/core.h
index eb5bd4e0e03c..a1239c48b41a 100644
--- a/include/linux/mfd/wm831x/core.h
+++ b/include/linux/mfd/wm831x/core.h
@@ -238,6 +238,15 @@ struct regulator_dev;
 #define WM831X_NUM_IRQ_REGS 5
+enum wm831x_parent {
+        WM8310 = 0x8310,
+        WM8311 = 0x8311,
+        WM8312 = 0x8312,
+        WM8320 = 0x8320,
+        WM8321 = 0x8321,
+        WM8325 = 0x8325,
+};
 struct wm831x {
        struct mutex io_lock;
@@ -285,6 +294,9 @@ int wm831x_set_bits(struct wm831x *wm831x, unsigned short reg,
 int wm831x_bulk_read(struct wm831x *wm831x, unsigned short reg,
                     int count, u16 *buf);
+int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq);
+void wm831x_device_exit(struct wm831x *wm831x);
+int wm831x_device_suspend(struct wm831x *wm831x);
 int wm831x_irq_init(struct wm831x *wm831x, int irq);
 void wm831x_irq_exit(struct wm831x *wm831x);
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 6b7525099e56..8ce082781ccb 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -48,6 +48,7 @@ struct mmc_ext_csd {
        unsigned int            sa_timeout;             /* Units: 100ns */
        unsigned int            hs_max_dtr;
        unsigned int            sectors;
+        unsigned int            card_type;
        unsigned int            hc_erase_size;          /* In sectors */
        unsigned int            hc_erase_timeout;       /* In milliseconds */
        unsigned int            sec_trim_mult;  /* Secure trim multiplier  */
@@ -113,6 +114,7 @@ struct mmc_card {
 #define MMC_STATE_READONLY      (1<<1)          /* card is read-only */
 #define MMC_STATE_HIGHSPEED     (1<<2)          /* card is in high speed mode */
 #define MMC_STATE_BLOCKADDR     (1<<3)          /* card uses block-addressing */
+#define MMC_STATE_HIGHSPEED_DDR (1<<4)          /* card is in high speed mode */
        unsigned int            quirks;         /* card quirks */
 #define MMC_QUIRK_LENIENT_FN0   (1<<0)          /* allow SDIO FN0 writes outside of the VS CCCR range */
 #define MMC_QUIRK_BLKSZ_FOR_BYTE_MODE (1<<1)    /* use func->cur_blksize */
@@ -154,11 +156,13 @@ struct mmc_card {
 #define mmc_card_readonly(c)    ((c)->state & MMC_STATE_READONLY)
 #define mmc_card_highspeed(c)   ((c)->state & MMC_STATE_HIGHSPEED)
 #define mmc_card_blockaddr(c)   ((c)->state & MMC_STATE_BLOCKADDR)
+#define mmc_card_ddr_mode(c)    ((c)->state & MMC_STATE_HIGHSPEED_DDR)
 #define mmc_card_set_present(c) ((c)->state |= MMC_STATE_PRESENT)
 #define mmc_card_set_readonly(c) ((c)->state |= MMC_STATE_READONLY)
 #define mmc_card_set_highspeed(c) ((c)->state |= MMC_STATE_HIGHSPEED)
 #define mmc_card_set_blockaddr(c) ((c)->state |= MMC_STATE_BLOCKADDR)
+#define mmc_card_set_ddr_mode(c) ((c)->state |= MMC_STATE_HIGHSPEED_DDR)
 static inline int mmc_card_lenient_fn0(const struct mmc_card *c)
 {
@@ -173,6 +177,8 @@ static inline int mmc_blksz_for_byte_mode(const struct mmc_card *c)
 #define mmc_card_name(c)        ((c)->cid.prod_name)
 #define mmc_card_id(c)          (dev_name(&(c)->dev))
+#define mmc_dev_to_card(d)      container_of(d, struct mmc_card, dev)
 #define mmc_list_to_card(l)     container_of(l, struct mmc_card, node)
 #define mmc_get_drvdata(c)      dev_get_drvdata(&(c)->dev)
 #define mmc_set_drvdata(c,d)    dev_set_drvdata(&(c)->dev, d)
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index 7429033acb66..64e013f1cfb8 100644
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -153,6 +153,8 @@ extern int mmc_can_secure_erase_trim(struct mmc_card *card);
 extern int mmc_erase_group_aligned(struct mmc_card *card, unsigned int from,
                                   unsigned int nr);
+extern int mmc_set_blocklen(struct mmc_card *card, unsigned int blocklen);
 extern void mmc_set_data_timeout(struct mmc_data *, const struct mmc_card *);
 extern unsigned int mmc_align_data_size(struct mmc_card *, unsigned int);
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 1575b52c3bfa..6d87f68ce4b6 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -50,6 +50,12 @@ struct mmc_ios {
 #define MMC_TIMING_LEGACY       0
 #define MMC_TIMING_MMC_HS       1
 #define MMC_TIMING_SD_HS        2
+        unsigned char   ddr;                    /* dual data rate used */
+#define MMC_SDR_MODE            0
+#define MMC_1_2V_DDR_MODE       1
+#define MMC_1_8V_DDR_MODE       2
 };
 struct mmc_host_ops {
@@ -123,6 +129,7 @@ struct mmc_host {
        const struct mmc_host_ops *ops;
        unsigned int            f_min;
        unsigned int            f_max;
+        unsigned int            f_init;
        u32                     ocr_avail;
        struct notifier_block   pm_notify;
@@ -157,13 +164,16 @@ struct mmc_host {
 #define MMC_CAP_NONREMOVABLE    (1 << 8)        /* Nonremovable e.g. eMMC */
 #define MMC_CAP_WAIT_WHILE_BUSY (1 << 9)        /* Waits while card is busy */
 #define MMC_CAP_ERASE           (1 << 10)       /* Allow erase/trim commands */
+#define MMC_CAP_1_8V_DDR        (1 << 11)       /* can support */
+                                                /* DDR mode at 1.8V */
+#define MMC_CAP_1_2V_DDR        (1 << 12)       /* can support */
+                                                /* DDR mode at 1.2V */
        mmc_pm_flag_t           pm_caps;        /* supported pm features */
        /* host specific block data */
        unsigned int            max_seg_size;   /* see blk_queue_max_segment_size */
-        unsigned short          max_hw_segs;    /* see blk_queue_max_hw_segments */
+        unsigned short          max_segs;       /* see blk_queue_max_segments */
-        unsigned short          max_phys_segs;  /* see blk_queue_max_phys_segments */
        unsigned short          unused;
        unsigned int            max_req_size;   /* maximum number of bytes in one req */
        unsigned int            max_blk_size;   /* maximum size of one mmc block */
@@ -212,6 +222,10 @@ struct mmc_host {
        struct led_trigger      *led;           /* activity led */
 #endif
+#ifdef CONFIG_REGULATOR
+        bool                    regulator_enabled; /* regulator state */
+#endif
        struct dentry           *debugfs_root;
        unsigned long           private[0] ____cacheline_aligned;
@@ -236,8 +250,8 @@ static inline void *mmc_priv(struct mmc_host *host)
 extern int mmc_suspend_host(struct mmc_host *);
 extern int mmc_resume_host(struct mmc_host *);
-extern void mmc_power_save_host(struct mmc_host *host);
+extern int mmc_power_save_host(struct mmc_host *host);
-extern void mmc_power_restore_host(struct mmc_host *host);
+extern int mmc_power_restore_host(struct mmc_host *host);
 extern void mmc_detect_change(struct mmc_host *, unsigned long delay);
 extern void mmc_request_done(struct mmc_host *, struct mmc_request *);
@@ -250,8 +264,24 @@ static inline void mmc_signal_sdio_irq(struct mmc_host *host)
 struct regulator;
+#ifdef CONFIG_REGULATOR
 int mmc_regulator_get_ocrmask(struct regulator *supply);
-int mmc_regulator_set_ocr(struct regulator *supply, unsigned short vdd_bit);
+int mmc_regulator_set_ocr(struct mmc_host *mmc,
+                        struct regulator *supply,
+                        unsigned short vdd_bit);
+#else
+static inline int mmc_regulator_get_ocrmask(struct regulator *supply)
+{
+        return 0;
+}
+static inline int mmc_regulator_set_ocr(struct mmc_host *mmc,
+                                 struct regulator *supply,
+                                 unsigned short vdd_bit)
+{
+        return 0;
+}
+#endif
 int mmc_card_awake(struct mmc_host *host);
 int mmc_card_sleep(struct mmc_host *host);
@@ -268,5 +298,13 @@ static inline void mmc_set_disable_delay(struct mmc_host *host,
        host->disable_delay = disable_delay;
 }
+/* Module parameter */
+extern int mmc_assume_removable;
+static inline int mmc_card_is_removable(struct mmc_host *host)
+{
+        return !(host->caps & MMC_CAP_NONREMOVABLE) && mmc_assume_removable;
+}
 #endif
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index dd11ae51fb68..956fbd877692 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -277,11 +277,19 @@ struct _mmc_csd {
 #define EXT_CSD_CARD_TYPE_26    (1<<0)  /* Card can run at 26MHz */
 #define EXT_CSD_CARD_TYPE_52    (1<<1)  /* Card can run at 52MHz */
-#define EXT_CSD_CARD_TYPE_MASK  0x3     /* Mask out reserved and DDR bits */
+#define EXT_CSD_CARD_TYPE_MASK  0xF     /* Mask out reserved bits */
+#define EXT_CSD_CARD_TYPE_DDR_1_8V  (1<<2)   /* Card can run at 52MHz */
+                                             /* DDR mode @1.8V or 3V I/O */
+#define EXT_CSD_CARD_TYPE_DDR_1_2V  (1<<3)   /* Card can run at 52MHz */
+                                             /* DDR mode @1.2V I/O */
+#define EXT_CSD_CARD_TYPE_DDR_52       (EXT_CSD_CARD_TYPE_DDR_1_8V  \
+                                        | EXT_CSD_CARD_TYPE_DDR_1_2V)
 #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 */
+#define EXT_CSD_DDR_BUS_WIDTH_4 5       /* Card is in 4 bit DDR mode */
+#define EXT_CSD_DDR_BUS_WIDTH_8 6       /* Card is in 8 bit DDR mode */
 #define EXT_CSD_SEC_ER_EN       BIT(0)
 #define EXT_CSD_SEC_BD_BLK_EN   BIT(2)
diff --git a/include/linux/sdhci-pltfm.h b/include/linux/mmc/sdhci-pltfm.h
index 0239bd70241e..548d59d404cb 100644
--- a/include/linux/sdhci-pltfm.h
+++ b/include/linux/mmc/sdhci-pltfm.h
@@ -28,7 +28,7 @@ struct sdhci_host;
 struct sdhci_pltfm_data {
        struct sdhci_ops *ops;
        unsigned int quirks;
-        int (*init)(struct sdhci_host *host);
+        int (*init)(struct sdhci_host *host, struct sdhci_pltfm_data *pdata);
        void (*exit)(struct sdhci_host *host);
 };
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
new file mode 100644
index 000000000000..1fdc673f2396
--- /dev/null
+++ b/include/linux/mmc/sdhci.h
@@ -0,0 +1,144 @@
+/*
+ *  linux/include/linux/mmc/sdhci.h - Secure Digital Host Controller Interface
+ *
+ *  Copyright (C) 2005-2008 Pierre Ossman, 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.
+ */
+#ifndef __SDHCI_H
+#define __SDHCI_H
+#include <linux/scatterlist.h>
+#include <linux/compiler.h>
+#include <linux/types.h>
+#include <linux/io.h>
+#include <linux/mmc/host.h>
+struct sdhci_host {
+        /* Data set by hardware interface driver */
+        const char *hw_name;    /* Hardware bus name */
+        unsigned int quirks;    /* Deviations from spec. */
+/* Controller doesn't honor resets unless we touch the clock register */
+#define SDHCI_QUIRK_CLOCK_BEFORE_RESET                  (1<<0)
+/* Controller has bad caps bits, but really supports DMA */
+#define SDHCI_QUIRK_FORCE_DMA                           (1<<1)
+/* Controller doesn't like to be reset when there is no card inserted. */
+#define SDHCI_QUIRK_NO_CARD_NO_RESET                    (1<<2)
+/* Controller doesn't like clearing the power reg before a change */
+#define SDHCI_QUIRK_SINGLE_POWER_WRITE                  (1<<3)
+/* Controller has flaky internal state so reset it on each ios change */
+#define SDHCI_QUIRK_RESET_CMD_DATA_ON_IOS               (1<<4)
+/* Controller has an unusable DMA engine */
+#define SDHCI_QUIRK_BROKEN_DMA                          (1<<5)
+/* Controller has an unusable ADMA engine */
+#define SDHCI_QUIRK_BROKEN_ADMA                         (1<<6)
+/* Controller can only DMA from 32-bit aligned addresses */
+#define SDHCI_QUIRK_32BIT_DMA_ADDR                      (1<<7)
+/* Controller can only DMA chunk sizes that are a multiple of 32 bits */
+#define SDHCI_QUIRK_32BIT_DMA_SIZE                      (1<<8)
+/* Controller can only ADMA chunks that are a multiple of 32 bits */
+#define SDHCI_QUIRK_32BIT_ADMA_SIZE                     (1<<9)
+/* Controller needs to be reset after each request to stay stable */
+#define SDHCI_QUIRK_RESET_AFTER_REQUEST                 (1<<10)
+/* Controller needs voltage and power writes to happen separately */
+#define SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER             (1<<11)
+/* Controller provides an incorrect timeout value for transfers */
+#define SDHCI_QUIRK_BROKEN_TIMEOUT_VAL                  (1<<12)
+/* Controller has an issue with buffer bits for small transfers */
+#define SDHCI_QUIRK_BROKEN_SMALL_PIO                    (1<<13)
+/* Controller does not provide transfer-complete interrupt when not busy */
+#define SDHCI_QUIRK_NO_BUSY_IRQ                         (1<<14)
+/* Controller has unreliable card detection */
+#define SDHCI_QUIRK_BROKEN_CARD_DETECTION               (1<<15)
+/* Controller reports inverted write-protect state */
+#define SDHCI_QUIRK_INVERTED_WRITE_PROTECT              (1<<16)
+/* Controller has nonstandard clock management */
+#define SDHCI_QUIRK_NONSTANDARD_CLOCK                   (1<<17)
+/* Controller does not like fast PIO transfers */
+#define SDHCI_QUIRK_PIO_NEEDS_DELAY                     (1<<18)
+/* Controller losing signal/interrupt enable states after reset */
+#define SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET            (1<<19)
+/* Controller has to be forced to use block size of 2048 bytes */
+#define SDHCI_QUIRK_FORCE_BLK_SZ_2048                   (1<<20)
+/* Controller cannot do multi-block transfers */
+#define SDHCI_QUIRK_NO_MULTIBLOCK                       (1<<21)
+/* Controller can only handle 1-bit data transfers */
+#define SDHCI_QUIRK_FORCE_1_BIT_DATA                    (1<<22)
+/* Controller needs 10ms delay between applying power and clock */
+#define SDHCI_QUIRK_DELAY_AFTER_POWER                   (1<<23)
+/* Controller uses SDCLK instead of TMCLK for data timeouts */
+#define SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK             (1<<24)
+/* Controller reports wrong base clock capability */
+#define SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN               (1<<25)
+/* Controller cannot support End Attribute in NOP ADMA descriptor */
+#define SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC               (1<<26)
+/* Controller is missing device caps. Use caps provided by host */
+#define SDHCI_QUIRK_MISSING_CAPS                        (1<<27)
+/* Controller uses Auto CMD12 command to stop the transfer */
+#define SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12              (1<<28)
+/* Controller doesn't have HISPD bit field in HI-SPEED SD card */
+#define SDHCI_QUIRK_NO_HISPD_BIT                        (1<<29)
+        int irq;                /* Device IRQ */
+        void __iomem *ioaddr;   /* Mapped address */
+        const struct sdhci_ops *ops;    /* Low level hw interface */
+        struct regulator *vmmc; /* Power regulator */
+        /* Internal data */
+        struct mmc_host *mmc;   /* MMC structure */
+        u64 dma_mask;           /* custom DMA mask */
+#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)
+        struct led_classdev led;        /* LED control */
+        char led_name[32];
+#endif
+        spinlock_t lock;        /* Mutex */
+        int flags;              /* Host attributes */
+#define SDHCI_USE_SDMA          (1<<0)  /* Host is SDMA capable */
+#define SDHCI_USE_ADMA          (1<<1)  /* Host is ADMA capable */
+#define SDHCI_REQ_USE_DMA       (1<<2)  /* Use DMA for this req. */
+#define SDHCI_DEVICE_DEAD       (1<<3)  /* Device unresponsive */
+        unsigned int version;   /* SDHCI spec. version */
+        unsigned int max_clk;   /* Max possible freq (MHz) */
+        unsigned int timeout_clk;       /* Timeout freq (KHz) */
+        unsigned int clock;     /* Current clock (MHz) */
+        u8 pwr;                 /* Current voltage */
+        struct mmc_request *mrq;        /* Current request */
+        struct mmc_command *cmd;        /* Current command */
+        struct mmc_data *data;  /* Current data request */
+        unsigned int data_early:1;      /* Data finished before cmd */
+        struct sg_mapping_iter sg_miter;        /* SG state for PIO */
+        unsigned int blocks;    /* remaining PIO blocks */
+        int sg_count;           /* Mapped sg entries */
+        u8 *adma_desc;          /* ADMA descriptor table */
+        u8 *align_buffer;       /* Bounce buffer */
+        dma_addr_t adma_addr;   /* Mapped ADMA descr. table */
+        dma_addr_t align_addr;  /* Mapped bounce buffer */
+        struct tasklet_struct card_tasklet;     /* Tasklet structures */
+        struct tasklet_struct finish_tasklet;
+        struct timer_list timer;        /* Timer for timeouts */
+        unsigned int caps;      /* Alternative capabilities */
+        unsigned long private[0] ____cacheline_aligned;
+};
+#endif /* __SDHCI_H */
diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h
index d4a2ebbdab4b..d19e2114fd86 100644
--- a/include/linux/mmc/sh_mmcif.h
+++ b/include/linux/mmc/sh_mmcif.h
@@ -34,6 +34,7 @@
 struct sh_mmcif_plat_data {
        void (*set_pwr)(struct platform_device *pdev, int state);
        void (*down_pwr)(struct platform_device *pdev);
+        int (*get_cd)(struct platform_device *pdef);
        u8      sup_pclk;       /* 1 :SH7757, 0: SH7724/SH7372 */
        unsigned long caps;
        u32     ocr;
diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
index 4e02ee2b071e..43dcfbdc39de 100644
--- a/include/linux/mmu_notifier.h
+++ b/include/linux/mmu_notifier.h
@@ -227,7 +227,7 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
 /*
 * These two macros will sometime replace ptep_clear_flush.
- * ptep_clear_flush is impleemnted as macro itself, so this also is
+ * ptep_clear_flush is implemented as macro itself, so this also is
 * implemented as a macro until ptep_clear_flush will converted to an
 * inline function, to diminish the risk of compilation failure. The
 * invalidate_page method over time can be moved outside the PT lock
diff --git a/include/linux/mtd/bbm.h b/include/linux/mtd/bbm.h
index 7fa20beb2ab9..57cc0e63714f 100644
--- a/include/linux/mtd/bbm.h
+++ b/include/linux/mtd/bbm.h
@@ -84,7 +84,7 @@ struct nand_bbt_descr {
 #define NAND_BBT_PERCHIP        0x00000080
 /* bbt has a version counter at offset veroffs */
 #define NAND_BBT_VERSION        0x00000100
-/* Create a bbt if none axists */
+/* Create a bbt if none exists */
 #define NAND_BBT_CREATE         0x00000200
 /* Search good / bad pattern through all pages of a block */
 #define NAND_BBT_SCANALLPAGES   0x00000400
@@ -102,6 +102,8 @@ struct nand_bbt_descr {
 #define NAND_BBT_SCANBYTE1AND6 0x00100000
 /* The nand_bbt_descr was created dynamicaly and must be freed */
 #define NAND_BBT_DYNAMICSTRUCT 0x00200000
+/* The bad block table does not OOB for marker */
+#define NAND_BBT_NO_OOB         0x00400000
 /* The maximum number of blocks to scan for a bbt */
 #define NAND_BBT_SCAN_MAXBLOCKS 4
diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
index d2118b0eac9a..4dd0c2cd7659 100644
--- a/include/linux/mtd/cfi.h
+++ b/include/linux/mtd/cfi.h
@@ -289,6 +289,7 @@ struct cfi_private {
                                  must be of the same type. */
        int mfr, id;
        int numchips;
+        map_word sector_erase_cmd;
        unsigned long chipshift; /* Because they're of the same type */
        const char *im_name;     /* inter_module name for cmdset_setup */
        struct flchip chips[0];  /* per-chip data structure for each chip */
diff --git a/include/linux/mtd/fsmc.h b/include/linux/mtd/fsmc.h
new file mode 100644
index 000000000000..5d2556700ec2
--- /dev/null
+++ b/include/linux/mtd/fsmc.h
@@ -0,0 +1,181 @@
+/*
+ * incude/mtd/fsmc.h
+ *
+ * ST Microelectronics
+ * Flexible Static Memory Controller (FSMC)
+ * platform data interface and header file
+ *
+ * Copyright © 2010 ST Microelectronics
+ * Vipin Kumar <vipin.kumar@st.com>
+ *
+ * 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 __MTD_FSMC_H
+#define __MTD_FSMC_H
+#include <linux/platform_device.h>
+#include <linux/mtd/physmap.h>
+#include <linux/types.h>
+#include <linux/mtd/partitions.h>
+#include <asm/param.h>
+#define FSMC_NAND_BW8           1
+#define FSMC_NAND_BW16          2
+/*
+ * The placement of the Command Latch Enable (CLE) and
+ * Address Latch Enable (ALE) is twised around in the
+ * SPEAR310 implementation.
+ */
+#if defined(CONFIG_MACH_SPEAR310)
+#define PLAT_NAND_CLE           (1 << 17)
+#define PLAT_NAND_ALE           (1 << 16)
+#else
+#define PLAT_NAND_CLE           (1 << 16)
+#define PLAT_NAND_ALE           (1 << 17)
+#endif
+#define FSMC_MAX_NOR_BANKS      4
+#define FSMC_MAX_NAND_BANKS     4
+#define FSMC_FLASH_WIDTH8       1
+#define FSMC_FLASH_WIDTH16      2
+struct fsmc_nor_bank_regs {
+        uint32_t ctrl;
+        uint32_t ctrl_tim;
+};
+/* ctrl register definitions */
+#define BANK_ENABLE             (1 << 0)
+#define MUXED                   (1 << 1)
+#define NOR_DEV                 (2 << 2)
+#define WIDTH_8                 (0 << 4)
+#define WIDTH_16                (1 << 4)
+#define RSTPWRDWN               (1 << 6)
+#define WPROT                   (1 << 7)
+#define WRT_ENABLE              (1 << 12)
+#define WAIT_ENB                (1 << 13)
+/* ctrl_tim register definitions */
+struct fsms_nand_bank_regs {
+        uint32_t pc;
+        uint32_t sts;
+        uint32_t comm;
+        uint32_t attrib;
+        uint32_t ioata;
+        uint32_t ecc1;
+        uint32_t ecc2;
+        uint32_t ecc3;
+};
+#define FSMC_NOR_REG_SIZE       0x40
+struct fsmc_regs {
+        struct fsmc_nor_bank_regs nor_bank_regs[FSMC_MAX_NOR_BANKS];
+        uint8_t reserved_1[0x40 - 0x20];
+        struct fsms_nand_bank_regs bank_regs[FSMC_MAX_NAND_BANKS];
+        uint8_t reserved_2[0xfe0 - 0xc0];
+        uint32_t peripid0;                      /* 0xfe0 */
+        uint32_t peripid1;                      /* 0xfe4 */
+        uint32_t peripid2;                      /* 0xfe8 */
+        uint32_t peripid3;                      /* 0xfec */
+        uint32_t pcellid0;                      /* 0xff0 */
+        uint32_t pcellid1;                      /* 0xff4 */
+        uint32_t pcellid2;                      /* 0xff8 */
+        uint32_t pcellid3;                      /* 0xffc */
+};
+#define FSMC_BUSY_WAIT_TIMEOUT  (1 * HZ)
+/* pc register definitions */
+#define FSMC_RESET              (1 << 0)
+#define FSMC_WAITON             (1 << 1)
+#define FSMC_ENABLE             (1 << 2)
+#define FSMC_DEVTYPE_NAND       (1 << 3)
+#define FSMC_DEVWID_8           (0 << 4)
+#define FSMC_DEVWID_16          (1 << 4)
+#define FSMC_ECCEN              (1 << 6)
+#define FSMC_ECCPLEN_512        (0 << 7)
+#define FSMC_ECCPLEN_256        (1 << 7)
+#define FSMC_TCLR_1             (1 << 9)
+#define FSMC_TAR_1              (1 << 13)
+/* sts register definitions */
+#define FSMC_CODE_RDY           (1 << 15)
+/* comm register definitions */
+#define FSMC_TSET_0             (0 << 0)
+#define FSMC_TWAIT_6            (6 << 8)
+#define FSMC_THOLD_4            (4 << 16)
+#define FSMC_THIZ_1             (1 << 24)
+/* peripid2 register definitions */
+#define FSMC_REVISION_MSK       (0xf)
+#define FSMC_REVISION_SHFT      (0x4)
+#define FSMC_VER1               1
+#define FSMC_VER2               2
+#define FSMC_VER3               3
+#define FSMC_VER4               4
+#define FSMC_VER5               5
+#define FSMC_VER6               6
+#define FSMC_VER7               7
+#define FSMC_VER8               8
+static inline uint32_t get_fsmc_version(struct fsmc_regs *regs)
+{
+        return (readl(&regs->peripid2) >> FSMC_REVISION_SHFT) &
+                                FSMC_REVISION_MSK;
+}
+/*
+ * There are 13 bytes of ecc for every 512 byte block in FSMC version 8
+ * and it has to be read consecutively and immediately after the 512
+ * byte data block for hardware to generate the error bit offsets
+ * Managing the ecc bytes in the following way is easier. This way is
+ * similar to oobfree structure maintained already in u-boot nand driver
+ */
+#define MAX_ECCPLACE_ENTRIES    32
+struct fsmc_nand_eccplace {
+        uint8_t offset;
+        uint8_t length;
+};
+struct fsmc_eccplace {
+        struct fsmc_nand_eccplace eccplace[MAX_ECCPLACE_ENTRIES];
+};
+/**
+ * fsmc_nand_platform_data - platform specific NAND controller config
+ * @partitions: partition table for the platform, use a default fallback
+ * if this is NULL
+ * @nr_partitions: the number of partitions in the previous entry
+ * @options: different options for the driver
+ * @width: bus width
+ * @bank: default bank
+ * @select_bank: callback to select a certain bank, this is
+ * platform-specific. If the controller only supports one bank
+ * this may be set to NULL
+ */
+struct fsmc_nand_platform_data {
+        struct mtd_partition    *partitions;
+        unsigned int            nr_partitions;
+        unsigned int            options;
+        unsigned int            width;
+        unsigned int            bank;
+        void                    (*select_bank)(uint32_t bank, uint32_t busw);
+};
+extern int __init fsmc_nor_init(struct platform_device *pdev,
+                unsigned long base, uint32_t bank, uint32_t width);
+extern void __init fsmc_init_board_info(struct platform_device *pdev,
+                struct mtd_partition *partitions, unsigned int nr_partitions,
+                unsigned int width);
+#endif /* __MTD_FSMC_H */
diff --git a/include/linux/mtd/inftl.h b/include/linux/mtd/inftl.h
index 64ee53ce95a9..02cd5f9b79b8 100644
--- a/include/linux/mtd/inftl.h
+++ b/include/linux/mtd/inftl.h
@@ -37,14 +37,14 @@ struct INFTLrecord {
        __u16 firstEUN;
        __u16 lastEUN;
        __u16 numfreeEUNs;
-        __u16 LastFreeEUN;              /* To speed up finding a free EUN */
+        __u16 LastFreeEUN;              /* To speed up finding a free EUN */
        int head,sect,cyl;
-        __u16 *PUtable;                 /* Physical Unit Table  */
+        __u16 *PUtable;                 /* Physical Unit Table */
-        __u16 *VUtable;                 /* Virtual Unit Table */
+        __u16 *VUtable;                 /* Virtual Unit Table */
-        unsigned int nb_blocks;         /* number of physical blocks */
+        unsigned int nb_blocks;         /* number of physical blocks */
-        unsigned int nb_boot_blocks;    /* number of blocks used by the bios */
+        unsigned int nb_boot_blocks;    /* number of blocks used by the bios */
-        struct erase_info instr;
+        struct erase_info instr;
-        struct nand_ecclayout oobinfo;
+        struct nand_ecclayout oobinfo;
 };
 int INFTL_mount(struct INFTLrecord *s);
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 8485e42a9b09..fe8d77ebec13 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -110,6 +110,21 @@ struct mtd_oob_ops {
        uint8_t         *oobbuf;
 };
+#define MTD_MAX_OOBFREE_ENTRIES_LARGE   32
+#define MTD_MAX_ECCPOS_ENTRIES_LARGE    448
+/*
+ * Internal ECC layout control structure. For historical reasons, there is a
+ * similar, smaller struct nand_ecclayout_user (in mtd-abi.h) that is retained
+ * for export to user-space via the ECCGETLAYOUT ioctl.
+ * nand_ecclayout should be expandable in the future simply by the above macros.
+ */
+struct nand_ecclayout {
+        __u32 eccbytes;
+        __u32 eccpos[MTD_MAX_ECCPOS_ENTRIES_LARGE];
+        __u32 oobavail;
+        struct nand_oobfree oobfree[MTD_MAX_OOBFREE_ENTRIES_LARGE];
+};
 struct mtd_info {
        u_char type;
        uint32_t flags;
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 102e12c58cb3..63e17d01fde9 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -27,15 +27,17 @@
 struct mtd_info;
 struct nand_flash_dev;
 /* Scan and identify a NAND device */
-extern int nand_scan (struct mtd_info *mtd, int max_chips);
+extern int nand_scan(struct mtd_info *mtd, int max_chips);
-/* Separate phases of nand_scan(), allowing board driver to intervene
+/*
- * and override command or ECC setup according to flash type */
+ * Separate phases of nand_scan(), allowing board driver to intervene
+ * and override command or ECC setup according to flash type.
+ */
 extern int nand_scan_ident(struct mtd_info *mtd, int max_chips,
                           struct nand_flash_dev *table);
 extern int nand_scan_tail(struct mtd_info *mtd);
 /* Free resources held by the NAND device */
-extern void nand_release (struct mtd_info *mtd);
+extern void nand_release(struct mtd_info *mtd);
 /* Internal helper for board drivers which need to override command function */
 extern void nand_wait_ready(struct mtd_info *mtd);
@@ -49,12 +51,13 @@ extern int nand_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len);
 /* The maximum number of NAND chips in an array */
 #define NAND_MAX_CHIPS          8
-/* This constant declares the max. oobsize / page, which
+/*
+ * This constant declares the max. oobsize / page, which
 * is supported now. If you add a chip with bigger oobsize/page
 * adjust this accordingly.
 */
-#define NAND_MAX_OOBSIZE        256
+#define NAND_MAX_OOBSIZE        576
-#define NAND_MAX_PAGESIZE       4096
+#define NAND_MAX_PAGESIZE       8192
 /*
 * Constants for hardware specific CLE/ALE/NCE function
@@ -88,6 +91,7 @@ extern int nand_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len);
 #define NAND_CMD_RNDIN          0x85
 #define NAND_CMD_READID         0x90
 #define NAND_CMD_ERASE2         0xd0
+#define NAND_CMD_PARAM          0xec
 #define NAND_CMD_RESET          0xff
 #define NAND_CMD_LOCK           0x2a
@@ -152,9 +156,10 @@ typedef enum {
 #define NAND_GET_DEVICE         0x80
-/* Option constants for bizarre disfunctionality and real
+/*
-*  features
+ * Option constants for bizarre disfunctionality and real
-*/
+ * features.
+ */
 /* Chip can not auto increment pages */
 #define NAND_NO_AUTOINCR        0x00000001
 /* Buswitdh is 16 bit */
@@ -165,19 +170,27 @@ typedef enum {
 #define NAND_CACHEPRG           0x00000008
 /* Chip has copy back function */
 #define NAND_COPYBACK           0x00000010
-/* AND Chip which has 4 banks and a confusing page / block
+/*
- * assignment. See Renesas datasheet for further information */
+ * AND Chip which has 4 banks and a confusing page / block
+ * assignment. See Renesas datasheet for further information.
+ */
 #define NAND_IS_AND             0x00000020
-/* Chip has a array of 4 pages which can be read without
+/*
- * additional ready /busy waits */
+ * Chip has a array of 4 pages which can be read without
+ * additional ready /busy waits.
+ */
 #define NAND_4PAGE_ARRAY        0x00000040
-/* Chip requires that BBT is periodically rewritten to prevent
+/*
+ * Chip requires that BBT is periodically rewritten to prevent
 * bits from adjacent blocks from 'leaking' in altering data.
- * This happens with the Renesas AG-AND chips, possibly others.  */
+ * This happens with the Renesas AG-AND chips, possibly others.
+ */
 #define BBT_AUTO_REFRESH        0x00000080
-/* Chip does not require ready check on read. True
+/*
+ * Chip does not require ready check on read. True
 * for all large page devices, as they do not support
- * autoincrement.*/
+ * autoincrement.
+ */
 #define NAND_NO_READRDY         0x00000100
 /* Chip does not allow subpage writes */
 #define NAND_NO_SUBPAGE_WRITE   0x00000200
@@ -205,16 +218,27 @@ typedef enum {
 #define NAND_CHIPOPTIONS_MSK    (0x0000ffff & ~NAND_NO_AUTOINCR)
 /* Non chip related options */
-/* Use a flash based bad block table. This option is passed to the
+/*
- * default bad block table function. */
+ * Use a flash based bad block table. OOB identifier is saved in OOB area.
+ * This option is passed to the default bad block table function.
+ */
 #define NAND_USE_FLASH_BBT      0x00010000
 /* This option skips the bbt scan during initialization. */
 #define NAND_SKIP_BBTSCAN       0x00020000
-/* This option is defined if the board driver allocates its own buffers
+/*
-   (e.g. because it needs them DMA-coherent */
+ * This option is defined if the board driver allocates its own buffers
+ * (e.g. because it needs them DMA-coherent).
+ */
 #define NAND_OWN_BUFFERS        0x00040000
 /* Chip may not exist, so silence any errors in scan */
 #define NAND_SCAN_SILENT_NODEV  0x00080000
+/*
+ * If passed additionally to NAND_USE_FLASH_BBT then BBT code will not touch
+ * the OOB area.
+ */
+#define NAND_USE_FLASH_BBT_NO_OOB       0x00100000
+/* Create an empty BBT with no vendor information if the BBT is available */
+#define NAND_CREATE_EMPTY_BBT           0x00200000
 /* Options set by nand scan */
 /* Nand scan has allocated controller struct */
@@ -227,15 +251,80 @@ typedef enum {
 /* Keep gcc happy */
 struct nand_chip;
+struct nand_onfi_params {
+        /* rev info and features block */
+        /* 'O' 'N' 'F' 'I'  */
+        u8 sig[4];
+        __le16 revision;
+        __le16 features;
+        __le16 opt_cmd;
+        u8 reserved[22];
+        /* manufacturer information block */
+        char manufacturer[12];
+        char model[20];
+        u8 jedec_id;
+        __le16 date_code;
+        u8 reserved2[13];
+        /* memory organization block */
+        __le32 byte_per_page;
+        __le16 spare_bytes_per_page;
+        __le32 data_bytes_per_ppage;
+        __le16 spare_bytes_per_ppage;
+        __le32 pages_per_block;
+        __le32 blocks_per_lun;
+        u8 lun_count;
+        u8 addr_cycles;
+        u8 bits_per_cell;
+        __le16 bb_per_lun;
+        __le16 block_endurance;
+        u8 guaranteed_good_blocks;
+        __le16 guaranteed_block_endurance;
+        u8 programs_per_page;
+        u8 ppage_attr;
+        u8 ecc_bits;
+        u8 interleaved_bits;
+        u8 interleaved_ops;
+        u8 reserved3[13];
+        /* electrical parameter block */
+        u8 io_pin_capacitance_max;
+        __le16 async_timing_mode;
+        __le16 program_cache_timing_mode;
+        __le16 t_prog;
+        __le16 t_bers;
+        __le16 t_r;
+        __le16 t_ccs;
+        __le16 src_sync_timing_mode;
+        __le16 src_ssync_features;
+        __le16 clk_pin_capacitance_typ;
+        __le16 io_pin_capacitance_typ;
+        __le16 input_pin_capacitance_typ;
+        u8 input_pin_capacitance_max;
+        u8 driver_strenght_support;
+        __le16 t_int_r;
+        __le16 t_ald;
+        u8 reserved4[7];
+        /* vendor */
+        u8 reserved5[90];
+        __le16 crc;
+} __attribute__((packed));
+#define ONFI_CRC_BASE   0x4F4E
 /**
 * struct nand_hw_control - Control structure for hardware controller (e.g ECC generator) shared among independent devices
 * @lock:               protection lock
 * @active:             the mtd device which holds the controller currently
- * @wq:                 wait queue to sleep on if a NAND operation is in progress
+ * @wq:                 wait queue to sleep on if a NAND operation is in
- *                      used instead of the per chip wait queue when a hw controller is available
+ *                      progress used instead of the per chip wait queue
+ *                      when a hw controller is available.
 */
 struct nand_hw_control {
-        spinlock_t       lock;
+        spinlock_t lock;
        struct nand_chip *active;
        wait_queue_head_t wq;
 };
@@ -256,51 +345,42 @@ struct nand_hw_control {
 * @correct:    function for ecc correction, matching to ecc generator (sw/hw)
 * @read_page_raw:      function to read a raw page without ECC
 * @write_page_raw:     function to write a raw page without ECC
- * @read_page:  function to read a page according to the ecc generator requirements
+ * @read_page:  function to read a page according to the ecc generator
+ *              requirements.
 * @read_subpage:       function to read parts of the page covered by ECC.
- * @write_page: function to write a page according to the ecc generator requirements
+ * @write_page: function to write a page according to the ecc generator
+ *              requirements.
 * @read_oob:   function to read chip OOB data
 * @write_oob:  function to write chip OOB data
 */
 struct nand_ecc_ctrl {
-        nand_ecc_modes_t        mode;
+        nand_ecc_modes_t mode;
-        int                     steps;
+        int steps;
-        int                     size;
+        int size;
-        int                     bytes;
+        int bytes;
-        int                     total;
+        int total;
-        int                     prepad;
+        int prepad;
-        int                     postpad;
+        int postpad;
        struct nand_ecclayout   *layout;
-        void                    (*hwctl)(struct mtd_info *mtd, int mode);
+        void (*hwctl)(struct mtd_info *mtd, int mode);
-        int                     (*calculate)(struct mtd_info *mtd,
+        int (*calculate)(struct mtd_info *mtd, const uint8_t *dat,
-                                             const uint8_t *dat,
+                        uint8_t *ecc_code);
-                                             uint8_t *ecc_code);
+        int (*correct)(struct mtd_info *mtd, uint8_t *dat, uint8_t *read_ecc,
-        int                     (*correct)(struct mtd_info *mtd, uint8_t *dat,
+                        uint8_t *calc_ecc);
-                                           uint8_t *read_ecc,
+        int (*read_page_raw)(struct mtd_info *mtd, struct nand_chip *chip,
-                                           uint8_t *calc_ecc);
+                        uint8_t *buf, int page);
-        int                     (*read_page_raw)(struct mtd_info *mtd,
+        void (*write_page_raw)(struct mtd_info *mtd, struct nand_chip *chip,
-                                                 struct nand_chip *chip,
+                        const uint8_t *buf);
-                                                 uint8_t *buf, int page);
+        int (*read_page)(struct mtd_info *mtd, struct nand_chip *chip,
-        void                    (*write_page_raw)(struct mtd_info *mtd,
+                        uint8_t *buf, int page);
-                                                  struct nand_chip *chip,
+        int (*read_subpage)(struct mtd_info *mtd, struct nand_chip *chip,
-                                                  const uint8_t *buf);
+                        uint32_t offs, uint32_t len, uint8_t *buf);
-        int                     (*read_page)(struct mtd_info *mtd,
+        void (*write_page)(struct mtd_info *mtd, struct nand_chip *chip,
-                                             struct nand_chip *chip,
+                        const uint8_t *buf);
-                                             uint8_t *buf, int page);
+        int (*read_oob)(struct mtd_info *mtd, struct nand_chip *chip, int page,
-        int                     (*read_subpage)(struct mtd_info *mtd,
+                        int sndcmd);
-                                             struct nand_chip *chip,
+        int (*write_oob)(struct mtd_info *mtd, struct nand_chip *chip,
-                                             uint32_t offs, uint32_t len,
+                        int page);
-                                             uint8_t *buf);
-        void                    (*write_page)(struct mtd_info *mtd,
-                                              struct nand_chip *chip,
-                                              const uint8_t *buf);
-        int                     (*read_oob)(struct mtd_info *mtd,
-                                            struct nand_chip *chip,
-                                            int page,
-                                            int sndcmd);
-        int                     (*write_oob)(struct mtd_info *mtd,
-                                             struct nand_chip *chip,
-                                             int page);
 };
 /**
@@ -320,102 +400,132 @@ struct nand_buffers {
 /**
 * struct nand_chip - NAND Private Flash Chip Data
- * @IO_ADDR_R:          [BOARDSPECIFIC] address to read the 8 I/O lines of the flash device
+ * @IO_ADDR_R:          [BOARDSPECIFIC] address to read the 8 I/O lines of the
- * @IO_ADDR_W:          [BOARDSPECIFIC] address to write the 8 I/O lines of the flash device
+ *                      flash device
+ * @IO_ADDR_W:          [BOARDSPECIFIC] address to write the 8 I/O lines of the
+ *                      flash device.
 * @read_byte:          [REPLACEABLE] read one byte from the chip
 * @read_word:          [REPLACEABLE] read one word from the chip
 * @write_buf:          [REPLACEABLE] write data from the buffer to the chip
 * @read_buf:           [REPLACEABLE] read data from the chip into the buffer
- * @verify_buf:         [REPLACEABLE] verify buffer contents against the chip data
+ * @verify_buf:         [REPLACEABLE] verify buffer contents against the chip
+ *                      data.
 * @select_chip:        [REPLACEABLE] select chip nr
 * @block_bad:          [REPLACEABLE] check, if the block is bad
 * @block_markbad:      [REPLACEABLE] mark the block bad
 * @cmd_ctrl:           [BOARDSPECIFIC] hardwarespecific funtion for controlling
 *                      ALE/CLE/nCE. Also used to write command and address
- * @dev_ready:          [BOARDSPECIFIC] hardwarespecific function for accesing device ready/busy line
+ * @init_size:          [BOARDSPECIFIC] hardwarespecific funtion for setting
- *                      If set to NULL no access to ready/busy is available and the ready/busy information
+ *                      mtd->oobsize, mtd->writesize and so on.
- *                      is read from the chip status register
+ *                      @id_data contains the 8 bytes values of NAND_CMD_READID.
- * @cmdfunc:            [REPLACEABLE] hardwarespecific function for writing commands to the chip
+ *                      Return with the bus width.
- * @waitfunc:           [REPLACEABLE] hardwarespecific function for wait on ready
+ * @dev_ready:          [BOARDSPECIFIC] hardwarespecific function for accesing
+ *                      device ready/busy line. If set to NULL no access to
+ *                      ready/busy is available and the ready/busy information
+ *                      is read from the chip status register.
+ * @cmdfunc:            [REPLACEABLE] hardwarespecific function for writing
+ *                      commands to the chip.
+ * @waitfunc:           [REPLACEABLE] hardwarespecific function for wait on
+ *                      ready.
 * @ecc:                [BOARDSPECIFIC] ecc control ctructure
 * @buffers:            buffer structure for read/write
 * @hwcontrol:          platform-specific hardware control structure
 * @ops:                oob operation operands
- * @erase_cmd:          [INTERN] erase command write function, selectable due to AND support
+ * @erase_cmd:          [INTERN] erase command write function, selectable due
+ *                      to AND support.
 * @scan_bbt:           [REPLACEABLE] function to scan bad block table
- * @chip_delay:         [BOARDSPECIFIC] chip dependent delay for transfering data from array to read regs (tR)
+ * @chip_delay:         [BOARDSPECIFIC] chip dependent delay for transfering
+ *                      data from array to read regs (tR).
 * @state:              [INTERN] the current state of the NAND device
 * @oob_poi:            poison value buffer
- * @page_shift:         [INTERN] number of address bits in a page (column address bits)
+ * @page_shift:         [INTERN] number of address bits in a page (column
+ *                      address bits).
 * @phys_erase_shift:   [INTERN] number of address bits in a physical eraseblock
 * @bbt_erase_shift:    [INTERN] number of address bits in a bbt entry
 * @chip_shift:         [INTERN] number of address bits in one chip
- * @options:            [BOARDSPECIFIC] various chip options. They can partly be set to inform nand_scan about
+ * @options:            [BOARDSPECIFIC] various chip options. They can partly
- *                      special functionality. See the defines for further explanation
+ *                      be set to inform nand_scan about special functionality.
- * @badblockpos:        [INTERN] position of the bad block marker in the oob area
+ *                      See the defines for further explanation.
+ * @badblockpos:        [INTERN] position of the bad block marker in the oob
+ *                      area.
 * @cellinfo:           [INTERN] MLC/multichip data from chip ident
 * @numchips:           [INTERN] number of physical chips
 * @chipsize:           [INTERN] the size of one chip for multichip arrays
 * @pagemask:           [INTERN] page number mask = number of (pages / chip) - 1
- * @pagebuf:            [INTERN] holds the pagenumber which is currently in data_buf
+ * @pagebuf:            [INTERN] holds the pagenumber 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.
+ * @onfi_params:        [INTERN] holds the ONFI page parameter when ONFI is
+ *                      supported, 0 otherwise.
 * @ecclayout:          [REPLACEABLE] the default ecc placement scheme
 * @bbt:                [INTERN] bad block table pointer
- * @bbt_td:             [REPLACEABLE] bad block table descriptor for flash lookup
+ * @bbt_td:             [REPLACEABLE] bad block table descriptor for flash
+ *                      lookup.
 * @bbt_md:             [REPLACEABLE] bad block table mirror descriptor
- * @badblock_pattern:   [REPLACEABLE] bad block scan pattern used for initial bad block scan
+ * @badblock_pattern:   [REPLACEABLE] bad block scan pattern used for initial
- * @controller:         [REPLACEABLE] a pointer to a hardware controller structure
+ *                      bad block scan.
- *                      which is shared among multiple independend devices
+ * @controller:         [REPLACEABLE] a pointer to a hardware controller
+ *                      structure which is shared among multiple independend
+ *                      devices.
 * @priv:               [OPTIONAL] pointer to private chip date
- * @errstat:            [OPTIONAL] hardware specific function to perform additional error status checks
+ * @errstat:            [OPTIONAL] hardware specific function to perform
- *                      (determine if errors are correctable)
+ *                      additional error status checks (determine if errors are
+ *                      correctable).
 * @write_page:         [REPLACEABLE] High-level page write function
 */
 struct nand_chip {
-        void  __iomem   *IO_ADDR_R;
+        void __iomem *IO_ADDR_R;
-        void  __iomem   *IO_ADDR_W;
+        void __iomem *IO_ADDR_W;
-        uint8_t         (*read_byte)(struct mtd_info *mtd);
+        uint8_t (*read_byte)(struct mtd_info *mtd);
-        u16             (*read_word)(struct mtd_info *mtd);
+        u16 (*read_word)(struct mtd_info *mtd);
-        void            (*write_buf)(struct mtd_info *mtd, const uint8_t *buf, int len);
+        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);
+        void (*read_buf)(struct mtd_info *mtd, uint8_t *buf, int len);
-        int             (*verify_buf)(struct mtd_info *mtd, const uint8_t *buf, int len);
+        int (*verify_buf)(struct mtd_info *mtd, const uint8_t *buf, int len);
-        void            (*select_chip)(struct mtd_info *mtd, int chip);
+        void (*select_chip)(struct mtd_info *mtd, int chip);
-        int             (*block_bad)(struct mtd_info *mtd, loff_t ofs, int getchip);
+        int (*block_bad)(struct mtd_info *mtd, loff_t ofs, int getchip);
-        int             (*block_markbad)(struct mtd_info *mtd, loff_t ofs);
+        int (*block_markbad)(struct mtd_info *mtd, loff_t ofs);
-        void            (*cmd_ctrl)(struct mtd_info *mtd, int dat,
+        void (*cmd_ctrl)(struct mtd_info *mtd, int dat, unsigned int ctrl);
-                                    unsigned int ctrl);
+        int (*init_size)(struct mtd_info *mtd, struct nand_chip *this,
-        int             (*dev_ready)(struct mtd_info *mtd);
+                        u8 *id_data);
-        void            (*cmdfunc)(struct mtd_info *mtd, unsigned command, int column, int page_addr);
+        int (*dev_ready)(struct mtd_info *mtd);
-        int             (*waitfunc)(struct mtd_info *mtd, struct nand_chip *this);
+        void (*cmdfunc)(struct mtd_info *mtd, unsigned command, int column,
-        void            (*erase_cmd)(struct mtd_info *mtd, int page);
+                        int page_addr);
-        int             (*scan_bbt)(struct mtd_info *mtd);
+        int(*waitfunc)(struct mtd_info *mtd, struct nand_chip *this);
-        int             (*errstat)(struct mtd_info *mtd, struct nand_chip *this, int state, int status, int page);
+        void (*erase_cmd)(struct mtd_info *mtd, int page);
-        int             (*write_page)(struct mtd_info *mtd, struct nand_chip *chip,
+        int (*scan_bbt)(struct mtd_info *mtd);
-                                      const uint8_t *buf, int page, int cached, int raw);
+        int (*errstat)(struct mtd_info *mtd, struct nand_chip *this, int state,
+                        int status, int page);
-        int             chip_delay;
+        int (*write_page)(struct mtd_info *mtd, struct nand_chip *chip,
-        unsigned int    options;
+                        const uint8_t *buf, int page, int cached, int raw);
-        int             page_shift;
+        int chip_delay;
-        int             phys_erase_shift;
+        unsigned int options;
-        int             bbt_erase_shift;
-        int             chip_shift;
+        int page_shift;
-        int             numchips;
+        int phys_erase_shift;
-        uint64_t        chipsize;
+        int bbt_erase_shift;
-        int             pagemask;
+        int chip_shift;
-        int             pagebuf;
+        int numchips;
-        int             subpagesize;
+        uint64_t chipsize;
-        uint8_t         cellinfo;
+        int pagemask;
-        int             badblockpos;
+        int pagebuf;
-        int             badblockbits;
+        int subpagesize;
+        uint8_t cellinfo;
-        flstate_t       state;
+        int badblockpos;
+        int badblockbits;
-        uint8_t         *oob_poi;
-        struct nand_hw_control  *controller;
+        int onfi_version;
-        struct nand_ecclayout   *ecclayout;
+        struct nand_onfi_params onfi_params;
+        flstate_t state;
+        uint8_t *oob_poi;
+        struct nand_hw_control *controller;
+        struct nand_ecclayout *ecclayout;
        struct nand_ecc_ctrl ecc;
        struct nand_buffers *buffers;
@@ -423,13 +533,13 @@ struct nand_chip {
        struct mtd_oob_ops ops;
-        uint8_t         *bbt;
+        uint8_t *bbt;
-        struct nand_bbt_descr   *bbt_td;
+        struct nand_bbt_descr *bbt_td;
-        struct nand_bbt_descr   *bbt_md;
+        struct nand_bbt_descr *bbt_md;
-        struct nand_bbt_descr   *badblock_pattern;
+        struct nand_bbt_descr *badblock_pattern;
-        void            *priv;
+        void *priv;
 };
 /*
@@ -473,7 +583,7 @@ struct nand_flash_dev {
 */
 struct nand_manufacturers {
        int id;
-        char * name;
+        char *name;
 };
 extern struct nand_flash_dev nand_flash_ids[];
@@ -486,7 +596,7 @@ extern int nand_isbad_bbt(struct mtd_info *mtd, loff_t offs, int allowbbt);
 extern int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
                           int allowbbt);
 extern int nand_do_read(struct mtd_info *mtd, loff_t from, size_t len,
-                        size_t * retlen, uint8_t * buf);
+                        size_t *retlen, uint8_t *buf);
 /**
 * struct platform_nand_chip - chip level device structure
@@ -502,17 +612,16 @@ extern int nand_do_read(struct mtd_info *mtd, loff_t from, size_t len,
 * @priv:               hardware controller specific settings
 */
 struct platform_nand_chip {
-        int                     nr_chips;
+        int nr_chips;
-        int                     chip_offset;
+        int chip_offset;
-        int                     nr_partitions;
+        int nr_partitions;
-        struct mtd_partition    *partitions;
+        struct mtd_partition *partitions;
-        struct nand_ecclayout   *ecclayout;
+        struct nand_ecclayout *ecclayout;
-        int                     chip_delay;
+        int chip_delay;
-        unsigned int            options;
+        unsigned int options;
-        const char              **part_probe_types;
+        const char **part_probe_types;
-        void                    (*set_parts)(uint64_t size,
+        void (*set_parts)(uint64_t size, struct platform_nand_chip *chip);
-                                        struct platform_nand_chip *chip);
+        void *priv;
-        void                    *priv;
 };
 /* Keep gcc happy */
@@ -534,18 +643,15 @@ struct platform_device;
 * All fields are optional and depend on the hardware driver requirements
 */
 struct platform_nand_ctrl {
-        int             (*probe)(struct platform_device *pdev);
+        int (*probe)(struct platform_device *pdev);
-        void            (*remove)(struct platform_device *pdev);
+        void (*remove)(struct platform_device *pdev);
-        void            (*hwcontrol)(struct mtd_info *mtd, int cmd);
+        void (*hwcontrol)(struct mtd_info *mtd, int cmd);
-        int             (*dev_ready)(struct mtd_info *mtd);
+        int (*dev_ready)(struct mtd_info *mtd);
-        void            (*select_chip)(struct mtd_info *mtd, int chip);
+        void (*select_chip)(struct mtd_info *mtd, int chip);
-        void            (*cmd_ctrl)(struct mtd_info *mtd, int dat,
+        void (*cmd_ctrl)(struct mtd_info *mtd, int dat, unsigned int ctrl);
-                                    unsigned int ctrl);
+        void (*write_buf)(struct mtd_info *mtd, const uint8_t *buf, int len);
-        void            (*write_buf)(struct mtd_info *mtd,
+        void (*read_buf)(struct mtd_info *mtd, uint8_t *buf, int len);
-                                    const uint8_t *buf, int len);
+        void *priv;
-        void            (*read_buf)(struct mtd_info *mtd,
-                                    uint8_t *buf, int len);
-        void            *priv;
 };
 /**
@@ -554,8 +660,8 @@ struct platform_nand_ctrl {
 * @ctrl:               controller level device structure
 */
 struct platform_nand_data {
-        struct platform_nand_chip       chip;
+        struct platform_nand_chip chip;
-        struct platform_nand_ctrl       ctrl;
+        struct platform_nand_ctrl ctrl;
 };
 /* Some helpers to access the data structures */
diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h
index 274b6196091d..2b54316591d2 100644
--- a/include/linux/mtd/partitions.h
+++ b/include/linux/mtd/partitions.h
@@ -39,7 +39,7 @@ struct mtd_partition {
        uint64_t size;                  /* partition size */
        uint64_t offset;                /* offset within the master MTD space */
        uint32_t mask_flags;            /* master MTD flags to mask out for this partition */
-        struct nand_ecclayout *ecclayout;       /* out of band layout for this partition (NAND only)*/
+        struct nand_ecclayout *ecclayout;       /* out of band layout for this partition (NAND only) */
 };
 #define MTDPART_OFS_NXTBLK      (-2)
@@ -89,4 +89,9 @@ static inline int mtd_has_cmdlinepart(void) { return 1; }
 static inline int mtd_has_cmdlinepart(void) { return 0; }
 #endif
+int mtd_is_master(struct mtd_info *mtd);
+int mtd_add_partition(struct mtd_info *master, char *name,
+                      long long offset, long long length);
+int mtd_del_partition(struct mtd_info *master, int partno);
 #endif
diff --git a/include/linux/mtd/super.h b/include/linux/mtd/super.h
index 4016dd6fe336..f456230f9330 100644
--- a/include/linux/mtd/super.h
+++ b/include/linux/mtd/super.h
@@ -18,10 +18,9 @@
 #include <linux/fs.h>
 #include <linux/mount.h>
-extern int get_sb_mtd(struct file_system_type *fs_type, int flags,
+extern struct dentry *mount_mtd(struct file_system_type *fs_type, int flags,
                      const char *dev_name, void *data,
-                      int (*fill_super)(struct super_block *, void *, int),
+                      int (*fill_super)(struct super_block *, void *, int));
-                      struct vfsmount *mnt);
 extern void kill_mtd_super(struct super_block *sb);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index c8d95e369ff4..7454408c41b6 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -541,7 +541,7 @@ struct pci_error_handlers {
 struct module;
 struct pci_driver {
        struct list_head node;
-        char *name;
+        const char *name;
        const struct pci_device_id *id_table;   /* must be non-NULL for probe to be called */
        int  (*probe)  (struct pci_dev *dev, const struct pci_device_id *id);   /* New device inserted */
        void (*remove) (struct pci_dev *dev);   /* Device removed (NULL if not a hot-plug capable driver) */
@@ -819,6 +819,9 @@ pci_power_t pci_target_state(struct pci_dev *dev);
 int pci_prepare_to_sleep(struct pci_dev *dev);
 int pci_back_from_sleep(struct pci_dev *dev);
 bool pci_dev_run_wake(struct pci_dev *dev);
+bool pci_check_pme_status(struct pci_dev *dev);
+void pci_wakeup_event(struct pci_dev *dev);
+void pci_pme_wakeup_bus(struct pci_bus *bus);
 static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state,
                                  bool enable)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index b4c3d1b50037..87e2c2e7aed3 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -767,6 +767,8 @@
 #define PCI_DEVICE_ID_ELSA_MICROLINK    0x1000
 #define PCI_DEVICE_ID_ELSA_QS3000       0x3000
+#define PCI_VENDOR_ID_STMICRO           0x104A
 #define PCI_VENDOR_ID_BUSLOGIC                0x104B
 #define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC 0x0140
 #define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER    0x1040
@@ -1251,6 +1253,8 @@
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5700_2    0x0348
 #define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_GO1000       0x034C
 #define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_1100         0x034E
+#define PCI_DEVICE_ID_NVIDIA_MCP55_BRIDGE_V0        0x0360
+#define PCI_DEVICE_ID_NVIDIA_MCP55_BRIDGE_V4        0x0364
 #define PCI_DEVICE_ID_NVIDIA_NVENET_15              0x0373
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA      0x03E7
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SMBUS     0x03EB
@@ -2430,6 +2434,13 @@
 #define PCI_DEVICE_ID_INTEL_82375       0x0482
 #define PCI_DEVICE_ID_INTEL_82424       0x0483
 #define PCI_DEVICE_ID_INTEL_82378       0x0484
+#define PCI_DEVICE_ID_INTEL_MRST_SD0    0x0807
+#define PCI_DEVICE_ID_INTEL_MRST_SD1    0x0808
+#define PCI_DEVICE_ID_INTEL_MFD_SD      0x0820
+#define PCI_DEVICE_ID_INTEL_MFD_SDIO1   0x0821
+#define PCI_DEVICE_ID_INTEL_MFD_SDIO2   0x0822
+#define PCI_DEVICE_ID_INTEL_MFD_EMMC0   0x0823
+#define PCI_DEVICE_ID_INTEL_MFD_EMMC1   0x0824
 #define PCI_DEVICE_ID_INTEL_I960        0x0960
 #define PCI_DEVICE_ID_INTEL_I960RM      0x0962
 #define PCI_DEVICE_ID_INTEL_8257X_SOL   0x1062
@@ -2451,9 +2462,10 @@
 #define PCI_DEVICE_ID_INTEL_82840_HB    0x1a21
 #define PCI_DEVICE_ID_INTEL_82845_HB    0x1a30
 #define PCI_DEVICE_ID_INTEL_IOAT        0x1a38
-#define PCI_DEVICE_ID_INTEL_CPT_SMBUS   0x1c22
+#define PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS   0x1c22
-#define PCI_DEVICE_ID_INTEL_CPT_LPC_MIN 0x1c41
+#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN 0x1c41
-#define PCI_DEVICE_ID_INTEL_CPT_LPC_MAX 0x1c5f
+#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX 0x1c5f
+#define PCI_DEVICE_ID_INTEL_PATSBURG_LPC        0x1d40
 #define PCI_DEVICE_ID_INTEL_82801AA_0   0x2410
 #define PCI_DEVICE_ID_INTEL_82801AA_1   0x2411
 #define PCI_DEVICE_ID_INTEL_82801AA_3   0x2413
@@ -2662,9 +2674,9 @@
 #define PCI_DEVICE_ID_INTEL_ICH10_3     0x3a1a
 #define PCI_DEVICE_ID_INTEL_ICH10_4     0x3a30
 #define PCI_DEVICE_ID_INTEL_ICH10_5     0x3a60
-#define PCI_DEVICE_ID_INTEL_PCH_LPC_MIN 0x3b00
+#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN       0x3b00
-#define PCI_DEVICE_ID_INTEL_PCH_LPC_MAX 0x3b1f
+#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX       0x3b1f
-#define PCI_DEVICE_ID_INTEL_PCH_SMBUS   0x3b30
+#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS 0x3b30
 #define PCI_DEVICE_ID_INTEL_IOAT_SNB    0x402f
 #define PCI_DEVICE_ID_INTEL_5100_16     0x65f0
 #define PCI_DEVICE_ID_INTEL_5100_21     0x65f5
@@ -2673,8 +2685,8 @@
 #define PCI_DEVICE_ID_INTEL_5400_FBD0   0x4035
 #define PCI_DEVICE_ID_INTEL_5400_FBD1   0x4036
 #define PCI_DEVICE_ID_INTEL_IOAT_SCNB   0x65ff
-#define PCI_DEVICE_ID_INTEL_TOLAPAI_0   0x5031
+#define PCI_DEVICE_ID_INTEL_EP80579_0   0x5031
-#define PCI_DEVICE_ID_INTEL_TOLAPAI_1   0x5032
+#define PCI_DEVICE_ID_INTEL_EP80579_1   0x5032
 #define PCI_DEVICE_ID_INTEL_82371SB_0   0x7000
 #define PCI_DEVICE_ID_INTEL_82371SB_1   0x7010
 #define PCI_DEVICE_ID_INTEL_82371SB_2   0x7020
diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h
index 455b9ccdfca7..af83076c31a6 100644
--- a/include/linux/pci_regs.h
+++ b/include/linux/pci_regs.h
@@ -300,12 +300,14 @@
 #define PCI_MSI_DATA_64         12      /* 16 bits of data for 64-bit devices */
 #define PCI_MSI_MASK_64         16      /* Mask bits register for 64-bit devices */
-/* MSI-X registers (these are at offset PCI_MSIX_FLAGS) */
+/* MSI-X registers */
 #define PCI_MSIX_FLAGS          2
 #define  PCI_MSIX_FLAGS_QSIZE   0x7FF
 #define  PCI_MSIX_FLAGS_ENABLE  (1 << 15)
 #define  PCI_MSIX_FLAGS_MASKALL (1 << 14)
-#define PCI_MSIX_FLAGS_BIRMASK  (7 << 0)
+#define PCI_MSIX_TABLE          4
+#define PCI_MSIX_PBA            8
+#define  PCI_MSIX_FLAGS_BIRMASK (7 << 0)
 /* CompactPCI Hotswap Register */
diff --git a/include/linux/percpu_counter.h b/include/linux/percpu_counter.h
index 8a7d510ffa9c..46f6ba56fa91 100644
--- a/include/linux/percpu_counter.h
+++ b/include/linux/percpu_counter.h
@@ -78,6 +78,11 @@ static inline s64 percpu_counter_read_positive(struct percpu_counter *fbc)
        return 1;
 }
+static inline int percpu_counter_initialized(struct percpu_counter *fbc)
+{
+        return (fbc->counters != NULL);
+}
 #else
 struct percpu_counter {
@@ -143,6 +148,11 @@ static inline s64 percpu_counter_sum(struct percpu_counter *fbc)
        return percpu_counter_read(fbc);
 }
+static inline int percpu_counter_initialized(struct percpu_counter *fbc)
+{
+        return 1;
+}
 #endif  /* CONFIG_SMP */
 static inline void percpu_counter_inc(struct percpu_counter *fbc)
diff --git a/include/linux/ramfs.h b/include/linux/ramfs.h
index e7320b5e82fb..3a8f0c9b2933 100644
--- a/include/linux/ramfs.h
+++ b/include/linux/ramfs.h
@@ -3,8 +3,8 @@
 struct inode *ramfs_get_inode(struct super_block *sb, const struct inode *dir,
         int mode, dev_t dev);
-extern int ramfs_get_sb(struct file_system_type *fs_type,
+extern struct dentry *ramfs_mount(struct file_system_type *fs_type,
-         int flags, const char *dev_name, void *data, struct vfsmount *mnt);
+         int flags, const char *dev_name, void *data);
 #ifndef CONFIG_MMU
 extern int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize);
diff --git a/include/linux/regulator/lp3972.h b/include/linux/regulator/lp3972.h
new file mode 100644
index 000000000000..9bb7389b7a1e
--- /dev/null
+++ b/include/linux/regulator/lp3972.h
@@ -0,0 +1,48 @@
+/*
+ * National Semiconductors LP3972 PMIC chip client interface
+ *
+ * Based on lp3971.h
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef __LINUX_REGULATOR_LP3972_H
+#define __LINUX_REGULATOR_LP3972_H
+#include <linux/regulator/machine.h>
+#define LP3972_LDO1  0
+#define LP3972_LDO2  1
+#define LP3972_LDO3  2
+#define LP3972_LDO4  3
+#define LP3972_LDO5  4
+#define LP3972_DCDC1 5
+#define LP3972_DCDC2 6
+#define LP3972_DCDC3 7
+#define LP3972_NUM_REGULATORS 8
+struct lp3972_regulator_subdev {
+        int id;
+        struct regulator_init_data *initdata;
+};
+struct lp3972_platform_data {
+        int num_regulators;
+        struct lp3972_regulator_subdev *regulators;
+};
+#endif
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index e2980287245e..761c745b9c24 100644
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -189,10 +189,15 @@ int regulator_suspend_prepare(suspend_state_t state);
 #ifdef CONFIG_REGULATOR
 void regulator_has_full_constraints(void);
+void regulator_use_dummy_regulator(void);
 #else
 static inline void regulator_has_full_constraints(void)
 {
 }
+static inline void regulator_use_dummy_regulator(void)
+{
+}
 #endif
 #endif
diff --git a/include/linux/regulator/max8952.h b/include/linux/regulator/max8952.h
new file mode 100644
index 000000000000..45e42855ad05
--- /dev/null
+++ b/include/linux/regulator/max8952.h
@@ -0,0 +1,135 @@
+/*
+ * max8952.h - Voltage regulation for the Maxim 8952
+ *
+ *  Copyright (C) 2010 Samsung Electrnoics
+ *  MyungJoo Ham <myungjoo.ham@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef REGULATOR_MAX8952
+#define REGULATOR_MAX8952
+#include <linux/regulator/machine.h>
+enum {
+        MAX8952_DVS_MODE0,
+        MAX8952_DVS_MODE1,
+        MAX8952_DVS_MODE2,
+        MAX8952_DVS_MODE3,
+};
+enum {
+        MAX8952_DVS_770mV = 0,
+        MAX8952_DVS_780mV,
+        MAX8952_DVS_790mV,
+        MAX8952_DVS_800mV,
+        MAX8952_DVS_810mV,
+        MAX8952_DVS_820mV,
+        MAX8952_DVS_830mV,
+        MAX8952_DVS_840mV,
+        MAX8952_DVS_850mV,
+        MAX8952_DVS_860mV,
+        MAX8952_DVS_870mV,
+        MAX8952_DVS_880mV,
+        MAX8952_DVS_890mV,
+        MAX8952_DVS_900mV,
+        MAX8952_DVS_910mV,
+        MAX8952_DVS_920mV,
+        MAX8952_DVS_930mV,
+        MAX8952_DVS_940mV,
+        MAX8952_DVS_950mV,
+        MAX8952_DVS_960mV,
+        MAX8952_DVS_970mV,
+        MAX8952_DVS_980mV,
+        MAX8952_DVS_990mV,
+        MAX8952_DVS_1000mV,
+        MAX8952_DVS_1010mV,
+        MAX8952_DVS_1020mV,
+        MAX8952_DVS_1030mV,
+        MAX8952_DVS_1040mV,
+        MAX8952_DVS_1050mV,
+        MAX8952_DVS_1060mV,
+        MAX8952_DVS_1070mV,
+        MAX8952_DVS_1080mV,
+        MAX8952_DVS_1090mV,
+        MAX8952_DVS_1100mV,
+        MAX8952_DVS_1110mV,
+        MAX8952_DVS_1120mV,
+        MAX8952_DVS_1130mV,
+        MAX8952_DVS_1140mV,
+        MAX8952_DVS_1150mV,
+        MAX8952_DVS_1160mV,
+        MAX8952_DVS_1170mV,
+        MAX8952_DVS_1180mV,
+        MAX8952_DVS_1190mV,
+        MAX8952_DVS_1200mV,
+        MAX8952_DVS_1210mV,
+        MAX8952_DVS_1220mV,
+        MAX8952_DVS_1230mV,
+        MAX8952_DVS_1240mV,
+        MAX8952_DVS_1250mV,
+        MAX8952_DVS_1260mV,
+        MAX8952_DVS_1270mV,
+        MAX8952_DVS_1280mV,
+        MAX8952_DVS_1290mV,
+        MAX8952_DVS_1300mV,
+        MAX8952_DVS_1310mV,
+        MAX8952_DVS_1320mV,
+        MAX8952_DVS_1330mV,
+        MAX8952_DVS_1340mV,
+        MAX8952_DVS_1350mV,
+        MAX8952_DVS_1360mV,
+        MAX8952_DVS_1370mV,
+        MAX8952_DVS_1380mV,
+        MAX8952_DVS_1390mV,
+        MAX8952_DVS_1400mV,
+};
+enum {
+        MAX8952_SYNC_FREQ_26MHZ, /* Default */
+        MAX8952_SYNC_FREQ_13MHZ,
+        MAX8952_SYNC_FREQ_19_2MHZ,
+};
+enum {
+        MAX8952_RAMP_32mV_us = 0, /* Default */
+        MAX8952_RAMP_16mV_us,
+        MAX8952_RAMP_8mV_us,
+        MAX8952_RAMP_4mV_us,
+        MAX8952_RAMP_2mV_us,
+        MAX8952_RAMP_1mV_us,
+        MAX8952_RAMP_0_5mV_us,
+        MAX8952_RAMP_0_25mV_us,
+};
+#define MAX8952_NUM_DVS_MODE    4
+struct max8952_platform_data {
+        int gpio_vid0;
+        int gpio_vid1;
+        int gpio_en;
+        u8 default_mode;
+        u8 dvs_mode[MAX8952_NUM_DVS_MODE]; /* MAX8952_DVS_MODEx_XXXXmV */
+        u8 sync_freq;
+        u8 ramp_speed;
+        struct regulator_init_data reg_data;
+};
+#endif /* REGULATOR_MAX8952 */
diff --git a/include/linux/sched.h b/include/linux/sched.h
index be7adb7588e5..f53cdf216cef 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1080,7 +1080,7 @@ struct sched_class {
                                         struct task_struct *task);
 #ifdef CONFIG_FAIR_GROUP_SCHED
-        void (*moved_group) (struct task_struct *p, int on_rq);
+        void (*task_move_group) (struct task_struct *p, int on_rq);
 #endif
 };
diff --git a/include/linux/sh_intc.h b/include/linux/sh_intc.h
index b4f183a31f13..f656d1a43dc0 100644
--- a/include/linux/sh_intc.h
+++ b/include/linux/sh_intc.h
@@ -129,7 +129,4 @@ static inline int register_intc_userimask(unsigned long addr)
 }
 #endif
-int reserve_irq_vector(unsigned int irq);
-void reserve_irq_legacy(void);
 #endif /* __SH_INTC_H */
diff --git a/include/linux/smb.h b/include/linux/smb.h
deleted file mode 100644
index 82fefddc5987..000000000000
--- a/include/linux/smb.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- *  smb.h
- *
- *  Copyright (C) 1995, 1996 by Paal-Kr. Engstad and Volker Lendecke
- *  Copyright (C) 1997 by Volker Lendecke
- *
- */
-#ifndef _LINUX_SMB_H
-#define _LINUX_SMB_H
-#include <linux/types.h>
-#include <linux/magic.h>
-#ifdef __KERNEL__
-#include <linux/time.h>
-#endif
-enum smb_protocol { 
-        SMB_PROTOCOL_NONE, 
-        SMB_PROTOCOL_CORE, 
-        SMB_PROTOCOL_COREPLUS, 
-        SMB_PROTOCOL_LANMAN1, 
-        SMB_PROTOCOL_LANMAN2, 
-        SMB_PROTOCOL_NT1 
-};
-enum smb_case_hndl {
-        SMB_CASE_DEFAULT,
-        SMB_CASE_LOWER,
-        SMB_CASE_UPPER
-};
-struct smb_dskattr {
-        __u16 total;
-        __u16 allocblocks;
-        __u16 blocksize;
-        __u16 free;
-};
-struct smb_conn_opt {
-        /* The socket */
-        unsigned int fd;
-        enum smb_protocol protocol;
-        enum smb_case_hndl case_handling;
-        /* Connection-Options */
-        __u32              max_xmit;
-        __u16              server_uid;
-        __u16              tid;
-        /* The following are LANMAN 1.0 options */
-        __u16              secmode;
-        __u16              maxmux;
-        __u16              maxvcs;
-        __u16              rawmode;
-        __u32              sesskey;
-        /* The following are NT LM 0.12 options */
-        __u32              maxraw;
-        __u32              capabilities;
-        __s16              serverzone;
-};
-#ifdef __KERNEL__
-#define SMB_NLS_MAXNAMELEN 20
-struct smb_nls_codepage {
-        char local_name[SMB_NLS_MAXNAMELEN];
-        char remote_name[SMB_NLS_MAXNAMELEN];
-};
-#define SMB_MAXNAMELEN 255
-#define SMB_MAXPATHLEN 1024
-/*
- * Contains all relevant data on a SMB networked file.
- */
-struct smb_fattr {
-        __u16 attr;
-        unsigned long   f_ino;
-        umode_t         f_mode;
-        nlink_t         f_nlink;
-        uid_t           f_uid;
-        gid_t           f_gid;
-        dev_t           f_rdev;
-        loff_t          f_size;
-        struct timespec f_atime;
-        struct timespec f_mtime;
-        struct timespec f_ctime;
-        unsigned long   f_blocks;
-        int             f_unix;
-};
-enum smb_conn_state {
-        CONN_VALID,             /* everything's fine */
-        CONN_INVALID,           /* Something went wrong, but did not
-                                   try to reconnect yet. */
-        CONN_RETRIED,           /* Tried a reconnection, but was refused */
-        CONN_RETRYING           /* Currently trying to reconnect */
-};
-#define SMB_HEADER_LEN   37     /* includes everything up to, but not
-                                 * including smb_bcc */
-#define SMB_INITIAL_PACKET_SIZE         4000
-#define SMB_MAX_PACKET_SIZE             32768
-/* reserve this much space for trans2 parameters. Shouldn't have to be more
-   than 10 or so, but OS/2 seems happier like this. */
-#define SMB_TRANS2_MAX_PARAM 64
-#endif
-#endif
diff --git a/include/linux/smb_fs.h b/include/linux/smb_fs.h
deleted file mode 100644
index 923cd8a247b1..000000000000
--- a/include/linux/smb_fs.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- *  smb_fs.h
- *
- *  Copyright (C) 1995 by Paal-Kr. Engstad and Volker Lendecke
- *  Copyright (C) 1997 by Volker Lendecke
- *
- */
-#ifndef _LINUX_SMB_FS_H
-#define _LINUX_SMB_FS_H
-#include <linux/smb.h>
-/*
- * ioctl commands
- */
-#define SMB_IOC_GETMOUNTUID             _IOR('u', 1, __kernel_old_uid_t)
-#define SMB_IOC_NEWCONN                 _IOW('u', 2, struct smb_conn_opt)
-/* __kernel_uid_t can never change, so we have to use __kernel_uid32_t */
-#define SMB_IOC_GETMOUNTUID32           _IOR('u', 3, __kernel_uid32_t)
-#ifdef __KERNEL__
-#include <linux/smb_fs_i.h>
-#include <linux/smb_fs_sb.h>
-#include <linux/fs.h>
-#include <linux/pagemap.h>
-#include <linux/vmalloc.h>
-#include <linux/smb_mount.h>
-#include <linux/jiffies.h>
-#include <asm/unaligned.h>
-static inline struct smb_sb_info *SMB_SB(struct super_block *sb)
-{
-        return sb->s_fs_info;
-}
-static inline struct smb_inode_info *SMB_I(struct inode *inode)
-{
-        return container_of(inode, struct smb_inode_info, vfs_inode);
-}
-/* macro names are short for word, double-word, long value (?) */
-#define WVAL(buf, pos) (get_unaligned_le16((u8 *)(buf) + (pos)))
-#define DVAL(buf, pos) (get_unaligned_le32((u8 *)(buf) + (pos)))
-#define LVAL(buf, pos) (get_unaligned_le64((u8 *)(buf) + (pos)))
-#define WSET(buf, pos, val) put_unaligned_le16((val), (u8 *)(buf) + (pos))
-#define DSET(buf, pos, val) put_unaligned_le32((val), (u8 *)(buf) + (pos))
-#define LSET(buf, pos, val) put_unaligned_le64((val), (u8 *)(buf) + (pos))
-/* where to find the base of the SMB packet proper */
-#define smb_base(buf) ((u8 *)(((u8 *)(buf))+4))
-/*
- * Flags for the in-memory inode
- */
-#define SMB_F_LOCALWRITE        0x02    /* file modified locally */
-/* NT1 protocol capability bits */
-#define SMB_CAP_RAW_MODE         0x00000001
-#define SMB_CAP_MPX_MODE         0x00000002
-#define SMB_CAP_UNICODE          0x00000004
-#define SMB_CAP_LARGE_FILES      0x00000008
-#define SMB_CAP_NT_SMBS          0x00000010
-#define SMB_CAP_RPC_REMOTE_APIS  0x00000020
-#define SMB_CAP_STATUS32         0x00000040
-#define SMB_CAP_LEVEL_II_OPLOCKS 0x00000080
-#define SMB_CAP_LOCK_AND_READ    0x00000100
-#define SMB_CAP_NT_FIND          0x00000200
-#define SMB_CAP_DFS              0x00001000
-#define SMB_CAP_LARGE_READX      0x00004000
-#define SMB_CAP_LARGE_WRITEX     0x00008000
-#define SMB_CAP_UNIX             0x00800000     /* unofficial ... */
-/*
- * This is the time we allow an inode, dentry or dir cache to live. It is bad
- * for performance to have shorter ttl on an inode than on the cache. It can
- * cause refresh on each inode for a dir listing ... one-by-one
- */
-#define SMB_MAX_AGE(server) (((server)->mnt->ttl * HZ) / 1000)
-static inline void
-smb_age_dentry(struct smb_sb_info *server, struct dentry *dentry)
-{
-        dentry->d_time = jiffies - SMB_MAX_AGE(server);
-}
-struct smb_cache_head {
-        time_t          mtime;  /* unused */
-        unsigned long   time;   /* cache age */
-        unsigned long   end;    /* last valid fpos in cache */
-        int             eof;
-};
-#define SMB_DIRCACHE_SIZE       ((int)(PAGE_CACHE_SIZE/sizeof(struct dentry *)))
-union smb_dir_cache {
-        struct smb_cache_head   head;
-        struct dentry           *dentry[SMB_DIRCACHE_SIZE];
-};
-#define SMB_FIRSTCACHE_SIZE     ((int)((SMB_DIRCACHE_SIZE * \
-        sizeof(struct dentry *) - sizeof(struct smb_cache_head)) / \
-        sizeof(struct dentry *)))
-#define SMB_DIRCACHE_START      (SMB_DIRCACHE_SIZE - SMB_FIRSTCACHE_SIZE)
-struct smb_cache_control {
-        struct  smb_cache_head          head;
-        struct  page                    *page;
-        union   smb_dir_cache           *cache;
-        unsigned long                   fpos, ofs;
-        int                             filled, valid, idx;
-};
-#define SMB_OPS_NUM_STATIC      5
-struct smb_ops {
-        int (*read)(struct inode *inode, loff_t offset, int count,
-                    char *data);
-        int (*write)(struct inode *inode, loff_t offset, int count, const
-                     char *data);
-        int (*readdir)(struct file *filp, void *dirent, filldir_t filldir,
-                       struct smb_cache_control *ctl);
-        int (*getattr)(struct smb_sb_info *server, struct dentry *dir,
-                       struct smb_fattr *fattr);
-        /* int (*setattr)(...); */      /* setattr is really icky! */
-        int (*truncate)(struct inode *inode, loff_t length);
-        /* --- --- --- end of "static" entries --- --- --- */
-        int (*convert)(unsigned char *output, int olen,
-                       const unsigned char *input, int ilen,
-                       struct nls_table *nls_from,
-                       struct nls_table *nls_to);
-};
-static inline int
-smb_is_open(struct inode *i)
-{
-        return (SMB_I(i)->open == server_from_inode(i)->generation);
-}
-extern void smb_install_null_ops(struct smb_ops *);
-#endif /* __KERNEL__ */
-#endif /* _LINUX_SMB_FS_H */
diff --git a/include/linux/smb_fs_i.h b/include/linux/smb_fs_i.h
deleted file mode 100644
index 8ccf4eca2c3d..000000000000
--- a/include/linux/smb_fs_i.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  smb_fs_i.h
- *
- *  Copyright (C) 1995 by Paal-Kr. Engstad and Volker Lendecke
- *  Copyright (C) 1997 by Volker Lendecke
- *
- */
-#ifndef _LINUX_SMB_FS_I
-#define _LINUX_SMB_FS_I
-#include <linux/types.h>
-#include <linux/fs.h>
-/*
- * smb fs inode data (in memory only)
- */
-struct smb_inode_info {
-        /*
-         * file handles are local to a connection. A file is open if
-         * (open == generation).
-         */
-        unsigned int open;      /* open generation */
-        __u16 fileid;           /* What id to handle a file with? */
-        __u16 attr;             /* Attribute fields, DOS value */
-        __u16 access;           /* Access mode */
-        __u16 flags;
-        unsigned long oldmtime; /* last time refreshed */
-        unsigned long closed;   /* timestamp when closed */
-        unsigned openers;       /* number of fileid users */
-        struct inode vfs_inode; /* must be at the end */
-};
-#endif
diff --git a/include/linux/smb_fs_sb.h b/include/linux/smb_fs_sb.h
deleted file mode 100644
index bb947dd1fba9..000000000000
--- a/include/linux/smb_fs_sb.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *  smb_fs_sb.h
- *
- *  Copyright (C) 1995 by Paal-Kr. Engstad and Volker Lendecke
- *  Copyright (C) 1997 by Volker Lendecke
- *
- */
-#ifndef _SMB_FS_SB
-#define _SMB_FS_SB
-#include <linux/types.h>
-#include <linux/backing-dev.h>
-#include <linux/smb.h>
-/*
- * Upper limit on the total number of active smb_request structs.
- */
-#define MAX_REQUEST_HARD       256
-enum smb_receive_state {
-        SMB_RECV_START,         /* No data read, looking for length + sig */
-        SMB_RECV_HEADER,        /* Reading the header data */
-        SMB_RECV_HCOMPLETE,     /* Done with the header */
-        SMB_RECV_PARAM,         /* Reading parameter words */
-        SMB_RECV_DATA,          /* Reading data bytes */
-        SMB_RECV_END,           /* End of request */
-        SMB_RECV_DROP,          /* Dropping this SMB */
-        SMB_RECV_REQUEST,       /* Received a request and not a reply */
-};
-/* structure access macros */
-#define server_from_inode(inode) SMB_SB((inode)->i_sb)
-#define server_from_dentry(dentry) SMB_SB((dentry)->d_sb)
-#define SB_of(server) ((server)->super_block)
-struct smb_sb_info {
-        /* List of all smbfs superblocks */
-        struct list_head entry;
-        enum smb_conn_state state;
-        struct file * sock_file;
-        int conn_error;
-        enum smb_receive_state rstate;
-        atomic_t nr_requests;
-        struct list_head xmitq;
-        struct list_head recvq;
-        u16 mid;
-        struct smb_mount_data_kernel *mnt;
-        /* Connections are counted. Each time a new socket arrives,
-         * generation is incremented.
-         */
-        unsigned int generation;
-        struct pid *conn_pid;
-        struct smb_conn_opt opt;
-        wait_queue_head_t conn_wq;
-        int conn_complete;
-        struct semaphore sem;
-        unsigned char      header[SMB_HEADER_LEN + 20*2 + 2];
-        u32                header_len;
-        u32                smb_len;
-        u32                smb_read;
-        /* We use our own data_ready callback, but need the original one */
-        void *data_ready;
-        /* nls pointers for codepage conversions */
-        struct nls_table *remote_nls;
-        struct nls_table *local_nls;
-        struct smb_ops *ops;
-        struct super_block *super_block;
-        struct backing_dev_info bdi;
-};
-static inline int
-smb_lock_server_interruptible(struct smb_sb_info *server)
-{
-        return down_interruptible(&(server->sem));
-}
-static inline void
-smb_lock_server(struct smb_sb_info *server)
-{
-        down(&(server->sem));
-}
-static inline void
-smb_unlock_server(struct smb_sb_info *server)
-{
-        up(&(server->sem));
-}
-#endif
diff --git a/include/linux/smb_mount.h b/include/linux/smb_mount.h
deleted file mode 100644
index d10f00cb5703..000000000000
--- a/include/linux/smb_mount.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  smb_mount.h
- *
- *  Copyright (C) 1995, 1996 by Paal-Kr. Engstad and Volker Lendecke
- *  Copyright (C) 1997 by Volker Lendecke
- *
- */
-#ifndef _LINUX_SMB_MOUNT_H
-#define _LINUX_SMB_MOUNT_H
-#include <linux/types.h>
-#define SMB_MOUNT_VERSION       6
-struct smb_mount_data {
-        int version;
-        __kernel_uid_t mounted_uid; /* Who may umount() this filesystem? */
-        __kernel_uid_t uid;
-        __kernel_gid_t gid;
-        __kernel_mode_t file_mode;
-        __kernel_mode_t dir_mode;
-};
-#ifdef __KERNEL__
-/* "vers" in big-endian */
-#define SMB_MOUNT_ASCII 0x76657273
-#define SMB_MOUNT_OLDVERSION    6
-#undef SMB_MOUNT_VERSION
-#define SMB_MOUNT_VERSION       7
-/* flags */
-#define SMB_MOUNT_WIN95         0x0001  /* Win 95 server */
-#define SMB_MOUNT_OLDATTR       0x0002  /* Use core getattr (Win 95 speedup) */
-#define SMB_MOUNT_DIRATTR       0x0004  /* Use find_first for getattr */
-#define SMB_MOUNT_CASE          0x0008  /* Be case sensitive */
-#define SMB_MOUNT_UNICODE       0x0010  /* Server talks unicode */
-#define SMB_MOUNT_UID           0x0020  /* Use user specified uid */
-#define SMB_MOUNT_GID           0x0040  /* Use user specified gid */
-#define SMB_MOUNT_FMODE         0x0080  /* Use user specified file mode */
-#define SMB_MOUNT_DMODE         0x0100  /* Use user specified dir mode */
-struct smb_mount_data_kernel {
-        int version;
-        uid_t mounted_uid;      /* Who may umount() this filesystem? */
-        uid_t uid;
-        gid_t gid;
-        mode_t file_mode;
-        mode_t dir_mode;
-        u32 flags;
-        /* maximum age in jiffies (inode, dentry and dircache) */
-        int ttl;
-        struct smb_nls_codepage codepage;
-};
-#endif
-#endif
diff --git a/include/linux/smbno.h b/include/linux/smbno.h
deleted file mode 100644
index f99e02d9ffe2..000000000000
--- a/include/linux/smbno.h
+++ /dev/null
@@ -1,363 +0,0 @@
-#ifndef _SMBNO_H_
-#define _SMBNO_H_
-/* these define the attribute byte as seen by DOS */
-#define aRONLY  (1L<<0)
-#define aHIDDEN (1L<<1)
-#define aSYSTEM (1L<<2)
-#define aVOLID  (1L<<3)
-#define aDIR    (1L<<4)
-#define aARCH   (1L<<5)
-/* error classes */
-#define SUCCESS 0  /* The request was successful. */
-#define ERRDOS 0x01 /*  Error is from the core DOS operating system set. */
-#define ERRSRV 0x02 /* Error is generated by the server network file manager.*/
-#define ERRHRD 0x03  /* Error is an hardware error. */
-#define ERRCMD 0xFF  /* Command was not in the "SMB" format. */
-/* SMB X/Open error codes for the ERRdos error class */
-#define ERRbadfunc 1            /* Invalid function (or system call) */
-#define ERRbadfile 2            /* File not found (pathname error) */
-#define ERRbadpath 3            /* Directory not found */
-#define ERRnofids 4             /* Too many open files */
-#define ERRnoaccess 5           /* Access denied */
-#define ERRbadfid 6             /* Invalid fid */
-#define ERRbadmcb 7             /* Memory control blocks destroyed */
-#define ERRnomem 8              /* Out of memory */
-#define ERRbadmem 9             /* Invalid memory block address */
-#define ERRbadenv 10            /* Invalid environment */
-#define ERRbadformat 11         /* Invalid format */
-#define ERRbadaccess 12         /* Invalid open mode */
-#define ERRbaddata 13           /* Invalid data (only from ioctl call) */
-#define ERRres 14               /* reserved */
-#define ERRbaddrive 15          /* Invalid drive */
-#define ERRremcd 16             /* Attempt to delete current directory */
-#define ERRdiffdevice 17        /* rename/move across different filesystems */
-#define ERRnofiles 18           /* no more files found in file search */
-#define ERRbadshare 32          /* Share mode on file conflict with open mode */
-#define ERRlock 33              /* Lock request conflicts with existing lock */
-#define ERRfilexists 80         /* File in operation already exists */
-#define ERRbadpipe 230          /* Named pipe invalid */
-#define ERRpipebusy 231         /* All instances of pipe are busy */
-#define ERRpipeclosing 232      /* named pipe close in progress */
-#define ERRnotconnected 233     /* No process on other end of named pipe */
-#define ERRmoredata 234         /* More data to be returned */
-#define ERROR_INVALID_PARAMETER  87
-#define ERROR_DISK_FULL         112
-#define ERROR_INVALID_NAME      123
-#define ERROR_DIR_NOT_EMPTY     145
-#define ERROR_NOT_LOCKED        158
-#define ERROR_ALREADY_EXISTS    183  /* see also 80 ? */
-#define ERROR_EAS_DIDNT_FIT     275 /* Extended attributes didn't fit */
-#define ERROR_EAS_NOT_SUPPORTED 282 /* Extended attributes not supported */
-/* Error codes for the ERRSRV class */
-#define ERRerror 1              /* Non specific error code */
-#define ERRbadpw 2              /* Bad password */
-#define ERRbadtype 3            /* reserved */
-#define ERRaccess 4          /* No permissions to do the requested operation */
-#define ERRinvnid 5             /* tid invalid */
-#define ERRinvnetname 6         /* Invalid servername */
-#define ERRinvdevice 7          /* Invalid device */
-#define ERRqfull 49             /* Print queue full */
-#define ERRqtoobig 50           /* Queued item too big */
-#define ERRinvpfid 52           /* Invalid print file in smb_fid */
-#define ERRsmbcmd 64            /* Unrecognised command */
-#define ERRsrverror 65          /* smb server internal error */
-#define ERRfilespecs 67         /* fid and pathname invalid combination */
-#define ERRbadlink 68           /* reserved */
-#define ERRbadpermits 69        /* Access specified for a file is not valid */
-#define ERRbadpid 70            /* reserved */
-#define ERRsetattrmode 71       /* attribute mode invalid */
-#define ERRpaused 81            /* Message server paused */
-#define ERRmsgoff 82            /* Not receiving messages */
-#define ERRnoroom 83            /* No room for message */
-#define ERRrmuns 87             /* too many remote usernames */
-#define ERRtimeout 88           /* operation timed out */
-#define ERRnoresource  89   /* No resources currently available for request. */
-#define ERRtoomanyuids 90       /* too many userids */
-#define ERRbaduid 91            /* bad userid */
-#define ERRuseMPX 250    /* temporarily unable to use raw mode, use MPX mode */
-#define ERRuseSTD 251    /* temporarily unable to use raw mode, use std.mode */
-#define ERRcontMPX 252          /* resume MPX mode */
-#define ERRbadPW                /* reserved */
-#define ERRnosupport 0xFFFF
-/* Error codes for the ERRHRD class */
-#define ERRnowrite 19           /* read only media */
-#define ERRbadunit 20           /* Unknown device */
-#define ERRnotready 21          /* Drive not ready */
-#define ERRbadcmd 22            /* Unknown command */
-#define ERRdata 23              /* Data (CRC) error */
-#define ERRbadreq 24            /* Bad request structure length */
-#define ERRseek 25
-#define ERRbadmedia 26
-#define ERRbadsector 27
-#define ERRnopaper 28
-#define ERRwrite 29             /* write fault */
-#define ERRread 30              /* read fault */
-#define ERRgeneral 31           /* General hardware failure */
-#define ERRwrongdisk 34
-#define ERRFCBunavail 35
-#define ERRsharebufexc 36       /* share buffer exceeded */
-#define ERRdiskfull 39
-/*
- * Access modes when opening a file
- */
-#define SMB_ACCMASK     0x0003
-#define SMB_O_RDONLY    0x0000
-#define SMB_O_WRONLY    0x0001
-#define SMB_O_RDWR      0x0002
-/* offsets into message for common items */
-#define smb_com 8
-#define smb_rcls 9
-#define smb_reh 10
-#define smb_err 11
-#define smb_flg 13
-#define smb_flg2 14
-#define smb_reb 13
-#define smb_tid 28
-#define smb_pid 30
-#define smb_uid 32
-#define smb_mid 34
-#define smb_wct 36
-#define smb_vwv 37
-#define smb_vwv0 37
-#define smb_vwv1 39
-#define smb_vwv2 41
-#define smb_vwv3 43
-#define smb_vwv4 45
-#define smb_vwv5 47
-#define smb_vwv6 49
-#define smb_vwv7 51
-#define smb_vwv8 53
-#define smb_vwv9 55
-#define smb_vwv10 57
-#define smb_vwv11 59
-#define smb_vwv12 61
-#define smb_vwv13 63
-#define smb_vwv14 65
-/* these are the trans2 sub fields for primary requests */
-#define smb_tpscnt smb_vwv0
-#define smb_tdscnt smb_vwv1
-#define smb_mprcnt smb_vwv2
-#define smb_mdrcnt smb_vwv3
-#define smb_msrcnt smb_vwv4
-#define smb_flags smb_vwv5
-#define smb_timeout smb_vwv6
-#define smb_pscnt smb_vwv9
-#define smb_psoff smb_vwv10
-#define smb_dscnt smb_vwv11
-#define smb_dsoff smb_vwv12
-#define smb_suwcnt smb_vwv13
-#define smb_setup smb_vwv14
-#define smb_setup0 smb_setup
-#define smb_setup1 (smb_setup+2)
-#define smb_setup2 (smb_setup+4)
-/* these are for the secondary requests */
-#define smb_spscnt smb_vwv2
-#define smb_spsoff smb_vwv3
-#define smb_spsdisp smb_vwv4
-#define smb_sdscnt smb_vwv5
-#define smb_sdsoff smb_vwv6
-#define smb_sdsdisp smb_vwv7
-#define smb_sfid smb_vwv8
-/* and these for responses */
-#define smb_tprcnt smb_vwv0
-#define smb_tdrcnt smb_vwv1
-#define smb_prcnt smb_vwv3
-#define smb_proff smb_vwv4
-#define smb_prdisp smb_vwv5
-#define smb_drcnt smb_vwv6
-#define smb_droff smb_vwv7
-#define smb_drdisp smb_vwv8
-/* the complete */
-#define SMBmkdir      0x00   /* create directory */
-#define SMBrmdir      0x01   /* delete directory */
-#define SMBopen       0x02   /* open file */
-#define SMBcreate     0x03   /* create file */
-#define SMBclose      0x04   /* close file */
-#define SMBflush      0x05   /* flush file */
-#define SMBunlink     0x06   /* delete file */
-#define SMBmv         0x07   /* rename file */
-#define SMBgetatr     0x08   /* get file attributes */
-#define SMBsetatr     0x09   /* set file attributes */
-#define SMBread       0x0A   /* read from file */
-#define SMBwrite      0x0B   /* write to file */
-#define SMBlock       0x0C   /* lock byte range */
-#define SMBunlock     0x0D   /* unlock byte range */
-#define SMBctemp      0x0E   /* create temporary file */
-#define SMBmknew      0x0F   /* make new file */
-#define SMBchkpth     0x10   /* check directory path */
-#define SMBexit       0x11   /* process exit */
-#define SMBlseek      0x12   /* seek */
-#define SMBtcon       0x70   /* tree connect */
-#define SMBtconX      0x75   /* tree connect and X*/
-#define SMBtdis       0x71   /* tree disconnect */
-#define SMBnegprot    0x72   /* negotiate protocol */
-#define SMBdskattr    0x80   /* get disk attributes */
-#define SMBsearch     0x81   /* search directory */
-#define SMBsplopen    0xC0   /* open print spool file */
-#define SMBsplwr      0xC1   /* write to print spool file */
-#define SMBsplclose   0xC2   /* close print spool file */
-#define SMBsplretq    0xC3   /* return print queue */
-#define SMBsends      0xD0   /* send single block message */
-#define SMBsendb      0xD1   /* send broadcast message */
-#define SMBfwdname    0xD2   /* forward user name */
-#define SMBcancelf    0xD3   /* cancel forward */
-#define SMBgetmac     0xD4   /* get machine name */
-#define SMBsendstrt   0xD5   /* send start of multi-block message */
-#define SMBsendend    0xD6   /* send end of multi-block message */
-#define SMBsendtxt    0xD7   /* send text of multi-block message */
-/* Core+ protocol */
-#define SMBlockread       0x13   /* Lock a range and read */
-#define SMBwriteunlock 0x14 /* Unlock a range then write */
-#define SMBreadbraw   0x1a  /* read a block of data with no smb header */
-#define SMBwritebraw  0x1d  /* write a block of data with no smb header */
-#define SMBwritec     0x20  /* secondary write request */
-#define SMBwriteclose 0x2c  /* write a file then close it */
-/* dos extended protocol */
-#define SMBreadBraw      0x1A   /* read block raw */
-#define SMBreadBmpx      0x1B   /* read block multiplexed */
-#define SMBreadBs        0x1C   /* read block (secondary response) */
-#define SMBwriteBraw     0x1D   /* write block raw */
-#define SMBwriteBmpx     0x1E   /* write block multiplexed */
-#define SMBwriteBs       0x1F   /* write block (secondary request) */
-#define SMBwriteC        0x20   /* write complete response */
-#define SMBsetattrE      0x22   /* set file attributes expanded */
-#define SMBgetattrE      0x23   /* get file attributes expanded */
-#define SMBlockingX      0x24   /* lock/unlock byte ranges and X */
-#define SMBtrans         0x25   /* transaction - name, bytes in/out */
-#define SMBtranss        0x26   /* transaction (secondary request/response) */
-#define SMBioctl         0x27   /* IOCTL */
-#define SMBioctls        0x28   /* IOCTL  (secondary request/response) */
-#define SMBcopy          0x29   /* copy */
-#define SMBmove          0x2A   /* move */
-#define SMBecho          0x2B   /* echo */
-#define SMBopenX         0x2D   /* open and X */
-#define SMBreadX         0x2E   /* read and X */
-#define SMBwriteX        0x2F   /* write and X */
-#define SMBsesssetupX    0x73   /* Session Set Up & X (including User Logon) */
-#define SMBtconX         0x75   /* tree connect and X */
-#define SMBffirst        0x82   /* find first */
-#define SMBfunique       0x83   /* find unique */
-#define SMBfclose        0x84   /* find close */
-#define SMBinvalid       0xFE   /* invalid command */
-/* Extended 2.0 protocol */
-#define SMBtrans2        0x32   /* TRANS2 protocol set */
-#define SMBtranss2       0x33   /* TRANS2 protocol set, secondary command */
-#define SMBfindclose     0x34   /* Terminate a TRANSACT2_FINDFIRST */
-#define SMBfindnclose    0x35   /* Terminate a TRANSACT2_FINDNOTIFYFIRST */
-#define SMBulogoffX      0x74   /* user logoff */
-/* these are the TRANS2 sub commands */
-#define TRANSACT2_OPEN          0
-#define TRANSACT2_FINDFIRST     1
-#define TRANSACT2_FINDNEXT      2
-#define TRANSACT2_QFSINFO       3
-#define TRANSACT2_SETFSINFO     4
-#define TRANSACT2_QPATHINFO     5
-#define TRANSACT2_SETPATHINFO   6
-#define TRANSACT2_QFILEINFO     7
-#define TRANSACT2_SETFILEINFO   8
-#define TRANSACT2_FSCTL         9
-#define TRANSACT2_IOCTL           10
-#define TRANSACT2_FINDNOTIFYFIRST 11
-#define TRANSACT2_FINDNOTIFYNEXT  12
-#define TRANSACT2_MKDIR           13
-/* Information Levels -  Shared? */
-#define SMB_INFO_STANDARD               1
-#define SMB_INFO_QUERY_EA_SIZE          2
-#define SMB_INFO_QUERY_EAS_FROM_LIST    3
-#define SMB_INFO_QUERY_ALL_EAS          4
-#define SMB_INFO_IS_NAME_VALID          6
-/* Information Levels -  TRANSACT2_FINDFIRST */
-#define SMB_FIND_FILE_DIRECTORY_INFO            0x101
-#define SMB_FIND_FILE_FULL_DIRECTORY_INFO       0x102
-#define SMB_FIND_FILE_NAMES_INFO                0x103
-#define SMB_FIND_FILE_BOTH_DIRECTORY_INFO       0x104
-/* Information Levels -  TRANSACT2_QPATHINFO */
-#define SMB_QUERY_FILE_BASIC_INFO       0x101
-#define SMB_QUERY_FILE_STANDARD_INFO    0x102
-#define SMB_QUERY_FILE_EA_INFO          0x103
-#define SMB_QUERY_FILE_NAME_INFO        0x104
-#define SMB_QUERY_FILE_ALL_INFO         0x107
-#define SMB_QUERY_FILE_ALT_NAME_INFO    0x108
-#define SMB_QUERY_FILE_STREAM_INFO      0x109
-#define SMB_QUERY_FILE_COMPRESSION_INFO 0x10b
-/* Information Levels - TRANSACT2_SETFILEINFO */
-#define SMB_SET_FILE_BASIC_INFO         0x101
-#define SMB_SET_FILE_DISPOSITION_INFO   0x102
-#define SMB_SET_FILE_ALLOCATION_INFO    0x103
-#define SMB_SET_FILE_END_OF_FILE_INFO   0x104
-/* smb_flg field flags */
-#define SMB_FLAGS_SUPPORT_LOCKREAD      0x01
-#define SMB_FLAGS_CLIENT_BUF_AVAIL      0x02
-#define SMB_FLAGS_RESERVED              0x04
-#define SMB_FLAGS_CASELESS_PATHNAMES    0x08
-#define SMB_FLAGS_CANONICAL_PATHNAMES   0x10
-#define SMB_FLAGS_REQUEST_OPLOCK        0x20
-#define SMB_FLAGS_REQUEST_BATCH_OPLOCK  0x40
-#define SMB_FLAGS_REPLY                 0x80
-/* smb_flg2 field flags (samba-2.2.0/source/include/smb.h) */
-#define SMB_FLAGS2_LONG_PATH_COMPONENTS         0x0001
-#define SMB_FLAGS2_EXTENDED_ATTRIBUTES          0x0002
-#define SMB_FLAGS2_DFS_PATHNAMES                0x1000
-#define SMB_FLAGS2_READ_PERMIT_NO_EXECUTE       0x2000
-#define SMB_FLAGS2_32_BIT_ERROR_CODES           0x4000 
-#define SMB_FLAGS2_UNICODE_STRINGS              0x8000
-/*
- * UNIX stuff  (from samba trans2.h)
- */
-#define MIN_UNIX_INFO_LEVEL             0x200
-#define MAX_UNIX_INFO_LEVEL             0x2FF
-#define SMB_FIND_FILE_UNIX              0x202
-#define SMB_QUERY_FILE_UNIX_BASIC       0x200
-#define SMB_QUERY_FILE_UNIX_LINK        0x201
-#define SMB_QUERY_FILE_UNIX_HLINK       0x202
-#define SMB_SET_FILE_UNIX_BASIC         0x200
-#define SMB_SET_FILE_UNIX_LINK          0x201
-#define SMB_SET_FILE_UNIX_HLINK         0x203
-#define SMB_QUERY_CIFS_UNIX_INFO        0x200
-/* values which means "don't change it" */
-#define SMB_MODE_NO_CHANGE              0xFFFFFFFF
-#define SMB_UID_NO_CHANGE               0xFFFFFFFF
-#define SMB_GID_NO_CHANGE               0xFFFFFFFF
-#define SMB_TIME_NO_CHANGE              0xFFFFFFFFFFFFFFFFULL
-#define SMB_SIZE_NO_CHANGE              0xFFFFFFFFFFFFFFFFULL
-/* UNIX filetype mappings. */
-#define UNIX_TYPE_FILE          0
-#define UNIX_TYPE_DIR           1
-#define UNIX_TYPE_SYMLINK       2
-#define UNIX_TYPE_CHARDEV       3
-#define UNIX_TYPE_BLKDEV        4
-#define UNIX_TYPE_FIFO          5
-#define UNIX_TYPE_SOCKET        6
-#define UNIX_TYPE_UNKNOWN       0xFFFFFFFF
-#endif /* _SMBNO_H_ */
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 5146b50202ce..86b652fabf6e 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -322,7 +322,7 @@ extern int csum_partial_copy_fromiovecend(unsigned char *kdata,
                                          int offset, 
                                          unsigned int len, __wsum *csump);
-extern long verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address, int mode);
+extern int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address, int mode);
 extern int memcpy_toiovec(struct iovec *v, unsigned char *kdata, int len);
 extern int memcpy_toiovecend(const struct iovec *v, unsigned char *kdata,
                             int offset, int len);
diff --git a/include/linux/ti_wilink_st.h b/include/linux/ti_wilink_st.h
new file mode 100644
index 000000000000..4c7be2263011
--- /dev/null
+++ b/include/linux/ti_wilink_st.h
@@ -0,0 +1,400 @@
+/*
+ *  Shared Transport Header file
+ *      To be included by the protocol stack drivers for
+ *      Texas Instruments BT,FM and GPS combo chip drivers
+ *      and also serves the sub-modules of the shared transport driver.
+ *
+ *  Copyright (C) 2009-2010 Texas Instruments
+ *  Author: Pavan Savoy <pavan_savoy@ti.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#ifndef TI_WILINK_ST_H
+#define TI_WILINK_ST_H
+/**
+ * enum kim_gpio_state - Few protocols such as FM have ACTIVE LOW
+ *      gpio states for their chip/core enable gpios
+ */
+enum kim_gpio_state {
+        KIM_GPIO_INACTIVE,
+        KIM_GPIO_ACTIVE,
+};
+/**
+ * enum proto-type - The protocol on WiLink chips which share a
+ *      common physical interface like UART.
+ */
+enum proto_type {
+        ST_BT,
+        ST_FM,
+        ST_GPS,
+        ST_MAX,
+};
+/**
+ * struct st_proto_s - Per Protocol structure from BT/FM/GPS to ST
+ * @type: type of the protocol being registered among the
+ *      available proto_type(BT, FM, GPS the protocol which share TTY).
+ * @recv: the receiver callback pointing to a function in the
+ *      protocol drivers called by the ST driver upon receiving
+ *      relevant data.
+ * @match_packet: reserved for future use, to make ST more generic
+ * @reg_complete_cb: callback handler pointing to a function in protocol
+ *      handler called by ST when the pending registrations are complete.
+ *      The registrations are marked pending, in situations when fw
+ *      download is in progress.
+ * @write: pointer to function in ST provided to protocol drivers from ST,
+ *      to be made use when protocol drivers have data to send to TTY.
+ * @priv_data: privdate data holder for the protocol drivers, sent
+ *      from the protocol drivers during registration, and sent back on
+ *      reg_complete_cb and recv.
+ */
+struct st_proto_s {
+        enum proto_type type;
+        long (*recv) (void *, struct sk_buff *);
+        unsigned char (*match_packet) (const unsigned char *data);
+        void (*reg_complete_cb) (void *, char data);
+        long (*write) (struct sk_buff *skb);
+        void *priv_data;
+};
+extern long st_register(struct st_proto_s *);
+extern long st_unregister(enum proto_type);
+/*
+ * header information used by st_core.c
+ */
+/* states of protocol list */
+#define ST_NOTEMPTY     1
+#define ST_EMPTY        0
+/*
+ * possible st_states
+ */
+#define ST_INITIALIZING         1
+#define ST_REG_IN_PROGRESS      2
+#define ST_REG_PENDING          3
+#define ST_WAITING_FOR_RESP     4
+/**
+ * struct st_data_s - ST core internal structure
+ * @st_state: different states of ST like initializing, registration
+ *      in progress, this is mainly used to return relevant err codes
+ *      when protocol drivers are registering. It is also used to track
+ *      the recv function, as in during fw download only HCI events
+ *      can occur , where as during other times other events CH8, CH9
+ *      can occur.
+ * @tty: tty provided by the TTY core for line disciplines.
+ * @tx_skb: If for some reason the tty's write returns lesser bytes written
+ *      then to maintain the rest of data to be written on next instance.
+ *      This needs to be protected, hence the lock inside wakeup func.
+ * @tx_state: if the data is being written onto the TTY and protocol driver
+ *      wants to send more, queue up data and mark that there is
+ *      more data to send.
+ * @list: the list of protocols registered, only MAX can exist, one protocol
+ *      can register only once.
+ * @rx_state: states to be maintained inside st's tty receive
+ * @rx_count: count to be maintained inside st's tty receieve
+ * @rx_skb: the skb where all data for a protocol gets accumulated,
+ *      since tty might not call receive when a complete event packet
+ *      is received, the states, count and the skb needs to be maintained.
+ * @txq: the list of skbs which needs to be sent onto the TTY.
+ * @tx_waitq: if the chip is not in AWAKE state, the skbs needs to be queued
+ *      up in here, PM(WAKEUP_IND) data needs to be sent and then the skbs
+ *      from waitq can be moved onto the txq.
+ *      Needs locking too.
+ * @lock: the lock to protect skbs, queues, and ST states.
+ * @protos_registered: count of the protocols registered, also when 0 the
+ *      chip enable gpio can be toggled, and when it changes to 1 the fw
+ *      needs to be downloaded to initialize chip side ST.
+ * @ll_state: the various PM states the chip can be, the states are notified
+ *      to us, when the chip sends relevant PM packets(SLEEP_IND, WAKE_IND).
+ * @kim_data: reference to the parent encapsulating structure.
+ *
+ */
+struct st_data_s {
+        unsigned long st_state;
+        struct tty_struct *tty;
+        struct sk_buff *tx_skb;
+#define ST_TX_SENDING   1
+#define ST_TX_WAKEUP    2
+        unsigned long tx_state;
+        struct st_proto_s *list[ST_MAX];
+        unsigned long rx_state;
+        unsigned long rx_count;
+        struct sk_buff *rx_skb;
+        struct sk_buff_head txq, tx_waitq;
+        spinlock_t lock;
+        unsigned char   protos_registered;
+        unsigned long ll_state;
+        void *kim_data;
+};
+/**
+ * st_int_write -
+ * point this to tty->driver->write or tty->ops->write
+ * depending upon the kernel version
+ */
+int st_int_write(struct st_data_s*, const unsigned char*, int);
+/**
+ * st_write -
+ * internal write function, passed onto protocol drivers
+ * via the write function ptr of protocol struct
+ */
+long st_write(struct sk_buff *);
+/* function to be called from ST-LL */
+void st_ll_send_frame(enum proto_type, struct sk_buff *);
+/* internal wake up function */
+void st_tx_wakeup(struct st_data_s *st_data);
+/* init, exit entry funcs called from KIM */
+int st_core_init(struct st_data_s **);
+void st_core_exit(struct st_data_s *);
+/* ask for reference from KIM */
+void st_kim_ref(struct st_data_s **, int);
+#define GPS_STUB_TEST
+#ifdef GPS_STUB_TEST
+int gps_chrdrv_stub_write(const unsigned char*, int);
+void gps_chrdrv_stub_init(void);
+#endif
+/*
+ * header information used by st_kim.c
+ */
+/* time in msec to wait for
+ * line discipline to be installed
+ */
+#define LDISC_TIME      500
+#define CMD_RESP_TIME   500
+#define MAKEWORD(a, b)  ((unsigned short)(((unsigned char)(a)) \
+        | ((unsigned short)((unsigned char)(b))) << 8))
+#define GPIO_HIGH 1
+#define GPIO_LOW  0
+/* the Power-On-Reset logic, requires to attempt
+ * to download firmware onto chip more than once
+ * since the self-test for chip takes a while
+ */
+#define POR_RETRY_COUNT 5
+/**
+ * struct chip_version - save the chip version
+ */
+struct chip_version {
+        unsigned short full;
+        unsigned short chip;
+        unsigned short min_ver;
+        unsigned short maj_ver;
+};
+/**
+ * struct kim_data_s - the KIM internal data, embedded as the
+ *      platform's drv data. One for each ST device in the system.
+ * @uim_pid: KIM needs to communicate with UIM to request to install
+ *      the ldisc by opening UART when protocol drivers register.
+ * @kim_pdev: the platform device added in one of the board-XX.c file
+ *      in arch/XX/ directory, 1 for each ST device.
+ * @kim_rcvd: completion handler to notify when data was received,
+ *      mainly used during fw download, which involves multiple send/wait
+ *      for each of the HCI-VS commands.
+ * @ldisc_installed: completion handler to notify that the UIM accepted
+ *      the request to install ldisc, notify from tty_open which suggests
+ *      the ldisc was properly installed.
+ * @resp_buffer: data buffer for the .bts fw file name.
+ * @fw_entry: firmware class struct to request/release the fw.
+ * @gpios: the list of core/chip enable gpios for BT, FM and GPS cores.
+ * @rx_state: the rx state for kim's receive func during fw download.
+ * @rx_count: the rx count for the kim's receive func during fw download.
+ * @rx_skb: all of fw data might not come at once, and hence data storage for
+ *      whole of the fw response, only HCI_EVENTs and hence diff from ST's
+ *      response.
+ * @rfkill: rfkill data for each of the cores to be registered with rfkill.
+ * @rf_protos: proto types of the data registered with rfkill sub-system.
+ * @core_data: ST core's data, which mainly is the tty's disc_data
+ * @version: chip version available via a sysfs entry.
+ *
+ */
+struct kim_data_s {
+        long uim_pid;
+        struct platform_device *kim_pdev;
+        struct completion kim_rcvd, ldisc_installed;
+        char resp_buffer[30];
+        const struct firmware *fw_entry;
+        long gpios[ST_MAX];
+        unsigned long rx_state;
+        unsigned long rx_count;
+        struct sk_buff *rx_skb;
+        struct rfkill *rfkill[ST_MAX];
+        enum proto_type rf_protos[ST_MAX];
+        struct st_data_s *core_data;
+        struct chip_version version;
+};
+/**
+ * functions called when 1 of the protocol drivers gets
+ * registered, these need to communicate with UIM to request
+ * ldisc installed, read chip_version, download relevant fw
+ */
+long st_kim_start(void *);
+long st_kim_stop(void *);
+void st_kim_recv(void *, const unsigned char *, long count);
+void st_kim_chip_toggle(enum proto_type, enum kim_gpio_state);
+void st_kim_complete(void *);
+void kim_st_list_protocols(struct st_data_s *, void *);
+/*
+ * BTS headers
+ */
+#define ACTION_SEND_COMMAND     1
+#define ACTION_WAIT_EVENT       2
+#define ACTION_SERIAL           3
+#define ACTION_DELAY            4
+#define ACTION_RUN_SCRIPT       5
+#define ACTION_REMARKS          6
+/**
+ * struct bts_header - the fw file is NOT binary which can
+ *      be sent onto TTY as is. The .bts is more a script
+ *      file which has different types of actions.
+ *      Each such action needs to be parsed by the KIM and
+ *      relevant procedure to be called.
+ */
+struct bts_header {
+        u32 magic;
+        u32 version;
+        u8 future[24];
+        u8 actions[0];
+} __attribute__ ((packed));
+/**
+ * struct bts_action - Each .bts action has its own type of
+ *      data.
+ */
+struct bts_action {
+        u16 type;
+        u16 size;
+        u8 data[0];
+} __attribute__ ((packed));
+struct bts_action_send {
+        u8 data[0];
+} __attribute__ ((packed));
+struct bts_action_wait {
+        u32 msec;
+        u32 size;
+        u8 data[0];
+} __attribute__ ((packed));
+struct bts_action_delay {
+        u32 msec;
+} __attribute__ ((packed));
+struct bts_action_serial {
+        u32 baud;
+        u32 flow_control;
+} __attribute__ ((packed));
+/**
+ * struct hci_command - the HCI-VS for intrepreting
+ *      the change baud rate of host-side UART, which
+ *      needs to be ignored, since UIM would do that
+ *      when it receives request from KIM for ldisc installation.
+ */
+struct hci_command {
+        u8 prefix;
+        u16 opcode;
+        u8 plen;
+        u32 speed;
+} __attribute__ ((packed));
+/*
+ * header information used by st_ll.c
+ */
+/* ST LL receiver states */
+#define ST_W4_PACKET_TYPE       0
+#define ST_BT_W4_EVENT_HDR      1
+#define ST_BT_W4_ACL_HDR        2
+#define ST_BT_W4_SCO_HDR        3
+#define ST_BT_W4_DATA           4
+#define ST_FM_W4_EVENT_HDR      5
+#define ST_GPS_W4_EVENT_HDR     6
+/* ST LL state machines */
+#define ST_LL_ASLEEP               0
+#define ST_LL_ASLEEP_TO_AWAKE      1
+#define ST_LL_AWAKE                2
+#define ST_LL_AWAKE_TO_ASLEEP      3
+#define ST_LL_INVALID              4
+/* different PM notifications coming from chip */
+#define LL_SLEEP_IND    0x30
+#define LL_SLEEP_ACK    0x31
+#define LL_WAKE_UP_IND  0x32
+#define LL_WAKE_UP_ACK  0x33
+/* initialize and de-init ST LL */
+long st_ll_init(struct st_data_s *);
+long st_ll_deinit(struct st_data_s *);
+/**
+ * enable/disable ST LL along with KIM start/stop
+ * called by ST Core
+ */
+void st_ll_enable(struct st_data_s *);
+void st_ll_disable(struct st_data_s *);
+/**
+ * various funcs used by ST core to set/get the various PM states
+ * of the chip.
+ */
+unsigned long st_ll_getstate(struct st_data_s *);
+unsigned long st_ll_sleep_state(struct st_data_s *, unsigned char);
+void st_ll_wakeup(struct st_data_s *);
+/*
+ * header information used by st_core.c for FM and GPS
+ * packet parsing, the bluetooth headers are already available
+ * at net/bluetooth/
+ */
+struct fm_event_hdr {
+        u8 plen;
+} __attribute__ ((packed));
+#define FM_MAX_FRAME_SIZE 0xFF  /* TODO: */
+#define FM_EVENT_HDR_SIZE 1     /* size of fm_event_hdr */
+#define ST_FM_CH8_PKT 0x8
+/* gps stuff */
+struct gps_event_hdr {
+        u8 opcode;
+        u16 plen;
+} __attribute__ ((packed));
+#endif /* TI_WILINK_ST_H */
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 86be0cdeb11b..2a754748dd5f 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -50,6 +50,7 @@
 #define N_V253          19      /* Codec control over voice modem */
 #define N_CAIF          20      /* CAIF protocol for talking to modems */
 #define N_GSM0710       21      /* GSM 0710 Mux */
+#define N_TI_WL 22      /* for TI's WL BT, FM, GPS combo chips */
 /*
 * This character is the same as _POSIX_VDISABLE: it cannot be used as
@@ -540,8 +541,8 @@ extern void tty_audit_exit(void);
 extern void tty_audit_fork(struct signal_struct *sig);
 extern void tty_audit_tiocsti(struct tty_struct *tty, char ch);
 extern void tty_audit_push(struct tty_struct *tty);
-extern void tty_audit_push_task(struct task_struct *tsk,
+extern int tty_audit_push_task(struct task_struct *tsk,
-                                        uid_t loginuid, u32 sessionid);
+                               uid_t loginuid, u32 sessionid);
 #else
 static inline void tty_audit_add_data(struct tty_struct *tty,
                                      unsigned char *data, size_t size)
@@ -559,9 +560,10 @@ static inline void tty_audit_fork(struct signal_struct *sig)
 static inline void tty_audit_push(struct tty_struct *tty)
 {
 }
-static inline void tty_audit_push_task(struct task_struct *tsk,
+static inline int tty_audit_push_task(struct task_struct *tsk,
-                                        uid_t loginuid, u32 sessionid)
+                                      uid_t loginuid, u32 sessionid)
 {
+        return 0;
 }
 #endif
diff --git a/include/linux/via-core.h b/include/linux/via-core.h
index 7ffb521e1a7a..38bffd8ccca5 100644
--- a/include/linux/via-core.h
+++ b/include/linux/via-core.h
@@ -81,7 +81,7 @@ struct viafb_dev {
        unsigned long fbmem_start;
        long fbmem_len;
        void __iomem *fbmem;
-#if defined(CONFIG_FB_VIA_CAMERA) || defined(CONFIG_FB_VIA_CAMERA_MODULE)
+#if defined(CONFIG_VIDEO_VIA_CAMERA) || defined(CONFIG_VIDEO_VIA_CAMERA_MODULE)
        long camera_fbmem_offset;
        long camera_fbmem_size;
 #endif
@@ -138,6 +138,7 @@ void viafb_irq_disable(u32 mask);
 #define   VDE_I_LVDSSIEN  0x40000000  /* LVDS Sense enable */
 #define   VDE_I_ENABLE    0x80000000  /* Global interrupt enable */
+#if defined(CONFIG_VIDEO_VIA_CAMERA) || defined(CONFIG_VIDEO_VIA_CAMERA_MODULE)
 /*
 * DMA management.
 */
@@ -172,6 +173,7 @@ int viafb_dma_copy_out_sg(unsigned int offset, struct scatterlist *sg, int nsg);
 */
 #define VGA_WIDTH       640
 #define VGA_HEIGHT      480
+#endif /* CONFIG_VIDEO_VIA_CAMERA */
 /*
 * Indexed port operations.  Note that these are all multi-op
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 61490c6dcdbd..5f6f47044abf 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -363,6 +363,8 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_OV518    v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */
 #define V4L2_PIX_FMT_STV0680  v4l2_fourcc('S', '6', '8', '0') /* stv0680 bayer */
 #define V4L2_PIX_FMT_TM6000   v4l2_fourcc('T', 'M', '6', '0') /* tm5600/tm60x0 */
+#define V4L2_PIX_FMT_CIT_YYVYUY v4l2_fourcc('C', 'I', 'T', 'V') /* one line of Y then 1 line of VYUY */
+#define V4L2_PIX_FMT_KONICA420  v4l2_fourcc('K', 'O', 'N', 'I') /* YUV420 planar in blocks of 256 pixels */
 /*
 *      F O R M A T   E N U M E R A T I O N
@@ -1045,8 +1047,11 @@ enum v4l2_colorfx {
 #define V4L2_CID_CHROMA_GAIN                    (V4L2_CID_BASE+36)
+#define V4L2_CID_ILLUMINATORS_1                 (V4L2_CID_BASE+37)
+#define V4L2_CID_ILLUMINATORS_2                 (V4L2_CID_BASE+38)
 /* last CID + 1 */
-#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+37)
+#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+39)
 /*  MPEG-class control IDs defined by V4L2 */
 #define V4L2_CID_MPEG_BASE                      (V4L2_CTRL_CLASS_MPEG | 0x900)
@@ -1363,6 +1368,8 @@ struct v4l2_modulator {
 #define V4L2_TUNER_CAP_SAP              0x0020
 #define V4L2_TUNER_CAP_LANG1            0x0040
 #define V4L2_TUNER_CAP_RDS              0x0080
+#define V4L2_TUNER_CAP_RDS_BLOCK_IO     0x0100
+#define V4L2_TUNER_CAP_RDS_CONTROLS     0x0200
 /*  Flags for the 'rxsubchans' field */
 #define V4L2_TUNER_SUB_MONO             0x0001
@@ -1392,7 +1399,8 @@ struct v4l2_hw_freq_seek {
        enum v4l2_tuner_type  type;
        __u32                 seek_upward;
        __u32                 wrap_around;
-        __u32                 reserved[8];
+        __u32                 spacing;
+        __u32                 reserved[7];
 };
 /*
diff --git a/include/linux/videotext.h b/include/linux/videotext.h
deleted file mode 100644
index 3e68c8d1c7f7..000000000000
--- a/include/linux/videotext.h
+++ /dev/null
@@ -1,125 +0,0 @@
-#ifndef _VTX_H
-#define _VTX_H
-/*
- * Teletext (=Videotext) hardware decoders using interface /dev/vtx
- * Do not confuse with drivers using /dev/vbi which decode videotext by software
- *
- * Videotext IOCTLs changed in order to use _IO() macros defined in <linux/ioctl.h>,
- * unused tuner IOCTLs cleaned up by
- * Michael Geng <linux@MichaelGeng.de>
- *
- * Copyright (c) 1994-97 Martin Buck  <martin-2.buck@student.uni-ulm.de>
- * Read COPYING for more information
- *
- */
-/*
- *      Videotext ioctls
- */
-#define VTXIOCGETINFO   _IOR  (0x81,  1, vtx_info_t)
-#define VTXIOCCLRPAGE   _IOW  (0x81,  2, vtx_pagereq_t)
-#define VTXIOCCLRFOUND  _IOW  (0x81,  3, vtx_pagereq_t)
-#define VTXIOCPAGEREQ   _IOW  (0x81,  4, vtx_pagereq_t)
-#define VTXIOCGETSTAT   _IOW  (0x81,  5, vtx_pagereq_t)
-#define VTXIOCGETPAGE   _IOW  (0x81,  6, vtx_pagereq_t)
-#define VTXIOCSTOPDAU   _IOW  (0x81,  7, vtx_pagereq_t)
-#define VTXIOCPUTPAGE   _IO   (0x81,  8)
-#define VTXIOCSETDISP   _IO   (0x81,  9)
-#define VTXIOCPUTSTAT   _IO   (0x81, 10)
-#define VTXIOCCLRCACHE  _IO   (0x81, 11)
-#define VTXIOCSETVIRT   _IOW  (0x81, 12, long)
-/* for compatibility, will go away some day */
-#define VTXIOCGETINFO_OLD  0x7101  /* get version of driver & capabilities of vtx-chipset */
-#define VTXIOCCLRPAGE_OLD  0x7102  /* clear page-buffer */
-#define VTXIOCCLRFOUND_OLD 0x7103  /* clear bits indicating that page was found */
-#define VTXIOCPAGEREQ_OLD  0x7104  /* search for page */
-#define VTXIOCGETSTAT_OLD  0x7105  /* get status of page-buffer */
-#define VTXIOCGETPAGE_OLD  0x7106  /* get contents of page-buffer */
-#define VTXIOCSTOPDAU_OLD  0x7107  /* stop data acquisition unit */
-#define VTXIOCPUTPAGE_OLD  0x7108  /* display page on TV-screen */
-#define VTXIOCSETDISP_OLD  0x7109  /* set TV-mode */
-#define VTXIOCPUTSTAT_OLD  0x710a  /* set status of TV-output-buffer */
-#define VTXIOCCLRCACHE_OLD 0x710b  /* clear cache on VTX-interface (if avail.) */
-#define VTXIOCSETVIRT_OLD  0x710c  /* turn on virtual mode (this disables TV-display) */
-/*
- *      Definitions for VTXIOCGETINFO
- */
-#define SAA5243 0
-#define SAA5246 1
-#define SAA5249 2
-#define SAA5248 3
-#define XSTV5346 4
-typedef struct {
-        int version_major, version_minor;       /* version of driver; if version_major changes, driver */
-                                                /* is not backward compatible!!! CHECK THIS!!! */
-        int numpages;                           /* number of page-buffers of vtx-chipset */
-        int cct_type;                           /* type of vtx-chipset (SAA5243, SAA5246, SAA5248 or
-                                                 * SAA5249) */
-}
-vtx_info_t;
-/*
- *      Definitions for VTXIOC{CLRPAGE,CLRFOUND,PAGEREQ,GETSTAT,GETPAGE,STOPDAU,PUTPAGE,SETDISP}
- */
-#define MIN_UNIT   (1<<0)
-#define MIN_TEN    (1<<1)
-#define HR_UNIT    (1<<2)
-#define HR_TEN     (1<<3)
-#define PG_UNIT    (1<<4)
-#define PG_TEN     (1<<5)
-#define PG_HUND    (1<<6)
-#define PGMASK_MAX (1<<7)
-#define PGMASK_PAGE (PG_HUND | PG_TEN | PG_UNIT)
-#define PGMASK_HOUR (HR_TEN | HR_UNIT)
-#define PGMASK_MINUTE (MIN_TEN | MIN_UNIT)
-typedef struct
-{
-        int page;       /* number of requested page (hexadecimal) */
-        int hour;       /* requested hour (hexadecimal) */
-        int minute;     /* requested minute (hexadecimal) */
-        int pagemask;   /* mask defining which values of the above are set */
-        int pgbuf;      /* buffer where page will be stored */
-        int start;      /* start of requested part of page */
-        int end;        /* end of requested part of page */
-        void __user *buffer;    /* pointer to beginning of destination buffer */
-}
-vtx_pagereq_t;
-/*
- *      Definitions for VTXIOC{GETSTAT,PUTSTAT}
- */
-#define VTX_PAGESIZE (40 * 24)
-#define VTX_VIRTUALSIZE (40 * 49)
-typedef struct
-{
-        int pagenum;                    /* number of page (hexadecimal) */
-        int hour;                       /* hour (hexadecimal) */
-        int minute;                     /* minute (hexadecimal) */
-        int charset;                    /* national charset */
-        unsigned delete : 1;            /* delete page (C4) */
-        unsigned headline : 1;          /* insert headline (C5) */
-        unsigned subtitle : 1;          /* insert subtitle (C6) */
-        unsigned supp_header : 1;       /* suppress header (C7) */
-        unsigned update : 1;            /* update page (C8) */
-        unsigned inter_seq : 1;         /* interrupted sequence (C9) */
-        unsigned dis_disp : 1;          /* disable/suppress display (C10) */
-        unsigned serial : 1;            /* serial mode (C11) */
-        unsigned notfound : 1;          /* /FOUND */
-        unsigned pblf : 1;              /* PBLF */
-        unsigned hamming : 1;           /* hamming-error occurred */
-}
-vtx_pageinfo_t;
-#endif /* _VTX_H */
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index d5c7aaadda59..0ead399e08b5 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -58,7 +58,9 @@ struct writeback_control {
 struct bdi_writeback;
 int inode_wait(void *);
 void writeback_inodes_sb(struct super_block *);
+void writeback_inodes_sb_nr(struct super_block *, unsigned long nr);
 int writeback_inodes_sb_if_idle(struct super_block *);
+int writeback_inodes_sb_nr_if_idle(struct super_block *, unsigned long nr);
 void sync_inodes_sb(struct super_block *);
 void writeback_inodes_wb(struct bdi_writeback *wb,
                struct writeback_control *wbc);
@@ -141,6 +143,8 @@ typedef int (*writepage_t)(struct page *page, struct writeback_control *wbc,
 int generic_writepages(struct address_space *mapping,
                       struct writeback_control *wbc);
+void tag_pages_for_writeback(struct address_space *mapping,
+                             pgoff_t start, pgoff_t end);
 int write_cache_pages(struct address_space *mapping,
                      struct writeback_control *wbc, writepage_t writepage,
                      void *data);
diff --git a/include/media/ir-core.h b/include/media/ir-core.h
index eb7fddf8f607..6dc37fae6606 100644
--- a/include/media/ir-core.h
+++ b/include/media/ir-core.h
@@ -60,6 +60,7 @@ enum rc_driver_type {
 * @s_idle: optional: enable/disable hardware idle mode, upon which,
        device doesn't interrupt host until it sees IR pulses
 * @s_learning_mode: enable wide band receiver used for learning
+ * @s_carrier_report: enable carrier reports
 */
 struct ir_dev_props {
        enum rc_driver_type     driver_type;
@@ -82,8 +83,9 @@ struct ir_dev_props {
        int                     (*s_tx_duty_cycle)(void *priv, u32 duty_cycle);
        int                     (*s_rx_carrier_range)(void *priv, u32 min, u32 max);
        int                     (*tx_ir)(void *priv, int *txbuf, u32 n);
-        void                    (*s_idle)(void *priv, int enable);
+        void                    (*s_idle)(void *priv, bool enable);
        int                     (*s_learning_mode)(void *priv, int enable);
+        int                     (*s_carrier_report) (void *priv, int enable);
 };
 struct ir_input_dev {
@@ -157,27 +159,54 @@ void ir_input_unregister(struct input_dev *input_dev);
 void ir_repeat(struct input_dev *dev);
 void ir_keydown(struct input_dev *dev, int scancode, u8 toggle);
+void ir_keyup(struct ir_input_dev *ir);
 u32 ir_g_keycode_from_table(struct input_dev *input_dev, u32 scancode);
 /* From ir-raw-event.c */
 struct ir_raw_event {
-        unsigned                        pulse:1;
+        union {
-        unsigned                        duration:31;
+                u32             duration;
+                struct {
+                        u32     carrier;
+                        u8      duty_cycle;
+                };
+        };
+        unsigned                pulse:1;
+        unsigned                reset:1;
+        unsigned                timeout:1;
+        unsigned                carrier_report:1;
 };
-#define IR_MAX_DURATION                 0x7FFFFFFF      /* a bit more than 2 seconds */
+#define DEFINE_IR_RAW_EVENT(event) \
+        struct ir_raw_event event = { \
+                { .duration = 0 } , \
+                .pulse = 0, \
+                .reset = 0, \
+                .timeout = 0, \
+                .carrier_report = 0 }
+static inline void init_ir_raw_event(struct ir_raw_event *ev)
+{
+        memset(ev, 0, sizeof(*ev));
+}
+#define IR_MAX_DURATION         0xFFFFFFFF      /* a bit more than 4 seconds */
 void ir_raw_event_handle(struct input_dev *input_dev);
 int ir_raw_event_store(struct input_dev *input_dev, struct ir_raw_event *ev);
 int ir_raw_event_store_edge(struct input_dev *input_dev, enum raw_event_type type);
 int ir_raw_event_store_with_filter(struct input_dev *input_dev,
                                struct ir_raw_event *ev);
-void ir_raw_event_set_idle(struct input_dev *input_dev, int idle);
+void ir_raw_event_set_idle(struct input_dev *input_dev, bool idle);
 static inline void ir_raw_event_reset(struct input_dev *input_dev)
 {
-        struct ir_raw_event ev = { .pulse = false, .duration = 0 };
+        DEFINE_IR_RAW_EVENT(ev);
+        ev.reset = true;
        ir_raw_event_store(input_dev, &ev);
        ir_raw_event_handle(input_dev);
 }
diff --git a/include/media/ir-kbd-i2c.h b/include/media/ir-kbd-i2c.h
index 5e96d7a430be..557c676ab7dc 100644
--- a/include/media/ir-kbd-i2c.h
+++ b/include/media/ir-kbd-i2c.h
@@ -3,6 +3,8 @@
 #include <media/ir-common.h>
+#define DEFAULT_POLLING_INTERVAL        100     /* ms */
 struct IR_i2c;
 struct IR_i2c {
@@ -15,6 +17,8 @@ struct IR_i2c {
        /* Used to avoid fast repeating */
        unsigned char          old;
+        u32                    polling_interval; /* in ms */
        struct delayed_work    work;
        char                   name[32];
        char                   phys[32];
@@ -24,7 +28,6 @@ struct IR_i2c {
 enum ir_kbd_get_key_fn {
        IR_KBD_GET_KEY_CUSTOM = 0,
        IR_KBD_GET_KEY_PIXELVIEW,
-        IR_KBD_GET_KEY_PV951,
        IR_KBD_GET_KEY_HAUP,
        IR_KBD_GET_KEY_KNC1,
        IR_KBD_GET_KEY_FUSIONHDTV,
@@ -35,8 +38,9 @@ enum ir_kbd_get_key_fn {
 /* Can be passed when instantiating an ir_video i2c device */
 struct IR_i2c_init_data {
        char                    *ir_codes;
-        const char             *name;
+        const char              *name;
-        u64          type; /* IR_TYPE_RC5, etc */
+        u64                     type; /* IR_TYPE_RC5, etc */
+        u32                     polling_interval; /* 0 means DEFAULT_POLLING_INTERVAL */
        /*
         * Specify either a function pointer or a value indicating one of
         * ir_kbd_i2c's internal get_key functions
diff --git a/include/media/lirc_dev.h b/include/media/lirc_dev.h
index b1f60663cb39..54780a560d0e 100644
--- a/include/media/lirc_dev.h
+++ b/include/media/lirc_dev.h
@@ -125,10 +125,10 @@ static inline unsigned int lirc_buffer_write(struct lirc_buffer *buf,
 struct lirc_driver {
        char name[40];
        int minor;
-        unsigned long code_length;
+        __u32 code_length;
        unsigned int buffer_size; /* in chunks holding one code each */
        int sample_rate;
-        unsigned long features;
+        __u32 features;
        unsigned int chunk_size;
@@ -139,7 +139,7 @@ struct lirc_driver {
        struct lirc_buffer *rbuf;
        int (*set_use_inc) (void *data);
        void (*set_use_dec) (void *data);
-        struct file_operations *fops;
+        const struct file_operations *fops;
        struct device *dev;
        struct module *owner;
 };
diff --git a/include/media/omap1_camera.h b/include/media/omap1_camera.h
new file mode 100644
index 000000000000..819767cf04d4
--- /dev/null
+++ b/include/media/omap1_camera.h
@@ -0,0 +1,35 @@
+/*
+ * Header for V4L2 SoC Camera driver for OMAP1 Camera Interface
+ *
+ * Copyright (C) 2010, Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
+ *
+ * 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 __MEDIA_OMAP1_CAMERA_H_
+#define __MEDIA_OMAP1_CAMERA_H_
+#include <linux/bitops.h>
+#define OMAP1_CAMERA_IOSIZE             0x1c
+enum omap1_cam_vb_mode {
+        OMAP1_CAM_DMA_CONTIG = 0,
+        OMAP1_CAM_DMA_SG,
+};
+#define OMAP1_CAMERA_MIN_BUF_COUNT(x)   ((x) == OMAP1_CAM_DMA_CONTIG ? 3 : 2)
+struct omap1_cam_platform_data {
+        unsigned long   camexclk_khz;
+        unsigned long   lclk_khz_max;
+        unsigned long   flags;
+};
+#define OMAP1_CAMERA_LCLK_RISING        BIT(0)
+#define OMAP1_CAMERA_RST_LOW            BIT(1)
+#define OMAP1_CAMERA_RST_HIGH           BIT(2)
+#endif /* __MEDIA_OMAP1_CAMERA_H_ */
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index 9b201ec8dc7f..e0f17edf38ed 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -17,12 +17,13 @@
 #define IR_TYPE_RC6     (1  << 2)       /* Philips RC6 protocol */
 #define IR_TYPE_JVC     (1  << 3)       /* JVC protocol */
 #define IR_TYPE_SONY    (1  << 4)       /* Sony12/15/20 protocol */
+#define IR_TYPE_RC5_SZ  (1  << 5)       /* RC5 variant used by Streamzap */
 #define IR_TYPE_LIRC    (1  << 30)      /* Pass raw IR to lirc userspace */
 #define IR_TYPE_OTHER   (1u << 31)
 #define IR_TYPE_ALL (IR_TYPE_RC5 | IR_TYPE_NEC  | IR_TYPE_RC6  | \
                     IR_TYPE_JVC | IR_TYPE_SONY | IR_TYPE_LIRC | \
-                     IR_TYPE_OTHER)
+                     IR_TYPE_RC5_SZ | IR_TYPE_OTHER)
 struct ir_scancode {
        u32     scancode;
@@ -54,6 +55,8 @@ void rc_map_init(void);
 /* Names of the several keytables defined in-kernel */
 #define RC_MAP_ADSTECH_DVB_T_PCI         "rc-adstech-dvb-t-pci"
+#define RC_MAP_ALINK_DTU_M               "rc-alink-dtu-m"
+#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_ATI_TV_WONDER_HD_600      "rc-ati-tv-wonder-hd-600"
@@ -62,8 +65,10 @@ void rc_map_init(void);
 #define RC_MAP_AVERMEDIA_DVBT            "rc-avermedia-dvbt"
 #define RC_MAP_AVERMEDIA_M135A           "rc-avermedia-m135a"
 #define RC_MAP_AVERMEDIA_M733A_RM_K6     "rc-avermedia-m733a-rm-k6"
+#define RC_MAP_AVERMEDIA_RM_KS           "rc-avermedia-rm-ks"
 #define RC_MAP_AVERMEDIA                 "rc-avermedia"
 #define RC_MAP_AVERTV_303                "rc-avertv-303"
+#define RC_MAP_AZUREWAVE_AD_TU700        "rc-azurewave-ad-tu700"
 #define RC_MAP_BEHOLD_COLUMBUS           "rc-behold-columbus"
 #define RC_MAP_BEHOLD                    "rc-behold"
 #define RC_MAP_BUDGET_CI_OLD             "rc-budget-ci-old"
@@ -71,6 +76,8 @@ void rc_map_init(void);
 #define RC_MAP_CINERGY                   "rc-cinergy"
 #define RC_MAP_DIB0700_NEC_TABLE         "rc-dib0700-nec"
 #define RC_MAP_DIB0700_RC5_TABLE         "rc-dib0700-rc5"
+#define RC_MAP_DIGITALNOW_TINYTWIN       "rc-digitalnow-tinytwin"
+#define RC_MAP_DIGITTRADE                "rc-digittrade"
 #define RC_MAP_DM1105_NEC                "rc-dm1105-nec"
 #define RC_MAP_DNTV_LIVE_DVBT_PRO        "rc-dntv-live-dvbt-pro"
 #define RC_MAP_DNTV_LIVE_DVB_T           "rc-dntv-live-dvb-t"
@@ -94,8 +101,12 @@ void rc_map_init(void);
 #define RC_MAP_KAIOMY                    "rc-kaiomy"
 #define RC_MAP_KWORLD_315U               "rc-kworld-315u"
 #define RC_MAP_KWORLD_PLUS_TV_ANALOG     "rc-kworld-plus-tv-analog"
+#define RC_MAP_LEADTEK_Y04G0051          "rc-leadtek-y04g0051"
 #define RC_MAP_LIRC                      "rc-lirc"
+#define RC_MAP_LME2510                   "rc-lme2510"
 #define RC_MAP_MANLI                     "rc-manli"
+#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"
 #define RC_MAP_MSI_TVANYWHERE            "rc-msi-tvanywhere"
 #define RC_MAP_NEBULA                    "rc-nebula"
@@ -114,14 +125,18 @@ void rc_map_init(void);
 #define RC_MAP_PURPLETV                  "rc-purpletv"
 #define RC_MAP_PV951                     "rc-pv951"
 #define RC_MAP_RC5_HAUPPAUGE_NEW         "rc-rc5-hauppauge-new"
-#define RC_MAP_RC5_STREAMZAP             "rc-rc5-streamzap"
 #define RC_MAP_RC5_TV                    "rc-rc5-tv"
 #define RC_MAP_RC6_MCE                   "rc-rc6-mce"
 #define RC_MAP_REAL_AUDIO_220_32_KEYS    "rc-real-audio-220-32-keys"
+#define RC_MAP_STREAMZAP                 "rc-streamzap"
 #define RC_MAP_TBS_NEC                   "rc-tbs-nec"
 #define RC_MAP_TERRATEC_CINERGY_XS       "rc-terratec-cinergy-xs"
+#define RC_MAP_TERRATEC_SLIM             "rc-terratec-slim"
 #define RC_MAP_TEVII_NEC                 "rc-tevii-nec"
+#define RC_MAP_TOTAL_MEDIA_IN_HAND       "rc-total-media-in-hand"
+#define RC_MAP_TREKSTOR                  "rc-trekstor"
 #define RC_MAP_TT_1500                   "rc-tt-1500"
+#define RC_MAP_TWINHAN_VP1027_DVBS       "rc-twinhan1027"
 #define RC_MAP_VIDEOMATE_S350            "rc-videomate-s350"
 #define RC_MAP_VIDEOMATE_TV_PVR          "rc-videomate-tv-pvr"
 #define RC_MAP_WINFAST                   "rc-winfast"
diff --git a/include/media/s3c_fimc.h b/include/media/s3c_fimc.h
new file mode 100644
index 000000000000..ca1b6738e4a4
--- /dev/null
+++ b/include/media/s3c_fimc.h
@@ -0,0 +1,60 @@
+/*
+ * Samsung S5P SoC camera interface driver header
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd
+ * Author: Sylwester Nawrocki, <s.nawrocki@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef S3C_FIMC_H_
+#define S3C_FIMC_H_
+enum cam_bus_type {
+        FIMC_ITU_601 = 1,
+        FIMC_ITU_656,
+        FIMC_MIPI_CSI2,
+        FIMC_LCD_WB, /* FIFO link from LCD mixer */
+};
+#define FIMC_CLK_INV_PCLK       (1 << 0)
+#define FIMC_CLK_INV_VSYNC      (1 << 1)
+#define FIMC_CLK_INV_HREF       (1 << 2)
+#define FIMC_CLK_INV_HSYNC      (1 << 3)
+struct i2c_board_info;
+/**
+ * struct s3c_fimc_isp_info - image sensor information required for host
+ *                            interace configuration.
+ *
+ * @board_info: pointer to I2C subdevice's board info
+ * @bus_type: determines bus type, MIPI, ITU-R BT.601 etc.
+ * @i2c_bus_num: i2c control bus id the sensor is attached to
+ * @mux_id: FIMC camera interface multiplexer index (separate for MIPI and ITU)
+ * @bus_width: camera data bus width in bits
+ * @flags: flags defining bus signals polarity inversion (High by default)
+ */
+struct s3c_fimc_isp_info {
+        struct i2c_board_info *board_info;
+        enum cam_bus_type bus_type;
+        u16 i2c_bus_num;
+        u16 mux_id;
+        u16 bus_width;
+        u16 flags;
+};
+#define FIMC_MAX_CAMIF_CLIENTS  2
+/**
+ * struct s3c_platform_fimc - camera host interface platform data
+ *
+ * @isp_info: properties of camera sensor required for host interface setup
+ */
+struct s3c_platform_fimc {
+        struct s3c_fimc_isp_info *isp_info[FIMC_MAX_CAMIF_CLIENTS];
+};
+#endif /* S3C_FIMC_H_ */
diff --git a/include/media/sh_vou.h b/include/media/sh_vou.h
index a3ef30242b00..ec3ba9a597a2 100644
--- a/include/media/sh_vou.h
+++ b/include/media/sh_vou.h
@@ -28,7 +28,6 @@ struct sh_vou_pdata {
        int i2c_adap;
        struct i2c_board_info *board_info;
        unsigned long flags;
-        char *module_name;
 };
 #endif
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index 2ce957301f77..86e3631764ef 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -21,6 +21,8 @@
 extern struct bus_type soc_camera_bus_type;
+struct file;
 struct soc_camera_device {
        struct list_head list;
        struct device dev;
@@ -41,10 +43,7 @@ struct soc_camera_device {
        /* soc_camera.c private count. Only accessed with .video_lock held */
        int use_count;
        struct mutex video_lock;        /* Protects device data */
-};
+        struct file *streamer;          /* stream owner */
-struct soc_camera_file {
-        struct soc_camera_device *icd;
        struct videobuf_queue vb_vidq;
 };
@@ -79,7 +78,7 @@ struct soc_camera_host_ops {
        int (*try_fmt)(struct soc_camera_device *, struct v4l2_format *);
        void (*init_videobuf)(struct videobuf_queue *,
                              struct soc_camera_device *);
-        int (*reqbufs)(struct soc_camera_file *, struct v4l2_requestbuffers *);
+        int (*reqbufs)(struct soc_camera_device *, struct v4l2_requestbuffers *);
        int (*querycap)(struct soc_camera_host *, struct v4l2_capability *);
        int (*set_bus_param)(struct soc_camera_device *, __u32);
        int (*get_ctrl)(struct soc_camera_device *, struct v4l2_control *);
diff --git a/include/media/sr030pc30.h b/include/media/sr030pc30.h
new file mode 100644
index 000000000000..6f901a653ba2
--- /dev/null
+++ b/include/media/sr030pc30.h
@@ -0,0 +1,21 @@
+/*
+ * Driver header for SR030PC30 camera sensor
+ *
+ * Copyright (c) 2010 Samsung Electronics, Co. Ltd
+ * Contact: Sylwester Nawrocki <s.nawrocki@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#ifndef SR030PC30_H
+#define SR030PC30_H
+struct sr030pc30_platform_data {
+        unsigned long clk_rate; /* master clock frequency in Hz */
+        int (*set_power)(struct device *dev, int on);
+};
+#endif /* SR030PC30_H */
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index 21b4428c12ab..51e89f2267b8 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -38,6 +38,9 @@ enum {
        /* module tvaudio: reserved range 50-99 */
        V4L2_IDENT_TVAUDIO = 50,        /* A tvaudio chip, unknown which it is exactly */
+        /* Sony IMX074 */
+        V4L2_IDENT_IMX074 = 74,
        /* module saa7110: just ident 100 */
        V4L2_IDENT_SAA7110 = 100,
@@ -70,6 +73,7 @@ enum {
        V4L2_IDENT_OV9655 = 255,
        V4L2_IDENT_SOI968 = 256,
        V4L2_IDENT_OV9640 = 257,
+        V4L2_IDENT_OV6650 = 258,
        /* module saa7146: reserved range 300-309 */
        V4L2_IDENT_SAA7146 = 300,
@@ -111,6 +115,10 @@ enum {
        V4L2_IDENT_VPX3216B = 3216,
        V4L2_IDENT_VPX3220A = 3220,
+        /* VX855 just ident 3409 */
+        /* Other via devs could use 3314, 3324, 3327, 3336, 3364, 3353 */
+        V4L2_IDENT_VIA_VX855 = 3409,
        /* module tvp5150 */
        V4L2_IDENT_TVP5150 = 5150,
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 98b32645e5a7..41dd480e45f1 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -232,4 +232,14 @@ void v4l_bound_align_image(unsigned int *w, unsigned int wmin,
                           unsigned int hmax, unsigned int halign,
                           unsigned int salign);
 int v4l_fill_dv_preset_info(u32 preset, struct v4l2_dv_enum_preset *info);
+struct v4l2_discrete_probe {
+        const struct v4l2_frmsize_discrete      *sizes;
+        int                                     num_sizes;
+};
+const struct v4l2_frmsize_discrete *v4l2_find_nearest_format(
+                const struct v4l2_discrete_probe *probe,
+                s32 width, s32 height);
 #endif /* V4L2_COMMON_H_ */
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 1efcacbed01a..15802a067a12 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -21,8 +21,7 @@
 #define VFL_TYPE_GRABBER        0
 #define VFL_TYPE_VBI            1
 #define VFL_TYPE_RADIO          2
-#define VFL_TYPE_VTX            3
+#define VFL_TYPE_MAX            3
-#define VFL_TYPE_MAX            4
 struct v4l2_ioctl_callbacks;
 struct video_device;
@@ -42,8 +41,6 @@ struct v4l2_file_operations {
        unsigned int (*poll) (struct file *, struct poll_table_struct *);
        long (*ioctl) (struct file *, unsigned int, unsigned long);
        long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
-        unsigned long (*get_unmapped_area) (struct file *, unsigned long,
-                                unsigned long, unsigned long, unsigned long);
        int (*mmap) (struct file *, struct vm_area_struct *);
        int (*open) (struct file *);
        int (*release) (struct file *);
@@ -97,6 +94,9 @@ struct video_device
        /* ioctl callbacks */
        const struct v4l2_ioctl_ops *ioctl_ops;
+        /* serialization lock */
+        struct mutex *lock;
 };
 /* dev to video-device */
diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
index 8bcbd7a0271c..6648036b728d 100644
--- a/include/media/v4l2-device.h
+++ b/include/media/v4l2-device.h
@@ -101,46 +101,67 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd);
 /* Call the specified callback for all subdevs matching the condition.
   Ignore any errors. Note that you cannot add or delete a subdev
   while walking the subdevs list. */
-#define __v4l2_device_call_subdevs(v4l2_dev, cond, o, f, args...)       \
+#define __v4l2_device_call_subdevs_p(v4l2_dev, sd, cond, o, f, args...) \
        do {                                                            \
-                struct v4l2_subdev *sd;                                 \
+                list_for_each_entry((sd), &(v4l2_dev)->subdevs, list)   \
+                        if ((cond) && (sd)->ops->o && (sd)->ops->o->f)  \
+                                (sd)->ops->o->f((sd) , ##args);         \
+        } while (0)
+#define __v4l2_device_call_subdevs(v4l2_dev, cond, o, f, args...)       \
+        do {                                                            \
+                struct v4l2_subdev *__sd;                               \
                                                                        \
-                list_for_each_entry(sd, &(v4l2_dev)->subdevs, list)     \
+                __v4l2_device_call_subdevs_p(v4l2_dev, __sd, cond, o,   \
-                        if ((cond) && sd->ops->o && sd->ops->o->f)      \
+                                                f , ##args);            \
-                                sd->ops->o->f(sd , ##args);             \
        } while (0)
 /* Call the specified callback for all subdevs matching the condition.
   If the callback returns an error other than 0 or -ENOIOCTLCMD, then
   return with that error code. Note that you cannot add or delete a
   subdev while walking the subdevs list. */
-#define __v4l2_device_call_subdevs_until_err(v4l2_dev, cond, o, f, args...) \
+#define __v4l2_device_call_subdevs_until_err_p(v4l2_dev, sd, cond, o, f, args...) \
 ({                                                                      \
-        struct v4l2_subdev *sd;                                         \
+        long __err = 0;                                                 \
-        long err = 0;                                                   \
                                                                        \
-        list_for_each_entry(sd, &(v4l2_dev)->subdevs, list) {           \
+        list_for_each_entry((sd), &(v4l2_dev)->subdevs, list) {         \
-                if ((cond) && sd->ops->o && sd->ops->o->f)              \
+                if ((cond) && (sd)->ops->o && (sd)->ops->o->f)          \
-                        err = sd->ops->o->f(sd , ##args);               \
+                        __err = (sd)->ops->o->f((sd) , ##args);         \
-                if (err && err != -ENOIOCTLCMD)                         \
+                if (__err && __err != -ENOIOCTLCMD)                     \
                        break;                                          \
        }                                                               \
-        (err == -ENOIOCTLCMD) ? 0 : err;                                \
+        (__err == -ENOIOCTLCMD) ? 0 : __err;                            \
+})
+#define __v4l2_device_call_subdevs_until_err(v4l2_dev, cond, o, f, args...) \
+({                                                                      \
+        struct v4l2_subdev *__sd;                                       \
+        __v4l2_device_call_subdevs_until_err_p(v4l2_dev, __sd, cond, o, \
+                                                f, args...);            \
 })
 /* Call the specified callback for all subdevs matching grp_id (if 0, then
   match them all). Ignore any errors. Note that you cannot add or delete
   a subdev while walking the subdevs list. */
-#define v4l2_device_call_all(v4l2_dev, grpid, o, f, args...)            \
+#define v4l2_device_call_all(v4l2_dev, grpid, o, f, args...)            \
-        __v4l2_device_call_subdevs(v4l2_dev,                            \
+        do {                                                            \
-                        !(grpid) || sd->grp_id == (grpid), o, f , ##args)
+                struct v4l2_subdev *__sd;                               \
+                                                                        \
+                __v4l2_device_call_subdevs_p(v4l2_dev, __sd,            \
+                        !(grpid) || __sd->grp_id == (grpid), o, f ,     \
+                        ##args);                                        \
+        } while (0)
 /* Call the specified callback for all subdevs matching grp_id (if 0, then
   match them all). If the callback returns an error other than 0 or
   -ENOIOCTLCMD, then return with that error code. Note that you cannot
   add or delete a subdev while walking the subdevs list. */
 #define v4l2_device_call_until_err(v4l2_dev, grpid, o, f, args...)      \
-        __v4l2_device_call_subdevs_until_err(v4l2_dev,                  \
+({                                                                      \
-                       !(grpid) || sd->grp_id == (grpid), o, f , ##args)
+        struct v4l2_subdev *__sd;                                       \
+        __v4l2_device_call_subdevs_until_err_p(v4l2_dev, __sd,          \
+                        !(grpid) || __sd->grp_id == (grpid), o, f ,     \
+                        ##args);                                        \
+})
 #endif
diff --git a/include/media/v4l2-i2c-drv.h b/include/media/v4l2-i2c-drv.h
deleted file mode 100644
index 74bf741d1a9b..000000000000
--- a/include/media/v4l2-i2c-drv.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * v4l2-i2c-drv.h - contains I2C handling code that's identical for
- *                  all V4L2 I2C drivers. Use this header if the
- *                  I2C driver is only used by drivers converted
- *                  to the bus-based I2C API.
- *
- * Copyright (C) 2007 Hans Verkuil <hverkuil@xs4all.nl>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-/* NOTE: the full version of this header is in the v4l-dvb repository
- * and allows v4l i2c drivers to be compiled on pre-2.6.26 kernels.
- * The version of this header as it appears in the kernel is a stripped
- * version (without all the backwards compatibility stuff) and so it
- * looks a bit odd.
- *
- * If you look at the full version then you will understand the reason
- * for introducing this header since you really don't want to have all
- * the tricky backwards compatibility code in each and every i2c driver.
- *
- * If the i2c driver will never be compiled for pre-2.6.26 kernels, then
- * DO NOT USE this header! Just write it as a regular i2c driver.
- */
-#ifndef __V4L2_I2C_DRV_H__
-#define __V4L2_I2C_DRV_H__
-#include <media/v4l2-common.h>
-struct v4l2_i2c_driver_data {
-        const char * const name;
-        int (*command)(struct i2c_client *client, unsigned int cmd, void *arg);
-        int (*probe)(struct i2c_client *client, const struct i2c_device_id *id);
-        int (*remove)(struct i2c_client *client);
-        int (*suspend)(struct i2c_client *client, pm_message_t state);
-        int (*resume)(struct i2c_client *client);
-        const struct i2c_device_id *id_table;
-};
-static struct v4l2_i2c_driver_data v4l2_i2c_data;
-static struct i2c_driver v4l2_i2c_driver;
-/* Bus-based I2C implementation for kernels >= 2.6.26 */
-static int __init v4l2_i2c_drv_init(void)
-{
-        v4l2_i2c_driver.driver.name = v4l2_i2c_data.name;
-        v4l2_i2c_driver.command = v4l2_i2c_data.command;
-        v4l2_i2c_driver.probe = v4l2_i2c_data.probe;
-        v4l2_i2c_driver.remove = v4l2_i2c_data.remove;
-        v4l2_i2c_driver.suspend = v4l2_i2c_data.suspend;
-        v4l2_i2c_driver.resume = v4l2_i2c_data.resume;
-        v4l2_i2c_driver.id_table = v4l2_i2c_data.id_table;
-        return i2c_add_driver(&v4l2_i2c_driver);
-}
-static void __exit v4l2_i2c_drv_cleanup(void)
-{
-        i2c_del_driver(&v4l2_i2c_driver);
-}
-module_init(v4l2_i2c_drv_init);
-module_exit(v4l2_i2c_drv_cleanup);
-#endif /* __V4L2_I2C_DRV_H__ */
diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h
index f0cf2e7def06..8e6559838ae3 100644
--- a/include/media/v4l2-mediabus.h
+++ b/include/media/v4l2-mediabus.h
@@ -28,10 +28,18 @@ enum v4l2_mbus_pixelcode {
        V4L2_MBUS_FMT_YVYU8_2X8,
        V4L2_MBUS_FMT_UYVY8_2X8,
        V4L2_MBUS_FMT_VYUY8_2X8,
+        V4L2_MBUS_FMT_YVYU10_2X10,
+        V4L2_MBUS_FMT_YUYV10_2X10,
+        V4L2_MBUS_FMT_YVYU10_1X20,
+        V4L2_MBUS_FMT_YUYV10_1X20,
+        V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE,
+        V4L2_MBUS_FMT_RGB444_2X8_PADHI_BE,
        V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE,
        V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE,
        V4L2_MBUS_FMT_RGB565_2X8_LE,
        V4L2_MBUS_FMT_RGB565_2X8_BE,
+        V4L2_MBUS_FMT_BGR565_2X8_LE,
+        V4L2_MBUS_FMT_BGR565_2X8_BE,
        V4L2_MBUS_FMT_SBGGR8_1X8,
        V4L2_MBUS_FMT_SBGGR10_1X10,
        V4L2_MBUS_FMT_GREY8_1X8,
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 4a97d7341a94..b0316a7cf08d 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -256,10 +256,6 @@ struct v4l2_subdev_video_ops {
        int (*querystd)(struct v4l2_subdev *sd, v4l2_std_id *std);
        int (*g_input_status)(struct v4l2_subdev *sd, u32 *status);
        int (*s_stream)(struct v4l2_subdev *sd, int enable);
-        int (*enum_fmt)(struct v4l2_subdev *sd, struct v4l2_fmtdesc *fmtdesc);
-        int (*g_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
-        int (*try_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
-        int (*s_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
        int (*cropcap)(struct v4l2_subdev *sd, struct v4l2_cropcap *cc);
        int (*g_crop)(struct v4l2_subdev *sd, struct v4l2_crop *crop);
        int (*s_crop)(struct v4l2_subdev *sd, struct v4l2_crop *crop);
@@ -442,17 +438,28 @@ struct v4l2_subdev {
        /* can be used to group similar subdevs, value is driver-specific */
        u32 grp_id;
        /* pointer to private data */
-        void *priv;
+        void *dev_priv;
+        void *host_priv;
 };
 static inline void v4l2_set_subdevdata(struct v4l2_subdev *sd, void *p)
 {
-        sd->priv = p;
+        sd->dev_priv = p;
 }
 static inline void *v4l2_get_subdevdata(const struct v4l2_subdev *sd)
 {
-        return sd->priv;
+        return sd->dev_priv;
+}
+static inline void v4l2_set_subdev_hostdata(struct v4l2_subdev *sd, void *p)
+{
+        sd->host_priv = p;
+}
+static inline void *v4l2_get_subdev_hostdata(const struct v4l2_subdev *sd)
+{
+        return sd->host_priv;
 }
 static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
@@ -466,7 +473,8 @@ static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
        sd->flags = 0;
        sd->name[0] = '\0';
        sd->grp_id = 0;
-        sd->priv = NULL;
+        sd->dev_priv = NULL;
+        sd->host_priv = NULL;
 }
 /* Call an ops of a v4l2_subdev, doing the right checks against
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h
index f2c41cebf453..1d3835fc26be 100644
--- a/include/media/videobuf-core.h
+++ b/include/media/videobuf-core.h
@@ -139,6 +139,7 @@ struct videobuf_qtype_ops {
 struct videobuf_queue {
        struct mutex               vb_lock;
+        struct mutex               *ext_lock;
        spinlock_t                 *irqlock;
        struct device              *dev;
@@ -167,7 +168,20 @@ struct videobuf_queue {
        void                       *priv_data;
 };
-int videobuf_waiton(struct videobuf_buffer *vb, int non_blocking, int intr);
+static inline void videobuf_queue_lock(struct videobuf_queue *q)
+{
+        if (!q->ext_lock)
+                mutex_lock(&q->vb_lock);
+}
+static inline void videobuf_queue_unlock(struct videobuf_queue *q)
+{
+        if (!q->ext_lock)
+                mutex_unlock(&q->vb_lock);
+}
+int videobuf_waiton(struct videobuf_queue *q, struct videobuf_buffer *vb,
+                int non_blocking, int intr);
 int videobuf_iolock(struct videobuf_queue *q, struct videobuf_buffer *vb,
                struct v4l2_framebuffer *fbuf);
@@ -185,7 +199,8 @@ void videobuf_queue_core_init(struct videobuf_queue *q,
                         enum v4l2_field field,
                         unsigned int msize,
                         void *priv,
-                         struct videobuf_qtype_ops *int_ops);
+                         struct videobuf_qtype_ops *int_ops,
+                         struct mutex *ext_lock);
 int  videobuf_queue_is_busy(struct videobuf_queue *q);
 void videobuf_queue_cancel(struct videobuf_queue *q);
diff --git a/include/media/videobuf-dma-contig.h b/include/media/videobuf-dma-contig.h
index ebaa9bc1ee8d..f0ed82543d9f 100644
--- a/include/media/videobuf-dma-contig.h
+++ b/include/media/videobuf-dma-contig.h
@@ -23,7 +23,8 @@ void videobuf_queue_dma_contig_init(struct videobuf_queue *q,
                                    enum v4l2_buf_type type,
                                    enum v4l2_field field,
                                    unsigned int msize,
-                                    void *priv);
+                                    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,
diff --git a/include/media/videobuf-dma-sg.h b/include/media/videobuf-dma-sg.h
index aa4ebb42a565..1c647e8148c4 100644
--- a/include/media/videobuf-dma-sg.h
+++ b/include/media/videobuf-dma-sg.h
@@ -103,7 +103,8 @@ void videobuf_queue_sg_init(struct videobuf_queue *q,
                         enum v4l2_buf_type type,
                         enum v4l2_field field,
                         unsigned int msize,
-                         void *priv);
+                         void *priv,
+                         struct mutex *ext_lock);
 #endif /* _VIDEOBUF_DMA_SG_H */
diff --git a/include/media/videobuf-vmalloc.h b/include/media/videobuf-vmalloc.h
index e19403c18dae..486a97efdb56 100644
--- a/include/media/videobuf-vmalloc.h
+++ b/include/media/videobuf-vmalloc.h
@@ -36,7 +36,8 @@ void videobuf_queue_vmalloc_init(struct videobuf_queue *q,
                         enum v4l2_buf_type type,
                         enum v4l2_field field,
                         unsigned int msize,
-                         void *priv);
+                         void *priv,
+                         struct mutex *ext_lock);
 void *videobuf_to_vmalloc(struct videobuf_buffer *buf);
diff --git a/include/media/wm8775.h b/include/media/wm8775.h
index 60739c5a23ae..a1c4d417dfa2 100644
--- a/include/media/wm8775.h
+++ b/include/media/wm8775.h
@@ -32,4 +32,7 @@
 #define WM8775_AIN3 4
 #define WM8775_AIN4 8
+/* subdev group ID */
+#define WM8775_GID (1 << 0)
 #endif
diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h
index 4debb4514634..2f7d45bcbd24 100644
--- a/include/mtd/mtd-abi.h
+++ b/include/mtd/mtd-abi.h
@@ -52,6 +52,7 @@ struct mtd_oob_buf64 {
 #define MTD_NANDFLASH           4
 #define MTD_DATAFLASH           6
 #define MTD_UBIVOLUME           7
+#define MTD_MLCNANDFLASH        8
 #define MTD_WRITEABLE           0x400   /* Device is writeable */
 #define MTD_BIT_WRITEABLE       0x800   /* Single bits can be flipped */
@@ -119,7 +120,7 @@ struct otp_info {
 #define OTPGETREGIONCOUNT       _IOW('M', 14, int)
 #define OTPGETREGIONINFO        _IOW('M', 15, struct otp_info)
 #define OTPLOCK                 _IOR('M', 16, struct otp_info)
-#define ECCGETLAYOUT            _IOR('M', 17, struct nand_ecclayout)
+#define ECCGETLAYOUT            _IOR('M', 17, struct nand_ecclayout_user)
 #define ECCGETSTATS             _IOR('M', 18, struct mtd_ecc_stats)
 #define MTDFILEMODE             _IO('M', 19)
 #define MEMERASE64              _IOW('M', 20, struct erase_info_user64)
@@ -144,13 +145,18 @@ struct nand_oobfree {
 };
 #define MTD_MAX_OOBFREE_ENTRIES 8
+#define MTD_MAX_ECCPOS_ENTRIES  64
 /*
- * ECC layout control structure. Exported to userspace for
+ * OBSOLETE: ECC layout control structure. Exported to user-space via ioctl
- * diagnosis and to allow creation of raw images
+ * ECCGETLAYOUT for backwards compatbility and should not be mistaken as a
+ * complete set of ECC information. The ioctl truncates the larger internal
+ * structure to retain binary compatibility with the static declaration of the
+ * ioctl. Note that the "MTD_MAX_..._ENTRIES" macros represent the max size of
+ * the user struct, not the MAX size of the internal struct nand_ecclayout.
 */
-struct nand_ecclayout {
+struct nand_ecclayout_user {
        __u32 eccbytes;
-        __u32 eccpos[64];
+        __u32 eccpos[MTD_MAX_ECCPOS_ENTRIES];
        __u32 oobavail;
        struct nand_oobfree oobfree[MTD_MAX_OOBFREE_ENTRIES];
 };
diff --git a/include/mtd/mtd-user.h b/include/mtd/mtd-user.h
index aa3c2f86a913..83327c808c86 100644
--- a/include/mtd/mtd-user.h
+++ b/include/mtd/mtd-user.h
@@ -29,6 +29,6 @@ typedef struct mtd_info_user mtd_info_t;
 typedef struct erase_info_user erase_info_t;
 typedef struct region_info_user region_info_t;
 typedef struct nand_oobinfo nand_oobinfo_t;
-typedef struct nand_ecclayout nand_ecclayout_t;
+typedef struct nand_ecclayout_user nand_ecclayout_t;
 #endif /* __MTD_USER_H__ */
diff --git a/include/net/9p/9p.h b/include/net/9p/9p.h
index a8de812ccbc8..071fd7a8d781 100644
--- a/include/net/9p/9p.h
+++ b/include/net/9p/9p.h
@@ -86,6 +86,8 @@ do { \
 /**
 * enum p9_msg_t - 9P message types
+ * @P9_TLERROR: not used
+ * @P9_RLERROR: response for any failed request for 9P2000.L
 * @P9_TSTATFS: file system status request
 * @P9_RSTATFS: file system status response
 * @P9_TSYMLINK: make symlink request
@@ -137,6 +139,8 @@ do { \
 */
 enum p9_msg_t {
+        P9_TLERROR = 6,
+        P9_RLERROR,
        P9_TSTATFS = 8,
        P9_RSTATFS,
        P9_TLOPEN = 12,
@@ -149,6 +153,8 @@ enum p9_msg_t {
        P9_RMKNOD,
        P9_TRENAME = 20,
        P9_RRENAME,
+        P9_TREADLINK = 22,
+        P9_RREADLINK,
        P9_TGETATTR = 24,
        P9_RGETATTR,
        P9_TSETATTR = 26,
@@ -159,6 +165,12 @@ enum p9_msg_t {
        P9_RXATTRCREATE,
        P9_TREADDIR = 40,
        P9_RREADDIR,
+        P9_TFSYNC = 50,
+        P9_RFSYNC,
+        P9_TLOCK = 52,
+        P9_RLOCK,
+        P9_TGETLOCK = 54,
+        P9_RGETLOCK,
        P9_TLINK = 70,
        P9_RLINK,
        P9_TMKDIR = 72,
@@ -458,6 +470,48 @@ struct p9_iattr_dotl {
        u64 mtime_nsec;
 };
+#define P9_LOCK_SUCCESS 0
+#define P9_LOCK_BLOCKED 1
+#define P9_LOCK_ERROR 2
+#define P9_LOCK_GRACE 3
+#define P9_LOCK_FLAGS_BLOCK 1
+#define P9_LOCK_FLAGS_RECLAIM 2
+/* struct p9_flock: POSIX lock structure
+ * @type - type of lock
+ * @flags - lock flags
+ * @start - starting offset of the lock
+ * @length - number of bytes
+ * @proc_id - process id which wants to take lock
+ * @client_id - client id
+ */
+struct p9_flock {
+        u8 type;
+        u32 flags;
+        u64 start;
+        u64 length;
+        u32 proc_id;
+        char *client_id;
+};
+/* struct p9_getlock: getlock structure
+ * @type - type of lock
+ * @start - starting offset of the lock
+ * @length - number of bytes
+ * @proc_id - process id which wants to take lock
+ * @client_id - client id
+ */
+struct p9_getlock {
+        u8 type;
+        u64 start;
+        u64 length;
+        u32 proc_id;
+        char *client_id;
+};
 /* Structures for Protocol Operations */
 struct p9_tstatfs {
        u32 fid;
diff --git a/include/net/9p/client.h b/include/net/9p/client.h
index 7f63d5ab7b44..83ba6a4d58a3 100644
--- a/include/net/9p/client.h
+++ b/include/net/9p/client.h
@@ -229,6 +229,7 @@ int p9_client_symlink(struct p9_fid *fid, char *name, char *symname, gid_t gid,
 int p9_client_create_dotl(struct p9_fid *ofid, char *name, u32 flags, u32 mode,
                gid_t gid, struct p9_qid *qid);
 int p9_client_clunk(struct p9_fid *fid);
+int p9_client_fsync(struct p9_fid *fid, int datasync);
 int p9_client_remove(struct p9_fid *fid);
 int p9_client_read(struct p9_fid *fid, char *data, char __user *udata,
                                                        u64 offset, u32 count);
@@ -248,6 +249,8 @@ int p9_client_mknod_dotl(struct p9_fid *oldfid, char *name, int mode,
                        dev_t rdev, gid_t gid, struct p9_qid *);
 int p9_client_mkdir_dotl(struct p9_fid *fid, char *name, int mode,
                                gid_t gid, struct p9_qid *);
+int p9_client_lock_dotl(struct p9_fid *fid, struct p9_flock *flock, u8 *status);
+int p9_client_getlock_dotl(struct p9_fid *fid, struct p9_getlock *fl);
 struct p9_req_t *p9_tag_lookup(struct p9_client *, u16);
 void p9_client_cb(struct p9_client *c, struct p9_req_t *req);
@@ -259,5 +262,6 @@ int p9_is_proto_dotu(struct p9_client *clnt);
 int p9_is_proto_dotl(struct p9_client *clnt);
 struct p9_fid *p9_client_xattrwalk(struct p9_fid *, const char *, u64 *);
 int p9_client_xattrcreate(struct p9_fid *, const char *, u64, int);
+int p9_client_readlink(struct p9_fid *fid, char **target);
 #endif /* NET_9P_CLIENT_H */
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index ba3666d31766..07bdb5e9e8ac 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -158,6 +158,8 @@ extern int fib_table_flush(struct fib_table *table);
 extern void fib_table_select_default(struct fib_table *table,
                                     const struct flowi *flp,
                                     struct fib_result *res);
+extern void fib_free_table(struct fib_table *tb);
 #ifndef CONFIG_IP_MULTIPLE_TABLES
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 6bcb00645de4..289010d3270b 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -21,7 +21,8 @@ TRACE_EVENT(ext4_free_inode,
        TP_ARGS(inode),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
                __field(        umode_t, mode                   )
                __field(        uid_t,  uid                     )
@@ -30,7 +31,8 @@ TRACE_EVENT(ext4_free_inode,
        ),
        TP_fast_assign(
-                __entry->dev    = inode->i_sb->s_dev;
+                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
+                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
                __entry->ino    = inode->i_ino;
                __entry->mode   = inode->i_mode;
                __entry->uid    = inode->i_uid;
@@ -38,9 +40,10 @@ TRACE_EVENT(ext4_free_inode,
                __entry->blocks = inode->i_blocks;
        ),
-        TP_printk("dev %s ino %lu mode 0%o uid %u gid %u blocks %llu",
+        TP_printk("dev %d,%d ino %lu mode 0%o uid %u gid %u blocks %llu",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->dev_major, __entry->dev_minor,
-                  __entry->mode, __entry->uid, __entry->gid,
+                  (unsigned long) __entry->ino, __entry->mode,
+                  __entry->uid, __entry->gid,
                  (unsigned long long) __entry->blocks)
 );
@@ -50,20 +53,22 @@ TRACE_EVENT(ext4_request_inode,
        TP_ARGS(dir, mode),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  dir                     )
                __field(        umode_t, mode                   )
        ),
        TP_fast_assign(
-                __entry->dev    = dir->i_sb->s_dev;
+                __entry->dev_major = MAJOR(dir->i_sb->s_dev);
+                __entry->dev_minor = MINOR(dir->i_sb->s_dev);
                __entry->dir    = dir->i_ino;
                __entry->mode   = mode;
        ),
-        TP_printk("dev %s dir %lu mode 0%o",
+        TP_printk("dev %d,%d dir %lu mode 0%o",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->dir,
+                  __entry->dev_major, __entry->dev_minor,
-                  __entry->mode)
+                  (unsigned long) __entry->dir, __entry->mode)
 );
 TRACE_EVENT(ext4_allocate_inode,
@@ -72,21 +77,24 @@ TRACE_EVENT(ext4_allocate_inode,
        TP_ARGS(inode, dir, mode),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
                __field(        ino_t,  dir                     )
                __field(        umode_t, mode                   )
        ),
        TP_fast_assign(
-                __entry->dev    = inode->i_sb->s_dev;
+                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
+                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
                __entry->ino    = inode->i_ino;
                __entry->dir    = dir->i_ino;
                __entry->mode   = mode;
        ),
-        TP_printk("dev %s ino %lu dir %lu mode 0%o",
+        TP_printk("dev %d,%d ino %lu dir %lu mode 0%o",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->dev_major, __entry->dev_minor,
+                  (unsigned long) __entry->ino,
                  (unsigned long) __entry->dir, __entry->mode)
 );
@@ -98,7 +106,8 @@ DECLARE_EVENT_CLASS(ext4__write_begin,
        TP_ARGS(inode, pos, len, flags),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
                __field(        loff_t, pos                     )
                __field(        unsigned int, len               )
@@ -106,15 +115,17 @@ DECLARE_EVENT_CLASS(ext4__write_begin,
        ),
        TP_fast_assign(
-                __entry->dev    = inode->i_sb->s_dev;
+                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
+                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
                __entry->ino    = inode->i_ino;
                __entry->pos    = pos;
                __entry->len    = len;
                __entry->flags  = flags;
        ),
-        TP_printk("dev %s ino %lu pos %llu len %u flags %u",
+        TP_printk("dev %d,%d ino %lu pos %llu len %u flags %u",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->dev_major, __entry->dev_minor,
+                  (unsigned long) __entry->ino,
                  __entry->pos, __entry->len, __entry->flags)
 );
@@ -141,7 +152,8 @@ DECLARE_EVENT_CLASS(ext4__write_end,
        TP_ARGS(inode, pos, len, copied),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
                __field(        loff_t, pos                     )
                __field(        unsigned int, len               )
@@ -149,16 +161,18 @@ DECLARE_EVENT_CLASS(ext4__write_end,
        ),
        TP_fast_assign(
-                __entry->dev    = inode->i_sb->s_dev;
+                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
+                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
                __entry->ino    = inode->i_ino;
                __entry->pos    = pos;
                __entry->len    = len;
                __entry->copied = copied;
        ),
-        TP_printk("dev %s ino %lu pos %llu len %u copied %u",
+        TP_printk("dev %d,%d ino %lu pos %llu len %u copied %u",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->dev_major, __entry->dev_minor,
-                  __entry->pos, __entry->len, __entry->copied)
+                  (unsigned long) __entry->ino, __entry->pos,
+                  __entry->len, __entry->copied)
 );
 DEFINE_EVENT(ext4__write_end, ext4_ordered_write_end,
@@ -199,21 +213,23 @@ TRACE_EVENT(ext4_writepage,
        TP_ARGS(inode, page),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
                __field(        pgoff_t, index                  )
        ),
        TP_fast_assign(
-                __entry->dev    = inode->i_sb->s_dev;
+                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
+                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
                __entry->ino    = inode->i_ino;
                __entry->index  = page->index;
        ),
-        TP_printk("dev %s ino %lu page_index %lu",
+        TP_printk("dev %d,%d ino %lu page_index %lu",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->dev_major, __entry->dev_minor,
-                  __entry->index)
+                  (unsigned long) __entry->ino, __entry->index)
 );
 TRACE_EVENT(ext4_da_writepages,
@@ -222,13 +238,13 @@ TRACE_EVENT(ext4_da_writepages,
        TP_ARGS(inode, wbc),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
                __field(        long,   nr_to_write             )
                __field(        long,   pages_skipped           )
                __field(        loff_t, range_start             )
                __field(        loff_t, range_end               )
-                __field(        char,   nonblocking             )
                __field(        char,   for_kupdate             )
                __field(        char,   for_reclaim             )
                __field(        char,   range_cyclic            )
@@ -236,7 +252,8 @@ TRACE_EVENT(ext4_da_writepages,
        ),
        TP_fast_assign(
-                __entry->dev            = inode->i_sb->s_dev;
+                __entry->dev_major      = MAJOR(inode->i_sb->s_dev);
+                __entry->dev_minor      = MINOR(inode->i_sb->s_dev);
                __entry->ino            = inode->i_ino;
                __entry->nr_to_write    = wbc->nr_to_write;
                __entry->pages_skipped  = wbc->pages_skipped;
@@ -248,11 +265,11 @@ TRACE_EVENT(ext4_da_writepages,
                __entry->writeback_index = inode->i_mapping->writeback_index;
        ),
-        TP_printk("dev %s ino %lu nr_to_write %ld pages_skipped %ld "
+        TP_printk("dev %d,%d ino %lu nr_to_write %ld pages_skipped %ld "
                  "range_start %llu range_end %llu "
                  "for_kupdate %d for_reclaim %d "
                  "range_cyclic %d writeback_index %lu",
-                  jbd2_dev_to_name(__entry->dev),
+                  __entry->dev_major, __entry->dev_minor,
                  (unsigned long) __entry->ino, __entry->nr_to_write,
                  __entry->pages_skipped, __entry->range_start,
                  __entry->range_end,
@@ -267,7 +284,8 @@ TRACE_EVENT(ext4_da_write_pages,
        TP_ARGS(inode, mpd),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
                __field(        __u64,  b_blocknr               )
                __field(        __u32,  b_size                  )
@@ -278,7 +296,8 @@ TRACE_EVENT(ext4_da_write_pages,
        ),
        TP_fast_assign(
-                __entry->dev            = inode->i_sb->s_dev;
+                __entry->dev_major      = MAJOR(inode->i_sb->s_dev);
+                __entry->dev_minor      = MINOR(inode->i_sb->s_dev);
                __entry->ino            = inode->i_ino;
                __entry->b_blocknr      = mpd->b_blocknr;
                __entry->b_size         = mpd->b_size;
@@ -288,8 +307,9 @@ TRACE_EVENT(ext4_da_write_pages,
                __entry->pages_written  = mpd->pages_written;
        ),
-        TP_printk("dev %s ino %lu b_blocknr %llu b_size %u b_state 0x%04x first_page %lu io_done %d pages_written %d",
+        TP_printk("dev %d,%d ino %lu b_blocknr %llu b_size %u b_state 0x%04x first_page %lu io_done %d pages_written %d",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->dev_major, __entry->dev_minor,
+                  (unsigned long) __entry->ino,
                  __entry->b_blocknr, __entry->b_size,
                  __entry->b_state, __entry->first_page,
                  __entry->io_done, __entry->pages_written)
@@ -302,7 +322,8 @@ TRACE_EVENT(ext4_da_writepages_result,
        TP_ARGS(inode, wbc, ret, pages_written),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
                __field(        int,    ret                     )
                __field(        int,    pages_written           )
@@ -312,7 +333,8 @@ TRACE_EVENT(ext4_da_writepages_result,
        ),
        TP_fast_assign(
-                __entry->dev            = inode->i_sb->s_dev;
+                __entry->dev_major      = MAJOR(inode->i_sb->s_dev);
+                __entry->dev_minor      = MINOR(inode->i_sb->s_dev);
                __entry->ino            = inode->i_ino;
                __entry->ret            = ret;
                __entry->pages_written  = pages_written;
@@ -321,8 +343,8 @@ TRACE_EVENT(ext4_da_writepages_result,
                __entry->writeback_index = inode->i_mapping->writeback_index;
        ),
-        TP_printk("dev %s ino %lu ret %d pages_written %d pages_skipped %ld more_io %d writeback_index %lu",
+        TP_printk("dev %d,%d ino %lu ret %d pages_written %d pages_skipped %ld more_io %d writeback_index %lu",
-                  jbd2_dev_to_name(__entry->dev),
+                  __entry->dev_major, __entry->dev_minor,
                  (unsigned long) __entry->ino, __entry->ret,
                  __entry->pages_written, __entry->pages_skipped,
                  __entry->more_io,
@@ -336,20 +358,23 @@ TRACE_EVENT(ext4_discard_blocks,
        TP_ARGS(sb, blk, count),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        __u64,  blk                     )
                __field(        __u64,  count                   )
        ),
        TP_fast_assign(
-                __entry->dev    = sb->s_dev;
+                __entry->dev_major = MAJOR(sb->s_dev);
+                __entry->dev_minor = MINOR(sb->s_dev);
                __entry->blk    = blk;
                __entry->count  = count;
        ),
-        TP_printk("dev %s blk %llu count %llu",
+        TP_printk("dev %d,%d blk %llu count %llu",
-                  jbd2_dev_to_name(__entry->dev), __entry->blk, __entry->count)
+                  __entry->dev_major, __entry->dev_minor,
+                  __entry->blk, __entry->count)
 );
 DECLARE_EVENT_CLASS(ext4__mb_new_pa,
@@ -359,7 +384,8 @@ DECLARE_EVENT_CLASS(ext4__mb_new_pa,
        TP_ARGS(ac, pa),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
                __field(        __u64,  pa_pstart               )
                __field(        __u32,  pa_len                  )
@@ -368,16 +394,18 @@ DECLARE_EVENT_CLASS(ext4__mb_new_pa,
        ),
        TP_fast_assign(
-                __entry->dev            = ac->ac_sb->s_dev;
+                __entry->dev_major      = MAJOR(ac->ac_sb->s_dev);
+                __entry->dev_minor      = MINOR(ac->ac_sb->s_dev);
                __entry->ino            = ac->ac_inode->i_ino;
                __entry->pa_pstart      = pa->pa_pstart;
                __entry->pa_len         = pa->pa_len;
                __entry->pa_lstart      = pa->pa_lstart;
        ),
-        TP_printk("dev %s ino %lu pstart %llu len %u lstart %llu",
+        TP_printk("dev %d,%d ino %lu pstart %llu len %u lstart %llu",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->dev_major, __entry->dev_minor,
-                  __entry->pa_pstart, __entry->pa_len, __entry->pa_lstart)
+                  (unsigned long) __entry->ino, __entry->pa_pstart,
+                  __entry->pa_len, __entry->pa_lstart)
 );
 DEFINE_EVENT(ext4__mb_new_pa, ext4_mb_new_inode_pa,
@@ -398,14 +426,15 @@ DEFINE_EVENT(ext4__mb_new_pa, ext4_mb_new_group_pa,
 TRACE_EVENT(ext4_mb_release_inode_pa,
        TP_PROTO(struct super_block *sb,
-                 struct ext4_allocation_context *ac,
+                 struct inode *inode,
                 struct ext4_prealloc_space *pa,
                 unsigned long long block, unsigned int count),
-        TP_ARGS(sb, ac, pa, block, count),
+        TP_ARGS(sb, inode, pa, block, count),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
                __field(        __u64,  block                   )
                __field(        __u32,  count                   )
@@ -413,43 +442,42 @@ TRACE_EVENT(ext4_mb_release_inode_pa,
        ),
        TP_fast_assign(
-                __entry->dev            = sb->s_dev;
+                __entry->dev_major      = MAJOR(sb->s_dev);
-                __entry->ino            = (ac && ac->ac_inode) ? 
+                __entry->dev_minor      = MINOR(sb->s_dev);
-                                                ac->ac_inode->i_ino : 0;
+                __entry->ino            = inode->i_ino;
                __entry->block          = block;
                __entry->count          = count;
        ),
-        TP_printk("dev %s ino %lu block %llu count %u",
+        TP_printk("dev %d,%d ino %lu block %llu count %u",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->dev_major, __entry->dev_minor,
-                  __entry->block, __entry->count)
+                  (unsigned long) __entry->ino, __entry->block, __entry->count)
 );
 TRACE_EVENT(ext4_mb_release_group_pa,
        TP_PROTO(struct super_block *sb,
-                 struct ext4_allocation_context *ac,
                 struct ext4_prealloc_space *pa),
-        TP_ARGS(sb, ac, pa),
+        TP_ARGS(sb, pa),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
-                __field(        ino_t,  ino                     )
+                __field(        int,   dev_minor                )
                __field(        __u64,  pa_pstart               )
                __field(        __u32,  pa_len                  )
        ),
        TP_fast_assign(
-                __entry->dev            = sb->s_dev;
+                __entry->dev_major      = MAJOR(sb->s_dev);
-                __entry->ino            = (ac && ac->ac_inode) ?
+                __entry->dev_minor      = MINOR(sb->s_dev);
-                                                ac->ac_inode->i_ino : 0;
                __entry->pa_pstart      = pa->pa_pstart;
                __entry->pa_len         = pa->pa_len;
        ),
-        TP_printk("dev %s pstart %llu len %u",
+        TP_printk("dev %d,%d pstart %llu len %u",
-                  jbd2_dev_to_name(__entry->dev), __entry->pa_pstart, __entry->pa_len)
+                  __entry->dev_major, __entry->dev_minor,
+                  __entry->pa_pstart, __entry->pa_len)
 );
 TRACE_EVENT(ext4_discard_preallocations,
@@ -458,18 +486,21 @@ TRACE_EVENT(ext4_discard_preallocations,
        TP_ARGS(inode),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
        ),
        TP_fast_assign(
-                __entry->dev    = inode->i_sb->s_dev;
+                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
+                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
                __entry->ino    = inode->i_ino;
        ),
-        TP_printk("dev %s ino %lu",
+        TP_printk("dev %d,%d ino %lu",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino)
+                  __entry->dev_major, __entry->dev_minor,
+                  (unsigned long) __entry->ino)
 );
 TRACE_EVENT(ext4_mb_discard_preallocations,
@@ -478,18 +509,20 @@ TRACE_EVENT(ext4_mb_discard_preallocations,
        TP_ARGS(sb, needed),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        int,    needed                  )
        ),
        TP_fast_assign(
-                __entry->dev    = sb->s_dev;
+                __entry->dev_major = MAJOR(sb->s_dev);
+                __entry->dev_minor = MINOR(sb->s_dev);
                __entry->needed = needed;
        ),
-        TP_printk("dev %s needed %d",
+        TP_printk("dev %d,%d needed %d",
-                  jbd2_dev_to_name(__entry->dev), __entry->needed)
+                  __entry->dev_major, __entry->dev_minor, __entry->needed)
 );
 TRACE_EVENT(ext4_request_blocks,
@@ -498,7 +531,8 @@ TRACE_EVENT(ext4_request_blocks,
        TP_ARGS(ar),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
                __field(        unsigned int, flags             )
                __field(        unsigned int, len               )
@@ -511,7 +545,8 @@ TRACE_EVENT(ext4_request_blocks,
        ),
        TP_fast_assign(
-                __entry->dev    = ar->inode->i_sb->s_dev;
+                __entry->dev_major = MAJOR(ar->inode->i_sb->s_dev);
+                __entry->dev_minor = MINOR(ar->inode->i_sb->s_dev);
                __entry->ino    = ar->inode->i_ino;
                __entry->flags  = ar->flags;
                __entry->len    = ar->len;
@@ -523,8 +558,9 @@ TRACE_EVENT(ext4_request_blocks,
                __entry->pright = ar->pright;
        ),
-        TP_printk("dev %s ino %lu flags %u len %u lblk %llu goal %llu lleft %llu lright %llu pleft %llu pright %llu ",
+        TP_printk("dev %d,%d ino %lu flags %u len %u lblk %llu goal %llu lleft %llu lright %llu pleft %llu pright %llu ",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->dev_major, __entry->dev_minor,
+                  (unsigned long) __entry->ino,
                  __entry->flags, __entry->len,
                  (unsigned long long) __entry->logical,
                  (unsigned long long) __entry->goal,
@@ -540,7 +576,8 @@ TRACE_EVENT(ext4_allocate_blocks,
        TP_ARGS(ar, block),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
                __field(        __u64,  block                   )
                __field(        unsigned int, flags             )
@@ -554,7 +591,8 @@ TRACE_EVENT(ext4_allocate_blocks,
        ),
        TP_fast_assign(
-                __entry->dev    = ar->inode->i_sb->s_dev;
+                __entry->dev_major = MAJOR(ar->inode->i_sb->s_dev);
+                __entry->dev_minor = MINOR(ar->inode->i_sb->s_dev);
                __entry->ino    = ar->inode->i_ino;
                __entry->block  = block;
                __entry->flags  = ar->flags;
@@ -567,9 +605,10 @@ TRACE_EVENT(ext4_allocate_blocks,
                __entry->pright = ar->pright;
        ),
-        TP_printk("dev %s ino %lu flags %u len %u block %llu lblk %llu goal %llu lleft %llu lright %llu pleft %llu pright %llu ",
+        TP_printk("dev %d,%d ino %lu flags %u len %u block %llu lblk %llu goal %llu lleft %llu lright %llu pleft %llu pright %llu ",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->dev_major, __entry->dev_minor,
-                  __entry->flags, __entry->len, __entry->block,
+                  (unsigned long) __entry->ino, __entry->flags,
+                  __entry->len, __entry->block,
                  (unsigned long long) __entry->logical,
                  (unsigned long long) __entry->goal,
                  (unsigned long long) __entry->lleft,
@@ -585,7 +624,8 @@ TRACE_EVENT(ext4_free_blocks,
        TP_ARGS(inode, block, count, flags),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
                __field(      umode_t, mode                     )
                __field(        __u64,  block                   )
@@ -594,7 +634,8 @@ TRACE_EVENT(ext4_free_blocks,
        ),
        TP_fast_assign(
-                __entry->dev            = inode->i_sb->s_dev;
+                __entry->dev_major      = MAJOR(inode->i_sb->s_dev);
+                __entry->dev_minor      = MINOR(inode->i_sb->s_dev);
                __entry->ino            = inode->i_ino;
                __entry->mode           = inode->i_mode;
                __entry->block          = block;
@@ -602,8 +643,9 @@ TRACE_EVENT(ext4_free_blocks,
                __entry->flags          = flags;
        ),
-        TP_printk("dev %s ino %lu mode 0%o block %llu count %lu flags %d",
+        TP_printk("dev %d,%d ino %lu mode 0%o block %llu count %lu flags %d",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->dev_major, __entry->dev_minor,
+                  (unsigned long) __entry->ino,
                  __entry->mode, __entry->block, __entry->count,
                  __entry->flags)
 );
@@ -614,7 +656,8 @@ TRACE_EVENT(ext4_sync_file,
        TP_ARGS(file, datasync),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
                __field(        ino_t,  parent                  )
                __field(        int,    datasync                )
@@ -623,14 +666,16 @@ TRACE_EVENT(ext4_sync_file,
        TP_fast_assign(
                struct dentry *dentry = file->f_path.dentry;
-                __entry->dev            = dentry->d_inode->i_sb->s_dev;
+                __entry->dev_major      = MAJOR(dentry->d_inode->i_sb->s_dev);
+                __entry->dev_minor      = MINOR(dentry->d_inode->i_sb->s_dev);
                __entry->ino            = dentry->d_inode->i_ino;
                __entry->datasync       = datasync;
                __entry->parent         = dentry->d_parent->d_inode->i_ino;
        ),
-        TP_printk("dev %s ino %ld parent %ld datasync %d ",
+        TP_printk("dev %d,%d ino %ld parent %ld datasync %d ",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->dev_major, __entry->dev_minor,
+                  (unsigned long) __entry->ino,
                  (unsigned long) __entry->parent, __entry->datasync)
 );
@@ -640,18 +685,20 @@ TRACE_EVENT(ext4_sync_fs,
        TP_ARGS(sb, wait),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        int,    wait                    )
        ),
        TP_fast_assign(
-                __entry->dev    = sb->s_dev;
+                __entry->dev_major = MAJOR(sb->s_dev);
+                __entry->dev_minor = MINOR(sb->s_dev);
                __entry->wait   = wait;
        ),
-        TP_printk("dev %s wait %d", jbd2_dev_to_name(__entry->dev),
+        TP_printk("dev %d,%d wait %d", __entry->dev_major,
-                  __entry->wait)
+                  __entry->dev_minor, __entry->wait)
 );
 TRACE_EVENT(ext4_alloc_da_blocks,
@@ -660,21 +707,24 @@ TRACE_EVENT(ext4_alloc_da_blocks,
        TP_ARGS(inode),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
                __field( unsigned int,  data_blocks     )
                __field( unsigned int,  meta_blocks     )
        ),
        TP_fast_assign(
-                __entry->dev    = inode->i_sb->s_dev;
+                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
+                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
                __entry->ino    = inode->i_ino;
                __entry->data_blocks = EXT4_I(inode)->i_reserved_data_blocks;
                __entry->meta_blocks = EXT4_I(inode)->i_reserved_meta_blocks;
        ),
-        TP_printk("dev %s ino %lu data_blocks %u meta_blocks %u",
+        TP_printk("dev %d,%d ino %lu data_blocks %u meta_blocks %u",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->dev_major, __entry->dev_minor,
+                  (unsigned long) __entry->ino,
                  __entry->data_blocks, __entry->meta_blocks)
 );
@@ -684,7 +734,8 @@ TRACE_EVENT(ext4_mballoc_alloc,
        TP_ARGS(ac),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
                __field(        __u16,  found                   )
                __field(        __u16,  groups                  )
@@ -707,7 +758,8 @@ TRACE_EVENT(ext4_mballoc_alloc,
        ),
        TP_fast_assign(
-                __entry->dev            = ac->ac_inode->i_sb->s_dev;
+                __entry->dev_major      = MAJOR(ac->ac_inode->i_sb->s_dev);
+                __entry->dev_minor      = MINOR(ac->ac_inode->i_sb->s_dev);
                __entry->ino            = ac->ac_inode->i_ino;
                __entry->found          = ac->ac_found;
                __entry->flags          = ac->ac_flags;
@@ -729,10 +781,11 @@ TRACE_EVENT(ext4_mballoc_alloc,
                __entry->result_len     = ac->ac_f_ex.fe_len;
        ),
-        TP_printk("dev %s inode %lu orig %u/%d/%u@%u goal %u/%d/%u@%u "
+        TP_printk("dev %d,%d inode %lu orig %u/%d/%u@%u goal %u/%d/%u@%u "
                  "result %u/%d/%u@%u blks %u grps %u cr %u flags 0x%04x "
                  "tail %u broken %u",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->dev_major, __entry->dev_minor,
+                  (unsigned long) __entry->ino,
                  __entry->orig_group, __entry->orig_start,
                  __entry->orig_len, __entry->orig_logical,
                  __entry->goal_group, __entry->goal_start,
@@ -750,7 +803,8 @@ TRACE_EVENT(ext4_mballoc_prealloc,
        TP_ARGS(ac),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
                __field(        __u32,  orig_logical            )
                __field(          int,  orig_start              )
@@ -763,7 +817,8 @@ TRACE_EVENT(ext4_mballoc_prealloc,
        ),
        TP_fast_assign(
-                __entry->dev            = ac->ac_inode->i_sb->s_dev;
+                __entry->dev_major      = MAJOR(ac->ac_inode->i_sb->s_dev);
+                __entry->dev_minor      = MINOR(ac->ac_inode->i_sb->s_dev);
                __entry->ino            = ac->ac_inode->i_ino;
                __entry->orig_logical   = ac->ac_o_ex.fe_logical;
                __entry->orig_start     = ac->ac_o_ex.fe_start;
@@ -775,8 +830,9 @@ TRACE_EVENT(ext4_mballoc_prealloc,
                __entry->result_len     = ac->ac_b_ex.fe_len;
        ),
-        TP_printk("dev %s inode %lu orig %u/%d/%u@%u result %u/%d/%u@%u",
+        TP_printk("dev %d,%d inode %lu orig %u/%d/%u@%u result %u/%d/%u@%u",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->dev_major, __entry->dev_minor,
+                  (unsigned long) __entry->ino,
                  __entry->orig_group, __entry->orig_start,
                  __entry->orig_len, __entry->orig_logical,
                  __entry->result_group, __entry->result_start,
@@ -784,46 +840,59 @@ TRACE_EVENT(ext4_mballoc_prealloc,
 );
 DECLARE_EVENT_CLASS(ext4__mballoc,
-        TP_PROTO(struct ext4_allocation_context *ac),
+        TP_PROTO(struct super_block *sb,
+                 struct inode *inode,
+                 ext4_group_t group,
+                 ext4_grpblk_t start,
+                 ext4_grpblk_t len),
-        TP_ARGS(ac),
+        TP_ARGS(sb, inode, group, start, len),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
-                __field(        __u32,  result_logical          )
                __field(          int,  result_start            )
                __field(        __u32,  result_group            )
                __field(          int,  result_len              )
        ),
        TP_fast_assign(
-                __entry->dev            = ac->ac_inode->i_sb->s_dev;
+                __entry->dev_major      = MAJOR(sb->s_dev);
-                __entry->ino            = ac->ac_inode->i_ino;
+                __entry->dev_minor      = MINOR(sb->s_dev);
-                __entry->result_logical = ac->ac_b_ex.fe_logical;
+                __entry->ino            = inode ? inode->i_ino : 0;
-                __entry->result_start   = ac->ac_b_ex.fe_start;
+                __entry->result_start   = start;
-                __entry->result_group   = ac->ac_b_ex.fe_group;
+                __entry->result_group   = group;
-                __entry->result_len     = ac->ac_b_ex.fe_len;
+                __entry->result_len     = len;
        ),
-        TP_printk("dev %s inode %lu extent %u/%d/%u@%u ",
+        TP_printk("dev %d,%d inode %lu extent %u/%d/%u ",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->dev_major, __entry->dev_minor,
+                  (unsigned long) __entry->ino,
                  __entry->result_group, __entry->result_start,
-                  __entry->result_len, __entry->result_logical)
+                  __entry->result_len)
 );
 DEFINE_EVENT(ext4__mballoc, ext4_mballoc_discard,
-        TP_PROTO(struct ext4_allocation_context *ac),
+        TP_PROTO(struct super_block *sb,
+                 struct inode *inode,
+                 ext4_group_t group,
+                 ext4_grpblk_t start,
+                 ext4_grpblk_t len),
-        TP_ARGS(ac)
+        TP_ARGS(sb, inode, group, start, len)
 );
 DEFINE_EVENT(ext4__mballoc, ext4_mballoc_free,
-        TP_PROTO(struct ext4_allocation_context *ac),
+        TP_PROTO(struct super_block *sb,
+                 struct inode *inode,
+                 ext4_group_t group,
+                 ext4_grpblk_t start,
+                 ext4_grpblk_t len),
-        TP_ARGS(ac)
+        TP_ARGS(sb, inode, group, start, len)
 );
 TRACE_EVENT(ext4_forget,
@@ -832,7 +901,8 @@ TRACE_EVENT(ext4_forget,
        TP_ARGS(inode, is_metadata, block),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
                __field(        umode_t, mode                   )
                __field(        int,    is_metadata             )
@@ -840,16 +910,18 @@ TRACE_EVENT(ext4_forget,
        ),
        TP_fast_assign(
-                __entry->dev    = inode->i_sb->s_dev;
+                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
+                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
                __entry->ino    = inode->i_ino;
                __entry->mode   = inode->i_mode;
                __entry->is_metadata = is_metadata;
                __entry->block  = block;
        ),
-        TP_printk("dev %s ino %lu mode 0%o is_metadata %d block %llu",
+        TP_printk("dev %d,%d ino %lu mode 0%o is_metadata %d block %llu",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->dev_major, __entry->dev_minor,
-                  __entry->mode, __entry->is_metadata, __entry->block)
+                  (unsigned long) __entry->ino, __entry->mode,
+                  __entry->is_metadata, __entry->block)
 );
 TRACE_EVENT(ext4_da_update_reserve_space,
@@ -858,7 +930,8 @@ TRACE_EVENT(ext4_da_update_reserve_space,
        TP_ARGS(inode, used_blocks),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
                __field(        umode_t, mode                   )
                __field(        __u64,  i_blocks                )
@@ -869,7 +942,8 @@ TRACE_EVENT(ext4_da_update_reserve_space,
        ),
        TP_fast_assign(
-                __entry->dev    = inode->i_sb->s_dev;
+                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
+                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
                __entry->ino    = inode->i_ino;
                __entry->mode   = inode->i_mode;
                __entry->i_blocks = inode->i_blocks;
@@ -879,9 +953,10 @@ TRACE_EVENT(ext4_da_update_reserve_space,
                __entry->allocated_meta_blocks = EXT4_I(inode)->i_allocated_meta_blocks;
        ),
-        TP_printk("dev %s ino %lu mode 0%o i_blocks %llu used_blocks %d reserved_data_blocks %d reserved_meta_blocks %d allocated_meta_blocks %d",
+        TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu used_blocks %d reserved_data_blocks %d reserved_meta_blocks %d allocated_meta_blocks %d",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->dev_major, __entry->dev_minor,
-                  __entry->mode,  (unsigned long long) __entry->i_blocks,
+                  (unsigned long) __entry->ino, __entry->mode,
+                  (unsigned long long) __entry->i_blocks,
                  __entry->used_blocks, __entry->reserved_data_blocks,
                  __entry->reserved_meta_blocks, __entry->allocated_meta_blocks)
 );
@@ -892,7 +967,8 @@ TRACE_EVENT(ext4_da_reserve_space,
        TP_ARGS(inode, md_needed),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
                __field(        umode_t, mode                   )
                __field(        __u64,  i_blocks                )
@@ -902,7 +978,8 @@ TRACE_EVENT(ext4_da_reserve_space,
        ),
        TP_fast_assign(
-                __entry->dev    = inode->i_sb->s_dev;
+                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
+                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
                __entry->ino    = inode->i_ino;
                __entry->mode   = inode->i_mode;
                __entry->i_blocks = inode->i_blocks;
@@ -911,8 +988,9 @@ TRACE_EVENT(ext4_da_reserve_space,
                __entry->reserved_meta_blocks = EXT4_I(inode)->i_reserved_meta_blocks;
        ),
-        TP_printk("dev %s ino %lu mode 0%o i_blocks %llu md_needed %d reserved_data_blocks %d reserved_meta_blocks %d",
+        TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu md_needed %d reserved_data_blocks %d reserved_meta_blocks %d",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->dev_major, __entry->dev_minor,
+                  (unsigned long) __entry->ino,
                  __entry->mode, (unsigned long long) __entry->i_blocks,
                  __entry->md_needed, __entry->reserved_data_blocks,
                  __entry->reserved_meta_blocks)
@@ -924,7 +1002,8 @@ TRACE_EVENT(ext4_da_release_space,
        TP_ARGS(inode, freed_blocks),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
                __field(        umode_t, mode                   )
                __field(        __u64,  i_blocks                )
@@ -935,7 +1014,8 @@ TRACE_EVENT(ext4_da_release_space,
        ),
        TP_fast_assign(
-                __entry->dev    = inode->i_sb->s_dev;
+                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
+                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
                __entry->ino    = inode->i_ino;
                __entry->mode   = inode->i_mode;
                __entry->i_blocks = inode->i_blocks;
@@ -945,8 +1025,9 @@ TRACE_EVENT(ext4_da_release_space,
                __entry->allocated_meta_blocks = EXT4_I(inode)->i_allocated_meta_blocks;
        ),
-        TP_printk("dev %s ino %lu mode 0%o i_blocks %llu freed_blocks %d reserved_data_blocks %d reserved_meta_blocks %d allocated_meta_blocks %d",
+        TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu freed_blocks %d reserved_data_blocks %d reserved_meta_blocks %d allocated_meta_blocks %d",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->dev_major, __entry->dev_minor,
+                  (unsigned long) __entry->ino,
                  __entry->mode, (unsigned long long) __entry->i_blocks,
                  __entry->freed_blocks, __entry->reserved_data_blocks,
                  __entry->reserved_meta_blocks, __entry->allocated_meta_blocks)
@@ -958,18 +1039,20 @@ DECLARE_EVENT_CLASS(ext4__bitmap_load,
        TP_ARGS(sb, group),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        __u32,  group                   )
        ),
        TP_fast_assign(
-                __entry->dev    = sb->s_dev;
+                __entry->dev_major = MAJOR(sb->s_dev);
+                __entry->dev_minor = MINOR(sb->s_dev);
                __entry->group  = group;
        ),
-        TP_printk("dev %s group %u",
+        TP_printk("dev %d,%d group %u",
-                  jbd2_dev_to_name(__entry->dev), __entry->group)
+                  __entry->dev_major, __entry->dev_minor, __entry->group)
 );
 DEFINE_EVENT(ext4__bitmap_load, ext4_mb_bitmap_load,
diff --git a/include/trace/events/jbd2.h b/include/trace/events/jbd2.h
index bf16545cc977..7447ea9305b5 100644
--- a/include/trace/events/jbd2.h
+++ b/include/trace/events/jbd2.h
@@ -17,17 +17,19 @@ TRACE_EVENT(jbd2_checkpoint,
        TP_ARGS(journal, result),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,    dev_major               )
+                __field(        int,    dev_minor               )
                __field(        int,    result                  )
        ),
        TP_fast_assign(
-                __entry->dev            = journal->j_fs_dev->bd_dev;
+                __entry->dev_major      = MAJOR(journal->j_fs_dev->bd_dev);
+                __entry->dev_minor      = MINOR(journal->j_fs_dev->bd_dev);
                __entry->result         = result;
        ),
-        TP_printk("dev %s result %d",
+        TP_printk("dev %d,%d result %d",
-                  jbd2_dev_to_name(__entry->dev), __entry->result)
+                  __entry->dev_major, __entry->dev_minor, __entry->result)
 );
 DECLARE_EVENT_CLASS(jbd2_commit,
@@ -37,20 +39,22 @@ DECLARE_EVENT_CLASS(jbd2_commit,
        TP_ARGS(journal, commit_transaction),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        char,   sync_commit               )
                __field(        int,    transaction               )
        ),
        TP_fast_assign(
-                __entry->dev            = journal->j_fs_dev->bd_dev;
+                __entry->dev_major      = MAJOR(journal->j_fs_dev->bd_dev);
+                __entry->dev_minor      = MINOR(journal->j_fs_dev->bd_dev);
                __entry->sync_commit = commit_transaction->t_synchronous_commit;
                __entry->transaction    = commit_transaction->t_tid;
        ),
-        TP_printk("dev %s transaction %d sync %d",
+        TP_printk("dev %d,%d transaction %d sync %d",
-                  jbd2_dev_to_name(__entry->dev), __entry->transaction,
+                  __entry->dev_major, __entry->dev_minor,
-                  __entry->sync_commit)
+                  __entry->transaction, __entry->sync_commit)
 );
 DEFINE_EVENT(jbd2_commit, jbd2_start_commit,
@@ -87,22 +91,24 @@ TRACE_EVENT(jbd2_end_commit,
        TP_ARGS(journal, commit_transaction),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        char,   sync_commit               )
                __field(        int,    transaction               )
                __field(        int,    head                      )
        ),
        TP_fast_assign(
-                __entry->dev            = journal->j_fs_dev->bd_dev;
+                __entry->dev_major      = MAJOR(journal->j_fs_dev->bd_dev);
+                __entry->dev_minor      = MINOR(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 %s transaction %d sync %d head %d",
+        TP_printk("dev %d,%d transaction %d sync %d head %d",
-                  jbd2_dev_to_name(__entry->dev), __entry->transaction,
+                  __entry->dev_major, __entry->dev_minor,
-                  __entry->sync_commit, __entry->head)
+                  __entry->transaction, __entry->sync_commit, __entry->head)
 );
 TRACE_EVENT(jbd2_submit_inode_data,
@@ -111,17 +117,20 @@ TRACE_EVENT(jbd2_submit_inode_data,
        TP_ARGS(inode),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        ino_t,  ino                     )
        ),
        TP_fast_assign(
-                __entry->dev    = inode->i_sb->s_dev;
+                __entry->dev_major = MAJOR(inode->i_sb->s_dev);
+                __entry->dev_minor = MINOR(inode->i_sb->s_dev);
                __entry->ino    = inode->i_ino;
        ),
-        TP_printk("dev %s ino %lu",
+        TP_printk("dev %d,%d ino %lu",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino)
+                  __entry->dev_major, __entry->dev_minor,
+                  (unsigned long) __entry->ino)
 );
 TRACE_EVENT(jbd2_run_stats,
@@ -131,7 +140,8 @@ TRACE_EVENT(jbd2_run_stats,
        TP_ARGS(dev, tid, stats),
        TP_STRUCT__entry(
-                __field(                dev_t,  dev             )
+                __field(                  int,  dev_major       )
+                __field(                  int,  dev_minor       )
                __field(        unsigned long,  tid             )
                __field(        unsigned long,  wait            )
                __field(        unsigned long,  running         )
@@ -144,7 +154,8 @@ TRACE_EVENT(jbd2_run_stats,
        ),
        TP_fast_assign(
-                __entry->dev            = dev;
+                __entry->dev_major      = MAJOR(dev);
+                __entry->dev_minor      = MINOR(dev);
                __entry->tid            = tid;
                __entry->wait           = stats->rs_wait;
                __entry->running        = stats->rs_running;
@@ -156,9 +167,9 @@ TRACE_EVENT(jbd2_run_stats,
                __entry->blocks_logged  = stats->rs_blocks_logged;
        ),
-        TP_printk("dev %s tid %lu wait %u running %u locked %u flushing %u "
+        TP_printk("dev %d,%d tid %lu wait %u running %u locked %u flushing %u "
                  "logging %u handle_count %u blocks %u blocks_logged %u",
-                  jbd2_dev_to_name(__entry->dev), __entry->tid,
+                  __entry->dev_major, __entry->dev_minor, __entry->tid,
                  jiffies_to_msecs(__entry->wait),
                  jiffies_to_msecs(__entry->running),
                  jiffies_to_msecs(__entry->locked),
@@ -175,7 +186,8 @@ TRACE_EVENT(jbd2_checkpoint_stats,
        TP_ARGS(dev, tid, stats),
        TP_STRUCT__entry(
-                __field(                dev_t,  dev             )
+                __field(                  int,  dev_major       )
+                __field(                  int,  dev_minor       )
                __field(        unsigned long,  tid             )
                __field(        unsigned long,  chp_time        )
                __field(                __u32,  forced_to_close )
@@ -184,7 +196,8 @@ TRACE_EVENT(jbd2_checkpoint_stats,
        ),
        TP_fast_assign(
-                __entry->dev            = dev;
+                __entry->dev_major      = MAJOR(dev);
+                __entry->dev_minor      = MINOR(dev);
                __entry->tid            = tid;
                __entry->chp_time       = stats->cs_chp_time;
                __entry->forced_to_close= stats->cs_forced_to_close;
@@ -192,9 +205,9 @@ TRACE_EVENT(jbd2_checkpoint_stats,
                __entry->dropped        = stats->cs_dropped;
        ),
-        TP_printk("dev %s tid %lu chp_time %u forced_to_close %u "
+        TP_printk("dev %d,%d tid %lu chp_time %u forced_to_close %u "
                  "written %u dropped %u",
-                  jbd2_dev_to_name(__entry->dev), __entry->tid,
+                  __entry->dev_major, __entry->dev_minor, __entry->tid,
                  jiffies_to_msecs(__entry->chp_time),
                  __entry->forced_to_close, __entry->written, __entry->dropped)
 );
@@ -207,7 +220,8 @@ TRACE_EVENT(jbd2_cleanup_journal_tail,
        TP_ARGS(journal, first_tid, block_nr, freed),
        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
+                __field(        int,   dev_major                )
+                __field(        int,   dev_minor                )
                __field(        tid_t,  tail_sequence           )
                __field(        tid_t,  first_tid               )
                __field(unsigned long,  block_nr                )
@@ -215,16 +229,18 @@ TRACE_EVENT(jbd2_cleanup_journal_tail,
        ),
        TP_fast_assign(
-                __entry->dev            = journal->j_fs_dev->bd_dev;
+                __entry->dev_major      = MAJOR(journal->j_fs_dev->bd_dev);
+                __entry->dev_minor      = MINOR(journal->j_fs_dev->bd_dev);
                __entry->tail_sequence  = journal->j_tail_sequence;
                __entry->first_tid      = first_tid;
                __entry->block_nr       = block_nr;
                __entry->freed          = freed;
        ),
-        TP_printk("dev %s from %u to %u offset %lu freed %lu",
+        TP_printk("dev %d,%d from %u to %u offset %lu freed %lu",
-                  jbd2_dev_to_name(__entry->dev), __entry->tail_sequence,
+                  __entry->dev_major, __entry->dev_minor,
-                  __entry->first_tid, __entry->block_nr, __entry->freed)
+                  __entry->tail_sequence, __entry->first_tid,
+                  __entry->block_nr, __entry->freed)
 );
 #endif /* _TRACE_JBD2_H */
diff --git a/include/video/sh_mobile_lcdc.h b/include/video/sh_mobile_lcdc.h
index 55d700e8566e..daabae5817c6 100644
--- a/include/video/sh_mobile_lcdc.h
+++ b/include/video/sh_mobile_lcdc.h
@@ -49,7 +49,9 @@ struct sh_mobile_lcdc_sys_bus_ops {
        unsigned long (*read_data)(void *handle);
 };
+struct module;
 struct sh_mobile_lcdc_board_cfg {
+        struct module *owner;
        void *board_data;
        int (*setup_sys)(void *board_data, void *sys_ops_handle,
                         struct sh_mobile_lcdc_sys_bus_ops *sys_ops);
@@ -70,7 +72,8 @@ struct sh_mobile_lcdc_chan_cfg {
        int interface_type; /* selects RGBn or SYSn I/F, see above */
        int clock_divider;
        unsigned long flags; /* LCDC_FLAGS_... */
-        struct fb_videomode lcd_cfg;
+        const struct fb_videomode *lcd_cfg;
+        int num_cfg;
        struct sh_mobile_lcdc_lcd_size_cfg lcd_size_cfg;
        struct sh_mobile_lcdc_board_cfg board_cfg;
        struct sh_mobile_lcdc_sys_bus_cfg sys_bus_cfg; /* only for SYSn I/F */
diff --git a/include/xen/events.h b/include/xen/events.h
index a15d93262e30..646dd17d3aa4 100644
--- a/include/xen/events.h
+++ b/include/xen/events.h
@@ -12,6 +12,7 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn,
                              irq_handler_t handler,
                              unsigned long irqflags, const char *devname,
                              void *dev_id);
+int bind_virq_to_irq(unsigned int virq, unsigned int cpu);
 int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu,
                            irq_handler_t handler,
                            unsigned long irqflags, const char *devname,
@@ -53,6 +54,10 @@ bool xen_test_irq_pending(int irq);
   irq will be disabled so it won't deliver an interrupt. */
 void xen_poll_irq(int irq);
+/* Poll waiting for an irq to become pending with a timeout.  In the usual case,
+ * the irq will be disabled so it won't deliver an interrupt. */
+void xen_poll_irq_timeout(int irq, u64 timeout);
 /* Determine the IRQ which is bound to an event channel */
 unsigned irq_from_evtchn(unsigned int evtchn);
@@ -63,4 +68,25 @@ int xen_set_callback_via(uint64_t via);
 void xen_evtchn_do_upcall(struct pt_regs *regs);
 void xen_hvm_evtchn_do_upcall(void);
+/* Allocate an irq for a physical interrupt, given a gsi.  "Legacy"
+ * GSIs are identity mapped; others are dynamically allocated as
+ * usual. */
+int xen_allocate_pirq(unsigned gsi, int shareable, char *name);
+int xen_map_pirq_gsi(unsigned pirq, unsigned gsi, int shareable, char *name);
+#ifdef CONFIG_PCI_MSI
+/* Allocate an irq and a pirq to be used with MSIs. */
+void xen_allocate_pirq_msi(char *name, int *irq, int *pirq);
+int xen_create_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, int type);
+#endif
+/* De-allocates the above mentioned physical interrupt. */
+int xen_destroy_irq(int irq);
+/* Return vector allocated to pirq */
+int xen_vector_from_irq(unsigned pirq);
+/* Return gsi allocated to pirq */
+int xen_gsi_from_irq(unsigned pirq);
 #endif  /* _XEN_EVENTS_H */
diff --git a/include/xen/interface/features.h b/include/xen/interface/features.h
index 70d2563ab166..b6ca39a069d8 100644
--- a/include/xen/interface/features.h
+++ b/include/xen/interface/features.h
@@ -47,6 +47,9 @@
 /* x86: pvclock algorithm is safe to use on HVM */
 #define XENFEAT_hvm_safe_pvclock           9
+/* x86: pirq can be used by HVM guests */
+#define XENFEAT_hvm_pirqs           10
 #define XENFEAT_NR_SUBMAPS 1
 #endif /* __XEN_PUBLIC_FEATURES_H__ */
diff --git a/include/xen/interface/io/pciif.h b/include/xen/interface/io/pciif.h
new file mode 100644
index 000000000000..d9922ae36eb5
--- /dev/null
+++ b/include/xen/interface/io/pciif.h
@@ -0,0 +1,112 @@
+/*
+ * PCI Backend/Frontend Common Data Structures & Macros
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (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.
+ *
+ *   Author: Ryan Wilson <hap9@epoch.ncsc.mil>
+ */
+#ifndef __XEN_PCI_COMMON_H__
+#define __XEN_PCI_COMMON_H__
+/* Be sure to bump this number if you change this file */
+#define XEN_PCI_MAGIC "7"
+/* xen_pci_sharedinfo flags */
+#define _XEN_PCIF_active                (0)
+#define XEN_PCIF_active                 (1<<_XEN_PCIF_active)
+#define _XEN_PCIB_AERHANDLER            (1)
+#define XEN_PCIB_AERHANDLER             (1<<_XEN_PCIB_AERHANDLER)
+#define _XEN_PCIB_active                (2)
+#define XEN_PCIB_active                 (1<<_XEN_PCIB_active)
+/* xen_pci_op commands */
+#define XEN_PCI_OP_conf_read            (0)
+#define XEN_PCI_OP_conf_write           (1)
+#define XEN_PCI_OP_enable_msi           (2)
+#define XEN_PCI_OP_disable_msi          (3)
+#define XEN_PCI_OP_enable_msix          (4)
+#define XEN_PCI_OP_disable_msix         (5)
+#define XEN_PCI_OP_aer_detected         (6)
+#define XEN_PCI_OP_aer_resume           (7)
+#define XEN_PCI_OP_aer_mmio             (8)
+#define XEN_PCI_OP_aer_slotreset        (9)
+/* xen_pci_op error numbers */
+#define XEN_PCI_ERR_success             (0)
+#define XEN_PCI_ERR_dev_not_found       (-1)
+#define XEN_PCI_ERR_invalid_offset      (-2)
+#define XEN_PCI_ERR_access_denied       (-3)
+#define XEN_PCI_ERR_not_implemented     (-4)
+/* XEN_PCI_ERR_op_failed - backend failed to complete the operation */
+#define XEN_PCI_ERR_op_failed           (-5)
+/*
+ * it should be PAGE_SIZE-sizeof(struct xen_pci_op))/sizeof(struct msix_entry))
+ * Should not exceed 128
+ */
+#define SH_INFO_MAX_VEC                 128
+struct xen_msix_entry {
+        uint16_t vector;
+        uint16_t entry;
+};
+struct xen_pci_op {
+        /* IN: what action to perform: XEN_PCI_OP_* */
+        uint32_t cmd;
+        /* OUT: will contain an error number (if any) from errno.h */
+        int32_t err;
+        /* IN: which device to touch */
+        uint32_t domain; /* PCI Domain/Segment */
+        uint32_t bus;
+        uint32_t devfn;
+        /* IN: which configuration registers to touch */
+        int32_t offset;
+        int32_t size;
+        /* IN/OUT: Contains the result after a READ or the value to WRITE */
+        uint32_t value;
+        /* IN: Contains extra infor for this operation */
+        uint32_t info;
+        /*IN:  param for msi-x */
+        struct xen_msix_entry msix_entries[SH_INFO_MAX_VEC];
+};
+/*used for pcie aer handling*/
+struct xen_pcie_aer_op {
+        /* IN: what action to perform: XEN_PCI_OP_* */
+        uint32_t cmd;
+        /*IN/OUT: return aer_op result or carry error_detected state as input*/
+        int32_t err;
+        /* IN: which device to touch */
+        uint32_t domain; /* PCI Domain/Segment*/
+        uint32_t bus;
+        uint32_t devfn;
+};
+struct xen_pci_sharedinfo {
+        /* flags - XEN_PCIF_* */
+        uint32_t flags;
+        struct xen_pci_op op;
+        struct xen_pcie_aer_op aer_op;
+};
+#endif /* __XEN_PCI_COMMON_H__ */
diff --git a/include/xen/interface/io/xenbus.h b/include/xen/interface/io/xenbus.h
index 46508c7fa399..9fda532973a5 100644
--- a/include/xen/interface/io/xenbus.h
+++ b/include/xen/interface/io/xenbus.h
@@ -27,8 +27,14 @@ enum xenbus_state
        XenbusStateClosing      = 5,  /* The device is being closed
                                         due to an error or an unplug
                                         event. */
-        XenbusStateClosed       = 6
+        XenbusStateClosed       = 6,
+        /*
+        * Reconfiguring: The device is being reconfigured.
+        */
+        XenbusStateReconfiguring = 7,
+        XenbusStateReconfigured  = 8
 };
 #endif /* _XEN_PUBLIC_IO_XENBUS_H */
diff --git a/include/xen/interface/physdev.h b/include/xen/interface/physdev.h
index cd6939147cb6..2b2c66c3df00 100644
--- a/include/xen/interface/physdev.h
+++ b/include/xen/interface/physdev.h
@@ -106,6 +106,57 @@ struct physdev_irq {
        uint32_t vector;
 };
+#define MAP_PIRQ_TYPE_MSI               0x0
+#define MAP_PIRQ_TYPE_GSI               0x1
+#define MAP_PIRQ_TYPE_UNKNOWN           0x2
+#define PHYSDEVOP_map_pirq              13
+struct physdev_map_pirq {
+    domid_t domid;
+    /* IN */
+    int type;
+    /* IN */
+    int index;
+    /* IN or OUT */
+    int pirq;
+    /* IN */
+    int bus;
+    /* IN */
+    int devfn;
+    /* IN */
+    int entry_nr;
+    /* IN */
+    uint64_t table_base;
+};
+#define PHYSDEVOP_unmap_pirq            14
+struct physdev_unmap_pirq {
+    domid_t domid;
+    /* IN */
+    int pirq;
+};
+#define PHYSDEVOP_manage_pci_add        15
+#define PHYSDEVOP_manage_pci_remove     16
+struct physdev_manage_pci {
+        /* IN */
+        uint8_t bus;
+        uint8_t devfn;
+};
+#define PHYSDEVOP_manage_pci_add_ext    20
+struct physdev_manage_pci_ext {
+        /* IN */
+        uint8_t bus;
+        uint8_t devfn;
+        unsigned is_extfn;
+        unsigned is_virtfn;
+        struct {
+                uint8_t bus;
+                uint8_t devfn;
+        } physfn;
+};
 /*
 * Argument to physdev_op_compat() hypercall. Superceded by new physdev_op()
 * hypercall since 0x00030202.
@@ -121,6 +172,22 @@ struct physdev_op {
        } u;
 };
+#define PHYSDEVOP_setup_gsi    21
+struct physdev_setup_gsi {
+    int gsi;
+    /* IN */
+    uint8_t triggering;
+    /* IN */
+    uint8_t polarity;
+    /* IN */
+};
+#define PHYSDEVOP_get_nr_pirqs    22
+struct physdev_nr_pirqs {
+    /* OUT */
+    uint32_t nr_pirqs;
+};
 /*
 * Notify that some PIRQ-bound event channels have been unmasked.
 * ** This command is obsolete since interface version 0x00030202 and is **