1482 files changed, 43307 insertions, 12033 deletions
diff --git a/drivers/acpi/acpica/evxface.c b/drivers/acpi/acpica/evxface.c
index e1141402dbed..f4f523bf5939 100644
--- a/drivers/acpi/acpica/evxface.c
+++ b/drivers/acpi/acpica/evxface.c
@@ -41,6 +41,7 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
+#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c
index c57b5c707a77..20516e599476 100644
--- a/drivers/acpi/acpica/evxfevnt.c
+++ b/drivers/acpi/acpica/evxfevnt.c
@@ -41,6 +41,7 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
+#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "actables.h"
diff --git a/drivers/acpi/acpica/evxfgpe.c b/drivers/acpi/acpica/evxfgpe.c
index 52aaff3df562..f06a3ee356ba 100644
--- a/drivers/acpi/acpica/evxfgpe.c
+++ b/drivers/acpi/acpica/evxfgpe.c
@@ -41,6 +41,7 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
+#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acevents.h"
diff --git a/drivers/acpi/acpica/evxfregn.c b/drivers/acpi/acpica/evxfregn.c
index 00cd95692a91..aee887e3ca5c 100644
--- a/drivers/acpi/acpica/evxfregn.c
+++ b/drivers/acpi/acpica/evxfregn.c
@@ -42,6 +42,7 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
+#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c
index 2ac28bbe8827..d52da3073650 100644
--- a/drivers/acpi/acpica/hwsleep.c
+++ b/drivers/acpi/acpica/hwsleep.c
@@ -46,6 +46,7 @@
 #include "accommon.h"
 #include "actables.h"
 #include <linux/tboot.h>
+#include <linux/module.h>
 #define _COMPONENT          ACPI_HARDWARE
 ACPI_MODULE_NAME("hwsleep")
diff --git a/drivers/acpi/acpica/hwtimer.c b/drivers/acpi/acpica/hwtimer.c
index 9c8eb71a12fb..50d21c40b5c1 100644
--- a/drivers/acpi/acpica/hwtimer.c
+++ b/drivers/acpi/acpica/hwtimer.c
@@ -42,6 +42,7 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
+#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
index f75f81ad15c9..c2793a82f120 100644
--- a/drivers/acpi/acpica/hwxface.c
+++ b/drivers/acpi/acpica/hwxface.c
@@ -42,6 +42,7 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
+#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c
index c53f0040e490..e7f016d1b226 100644
--- a/drivers/acpi/acpica/nsxfeval.c
+++ b/drivers/acpi/acpica/nsxfeval.c
@@ -42,6 +42,7 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
+#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/drivers/acpi/acpica/nsxfname.c b/drivers/acpi/acpica/nsxfname.c
index 3fd4526f3dba..83bf93024303 100644
--- a/drivers/acpi/acpica/nsxfname.c
+++ b/drivers/acpi/acpica/nsxfname.c
@@ -42,6 +42,7 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
+#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/drivers/acpi/acpica/nsxfobj.c b/drivers/acpi/acpica/nsxfobj.c
index db7660f8b869..57e6d825ed84 100644
--- a/drivers/acpi/acpica/nsxfobj.c
+++ b/drivers/acpi/acpica/nsxfobj.c
@@ -42,6 +42,7 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
+#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/drivers/acpi/acpica/rsxface.c b/drivers/acpi/acpica/rsxface.c
index 2ff657a28f26..fe86b37b16ce 100644
--- a/drivers/acpi/acpica/rsxface.c
+++ b/drivers/acpi/acpica/rsxface.c
@@ -41,6 +41,7 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
+#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acresrc.h"
diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
index 4b7085dfc683..e7d13f5d3f2d 100644
--- a/drivers/acpi/acpica/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
@@ -42,6 +42,7 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
+#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c
index a9bcd816dc29..a1f8d7509e66 100644
--- a/drivers/acpi/acpica/utdebug.c
+++ b/drivers/acpi/acpica/utdebug.c
@@ -41,6 +41,7 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
+#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
diff --git a/drivers/acpi/acpica/utdecode.c b/drivers/acpi/acpica/utdecode.c
index 97cb36f85ce9..8b087e2d64f4 100644
--- a/drivers/acpi/acpica/utdecode.c
+++ b/drivers/acpi/acpica/utdecode.c
@@ -41,6 +41,7 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
+#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c
index 833a38a9c905..ffba0a39c3e8 100644
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -43,6 +43,7 @@
 #define DEFINE_ACPI_GLOBALS
+#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
diff --git a/drivers/acpi/acpica/utxface.c b/drivers/acpi/acpica/utxface.c
index 98ad125e14ff..420ebfe08c72 100644
--- a/drivers/acpi/acpica/utxface.c
+++ b/drivers/acpi/acpica/utxface.c
@@ -41,6 +41,7 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
+#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acevents.h"
diff --git a/drivers/acpi/acpica/utxferror.c b/drivers/acpi/acpica/utxferror.c
index 916ae097c43c..8d0245ec4315 100644
--- a/drivers/acpi/acpica/utxferror.c
+++ b/drivers/acpi/acpica/utxferror.c
@@ -41,6 +41,7 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
+#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
diff --git a/drivers/acpi/atomicio.c b/drivers/acpi/atomicio.c
index 7489b89c300f..04ae1c88c03c 100644
--- a/drivers/acpi/atomicio.c
+++ b/drivers/acpi/atomicio.c
@@ -24,7 +24,7 @@
 */
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/acpi.h>
 #include <linux/io.h>
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index af308d03f492..cb9629638def 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -28,7 +28,6 @@
 */
 #include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/acpi.h>
 #include <acpi/acpi_bus.h>
diff --git a/drivers/acpi/debugfs.c b/drivers/acpi/debugfs.c
index 182a9fc36355..b55d6a20dc0e 100644
--- a/drivers/acpi/debugfs.c
+++ b/drivers/acpi/debugfs.c
@@ -2,6 +2,7 @@
 * debugfs.c - ACPI debugfs interface to userspace.
 */
+#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/debugfs.h>
 #include <acpi/acpi_drivers.h>
diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
index 22f918bacd35..6c47ae9793a7 100644
--- a/drivers/acpi/ec_sys.c
+++ b/drivers/acpi/ec_sys.c
@@ -11,6 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/acpi.h>
 #include <linux/debugfs.h>
+#include <linux/module.h>
 #include "internal.h"
 MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>");
diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c
index 85d908993809..1442737cedec 100644
--- a/drivers/acpi/event.c
+++ b/drivers/acpi/event.c
@@ -7,6 +7,7 @@
 */
 #include <linux/spinlock.h>
+#include <linux/export.h>
 #include <linux/proc_fs.h>
 #include <linux/init.h>
 #include <linux/poll.h>
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 7c47ed55e528..29a4a5c8ee00 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -6,6 +6,7 @@
 *
 * This file is released under the GPLv2.
 */
+#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/device.h>
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
index f5f986991b52..251c7b6273a9 100644
--- a/drivers/acpi/proc.c
+++ b/drivers/acpi/proc.c
@@ -1,5 +1,6 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/export.h>
 #include <linux/suspend.h>
 #include <linux/bcd.h>
 #include <asm/uaccess.h>
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 02d2a4c9084d..3a0428e8435c 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -7,6 +7,7 @@
 *      Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
 *      - Added _PDC for platforms with Intel CPUs
 */
+#include <linux/export.h>
 #include <linux/dmi.h>
 #include <linux/slab.h>
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index f8be23b6c129..f8d2a472795c 100644
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -13,6 +13,7 @@
 #include <linux/wait.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 #include <linux/interrupt.h>
 #include "sbshc.h"
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 0e46faef1d30..6d9a3ab58db2 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -398,6 +398,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
        },
        {
        .callback = init_nvs_nosave,
+        .ident = "Sony Vaio VPCEB17FX",
+        .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB17FX"),
+                },
+        },
+        {
+        .callback = init_nvs_nosave,
        .ident = "Sony Vaio VGN-SR11M",
        .matches = {
                DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index 5af3479714f6..f3f0fe7e255a 100644
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -33,6 +33,7 @@
 *
 */
+#include <linux/export.h>
 #include <linux/acpi.h>
 #include <linux/dmi.h>
 #include <linux/pci.h>
diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
index c03277d37748..004f2ce3dc73 100644
--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
@@ -202,11 +202,18 @@ static int __devexit ahci_remove(struct platform_device *pdev)
        return 0;
 }
+static const struct of_device_id ahci_of_match[] = {
+        { .compatible = "calxeda,hb-ahci", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, ahci_of_match);
 static struct platform_driver ahci_driver = {
        .remove = __devexit_p(ahci_remove),
        .driver = {
                .name = "ahci",
                .owner = THIS_MODULE,
+                .of_match_table = ahci_of_match,
        },
        .id_table       = ahci_devtype,
 };
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index c021186736e9..f22957c2769a 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -34,6 +34,7 @@
 #include <linux/kernel.h>
 #include <linux/blkdev.h>
+#include <linux/export.h>
 #include <linux/pci.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c
index 3eb2b816eb2a..104462dbc524 100644
--- a/drivers/ata/libata-pmp.c
+++ b/drivers/ata/libata-pmp.c
@@ -8,6 +8,7 @@
 */
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/libata.h>
 #include <linux/slab.h>
 #include "libata.h"
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 19ba77032ac2..72a9770ac42f 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -37,6 +37,7 @@
 #include <linux/kernel.h>
 #include <linux/blkdev.h>
 #include <linux/spinlock.h>
+#include <linux/export.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_cmnd.h>
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 239bfa67d032..63d53277d6a9 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -35,6 +35,7 @@
 #include <linux/kernel.h>
 #include <linux/gfp.h>
 #include <linux/pci.h>
+#include <linux/module.h>
 #include <linux/libata.h>
 #include <linux/highmem.h>
diff --git a/drivers/base/base.h b/drivers/base/base.h
index a34dca0ad041..21c1b96c34c6 100644
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -1,3 +1,4 @@
+#include <linux/notifier.h>
 /**
 * struct subsys_private - structure to hold the private to the driver core portions of the bus_type/class structure.
diff --git a/drivers/base/dma-coherent.c b/drivers/base/dma-coherent.c
index f369e2795985..bb0025c510b3 100644
--- a/drivers/base/dma-coherent.c
+++ b/drivers/base/dma-coherent.c
@@ -4,6 +4,7 @@
 */
 #include <linux/slab.h>
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/dma-mapping.h>
 struct dma_coherent_mem {
diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c
index 763d59c1eb65..6f3676f1559f 100644
--- a/drivers/base/dma-mapping.c
+++ b/drivers/base/dma-mapping.c
@@ -8,6 +8,7 @@
 */
 #include <linux/dma-mapping.h>
+#include <linux/export.h>
 #include <linux/gfp.h>
 /*
diff --git a/drivers/base/hypervisor.c b/drivers/base/hypervisor.c
index 6428cba3aadd..4f8b741f4615 100644
--- a/drivers/base/hypervisor.c
+++ b/drivers/base/hypervisor.c
@@ -10,6 +10,7 @@
 #include <linux/kobject.h>
 #include <linux/device.h>
+#include <linux/export.h>
 #include "base.h"
 struct kobject *hypervisor_kobj;
diff --git a/drivers/base/power/common.c b/drivers/base/power/common.c
index 29820c396182..4af7c1cbf909 100644
--- a/drivers/base/power/common.c
+++ b/drivers/base/power/common.c
@@ -8,7 +8,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/pm_clock.h>
diff --git a/drivers/base/power/generic_ops.c b/drivers/base/power/generic_ops.c
index 9508df71274b..265a0ee3b49e 100644
--- a/drivers/base/power/generic_ops.c
+++ b/drivers/base/power/generic_ops.c
@@ -8,6 +8,7 @@
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
+#include <linux/export.h>
 #ifdef CONFIG_PM_RUNTIME
 /**
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 59f8ab235486..7fa098464dae 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -19,6 +19,7 @@
 #include <linux/device.h>
 #include <linux/kallsyms.h>
+#include <linux/export.h>
 #include <linux/mutex.h>
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
index 91e061417382..30a94eadc200 100644
--- a/drivers/base/power/qos.c
+++ b/drivers/base/power/qos.c
@@ -39,6 +39,7 @@
 #include <linux/slab.h>
 #include <linux/device.h>
 #include <linux/mutex.h>
+#include <linux/export.h>
 static DEFINE_MUTEX(dev_pm_qos_mtx);
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 6bb3aafa85ed..8c78443bca8f 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -8,6 +8,7 @@
 */
 #include <linux/sched.h>
+#include <linux/export.h>
 #include <linux/pm_runtime.h>
 #include <trace/events/rpm.h>
 #include "power.h"
@@ -29,13 +30,10 @@ static int rpm_suspend(struct device *dev, int rpmflags);
 void update_pm_runtime_accounting(struct device *dev)
 {
        unsigned long now = jiffies;
-        int delta;
+        unsigned long delta;
        delta = now - dev->power.accounting_timestamp;
-        if (delta < 0)
-                delta = 0;
        dev->power.accounting_timestamp = now;
        if (dev->power.disable_depth > 0)
@@ -296,6 +294,9 @@ static int rpm_callback(int (*cb)(struct device *), struct device *dev)
 * the callback was running then carry it out, otherwise send an idle
 * notification for its parent (if the suspend succeeded and both
 * ignore_children of parent->power and irq_safe of dev->power are not set).
+ * If ->runtime_suspend failed with -EAGAIN or -EBUSY, and if the RPM_AUTO
+ * flag is set and the next autosuspend-delay expiration time is in the
+ * future, schedule another autosuspend attempt.
 *
 * This function must be called under dev->power.lock with interrupts disabled.
 */
@@ -416,10 +417,21 @@ static int rpm_suspend(struct device *dev, int rpmflags)
        if (retval) {
                __update_runtime_status(dev, RPM_ACTIVE);
                dev->power.deferred_resume = false;
-                if (retval == -EAGAIN || retval == -EBUSY)
+                if (retval == -EAGAIN || retval == -EBUSY) {
                        dev->power.runtime_error = 0;
-                else
+                        /*
+                         * If the callback routine failed an autosuspend, and
+                         * if the last_busy time has been updated so that there
+                         * is a new autosuspend expiration time, automatically
+                         * reschedule another autosuspend.
+                         */
+                        if ((rpmflags & RPM_AUTO) &&
+                            pm_runtime_autosuspend_expiration(dev) != 0)
+                                goto repeat;
+                } else {
                        pm_runtime_cancel_pending(dev);
+                }
                wake_up_all(&dev->power.wait_queue);
                goto out;
        }
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
index 17b7934f31cb..adf41be0ea66 100644
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
@@ -4,6 +4,7 @@
 #include <linux/device.h>
 #include <linux/string.h>
+#include <linux/export.h>
 #include <linux/pm_runtime.h>
 #include <linux/atomic.h>
 #include <linux/jiffies.h>
diff --git a/drivers/base/power/trace.c b/drivers/base/power/trace.c
index af10abecb99b..d94a1f5121cf 100644
--- a/drivers/base/power/trace.c
+++ b/drivers/base/power/trace.c
@@ -8,6 +8,7 @@
 */
 #include <linux/resume-trace.h>
+#include <linux/export.h>
 #include <linux/rtc.h>
 #include <asm/rtc.h>
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index 14ee07e9cc43..caf995fb774b 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -10,6 +10,7 @@
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/capability.h>
+#include <linux/export.h>
 #include <linux/suspend.h>
 #include <linux/seq_file.h>
 #include <linux/debugfs.h>
diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index afcfef838263..666f6f5011dc 100644
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -11,6 +11,7 @@
 */
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <trace/events/regmap.h>
 #include <linux/bsearch.h>
 #include <linux/sort.h>
diff --git a/drivers/base/transport_class.c b/drivers/base/transport_class.c
index 84997efdb23d..f6c453c3816e 100644
--- a/drivers/base/transport_class.c
+++ b/drivers/base/transport_class.c
@@ -27,6 +27,7 @@
 * transport class is framed entirely in terms of generic devices to
 * allow it to be used by any physical HBA in the system.
 */
+#include <linux/export.h>
 #include <linux/attribute_container.h>
 #include <linux/transport_class.h>
diff --git a/drivers/bcma/core.c b/drivers/bcma/core.c
index 189a97b51be9..893f6e0c759f 100644
--- a/drivers/bcma/core.c
+++ b/drivers/bcma/core.c
@@ -6,6 +6,7 @@
 */
 #include "bcma_private.h"
+#include <linux/export.h>
 #include <linux/bcma/bcma.h>
 bool bcma_core_is_enabled(struct bcma_device *core)
diff --git a/drivers/bcma/driver_chipcommon.c b/drivers/bcma/driver_chipcommon.c
index 47cce9d69630..e9f1b3fd252c 100644
--- a/drivers/bcma/driver_chipcommon.c
+++ b/drivers/bcma/driver_chipcommon.c
@@ -9,6 +9,7 @@
 */
 #include "bcma_private.h"
+#include <linux/export.h>
 #include <linux/bcma/bcma.h>
 static inline u32 bcma_cc_write32_masked(struct bcma_drv_cc *cc, u16 offset,
diff --git a/drivers/bcma/driver_chipcommon_pmu.c b/drivers/bcma/driver_chipcommon_pmu.c
index 2968d809d49f..800163c8c2e7 100644
--- a/drivers/bcma/driver_chipcommon_pmu.c
+++ b/drivers/bcma/driver_chipcommon_pmu.c
@@ -9,6 +9,7 @@
 */
 #include "bcma_private.h"
+#include <linux/export.h>
 #include <linux/bcma/bcma.h>
 static u32 bcma_chipco_pll_read(struct bcma_drv_cc *cc, u32 offset)
diff --git a/drivers/bcma/driver_pci.c b/drivers/bcma/driver_pci.c
index 81f3d0a4b856..4fde6254f04e 100644
--- a/drivers/bcma/driver_pci.c
+++ b/drivers/bcma/driver_pci.c
@@ -9,6 +9,7 @@
 */
 #include "bcma_private.h"
+#include <linux/export.h>
 #include <linux/bcma/bcma.h>
 /**************************************************
diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c
index ac4bc626c149..1b51d8b7ac80 100644
--- a/drivers/bcma/host_pci.c
+++ b/drivers/bcma/host_pci.c
@@ -9,6 +9,7 @@
 #include <linux/slab.h>
 #include <linux/bcma/bcma.h>
 #include <linux/pci.h>
+#include <linux/module.h>
 static void bcma_host_pci_switch_core(struct bcma_device *core)
 {
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 8c09c3e547cd..70c84b951098 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -6,6 +6,7 @@
 */
 #include "bcma_private.h"
+#include <linux/module.h>
 #include <linux/bcma/bcma.h>
 #include <linux/slab.h>
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index 528f6318ded1..321de7b6c442 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -15,6 +15,7 @@
 #include <linux/genhd.h>
 #include <linux/netdevice.h>
 #include <linux/mutex.h>
+#include <linux/export.h>
 #include "aoe.h"
 static DEFINE_MUTEX(aoeblk_mutex);
@@ -159,7 +160,7 @@ aoeblk_release(struct gendisk *disk, fmode_t mode)
        return 0;
 }
-static int
+static void
 aoeblk_make_request(struct request_queue *q, struct bio *bio)
 {
        struct sk_buff_head queue;
@@ -172,25 +173,25 @@ aoeblk_make_request(struct request_queue *q, struct bio *bio)
        if (bio == NULL) {
                printk(KERN_ERR "aoe: bio is NULL\n");
                BUG();
-                return 0;
+                return;
        }
        d = bio->bi_bdev->bd_disk->private_data;
        if (d == NULL) {
                printk(KERN_ERR "aoe: bd_disk->private_data is NULL\n");
                BUG();
                bio_endio(bio, -ENXIO);
-                return 0;
+                return;
        } else if (bio->bi_io_vec == NULL) {
                printk(KERN_ERR "aoe: bi_io_vec is NULL\n");
                BUG();
                bio_endio(bio, -ENXIO);
-                return 0;
+                return;
        }
        buf = mempool_alloc(d->bufpool, GFP_NOIO);
        if (buf == NULL) {
                printk(KERN_INFO "aoe: buf allocation failure\n");
                bio_endio(bio, -ENOMEM);
-                return 0;
+                return;
        }
        memset(buf, 0, sizeof(*buf));
        INIT_LIST_HEAD(&buf->bufs);
@@ -211,7 +212,7 @@ aoeblk_make_request(struct request_queue *q, struct bio *bio)
                spin_unlock_irqrestore(&d->lock, flags);
                mempool_free(buf, d->bufpool);
                bio_endio(bio, -ENXIO);
-                return 0;
+                return;
        }
        list_add_tail(&buf->bufs, &d->bufq);
@@ -222,8 +223,6 @@ aoeblk_make_request(struct request_queue *q, struct bio *bio)
        spin_unlock_irqrestore(&d->lock, flags);
        aoenet_xmit(&queue);
-        return 0;
 }
 static int
diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c
index 146296ca4965..5f8e39c43ae5 100644
--- a/drivers/block/aoe/aoechr.c
+++ b/drivers/block/aoe/aoechr.c
@@ -11,6 +11,7 @@
 #include <linux/slab.h>
 #include <linux/mutex.h>
 #include <linux/skbuff.h>
+#include <linux/export.h>
 #include "aoe.h"
 enum {
diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index dba1c32e1ddf..d22119d49e53 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -323,7 +323,7 @@ out:
        return err;
 }
-static int brd_make_request(struct request_queue *q, struct bio *bio)
+static void brd_make_request(struct request_queue *q, struct bio *bio)
 {
        struct block_device *bdev = bio->bi_bdev;
        struct brd_device *brd = bdev->bd_disk->private_data;
@@ -359,8 +359,6 @@ static int brd_make_request(struct request_queue *q, struct bio *bio)
 out:
        bio_endio(bio, err);
-        return 0;
 }
 #ifdef CONFIG_BLK_DEV_XIP
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 8f4ef656a1af..486f94ef24d4 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -68,6 +68,10 @@ static int cciss_tape_cmds = 6;
 module_param(cciss_tape_cmds, int, 0644);
 MODULE_PARM_DESC(cciss_tape_cmds,
        "number of commands to allocate for tape devices (default: 6)");
+static int cciss_simple_mode;
+module_param(cciss_simple_mode, int, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(cciss_simple_mode,
+        "Use 'simple mode' rather than 'performant mode'");
 static DEFINE_MUTEX(cciss_mutex);
 static struct proc_dir_entry *proc_cciss;
@@ -176,6 +180,7 @@ static void cciss_geometry_inquiry(ctlr_info_t *h, int logvol,
                        unsigned int block_size, InquiryData_struct *inq_buff,
                                   drive_info_struct *drv);
 static void __devinit cciss_interrupt_mode(ctlr_info_t *);
+static int __devinit cciss_enter_simple_mode(struct ctlr_info *h);
 static void start_io(ctlr_info_t *h);
 static int sendcmd_withirq(ctlr_info_t *h, __u8 cmd, void *buff, size_t size,
                        __u8 page_code, unsigned char scsi3addr[],
@@ -388,7 +393,7 @@ static void cciss_seq_show_header(struct seq_file *seq)
                h->product_name,
                (unsigned long)h->board_id,
                h->firm_ver[0], h->firm_ver[1], h->firm_ver[2],
-                h->firm_ver[3], (unsigned int)h->intr[PERF_MODE_INT],
+                h->firm_ver[3], (unsigned int)h->intr[h->intr_mode],
                h->num_luns,
                h->Qdepth, h->commands_outstanding,
                h->maxQsinceinit, h->max_outstanding, h->maxSG);
@@ -636,6 +641,18 @@ static ssize_t host_store_rescan(struct device *dev,
 }
 static DEVICE_ATTR(rescan, S_IWUSR, NULL, host_store_rescan);
+static ssize_t host_show_transport_mode(struct device *dev,
+                                 struct device_attribute *attr,
+                                 char *buf)
+{
+        struct ctlr_info *h = to_hba(dev);
+        return snprintf(buf, 20, "%s\n",
+                h->transMethod & CFGTBL_Trans_Performant ?
+                        "performant" : "simple");
+}
+static DEVICE_ATTR(transport_mode, S_IRUGO, host_show_transport_mode, NULL);
 static ssize_t dev_show_unique_id(struct device *dev,
                                 struct device_attribute *attr,
                                 char *buf)
@@ -808,6 +825,7 @@ static DEVICE_ATTR(usage_count, S_IRUGO, cciss_show_usage_count, NULL);
 static struct attribute *cciss_host_attrs[] = {
        &dev_attr_rescan.attr,
        &dev_attr_resettable.attr,
+        &dev_attr_transport_mode.attr,
        NULL
 };
@@ -3984,6 +4002,9 @@ static void __devinit cciss_put_controller_into_performant_mode(ctlr_info_t *h)
 {
        __u32 trans_support;
+        if (cciss_simple_mode)
+                return;
        dev_dbg(&h->pdev->dev, "Trying to put board into Performant mode\n");
        /* Attempt to put controller into performant mode if supported */
        /* Does board support performant mode? */
@@ -4081,7 +4102,7 @@ static void __devinit cciss_interrupt_mode(ctlr_info_t *h)
 default_int_mode:
 #endif                          /* CONFIG_PCI_MSI */
        /* if we get here we're going to use the default interrupt mode */
-        h->intr[PERF_MODE_INT] = h->pdev->irq;
+        h->intr[h->intr_mode] = h->pdev->irq;
        return;
 }
@@ -4341,6 +4362,9 @@ static int __devinit cciss_pci_init(ctlr_info_t *h)
        }
        cciss_enable_scsi_prefetch(h);
        cciss_p600_dma_prefetch_quirk(h);
+        err = cciss_enter_simple_mode(h);
+        if (err)
+                goto err_out_free_res;
        cciss_put_controller_into_performant_mode(h);
        return 0;
@@ -4533,6 +4557,13 @@ static int cciss_controller_hard_reset(struct pci_dev *pdev,
                pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
                pmcsr |= PCI_D0;
                pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr);
+                /*
+                 * The P600 requires a small delay when changing states.
+                 * Otherwise we may think the board did not reset and we bail.
+                 * This for kdump only and is particular to the P600.
+                 */
+                msleep(500);
        }
        return 0;
 }
@@ -4843,20 +4874,20 @@ static int cciss_request_irq(ctlr_info_t *h,
        irqreturn_t (*intxhandler)(int, void *))
 {
        if (h->msix_vector || h->msi_vector) {
-                if (!request_irq(h->intr[PERF_MODE_INT], msixhandler,
+                if (!request_irq(h->intr[h->intr_mode], msixhandler,
                                IRQF_DISABLED, h->devname, h))
                        return 0;
                dev_err(&h->pdev->dev, "Unable to get msi irq %d"
-                        " for %s\n", h->intr[PERF_MODE_INT],
+                        " for %s\n", h->intr[h->intr_mode],
                        h->devname);
                return -1;
        }
-        if (!request_irq(h->intr[PERF_MODE_INT], intxhandler,
+        if (!request_irq(h->intr[h->intr_mode], intxhandler,
                        IRQF_DISABLED, h->devname, h))
                return 0;
        dev_err(&h->pdev->dev, "Unable to get irq %d for %s\n",
-                h->intr[PERF_MODE_INT], h->devname);
+                h->intr[h->intr_mode], h->devname);
        return -1;
 }
@@ -4887,7 +4918,7 @@ static void cciss_undo_allocations_after_kdump_soft_reset(ctlr_info_t *h)
 {
        int ctlr = h->ctlr;
-        free_irq(h->intr[PERF_MODE_INT], h);
+        free_irq(h->intr[h->intr_mode], h);
 #ifdef CONFIG_PCI_MSI
        if (h->msix_vector)
                pci_disable_msix(h->pdev);
@@ -4953,6 +4984,7 @@ reinit_after_soft_reset:
        h = hba[i];
        h->pdev = pdev;
        h->busy_initializing = 1;
+        h->intr_mode = cciss_simple_mode ? SIMPLE_MODE_INT : PERF_MODE_INT;
        INIT_LIST_HEAD(&h->cmpQ);
        INIT_LIST_HEAD(&h->reqQ);
        mutex_init(&h->busy_shutting_down);
@@ -5009,7 +5041,7 @@ reinit_after_soft_reset:
        dev_info(&h->pdev->dev, "%s: <0x%x> at PCI %s IRQ %d%s using DAC\n",
               h->devname, pdev->device, pci_name(pdev),
-               h->intr[PERF_MODE_INT], dac ? "" : " not");
+               h->intr[h->intr_mode], dac ? "" : " not");
        if (cciss_allocate_cmd_pool(h))
                goto clean4;
@@ -5056,7 +5088,7 @@ reinit_after_soft_reset:
                spin_lock_irqsave(&h->lock, flags);
                h->access.set_intr_mask(h, CCISS_INTR_OFF);
                spin_unlock_irqrestore(&h->lock, flags);
-                free_irq(h->intr[PERF_MODE_INT], h);
+                free_irq(h->intr[h->intr_mode], h);
                rc = cciss_request_irq(h, cciss_msix_discard_completions,
                                        cciss_intx_discard_completions);
                if (rc) {
@@ -5133,7 +5165,7 @@ clean4:
        cciss_free_cmd_pool(h);
        cciss_free_scatterlists(h);
        cciss_free_sg_chain_blocks(h->cmd_sg_list, h->nr_cmds);
-        free_irq(h->intr[PERF_MODE_INT], h);
+        free_irq(h->intr[h->intr_mode], h);
 clean2:
        unregister_blkdev(h->major, h->devname);
 clean1:
@@ -5172,9 +5204,31 @@ static void cciss_shutdown(struct pci_dev *pdev)
        if (return_code != IO_OK)
                dev_warn(&h->pdev->dev, "Error flushing cache\n");
        h->access.set_intr_mask(h, CCISS_INTR_OFF);
-        free_irq(h->intr[PERF_MODE_INT], h);
+        free_irq(h->intr[h->intr_mode], h);
+}
+static int __devinit cciss_enter_simple_mode(struct ctlr_info *h)
+{
+        u32 trans_support;
+        trans_support = readl(&(h->cfgtable->TransportSupport));
+        if (!(trans_support & SIMPLE_MODE))
+                return -ENOTSUPP;
+        h->max_commands = readl(&(h->cfgtable->CmdsOutMax));
+        writel(CFGTBL_Trans_Simple, &(h->cfgtable->HostWrite.TransportRequest));
+        writel(CFGTBL_ChangeReq, h->vaddr + SA5_DOORBELL);
+        cciss_wait_for_mode_change_ack(h);
+        print_cfg_table(h);
+        if (!(readl(&(h->cfgtable->TransportActive)) & CFGTBL_Trans_Simple)) {
+                dev_warn(&h->pdev->dev, "unable to get board into simple mode\n");
+                return -ENODEV;
+        }
+        h->transMethod = CFGTBL_Trans_Simple;
+        return 0;
 }
 static void __devexit cciss_remove_one(struct pci_dev *pdev)
 {
        ctlr_info_t *h;
diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
index c049548e68b7..7fda30e4a241 100644
--- a/drivers/block/cciss.h
+++ b/drivers/block/cciss.h
@@ -92,6 +92,7 @@ struct ctlr_info
        unsigned int intr[4];
        unsigned int msix_vector;
        unsigned int msi_vector;
+        int     intr_mode;
        int     cciss_max_sectors;
        BYTE    cciss_read;
        BYTE    cciss_write;
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index b2fceb53e809..9125bbeacd4d 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -620,6 +620,7 @@ static int cpqarray_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
        }
        vendor_id = pdev->vendor;
        device_id = pdev->device;
+        revision  = pdev->revision;
        irq = pdev->irq;
        for(i=0; i<6; i++)
@@ -632,7 +633,6 @@ static int cpqarray_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
        }
        pci_read_config_word(pdev, PCI_COMMAND, &command);
-        pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
        pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &cache_line_size);
        pci_read_config_byte(pdev, PCI_LATENCY_TIMER, &latency_timer);
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 1706d60b8c99..9cf20355ceec 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -1506,7 +1506,7 @@ extern void drbd_free_mdev(struct drbd_conf *mdev);
 extern int proc_details;
 /* drbd_req */
-extern int drbd_make_request(struct request_queue *q, struct bio *bio);
+extern void drbd_make_request(struct request_queue *q, struct bio *bio);
 extern int drbd_read_remote(struct drbd_conf *mdev, struct drbd_request *req);
 extern int drbd_merge_bvec(struct request_queue *q, struct bvec_merge_data *bvm, struct bio_vec *bvec);
 extern int is_valid_ar_handle(struct drbd_request *, sector_t);
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index 3424d675b769..4a0f314086e5 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -1073,7 +1073,7 @@ static int drbd_fail_request_early(struct drbd_conf *mdev, int is_write)
        return 0;
 }
-int drbd_make_request(struct request_queue *q, struct bio *bio)
+void drbd_make_request(struct request_queue *q, struct bio *bio)
 {
        unsigned int s_enr, e_enr;
        struct drbd_conf *mdev = (struct drbd_conf *) q->queuedata;
@@ -1081,7 +1081,7 @@ int drbd_make_request(struct request_queue *q, struct bio *bio)
        if (drbd_fail_request_early(mdev, bio_data_dir(bio) & WRITE)) {
                bio_endio(bio, -EPERM);
-                return 0;
+                return;
        }
        start_time = jiffies;
@@ -1100,7 +1100,8 @@ int drbd_make_request(struct request_queue *q, struct bio *bio)
        if (likely(s_enr == e_enr)) {
                inc_ap_bio(mdev, 1);
-                return drbd_make_request_common(mdev, bio, start_time);
+                drbd_make_request_common(mdev, bio, start_time);
+                return;
        }
        /* can this bio be split generically?
@@ -1148,7 +1149,6 @@ int drbd_make_request(struct request_queue *q, struct bio *bio)
                bio_pair_release(bp);
        }
-        return 0;
 }
 /* This is called by bio_add_page().  With this function we reduce
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 4720c7ade0ae..3d806820280e 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -76,6 +76,8 @@
 #include <linux/splice.h>
 #include <linux/sysfs.h>
 #include <linux/miscdevice.h>
+#include <linux/falloc.h>
 #include <asm/uaccess.h>
 static DEFINE_IDR(loop_index_idr);
@@ -203,74 +205,6 @@ lo_do_transfer(struct loop_device *lo, int cmd,
 }
 /**
- * do_lo_send_aops - helper for writing data to a loop device
- *
- * This is the fast version for backing filesystems which implement the address
- * space operations write_begin and write_end.
- */
-static int do_lo_send_aops(struct loop_device *lo, struct bio_vec *bvec,
-                loff_t pos, struct page *unused)
-{
-        struct file *file = lo->lo_backing_file; /* kudos to NFsckingS */
-        struct address_space *mapping = file->f_mapping;
-        pgoff_t index;
-        unsigned offset, bv_offs;
-        int len, ret;
-        mutex_lock(&mapping->host->i_mutex);
-        index = pos >> PAGE_CACHE_SHIFT;
-        offset = pos & ((pgoff_t)PAGE_CACHE_SIZE - 1);
-        bv_offs = bvec->bv_offset;
-        len = bvec->bv_len;
-        while (len > 0) {
-                sector_t IV;
-                unsigned size, copied;
-                int transfer_result;
-                struct page *page;
-                void *fsdata;
-                IV = ((sector_t)index << (PAGE_CACHE_SHIFT - 9))+(offset >> 9);
-                size = PAGE_CACHE_SIZE - offset;
-                if (size > len)
-                        size = len;
-                ret = pagecache_write_begin(file, mapping, pos, size, 0,
-                                                        &page, &fsdata);
-                if (ret)
-                        goto fail;
-                file_update_time(file);
-                transfer_result = lo_do_transfer(lo, WRITE, page, offset,
-                                bvec->bv_page, bv_offs, size, IV);
-                copied = size;
-                if (unlikely(transfer_result))
-                        copied = 0;
-                ret = pagecache_write_end(file, mapping, pos, size, copied,
-                                                        page, fsdata);
-                if (ret < 0 || ret != copied)
-                        goto fail;
-                if (unlikely(transfer_result))
-                        goto fail;
-                bv_offs += copied;
-                len -= copied;
-                offset = 0;
-                index++;
-                pos += copied;
-        }
-        ret = 0;
-out:
-        mutex_unlock(&mapping->host->i_mutex);
-        return ret;
-fail:
-        ret = -1;
-        goto out;
-}
-/**
 * __do_lo_send_write - helper for writing data to a loop device
 *
 * This helper just factors out common code between do_lo_send_direct_write()
@@ -297,10 +231,8 @@ static int __do_lo_send_write(struct file *file,
 /**
 * do_lo_send_direct_write - helper for writing data to a loop device
 *
- * This is the fast, non-transforming version for backing filesystems which do
+ * This is the fast, non-transforming version that does not need double
- * not implement the address space operations write_begin and write_end.
+ * buffering.
- * It uses the write file operation which should be present on all writeable
- * filesystems.
 */
 static int do_lo_send_direct_write(struct loop_device *lo,
                struct bio_vec *bvec, loff_t pos, struct page *page)
@@ -316,15 +248,9 @@ static int do_lo_send_direct_write(struct loop_device *lo,
 /**
 * do_lo_send_write - helper for writing data to a loop device
 *
- * This is the slow, transforming version for filesystems which do not
+ * This is the slow, transforming version that needs to double buffer the
- * implement the address space operations write_begin and write_end.  It
+ * data as it cannot do the transformations in place without having direct
- * uses the write file operation which should be present on all writeable
+ * access to the destination pages of the backing file.
- * filesystems.
- *
- * Using fops->write is slower than using aops->{prepare,commit}_write in the
- * transforming case because we need to double buffer the data as we cannot do
- * the transformations in place as we do not have direct access to the
- * destination pages of the backing file.
 */
 static int do_lo_send_write(struct loop_device *lo, struct bio_vec *bvec,
                loff_t pos, struct page *page)
@@ -350,17 +276,16 @@ static int lo_send(struct loop_device *lo, struct bio *bio, loff_t pos)
        struct page *page = NULL;
        int i, ret = 0;
-        do_lo_send = do_lo_send_aops;
+        if (lo->transfer != transfer_none) {
-        if (!(lo->lo_flags & LO_FLAGS_USE_AOPS)) {
+                page = alloc_page(GFP_NOIO | __GFP_HIGHMEM);
+                if (unlikely(!page))
+                        goto fail;
+                kmap(page);
+                do_lo_send = do_lo_send_write;
+        } else {
                do_lo_send = do_lo_send_direct_write;
-                if (lo->transfer != transfer_none) {
-                        page = alloc_page(GFP_NOIO | __GFP_HIGHMEM);
-                        if (unlikely(!page))
-                                goto fail;
-                        kmap(page);
-                        do_lo_send = do_lo_send_write;
-                }
        }
        bio_for_each_segment(bvec, bio, i) {
                ret = do_lo_send(lo, bvec, pos, page);
                if (ret < 0)
@@ -484,6 +409,29 @@ static int do_bio_filebacked(struct loop_device *lo, struct bio *bio)
                        }
                }
+                /*
+                 * We use punch hole to reclaim the free space used by the
+                 * image a.k.a. discard. However we do support discard if
+                 * encryption is enabled, because it may give an attacker
+                 * useful information.
+                 */
+                if (bio->bi_rw & REQ_DISCARD) {
+                        struct file *file = lo->lo_backing_file;
+                        int mode = FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE;
+                        if ((!file->f_op->fallocate) ||
+                            lo->lo_encrypt_key_size) {
+                                ret = -EOPNOTSUPP;
+                                goto out;
+                        }
+                        ret = file->f_op->fallocate(file, mode, pos,
+                                                    bio->bi_size);
+                        if (unlikely(ret && ret != -EINVAL &&
+                                     ret != -EOPNOTSUPP))
+                                ret = -EIO;
+                        goto out;
+                }
                ret = lo_send(lo, bio, pos);
                if ((bio->bi_rw & REQ_FUA) && !ret) {
@@ -514,7 +462,7 @@ static struct bio *loop_get_bio(struct loop_device *lo)
        return bio_list_pop(&lo->lo_bio_list);
 }
-static int loop_make_request(struct request_queue *q, struct bio *old_bio)
+static void loop_make_request(struct request_queue *q, struct bio *old_bio)
 {
        struct loop_device *lo = q->queuedata;
        int rw = bio_rw(old_bio);
@@ -532,12 +480,11 @@ static int loop_make_request(struct request_queue *q, struct bio *old_bio)
        loop_add_bio(lo, old_bio);
        wake_up(&lo->lo_event);
        spin_unlock_irq(&lo->lo_lock);
-        return 0;
+        return;
 out:
        spin_unlock_irq(&lo->lo_lock);
        bio_io_error(old_bio);
-        return 0;
 }
 struct switch_request {
@@ -700,7 +647,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
                goto out_putf;
        fput(old_file);
-        if (max_part > 0)
+        if (lo->lo_flags & LO_FLAGS_PARTSCAN)
                ioctl_by_bdev(bdev, BLKRRPART, 0);
        return 0;
@@ -777,16 +724,25 @@ static ssize_t loop_attr_autoclear_show(struct loop_device *lo, char *buf)
        return sprintf(buf, "%s\n", autoclear ? "1" : "0");
 }
+static ssize_t loop_attr_partscan_show(struct loop_device *lo, char *buf)
+{
+        int partscan = (lo->lo_flags & LO_FLAGS_PARTSCAN);
+        return sprintf(buf, "%s\n", partscan ? "1" : "0");
+}
 LOOP_ATTR_RO(backing_file);
 LOOP_ATTR_RO(offset);
 LOOP_ATTR_RO(sizelimit);
 LOOP_ATTR_RO(autoclear);
+LOOP_ATTR_RO(partscan);
 static struct attribute *loop_attrs[] = {
        &loop_attr_backing_file.attr,
        &loop_attr_offset.attr,
        &loop_attr_sizelimit.attr,
        &loop_attr_autoclear.attr,
+        &loop_attr_partscan.attr,
        NULL,
 };
@@ -807,6 +763,35 @@ static void loop_sysfs_exit(struct loop_device *lo)
                           &loop_attribute_group);
 }
+static void loop_config_discard(struct loop_device *lo)
+{
+        struct file *file = lo->lo_backing_file;
+        struct inode *inode = file->f_mapping->host;
+        struct request_queue *q = lo->lo_queue;
+        /*
+         * We use punch hole to reclaim the free space used by the
+         * image a.k.a. discard. However we do support discard if
+         * encryption is enabled, because it may give an attacker
+         * useful information.
+         */
+        if ((!file->f_op->fallocate) ||
+            lo->lo_encrypt_key_size) {
+                q->limits.discard_granularity = 0;
+                q->limits.discard_alignment = 0;
+                q->limits.max_discard_sectors = 0;
+                q->limits.discard_zeroes_data = 0;
+                queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, q);
+                return;
+        }
+        q->limits.discard_granularity = inode->i_sb->s_blocksize;
+        q->limits.discard_alignment = inode->i_sb->s_blocksize;
+        q->limits.max_discard_sectors = UINT_MAX >> 9;
+        q->limits.discard_zeroes_data = 1;
+        queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q);
+}
 static int loop_set_fd(struct loop_device *lo, fmode_t mode,
                       struct block_device *bdev, unsigned int arg)
 {
@@ -849,35 +834,23 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
        mapping = file->f_mapping;
        inode = mapping->host;
-        if (!(file->f_mode & FMODE_WRITE))
-                lo_flags |= LO_FLAGS_READ_ONLY;
        error = -EINVAL;
-        if (S_ISREG(inode->i_mode) || S_ISBLK(inode->i_mode)) {
+        if (!S_ISREG(inode->i_mode) && !S_ISBLK(inode->i_mode))
-                const struct address_space_operations *aops = mapping->a_ops;
+                goto out_putf;
-                if (aops->write_begin)
-                        lo_flags |= LO_FLAGS_USE_AOPS;
-                if (!(lo_flags & LO_FLAGS_USE_AOPS) && !file->f_op->write)
-                        lo_flags |= LO_FLAGS_READ_ONLY;
-                lo_blocksize = S_ISBLK(inode->i_mode) ?
+        if (!(file->f_mode & FMODE_WRITE) || !(mode & FMODE_WRITE) ||
-                        inode->i_bdev->bd_block_size : PAGE_SIZE;
+            !file->f_op->write)
+                lo_flags |= LO_FLAGS_READ_ONLY;
-                error = 0;
+        lo_blocksize = S_ISBLK(inode->i_mode) ?
-        } else {
+                inode->i_bdev->bd_block_size : PAGE_SIZE;
-                goto out_putf;
-        }
+        error = -EFBIG;
        size = get_loop_size(lo, file);
+        if ((loff_t)(sector_t)size != size)
-        if ((loff_t)(sector_t)size != size) {
-                error = -EFBIG;
                goto out_putf;
-        }
-        if (!(mode & FMODE_WRITE))
+        error = 0;
-                lo_flags |= LO_FLAGS_READ_ONLY;
        set_device_ro(bdev, (lo_flags & LO_FLAGS_READ_ONLY) != 0);
@@ -919,7 +892,9 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
        }
        lo->lo_state = Lo_bound;
        wake_up_process(lo->lo_thread);
-        if (max_part > 0)
+        if (part_shift)
+                lo->lo_flags |= LO_FLAGS_PARTSCAN;
+        if (lo->lo_flags & LO_FLAGS_PARTSCAN)
                ioctl_by_bdev(bdev, BLKRRPART, 0);
        return 0;
@@ -980,10 +955,11 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
        return err;
 }
-static int loop_clr_fd(struct loop_device *lo, struct block_device *bdev)
+static int loop_clr_fd(struct loop_device *lo)
 {
        struct file *filp = lo->lo_backing_file;
        gfp_t gfp = lo->old_gfp_mask;
+        struct block_device *bdev = lo->lo_device;
        if (lo->lo_state != Lo_bound)
                return -ENXIO;
@@ -1012,7 +988,6 @@ static int loop_clr_fd(struct loop_device *lo, struct block_device *bdev)
        lo->lo_offset = 0;
        lo->lo_sizelimit = 0;
        lo->lo_encrypt_key_size = 0;
-        lo->lo_flags = 0;
        lo->lo_thread = NULL;
        memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE);
        memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
@@ -1030,8 +1005,11 @@ static int loop_clr_fd(struct loop_device *lo, struct block_device *bdev)
        lo->lo_state = Lo_unbound;
        /* This is safe: open() is still holding a reference. */
        module_put(THIS_MODULE);
-        if (max_part > 0 && bdev)
+        if (lo->lo_flags & LO_FLAGS_PARTSCAN && bdev)
                ioctl_by_bdev(bdev, BLKRRPART, 0);
+        lo->lo_flags = 0;
+        if (!part_shift)
+                lo->lo_disk->flags |= GENHD_FL_NO_PART_SCAN;
        mutex_unlock(&lo->lo_ctl_mutex);
        /*
         * Need not hold lo_ctl_mutex to fput backing file.
@@ -1085,6 +1063,7 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info)
                if (figure_loop_size(lo))
                        return -EFBIG;
        }
+        loop_config_discard(lo);
        memcpy(lo->lo_file_name, info->lo_file_name, LO_NAME_SIZE);
        memcpy(lo->lo_crypt_name, info->lo_crypt_name, LO_NAME_SIZE);
@@ -1100,6 +1079,13 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info)
             (info->lo_flags & LO_FLAGS_AUTOCLEAR))
                lo->lo_flags ^= LO_FLAGS_AUTOCLEAR;
+        if ((info->lo_flags & LO_FLAGS_PARTSCAN) &&
+             !(lo->lo_flags & LO_FLAGS_PARTSCAN)) {
+                lo->lo_flags |= LO_FLAGS_PARTSCAN;
+                lo->lo_disk->flags &= ~GENHD_FL_NO_PART_SCAN;
+                ioctl_by_bdev(lo->lo_device, BLKRRPART, 0);
+        }
        lo->lo_encrypt_key_size = info->lo_encrypt_key_size;
        lo->lo_init[0] = info->lo_init[0];
        lo->lo_init[1] = info->lo_init[1];
@@ -1293,7 +1279,7 @@ static int lo_ioctl(struct block_device *bdev, fmode_t mode,
                break;
        case LOOP_CLR_FD:
                /* loop_clr_fd would have unlocked lo_ctl_mutex on success */
-                err = loop_clr_fd(lo, bdev);
+                err = loop_clr_fd(lo);
                if (!err)
                        goto out_unlocked;
                break;
@@ -1513,7 +1499,7 @@ static int lo_release(struct gendisk *disk, fmode_t mode)
                 * In autoclear mode, stop the loop thread
                 * and remove configuration after last close.
                 */
-                err = loop_clr_fd(lo, NULL);
+                err = loop_clr_fd(lo);
                if (!err)
                        goto out_unlocked;
        } else {
@@ -1635,6 +1621,27 @@ static int loop_add(struct loop_device **l, int i)
        if (!disk)
                goto out_free_queue;
+        /*
+         * Disable partition scanning by default. The in-kernel partition
+         * scanning can be requested individually per-device during its
+         * setup. Userspace can always add and remove partitions from all
+         * devices. The needed partition minors are allocated from the
+         * extended minor space, the main loop device numbers will continue
+         * to match the loop minors, regardless of the number of partitions
+         * used.
+         *
+         * If max_part is given, partition scanning is globally enabled for
+         * all loop devices. The minors for the main loop devices will be
+         * multiples of max_part.
+         *
+         * Note: Global-for-all-devices, set-only-at-init, read-only module
+         * parameteters like 'max_loop' and 'max_part' make things needlessly
+         * complicated, are too static, inflexible and may surprise
+         * userspace tools. Parameters like this in general should be avoided.
+         */
+        if (!part_shift)
+                disk->flags |= GENHD_FL_NO_PART_SCAN;
+        disk->flags |= GENHD_FL_EXT_DEVT;
        mutex_init(&lo->lo_ctl_mutex);
        lo->lo_number           = i;
        lo->lo_thread           = NULL;
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index f533f3375e24..c3f0ee16594d 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -127,8 +127,7 @@ static void sock_shutdown(struct nbd_device *lo, int lock)
        if (lock)
                mutex_lock(&lo->tx_lock);
        if (lo->sock) {
-                printk(KERN_WARNING "%s: shutting down socket\n",
+                dev_warn(disk_to_dev(lo->disk), "shutting down socket\n");
-                        lo->disk->disk_name);
                kernel_sock_shutdown(lo->sock, SHUT_RDWR);
                lo->sock = NULL;
        }
@@ -158,8 +157,9 @@ static int sock_xmit(struct nbd_device *lo, int send, void *buf, int size,
        sigset_t blocked, oldset;
        if (unlikely(!sock)) {
-                printk(KERN_ERR "%s: Attempted %s on closed socket in sock_xmit\n",
+                dev_err(disk_to_dev(lo->disk),
-                       lo->disk->disk_name, (send ? "send" : "recv"));
+                        "Attempted %s on closed socket in sock_xmit\n",
+                        (send ? "send" : "recv"));
                return -EINVAL;
        }
@@ -250,8 +250,8 @@ static int nbd_send_req(struct nbd_device *lo, struct request *req)
        result = sock_xmit(lo, 1, &request, sizeof(request),
                        (nbd_cmd(req) == NBD_CMD_WRITE) ? MSG_MORE : 0);
        if (result <= 0) {
-                printk(KERN_ERR "%s: Send control failed (result %d)\n",
+                dev_err(disk_to_dev(lo->disk),
-                                lo->disk->disk_name, result);
+                        "Send control failed (result %d)\n", result);
                goto error_out;
        }
@@ -270,8 +270,9 @@ static int nbd_send_req(struct nbd_device *lo, struct request *req)
                                        lo->disk->disk_name, req, bvec->bv_len);
                        result = sock_send_bvec(lo, bvec, flags);
                        if (result <= 0) {
-                                printk(KERN_ERR "%s: Send data failed (result %d)\n",
+                                dev_err(disk_to_dev(lo->disk),
-                                                lo->disk->disk_name, result);
+                                        "Send data failed (result %d)\n",
+                                        result);
                                goto error_out;
                        }
                }
@@ -328,14 +329,13 @@ static struct request *nbd_read_stat(struct nbd_device *lo)
        reply.magic = 0;
        result = sock_xmit(lo, 0, &reply, sizeof(reply), MSG_WAITALL);
        if (result <= 0) {
-                printk(KERN_ERR "%s: Receive control failed (result %d)\n",
+                dev_err(disk_to_dev(lo->disk),
-                                lo->disk->disk_name, result);
+                        "Receive control failed (result %d)\n", result);
                goto harderror;
        }
        if (ntohl(reply.magic) != NBD_REPLY_MAGIC) {
-                printk(KERN_ERR "%s: Wrong magic (0x%lx)\n",
+                dev_err(disk_to_dev(lo->disk), "Wrong magic (0x%lx)\n",
-                                lo->disk->disk_name,
                                (unsigned long)ntohl(reply.magic));
                result = -EPROTO;
                goto harderror;
@@ -347,15 +347,15 @@ static struct request *nbd_read_stat(struct nbd_device *lo)
                if (result != -ENOENT)
                        goto harderror;
-                printk(KERN_ERR "%s: Unexpected reply (%p)\n",
+                dev_err(disk_to_dev(lo->disk), "Unexpected reply (%p)\n",
-                                lo->disk->disk_name, reply.handle);
+                        reply.handle);
                result = -EBADR;
                goto harderror;
        }
        if (ntohl(reply.error)) {
-                printk(KERN_ERR "%s: Other side returned error (%d)\n",
+                dev_err(disk_to_dev(lo->disk), "Other side returned error (%d)\n",
-                                lo->disk->disk_name, ntohl(reply.error));
+                        ntohl(reply.error));
                req->errors++;
                return req;
        }
@@ -369,8 +369,8 @@ static struct request *nbd_read_stat(struct nbd_device *lo)
                rq_for_each_segment(bvec, req, iter) {
                        result = sock_recv_bvec(lo, bvec);
                        if (result <= 0) {
-                                printk(KERN_ERR "%s: Receive data failed (result %d)\n",
+                                dev_err(disk_to_dev(lo->disk), "Receive data failed (result %d)\n",
-                                                lo->disk->disk_name, result);
+                                        result);
                                req->errors++;
                                return req;
                        }
@@ -405,10 +405,10 @@ static int nbd_do_it(struct nbd_device *lo)
        BUG_ON(lo->magic != LO_MAGIC);
-        lo->pid = current->pid;
+        lo->pid = task_pid_nr(current);
-        ret = sysfs_create_file(&disk_to_dev(lo->disk)->kobj, &pid_attr.attr);
+        ret = device_create_file(disk_to_dev(lo->disk), &pid_attr);
        if (ret) {
-                printk(KERN_ERR "nbd: sysfs_create_file failed!");
+                dev_err(disk_to_dev(lo->disk), "device_create_file failed!\n");
                lo->pid = 0;
                return ret;
        }
@@ -416,7 +416,7 @@ static int nbd_do_it(struct nbd_device *lo)
        while ((req = nbd_read_stat(lo)) != NULL)
                nbd_end_request(req);
-        sysfs_remove_file(&disk_to_dev(lo->disk)->kobj, &pid_attr.attr);
+        device_remove_file(disk_to_dev(lo->disk), &pid_attr);
        lo->pid = 0;
        return 0;
 }
@@ -457,8 +457,8 @@ static void nbd_handle_req(struct nbd_device *lo, struct request *req)
        if (rq_data_dir(req) == WRITE) {
                nbd_cmd(req) = NBD_CMD_WRITE;
                if (lo->flags & NBD_READ_ONLY) {
-                        printk(KERN_ERR "%s: Write on read-only\n",
+                        dev_err(disk_to_dev(lo->disk),
-                                        lo->disk->disk_name);
+                                "Write on read-only\n");
                        goto error_out;
                }
        }
@@ -468,16 +468,15 @@ static void nbd_handle_req(struct nbd_device *lo, struct request *req)
        mutex_lock(&lo->tx_lock);
        if (unlikely(!lo->sock)) {
                mutex_unlock(&lo->tx_lock);
-                printk(KERN_ERR "%s: Attempted send on closed socket\n",
+                dev_err(disk_to_dev(lo->disk),
-                       lo->disk->disk_name);
+                        "Attempted send on closed socket\n");
                goto error_out;
        }
        lo->active_req = req;
        if (nbd_send_req(lo, req) != 0) {
-                printk(KERN_ERR "%s: Request send failed\n",
+                dev_err(disk_to_dev(lo->disk), "Request send failed\n");
-                                lo->disk->disk_name);
                req->errors++;
                nbd_end_request(req);
        } else {
@@ -549,8 +548,8 @@ static void do_nbd_request(struct request_queue *q)
                BUG_ON(lo->magic != LO_MAGIC);
                if (unlikely(!lo->sock)) {
-                        printk(KERN_ERR "%s: Attempted send on closed socket\n",
+                        dev_err(disk_to_dev(lo->disk),
-                                lo->disk->disk_name);
+                                "Attempted send on closed socket\n");
                        req->errors++;
                        nbd_end_request(req);
                        spin_lock_irq(q->queue_lock);
@@ -576,7 +575,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo,
        case NBD_DISCONNECT: {
                struct request sreq;
-                printk(KERN_INFO "%s: NBD_DISCONNECT\n", lo->disk->disk_name);
+                dev_info(disk_to_dev(lo->disk), "NBD_DISCONNECT\n");
                blk_rq_init(NULL, &sreq);
                sreq.cmd_type = REQ_TYPE_SPECIAL;
@@ -674,7 +673,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo,
                file = lo->file;
                lo->file = NULL;
                nbd_clear_que(lo);
-                printk(KERN_WARNING "%s: queue cleared\n", lo->disk->disk_name);
+                dev_warn(disk_to_dev(lo->disk), "queue cleared\n");
                if (file)
                        fput(file);
                lo->bytesize = 0;
@@ -694,8 +693,8 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo,
                return 0;
        case NBD_PRINT_DEBUG:
-                printk(KERN_INFO "%s: next = %p, prev = %p, head = %p\n",
+                dev_info(disk_to_dev(lo->disk),
-                        bdev->bd_disk->disk_name,
+                        "next = %p, prev = %p, head = %p\n",
                        lo->queue_head.next, lo->queue_head.prev,
                        &lo->queue_head);
                return 0;
@@ -745,7 +744,7 @@ static int __init nbd_init(void)
        BUILD_BUG_ON(sizeof(struct nbd_request) != 28);
        if (max_part < 0) {
-                printk(KERN_CRIT "nbd: max_part must be >= 0\n");
+                printk(KERN_ERR "nbd: max_part must be >= 0\n");
                return -EINVAL;
        }
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index e133f094ab08..a63b0a2b7805 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -2444,7 +2444,7 @@ static void pkt_end_io_read_cloned(struct bio *bio, int err)
        pkt_bio_finished(pd);
 }
-static int pkt_make_request(struct request_queue *q, struct bio *bio)
+static void pkt_make_request(struct request_queue *q, struct bio *bio)
 {
        struct pktcdvd_device *pd;
        char b[BDEVNAME_SIZE];
@@ -2473,7 +2473,7 @@ static int pkt_make_request(struct request_queue *q, struct bio *bio)
                cloned_bio->bi_end_io = pkt_end_io_read_cloned;
                pd->stats.secs_r += bio->bi_size >> 9;
                pkt_queue_bio(pd, cloned_bio);
-                return 0;
+                return;
        }
        if (!test_bit(PACKET_WRITABLE, &pd->flags)) {
@@ -2509,7 +2509,7 @@ static int pkt_make_request(struct request_queue *q, struct bio *bio)
                        pkt_make_request(q, &bp->bio1);
                        pkt_make_request(q, &bp->bio2);
                        bio_pair_release(bp);
-                        return 0;
+                        return;
                }
        }
@@ -2533,7 +2533,7 @@ static int pkt_make_request(struct request_queue *q, struct bio *bio)
                                }
                                spin_unlock(&pkt->lock);
                                spin_unlock(&pd->cdrw.active_list_lock);
-                                return 0;
+                                return;
                        } else {
                                blocked_bio = 1;
                        }
@@ -2584,10 +2584,9 @@ static int pkt_make_request(struct request_queue *q, struct bio *bio)
                 */
                wake_up(&pd->wqueue);
        }
-        return 0;
+        return;
 end_io:
        bio_io_error(bio);
-        return 0;
 }
diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c
index 8e1ce2e2916a..da0abc1838c1 100644
--- a/drivers/block/ps3disk.c
+++ b/drivers/block/ps3disk.c
@@ -21,6 +21,7 @@
 #include <linux/ata.h>
 #include <linux/blkdev.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <asm/lv1call.h>
 #include <asm/ps3stor.h>
diff --git a/drivers/block/ps3vram.c b/drivers/block/ps3vram.c
index b3bdb8af89cf..f58cdcfb305f 100644
--- a/drivers/block/ps3vram.c
+++ b/drivers/block/ps3vram.c
@@ -10,6 +10,7 @@
 #include <linux/blkdev.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
@@ -596,7 +597,7 @@ out:
        return next;
 }
-static int ps3vram_make_request(struct request_queue *q, struct bio *bio)
+static void ps3vram_make_request(struct request_queue *q, struct bio *bio)
 {
        struct ps3_system_bus_device *dev = q->queuedata;
        struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
@@ -610,13 +611,11 @@ static int ps3vram_make_request(struct request_queue *q, struct bio *bio)
        spin_unlock_irq(&priv->lock);
        if (busy)
-                return 0;
+                return;
        do {
                bio = ps3vram_do_bio(dev, bio);
        } while (bio);
-        return 0;
 }
 static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev)
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index 031ca720d926..aa2712060bfb 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -513,7 +513,7 @@ static void process_page(unsigned long data)
        }
 }
-static int mm_make_request(struct request_queue *q, struct bio *bio)
+static void mm_make_request(struct request_queue *q, struct bio *bio)
 {
        struct cardinfo *card = q->queuedata;
        pr_debug("mm_make_request %llu %u\n",
@@ -525,7 +525,7 @@ static int mm_make_request(struct request_queue *q, struct bio *bio)
        card->biotail = &bio->bi_next;
        spin_unlock_irq(&card->lock);
-        return 0;
+        return;
 }
 static irqreturn_t mm_interrupt(int irq, void *__card)
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 079c08808d8a..4d0b70adf5f7 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -3,15 +3,19 @@
 #include <linux/slab.h>
 #include <linux/blkdev.h>
 #include <linux/hdreg.h>
+#include <linux/module.h>
 #include <linux/virtio.h>
 #include <linux/virtio_blk.h>
 #include <linux/scatterlist.h>
 #include <linux/string_helpers.h>
 #include <scsi/scsi_cmnd.h>
+#include <linux/idr.h>
 #define PART_BITS 4
-static int major, index;
+static int major;
+static DEFINE_IDA(vd_index_ida);
 struct workqueue_struct *virtblk_wq;
 struct virtio_blk
@@ -35,6 +39,9 @@ struct virtio_blk
        /* What host tells us, plus 2 for header & tailer. */
        unsigned int sg_elems;
+        /* Ida index - used to track minor number allocations. */
+        int index;
        /* Scatterlist: can be too big for stack. */
        struct scatterlist sg[/*sg_elems*/];
 };
@@ -276,6 +283,11 @@ static int index_to_minor(int index)
        return index << PART_BITS;
 }
+static int minor_to_index(int minor)
+{
+        return minor >> PART_BITS;
+}
 static ssize_t virtblk_serial_show(struct device *dev,
                                struct device_attribute *attr, char *buf)
 {
@@ -341,14 +353,17 @@ static int __devinit virtblk_probe(struct virtio_device *vdev)
 {
        struct virtio_blk *vblk;
        struct request_queue *q;
-        int err;
+        int err, index;
        u64 cap;
        u32 v, blk_size, sg_elems, opt_io_size;
        u16 min_io_size;
        u8 physical_block_exp, alignment_offset;
-        if (index_to_minor(index) >= 1 << MINORBITS)
+        err = ida_simple_get(&vd_index_ida, 0, minor_to_index(1 << MINORBITS),
-                return -ENOSPC;
+                             GFP_KERNEL);
+        if (err < 0)
+                goto out;
+        index = err;
        /* We need to know how many segments before we allocate. */
        err = virtio_config_val(vdev, VIRTIO_BLK_F_SEG_MAX,
@@ -365,7 +380,7 @@ static int __devinit virtblk_probe(struct virtio_device *vdev)
                                    sizeof(vblk->sg[0]) * sg_elems, GFP_KERNEL);
        if (!vblk) {
                err = -ENOMEM;
-                goto out;
+                goto out_free_index;
        }
        INIT_LIST_HEAD(&vblk->reqs);
@@ -421,7 +436,7 @@ static int __devinit virtblk_probe(struct virtio_device *vdev)
        vblk->disk->private_data = vblk;
        vblk->disk->fops = &virtblk_fops;
        vblk->disk->driverfs_dev = &vdev->dev;
-        index++;
+        vblk->index = index;
        /* configure queue flush support */
        if (virtio_has_feature(vdev, VIRTIO_BLK_F_FLUSH))
@@ -516,6 +531,8 @@ out_free_vq:
        vdev->config->del_vqs(vdev);
 out_free_vblk:
        kfree(vblk);
+out_free_index:
+        ida_simple_remove(&vd_index_ida, index);
 out:
        return err;
 }
@@ -523,6 +540,7 @@ out:
 static void __devexit virtblk_remove(struct virtio_device *vdev)
 {
        struct virtio_blk *vblk = vdev->priv;
+        int index = vblk->index;
        flush_work(&vblk->config_work);
@@ -538,6 +556,7 @@ static void __devexit virtblk_remove(struct virtio_device *vdev)
        mempool_destroy(vblk->pool);
        vdev->config->del_vqs(vdev);
        kfree(vblk);
+        ida_simple_remove(&vd_index_ida, index);
 }
 static const struct virtio_device_id id_table[] = {
diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c
index 1540792b1e54..15ec4db194d1 100644
--- a/drivers/block/xen-blkback/blkback.c
+++ b/drivers/block/xen-blkback/blkback.c
@@ -39,6 +39,9 @@
 #include <linux/list.h>
 #include <linux/delay.h>
 #include <linux/freezer.h>
+#include <linux/loop.h>
+#include <linux/falloc.h>
+#include <linux/fs.h>
 #include <xen/events.h>
 #include <xen/page.h>
@@ -258,13 +261,16 @@ irqreturn_t xen_blkif_be_int(int irq, void *dev_id)
 static void print_stats(struct xen_blkif *blkif)
 {
-        pr_info("xen-blkback (%s): oo %3d  |  rd %4d  |  wr %4d  |  f %4d\n",
+        pr_info("xen-blkback (%s): oo %3d  |  rd %4d  |  wr %4d  |  f %4d"
+                 "  |  ds %4d\n",
                 current->comm, blkif->st_oo_req,
-                 blkif->st_rd_req, blkif->st_wr_req, blkif->st_f_req);
+                 blkif->st_rd_req, blkif->st_wr_req,
+                 blkif->st_f_req, blkif->st_ds_req);
        blkif->st_print = jiffies + msecs_to_jiffies(10 * 1000);
        blkif->st_rd_req = 0;
        blkif->st_wr_req = 0;
        blkif->st_oo_req = 0;
+        blkif->st_ds_req = 0;
 }
 int xen_blkif_schedule(void *arg)
@@ -410,6 +416,59 @@ static int xen_blkbk_map(struct blkif_request *req,
        return ret;
 }
+static void xen_blk_discard(struct xen_blkif *blkif, struct blkif_request *req)
+{
+        int err = 0;
+        int status = BLKIF_RSP_OKAY;
+        struct block_device *bdev = blkif->vbd.bdev;
+        if (blkif->blk_backend_type == BLKIF_BACKEND_PHY)
+                /* just forward the discard request */
+                err = blkdev_issue_discard(bdev,
+                                req->u.discard.sector_number,
+                                req->u.discard.nr_sectors,
+                                GFP_KERNEL, 0);
+        else if (blkif->blk_backend_type == BLKIF_BACKEND_FILE) {
+                /* punch a hole in the backing file */
+                struct loop_device *lo = bdev->bd_disk->private_data;
+                struct file *file = lo->lo_backing_file;
+                if (file->f_op->fallocate)
+                        err = file->f_op->fallocate(file,
+                                FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE,
+                                req->u.discard.sector_number << 9,
+                                req->u.discard.nr_sectors << 9);
+                else
+                        err = -EOPNOTSUPP;
+        } else
+                err = -EOPNOTSUPP;
+        if (err == -EOPNOTSUPP) {
+                pr_debug(DRV_PFX "discard op failed, not supported\n");
+                status = BLKIF_RSP_EOPNOTSUPP;
+        } else if (err)
+                status = BLKIF_RSP_ERROR;
+        make_response(blkif, req->id, req->operation, status);
+}
+static void xen_blk_drain_io(struct xen_blkif *blkif)
+{
+        atomic_set(&blkif->drain, 1);
+        do {
+                /* The initial value is one, and one refcnt taken at the
+                 * start of the xen_blkif_schedule thread. */
+                if (atomic_read(&blkif->refcnt) <= 2)
+                        break;
+                wait_for_completion_interruptible_timeout(
+                                &blkif->drain_complete, HZ);
+                if (!atomic_read(&blkif->drain))
+                        break;
+        } while (!kthread_should_stop());
+        atomic_set(&blkif->drain, 0);
+}
 /*
 * Completion callback on the bio's. Called as bh->b_end_io()
 */
@@ -422,6 +481,11 @@ static void __end_block_io_op(struct pending_req *pending_req, int error)
                pr_debug(DRV_PFX "flush diskcache op failed, not supported\n");
                xen_blkbk_flush_diskcache(XBT_NIL, pending_req->blkif->be, 0);
                pending_req->status = BLKIF_RSP_EOPNOTSUPP;
+        } else if ((pending_req->operation == BLKIF_OP_WRITE_BARRIER) &&
+                    (error == -EOPNOTSUPP)) {
+                pr_debug(DRV_PFX "write barrier op failed, not supported\n");
+                xen_blkbk_barrier(XBT_NIL, pending_req->blkif->be, 0);
+                pending_req->status = BLKIF_RSP_EOPNOTSUPP;
        } else if (error) {
                pr_debug(DRV_PFX "Buffer not up-to-date at end of operation,"
                         " error=%d\n", error);
@@ -438,6 +502,10 @@ static void __end_block_io_op(struct pending_req *pending_req, int error)
                make_response(pending_req->blkif, pending_req->id,
                              pending_req->operation, pending_req->status);
                xen_blkif_put(pending_req->blkif);
+                if (atomic_read(&pending_req->blkif->refcnt) <= 2) {
+                        if (atomic_read(&pending_req->blkif->drain))
+                                complete(&pending_req->blkif->drain_complete);
+                }
                free_req(pending_req);
        }
 }
@@ -532,7 +600,6 @@ do_block_io_op(struct xen_blkif *blkif)
        return more_to_do;
 }
 /*
 * Transmutation of the 'struct blkif_request' to a proper 'struct bio'
 * and call the 'submit_bio' to pass it to the underlying storage.
@@ -549,6 +616,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
        int i, nbio = 0;
        int operation;
        struct blk_plug plug;
+        bool drain = false;
        switch (req->operation) {
        case BLKIF_OP_READ:
@@ -559,11 +627,16 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
                blkif->st_wr_req++;
                operation = WRITE_ODIRECT;
                break;
+        case BLKIF_OP_WRITE_BARRIER:
+                drain = true;
        case BLKIF_OP_FLUSH_DISKCACHE:
                blkif->st_f_req++;
                operation = WRITE_FLUSH;
                break;
-        case BLKIF_OP_WRITE_BARRIER:
+        case BLKIF_OP_DISCARD:
+                blkif->st_ds_req++;
+                operation = REQ_DISCARD;
+                break;
        default:
                operation = 0; /* make gcc happy */
                goto fail_response;
@@ -572,7 +645,8 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
        /* Check that the number of segments is sane. */
        nseg = req->nr_segments;
-        if (unlikely(nseg == 0 && operation != WRITE_FLUSH) ||
+        if (unlikely(nseg == 0 && operation != WRITE_FLUSH &&
+                                operation != REQ_DISCARD) ||
            unlikely(nseg > BLKIF_MAX_SEGMENTS_PER_REQUEST)) {
                pr_debug(DRV_PFX "Bad number of segments in request (%d)\n",
                         nseg);
@@ -621,16 +695,25 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
                }
        }
+        /* Wait on all outstanding I/O's and once that has been completed
+         * issue the WRITE_FLUSH.
+         */
+        if (drain)
+                xen_blk_drain_io(pending_req->blkif);
        /*
         * If we have failed at this point, we need to undo the M2P override,
         * set gnttab_set_unmap_op on all of the grant references and perform
         * the hypercall to unmap the grants - that is all done in
         * xen_blkbk_unmap.
         */
-        if (xen_blkbk_map(req, pending_req, seg))
+        if (operation != REQ_DISCARD && xen_blkbk_map(req, pending_req, seg))
                goto fail_flush;
-        /* This corresponding xen_blkif_put is done in __end_block_io_op */
+        /*
+         * This corresponding xen_blkif_put is done in __end_block_io_op, or
+         * below (in "!bio") if we are handling a BLKIF_OP_DISCARD.
+         */
        xen_blkif_get(blkif);
        for (i = 0; i < nseg; i++) {
@@ -654,18 +737,25 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
                preq.sector_number += seg[i].nsec;
        }
-        /* This will be hit if the operation was a flush. */
+        /* This will be hit if the operation was a flush or discard. */
        if (!bio) {
-                BUG_ON(operation != WRITE_FLUSH);
+                BUG_ON(operation != WRITE_FLUSH && operation != REQ_DISCARD);
-                bio = bio_alloc(GFP_KERNEL, 0);
+                if (operation == WRITE_FLUSH) {
-                if (unlikely(bio == NULL))
+                        bio = bio_alloc(GFP_KERNEL, 0);
-                        goto fail_put_bio;
+                        if (unlikely(bio == NULL))
+                                goto fail_put_bio;
-                biolist[nbio++] = bio;
+                        biolist[nbio++] = bio;
-                bio->bi_bdev    = preq.bdev;
+                        bio->bi_bdev    = preq.bdev;
-                bio->bi_private = pending_req;
+                        bio->bi_private = pending_req;
-                bio->bi_end_io  = end_block_io_op;
+                        bio->bi_end_io  = end_block_io_op;
+                } else if (operation == REQ_DISCARD) {
+                        xen_blk_discard(blkif, req);
+                        xen_blkif_put(blkif);
+                        free_req(pending_req);
+                        return 0;
+                }
        }
        /*
@@ -685,7 +775,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
        if (operation == READ)
                blkif->st_rd_sect += preq.nr_sects;
-        else if (operation == WRITE || operation == WRITE_FLUSH)
+        else if (operation & WRITE)
                blkif->st_wr_sect += preq.nr_sects;
        return 0;
@@ -765,9 +855,9 @@ static int __init xen_blkif_init(void)
        mmap_pages = xen_blkif_reqs * BLKIF_MAX_SEGMENTS_PER_REQUEST;
-        blkbk->pending_reqs          = kmalloc(sizeof(blkbk->pending_reqs[0]) *
+        blkbk->pending_reqs          = kzalloc(sizeof(blkbk->pending_reqs[0]) *
                                        xen_blkif_reqs, GFP_KERNEL);
-        blkbk->pending_grant_handles = kzalloc(sizeof(blkbk->pending_grant_handles[0]) *
+        blkbk->pending_grant_handles = kmalloc(sizeof(blkbk->pending_grant_handles[0]) *
                                        mmap_pages, GFP_KERNEL);
        blkbk->pending_pages         = kzalloc(sizeof(blkbk->pending_pages[0]) *
                                        mmap_pages, GFP_KERNEL);
@@ -790,8 +880,6 @@ static int __init xen_blkif_init(void)
        if (rc)
                goto failed_init;
-        memset(blkbk->pending_reqs, 0, sizeof(blkbk->pending_reqs));
        INIT_LIST_HEAD(&blkbk->pending_free);
        spin_lock_init(&blkbk->pending_free_lock);
        init_waitqueue_head(&blkbk->pending_free_wq);
diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback/common.h
index c4bd34063ecc..dfb1b3a43a5d 100644
--- a/drivers/block/xen-blkback/common.h
+++ b/drivers/block/xen-blkback/common.h
@@ -62,13 +62,26 @@ struct blkif_common_response {
 /* i386 protocol version */
 #pragma pack(push, 4)
+struct blkif_x86_32_request_rw {
+        blkif_sector_t sector_number;/* start sector idx on disk (r/w only)  */
+        struct blkif_request_segment seg[BLKIF_MAX_SEGMENTS_PER_REQUEST];
+};
+struct blkif_x86_32_request_discard {
+        blkif_sector_t sector_number;/* start sector idx on disk (r/w only)  */
+        uint64_t nr_sectors;
+};
 struct blkif_x86_32_request {
        uint8_t        operation;    /* BLKIF_OP_???                         */
        uint8_t        nr_segments;  /* number of segments                   */
        blkif_vdev_t   handle;       /* only for read/write requests         */
        uint64_t       id;           /* private guest value, echoed in resp  */
-        blkif_sector_t sector_number;/* start sector idx on disk (r/w only)  */
+        union {
-        struct blkif_request_segment seg[BLKIF_MAX_SEGMENTS_PER_REQUEST];
+                struct blkif_x86_32_request_rw rw;
+                struct blkif_x86_32_request_discard discard;
+        } u;
 };
 struct blkif_x86_32_response {
        uint64_t        id;              /* copied from request */
@@ -78,13 +91,26 @@ struct blkif_x86_32_response {
 #pragma pack(pop)
 /* x86_64 protocol version */
+struct blkif_x86_64_request_rw {
+        blkif_sector_t sector_number;/* start sector idx on disk (r/w only)  */
+        struct blkif_request_segment seg[BLKIF_MAX_SEGMENTS_PER_REQUEST];
+};
+struct blkif_x86_64_request_discard {
+        blkif_sector_t sector_number;/* start sector idx on disk (r/w only)  */
+        uint64_t nr_sectors;
+};
 struct blkif_x86_64_request {
        uint8_t        operation;    /* BLKIF_OP_???                         */
        uint8_t        nr_segments;  /* number of segments                   */
        blkif_vdev_t   handle;       /* only for read/write requests         */
        uint64_t       __attribute__((__aligned__(8))) id;
-        blkif_sector_t sector_number;/* start sector idx on disk (r/w only)  */
+        union {
-        struct blkif_request_segment seg[BLKIF_MAX_SEGMENTS_PER_REQUEST];
+                struct blkif_x86_64_request_rw rw;
+                struct blkif_x86_64_request_discard discard;
+        } u;
 };
 struct blkif_x86_64_response {
        uint64_t       __attribute__((__aligned__(8))) id;
@@ -112,6 +138,11 @@ enum blkif_protocol {
        BLKIF_PROTOCOL_X86_64 = 3,
 };
+enum blkif_backend_type {
+        BLKIF_BACKEND_PHY  = 1,
+        BLKIF_BACKEND_FILE = 2,
+};
 struct xen_vbd {
        /* What the domain refers to this vbd as. */
        blkif_vdev_t            handle;
@@ -137,8 +168,9 @@ struct xen_blkif {
        unsigned int            irq;
        /* Comms information. */
        enum blkif_protocol     blk_protocol;
+        enum blkif_backend_type blk_backend_type;
        union blkif_back_rings  blk_rings;
-        struct vm_struct        *blk_ring_area;
+        void                    *blk_ring;
        /* The VBD attached to this interface. */
        struct xen_vbd          vbd;
        /* Back pointer to the backend_info. */
@@ -148,6 +180,9 @@ struct xen_blkif {
        atomic_t                refcnt;
        wait_queue_head_t       wq;
+        /* for barrier (drain) requests */
+        struct completion       drain_complete;
+        atomic_t                drain;
        /* One thread per one blkif. */
        struct task_struct      *xenblkd;
        unsigned int            waiting_reqs;
@@ -158,13 +193,11 @@ struct xen_blkif {
        int                     st_wr_req;
        int                     st_oo_req;
        int                     st_f_req;
+        int                     st_ds_req;
        int                     st_rd_sect;
        int                     st_wr_sect;
        wait_queue_head_t       waiting_to_free;
-        grant_handle_t          shmem_handle;
-        grant_ref_t             shmem_ref;
 };
@@ -181,7 +214,7 @@ struct xen_blkif {
 struct phys_req {
        unsigned short          dev;
-        unsigned short          nr_sects;
+        blkif_sector_t          nr_sects;
        struct block_device     *bdev;
        blkif_sector_t          sector_number;
 };
@@ -195,6 +228,8 @@ int xen_blkif_schedule(void *arg);
 int xen_blkbk_flush_diskcache(struct xenbus_transaction xbt,
                              struct backend_info *be, int state);
+int xen_blkbk_barrier(struct xenbus_transaction xbt,
+                      struct backend_info *be, int state);
 struct xenbus_device *xen_blkbk_xenbus(struct backend_info *be);
 static inline void blkif_get_x86_32_req(struct blkif_request *dst,
@@ -205,12 +240,25 @@ static inline void blkif_get_x86_32_req(struct blkif_request *dst,
        dst->nr_segments = src->nr_segments;
        dst->handle = src->handle;
        dst->id = src->id;
-        dst->u.rw.sector_number = src->sector_number;
+        switch (src->operation) {
-        barrier();
+        case BLKIF_OP_READ:
-        if (n > dst->nr_segments)
+        case BLKIF_OP_WRITE:
-                n = dst->nr_segments;
+        case BLKIF_OP_WRITE_BARRIER:
-        for (i = 0; i < n; i++)
+        case BLKIF_OP_FLUSH_DISKCACHE:
-                dst->u.rw.seg[i] = src->seg[i];
+                dst->u.rw.sector_number = src->u.rw.sector_number;
+                barrier();
+                if (n > dst->nr_segments)
+                        n = dst->nr_segments;
+                for (i = 0; i < n; i++)
+                        dst->u.rw.seg[i] = src->u.rw.seg[i];
+                break;
+        case BLKIF_OP_DISCARD:
+                dst->u.discard.sector_number = src->u.discard.sector_number;
+                dst->u.discard.nr_sectors = src->u.discard.nr_sectors;
+                break;
+        default:
+                break;
+        }
 }
 static inline void blkif_get_x86_64_req(struct blkif_request *dst,
@@ -221,12 +269,25 @@ static inline void blkif_get_x86_64_req(struct blkif_request *dst,
        dst->nr_segments = src->nr_segments;
        dst->handle = src->handle;
        dst->id = src->id;
-        dst->u.rw.sector_number = src->sector_number;
+        switch (src->operation) {
-        barrier();
+        case BLKIF_OP_READ:
-        if (n > dst->nr_segments)
+        case BLKIF_OP_WRITE:
-                n = dst->nr_segments;
+        case BLKIF_OP_WRITE_BARRIER:
-        for (i = 0; i < n; i++)
+        case BLKIF_OP_FLUSH_DISKCACHE:
-                dst->u.rw.seg[i] = src->seg[i];
+                dst->u.rw.sector_number = src->u.rw.sector_number;
+                barrier();
+                if (n > dst->nr_segments)
+                        n = dst->nr_segments;
+                for (i = 0; i < n; i++)
+                        dst->u.rw.seg[i] = src->u.rw.seg[i];
+                break;
+        case BLKIF_OP_DISCARD:
+                dst->u.discard.sector_number = src->u.discard.sector_number;
+                dst->u.discard.nr_sectors = src->u.discard.nr_sectors;
+                break;
+        default:
+                break;
+        }
 }
 #endif /* __XEN_BLKIF__BACKEND__COMMON_H__ */
diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
index 5fd2010f7d2b..f759ad4584c3 100644
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
@@ -114,44 +114,14 @@ static struct xen_blkif *xen_blkif_alloc(domid_t domid)
        spin_lock_init(&blkif->blk_ring_lock);
        atomic_set(&blkif->refcnt, 1);
        init_waitqueue_head(&blkif->wq);
+        init_completion(&blkif->drain_complete);
+        atomic_set(&blkif->drain, 0);
        blkif->st_print = jiffies;
        init_waitqueue_head(&blkif->waiting_to_free);
        return blkif;
 }
-static int map_frontend_page(struct xen_blkif *blkif, unsigned long shared_page)
-{
-        struct gnttab_map_grant_ref op;
-        gnttab_set_map_op(&op, (unsigned long)blkif->blk_ring_area->addr,
-                          GNTMAP_host_map, shared_page, blkif->domid);
-        if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
-                BUG();
-        if (op.status) {
-                DPRINTK("Grant table operation failure !\n");
-                return op.status;
-        }
-        blkif->shmem_ref = shared_page;
-        blkif->shmem_handle = op.handle;
-        return 0;
-}
-static void unmap_frontend_page(struct xen_blkif *blkif)
-{
-        struct gnttab_unmap_grant_ref op;
-        gnttab_set_unmap_op(&op, (unsigned long)blkif->blk_ring_area->addr,
-                            GNTMAP_host_map, blkif->shmem_handle);
-        if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1))
-                BUG();
-}
 static int xen_blkif_map(struct xen_blkif *blkif, unsigned long shared_page,
                         unsigned int evtchn)
 {
@@ -161,35 +131,29 @@ static int xen_blkif_map(struct xen_blkif *blkif, unsigned long shared_page,
        if (blkif->irq)
                return 0;
-        blkif->blk_ring_area = alloc_vm_area(PAGE_SIZE);
+        err = xenbus_map_ring_valloc(blkif->be->dev, shared_page, &blkif->blk_ring);
-        if (!blkif->blk_ring_area)
+        if (err < 0)
-                return -ENOMEM;
-        err = map_frontend_page(blkif, shared_page);
-        if (err) {
-                free_vm_area(blkif->blk_ring_area);
                return err;
-        }
        switch (blkif->blk_protocol) {
        case BLKIF_PROTOCOL_NATIVE:
        {
                struct blkif_sring *sring;
-                sring = (struct blkif_sring *)blkif->blk_ring_area->addr;
+                sring = (struct blkif_sring *)blkif->blk_ring;
                BACK_RING_INIT(&blkif->blk_rings.native, sring, PAGE_SIZE);
                break;
        }
        case BLKIF_PROTOCOL_X86_32:
        {
                struct blkif_x86_32_sring *sring_x86_32;
-                sring_x86_32 = (struct blkif_x86_32_sring *)blkif->blk_ring_area->addr;
+                sring_x86_32 = (struct blkif_x86_32_sring *)blkif->blk_ring;
                BACK_RING_INIT(&blkif->blk_rings.x86_32, sring_x86_32, PAGE_SIZE);
                break;
        }
        case BLKIF_PROTOCOL_X86_64:
        {
                struct blkif_x86_64_sring *sring_x86_64;
-                sring_x86_64 = (struct blkif_x86_64_sring *)blkif->blk_ring_area->addr;
+                sring_x86_64 = (struct blkif_x86_64_sring *)blkif->blk_ring;
                BACK_RING_INIT(&blkif->blk_rings.x86_64, sring_x86_64, PAGE_SIZE);
                break;
        }
@@ -201,8 +165,7 @@ static int xen_blkif_map(struct xen_blkif *blkif, unsigned long shared_page,
                                                    xen_blkif_be_int, 0,
                                                    "blkif-backend", blkif);
        if (err < 0) {
-                unmap_frontend_page(blkif);
+                xenbus_unmap_ring_vfree(blkif->be->dev, blkif->blk_ring);
-                free_vm_area(blkif->blk_ring_area);
                blkif->blk_rings.common.sring = NULL;
                return err;
        }
@@ -228,8 +191,7 @@ static void xen_blkif_disconnect(struct xen_blkif *blkif)
        }
        if (blkif->blk_rings.common.sring) {
-                unmap_frontend_page(blkif);
+                xenbus_unmap_ring_vfree(blkif->be->dev, blkif->blk_ring);
-                free_vm_area(blkif->blk_ring_area);
                blkif->blk_rings.common.sring = NULL;
        }
 }
@@ -272,6 +234,7 @@ VBD_SHOW(oo_req,  "%d\n", be->blkif->st_oo_req);
 VBD_SHOW(rd_req,  "%d\n", be->blkif->st_rd_req);
 VBD_SHOW(wr_req,  "%d\n", be->blkif->st_wr_req);
 VBD_SHOW(f_req,  "%d\n", be->blkif->st_f_req);
+VBD_SHOW(ds_req,  "%d\n", be->blkif->st_ds_req);
 VBD_SHOW(rd_sect, "%d\n", be->blkif->st_rd_sect);
 VBD_SHOW(wr_sect, "%d\n", be->blkif->st_wr_sect);
@@ -280,6 +243,7 @@ static struct attribute *xen_vbdstat_attrs[] = {
        &dev_attr_rd_req.attr,
        &dev_attr_wr_req.attr,
        &dev_attr_f_req.attr,
+        &dev_attr_ds_req.attr,
        &dev_attr_rd_sect.attr,
        &dev_attr_wr_sect.attr,
        NULL
@@ -419,6 +383,73 @@ int xen_blkbk_flush_diskcache(struct xenbus_transaction xbt,
        return err;
 }
+int xen_blkbk_discard(struct xenbus_transaction xbt, struct backend_info *be)
+{
+        struct xenbus_device *dev = be->dev;
+        struct xen_blkif *blkif = be->blkif;
+        char *type;
+        int err;
+        int state = 0;
+        type = xenbus_read(XBT_NIL, dev->nodename, "type", NULL);
+        if (!IS_ERR(type)) {
+                if (strncmp(type, "file", 4) == 0) {
+                        state = 1;
+                        blkif->blk_backend_type = BLKIF_BACKEND_FILE;
+                }
+                if (strncmp(type, "phy", 3) == 0) {
+                        struct block_device *bdev = be->blkif->vbd.bdev;
+                        struct request_queue *q = bdev_get_queue(bdev);
+                        if (blk_queue_discard(q)) {
+                                err = xenbus_printf(xbt, dev->nodename,
+                                        "discard-granularity", "%u",
+                                        q->limits.discard_granularity);
+                                if (err) {
+                                        xenbus_dev_fatal(dev, err,
+                                                "writing discard-granularity");
+                                        goto kfree;
+                                }
+                                err = xenbus_printf(xbt, dev->nodename,
+                                        "discard-alignment", "%u",
+                                        q->limits.discard_alignment);
+                                if (err) {
+                                        xenbus_dev_fatal(dev, err,
+                                                "writing discard-alignment");
+                                        goto kfree;
+                                }
+                                state = 1;
+                                blkif->blk_backend_type = BLKIF_BACKEND_PHY;
+                        }
+                }
+        } else {
+                err = PTR_ERR(type);
+                xenbus_dev_fatal(dev, err, "reading type");
+                goto out;
+        }
+        err = xenbus_printf(xbt, dev->nodename, "feature-discard",
+                            "%d", state);
+        if (err)
+                xenbus_dev_fatal(dev, err, "writing feature-discard");
+kfree:
+        kfree(type);
+out:
+        return err;
+}
+int xen_blkbk_barrier(struct xenbus_transaction xbt,
+                      struct backend_info *be, int state)
+{
+        struct xenbus_device *dev = be->dev;
+        int err;
+        err = xenbus_printf(xbt, dev->nodename, "feature-barrier",
+                            "%d", state);
+        if (err)
+                xenbus_dev_fatal(dev, err, "writing feature-barrier");
+        return err;
+}
 /*
 * Entry point to this code when a new device is created.  Allocate the basic
 * structures, and watch the store waiting for the hotplug scripts to tell us
@@ -650,6 +681,11 @@ again:
        if (err)
                goto abort;
+        err = xen_blkbk_discard(xbt, be);
+        /* If we can't advertise it is OK. */
+        err = xen_blkbk_barrier(xbt, be, be->blkif->vbd.flush_support);
        err = xenbus_printf(xbt, dev->nodename, "sectors", "%llu",
                            (unsigned long long)vbd_sz(&be->blkif->vbd));
        if (err) {
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 9ea8c2576c70..7b2ec5908413 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -98,6 +98,9 @@ struct blkfront_info
        unsigned long shadow_free;
        unsigned int feature_flush;
        unsigned int flush_op;
+        unsigned int feature_discard;
+        unsigned int discard_granularity;
+        unsigned int discard_alignment;
        int is_ready;
 };
@@ -302,29 +305,36 @@ static int blkif_queue_request(struct request *req)
                ring_req->operation = info->flush_op;
        }
-        ring_req->nr_segments = blk_rq_map_sg(req->q, req, info->sg);
+        if (unlikely(req->cmd_flags & REQ_DISCARD)) {
-        BUG_ON(ring_req->nr_segments > BLKIF_MAX_SEGMENTS_PER_REQUEST);
+                /* id, sector_number and handle are set above. */
+                ring_req->operation = BLKIF_OP_DISCARD;
+                ring_req->nr_segments = 0;
+                ring_req->u.discard.nr_sectors = blk_rq_sectors(req);
+        } else {
+                ring_req->nr_segments = blk_rq_map_sg(req->q, req, info->sg);
+                BUG_ON(ring_req->nr_segments > BLKIF_MAX_SEGMENTS_PER_REQUEST);
-        for_each_sg(info->sg, sg, ring_req->nr_segments, i) {
+                for_each_sg(info->sg, sg, ring_req->nr_segments, i) {
-                buffer_mfn = pfn_to_mfn(page_to_pfn(sg_page(sg)));
+                        buffer_mfn = pfn_to_mfn(page_to_pfn(sg_page(sg)));
-                fsect = sg->offset >> 9;
+                        fsect = sg->offset >> 9;
-                lsect = fsect + (sg->length >> 9) - 1;
+                        lsect = fsect + (sg->length >> 9) - 1;
-                /* install a grant reference. */
+                        /* install a grant reference. */
-                ref = gnttab_claim_grant_reference(&gref_head);
+                        ref = gnttab_claim_grant_reference(&gref_head);
-                BUG_ON(ref == -ENOSPC);
+                        BUG_ON(ref == -ENOSPC);
-                gnttab_grant_foreign_access_ref(
+                        gnttab_grant_foreign_access_ref(
-                                ref,
+                                        ref,
-                                info->xbdev->otherend_id,
+                                        info->xbdev->otherend_id,
-                                buffer_mfn,
+                                        buffer_mfn,
-                                rq_data_dir(req) );
+                                        rq_data_dir(req));
-                info->shadow[id].frame[i] = mfn_to_pfn(buffer_mfn);
+                        info->shadow[id].frame[i] = mfn_to_pfn(buffer_mfn);
-                ring_req->u.rw.seg[i] =
+                        ring_req->u.rw.seg[i] =
-                                (struct blkif_request_segment) {
+                                        (struct blkif_request_segment) {
-                                        .gref       = ref,
+                                                .gref       = ref,
-                                        .first_sect = fsect,
+                                                .first_sect = fsect,
-                                        .last_sect  = lsect };
+                                                .last_sect  = lsect };
+                }
        }
        info->ring.req_prod_pvt++;
@@ -370,7 +380,9 @@ static void do_blkif_request(struct request_queue *rq)
                blk_start_request(req);
-                if (req->cmd_type != REQ_TYPE_FS) {
+                if ((req->cmd_type != REQ_TYPE_FS) ||
+                    ((req->cmd_flags & (REQ_FLUSH | REQ_FUA)) &&
+                    !info->flush_op)) {
                        __blk_end_request_all(req, -EIO);
                        continue;
                }
@@ -399,6 +411,7 @@ wait:
 static int xlvbd_init_blk_queue(struct gendisk *gd, u16 sector_size)
 {
        struct request_queue *rq;
+        struct blkfront_info *info = gd->private_data;
        rq = blk_init_queue(do_blkif_request, &blkif_io_lock);
        if (rq == NULL)
@@ -406,6 +419,13 @@ static int xlvbd_init_blk_queue(struct gendisk *gd, u16 sector_size)
        queue_flag_set_unlocked(QUEUE_FLAG_VIRT, rq);
+        if (info->feature_discard) {
+                queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, rq);
+                blk_queue_max_discard_sectors(rq, get_capacity(gd));
+                rq->limits.discard_granularity = info->discard_granularity;
+                rq->limits.discard_alignment = info->discard_alignment;
+        }
        /* Hard sector size and max sectors impersonate the equiv. hardware. */
        blk_queue_logical_block_size(rq, sector_size);
        blk_queue_max_hw_sectors(rq, 512);
@@ -722,6 +742,17 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
                error = (bret->status == BLKIF_RSP_OKAY) ? 0 : -EIO;
                switch (bret->operation) {
+                case BLKIF_OP_DISCARD:
+                        if (unlikely(bret->status == BLKIF_RSP_EOPNOTSUPP)) {
+                                struct request_queue *rq = info->rq;
+                                printk(KERN_WARNING "blkfront: %s: discard op failed\n",
+                                           info->gd->disk_name);
+                                error = -EOPNOTSUPP;
+                                info->feature_discard = 0;
+                                queue_flag_clear(QUEUE_FLAG_DISCARD, rq);
+                        }
+                        __blk_end_request_all(req, error);
+                        break;
                case BLKIF_OP_FLUSH_DISKCACHE:
                case BLKIF_OP_WRITE_BARRIER:
                        if (unlikely(bret->status == BLKIF_RSP_EOPNOTSUPP)) {
@@ -1098,6 +1129,33 @@ blkfront_closing(struct blkfront_info *info)
        bdput(bdev);
 }
+static void blkfront_setup_discard(struct blkfront_info *info)
+{
+        int err;
+        char *type;
+        unsigned int discard_granularity;
+        unsigned int discard_alignment;
+        type = xenbus_read(XBT_NIL, info->xbdev->otherend, "type", NULL);
+        if (IS_ERR(type))
+                return;
+        if (strncmp(type, "phy", 3) == 0) {
+                err = xenbus_gather(XBT_NIL, info->xbdev->otherend,
+                        "discard-granularity", "%u", &discard_granularity,
+                        "discard-alignment", "%u", &discard_alignment,
+                        NULL);
+                if (!err) {
+                        info->feature_discard = 1;
+                        info->discard_granularity = discard_granularity;
+                        info->discard_alignment = discard_alignment;
+                }
+        } else if (strncmp(type, "file", 4) == 0)
+                info->feature_discard = 1;
+        kfree(type);
+}
 /*
 * Invoked when the backend is finally 'ready' (and has told produced
 * the details about the physical device - #sectors, size, etc).
@@ -1108,7 +1166,7 @@ static void blkfront_connect(struct blkfront_info *info)
        unsigned long sector_size;
        unsigned int binfo;
        int err;
-        int barrier, flush;
+        int barrier, flush, discard;
        switch (info->connected) {
        case BLKIF_STATE_CONNECTED:
@@ -1178,7 +1236,14 @@ static void blkfront_connect(struct blkfront_info *info)
                info->feature_flush = REQ_FLUSH;
                info->flush_op = BLKIF_OP_FLUSH_DISKCACHE;
        }
-                
+        err = xenbus_gather(XBT_NIL, info->xbdev->otherend,
+                            "feature-discard", "%d", &discard,
+                            NULL);
+        if (!err && discard)
+                blkfront_setup_discard(info);
        err = xlvbd_alloc_gendisk(sectors, info, binfo, sector_size);
        if (err) {
                xenbus_dev_fatal(info->xbdev, err, "xlvbd_add at %s",
@@ -1385,6 +1450,8 @@ static struct xenbus_driver blkfront = {
 static int __init xlblk_init(void)
 {
+        int ret;
        if (!xen_domain())
                return -ENODEV;
@@ -1394,7 +1461,13 @@ static int __init xlblk_init(void)
                return -ENODEV;
        }
-        return xenbus_register_frontend(&blkfront);
+        ret = xenbus_register_frontend(&blkfront);
+        if (ret) {
+                unregister_blkdev(XENVBD_MAJOR, DEV_NAME);
+                return ret;
+        }
+        return 0;
 }
 module_init(xlblk_init);
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index 548d1d9e4dda..a88a78c86162 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -18,6 +18,8 @@
 * this warranty disclaimer.
 **/
+#include <linux/module.h>
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index c827d737ccee..9ef48167e2cf 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -23,6 +23,7 @@
 #include <linux/mmc/sdio_ids.h>
 #include <linux/mmc/sdio_func.h>
+#include <linux/module.h>
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
index 04d353f58d71..b5f83b44a0cd 100644
--- a/drivers/bluetooth/btwilink.c
+++ b/drivers/bluetooth/btwilink.c
@@ -29,6 +29,7 @@
 #include <net/bluetooth/hci.h>
 #include <linux/ti_wilink_st.h>
+#include <linux/module.h>
 /* Bluetooth Driver Version */
 #define VERSION               "1.0"
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 423fd56bf612..43643033a3ae 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -298,7 +298,7 @@ if RTC_LIB=n
 config RTC
        tristate "Enhanced Real Time Clock Support (legacy PC RTC driver)"
        depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV \
-                        && !ARM && !SUPERH && !S390 && !AVR32 && !BLACKFIN
+                        && !ARM && !SUPERH && !S390 && !AVR32 && !BLACKFIN && !UML
        ---help---
          If you say Y here and create a character special file /dev/rtc with
          major number 10 and minor number 135 using mknod ("man mknod"), you
@@ -346,7 +346,7 @@ config JS_RTC
 config GEN_RTC
        tristate "Generic /dev/rtc emulation"
-        depends on RTC!=y && !IA64 && !ARM && !M32R && !MIPS && !SPARC && !FRV && !S390 && !SUPERH && !AVR32 && !BLACKFIN
+        depends on RTC!=y && !IA64 && !ARM && !M32R && !MIPS && !SPARC && !FRV && !S390 && !SUPERH && !AVR32 && !BLACKFIN && !UML
        ---help---
          If you say Y here and create a character special file /dev/rtc with
          major number 10 and minor number 135 using mknod ("man mknod"), you
@@ -490,7 +490,7 @@ config SCx200_GPIO
 config PC8736x_GPIO
        tristate "NatSemi PC8736x GPIO Support"
-        depends on X86_32
+        depends on X86_32 && !UML
        default SCx200_GPIO     # mostly N
        select NSC_GPIO         # needed for support routines
        help
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c
index 056b289a1e89..3695773ce7c3 100644
--- a/drivers/char/agp/hp-agp.c
+++ b/drivers/char/agp/hp-agp.c
@@ -336,7 +336,8 @@ hp_zx1_insert_memory (struct agp_memory *mem, off_t pg_start, int type)
        off_t j, io_pg_start;
        int io_pg_count;
-        if (type != 0 || mem->type != 0) {
+        if (type != mem->type ||
+                agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type)) {
                return -EINVAL;
        }
@@ -380,7 +381,8 @@ hp_zx1_remove_memory (struct agp_memory *mem, off_t pg_start, int type)
        struct _hp_private *hp = &hp_private;
        int i, io_pg_start, io_pg_count;
-        if (type != 0 || mem->type != 0) {
+        if (type != mem->type ||
+                agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type)) {
                return -EINVAL;
        }
diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index e0135873ba9d..0689bf6b0183 100644
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -235,3 +235,18 @@ config HW_RANDOM_PPC4XX
         module will be called ppc4xx-rng.
         If unsure, say N.
+config UML_RANDOM
+        depends on UML
+        tristate "Hardware random number generator"
+        help
+          This option enables UML's "hardware" random number generator.  It
+          attaches itself to the host's /dev/random, supplying as much entropy
+          as the host has, rather than the small amount the UML gets from its
+          own drivers.  It registers itself as a standard hardware random number
+          generator, major 10, minor 183, and the canonical device name is
+          /dev/hwrng.
+          The way to make use of this is to install the rng-tools package
+          (check your distro, or download from
+          http://sourceforge.net/projects/gkernel/).  rngd periodically reads
+          /dev/hwrng and injects the entropy into /dev/random.
diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c
index 75f1cbd61c17..fd699ccecf5b 100644
--- a/drivers/char/hw_random/virtio-rng.c
+++ b/drivers/char/hw_random/virtio-rng.c
@@ -23,6 +23,7 @@
 #include <linux/spinlock.h>
 #include <linux/virtio.h>
 #include <linux/virtio_rng.h>
+#include <linux/module.h>
 static struct virtqueue *vq;
 static unsigned int data_avail;
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 8fc04b4f311f..145179033716 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -26,6 +26,7 @@
 #include <linux/bootmem.h>
 #include <linux/splice.h>
 #include <linux/pfn.h>
+#include <linux/export.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
diff --git a/drivers/char/ps3flash.c b/drivers/char/ps3flash.c
index d0c57c2e2909..6abdde4da2b7 100644
--- a/drivers/char/ps3flash.c
+++ b/drivers/char/ps3flash.c
@@ -22,6 +22,7 @@
 #include <linux/miscdevice.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
+#include <linux/module.h>
 #include <asm/lv1call.h>
 #include <asm/ps3stor.h>
diff --git a/drivers/char/ramoops.c b/drivers/char/ramoops.c
index 810aff9e750f..7c7f42a1f880 100644
--- a/drivers/char/ramoops.c
+++ b/drivers/char/ramoops.c
@@ -26,6 +26,7 @@
 #include <linux/module.h>
 #include <linux/kmsg_dump.h>
 #include <linux/time.h>
+#include <linux/err.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/platform_device.h>
diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c
index a1f68af4ccf4..eedd5474850c 100644
--- a/drivers/char/ttyprintk.c
+++ b/drivers/char/ttyprintk.c
@@ -17,6 +17,7 @@
 #include <linux/device.h>
 #include <linux/serial.h>
 #include <linux/tty.h>
+#include <linux/export.h>
 struct ttyprintk_port {
        struct tty_port port;
@@ -170,7 +171,7 @@ static const struct tty_operations ttyprintk_ops = {
        .ioctl = tpk_ioctl,
 };
-struct tty_port_operations null_ops = { };
+static struct tty_port_operations null_ops = { };
 static struct tty_driver *ttyprintk_driver;
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index fb68b1295373..8e3c46d67cb3 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -19,8 +19,10 @@
 */
 #include <linux/cdev.h>
 #include <linux/debugfs.h>
+#include <linux/completion.h>
 #include <linux/device.h>
 #include <linux/err.h>
+#include <linux/freezer.h>
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/list.h>
@@ -32,6 +34,7 @@
 #include <linux/virtio_console.h>
 #include <linux/wait.h>
 #include <linux/workqueue.h>
+#include <linux/module.h>
 #include "../tty/hvc/hvc_console.h"
 /*
@@ -73,6 +76,7 @@ struct ports_driver_data {
 static struct ports_driver_data pdrvdata;
 DEFINE_SPINLOCK(pdrvdata_lock);
+DECLARE_COMPLETION(early_console_added);
 /* This struct holds information that's relevant only for console ports */
 struct console {
@@ -151,6 +155,10 @@ struct ports_device {
        int chr_major;
 };
+struct port_stats {
+        unsigned long bytes_sent, bytes_received, bytes_discarded;
+};
 /* This struct holds the per-port data */
 struct port {
        /* Next port in the list, head is in the ports_device */
@@ -179,6 +187,13 @@ struct port {
        struct dentry *debugfs_file;
        /*
+         * Keep count of the bytes sent, received and discarded for
+         * this port for accounting and debugging purposes.  These
+         * counts are not reset across port open / close events.
+         */
+        struct port_stats stats;
+        /*
         * The entries in this struct will be valid if this port is
         * hooked up to an hvc console
         */
@@ -347,17 +362,19 @@ fail:
 }
 /* Callers should take appropriate locks */
-static void *get_inbuf(struct port *port)
+static struct port_buffer *get_inbuf(struct port *port)
 {
        struct port_buffer *buf;
-        struct virtqueue *vq;
        unsigned int len;
-        vq = port->in_vq;
+        if (port->inbuf)
-        buf = virtqueue_get_buf(vq, &len);
+                return port->inbuf;
+        buf = virtqueue_get_buf(port->in_vq, &len);
        if (buf) {
                buf->len = len;
                buf->offset = 0;
+                port->stats.bytes_received += len;
        }
        return buf;
 }
@@ -384,32 +401,27 @@ static int add_inbuf(struct virtqueue *vq, struct port_buffer *buf)
 static void discard_port_data(struct port *port)
 {
        struct port_buffer *buf;
-        struct virtqueue *vq;
+        unsigned int err;
-        unsigned int len;
-        int ret;
        if (!port->portdev) {
                /* Device has been unplugged.  vqs are already gone. */
                return;
        }
-        vq = port->in_vq;
+        buf = get_inbuf(port);
-        if (port->inbuf)
-                buf = port->inbuf;
-        else
-                buf = virtqueue_get_buf(vq, &len);
-        ret = 0;
+        err = 0;
        while (buf) {
-                if (add_inbuf(vq, buf) < 0) {
+                port->stats.bytes_discarded += buf->len - buf->offset;
-                        ret++;
+                if (add_inbuf(port->in_vq, buf) < 0) {
+                        err++;
                        free_buf(buf);
                }
-                buf = virtqueue_get_buf(vq, &len);
+                port->inbuf = NULL;
+                buf = get_inbuf(port);
        }
-        port->inbuf = NULL;
+        if (err)
-        if (ret)
                dev_warn(port->dev, "Errors adding %d buffers back to vq\n",
-                         ret);
+                         err);
 }
 static bool port_has_data(struct port *port)
@@ -417,18 +429,12 @@ static bool port_has_data(struct port *port)
        unsigned long flags;
        bool ret;
+        ret = false;
        spin_lock_irqsave(&port->inbuf_lock, flags);
-        if (port->inbuf) {
-                ret = true;
-                goto out;
-        }
        port->inbuf = get_inbuf(port);
-        if (port->inbuf) {
+        if (port->inbuf)
                ret = true;
-                goto out;
-        }
-        ret = false;
-out:
        spin_unlock_irqrestore(&port->inbuf_lock, flags);
        return ret;
 }
@@ -529,6 +535,8 @@ static ssize_t send_buf(struct port *port, void *in_buf, size_t in_count,
                cpu_relax();
 done:
        spin_unlock_irqrestore(&port->outvq_lock, flags);
+        port->stats.bytes_sent += in_count;
        /*
         * We're expected to return the amount of data we wrote -- all
         * of it
@@ -633,8 +641,8 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
                if (filp->f_flags & O_NONBLOCK)
                        return -EAGAIN;
-                ret = wait_event_interruptible(port->waitqueue,
+                ret = wait_event_freezable(port->waitqueue,
-                                               !will_read_block(port));
+                                           !will_read_block(port));
                if (ret < 0)
                        return ret;
        }
@@ -677,8 +685,8 @@ static ssize_t port_fops_write(struct file *filp, const char __user *ubuf,
                if (nonblock)
                        return -EAGAIN;
-                ret = wait_event_interruptible(port->waitqueue,
+                ret = wait_event_freezable(port->waitqueue,
-                                               !will_write_block(port));
+                                           !will_write_block(port));
                if (ret < 0)
                        return ret;
        }
@@ -1059,6 +1067,14 @@ static ssize_t debugfs_read(struct file *filp, char __user *ubuf,
        out_offset += snprintf(buf + out_offset, out_count - out_offset,
                               "outvq_full: %d\n", port->outvq_full);
        out_offset += snprintf(buf + out_offset, out_count - out_offset,
+                               "bytes_sent: %lu\n", port->stats.bytes_sent);
+        out_offset += snprintf(buf + out_offset, out_count - out_offset,
+                               "bytes_received: %lu\n",
+                               port->stats.bytes_received);
+        out_offset += snprintf(buf + out_offset, out_count - out_offset,
+                               "bytes_discarded: %lu\n",
+                               port->stats.bytes_discarded);
+        out_offset += snprintf(buf + out_offset, out_count - out_offset,
                               "is_console: %s\n",
                               is_console_port(port) ? "yes" : "no");
        out_offset += snprintf(buf + out_offset, out_count - out_offset,
@@ -1143,6 +1159,7 @@ static int add_port(struct ports_device *portdev, u32 id)
        port->cons.ws.ws_row = port->cons.ws.ws_col = 0;
        port->host_connected = port->guest_connected = false;
+        port->stats = (struct port_stats) { 0 };
        port->outvq_full = false;
@@ -1352,6 +1369,7 @@ static void handle_control_message(struct ports_device *portdev,
                        break;
                init_port_console(port);
+                complete(&early_console_added);
                /*
                 * Could remove the port here in case init fails - but
                 * have to notify the host first.
@@ -1394,6 +1412,13 @@ static void handle_control_message(struct ports_device *portdev,
                break;
        case VIRTIO_CONSOLE_PORT_NAME:
                /*
+                 * If we woke up after hibernation, we can get this
+                 * again.  Skip it in that case.
+                 */
+                if (port->name)
+                        break;
+                /*
                 * Skip the size of the header and the cpkt to get the size
                 * of the name that was sent
                 */
@@ -1481,8 +1506,7 @@ static void in_intr(struct virtqueue *vq)
                return;
        spin_lock_irqsave(&port->inbuf_lock, flags);
-        if (!port->inbuf)
+        port->inbuf = get_inbuf(port);
-                port->inbuf = get_inbuf(port);
        /*
         * Don't queue up data when port is closed.  This condition
@@ -1563,7 +1587,7 @@ static int init_vqs(struct ports_device *portdev)
        portdev->out_vqs = kmalloc(nr_ports * sizeof(struct virtqueue *),
                                   GFP_KERNEL);
        if (!vqs || !io_callbacks || !io_names || !portdev->in_vqs ||
-                        !portdev->out_vqs) {
+            !portdev->out_vqs) {
                err = -ENOMEM;
                goto free;
        }
@@ -1648,6 +1672,10 @@ static int __devinit virtcons_probe(struct virtio_device *vdev)
        struct ports_device *portdev;
        int err;
        bool multiport;
+        bool early = early_put_chars != NULL;
+        /* Ensure to read early_put_chars now */
+        barrier();
        portdev = kmalloc(sizeof(*portdev), GFP_KERNEL);
        if (!portdev) {
@@ -1675,13 +1703,11 @@ static int __devinit virtcons_probe(struct virtio_device *vdev)
        multiport = false;
        portdev->config.max_nr_ports = 1;
-        if (virtio_has_feature(vdev, VIRTIO_CONSOLE_F_MULTIPORT)) {
+        if (virtio_config_val(vdev, VIRTIO_CONSOLE_F_MULTIPORT,
+                              offsetof(struct virtio_console_config,
+                                       max_nr_ports),
+                              &portdev->config.max_nr_ports) == 0)
                multiport = true;
-                vdev->config->get(vdev, offsetof(struct virtio_console_config,
-                                                 max_nr_ports),
-                                  &portdev->config.max_nr_ports,
-                                  sizeof(portdev->config.max_nr_ports));
-        }
        err = init_vqs(portdev);
        if (err < 0) {
@@ -1719,6 +1745,19 @@ static int __devinit virtcons_probe(struct virtio_device *vdev)
        __send_control_msg(portdev, VIRTIO_CONSOLE_BAD_ID,
                           VIRTIO_CONSOLE_DEVICE_READY, 1);
+        /*
+         * If there was an early virtio console, assume that there are no
+         * other consoles. We need to wait until the hvc_alloc matches the
+         * hvc_instantiate, otherwise tty_open will complain, resulting in
+         * a "Warning: unable to open an initial console" boot failure.
+         * Without multiport this is done in add_port above. With multiport
+         * this might take some host<->guest communication - thus we have to
+         * wait.
+         */
+        if (multiport && early)
+                wait_for_completion(&early_console_added);
        return 0;
 free_vqs:
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
index 32a77becc098..ca09bc421ddb 100644
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
@@ -31,6 +31,7 @@
 #include <linux/clockchips.h>
 #include <linux/sh_timer.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 struct sh_cmt_priv {
        void __iomem *mapbase;
diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c
index 40630cb98237..db8d5955bad4 100644
--- a/drivers/clocksource/sh_mtu2.c
+++ b/drivers/clocksource/sh_mtu2.c
@@ -30,6 +30,7 @@
 #include <linux/clockchips.h>
 #include <linux/sh_timer.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 struct sh_mtu2_priv {
        void __iomem *mapbase;
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c
index 808135768617..079e96ad44e8 100644
--- a/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
@@ -31,6 +31,7 @@
 #include <linux/clockchips.h>
 #include <linux/sh_timer.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 struct sh_tmu_priv {
        void __iomem *mapbase;
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index faf7c5217848..c5072a91e848 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -15,6 +15,7 @@
 #include <linux/cpu.h>
 #include <linux/sysfs.h>
 #include <linux/cpufreq.h>
+#include <linux/module.h>
 #include <linux/jiffies.h>
 #include <linux/percpu.h>
 #include <linux/kobject.h>
diff --git a/drivers/cpufreq/db8500-cpufreq.c b/drivers/cpufreq/db8500-cpufreq.c
index d90456a809f9..edaa987621ea 100644
--- a/drivers/cpufreq/db8500-cpufreq.c
+++ b/drivers/cpufreq/db8500-cpufreq.c
@@ -12,30 +12,35 @@
 #include <linux/cpufreq.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
-#include <linux/mfd/db8500-prcmu.h>
+#include <linux/mfd/dbx500-prcmu.h>
 #include <mach/id.h>
 static struct cpufreq_frequency_table freq_table[] = {
        [0] = {
                .index = 0,
-                .frequency = 300000,
+                .frequency = 200000,
        },
        [1] = {
                .index = 1,
-                .frequency = 600000,
+                .frequency = 300000,
        },
        [2] = {
-                /* Used for MAX_OPP, if available */
                .index = 2,
-                .frequency = CPUFREQ_TABLE_END,
+                .frequency = 600000,
        },
        [3] = {
+                /* Used for MAX_OPP, if available */
                .index = 3,
                .frequency = CPUFREQ_TABLE_END,
        },
+        [4] = {
+                .index = 4,
+                .frequency = CPUFREQ_TABLE_END,
+        },
 };
 static enum arm_opp idx2opp[] = {
+        ARM_EXTCLK,
        ARM_50_OPP,
        ARM_100_OPP,
        ARM_MAX_OPP
@@ -72,13 +77,13 @@ static int db8500_cpufreq_target(struct cpufreq_policy *policy,
        freqs.old = policy->cur;
        freqs.new = freq_table[idx].frequency;
-        freqs.cpu = policy->cpu;
        if (freqs.old == freqs.new)
                return 0;
        /* pre-change notification */
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        for_each_cpu(freqs.cpu, policy->cpus)
+                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
        /* request the PRCM unit for opp change */
        if (prcmu_set_arm_opp(idx2opp[idx])) {
@@ -87,7 +92,8 @@ static int db8500_cpufreq_target(struct cpufreq_policy *policy,
        }
        /* post change notification */
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        for_each_cpu(freqs.cpu, policy->cpus)
+                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
        return 0;
 }
@@ -104,16 +110,18 @@ static unsigned int db8500_cpufreq_getspeed(unsigned int cpu)
 static int __cpuinit db8500_cpufreq_init(struct cpufreq_policy *policy)
 {
        int res;
-        int i;
        BUILD_BUG_ON(ARRAY_SIZE(idx2opp) + 1 != ARRAY_SIZE(freq_table));
-        if (cpu_is_u8500v2() && !prcmu_is_u8400()) {
+        if (!prcmu_is_u8400()) {
-                freq_table[0].frequency = 400000;
+                freq_table[1].frequency = 400000;
-                freq_table[1].frequency = 800000;
+                freq_table[2].frequency = 800000;
                if (prcmu_has_arm_maxopp())
-                        freq_table[2].frequency = 1000000;
+                        freq_table[3].frequency = 1000000;
        }
+        pr_info("db8500-cpufreq : Available frequencies:\n");
+        while (freq_table[i].frequency != CPUFREQ_TABLE_END)
+                pr_info("  %d Mhz\n", freq_table[i++].frequency/1000);
        /* get policy fields based on the table */
        res = cpufreq_frequency_table_cpuinfo(policy, freq_table);
@@ -127,10 +135,6 @@ static int __cpuinit db8500_cpufreq_init(struct cpufreq_policy *policy)
        policy->min = policy->cpuinfo.min_freq;
        policy->max = policy->cpuinfo.max_freq;
        policy->cur = db8500_cpufreq_getspeed(policy->cpu);
-        for (i = 0; freq_table[i].frequency != policy->cur; i++)
-                ;
        policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
        /*
diff --git a/drivers/cpufreq/e_powersaver.c b/drivers/cpufreq/e_powersaver.c
index 35a257dd4bb7..4bd6815d317b 100644
--- a/drivers/cpufreq/e_powersaver.c
+++ b/drivers/cpufreq/e_powersaver.c
@@ -19,6 +19,11 @@
 #include <asm/msr.h>
 #include <asm/tsc.h>
+#if defined CONFIG_ACPI_PROCESSOR || defined CONFIG_ACPI_PROCESSOR_MODULE
+#include <linux/acpi.h>
+#include <acpi/processor.h>
+#endif
 #define EPS_BRAND_C7M   0
 #define EPS_BRAND_C7    1
 #define EPS_BRAND_EDEN  2
@@ -27,11 +32,59 @@
 struct eps_cpu_data {
        u32 fsb;
+#if defined CONFIG_ACPI_PROCESSOR || defined CONFIG_ACPI_PROCESSOR_MODULE
+        u32 bios_limit;
+#endif
        struct cpufreq_frequency_table freq_table[];
 };
 static struct eps_cpu_data *eps_cpu[NR_CPUS];
+/* Module parameters */
+static int freq_failsafe_off;
+static int voltage_failsafe_off;
+static int set_max_voltage;
+#if defined CONFIG_ACPI_PROCESSOR || defined CONFIG_ACPI_PROCESSOR_MODULE
+static int ignore_acpi_limit;
+static struct acpi_processor_performance *eps_acpi_cpu_perf;
+/* Minimum necessary to get acpi_processor_get_bios_limit() working */
+static int eps_acpi_init(void)
+{
+        eps_acpi_cpu_perf = kzalloc(sizeof(struct acpi_processor_performance),
+                                      GFP_KERNEL);
+        if (!eps_acpi_cpu_perf)
+                return -ENOMEM;
+        if (!zalloc_cpumask_var(&eps_acpi_cpu_perf->shared_cpu_map,
+                                                                GFP_KERNEL)) {
+                kfree(eps_acpi_cpu_perf);
+                eps_acpi_cpu_perf = NULL;
+                return -ENOMEM;
+        }
+        if (acpi_processor_register_performance(eps_acpi_cpu_perf, 0)) {
+                free_cpumask_var(eps_acpi_cpu_perf->shared_cpu_map);
+                kfree(eps_acpi_cpu_perf);
+                eps_acpi_cpu_perf = NULL;
+                return -EIO;
+        }
+        return 0;
+}
+static int eps_acpi_exit(struct cpufreq_policy *policy)
+{
+        if (eps_acpi_cpu_perf) {
+                acpi_processor_unregister_performance(eps_acpi_cpu_perf, 0);
+                free_cpumask_var(eps_acpi_cpu_perf->shared_cpu_map);
+                kfree(eps_acpi_cpu_perf);
+                eps_acpi_cpu_perf = NULL;
+        }
+        return 0;
+}
+#endif
 static unsigned int eps_get(unsigned int cpu)
 {
@@ -164,6 +217,9 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
        int k, step, voltage;
        int ret;
        int states;
+#if defined CONFIG_ACPI_PROCESSOR || defined CONFIG_ACPI_PROCESSOR_MODULE
+        unsigned int limit;
+#endif
        if (policy->cpu != 0)
                return -ENODEV;
@@ -244,11 +300,62 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
                return -EINVAL;
        if (current_voltage > 0x1f || max_voltage > 0x1f)
                return -EINVAL;
-        if (max_voltage < min_voltage)
+        if (max_voltage < min_voltage
+            || current_voltage < min_voltage
+            || current_voltage > max_voltage)
                return -EINVAL;
+        /* Check for systems using underclocked CPU */
+        if (!freq_failsafe_off && max_multiplier != current_multiplier) {
+                printk(KERN_INFO "eps: Your processor is running at different "
+                        "frequency then its maximum. Aborting.\n");
+                printk(KERN_INFO "eps: You can use freq_failsafe_off option "
+                        "to disable this check.\n");
+                return -EINVAL;
+        }
+        if (!voltage_failsafe_off && max_voltage != current_voltage) {
+                printk(KERN_INFO "eps: Your processor is running at different "
+                        "voltage then its maximum. Aborting.\n");
+                printk(KERN_INFO "eps: You can use voltage_failsafe_off "
+                        "option to disable this check.\n");
+                return -EINVAL;
+        }
        /* Calc FSB speed */
        fsb = cpu_khz / current_multiplier;
+#if defined CONFIG_ACPI_PROCESSOR || defined CONFIG_ACPI_PROCESSOR_MODULE
+        /* Check for ACPI processor speed limit */
+        if (!ignore_acpi_limit && !eps_acpi_init()) {
+                if (!acpi_processor_get_bios_limit(policy->cpu, &limit)) {
+                        printk(KERN_INFO "eps: ACPI limit %u.%uGHz\n",
+                                limit/1000000,
+                                (limit%1000000)/10000);
+                        eps_acpi_exit(policy);
+                        /* Check if max_multiplier is in BIOS limits */
+                        if (limit && max_multiplier * fsb > limit) {
+                                printk(KERN_INFO "eps: Aborting.\n");
+                                return -EINVAL;
+                        }
+                }
+        }
+#endif
+        /* Allow user to set lower maximum voltage then that reported
+         * by processor */
+        if (brand == EPS_BRAND_C7M && set_max_voltage) {
+                u32 v;
+                /* Change mV to something hardware can use */
+                v = (set_max_voltage - 700) / 16;
+                /* Check if voltage is within limits */
+                if (v >= min_voltage && v <= max_voltage) {
+                        printk(KERN_INFO "eps: Setting %dmV as maximum.\n",
+                                v * 16 + 700);
+                        max_voltage = v;
+                }
+        }
        /* Calc number of p-states supported */
        if (brand == EPS_BRAND_C7M)
                states = max_multiplier - min_multiplier + 1;
@@ -265,6 +372,9 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
        /* Copy basic values */
        centaur->fsb = fsb;
+#if defined CONFIG_ACPI_PROCESSOR || defined CONFIG_ACPI_PROCESSOR_MODULE
+        centaur->bios_limit = limit;
+#endif
        /* Fill frequency and MSR value table */
        f_table = &centaur->freq_table[0];
@@ -303,17 +413,7 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
 static int eps_cpu_exit(struct cpufreq_policy *policy)
 {
        unsigned int cpu = policy->cpu;
-        struct eps_cpu_data *centaur;
-        u32 lo, hi;
-        if (eps_cpu[cpu] == NULL)
-                return -ENODEV;
-        centaur = eps_cpu[cpu];
-        /* Get max frequency */
-        rdmsr(MSR_IA32_PERF_STATUS, lo, hi);
-        /* Set max frequency */
-        eps_set_state(centaur, cpu, hi & 0xffff);
        /* Bye */
        cpufreq_frequency_table_put_attr(policy->cpu);
        kfree(eps_cpu[cpu]);
@@ -359,6 +459,19 @@ static void __exit eps_exit(void)
        cpufreq_unregister_driver(&eps_driver);
 }
+/* Allow user to overclock his machine or to change frequency to higher after
+ * unloading module */
+module_param(freq_failsafe_off, int, 0644);
+MODULE_PARM_DESC(freq_failsafe_off, "Disable current vs max frequency check");
+module_param(voltage_failsafe_off, int, 0644);
+MODULE_PARM_DESC(voltage_failsafe_off, "Disable current vs max voltage check");
+#if defined CONFIG_ACPI_PROCESSOR || defined CONFIG_ACPI_PROCESSOR_MODULE
+module_param(ignore_acpi_limit, int, 0644);
+MODULE_PARM_DESC(ignore_acpi_limit, "Don't check ACPI's processor speed limit");
+#endif
+module_param(set_max_voltage, int, 0644);
+MODULE_PARM_DESC(set_max_voltage, "Set maximum CPU voltage (mV) C7-M only");
 MODULE_AUTHOR("Rafal Bilski <rafalbilski@interia.pl>");
 MODULE_DESCRIPTION("Enhanced PowerSaver driver for VIA C7 CPU's.");
 MODULE_LICENSE("GPL");
diff --git a/drivers/cpufreq/exynos4210-cpufreq.c b/drivers/cpufreq/exynos4210-cpufreq.c
index b7c3a84c4cfa..ab9741fab92e 100644
--- a/drivers/cpufreq/exynos4210-cpufreq.c
+++ b/drivers/cpufreq/exynos4210-cpufreq.c
@@ -17,6 +17,8 @@
 #include <linux/slab.h>
 #include <linux/regulator/consumer.h>
 #include <linux/cpufreq.h>
+#include <linux/notifier.h>
+#include <linux/suspend.h>
 #include <mach/map.h>
 #include <mach/regs-clock.h>
@@ -36,6 +38,10 @@ static struct regulator *int_regulator;
 static struct cpufreq_freqs freqs;
 static unsigned int memtype;
+static unsigned int locking_frequency;
+static bool frequency_locked;
+static DEFINE_MUTEX(cpufreq_lock);
 enum exynos4_memory_type {
        DDR2 = 4,
        LPDDR2,
@@ -405,22 +411,32 @@ static int exynos4_target(struct cpufreq_policy *policy,
 {
        unsigned int index, old_index;
        unsigned int arm_volt, int_volt;
+        int err = -EINVAL;
        freqs.old = exynos4_getspeed(policy->cpu);
+        mutex_lock(&cpufreq_lock);
+        if (frequency_locked && target_freq != locking_frequency) {
+                err = -EAGAIN;
+                goto out;
+        }
        if (cpufreq_frequency_table_target(policy, exynos4_freq_table,
                                           freqs.old, relation, &old_index))
-                return -EINVAL;
+                goto out;
        if (cpufreq_frequency_table_target(policy, exynos4_freq_table,
                                           target_freq, relation, &index))
-                return -EINVAL;
+                goto out;
+        err = 0;
        freqs.new = exynos4_freq_table[index].frequency;
        freqs.cpu = policy->cpu;
        if (freqs.new == freqs.old)
-                return 0;
+                goto out;
        /* get the voltage value */
        arm_volt = exynos4_volt_table[index].arm_volt;
@@ -447,10 +463,16 @@ static int exynos4_target(struct cpufreq_policy *policy,
        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-        return 0;
+out:
+        mutex_unlock(&cpufreq_lock);
+        return err;
 }
 #ifdef CONFIG_PM
+/*
+ * These suspend/resume are used as syscore_ops, it is already too
+ * late to set regulator voltages at this stage.
+ */
 static int exynos4_cpufreq_suspend(struct cpufreq_policy *policy)
 {
        return 0;
@@ -462,8 +484,82 @@ static int exynos4_cpufreq_resume(struct cpufreq_policy *policy)
 }
 #endif
+/**
+ * exynos4_cpufreq_pm_notifier - block CPUFREQ's activities in suspend-resume
+ *                      context
+ * @notifier
+ * @pm_event
+ * @v
+ *
+ * While frequency_locked == true, target() ignores every frequency but
+ * locking_frequency. The locking_frequency value is the initial frequency,
+ * which is set by the bootloader. In order to eliminate possible
+ * inconsistency in clock values, we save and restore frequencies during
+ * suspend and resume and block CPUFREQ activities. Note that the standard
+ * suspend/resume cannot be used as they are too deep (syscore_ops) for
+ * regulator actions.
+ */
+static int exynos4_cpufreq_pm_notifier(struct notifier_block *notifier,
+                                       unsigned long pm_event, void *v)
+{
+        struct cpufreq_policy *policy = cpufreq_cpu_get(0); /* boot CPU */
+        static unsigned int saved_frequency;
+        unsigned int temp;
+        mutex_lock(&cpufreq_lock);
+        switch (pm_event) {
+        case PM_SUSPEND_PREPARE:
+                if (frequency_locked)
+                        goto out;
+                frequency_locked = true;
+                if (locking_frequency) {
+                        saved_frequency = exynos4_getspeed(0);
+                        mutex_unlock(&cpufreq_lock);
+                        exynos4_target(policy, locking_frequency,
+                                       CPUFREQ_RELATION_H);
+                        mutex_lock(&cpufreq_lock);
+                }
+                break;
+        case PM_POST_SUSPEND:
+                if (saved_frequency) {
+                        /*
+                         * While frequency_locked, only locking_frequency
+                         * is valid for target(). In order to use
+                         * saved_frequency while keeping frequency_locked,
+                         * we temporarly overwrite locking_frequency.
+                         */
+                        temp = locking_frequency;
+                        locking_frequency = saved_frequency;
+                        mutex_unlock(&cpufreq_lock);
+                        exynos4_target(policy, locking_frequency,
+                                       CPUFREQ_RELATION_H);
+                        mutex_lock(&cpufreq_lock);
+                        locking_frequency = temp;
+                }
+                frequency_locked = false;
+                break;
+        }
+out:
+        mutex_unlock(&cpufreq_lock);
+        return NOTIFY_OK;
+}
+static struct notifier_block exynos4_cpufreq_nb = {
+        .notifier_call = exynos4_cpufreq_pm_notifier,
+};
 static int exynos4_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
+        int ret;
        policy->cur = policy->min = policy->max = exynos4_getspeed(policy->cpu);
        cpufreq_frequency_table_get_attr(exynos4_freq_table, policy->cpu);
@@ -479,16 +575,35 @@ static int exynos4_cpufreq_cpu_init(struct cpufreq_policy *policy)
         */
        cpumask_setall(policy->cpus);
-        return cpufreq_frequency_table_cpuinfo(policy, exynos4_freq_table);
+        ret = cpufreq_frequency_table_cpuinfo(policy, exynos4_freq_table);
+        if (ret)
+                return ret;
+        cpufreq_frequency_table_get_attr(exynos4_freq_table, policy->cpu);
+        return 0;
+}
+static int exynos4_cpufreq_cpu_exit(struct cpufreq_policy *policy)
+{
+        cpufreq_frequency_table_put_attr(policy->cpu);
+        return 0;
 }
+static struct freq_attr *exynos4_cpufreq_attr[] = {
+        &cpufreq_freq_attr_scaling_available_freqs,
+        NULL,
+};
 static struct cpufreq_driver exynos4_driver = {
        .flags          = CPUFREQ_STICKY,
        .verify         = exynos4_verify_speed,
        .target         = exynos4_target,
        .get            = exynos4_getspeed,
        .init           = exynos4_cpufreq_cpu_init,
+        .exit           = exynos4_cpufreq_cpu_exit,
        .name           = "exynos4_cpufreq",
+        .attr           = exynos4_cpufreq_attr,
 #ifdef CONFIG_PM
        .suspend        = exynos4_cpufreq_suspend,
        .resume         = exynos4_cpufreq_resume,
@@ -501,6 +616,8 @@ static int __init exynos4_cpufreq_init(void)
        if (IS_ERR(cpu_clk))
                return PTR_ERR(cpu_clk);
+        locking_frequency = exynos4_getspeed(0);
        moutcore = clk_get(NULL, "moutcore");
        if (IS_ERR(moutcore))
                goto out;
@@ -540,6 +657,8 @@ static int __init exynos4_cpufreq_init(void)
                printk(KERN_DEBUG "%s: memtype= 0x%x\n", __func__, memtype);
        }
+        register_pm_notifier(&exynos4_cpufreq_nb);
        return cpufreq_register_driver(&exynos4_driver);
 out:
diff --git a/drivers/cpufreq/s3c64xx-cpufreq.c b/drivers/cpufreq/s3c64xx-cpufreq.c
index b8d1d205e1ef..3475f65aeec6 100644
--- a/drivers/cpufreq/s3c64xx-cpufreq.c
+++ b/drivers/cpufreq/s3c64xx-cpufreq.c
@@ -15,6 +15,7 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/regulator/consumer.h>
+#include <linux/module.h>
 static struct clk *armclk;
 static struct regulator *vddarm;
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 0df014110097..becd6d99203b 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -17,6 +17,7 @@
 #include <linux/cpuidle.h>
 #include <linux/ktime.h>
 #include <linux/hrtimer.h>
+#include <linux/module.h>
 #include <trace/events/power.h>
 #include "cpuidle.h"
diff --git a/drivers/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c
index f62fde21e962..3b8fce20f023 100644
--- a/drivers/cpuidle/governors/ladder.c
+++ b/drivers/cpuidle/governors/ladder.c
@@ -15,7 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/cpuidle.h>
 #include <linux/pm_qos.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/jiffies.h>
 #include <asm/io.h>
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index 3600f1955e48..00275244ce2f 100644
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -19,6 +19,7 @@
 #include <linux/tick.h>
 #include <linux/sched.h>
 #include <linux/math64.h>
+#include <linux/module.h>
 #define BUCKETS 12
 #define INTERVALS 8
diff --git a/drivers/crypto/mv_cesa.c b/drivers/crypto/mv_cesa.c
index 3cf303ee3fe3..5c6f56f21443 100644
--- a/drivers/crypto/mv_cesa.c
+++ b/drivers/crypto/mv_cesa.c
@@ -15,6 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/scatterlist.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <crypto/internal/hash.h>
 #include <crypto/sha.h>
diff --git a/drivers/dca/dca-core.c b/drivers/dca/dca-core.c
index 25ec0bb05198..bc6f5faa1e9e 100644
--- a/drivers/dca/dca-core.c
+++ b/drivers/dca/dca-core.c
@@ -28,6 +28,7 @@
 #include <linux/device.h>
 #include <linux/dca.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #define DCA_VERSION "1.12.1"
diff --git a/drivers/dca/dca-sysfs.c b/drivers/dca/dca-sysfs.c
index 5e8f335e6f6e..591b6597c00a 100644
--- a/drivers/dca/dca-sysfs.c
+++ b/drivers/dca/dca-sysfs.c
@@ -27,6 +27,7 @@
 #include <linux/err.h>
 #include <linux/dca.h>
 #include <linux/gfp.h>
+#include <linux/export.h>
 static struct class *dca_class;
 static struct idr dca_idr;
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 2e3b3d38c465..ab8f469f5cf8 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -193,7 +193,8 @@ config ARCH_HAS_ASYNC_TX_FIND_CHANNEL
 config PL330_DMA
        tristate "DMA API Driver for PL330"
        select DMA_ENGINE
-        depends on PL330
+        depends on ARM_AMBA
+        select PL330
        help
          Select if your platform has one or more PL330 DMACs.
          You need to provide platform specific settings via
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index be21e3f138a8..b7cbd1ab1db1 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -66,32 +66,29 @@
 *    after the final transfer signalled by LBREQ or LSREQ.  The DMAC
 *    will then move to the next LLI entry.
 *
- * Only the former works sanely with scatter lists, so we only implement
- * the DMAC flow control method.  However, peripherals which use the LBREQ
- * and LSREQ signals (eg, MMCI) are unable to use this mode, which through
- * these hardware restrictions prevents them from using scatter DMA.
- *
 * Global TODO:
 * - Break out common code from arch/arm/mach-s3c64xx and share
 */
-#include <linux/device.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/interrupt.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/dma-mapping.h>
-#include <linux/dmapool.h>
-#include <linux/dmaengine.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/pl08x.h>
 #include <linux/debugfs.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/dmaengine.h>
+#include <linux/dmapool.h>
+#include <linux/dma-mapping.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/pm_runtime.h>
 #include <linux/seq_file.h>
+#include <linux/slab.h>
 #include <asm/hardware/pl080.h>
 #define DRIVER_NAME     "pl08xdmac"
+static struct amba_driver pl08x_amba_driver;
 /**
 * struct vendor_data - vendor-specific config parameters for PL08x derivatives
 * @channels: the number of channels available in this variant
@@ -126,7 +123,8 @@ struct pl08x_lli {
 * @phy_chans: array of data for the physical channels
 * @pool: a pool for the LLI descriptors
 * @pool_ctr: counter of LLIs in the pool
- * @lli_buses: bitmask to or in to LLI pointer selecting AHB port for LLI fetches
+ * @lli_buses: bitmask to or in to LLI pointer selecting AHB port for LLI
+ * fetches
 * @mem_buses: set to indicate memory transfers on AHB2.
 * @lock: a spinlock for this struct
 */
@@ -149,14 +147,6 @@ struct pl08x_driver_data {
 * PL08X specific defines
 */
-/*
- * Memory boundaries: the manual for PL08x says that the controller
- * cannot read past a 1KiB boundary, so these defines are used to
- * create transfer LLIs that do not cross such boundaries.
- */
-#define PL08X_BOUNDARY_SHIFT            (10)    /* 1KB 0x400 */
-#define PL08X_BOUNDARY_SIZE             (1 << PL08X_BOUNDARY_SHIFT)
 /* Size (bytes) of each LLI buffer allocated for one transfer */
 # define PL08X_LLI_TSFR_SIZE    0x2000
@@ -272,7 +262,6 @@ static void pl08x_resume_phy_chan(struct pl08x_phy_chan *ch)
        writel(val, ch->base + PL080_CH_CONFIG);
 }
 /*
 * pl08x_terminate_phy_chan() stops the channel, clears the FIFO and
 * clears any pending interrupt status.  This should not be used for
@@ -363,7 +352,9 @@ static u32 pl08x_getbytes_chan(struct pl08x_dma_chan *plchan)
        if (!list_empty(&plchan->pend_list)) {
                struct pl08x_txd *txdi;
                list_for_each_entry(txdi, &plchan->pend_list, node) {
-                        bytes += txdi->len;
+                        struct pl08x_sg *dsg;
+                        list_for_each_entry(dsg, &txd->dsg_list, node)
+                                bytes += dsg->len;
                }
        }
@@ -407,6 +398,7 @@ pl08x_get_phy_channel(struct pl08x_driver_data *pl08x,
                return NULL;
        }
+        pm_runtime_get_sync(&pl08x->adev->dev);
        return ch;
 }
@@ -420,6 +412,8 @@ static inline void pl08x_put_phy_channel(struct pl08x_driver_data *pl08x,
        /* Stop the channel and clear its interrupts */
        pl08x_terminate_phy_chan(pl08x, ch);
+        pm_runtime_put(&pl08x->adev->dev);
        /* Mark it as free */
        ch->serving = NULL;
        spin_unlock_irqrestore(&ch->lock, flags);
@@ -499,36 +493,30 @@ struct pl08x_lli_build_data {
 };
 /*
- * Autoselect a master bus to use for the transfer this prefers the
+ * Autoselect a master bus to use for the transfer. Slave will be the chosen as
- * destination bus if both available if fixed address on one bus the
+ * victim in case src & dest are not similarly aligned. i.e. If after aligning
- * other will be chosen
+ * masters address with width requirements of transfer (by sending few byte by
+ * byte data), slave is still not aligned, then its width will be reduced to
+ * BYTE.
+ * - prefers the destination bus if both available
+ * - prefers bus with fixed address (i.e. peripheral)
 */
 static void pl08x_choose_master_bus(struct pl08x_lli_build_data *bd,
        struct pl08x_bus_data **mbus, struct pl08x_bus_data **sbus, u32 cctl)
 {
        if (!(cctl & PL080_CONTROL_DST_INCR)) {
-                *mbus = &bd->srcbus;
-                *sbus = &bd->dstbus;
-        } else if (!(cctl & PL080_CONTROL_SRC_INCR)) {
                *mbus = &bd->dstbus;
                *sbus = &bd->srcbus;
+        } else if (!(cctl & PL080_CONTROL_SRC_INCR)) {
+                *mbus = &bd->srcbus;
+                *sbus = &bd->dstbus;
        } else {
-                if (bd->dstbus.buswidth == 4) {
+                if (bd->dstbus.buswidth >= bd->srcbus.buswidth) {
                        *mbus = &bd->dstbus;
                        *sbus = &bd->srcbus;
-                } else if (bd->srcbus.buswidth == 4) {
+                } else {
-                        *mbus = &bd->srcbus;
-                        *sbus = &bd->dstbus;
-                } else if (bd->dstbus.buswidth == 2) {
-                        *mbus = &bd->dstbus;
-                        *sbus = &bd->srcbus;
-                } else if (bd->srcbus.buswidth == 2) {
                        *mbus = &bd->srcbus;
                        *sbus = &bd->dstbus;
-                } else {
-                        /* bd->srcbus.buswidth == 1 */
-                        *mbus = &bd->dstbus;
-                        *sbus = &bd->srcbus;
                }
        }
 }
@@ -547,7 +535,8 @@ static void pl08x_fill_lli_for_desc(struct pl08x_lli_build_data *bd,
        llis_va[num_llis].cctl = cctl;
        llis_va[num_llis].src = bd->srcbus.addr;
        llis_va[num_llis].dst = bd->dstbus.addr;
-        llis_va[num_llis].lli = llis_bus + (num_llis + 1) * sizeof(struct pl08x_lli);
+        llis_va[num_llis].lli = llis_bus + (num_llis + 1) *
+                sizeof(struct pl08x_lli);
        llis_va[num_llis].lli |= bd->lli_bus;
        if (cctl & PL080_CONTROL_SRC_INCR)
@@ -560,16 +549,12 @@ static void pl08x_fill_lli_for_desc(struct pl08x_lli_build_data *bd,
        bd->remainder -= len;
 }
-/*
+static inline void prep_byte_width_lli(struct pl08x_lli_build_data *bd,
- * Return number of bytes to fill to boundary, or len.
+                u32 *cctl, u32 len, int num_llis, size_t *total_bytes)
- * This calculation works for any value of addr.
- */
-static inline size_t pl08x_pre_boundary(u32 addr, size_t len)
 {
-        size_t boundary_len = PL08X_BOUNDARY_SIZE -
+        *cctl = pl08x_cctl_bits(*cctl, 1, 1, len);
-                        (addr & (PL08X_BOUNDARY_SIZE - 1));
+        pl08x_fill_lli_for_desc(bd, num_llis, len, *cctl);
+        (*total_bytes) += len;
-        return min(boundary_len, len);
 }
 /*
@@ -583,13 +568,12 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
        struct pl08x_bus_data *mbus, *sbus;
        struct pl08x_lli_build_data bd;
        int num_llis = 0;
-        u32 cctl;
+        u32 cctl, early_bytes = 0;
-        size_t max_bytes_per_lli;
+        size_t max_bytes_per_lli, total_bytes;
-        size_t total_bytes = 0;
        struct pl08x_lli *llis_va;
+        struct pl08x_sg *dsg;
-        txd->llis_va = dma_pool_alloc(pl08x->pool, GFP_NOWAIT,
+        txd->llis_va = dma_pool_alloc(pl08x->pool, GFP_NOWAIT, &txd->llis_bus);
-                                      &txd->llis_bus);
        if (!txd->llis_va) {
                dev_err(&pl08x->adev->dev, "%s no memory for llis\n", __func__);
                return 0;
@@ -597,13 +581,9 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
        pl08x->pool_ctr++;
-        /* Get the default CCTL */
-        cctl = txd->cctl;
        bd.txd = txd;
-        bd.srcbus.addr = txd->src_addr;
-        bd.dstbus.addr = txd->dst_addr;
        bd.lli_bus = (pl08x->lli_buses & PL08X_AHB2) ? PL080_LLI_LM_AHB2 : 0;
+        cctl = txd->cctl;
        /* Find maximum width of the source bus */
        bd.srcbus.maxwidth =
@@ -615,215 +595,179 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
                pl08x_get_bytes_for_cctl((cctl & PL080_CONTROL_DWIDTH_MASK) >>
                                       PL080_CONTROL_DWIDTH_SHIFT);
-        /* Set up the bus widths to the maximum */
+        list_for_each_entry(dsg, &txd->dsg_list, node) {
-        bd.srcbus.buswidth = bd.srcbus.maxwidth;
+                total_bytes = 0;
-        bd.dstbus.buswidth = bd.dstbus.maxwidth;
+                cctl = txd->cctl;
-        /*
+                bd.srcbus.addr = dsg->src_addr;
-         * Bytes transferred == tsize * MIN(buswidths), not max(buswidths)
+                bd.dstbus.addr = dsg->dst_addr;
-         */
+                bd.remainder = dsg->len;
-        max_bytes_per_lli = min(bd.srcbus.buswidth, bd.dstbus.buswidth) *
+                bd.srcbus.buswidth = bd.srcbus.maxwidth;
-                PL080_CONTROL_TRANSFER_SIZE_MASK;
+                bd.dstbus.buswidth = bd.dstbus.maxwidth;
-        /* We need to count this down to zero */
+                pl08x_choose_master_bus(&bd, &mbus, &sbus, cctl);
-        bd.remainder = txd->len;
-        /*
+                dev_vdbg(&pl08x->adev->dev, "src=0x%08x%s/%u dst=0x%08x%s/%u len=%zu\n",
-         * Choose bus to align to
+                        bd.srcbus.addr, cctl & PL080_CONTROL_SRC_INCR ? "+" : "",
-         * - prefers destination bus if both available
+                        bd.srcbus.buswidth,
-         * - if fixed address on one bus chooses other
+                        bd.dstbus.addr, cctl & PL080_CONTROL_DST_INCR ? "+" : "",
-         */
+                        bd.dstbus.buswidth,
-        pl08x_choose_master_bus(&bd, &mbus, &sbus, cctl);
+                        bd.remainder);
+                dev_vdbg(&pl08x->adev->dev, "mbus=%s sbus=%s\n",
-        dev_vdbg(&pl08x->adev->dev, "src=0x%08x%s/%u dst=0x%08x%s/%u len=%zu llimax=%zu\n",
+                        mbus == &bd.srcbus ? "src" : "dst",
-                 bd.srcbus.addr, cctl & PL080_CONTROL_SRC_INCR ? "+" : "",
+                        sbus == &bd.srcbus ? "src" : "dst");
-                 bd.srcbus.buswidth,
-                 bd.dstbus.addr, cctl & PL080_CONTROL_DST_INCR ? "+" : "",
-                 bd.dstbus.buswidth,
-                 bd.remainder, max_bytes_per_lli);
-        dev_vdbg(&pl08x->adev->dev, "mbus=%s sbus=%s\n",
-                 mbus == &bd.srcbus ? "src" : "dst",
-                 sbus == &bd.srcbus ? "src" : "dst");
-        if (txd->len < mbus->buswidth) {
-                /* Less than a bus width available - send as single bytes */
-                while (bd.remainder) {
-                        dev_vdbg(&pl08x->adev->dev,
-                                 "%s single byte LLIs for a transfer of "
-                                 "less than a bus width (remain 0x%08x)\n",
-                                 __func__, bd.remainder);
-                        cctl = pl08x_cctl_bits(cctl, 1, 1, 1);
-                        pl08x_fill_lli_for_desc(&bd, num_llis++, 1, cctl);
-                        total_bytes++;
-                }
-        } else {
-                /* Make one byte LLIs until master bus is aligned */
-                while ((mbus->addr) % (mbus->buswidth)) {
-                        dev_vdbg(&pl08x->adev->dev,
-                                "%s adjustment lli for less than bus width "
-                                 "(remain 0x%08x)\n",
-                                 __func__, bd.remainder);
-                        cctl = pl08x_cctl_bits(cctl, 1, 1, 1);
-                        pl08x_fill_lli_for_desc(&bd, num_llis++, 1, cctl);
-                        total_bytes++;
-                }
                /*
-                 * Master now aligned
+                 * Zero length is only allowed if all these requirements are
-                 * - if slave is not then we must set its width down
+                 * met:
+                 * - flow controller is peripheral.
+                 * - src.addr is aligned to src.width
+                 * - dst.addr is aligned to dst.width
+                 *
+                 * sg_len == 1 should be true, as there can be two cases here:
+                 *
+                 * - Memory addresses are contiguous and are not scattered.
+                 *   Here, Only one sg will be passed by user driver, with
+                 *   memory address and zero length. We pass this to controller
+                 *   and after the transfer it will receive the last burst
+                 *   request from peripheral and so transfer finishes.
+                 *
+                 * - Memory addresses are scattered and are not contiguous.
+                 *   Here, Obviously as DMA controller doesn't know when a lli's
+                 *   transfer gets over, it can't load next lli. So in this
+                 *   case, there has to be an assumption that only one lli is
+                 *   supported. Thus, we can't have scattered addresses.
                 */
-                if (sbus->addr % sbus->buswidth) {
+                if (!bd.remainder) {
-                        dev_dbg(&pl08x->adev->dev,
+                        u32 fc = (txd->ccfg & PL080_CONFIG_FLOW_CONTROL_MASK) >>
-                                "%s set down bus width to one byte\n",
+                                PL080_CONFIG_FLOW_CONTROL_SHIFT;
-                                 __func__);
+                        if (!((fc >= PL080_FLOW_SRC2DST_DST) &&
+                                        (fc <= PL080_FLOW_SRC2DST_SRC))) {
+                                dev_err(&pl08x->adev->dev, "%s sg len can't be zero",
+                                        __func__);
+                                return 0;
+                        }
+                        if ((bd.srcbus.addr % bd.srcbus.buswidth) ||
+                                        (bd.srcbus.addr % bd.srcbus.buswidth)) {
+                                dev_err(&pl08x->adev->dev,
+                                        "%s src & dst address must be aligned to src"
+                                        " & dst width if peripheral is flow controller",
+                                        __func__);
+                                return 0;
+                        }
-                        sbus->buswidth = 1;
+                        cctl = pl08x_cctl_bits(cctl, bd.srcbus.buswidth,
+                                        bd.dstbus.buswidth, 0);
+                        pl08x_fill_lli_for_desc(&bd, num_llis++, 0, cctl);
+                        break;
                }
                /*
-                 * Make largest possible LLIs until less than one bus
+                 * Send byte by byte for following cases
-                 * width left
+                 * - Less than a bus width available
+                 * - until master bus is aligned
                 */
-                while (bd.remainder > (mbus->buswidth - 1)) {
+                if (bd.remainder < mbus->buswidth)
-                        size_t lli_len, target_len, tsize, odd_bytes;
+                        early_bytes = bd.remainder;
+                else if ((mbus->addr) % (mbus->buswidth)) {
+                        early_bytes = mbus->buswidth - (mbus->addr) %
+                                (mbus->buswidth);
+                        if ((bd.remainder - early_bytes) < mbus->buswidth)
+                                early_bytes = bd.remainder;
+                }
+                if (early_bytes) {
+                        dev_vdbg(&pl08x->adev->dev,
+                                "%s byte width LLIs (remain 0x%08x)\n",
+                                __func__, bd.remainder);
+                        prep_byte_width_lli(&bd, &cctl, early_bytes, num_llis++,
+                                &total_bytes);
+                }
+                if (bd.remainder) {
                        /*
-                         * If enough left try to send max possible,
+                         * Master now aligned
-                         * otherwise try to send the remainder
+                         * - if slave is not then we must set its width down
                         */
-                        target_len = min(bd.remainder, max_bytes_per_lli);
+                        if (sbus->addr % sbus->buswidth) {
+                                dev_dbg(&pl08x->adev->dev,
+                                        "%s set down bus width to one byte\n",
+                                        __func__);
+                                sbus->buswidth = 1;
+                        }
                        /*
-                         * Set bus lengths for incrementing buses to the
+                         * Bytes transferred = tsize * src width, not
-                         * number of bytes which fill to next memory boundary,
+                         * MIN(buswidths)
-                         * limiting on the target length calculated above.
                         */
-                        if (cctl & PL080_CONTROL_SRC_INCR)
+                        max_bytes_per_lli = bd.srcbus.buswidth *
-                                bd.srcbus.fill_bytes =
+                                PL080_CONTROL_TRANSFER_SIZE_MASK;
-                                        pl08x_pre_boundary(bd.srcbus.addr,
+                        dev_vdbg(&pl08x->adev->dev,
-                                                target_len);
+                                "%s max bytes per lli = %zu\n",
-                        else
+                                __func__, max_bytes_per_lli);
-                                bd.srcbus.fill_bytes = target_len;
+                        /*
-                        if (cctl & PL080_CONTROL_DST_INCR)
+                         * Make largest possible LLIs until less than one bus
-                                bd.dstbus.fill_bytes =
+                         * width left
-                                        pl08x_pre_boundary(bd.dstbus.addr,
+                         */
-                                                target_len);
+                        while (bd.remainder > (mbus->buswidth - 1)) {
-                        else
+                                size_t lli_len, tsize, width;
-                                bd.dstbus.fill_bytes = target_len;
-                        /* Find the nearest */
-                        lli_len = min(bd.srcbus.fill_bytes,
-                                      bd.dstbus.fill_bytes);
-                        BUG_ON(lli_len > bd.remainder);
-                        if (lli_len <= 0) {
-                                dev_err(&pl08x->adev->dev,
-                                        "%s lli_len is %zu, <= 0\n",
-                                                __func__, lli_len);
-                                return 0;
-                        }
-                        if (lli_len == target_len) {
-                                /*
-                                 * Can send what we wanted.
-                                 * Maintain alignment
-                                 */
-                                lli_len = (lli_len/mbus->buswidth) *
-                                                        mbus->buswidth;
-                                odd_bytes = 0;
-                        } else {
                                /*
-                                 * So now we know how many bytes to transfer
+                                 * If enough left try to send max possible,
-                                 * to get to the nearest boundary.  The next
+                                 * otherwise try to send the remainder
-                                 * LLI will past the boundary.  However, we
-                                 * may be working to a boundary on the slave
-                                 * bus.  We need to ensure the master stays
-                                 * aligned, and that we are working in
-                                 * multiples of the bus widths.
                                 */
-                                odd_bytes = lli_len % mbus->buswidth;
+                                lli_len = min(bd.remainder, max_bytes_per_lli);
-                                lli_len -= odd_bytes;
-                        }
-                        if (lli_len) {
                                /*
-                                 * Check against minimum bus alignment:
+                                 * Check against maximum bus alignment:
-                                 * Calculate actual transfer size in relation
+                                 * Calculate actual transfer size in relation to
-                                 * to bus width an get a maximum remainder of
+                                 * bus width an get a maximum remainder of the
-                                 * the smallest bus width - 1
+                                 * highest bus width - 1
                                 */
-                                /* FIXME: use round_down()? */
+                                width = max(mbus->buswidth, sbus->buswidth);
-                                tsize = lli_len / min(mbus->buswidth,
+                                lli_len = (lli_len / width) * width;
-                                                      sbus->buswidth);
+                                tsize = lli_len / bd.srcbus.buswidth;
-                                lli_len = tsize * min(mbus->buswidth,
-                                                      sbus->buswidth);
-                                if (target_len != lli_len) {
-                                        dev_vdbg(&pl08x->adev->dev,
-                                        "%s can't send what we want. Desired 0x%08zx, lli of 0x%08zx bytes in txd of 0x%08zx\n",
-                                        __func__, target_len, lli_len, txd->len);
-                                }
-                                cctl = pl08x_cctl_bits(cctl,
-                                                       bd.srcbus.buswidth,
-                                                       bd.dstbus.buswidth,
-                                                       tsize);
                                dev_vdbg(&pl08x->adev->dev,
-                                        "%s fill lli with single lli chunk of size 0x%08zx (remainder 0x%08zx)\n",
+                                        "%s fill lli with single lli chunk of "
+                                        "size 0x%08zx (remainder 0x%08zx)\n",
                                        __func__, lli_len, bd.remainder);
+                                cctl = pl08x_cctl_bits(cctl, bd.srcbus.buswidth,
+                                        bd.dstbus.buswidth, tsize);
                                pl08x_fill_lli_for_desc(&bd, num_llis++,
-                                        lli_len, cctl);
+                                                lli_len, cctl);
                                total_bytes += lli_len;
                        }
+                        /*
-                        if (odd_bytes) {
+                         * Send any odd bytes
-                                /*
+                         */
-                                 * Creep past the boundary, maintaining
+                        if (bd.remainder) {
-                                 * master alignment
+                                dev_vdbg(&pl08x->adev->dev,
-                                 */
+                                        "%s align with boundary, send odd bytes (remain %zu)\n",
-                                int j;
+                                        __func__, bd.remainder);
-                                for (j = 0; (j < mbus->buswidth)
+                                prep_byte_width_lli(&bd, &cctl, bd.remainder,
-                                                && (bd.remainder); j++) {
+                                                num_llis++, &total_bytes);
-                                        cctl = pl08x_cctl_bits(cctl, 1, 1, 1);
-                                        dev_vdbg(&pl08x->adev->dev,
-                                                "%s align with boundary, single byte (remain 0x%08zx)\n",
-                                                __func__, bd.remainder);
-                                        pl08x_fill_lli_for_desc(&bd,
-                                                num_llis++, 1, cctl);
-                                        total_bytes++;
-                                }
                        }
                }
-                /*
+                if (total_bytes != dsg->len) {
-                 * Send any odd bytes
+                        dev_err(&pl08x->adev->dev,
-                 */
+                                "%s size of encoded lli:s don't match total txd, transferred 0x%08zx from size 0x%08zx\n",
-                while (bd.remainder) {
+                                __func__, total_bytes, dsg->len);
-                        cctl = pl08x_cctl_bits(cctl, 1, 1, 1);
+                        return 0;
-                        dev_vdbg(&pl08x->adev->dev,
-                                "%s align with boundary, single odd byte (remain %zu)\n",
-                                __func__, bd.remainder);
-                        pl08x_fill_lli_for_desc(&bd, num_llis++, 1, cctl);
-                        total_bytes++;
                }
-        }
-        if (total_bytes != txd->len) {
-                dev_err(&pl08x->adev->dev,
-                        "%s size of encoded lli:s don't match total txd, transferred 0x%08zx from size 0x%08zx\n",
-                        __func__, total_bytes, txd->len);
-                return 0;
-        }
-        if (num_llis >= MAX_NUM_TSFR_LLIS) {
+                if (num_llis >= MAX_NUM_TSFR_LLIS) {
-                dev_err(&pl08x->adev->dev,
+                        dev_err(&pl08x->adev->dev,
-                        "%s need to increase MAX_NUM_TSFR_LLIS from 0x%08x\n",
+                                "%s need to increase MAX_NUM_TSFR_LLIS from 0x%08x\n",
-                        __func__, (u32) MAX_NUM_TSFR_LLIS);
+                                __func__, (u32) MAX_NUM_TSFR_LLIS);
-                return 0;
+                        return 0;
+                }
        }
        llis_va = txd->llis_va;
@@ -856,11 +800,19 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
 static void pl08x_free_txd(struct pl08x_driver_data *pl08x,
                           struct pl08x_txd *txd)
 {
+        struct pl08x_sg *dsg, *_dsg;
        /* Free the LLI */
-        dma_pool_free(pl08x->pool, txd->llis_va, txd->llis_bus);
+        if (txd->llis_va)
+                dma_pool_free(pl08x->pool, txd->llis_va, txd->llis_bus);
        pl08x->pool_ctr--;
+        list_for_each_entry_safe(dsg, _dsg, &txd->dsg_list, node) {
+                list_del(&dsg->node);
+                kfree(dsg);
+        }
        kfree(txd);
 }
@@ -917,9 +869,7 @@ static int prep_phy_channel(struct pl08x_dma_chan *plchan,
         * need, but for slaves the physical signals may be muxed!
         * Can the platform allow us to use this channel?
         */
-        if (plchan->slave &&
+        if (plchan->slave && pl08x->pd->get_signal) {
-            ch->signal < 0 &&
-            pl08x->pd->get_signal) {
                ret = pl08x->pd->get_signal(plchan);
                if (ret < 0) {
                        dev_dbg(&pl08x->adev->dev,
@@ -1008,10 +958,8 @@ static struct dma_async_tx_descriptor *pl08x_prep_dma_interrupt(
 * If slaves are relying on interrupts to signal completion this function
 * must not be called with interrupts disabled.
 */
-static enum dma_status
+static enum dma_status pl08x_dma_tx_status(struct dma_chan *chan,
-pl08x_dma_tx_status(struct dma_chan *chan,
+                dma_cookie_t cookie, struct dma_tx_state *txstate)
-                    dma_cookie_t cookie,
-                    struct dma_tx_state *txstate)
 {
        struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);
        dma_cookie_t last_used;
@@ -1253,7 +1201,9 @@ static int pl08x_prep_channel_resources(struct pl08x_dma_chan *plchan,
        num_llis = pl08x_fill_llis_for_desc(pl08x, txd);
        if (!num_llis) {
-                kfree(txd);
+                spin_lock_irqsave(&plchan->lock, flags);
+                pl08x_free_txd(pl08x, txd);
+                spin_unlock_irqrestore(&plchan->lock, flags);
                return -EINVAL;
        }
@@ -1301,13 +1251,14 @@ static int pl08x_prep_channel_resources(struct pl08x_dma_chan *plchan,
 static struct pl08x_txd *pl08x_get_txd(struct pl08x_dma_chan *plchan,
        unsigned long flags)
 {
-        struct pl08x_txd *txd = kzalloc(sizeof(struct pl08x_txd), GFP_NOWAIT);
+        struct pl08x_txd *txd = kzalloc(sizeof(*txd), GFP_NOWAIT);
        if (txd) {
                dma_async_tx_descriptor_init(&txd->tx, &plchan->chan);
                txd->tx.flags = flags;
                txd->tx.tx_submit = pl08x_tx_submit;
                INIT_LIST_HEAD(&txd->node);
+                INIT_LIST_HEAD(&txd->dsg_list);
                /* Always enable error and terminal interrupts */
                txd->ccfg = PL080_CONFIG_ERR_IRQ_MASK |
@@ -1326,6 +1277,7 @@ static struct dma_async_tx_descriptor *pl08x_prep_dma_memcpy(
        struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);
        struct pl08x_driver_data *pl08x = plchan->host;
        struct pl08x_txd *txd;
+        struct pl08x_sg *dsg;
        int ret;
        txd = pl08x_get_txd(plchan, flags);
@@ -1335,10 +1287,19 @@ static struct dma_async_tx_descriptor *pl08x_prep_dma_memcpy(
                return NULL;
        }
+        dsg = kzalloc(sizeof(struct pl08x_sg), GFP_NOWAIT);
+        if (!dsg) {
+                pl08x_free_txd(pl08x, txd);
+                dev_err(&pl08x->adev->dev, "%s no memory for pl080 sg\n",
+                                __func__);
+                return NULL;
+        }
+        list_add_tail(&dsg->node, &txd->dsg_list);
        txd->direction = DMA_NONE;
-        txd->src_addr = src;
+        dsg->src_addr = src;
-        txd->dst_addr = dest;
+        dsg->dst_addr = dest;
-        txd->len = len;
+        dsg->len = len;
        /* Set platform data for m2m */
        txd->ccfg |= PL080_FLOW_MEM2MEM << PL080_CONFIG_FLOW_CONTROL_SHIFT;
@@ -1367,19 +1328,13 @@ static struct dma_async_tx_descriptor *pl08x_prep_slave_sg(
        struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);
        struct pl08x_driver_data *pl08x = plchan->host;
        struct pl08x_txd *txd;
-        int ret;
+        struct pl08x_sg *dsg;
+        struct scatterlist *sg;
-        /*
+        dma_addr_t slave_addr;
-         * Current implementation ASSUMES only one sg
+        int ret, tmp;
-         */
-        if (sg_len != 1) {
-                dev_err(&pl08x->adev->dev, "%s prepared too long sglist\n",
-                        __func__);
-                BUG();
-        }
        dev_dbg(&pl08x->adev->dev, "%s prepare transaction of %d bytes from %s\n",
-                __func__, sgl->length, plchan->name);
+                        __func__, sgl->length, plchan->name);
        txd = pl08x_get_txd(plchan, flags);
        if (!txd) {
@@ -1398,24 +1353,49 @@ static struct dma_async_tx_descriptor *pl08x_prep_slave_sg(
         * channel target address dynamically at runtime.
         */
        txd->direction = direction;
-        txd->len = sgl->length;
        if (direction == DMA_TO_DEVICE) {
-                txd->ccfg |= PL080_FLOW_MEM2PER << PL080_CONFIG_FLOW_CONTROL_SHIFT;
                txd->cctl = plchan->dst_cctl;
-                txd->src_addr = sgl->dma_address;
+                slave_addr = plchan->dst_addr;
-                txd->dst_addr = plchan->dst_addr;
        } else if (direction == DMA_FROM_DEVICE) {
-                txd->ccfg |= PL080_FLOW_PER2MEM << PL080_CONFIG_FLOW_CONTROL_SHIFT;
                txd->cctl = plchan->src_cctl;
-                txd->src_addr = plchan->src_addr;
+                slave_addr = plchan->src_addr;
-                txd->dst_addr = sgl->dma_address;
        } else {
+                pl08x_free_txd(pl08x, txd);
                dev_err(&pl08x->adev->dev,
                        "%s direction unsupported\n", __func__);
                return NULL;
        }
+        if (plchan->cd->device_fc)
+                tmp = (direction == DMA_TO_DEVICE) ? PL080_FLOW_MEM2PER_PER :
+                        PL080_FLOW_PER2MEM_PER;
+        else
+                tmp = (direction == DMA_TO_DEVICE) ? PL080_FLOW_MEM2PER :
+                        PL080_FLOW_PER2MEM;
+        txd->ccfg |= tmp << PL080_CONFIG_FLOW_CONTROL_SHIFT;
+        for_each_sg(sgl, sg, sg_len, tmp) {
+                dsg = kzalloc(sizeof(struct pl08x_sg), GFP_NOWAIT);
+                if (!dsg) {
+                        pl08x_free_txd(pl08x, txd);
+                        dev_err(&pl08x->adev->dev, "%s no mem for pl080 sg\n",
+                                        __func__);
+                        return NULL;
+                }
+                list_add_tail(&dsg->node, &txd->dsg_list);
+                dsg->len = sg_dma_len(sg);
+                if (direction == DMA_TO_DEVICE) {
+                        dsg->src_addr = sg_phys(sg);
+                        dsg->dst_addr = slave_addr;
+                } else {
+                        dsg->src_addr = slave_addr;
+                        dsg->dst_addr = sg_phys(sg);
+                }
+        }
        ret = pl08x_prep_channel_resources(plchan, txd);
        if (ret)
                return NULL;
@@ -1489,9 +1469,15 @@ static int pl08x_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
 bool pl08x_filter_id(struct dma_chan *chan, void *chan_id)
 {
-        struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);
+        struct pl08x_dma_chan *plchan;
        char *name = chan_id;
+        /* Reject channels for devices not bound to this driver */
+        if (chan->device->dev->driver != &pl08x_amba_driver.drv)
+                return false;
+        plchan = to_pl08x_chan(chan);
        /* Check that the channel is not taken! */
        if (!strcmp(plchan->name, name))
                return true;
@@ -1507,34 +1493,34 @@ bool pl08x_filter_id(struct dma_chan *chan, void *chan_id)
 */
 static void pl08x_ensure_on(struct pl08x_driver_data *pl08x)
 {
-        u32 val;
+        writel(PL080_CONFIG_ENABLE, pl08x->base + PL080_CONFIG);
-        val = readl(pl08x->base + PL080_CONFIG);
-        val &= ~(PL080_CONFIG_M2_BE | PL080_CONFIG_M1_BE | PL080_CONFIG_ENABLE);
-        /* We implicitly clear bit 1 and that means little-endian mode */
-        val |= PL080_CONFIG_ENABLE;
-        writel(val, pl08x->base + PL080_CONFIG);
 }
 static void pl08x_unmap_buffers(struct pl08x_txd *txd)
 {
        struct device *dev = txd->tx.chan->device->dev;
+        struct pl08x_sg *dsg;
        if (!(txd->tx.flags & DMA_COMPL_SKIP_SRC_UNMAP)) {
                if (txd->tx.flags & DMA_COMPL_SRC_UNMAP_SINGLE)
-                        dma_unmap_single(dev, txd->src_addr, txd->len,
+                        list_for_each_entry(dsg, &txd->dsg_list, node)
-                                DMA_TO_DEVICE);
+                                dma_unmap_single(dev, dsg->src_addr, dsg->len,
-                else
+                                                DMA_TO_DEVICE);
-                        dma_unmap_page(dev, txd->src_addr, txd->len,
+                else {
-                                DMA_TO_DEVICE);
+                        list_for_each_entry(dsg, &txd->dsg_list, node)
+                                dma_unmap_page(dev, dsg->src_addr, dsg->len,
+                                                DMA_TO_DEVICE);
+                }
        }
        if (!(txd->tx.flags & DMA_COMPL_SKIP_DEST_UNMAP)) {
                if (txd->tx.flags & DMA_COMPL_DEST_UNMAP_SINGLE)
-                        dma_unmap_single(dev, txd->dst_addr, txd->len,
+                        list_for_each_entry(dsg, &txd->dsg_list, node)
-                                DMA_FROM_DEVICE);
+                                dma_unmap_single(dev, dsg->dst_addr, dsg->len,
+                                                DMA_FROM_DEVICE);
                else
-                        dma_unmap_page(dev, txd->dst_addr, txd->len,
+                        list_for_each_entry(dsg, &txd->dsg_list, node)
-                                DMA_FROM_DEVICE);
+                                dma_unmap_page(dev, dsg->dst_addr, dsg->len,
+                                                DMA_FROM_DEVICE);
        }
 }
@@ -1589,8 +1575,8 @@ static void pl08x_tasklet(unsigned long data)
                 */
                list_for_each_entry(waiting, &pl08x->memcpy.channels,
                                    chan.device_node) {
-                  if (waiting->state == PL08X_CHAN_WAITING &&
+                        if (waiting->state == PL08X_CHAN_WAITING &&
-                            waiting->waiting != NULL) {
+                                waiting->waiting != NULL) {
                                int ret;
                                /* This should REALLY not fail now */
@@ -1630,38 +1616,40 @@ static void pl08x_tasklet(unsigned long data)
 static irqreturn_t pl08x_irq(int irq, void *dev)
 {
        struct pl08x_driver_data *pl08x = dev;
-        u32 mask = 0;
+        u32 mask = 0, err, tc, i;
-        u32 val;
-        int i;
+        /* check & clear - ERR & TC interrupts */
+        err = readl(pl08x->base + PL080_ERR_STATUS);
-        val = readl(pl08x->base + PL080_ERR_STATUS);
+        if (err) {
-        if (val) {
+                dev_err(&pl08x->adev->dev, "%s error interrupt, register value 0x%08x\n",
-                /* An error interrupt (on one or more channels) */
+                        __func__, err);
-                dev_err(&pl08x->adev->dev,
+                writel(err, pl08x->base + PL080_ERR_CLEAR);
-                        "%s error interrupt, register value 0x%08x\n",
-                                __func__, val);
-                /*
-                 * Simply clear ALL PL08X error interrupts,
-                 * regardless of channel and cause
-                 * FIXME: should be 0x00000003 on PL081 really.
-                 */
-                writel(0x000000FF, pl08x->base + PL080_ERR_CLEAR);
        }
-        val = readl(pl08x->base + PL080_INT_STATUS);
+        tc = readl(pl08x->base + PL080_INT_STATUS);
+        if (tc)
+                writel(tc, pl08x->base + PL080_TC_CLEAR);
+        if (!err && !tc)
+                return IRQ_NONE;
        for (i = 0; i < pl08x->vd->channels; i++) {
-                if ((1 << i) & val) {
+                if (((1 << i) & err) || ((1 << i) & tc)) {
                        /* Locate physical channel */
                        struct pl08x_phy_chan *phychan = &pl08x->phy_chans[i];
                        struct pl08x_dma_chan *plchan = phychan->serving;
+                        if (!plchan) {
+                                dev_err(&pl08x->adev->dev,
+                                        "%s Error TC interrupt on unused channel: 0x%08x\n",
+                                        __func__, i);
+                                continue;
+                        }
                        /* Schedule tasklet on this channel */
                        tasklet_schedule(&plchan->tasklet);
                        mask |= (1 << i);
                }
        }
-        /* Clear only the terminal interrupts on channels we processed */
-        writel(mask, pl08x->base + PL080_TC_CLEAR);
        return mask ? IRQ_HANDLED : IRQ_NONE;
 }
@@ -1685,9 +1673,7 @@ static void pl08x_dma_slave_init(struct pl08x_dma_chan *chan)
 * Make a local wrapper to hold required data
 */
 static int pl08x_dma_init_virtual_channels(struct pl08x_driver_data *pl08x,
-                                           struct dma_device *dmadev,
+                struct dma_device *dmadev, unsigned int channels, bool slave)
-                                           unsigned int channels,
-                                           bool slave)
 {
        struct pl08x_dma_chan *chan;
        int i;
@@ -1700,7 +1686,7 @@ static int pl08x_dma_init_virtual_channels(struct pl08x_driver_data *pl08x,
         * to cope with that situation.
         */
        for (i = 0; i < channels; i++) {
-                chan = kzalloc(sizeof(struct pl08x_dma_chan), GFP_KERNEL);
+                chan = kzalloc(sizeof(*chan), GFP_KERNEL);
                if (!chan) {
                        dev_err(&pl08x->adev->dev,
                                "%s no memory for channel\n", __func__);
@@ -1728,7 +1714,7 @@ static int pl08x_dma_init_virtual_channels(struct pl08x_driver_data *pl08x,
                        kfree(chan);
                        continue;
                }
-                dev_info(&pl08x->adev->dev,
+                dev_dbg(&pl08x->adev->dev,
                         "initialize virtual channel \"%s\"\n",
                         chan->name);
@@ -1837,9 +1823,9 @@ static const struct file_operations pl08x_debugfs_operations = {
 static void init_pl08x_debugfs(struct pl08x_driver_data *pl08x)
 {
        /* Expose a simple debugfs interface to view all clocks */
-        (void) debugfs_create_file(dev_name(&pl08x->adev->dev), S_IFREG | S_IRUGO,
+        (void) debugfs_create_file(dev_name(&pl08x->adev->dev),
-                                   NULL, pl08x,
+                        S_IFREG | S_IRUGO, NULL, pl08x,
-                                   &pl08x_debugfs_operations);
+                        &pl08x_debugfs_operations);
 }
 #else
@@ -1860,12 +1846,15 @@ static int pl08x_probe(struct amba_device *adev, const struct amba_id *id)
                return ret;
        /* Create the driver state holder */
-        pl08x = kzalloc(sizeof(struct pl08x_driver_data), GFP_KERNEL);
+        pl08x = kzalloc(sizeof(*pl08x), GFP_KERNEL);
        if (!pl08x) {
                ret = -ENOMEM;
                goto out_no_pl08x;
        }
+        pm_runtime_set_active(&adev->dev);
+        pm_runtime_enable(&adev->dev);
        /* Initialize memcpy engine */
        dma_cap_set(DMA_MEMCPY, pl08x->memcpy.cap_mask);
        pl08x->memcpy.dev = &adev->dev;
@@ -1939,7 +1928,7 @@ static int pl08x_probe(struct amba_device *adev, const struct amba_id *id)
        }
        /* Initialize physical channels */
-        pl08x->phy_chans = kmalloc((vd->channels * sizeof(struct pl08x_phy_chan)),
+        pl08x->phy_chans = kmalloc((vd->channels * sizeof(*pl08x->phy_chans)),
                        GFP_KERNEL);
        if (!pl08x->phy_chans) {
                dev_err(&adev->dev, "%s failed to allocate "
@@ -1956,9 +1945,8 @@ static int pl08x_probe(struct amba_device *adev, const struct amba_id *id)
                spin_lock_init(&ch->lock);
                ch->serving = NULL;
                ch->signal = -1;
-                dev_info(&adev->dev,
+                dev_dbg(&adev->dev, "physical channel %d is %s\n",
-                         "physical channel %d is %s\n", i,
+                        i, pl08x_phy_channel_busy(ch) ? "BUSY" : "FREE");
-                         pl08x_phy_channel_busy(ch) ? "BUSY" : "FREE");
        }
        /* Register as many memcpy channels as there are physical channels */
@@ -1974,8 +1962,7 @@ static int pl08x_probe(struct amba_device *adev, const struct amba_id *id)
        /* Register slave channels */
        ret = pl08x_dma_init_virtual_channels(pl08x, &pl08x->slave,
-                                              pl08x->pd->num_slave_channels,
+                        pl08x->pd->num_slave_channels, true);
-                                              true);
        if (ret <= 0) {
                dev_warn(&pl08x->adev->dev,
                        "%s failed to enumerate slave channels - %d\n",
@@ -2005,6 +1992,8 @@ static int pl08x_probe(struct amba_device *adev, const struct amba_id *id)
        dev_info(&pl08x->adev->dev, "DMA: PL%03x rev%u at 0x%08llx irq %d\n",
                 amba_part(adev), amba_rev(adev),
                 (unsigned long long)adev->res.start, adev->irq[0]);
+        pm_runtime_put(&adev->dev);
        return 0;
 out_no_slave_reg:
@@ -2023,6 +2012,9 @@ out_no_ioremap:
        dma_pool_destroy(pl08x->pool);
 out_no_lli_pool:
 out_no_platdata:
+        pm_runtime_put(&adev->dev);
+        pm_runtime_disable(&adev->dev);
        kfree(pl08x);
 out_no_pl08x:
        amba_release_regions(adev);
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index 6a483eac7b3f..fcfa0a8b5c59 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -107,10 +107,11 @@ static struct at_desc *atc_desc_get(struct at_dma_chan *atchan)
 {
        struct at_desc *desc, *_desc;
        struct at_desc *ret = NULL;
+        unsigned long flags;
        unsigned int i = 0;
        LIST_HEAD(tmp_list);
-        spin_lock_bh(&atchan->lock);
+        spin_lock_irqsave(&atchan->lock, flags);
        list_for_each_entry_safe(desc, _desc, &atchan->free_list, desc_node) {
                i++;
                if (async_tx_test_ack(&desc->txd)) {
@@ -121,7 +122,7 @@ static struct at_desc *atc_desc_get(struct at_dma_chan *atchan)
                dev_dbg(chan2dev(&atchan->chan_common),
                                "desc %p not ACKed\n", desc);
        }
-        spin_unlock_bh(&atchan->lock);
+        spin_unlock_irqrestore(&atchan->lock, flags);
        dev_vdbg(chan2dev(&atchan->chan_common),
                "scanned %u descriptors on freelist\n", i);
@@ -129,9 +130,9 @@ static struct at_desc *atc_desc_get(struct at_dma_chan *atchan)
        if (!ret) {
                ret = atc_alloc_descriptor(&atchan->chan_common, GFP_ATOMIC);
                if (ret) {
-                        spin_lock_bh(&atchan->lock);
+                        spin_lock_irqsave(&atchan->lock, flags);
                        atchan->descs_allocated++;
-                        spin_unlock_bh(&atchan->lock);
+                        spin_unlock_irqrestore(&atchan->lock, flags);
                } else {
                        dev_err(chan2dev(&atchan->chan_common),
                                        "not enough descriptors available\n");
@@ -150,8 +151,9 @@ static void atc_desc_put(struct at_dma_chan *atchan, struct at_desc *desc)
 {
        if (desc) {
                struct at_desc *child;
+                unsigned long flags;
-                spin_lock_bh(&atchan->lock);
+                spin_lock_irqsave(&atchan->lock, flags);
                list_for_each_entry(child, &desc->tx_list, desc_node)
                        dev_vdbg(chan2dev(&atchan->chan_common),
                                        "moving child desc %p to freelist\n",
@@ -160,7 +162,7 @@ static void atc_desc_put(struct at_dma_chan *atchan, struct at_desc *desc)
                dev_vdbg(chan2dev(&atchan->chan_common),
                         "moving desc %p to freelist\n", desc);
                list_add(&desc->desc_node, &atchan->free_list);
-                spin_unlock_bh(&atchan->lock);
+                spin_unlock_irqrestore(&atchan->lock, flags);
        }
 }
@@ -299,7 +301,7 @@ atc_chain_complete(struct at_dma_chan *atchan, struct at_desc *desc)
        /* for cyclic transfers,
         * no need to replay callback function while stopping */
-        if (!test_bit(ATC_IS_CYCLIC, &atchan->status)) {
+        if (!atc_chan_is_cyclic(atchan)) {
                dma_async_tx_callback   callback = txd->callback;
                void                    *param = txd->callback_param;
@@ -471,16 +473,17 @@ static void atc_handle_cyclic(struct at_dma_chan *atchan)
 static void atc_tasklet(unsigned long data)
 {
        struct at_dma_chan *atchan = (struct at_dma_chan *)data;
+        unsigned long flags;
-        spin_lock(&atchan->lock);
+        spin_lock_irqsave(&atchan->lock, flags);
        if (test_and_clear_bit(ATC_IS_ERROR, &atchan->status))
                atc_handle_error(atchan);
-        else if (test_bit(ATC_IS_CYCLIC, &atchan->status))
+        else if (atc_chan_is_cyclic(atchan))
                atc_handle_cyclic(atchan);
        else
                atc_advance_work(atchan);
-        spin_unlock(&atchan->lock);
+        spin_unlock_irqrestore(&atchan->lock, flags);
 }
 static irqreturn_t at_dma_interrupt(int irq, void *dev_id)
@@ -539,8 +542,9 @@ static dma_cookie_t atc_tx_submit(struct dma_async_tx_descriptor *tx)
        struct at_desc          *desc = txd_to_at_desc(tx);
        struct at_dma_chan      *atchan = to_at_dma_chan(tx->chan);
        dma_cookie_t            cookie;
+        unsigned long           flags;
-        spin_lock_bh(&atchan->lock);
+        spin_lock_irqsave(&atchan->lock, flags);
        cookie = atc_assign_cookie(atchan, desc);
        if (list_empty(&atchan->active_list)) {
@@ -554,7 +558,7 @@ static dma_cookie_t atc_tx_submit(struct dma_async_tx_descriptor *tx)
                list_add_tail(&desc->desc_node, &atchan->queue);
        }
-        spin_unlock_bh(&atchan->lock);
+        spin_unlock_irqrestore(&atchan->lock, flags);
        return cookie;
 }
@@ -927,28 +931,29 @@ static int atc_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
        struct at_dma_chan      *atchan = to_at_dma_chan(chan);
        struct at_dma           *atdma = to_at_dma(chan->device);
        int                     chan_id = atchan->chan_common.chan_id;
+        unsigned long           flags;
        LIST_HEAD(list);
        dev_vdbg(chan2dev(chan), "atc_control (%d)\n", cmd);
        if (cmd == DMA_PAUSE) {
-                spin_lock_bh(&atchan->lock);
+                spin_lock_irqsave(&atchan->lock, flags);
                dma_writel(atdma, CHER, AT_DMA_SUSP(chan_id));
                set_bit(ATC_IS_PAUSED, &atchan->status);
-                spin_unlock_bh(&atchan->lock);
+                spin_unlock_irqrestore(&atchan->lock, flags);
        } else if (cmd == DMA_RESUME) {
-                if (!test_bit(ATC_IS_PAUSED, &atchan->status))
+                if (!atc_chan_is_paused(atchan))
                        return 0;
-                spin_lock_bh(&atchan->lock);
+                spin_lock_irqsave(&atchan->lock, flags);
                dma_writel(atdma, CHDR, AT_DMA_RES(chan_id));
                clear_bit(ATC_IS_PAUSED, &atchan->status);
-                spin_unlock_bh(&atchan->lock);
+                spin_unlock_irqrestore(&atchan->lock, flags);
        } else if (cmd == DMA_TERMINATE_ALL) {
                struct at_desc  *desc, *_desc;
                /*
@@ -957,7 +962,7 @@ static int atc_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
                 * channel. We still have to poll the channel enable bit due
                 * to AHB/HSB limitations.
                 */
-                spin_lock_bh(&atchan->lock);
+                spin_lock_irqsave(&atchan->lock, flags);
                /* disabling channel: must also remove suspend state */
                dma_writel(atdma, CHDR, AT_DMA_RES(chan_id) | atchan->mask);
@@ -978,7 +983,7 @@ static int atc_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
                /* if channel dedicated to cyclic operations, free it */
                clear_bit(ATC_IS_CYCLIC, &atchan->status);
-                spin_unlock_bh(&atchan->lock);
+                spin_unlock_irqrestore(&atchan->lock, flags);
        } else {
                return -ENXIO;
        }
@@ -1004,9 +1009,10 @@ atc_tx_status(struct dma_chan *chan,
        struct at_dma_chan      *atchan = to_at_dma_chan(chan);
        dma_cookie_t            last_used;
        dma_cookie_t            last_complete;
+        unsigned long           flags;
        enum dma_status         ret;
-        spin_lock_bh(&atchan->lock);
+        spin_lock_irqsave(&atchan->lock, flags);
        last_complete = atchan->completed_cookie;
        last_used = chan->cookie;
@@ -1021,7 +1027,7 @@ atc_tx_status(struct dma_chan *chan,
                ret = dma_async_is_complete(cookie, last_complete, last_used);
        }
-        spin_unlock_bh(&atchan->lock);
+        spin_unlock_irqrestore(&atchan->lock, flags);
        if (ret != DMA_SUCCESS)
                dma_set_tx_state(txstate, last_complete, last_used,
@@ -1029,7 +1035,7 @@ atc_tx_status(struct dma_chan *chan,
        else
                dma_set_tx_state(txstate, last_complete, last_used, 0);
-        if (test_bit(ATC_IS_PAUSED, &atchan->status))
+        if (atc_chan_is_paused(atchan))
                ret = DMA_PAUSED;
        dev_vdbg(chan2dev(chan), "tx_status %d: cookie = %d (d%d, u%d)\n",
@@ -1046,18 +1052,19 @@ atc_tx_status(struct dma_chan *chan,
 static void atc_issue_pending(struct dma_chan *chan)
 {
        struct at_dma_chan      *atchan = to_at_dma_chan(chan);
+        unsigned long           flags;
        dev_vdbg(chan2dev(chan), "issue_pending\n");
        /* Not needed for cyclic transfers */
-        if (test_bit(ATC_IS_CYCLIC, &atchan->status))
+        if (atc_chan_is_cyclic(atchan))
                return;
-        spin_lock_bh(&atchan->lock);
+        spin_lock_irqsave(&atchan->lock, flags);
        if (!atc_chan_is_enabled(atchan)) {
                atc_advance_work(atchan);
        }
-        spin_unlock_bh(&atchan->lock);
+        spin_unlock_irqrestore(&atchan->lock, flags);
 }
 /**
@@ -1073,6 +1080,7 @@ static int atc_alloc_chan_resources(struct dma_chan *chan)
        struct at_dma           *atdma = to_at_dma(chan->device);
        struct at_desc          *desc;
        struct at_dma_slave     *atslave;
+        unsigned long           flags;
        int                     i;
        u32                     cfg;
        LIST_HEAD(tmp_list);
@@ -1116,11 +1124,11 @@ static int atc_alloc_chan_resources(struct dma_chan *chan)
                list_add_tail(&desc->desc_node, &tmp_list);
        }
-        spin_lock_bh(&atchan->lock);
+        spin_lock_irqsave(&atchan->lock, flags);
        atchan->descs_allocated = i;
        list_splice(&tmp_list, &atchan->free_list);
        atchan->completed_cookie = chan->cookie = 1;
-        spin_unlock_bh(&atchan->lock);
+        spin_unlock_irqrestore(&atchan->lock, flags);
        /* channel parameters */
        channel_writel(atchan, CFG, cfg);
@@ -1260,12 +1268,11 @@ static int __init at_dma_probe(struct platform_device *pdev)
        /* initialize channels related values */
        INIT_LIST_HEAD(&atdma->dma_common.channels);
-        for (i = 0; i < pdata->nr_channels; i++, atdma->dma_common.chancnt++) {
+        for (i = 0; i < pdata->nr_channels; i++) {
                struct at_dma_chan      *atchan = &atdma->chan[i];
                atchan->chan_common.device = &atdma->dma_common;
                atchan->chan_common.cookie = atchan->completed_cookie = 1;
-                atchan->chan_common.chan_id = i;
                list_add_tail(&atchan->chan_common.device_node,
                                &atdma->dma_common.channels);
@@ -1293,22 +1300,20 @@ static int __init at_dma_probe(struct platform_device *pdev)
        if (dma_has_cap(DMA_MEMCPY, atdma->dma_common.cap_mask))
                atdma->dma_common.device_prep_dma_memcpy = atc_prep_dma_memcpy;
-        if (dma_has_cap(DMA_SLAVE, atdma->dma_common.cap_mask))
+        if (dma_has_cap(DMA_SLAVE, atdma->dma_common.cap_mask)) {
                atdma->dma_common.device_prep_slave_sg = atc_prep_slave_sg;
+                /* controller can do slave DMA: can trigger cyclic transfers */
-        if (dma_has_cap(DMA_CYCLIC, atdma->dma_common.cap_mask))
+                dma_cap_set(DMA_CYCLIC, atdma->dma_common.cap_mask);
                atdma->dma_common.device_prep_dma_cyclic = atc_prep_dma_cyclic;
-        if (dma_has_cap(DMA_SLAVE, atdma->dma_common.cap_mask) ||
-            dma_has_cap(DMA_CYCLIC, atdma->dma_common.cap_mask))
                atdma->dma_common.device_control = atc_control;
+        }
        dma_writel(atdma, EN, AT_DMA_ENABLE);
        dev_info(&pdev->dev, "Atmel AHB DMA Controller ( %s%s), %d channels\n",
          dma_has_cap(DMA_MEMCPY, atdma->dma_common.cap_mask) ? "cpy " : "",
          dma_has_cap(DMA_SLAVE, atdma->dma_common.cap_mask)  ? "slave " : "",
-          atdma->dma_common.chancnt);
+          pdata->nr_channels);
        dma_async_device_register(&atdma->dma_common);
@@ -1377,27 +1382,112 @@ static void at_dma_shutdown(struct platform_device *pdev)
        clk_disable(atdma->clk);
 }
+static int at_dma_prepare(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct at_dma *atdma = platform_get_drvdata(pdev);
+        struct dma_chan *chan, *_chan;
+        list_for_each_entry_safe(chan, _chan, &atdma->dma_common.channels,
+                        device_node) {
+                struct at_dma_chan *atchan = to_at_dma_chan(chan);
+                /* wait for transaction completion (except in cyclic case) */
+                if (atc_chan_is_enabled(atchan) && !atc_chan_is_cyclic(atchan))
+                        return -EAGAIN;
+        }
+        return 0;
+}
+static void atc_suspend_cyclic(struct at_dma_chan *atchan)
+{
+        struct dma_chan *chan = &atchan->chan_common;
+        /* Channel should be paused by user
+         * do it anyway even if it is not done already */
+        if (!atc_chan_is_paused(atchan)) {
+                dev_warn(chan2dev(chan),
+                "cyclic channel not paused, should be done by channel user\n");
+                atc_control(chan, DMA_PAUSE, 0);
+        }
+        /* now preserve additional data for cyclic operations */
+        /* next descriptor address in the cyclic list */
+        atchan->save_dscr = channel_readl(atchan, DSCR);
+        vdbg_dump_regs(atchan);
+}
 static int at_dma_suspend_noirq(struct device *dev)
 {
        struct platform_device *pdev = to_platform_device(dev);
        struct at_dma *atdma = platform_get_drvdata(pdev);
+        struct dma_chan *chan, *_chan;
-        at_dma_off(platform_get_drvdata(pdev));
+        /* preserve data */
+        list_for_each_entry_safe(chan, _chan, &atdma->dma_common.channels,
+                        device_node) {
+                struct at_dma_chan *atchan = to_at_dma_chan(chan);
+                if (atc_chan_is_cyclic(atchan))
+                        atc_suspend_cyclic(atchan);
+                atchan->save_cfg = channel_readl(atchan, CFG);
+        }
+        atdma->save_imr = dma_readl(atdma, EBCIMR);
+        /* disable DMA controller */
+        at_dma_off(atdma);
        clk_disable(atdma->clk);
        return 0;
 }
+static void atc_resume_cyclic(struct at_dma_chan *atchan)
+{
+        struct at_dma   *atdma = to_at_dma(atchan->chan_common.device);
+        /* restore channel status for cyclic descriptors list:
+         * next descriptor in the cyclic list at the time of suspend */
+        channel_writel(atchan, SADDR, 0);
+        channel_writel(atchan, DADDR, 0);
+        channel_writel(atchan, CTRLA, 0);
+        channel_writel(atchan, CTRLB, 0);
+        channel_writel(atchan, DSCR, atchan->save_dscr);
+        dma_writel(atdma, CHER, atchan->mask);
+        /* channel pause status should be removed by channel user
+         * We cannot take the initiative to do it here */
+        vdbg_dump_regs(atchan);
+}
 static int at_dma_resume_noirq(struct device *dev)
 {
        struct platform_device *pdev = to_platform_device(dev);
        struct at_dma *atdma = platform_get_drvdata(pdev);
+        struct dma_chan *chan, *_chan;
+        /* bring back DMA controller */
        clk_enable(atdma->clk);
        dma_writel(atdma, EN, AT_DMA_ENABLE);
+        /* clear any pending interrupt */
+        while (dma_readl(atdma, EBCISR))
+                cpu_relax();
+        /* restore saved data */
+        dma_writel(atdma, EBCIER, atdma->save_imr);
+        list_for_each_entry_safe(chan, _chan, &atdma->dma_common.channels,
+                        device_node) {
+                struct at_dma_chan *atchan = to_at_dma_chan(chan);
+                channel_writel(atchan, CFG, atchan->save_cfg);
+                if (atc_chan_is_cyclic(atchan))
+                        atc_resume_cyclic(atchan);
+        }
        return 0;
 }
 static const struct dev_pm_ops at_dma_dev_pm_ops = {
+        .prepare = at_dma_prepare,
        .suspend_noirq = at_dma_suspend_noirq,
        .resume_noirq = at_dma_resume_noirq,
 };
diff --git a/drivers/dma/at_hdmac_regs.h b/drivers/dma/at_hdmac_regs.h
index 087dbf1dd39c..aa4c9aebab7c 100644
--- a/drivers/dma/at_hdmac_regs.h
+++ b/drivers/dma/at_hdmac_regs.h
@@ -204,6 +204,9 @@ enum atc_status {
 * @status: transmit status information from irq/prep* functions
 *                to tasklet (use atomic operations)
 * @tasklet: bottom half to finish transaction work
+ * @save_cfg: configuration register that is saved on suspend/resume cycle
+ * @save_dscr: for cyclic operations, preserve next descriptor address in
+ *             the cyclic list on suspend/resume cycle
 * @lock: serializes enqueue/dequeue operations to descriptors lists
 * @completed_cookie: identifier for the most recently completed operation
 * @active_list: list of descriptors dmaengine is being running on
@@ -218,6 +221,8 @@ struct at_dma_chan {
        u8                      mask;
        unsigned long           status;
        struct tasklet_struct   tasklet;
+        u32                     save_cfg;
+        u32                     save_dscr;
        spinlock_t              lock;
@@ -248,6 +253,7 @@ static inline struct at_dma_chan *to_at_dma_chan(struct dma_chan *dchan)
 * @chan_common: common dmaengine dma_device object members
 * @ch_regs: memory mapped register base
 * @clk: dma controller clock
+ * @save_imr: interrupt mask register that is saved on suspend/resume cycle
 * @all_chan_mask: all channels availlable in a mask
 * @dma_desc_pool: base of DMA descriptor region (DMA address)
 * @chan: channels table to store at_dma_chan structures
@@ -256,6 +262,7 @@ struct at_dma {
        struct dma_device       dma_common;
        void __iomem            *regs;
        struct clk              *clk;
+        u32                     save_imr;
        u8                      all_chan_mask;
@@ -355,6 +362,23 @@ static inline int atc_chan_is_enabled(struct at_dma_chan *atchan)
        return !!(dma_readl(atdma, CHSR) & atchan->mask);
 }
+/**
+ * atc_chan_is_paused - test channel pause/resume status
+ * @atchan: channel we want to test status
+ */
+static inline int atc_chan_is_paused(struct at_dma_chan *atchan)
+{
+        return test_bit(ATC_IS_PAUSED, &atchan->status);
+}
+/**
+ * atc_chan_is_cyclic - test if given channel has cyclic property set
+ * @atchan: channel we want to test status
+ */
+static inline int atc_chan_is_cyclic(struct at_dma_chan *atchan)
+{
+        return test_bit(ATC_IS_CYCLIC, &atchan->status);
+}
 /**
 * set_desc_eol - set end-of-link to descriptor so it will end transfer
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
index 765f5ff22304..eb1d8641cf5c 100644
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@ -10,6 +10,7 @@
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
+#include <linux/freezer.h>
 #include <linux/init.h>
 #include <linux/kthread.h>
 #include <linux/module.h>
@@ -251,6 +252,7 @@ static int dmatest_func(void *data)
        int                     i;
        thread_name = current->comm;
+        set_freezable_with_signal();
        ret = -ENOMEM;
@@ -305,7 +307,8 @@ static int dmatest_func(void *data)
                dma_addr_t dma_srcs[src_cnt];
                dma_addr_t dma_dsts[dst_cnt];
                struct completion cmp;
-                unsigned long tmo = msecs_to_jiffies(timeout);
+                unsigned long start, tmo, end = 0 /* compiler... */;
+                bool reload = true;
                u8 align = 0;
                total_tests++;
@@ -404,7 +407,17 @@ static int dmatest_func(void *data)
                }
                dma_async_issue_pending(chan);
-                tmo = wait_for_completion_timeout(&cmp, tmo);
+                do {
+                        start = jiffies;
+                        if (reload)
+                                end = start + msecs_to_jiffies(timeout);
+                        else if (end <= start)
+                                end = start + 1;
+                        tmo = wait_for_completion_interruptible_timeout(&cmp,
+                                                                end - start);
+                        reload = try_to_freeze();
+                } while (tmo == -ERESTARTSYS);
                status = dma_async_is_tx_complete(chan, cookie, NULL, NULL);
                if (tmo == 0) {
@@ -477,6 +490,8 @@ err_srcs:
        pr_notice("%s: terminating after %u tests, %u failures (status %d)\n",
                        thread_name, total_tests, failed_tests, ret);
+        /* terminate all transfers on specified channels */
+        chan->device->device_control(chan, DMA_TERMINATE_ALL, 0);
        if (iterations > 0)
                while (!kthread_should_stop()) {
                        DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wait_dmatest_exit);
@@ -499,6 +514,10 @@ static void dmatest_cleanup_channel(struct dmatest_chan *dtc)
                list_del(&thread->node);
                kfree(thread);
        }
+        /* terminate all transfers on specified channels */
+        dtc->chan->device->device_control(dtc->chan, DMA_TERMINATE_ALL, 0);
        kfree(dtc);
 }
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index 4d180ca9a1d8..9bfd6d360718 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -1407,12 +1407,11 @@ static int __init dw_probe(struct platform_device *pdev)
        dw->all_chan_mask = (1 << pdata->nr_channels) - 1;
        INIT_LIST_HEAD(&dw->dma.channels);
-        for (i = 0; i < pdata->nr_channels; i++, dw->dma.chancnt++) {
+        for (i = 0; i < pdata->nr_channels; i++) {
                struct dw_dma_chan      *dwc = &dw->chan[i];
                dwc->chan.device = &dw->dma;
                dwc->chan.cookie = dwc->completed = 1;
-                dwc->chan.chan_id = i;
                if (pdata->chan_allocation_order == CHAN_ALLOCATION_ASCENDING)
                        list_add_tail(&dwc->chan.device_node,
                                        &dw->dma.channels);
@@ -1468,7 +1467,7 @@ static int __init dw_probe(struct platform_device *pdev)
        dma_writel(dw, CFG, DW_CFG_DMA_EN);
        printk(KERN_INFO "%s: DesignWare DMA Controller, %d channels\n",
-                        dev_name(&pdev->dev), dw->dma.chancnt);
+                        dev_name(&pdev->dev), pdata->nr_channels);
        dma_async_device_register(&dw->dma);
diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c
index 5d7a49bd7c26..b47e2b803faf 100644
--- a/drivers/dma/ep93xx_dma.c
+++ b/drivers/dma/ep93xx_dma.c
@@ -22,6 +22,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/dmaengine.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index d99f71c356b5..4be55f9bb6c1 100644
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -14,6 +14,7 @@
 * http://www.gnu.org/copyleft/gpl.html
 */
 #include <linux/init.h>
+#include <linux/module.h>
 #include <linux/types.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
@@ -23,6 +24,7 @@
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/dmaengine.h>
+#include <linux/module.h>
 #include <asm/irq.h>
 #include <mach/dma-v1.h>
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 7bd7e98548cd..f993955a640c 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -18,6 +18,7 @@
 */
 #include <linux/init.h>
+#include <linux/module.h>
 #include <linux/types.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
@@ -34,6 +35,7 @@
 #include <linux/dmaengine.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
+#include <linux/module.h>
 #include <asm/irq.h>
 #include <mach/sdma.h>
@@ -318,6 +320,7 @@ struct sdma_engine {
        dma_addr_t                      context_phys;
        struct dma_device               dma_device;
        struct clk                      *clk;
+        struct mutex                    channel_0_lock;
        struct sdma_script_start_addrs  *script_addrs;
 };
@@ -415,11 +418,15 @@ static int sdma_load_script(struct sdma_engine *sdma, void *buf, int size,
        dma_addr_t buf_phys;
        int ret;
+        mutex_lock(&sdma->channel_0_lock);
        buf_virt = dma_alloc_coherent(NULL,
                        size,
                        &buf_phys, GFP_KERNEL);
-        if (!buf_virt)
+        if (!buf_virt) {
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto err_out;
+        }
        bd0->mode.command = C0_SETPM;
        bd0->mode.status = BD_DONE | BD_INTR | BD_WRAP | BD_EXTD;
@@ -433,6 +440,9 @@ static int sdma_load_script(struct sdma_engine *sdma, void *buf, int size,
        dma_free_coherent(NULL, size, buf_virt, buf_phys);
+err_out:
+        mutex_unlock(&sdma->channel_0_lock);
        return ret;
 }
@@ -656,6 +666,8 @@ static int sdma_load_context(struct sdma_channel *sdmac)
        dev_dbg(sdma->dev, "event_mask0 = 0x%08x\n", sdmac->event_mask0);
        dev_dbg(sdma->dev, "event_mask1 = 0x%08x\n", sdmac->event_mask1);
+        mutex_lock(&sdma->channel_0_lock);
        memset(context, 0, sizeof(*context));
        context->channel_state.pc = load_address;
@@ -676,6 +688,8 @@ static int sdma_load_context(struct sdma_channel *sdmac)
        ret = sdma_run_channel(&sdma->channel[0]);
+        mutex_unlock(&sdma->channel_0_lock);
        return ret;
 }
@@ -1131,18 +1145,17 @@ static void sdma_add_scripts(struct sdma_engine *sdma,
                        saddr_arr[i] = addr_arr[i];
 }
-static int __init sdma_get_firmware(struct sdma_engine *sdma,
+static void sdma_load_firmware(const struct firmware *fw, void *context)
-                const char *fw_name)
 {
-        const struct firmware *fw;
+        struct sdma_engine *sdma = context;
        const struct sdma_firmware_header *header;
-        int ret;
        const struct sdma_script_start_addrs *addr;
        unsigned short *ram_code;
-        ret = request_firmware(&fw, fw_name, sdma->dev);
+        if (!fw) {
-        if (ret)
+                dev_err(sdma->dev, "firmware not found\n");
-                return ret;
+                return;
+        }
        if (fw->size < sizeof(*header))
                goto err_firmware;
@@ -1172,6 +1185,16 @@ static int __init sdma_get_firmware(struct sdma_engine *sdma,
 err_firmware:
        release_firmware(fw);
+}
+static int __init sdma_get_firmware(struct sdma_engine *sdma,
+                const char *fw_name)
+{
+        int ret;
+        ret = request_firmware_nowait(THIS_MODULE,
+                        FW_ACTION_HOTPLUG, fw_name, sdma->dev,
+                        GFP_KERNEL, sdma, sdma_load_firmware);
        return ret;
 }
@@ -1269,11 +1292,14 @@ static int __init sdma_probe(struct platform_device *pdev)
        struct sdma_platform_data *pdata = pdev->dev.platform_data;
        int i;
        struct sdma_engine *sdma;
+        s32 *saddr_arr;
        sdma = kzalloc(sizeof(*sdma), GFP_KERNEL);
        if (!sdma)
                return -ENOMEM;
+        mutex_init(&sdma->channel_0_lock);
        sdma->dev = &pdev->dev;
        iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -1310,6 +1336,11 @@ static int __init sdma_probe(struct platform_device *pdev)
                goto err_alloc;
        }
+        /* initially no scripts available */
+        saddr_arr = (s32 *)sdma->script_addrs;
+        for (i = 0; i < SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1; i++)
+                saddr_arr[i] = -EINVAL;
        if (of_id)
                pdev->id_entry = of_id->data;
        sdma->devtype = pdev->id_entry->driver_data;
diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c
index 8a3fdd87db97..19a0c64d45d3 100644
--- a/drivers/dma/intel_mid_dma.c
+++ b/drivers/dma/intel_mid_dma.c
@@ -27,6 +27,7 @@
 #include <linux/interrupt.h>
 #include <linux/pm_runtime.h>
 #include <linux/intel_mid_dma.h>
+#include <linux/module.h>
 #define MAX_CHAN        4 /*max ch across controllers*/
 #include "intel_mid_dma_regs.h"
@@ -115,16 +116,15 @@ DMAC1 interrupt Functions*/
 /**
 * dmac1_mask_periphral_intr -  mask the periphral interrupt
- * @midc: dma channel for which masking is required
+ * @mid: dma device for which masking is required
 *
 * Masks the DMA periphral interrupt
 * this is valid for DMAC1 family controllers only
 * This controller should have periphral mask registers already mapped
 */
-static void dmac1_mask_periphral_intr(struct intel_mid_dma_chan *midc)
+static void dmac1_mask_periphral_intr(struct middma_device *mid)
 {
        u32 pimr;
-        struct middma_device *mid = to_middma_device(midc->chan.device);
        if (mid->pimr_mask) {
                pimr = readl(mid->mask_reg + LNW_PERIPHRAL_MASK);
@@ -184,7 +184,6 @@ static void enable_dma_interrupt(struct intel_mid_dma_chan *midc)
 static void disable_dma_interrupt(struct intel_mid_dma_chan *midc)
 {
        /*Check LPE PISR, make sure fwd is disabled*/
-        dmac1_mask_periphral_intr(midc);
        iowrite32(MASK_INTR_REG(midc->ch_id), midc->dma_base + MASK_BLOCK);
        iowrite32(MASK_INTR_REG(midc->ch_id), midc->dma_base + MASK_TFR);
        iowrite32(MASK_INTR_REG(midc->ch_id), midc->dma_base + MASK_ERR);
@@ -1114,7 +1113,6 @@ static int mid_setup_dma(struct pci_dev *pdev)
                midch->chan.device = &dma->common;
                midch->chan.cookie =  1;
-                midch->chan.chan_id = i;
                midch->ch_id = dma->chan_base + i;
                pr_debug("MDMA:Init CH %d, ID %d\n", i, midch->ch_id);
@@ -1150,7 +1148,6 @@ static int mid_setup_dma(struct pci_dev *pdev)
        dma_cap_set(DMA_SLAVE, dma->common.cap_mask);
        dma_cap_set(DMA_PRIVATE, dma->common.cap_mask);
        dma->common.dev = &pdev->dev;
-        dma->common.chancnt = dma->max_chan;
        dma->common.device_alloc_chan_resources =
                                        intel_mid_dma_alloc_chan_resources;
@@ -1350,6 +1347,7 @@ int dma_suspend(struct pci_dev *pci, pm_message_t state)
                if (device->ch[i].in_use)
                        return -EAGAIN;
        }
+        dmac1_mask_periphral_intr(device);
        device->state = SUSPENDED;
        pci_save_state(pci);
        pci_disable_device(pci);
diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c
index 6815905a772f..0e5ef33f90a1 100644
--- a/drivers/dma/ipu/ipu_idmac.c
+++ b/drivers/dma/ipu/ipu_idmac.c
@@ -21,6 +21,7 @@
 #include <linux/string.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
+#include <linux/module.h>
 #include <mach/ipu.h>
@@ -1307,6 +1308,7 @@ static irqreturn_t idmac_interrupt(int irq, void *dev_id)
            ipu_submit_buffer(ichan, descnew, sgnew, ichan->active_buffer) < 0) {
                callback = descnew->txd.callback;
                callback_param = descnew->txd.callback_param;
+                list_del_init(&descnew->list);
                spin_unlock(&ichan->lock);
                if (callback)
                        callback(callback_param);
@@ -1428,39 +1430,58 @@ static int __idmac_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
 {
        struct idmac_channel *ichan = to_idmac_chan(chan);
        struct idmac *idmac = to_idmac(chan->device);
+        struct ipu *ipu = to_ipu(idmac);
+        struct list_head *list, *tmp;
        unsigned long flags;
        int i;
-        /* Only supports DMA_TERMINATE_ALL */
+        switch (cmd) {
-        if (cmd != DMA_TERMINATE_ALL)
+        case DMA_PAUSE:
-                return -ENXIO;
+                spin_lock_irqsave(&ipu->lock, flags);
+                ipu_ic_disable_task(ipu, chan->chan_id);
-        ipu_disable_channel(idmac, ichan,
+                /* Return all descriptors into "prepared" state */
-                            ichan->status >= IPU_CHANNEL_ENABLED);
+                list_for_each_safe(list, tmp, &ichan->queue)
+                        list_del_init(list);
-        tasklet_disable(&to_ipu(idmac)->tasklet);
+                ichan->sg[0] = NULL;
+                ichan->sg[1] = NULL;
-        /* ichan->queue is modified in ISR, have to spinlock */
+                spin_unlock_irqrestore(&ipu->lock, flags);
-        spin_lock_irqsave(&ichan->lock, flags);
-        list_splice_init(&ichan->queue, &ichan->free_list);
-        if (ichan->desc)
+                ichan->status = IPU_CHANNEL_INITIALIZED;
-                for (i = 0; i < ichan->n_tx_desc; i++) {
+                break;
-                        struct idmac_tx_desc *desc = ichan->desc + i;
+        case DMA_TERMINATE_ALL:
-                        if (list_empty(&desc->list))
+                ipu_disable_channel(idmac, ichan,
-                                /* Descriptor was prepared, but not submitted */
+                                    ichan->status >= IPU_CHANNEL_ENABLED);
-                                list_add(&desc->list, &ichan->free_list);
-                        async_tx_clear_ack(&desc->txd);
+                tasklet_disable(&ipu->tasklet);
-                }
-        ichan->sg[0] = NULL;
+                /* ichan->queue is modified in ISR, have to spinlock */
-        ichan->sg[1] = NULL;
+                spin_lock_irqsave(&ichan->lock, flags);
-        spin_unlock_irqrestore(&ichan->lock, flags);
+                list_splice_init(&ichan->queue, &ichan->free_list);
-        tasklet_enable(&to_ipu(idmac)->tasklet);
+                if (ichan->desc)
+                        for (i = 0; i < ichan->n_tx_desc; i++) {
+                                struct idmac_tx_desc *desc = ichan->desc + i;
+                                if (list_empty(&desc->list))
+                                        /* Descriptor was prepared, but not submitted */
+                                        list_add(&desc->list, &ichan->free_list);
-        ichan->status = IPU_CHANNEL_INITIALIZED;
+                                async_tx_clear_ack(&desc->txd);
+                        }
+                ichan->sg[0] = NULL;
+                ichan->sg[1] = NULL;
+                spin_unlock_irqrestore(&ichan->lock, flags);
+                tasklet_enable(&ipu->tasklet);
+                ichan->status = IPU_CHANNEL_INITIALIZED;
+                break;
+        default:
+                return -ENOSYS;
+        }
        return 0;
 }
@@ -1663,7 +1684,6 @@ static void __exit ipu_idmac_exit(struct ipu *ipu)
                struct idmac_channel *ichan = ipu->channel + i;
                idmac_control(&ichan->dma_chan, DMA_TERMINATE_ALL, 0);
-                idmac_prep_slave_sg(&ichan->dma_chan, NULL, 0, DMA_NONE, 0);
        }
        dma_async_device_unregister(&idmac->dma);
diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c
index b9bae94f2015..8ba4edc6185e 100644
--- a/drivers/dma/mpc512x_dma.c
+++ b/drivers/dma/mpc512x_dma.c
@@ -741,7 +741,6 @@ static int __devinit mpc_dma_probe(struct platform_device *op)
                mchan = &mdma->channels[i];
                mchan->chan.device = dma;
-                mchan->chan.chan_id = i;
                mchan->chan.cookie = 1;
                mchan->completed_cookie = mchan->chan.cookie;
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index be641cbd36fc..b4588bdd98bb 100644
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@ -130,6 +130,23 @@ struct mxs_dma_engine {
        struct mxs_dma_chan             mxs_chans[MXS_DMA_CHANNELS];
 };
+static inline void mxs_dma_clkgate(struct mxs_dma_chan *mxs_chan, int enable)
+{
+        struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
+        int chan_id = mxs_chan->chan.chan_id;
+        int set_clr = enable ? MXS_CLR_ADDR : MXS_SET_ADDR;
+        /* enable apbh channel clock */
+        if (dma_is_apbh()) {
+                if (apbh_is_old())
+                        writel(1 << (chan_id + BP_APBH_CTRL0_CLKGATE_CHANNEL),
+                                mxs_dma->base + HW_APBHX_CTRL0 + set_clr);
+                else
+                        writel(1 << chan_id,
+                                mxs_dma->base + HW_APBHX_CTRL0 + set_clr);
+        }
+}
 static void mxs_dma_reset_chan(struct mxs_dma_chan *mxs_chan)
 {
        struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
@@ -148,38 +165,21 @@ static void mxs_dma_enable_chan(struct mxs_dma_chan *mxs_chan)
        struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
        int chan_id = mxs_chan->chan.chan_id;
+        /* clkgate needs to be enabled before writing other registers */
+        mxs_dma_clkgate(mxs_chan, 1);
        /* set cmd_addr up */
        writel(mxs_chan->ccw_phys,
                mxs_dma->base + HW_APBHX_CHn_NXTCMDAR(chan_id));
-        /* enable apbh channel clock */
-        if (dma_is_apbh()) {
-                if (apbh_is_old())
-                        writel(1 << (chan_id + BP_APBH_CTRL0_CLKGATE_CHANNEL),
-                                mxs_dma->base + HW_APBHX_CTRL0 + MXS_CLR_ADDR);
-                else
-                        writel(1 << chan_id,
-                                mxs_dma->base + HW_APBHX_CTRL0 + MXS_CLR_ADDR);
-        }
        /* write 1 to SEMA to kick off the channel */
        writel(1, mxs_dma->base + HW_APBHX_CHn_SEMA(chan_id));
 }
 static void mxs_dma_disable_chan(struct mxs_dma_chan *mxs_chan)
 {
-        struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
-        int chan_id = mxs_chan->chan.chan_id;
        /* disable apbh channel clock */
-        if (dma_is_apbh()) {
+        mxs_dma_clkgate(mxs_chan, 0);
-                if (apbh_is_old())
-                        writel(1 << (chan_id + BP_APBH_CTRL0_CLKGATE_CHANNEL),
-                                mxs_dma->base + HW_APBHX_CTRL0 + MXS_SET_ADDR);
-                else
-                        writel(1 << chan_id,
-                                mxs_dma->base + HW_APBHX_CTRL0 + MXS_SET_ADDR);
-        }
        mxs_chan->status = DMA_SUCCESS;
 }
@@ -338,7 +338,10 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan)
        if (ret)
                goto err_clk;
+        /* clkgate needs to be enabled for reset to finish */
+        mxs_dma_clkgate(mxs_chan, 1);
        mxs_dma_reset_chan(mxs_chan);
+        mxs_dma_clkgate(mxs_chan, 0);
        dma_async_tx_descriptor_init(&mxs_chan->desc, chan);
        mxs_chan->desc.tx_submit = mxs_dma_tx_submit;
diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
index 1ac8d4b580b7..a6d0e3dbed07 100644
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
@@ -60,7 +60,7 @@
 #define DMA_DESC_FOLLOW_WITHOUT_IRQ     0x2
 #define DMA_DESC_FOLLOW_WITH_IRQ        0x3
-#define MAX_CHAN_NR                     8
+#define MAX_CHAN_NR                     12
 #define DMA_MASK_CTL0_MODE      0x33333333
 #define DMA_MASK_CTL2_MODE      0x00003333
@@ -872,8 +872,7 @@ static int __devinit pch_dma_probe(struct pci_dev *pdev,
        int i;
        nr_channels = id->driver_data;
-        pd = kzalloc(sizeof(struct pch_dma)+
+        pd = kzalloc(sizeof(*pd), GFP_KERNEL);
-                sizeof(struct pch_dma_chan) * nr_channels, GFP_KERNEL);
        if (!pd)
                return -ENOMEM;
@@ -926,7 +925,6 @@ static int __devinit pch_dma_probe(struct pci_dev *pdev,
        }
        pd->dma.dev = &pdev->dev;
-        pd->dma.chancnt = nr_channels;
        INIT_LIST_HEAD(&pd->dma.channels);
@@ -935,7 +933,6 @@ static int __devinit pch_dma_probe(struct pci_dev *pdev,
                pd_chan->chan.device = &pd->dma;
                pd_chan->chan.cookie = 1;
-                pd_chan->chan.chan_id = i;
                pd_chan->membase = &regs->desc[i];
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 00eee59e8b33..571041477ab2 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -17,6 +17,8 @@
 #include <linux/interrupt.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/pl330.h>
+#include <linux/pm_runtime.h>
+#include <linux/scatterlist.h>
 #define NR_DEFAULT_DESC 16
@@ -68,6 +70,14 @@ struct dma_pl330_chan {
         * NULL if the channel is available to be acquired.
         */
        void *pl330_chid;
+        /* For D-to-M and M-to-D channels */
+        int burst_sz; /* the peripheral fifo width */
+        int burst_len; /* the number of burst */
+        dma_addr_t fifo_addr;
+        /* for cyclic capability */
+        bool cyclic;
 };
 struct dma_pl330_dmac {
@@ -83,6 +93,8 @@ struct dma_pl330_dmac {
        /* Peripheral channels connected to this DMAC */
        struct dma_pl330_chan *peripherals; /* keep at end */
+        struct clk *clk;
 };
 struct dma_pl330_desc {
@@ -152,6 +164,31 @@ static inline void free_desc_list(struct list_head *list)
        spin_unlock_irqrestore(&pdmac->pool_lock, flags);
 }
+static inline void handle_cyclic_desc_list(struct list_head *list)
+{
+        struct dma_pl330_desc *desc;
+        struct dma_pl330_chan *pch;
+        unsigned long flags;
+        if (list_empty(list))
+                return;
+        list_for_each_entry(desc, list, node) {
+                dma_async_tx_callback callback;
+                /* Change status to reload it */
+                desc->status = PREP;
+                pch = desc->pchan;
+                callback = desc->txd.callback;
+                if (callback)
+                        callback(desc->txd.callback_param);
+        }
+        spin_lock_irqsave(&pch->lock, flags);
+        list_splice_tail_init(list, &pch->work_list);
+        spin_unlock_irqrestore(&pch->lock, flags);
+}
 static inline void fill_queue(struct dma_pl330_chan *pch)
 {
        struct dma_pl330_desc *desc;
@@ -205,7 +242,10 @@ static void pl330_tasklet(unsigned long data)
        spin_unlock_irqrestore(&pch->lock, flags);
-        free_desc_list(&list);
+        if (pch->cyclic)
+                handle_cyclic_desc_list(&list);
+        else
+                free_desc_list(&list);
 }
 static void dma_pl330_rqcb(void *token, enum pl330_op_err err)
@@ -236,6 +276,7 @@ static int pl330_alloc_chan_resources(struct dma_chan *chan)
        spin_lock_irqsave(&pch->lock, flags);
        pch->completed = chan->cookie = 1;
+        pch->cyclic = false;
        pch->pl330_chid = pl330_request_channel(&pdmac->pif);
        if (!pch->pl330_chid) {
@@ -253,25 +294,52 @@ static int pl330_alloc_chan_resources(struct dma_chan *chan)
 static int pl330_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, unsigned long arg)
 {
        struct dma_pl330_chan *pch = to_pchan(chan);
-        struct dma_pl330_desc *desc;
+        struct dma_pl330_desc *desc, *_dt;
        unsigned long flags;
+        struct dma_pl330_dmac *pdmac = pch->dmac;
+        struct dma_slave_config *slave_config;
+        LIST_HEAD(list);
-        /* Only supports DMA_TERMINATE_ALL */
+        switch (cmd) {
-        if (cmd != DMA_TERMINATE_ALL)
+        case DMA_TERMINATE_ALL:
-                return -ENXIO;
+                spin_lock_irqsave(&pch->lock, flags);
-        spin_lock_irqsave(&pch->lock, flags);
-        /* FLUSH the PL330 Channel thread */
-        pl330_chan_ctrl(pch->pl330_chid, PL330_OP_FLUSH);
-        /* Mark all desc done */
+                /* FLUSH the PL330 Channel thread */
-        list_for_each_entry(desc, &pch->work_list, node)
+                pl330_chan_ctrl(pch->pl330_chid, PL330_OP_FLUSH);
-                desc->status = DONE;
-        spin_unlock_irqrestore(&pch->lock, flags);
+                /* Mark all desc done */
+                list_for_each_entry_safe(desc, _dt, &pch->work_list , node) {
+                        desc->status = DONE;
+                        pch->completed = desc->txd.cookie;
+                        list_move_tail(&desc->node, &list);
+                }
-        pl330_tasklet((unsigned long) pch);
+                list_splice_tail_init(&list, &pdmac->desc_pool);
+                spin_unlock_irqrestore(&pch->lock, flags);
+                break;
+        case DMA_SLAVE_CONFIG:
+                slave_config = (struct dma_slave_config *)arg;
+                if (slave_config->direction == DMA_TO_DEVICE) {
+                        if (slave_config->dst_addr)
+                                pch->fifo_addr = slave_config->dst_addr;
+                        if (slave_config->dst_addr_width)
+                                pch->burst_sz = __ffs(slave_config->dst_addr_width);
+                        if (slave_config->dst_maxburst)
+                                pch->burst_len = slave_config->dst_maxburst;
+                } else if (slave_config->direction == DMA_FROM_DEVICE) {
+                        if (slave_config->src_addr)
+                                pch->fifo_addr = slave_config->src_addr;
+                        if (slave_config->src_addr_width)
+                                pch->burst_sz = __ffs(slave_config->src_addr_width);
+                        if (slave_config->src_maxburst)
+                                pch->burst_len = slave_config->src_maxburst;
+                }
+                break;
+        default:
+                dev_err(pch->dmac->pif.dev, "Not supported command.\n");
+                return -ENXIO;
+        }
        return 0;
 }
@@ -288,6 +356,9 @@ static void pl330_free_chan_resources(struct dma_chan *chan)
        pl330_release_channel(pch->pl330_chid);
        pch->pl330_chid = NULL;
+        if (pch->cyclic)
+                list_splice_tail_init(&pch->work_list, &pch->dmac->desc_pool);
        spin_unlock_irqrestore(&pch->lock, flags);
 }
@@ -453,7 +524,7 @@ static struct dma_pl330_desc *pl330_get_desc(struct dma_pl330_chan *pch)
        if (peri) {
                desc->req.rqtype = peri->rqtype;
-                desc->req.peri = peri->peri_id;
+                desc->req.peri = pch->chan.chan_id;
        } else {
                desc->req.rqtype = MEMTOMEM;
                desc->req.peri = 0;
@@ -524,6 +595,51 @@ static inline int get_burst_len(struct dma_pl330_desc *desc, size_t len)
        return burst_len;
 }
+static struct dma_async_tx_descriptor *pl330_prep_dma_cyclic(
+                struct dma_chan *chan, dma_addr_t dma_addr, size_t len,
+                size_t period_len, enum dma_data_direction direction)
+{
+        struct dma_pl330_desc *desc;
+        struct dma_pl330_chan *pch = to_pchan(chan);
+        dma_addr_t dst;
+        dma_addr_t src;
+        desc = pl330_get_desc(pch);
+        if (!desc) {
+                dev_err(pch->dmac->pif.dev, "%s:%d Unable to fetch desc\n",
+                        __func__, __LINE__);
+                return NULL;
+        }
+        switch (direction) {
+        case DMA_TO_DEVICE:
+                desc->rqcfg.src_inc = 1;
+                desc->rqcfg.dst_inc = 0;
+                src = dma_addr;
+                dst = pch->fifo_addr;
+                break;
+        case DMA_FROM_DEVICE:
+                desc->rqcfg.src_inc = 0;
+                desc->rqcfg.dst_inc = 1;
+                src = pch->fifo_addr;
+                dst = dma_addr;
+                break;
+        default:
+                dev_err(pch->dmac->pif.dev, "%s:%d Invalid dma direction\n",
+                __func__, __LINE__);
+                return NULL;
+        }
+        desc->rqcfg.brst_size = pch->burst_sz;
+        desc->rqcfg.brst_len = 1;
+        pch->cyclic = true;
+        fill_px(&desc->px, dst, src, period_len);
+        return &desc->txd;
+}
 static struct dma_async_tx_descriptor *
 pl330_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dst,
                dma_addr_t src, size_t len, unsigned long flags)
@@ -579,7 +695,7 @@ pl330_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
        struct dma_pl330_peri *peri = chan->private;
        struct scatterlist *sg;
        unsigned long flags;
-        int i, burst_size;
+        int i;
        dma_addr_t addr;
        if (unlikely(!pch || !sgl || !sg_len || !peri))
@@ -595,8 +711,7 @@ pl330_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                return NULL;
        }
-        addr = peri->fifo_addr;
+        addr = pch->fifo_addr;
-        burst_size = peri->burst_sz;
        first = NULL;
@@ -644,7 +759,7 @@ pl330_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                                sg_dma_address(sg), addr, sg_dma_len(sg));
                }
-                desc->rqcfg.brst_size = burst_size;
+                desc->rqcfg.brst_size = pch->burst_sz;
                desc->rqcfg.brst_len = 1;
        }
@@ -696,6 +811,30 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
                goto probe_err1;
        }
+        pdmac->clk = clk_get(&adev->dev, "dma");
+        if (IS_ERR(pdmac->clk)) {
+                dev_err(&adev->dev, "Cannot get operation clock.\n");
+                ret = -EINVAL;
+                goto probe_err1;
+        }
+        amba_set_drvdata(adev, pdmac);
+#ifdef CONFIG_PM_RUNTIME
+        /* to use the runtime PM helper functions */
+        pm_runtime_enable(&adev->dev);
+        /* enable the power domain */
+        if (pm_runtime_get_sync(&adev->dev)) {
+                dev_err(&adev->dev, "failed to get runtime pm\n");
+                ret = -ENODEV;
+                goto probe_err1;
+        }
+#else
+        /* enable dma clk */
+        clk_enable(pdmac->clk);
+#endif
        irq = adev->irq[0];
        ret = request_irq(irq, pl330_irq_handler, 0,
                        dev_name(&adev->dev), pi);
@@ -732,6 +871,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
                        case MEMTODEV:
                        case DEVTOMEM:
                                dma_cap_set(DMA_SLAVE, pd->cap_mask);
+                                dma_cap_set(DMA_CYCLIC, pd->cap_mask);
                                break;
                        default:
                                dev_err(&adev->dev, "DEVTODEV Not Supported\n");
@@ -747,11 +887,9 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
                spin_lock_init(&pch->lock);
                pch->pl330_chid = NULL;
                pch->chan.device = pd;
-                pch->chan.chan_id = i;
                pch->dmac = pdmac;
                /* Add the channel to the DMAC list */
-                pd->chancnt++;
                list_add_tail(&pch->chan.device_node, &pd->channels);
        }
@@ -760,6 +898,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
        pd->device_alloc_chan_resources = pl330_alloc_chan_resources;
        pd->device_free_chan_resources = pl330_free_chan_resources;
        pd->device_prep_dma_memcpy = pl330_prep_dma_memcpy;
+        pd->device_prep_dma_cyclic = pl330_prep_dma_cyclic;
        pd->device_tx_status = pl330_tx_status;
        pd->device_prep_slave_sg = pl330_prep_slave_sg;
        pd->device_control = pl330_control;
@@ -771,8 +910,6 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
                goto probe_err4;
        }
-        amba_set_drvdata(adev, pdmac);
        dev_info(&adev->dev,
                "Loaded driver for PL330 DMAC-%d\n", adev->periphid);
        dev_info(&adev->dev,
@@ -833,6 +970,13 @@ static int __devexit pl330_remove(struct amba_device *adev)
        res = &adev->res;
        release_mem_region(res->start, resource_size(res));
+#ifdef CONFIG_PM_RUNTIME
+        pm_runtime_put(&adev->dev);
+        pm_runtime_disable(&adev->dev);
+#else
+        clk_disable(pdmac->clk);
+#endif
        kfree(pdmac);
        return 0;
@@ -846,10 +990,49 @@ static struct amba_id pl330_ids[] = {
        { 0, 0 },
 };
+#ifdef CONFIG_PM_RUNTIME
+static int pl330_runtime_suspend(struct device *dev)
+{
+        struct dma_pl330_dmac *pdmac = dev_get_drvdata(dev);
+        if (!pdmac) {
+                dev_err(dev, "failed to get dmac\n");
+                return -ENODEV;
+        }
+        clk_disable(pdmac->clk);
+        return 0;
+}
+static int pl330_runtime_resume(struct device *dev)
+{
+        struct dma_pl330_dmac *pdmac = dev_get_drvdata(dev);
+        if (!pdmac) {
+                dev_err(dev, "failed to get dmac\n");
+                return -ENODEV;
+        }
+        clk_enable(pdmac->clk);
+        return 0;
+}
+#else
+#define pl330_runtime_suspend   NULL
+#define pl330_runtime_resume    NULL
+#endif /* CONFIG_PM_RUNTIME */
+static const struct dev_pm_ops pl330_pm_ops = {
+        .runtime_suspend = pl330_runtime_suspend,
+        .runtime_resume = pl330_runtime_resume,
+};
 static struct amba_driver pl330_driver = {
        .drv = {
                .owner = THIS_MODULE,
                .name = "dma-pl330",
+                .pm = &pl330_pm_ops,
        },
        .id_table = pl330_ids,
        .probe = pl330_probe,
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index 7f49235d14b9..81809c2b46ab 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -259,14 +259,23 @@ static int dmae_set_dmars(struct sh_dmae_chan *sh_chan, u16 val)
        return 0;
 }
+static void sh_chan_xfer_ld_queue(struct sh_dmae_chan *sh_chan);
 static dma_cookie_t sh_dmae_tx_submit(struct dma_async_tx_descriptor *tx)
 {
        struct sh_desc *desc = tx_to_sh_desc(tx), *chunk, *last = desc, *c;
        struct sh_dmae_chan *sh_chan = to_sh_chan(tx->chan);
+        struct sh_dmae_slave *param = tx->chan->private;
        dma_async_tx_callback callback = tx->callback;
        dma_cookie_t cookie;
+        bool power_up;
+        spin_lock_irq(&sh_chan->desc_lock);
-        spin_lock_bh(&sh_chan->desc_lock);
+        if (list_empty(&sh_chan->ld_queue))
+                power_up = true;
+        else
+                power_up = false;
        cookie = sh_chan->common.cookie;
        cookie++;
@@ -302,7 +311,38 @@ static dma_cookie_t sh_dmae_tx_submit(struct dma_async_tx_descriptor *tx)
                tx->cookie, &last->async_tx, sh_chan->id,
                desc->hw.sar, desc->hw.tcr, desc->hw.dar);
-        spin_unlock_bh(&sh_chan->desc_lock);
+        if (power_up) {
+                sh_chan->pm_state = DMAE_PM_BUSY;
+                pm_runtime_get(sh_chan->dev);
+                spin_unlock_irq(&sh_chan->desc_lock);
+                pm_runtime_barrier(sh_chan->dev);
+                spin_lock_irq(&sh_chan->desc_lock);
+                /* Have we been reset, while waiting? */
+                if (sh_chan->pm_state != DMAE_PM_ESTABLISHED) {
+                        dev_dbg(sh_chan->dev, "Bring up channel %d\n",
+                                sh_chan->id);
+                        if (param) {
+                                const struct sh_dmae_slave_config *cfg =
+                                        param->config;
+                                dmae_set_dmars(sh_chan, cfg->mid_rid);
+                                dmae_set_chcr(sh_chan, cfg->chcr);
+                        } else {
+                                dmae_init(sh_chan);
+                        }
+                        if (sh_chan->pm_state == DMAE_PM_PENDING)
+                                sh_chan_xfer_ld_queue(sh_chan);
+                        sh_chan->pm_state = DMAE_PM_ESTABLISHED;
+                }
+        }
+        spin_unlock_irq(&sh_chan->desc_lock);
        return cookie;
 }
@@ -346,8 +386,6 @@ static int sh_dmae_alloc_chan_resources(struct dma_chan *chan)
        struct sh_dmae_slave *param = chan->private;
        int ret;
-        pm_runtime_get_sync(sh_chan->dev);
        /*
         * This relies on the guarantee from dmaengine that alloc_chan_resources
         * never runs concurrently with itself or free_chan_resources.
@@ -367,31 +405,20 @@ static int sh_dmae_alloc_chan_resources(struct dma_chan *chan)
                }
                param->config = cfg;
-                dmae_set_dmars(sh_chan, cfg->mid_rid);
-                dmae_set_chcr(sh_chan, cfg->chcr);
-        } else {
-                dmae_init(sh_chan);
        }
-        spin_lock_bh(&sh_chan->desc_lock);
        while (sh_chan->descs_allocated < NR_DESCS_PER_CHANNEL) {
-                spin_unlock_bh(&sh_chan->desc_lock);
                desc = kzalloc(sizeof(struct sh_desc), GFP_KERNEL);
-                if (!desc) {
+                if (!desc)
-                        spin_lock_bh(&sh_chan->desc_lock);
                        break;
-                }
                dma_async_tx_descriptor_init(&desc->async_tx,
                                        &sh_chan->common);
                desc->async_tx.tx_submit = sh_dmae_tx_submit;
                desc->mark = DESC_IDLE;
-                spin_lock_bh(&sh_chan->desc_lock);
                list_add(&desc->node, &sh_chan->ld_free);
                sh_chan->descs_allocated++;
        }
-        spin_unlock_bh(&sh_chan->desc_lock);
        if (!sh_chan->descs_allocated) {
                ret = -ENOMEM;
@@ -405,7 +432,7 @@ edescalloc:
                clear_bit(param->slave_id, sh_dmae_slave_used);
 etestused:
 efindslave:
-        pm_runtime_put(sh_chan->dev);
+        chan->private = NULL;
        return ret;
 }
@@ -417,7 +444,6 @@ static void sh_dmae_free_chan_resources(struct dma_chan *chan)
        struct sh_dmae_chan *sh_chan = to_sh_chan(chan);
        struct sh_desc *desc, *_desc;
        LIST_HEAD(list);
-        int descs = sh_chan->descs_allocated;
        /* Protect against ISR */
        spin_lock_irq(&sh_chan->desc_lock);
@@ -437,15 +463,12 @@ static void sh_dmae_free_chan_resources(struct dma_chan *chan)
                chan->private = NULL;
        }
-        spin_lock_bh(&sh_chan->desc_lock);
+        spin_lock_irq(&sh_chan->desc_lock);
        list_splice_init(&sh_chan->ld_free, &list);
        sh_chan->descs_allocated = 0;
-        spin_unlock_bh(&sh_chan->desc_lock);
+        spin_unlock_irq(&sh_chan->desc_lock);
-        if (descs > 0)
-                pm_runtime_put(sh_chan->dev);
        list_for_each_entry_safe(desc, _desc, &list, node)
                kfree(desc);
@@ -534,6 +557,7 @@ static struct dma_async_tx_descriptor *sh_dmae_prep_sg(struct sh_dmae_chan *sh_c
        struct sh_desc *first = NULL, *new = NULL /* compiler... */;
        LIST_HEAD(tx_list);
        int chunks = 0;
+        unsigned long irq_flags;
        int i;
        if (!sg_len)
@@ -544,7 +568,7 @@ static struct dma_async_tx_descriptor *sh_dmae_prep_sg(struct sh_dmae_chan *sh_c
                        (SH_DMA_TCR_MAX + 1);
        /* Have to lock the whole loop to protect against concurrent release */
-        spin_lock_bh(&sh_chan->desc_lock);
+        spin_lock_irqsave(&sh_chan->desc_lock, irq_flags);
        /*
         * Chaining:
@@ -590,7 +614,7 @@ static struct dma_async_tx_descriptor *sh_dmae_prep_sg(struct sh_dmae_chan *sh_c
        /* Put them back on the free list, so, they don't get lost */
        list_splice_tail(&tx_list, &sh_chan->ld_free);
-        spin_unlock_bh(&sh_chan->desc_lock);
+        spin_unlock_irqrestore(&sh_chan->desc_lock, irq_flags);
        return &first->async_tx;
@@ -599,7 +623,7 @@ err_get_desc:
                new->mark = DESC_IDLE;
        list_splice(&tx_list, &sh_chan->ld_free);
-        spin_unlock_bh(&sh_chan->desc_lock);
+        spin_unlock_irqrestore(&sh_chan->desc_lock, irq_flags);
        return NULL;
 }
@@ -661,6 +685,7 @@ static int sh_dmae_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
                           unsigned long arg)
 {
        struct sh_dmae_chan *sh_chan = to_sh_chan(chan);
+        unsigned long flags;
        /* Only supports DMA_TERMINATE_ALL */
        if (cmd != DMA_TERMINATE_ALL)
@@ -669,7 +694,7 @@ static int sh_dmae_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
        if (!chan)
                return -EINVAL;
-        spin_lock_bh(&sh_chan->desc_lock);
+        spin_lock_irqsave(&sh_chan->desc_lock, flags);
        dmae_halt(sh_chan);
        if (!list_empty(&sh_chan->ld_queue)) {
@@ -678,9 +703,8 @@ static int sh_dmae_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
                                                  struct sh_desc, node);
                desc->partial = (desc->hw.tcr - sh_dmae_readl(sh_chan, TCR)) <<
                        sh_chan->xmit_shift;
        }
-        spin_unlock_bh(&sh_chan->desc_lock);
+        spin_unlock_irqrestore(&sh_chan->desc_lock, flags);
        sh_dmae_chan_ld_cleanup(sh_chan, true);
@@ -695,8 +719,9 @@ static dma_async_tx_callback __ld_cleanup(struct sh_dmae_chan *sh_chan, bool all
        dma_cookie_t cookie = 0;
        dma_async_tx_callback callback = NULL;
        void *param = NULL;
+        unsigned long flags;
-        spin_lock_bh(&sh_chan->desc_lock);
+        spin_lock_irqsave(&sh_chan->desc_lock, flags);
        list_for_each_entry_safe(desc, _desc, &sh_chan->ld_queue, node) {
                struct dma_async_tx_descriptor *tx = &desc->async_tx;
@@ -762,7 +787,13 @@ static dma_async_tx_callback __ld_cleanup(struct sh_dmae_chan *sh_chan, bool all
                     async_tx_test_ack(&desc->async_tx)) || all) {
                        /* Remove from ld_queue list */
                        desc->mark = DESC_IDLE;
                        list_move(&desc->node, &sh_chan->ld_free);
+                        if (list_empty(&sh_chan->ld_queue)) {
+                                dev_dbg(sh_chan->dev, "Bring down channel %d\n", sh_chan->id);
+                                pm_runtime_put(sh_chan->dev);
+                        }
                }
        }
@@ -773,7 +804,7 @@ static dma_async_tx_callback __ld_cleanup(struct sh_dmae_chan *sh_chan, bool all
                 */
                sh_chan->completed_cookie = sh_chan->common.cookie;
-        spin_unlock_bh(&sh_chan->desc_lock);
+        spin_unlock_irqrestore(&sh_chan->desc_lock, flags);
        if (callback)
                callback(param);
@@ -792,14 +823,14 @@ static void sh_dmae_chan_ld_cleanup(struct sh_dmae_chan *sh_chan, bool all)
                ;
 }
+/* Called under spin_lock_irq(&sh_chan->desc_lock) */
 static void sh_chan_xfer_ld_queue(struct sh_dmae_chan *sh_chan)
 {
        struct sh_desc *desc;
-        spin_lock_bh(&sh_chan->desc_lock);
        /* DMA work check */
        if (dmae_is_busy(sh_chan))
-                goto sh_chan_xfer_ld_queue_end;
+                return;
        /* Find the first not transferred descriptor */
        list_for_each_entry(desc, &sh_chan->ld_queue, node)
@@ -812,15 +843,18 @@ static void sh_chan_xfer_ld_queue(struct sh_dmae_chan *sh_chan)
                        dmae_start(sh_chan);
                        break;
                }
-sh_chan_xfer_ld_queue_end:
-        spin_unlock_bh(&sh_chan->desc_lock);
 }
 static void sh_dmae_memcpy_issue_pending(struct dma_chan *chan)
 {
        struct sh_dmae_chan *sh_chan = to_sh_chan(chan);
-        sh_chan_xfer_ld_queue(sh_chan);
+        spin_lock_irq(&sh_chan->desc_lock);
+        if (sh_chan->pm_state == DMAE_PM_ESTABLISHED)
+                sh_chan_xfer_ld_queue(sh_chan);
+        else
+                sh_chan->pm_state = DMAE_PM_PENDING;
+        spin_unlock_irq(&sh_chan->desc_lock);
 }
 static enum dma_status sh_dmae_tx_status(struct dma_chan *chan,
@@ -831,6 +865,7 @@ static enum dma_status sh_dmae_tx_status(struct dma_chan *chan,
        dma_cookie_t last_used;
        dma_cookie_t last_complete;
        enum dma_status status;
+        unsigned long flags;
        sh_dmae_chan_ld_cleanup(sh_chan, false);
@@ -841,7 +876,7 @@ static enum dma_status sh_dmae_tx_status(struct dma_chan *chan,
        BUG_ON(last_complete < 0);
        dma_set_tx_state(txstate, last_complete, last_used, 0);
-        spin_lock_bh(&sh_chan->desc_lock);
+        spin_lock_irqsave(&sh_chan->desc_lock, flags);
        status = dma_async_is_complete(cookie, last_complete, last_used);
@@ -859,7 +894,7 @@ static enum dma_status sh_dmae_tx_status(struct dma_chan *chan,
                        }
        }
-        spin_unlock_bh(&sh_chan->desc_lock);
+        spin_unlock_irqrestore(&sh_chan->desc_lock, flags);
        return status;
 }
@@ -912,6 +947,12 @@ static bool sh_dmae_reset(struct sh_dmae_device *shdev)
                list_splice_init(&sh_chan->ld_queue, &dl);
+                if (!list_empty(&dl)) {
+                        dev_dbg(sh_chan->dev, "Bring down channel %d\n", sh_chan->id);
+                        pm_runtime_put(sh_chan->dev);
+                }
+                sh_chan->pm_state = DMAE_PM_ESTABLISHED;
                spin_unlock(&sh_chan->desc_lock);
                /* Complete all  */
@@ -952,7 +993,7 @@ static void dmae_do_tasklet(unsigned long data)
        u32 sar_buf = sh_dmae_readl(sh_chan, SAR);
        u32 dar_buf = sh_dmae_readl(sh_chan, DAR);
-        spin_lock(&sh_chan->desc_lock);
+        spin_lock_irq(&sh_chan->desc_lock);
        list_for_each_entry(desc, &sh_chan->ld_queue, node) {
                if (desc->mark == DESC_SUBMITTED &&
                    ((desc->direction == DMA_FROM_DEVICE &&
@@ -965,10 +1006,10 @@ static void dmae_do_tasklet(unsigned long data)
                        break;
                }
        }
-        spin_unlock(&sh_chan->desc_lock);
        /* Next desc */
        sh_chan_xfer_ld_queue(sh_chan);
+        spin_unlock_irq(&sh_chan->desc_lock);
        sh_dmae_chan_ld_cleanup(sh_chan, false);
 }
@@ -1036,7 +1077,9 @@ static int __devinit sh_dmae_chan_probe(struct sh_dmae_device *shdev, int id,
                return -ENOMEM;
        }
-        /* copy struct dma_device */
+        new_sh_chan->pm_state = DMAE_PM_ESTABLISHED;
+        /* reference struct dma_device */
        new_sh_chan->common.device = &shdev->common;
        new_sh_chan->dev = shdev->common.dev;
diff --git a/drivers/dma/shdma.h b/drivers/dma/shdma.h
index dc56576f9fdb..2b55a276dc5b 100644
--- a/drivers/dma/shdma.h
+++ b/drivers/dma/shdma.h
@@ -23,6 +23,12 @@
 struct device;
+enum dmae_pm_state {
+        DMAE_PM_ESTABLISHED,
+        DMAE_PM_BUSY,
+        DMAE_PM_PENDING,
+};
 struct sh_dmae_chan {
        dma_cookie_t completed_cookie;  /* The maximum cookie completed */
        spinlock_t desc_lock;           /* Descriptor operation lock */
@@ -38,6 +44,7 @@ struct sh_dmae_chan {
        u32 __iomem *base;
        char dev_id[16];                /* unique name per DMAC of channel */
        int pm_error;
+        enum dmae_pm_state pm_state;
 };
 struct sh_dmae_device {
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 467e4dcb20a0..13259cad0ceb 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -9,6 +9,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <linux/dmaengine.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c
index f69f90a61873..a4a398f2ef61 100644
--- a/drivers/dma/timb_dma.c
+++ b/drivers/dma/timb_dma.c
@@ -753,7 +753,7 @@ static int __devinit td_probe(struct platform_device *pdev)
        INIT_LIST_HEAD(&td->dma.channels);
-        for (i = 0; i < pdata->nr_channels; i++, td->dma.chancnt++) {
+        for (i = 0; i < pdata->nr_channels; i++) {
                struct timb_dma_chan *td_chan = &td->channels[i];
                struct timb_dma_platform_data_channel *pchan =
                        pdata->channels + i;
@@ -762,12 +762,11 @@ static int __devinit td_probe(struct platform_device *pdev)
                if ((i % 2) == pchan->rx) {
                        dev_err(&pdev->dev, "Wrong channel configuration\n");
                        err = -EINVAL;
-                        goto err_tasklet_kill;
+                        goto err_free_irq;
                }
                td_chan->chan.device = &td->dma;
                td_chan->chan.cookie = 1;
-                td_chan->chan.chan_id = i;
                spin_lock_init(&td_chan->lock);
                INIT_LIST_HEAD(&td_chan->active_list);
                INIT_LIST_HEAD(&td_chan->queue);
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index af1a17d42bd7..5948a2194f50 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -41,7 +41,7 @@ config EDAC_DEBUG
 config EDAC_DECODE_MCE
        tristate "Decode MCEs in human-readable form (only on AMD for now)"
-        depends on CPU_SUP_AMD && X86_MCE
+        depends on CPU_SUP_AMD && X86_MCE_AMD
        default y
        ---help---
          Enable this option if you want to decode Machine Check Exceptions
@@ -71,9 +71,6 @@ config EDAC_MM_EDAC
          occurred so that a particular failing memory module can be
          replaced.  If unsure, select 'Y'.
-config EDAC_MCE
-        bool
 config EDAC_AMD64
        tristate "AMD64 (Opteron, Athlon64) K8, F10h"
        depends on EDAC_MM_EDAC && AMD_NB && X86_64 && EDAC_DECODE_MCE
@@ -173,8 +170,7 @@ config EDAC_I5400
 config EDAC_I7CORE
        tristate "Intel i7 Core (Nehalem) processors"
-        depends on EDAC_MM_EDAC && PCI && X86
+        depends on EDAC_MM_EDAC && PCI && X86 && X86_MCE_INTEL
-        select EDAC_MCE
        help
          Support for error detection and correction the Intel
          i7 Core (Nehalem) Integrated Memory Controller that exists on
@@ -216,6 +212,14 @@ config EDAC_I7300
          Support for error detection and correction the Intel
          Clarksboro MCH (Intel 7300 chipset).
+config EDAC_SBRIDGE
+        tristate "Intel Sandy-Bridge Integrated MC"
+        depends on EDAC_MM_EDAC && PCI && X86_64 && X86_MCE_INTEL
+        depends on EXPERIMENTAL
+        help
+          Support for error detection and correction the Intel
+          Sandy Bridge Integrated Memory Controller.
 config EDAC_MPC85XX
        tristate "Freescale MPC83xx / MPC85xx"
        depends on EDAC_MM_EDAC && FSL_SOC && (PPC_83xx || PPC_85xx)
diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile
index 3e239133e29e..196a63dd37c5 100644
--- a/drivers/edac/Makefile
+++ b/drivers/edac/Makefile
@@ -8,7 +8,6 @@
 obj-$(CONFIG_EDAC)                      := edac_stub.o
 obj-$(CONFIG_EDAC_MM_EDAC)              += edac_core.o
-obj-$(CONFIG_EDAC_MCE)                  += edac_mce.o
 edac_core-y     := edac_mc.o edac_device.o edac_mc_sysfs.o edac_pci_sysfs.o
 edac_core-y     += edac_module.o edac_device_sysfs.o
@@ -29,6 +28,7 @@ obj-$(CONFIG_EDAC_I5100)		+= i5100_edac.o
 obj-$(CONFIG_EDAC_I5400)                += i5400_edac.o
 obj-$(CONFIG_EDAC_I7300)                += i7300_edac.o
 obj-$(CONFIG_EDAC_I7CORE)               += i7core_edac.o
+obj-$(CONFIG_EDAC_SBRIDGE)              += sb_edac.o
 obj-$(CONFIG_EDAC_E7XXX)                += e7xxx_edac.o
 obj-$(CONFIG_EDAC_E752X)                += e752x_edac.o
 obj-$(CONFIG_EDAC_I82443BXGX)           += i82443bxgx_edac.o
diff --git a/drivers/edac/cpc925_edac.c b/drivers/edac/cpc925_edac.c
index a687a0d16962..a774c0ddaf5b 100644
--- a/drivers/edac/cpc925_edac.c
+++ b/drivers/edac/cpc925_edac.c
@@ -90,6 +90,7 @@ enum apimask_bits {
        ECC_MASK_ENABLE = (APIMASK_ECC_UE_H | APIMASK_ECC_CE_H |
                           APIMASK_ECC_UE_L | APIMASK_ECC_CE_L),
 };
+#define APIMASK_ADI(n)          CPC925_BIT(((n)+1))
 /************************************************************
 *      Processor Interface Exception Register (APIEXCP)
@@ -581,16 +582,73 @@ static void cpc925_mc_check(struct mem_ctl_info *mci)
 }
 /******************** CPU err device********************************/
+static u32 cpc925_cpu_mask_disabled(void)
+{
+        struct device_node *cpus;
+        struct device_node *cpunode = NULL;
+        static u32 mask = 0;
+        /* use cached value if available */
+        if (mask != 0)
+                return mask;
+        mask = APIMASK_ADI0 | APIMASK_ADI1;
+        cpus = of_find_node_by_path("/cpus");
+        if (cpus == NULL) {
+                cpc925_printk(KERN_DEBUG, "No /cpus node !\n");
+                return 0;
+        }
+        while ((cpunode = of_get_next_child(cpus, cpunode)) != NULL) {
+                const u32 *reg = of_get_property(cpunode, "reg", NULL);
+                if (strcmp(cpunode->type, "cpu")) {
+                        cpc925_printk(KERN_ERR, "Not a cpu node in /cpus: %s\n", cpunode->name);
+                        continue;
+                }
+                if (reg == NULL || *reg > 2) {
+                        cpc925_printk(KERN_ERR, "Bad reg value at %s\n", cpunode->full_name);
+                        continue;
+                }
+                mask &= ~APIMASK_ADI(*reg);
+        }
+        if (mask != (APIMASK_ADI0 | APIMASK_ADI1)) {
+                /* We assume that each CPU sits on it's own PI and that
+                 * for present CPUs the reg property equals to the PI
+                 * interface id */
+                cpc925_printk(KERN_WARNING,
+                                "Assuming PI id is equal to CPU MPIC id!\n");
+        }
+        of_node_put(cpunode);
+        of_node_put(cpus);
+        return mask;
+}
 /* Enable CPU Errors detection */
 static void cpc925_cpu_init(struct cpc925_dev_info *dev_info)
 {
        u32 apimask;
+        u32 cpumask;
        apimask = __raw_readl(dev_info->vbase + REG_APIMASK_OFFSET);
-        if ((apimask & CPU_MASK_ENABLE) == 0) {
-                apimask |= CPU_MASK_ENABLE;
+        cpumask = cpc925_cpu_mask_disabled();
-                __raw_writel(apimask, dev_info->vbase + REG_APIMASK_OFFSET);
+        if (apimask & cpumask) {
+                cpc925_printk(KERN_WARNING, "CPU(s) not present, "
+                                "but enabled in APIMASK, disabling\n");
+                apimask &= ~cpumask;
        }
+        if ((apimask & CPU_MASK_ENABLE) == 0)
+                apimask |= CPU_MASK_ENABLE;
+        __raw_writel(apimask, dev_info->vbase + REG_APIMASK_OFFSET);
 }
 /* Disable CPU Errors detection */
@@ -622,6 +680,9 @@ static void cpc925_cpu_check(struct edac_device_ctl_info *edac_dev)
        if ((apiexcp & CPU_EXCP_DETECTED) == 0)
                return;
+        if ((apiexcp & ~cpc925_cpu_mask_disabled()) == 0)
+                return;
        apimask = __raw_readl(dev_info->vbase + REG_APIMASK_OFFSET);
        cpc925_printk(KERN_INFO, "Processor Interface Fault\n"
                                 "Processor Interface register dump:\n");
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index 55b8278bb172..fe90cd4a7ebc 100644
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -34,11 +34,10 @@
 #include <linux/platform_device.h>
 #include <linux/sysdev.h>
 #include <linux/workqueue.h>
+#include <linux/edac.h>
-#define EDAC_MC_LABEL_LEN       31
 #define EDAC_DEVICE_NAME_LEN    31
 #define EDAC_ATTRIB_VALUE_LEN   15
-#define MC_PROC_NAME_MAX_LEN    7
 #if PAGE_SHIFT < 20
 #define PAGES_TO_MiB(pages)     ((pages) >> (20 - PAGE_SHIFT))
@@ -101,353 +100,6 @@ extern int edac_debug_level;
 #define edac_dev_name(dev) (dev)->dev_name
-/* memory devices */
-enum dev_type {
-        DEV_UNKNOWN = 0,
-        DEV_X1,
-        DEV_X2,
-        DEV_X4,
-        DEV_X8,
-        DEV_X16,
-        DEV_X32,                /* Do these parts exist? */
-        DEV_X64                 /* Do these parts exist? */
-};
-#define DEV_FLAG_UNKNOWN        BIT(DEV_UNKNOWN)
-#define DEV_FLAG_X1             BIT(DEV_X1)
-#define DEV_FLAG_X2             BIT(DEV_X2)
-#define DEV_FLAG_X4             BIT(DEV_X4)
-#define DEV_FLAG_X8             BIT(DEV_X8)
-#define DEV_FLAG_X16            BIT(DEV_X16)
-#define DEV_FLAG_X32            BIT(DEV_X32)
-#define DEV_FLAG_X64            BIT(DEV_X64)
-/* memory types */
-enum mem_type {
-        MEM_EMPTY = 0,          /* Empty csrow */
-        MEM_RESERVED,           /* Reserved csrow type */
-        MEM_UNKNOWN,            /* Unknown csrow type */
-        MEM_FPM,                /* Fast page mode */
-        MEM_EDO,                /* Extended data out */
-        MEM_BEDO,               /* Burst Extended data out */
-        MEM_SDR,                /* Single data rate SDRAM */
-        MEM_RDR,                /* Registered single data rate SDRAM */
-        MEM_DDR,                /* Double data rate SDRAM */
-        MEM_RDDR,               /* Registered Double data rate SDRAM */
-        MEM_RMBS,               /* Rambus DRAM */
-        MEM_DDR2,               /* DDR2 RAM */
-        MEM_FB_DDR2,            /* fully buffered DDR2 */
-        MEM_RDDR2,              /* Registered DDR2 RAM */
-        MEM_XDR,                /* Rambus XDR */
-        MEM_DDR3,               /* DDR3 RAM */
-        MEM_RDDR3,              /* Registered DDR3 RAM */
-};
-#define MEM_FLAG_EMPTY          BIT(MEM_EMPTY)
-#define MEM_FLAG_RESERVED       BIT(MEM_RESERVED)
-#define MEM_FLAG_UNKNOWN        BIT(MEM_UNKNOWN)
-#define MEM_FLAG_FPM            BIT(MEM_FPM)
-#define MEM_FLAG_EDO            BIT(MEM_EDO)
-#define MEM_FLAG_BEDO           BIT(MEM_BEDO)
-#define MEM_FLAG_SDR            BIT(MEM_SDR)
-#define MEM_FLAG_RDR            BIT(MEM_RDR)
-#define MEM_FLAG_DDR            BIT(MEM_DDR)
-#define MEM_FLAG_RDDR           BIT(MEM_RDDR)
-#define MEM_FLAG_RMBS           BIT(MEM_RMBS)
-#define MEM_FLAG_DDR2           BIT(MEM_DDR2)
-#define MEM_FLAG_FB_DDR2        BIT(MEM_FB_DDR2)
-#define MEM_FLAG_RDDR2          BIT(MEM_RDDR2)
-#define MEM_FLAG_XDR            BIT(MEM_XDR)
-#define MEM_FLAG_DDR3            BIT(MEM_DDR3)
-#define MEM_FLAG_RDDR3           BIT(MEM_RDDR3)
-/* chipset Error Detection and Correction capabilities and mode */
-enum edac_type {
-        EDAC_UNKNOWN = 0,       /* Unknown if ECC is available */
-        EDAC_NONE,              /* Doesn't support ECC */
-        EDAC_RESERVED,          /* Reserved ECC type */
-        EDAC_PARITY,            /* Detects parity errors */
-        EDAC_EC,                /* Error Checking - no correction */
-        EDAC_SECDED,            /* Single bit error correction, Double detection */
-        EDAC_S2ECD2ED,          /* Chipkill x2 devices - do these exist? */
-        EDAC_S4ECD4ED,          /* Chipkill x4 devices */
-        EDAC_S8ECD8ED,          /* Chipkill x8 devices */
-        EDAC_S16ECD16ED,        /* Chipkill x16 devices */
-};
-#define EDAC_FLAG_UNKNOWN       BIT(EDAC_UNKNOWN)
-#define EDAC_FLAG_NONE          BIT(EDAC_NONE)
-#define EDAC_FLAG_PARITY        BIT(EDAC_PARITY)
-#define EDAC_FLAG_EC            BIT(EDAC_EC)
-#define EDAC_FLAG_SECDED        BIT(EDAC_SECDED)
-#define EDAC_FLAG_S2ECD2ED      BIT(EDAC_S2ECD2ED)
-#define EDAC_FLAG_S4ECD4ED      BIT(EDAC_S4ECD4ED)
-#define EDAC_FLAG_S8ECD8ED      BIT(EDAC_S8ECD8ED)
-#define EDAC_FLAG_S16ECD16ED    BIT(EDAC_S16ECD16ED)
-/* scrubbing capabilities */
-enum scrub_type {
-        SCRUB_UNKNOWN = 0,      /* Unknown if scrubber is available */
-        SCRUB_NONE,             /* No scrubber */
-        SCRUB_SW_PROG,          /* SW progressive (sequential) scrubbing */
-        SCRUB_SW_SRC,           /* Software scrub only errors */
-        SCRUB_SW_PROG_SRC,      /* Progressive software scrub from an error */
-        SCRUB_SW_TUNABLE,       /* Software scrub frequency is tunable */
-        SCRUB_HW_PROG,          /* HW progressive (sequential) scrubbing */
-        SCRUB_HW_SRC,           /* Hardware scrub only errors */
-        SCRUB_HW_PROG_SRC,      /* Progressive hardware scrub from an error */
-        SCRUB_HW_TUNABLE        /* Hardware scrub frequency is tunable */
-};
-#define SCRUB_FLAG_SW_PROG      BIT(SCRUB_SW_PROG)
-#define SCRUB_FLAG_SW_SRC       BIT(SCRUB_SW_SRC)
-#define SCRUB_FLAG_SW_PROG_SRC  BIT(SCRUB_SW_PROG_SRC)
-#define SCRUB_FLAG_SW_TUN       BIT(SCRUB_SW_SCRUB_TUNABLE)
-#define SCRUB_FLAG_HW_PROG      BIT(SCRUB_HW_PROG)
-#define SCRUB_FLAG_HW_SRC       BIT(SCRUB_HW_SRC)
-#define SCRUB_FLAG_HW_PROG_SRC  BIT(SCRUB_HW_PROG_SRC)
-#define SCRUB_FLAG_HW_TUN       BIT(SCRUB_HW_TUNABLE)
-/* FIXME - should have notify capabilities: NMI, LOG, PROC, etc */
-/* EDAC internal operation states */
-#define OP_ALLOC                0x100
-#define OP_RUNNING_POLL         0x201
-#define OP_RUNNING_INTERRUPT    0x202
-#define OP_RUNNING_POLL_INTR    0x203
-#define OP_OFFLINE              0x300
-/*
- * There are several things to be aware of that aren't at all obvious:
- *
- *
- * SOCKETS, SOCKET SETS, BANKS, ROWS, CHIP-SELECT ROWS, CHANNELS, etc..
- *
- * These are some of the many terms that are thrown about that don't always
- * mean what people think they mean (Inconceivable!).  In the interest of
- * creating a common ground for discussion, terms and their definitions
- * will be established.
- *
- * Memory devices:      The individual chip on a memory stick.  These devices
- *                      commonly output 4 and 8 bits each.  Grouping several
- *                      of these in parallel provides 64 bits which is common
- *                      for a memory stick.
- *
- * Memory Stick:        A printed circuit board that aggregates multiple
- *                      memory devices in parallel.  This is the atomic
- *                      memory component that is purchaseable by Joe consumer
- *                      and loaded into a memory socket.
- *
- * Socket:              A physical connector on the motherboard that accepts
- *                      a single memory stick.
- *
- * Channel:             Set of memory devices on a memory stick that must be
- *                      grouped in parallel with one or more additional
- *                      channels from other memory sticks.  This parallel
- *                      grouping of the output from multiple channels are
- *                      necessary for the smallest granularity of memory access.
- *                      Some memory controllers are capable of single channel -
- *                      which means that memory sticks can be loaded
- *                      individually.  Other memory controllers are only
- *                      capable of dual channel - which means that memory
- *                      sticks must be loaded as pairs (see "socket set").
- *
- * Chip-select row:     All of the memory devices that are selected together.
- *                      for a single, minimum grain of memory access.
- *                      This selects all of the parallel memory devices across
- *                      all of the parallel channels.  Common chip-select rows
- *                      for single channel are 64 bits, for dual channel 128
- *                      bits.
- *
- * Single-Ranked stick: A Single-ranked stick has 1 chip-select row of memory.
- *                      Motherboards commonly drive two chip-select pins to
- *                      a memory stick. A single-ranked stick, will occupy
- *                      only one of those rows. The other will be unused.
- *
- * Double-Ranked stick: A double-ranked stick has two chip-select rows which
- *                      access different sets of memory devices.  The two
- *                      rows cannot be accessed concurrently.
- *
- * Double-sided stick:  DEPRECATED TERM, see Double-Ranked stick.
- *                      A double-sided stick has two chip-select rows which
- *                      access different sets of memory devices.  The two
- *                      rows cannot be accessed concurrently.  "Double-sided"
- *                      is irrespective of the memory devices being mounted
- *                      on both sides of the memory stick.
- *
- * Socket set:          All of the memory sticks that are required for
- *                      a single memory access or all of the memory sticks
- *                      spanned by a chip-select row.  A single socket set
- *                      has two chip-select rows and if double-sided sticks
- *                      are used these will occupy those chip-select rows.
- *
- * Bank:                This term is avoided because it is unclear when
- *                      needing to distinguish between chip-select rows and
- *                      socket sets.
- *
- * Controller pages:
- *
- * Physical pages:
- *
- * Virtual pages:
- *
- *
- * STRUCTURE ORGANIZATION AND CHOICES
- *
- *
- *
- * PS - I enjoyed writing all that about as much as you enjoyed reading it.
- */
-struct channel_info {
-        int chan_idx;           /* channel index */
-        u32 ce_count;           /* Correctable Errors for this CHANNEL */
-        char label[EDAC_MC_LABEL_LEN + 1];      /* DIMM label on motherboard */
-        struct csrow_info *csrow;       /* the parent */
-};
-struct csrow_info {
-        unsigned long first_page;       /* first page number in dimm */
-        unsigned long last_page;        /* last page number in dimm */
-        unsigned long page_mask;        /* used for interleaving -
-                                         * 0UL for non intlv
-                                         */
-        u32 nr_pages;           /* number of pages in csrow */
-        u32 grain;              /* granularity of reported error in bytes */
-        int csrow_idx;          /* the chip-select row */
-        enum dev_type dtype;    /* memory device type */
-        u32 ue_count;           /* Uncorrectable Errors for this csrow */
-        u32 ce_count;           /* Correctable Errors for this csrow */
-        enum mem_type mtype;    /* memory csrow type */
-        enum edac_type edac_mode;       /* EDAC mode for this csrow */
-        struct mem_ctl_info *mci;       /* the parent */
-        struct kobject kobj;    /* sysfs kobject for this csrow */
-        /* channel information for this csrow */
-        u32 nr_channels;
-        struct channel_info *channels;
-};
-struct mcidev_sysfs_group {
-        const char *name;                               /* group name */
-        const struct mcidev_sysfs_attribute *mcidev_attr; /* group attributes */
-};
-struct mcidev_sysfs_group_kobj {
-        struct list_head list;          /* list for all instances within a mc */
-        struct kobject kobj;            /* kobj for the group */
-        const struct mcidev_sysfs_group *grp;   /* group description table */
-        struct mem_ctl_info *mci;       /* the parent */
-};
-/* mcidev_sysfs_attribute structure
- *      used for driver sysfs attributes and in mem_ctl_info
- *      sysfs top level entries
- */
-struct mcidev_sysfs_attribute {
-        /* It should use either attr or grp */
-        struct attribute attr;
-        const struct mcidev_sysfs_group *grp;   /* Points to a group of attributes */
-        /* Ops for show/store values at the attribute - not used on group */
-        ssize_t (*show)(struct mem_ctl_info *,char *);
-        ssize_t (*store)(struct mem_ctl_info *, const char *,size_t);
-};
-/* MEMORY controller information structure
- */
-struct mem_ctl_info {
-        struct list_head link;  /* for global list of mem_ctl_info structs */
-        struct module *owner;   /* Module owner of this control struct */
-        unsigned long mtype_cap;        /* memory types supported by mc */
-        unsigned long edac_ctl_cap;     /* Mem controller EDAC capabilities */
-        unsigned long edac_cap; /* configuration capabilities - this is
-                                 * closely related to edac_ctl_cap.  The
-                                 * difference is that the controller may be
-                                 * capable of s4ecd4ed which would be listed
-                                 * in edac_ctl_cap, but if channels aren't
-                                 * capable of s4ecd4ed then the edac_cap would
-                                 * not have that capability.
-                                 */
-        unsigned long scrub_cap;        /* chipset scrub capabilities */
-        enum scrub_type scrub_mode;     /* current scrub mode */
-        /* Translates sdram memory scrub rate given in bytes/sec to the
-           internal representation and configures whatever else needs
-           to be configured.
-         */
-        int (*set_sdram_scrub_rate) (struct mem_ctl_info * mci, u32 bw);
-        /* Get the current sdram memory scrub rate from the internal
-           representation and converts it to the closest matching
-           bandwidth in bytes/sec.
-         */
-        int (*get_sdram_scrub_rate) (struct mem_ctl_info * mci);
-        /* pointer to edac checking routine */
-        void (*edac_check) (struct mem_ctl_info * mci);
-        /*
-         * Remaps memory pages: controller pages to physical pages.
-         * For most MC's, this will be NULL.
-         */
-        /* FIXME - why not send the phys page to begin with? */
-        unsigned long (*ctl_page_to_phys) (struct mem_ctl_info * mci,
-                                           unsigned long page);
-        int mc_idx;
-        int nr_csrows;
-        struct csrow_info *csrows;
-        /*
-         * FIXME - what about controllers on other busses? - IDs must be
-         * unique.  dev pointer should be sufficiently unique, but
-         * BUS:SLOT.FUNC numbers may not be unique.
-         */
-        struct device *dev;
-        const char *mod_name;
-        const char *mod_ver;
-        const char *ctl_name;
-        const char *dev_name;
-        char proc_name[MC_PROC_NAME_MAX_LEN + 1];
-        void *pvt_info;
-        u32 ue_noinfo_count;    /* Uncorrectable Errors w/o info */
-        u32 ce_noinfo_count;    /* Correctable Errors w/o info */
-        u32 ue_count;           /* Total Uncorrectable Errors for this MC */
-        u32 ce_count;           /* Total Correctable Errors for this MC */
-        unsigned long start_time;       /* mci load start time (in jiffies) */
-        struct completion complete;
-        /* edac sysfs device control */
-        struct kobject edac_mci_kobj;
-        /* list for all grp instances within a mc */
-        struct list_head grp_kobj_list;
-        /* Additional top controller level attributes, but specified
-         * by the low level driver.
-         *
-         * Set by the low level driver to provide attributes at the
-         * controller level, same level as 'ue_count' and 'ce_count' above.
-         * An array of structures, NULL terminated
-         *
-         * If attributes are desired, then set to array of attributes
-         * If no attributes are desired, leave NULL
-         */
-        const struct mcidev_sysfs_attribute *mc_driver_sysfs_attributes;
-        /* work struct for this MC */
-        struct delayed_work work;
-        /* the internal state of this controller instance */
-        int op_state;
-};
 /*
 * The following are the structures to provide for a generic
 * or abstract 'edac_device'. This set of structures and the
diff --git a/drivers/edac/edac_mce.c b/drivers/edac/edac_mce.c
deleted file mode 100644
index 9ccdc5b140e7..000000000000
--- a/drivers/edac/edac_mce.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Provides edac interface to mcelog events
- *
- * This file may be distributed under the terms of the
- * GNU General Public License version 2.
- *
- * Copyright (c) 2009 by:
- *       Mauro Carvalho Chehab <mchehab@redhat.com>
- *
- * Red Hat Inc. http://www.redhat.com
- */
-#include <linux/module.h>
-#include <linux/edac_mce.h>
-#include <asm/mce.h>
-int edac_mce_enabled;
-EXPORT_SYMBOL_GPL(edac_mce_enabled);
-/*
- * Extension interface
- */
-static LIST_HEAD(edac_mce_list);
-static DEFINE_MUTEX(edac_mce_lock);
-int edac_mce_register(struct edac_mce *edac_mce)
-{
-        mutex_lock(&edac_mce_lock);
-        list_add_tail(&edac_mce->list, &edac_mce_list);
-        mutex_unlock(&edac_mce_lock);
-        return 0;
-}
-EXPORT_SYMBOL(edac_mce_register);
-void edac_mce_unregister(struct edac_mce *edac_mce)
-{
-        mutex_lock(&edac_mce_lock);
-        list_del(&edac_mce->list);
-        mutex_unlock(&edac_mce_lock);
-}
-EXPORT_SYMBOL(edac_mce_unregister);
-int edac_mce_parse(struct mce *mce)
-{
-        struct edac_mce *edac_mce;
-        list_for_each_entry(edac_mce, &edac_mce_list, list) {
-                if (edac_mce->check_error(edac_mce->priv, mce))
-                        return 1;
-        }
-        /* Nobody queued the error */
-        return 0;
-}
-EXPORT_SYMBOL_GPL(edac_mce_parse);
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
-MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)");
-MODULE_DESCRIPTION("EDAC Driver for mcelog captured errors");
diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c
index a76fe8366b68..6104dba380b6 100644
--- a/drivers/edac/i7300_edac.c
+++ b/drivers/edac/i7300_edac.c
@@ -372,7 +372,7 @@ static const char *get_err_from_table(const char *table[], int size, int pos)
 static void i7300_process_error_global(struct mem_ctl_info *mci)
 {
        struct i7300_pvt *pvt;
-        u32 errnum, value;
+        u32 errnum, error_reg;
        unsigned long errors;
        const char *specific;
        bool is_fatal;
@@ -381,9 +381,9 @@ static void i7300_process_error_global(struct mem_ctl_info *mci)
        /* read in the 1st FATAL error register */
        pci_read_config_dword(pvt->pci_dev_16_2_fsb_err_regs,
-                              FERR_GLOBAL_HI, &value);
+                              FERR_GLOBAL_HI, &error_reg);
-        if (unlikely(value)) {
+        if (unlikely(error_reg)) {
-                errors = value;
+                errors = error_reg;
                errnum = find_first_bit(&errors,
                                        ARRAY_SIZE(ferr_global_hi_name));
                specific = GET_ERR_FROM_TABLE(ferr_global_hi_name, errnum);
@@ -391,15 +391,15 @@ static void i7300_process_error_global(struct mem_ctl_info *mci)
                /* Clear the error bit */
                pci_write_config_dword(pvt->pci_dev_16_2_fsb_err_regs,
-                                       FERR_GLOBAL_HI, value);
+                                       FERR_GLOBAL_HI, error_reg);
                goto error_global;
        }
        pci_read_config_dword(pvt->pci_dev_16_2_fsb_err_regs,
-                              FERR_GLOBAL_LO, &value);
+                              FERR_GLOBAL_LO, &error_reg);
-        if (unlikely(value)) {
+        if (unlikely(error_reg)) {
-                errors = value;
+                errors = error_reg;
                errnum = find_first_bit(&errors,
                                        ARRAY_SIZE(ferr_global_lo_name));
                specific = GET_ERR_FROM_TABLE(ferr_global_lo_name, errnum);
@@ -407,7 +407,7 @@ static void i7300_process_error_global(struct mem_ctl_info *mci)
                /* Clear the error bit */
                pci_write_config_dword(pvt->pci_dev_16_2_fsb_err_regs,
-                                       FERR_GLOBAL_LO, value);
+                                       FERR_GLOBAL_LO, error_reg);
                goto error_global;
        }
@@ -427,7 +427,7 @@ error_global:
 static void i7300_process_fbd_error(struct mem_ctl_info *mci)
 {
        struct i7300_pvt *pvt;
-        u32 errnum, value;
+        u32 errnum, value, error_reg;
        u16 val16;
        unsigned branch, channel, bank, rank, cas, ras;
        u32 syndrome;
@@ -440,14 +440,14 @@ static void i7300_process_fbd_error(struct mem_ctl_info *mci)
        /* read in the 1st FATAL error register */
        pci_read_config_dword(pvt->pci_dev_16_1_fsb_addr_map,
-                              FERR_FAT_FBD, &value);
+                              FERR_FAT_FBD, &error_reg);
-        if (unlikely(value & FERR_FAT_FBD_ERR_MASK)) {
+        if (unlikely(error_reg & FERR_FAT_FBD_ERR_MASK)) {
-                errors = value & FERR_FAT_FBD_ERR_MASK ;
+                errors = error_reg & FERR_FAT_FBD_ERR_MASK ;
                errnum = find_first_bit(&errors,
                                        ARRAY_SIZE(ferr_fat_fbd_name));
                specific = GET_ERR_FROM_TABLE(ferr_fat_fbd_name, errnum);
+                branch = (GET_FBD_FAT_IDX(error_reg) == 2) ? 1 : 0;
-                branch = (GET_FBD_FAT_IDX(value) == 2) ? 1 : 0;
                pci_read_config_word(pvt->pci_dev_16_1_fsb_addr_map,
                                     NRECMEMA, &val16);
                bank = NRECMEMA_BANK(val16);
@@ -455,11 +455,14 @@ static void i7300_process_fbd_error(struct mem_ctl_info *mci)
                pci_read_config_dword(pvt->pci_dev_16_1_fsb_addr_map,
                                NRECMEMB, &value);
                is_wr = NRECMEMB_IS_WR(value);
                cas = NRECMEMB_CAS(value);
                ras = NRECMEMB_RAS(value);
+                /* Clean the error register */
+                pci_write_config_dword(pvt->pci_dev_16_1_fsb_addr_map,
+                                FERR_FAT_FBD, error_reg);
                snprintf(pvt->tmp_prt_buffer, PAGE_SIZE,
                        "FATAL (Branch=%d DRAM-Bank=%d %s "
                        "RAS=%d CAS=%d Err=0x%lx (%s))",
@@ -476,21 +479,17 @@ static void i7300_process_fbd_error(struct mem_ctl_info *mci)
        /* read in the 1st NON-FATAL error register */
        pci_read_config_dword(pvt->pci_dev_16_1_fsb_addr_map,
-                              FERR_NF_FBD, &value);
+                              FERR_NF_FBD, &error_reg);
-        if (unlikely(value & FERR_NF_FBD_ERR_MASK)) {
+        if (unlikely(error_reg & FERR_NF_FBD_ERR_MASK)) {
-                errors = value & FERR_NF_FBD_ERR_MASK;
+                errors = error_reg & FERR_NF_FBD_ERR_MASK;
                errnum = find_first_bit(&errors,
                                        ARRAY_SIZE(ferr_nf_fbd_name));
                specific = GET_ERR_FROM_TABLE(ferr_nf_fbd_name, errnum);
+                branch = (GET_FBD_FAT_IDX(error_reg) == 2) ? 1 : 0;
-                /* Clear the error bit */
-                pci_write_config_dword(pvt->pci_dev_16_2_fsb_err_regs,
-                                       FERR_GLOBAL_LO, value);
                pci_read_config_dword(pvt->pci_dev_16_1_fsb_addr_map,
                        REDMEMA, &syndrome);
-                branch = (GET_FBD_FAT_IDX(value) == 2) ? 1 : 0;
                pci_read_config_word(pvt->pci_dev_16_1_fsb_addr_map,
                                     RECMEMA, &val16);
                bank = RECMEMA_BANK(val16);
@@ -498,18 +497,20 @@ static void i7300_process_fbd_error(struct mem_ctl_info *mci)
                pci_read_config_dword(pvt->pci_dev_16_1_fsb_addr_map,
                                RECMEMB, &value);
                is_wr = RECMEMB_IS_WR(value);
                cas = RECMEMB_CAS(value);
                ras = RECMEMB_RAS(value);
                pci_read_config_dword(pvt->pci_dev_16_1_fsb_addr_map,
                                     REDMEMB, &value);
                channel = (branch << 1);
                if (IS_SECOND_CH(value))
                        channel++;
+                /* Clear the error bit */
+                pci_write_config_dword(pvt->pci_dev_16_1_fsb_addr_map,
+                                FERR_NF_FBD, error_reg);
                /* Form out message */
                snprintf(pvt->tmp_prt_buffer, PAGE_SIZE,
                        "Corrected error (Branch=%d, Channel %d), "
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index f6cf448d69b4..70ad8923f1d7 100644
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -31,11 +31,13 @@
 #include <linux/pci_ids.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
+#include <linux/dmi.h>
 #include <linux/edac.h>
 #include <linux/mmzone.h>
-#include <linux/edac_mce.h>
 #include <linux/smp.h>
+#include <asm/mce.h>
 #include <asm/processor.h>
+#include <asm/div64.h>
 #include "edac_core.h"
@@ -78,6 +80,8 @@ MODULE_PARM_DESC(use_pci_fixup, "Enable PCI fixup to seek for hidden devices");
        /* OFFSETS for Device 0 Function 0 */
 #define MC_CFG_CONTROL  0x90
+  #define MC_CFG_UNLOCK         0x02
+  #define MC_CFG_LOCK           0x00
        /* OFFSETS for Device 3 Function 0 */
@@ -98,6 +102,15 @@ MODULE_PARM_DESC(use_pci_fixup, "Enable PCI fixup to seek for hidden devices");
  #define DIMM0_COR_ERR(r)                      ((r) & 0x7fff)
 /* OFFSETS for Device 3 Function 2, as inicated on Xeon 5500 datasheet */
+#define MC_SSRCONTROL           0x48
+  #define SSR_MODE_DISABLE      0x00
+  #define SSR_MODE_ENABLE       0x01
+  #define SSR_MODE_MASK         0x03
+#define MC_SCRUB_CONTROL        0x4c
+  #define STARTSCRUB            (1 << 24)
+  #define SCRUBINTERVAL_MASK    0xffffff
 #define MC_COR_ECC_CNT_0        0x80
 #define MC_COR_ECC_CNT_1        0x84
 #define MC_COR_ECC_CNT_2        0x88
@@ -253,10 +266,7 @@ struct i7core_pvt {
        unsigned long   rdimm_ce_count[NUM_CHANS][MAX_DIMMS];
        int             rdimm_last_ce_count[NUM_CHANS][MAX_DIMMS];
-        unsigned int    is_registered;
+        bool            is_registered, enable_scrub;
-        /* mcelog glue */
-        struct edac_mce         edac_mce;
        /* Fifo double buffers */
        struct mce              mce_entry[MCE_LOG_LEN];
@@ -268,6 +278,9 @@ struct i7core_pvt {
        /* Count indicator to show errors not got */
        unsigned                mce_overrun;
+        /* DCLK Frequency used for computing scrub rate */
+        int                     dclk_freq;
        /* Struct to control EDAC polling */
        struct edac_pci_ctl_info *i7core_pci;
 };
@@ -281,8 +294,7 @@ static const struct pci_id_descr pci_dev_descr_i7core_nehalem[] = {
                /* Memory controller */
        { PCI_DESCR(3, 0, PCI_DEVICE_ID_INTEL_I7_MCR)     },
        { PCI_DESCR(3, 1, PCI_DEVICE_ID_INTEL_I7_MC_TAD)  },
+                        /* Exists only for RDIMM */
-                /* Exists only for RDIMM */
        { PCI_DESCR(3, 2, PCI_DEVICE_ID_INTEL_I7_MC_RAS), .optional = 1  },
        { PCI_DESCR(3, 4, PCI_DEVICE_ID_INTEL_I7_MC_TEST) },
@@ -303,6 +315,16 @@ static const struct pci_id_descr pci_dev_descr_i7core_nehalem[] = {
        { PCI_DESCR(6, 1, PCI_DEVICE_ID_INTEL_I7_MC_CH2_ADDR) },
        { PCI_DESCR(6, 2, PCI_DEVICE_ID_INTEL_I7_MC_CH2_RANK) },
        { PCI_DESCR(6, 3, PCI_DEVICE_ID_INTEL_I7_MC_CH2_TC)   },
+                /* Generic Non-core registers */
+        /*
+         * This is the PCI device on i7core and on Xeon 35xx (8086:2c41)
+         * On Xeon 55xx, however, it has a different id (8086:2c40). So,
+         * the probing code needs to test for the other address in case of
+         * failure of this one
+         */
+        { PCI_DESCR(0, 0, PCI_DEVICE_ID_INTEL_I7_NONCORE)  },
 };
 static const struct pci_id_descr pci_dev_descr_lynnfield[] = {
@@ -319,6 +341,12 @@ static const struct pci_id_descr pci_dev_descr_lynnfield[] = {
        { PCI_DESCR( 5, 1, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH1_ADDR) },
        { PCI_DESCR( 5, 2, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH1_RANK) },
        { PCI_DESCR( 5, 3, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH1_TC)   },
+        /*
+         * This is the PCI device has an alternate address on some
+         * processors like Core i7 860
+         */
+        { PCI_DESCR( 0, 0, PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE)     },
 };
 static const struct pci_id_descr pci_dev_descr_i7core_westmere[] = {
@@ -346,6 +374,10 @@ static const struct pci_id_descr pci_dev_descr_i7core_westmere[] = {
        { PCI_DESCR(6, 1, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH2_ADDR_REV2) },
        { PCI_DESCR(6, 2, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH2_RANK_REV2) },
        { PCI_DESCR(6, 3, PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH2_TC_REV2)   },
+                /* Generic Non-core registers */
+        { PCI_DESCR(0, 0, PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_REV2)  },
 };
 #define PCI_ID_TABLE_ENTRY(A) { .descr=A, .n_devs = ARRAY_SIZE(A) }
@@ -714,6 +746,10 @@ static int get_dimm_config(const struct mem_ctl_info *mci)
                        csr->edac_mode = mode;
                        csr->mtype = mtype;
+                        snprintf(csr->channels[0].label,
+                                        sizeof(csr->channels[0].label),
+                                        "CPU#%uChannel#%u_DIMM#%u",
+                                        pvt->i7core_dev->socket, i, j);
                        csrow++;
                }
@@ -731,7 +767,7 @@ static int get_dimm_config(const struct mem_ctl_info *mci)
                        debugf1("\t\t%#x\t%#x\t%#x\n",
                                (value[j] >> 27) & 0x1,
                                (value[j] >> 24) & 0x7,
-                                (value[j] && ((1 << 24) - 1)));
+                                (value[j] & ((1 << 24) - 1)));
        }
        return 0;
@@ -1324,6 +1360,20 @@ static int i7core_get_onedevice(struct pci_dev **prev,
        pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
                              dev_descr->dev_id, *prev);
+        /*
+         * On Xeon 55xx, the Intel Quckpath Arch Generic Non-core regs
+         * is at addr 8086:2c40, instead of 8086:2c41. So, we need
+         * to probe for the alternate address in case of failure
+         */
+        if (dev_descr->dev_id == PCI_DEVICE_ID_INTEL_I7_NONCORE && !pdev)
+                pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
+                                      PCI_DEVICE_ID_INTEL_I7_NONCORE_ALT, *prev);
+        if (dev_descr->dev_id == PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE && !pdev)
+                pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
+                                      PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_ALT,
+                                      *prev);
        if (!pdev) {
                if (*prev) {
                        *prev = pdev;
@@ -1444,8 +1494,10 @@ static int mci_bind_devs(struct mem_ctl_info *mci,
        struct i7core_pvt *pvt = mci->pvt_info;
        struct pci_dev *pdev;
        int i, func, slot;
+        char *family;
-        pvt->is_registered = 0;
+        pvt->is_registered = false;
+        pvt->enable_scrub  = false;
        for (i = 0; i < i7core_dev->n_devs; i++) {
                pdev = i7core_dev->pdev[i];
                if (!pdev)
@@ -1461,9 +1513,37 @@ static int mci_bind_devs(struct mem_ctl_info *mci,
                        if (unlikely(func > MAX_CHAN_FUNC))
                                goto error;
                        pvt->pci_ch[slot - 4][func] = pdev;
-                } else if (!slot && !func)
+                } else if (!slot && !func) {
                        pvt->pci_noncore = pdev;
-                else
+                        /* Detect the processor family */
+                        switch (pdev->device) {
+                        case PCI_DEVICE_ID_INTEL_I7_NONCORE:
+                                family = "Xeon 35xx/ i7core";
+                                pvt->enable_scrub = false;
+                                break;
+                        case PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_ALT:
+                                family = "i7-800/i5-700";
+                                pvt->enable_scrub = false;
+                                break;
+                        case PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE:
+                                family = "Xeon 34xx";
+                                pvt->enable_scrub = false;
+                                break;
+                        case PCI_DEVICE_ID_INTEL_I7_NONCORE_ALT:
+                                family = "Xeon 55xx";
+                                pvt->enable_scrub = true;
+                                break;
+                        case PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_REV2:
+                                family = "Xeon 56xx / i7-900";
+                                pvt->enable_scrub = true;
+                                break;
+                        default:
+                                family = "unknown";
+                                pvt->enable_scrub = false;
+                        }
+                        debugf0("Detected a processor type %s\n", family);
+                } else
                        goto error;
                debugf0("Associated fn %d.%d, dev = %p, socket %d\n",
@@ -1472,7 +1552,7 @@ static int mci_bind_devs(struct mem_ctl_info *mci,
                if (PCI_SLOT(pdev->devfn) == 3 &&
                        PCI_FUNC(pdev->devfn) == 2)
-                        pvt->is_registered = 1;
+                        pvt->is_registered = true;
        }
        return 0;
@@ -1826,33 +1906,43 @@ check_ce_error:
 * WARNING: As this routine should be called at NMI time, extra care should
 * be taken to avoid deadlocks, and to be as fast as possible.
 */
-static int i7core_mce_check_error(void *priv, struct mce *mce)
+static int i7core_mce_check_error(struct notifier_block *nb, unsigned long val,
+                                  void *data)
 {
-        struct mem_ctl_info *mci = priv;
+        struct mce *mce = (struct mce *)data;
-        struct i7core_pvt *pvt = mci->pvt_info;
+        struct i7core_dev *i7_dev;
+        struct mem_ctl_info *mci;
+        struct i7core_pvt *pvt;
+        i7_dev = get_i7core_dev(mce->socketid);
+        if (!i7_dev)
+                return NOTIFY_BAD;
+        mci = i7_dev->mci;
+        pvt = mci->pvt_info;
        /*
         * Just let mcelog handle it if the error is
         * outside the memory controller
         */
        if (((mce->status & 0xffff) >> 7) != 1)
-                return 0;
+                return NOTIFY_DONE;
        /* Bank 8 registers are the only ones that we know how to handle */
        if (mce->bank != 8)
-                return 0;
+                return NOTIFY_DONE;
 #ifdef CONFIG_SMP
        /* Only handle if it is the right mc controller */
-        if (cpu_data(mce->cpu).phys_proc_id != pvt->i7core_dev->socket)
+        if (mce->socketid != pvt->i7core_dev->socket)
-                return 0;
+                return NOTIFY_DONE;
 #endif
        smp_rmb();
        if ((pvt->mce_out + 1) % MCE_LOG_LEN == pvt->mce_in) {
                smp_wmb();
                pvt->mce_overrun++;
-                return 0;
+                return NOTIFY_DONE;
        }
        /* Copy memory error at the ringbuffer */
@@ -1865,7 +1955,240 @@ static int i7core_mce_check_error(void *priv, struct mce *mce)
                i7core_check_error(mci);
        /* Advise mcelog that the errors were handled */
-        return 1;
+        return NOTIFY_STOP;
+}
+static struct notifier_block i7_mce_dec = {
+        .notifier_call  = i7core_mce_check_error,
+};
+struct memdev_dmi_entry {
+        u8 type;
+        u8 length;
+        u16 handle;
+        u16 phys_mem_array_handle;
+        u16 mem_err_info_handle;
+        u16 total_width;
+        u16 data_width;
+        u16 size;
+        u8 form;
+        u8 device_set;
+        u8 device_locator;
+        u8 bank_locator;
+        u8 memory_type;
+        u16 type_detail;
+        u16 speed;
+        u8 manufacturer;
+        u8 serial_number;
+        u8 asset_tag;
+        u8 part_number;
+        u8 attributes;
+        u32 extended_size;
+        u16 conf_mem_clk_speed;
+} __attribute__((__packed__));
+/*
+ * Decode the DRAM Clock Frequency, be paranoid, make sure that all
+ * memory devices show the same speed, and if they don't then consider
+ * all speeds to be invalid.
+ */
+static void decode_dclk(const struct dmi_header *dh, void *_dclk_freq)
+{
+        int *dclk_freq = _dclk_freq;
+        u16 dmi_mem_clk_speed;
+        if (*dclk_freq == -1)
+                return;
+        if (dh->type == DMI_ENTRY_MEM_DEVICE) {
+                struct memdev_dmi_entry *memdev_dmi_entry =
+                        (struct memdev_dmi_entry *)dh;
+                unsigned long conf_mem_clk_speed_offset =
+                        (unsigned long)&memdev_dmi_entry->conf_mem_clk_speed -
+                        (unsigned long)&memdev_dmi_entry->type;
+                unsigned long speed_offset =
+                        (unsigned long)&memdev_dmi_entry->speed -
+                        (unsigned long)&memdev_dmi_entry->type;
+                /* Check that a DIMM is present */
+                if (memdev_dmi_entry->size == 0)
+                        return;
+                /*
+                 * Pick the configured speed if it's available, otherwise
+                 * pick the DIMM speed, or we don't have a speed.
+                 */
+                if (memdev_dmi_entry->length > conf_mem_clk_speed_offset) {
+                        dmi_mem_clk_speed =
+                                memdev_dmi_entry->conf_mem_clk_speed;
+                } else if (memdev_dmi_entry->length > speed_offset) {
+                        dmi_mem_clk_speed = memdev_dmi_entry->speed;
+                } else {
+                        *dclk_freq = -1;
+                        return;
+                }
+                if (*dclk_freq == 0) {
+                        /* First pass, speed was 0 */
+                        if (dmi_mem_clk_speed > 0) {
+                                /* Set speed if a valid speed is read */
+                                *dclk_freq = dmi_mem_clk_speed;
+                        } else {
+                                /* Otherwise we don't have a valid speed */
+                                *dclk_freq = -1;
+                        }
+                } else if (*dclk_freq > 0 &&
+                           *dclk_freq != dmi_mem_clk_speed) {
+                        /*
+                         * If we have a speed, check that all DIMMS are the same
+                         * speed, otherwise set the speed as invalid.
+                         */
+                        *dclk_freq = -1;
+                }
+        }
+}
+/*
+ * The default DCLK frequency is used as a fallback if we
+ * fail to find anything reliable in the DMI. The value
+ * is taken straight from the datasheet.
+ */
+#define DEFAULT_DCLK_FREQ 800
+static int get_dclk_freq(void)
+{
+        int dclk_freq = 0;
+        dmi_walk(decode_dclk, (void *)&dclk_freq);
+        if (dclk_freq < 1)
+                return DEFAULT_DCLK_FREQ;
+        return dclk_freq;
+}
+/*
+ * set_sdram_scrub_rate         This routine sets byte/sec bandwidth scrub rate
+ *                              to hardware according to SCRUBINTERVAL formula
+ *                              found in datasheet.
+ */
+static int set_sdram_scrub_rate(struct mem_ctl_info *mci, u32 new_bw)
+{
+        struct i7core_pvt *pvt = mci->pvt_info;
+        struct pci_dev *pdev;
+        u32 dw_scrub;
+        u32 dw_ssr;
+        /* Get data from the MC register, function 2 */
+        pdev = pvt->pci_mcr[2];
+        if (!pdev)
+                return -ENODEV;
+        pci_read_config_dword(pdev, MC_SCRUB_CONTROL, &dw_scrub);
+        if (new_bw == 0) {
+                /* Prepare to disable petrol scrub */
+                dw_scrub &= ~STARTSCRUB;
+                /* Stop the patrol scrub engine */
+                write_and_test(pdev, MC_SCRUB_CONTROL,
+                               dw_scrub & ~SCRUBINTERVAL_MASK);
+                /* Get current status of scrub rate and set bit to disable */
+                pci_read_config_dword(pdev, MC_SSRCONTROL, &dw_ssr);
+                dw_ssr &= ~SSR_MODE_MASK;
+                dw_ssr |= SSR_MODE_DISABLE;
+        } else {
+                const int cache_line_size = 64;
+                const u32 freq_dclk_mhz = pvt->dclk_freq;
+                unsigned long long scrub_interval;
+                /*
+                 * Translate the desired scrub rate to a register value and
+                 * program the corresponding register value.
+                 */
+                scrub_interval = (unsigned long long)freq_dclk_mhz *
+                        cache_line_size * 1000000;
+                do_div(scrub_interval, new_bw);
+                if (!scrub_interval || scrub_interval > SCRUBINTERVAL_MASK)
+                        return -EINVAL;
+                dw_scrub = SCRUBINTERVAL_MASK & scrub_interval;
+                /* Start the patrol scrub engine */
+                pci_write_config_dword(pdev, MC_SCRUB_CONTROL,
+                                       STARTSCRUB | dw_scrub);
+                /* Get current status of scrub rate and set bit to enable */
+                pci_read_config_dword(pdev, MC_SSRCONTROL, &dw_ssr);
+                dw_ssr &= ~SSR_MODE_MASK;
+                dw_ssr |= SSR_MODE_ENABLE;
+        }
+        /* Disable or enable scrubbing */
+        pci_write_config_dword(pdev, MC_SSRCONTROL, dw_ssr);
+        return new_bw;
+}
+/*
+ * get_sdram_scrub_rate         This routine convert current scrub rate value
+ *                              into byte/sec bandwidth accourding to
+ *                              SCRUBINTERVAL formula found in datasheet.
+ */
+static int get_sdram_scrub_rate(struct mem_ctl_info *mci)
+{
+        struct i7core_pvt *pvt = mci->pvt_info;
+        struct pci_dev *pdev;
+        const u32 cache_line_size = 64;
+        const u32 freq_dclk_mhz = pvt->dclk_freq;
+        unsigned long long scrub_rate;
+        u32 scrubval;
+        /* Get data from the MC register, function 2 */
+        pdev = pvt->pci_mcr[2];
+        if (!pdev)
+                return -ENODEV;
+        /* Get current scrub control data */
+        pci_read_config_dword(pdev, MC_SCRUB_CONTROL, &scrubval);
+        /* Mask highest 8-bits to 0 */
+        scrubval &=  SCRUBINTERVAL_MASK;
+        if (!scrubval)
+                return 0;
+        /* Calculate scrub rate value into byte/sec bandwidth */
+        scrub_rate =  (unsigned long long)freq_dclk_mhz *
+                1000000 * cache_line_size;
+        do_div(scrub_rate, scrubval);
+        return (int)scrub_rate;
+}
+static void enable_sdram_scrub_setting(struct mem_ctl_info *mci)
+{
+        struct i7core_pvt *pvt = mci->pvt_info;
+        u32 pci_lock;
+        /* Unlock writes to pci registers */
+        pci_read_config_dword(pvt->pci_noncore, MC_CFG_CONTROL, &pci_lock);
+        pci_lock &= ~0x3;
+        pci_write_config_dword(pvt->pci_noncore, MC_CFG_CONTROL,
+                               pci_lock | MC_CFG_UNLOCK);
+        mci->set_sdram_scrub_rate = set_sdram_scrub_rate;
+        mci->get_sdram_scrub_rate = get_sdram_scrub_rate;
+}
+static void disable_sdram_scrub_setting(struct mem_ctl_info *mci)
+{
+        struct i7core_pvt *pvt = mci->pvt_info;
+        u32 pci_lock;
+        /* Lock writes to pci registers */
+        pci_read_config_dword(pvt->pci_noncore, MC_CFG_CONTROL, &pci_lock);
+        pci_lock &= ~0x3;
+        pci_write_config_dword(pvt->pci_noncore, MC_CFG_CONTROL,
+                               pci_lock | MC_CFG_LOCK);
 }
 static void i7core_pci_ctl_create(struct i7core_pvt *pvt)
@@ -1874,7 +2197,8 @@ static void i7core_pci_ctl_create(struct i7core_pvt *pvt)
                                                &pvt->i7core_dev->pdev[0]->dev,
                                                EDAC_MOD_STR);
        if (unlikely(!pvt->i7core_pci))
-                pr_warn("Unable to setup PCI error report via EDAC\n");
+                i7core_printk(KERN_WARNING,
+                              "Unable to setup PCI error report via EDAC\n");
 }
 static void i7core_pci_ctl_release(struct i7core_pvt *pvt)
@@ -1906,8 +2230,11 @@ static void i7core_unregister_mci(struct i7core_dev *i7core_dev)
        debugf0("MC: " __FILE__ ": %s(): mci = %p, dev = %p\n",
                __func__, mci, &i7core_dev->pdev[0]->dev);
-        /* Disable MCE NMI handler */
+        /* Disable scrubrate setting */
-        edac_mce_unregister(&pvt->edac_mce);
+        if (pvt->enable_scrub)
+                disable_sdram_scrub_setting(mci);
+        atomic_notifier_chain_unregister(&x86_mce_decoder_chain, &i7_mce_dec);
        /* Disable EDAC polling */
        i7core_pci_ctl_release(pvt);
@@ -1979,6 +2306,10 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev)
        /* Set the function pointer to an actual operation function */
        mci->edac_check = i7core_check_error;
+        /* Enable scrubrate setting */
+        if (pvt->enable_scrub)
+                enable_sdram_scrub_setting(mci);
        /* add this new MC control structure to EDAC's list of MCs */
        if (unlikely(edac_mc_add_mc(mci))) {
                debugf0("MC: " __FILE__
@@ -2002,21 +2333,13 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev)
        /* allocating generic PCI control info */
        i7core_pci_ctl_create(pvt);
-        /* Registers on edac_mce in order to receive memory errors */
+        /* DCLK for scrub rate setting */
-        pvt->edac_mce.priv = mci;
+        pvt->dclk_freq = get_dclk_freq();
-        pvt->edac_mce.check_error = i7core_mce_check_error;
-        rc = edac_mce_register(&pvt->edac_mce);
+        atomic_notifier_chain_register(&x86_mce_decoder_chain, &i7_mce_dec);
-        if (unlikely(rc < 0)) {
-                debugf0("MC: " __FILE__
-                        ": %s(): failed edac_mce_register()\n", __func__);
-                goto fail1;
-        }
        return 0;
-fail1:
-        i7core_pci_ctl_release(pvt);
-        edac_mc_del_mc(mci->dev);
 fail0:
        kfree(mci->ctl_name);
        edac_mc_free(mci);
@@ -2035,7 +2358,7 @@ fail0:
 static int __devinit i7core_probe(struct pci_dev *pdev,
                                  const struct pci_device_id *id)
 {
-        int rc;
+        int rc, count = 0;
        struct i7core_dev *i7core_dev;
        /* get the pci devices we want to reserve for our use */
@@ -2055,12 +2378,28 @@ static int __devinit i7core_probe(struct pci_dev *pdev,
                goto fail0;
        list_for_each_entry(i7core_dev, &i7core_edac_list, list) {
+                count++;
                rc = i7core_register_mci(i7core_dev);
                if (unlikely(rc < 0))
                        goto fail1;
        }
-        i7core_printk(KERN_INFO, "Driver loaded.\n");
+        /*
+         * Nehalem-EX uses a different memory controller. However, as the
+         * memory controller is not visible on some Nehalem/Nehalem-EP, we
+         * need to indirectly probe via a X58 PCI device. The same devices
+         * are found on (some) Nehalem-EX. So, on those machines, the
+         * probe routine needs to return -ENODEV, as the actual Memory
+         * Controller registers won't be detected.
+         */
+        if (!count) {
+                rc = -ENODEV;
+                goto fail1;
+        }
+        i7core_printk(KERN_INFO,
+                      "Driver loaded, %d memory controller(s) found.\n",
+                      count);
        mutex_unlock(&i7core_edac_lock);
        return 0;
diff --git a/drivers/edac/mce_amd_inj.c b/drivers/edac/mce_amd_inj.c
index a4987e03f59e..73c3e26a0bce 100644
--- a/drivers/edac/mce_amd_inj.c
+++ b/drivers/edac/mce_amd_inj.c
@@ -13,6 +13,7 @@
 #include <linux/kobject.h>
 #include <linux/sysdev.h>
 #include <linux/edac.h>
+#include <linux/module.h>
 #include <asm/mce.h>
 #include "mce_amd.h"
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c
index 0de7d8770891..38400963e245 100644
--- a/drivers/edac/ppc4xx_edac.c
+++ b/drivers/edac/ppc4xx_edac.c
@@ -205,7 +205,7 @@ static struct platform_driver ppc4xx_edac_driver = {
        .remove                 = ppc4xx_edac_remove,
        .driver = {
                .owner = THIS_MODULE,
-                .name = PPC4XX_EDAC_MODULE_NAME
+                .name = PPC4XX_EDAC_MODULE_NAME,
                .of_match_table = ppc4xx_edac_match,
        },
 };
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
new file mode 100644
index 000000000000..7a402bfbee7d
--- /dev/null
+++ b/drivers/edac/sb_edac.c
@@ -0,0 +1,1893 @@
+/* Intel Sandy Bridge -EN/-EP/-EX Memory Controller kernel module
+ *
+ * This driver supports the memory controllers found on the Intel
+ * processor family Sandy Bridge.
+ *
+ * This file may be distributed under the terms of the
+ * GNU General Public License version 2 only.
+ *
+ * Copyright (c) 2011 by:
+ *       Mauro Carvalho Chehab <mchehab@redhat.com>
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/pci_ids.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/edac.h>
+#include <linux/mmzone.h>
+#include <linux/smp.h>
+#include <linux/bitmap.h>
+#include <asm/processor.h>
+#include <asm/mce.h>
+#include "edac_core.h"
+/* Static vars */
+static LIST_HEAD(sbridge_edac_list);
+static DEFINE_MUTEX(sbridge_edac_lock);
+static int probed;
+/*
+ * Alter this version for the module when modifications are made
+ */
+#define SBRIDGE_REVISION    " Ver: 1.0.0 "
+#define EDAC_MOD_STR      "sbridge_edac"
+/*
+ * Debug macros
+ */
+#define sbridge_printk(level, fmt, arg...)                      \
+        edac_printk(level, "sbridge", fmt, ##arg)
+#define sbridge_mc_printk(mci, level, fmt, arg...)              \
+        edac_mc_chipset_printk(mci, level, "sbridge", fmt, ##arg)
+/*
+ * Get a bit field at register value <v>, from bit <lo> to bit <hi>
+ */
+#define GET_BITFIELD(v, lo, hi) \
+        (((v) & ((1ULL << ((hi) - (lo) + 1)) - 1) << (lo)) >> (lo))
+/*
+ * sbridge Memory Controller Registers
+ */
+/*
+ * FIXME: For now, let's order by device function, as it makes
+ * easier for driver's development proccess. This table should be
+ * moved to pci_id.h when submitted upstream
+ */
+#define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD0        0x3cf4  /* 12.6 */
+#define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD1        0x3cf6  /* 12.7 */
+#define PCI_DEVICE_ID_INTEL_SBRIDGE_BR          0x3cf5  /* 13.6 */
+#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_HA0     0x3ca0  /* 14.0 */
+#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA      0x3ca8  /* 15.0 */
+#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_RAS     0x3c71  /* 15.1 */
+#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD0    0x3caa  /* 15.2 */
+#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD1    0x3cab  /* 15.3 */
+#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD2    0x3cac  /* 15.4 */
+#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD3    0x3cad  /* 15.5 */
+#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_DDRIO   0x3cb8  /* 17.0 */
+        /*
+         * Currently, unused, but will be needed in the future
+         * implementations, as they hold the error counters
+         */
+#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR0    0x3c72  /* 16.2 */
+#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR1    0x3c73  /* 16.3 */
+#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR2    0x3c76  /* 16.6 */
+#define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR3    0x3c77  /* 16.7 */
+/* Devices 12 Function 6, Offsets 0x80 to 0xcc */
+static const u32 dram_rule[] = {
+        0x80, 0x88, 0x90, 0x98, 0xa0,
+        0xa8, 0xb0, 0xb8, 0xc0, 0xc8,
+};
+#define MAX_SAD         ARRAY_SIZE(dram_rule)
+#define SAD_LIMIT(reg)          ((GET_BITFIELD(reg, 6, 25) << 26) | 0x3ffffff)
+#define DRAM_ATTR(reg)          GET_BITFIELD(reg, 2,  3)
+#define INTERLEAVE_MODE(reg)    GET_BITFIELD(reg, 1,  1)
+#define DRAM_RULE_ENABLE(reg)   GET_BITFIELD(reg, 0,  0)
+static char *get_dram_attr(u32 reg)
+{
+        switch(DRAM_ATTR(reg)) {
+                case 0:
+                        return "DRAM";
+                case 1:
+                        return "MMCFG";
+                case 2:
+                        return "NXM";
+                default:
+                        return "unknown";
+        }
+}
+static const u32 interleave_list[] = {
+        0x84, 0x8c, 0x94, 0x9c, 0xa4,
+        0xac, 0xb4, 0xbc, 0xc4, 0xcc,
+};
+#define MAX_INTERLEAVE  ARRAY_SIZE(interleave_list)
+#define SAD_PKG0(reg)           GET_BITFIELD(reg, 0, 2)
+#define SAD_PKG1(reg)           GET_BITFIELD(reg, 3, 5)
+#define SAD_PKG2(reg)           GET_BITFIELD(reg, 8, 10)
+#define SAD_PKG3(reg)           GET_BITFIELD(reg, 11, 13)
+#define SAD_PKG4(reg)           GET_BITFIELD(reg, 16, 18)
+#define SAD_PKG5(reg)           GET_BITFIELD(reg, 19, 21)
+#define SAD_PKG6(reg)           GET_BITFIELD(reg, 24, 26)
+#define SAD_PKG7(reg)           GET_BITFIELD(reg, 27, 29)
+static inline int sad_pkg(u32 reg, int interleave)
+{
+        switch (interleave) {
+        case 0:
+                return SAD_PKG0(reg);
+        case 1:
+                return SAD_PKG1(reg);
+        case 2:
+                return SAD_PKG2(reg);
+        case 3:
+                return SAD_PKG3(reg);
+        case 4:
+                return SAD_PKG4(reg);
+        case 5:
+                return SAD_PKG5(reg);
+        case 6:
+                return SAD_PKG6(reg);
+        case 7:
+                return SAD_PKG7(reg);
+        default:
+                return -EINVAL;
+        }
+}
+/* Devices 12 Function 7 */
+#define TOLM            0x80
+#define TOHM            0x84
+#define GET_TOLM(reg)           ((GET_BITFIELD(reg, 0,  3) << 28) | 0x3ffffff)
+#define GET_TOHM(reg)           ((GET_BITFIELD(reg, 0, 20) << 25) | 0x3ffffff)
+/* Device 13 Function 6 */
+#define SAD_TARGET      0xf0
+#define SOURCE_ID(reg)          GET_BITFIELD(reg, 9, 11)
+#define SAD_CONTROL     0xf4
+#define NODE_ID(reg)            GET_BITFIELD(reg, 0, 2)
+/* Device 14 function 0 */
+static const u32 tad_dram_rule[] = {
+        0x40, 0x44, 0x48, 0x4c,
+        0x50, 0x54, 0x58, 0x5c,
+        0x60, 0x64, 0x68, 0x6c,
+};
+#define MAX_TAD ARRAY_SIZE(tad_dram_rule)
+#define TAD_LIMIT(reg)          ((GET_BITFIELD(reg, 12, 31) << 26) | 0x3ffffff)
+#define TAD_SOCK(reg)           GET_BITFIELD(reg, 10, 11)
+#define TAD_CH(reg)             GET_BITFIELD(reg,  8,  9)
+#define TAD_TGT3(reg)           GET_BITFIELD(reg,  6,  7)
+#define TAD_TGT2(reg)           GET_BITFIELD(reg,  4,  5)
+#define TAD_TGT1(reg)           GET_BITFIELD(reg,  2,  3)
+#define TAD_TGT0(reg)           GET_BITFIELD(reg,  0,  1)
+/* Device 15, function 0 */
+#define MCMTR                   0x7c
+#define IS_ECC_ENABLED(mcmtr)           GET_BITFIELD(mcmtr, 2, 2)
+#define IS_LOCKSTEP_ENABLED(mcmtr)      GET_BITFIELD(mcmtr, 1, 1)
+#define IS_CLOSE_PG(mcmtr)              GET_BITFIELD(mcmtr, 0, 0)
+/* Device 15, function 1 */
+#define RASENABLES              0xac
+#define IS_MIRROR_ENABLED(reg)          GET_BITFIELD(reg, 0, 0)
+/* Device 15, functions 2-5 */
+static const int mtr_regs[] = {
+        0x80, 0x84, 0x88,
+};
+#define RANK_DISABLE(mtr)               GET_BITFIELD(mtr, 16, 19)
+#define IS_DIMM_PRESENT(mtr)            GET_BITFIELD(mtr, 14, 14)
+#define RANK_CNT_BITS(mtr)              GET_BITFIELD(mtr, 12, 13)
+#define RANK_WIDTH_BITS(mtr)            GET_BITFIELD(mtr, 2, 4)
+#define COL_WIDTH_BITS(mtr)             GET_BITFIELD(mtr, 0, 1)
+static const u32 tad_ch_nilv_offset[] = {
+        0x90, 0x94, 0x98, 0x9c,
+        0xa0, 0xa4, 0xa8, 0xac,
+        0xb0, 0xb4, 0xb8, 0xbc,
+};
+#define CHN_IDX_OFFSET(reg)             GET_BITFIELD(reg, 28, 29)
+#define TAD_OFFSET(reg)                 (GET_BITFIELD(reg,  6, 25) << 26)
+static const u32 rir_way_limit[] = {
+        0x108, 0x10c, 0x110, 0x114, 0x118,
+};
+#define MAX_RIR_RANGES ARRAY_SIZE(rir_way_limit)
+#define IS_RIR_VALID(reg)       GET_BITFIELD(reg, 31, 31)
+#define RIR_WAY(reg)            GET_BITFIELD(reg, 28, 29)
+#define RIR_LIMIT(reg)          ((GET_BITFIELD(reg,  1, 10) << 29)| 0x1fffffff)
+#define MAX_RIR_WAY     8
+static const u32 rir_offset[MAX_RIR_RANGES][MAX_RIR_WAY] = {
+        { 0x120, 0x124, 0x128, 0x12c, 0x130, 0x134, 0x138, 0x13c },
+        { 0x140, 0x144, 0x148, 0x14c, 0x150, 0x154, 0x158, 0x15c },
+        { 0x160, 0x164, 0x168, 0x16c, 0x170, 0x174, 0x178, 0x17c },
+        { 0x180, 0x184, 0x188, 0x18c, 0x190, 0x194, 0x198, 0x19c },
+        { 0x1a0, 0x1a4, 0x1a8, 0x1ac, 0x1b0, 0x1b4, 0x1b8, 0x1bc },
+};
+#define RIR_RNK_TGT(reg)                GET_BITFIELD(reg, 16, 19)
+#define RIR_OFFSET(reg)         GET_BITFIELD(reg,  2, 14)
+/* Device 16, functions 2-7 */
+/*
+ * FIXME: Implement the error count reads directly
+ */
+static const u32 correrrcnt[] = {
+        0x104, 0x108, 0x10c, 0x110,
+};
+#define RANK_ODD_OV(reg)                GET_BITFIELD(reg, 31, 31)
+#define RANK_ODD_ERR_CNT(reg)           GET_BITFIELD(reg, 16, 30)
+#define RANK_EVEN_OV(reg)               GET_BITFIELD(reg, 15, 15)
+#define RANK_EVEN_ERR_CNT(reg)          GET_BITFIELD(reg,  0, 14)
+static const u32 correrrthrsld[] = {
+        0x11c, 0x120, 0x124, 0x128,
+};
+#define RANK_ODD_ERR_THRSLD(reg)        GET_BITFIELD(reg, 16, 30)
+#define RANK_EVEN_ERR_THRSLD(reg)       GET_BITFIELD(reg,  0, 14)
+/* Device 17, function 0 */
+#define RANK_CFG_A              0x0328
+#define IS_RDIMM_ENABLED(reg)           GET_BITFIELD(reg, 11, 11)
+/*
+ * sbridge structs
+ */
+#define NUM_CHANNELS    4
+#define MAX_DIMMS       3               /* Max DIMMS per channel */
+struct sbridge_info {
+        u32     mcmtr;
+};
+struct sbridge_channel {
+        u32             ranks;
+        u32             dimms;
+};
+struct pci_id_descr {
+        int                     dev;
+        int                     func;
+        int                     dev_id;
+        int                     optional;
+};
+struct pci_id_table {
+        const struct pci_id_descr       *descr;
+        int                             n_devs;
+};
+struct sbridge_dev {
+        struct list_head        list;
+        u8                      bus, mc;
+        u8                      node_id, source_id;
+        struct pci_dev          **pdev;
+        int                     n_devs;
+        struct mem_ctl_info     *mci;
+};
+struct sbridge_pvt {
+        struct pci_dev          *pci_ta, *pci_ddrio, *pci_ras;
+        struct pci_dev          *pci_sad0, *pci_sad1, *pci_ha0;
+        struct pci_dev          *pci_br;
+        struct pci_dev          *pci_tad[NUM_CHANNELS];
+        struct sbridge_dev      *sbridge_dev;
+        struct sbridge_info     info;
+        struct sbridge_channel  channel[NUM_CHANNELS];
+        int                     csrow_map[NUM_CHANNELS][MAX_DIMMS];
+        /* Memory type detection */
+        bool                    is_mirrored, is_lockstep, is_close_pg;
+        /* Fifo double buffers */
+        struct mce              mce_entry[MCE_LOG_LEN];
+        struct mce              mce_outentry[MCE_LOG_LEN];
+        /* Fifo in/out counters */
+        unsigned                mce_in, mce_out;
+        /* Count indicator to show errors not got */
+        unsigned                mce_overrun;
+        /* Memory description */
+        u64                     tolm, tohm;
+};
+#define PCI_DESCR(device, function, device_id)  \
+        .dev = (device),                        \
+        .func = (function),                     \
+        .dev_id = (device_id)
+static const struct pci_id_descr pci_dev_descr_sbridge[] = {
+                /* Processor Home Agent */
+        { PCI_DESCR(14, 0, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_HA0)         },
+                /* Memory controller */
+        { PCI_DESCR(15, 0, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA)          },
+        { PCI_DESCR(15, 1, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_RAS)         },
+        { PCI_DESCR(15, 2, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD0)        },
+        { PCI_DESCR(15, 3, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD1)        },
+        { PCI_DESCR(15, 4, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD2)        },
+        { PCI_DESCR(15, 5, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD3)        },
+        { PCI_DESCR(17, 0, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_DDRIO)       },
+                /* System Address Decoder */
+        { PCI_DESCR(12, 6, PCI_DEVICE_ID_INTEL_SBRIDGE_SAD0)            },
+        { PCI_DESCR(12, 7, PCI_DEVICE_ID_INTEL_SBRIDGE_SAD1)            },
+                /* Broadcast Registers */
+        { PCI_DESCR(13, 6, PCI_DEVICE_ID_INTEL_SBRIDGE_BR)              },
+};
+#define PCI_ID_TABLE_ENTRY(A) { .descr=A, .n_devs = ARRAY_SIZE(A) }
+static const struct pci_id_table pci_dev_descr_sbridge_table[] = {
+        PCI_ID_TABLE_ENTRY(pci_dev_descr_sbridge),
+        {0,}                    /* 0 terminated list. */
+};
+/*
+ *      pci_device_id   table for which devices we are looking for
+ */
+static const struct pci_device_id sbridge_pci_tbl[] __devinitdata = {
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA)},
+        {0,}                    /* 0 terminated list. */
+};
+/****************************************************************************
+                        Anciliary status routines
+ ****************************************************************************/
+static inline int numrank(u32 mtr)
+{
+        int ranks = (1 << RANK_CNT_BITS(mtr));
+        if (ranks > 4) {
+                debugf0("Invalid number of ranks: %d (max = 4) raw value = %x (%04x)",
+                        ranks, (unsigned int)RANK_CNT_BITS(mtr), mtr);
+                return -EINVAL;
+        }
+        return ranks;
+}
+static inline int numrow(u32 mtr)
+{
+        int rows = (RANK_WIDTH_BITS(mtr) + 12);
+        if (rows < 13 || rows > 18) {
+                debugf0("Invalid number of rows: %d (should be between 14 and 17) raw value = %x (%04x)",
+                        rows, (unsigned int)RANK_WIDTH_BITS(mtr), mtr);
+                return -EINVAL;
+        }
+        return 1 << rows;
+}
+static inline int numcol(u32 mtr)
+{
+        int cols = (COL_WIDTH_BITS(mtr) + 10);
+        if (cols > 12) {
+                debugf0("Invalid number of cols: %d (max = 4) raw value = %x (%04x)",
+                        cols, (unsigned int)COL_WIDTH_BITS(mtr), mtr);
+                return -EINVAL;
+        }
+        return 1 << cols;
+}
+static struct sbridge_dev *get_sbridge_dev(u8 bus)
+{
+        struct sbridge_dev *sbridge_dev;
+        list_for_each_entry(sbridge_dev, &sbridge_edac_list, list) {
+                if (sbridge_dev->bus == bus)
+                        return sbridge_dev;
+        }
+        return NULL;
+}
+static struct sbridge_dev *alloc_sbridge_dev(u8 bus,
+                                           const struct pci_id_table *table)
+{
+        struct sbridge_dev *sbridge_dev;
+        sbridge_dev = kzalloc(sizeof(*sbridge_dev), GFP_KERNEL);
+        if (!sbridge_dev)
+                return NULL;
+        sbridge_dev->pdev = kzalloc(sizeof(*sbridge_dev->pdev) * table->n_devs,
+                                   GFP_KERNEL);
+        if (!sbridge_dev->pdev) {
+                kfree(sbridge_dev);
+                return NULL;
+        }
+        sbridge_dev->bus = bus;
+        sbridge_dev->n_devs = table->n_devs;
+        list_add_tail(&sbridge_dev->list, &sbridge_edac_list);
+        return sbridge_dev;
+}
+static void free_sbridge_dev(struct sbridge_dev *sbridge_dev)
+{
+        list_del(&sbridge_dev->list);
+        kfree(sbridge_dev->pdev);
+        kfree(sbridge_dev);
+}
+/****************************************************************************
+                        Memory check routines
+ ****************************************************************************/
+static struct pci_dev *get_pdev_slot_func(u8 bus, unsigned slot,
+                                          unsigned func)
+{
+        struct sbridge_dev *sbridge_dev = get_sbridge_dev(bus);
+        int i;
+        if (!sbridge_dev)
+                return NULL;
+        for (i = 0; i < sbridge_dev->n_devs; i++) {
+                if (!sbridge_dev->pdev[i])
+                        continue;
+                if (PCI_SLOT(sbridge_dev->pdev[i]->devfn) == slot &&
+                    PCI_FUNC(sbridge_dev->pdev[i]->devfn) == func) {
+                        debugf1("Associated %02x.%02x.%d with %p\n",
+                                bus, slot, func, sbridge_dev->pdev[i]);
+                        return sbridge_dev->pdev[i];
+                }
+        }
+        return NULL;
+}
+/**
+ * sbridge_get_active_channels() - gets the number of channels and csrows
+ * bus:         Device bus
+ * @channels:   Number of channels that will be returned
+ * @csrows:     Number of csrows found
+ *
+ * Since EDAC core needs to know in advance the number of available channels
+ * and csrows, in order to allocate memory for csrows/channels, it is needed
+ * to run two similar steps. At the first step, implemented on this function,
+ * it checks the number of csrows/channels present at one socket, identified
+ * by the associated PCI bus.
+ * this is used in order to properly allocate the size of mci components.
+ * Note: one csrow is one dimm.
+ */
+static int sbridge_get_active_channels(const u8 bus, unsigned *channels,
+                                      unsigned *csrows)
+{
+        struct pci_dev *pdev = NULL;
+        int i, j;
+        u32 mcmtr;
+        *channels = 0;
+        *csrows = 0;
+        pdev = get_pdev_slot_func(bus, 15, 0);
+        if (!pdev) {
+                sbridge_printk(KERN_ERR, "Couldn't find PCI device "
+                                        "%2x.%02d.%d!!!\n",
+                                        bus, 15, 0);
+                return -ENODEV;
+        }
+        pci_read_config_dword(pdev, MCMTR, &mcmtr);
+        if (!IS_ECC_ENABLED(mcmtr)) {
+                sbridge_printk(KERN_ERR, "ECC is disabled. Aborting\n");
+                return -ENODEV;
+        }
+        for (i = 0; i < NUM_CHANNELS; i++) {
+                u32 mtr;
+                /* Device 15 functions 2 - 5  */
+                pdev = get_pdev_slot_func(bus, 15, 2 + i);
+                if (!pdev) {
+                        sbridge_printk(KERN_ERR, "Couldn't find PCI device "
+                                                 "%2x.%02d.%d!!!\n",
+                                                 bus, 15, 2 + i);
+                        return -ENODEV;
+                }
+                (*channels)++;
+                for (j = 0; j < ARRAY_SIZE(mtr_regs); j++) {
+                        pci_read_config_dword(pdev, mtr_regs[j], &mtr);
+                        debugf1("Bus#%02x channel #%d  MTR%d = %x\n", bus, i, j, mtr);
+                        if (IS_DIMM_PRESENT(mtr))
+                                (*csrows)++;
+                }
+        }
+        debugf0("Number of active channels: %d, number of active dimms: %d\n",
+                *channels, *csrows);
+        return 0;
+}
+static int get_dimm_config(const struct mem_ctl_info *mci)
+{
+        struct sbridge_pvt *pvt = mci->pvt_info;
+        struct csrow_info *csr;
+        int i, j, banks, ranks, rows, cols, size, npages;
+        int csrow = 0;
+        unsigned long last_page = 0;
+        u32 reg;
+        enum edac_type mode;
+        enum mem_type mtype;
+        pci_read_config_dword(pvt->pci_br, SAD_TARGET, &reg);
+        pvt->sbridge_dev->source_id = SOURCE_ID(reg);
+        pci_read_config_dword(pvt->pci_br, SAD_CONTROL, &reg);
+        pvt->sbridge_dev->node_id = NODE_ID(reg);
+        debugf0("mc#%d: Node ID: %d, source ID: %d\n",
+                pvt->sbridge_dev->mc,
+                pvt->sbridge_dev->node_id,
+                pvt->sbridge_dev->source_id);
+        pci_read_config_dword(pvt->pci_ras, RASENABLES, &reg);
+        if (IS_MIRROR_ENABLED(reg)) {
+                debugf0("Memory mirror is enabled\n");
+                pvt->is_mirrored = true;
+        } else {
+                debugf0("Memory mirror is disabled\n");
+                pvt->is_mirrored = false;
+        }
+        pci_read_config_dword(pvt->pci_ta, MCMTR, &pvt->info.mcmtr);
+        if (IS_LOCKSTEP_ENABLED(pvt->info.mcmtr)) {
+                debugf0("Lockstep is enabled\n");
+                mode = EDAC_S8ECD8ED;
+                pvt->is_lockstep = true;
+        } else {
+                debugf0("Lockstep is disabled\n");
+                mode = EDAC_S4ECD4ED;
+                pvt->is_lockstep = false;
+        }
+        if (IS_CLOSE_PG(pvt->info.mcmtr)) {
+                debugf0("address map is on closed page mode\n");
+                pvt->is_close_pg = true;
+        } else {
+                debugf0("address map is on open page mode\n");
+                pvt->is_close_pg = false;
+        }
+        pci_read_config_dword(pvt->pci_ta, RANK_CFG_A, &reg);
+        if (IS_RDIMM_ENABLED(reg)) {
+                /* FIXME: Can also be LRDIMM */
+                debugf0("Memory is registered\n");
+                mtype = MEM_RDDR3;
+        } else {
+                debugf0("Memory is unregistered\n");
+                mtype = MEM_DDR3;
+        }
+        /* On all supported DDR3 DIMM types, there are 8 banks available */
+        banks = 8;
+        for (i = 0; i < NUM_CHANNELS; i++) {
+                u32 mtr;
+                for (j = 0; j < ARRAY_SIZE(mtr_regs); j++) {
+                        pci_read_config_dword(pvt->pci_tad[i],
+                                              mtr_regs[j], &mtr);
+                        debugf4("Channel #%d  MTR%d = %x\n", i, j, mtr);
+                        if (IS_DIMM_PRESENT(mtr)) {
+                                pvt->channel[i].dimms++;
+                                ranks = numrank(mtr);
+                                rows = numrow(mtr);
+                                cols = numcol(mtr);
+                                /* DDR3 has 8 I/O banks */
+                                size = (rows * cols * banks * ranks) >> (20 - 3);
+                                npages = MiB_TO_PAGES(size);
+                                debugf0("mc#%d: channel %d, dimm %d, %d Mb (%d pages) bank: %d, rank: %d, row: %#x, col: %#x\n",
+                                        pvt->sbridge_dev->mc, i, j,
+                                        size, npages,
+                                        banks, ranks, rows, cols);
+                                csr = &mci->csrows[csrow];
+                                csr->first_page = last_page;
+                                csr->last_page = last_page + npages - 1;
+                                csr->page_mask = 0UL;   /* Unused */
+                                csr->nr_pages = npages;
+                                csr->grain = 32;
+                                csr->csrow_idx = csrow;
+                                csr->dtype = (banks == 8) ? DEV_X8 : DEV_X4;
+                                csr->ce_count = 0;
+                                csr->ue_count = 0;
+                                csr->mtype = mtype;
+                                csr->edac_mode = mode;
+                                csr->nr_channels = 1;
+                                csr->channels[0].chan_idx = i;
+                                csr->channels[0].ce_count = 0;
+                                pvt->csrow_map[i][j] = csrow;
+                                snprintf(csr->channels[0].label,
+                                         sizeof(csr->channels[0].label),
+                                         "CPU_SrcID#%u_Channel#%u_DIMM#%u",
+                                         pvt->sbridge_dev->source_id, i, j);
+                                last_page += npages;
+                                csrow++;
+                        }
+                }
+        }
+        return 0;
+}
+static void get_memory_layout(const struct mem_ctl_info *mci)
+{
+        struct sbridge_pvt *pvt = mci->pvt_info;
+        int i, j, k, n_sads, n_tads, sad_interl;
+        u32 reg;
+        u64 limit, prv = 0;
+        u64 tmp_mb;
+        u32 rir_way;
+        /*
+         * Step 1) Get TOLM/TOHM ranges
+         */
+        /* Address range is 32:28 */
+        pci_read_config_dword(pvt->pci_sad1, TOLM,
+                              &reg);
+        pvt->tolm = GET_TOLM(reg);
+        tmp_mb = (1 + pvt->tolm) >> 20;
+        debugf0("TOLM: %Lu.%03Lu GB (0x%016Lx)\n",
+                tmp_mb / 1000, tmp_mb % 1000, (u64)pvt->tolm);
+        /* Address range is already 45:25 */
+        pci_read_config_dword(pvt->pci_sad1, TOHM,
+                              &reg);
+        pvt->tohm = GET_TOHM(reg);
+        tmp_mb = (1 + pvt->tohm) >> 20;
+        debugf0("TOHM: %Lu.%03Lu GB (0x%016Lx)",
+                tmp_mb / 1000, tmp_mb % 1000, (u64)pvt->tohm);
+        /*
+         * Step 2) Get SAD range and SAD Interleave list
+         * TAD registers contain the interleave wayness. However, it
+         * seems simpler to just discover it indirectly, with the
+         * algorithm bellow.
+         */
+        prv = 0;
+        for (n_sads = 0; n_sads < MAX_SAD; n_sads++) {
+                /* SAD_LIMIT Address range is 45:26 */
+                pci_read_config_dword(pvt->pci_sad0, dram_rule[n_sads],
+                                      &reg);
+                limit = SAD_LIMIT(reg);
+                if (!DRAM_RULE_ENABLE(reg))
+                        continue;
+                if (limit <= prv)
+                        break;
+                tmp_mb = (limit + 1) >> 20;
+                debugf0("SAD#%d %s up to %Lu.%03Lu GB (0x%016Lx) %s reg=0x%08x\n",
+                        n_sads,
+                        get_dram_attr(reg),
+                        tmp_mb / 1000, tmp_mb % 1000,
+                        ((u64)tmp_mb) << 20L,
+                        INTERLEAVE_MODE(reg) ? "Interleave: 8:6" : "Interleave: [8:6]XOR[18:16]",
+                        reg);
+                prv = limit;
+                pci_read_config_dword(pvt->pci_sad0, interleave_list[n_sads],
+                                      &reg);
+                sad_interl = sad_pkg(reg, 0);
+                for (j = 0; j < 8; j++) {
+                        if (j > 0 && sad_interl == sad_pkg(reg, j))
+                                break;
+                        debugf0("SAD#%d, interleave #%d: %d\n",
+                        n_sads, j, sad_pkg(reg, j));
+                }
+        }
+        /*
+         * Step 3) Get TAD range
+         */
+        prv = 0;
+        for (n_tads = 0; n_tads < MAX_TAD; n_tads++) {
+                pci_read_config_dword(pvt->pci_ha0, tad_dram_rule[n_tads],
+                                      &reg);
+                limit = TAD_LIMIT(reg);
+                if (limit <= prv)
+                        break;
+                tmp_mb = (limit + 1) >> 20;
+                debugf0("TAD#%d: up to %Lu.%03Lu GB (0x%016Lx), socket interleave %d, memory interleave %d, TGT: %d, %d, %d, %d, reg=0x%08x\n",
+                        n_tads, tmp_mb / 1000, tmp_mb % 1000,
+                        ((u64)tmp_mb) << 20L,
+                        (u32)TAD_SOCK(reg),
+                        (u32)TAD_CH(reg),
+                        (u32)TAD_TGT0(reg),
+                        (u32)TAD_TGT1(reg),
+                        (u32)TAD_TGT2(reg),
+                        (u32)TAD_TGT3(reg),
+                        reg);
+                prv = tmp_mb;
+        }
+        /*
+         * Step 4) Get TAD offsets, per each channel
+         */
+        for (i = 0; i < NUM_CHANNELS; i++) {
+                if (!pvt->channel[i].dimms)
+                        continue;
+                for (j = 0; j < n_tads; j++) {
+                        pci_read_config_dword(pvt->pci_tad[i],
+                                              tad_ch_nilv_offset[j],
+                                              &reg);
+                        tmp_mb = TAD_OFFSET(reg) >> 20;
+                        debugf0("TAD CH#%d, offset #%d: %Lu.%03Lu GB (0x%016Lx), reg=0x%08x\n",
+                                i, j,
+                                tmp_mb / 1000, tmp_mb % 1000,
+                                ((u64)tmp_mb) << 20L,
+                                reg);
+                }
+        }
+        /*
+         * Step 6) Get RIR Wayness/Limit, per each channel
+         */
+        for (i = 0; i < NUM_CHANNELS; i++) {
+                if (!pvt->channel[i].dimms)
+                        continue;
+                for (j = 0; j < MAX_RIR_RANGES; j++) {
+                        pci_read_config_dword(pvt->pci_tad[i],
+                                              rir_way_limit[j],
+                                              &reg);
+                        if (!IS_RIR_VALID(reg))
+                                continue;
+                        tmp_mb = RIR_LIMIT(reg) >> 20;
+                        rir_way = 1 << RIR_WAY(reg);
+                        debugf0("CH#%d RIR#%d, limit: %Lu.%03Lu GB (0x%016Lx), way: %d, reg=0x%08x\n",
+                                i, j,
+                                tmp_mb / 1000, tmp_mb % 1000,
+                                ((u64)tmp_mb) << 20L,
+                                rir_way,
+                                reg);
+                        for (k = 0; k < rir_way; k++) {
+                                pci_read_config_dword(pvt->pci_tad[i],
+                                                      rir_offset[j][k],
+                                                      &reg);
+                                tmp_mb = RIR_OFFSET(reg) << 6;
+                                debugf0("CH#%d RIR#%d INTL#%d, offset %Lu.%03Lu GB (0x%016Lx), tgt: %d, reg=0x%08x\n",
+                                        i, j, k,
+                                        tmp_mb / 1000, tmp_mb % 1000,
+                                        ((u64)tmp_mb) << 20L,
+                                        (u32)RIR_RNK_TGT(reg),
+                                        reg);
+                        }
+                }
+        }
+}
+struct mem_ctl_info *get_mci_for_node_id(u8 node_id)
+{
+        struct sbridge_dev *sbridge_dev;
+        list_for_each_entry(sbridge_dev, &sbridge_edac_list, list) {
+                if (sbridge_dev->node_id == node_id)
+                        return sbridge_dev->mci;
+        }
+        return NULL;
+}
+static int get_memory_error_data(struct mem_ctl_info *mci,
+                                 u64 addr,
+                                 u8 *socket,
+                                 long *channel_mask,
+                                 u8 *rank,
+                                 char *area_type)
+{
+        struct mem_ctl_info     *new_mci;
+        struct sbridge_pvt *pvt = mci->pvt_info;
+        char                    msg[256];
+        int                     n_rir, n_sads, n_tads, sad_way, sck_xch;
+        int                     sad_interl, idx, base_ch;
+        int                     interleave_mode;
+        unsigned                sad_interleave[MAX_INTERLEAVE];
+        u32                     reg;
+        u8                      ch_way,sck_way;
+        u32                     tad_offset;
+        u32                     rir_way;
+        u64                     ch_addr, offset, limit, prv = 0;
+        /*
+         * Step 0) Check if the address is at special memory ranges
+         * The check bellow is probably enough to fill all cases where
+         * the error is not inside a memory, except for the legacy
+         * range (e. g. VGA addresses). It is unlikely, however, that the
+         * memory controller would generate an error on that range.
+         */
+        if ((addr > (u64) pvt->tolm) && (addr < (1L << 32))) {
+                sprintf(msg, "Error at TOLM area, on addr 0x%08Lx", addr);
+                edac_mc_handle_ce_no_info(mci, msg);
+                return -EINVAL;
+        }
+        if (addr >= (u64)pvt->tohm) {
+                sprintf(msg, "Error at MMIOH area, on addr 0x%016Lx", addr);
+                edac_mc_handle_ce_no_info(mci, msg);
+                return -EINVAL;
+        }
+        /*
+         * Step 1) Get socket
+         */
+        for (n_sads = 0; n_sads < MAX_SAD; n_sads++) {
+                pci_read_config_dword(pvt->pci_sad0, dram_rule[n_sads],
+                                      &reg);
+                if (!DRAM_RULE_ENABLE(reg))
+                        continue;
+                limit = SAD_LIMIT(reg);
+                if (limit <= prv) {
+                        sprintf(msg, "Can't discover the memory socket");
+                        edac_mc_handle_ce_no_info(mci, msg);
+                        return -EINVAL;
+                }
+                if  (addr <= limit)
+                        break;
+                prv = limit;
+        }
+        if (n_sads == MAX_SAD) {
+                sprintf(msg, "Can't discover the memory socket");
+                edac_mc_handle_ce_no_info(mci, msg);
+                return -EINVAL;
+        }
+        area_type = get_dram_attr(reg);
+        interleave_mode = INTERLEAVE_MODE(reg);
+        pci_read_config_dword(pvt->pci_sad0, interleave_list[n_sads],
+                              &reg);
+        sad_interl = sad_pkg(reg, 0);
+        for (sad_way = 0; sad_way < 8; sad_way++) {
+                if (sad_way > 0 && sad_interl == sad_pkg(reg, sad_way))
+                        break;
+                sad_interleave[sad_way] = sad_pkg(reg, sad_way);
+                debugf0("SAD interleave #%d: %d\n",
+                        sad_way, sad_interleave[sad_way]);
+        }
+        debugf0("mc#%d: Error detected on SAD#%d: address 0x%016Lx < 0x%016Lx, Interleave [%d:6]%s\n",
+                pvt->sbridge_dev->mc,
+                n_sads,
+                addr,
+                limit,
+                sad_way + 7,
+                INTERLEAVE_MODE(reg) ? "" : "XOR[18:16]");
+        if (interleave_mode)
+                idx = ((addr >> 6) ^ (addr >> 16)) & 7;
+        else
+                idx = (addr >> 6) & 7;
+        switch (sad_way) {
+        case 1:
+                idx = 0;
+                break;
+        case 2:
+                idx = idx & 1;
+                break;
+        case 4:
+                idx = idx & 3;
+                break;
+        case 8:
+                break;
+        default:
+                sprintf(msg, "Can't discover socket interleave");
+                edac_mc_handle_ce_no_info(mci, msg);
+                return -EINVAL;
+        }
+        *socket = sad_interleave[idx];
+        debugf0("SAD interleave index: %d (wayness %d) = CPU socket %d\n",
+                idx, sad_way, *socket);
+        /*
+         * Move to the proper node structure, in order to access the
+         * right PCI registers
+         */
+        new_mci = get_mci_for_node_id(*socket);
+        if (!new_mci) {
+                sprintf(msg, "Struct for socket #%u wasn't initialized",
+                        *socket);
+                edac_mc_handle_ce_no_info(mci, msg);
+                return -EINVAL;
+        }
+        mci = new_mci;
+        pvt = mci->pvt_info;
+        /*
+         * Step 2) Get memory channel
+         */
+        prv = 0;
+        for (n_tads = 0; n_tads < MAX_TAD; n_tads++) {
+                pci_read_config_dword(pvt->pci_ha0, tad_dram_rule[n_tads],
+                                      &reg);
+                limit = TAD_LIMIT(reg);
+                if (limit <= prv) {
+                        sprintf(msg, "Can't discover the memory channel");
+                        edac_mc_handle_ce_no_info(mci, msg);
+                        return -EINVAL;
+                }
+                if  (addr <= limit)
+                        break;
+                prv = limit;
+        }
+        ch_way = TAD_CH(reg) + 1;
+        sck_way = TAD_SOCK(reg) + 1;
+        /*
+         * FIXME: Is it right to always use channel 0 for offsets?
+         */
+        pci_read_config_dword(pvt->pci_tad[0],
+                                tad_ch_nilv_offset[n_tads],
+                                &tad_offset);
+        if (ch_way == 3)
+                idx = addr >> 6;
+        else
+                idx = addr >> (6 + sck_way);
+        idx = idx % ch_way;
+        /*
+         * FIXME: Shouldn't we use CHN_IDX_OFFSET() here, when ch_way == 3 ???
+         */
+        switch (idx) {
+        case 0:
+                base_ch = TAD_TGT0(reg);
+                break;
+        case 1:
+                base_ch = TAD_TGT1(reg);
+                break;
+        case 2:
+                base_ch = TAD_TGT2(reg);
+                break;
+        case 3:
+                base_ch = TAD_TGT3(reg);
+                break;
+        default:
+                sprintf(msg, "Can't discover the TAD target");
+                edac_mc_handle_ce_no_info(mci, msg);
+                return -EINVAL;
+        }
+        *channel_mask = 1 << base_ch;
+        if (pvt->is_mirrored) {
+                *channel_mask |= 1 << ((base_ch + 2) % 4);
+                switch(ch_way) {
+                case 2:
+                case 4:
+                        sck_xch = 1 << sck_way * (ch_way >> 1);
+                        break;
+                default:
+                        sprintf(msg, "Invalid mirror set. Can't decode addr");
+                        edac_mc_handle_ce_no_info(mci, msg);
+                        return -EINVAL;
+                }
+        } else
+                sck_xch = (1 << sck_way) * ch_way;
+        if (pvt->is_lockstep)
+                *channel_mask |= 1 << ((base_ch + 1) % 4);
+        offset = TAD_OFFSET(tad_offset);
+        debugf0("TAD#%d: address 0x%016Lx < 0x%016Lx, socket interleave %d, channel interleave %d (offset 0x%08Lx), index %d, base ch: %d, ch mask: 0x%02lx\n",
+                n_tads,
+                addr,
+                limit,
+                (u32)TAD_SOCK(reg),
+                ch_way,
+                offset,
+                idx,
+                base_ch,
+                *channel_mask);
+        /* Calculate channel address */
+        /* Remove the TAD offset */
+        if (offset > addr) {
+                sprintf(msg, "Can't calculate ch addr: TAD offset 0x%08Lx is too high for addr 0x%08Lx!",
+                        offset, addr);
+                edac_mc_handle_ce_no_info(mci, msg);
+                return -EINVAL;
+        }
+        addr -= offset;
+        /* Store the low bits [0:6] of the addr */
+        ch_addr = addr & 0x7f;
+        /* Remove socket wayness and remove 6 bits */
+        addr >>= 6;
+        addr /= sck_xch;
+#if 0
+        /* Divide by channel way */
+        addr = addr / ch_way;
+#endif
+        /* Recover the last 6 bits */
+        ch_addr |= addr << 6;
+        /*
+         * Step 3) Decode rank
+         */
+        for (n_rir = 0; n_rir < MAX_RIR_RANGES; n_rir++) {
+                pci_read_config_dword(pvt->pci_tad[base_ch],
+                                      rir_way_limit[n_rir],
+                                      &reg);
+                if (!IS_RIR_VALID(reg))
+                        continue;
+                limit = RIR_LIMIT(reg);
+                debugf0("RIR#%d, limit: %Lu.%03Lu GB (0x%016Lx), way: %d\n",
+                        n_rir,
+                        (limit >> 20) / 1000, (limit >> 20) % 1000,
+                        limit,
+                        1 << RIR_WAY(reg));
+                if  (ch_addr <= limit)
+                        break;
+        }
+        if (n_rir == MAX_RIR_RANGES) {
+                sprintf(msg, "Can't discover the memory rank for ch addr 0x%08Lx",
+                        ch_addr);
+                edac_mc_handle_ce_no_info(mci, msg);
+                return -EINVAL;
+        }
+        rir_way = RIR_WAY(reg);
+        if (pvt->is_close_pg)
+                idx = (ch_addr >> 6);
+        else
+                idx = (ch_addr >> 13);  /* FIXME: Datasheet says to shift by 15 */
+        idx %= 1 << rir_way;
+        pci_read_config_dword(pvt->pci_tad[base_ch],
+                              rir_offset[n_rir][idx],
+                              &reg);
+        *rank = RIR_RNK_TGT(reg);
+        debugf0("RIR#%d: channel address 0x%08Lx < 0x%08Lx, RIR interleave %d, index %d\n",
+                n_rir,
+                ch_addr,
+                limit,
+                rir_way,
+                idx);
+        return 0;
+}
+/****************************************************************************
+        Device initialization routines: put/get, init/exit
+ ****************************************************************************/
+/*
+ *      sbridge_put_all_devices 'put' all the devices that we have
+ *                              reserved via 'get'
+ */
+static void sbridge_put_devices(struct sbridge_dev *sbridge_dev)
+{
+        int i;
+        debugf0(__FILE__ ": %s()\n", __func__);
+        for (i = 0; i < sbridge_dev->n_devs; i++) {
+                struct pci_dev *pdev = sbridge_dev->pdev[i];
+                if (!pdev)
+                        continue;
+                debugf0("Removing dev %02x:%02x.%d\n",
+                        pdev->bus->number,
+                        PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
+                pci_dev_put(pdev);
+        }
+}
+static void sbridge_put_all_devices(void)
+{
+        struct sbridge_dev *sbridge_dev, *tmp;
+        list_for_each_entry_safe(sbridge_dev, tmp, &sbridge_edac_list, list) {
+                sbridge_put_devices(sbridge_dev);
+                free_sbridge_dev(sbridge_dev);
+        }
+}
+/*
+ *      sbridge_get_all_devices Find and perform 'get' operation on the MCH's
+ *                      device/functions we want to reference for this driver
+ *
+ *                      Need to 'get' device 16 func 1 and func 2
+ */
+static int sbridge_get_onedevice(struct pci_dev **prev,
+                                 u8 *num_mc,
+                                 const struct pci_id_table *table,
+                                 const unsigned devno)
+{
+        struct sbridge_dev *sbridge_dev;
+        const struct pci_id_descr *dev_descr = &table->descr[devno];
+        struct pci_dev *pdev = NULL;
+        u8 bus = 0;
+        sbridge_printk(KERN_INFO,
+                "Seeking for: dev %02x.%d PCI ID %04x:%04x\n",
+                dev_descr->dev, dev_descr->func,
+                PCI_VENDOR_ID_INTEL, dev_descr->dev_id);
+        pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
+                              dev_descr->dev_id, *prev);
+        if (!pdev) {
+                if (*prev) {
+                        *prev = pdev;
+                        return 0;
+                }
+                if (dev_descr->optional)
+                        return 0;
+                if (devno == 0)
+                        return -ENODEV;
+                sbridge_printk(KERN_INFO,
+                        "Device not found: dev %02x.%d PCI ID %04x:%04x\n",
+                        dev_descr->dev, dev_descr->func,
+                        PCI_VENDOR_ID_INTEL, dev_descr->dev_id);
+                /* End of list, leave */
+                return -ENODEV;
+        }
+        bus = pdev->bus->number;
+        sbridge_dev = get_sbridge_dev(bus);
+        if (!sbridge_dev) {
+                sbridge_dev = alloc_sbridge_dev(bus, table);
+                if (!sbridge_dev) {
+                        pci_dev_put(pdev);
+                        return -ENOMEM;
+                }
+                (*num_mc)++;
+        }
+        if (sbridge_dev->pdev[devno]) {
+                sbridge_printk(KERN_ERR,
+                        "Duplicated device for "
+                        "dev %02x:%d.%d PCI ID %04x:%04x\n",
+                        bus, dev_descr->dev, dev_descr->func,
+                        PCI_VENDOR_ID_INTEL, dev_descr->dev_id);
+                pci_dev_put(pdev);
+                return -ENODEV;
+        }
+        sbridge_dev->pdev[devno] = pdev;
+        /* Sanity check */
+        if (unlikely(PCI_SLOT(pdev->devfn) != dev_descr->dev ||
+                        PCI_FUNC(pdev->devfn) != dev_descr->func)) {
+                sbridge_printk(KERN_ERR,
+                        "Device PCI ID %04x:%04x "
+                        "has dev %02x:%d.%d instead of dev %02x:%02x.%d\n",
+                        PCI_VENDOR_ID_INTEL, dev_descr->dev_id,
+                        bus, PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn),
+                        bus, dev_descr->dev, dev_descr->func);
+                return -ENODEV;
+        }
+        /* Be sure that the device is enabled */
+        if (unlikely(pci_enable_device(pdev) < 0)) {
+                sbridge_printk(KERN_ERR,
+                        "Couldn't enable "
+                        "dev %02x:%d.%d PCI ID %04x:%04x\n",
+                        bus, dev_descr->dev, dev_descr->func,
+                        PCI_VENDOR_ID_INTEL, dev_descr->dev_id);
+                return -ENODEV;
+        }
+        debugf0("Detected dev %02x:%d.%d PCI ID %04x:%04x\n",
+                bus, dev_descr->dev,
+                dev_descr->func,
+                PCI_VENDOR_ID_INTEL, dev_descr->dev_id);
+        /*
+         * As stated on drivers/pci/search.c, the reference count for
+         * @from is always decremented if it is not %NULL. So, as we need
+         * to get all devices up to null, we need to do a get for the device
+         */
+        pci_dev_get(pdev);
+        *prev = pdev;
+        return 0;
+}
+static int sbridge_get_all_devices(u8 *num_mc)
+{
+        int i, rc;
+        struct pci_dev *pdev = NULL;
+        const struct pci_id_table *table = pci_dev_descr_sbridge_table;
+        while (table && table->descr) {
+                for (i = 0; i < table->n_devs; i++) {
+                        pdev = NULL;
+                        do {
+                                rc = sbridge_get_onedevice(&pdev, num_mc,
+                                                           table, i);
+                                if (rc < 0) {
+                                        if (i == 0) {
+                                                i = table->n_devs;
+                                                break;
+                                        }
+                                        sbridge_put_all_devices();
+                                        return -ENODEV;
+                                }
+                        } while (pdev);
+                }
+                table++;
+        }
+        return 0;
+}
+static int mci_bind_devs(struct mem_ctl_info *mci,
+                         struct sbridge_dev *sbridge_dev)
+{
+        struct sbridge_pvt *pvt = mci->pvt_info;
+        struct pci_dev *pdev;
+        int i, func, slot;
+        for (i = 0; i < sbridge_dev->n_devs; i++) {
+                pdev = sbridge_dev->pdev[i];
+                if (!pdev)
+                        continue;
+                slot = PCI_SLOT(pdev->devfn);
+                func = PCI_FUNC(pdev->devfn);
+                switch (slot) {
+                case 12:
+                        switch (func) {
+                        case 6:
+                                pvt->pci_sad0 = pdev;
+                                break;
+                        case 7:
+                                pvt->pci_sad1 = pdev;
+                                break;
+                        default:
+                                goto error;
+                        }
+                        break;
+                case 13:
+                        switch (func) {
+                        case 6:
+                                pvt->pci_br = pdev;
+                                break;
+                        default:
+                                goto error;
+                        }
+                        break;
+                case 14:
+                        switch (func) {
+                        case 0:
+                                pvt->pci_ha0 = pdev;
+                                break;
+                        default:
+                                goto error;
+                        }
+                        break;
+                case 15:
+                        switch (func) {
+                        case 0:
+                                pvt->pci_ta = pdev;
+                                break;
+                        case 1:
+                                pvt->pci_ras = pdev;
+                                break;
+                        case 2:
+                        case 3:
+                        case 4:
+                        case 5:
+                                pvt->pci_tad[func - 2] = pdev;
+                                break;
+                        default:
+                                goto error;
+                        }
+                        break;
+                case 17:
+                        switch (func) {
+                        case 0:
+                                pvt->pci_ddrio = pdev;
+                                break;
+                        default:
+                                goto error;
+                        }
+                        break;
+                default:
+                        goto error;
+                }
+                debugf0("Associated PCI %02x.%02d.%d with dev = %p\n",
+                        sbridge_dev->bus,
+                        PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn),
+                        pdev);
+        }
+        /* Check if everything were registered */
+        if (!pvt->pci_sad0 || !pvt->pci_sad1 || !pvt->pci_ha0 ||
+            !pvt-> pci_tad || !pvt->pci_ras  || !pvt->pci_ta ||
+            !pvt->pci_ddrio)
+                goto enodev;
+        for (i = 0; i < NUM_CHANNELS; i++) {
+                if (!pvt->pci_tad[i])
+                        goto enodev;
+        }
+        return 0;
+enodev:
+        sbridge_printk(KERN_ERR, "Some needed devices are missing\n");
+        return -ENODEV;
+error:
+        sbridge_printk(KERN_ERR, "Device %d, function %d "
+                      "is out of the expected range\n",
+                      slot, func);
+        return -EINVAL;
+}
+/****************************************************************************
+                        Error check routines
+ ****************************************************************************/
+/*
+ * While Sandy Bridge has error count registers, SMI BIOS read values from
+ * and resets the counters. So, they are not reliable for the OS to read
+ * from them. So, we have no option but to just trust on whatever MCE is
+ * telling us about the errors.
+ */
+static void sbridge_mce_output_error(struct mem_ctl_info *mci,
+                                    const struct mce *m)
+{
+        struct mem_ctl_info *new_mci;
+        struct sbridge_pvt *pvt = mci->pvt_info;
+        char *type, *optype, *msg, *recoverable_msg;
+        bool ripv = GET_BITFIELD(m->mcgstatus, 0, 0);
+        bool overflow = GET_BITFIELD(m->status, 62, 62);
+        bool uncorrected_error = GET_BITFIELD(m->status, 61, 61);
+        bool recoverable = GET_BITFIELD(m->status, 56, 56);
+        u32 core_err_cnt = GET_BITFIELD(m->status, 38, 52);
+        u32 mscod = GET_BITFIELD(m->status, 16, 31);
+        u32 errcode = GET_BITFIELD(m->status, 0, 15);
+        u32 channel = GET_BITFIELD(m->status, 0, 3);
+        u32 optypenum = GET_BITFIELD(m->status, 4, 6);
+        long channel_mask, first_channel;
+        u8  rank, socket;
+        int csrow, rc, dimm;
+        char *area_type = "Unknown";
+        if (ripv)
+                type = "NON_FATAL";
+        else
+                type = "FATAL";
+        /*
+         * According with Table 15-9 of the Intel Archictecture spec vol 3A,
+         * memory errors should fit in this mask:
+         *      000f 0000 1mmm cccc (binary)
+         * where:
+         *      f = Correction Report Filtering Bit. If 1, subsequent errors
+         *          won't be shown
+         *      mmm = error type
+         *      cccc = channel
+         * If the mask doesn't match, report an error to the parsing logic
+         */
+        if (! ((errcode & 0xef80) == 0x80)) {
+                optype = "Can't parse: it is not a mem";
+        } else {
+                switch (optypenum) {
+                case 0:
+                        optype = "generic undef request";
+                        break;
+                case 1:
+                        optype = "memory read";
+                        break;
+                case 2:
+                        optype = "memory write";
+                        break;
+                case 3:
+                        optype = "addr/cmd";
+                        break;
+                case 4:
+                        optype = "memory scrubbing";
+                        break;
+                default:
+                        optype = "reserved";
+                        break;
+                }
+        }
+        rc = get_memory_error_data(mci, m->addr, &socket,
+                                   &channel_mask, &rank, area_type);
+        if (rc < 0)
+                return;
+        new_mci = get_mci_for_node_id(socket);
+        if (!new_mci) {
+                edac_mc_handle_ce_no_info(mci, "Error: socket got corrupted!");
+                return;
+        }
+        mci = new_mci;
+        pvt = mci->pvt_info;
+        first_channel = find_first_bit(&channel_mask, NUM_CHANNELS);
+        if (rank < 4)
+                dimm = 0;
+        else if (rank < 8)
+                dimm = 1;
+        else
+                dimm = 2;
+        csrow = pvt->csrow_map[first_channel][dimm];
+        if (uncorrected_error && recoverable)
+                recoverable_msg = " recoverable";
+        else
+                recoverable_msg = "";
+        /*
+         * FIXME: What should we do with "channel" information on mcelog?
+         * Probably, we can just discard it, as the channel information
+         * comes from the get_memory_error_data() address decoding
+         */
+        msg = kasprintf(GFP_ATOMIC,
+                        "%d %s error(s): %s on %s area %s%s: cpu=%d Err=%04x:%04x (ch=%d), "
+                        "addr = 0x%08llx => socket=%d, Channel=%ld(mask=%ld), rank=%d\n",
+                        core_err_cnt,
+                        area_type,
+                        optype,
+                        type,
+                        recoverable_msg,
+                        overflow ? "OVERFLOW" : "",
+                        m->cpu,
+                        mscod, errcode,
+                        channel,                /* 1111b means not specified */
+                        (long long) m->addr,
+                        socket,
+                        first_channel,          /* This is the real channel on SB */
+                        channel_mask,
+                        rank);
+        debugf0("%s", msg);
+        /* Call the helper to output message */
+        if (uncorrected_error)
+                edac_mc_handle_fbd_ue(mci, csrow, 0, 0, msg);
+        else
+                edac_mc_handle_fbd_ce(mci, csrow, 0, msg);
+        kfree(msg);
+}
+/*
+ *      sbridge_check_error     Retrieve and process errors reported by the
+ *                              hardware. Called by the Core module.
+ */
+static void sbridge_check_error(struct mem_ctl_info *mci)
+{
+        struct sbridge_pvt *pvt = mci->pvt_info;
+        int i;
+        unsigned count = 0;
+        struct mce *m;
+        /*
+         * MCE first step: Copy all mce errors into a temporary buffer
+         * We use a double buffering here, to reduce the risk of
+         * loosing an error.
+         */
+        smp_rmb();
+        count = (pvt->mce_out + MCE_LOG_LEN - pvt->mce_in)
+                % MCE_LOG_LEN;
+        if (!count)
+                return;
+        m = pvt->mce_outentry;
+        if (pvt->mce_in + count > MCE_LOG_LEN) {
+                unsigned l = MCE_LOG_LEN - pvt->mce_in;
+                memcpy(m, &pvt->mce_entry[pvt->mce_in], sizeof(*m) * l);
+                smp_wmb();
+                pvt->mce_in = 0;
+                count -= l;
+                m += l;
+        }
+        memcpy(m, &pvt->mce_entry[pvt->mce_in], sizeof(*m) * count);
+        smp_wmb();
+        pvt->mce_in += count;
+        smp_rmb();
+        if (pvt->mce_overrun) {
+                sbridge_printk(KERN_ERR, "Lost %d memory errors\n",
+                              pvt->mce_overrun);
+                smp_wmb();
+                pvt->mce_overrun = 0;
+        }
+        /*
+         * MCE second step: parse errors and display
+         */
+        for (i = 0; i < count; i++)
+                sbridge_mce_output_error(mci, &pvt->mce_outentry[i]);
+}
+/*
+ * sbridge_mce_check_error      Replicates mcelog routine to get errors
+ *                              This routine simply queues mcelog errors, and
+ *                              return. The error itself should be handled later
+ *                              by sbridge_check_error.
+ * WARNING: As this routine should be called at NMI time, extra care should
+ * be taken to avoid deadlocks, and to be as fast as possible.
+ */
+static int sbridge_mce_check_error(struct notifier_block *nb, unsigned long val,
+                                   void *data)
+{
+        struct mce *mce = (struct mce *)data;
+        struct mem_ctl_info *mci;
+        struct sbridge_pvt *pvt;
+        mci = get_mci_for_node_id(mce->socketid);
+        if (!mci)
+                return NOTIFY_BAD;
+        pvt = mci->pvt_info;
+        /*
+         * Just let mcelog handle it if the error is
+         * outside the memory controller. A memory error
+         * is indicated by bit 7 = 1 and bits = 8-11,13-15 = 0.
+         * bit 12 has an special meaning.
+         */
+        if ((mce->status & 0xefff) >> 7 != 1)
+                return NOTIFY_DONE;
+        printk("sbridge: HANDLING MCE MEMORY ERROR\n");
+        printk("CPU %d: Machine Check Exception: %Lx Bank %d: %016Lx\n",
+               mce->extcpu, mce->mcgstatus, mce->bank, mce->status);
+        printk("TSC %llx ", mce->tsc);
+        printk("ADDR %llx ", mce->addr);
+        printk("MISC %llx ", mce->misc);
+        printk("PROCESSOR %u:%x TIME %llu SOCKET %u APIC %x\n",
+                mce->cpuvendor, mce->cpuid, mce->time,
+                mce->socketid, mce->apicid);
+#ifdef CONFIG_SMP
+        /* Only handle if it is the right mc controller */
+        if (cpu_data(mce->cpu).phys_proc_id != pvt->sbridge_dev->mc)
+                return NOTIFY_DONE;
+#endif
+        smp_rmb();
+        if ((pvt->mce_out + 1) % MCE_LOG_LEN == pvt->mce_in) {
+                smp_wmb();
+                pvt->mce_overrun++;
+                return NOTIFY_DONE;
+        }
+        /* Copy memory error at the ringbuffer */
+        memcpy(&pvt->mce_entry[pvt->mce_out], mce, sizeof(*mce));
+        smp_wmb();
+        pvt->mce_out = (pvt->mce_out + 1) % MCE_LOG_LEN;
+        /* Handle fatal errors immediately */
+        if (mce->mcgstatus & 1)
+                sbridge_check_error(mci);
+        /* Advice mcelog that the error were handled */
+        return NOTIFY_STOP;
+}
+static struct notifier_block sbridge_mce_dec = {
+        .notifier_call      = sbridge_mce_check_error,
+};
+/****************************************************************************
+                        EDAC register/unregister logic
+ ****************************************************************************/
+static void sbridge_unregister_mci(struct sbridge_dev *sbridge_dev)
+{
+        struct mem_ctl_info *mci = sbridge_dev->mci;
+        struct sbridge_pvt *pvt;
+        if (unlikely(!mci || !mci->pvt_info)) {
+                debugf0("MC: " __FILE__ ": %s(): dev = %p\n",
+                        __func__, &sbridge_dev->pdev[0]->dev);
+                sbridge_printk(KERN_ERR, "Couldn't find mci handler\n");
+                return;
+        }
+        pvt = mci->pvt_info;
+        debugf0("MC: " __FILE__ ": %s(): mci = %p, dev = %p\n",
+                __func__, mci, &sbridge_dev->pdev[0]->dev);
+        atomic_notifier_chain_unregister(&x86_mce_decoder_chain,
+                                         &sbridge_mce_dec);
+        /* Remove MC sysfs nodes */
+        edac_mc_del_mc(mci->dev);
+        debugf1("%s: free mci struct\n", mci->ctl_name);
+        kfree(mci->ctl_name);
+        edac_mc_free(mci);
+        sbridge_dev->mci = NULL;
+}
+static int sbridge_register_mci(struct sbridge_dev *sbridge_dev)
+{
+        struct mem_ctl_info *mci;
+        struct sbridge_pvt *pvt;
+        int rc, channels, csrows;
+        /* Check the number of active and not disabled channels */
+        rc = sbridge_get_active_channels(sbridge_dev->bus, &channels, &csrows);
+        if (unlikely(rc < 0))
+                return rc;
+        /* allocate a new MC control structure */
+        mci = edac_mc_alloc(sizeof(*pvt), csrows, channels, sbridge_dev->mc);
+        if (unlikely(!mci))
+                return -ENOMEM;
+        debugf0("MC: " __FILE__ ": %s(): mci = %p, dev = %p\n",
+                __func__, mci, &sbridge_dev->pdev[0]->dev);
+        pvt = mci->pvt_info;
+        memset(pvt, 0, sizeof(*pvt));
+        /* Associate sbridge_dev and mci for future usage */
+        pvt->sbridge_dev = sbridge_dev;
+        sbridge_dev->mci = mci;
+        mci->mtype_cap = MEM_FLAG_DDR3;
+        mci->edac_ctl_cap = EDAC_FLAG_NONE;
+        mci->edac_cap = EDAC_FLAG_NONE;
+        mci->mod_name = "sbridge_edac.c";
+        mci->mod_ver = SBRIDGE_REVISION;
+        mci->ctl_name = kasprintf(GFP_KERNEL, "Sandy Bridge Socket#%d", mci->mc_idx);
+        mci->dev_name = pci_name(sbridge_dev->pdev[0]);
+        mci->ctl_page_to_phys = NULL;
+        /* Set the function pointer to an actual operation function */
+        mci->edac_check = sbridge_check_error;
+        /* Store pci devices at mci for faster access */
+        rc = mci_bind_devs(mci, sbridge_dev);
+        if (unlikely(rc < 0))
+                goto fail0;
+        /* Get dimm basic config and the memory layout */
+        get_dimm_config(mci);
+        get_memory_layout(mci);
+        /* record ptr to the generic device */
+        mci->dev = &sbridge_dev->pdev[0]->dev;
+        /* add this new MC control structure to EDAC's list of MCs */
+        if (unlikely(edac_mc_add_mc(mci))) {
+                debugf0("MC: " __FILE__
+                        ": %s(): failed edac_mc_add_mc()\n", __func__);
+                rc = -EINVAL;
+                goto fail0;
+        }
+        atomic_notifier_chain_register(&x86_mce_decoder_chain,
+                                       &sbridge_mce_dec);
+        return 0;
+fail0:
+        kfree(mci->ctl_name);
+        edac_mc_free(mci);
+        sbridge_dev->mci = NULL;
+        return rc;
+}
+/*
+ *      sbridge_probe   Probe for ONE instance of device to see if it is
+ *                      present.
+ *      return:
+ *              0 for FOUND a device
+ *              < 0 for error code
+ */
+static int __devinit sbridge_probe(struct pci_dev *pdev,
+                                  const struct pci_device_id *id)
+{
+        int rc;
+        u8 mc, num_mc = 0;
+        struct sbridge_dev *sbridge_dev;
+        /* get the pci devices we want to reserve for our use */
+        mutex_lock(&sbridge_edac_lock);
+        /*
+         * All memory controllers are allocated at the first pass.
+         */
+        if (unlikely(probed >= 1)) {
+                mutex_unlock(&sbridge_edac_lock);
+                return -ENODEV;
+        }
+        probed++;
+        rc = sbridge_get_all_devices(&num_mc);
+        if (unlikely(rc < 0))
+                goto fail0;
+        mc = 0;
+        list_for_each_entry(sbridge_dev, &sbridge_edac_list, list) {
+                debugf0("Registering MC#%d (%d of %d)\n", mc, mc + 1, num_mc);
+                sbridge_dev->mc = mc++;
+                rc = sbridge_register_mci(sbridge_dev);
+                if (unlikely(rc < 0))
+                        goto fail1;
+        }
+        sbridge_printk(KERN_INFO, "Driver loaded.\n");
+        mutex_unlock(&sbridge_edac_lock);
+        return 0;
+fail1:
+        list_for_each_entry(sbridge_dev, &sbridge_edac_list, list)
+                sbridge_unregister_mci(sbridge_dev);
+        sbridge_put_all_devices();
+fail0:
+        mutex_unlock(&sbridge_edac_lock);
+        return rc;
+}
+/*
+ *      sbridge_remove  destructor for one instance of device
+ *
+ */
+static void __devexit sbridge_remove(struct pci_dev *pdev)
+{
+        struct sbridge_dev *sbridge_dev;
+        debugf0(__FILE__ ": %s()\n", __func__);
+        /*
+         * we have a trouble here: pdev value for removal will be wrong, since
+         * it will point to the X58 register used to detect that the machine
+         * is a Nehalem or upper design. However, due to the way several PCI
+         * devices are grouped together to provide MC functionality, we need
+         * to use a different method for releasing the devices
+         */
+        mutex_lock(&sbridge_edac_lock);
+        if (unlikely(!probed)) {
+                mutex_unlock(&sbridge_edac_lock);
+                return;
+        }
+        list_for_each_entry(sbridge_dev, &sbridge_edac_list, list)
+                sbridge_unregister_mci(sbridge_dev);
+        /* Release PCI resources */
+        sbridge_put_all_devices();
+        probed--;
+        mutex_unlock(&sbridge_edac_lock);
+}
+MODULE_DEVICE_TABLE(pci, sbridge_pci_tbl);
+/*
+ *      sbridge_driver  pci_driver structure for this module
+ *
+ */
+static struct pci_driver sbridge_driver = {
+        .name     = "sbridge_edac",
+        .probe    = sbridge_probe,
+        .remove   = __devexit_p(sbridge_remove),
+        .id_table = sbridge_pci_tbl,
+};
+/*
+ *      sbridge_init            Module entry function
+ *                      Try to initialize this module for its devices
+ */
+static int __init sbridge_init(void)
+{
+        int pci_rc;
+        debugf2("MC: " __FILE__ ": %s()\n", __func__);
+        /* Ensure that the OPSTATE is set correctly for POLL or NMI */
+        opstate_init();
+        pci_rc = pci_register_driver(&sbridge_driver);
+        if (pci_rc >= 0)
+                return 0;
+        sbridge_printk(KERN_ERR, "Failed to register device with error %d.\n",
+                      pci_rc);
+        return pci_rc;
+}
+/*
+ *      sbridge_exit()  Module exit function
+ *                      Unregister the driver
+ */
+static void __exit sbridge_exit(void)
+{
+        debugf2("MC: " __FILE__ ": %s()\n", __func__);
+        pci_unregister_driver(&sbridge_driver);
+}
+module_init(sbridge_init);
+module_exit(sbridge_exit);
+module_param(edac_op_state, int, 0444);
+MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
+MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)");
+MODULE_DESCRIPTION("MC Driver for Intel Sandy Bridge memory controllers - "
+                   SBRIDGE_REVISION);
diff --git a/drivers/firewire/core-iso.c b/drivers/firewire/core-iso.c
index 57c3973093ad..0f90e0071875 100644
--- a/drivers/firewire/core-iso.c
+++ b/drivers/firewire/core-iso.c
@@ -29,6 +29,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/vmalloc.h>
+#include <linux/export.h>
 #include <asm/byteorder.h>
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index f1b7f659d3c9..e22957665808 100644
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -151,7 +151,8 @@ edd_show_host_bus(struct edd_device *edev, char *buf)
                p += scnprintf(p, left, "\tbase_address: %x\n",
                             info->params.interface_path.isa.base_address);
        } else if (!strncmp(info->params.host_bus_type, "PCIX", 4) ||
-                   !strncmp(info->params.host_bus_type, "PCI", 3)) {
+                   !strncmp(info->params.host_bus_type, "PCI", 3) ||
+                   !strncmp(info->params.host_bus_type, "XPRS", 4)) {
                p += scnprintf(p, left,
                             "\t%02x:%02x.%d  channel: %u\n",
                             info->params.interface_path.pci.bus,
@@ -159,7 +160,6 @@ edd_show_host_bus(struct edd_device *edev, char *buf)
                             info->params.interface_path.pci.function,
                             info->params.interface_path.pci.channel);
        } else if (!strncmp(info->params.host_bus_type, "IBND", 4) ||
-                   !strncmp(info->params.host_bus_type, "XPRS", 4) ||
                   !strncmp(info->params.host_bus_type, "HTPT", 4)) {
                p += scnprintf(p, left,
                             "\tTBD: %llx\n",
@@ -668,7 +668,7 @@ edd_get_pci_dev(struct edd_device *edev)
 {
        struct edd_info *info = edd_dev_get_info(edev);
-        if (edd_dev_is_type(edev, "PCI")) {
+        if (edd_dev_is_type(edev, "PCI") || edd_dev_is_type(edev, "XPRS")) {
                return pci_get_bus_and_slot(info->params.interface_path.pci.bus,
                                     PCI_DEVFN(info->params.interface_path.pci.slot,
                                               info->params.interface_path.pci.
diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c
index aa83de9db1b9..c4e7c59d1c63 100644
--- a/drivers/firmware/google/gsmi.c
+++ b/drivers/firmware/google/gsmi.c
@@ -27,6 +27,7 @@
 #include <linux/kdebug.h>
 #include <linux/reboot.h>
 #include <linux/efi.h>
+#include <linux/module.h>
 #define GSMI_SHUTDOWN_CLEAN     0       /* Clean Shutdown */
 /* TODO(mikew@google.com): Tie in HARDLOCKUP_DETECTOR with NMIWDT */
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index cb0bd078efc0..8482a23887dc 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -95,14 +95,18 @@ config GPIO_EP93XX
        depends on ARCH_EP93XX
        select GPIO_GENERIC
-config GPIO_EXYNOS4
-        def_bool y
-        depends on CPU_EXYNOS4210
 config GPIO_MPC5200
        def_bool y
        depends on PPC_MPC52xx
+config GPIO_MPC8XXX
+        bool "MPC512x/MPC8xxx GPIO support"
+        depends on PPC_MPC512x || PPC_MPC831x || PPC_MPC834x || PPC_MPC837x || \
+                   FSL_SOC_BOOKE || PPC_86xx
+        help
+          Say Y here if you're going to use hardware that connects to the
+          MPC512x/831x/834x/837x/8572/8610 GPIOs.
 config GPIO_MSM_V1
        tristate "Qualcomm MSM GPIO v1"
        depends on GPIOLIB && ARCH_MSM
@@ -131,18 +135,6 @@ config GPIO_MXS
        select GPIO_GENERIC
        select GENERIC_IRQ_CHIP
-config GPIO_PLAT_SAMSUNG
-        def_bool y
-        depends on SAMSUNG_GPIOLIB_4BIT
-config GPIO_S5PC100
-        def_bool y
-        depends on CPU_S5PC100
-config GPIO_S5PV210
-        def_bool y
-        depends on CPU_S5PV210
 config GPIO_PL061
        bool "PrimeCell PL061 GPIO support"
        depends on ARM_AMBA
@@ -189,7 +181,7 @@ config GPIO_U300
 config GPIO_VX855
        tristate "VIA VX855/VX875 GPIO"
-        depends on MFD_SUPPORT && PCI
+        depends on PCI
        select MFD_CORE
        select MFD_VX855
        help
@@ -428,7 +420,6 @@ config GPIO_TIMBERDALE
 config GPIO_RDC321X
        tristate "RDC R-321x GPIO support"
        depends on PCI
-        select MFD_SUPPORT
        select MFD_CORE
        select MFD_RDC321X
        help
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 19c5d27b6d2e..dbcb0bcfd8da 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -16,7 +16,6 @@ obj-$(CONFIG_GPIO_CS5535)	+= gpio-cs5535.o
 obj-$(CONFIG_GPIO_DA9052)       += gpio-da9052.o
 obj-$(CONFIG_ARCH_DAVINCI)      += gpio-davinci.o
 obj-$(CONFIG_GPIO_EP93XX)       += gpio-ep93xx.o
-obj-$(CONFIG_GPIO_EXYNOS4)      += gpio-exynos4.o
 obj-$(CONFIG_GPIO_IT8761E)      += gpio-it8761e.o
 obj-$(CONFIG_GPIO_JANZ_TTL)     += gpio-janz-ttl.o
 obj-$(CONFIG_MACH_KS8695)       += gpio-ks8695.o
@@ -30,6 +29,7 @@ obj-$(CONFIG_GPIO_MC33880)	+= gpio-mc33880.o
 obj-$(CONFIG_GPIO_MCP23S08)     += gpio-mcp23s08.o
 obj-$(CONFIG_GPIO_ML_IOH)       += gpio-ml-ioh.o
 obj-$(CONFIG_GPIO_MPC5200)      += gpio-mpc5200.o
+obj-$(CONFIG_GPIO_MPC8XXX)      += gpio-mpc8xxx.o
 obj-$(CONFIG_GPIO_MSM_V1)       += gpio-msm-v1.o
 obj-$(CONFIG_GPIO_MSM_V2)       += gpio-msm-v2.o
 obj-$(CONFIG_GPIO_MXC)          += gpio-mxc.o
@@ -42,10 +42,7 @@ obj-$(CONFIG_GPIO_PCH)		+= gpio-pch.o
 obj-$(CONFIG_GPIO_PL061)        += gpio-pl061.o
 obj-$(CONFIG_PLAT_PXA)          += gpio-pxa.o
 obj-$(CONFIG_GPIO_RDC321X)      += gpio-rdc321x.o
+obj-$(CONFIG_PLAT_SAMSUNG)      += gpio-samsung.o
-obj-$(CONFIG_GPIO_PLAT_SAMSUNG) += gpio-plat-samsung.o
-obj-$(CONFIG_GPIO_S5PC100)      += gpio-s5pc100.o
-obj-$(CONFIG_GPIO_S5PV210)      += gpio-s5pv210.o
 obj-$(CONFIG_ARCH_SA1100)       += gpio-sa1100.o
 obj-$(CONFIG_GPIO_SCH)          += gpio-sch.o
 obj-$(CONFIG_GPIO_STMPE)        += gpio-stmpe.o
diff --git a/drivers/gpio/gpio-74x164.c b/drivers/gpio/gpio-74x164.c
index ff525c0958dd..a31ad6f5d910 100644
--- a/drivers/gpio/gpio-74x164.c
+++ b/drivers/gpio/gpio-74x164.c
@@ -15,6 +15,7 @@
 #include <linux/spi/74x164.h>
 #include <linux/gpio.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 struct gen_74x164_chip {
        struct spi_device       *spi;
diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c
index 7aafbb437339..1c0fc3756cb1 100644
--- a/drivers/gpio/gpio-ep93xx.c
+++ b/drivers/gpio/gpio-ep93xx.c
@@ -15,6 +15,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/init.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
diff --git a/drivers/gpio/gpio-exynos4.c b/drivers/gpio/gpio-exynos4.c
deleted file mode 100644
index d24b337cf1ac..000000000000
--- a/drivers/gpio/gpio-exynos4.c
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- * EXYNOS4 - GPIOlib support
- *
- * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
- *              http://www.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.
-*/
-#include <linux/kernel.h>
-#include <linux/irq.h>
-#include <linux/io.h>
-#include <linux/gpio.h>
-#include <mach/map.h>
-#include <plat/gpio-core.h>
-#include <plat/gpio-cfg.h>
-#include <plat/gpio-cfg-helpers.h>
-int s3c_gpio_setpull_exynos4(struct s3c_gpio_chip *chip,
-                                unsigned int off, s3c_gpio_pull_t pull)
-{
-        if (pull == S3C_GPIO_PULL_UP)
-                pull = 3;
-        return s3c_gpio_setpull_updown(chip, off, pull);
-}
-s3c_gpio_pull_t s3c_gpio_getpull_exynos4(struct s3c_gpio_chip *chip,
-                                                unsigned int off)
-{
-        s3c_gpio_pull_t pull;
-        pull = s3c_gpio_getpull_updown(chip, off);
-        if (pull == 3)
-                pull = S3C_GPIO_PULL_UP;
-        return pull;
-}
-static struct s3c_gpio_cfg gpio_cfg = {
-        .set_config     = s3c_gpio_setcfg_s3c64xx_4bit,
-        .set_pull       = s3c_gpio_setpull_exynos4,
-        .get_pull       = s3c_gpio_getpull_exynos4,
-};
-static struct s3c_gpio_cfg gpio_cfg_noint = {
-        .set_config     = s3c_gpio_setcfg_s3c64xx_4bit,
-        .set_pull       = s3c_gpio_setpull_exynos4,
-        .get_pull       = s3c_gpio_getpull_exynos4,
-};
-/*
- * Following are the gpio banks in v310.
- *
- * The 'config' member when left to NULL, is initialized to the default
- * structure gpio_cfg in the init function below.
- *
- * The 'base' member is also initialized in the init function below.
- * Note: The initialization of 'base' member of s3c_gpio_chip structure
- * uses the above macro and depends on the banks being listed in order here.
- */
-static struct s3c_gpio_chip exynos4_gpio_part1_4bit[] = {
-        {
-                .chip   = {
-                        .base   = EXYNOS4_GPA0(0),
-                        .ngpio  = EXYNOS4_GPIO_A0_NR,
-                        .label  = "GPA0",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPA1(0),
-                        .ngpio  = EXYNOS4_GPIO_A1_NR,
-                        .label  = "GPA1",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPB(0),
-                        .ngpio  = EXYNOS4_GPIO_B_NR,
-                        .label  = "GPB",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPC0(0),
-                        .ngpio  = EXYNOS4_GPIO_C0_NR,
-                        .label  = "GPC0",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPC1(0),
-                        .ngpio  = EXYNOS4_GPIO_C1_NR,
-                        .label  = "GPC1",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPD0(0),
-                        .ngpio  = EXYNOS4_GPIO_D0_NR,
-                        .label  = "GPD0",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPD1(0),
-                        .ngpio  = EXYNOS4_GPIO_D1_NR,
-                        .label  = "GPD1",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPE0(0),
-                        .ngpio  = EXYNOS4_GPIO_E0_NR,
-                        .label  = "GPE0",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPE1(0),
-                        .ngpio  = EXYNOS4_GPIO_E1_NR,
-                        .label  = "GPE1",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPE2(0),
-                        .ngpio  = EXYNOS4_GPIO_E2_NR,
-                        .label  = "GPE2",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPE3(0),
-                        .ngpio  = EXYNOS4_GPIO_E3_NR,
-                        .label  = "GPE3",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPE4(0),
-                        .ngpio  = EXYNOS4_GPIO_E4_NR,
-                        .label  = "GPE4",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPF0(0),
-                        .ngpio  = EXYNOS4_GPIO_F0_NR,
-                        .label  = "GPF0",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPF1(0),
-                        .ngpio  = EXYNOS4_GPIO_F1_NR,
-                        .label  = "GPF1",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPF2(0),
-                        .ngpio  = EXYNOS4_GPIO_F2_NR,
-                        .label  = "GPF2",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPF3(0),
-                        .ngpio  = EXYNOS4_GPIO_F3_NR,
-                        .label  = "GPF3",
-                },
-        },
-};
-static struct s3c_gpio_chip exynos4_gpio_part2_4bit[] = {
-        {
-                .chip   = {
-                        .base   = EXYNOS4_GPJ0(0),
-                        .ngpio  = EXYNOS4_GPIO_J0_NR,
-                        .label  = "GPJ0",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPJ1(0),
-                        .ngpio  = EXYNOS4_GPIO_J1_NR,
-                        .label  = "GPJ1",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPK0(0),
-                        .ngpio  = EXYNOS4_GPIO_K0_NR,
-                        .label  = "GPK0",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPK1(0),
-                        .ngpio  = EXYNOS4_GPIO_K1_NR,
-                        .label  = "GPK1",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPK2(0),
-                        .ngpio  = EXYNOS4_GPIO_K2_NR,
-                        .label  = "GPK2",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPK3(0),
-                        .ngpio  = EXYNOS4_GPIO_K3_NR,
-                        .label  = "GPK3",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPL0(0),
-                        .ngpio  = EXYNOS4_GPIO_L0_NR,
-                        .label  = "GPL0",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPL1(0),
-                        .ngpio  = EXYNOS4_GPIO_L1_NR,
-                        .label  = "GPL1",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPL2(0),
-                        .ngpio  = EXYNOS4_GPIO_L2_NR,
-                        .label  = "GPL2",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = EXYNOS4_GPY0(0),
-                        .ngpio  = EXYNOS4_GPIO_Y0_NR,
-                        .label  = "GPY0",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = EXYNOS4_GPY1(0),
-                        .ngpio  = EXYNOS4_GPIO_Y1_NR,
-                        .label  = "GPY1",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = EXYNOS4_GPY2(0),
-                        .ngpio  = EXYNOS4_GPIO_Y2_NR,
-                        .label  = "GPY2",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = EXYNOS4_GPY3(0),
-                        .ngpio  = EXYNOS4_GPIO_Y3_NR,
-                        .label  = "GPY3",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = EXYNOS4_GPY4(0),
-                        .ngpio  = EXYNOS4_GPIO_Y4_NR,
-                        .label  = "GPY4",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = EXYNOS4_GPY5(0),
-                        .ngpio  = EXYNOS4_GPIO_Y5_NR,
-                        .label  = "GPY5",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = EXYNOS4_GPY6(0),
-                        .ngpio  = EXYNOS4_GPIO_Y6_NR,
-                        .label  = "GPY6",
-                },
-        }, {
-                .base   = (S5P_VA_GPIO2 + 0xC00),
-                .config = &gpio_cfg_noint,
-                .irq_base = IRQ_EINT(0),
-                .chip   = {
-                        .base   = EXYNOS4_GPX0(0),
-                        .ngpio  = EXYNOS4_GPIO_X0_NR,
-                        .label  = "GPX0",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        }, {
-                .base   = (S5P_VA_GPIO2 + 0xC20),
-                .config = &gpio_cfg_noint,
-                .irq_base = IRQ_EINT(8),
-                .chip   = {
-                        .base   = EXYNOS4_GPX1(0),
-                        .ngpio  = EXYNOS4_GPIO_X1_NR,
-                        .label  = "GPX1",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        }, {
-                .base   = (S5P_VA_GPIO2 + 0xC40),
-                .config = &gpio_cfg_noint,
-                .irq_base = IRQ_EINT(16),
-                .chip   = {
-                        .base   = EXYNOS4_GPX2(0),
-                        .ngpio  = EXYNOS4_GPIO_X2_NR,
-                        .label  = "GPX2",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        }, {
-                .base   = (S5P_VA_GPIO2 + 0xC60),
-                .config = &gpio_cfg_noint,
-                .irq_base = IRQ_EINT(24),
-                .chip   = {
-                        .base   = EXYNOS4_GPX3(0),
-                        .ngpio  = EXYNOS4_GPIO_X3_NR,
-                        .label  = "GPX3",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        },
-};
-static struct s3c_gpio_chip exynos4_gpio_part3_4bit[] = {
-        {
-                .chip   = {
-                        .base   = EXYNOS4_GPZ(0),
-                        .ngpio  = EXYNOS4_GPIO_Z_NR,
-                        .label  = "GPZ",
-                },
-        },
-};
-static __init int exynos4_gpiolib_init(void)
-{
-        struct s3c_gpio_chip *chip;
-        int i;
-        int group = 0;
-        int nr_chips;
-        /* GPIO part 1 */
-        chip = exynos4_gpio_part1_4bit;
-        nr_chips = ARRAY_SIZE(exynos4_gpio_part1_4bit);
-        for (i = 0; i < nr_chips; i++, chip++) {
-                if (chip->config == NULL) {
-                        chip->config = &gpio_cfg;
-                        /* Assign the GPIO interrupt group */
-                        chip->group = group++;
-                }
-                if (chip->base == NULL)
-                        chip->base = S5P_VA_GPIO1 + (i) * 0x20;
-        }
-        samsung_gpiolib_add_4bit_chips(exynos4_gpio_part1_4bit, nr_chips);
-        /* GPIO part 2 */
-        chip = exynos4_gpio_part2_4bit;
-        nr_chips = ARRAY_SIZE(exynos4_gpio_part2_4bit);
-        for (i = 0; i < nr_chips; i++, chip++) {
-                if (chip->config == NULL) {
-                        chip->config = &gpio_cfg;
-                        /* Assign the GPIO interrupt group */
-                        chip->group = group++;
-                }
-                if (chip->base == NULL)
-                        chip->base = S5P_VA_GPIO2 + (i) * 0x20;
-        }
-        samsung_gpiolib_add_4bit_chips(exynos4_gpio_part2_4bit, nr_chips);
-        /* GPIO part 3 */
-        chip = exynos4_gpio_part3_4bit;
-        nr_chips = ARRAY_SIZE(exynos4_gpio_part3_4bit);
-        for (i = 0; i < nr_chips; i++, chip++) {
-                if (chip->config == NULL) {
-                        chip->config = &gpio_cfg;
-                        /* Assign the GPIO interrupt group */
-                        chip->group = group++;
-                }
-                if (chip->base == NULL)
-                        chip->base = S5P_VA_GPIO3 + (i) * 0x20;
-        }
-        samsung_gpiolib_add_4bit_chips(exynos4_gpio_part3_4bit, nr_chips);
-        s5p_register_gpioint_bank(IRQ_GPIO_XA, 0, IRQ_GPIO1_NR_GROUPS);
-        s5p_register_gpioint_bank(IRQ_GPIO_XB, IRQ_GPIO1_NR_GROUPS, IRQ_GPIO2_NR_GROUPS);
-        return 0;
-}
-core_initcall(exynos4_gpiolib_init);
diff --git a/drivers/gpio/gpio-mc33880.c b/drivers/gpio/gpio-mc33880.c
index b3b4652e89ec..2de57ce5feb6 100644
--- a/drivers/gpio/gpio-mc33880.c
+++ b/drivers/gpio/gpio-mc33880.c
@@ -26,6 +26,7 @@
 #include <linux/spi/mc33880.h>
 #include <linux/gpio.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #define DRIVER_NAME "mc33880"
diff --git a/drivers/gpio/gpio-mcp23s08.c b/drivers/gpio/gpio-mcp23s08.c
index 1ef46e6c2a2a..c5d83a8a91c2 100644
--- a/drivers/gpio/gpio-mcp23s08.c
+++ b/drivers/gpio/gpio-mcp23s08.c
@@ -5,6 +5,7 @@
 #include <linux/kernel.h>
 #include <linux/device.h>
 #include <linux/mutex.h>
+#include <linux/module.h>
 #include <linux/gpio.h>
 #include <linux/i2c.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/gpio/gpio-ml-ioh.c b/drivers/gpio/gpio-ml-ioh.c
index 3aa6beec8c1e..ea8e73869250 100644
--- a/drivers/gpio/gpio-ml-ioh.c
+++ b/drivers/gpio/gpio-ml-ioh.c
@@ -14,6 +14,7 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 */
+#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
diff --git a/drivers/gpio/gpio-mpc5200.c b/drivers/gpio/gpio-mpc5200.c
index 52d3ed208105..2c7cef367fc0 100644
--- a/drivers/gpio/gpio-mpc5200.c
+++ b/drivers/gpio/gpio-mpc5200.c
@@ -23,6 +23,7 @@
 #include <linux/of_gpio.h>
 #include <linux/io.h>
 #include <linux/of_platform.h>
+#include <linux/module.h>
 #include <asm/gpio.h>
 #include <asm/mpc52xx.h>
diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c
new file mode 100644
index 000000000000..ec3fcf0a7e12
--- /dev/null
+++ b/drivers/gpio/gpio-mpc8xxx.c
@@ -0,0 +1,398 @@
+/*
+ * GPIOs on MPC512x/8349/8572/8610 and compatible
+ *
+ * Copyright (C) 2008 Peter Korsgaard <jacmet@sunsite.dk>
+ *
+ * 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.
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/spinlock.h>
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/gpio.h>
+#include <linux/slab.h>
+#include <linux/irq.h>
+#define MPC8XXX_GPIO_PINS       32
+#define GPIO_DIR                0x00
+#define GPIO_ODR                0x04
+#define GPIO_DAT                0x08
+#define GPIO_IER                0x0c
+#define GPIO_IMR                0x10
+#define GPIO_ICR                0x14
+#define GPIO_ICR2               0x18
+struct mpc8xxx_gpio_chip {
+        struct of_mm_gpio_chip mm_gc;
+        spinlock_t lock;
+        /*
+         * shadowed data register to be able to clear/set output pins in
+         * open drain mode safely
+         */
+        u32 data;
+        struct irq_host *irq;
+        void *of_dev_id_data;
+};
+static inline u32 mpc8xxx_gpio2mask(unsigned int gpio)
+{
+        return 1u << (MPC8XXX_GPIO_PINS - 1 - gpio);
+}
+static inline struct mpc8xxx_gpio_chip *
+to_mpc8xxx_gpio_chip(struct of_mm_gpio_chip *mm)
+{
+        return container_of(mm, struct mpc8xxx_gpio_chip, mm_gc);
+}
+static void mpc8xxx_gpio_save_regs(struct of_mm_gpio_chip *mm)
+{
+        struct mpc8xxx_gpio_chip *mpc8xxx_gc = to_mpc8xxx_gpio_chip(mm);
+        mpc8xxx_gc->data = in_be32(mm->regs + GPIO_DAT);
+}
+/* Workaround GPIO 1 errata on MPC8572/MPC8536. The status of GPIOs
+ * defined as output cannot be determined by reading GPDAT register,
+ * so we use shadow data register instead. The status of input pins
+ * is determined by reading GPDAT register.
+ */
+static int mpc8572_gpio_get(struct gpio_chip *gc, unsigned int gpio)
+{
+        u32 val;
+        struct of_mm_gpio_chip *mm = to_of_mm_gpio_chip(gc);
+        struct mpc8xxx_gpio_chip *mpc8xxx_gc = to_mpc8xxx_gpio_chip(mm);
+        val = in_be32(mm->regs + GPIO_DAT) & ~in_be32(mm->regs + GPIO_DIR);
+        return (val | mpc8xxx_gc->data) & mpc8xxx_gpio2mask(gpio);
+}
+static int mpc8xxx_gpio_get(struct gpio_chip *gc, unsigned int gpio)
+{
+        struct of_mm_gpio_chip *mm = to_of_mm_gpio_chip(gc);
+        return in_be32(mm->regs + GPIO_DAT) & mpc8xxx_gpio2mask(gpio);
+}
+static void mpc8xxx_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
+{
+        struct of_mm_gpio_chip *mm = to_of_mm_gpio_chip(gc);
+        struct mpc8xxx_gpio_chip *mpc8xxx_gc = to_mpc8xxx_gpio_chip(mm);
+        unsigned long flags;
+        spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
+        if (val)
+                mpc8xxx_gc->data |= mpc8xxx_gpio2mask(gpio);
+        else
+                mpc8xxx_gc->data &= ~mpc8xxx_gpio2mask(gpio);
+        out_be32(mm->regs + GPIO_DAT, mpc8xxx_gc->data);
+        spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
+}
+static int mpc8xxx_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio)
+{
+        struct of_mm_gpio_chip *mm = to_of_mm_gpio_chip(gc);
+        struct mpc8xxx_gpio_chip *mpc8xxx_gc = to_mpc8xxx_gpio_chip(mm);
+        unsigned long flags;
+        spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
+        clrbits32(mm->regs + GPIO_DIR, mpc8xxx_gpio2mask(gpio));
+        spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
+        return 0;
+}
+static int mpc8xxx_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
+{
+        struct of_mm_gpio_chip *mm = to_of_mm_gpio_chip(gc);
+        struct mpc8xxx_gpio_chip *mpc8xxx_gc = to_mpc8xxx_gpio_chip(mm);
+        unsigned long flags;
+        mpc8xxx_gpio_set(gc, gpio, val);
+        spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
+        setbits32(mm->regs + GPIO_DIR, mpc8xxx_gpio2mask(gpio));
+        spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
+        return 0;
+}
+static int mpc8xxx_gpio_to_irq(struct gpio_chip *gc, unsigned offset)
+{
+        struct of_mm_gpio_chip *mm = to_of_mm_gpio_chip(gc);
+        struct mpc8xxx_gpio_chip *mpc8xxx_gc = to_mpc8xxx_gpio_chip(mm);
+        if (mpc8xxx_gc->irq && offset < MPC8XXX_GPIO_PINS)
+                return irq_create_mapping(mpc8xxx_gc->irq, offset);
+        else
+                return -ENXIO;
+}
+static void mpc8xxx_gpio_irq_cascade(unsigned int irq, struct irq_desc *desc)
+{
+        struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_desc_get_handler_data(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
+        struct of_mm_gpio_chip *mm = &mpc8xxx_gc->mm_gc;
+        unsigned int mask;
+        mask = in_be32(mm->regs + GPIO_IER) & in_be32(mm->regs + GPIO_IMR);
+        if (mask)
+                generic_handle_irq(irq_linear_revmap(mpc8xxx_gc->irq,
+                                                     32 - ffs(mask)));
+        chip->irq_eoi(&desc->irq_data);
+}
+static void mpc8xxx_irq_unmask(struct irq_data *d)
+{
+        struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_data_get_irq_chip_data(d);
+        struct of_mm_gpio_chip *mm = &mpc8xxx_gc->mm_gc;
+        unsigned long flags;
+        spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
+        setbits32(mm->regs + GPIO_IMR, mpc8xxx_gpio2mask(irqd_to_hwirq(d)));
+        spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
+}
+static void mpc8xxx_irq_mask(struct irq_data *d)
+{
+        struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_data_get_irq_chip_data(d);
+        struct of_mm_gpio_chip *mm = &mpc8xxx_gc->mm_gc;
+        unsigned long flags;
+        spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
+        clrbits32(mm->regs + GPIO_IMR, mpc8xxx_gpio2mask(irqd_to_hwirq(d)));
+        spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
+}
+static void mpc8xxx_irq_ack(struct irq_data *d)
+{
+        struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_data_get_irq_chip_data(d);
+        struct of_mm_gpio_chip *mm = &mpc8xxx_gc->mm_gc;
+        out_be32(mm->regs + GPIO_IER, mpc8xxx_gpio2mask(irqd_to_hwirq(d)));
+}
+static int mpc8xxx_irq_set_type(struct irq_data *d, unsigned int flow_type)
+{
+        struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_data_get_irq_chip_data(d);
+        struct of_mm_gpio_chip *mm = &mpc8xxx_gc->mm_gc;
+        unsigned long flags;
+        switch (flow_type) {
+        case IRQ_TYPE_EDGE_FALLING:
+                spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
+                setbits32(mm->regs + GPIO_ICR,
+                          mpc8xxx_gpio2mask(irqd_to_hwirq(d)));
+                spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
+                break;
+        case IRQ_TYPE_EDGE_BOTH:
+                spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
+                clrbits32(mm->regs + GPIO_ICR,
+                          mpc8xxx_gpio2mask(irqd_to_hwirq(d)));
+                spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+static int mpc512x_irq_set_type(struct irq_data *d, unsigned int flow_type)
+{
+        struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_data_get_irq_chip_data(d);
+        struct of_mm_gpio_chip *mm = &mpc8xxx_gc->mm_gc;
+        unsigned long gpio = irqd_to_hwirq(d);
+        void __iomem *reg;
+        unsigned int shift;
+        unsigned long flags;
+        if (gpio < 16) {
+                reg = mm->regs + GPIO_ICR;
+                shift = (15 - gpio) * 2;
+        } else {
+                reg = mm->regs + GPIO_ICR2;
+                shift = (15 - (gpio % 16)) * 2;
+        }
+        switch (flow_type) {
+        case IRQ_TYPE_EDGE_FALLING:
+        case IRQ_TYPE_LEVEL_LOW:
+                spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
+                clrsetbits_be32(reg, 3 << shift, 2 << shift);
+                spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
+                break;
+        case IRQ_TYPE_EDGE_RISING:
+        case IRQ_TYPE_LEVEL_HIGH:
+                spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
+                clrsetbits_be32(reg, 3 << shift, 1 << shift);
+                spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
+                break;
+        case IRQ_TYPE_EDGE_BOTH:
+                spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
+                clrbits32(reg, 3 << shift);
+                spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+static struct irq_chip mpc8xxx_irq_chip = {
+        .name           = "mpc8xxx-gpio",
+        .irq_unmask     = mpc8xxx_irq_unmask,
+        .irq_mask       = mpc8xxx_irq_mask,
+        .irq_ack        = mpc8xxx_irq_ack,
+        .irq_set_type   = mpc8xxx_irq_set_type,
+};
+static int mpc8xxx_gpio_irq_map(struct irq_host *h, unsigned int virq,
+                                irq_hw_number_t hw)
+{
+        struct mpc8xxx_gpio_chip *mpc8xxx_gc = h->host_data;
+        if (mpc8xxx_gc->of_dev_id_data)
+                mpc8xxx_irq_chip.irq_set_type = mpc8xxx_gc->of_dev_id_data;
+        irq_set_chip_data(virq, h->host_data);
+        irq_set_chip_and_handler(virq, &mpc8xxx_irq_chip, handle_level_irq);
+        irq_set_irq_type(virq, IRQ_TYPE_NONE);
+        return 0;
+}
+static int mpc8xxx_gpio_irq_xlate(struct irq_host *h, struct device_node *ct,
+                                  const u32 *intspec, unsigned int intsize,
+                                  irq_hw_number_t *out_hwirq,
+                                  unsigned int *out_flags)
+{
+        /* interrupt sense values coming from the device tree equal either
+         * EDGE_FALLING or EDGE_BOTH
+         */
+        *out_hwirq = intspec[0];
+        *out_flags = intspec[1];
+        return 0;
+}
+static struct irq_host_ops mpc8xxx_gpio_irq_ops = {
+        .map    = mpc8xxx_gpio_irq_map,
+        .xlate  = mpc8xxx_gpio_irq_xlate,
+};
+static struct of_device_id mpc8xxx_gpio_ids[] __initdata = {
+        { .compatible = "fsl,mpc8349-gpio", },
+        { .compatible = "fsl,mpc8572-gpio", },
+        { .compatible = "fsl,mpc8610-gpio", },
+        { .compatible = "fsl,mpc5121-gpio", .data = mpc512x_irq_set_type, },
+        { .compatible = "fsl,pq3-gpio",     },
+        { .compatible = "fsl,qoriq-gpio",   },
+        {}
+};
+static void __init mpc8xxx_add_controller(struct device_node *np)
+{
+        struct mpc8xxx_gpio_chip *mpc8xxx_gc;
+        struct of_mm_gpio_chip *mm_gc;
+        struct gpio_chip *gc;
+        const struct of_device_id *id;
+        unsigned hwirq;
+        int ret;
+        mpc8xxx_gc = kzalloc(sizeof(*mpc8xxx_gc), GFP_KERNEL);
+        if (!mpc8xxx_gc) {
+                ret = -ENOMEM;
+                goto err;
+        }
+        spin_lock_init(&mpc8xxx_gc->lock);
+        mm_gc = &mpc8xxx_gc->mm_gc;
+        gc = &mm_gc->gc;
+        mm_gc->save_regs = mpc8xxx_gpio_save_regs;
+        gc->ngpio = MPC8XXX_GPIO_PINS;
+        gc->direction_input = mpc8xxx_gpio_dir_in;
+        gc->direction_output = mpc8xxx_gpio_dir_out;
+        if (of_device_is_compatible(np, "fsl,mpc8572-gpio"))
+                gc->get = mpc8572_gpio_get;
+        else
+                gc->get = mpc8xxx_gpio_get;
+        gc->set = mpc8xxx_gpio_set;
+        gc->to_irq = mpc8xxx_gpio_to_irq;
+        ret = of_mm_gpiochip_add(np, mm_gc);
+        if (ret)
+                goto err;
+        hwirq = irq_of_parse_and_map(np, 0);
+        if (hwirq == NO_IRQ)
+                goto skip_irq;
+        mpc8xxx_gc->irq =
+                irq_alloc_host(np, IRQ_HOST_MAP_LINEAR, MPC8XXX_GPIO_PINS,
+                               &mpc8xxx_gpio_irq_ops, MPC8XXX_GPIO_PINS);
+        if (!mpc8xxx_gc->irq)
+                goto skip_irq;
+        id = of_match_node(mpc8xxx_gpio_ids, np);
+        if (id)
+                mpc8xxx_gc->of_dev_id_data = id->data;
+        mpc8xxx_gc->irq->host_data = mpc8xxx_gc;
+        /* ack and mask all irqs */
+        out_be32(mm_gc->regs + GPIO_IER, 0xffffffff);
+        out_be32(mm_gc->regs + GPIO_IMR, 0);
+        irq_set_handler_data(hwirq, mpc8xxx_gc);
+        irq_set_chained_handler(hwirq, mpc8xxx_gpio_irq_cascade);
+skip_irq:
+        return;
+err:
+        pr_err("%s: registration failed with status %d\n",
+               np->full_name, ret);
+        kfree(mpc8xxx_gc);
+        return;
+}
+static int __init mpc8xxx_add_gpiochips(void)
+{
+        struct device_node *np;
+        for_each_matching_node(np, mpc8xxx_gpio_ids)
+                mpc8xxx_add_controller(np);
+        return 0;
+}
+arch_initcall(mpc8xxx_add_gpiochips);
diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
index b81c98992114..e79147634573 100644
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@ -29,6 +29,7 @@
 #include <linux/basic_mmio_gpio.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
+#include <linux/module.h>
 #include <asm-generic/bug.h>
 #include <asm/mach/irq.h>
diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c
index 292b50481db9..385c58e8405b 100644
--- a/drivers/gpio/gpio-mxs.c
+++ b/drivers/gpio/gpio-mxs.c
@@ -28,6 +28,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/basic_mmio_gpio.h>
+#include <linux/module.h>
 #include <mach/mxs.h>
 #define MXS_SET         0x4
diff --git a/drivers/gpio/gpio-pcf857x.c b/drivers/gpio/gpio-pcf857x.c
index 7369fdda92b0..3e1f1ecd07be 100644
--- a/drivers/gpio/gpio-pcf857x.c
+++ b/drivers/gpio/gpio-pcf857x.c
@@ -23,6 +23,7 @@
 #include <linux/gpio.h>
 #include <linux/i2c.h>
 #include <linux/i2c/pcf857x.h>
+#include <linux/module.h>
 static const struct i2c_device_id pcf857x_id[] = {
diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c
index 1e8a4a538810..a6008e123d04 100644
--- a/drivers/gpio/gpio-pch.c
+++ b/drivers/gpio/gpio-pch.c
@@ -14,6 +14,7 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 */
+#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/gpio.h>
diff --git a/drivers/gpio/gpio-plat-samsung.c b/drivers/gpio/gpio-plat-samsung.c
deleted file mode 100644
index ef67f1952a72..000000000000
--- a/drivers/gpio/gpio-plat-samsung.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * Copyright (c) 2009 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * SAMSUNG - GPIOlib support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/kernel.h>
-#include <linux/irq.h>
-#include <linux/io.h>
-#include <linux/gpio.h>
-#include <plat/gpio-core.h>
-#include <plat/gpio-cfg.h>
-#include <plat/gpio-cfg-helpers.h>
-#ifndef DEBUG_GPIO
-#define gpio_dbg(x...) do { } while (0)
-#else
-#define gpio_dbg(x...) printk(KERN_DEBUG x)
-#endif
-/* The samsung_gpiolib_4bit routines are to control the gpio banks where
- * the gpio configuration register (GPxCON) has 4 bits per GPIO, as the
- * following example:
- *
- * base + 0x00: Control register, 4 bits per gpio
- *              gpio n: 4 bits starting at (4*n)
- *              0000 = input, 0001 = output, others mean special-function
- * base + 0x04: Data register, 1 bit per gpio
- *              bit n: data bit n
- *
- * Note, since the data register is one bit per gpio and is at base + 0x4
- * we can use s3c_gpiolib_get and s3c_gpiolib_set to change the state of
- * the output.
-*/
-static int samsung_gpiolib_4bit_input(struct gpio_chip *chip,
-                                      unsigned int offset)
-{
-        struct s3c_gpio_chip *ourchip = to_s3c_gpio(chip);
-        void __iomem *base = ourchip->base;
-        unsigned long con;
-        con = __raw_readl(base + GPIOCON_OFF);
-        con &= ~(0xf << con_4bit_shift(offset));
-        __raw_writel(con, base + GPIOCON_OFF);
-        gpio_dbg("%s: %p: CON now %08lx\n", __func__, base, con);
-        return 0;
-}
-static int samsung_gpiolib_4bit_output(struct gpio_chip *chip,
-                                       unsigned int offset, int value)
-{
-        struct s3c_gpio_chip *ourchip = to_s3c_gpio(chip);
-        void __iomem *base = ourchip->base;
-        unsigned long con;
-        unsigned long dat;
-        con = __raw_readl(base + GPIOCON_OFF);
-        con &= ~(0xf << con_4bit_shift(offset));
-        con |= 0x1 << con_4bit_shift(offset);
-        dat = __raw_readl(base + GPIODAT_OFF);
-        if (value)
-                dat |= 1 << offset;
-        else
-                dat &= ~(1 << offset);
-        __raw_writel(dat, base + GPIODAT_OFF);
-        __raw_writel(con, base + GPIOCON_OFF);
-        __raw_writel(dat, base + GPIODAT_OFF);
-        gpio_dbg("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);
-        return 0;
-}
-/* The next set of routines are for the case where the GPIO configuration
- * registers are 4 bits per GPIO but there is more than one register (the
- * bank has more than 8 GPIOs.
- *
- * This case is the similar to the 4 bit case, but the registers are as
- * follows:
- *
- * base + 0x00: Control register, 4 bits per gpio (lower 8 GPIOs)
- *              gpio n: 4 bits starting at (4*n)
- *              0000 = input, 0001 = output, others mean special-function
- * base + 0x04: Control register, 4 bits per gpio (up to 8 additions GPIOs)
- *              gpio n: 4 bits starting at (4*n)
- *              0000 = input, 0001 = output, others mean special-function
- * base + 0x08: Data register, 1 bit per gpio
- *              bit n: data bit n
- *
- * To allow us to use the s3c_gpiolib_get and s3c_gpiolib_set routines we
- * store the 'base + 0x4' address so that these routines see the data
- * register at ourchip->base + 0x04.
- */
-static int samsung_gpiolib_4bit2_input(struct gpio_chip *chip,
-                                       unsigned int offset)
-{
-        struct s3c_gpio_chip *ourchip = to_s3c_gpio(chip);
-        void __iomem *base = ourchip->base;
-        void __iomem *regcon = base;
-        unsigned long con;
-        if (offset > 7)
-                offset -= 8;
-        else
-                regcon -= 4;
-        con = __raw_readl(regcon);
-        con &= ~(0xf << con_4bit_shift(offset));
-        __raw_writel(con, regcon);
-        gpio_dbg("%s: %p: CON %08lx\n", __func__, base, con);
-        return 0;
-}
-static int samsung_gpiolib_4bit2_output(struct gpio_chip *chip,
-                                        unsigned int offset, int value)
-{
-        struct s3c_gpio_chip *ourchip = to_s3c_gpio(chip);
-        void __iomem *base = ourchip->base;
-        void __iomem *regcon = base;
-        unsigned long con;
-        unsigned long dat;
-        unsigned con_offset = offset;
-        if (con_offset > 7)
-                con_offset -= 8;
-        else
-                regcon -= 4;
-        con = __raw_readl(regcon);
-        con &= ~(0xf << con_4bit_shift(con_offset));
-        con |= 0x1 << con_4bit_shift(con_offset);
-        dat = __raw_readl(base + GPIODAT_OFF);
-        if (value)
-                dat |= 1 << offset;
-        else
-                dat &= ~(1 << offset);
-        __raw_writel(dat, base + GPIODAT_OFF);
-        __raw_writel(con, regcon);
-        __raw_writel(dat, base + GPIODAT_OFF);
-        gpio_dbg("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);
-        return 0;
-}
-void __init samsung_gpiolib_add_4bit(struct s3c_gpio_chip *chip)
-{
-        chip->chip.direction_input = samsung_gpiolib_4bit_input;
-        chip->chip.direction_output = samsung_gpiolib_4bit_output;
-        chip->pm = __gpio_pm(&s3c_gpio_pm_4bit);
-}
-void __init samsung_gpiolib_add_4bit2(struct s3c_gpio_chip *chip)
-{
-        chip->chip.direction_input = samsung_gpiolib_4bit2_input;
-        chip->chip.direction_output = samsung_gpiolib_4bit2_output;
-        chip->pm = __gpio_pm(&s3c_gpio_pm_4bit);
-}
-void __init samsung_gpiolib_add_4bit_chips(struct s3c_gpio_chip *chip,
-                                           int nr_chips)
-{
-        for (; nr_chips > 0; nr_chips--, chip++) {
-                samsung_gpiolib_add_4bit(chip);
-                s3c_gpiolib_add(chip);
-        }
-}
-void __init samsung_gpiolib_add_4bit2_chips(struct s3c_gpio_chip *chip,
-                                            int nr_chips)
-{
-        for (; nr_chips > 0; nr_chips--, chip++) {
-                samsung_gpiolib_add_4bit2(chip);
-                s3c_gpiolib_add(chip);
-        }
-}
-void __init samsung_gpiolib_add_2bit_chips(struct s3c_gpio_chip *chip,
-                                           int nr_chips)
-{
-        for (; nr_chips > 0; nr_chips--, chip++)
-                s3c_gpiolib_add(chip);
-}
diff --git a/drivers/gpio/gpio-s5pc100.c b/drivers/gpio/gpio-s5pc100.c
deleted file mode 100644
index 7f87b0c76e0b..000000000000
--- a/drivers/gpio/gpio-s5pc100.c
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
- * S5PC100 - GPIOlib support
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- *  Copyright 2009 Samsung Electronics Co
- *  Kyungmin Park <kyungmin.park@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.
- */
-#include <linux/kernel.h>
-#include <linux/irq.h>
-#include <linux/io.h>
-#include <linux/gpio.h>
-#include <mach/map.h>
-#include <mach/regs-gpio.h>
-#include <plat/gpio-core.h>
-#include <plat/gpio-cfg.h>
-#include <plat/gpio-cfg-helpers.h>
-/* S5PC100 GPIO bank summary:
- *
- * Bank GPIOs   Style   INT Type
- * A0   8       4Bit    GPIO_INT0
- * A1   5       4Bit    GPIO_INT1
- * B    8       4Bit    GPIO_INT2
- * C    5       4Bit    GPIO_INT3
- * D    7       4Bit    GPIO_INT4
- * E0   8       4Bit    GPIO_INT5
- * E1   6       4Bit    GPIO_INT6
- * F0   8       4Bit    GPIO_INT7
- * F1   8       4Bit    GPIO_INT8
- * F2   8       4Bit    GPIO_INT9
- * F3   4       4Bit    GPIO_INT10
- * G0   8       4Bit    GPIO_INT11
- * G1   3       4Bit    GPIO_INT12
- * G2   7       4Bit    GPIO_INT13
- * G3   7       4Bit    GPIO_INT14
- * H0   8       4Bit    WKUP_INT
- * H1   8       4Bit    WKUP_INT
- * H2   8       4Bit    WKUP_INT
- * H3   8       4Bit    WKUP_INT
- * I    8       4Bit    GPIO_INT15
- * J0   8       4Bit    GPIO_INT16
- * J1   5       4Bit    GPIO_INT17
- * J2   8       4Bit    GPIO_INT18
- * J3   8       4Bit    GPIO_INT19
- * J4   4       4Bit    GPIO_INT20
- * K0   8       4Bit    None
- * K1   6       4Bit    None
- * K2   8       4Bit    None
- * K3   8       4Bit    None
- * L0   8       4Bit    None
- * L1   8       4Bit    None
- * L2   8       4Bit    None
- * L3   8       4Bit    None
- */
-static struct s3c_gpio_cfg gpio_cfg = {
-        .set_config     = s3c_gpio_setcfg_s3c64xx_4bit,
-        .set_pull       = s3c_gpio_setpull_updown,
-        .get_pull       = s3c_gpio_getpull_updown,
-};
-static struct s3c_gpio_cfg gpio_cfg_eint = {
-        .cfg_eint       = 0xf,
-        .set_config     = s3c_gpio_setcfg_s3c64xx_4bit,
-        .set_pull       = s3c_gpio_setpull_updown,
-        .get_pull       = s3c_gpio_getpull_updown,
-};
-static struct s3c_gpio_cfg gpio_cfg_noint = {
-        .set_config     = s3c_gpio_setcfg_s3c64xx_4bit,
-        .set_pull       = s3c_gpio_setpull_updown,
-        .get_pull       = s3c_gpio_getpull_updown,
-};
-/*
- * GPIO bank's base address given the index of the bank in the
- * list of all gpio banks.
- */
-#define S5PC100_BANK_BASE(bank_nr)      (S5P_VA_GPIO + ((bank_nr) * 0x20))
-/*
- * Following are the gpio banks in S5PC100.
- *
- * The 'config' member when left to NULL, is initialized to the default
- * structure gpio_cfg in the init function below.
- *
- * The 'base' member is also initialized in the init function below.
- * Note: The initialization of 'base' member of s3c_gpio_chip structure
- * uses the above macro and depends on the banks being listed in order here.
- */
-static struct s3c_gpio_chip s5pc100_gpio_chips[] = {
-        {
-                .chip   = {
-                        .base   = S5PC100_GPA0(0),
-                        .ngpio  = S5PC100_GPIO_A0_NR,
-                        .label  = "GPA0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPA1(0),
-                        .ngpio  = S5PC100_GPIO_A1_NR,
-                        .label  = "GPA1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPB(0),
-                        .ngpio  = S5PC100_GPIO_B_NR,
-                        .label  = "GPB",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPC(0),
-                        .ngpio  = S5PC100_GPIO_C_NR,
-                        .label  = "GPC",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPD(0),
-                        .ngpio  = S5PC100_GPIO_D_NR,
-                        .label  = "GPD",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPE0(0),
-                        .ngpio  = S5PC100_GPIO_E0_NR,
-                        .label  = "GPE0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPE1(0),
-                        .ngpio  = S5PC100_GPIO_E1_NR,
-                        .label  = "GPE1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPF0(0),
-                        .ngpio  = S5PC100_GPIO_F0_NR,
-                        .label  = "GPF0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPF1(0),
-                        .ngpio  = S5PC100_GPIO_F1_NR,
-                        .label  = "GPF1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPF2(0),
-                        .ngpio  = S5PC100_GPIO_F2_NR,
-                        .label  = "GPF2",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPF3(0),
-                        .ngpio  = S5PC100_GPIO_F3_NR,
-                        .label  = "GPF3",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPG0(0),
-                        .ngpio  = S5PC100_GPIO_G0_NR,
-                        .label  = "GPG0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPG1(0),
-                        .ngpio  = S5PC100_GPIO_G1_NR,
-                        .label  = "GPG1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPG2(0),
-                        .ngpio  = S5PC100_GPIO_G2_NR,
-                        .label  = "GPG2",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPG3(0),
-                        .ngpio  = S5PC100_GPIO_G3_NR,
-                        .label  = "GPG3",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPI(0),
-                        .ngpio  = S5PC100_GPIO_I_NR,
-                        .label  = "GPI",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPJ0(0),
-                        .ngpio  = S5PC100_GPIO_J0_NR,
-                        .label  = "GPJ0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPJ1(0),
-                        .ngpio  = S5PC100_GPIO_J1_NR,
-                        .label  = "GPJ1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPJ2(0),
-                        .ngpio  = S5PC100_GPIO_J2_NR,
-                        .label  = "GPJ2",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPJ3(0),
-                        .ngpio  = S5PC100_GPIO_J3_NR,
-                        .label  = "GPJ3",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPJ4(0),
-                        .ngpio  = S5PC100_GPIO_J4_NR,
-                        .label  = "GPJ4",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PC100_GPK0(0),
-                        .ngpio  = S5PC100_GPIO_K0_NR,
-                        .label  = "GPK0",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PC100_GPK1(0),
-                        .ngpio  = S5PC100_GPIO_K1_NR,
-                        .label  = "GPK1",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PC100_GPK2(0),
-                        .ngpio  = S5PC100_GPIO_K2_NR,
-                        .label  = "GPK2",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PC100_GPK3(0),
-                        .ngpio  = S5PC100_GPIO_K3_NR,
-                        .label  = "GPK3",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PC100_GPL0(0),
-                        .ngpio  = S5PC100_GPIO_L0_NR,
-                        .label  = "GPL0",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PC100_GPL1(0),
-                        .ngpio  = S5PC100_GPIO_L1_NR,
-                        .label  = "GPL1",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PC100_GPL2(0),
-                        .ngpio  = S5PC100_GPIO_L2_NR,
-                        .label  = "GPL2",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PC100_GPL3(0),
-                        .ngpio  = S5PC100_GPIO_L3_NR,
-                        .label  = "GPL3",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PC100_GPL4(0),
-                        .ngpio  = S5PC100_GPIO_L4_NR,
-                        .label  = "GPL4",
-                },
-        }, {
-                .base   = (S5P_VA_GPIO + 0xC00),
-                .config = &gpio_cfg_eint,
-                .irq_base = IRQ_EINT(0),
-                .chip   = {
-                        .base   = S5PC100_GPH0(0),
-                        .ngpio  = S5PC100_GPIO_H0_NR,
-                        .label  = "GPH0",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        }, {
-                .base   = (S5P_VA_GPIO + 0xC20),
-                .config = &gpio_cfg_eint,
-                .irq_base = IRQ_EINT(8),
-                .chip   = {
-                        .base   = S5PC100_GPH1(0),
-                        .ngpio  = S5PC100_GPIO_H1_NR,
-                        .label  = "GPH1",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        }, {
-                .base   = (S5P_VA_GPIO + 0xC40),
-                .config = &gpio_cfg_eint,
-                .irq_base = IRQ_EINT(16),
-                .chip   = {
-                        .base   = S5PC100_GPH2(0),
-                        .ngpio  = S5PC100_GPIO_H2_NR,
-                        .label  = "GPH2",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        }, {
-                .base   = (S5P_VA_GPIO + 0xC60),
-                .config = &gpio_cfg_eint,
-                .irq_base = IRQ_EINT(24),
-                .chip   = {
-                        .base   = S5PC100_GPH3(0),
-                        .ngpio  = S5PC100_GPIO_H3_NR,
-                        .label  = "GPH3",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        },
-};
-static __init int s5pc100_gpiolib_init(void)
-{
-        struct s3c_gpio_chip *chip = s5pc100_gpio_chips;
-        int nr_chips = ARRAY_SIZE(s5pc100_gpio_chips);
-        int gpioint_group = 0;
-        int i;
-        for (i = 0; i < nr_chips; i++, chip++) {
-                if (chip->config == NULL) {
-                        chip->config = &gpio_cfg;
-                        chip->group = gpioint_group++;
-                }
-                if (chip->base == NULL)
-                        chip->base = S5PC100_BANK_BASE(i);
-        }
-        samsung_gpiolib_add_4bit_chips(s5pc100_gpio_chips, nr_chips);
-        s5p_register_gpioint_bank(IRQ_GPIOINT, 0, S5P_GPIOINT_GROUP_MAXNR);
-        return 0;
-}
-core_initcall(s5pc100_gpiolib_init);
diff --git a/drivers/gpio/gpio-s5pv210.c b/drivers/gpio/gpio-s5pv210.c
deleted file mode 100644
index eb12f1602de9..000000000000
--- a/drivers/gpio/gpio-s5pv210.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * S5PV210 - GPIOlib support
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.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.
- */
-#include <linux/kernel.h>
-#include <linux/irq.h>
-#include <linux/io.h>
-#include <linux/gpio.h>
-#include <plat/gpio-core.h>
-#include <plat/gpio-cfg.h>
-#include <plat/gpio-cfg-helpers.h>
-#include <mach/map.h>
-static struct s3c_gpio_cfg gpio_cfg = {
-        .set_config     = s3c_gpio_setcfg_s3c64xx_4bit,
-        .set_pull       = s3c_gpio_setpull_updown,
-        .get_pull       = s3c_gpio_getpull_updown,
-};
-static struct s3c_gpio_cfg gpio_cfg_noint = {
-        .set_config     = s3c_gpio_setcfg_s3c64xx_4bit,
-        .set_pull       = s3c_gpio_setpull_updown,
-        .get_pull       = s3c_gpio_getpull_updown,
-};
-/* GPIO bank's base address given the index of the bank in the
- * list of all gpio banks.
- */
-#define S5PV210_BANK_BASE(bank_nr)      (S5P_VA_GPIO + ((bank_nr) * 0x20))
-/*
- * Following are the gpio banks in v210.
- *
- * The 'config' member when left to NULL, is initialized to the default
- * structure gpio_cfg in the init function below.
- *
- * The 'base' member is also initialized in the init function below.
- * Note: The initialization of 'base' member of s3c_gpio_chip structure
- * uses the above macro and depends on the banks being listed in order here.
- */
-static struct s3c_gpio_chip s5pv210_gpio_4bit[] = {
-        {
-                .chip   = {
-                        .base   = S5PV210_GPA0(0),
-                        .ngpio  = S5PV210_GPIO_A0_NR,
-                        .label  = "GPA0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPA1(0),
-                        .ngpio  = S5PV210_GPIO_A1_NR,
-                        .label  = "GPA1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPB(0),
-                        .ngpio  = S5PV210_GPIO_B_NR,
-                        .label  = "GPB",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPC0(0),
-                        .ngpio  = S5PV210_GPIO_C0_NR,
-                        .label  = "GPC0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPC1(0),
-                        .ngpio  = S5PV210_GPIO_C1_NR,
-                        .label  = "GPC1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPD0(0),
-                        .ngpio  = S5PV210_GPIO_D0_NR,
-                        .label  = "GPD0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPD1(0),
-                        .ngpio  = S5PV210_GPIO_D1_NR,
-                        .label  = "GPD1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPE0(0),
-                        .ngpio  = S5PV210_GPIO_E0_NR,
-                        .label  = "GPE0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPE1(0),
-                        .ngpio  = S5PV210_GPIO_E1_NR,
-                        .label  = "GPE1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPF0(0),
-                        .ngpio  = S5PV210_GPIO_F0_NR,
-                        .label  = "GPF0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPF1(0),
-                        .ngpio  = S5PV210_GPIO_F1_NR,
-                        .label  = "GPF1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPF2(0),
-                        .ngpio  = S5PV210_GPIO_F2_NR,
-                        .label  = "GPF2",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPF3(0),
-                        .ngpio  = S5PV210_GPIO_F3_NR,
-                        .label  = "GPF3",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPG0(0),
-                        .ngpio  = S5PV210_GPIO_G0_NR,
-                        .label  = "GPG0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPG1(0),
-                        .ngpio  = S5PV210_GPIO_G1_NR,
-                        .label  = "GPG1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPG2(0),
-                        .ngpio  = S5PV210_GPIO_G2_NR,
-                        .label  = "GPG2",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPG3(0),
-                        .ngpio  = S5PV210_GPIO_G3_NR,
-                        .label  = "GPG3",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PV210_GPI(0),
-                        .ngpio  = S5PV210_GPIO_I_NR,
-                        .label  = "GPI",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPJ0(0),
-                        .ngpio  = S5PV210_GPIO_J0_NR,
-                        .label  = "GPJ0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPJ1(0),
-                        .ngpio  = S5PV210_GPIO_J1_NR,
-                        .label  = "GPJ1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPJ2(0),
-                        .ngpio  = S5PV210_GPIO_J2_NR,
-                        .label  = "GPJ2",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPJ3(0),
-                        .ngpio  = S5PV210_GPIO_J3_NR,
-                        .label  = "GPJ3",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPJ4(0),
-                        .ngpio  = S5PV210_GPIO_J4_NR,
-                        .label  = "GPJ4",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PV210_MP01(0),
-                        .ngpio  = S5PV210_GPIO_MP01_NR,
-                        .label  = "MP01",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PV210_MP02(0),
-                        .ngpio  = S5PV210_GPIO_MP02_NR,
-                        .label  = "MP02",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PV210_MP03(0),
-                        .ngpio  = S5PV210_GPIO_MP03_NR,
-                        .label  = "MP03",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PV210_MP04(0),
-                        .ngpio  = S5PV210_GPIO_MP04_NR,
-                        .label  = "MP04",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PV210_MP05(0),
-                        .ngpio  = S5PV210_GPIO_MP05_NR,
-                        .label  = "MP05",
-                },
-        }, {
-                .base   = (S5P_VA_GPIO + 0xC00),
-                .config = &gpio_cfg_noint,
-                .irq_base = IRQ_EINT(0),
-                .chip   = {
-                        .base   = S5PV210_GPH0(0),
-                        .ngpio  = S5PV210_GPIO_H0_NR,
-                        .label  = "GPH0",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        }, {
-                .base   = (S5P_VA_GPIO + 0xC20),
-                .config = &gpio_cfg_noint,
-                .irq_base = IRQ_EINT(8),
-                .chip   = {
-                        .base   = S5PV210_GPH1(0),
-                        .ngpio  = S5PV210_GPIO_H1_NR,
-                        .label  = "GPH1",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        }, {
-                .base   = (S5P_VA_GPIO + 0xC40),
-                .config = &gpio_cfg_noint,
-                .irq_base = IRQ_EINT(16),
-                .chip   = {
-                        .base   = S5PV210_GPH2(0),
-                        .ngpio  = S5PV210_GPIO_H2_NR,
-                        .label  = "GPH2",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        }, {
-                .base   = (S5P_VA_GPIO + 0xC60),
-                .config = &gpio_cfg_noint,
-                .irq_base = IRQ_EINT(24),
-                .chip   = {
-                        .base   = S5PV210_GPH3(0),
-                        .ngpio  = S5PV210_GPIO_H3_NR,
-                        .label  = "GPH3",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        },
-};
-static __init int s5pv210_gpiolib_init(void)
-{
-        struct s3c_gpio_chip *chip = s5pv210_gpio_4bit;
-        int nr_chips = ARRAY_SIZE(s5pv210_gpio_4bit);
-        int gpioint_group = 0;
-        int i = 0;
-        for (i = 0; i < nr_chips; i++, chip++) {
-                if (chip->config == NULL) {
-                        chip->config = &gpio_cfg;
-                        chip->group = gpioint_group++;
-                }
-                if (chip->base == NULL)
-                        chip->base = S5PV210_BANK_BASE(i);
-        }
-        samsung_gpiolib_add_4bit_chips(s5pv210_gpio_4bit, nr_chips);
-        s5p_register_gpioint_bank(IRQ_GPIOINT, 0, S5P_GPIOINT_GROUP_MAXNR);
-        return 0;
-}
-core_initcall(s5pv210_gpiolib_init);
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
new file mode 100644
index 000000000000..866251852719
--- /dev/null
+++ b/drivers/gpio/gpio-samsung.c
@@ -0,0 +1,2712 @@
+/*
+ * Copyright (c) 2009-2011 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.com/
+ *
+ * Copyright 2008 Openmoko, Inc.
+ * Copyright 2008 Simtec Electronics
+ *      Ben Dooks <ben@simtec.co.uk>
+ *      http://armlinux.simtec.co.uk/
+ *
+ * SAMSUNG - GPIOlib support
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/kernel.h>
+#include <linux/irq.h>
+#include <linux/io.h>
+#include <linux/gpio.h>
+#include <linux/init.h>
+#include <linux/spinlock.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/sysdev.h>
+#include <linux/ioport.h>
+#include <asm/irq.h>
+#include <mach/hardware.h>
+#include <mach/map.h>
+#include <mach/regs-clock.h>
+#include <mach/regs-gpio.h>
+#include <plat/cpu.h>
+#include <plat/gpio-core.h>
+#include <plat/gpio-cfg.h>
+#include <plat/gpio-cfg-helpers.h>
+#include <plat/gpio-fns.h>
+#include <plat/pm.h>
+#ifndef DEBUG_GPIO
+#define gpio_dbg(x...) do { } while (0)
+#else
+#define gpio_dbg(x...) printk(KERN_DEBUG x)
+#endif
+int samsung_gpio_setpull_updown(struct samsung_gpio_chip *chip,
+                                unsigned int off, samsung_gpio_pull_t pull)
+{
+        void __iomem *reg = chip->base + 0x08;
+        int shift = off * 2;
+        u32 pup;
+        pup = __raw_readl(reg);
+        pup &= ~(3 << shift);
+        pup |= pull << shift;
+        __raw_writel(pup, reg);
+        return 0;
+}
+samsung_gpio_pull_t samsung_gpio_getpull_updown(struct samsung_gpio_chip *chip,
+                                                unsigned int off)
+{
+        void __iomem *reg = chip->base + 0x08;
+        int shift = off * 2;
+        u32 pup = __raw_readl(reg);
+        pup >>= shift;
+        pup &= 0x3;
+        return (__force samsung_gpio_pull_t)pup;
+}
+int s3c2443_gpio_setpull(struct samsung_gpio_chip *chip,
+                         unsigned int off, samsung_gpio_pull_t pull)
+{
+        switch (pull) {
+        case S3C_GPIO_PULL_NONE:
+                pull = 0x01;
+                break;
+        case S3C_GPIO_PULL_UP:
+                pull = 0x00;
+                break;
+        case S3C_GPIO_PULL_DOWN:
+                pull = 0x02;
+                break;
+        }
+        return samsung_gpio_setpull_updown(chip, off, pull);
+}
+samsung_gpio_pull_t s3c2443_gpio_getpull(struct samsung_gpio_chip *chip,
+                                         unsigned int off)
+{
+        samsung_gpio_pull_t pull;
+        pull = samsung_gpio_getpull_updown(chip, off);
+        switch (pull) {
+        case 0x00:
+                pull = S3C_GPIO_PULL_UP;
+                break;
+        case 0x01:
+        case 0x03:
+                pull = S3C_GPIO_PULL_NONE;
+                break;
+        case 0x02:
+                pull = S3C_GPIO_PULL_DOWN;
+                break;
+        }
+        return pull;
+}
+static int s3c24xx_gpio_setpull_1(struct samsung_gpio_chip *chip,
+                                  unsigned int off, samsung_gpio_pull_t pull,
+                                  samsung_gpio_pull_t updown)
+{
+        void __iomem *reg = chip->base + 0x08;
+        u32 pup = __raw_readl(reg);
+        if (pull == updown)
+                pup &= ~(1 << off);
+        else if (pull == S3C_GPIO_PULL_NONE)
+                pup |= (1 << off);
+        else
+                return -EINVAL;
+        __raw_writel(pup, reg);
+        return 0;
+}
+static samsung_gpio_pull_t s3c24xx_gpio_getpull_1(struct samsung_gpio_chip *chip,
+                                                  unsigned int off,
+                                                  samsung_gpio_pull_t updown)
+{
+        void __iomem *reg = chip->base + 0x08;
+        u32 pup = __raw_readl(reg);
+        pup &= (1 << off);
+        return pup ? S3C_GPIO_PULL_NONE : updown;
+}
+samsung_gpio_pull_t s3c24xx_gpio_getpull_1up(struct samsung_gpio_chip *chip,
+                                             unsigned int off)
+{
+        return s3c24xx_gpio_getpull_1(chip, off, S3C_GPIO_PULL_UP);
+}
+int s3c24xx_gpio_setpull_1up(struct samsung_gpio_chip *chip,
+                             unsigned int off, samsung_gpio_pull_t pull)
+{
+        return s3c24xx_gpio_setpull_1(chip, off, pull, S3C_GPIO_PULL_UP);
+}
+samsung_gpio_pull_t s3c24xx_gpio_getpull_1down(struct samsung_gpio_chip *chip,
+                                               unsigned int off)
+{
+        return s3c24xx_gpio_getpull_1(chip, off, S3C_GPIO_PULL_DOWN);
+}
+int s3c24xx_gpio_setpull_1down(struct samsung_gpio_chip *chip,
+                               unsigned int off, samsung_gpio_pull_t pull)
+{
+        return s3c24xx_gpio_setpull_1(chip, off, pull, S3C_GPIO_PULL_DOWN);
+}
+static int exynos4_gpio_setpull(struct samsung_gpio_chip *chip,
+                                unsigned int off, samsung_gpio_pull_t pull)
+{
+        if (pull == S3C_GPIO_PULL_UP)
+                pull = 3;
+        return samsung_gpio_setpull_updown(chip, off, pull);
+}
+static samsung_gpio_pull_t exynos4_gpio_getpull(struct samsung_gpio_chip *chip,
+                                                unsigned int off)
+{
+        samsung_gpio_pull_t pull;
+        pull = samsung_gpio_getpull_updown(chip, off);
+        if (pull == 3)
+                pull = S3C_GPIO_PULL_UP;
+        return pull;
+}
+/*
+ * samsung_gpio_setcfg_2bit - Samsung 2bit style GPIO configuration.
+ * @chip: The gpio chip that is being configured.
+ * @off: The offset for the GPIO being configured.
+ * @cfg: The configuration value to set.
+ *
+ * This helper deal with the GPIO cases where the control register
+ * has two bits of configuration per gpio, which have the following
+ * functions:
+ *      00 = input
+ *      01 = output
+ *      1x = special function
+ */
+static int samsung_gpio_setcfg_2bit(struct samsung_gpio_chip *chip,
+                                    unsigned int off, unsigned int cfg)
+{
+        void __iomem *reg = chip->base;
+        unsigned int shift = off * 2;
+        u32 con;
+        if (samsung_gpio_is_cfg_special(cfg)) {
+                cfg &= 0xf;
+                if (cfg > 3)
+                        return -EINVAL;
+                cfg <<= shift;
+        }
+        con = __raw_readl(reg);
+        con &= ~(0x3 << shift);
+        con |= cfg;
+        __raw_writel(con, reg);
+        return 0;
+}
+/*
+ * samsung_gpio_getcfg_2bit - Samsung 2bit style GPIO configuration read.
+ * @chip: The gpio chip that is being configured.
+ * @off: The offset for the GPIO being configured.
+ *
+ * The reverse of samsung_gpio_setcfg_2bit(). Will return a value whicg
+ * could be directly passed back to samsung_gpio_setcfg_2bit(), from the
+ * S3C_GPIO_SPECIAL() macro.
+ */
+static unsigned int samsung_gpio_getcfg_2bit(struct samsung_gpio_chip *chip,
+                                             unsigned int off)
+{
+        u32 con;
+        con = __raw_readl(chip->base);
+        con >>= off * 2;
+        con &= 3;
+        /* this conversion works for IN and OUT as well as special mode */
+        return S3C_GPIO_SPECIAL(con);
+}
+/*
+ * samsung_gpio_setcfg_4bit - Samsung 4bit single register GPIO config.
+ * @chip: The gpio chip that is being configured.
+ * @off: The offset for the GPIO being configured.
+ * @cfg: The configuration value to set.
+ *
+ * This helper deal with the GPIO cases where the control register has 4 bits
+ * of control per GPIO, generally in the form of:
+ *      0000 = Input
+ *      0001 = Output
+ *      others = Special functions (dependent on bank)
+ *
+ * Note, since the code to deal with the case where there are two control
+ * registers instead of one, we do not have a separate set of functions for
+ * each case.
+ */
+static int samsung_gpio_setcfg_4bit(struct samsung_gpio_chip *chip,
+                                    unsigned int off, unsigned int cfg)
+{
+        void __iomem *reg = chip->base;
+        unsigned int shift = (off & 7) * 4;
+        u32 con;
+        if (off < 8 && chip->chip.ngpio > 8)
+                reg -= 4;
+        if (samsung_gpio_is_cfg_special(cfg)) {
+                cfg &= 0xf;
+                cfg <<= shift;
+        }
+        con = __raw_readl(reg);
+        con &= ~(0xf << shift);
+        con |= cfg;
+        __raw_writel(con, reg);
+        return 0;
+}
+/*
+ * samsung_gpio_getcfg_4bit - Samsung 4bit single register GPIO config read.
+ * @chip: The gpio chip that is being configured.
+ * @off: The offset for the GPIO being configured.
+ *
+ * The reverse of samsung_gpio_setcfg_4bit(), turning a gpio configuration
+ * register setting into a value the software can use, such as could be passed
+ * to samsung_gpio_setcfg_4bit().
+ *
+ * @sa samsung_gpio_getcfg_2bit
+ */
+static unsigned samsung_gpio_getcfg_4bit(struct samsung_gpio_chip *chip,
+                                         unsigned int off)
+{
+        void __iomem *reg = chip->base;
+        unsigned int shift = (off & 7) * 4;
+        u32 con;
+        if (off < 8 && chip->chip.ngpio > 8)
+                reg -= 4;
+        con = __raw_readl(reg);
+        con >>= shift;
+        con &= 0xf;
+        /* this conversion works for IN and OUT as well as special mode */
+        return S3C_GPIO_SPECIAL(con);
+}
+#ifdef CONFIG_PLAT_S3C24XX
+/*
+ * s3c24xx_gpio_setcfg_abank - S3C24XX style GPIO configuration (Bank A)
+ * @chip: The gpio chip that is being configured.
+ * @off: The offset for the GPIO being configured.
+ * @cfg: The configuration value to set.
+ *
+ * This helper deal with the GPIO cases where the control register
+ * has one bit of configuration for the gpio, where setting the bit
+ * means the pin is in special function mode and unset means output.
+ */
+static int s3c24xx_gpio_setcfg_abank(struct samsung_gpio_chip *chip,
+                                     unsigned int off, unsigned int cfg)
+{
+        void __iomem *reg = chip->base;
+        unsigned int shift = off;
+        u32 con;
+        if (samsung_gpio_is_cfg_special(cfg)) {
+                cfg &= 0xf;
+                /* Map output to 0, and SFN2 to 1 */
+                cfg -= 1;
+                if (cfg > 1)
+                        return -EINVAL;
+                cfg <<= shift;
+        }
+        con = __raw_readl(reg);
+        con &= ~(0x1 << shift);
+        con |= cfg;
+        __raw_writel(con, reg);
+        return 0;
+}
+/*
+ * s3c24xx_gpio_getcfg_abank - S3C24XX style GPIO configuration read (Bank A)
+ * @chip: The gpio chip that is being configured.
+ * @off: The offset for the GPIO being configured.
+ *
+ * The reverse of s3c24xx_gpio_setcfg_abank() turning an GPIO into a usable
+ * GPIO configuration value.
+ *
+ * @sa samsung_gpio_getcfg_2bit
+ * @sa samsung_gpio_getcfg_4bit
+ */
+static unsigned s3c24xx_gpio_getcfg_abank(struct samsung_gpio_chip *chip,
+                                          unsigned int off)
+{
+        u32 con;
+        con = __raw_readl(chip->base);
+        con >>= off;
+        con &= 1;
+        con++;
+        return S3C_GPIO_SFN(con);
+}
+#endif
+#if defined(CONFIG_CPU_S5P6440) || defined(CONFIG_CPU_S5P6450)
+static int s5p64x0_gpio_setcfg_rbank(struct samsung_gpio_chip *chip,
+                                     unsigned int off, unsigned int cfg)
+{
+        void __iomem *reg = chip->base;
+        unsigned int shift;
+        u32 con;
+        switch (off) {
+        case 0:
+        case 1:
+        case 2:
+        case 3:
+        case 4:
+        case 5:
+                shift = (off & 7) * 4;
+                reg -= 4;
+                break;
+        case 6:
+                shift = ((off + 1) & 7) * 4;
+                reg -= 4;
+        default:
+                shift = ((off + 1) & 7) * 4;
+                break;
+        }
+        if (samsung_gpio_is_cfg_special(cfg)) {
+                cfg &= 0xf;
+                cfg <<= shift;
+        }
+        con = __raw_readl(reg);
+        con &= ~(0xf << shift);
+        con |= cfg;
+        __raw_writel(con, reg);
+        return 0;
+}
+#endif
+static void __init samsung_gpiolib_set_cfg(struct samsung_gpio_cfg *chipcfg,
+                                           int nr_chips)
+{
+        for (; nr_chips > 0; nr_chips--, chipcfg++) {
+                if (!chipcfg->set_config)
+                        chipcfg->set_config = samsung_gpio_setcfg_4bit;
+                if (!chipcfg->get_config)
+                        chipcfg->get_config = samsung_gpio_getcfg_4bit;
+                if (!chipcfg->set_pull)
+                        chipcfg->set_pull = samsung_gpio_setpull_updown;
+                if (!chipcfg->get_pull)
+                        chipcfg->get_pull = samsung_gpio_getpull_updown;
+        }
+}
+struct samsung_gpio_cfg s3c24xx_gpiocfg_default = {
+        .set_config     = samsung_gpio_setcfg_2bit,
+        .get_config     = samsung_gpio_getcfg_2bit,
+};
+#ifdef CONFIG_PLAT_S3C24XX
+static struct samsung_gpio_cfg s3c24xx_gpiocfg_banka = {
+        .set_config     = s3c24xx_gpio_setcfg_abank,
+        .get_config     = s3c24xx_gpio_getcfg_abank,
+};
+#endif
+static struct samsung_gpio_cfg exynos4_gpio_cfg = {
+        .set_pull       = exynos4_gpio_setpull,
+        .get_pull       = exynos4_gpio_getpull,
+        .set_config     = samsung_gpio_setcfg_4bit,
+        .get_config     = samsung_gpio_getcfg_4bit,
+};
+#if defined(CONFIG_CPU_S5P6440) || defined(CONFIG_CPU_S5P6450)
+static struct samsung_gpio_cfg s5p64x0_gpio_cfg_rbank = {
+        .cfg_eint       = 0x3,
+        .set_config     = s5p64x0_gpio_setcfg_rbank,
+        .get_config     = samsung_gpio_getcfg_4bit,
+        .set_pull       = samsung_gpio_setpull_updown,
+        .get_pull       = samsung_gpio_getpull_updown,
+};
+#endif
+static struct samsung_gpio_cfg samsung_gpio_cfgs[] = {
+        {
+                .cfg_eint       = 0x0,
+        }, {
+                .cfg_eint       = 0x3,
+        }, {
+                .cfg_eint       = 0x7,
+        }, {
+                .cfg_eint       = 0xF,
+        }, {
+                .cfg_eint       = 0x0,
+                .set_config     = samsung_gpio_setcfg_2bit,
+                .get_config     = samsung_gpio_getcfg_2bit,
+        }, {
+                .cfg_eint       = 0x2,
+                .set_config     = samsung_gpio_setcfg_2bit,
+                .get_config     = samsung_gpio_getcfg_2bit,
+        }, {
+                .cfg_eint       = 0x3,
+                .set_config     = samsung_gpio_setcfg_2bit,
+                .get_config     = samsung_gpio_getcfg_2bit,
+        }, {
+                .set_config     = samsung_gpio_setcfg_2bit,
+                .get_config     = samsung_gpio_getcfg_2bit,
+        }, {
+                .set_pull       = exynos4_gpio_setpull,
+                .get_pull       = exynos4_gpio_getpull,
+        }, {
+                .cfg_eint       = 0x3,
+                .set_pull       = exynos4_gpio_setpull,
+                .get_pull       = exynos4_gpio_getpull,
+        }
+};
+/*
+ * Default routines for controlling GPIO, based on the original S3C24XX
+ * GPIO functions which deal with the case where each gpio bank of the
+ * chip is as following:
+ *
+ * base + 0x00: Control register, 2 bits per gpio
+ *              gpio n: 2 bits starting at (2*n)
+ *              00 = input, 01 = output, others mean special-function
+ * base + 0x04: Data register, 1 bit per gpio
+ *              bit n: data bit n
+*/
+static int samsung_gpiolib_2bit_input(struct gpio_chip *chip, unsigned offset)
+{
+        struct samsung_gpio_chip *ourchip = to_samsung_gpio(chip);
+        void __iomem *base = ourchip->base;
+        unsigned long flags;
+        unsigned long con;
+        samsung_gpio_lock(ourchip, flags);
+        con = __raw_readl(base + 0x00);
+        con &= ~(3 << (offset * 2));
+        __raw_writel(con, base + 0x00);
+        samsung_gpio_unlock(ourchip, flags);
+        return 0;
+}
+static int samsung_gpiolib_2bit_output(struct gpio_chip *chip,
+                                       unsigned offset, int value)
+{
+        struct samsung_gpio_chip *ourchip = to_samsung_gpio(chip);
+        void __iomem *base = ourchip->base;
+        unsigned long flags;
+        unsigned long dat;
+        unsigned long con;
+        samsung_gpio_lock(ourchip, flags);
+        dat = __raw_readl(base + 0x04);
+        dat &= ~(1 << offset);
+        if (value)
+                dat |= 1 << offset;
+        __raw_writel(dat, base + 0x04);
+        con = __raw_readl(base + 0x00);
+        con &= ~(3 << (offset * 2));
+        con |= 1 << (offset * 2);
+        __raw_writel(con, base + 0x00);
+        __raw_writel(dat, base + 0x04);
+        samsung_gpio_unlock(ourchip, flags);
+        return 0;
+}
+/*
+ * The samsung_gpiolib_4bit routines are to control the gpio banks where
+ * the gpio configuration register (GPxCON) has 4 bits per GPIO, as the
+ * following example:
+ *
+ * base + 0x00: Control register, 4 bits per gpio
+ *              gpio n: 4 bits starting at (4*n)
+ *              0000 = input, 0001 = output, others mean special-function
+ * base + 0x04: Data register, 1 bit per gpio
+ *              bit n: data bit n
+ *
+ * Note, since the data register is one bit per gpio and is at base + 0x4
+ * we can use samsung_gpiolib_get and samsung_gpiolib_set to change the
+ * state of the output.
+ */
+static int samsung_gpiolib_4bit_input(struct gpio_chip *chip,
+                                      unsigned int offset)
+{
+        struct samsung_gpio_chip *ourchip = to_samsung_gpio(chip);
+        void __iomem *base = ourchip->base;
+        unsigned long con;
+        con = __raw_readl(base + GPIOCON_OFF);
+        con &= ~(0xf << con_4bit_shift(offset));
+        __raw_writel(con, base + GPIOCON_OFF);
+        gpio_dbg("%s: %p: CON now %08lx\n", __func__, base, con);
+        return 0;
+}
+static int samsung_gpiolib_4bit_output(struct gpio_chip *chip,
+                                       unsigned int offset, int value)
+{
+        struct samsung_gpio_chip *ourchip = to_samsung_gpio(chip);
+        void __iomem *base = ourchip->base;
+        unsigned long con;
+        unsigned long dat;
+        con = __raw_readl(base + GPIOCON_OFF);
+        con &= ~(0xf << con_4bit_shift(offset));
+        con |= 0x1 << con_4bit_shift(offset);
+        dat = __raw_readl(base + GPIODAT_OFF);
+        if (value)
+                dat |= 1 << offset;
+        else
+                dat &= ~(1 << offset);
+        __raw_writel(dat, base + GPIODAT_OFF);
+        __raw_writel(con, base + GPIOCON_OFF);
+        __raw_writel(dat, base + GPIODAT_OFF);
+        gpio_dbg("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);
+        return 0;
+}
+/*
+ * The next set of routines are for the case where the GPIO configuration
+ * registers are 4 bits per GPIO but there is more than one register (the
+ * bank has more than 8 GPIOs.
+ *
+ * This case is the similar to the 4 bit case, but the registers are as
+ * follows:
+ *
+ * base + 0x00: Control register, 4 bits per gpio (lower 8 GPIOs)
+ *              gpio n: 4 bits starting at (4*n)
+ *              0000 = input, 0001 = output, others mean special-function
+ * base + 0x04: Control register, 4 bits per gpio (up to 8 additions GPIOs)
+ *              gpio n: 4 bits starting at (4*n)
+ *              0000 = input, 0001 = output, others mean special-function
+ * base + 0x08: Data register, 1 bit per gpio
+ *              bit n: data bit n
+ *
+ * To allow us to use the samsung_gpiolib_get and samsung_gpiolib_set
+ * routines we store the 'base + 0x4' address so that these routines see
+ * the data register at ourchip->base + 0x04.
+ */
+static int samsung_gpiolib_4bit2_input(struct gpio_chip *chip,
+                                       unsigned int offset)
+{
+        struct samsung_gpio_chip *ourchip = to_samsung_gpio(chip);
+        void __iomem *base = ourchip->base;
+        void __iomem *regcon = base;
+        unsigned long con;
+        if (offset > 7)
+                offset -= 8;
+        else
+                regcon -= 4;
+        con = __raw_readl(regcon);
+        con &= ~(0xf << con_4bit_shift(offset));
+        __raw_writel(con, regcon);
+        gpio_dbg("%s: %p: CON %08lx\n", __func__, base, con);
+        return 0;
+}
+static int samsung_gpiolib_4bit2_output(struct gpio_chip *chip,
+                                        unsigned int offset, int value)
+{
+        struct samsung_gpio_chip *ourchip = to_samsung_gpio(chip);
+        void __iomem *base = ourchip->base;
+        void __iomem *regcon = base;
+        unsigned long con;
+        unsigned long dat;
+        unsigned con_offset = offset;
+        if (con_offset > 7)
+                con_offset -= 8;
+        else
+                regcon -= 4;
+        con = __raw_readl(regcon);
+        con &= ~(0xf << con_4bit_shift(con_offset));
+        con |= 0x1 << con_4bit_shift(con_offset);
+        dat = __raw_readl(base + GPIODAT_OFF);
+        if (value)
+                dat |= 1 << offset;
+        else
+                dat &= ~(1 << offset);
+        __raw_writel(dat, base + GPIODAT_OFF);
+        __raw_writel(con, regcon);
+        __raw_writel(dat, base + GPIODAT_OFF);
+        gpio_dbg("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);
+        return 0;
+}
+#ifdef CONFIG_PLAT_S3C24XX
+/* The next set of routines are for the case of s3c24xx bank a */
+static int s3c24xx_gpiolib_banka_input(struct gpio_chip *chip, unsigned offset)
+{
+        return -EINVAL;
+}
+static int s3c24xx_gpiolib_banka_output(struct gpio_chip *chip,
+                                        unsigned offset, int value)
+{
+        struct samsung_gpio_chip *ourchip = to_samsung_gpio(chip);
+        void __iomem *base = ourchip->base;
+        unsigned long flags;
+        unsigned long dat;
+        unsigned long con;
+        local_irq_save(flags);
+        con = __raw_readl(base + 0x00);
+        dat = __raw_readl(base + 0x04);
+        dat &= ~(1 << offset);
+        if (value)
+                dat |= 1 << offset;
+        __raw_writel(dat, base + 0x04);
+        con &= ~(1 << offset);
+        __raw_writel(con, base + 0x00);
+        __raw_writel(dat, base + 0x04);
+        local_irq_restore(flags);
+        return 0;
+}
+#endif
+/* The next set of routines are for the case of s5p64x0 bank r */
+static int s5p64x0_gpiolib_rbank_input(struct gpio_chip *chip,
+                                       unsigned int offset)
+{
+        struct samsung_gpio_chip *ourchip = to_samsung_gpio(chip);
+        void __iomem *base = ourchip->base;
+        void __iomem *regcon = base;
+        unsigned long con;
+        unsigned long flags;
+        switch (offset) {
+        case 6:
+                offset += 1;
+        case 0:
+        case 1:
+        case 2:
+        case 3:
+        case 4:
+        case 5:
+                regcon -= 4;
+                break;
+        default:
+                offset -= 7;
+                break;
+        }
+        samsung_gpio_lock(ourchip, flags);
+        con = __raw_readl(regcon);
+        con &= ~(0xf << con_4bit_shift(offset));
+        __raw_writel(con, regcon);
+        samsung_gpio_unlock(ourchip, flags);
+        return 0;
+}
+static int s5p64x0_gpiolib_rbank_output(struct gpio_chip *chip,
+                                        unsigned int offset, int value)
+{
+        struct samsung_gpio_chip *ourchip = to_samsung_gpio(chip);
+        void __iomem *base = ourchip->base;
+        void __iomem *regcon = base;
+        unsigned long con;
+        unsigned long dat;
+        unsigned long flags;
+        unsigned con_offset  = offset;
+        switch (con_offset) {
+        case 6:
+                con_offset += 1;
+        case 0:
+        case 1:
+        case 2:
+        case 3:
+        case 4:
+        case 5:
+                regcon -= 4;
+                break;
+        default:
+                con_offset -= 7;
+                break;
+        }
+        samsung_gpio_lock(ourchip, flags);
+        con = __raw_readl(regcon);
+        con &= ~(0xf << con_4bit_shift(con_offset));
+        con |= 0x1 << con_4bit_shift(con_offset);
+        dat = __raw_readl(base + GPIODAT_OFF);
+        if (value)
+                dat |= 1 << offset;
+        else
+                dat &= ~(1 << offset);
+        __raw_writel(con, regcon);
+        __raw_writel(dat, base + GPIODAT_OFF);
+        samsung_gpio_unlock(ourchip, flags);
+        return 0;
+}
+static void samsung_gpiolib_set(struct gpio_chip *chip,
+                                unsigned offset, int value)
+{
+        struct samsung_gpio_chip *ourchip = to_samsung_gpio(chip);
+        void __iomem *base = ourchip->base;
+        unsigned long flags;
+        unsigned long dat;
+        samsung_gpio_lock(ourchip, flags);
+        dat = __raw_readl(base + 0x04);
+        dat &= ~(1 << offset);
+        if (value)
+                dat |= 1 << offset;
+        __raw_writel(dat, base + 0x04);
+        samsung_gpio_unlock(ourchip, flags);
+}
+static int samsung_gpiolib_get(struct gpio_chip *chip, unsigned offset)
+{
+        struct samsung_gpio_chip *ourchip = to_samsung_gpio(chip);
+        unsigned long val;
+        val = __raw_readl(ourchip->base + 0x04);
+        val >>= offset;
+        val &= 1;
+        return val;
+}
+/*
+ * CONFIG_S3C_GPIO_TRACK enables the tracking of the s3c specific gpios
+ * for use with the configuration calls, and other parts of the s3c gpiolib
+ * support code.
+ *
+ * Not all s3c support code will need this, as some configurations of cpu
+ * may only support one or two different configuration options and have an
+ * easy gpio to samsung_gpio_chip mapping function. If this is the case, then
+ * the machine support file should provide its own samsung_gpiolib_getchip()
+ * and any other necessary functions.
+ */
+#ifdef CONFIG_S3C_GPIO_TRACK
+struct samsung_gpio_chip *s3c_gpios[S3C_GPIO_END];
+static __init void s3c_gpiolib_track(struct samsung_gpio_chip *chip)
+{
+        unsigned int gpn;
+        int i;
+        gpn = chip->chip.base;
+        for (i = 0; i < chip->chip.ngpio; i++, gpn++) {
+                BUG_ON(gpn >= ARRAY_SIZE(s3c_gpios));
+                s3c_gpios[gpn] = chip;
+        }
+}
+#endif /* CONFIG_S3C_GPIO_TRACK */
+/*
+ * samsung_gpiolib_add() - add the Samsung gpio_chip.
+ * @chip: The chip to register
+ *
+ * This is a wrapper to gpiochip_add() that takes our specific gpio chip
+ * information and makes the necessary alterations for the platform and
+ * notes the information for use with the configuration systems and any
+ * other parts of the system.
+ */
+static void __init samsung_gpiolib_add(struct samsung_gpio_chip *chip)
+{
+        struct gpio_chip *gc = &chip->chip;
+        int ret;
+        BUG_ON(!chip->base);
+        BUG_ON(!gc->label);
+        BUG_ON(!gc->ngpio);
+        spin_lock_init(&chip->lock);
+        if (!gc->direction_input)
+                gc->direction_input = samsung_gpiolib_2bit_input;
+        if (!gc->direction_output)
+                gc->direction_output = samsung_gpiolib_2bit_output;
+        if (!gc->set)
+                gc->set = samsung_gpiolib_set;
+        if (!gc->get)
+                gc->get = samsung_gpiolib_get;
+#ifdef CONFIG_PM
+        if (chip->pm != NULL) {
+                if (!chip->pm->save || !chip->pm->resume)
+                        printk(KERN_ERR "gpio: %s has missing PM functions\n",
+                               gc->label);
+        } else
+                printk(KERN_ERR "gpio: %s has no PM function\n", gc->label);
+#endif
+        /* gpiochip_add() prints own failure message on error. */
+        ret = gpiochip_add(gc);
+        if (ret >= 0)
+                s3c_gpiolib_track(chip);
+}
+static void __init s3c24xx_gpiolib_add_chips(struct samsung_gpio_chip *chip,
+                                             int nr_chips, void __iomem *base)
+{
+        int i;
+        struct gpio_chip *gc = &chip->chip;
+        for (i = 0 ; i < nr_chips; i++, chip++) {
+                /* skip banks not present on SoC */
+                if (chip->chip.base >= S3C_GPIO_END)
+                        continue;
+                if (!chip->config)
+                        chip->config = &s3c24xx_gpiocfg_default;
+                if (!chip->pm)
+                        chip->pm = __gpio_pm(&samsung_gpio_pm_2bit);
+                if ((base != NULL) && (chip->base == NULL))
+                        chip->base = base + ((i) * 0x10);
+                if (!gc->direction_input)
+                        gc->direction_input = samsung_gpiolib_2bit_input;
+                if (!gc->direction_output)
+                        gc->direction_output = samsung_gpiolib_2bit_output;
+                samsung_gpiolib_add(chip);
+        }
+}
+static void __init samsung_gpiolib_add_2bit_chips(struct samsung_gpio_chip *chip,
+                                                  int nr_chips, void __iomem *base,
+                                                  unsigned int offset)
+{
+        int i;
+        for (i = 0 ; i < nr_chips; i++, chip++) {
+                chip->chip.direction_input = samsung_gpiolib_2bit_input;
+                chip->chip.direction_output = samsung_gpiolib_2bit_output;
+                if (!chip->config)
+                        chip->config = &samsung_gpio_cfgs[7];
+                if (!chip->pm)
+                        chip->pm = __gpio_pm(&samsung_gpio_pm_2bit);
+                if ((base != NULL) && (chip->base == NULL))
+                        chip->base = base + ((i) * offset);
+                samsung_gpiolib_add(chip);
+        }
+}
+/*
+ * samsung_gpiolib_add_4bit_chips - 4bit single register GPIO config.
+ * @chip: The gpio chip that is being configured.
+ * @nr_chips: The no of chips (gpio ports) for the GPIO being configured.
+ *
+ * This helper deal with the GPIO cases where the control register has 4 bits
+ * of control per GPIO, generally in the form of:
+ * 0000 = Input
+ * 0001 = Output
+ * others = Special functions (dependent on bank)
+ *
+ * Note, since the code to deal with the case where there are two control
+ * registers instead of one, we do not have a separate set of function
+ * (samsung_gpiolib_add_4bit2_chips)for each case.
+ */
+static void __init samsung_gpiolib_add_4bit_chips(struct samsung_gpio_chip *chip,
+                                                  int nr_chips, void __iomem *base)
+{
+        int i;
+        for (i = 0 ; i < nr_chips; i++, chip++) {
+                chip->chip.direction_input = samsung_gpiolib_4bit_input;
+                chip->chip.direction_output = samsung_gpiolib_4bit_output;
+                if (!chip->config)
+                        chip->config = &samsung_gpio_cfgs[2];
+                if (!chip->pm)
+                        chip->pm = __gpio_pm(&samsung_gpio_pm_4bit);
+                if ((base != NULL) && (chip->base == NULL))
+                        chip->base = base + ((i) * 0x20);
+                samsung_gpiolib_add(chip);
+        }
+}
+static void __init samsung_gpiolib_add_4bit2_chips(struct samsung_gpio_chip *chip,
+                                                   int nr_chips)
+{
+        for (; nr_chips > 0; nr_chips--, chip++) {
+                chip->chip.direction_input = samsung_gpiolib_4bit2_input;
+                chip->chip.direction_output = samsung_gpiolib_4bit2_output;
+                if (!chip->config)
+                        chip->config = &samsung_gpio_cfgs[2];
+                if (!chip->pm)
+                        chip->pm = __gpio_pm(&samsung_gpio_pm_4bit);
+                samsung_gpiolib_add(chip);
+        }
+}
+static void __init s5p64x0_gpiolib_add_rbank(struct samsung_gpio_chip *chip,
+                                             int nr_chips)
+{
+        for (; nr_chips > 0; nr_chips--, chip++) {
+                chip->chip.direction_input = s5p64x0_gpiolib_rbank_input;
+                chip->chip.direction_output = s5p64x0_gpiolib_rbank_output;
+                if (!chip->pm)
+                        chip->pm = __gpio_pm(&samsung_gpio_pm_4bit);
+                samsung_gpiolib_add(chip);
+        }
+}
+int samsung_gpiolib_to_irq(struct gpio_chip *chip, unsigned int offset)
+{
+        struct samsung_gpio_chip *samsung_chip = container_of(chip, struct samsung_gpio_chip, chip);
+        return samsung_chip->irq_base + offset;
+}
+#ifdef CONFIG_PLAT_S3C24XX
+static int s3c24xx_gpiolib_fbank_to_irq(struct gpio_chip *chip, unsigned offset)
+{
+        if (offset < 4)
+                return IRQ_EINT0 + offset;
+        if (offset < 8)
+                return IRQ_EINT4 + offset - 4;
+        return -EINVAL;
+}
+#endif
+#ifdef CONFIG_PLAT_S3C64XX
+static int s3c64xx_gpiolib_mbank_to_irq(struct gpio_chip *chip, unsigned pin)
+{
+        return pin < 5 ? IRQ_EINT(23) + pin : -ENXIO;
+}
+static int s3c64xx_gpiolib_lbank_to_irq(struct gpio_chip *chip, unsigned pin)
+{
+        return pin >= 8 ? IRQ_EINT(16) + pin - 8 : -ENXIO;
+}
+#endif
+struct samsung_gpio_chip s3c24xx_gpios[] = {
+#ifdef CONFIG_PLAT_S3C24XX
+        {
+                .config = &s3c24xx_gpiocfg_banka,
+                .chip   = {
+                        .base                   = S3C2410_GPA(0),
+                        .owner                  = THIS_MODULE,
+                        .label                  = "GPIOA",
+                        .ngpio                  = 24,
+                        .direction_input        = s3c24xx_gpiolib_banka_input,
+                        .direction_output       = s3c24xx_gpiolib_banka_output,
+                },
+        }, {
+                .chip   = {
+                        .base   = S3C2410_GPB(0),
+                        .owner  = THIS_MODULE,
+                        .label  = "GPIOB",
+                        .ngpio  = 16,
+                },
+        }, {
+                .chip   = {
+                        .base   = S3C2410_GPC(0),
+                        .owner  = THIS_MODULE,
+                        .label  = "GPIOC",
+                        .ngpio  = 16,
+                },
+        }, {
+                .chip   = {
+                        .base   = S3C2410_GPD(0),
+                        .owner  = THIS_MODULE,
+                        .label  = "GPIOD",
+                        .ngpio  = 16,
+                },
+        }, {
+                .chip   = {
+                        .base   = S3C2410_GPE(0),
+                        .label  = "GPIOE",
+                        .owner  = THIS_MODULE,
+                        .ngpio  = 16,
+                },
+        }, {
+                .chip   = {
+                        .base   = S3C2410_GPF(0),
+                        .owner  = THIS_MODULE,
+                        .label  = "GPIOF",
+                        .ngpio  = 8,
+                        .to_irq = s3c24xx_gpiolib_fbank_to_irq,
+                },
+        }, {
+                .irq_base = IRQ_EINT8,
+                .chip   = {
+                        .base   = S3C2410_GPG(0),
+                        .owner  = THIS_MODULE,
+                        .label  = "GPIOG",
+                        .ngpio  = 16,
+                        .to_irq = samsung_gpiolib_to_irq,
+                },
+        }, {
+                .chip   = {
+                        .base   = S3C2410_GPH(0),
+                        .owner  = THIS_MODULE,
+                        .label  = "GPIOH",
+                        .ngpio  = 11,
+                },
+        },
+                /* GPIOS for the S3C2443 and later devices. */
+        {
+                .base   = S3C2440_GPJCON,
+                .chip   = {
+                        .base   = S3C2410_GPJ(0),
+                        .owner  = THIS_MODULE,
+                        .label  = "GPIOJ",
+                        .ngpio  = 16,
+                },
+        }, {
+                .base   = S3C2443_GPKCON,
+                .chip   = {
+                        .base   = S3C2410_GPK(0),
+                        .owner  = THIS_MODULE,
+                        .label  = "GPIOK",
+                        .ngpio  = 16,
+                },
+        }, {
+                .base   = S3C2443_GPLCON,
+                .chip   = {
+                        .base   = S3C2410_GPL(0),
+                        .owner  = THIS_MODULE,
+                        .label  = "GPIOL",
+                        .ngpio  = 15,
+                },
+        }, {
+                .base   = S3C2443_GPMCON,
+                .chip   = {
+                        .base   = S3C2410_GPM(0),
+                        .owner  = THIS_MODULE,
+                        .label  = "GPIOM",
+                        .ngpio  = 2,
+                },
+        },
+#endif
+};
+/*
+ * GPIO bank summary:
+ *
+ * Bank GPIOs   Style   SlpCon  ExtInt Group
+ * A    8       4Bit    Yes     1
+ * B    7       4Bit    Yes     1
+ * C    8       4Bit    Yes     2
+ * D    5       4Bit    Yes     3
+ * E    5       4Bit    Yes     None
+ * F    16      2Bit    Yes     4 [1]
+ * G    7       4Bit    Yes     5
+ * H    10      4Bit[2] Yes     6
+ * I    16      2Bit    Yes     None
+ * J    12      2Bit    Yes     None
+ * K    16      4Bit[2] No      None
+ * L    15      4Bit[2] No      None
+ * M    6       4Bit    No      IRQ_EINT
+ * N    16      2Bit    No      IRQ_EINT
+ * O    16      2Bit    Yes     7
+ * P    15      2Bit    Yes     8
+ * Q    9       2Bit    Yes     9
+ *
+ * [1] BANKF pins 14,15 do not form part of the external interrupt sources
+ * [2] BANK has two control registers, GPxCON0 and GPxCON1
+ */
+static struct samsung_gpio_chip s3c64xx_gpios_4bit[] = {
+#ifdef CONFIG_PLAT_S3C64XX
+        {
+                .chip   = {
+                        .base   = S3C64XX_GPA(0),
+                        .ngpio  = S3C64XX_GPIO_A_NR,
+                        .label  = "GPA",
+                },
+        }, {
+                .chip   = {
+                        .base   = S3C64XX_GPB(0),
+                        .ngpio  = S3C64XX_GPIO_B_NR,
+                        .label  = "GPB",
+                },
+        }, {
+                .chip   = {
+                        .base   = S3C64XX_GPC(0),
+                        .ngpio  = S3C64XX_GPIO_C_NR,
+                        .label  = "GPC",
+                },
+        }, {
+                .chip   = {
+                        .base   = S3C64XX_GPD(0),
+                        .ngpio  = S3C64XX_GPIO_D_NR,
+                        .label  = "GPD",
+                },
+        }, {
+                .config = &samsung_gpio_cfgs[0],
+                .chip   = {
+                        .base   = S3C64XX_GPE(0),
+                        .ngpio  = S3C64XX_GPIO_E_NR,
+                        .label  = "GPE",
+                },
+        }, {
+                .base   = S3C64XX_GPG_BASE,
+                .chip   = {
+                        .base   = S3C64XX_GPG(0),
+                        .ngpio  = S3C64XX_GPIO_G_NR,
+                        .label  = "GPG",
+                },
+        }, {
+                .base   = S3C64XX_GPM_BASE,
+                .config = &samsung_gpio_cfgs[1],
+                .chip   = {
+                        .base   = S3C64XX_GPM(0),
+                        .ngpio  = S3C64XX_GPIO_M_NR,
+                        .label  = "GPM",
+                        .to_irq = s3c64xx_gpiolib_mbank_to_irq,
+                },
+        },
+#endif
+};
+static struct samsung_gpio_chip s3c64xx_gpios_4bit2[] = {
+#ifdef CONFIG_PLAT_S3C64XX
+        {
+                .base   = S3C64XX_GPH_BASE + 0x4,
+                .chip   = {
+                        .base   = S3C64XX_GPH(0),
+                        .ngpio  = S3C64XX_GPIO_H_NR,
+                        .label  = "GPH",
+                },
+        }, {
+                .base   = S3C64XX_GPK_BASE + 0x4,
+                .config = &samsung_gpio_cfgs[0],
+                .chip   = {
+                        .base   = S3C64XX_GPK(0),
+                        .ngpio  = S3C64XX_GPIO_K_NR,
+                        .label  = "GPK",
+                },
+        }, {
+                .base   = S3C64XX_GPL_BASE + 0x4,
+                .config = &samsung_gpio_cfgs[1],
+                .chip   = {
+                        .base   = S3C64XX_GPL(0),
+                        .ngpio  = S3C64XX_GPIO_L_NR,
+                        .label  = "GPL",
+                        .to_irq = s3c64xx_gpiolib_lbank_to_irq,
+                },
+        },
+#endif
+};
+static struct samsung_gpio_chip s3c64xx_gpios_2bit[] = {
+#ifdef CONFIG_PLAT_S3C64XX
+        {
+                .base   = S3C64XX_GPF_BASE,
+                .config = &samsung_gpio_cfgs[6],
+                .chip   = {
+                        .base   = S3C64XX_GPF(0),
+                        .ngpio  = S3C64XX_GPIO_F_NR,
+                        .label  = "GPF",
+                },
+        }, {
+                .config = &samsung_gpio_cfgs[7],
+                .chip   = {
+                        .base   = S3C64XX_GPI(0),
+                        .ngpio  = S3C64XX_GPIO_I_NR,
+                        .label  = "GPI",
+                },
+        }, {
+                .config = &samsung_gpio_cfgs[7],
+                .chip   = {
+                        .base   = S3C64XX_GPJ(0),
+                        .ngpio  = S3C64XX_GPIO_J_NR,
+                        .label  = "GPJ",
+                },
+        }, {
+                .config = &samsung_gpio_cfgs[6],
+                .chip   = {
+                        .base   = S3C64XX_GPO(0),
+                        .ngpio  = S3C64XX_GPIO_O_NR,
+                        .label  = "GPO",
+                },
+        }, {
+                .config = &samsung_gpio_cfgs[6],
+                .chip   = {
+                        .base   = S3C64XX_GPP(0),
+                        .ngpio  = S3C64XX_GPIO_P_NR,
+                        .label  = "GPP",
+                },
+        }, {
+                .config = &samsung_gpio_cfgs[6],
+                .chip   = {
+                        .base   = S3C64XX_GPQ(0),
+                        .ngpio  = S3C64XX_GPIO_Q_NR,
+                        .label  = "GPQ",
+                },
+        }, {
+                .base   = S3C64XX_GPN_BASE,
+                .irq_base = IRQ_EINT(0),
+                .config = &samsung_gpio_cfgs[5],
+                .chip   = {
+                        .base   = S3C64XX_GPN(0),
+                        .ngpio  = S3C64XX_GPIO_N_NR,
+                        .label  = "GPN",
+                        .to_irq = samsung_gpiolib_to_irq,
+                },
+        },
+#endif
+};
+/*
+ * S5P6440 GPIO bank summary:
+ *
+ * Bank GPIOs   Style   SlpCon  ExtInt Group
+ * A    6       4Bit    Yes     1
+ * B    7       4Bit    Yes     1
+ * C    8       4Bit    Yes     2
+ * F    2       2Bit    Yes     4 [1]
+ * G    7       4Bit    Yes     5
+ * H    10      4Bit[2] Yes     6
+ * I    16      2Bit    Yes     None
+ * J    12      2Bit    Yes     None
+ * N    16      2Bit    No      IRQ_EINT
+ * P    8       2Bit    Yes     8
+ * R    15      4Bit[2] Yes     8
+ */
+static struct samsung_gpio_chip s5p6440_gpios_4bit[] = {
+#ifdef CONFIG_CPU_S5P6440
+        {
+                .chip   = {
+                        .base   = S5P6440_GPA(0),
+                        .ngpio  = S5P6440_GPIO_A_NR,
+                        .label  = "GPA",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5P6440_GPB(0),
+                        .ngpio  = S5P6440_GPIO_B_NR,
+                        .label  = "GPB",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5P6440_GPC(0),
+                        .ngpio  = S5P6440_GPIO_C_NR,
+                        .label  = "GPC",
+                },
+        }, {
+                .base   = S5P64X0_GPG_BASE,
+                .chip   = {
+                        .base   = S5P6440_GPG(0),
+                        .ngpio  = S5P6440_GPIO_G_NR,
+                        .label  = "GPG",
+                },
+        },
+#endif
+};
+static struct samsung_gpio_chip s5p6440_gpios_4bit2[] = {
+#ifdef CONFIG_CPU_S5P6440
+        {
+                .base   = S5P64X0_GPH_BASE + 0x4,
+                .chip   = {
+                        .base   = S5P6440_GPH(0),
+                        .ngpio  = S5P6440_GPIO_H_NR,
+                        .label  = "GPH",
+                },
+        },
+#endif
+};
+static struct samsung_gpio_chip s5p6440_gpios_rbank[] = {
+#ifdef CONFIG_CPU_S5P6440
+        {
+                .base   = S5P64X0_GPR_BASE + 0x4,
+                .config = &s5p64x0_gpio_cfg_rbank,
+                .chip   = {
+                        .base   = S5P6440_GPR(0),
+                        .ngpio  = S5P6440_GPIO_R_NR,
+                        .label  = "GPR",
+                },
+        },
+#endif
+};
+static struct samsung_gpio_chip s5p6440_gpios_2bit[] = {
+#ifdef CONFIG_CPU_S5P6440
+        {
+                .base   = S5P64X0_GPF_BASE,
+                .config = &samsung_gpio_cfgs[6],
+                .chip   = {
+                        .base   = S5P6440_GPF(0),
+                        .ngpio  = S5P6440_GPIO_F_NR,
+                        .label  = "GPF",
+                },
+        }, {
+                .base   = S5P64X0_GPI_BASE,
+                .config = &samsung_gpio_cfgs[4],
+                .chip   = {
+                        .base   = S5P6440_GPI(0),
+                        .ngpio  = S5P6440_GPIO_I_NR,
+                        .label  = "GPI",
+                },
+        }, {
+                .base   = S5P64X0_GPJ_BASE,
+                .config = &samsung_gpio_cfgs[4],
+                .chip   = {
+                        .base   = S5P6440_GPJ(0),
+                        .ngpio  = S5P6440_GPIO_J_NR,
+                        .label  = "GPJ",
+                },
+        }, {
+                .base   = S5P64X0_GPN_BASE,
+                .config = &samsung_gpio_cfgs[5],
+                .chip   = {
+                        .base   = S5P6440_GPN(0),
+                        .ngpio  = S5P6440_GPIO_N_NR,
+                        .label  = "GPN",
+                },
+        }, {
+                .base   = S5P64X0_GPP_BASE,
+                .config = &samsung_gpio_cfgs[6],
+                .chip   = {
+                        .base   = S5P6440_GPP(0),
+                        .ngpio  = S5P6440_GPIO_P_NR,
+                        .label  = "GPP",
+                },
+        },
+#endif
+};
+/*
+ * S5P6450 GPIO bank summary:
+ *
+ * Bank GPIOs   Style   SlpCon  ExtInt Group
+ * A    6       4Bit    Yes     1
+ * B    7       4Bit    Yes     1
+ * C    8       4Bit    Yes     2
+ * D    8       4Bit    Yes     None
+ * F    2       2Bit    Yes     None
+ * G    14      4Bit[2] Yes     5
+ * H    10      4Bit[2] Yes     6
+ * I    16      2Bit    Yes     None
+ * J    12      2Bit    Yes     None
+ * K    5       4Bit    Yes     None
+ * N    16      2Bit    No      IRQ_EINT
+ * P    11      2Bit    Yes     8
+ * Q    14      2Bit    Yes     None
+ * R    15      4Bit[2] Yes     None
+ * S    8       2Bit    Yes     None
+ *
+ * [1] BANKF pins 14,15 do not form part of the external interrupt sources
+ * [2] BANK has two control registers, GPxCON0 and GPxCON1
+ */
+static struct samsung_gpio_chip s5p6450_gpios_4bit[] = {
+#ifdef CONFIG_CPU_S5P6450
+        {
+                .chip   = {
+                        .base   = S5P6450_GPA(0),
+                        .ngpio  = S5P6450_GPIO_A_NR,
+                        .label  = "GPA",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5P6450_GPB(0),
+                        .ngpio  = S5P6450_GPIO_B_NR,
+                        .label  = "GPB",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5P6450_GPC(0),
+                        .ngpio  = S5P6450_GPIO_C_NR,
+                        .label  = "GPC",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5P6450_GPD(0),
+                        .ngpio  = S5P6450_GPIO_D_NR,
+                        .label  = "GPD",
+                },
+        }, {
+                .base   = S5P6450_GPK_BASE,
+                .chip   = {
+                        .base   = S5P6450_GPK(0),
+                        .ngpio  = S5P6450_GPIO_K_NR,
+                        .label  = "GPK",
+                },
+        },
+#endif
+};
+static struct samsung_gpio_chip s5p6450_gpios_4bit2[] = {
+#ifdef CONFIG_CPU_S5P6450
+        {
+                .base   = S5P64X0_GPG_BASE + 0x4,
+                .chip   = {
+                        .base   = S5P6450_GPG(0),
+                        .ngpio  = S5P6450_GPIO_G_NR,
+                        .label  = "GPG",
+                },
+        }, {
+                .base   = S5P64X0_GPH_BASE + 0x4,
+                .chip   = {
+                        .base   = S5P6450_GPH(0),
+                        .ngpio  = S5P6450_GPIO_H_NR,
+                        .label  = "GPH",
+                },
+        },
+#endif
+};
+static struct samsung_gpio_chip s5p6450_gpios_rbank[] = {
+#ifdef CONFIG_CPU_S5P6450
+        {
+                .base   = S5P64X0_GPR_BASE + 0x4,
+                .config = &s5p64x0_gpio_cfg_rbank,
+                .chip   = {
+                        .base   = S5P6450_GPR(0),
+                        .ngpio  = S5P6450_GPIO_R_NR,
+                        .label  = "GPR",
+                },
+        },
+#endif
+};
+static struct samsung_gpio_chip s5p6450_gpios_2bit[] = {
+#ifdef CONFIG_CPU_S5P6450
+        {
+                .base   = S5P64X0_GPF_BASE,
+                .config = &samsung_gpio_cfgs[6],
+                .chip   = {
+                        .base   = S5P6450_GPF(0),
+                        .ngpio  = S5P6450_GPIO_F_NR,
+                        .label  = "GPF",
+                },
+        }, {
+                .base   = S5P64X0_GPI_BASE,
+                .config = &samsung_gpio_cfgs[4],
+                .chip   = {
+                        .base   = S5P6450_GPI(0),
+                        .ngpio  = S5P6450_GPIO_I_NR,
+                        .label  = "GPI",
+                },
+        }, {
+                .base   = S5P64X0_GPJ_BASE,
+                .config = &samsung_gpio_cfgs[4],
+                .chip   = {
+                        .base   = S5P6450_GPJ(0),
+                        .ngpio  = S5P6450_GPIO_J_NR,
+                        .label  = "GPJ",
+                },
+        }, {
+                .base   = S5P64X0_GPN_BASE,
+                .config = &samsung_gpio_cfgs[5],
+                .chip   = {
+                        .base   = S5P6450_GPN(0),
+                        .ngpio  = S5P6450_GPIO_N_NR,
+                        .label  = "GPN",
+                },
+        }, {
+                .base   = S5P64X0_GPP_BASE,
+                .config = &samsung_gpio_cfgs[6],
+                .chip   = {
+                        .base   = S5P6450_GPP(0),
+                        .ngpio  = S5P6450_GPIO_P_NR,
+                        .label  = "GPP",
+                },
+        }, {
+                .base   = S5P6450_GPQ_BASE,
+                .config = &samsung_gpio_cfgs[5],
+                .chip   = {
+                        .base   = S5P6450_GPQ(0),
+                        .ngpio  = S5P6450_GPIO_Q_NR,
+                        .label  = "GPQ",
+                },
+        }, {
+                .base   = S5P6450_GPS_BASE,
+                .config = &samsung_gpio_cfgs[6],
+                .chip   = {
+                        .base   = S5P6450_GPS(0),
+                        .ngpio  = S5P6450_GPIO_S_NR,
+                        .label  = "GPS",
+                },
+        },
+#endif
+};
+/*
+ * S5PC100 GPIO bank summary:
+ *
+ * Bank GPIOs   Style   INT Type
+ * A0   8       4Bit    GPIO_INT0
+ * A1   5       4Bit    GPIO_INT1
+ * B    8       4Bit    GPIO_INT2
+ * C    5       4Bit    GPIO_INT3
+ * D    7       4Bit    GPIO_INT4
+ * E0   8       4Bit    GPIO_INT5
+ * E1   6       4Bit    GPIO_INT6
+ * F0   8       4Bit    GPIO_INT7
+ * F1   8       4Bit    GPIO_INT8
+ * F2   8       4Bit    GPIO_INT9
+ * F3   4       4Bit    GPIO_INT10
+ * G0   8       4Bit    GPIO_INT11
+ * G1   3       4Bit    GPIO_INT12
+ * G2   7       4Bit    GPIO_INT13
+ * G3   7       4Bit    GPIO_INT14
+ * H0   8       4Bit    WKUP_INT
+ * H1   8       4Bit    WKUP_INT
+ * H2   8       4Bit    WKUP_INT
+ * H3   8       4Bit    WKUP_INT
+ * I    8       4Bit    GPIO_INT15
+ * J0   8       4Bit    GPIO_INT16
+ * J1   5       4Bit    GPIO_INT17
+ * J2   8       4Bit    GPIO_INT18
+ * J3   8       4Bit    GPIO_INT19
+ * J4   4       4Bit    GPIO_INT20
+ * K0   8       4Bit    None
+ * K1   6       4Bit    None
+ * K2   8       4Bit    None
+ * K3   8       4Bit    None
+ * L0   8       4Bit    None
+ * L1   8       4Bit    None
+ * L2   8       4Bit    None
+ * L3   8       4Bit    None
+ */
+static struct samsung_gpio_chip s5pc100_gpios_4bit[] = {
+#ifdef CONFIG_CPU_S5PC100
+        {
+                .chip   = {
+                        .base   = S5PC100_GPA0(0),
+                        .ngpio  = S5PC100_GPIO_A0_NR,
+                        .label  = "GPA0",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPA1(0),
+                        .ngpio  = S5PC100_GPIO_A1_NR,
+                        .label  = "GPA1",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPB(0),
+                        .ngpio  = S5PC100_GPIO_B_NR,
+                        .label  = "GPB",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPC(0),
+                        .ngpio  = S5PC100_GPIO_C_NR,
+                        .label  = "GPC",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPD(0),
+                        .ngpio  = S5PC100_GPIO_D_NR,
+                        .label  = "GPD",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPE0(0),
+                        .ngpio  = S5PC100_GPIO_E0_NR,
+                        .label  = "GPE0",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPE1(0),
+                        .ngpio  = S5PC100_GPIO_E1_NR,
+                        .label  = "GPE1",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPF0(0),
+                        .ngpio  = S5PC100_GPIO_F0_NR,
+                        .label  = "GPF0",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPF1(0),
+                        .ngpio  = S5PC100_GPIO_F1_NR,
+                        .label  = "GPF1",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPF2(0),
+                        .ngpio  = S5PC100_GPIO_F2_NR,
+                        .label  = "GPF2",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPF3(0),
+                        .ngpio  = S5PC100_GPIO_F3_NR,
+                        .label  = "GPF3",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPG0(0),
+                        .ngpio  = S5PC100_GPIO_G0_NR,
+                        .label  = "GPG0",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPG1(0),
+                        .ngpio  = S5PC100_GPIO_G1_NR,
+                        .label  = "GPG1",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPG2(0),
+                        .ngpio  = S5PC100_GPIO_G2_NR,
+                        .label  = "GPG2",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPG3(0),
+                        .ngpio  = S5PC100_GPIO_G3_NR,
+                        .label  = "GPG3",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPI(0),
+                        .ngpio  = S5PC100_GPIO_I_NR,
+                        .label  = "GPI",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPJ0(0),
+                        .ngpio  = S5PC100_GPIO_J0_NR,
+                        .label  = "GPJ0",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPJ1(0),
+                        .ngpio  = S5PC100_GPIO_J1_NR,
+                        .label  = "GPJ1",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPJ2(0),
+                        .ngpio  = S5PC100_GPIO_J2_NR,
+                        .label  = "GPJ2",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPJ3(0),
+                        .ngpio  = S5PC100_GPIO_J3_NR,
+                        .label  = "GPJ3",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPJ4(0),
+                        .ngpio  = S5PC100_GPIO_J4_NR,
+                        .label  = "GPJ4",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPK0(0),
+                        .ngpio  = S5PC100_GPIO_K0_NR,
+                        .label  = "GPK0",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPK1(0),
+                        .ngpio  = S5PC100_GPIO_K1_NR,
+                        .label  = "GPK1",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPK2(0),
+                        .ngpio  = S5PC100_GPIO_K2_NR,
+                        .label  = "GPK2",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPK3(0),
+                        .ngpio  = S5PC100_GPIO_K3_NR,
+                        .label  = "GPK3",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPL0(0),
+                        .ngpio  = S5PC100_GPIO_L0_NR,
+                        .label  = "GPL0",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPL1(0),
+                        .ngpio  = S5PC100_GPIO_L1_NR,
+                        .label  = "GPL1",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPL2(0),
+                        .ngpio  = S5PC100_GPIO_L2_NR,
+                        .label  = "GPL2",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPL3(0),
+                        .ngpio  = S5PC100_GPIO_L3_NR,
+                        .label  = "GPL3",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PC100_GPL4(0),
+                        .ngpio  = S5PC100_GPIO_L4_NR,
+                        .label  = "GPL4",
+                },
+        }, {
+                .base   = (S5P_VA_GPIO + 0xC00),
+                .irq_base = IRQ_EINT(0),
+                .chip   = {
+                        .base   = S5PC100_GPH0(0),
+                        .ngpio  = S5PC100_GPIO_H0_NR,
+                        .label  = "GPH0",
+                        .to_irq = samsung_gpiolib_to_irq,
+                },
+        }, {
+                .base   = (S5P_VA_GPIO + 0xC20),
+                .irq_base = IRQ_EINT(8),
+                .chip   = {
+                        .base   = S5PC100_GPH1(0),
+                        .ngpio  = S5PC100_GPIO_H1_NR,
+                        .label  = "GPH1",
+                        .to_irq = samsung_gpiolib_to_irq,
+                },
+        }, {
+                .base   = (S5P_VA_GPIO + 0xC40),
+                .irq_base = IRQ_EINT(16),
+                .chip   = {
+                        .base   = S5PC100_GPH2(0),
+                        .ngpio  = S5PC100_GPIO_H2_NR,
+                        .label  = "GPH2",
+                        .to_irq = samsung_gpiolib_to_irq,
+                },
+        }, {
+                .base   = (S5P_VA_GPIO + 0xC60),
+                .irq_base = IRQ_EINT(24),
+                .chip   = {
+                        .base   = S5PC100_GPH3(0),
+                        .ngpio  = S5PC100_GPIO_H3_NR,
+                        .label  = "GPH3",
+                        .to_irq = samsung_gpiolib_to_irq,
+                },
+        },
+#endif
+};
+/*
+ * Followings are the gpio banks in S5PV210/S5PC110
+ *
+ * The 'config' member when left to NULL, is initialized to the default
+ * structure samsung_gpio_cfgs[3] in the init function below.
+ *
+ * The 'base' member is also initialized in the init function below.
+ * Note: The initialization of 'base' member of samsung_gpio_chip structure
+ * uses the above macro and depends on the banks being listed in order here.
+ */
+static struct samsung_gpio_chip s5pv210_gpios_4bit[] = {
+#ifdef CONFIG_CPU_S5PV210
+        {
+                .chip   = {
+                        .base   = S5PV210_GPA0(0),
+                        .ngpio  = S5PV210_GPIO_A0_NR,
+                        .label  = "GPA0",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPA1(0),
+                        .ngpio  = S5PV210_GPIO_A1_NR,
+                        .label  = "GPA1",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPB(0),
+                        .ngpio  = S5PV210_GPIO_B_NR,
+                        .label  = "GPB",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPC0(0),
+                        .ngpio  = S5PV210_GPIO_C0_NR,
+                        .label  = "GPC0",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPC1(0),
+                        .ngpio  = S5PV210_GPIO_C1_NR,
+                        .label  = "GPC1",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPD0(0),
+                        .ngpio  = S5PV210_GPIO_D0_NR,
+                        .label  = "GPD0",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPD1(0),
+                        .ngpio  = S5PV210_GPIO_D1_NR,
+                        .label  = "GPD1",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPE0(0),
+                        .ngpio  = S5PV210_GPIO_E0_NR,
+                        .label  = "GPE0",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPE1(0),
+                        .ngpio  = S5PV210_GPIO_E1_NR,
+                        .label  = "GPE1",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPF0(0),
+                        .ngpio  = S5PV210_GPIO_F0_NR,
+                        .label  = "GPF0",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPF1(0),
+                        .ngpio  = S5PV210_GPIO_F1_NR,
+                        .label  = "GPF1",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPF2(0),
+                        .ngpio  = S5PV210_GPIO_F2_NR,
+                        .label  = "GPF2",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPF3(0),
+                        .ngpio  = S5PV210_GPIO_F3_NR,
+                        .label  = "GPF3",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPG0(0),
+                        .ngpio  = S5PV210_GPIO_G0_NR,
+                        .label  = "GPG0",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPG1(0),
+                        .ngpio  = S5PV210_GPIO_G1_NR,
+                        .label  = "GPG1",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPG2(0),
+                        .ngpio  = S5PV210_GPIO_G2_NR,
+                        .label  = "GPG2",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPG3(0),
+                        .ngpio  = S5PV210_GPIO_G3_NR,
+                        .label  = "GPG3",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPI(0),
+                        .ngpio  = S5PV210_GPIO_I_NR,
+                        .label  = "GPI",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPJ0(0),
+                        .ngpio  = S5PV210_GPIO_J0_NR,
+                        .label  = "GPJ0",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPJ1(0),
+                        .ngpio  = S5PV210_GPIO_J1_NR,
+                        .label  = "GPJ1",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPJ2(0),
+                        .ngpio  = S5PV210_GPIO_J2_NR,
+                        .label  = "GPJ2",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPJ3(0),
+                        .ngpio  = S5PV210_GPIO_J3_NR,
+                        .label  = "GPJ3",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_GPJ4(0),
+                        .ngpio  = S5PV210_GPIO_J4_NR,
+                        .label  = "GPJ4",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_MP01(0),
+                        .ngpio  = S5PV210_GPIO_MP01_NR,
+                        .label  = "MP01",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_MP02(0),
+                        .ngpio  = S5PV210_GPIO_MP02_NR,
+                        .label  = "MP02",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_MP03(0),
+                        .ngpio  = S5PV210_GPIO_MP03_NR,
+                        .label  = "MP03",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_MP04(0),
+                        .ngpio  = S5PV210_GPIO_MP04_NR,
+                        .label  = "MP04",
+                },
+        }, {
+                .chip   = {
+                        .base   = S5PV210_MP05(0),
+                        .ngpio  = S5PV210_GPIO_MP05_NR,
+                        .label  = "MP05",
+                },
+        }, {
+                .base   = (S5P_VA_GPIO + 0xC00),
+                .irq_base = IRQ_EINT(0),
+                .chip   = {
+                        .base   = S5PV210_GPH0(0),
+                        .ngpio  = S5PV210_GPIO_H0_NR,
+                        .label  = "GPH0",
+                        .to_irq = samsung_gpiolib_to_irq,
+                },
+        }, {
+                .base   = (S5P_VA_GPIO + 0xC20),
+                .irq_base = IRQ_EINT(8),
+                .chip   = {
+                        .base   = S5PV210_GPH1(0),
+                        .ngpio  = S5PV210_GPIO_H1_NR,
+                        .label  = "GPH1",
+                        .to_irq = samsung_gpiolib_to_irq,
+                },
+        }, {
+                .base   = (S5P_VA_GPIO + 0xC40),
+                .irq_base = IRQ_EINT(16),
+                .chip   = {
+                        .base   = S5PV210_GPH2(0),
+                        .ngpio  = S5PV210_GPIO_H2_NR,
+                        .label  = "GPH2",
+                        .to_irq = samsung_gpiolib_to_irq,
+                },
+        }, {
+                .base   = (S5P_VA_GPIO + 0xC60),
+                .irq_base = IRQ_EINT(24),
+                .chip   = {
+                        .base   = S5PV210_GPH3(0),
+                        .ngpio  = S5PV210_GPIO_H3_NR,
+                        .label  = "GPH3",
+                        .to_irq = samsung_gpiolib_to_irq,
+                },
+        },
+#endif
+};
+/*
+ * Followings are the gpio banks in EXYNOS4210
+ *
+ * The 'config' member when left to NULL, is initialized to the default
+ * structure samsung_gpio_cfgs[3] in the init function below.
+ *
+ * The 'base' member is also initialized in the init function below.
+ * Note: The initialization of 'base' member of samsung_gpio_chip structure
+ * uses the above macro and depends on the banks being listed in order here.
+ */
+static struct samsung_gpio_chip exynos4_gpios_1[] = {
+#ifdef CONFIG_ARCH_EXYNOS4
+        {
+                .chip   = {
+                        .base   = EXYNOS4_GPA0(0),
+                        .ngpio  = EXYNOS4_GPIO_A0_NR,
+                        .label  = "GPA0",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPA1(0),
+                        .ngpio  = EXYNOS4_GPIO_A1_NR,
+                        .label  = "GPA1",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPB(0),
+                        .ngpio  = EXYNOS4_GPIO_B_NR,
+                        .label  = "GPB",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPC0(0),
+                        .ngpio  = EXYNOS4_GPIO_C0_NR,
+                        .label  = "GPC0",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPC1(0),
+                        .ngpio  = EXYNOS4_GPIO_C1_NR,
+                        .label  = "GPC1",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPD0(0),
+                        .ngpio  = EXYNOS4_GPIO_D0_NR,
+                        .label  = "GPD0",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPD1(0),
+                        .ngpio  = EXYNOS4_GPIO_D1_NR,
+                        .label  = "GPD1",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPE0(0),
+                        .ngpio  = EXYNOS4_GPIO_E0_NR,
+                        .label  = "GPE0",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPE1(0),
+                        .ngpio  = EXYNOS4_GPIO_E1_NR,
+                        .label  = "GPE1",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPE2(0),
+                        .ngpio  = EXYNOS4_GPIO_E2_NR,
+                        .label  = "GPE2",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPE3(0),
+                        .ngpio  = EXYNOS4_GPIO_E3_NR,
+                        .label  = "GPE3",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPE4(0),
+                        .ngpio  = EXYNOS4_GPIO_E4_NR,
+                        .label  = "GPE4",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPF0(0),
+                        .ngpio  = EXYNOS4_GPIO_F0_NR,
+                        .label  = "GPF0",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPF1(0),
+                        .ngpio  = EXYNOS4_GPIO_F1_NR,
+                        .label  = "GPF1",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPF2(0),
+                        .ngpio  = EXYNOS4_GPIO_F2_NR,
+                        .label  = "GPF2",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPF3(0),
+                        .ngpio  = EXYNOS4_GPIO_F3_NR,
+                        .label  = "GPF3",
+                },
+        },
+#endif
+};
+static struct samsung_gpio_chip exynos4_gpios_2[] = {
+#ifdef CONFIG_ARCH_EXYNOS4
+        {
+                .chip   = {
+                        .base   = EXYNOS4_GPJ0(0),
+                        .ngpio  = EXYNOS4_GPIO_J0_NR,
+                        .label  = "GPJ0",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPJ1(0),
+                        .ngpio  = EXYNOS4_GPIO_J1_NR,
+                        .label  = "GPJ1",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPK0(0),
+                        .ngpio  = EXYNOS4_GPIO_K0_NR,
+                        .label  = "GPK0",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPK1(0),
+                        .ngpio  = EXYNOS4_GPIO_K1_NR,
+                        .label  = "GPK1",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPK2(0),
+                        .ngpio  = EXYNOS4_GPIO_K2_NR,
+                        .label  = "GPK2",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPK3(0),
+                        .ngpio  = EXYNOS4_GPIO_K3_NR,
+                        .label  = "GPK3",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPL0(0),
+                        .ngpio  = EXYNOS4_GPIO_L0_NR,
+                        .label  = "GPL0",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPL1(0),
+                        .ngpio  = EXYNOS4_GPIO_L1_NR,
+                        .label  = "GPL1",
+                },
+        }, {
+                .chip   = {
+                        .base   = EXYNOS4_GPL2(0),
+                        .ngpio  = EXYNOS4_GPIO_L2_NR,
+                        .label  = "GPL2",
+                },
+        }, {
+                .config = &samsung_gpio_cfgs[8],
+                .chip   = {
+                        .base   = EXYNOS4_GPY0(0),
+                        .ngpio  = EXYNOS4_GPIO_Y0_NR,
+                        .label  = "GPY0",
+                },
+        }, {
+                .config = &samsung_gpio_cfgs[8],
+                .chip   = {
+                        .base   = EXYNOS4_GPY1(0),
+                        .ngpio  = EXYNOS4_GPIO_Y1_NR,
+                        .label  = "GPY1",
+                },
+        }, {
+                .config = &samsung_gpio_cfgs[8],
+                .chip   = {
+                        .base   = EXYNOS4_GPY2(0),
+                        .ngpio  = EXYNOS4_GPIO_Y2_NR,
+                        .label  = "GPY2",
+                },
+        }, {
+                .config = &samsung_gpio_cfgs[8],
+                .chip   = {
+                        .base   = EXYNOS4_GPY3(0),
+                        .ngpio  = EXYNOS4_GPIO_Y3_NR,
+                        .label  = "GPY3",
+                },
+        }, {
+                .config = &samsung_gpio_cfgs[8],
+                .chip   = {
+                        .base   = EXYNOS4_GPY4(0),
+                        .ngpio  = EXYNOS4_GPIO_Y4_NR,
+                        .label  = "GPY4",
+                },
+        }, {
+                .config = &samsung_gpio_cfgs[8],
+                .chip   = {
+                        .base   = EXYNOS4_GPY5(0),
+                        .ngpio  = EXYNOS4_GPIO_Y5_NR,
+                        .label  = "GPY5",
+                },
+        }, {
+                .config = &samsung_gpio_cfgs[8],
+                .chip   = {
+                        .base   = EXYNOS4_GPY6(0),
+                        .ngpio  = EXYNOS4_GPIO_Y6_NR,
+                        .label  = "GPY6",
+                },
+        }, {
+                .base   = (S5P_VA_GPIO2 + 0xC00),
+                .config = &samsung_gpio_cfgs[9],
+                .irq_base = IRQ_EINT(0),
+                .chip   = {
+                        .base   = EXYNOS4_GPX0(0),
+                        .ngpio  = EXYNOS4_GPIO_X0_NR,
+                        .label  = "GPX0",
+                        .to_irq = samsung_gpiolib_to_irq,
+                },
+        }, {
+                .base   = (S5P_VA_GPIO2 + 0xC20),
+                .config = &samsung_gpio_cfgs[9],
+                .irq_base = IRQ_EINT(8),
+                .chip   = {
+                        .base   = EXYNOS4_GPX1(0),
+                        .ngpio  = EXYNOS4_GPIO_X1_NR,
+                        .label  = "GPX1",
+                        .to_irq = samsung_gpiolib_to_irq,
+                },
+        }, {
+                .base   = (S5P_VA_GPIO2 + 0xC40),
+                .config = &samsung_gpio_cfgs[9],
+                .irq_base = IRQ_EINT(16),
+                .chip   = {
+                        .base   = EXYNOS4_GPX2(0),
+                        .ngpio  = EXYNOS4_GPIO_X2_NR,
+                        .label  = "GPX2",
+                        .to_irq = samsung_gpiolib_to_irq,
+                },
+        }, {
+                .base   = (S5P_VA_GPIO2 + 0xC60),
+                .config = &samsung_gpio_cfgs[9],
+                .irq_base = IRQ_EINT(24),
+                .chip   = {
+                        .base   = EXYNOS4_GPX3(0),
+                        .ngpio  = EXYNOS4_GPIO_X3_NR,
+                        .label  = "GPX3",
+                        .to_irq = samsung_gpiolib_to_irq,
+                },
+        },
+#endif
+};
+static struct samsung_gpio_chip exynos4_gpios_3[] = {
+#ifdef CONFIG_ARCH_EXYNOS4
+        {
+                .chip   = {
+                        .base   = EXYNOS4_GPZ(0),
+                        .ngpio  = EXYNOS4_GPIO_Z_NR,
+                        .label  = "GPZ",
+                },
+        },
+#endif
+};
+/* TODO: cleanup soc_is_* */
+static __init int samsung_gpiolib_init(void)
+{
+        struct samsung_gpio_chip *chip;
+        int i, nr_chips;
+        int group = 0;
+        samsung_gpiolib_set_cfg(samsung_gpio_cfgs, ARRAY_SIZE(samsung_gpio_cfgs));
+        if (soc_is_s3c24xx()) {
+                s3c24xx_gpiolib_add_chips(s3c24xx_gpios,
+                                ARRAY_SIZE(s3c24xx_gpios), S3C24XX_VA_GPIO);
+        } else if (soc_is_s3c64xx()) {
+                samsung_gpiolib_add_2bit_chips(s3c64xx_gpios_2bit,
+                                ARRAY_SIZE(s3c64xx_gpios_2bit),
+                                S3C64XX_VA_GPIO + 0xE0, 0x20);
+                samsung_gpiolib_add_4bit_chips(s3c64xx_gpios_4bit,
+                                ARRAY_SIZE(s3c64xx_gpios_4bit),
+                                S3C64XX_VA_GPIO);
+                samsung_gpiolib_add_4bit2_chips(s3c64xx_gpios_4bit2,
+                                ARRAY_SIZE(s3c64xx_gpios_4bit2));
+        } else if (soc_is_s5p6440()) {
+                samsung_gpiolib_add_2bit_chips(s5p6440_gpios_2bit,
+                                ARRAY_SIZE(s5p6440_gpios_2bit), NULL, 0x0);
+                samsung_gpiolib_add_4bit_chips(s5p6440_gpios_4bit,
+                                ARRAY_SIZE(s5p6440_gpios_4bit), S5P_VA_GPIO);
+                samsung_gpiolib_add_4bit2_chips(s5p6440_gpios_4bit2,
+                                ARRAY_SIZE(s5p6440_gpios_4bit2));
+                s5p64x0_gpiolib_add_rbank(s5p6440_gpios_rbank,
+                                ARRAY_SIZE(s5p6440_gpios_rbank));
+        } else if (soc_is_s5p6450()) {
+                samsung_gpiolib_add_2bit_chips(s5p6450_gpios_2bit,
+                                ARRAY_SIZE(s5p6450_gpios_2bit), NULL, 0x0);
+                samsung_gpiolib_add_4bit_chips(s5p6450_gpios_4bit,
+                                ARRAY_SIZE(s5p6450_gpios_4bit), S5P_VA_GPIO);
+                samsung_gpiolib_add_4bit2_chips(s5p6450_gpios_4bit2,
+                                ARRAY_SIZE(s5p6450_gpios_4bit2));
+                s5p64x0_gpiolib_add_rbank(s5p6450_gpios_rbank,
+                                ARRAY_SIZE(s5p6450_gpios_rbank));
+        } else if (soc_is_s5pc100()) {
+                group = 0;
+                chip = s5pc100_gpios_4bit;
+                nr_chips = ARRAY_SIZE(s5pc100_gpios_4bit);
+                for (i = 0; i < nr_chips; i++, chip++) {
+                        if (!chip->config) {
+                                chip->config = &samsung_gpio_cfgs[3];
+                                chip->group = group++;
+                        }
+                }
+                samsung_gpiolib_add_4bit_chips(s5pc100_gpios_4bit, nr_chips, S5P_VA_GPIO);
+#if defined(CONFIG_CPU_S5PC100) && defined(CONFIG_S5P_GPIO_INT)
+                s5p_register_gpioint_bank(IRQ_GPIOINT, 0, S5P_GPIOINT_GROUP_MAXNR);
+#endif
+        } else if (soc_is_s5pv210()) {
+                group = 0;
+                chip = s5pv210_gpios_4bit;
+                nr_chips = ARRAY_SIZE(s5pv210_gpios_4bit);
+                for (i = 0; i < nr_chips; i++, chip++) {
+                        if (!chip->config) {
+                                chip->config = &samsung_gpio_cfgs[3];
+                                chip->group = group++;
+                        }
+                }
+                samsung_gpiolib_add_4bit_chips(s5pv210_gpios_4bit, nr_chips, S5P_VA_GPIO);
+#if defined(CONFIG_CPU_S5PV210) && defined(CONFIG_S5P_GPIO_INT)
+                s5p_register_gpioint_bank(IRQ_GPIOINT, 0, S5P_GPIOINT_GROUP_MAXNR);
+#endif
+        } else if (soc_is_exynos4210()) {
+                group = 0;
+                /* gpio part1 */
+                chip = exynos4_gpios_1;
+                nr_chips = ARRAY_SIZE(exynos4_gpios_1);
+                for (i = 0; i < nr_chips; i++, chip++) {
+                        if (!chip->config) {
+                                chip->config = &exynos4_gpio_cfg;
+                                chip->group = group++;
+                        }
+                }
+                samsung_gpiolib_add_4bit_chips(exynos4_gpios_1, nr_chips, S5P_VA_GPIO1);
+                /* gpio part2 */
+                chip = exynos4_gpios_2;
+                nr_chips = ARRAY_SIZE(exynos4_gpios_2);
+                for (i = 0; i < nr_chips; i++, chip++) {
+                        if (!chip->config) {
+                                chip->config = &exynos4_gpio_cfg;
+                                chip->group = group++;
+                        }
+                }
+                samsung_gpiolib_add_4bit_chips(exynos4_gpios_2, nr_chips, S5P_VA_GPIO2);
+                /* gpio part3 */
+                chip = exynos4_gpios_3;
+                nr_chips = ARRAY_SIZE(exynos4_gpios_3);
+                for (i = 0; i < nr_chips; i++, chip++) {
+                        if (!chip->config) {
+                                chip->config = &exynos4_gpio_cfg;
+                                chip->group = group++;
+                        }
+                }
+                samsung_gpiolib_add_4bit_chips(exynos4_gpios_3, nr_chips, S5P_VA_GPIO3);
+#if defined(CONFIG_CPU_EXYNOS4210) && defined(CONFIG_S5P_GPIO_INT)
+                s5p_register_gpioint_bank(IRQ_GPIO_XA, 0, IRQ_GPIO1_NR_GROUPS);
+                s5p_register_gpioint_bank(IRQ_GPIO_XB, IRQ_GPIO1_NR_GROUPS, IRQ_GPIO2_NR_GROUPS);
+#endif
+        } else {
+                WARN(1, "Unknown SoC in gpio-samsung, no GPIOs added\n");
+                return -ENODEV;
+        }
+        return 0;
+}
+core_initcall(samsung_gpiolib_init);
+int s3c_gpio_cfgpin(unsigned int pin, unsigned int config)
+{
+        struct samsung_gpio_chip *chip = samsung_gpiolib_getchip(pin);
+        unsigned long flags;
+        int offset;
+        int ret;
+        if (!chip)
+                return -EINVAL;
+        offset = pin - chip->chip.base;
+        samsung_gpio_lock(chip, flags);
+        ret = samsung_gpio_do_setcfg(chip, offset, config);
+        samsung_gpio_unlock(chip, flags);
+        return ret;
+}
+EXPORT_SYMBOL(s3c_gpio_cfgpin);
+int s3c_gpio_cfgpin_range(unsigned int start, unsigned int nr,
+                          unsigned int cfg)
+{
+        int ret;
+        for (; nr > 0; nr--, start++) {
+                ret = s3c_gpio_cfgpin(start, cfg);
+                if (ret != 0)
+                        return ret;
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(s3c_gpio_cfgpin_range);
+int s3c_gpio_cfgall_range(unsigned int start, unsigned int nr,
+                          unsigned int cfg, samsung_gpio_pull_t pull)
+{
+        int ret;
+        for (; nr > 0; nr--, start++) {
+                s3c_gpio_setpull(start, pull);
+                ret = s3c_gpio_cfgpin(start, cfg);
+                if (ret != 0)
+                        return ret;
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(s3c_gpio_cfgall_range);
+unsigned s3c_gpio_getcfg(unsigned int pin)
+{
+        struct samsung_gpio_chip *chip = samsung_gpiolib_getchip(pin);
+        unsigned long flags;
+        unsigned ret = 0;
+        int offset;
+        if (chip) {
+                offset = pin - chip->chip.base;
+                samsung_gpio_lock(chip, flags);
+                ret = samsung_gpio_do_getcfg(chip, offset);
+                samsung_gpio_unlock(chip, flags);
+        }
+        return ret;
+}
+EXPORT_SYMBOL(s3c_gpio_getcfg);
+int s3c_gpio_setpull(unsigned int pin, samsung_gpio_pull_t pull)
+{
+        struct samsung_gpio_chip *chip = samsung_gpiolib_getchip(pin);
+        unsigned long flags;
+        int offset, ret;
+        if (!chip)
+                return -EINVAL;
+        offset = pin - chip->chip.base;
+        samsung_gpio_lock(chip, flags);
+        ret = samsung_gpio_do_setpull(chip, offset, pull);
+        samsung_gpio_unlock(chip, flags);
+        return ret;
+}
+EXPORT_SYMBOL(s3c_gpio_setpull);
+samsung_gpio_pull_t s3c_gpio_getpull(unsigned int pin)
+{
+        struct samsung_gpio_chip *chip = samsung_gpiolib_getchip(pin);
+        unsigned long flags;
+        int offset;
+        u32 pup = 0;
+        if (chip) {
+                offset = pin - chip->chip.base;
+                samsung_gpio_lock(chip, flags);
+                pup = samsung_gpio_do_getpull(chip, offset);
+                samsung_gpio_unlock(chip, flags);
+        }
+        return (__force samsung_gpio_pull_t)pup;
+}
+EXPORT_SYMBOL(s3c_gpio_getpull);
+/* gpiolib wrappers until these are totally eliminated */
+void s3c2410_gpio_pullup(unsigned int pin, unsigned int to)
+{
+        int ret;
+        WARN_ON(to);    /* should be none of these left */
+        if (!to) {
+                /* if pull is enabled, try first with up, and if that
+                 * fails, try using down */
+                ret = s3c_gpio_setpull(pin, S3C_GPIO_PULL_UP);
+                if (ret)
+                        s3c_gpio_setpull(pin, S3C_GPIO_PULL_DOWN);
+        } else {
+                s3c_gpio_setpull(pin, S3C_GPIO_PULL_NONE);
+        }
+}
+EXPORT_SYMBOL(s3c2410_gpio_pullup);
+void s3c2410_gpio_setpin(unsigned int pin, unsigned int to)
+{
+        /* do this via gpiolib until all users removed */
+        gpio_request(pin, "temporary");
+        gpio_set_value(pin, to);
+        gpio_free(pin);
+}
+EXPORT_SYMBOL(s3c2410_gpio_setpin);
+unsigned int s3c2410_gpio_getpin(unsigned int pin)
+{
+        struct samsung_gpio_chip *chip = samsung_gpiolib_getchip(pin);
+        unsigned long offs = pin - chip->chip.base;
+        return __raw_readl(chip->base + 0x04) & (1 << offs);
+}
+EXPORT_SYMBOL(s3c2410_gpio_getpin);
+#ifdef CONFIG_S5P_GPIO_DRVSTR
+s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned int pin)
+{
+        struct samsung_gpio_chip *chip = samsung_gpiolib_getchip(pin);
+        unsigned int off;
+        void __iomem *reg;
+        int shift;
+        u32 drvstr;
+        if (!chip)
+                return -EINVAL;
+        off = pin - chip->chip.base;
+        shift = off * 2;
+        reg = chip->base + 0x0C;
+        drvstr = __raw_readl(reg);
+        drvstr = drvstr >> shift;
+        drvstr &= 0x3;
+        return (__force s5p_gpio_drvstr_t)drvstr;
+}
+EXPORT_SYMBOL(s5p_gpio_get_drvstr);
+int s5p_gpio_set_drvstr(unsigned int pin, s5p_gpio_drvstr_t drvstr)
+{
+        struct samsung_gpio_chip *chip = samsung_gpiolib_getchip(pin);
+        unsigned int off;
+        void __iomem *reg;
+        int shift;
+        u32 tmp;
+        if (!chip)
+                return -EINVAL;
+        off = pin - chip->chip.base;
+        shift = off * 2;
+        reg = chip->base + 0x0C;
+        tmp = __raw_readl(reg);
+        tmp &= ~(0x3 << shift);
+        tmp |= drvstr << shift;
+        __raw_writel(tmp, reg);
+        return 0;
+}
+EXPORT_SYMBOL(s5p_gpio_set_drvstr);
+#endif  /* CONFIG_S5P_GPIO_DRVSTR */
+#ifdef CONFIG_PLAT_S3C24XX
+unsigned int s3c2410_modify_misccr(unsigned int clear, unsigned int change)
+{
+        unsigned long flags;
+        unsigned long misccr;
+        local_irq_save(flags);
+        misccr = __raw_readl(S3C24XX_MISCCR);
+        misccr &= ~clear;
+        misccr ^= change;
+        __raw_writel(misccr, S3C24XX_MISCCR);
+        local_irq_restore(flags);
+        return misccr;
+}
+EXPORT_SYMBOL(s3c2410_modify_misccr);
+#endif
diff --git a/drivers/gpio/gpio-xilinx.c b/drivers/gpio/gpio-xilinx.c
index 846fbd5e31bf..0ce6ac9898b1 100644
--- a/drivers/gpio/gpio-xilinx.c
+++ b/drivers/gpio/gpio-xilinx.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/errno.h>
+#include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
 #include <linux/of_gpio.h>
diff --git a/drivers/gpu/drm/ati_pcigart.c b/drivers/gpu/drm/ati_pcigart.c
index 1c3649242208..9afe495c12c7 100644
--- a/drivers/gpu/drm/ati_pcigart.c
+++ b/drivers/gpu/drm/ati_pcigart.c
@@ -31,6 +31,7 @@
 * DEALINGS IN THE SOFTWARE.
 */
+#include <linux/export.h>
 #include "drmP.h"
 # define ATI_PCIGART_PAGE_SIZE          4096    /**< PCI GART page size */
diff --git a/drivers/gpu/drm/drm_buffer.c b/drivers/gpu/drm/drm_buffer.c
index 529a0dbe9fc6..08ccefedb327 100644
--- a/drivers/gpu/drm/drm_buffer.c
+++ b/drivers/gpu/drm/drm_buffer.c
@@ -32,6 +32,7 @@
 * Pauli Nieminen <suokkos-at-gmail-dot-com>
 */
+#include <linux/export.h>
 #include "drm_buffer.h"
 /**
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index 61e1ef90d4e5..30372f7b2d45 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -36,6 +36,7 @@
 #include <linux/vmalloc.h>
 #include <linux/slab.h>
 #include <linux/log2.h>
+#include <linux/export.h>
 #include <asm/shmparam.h>
 #include "drmP.h"
diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c
index 0e3bd5b54b78..592865381c6e 100644
--- a/drivers/gpu/drm/drm_cache.c
+++ b/drivers/gpu/drm/drm_cache.c
@@ -28,6 +28,7 @@
 * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com>
 */
+#include <linux/export.h>
 #include "drmP.h"
 #if defined(CONFIG_X86)
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index fe738f05309b..711d9653abd0 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -31,6 +31,7 @@
 */
 #include <linux/list.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "drm.h"
 #include "drmP.h"
 #include "drm_crtc.h"
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index f2366440b738..2957636161e8 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -29,6 +29,9 @@
 *      Jesse Barnes <jesse.barnes@intel.com>
 */
+#include <linux/export.h>
+#include <linux/moduleparam.h>
 #include "drmP.h"
 #include "drm_crtc.h"
 #include "drm_crtc_helper.h"
diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
index b9dc2629ea9a..d067c12ba940 100644
--- a/drivers/gpu/drm/drm_debugfs.c
+++ b/drivers/gpu/drm/drm_debugfs.c
@@ -33,6 +33,7 @@
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "drmP.h"
 #if defined(CONFIG_DEBUG_FS)
diff --git a/drivers/gpu/drm/drm_dma.c b/drivers/gpu/drm/drm_dma.c
index 252cbd74df0e..cfb4e333ec0f 100644
--- a/drivers/gpu/drm/drm_dma.c
+++ b/drivers/gpu/drm/drm_dma.c
@@ -33,6 +33,7 @@
 * OTHER DEALINGS IN THE SOFTWARE.
 */
+#include <linux/export.h>
 #include "drmP.h"
 /**
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 7a87e0878f30..fc81af9dbf42 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -48,6 +48,7 @@
 #include <linux/debugfs.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "drmP.h"
 #include "drm_core.h"
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index fe39c3570538..3e927ce7557d 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -30,6 +30,7 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
+#include <linux/export.h>
 #include "drmP.h"
 #include "drm_edid.h"
 #include "drm_edid_modes.h"
diff --git a/drivers/gpu/drm/drm_encoder_slave.c b/drivers/gpu/drm/drm_encoder_slave.c
index d62c064fbaa0..fb943551060e 100644
--- a/drivers/gpu/drm/drm_encoder_slave.c
+++ b/drivers/gpu/drm/drm_encoder_slave.c
@@ -24,6 +24,8 @@
 *
 */
+#include <linux/module.h>
 #include "drm_encoder_slave.h"
 /**
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index f7c6854eb4dd..80fe39d98b0c 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -31,6 +31,7 @@
 #include <linux/sysrq.h>
 #include <linux/slab.h>
 #include <linux/fb.h>
+#include <linux/module.h>
 #include "drmP.h"
 #include "drm_crtc.h"
 #include "drm_fb_helper.h"
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 2ec7d48fc4a8..4911e1d1dcf2 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -37,6 +37,7 @@
 #include "drmP.h"
 #include <linux/poll.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 /* from BKL pushdown: note that nothing else serializes idr_find() */
 DEFINE_MUTEX(drm_global_mutex);
diff --git a/drivers/gpu/drm/drm_hashtab.c b/drivers/gpu/drm/drm_hashtab.c
index e3a75688f3cd..68dc8744b630 100644
--- a/drivers/gpu/drm/drm_hashtab.c
+++ b/drivers/gpu/drm/drm_hashtab.c
@@ -36,6 +36,7 @@
 #include "drm_hashtab.h"
 #include <linux/hash.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 int drm_ht_create(struct drm_open_hash *ht, unsigned int order)
 {
diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
index 4a058c7af6c0..ddd70db45f76 100644
--- a/drivers/gpu/drm/drm_ioc32.c
+++ b/drivers/gpu/drm/drm_ioc32.c
@@ -29,6 +29,7 @@
 */
 #include <linux/compat.h>
 #include <linux/ratelimit.h>
+#include <linux/export.h>
 #include "drmP.h"
 #include "drm_core.h"
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 3830e9e478c0..cb3794a00f98 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -40,6 +40,7 @@
 #include <linux/slab.h>
 #include <linux/vgaarb.h>
+#include <linux/export.h>
 /* Access macro for slots in vblank timestamp ringbuffer. */
 #define vblanktimestamp(dev, crtc, count) ( \
diff --git a/drivers/gpu/drm/drm_memory.c b/drivers/gpu/drm/drm_memory.c
index c9b805000a11..c8b6b66d428d 100644
--- a/drivers/gpu/drm/drm_memory.c
+++ b/drivers/gpu/drm/drm_memory.c
@@ -34,6 +34,7 @@
 */
 #include <linux/highmem.h>
+#include <linux/export.h>
 #include "drmP.h"
 /**
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
index 959186cbf328..961fb54f4266 100644
--- a/drivers/gpu/drm/drm_mm.c
+++ b/drivers/gpu/drm/drm_mm.c
@@ -45,6 +45,7 @@
 #include "drm_mm.h"
 #include <linux/slab.h>
 #include <linux/seq_file.h>
+#include <linux/export.h>
 #define MM_UNUSED_TARGET 4
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index ad74fb4dc542..fb8e46b4e8bc 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -32,6 +32,7 @@
 #include <linux/list.h>
 #include <linux/list_sort.h>
+#include <linux/export.h>
 #include "drmP.h"
 #include "drm.h"
 #include "drm_crtc.h"
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index b6a19cb07caf..d4d10b7880cf 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -39,6 +39,7 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/dma-mapping.h>
+#include <linux/export.h>
 #include "drmP.h"
 /**********************************************************************/
diff --git a/drivers/gpu/drm/drm_platform.c b/drivers/gpu/drm/drm_platform.c
index 2a8b6265ad3d..ae9db5e2b27c 100644
--- a/drivers/gpu/drm/drm_platform.c
+++ b/drivers/gpu/drm/drm_platform.c
@@ -25,6 +25,7 @@
 * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include <linux/export.h>
 #include "drmP.h"
 /**
diff --git a/drivers/gpu/drm/drm_proc.c b/drivers/gpu/drm/drm_proc.c
index 0f3c4e3cafc3..fff87221f9e9 100644
--- a/drivers/gpu/drm/drm_proc.c
+++ b/drivers/gpu/drm/drm_proc.c
@@ -39,6 +39,7 @@
 #include <linux/seq_file.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "drmP.h"
 /***************************************************
diff --git a/drivers/gpu/drm/drm_sman.c b/drivers/gpu/drm/drm_sman.c
index 34664587a74e..cebce45f4429 100644
--- a/drivers/gpu/drm/drm_sman.c
+++ b/drivers/gpu/drm/drm_sman.c
@@ -36,6 +36,7 @@
 * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
 */
+#include <linux/export.h>
 #include "drm_sman.h"
 struct drm_owner_item {
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index 2eee8e016b38..0f9ef9bf6730 100644
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -16,6 +16,7 @@
 #include <linux/kdev_t.h>
 #include <linux/gfp.h>
 #include <linux/err.h>
+#include <linux/export.h>
 #include "drm_sysfs.h"
 #include "drm_core.h"
diff --git a/drivers/gpu/drm/drm_usb.c b/drivers/gpu/drm/drm_usb.c
index 206d2300d873..445003f4dc93 100644
--- a/drivers/gpu/drm/drm_usb.c
+++ b/drivers/gpu/drm/drm_usb.c
@@ -1,5 +1,6 @@
 #include "drmP.h"
 #include <linux/usb.h>
+#include <linux/export.h>
 #ifdef CONFIG_USB
 int drm_get_usb_dev(struct usb_interface *interface,
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
index 5db96d45fc71..8c03eaf41448 100644
--- a/drivers/gpu/drm/drm_vm.c
+++ b/drivers/gpu/drm/drm_vm.c
@@ -34,6 +34,7 @@
 */
 #include "drmP.h"
+#include <linux/export.h>
 #if defined(__ia64__)
 #include <linux/efi.h>
 #include <linux/slab.h>
diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c
index 08792a740f18..07d55df6623e 100644
--- a/drivers/gpu/drm/i2c/ch7006_drv.c
+++ b/drivers/gpu/drm/i2c/ch7006_drv.c
@@ -24,6 +24,8 @@
 *
 */
+#include <linux/module.h>
 #include "ch7006_priv.h"
 /* DRM encoder functions */
diff --git a/drivers/gpu/drm/i2c/sil164_drv.c b/drivers/gpu/drm/i2c/sil164_drv.c
index 0b6773290c08..b7d45ab4ba69 100644
--- a/drivers/gpu/drm/i2c/sil164_drv.c
+++ b/drivers/gpu/drm/i2c/sil164_drv.c
@@ -24,6 +24,8 @@
 *
 */
+#include <linux/module.h>
 #include "drmP.h"
 #include "drm_crtc_helper.h"
 #include "drm_encoder_slave.h"
diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c
index 6f98d059f68a..d4266bdf6fb4 100644
--- a/drivers/gpu/drm/i810/i810_drv.c
+++ b/drivers/gpu/drm/i810/i810_drv.c
@@ -30,6 +30,8 @@
 *    Gareth Hughes <gareth@valinux.com>
 */
+#include <linux/module.h>
 #include "drmP.h"
 #include "drm.h"
 #include "i810_drm.h"
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 8e95d66800b0..d14b44e13f51 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -29,6 +29,7 @@
 #include <linux/seq_file.h>
 #include <linux/debugfs.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "drmP.h"
 #include "drm.h"
 #include "intel_drv.h"
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 2eac955dee18..a9533c54c93c 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -41,6 +41,7 @@
 #include <linux/pnp.h>
 #include <linux/vga_switcheroo.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <acpi/video.h>
 static void i915_write_hws_pga(struct drm_device *dev)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 4c8d681c2151..cc531bb59c26 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -35,6 +35,7 @@
 #include "intel_drv.h"
 #include <linux/console.h>
+#include <linux/module.h>
 #include "drm_crtc_helper.h"
 static int i915_modeset __read_mostly = -1;
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index fc1a0832af4f..09b318b0227f 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -27,6 +27,7 @@
 #include <linux/i2c.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "drmP.h"
 #include "drm.h"
 #include "drm_crtc.h"
diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c
index 9ed5380e5a53..d30ccccb9d73 100644
--- a/drivers/gpu/drm/i915/intel_i2c.c
+++ b/drivers/gpu/drm/i915/intel_i2c.c
@@ -28,6 +28,7 @@
 */
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
+#include <linux/export.h>
 #include "drmP.h"
 #include "drm.h"
 #include "intel_drv.h"
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 6db3b1ccb6eb..3003fb25aefd 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -28,6 +28,7 @@
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
+#include <linux/export.h>
 #include "drmP.h"
 #include "drm.h"
 #include "drm_crtc.h"
diff --git a/drivers/gpu/drm/mga/mga_drv.c b/drivers/gpu/drm/mga/mga_drv.c
index 42d31874edf2..33daa29eea66 100644
--- a/drivers/gpu/drm/mga/mga_drv.c
+++ b/drivers/gpu/drm/mga/mga_drv.c
@@ -29,6 +29,8 @@
 *    Gareth Hughes <gareth@valinux.com>
 */
+#include <linux/module.h>
 #include "drmP.h"
 #include "drm.h"
 #include "mga_drm.h"
diff --git a/drivers/gpu/drm/mga/mga_warp.c b/drivers/gpu/drm/mga/mga_warp.c
index f172bd5c257f..722a91b69b0c 100644
--- a/drivers/gpu/drm/mga/mga_warp.c
+++ b/drivers/gpu/drm/mga/mga_warp.c
@@ -30,6 +30,7 @@
 #include <linux/firmware.h>
 #include <linux/ihex.h>
 #include <linux/platform_device.h>
+#include <linux/module.h>
 #include "drmP.h"
 #include "drm.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
index c1e01f37b9d1..9f7bb1295262 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
@@ -23,6 +23,7 @@
 */
 #include <linux/console.h>
+#include <linux/module.h>
 #include "drmP.h"
 #include "drm.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.c b/drivers/gpu/drm/nouveau/nouveau_i2c.c
index f6a27fabcfe0..c6143df48b9f 100644
--- a/drivers/gpu/drm/nouveau/nouveau_i2c.c
+++ b/drivers/gpu/drm/nouveau/nouveau_i2c.c
@@ -22,6 +22,8 @@
 * Authors: Ben Skeggs
 */
+#include <linux/module.h>
 #include "drmP.h"
 #include "nouveau_drv.h"
 #include "nouveau_i2c.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_temp.c b/drivers/gpu/drm/nouveau/nouveau_temp.c
index 081ca7b03e8a..5a46446dd5a8 100644
--- a/drivers/gpu/drm/nouveau/nouveau_temp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_temp.c
@@ -22,6 +22,8 @@
 * Authors: Martin Peres
 */
+#include <linux/module.h>
 #include "drmP.h"
 #include "nouveau_drv.h"
diff --git a/drivers/gpu/drm/nouveau/nvc0_graph.c b/drivers/gpu/drm/nouveau/nvc0_graph.c
index 4b8d0b3f7d2b..bbdbc51830c8 100644
--- a/drivers/gpu/drm/nouveau/nvc0_graph.c
+++ b/drivers/gpu/drm/nouveau/nvc0_graph.c
@@ -23,6 +23,7 @@
 */
 #include <linux/firmware.h>
+#include <linux/module.h>
 #include "drmP.h"
diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
index 570e190710bd..bcac90b543ad 100644
--- a/drivers/gpu/drm/r128/r128_cce.c
+++ b/drivers/gpu/drm/r128/r128_cce.c
@@ -32,6 +32,7 @@
 #include <linux/firmware.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include "drmP.h"
 #include "drm.h"
diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c
index b9e8efd2b754..4c8796ba6dd8 100644
--- a/drivers/gpu/drm/r128/r128_drv.c
+++ b/drivers/gpu/drm/r128/r128_drv.c
@@ -29,6 +29,8 @@
 *    Gareth Hughes <gareth@valinux.com>
 */
+#include <linux/module.h>
 #include "drmP.h"
 #include "drm.h"
 #include "r128_drm.h"
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index 556b7bc3418b..fdb93f884575 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -24,6 +24,7 @@
 #include <linux/firmware.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include "drmP.h"
 #include "radeon.h"
 #include "radeon_asic.h"
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 8f8b8fa14357..cbf49f4f408e 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -41,6 +41,7 @@
 #include <linux/firmware.h>
 #include <linux/platform_device.h>
+#include <linux/module.h>
 #include "r100_reg_safe.h"
 #include "rn50_reg_safe.h"
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 12470b090ddf..4e777c1e4b7b 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -29,6 +29,7 @@
 #include <linux/seq_file.h>
 #include <linux/firmware.h>
 #include <linux/platform_device.h>
+#include <linux/module.h>
 #include "drmP.h"
 #include "radeon_drm.h"
 #include "radeon.h"
diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c
index 45fd592f9606..c9db4931913f 100644
--- a/drivers/gpu/drm/radeon/r600_cp.c
+++ b/drivers/gpu/drm/radeon/r600_cp.c
@@ -26,6 +26,8 @@
 *     Alex Deucher <alexander.deucher@amd.com>
 */
+#include <linux/module.h>
 #include "drmP.h"
 #include "drm.h"
 #include "radeon_drm.h"
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
index 045ec59478f9..72ae8266b8e9 100644
--- a/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/drivers/gpu/drm/radeon/radeon_cp.c
@@ -29,6 +29,8 @@
 *    Gareth Hughes <gareth@valinux.com>
 */
+#include <linux/module.h>
 #include "drmP.h"
 #include "drm.h"
 #include "drm_sarea.h"
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index e71d2ed7fa11..969933833ccb 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -36,6 +36,7 @@
 #include "drm_pciids.h"
 #include <linux/console.h>
+#include <linux/module.h>
 /*
diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c
index 02cb7da4124d..e6d110ce2331 100644
--- a/drivers/gpu/drm/radeon/radeon_i2c.c
+++ b/drivers/gpu/drm/radeon/radeon_i2c.c
@@ -23,6 +23,8 @@
 * Authors: Dave Airlie
 *          Alex Deucher
 */
+#include <linux/export.h>
 #include "drmP.h"
 #include "radeon_drm.h"
 #include "radeon.h"
diff --git a/drivers/gpu/drm/savage/savage_drv.c b/drivers/gpu/drm/savage/savage_drv.c
index 6464490b240b..5468d1cd3296 100644
--- a/drivers/gpu/drm/savage/savage_drv.c
+++ b/drivers/gpu/drm/savage/savage_drv.c
@@ -23,6 +23,8 @@
 * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include <linux/module.h>
 #include "drmP.h"
 #include "savage_drm.h"
 #include "savage_drv.h"
diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index 46d5be6e97e5..a9c5716bea4e 100644
--- a/drivers/gpu/drm/sis/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c
@@ -25,6 +25,8 @@
 *
 */
+#include <linux/module.h>
 #include "drmP.h"
 #include "sis_drm.h"
 #include "sis_drv.h"
diff --git a/drivers/gpu/drm/tdfx/tdfx_drv.c b/drivers/gpu/drm/tdfx/tdfx_drv.c
index 8bf98810a8d6..cda29911e332 100644
--- a/drivers/gpu/drm/tdfx/tdfx_drv.c
+++ b/drivers/gpu/drm/tdfx/tdfx_drv.c
@@ -30,6 +30,8 @@
 *    Gareth Hughes <gareth@valinux.com>
 */
+#include <linux/module.h>
 #include "drmP.h"
 #include "tdfx_drv.h"
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index 58c271ebc0f7..f9cc548d6d98 100644
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -35,6 +35,7 @@
 #include <linux/file.h>
 #include <linux/swap.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "drm_cache.h"
 #include "drm_mem_util.h"
 #include "ttm/ttm_module.h"
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index 920a55214bcf..a83e86d3956c 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -22,6 +22,8 @@
 * DEALINGS IN THE SOFTWARE.
 */
+#include <linux/module.h>
 #include "drmP.h"
 #include "via_drm.h"
 #include "via_drv.h"
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 13afddc1f034..1805b8c2a948 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -24,6 +24,7 @@
 * USE OR OTHER DEALINGS IN THE SOFTWARE.
 *
 **************************************************************************/
+#include <linux/module.h>
 #include "drmP.h"
 #include "vmwgfx_drv.h"
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
index 070797b7b03a..34e51a1695b8 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
@@ -26,6 +26,8 @@
 *
 **************************************************************************/
+#include <linux/export.h>
 #include "drmP.h"
 #include "vmwgfx_drv.h"
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index 9bc7b03269df..299d23871122 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -183,9 +183,6 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
                if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI &&
                                hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS)
                        table = macbookair_fn_keys;
-                else if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI &&
-                                hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING6_JIS)
-                        table = macbookair_fn_keys;
                else if (hid->product < 0x21d || hid->product >= 0x300)
                        table = powerbook_fn_keys;
                else
@@ -458,6 +455,9 @@ static const struct hid_device_id apple_devices[] = {
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO),
                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
                        APPLE_ISO_KEYBOARD },
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+                        APPLE_ISO_KEYBOARD },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),
                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),
@@ -508,6 +508,12 @@ static const struct hid_device_id apple_devices[] = {
                .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS),
                .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI),
+                .driver_data = APPLE_HAS_FN },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO),
+                .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS),
+                .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
diff --git a/drivers/hid/hid-axff.c b/drivers/hid/hid-axff.c
index 3bdb4500f95e..5be858dd9a15 100644
--- a/drivers/hid/hid-axff.c
+++ b/drivers/hid/hid-axff.c
@@ -31,6 +31,7 @@
 #include <linux/slab.h>
 #include <linux/usb.h>
 #include <linux/hid.h>
+#include <linux/module.h>
 #include "hid-ids.h"
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 91adcc5bad28..848a56c0279c 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1362,6 +1362,9 @@ static const struct hid_device_id hid_have_special_driver[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ANSI) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ISO) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_JIS) },
@@ -1374,6 +1377,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_T91MT) },
@@ -1942,6 +1946,9 @@ static const struct hid_device_id hid_mouse_ignore_list[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ISO) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_JIS) },
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index 9a243ca96e6d..ee80d733801d 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -31,6 +31,7 @@
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include <linux/sched.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
 #include <linux/poll.h>
diff --git a/drivers/hid/hid-dr.c b/drivers/hid/hid-dr.c
index 61eece47204d..e832f44ae383 100644
--- a/drivers/hid/hid-dr.c
+++ b/drivers/hid/hid-dr.c
@@ -31,6 +31,7 @@
 #include <linux/slab.h>
 #include <linux/usb.h>
 #include <linux/hid.h>
+#include <linux/module.h>
 #include "hid-ids.h"
diff --git a/drivers/hid/hid-emsff.c b/drivers/hid/hid-emsff.c
index a5dc13fe367b..9bdde867a02f 100644
--- a/drivers/hid/hid-emsff.c
+++ b/drivers/hid/hid-emsff.c
@@ -24,6 +24,7 @@
 #include <linux/hid.h>
 #include <linux/input.h>
 #include <linux/usb.h>
+#include <linux/module.h>
 #include "hid-ids.h"
 #include "usbhid/usbhid.h"
diff --git a/drivers/hid/hid-gaff.c b/drivers/hid/hid-gaff.c
index 279ba530003c..f1e1bcf67427 100644
--- a/drivers/hid/hid-gaff.c
+++ b/drivers/hid/hid-gaff.c
@@ -31,6 +31,7 @@
 #include <linux/slab.h>
 #include <linux/usb.h>
 #include <linux/hid.h>
+#include <linux/module.h>
 #include "hid-ids.h"
 #ifdef CONFIG_GREENASIA_FF
diff --git a/drivers/hid/hid-holtekff.c b/drivers/hid/hid-holtekff.c
index 91e3a032112b..4e7542151e22 100644
--- a/drivers/hid/hid-holtekff.c
+++ b/drivers/hid/hid-holtekff.c
@@ -25,6 +25,7 @@
 #include <linux/hid.h>
 #include <linux/input.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/usb.h>
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 1680e99b4816..06ce996b8b65 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -112,6 +112,9 @@
 #define USB_DEVICE_ID_APPLE_ALU_REVB_ANSI       0x024f
 #define USB_DEVICE_ID_APPLE_ALU_REVB_ISO        0x0250
 #define USB_DEVICE_ID_APPLE_ALU_REVB_JIS        0x0251
+#define USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI   0x0252
+#define USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO    0x0253
+#define USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS    0x0254
 #define USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI   0x0249
 #define USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO    0x024a
 #define USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS    0x024b
@@ -121,6 +124,7 @@
 #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI  0x0239
 #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO   0x023a
 #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS   0x023b
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO   0x0256
 #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY    0x030a
 #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY     0x030b
 #define USB_DEVICE_ID_APPLE_ATV_IRCONTROL       0x8241
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index fa5d7a1ffa9e..f1c909f1b239 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -291,7 +291,6 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                        td->last_slot_field = usage->hid;
                        td->last_field_index = field->index;
                        td->last_mt_collection = usage->collection_index;
-                        hdev->quirks &= ~HID_QUIRK_MULTITOUCH;
                        return 1;
                case HID_DG_WIDTH:
                        hid_map_usage(hi, usage, bit, max,
@@ -530,44 +529,12 @@ static void mt_set_input_mode(struct hid_device *hdev)
        }
 }
-/* a list of devices for which there is a specialized multitouch driver */
-static const struct hid_device_id mt_have_special_driver[] = {
-        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, 0x0001) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, 0x0006) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA,
-                        USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA,
-                        USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
-        { }
-};
-static bool mt_match_one_id(struct hid_device *hdev,
-                const struct hid_device_id *id)
-{
-        return id->bus == hdev->bus &&
-                (id->vendor == HID_ANY_ID || id->vendor == hdev->vendor) &&
-                (id->product == HID_ANY_ID || id->product == hdev->product);
-}
-static const struct hid_device_id *mt_match_id(struct hid_device *hdev,
-                const struct hid_device_id *id)
-{
-        for (; id->bus; id++)
-                if (mt_match_one_id(hdev, id))
-                        return id;
-        return NULL;
-}
 static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
 {
        int ret, i;
        struct mt_device *td;
        struct mt_class *mtclass = mt_classes; /* MT_CLS_DEFAULT */
-        if (mt_match_id(hdev, mt_have_special_driver))
-                return -ENODEV;
        for (i = 0; mt_classes[i].name ; i++) {
                if (id->driver_data == mt_classes[i].name) {
                        mtclass = &(mt_classes[i]);
@@ -575,6 +542,10 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
                }
        }
+        /* This allows the driver to correctly support devices
+         * that emit events over several HID messages.
+         */
+        hdev->quirks |= HID_QUIRK_NO_INPUT_SYNC;
        td = kzalloc(sizeof(struct mt_device), GFP_KERNEL);
        if (!td) {
@@ -590,16 +561,10 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
        if (ret != 0)
                goto fail;
-        hdev->quirks |= HID_QUIRK_MULTITOUCH;
        ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
        if (ret)
                goto fail;
-        /* This allows the driver to correctly support devices
-         * that emit events over several HID messages.
-         */
-        hdev->quirks |= HID_QUIRK_NO_INPUT_SYNC;
        td->slots = kzalloc(td->maxcontacts * sizeof(struct mt_slot),
                                GFP_KERNEL);
        if (!td->slots) {
@@ -793,10 +758,6 @@ static const struct hid_device_id mt_devices[] = {
                HID_USB_DEVICE(USB_VENDOR_ID_XAT,
                        USB_DEVICE_ID_XAT_CSR) },
-        /* Rest of the world */
-        { .driver_data = MT_CLS_DEFAULT,
-                HID_USB_DEVICE(HID_ANY_ID, HID_ANY_ID) },
        { }
 };
 MODULE_DEVICE_TABLE(hid, mt_devices);
diff --git a/drivers/hid/hid-picolcd.c b/drivers/hid/hid-picolcd.c
index 1782693819f3..01e7d2cd7c26 100644
--- a/drivers/hid/hid-picolcd.c
+++ b/drivers/hid/hid-picolcd.c
@@ -36,6 +36,7 @@
 #include <linux/completion.h>
 #include <linux/uaccess.h>
+#include <linux/module.h>
 #define PICOLCD_NAME "PicoLCD (graphic)"
diff --git a/drivers/hid/hid-pl.c b/drivers/hid/hid-pl.c
index 06e5300d43d2..070f93a5c11b 100644
--- a/drivers/hid/hid-pl.c
+++ b/drivers/hid/hid-pl.c
@@ -40,6 +40,7 @@
 #include <linux/input.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <linux/usb.h>
 #include <linux/hid.h>
diff --git a/drivers/hid/hid-roccat-common.c b/drivers/hid/hid-roccat-common.c
index edf898dee28b..b07e7f96a358 100644
--- a/drivers/hid/hid-roccat-common.c
+++ b/drivers/hid/hid-roccat-common.c
@@ -13,6 +13,7 @@
 #include <linux/hid.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include "hid-roccat-common.h"
 static inline uint16_t roccat_common_feature_report(uint8_t report_id)
diff --git a/drivers/hid/hid-roccat.c b/drivers/hid/hid-roccat.c
index 5666e7587b18..b685b04dbf9d 100644
--- a/drivers/hid/hid-roccat.c
+++ b/drivers/hid/hid-roccat.c
@@ -27,6 +27,7 @@
 #include <linux/poll.h>
 #include <linux/sched.h>
 #include <linux/hid-roccat.h>
+#include <linux/module.h>
 #define ROCCAT_FIRST_MINOR 0
 #define ROCCAT_MAX_DEVICES 8
@@ -162,27 +163,27 @@ static int roccat_open(struct inode *inode, struct file *file)
        device = devices[minor];
-        mutex_lock(&device->readers_lock);
        if (!device) {
                pr_emerg("roccat device with minor %d doesn't exist\n", minor);
                error = -ENODEV;
-                goto exit_err;
+                goto exit_err_devices;
        }
+        mutex_lock(&device->readers_lock);
        if (!device->open++) {
                /* power on device on adding first reader */
                error = hid_hw_power(device->hid, PM_HINT_FULLON);
                if (error < 0) {
                        --device->open;
-                        goto exit_err;
+                        goto exit_err_readers;
                }
                error = hid_hw_open(device->hid);
                if (error < 0) {
                        hid_hw_power(device->hid, PM_HINT_NORMAL);
                        --device->open;
-                        goto exit_err;
+                        goto exit_err_readers;
                }
        }
@@ -193,13 +194,13 @@ static int roccat_open(struct inode *inode, struct file *file)
        list_add_tail(&reader->node, &device->readers);
        file->private_data = reader;
-exit_unlock:
+exit_err_readers:
        mutex_unlock(&device->readers_lock);
+exit_err_devices:
        mutex_unlock(&devices_lock);
+        if (error)
+                kfree(reader);
        return error;
-exit_err:
-        kfree(reader);
-        goto exit_unlock;
 }
 static int roccat_release(struct inode *inode, struct file *file)
diff --git a/drivers/hid/hid-sjoy.c b/drivers/hid/hid-sjoy.c
index 670da9109f86..4b1448613ea6 100644
--- a/drivers/hid/hid-sjoy.c
+++ b/drivers/hid/hid-sjoy.c
@@ -30,6 +30,7 @@
 #include <linux/slab.h>
 #include <linux/usb.h>
 #include <linux/hid.h>
+#include <linux/module.h>
 #include "hid-ids.h"
 #ifdef CONFIG_SMARTJOYPLUS_FF
diff --git a/drivers/hid/hid-tmff.c b/drivers/hid/hid-tmff.c
index 575862b0688e..83a933b9c2e9 100644
--- a/drivers/hid/hid-tmff.c
+++ b/drivers/hid/hid-tmff.c
@@ -31,6 +31,7 @@
 #include <linux/input.h>
 #include <linux/slab.h>
 #include <linux/usb.h>
+#include <linux/module.h>
 #include "hid-ids.h"
diff --git a/drivers/hid/hid-zpff.c b/drivers/hid/hid-zpff.c
index f31fab012f2f..f6ba81df71bd 100644
--- a/drivers/hid/hid-zpff.c
+++ b/drivers/hid/hid-zpff.c
@@ -25,6 +25,7 @@
 #include <linux/input.h>
 #include <linux/slab.h>
 #include <linux/usb.h>
+#include <linux/module.h>
 #include "hid-ids.h"
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 4ea464151c3b..5028d60a22a1 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -16,6 +16,7 @@
 */
 #include <linux/hid.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include "../hid-ids.h"
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 9b347acf1559..9ec854ae118b 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -335,6 +335,7 @@ config SENSORS_I5K_AMB
 config SENSORS_F71805F
        tristate "Fintek F71805F/FG, F71806F/FG and F71872F/FG"
+        depends on !PPC
        help
          If you say yes here you get support for hardware monitoring
          features of the Fintek F71805F/FG, F71806F/FG and F71872F/FG
@@ -345,6 +346,7 @@ config SENSORS_F71805F
 config SENSORS_F71882FG
        tristate "Fintek F71882FG and compatibles"
+        depends on !PPC
        help
          If you say yes here you get support for hardware monitoring
          features of many Fintek Super-I/O (LPC) chips. The currently
@@ -468,6 +470,7 @@ config SENSORS_IBMPEX
 config SENSORS_IT87
        tristate "ITE IT87xx and compatibles"
+        depends on !PPC
        select HWMON_VID
        help
          If you say yes here you get support for ITE IT8705F, IT8712F,
@@ -824,6 +827,7 @@ config SENSORS_NTC_THERMISTOR
 config SENSORS_PC87360
        tristate "National Semiconductor PC87360 family"
+        depends on !PPC
        select HWMON_VID
        help
          If you say yes here you get access to the hardware monitoring
@@ -837,6 +841,7 @@ config SENSORS_PC87360
 config SENSORS_PC87427
        tristate "National Semiconductor PC87427"
+        depends on !PPC
        help
          If you say yes here you get access to the hardware monitoring
          functions of the National Semiconductor PC87427 Super-I/O chip.
@@ -928,7 +933,7 @@ config SENSORS_SMM665
 config SENSORS_DME1737
        tristate "SMSC DME1737, SCH311x and compatibles"
-        depends on I2C && EXPERIMENTAL
+        depends on I2C && EXPERIMENTAL && !PPC
        select HWMON_VID
        help
          If you say yes here you get support for the hardware monitoring
@@ -970,6 +975,7 @@ config SENSORS_EMC6W201
 config SENSORS_SMSC47M1
        tristate "SMSC LPC47M10x and compatibles"
+        depends on !PPC
        help
          If you say yes here you get support for the integrated fan
          monitoring and control capabilities of the SMSC LPC47B27x,
@@ -1003,7 +1009,7 @@ config SENSORS_SMSC47M192
 config SENSORS_SMSC47B397
        tristate "SMSC LPC47B397-NC"
-        depends on EXPERIMENTAL
+        depends on EXPERIMENTAL && !PPC
        help
          If you say yes here you get support for the SMSC LPC47B397-NC
          sensor chip.
@@ -1017,6 +1023,7 @@ config SENSORS_SCH56XX_COMMON
 config SENSORS_SCH5627
        tristate "SMSC SCH5627"
+        depends on !PPC
        select SENSORS_SCH56XX_COMMON
        help
          If you say yes here you get support for the hardware monitoring
@@ -1027,6 +1034,7 @@ config SENSORS_SCH5627
 config SENSORS_SCH5636
        tristate "SMSC SCH5636"
+        depends on !PPC
        select SENSORS_SCH56XX_COMMON
        help
          SMSC SCH5636 Super I/O chips include an embedded microcontroller for
@@ -1150,6 +1158,7 @@ config SENSORS_VIA686A
 config SENSORS_VT1211
        tristate "VIA VT1211"
+        depends on !PPC
        select HWMON_VID
        help
          If you say yes here then you get support for hardware monitoring
@@ -1262,6 +1271,7 @@ config SENSORS_W83L786NG
 config SENSORS_W83627HF
        tristate "Winbond W83627HF, W83627THF, W83637HF, W83687THF, W83697HF"
+        depends on !PPC
        select HWMON_VID
        help
          If you say yes here you get support for the Winbond W836X7 series
@@ -1272,7 +1282,8 @@ config SENSORS_W83627HF
          will be called w83627hf.
 config SENSORS_W83627EHF
-        tristate "Winbond W83627EHF/EHG/DHG, W83667HG, NCT6775F, NCT6776F"
+        tristate "Winbond W83627EHF/EHG/DHG/UHG, W83667HG, NCT6775F, NCT6776F"
+        depends on !PPC
        select HWMON_VID
        help
          If you say yes here you get support for the hardware
@@ -1281,7 +1292,8 @@ config SENSORS_W83627EHF
          This driver also supports the W83627EHG, which is the lead-free
          version of the W83627EHF, and the W83627DHG, which is a similar
          chip suited for specific Intel processors that use PECI such as
-          the Core 2 Duo.
+          the Core 2 Duo. And also the W83627UHG, which is a stripped down
+          version of the W83627DHG (as far as hardware monitoring goes.)
          This driver also supports Nuvoton W83667HG, W83667HG-B, NCT6775F
          (also known as W83667HG-I), and NCT6776F.
diff --git a/drivers/hwmon/ad7414.c b/drivers/hwmon/ad7414.c
index d46c0c758ddf..df29a7fff9e7 100644
--- a/drivers/hwmon/ad7414.c
+++ b/drivers/hwmon/ad7414.c
@@ -58,10 +58,9 @@ static inline int ad7414_temp_from_reg(s16 reg)
 static inline int ad7414_read(struct i2c_client *client, u8 reg)
 {
-        if (reg == AD7414_REG_TEMP) {
+        if (reg == AD7414_REG_TEMP)
-                int value = i2c_smbus_read_word_data(client, reg);
+                return i2c_smbus_read_word_swapped(client, reg);
-                return (value < 0) ? value : swab16(value);
+        else
-        } else
                return i2c_smbus_read_byte_data(client, reg);
 }
diff --git a/drivers/hwmon/ad7418.c b/drivers/hwmon/ad7418.c
index ffc781fec185..8cb718ce8237 100644
--- a/drivers/hwmon/ad7418.c
+++ b/drivers/hwmon/ad7418.c
@@ -76,20 +76,6 @@ static struct i2c_driver ad7418_driver = {
        .id_table       = ad7418_id,
 };
-/* All registers are word-sized, except for the configuration registers.
- * AD7418 uses a high-byte first convention. Do NOT use those functions to
- * access the configuration registers CONF and CONF2, as they are byte-sized.
- */
-static inline int ad7418_read(struct i2c_client *client, u8 reg)
-{
-        return swab16(i2c_smbus_read_word_data(client, reg));
-}
-static inline int ad7418_write(struct i2c_client *client, u8 reg, u16 value)
-{
-        return i2c_smbus_write_word_data(client, reg, swab16(value));
-}
 static void ad7418_init_client(struct i2c_client *client)
 {
        struct ad7418_data *data = i2c_get_clientdata(client);
@@ -128,7 +114,9 @@ static struct ad7418_data *ad7418_update_device(struct device *dev)
                udelay(30);
                for (i = 0; i < 3; i++) {
-                        data->temp[i] = ad7418_read(client, AD7418_REG_TEMP[i]);
+                        data->temp[i] =
+                                i2c_smbus_read_word_swapped(client,
+                                                AD7418_REG_TEMP[i]);
                }
                for (i = 0, ch = 4; i < data->adc_max; i++, ch--) {
@@ -138,11 +126,12 @@ static struct ad7418_data *ad7418_update_device(struct device *dev)
                        udelay(15);
                        data->in[data->adc_max - 1 - i] =
-                                ad7418_read(client, AD7418_REG_ADC);
+                                i2c_smbus_read_word_swapped(client,
+                                                AD7418_REG_ADC);
                }
                /* restore old configuration value */
-                ad7418_write(client, AD7418_REG_CONF, cfg);
+                i2c_smbus_write_word_swapped(client, AD7418_REG_CONF, cfg);
                data->last_updated = jiffies;
                data->valid = 1;
@@ -182,7 +171,9 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *devattr,
        mutex_lock(&data->lock);
        data->temp[attr->index] = LM75_TEMP_TO_REG(temp);
-        ad7418_write(client, AD7418_REG_TEMP[attr->index], data->temp[attr->index]);
+        i2c_smbus_write_word_swapped(client,
+                                     AD7418_REG_TEMP[attr->index],
+                                     data->temp[attr->index]);
        mutex_unlock(&data->lock);
        return count;
 }
diff --git a/drivers/hwmon/ads1015.c b/drivers/hwmon/ads1015.c
index e9beeda4cbe5..eedca3cf9968 100644
--- a/drivers/hwmon/ads1015.c
+++ b/drivers/hwmon/ads1015.c
@@ -59,19 +59,6 @@ struct ads1015_data {
        struct ads1015_channel_data channel_data[ADS1015_CHANNELS];
 };
-static s32 ads1015_read_reg(struct i2c_client *client, unsigned int reg)
-{
-        s32 data = i2c_smbus_read_word_data(client, reg);
-        return (data < 0) ? data : swab16(data);
-}
-static s32 ads1015_write_reg(struct i2c_client *client, unsigned int reg,
-                             u16 val)
-{
-        return i2c_smbus_write_word_data(client, reg, swab16(val));
-}
 static int ads1015_read_value(struct i2c_client *client, unsigned int channel,
                              int *value)
 {
@@ -87,7 +74,7 @@ static int ads1015_read_value(struct i2c_client *client, unsigned int channel,
        mutex_lock(&data->update_lock);
        /* get channel parameters */
-        res = ads1015_read_reg(client, ADS1015_CONFIG);
+        res = i2c_smbus_read_word_swapped(client, ADS1015_CONFIG);
        if (res < 0)
                goto err_unlock;
        config = res;
@@ -101,13 +88,13 @@ static int ads1015_read_value(struct i2c_client *client, unsigned int channel,
        config |= (pga & 0x0007) << 9;
        config |= (data_rate & 0x0007) << 5;
-        res = ads1015_write_reg(client, ADS1015_CONFIG, config);
+        res = i2c_smbus_write_word_swapped(client, ADS1015_CONFIG, config);
        if (res < 0)
                goto err_unlock;
        /* wait until conversion finished */
        msleep(conversion_time_ms);
-        res = ads1015_read_reg(client, ADS1015_CONFIG);
+        res = i2c_smbus_read_word_swapped(client, ADS1015_CONFIG);
        if (res < 0)
                goto err_unlock;
        config = res;
@@ -117,7 +104,7 @@ static int ads1015_read_value(struct i2c_client *client, unsigned int channel,
                goto err_unlock;
        }
-        res = ads1015_read_reg(client, ADS1015_CONVERSION);
+        res = i2c_smbus_read_word_swapped(client, ADS1015_CONVERSION);
        if (res < 0)
                goto err_unlock;
        conversion = res;
diff --git a/drivers/hwmon/ads7828.c b/drivers/hwmon/ads7828.c
index c42c5a69a664..cfcc3b6fb6bf 100644
--- a/drivers/hwmon/ads7828.c
+++ b/drivers/hwmon/ads7828.c
@@ -74,13 +74,6 @@ static int ads7828_detect(struct i2c_client *client,
 static int ads7828_probe(struct i2c_client *client,
                         const struct i2c_device_id *id);
-/* The ADS7828 returns the 12-bit sample in two bytes,
-        these are read as a word then byte-swapped */
-static u16 ads7828_read_value(struct i2c_client *client, u8 reg)
-{
-        return swab16(i2c_smbus_read_word_data(client, reg));
-}
 static inline u8 channel_cmd_byte(int ch)
 {
        /* cmd byte C2,C1,C0 - see datasheet */
@@ -104,7 +97,8 @@ static struct ads7828_data *ads7828_update_device(struct device *dev)
                for (ch = 0; ch < ADS7828_NCH; ch++) {
                        u8 cmd = channel_cmd_byte(ch);
-                        data->adc_input[ch] = ads7828_read_value(client, cmd);
+                        data->adc_input[ch] =
+                                i2c_smbus_read_word_swapped(client, cmd);
                }
                data->last_updated = jiffies;
                data->valid = 1;
@@ -203,7 +197,7 @@ static int ads7828_detect(struct i2c_client *client,
        for (ch = 0; ch < ADS7828_NCH; ch++) {
                u16 in_data;
                u8 cmd = channel_cmd_byte(ch);
-                in_data = ads7828_read_value(client, cmd);
+                in_data = i2c_smbus_read_word_swapped(client, cmd);
                if (in_data & 0xF000) {
                        pr_debug("%s : Doesn't look like an ads7828 device\n",
                                 __func__);
diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c
index c02a052d3085..d7bd1f3f2a31 100644
--- a/drivers/hwmon/asb100.c
+++ b/drivers/hwmon/asb100.c
@@ -829,17 +829,17 @@ static int asb100_read_value(struct i2c_client *client, u16 reg)
                /* convert from ISA to LM75 I2C addresses */
                switch (reg & 0xff) {
                case 0x50: /* TEMP */
-                        res = swab16(i2c_smbus_read_word_data(cl, 0));
+                        res = i2c_smbus_read_word_swapped(cl, 0);
                        break;
                case 0x52: /* CONFIG */
                        res = i2c_smbus_read_byte_data(cl, 1);
                        break;
                case 0x53: /* HYST */
-                        res = swab16(i2c_smbus_read_word_data(cl, 2));
+                        res = i2c_smbus_read_word_swapped(cl, 2);
                        break;
                case 0x55: /* MAX */
                default:
-                        res = swab16(i2c_smbus_read_word_data(cl, 3));
+                        res = i2c_smbus_read_word_swapped(cl, 3);
                        break;
                }
        }
@@ -877,10 +877,10 @@ static void asb100_write_value(struct i2c_client *client, u16 reg, u16 value)
                        i2c_smbus_write_byte_data(cl, 1, value & 0xff);
                        break;
                case 0x53: /* HYST */
-                        i2c_smbus_write_word_data(cl, 2, swab16(value));
+                        i2c_smbus_write_word_swapped(cl, 2, value);
                        break;
                case 0x55: /* MAX */
-                        i2c_smbus_write_word_data(cl, 3, swab16(value));
+                        i2c_smbus_write_word_swapped(cl, 3, value);
                        break;
                }
        }
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index ce18c046f728..104b3767516c 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -60,14 +60,13 @@ MODULE_PARM_DESC(tjmax, "TjMax value in degrees Celsius");
 #ifdef CONFIG_SMP
 #define TO_PHYS_ID(cpu)         cpu_data(cpu).phys_proc_id
 #define TO_CORE_ID(cpu)         cpu_data(cpu).cpu_core_id
-#define TO_ATTR_NO(cpu)         (TO_CORE_ID(cpu) + BASE_SYSFS_ATTR_NO)
 #define for_each_sibling(i, cpu)        for_each_cpu(i, cpu_sibling_mask(cpu))
 #else
 #define TO_PHYS_ID(cpu)         (cpu)
 #define TO_CORE_ID(cpu)         (cpu)
-#define TO_ATTR_NO(cpu)         (cpu)
 #define for_each_sibling(i, cpu)        for (i = 0; false; )
 #endif
+#define TO_ATTR_NO(cpu)         (TO_CORE_ID(cpu) + BASE_SYSFS_ATTR_NO)
 /*
 * Per-Core Temperature Data
diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index e11363467a8d..ef1ac996752e 100644
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -80,24 +80,6 @@ struct ds1621_data {
        u8 conf;                        /* Register encoding, combined */
 };
-/* Temperature registers are word-sized.
-   DS1621 uses a high-byte first convention, which is exactly opposite to
-   the SMBus standard. */
-static int ds1621_read_temp(struct i2c_client *client, u8 reg)
-{
-        int ret;
-        ret = i2c_smbus_read_word_data(client, reg);
-        if (ret < 0)
-                return ret;
-        return swab16(ret);
-}
-static int ds1621_write_temp(struct i2c_client *client, u8 reg, u16 value)
-{
-        return i2c_smbus_write_word_data(client, reg, swab16(value));
-}
 static void ds1621_init_client(struct i2c_client *client)
 {
        u8 conf, new_conf;
@@ -136,7 +118,7 @@ static struct ds1621_data *ds1621_update_client(struct device *dev)
                data->conf = i2c_smbus_read_byte_data(client, DS1621_REG_CONF);
                for (i = 0; i < ARRAY_SIZE(data->temp); i++)
-                        data->temp[i] = ds1621_read_temp(client,
+                        data->temp[i] = i2c_smbus_read_word_swapped(client,
                                                         DS1621_REG_TEMP[i]);
                /* reset alarms if necessary */
@@ -177,8 +159,8 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *da,
        mutex_lock(&data->update_lock);
        data->temp[attr->index] = val;
-        ds1621_write_temp(client, DS1621_REG_TEMP[attr->index],
+        i2c_smbus_write_word_swapped(client, DS1621_REG_TEMP[attr->index],
-                          data->temp[attr->index]);
+                                     data->temp[attr->index]);
        mutex_unlock(&data->update_lock);
        return count;
 }
diff --git a/drivers/hwmon/ds620.c b/drivers/hwmon/ds620.c
index 4f7c3fc40a89..225ae4f36583 100644
--- a/drivers/hwmon/ds620.c
+++ b/drivers/hwmon/ds620.c
@@ -75,33 +75,13 @@ struct ds620_data {
        s16 temp[3];            /* Register values, word */
 };
-/*
- *  Temperature registers are word-sized.
- *  DS620 uses a high-byte first convention, which is exactly opposite to
- *  the SMBus standard.
- */
-static int ds620_read_temp(struct i2c_client *client, u8 reg)
-{
-        int ret;
-        ret = i2c_smbus_read_word_data(client, reg);
-        if (ret < 0)
-                return ret;
-        return swab16(ret);
-}
-static int ds620_write_temp(struct i2c_client *client, u8 reg, u16 value)
-{
-        return i2c_smbus_write_word_data(client, reg, swab16(value));
-}
 static void ds620_init_client(struct i2c_client *client)
 {
        struct ds620_platform_data *ds620_info = client->dev.platform_data;
        u16 conf, new_conf;
        new_conf = conf =
-            swab16(i2c_smbus_read_word_data(client, DS620_REG_CONF));
+            i2c_smbus_read_word_swapped(client, DS620_REG_CONF);
        /* switch to continuous conversion mode */
        new_conf &= ~DS620_REG_CONFIG_1SHOT;
@@ -118,8 +98,7 @@ static void ds620_init_client(struct i2c_client *client)
        new_conf |= DS620_REG_CONFIG_R1 | DS620_REG_CONFIG_R0;
        if (conf != new_conf)
-                i2c_smbus_write_word_data(client, DS620_REG_CONF,
+                i2c_smbus_write_word_swapped(client, DS620_REG_CONF, new_conf);
-                                          swab16(new_conf));
        /* start conversion */
        i2c_smbus_write_byte(client, DS620_COM_START);
@@ -141,8 +120,8 @@ static struct ds620_data *ds620_update_client(struct device *dev)
                dev_dbg(&client->dev, "Starting ds620 update\n");
                for (i = 0; i < ARRAY_SIZE(data->temp); i++) {
-                        res = ds620_read_temp(client,
+                        res = i2c_smbus_read_word_swapped(client,
-                                              DS620_REG_TEMP[i]);
+                                                          DS620_REG_TEMP[i]);
                        if (res < 0) {
                                ret = ERR_PTR(res);
                                goto abort;
@@ -191,8 +170,8 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *da,
        mutex_lock(&data->update_lock);
        data->temp[attr->index] = val;
-        ds620_write_temp(client, DS620_REG_TEMP[attr->index],
+        i2c_smbus_write_word_swapped(client, DS620_REG_TEMP[attr->index],
-                         data->temp[attr->index]);
+                                     data->temp[attr->index]);
        mutex_unlock(&data->update_lock);
        return count;
 }
@@ -210,16 +189,15 @@ static ssize_t show_alarm(struct device *dev, struct device_attribute *da,
                return PTR_ERR(data);
        /* reset alarms if necessary */
-        res = i2c_smbus_read_word_data(client, DS620_REG_CONF);
+        res = i2c_smbus_read_word_swapped(client, DS620_REG_CONF);
        if (res < 0)
                return res;
-        conf = swab16(res);
+        new_conf = conf = res;
-        new_conf = conf;
        new_conf &= ~attr->index;
        if (conf != new_conf) {
-                res = i2c_smbus_write_word_data(client, DS620_REG_CONF,
+                res = i2c_smbus_write_word_swapped(client, DS620_REG_CONF,
-                                                swab16(new_conf));
+                                                   new_conf);
                if (res < 0)
                        return res;
        }
diff --git a/drivers/hwmon/gl518sm.c b/drivers/hwmon/gl518sm.c
index e7ae5743e181..a13e2da97e30 100644
--- a/drivers/hwmon/gl518sm.c
+++ b/drivers/hwmon/gl518sm.c
@@ -591,7 +591,7 @@ static int gl518_remove(struct i2c_client *client)
 static int gl518_read_value(struct i2c_client *client, u8 reg)
 {
        if ((reg >= 0x07) && (reg <= 0x0c))
-                return swab16(i2c_smbus_read_word_data(client, reg));
+                return i2c_smbus_read_word_swapped(client, reg);
        else
                return i2c_smbus_read_byte_data(client, reg);
 }
@@ -599,7 +599,7 @@ static int gl518_read_value(struct i2c_client *client, u8 reg)
 static int gl518_write_value(struct i2c_client *client, u8 reg, u16 value)
 {
        if ((reg >= 0x07) && (reg <= 0x0c))
-                return i2c_smbus_write_word_data(client, reg, swab16(value));
+                return i2c_smbus_write_word_swapped(client, reg, value);
        else
                return i2c_smbus_write_byte_data(client, reg, value);
 }
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index 131ea8625f08..cd6085bbfba7 100644
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -821,7 +821,7 @@ static int gl520_remove(struct i2c_client *client)
 static int gl520_read_value(struct i2c_client *client, u8 reg)
 {
        if ((reg >= 0x07) && (reg <= 0x0c))
-                return swab16(i2c_smbus_read_word_data(client, reg));
+                return i2c_smbus_read_word_swapped(client, reg);
        else
                return i2c_smbus_read_byte_data(client, reg);
 }
@@ -829,7 +829,7 @@ static int gl520_read_value(struct i2c_client *client, u8 reg)
 static int gl520_write_value(struct i2c_client *client, u8 reg, u16 value)
 {
        if ((reg >= 0x07) && (reg <= 0x0c))
-                return i2c_smbus_write_word_data(client, reg, swab16(value));
+                return i2c_smbus_write_word_swapped(client, reg, value);
        else
                return i2c_smbus_write_byte_data(client, reg, value);
 }
diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
index 783d0c17b762..6a967d7dbdee 100644
--- a/drivers/hwmon/ibmaem.c
+++ b/drivers/hwmon/ibmaem.c
@@ -147,8 +147,9 @@ struct aem_data {
        int                     id;
        struct aem_ipmi_data    ipmi;
-        /* Function to update sensors */
+        /* Function and buffer to update sensors */
        void (*update)(struct aem_data *data);
+        struct aem_read_sensor_resp *rs_resp;
        /*
         * AEM 1.x sensors:
@@ -245,8 +246,6 @@ static void aem_bmc_gone(int iface);
 static void aem_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data);
 static void aem_remove_sensors(struct aem_data *data);
-static int aem_init_aem1(struct aem_ipmi_data *probe);
-static int aem_init_aem2(struct aem_ipmi_data *probe);
 static int aem1_find_sensors(struct aem_data *data);
 static int aem2_find_sensors(struct aem_data *data);
 static void update_aem1_sensors(struct aem_data *data);
@@ -357,13 +356,14 @@ static void aem_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data)
 /* Sensor support functions */
-/* Read a sensor value */
+/* Read a sensor value; must be called with data->lock held */
 static int aem_read_sensor(struct aem_data *data, u8 elt, u8 reg,
                           void *buf, size_t size)
 {
        int rs_size, res;
        struct aem_read_sensor_req rs_req;
-        struct aem_read_sensor_resp *rs_resp;
+        /* Use preallocated rx buffer */
+        struct aem_read_sensor_resp *rs_resp = data->rs_resp;
        struct aem_ipmi_data *ipmi = &data->ipmi;
        /* AEM registers are 1, 2, 4 or 8 bytes */
@@ -389,10 +389,6 @@ static int aem_read_sensor(struct aem_data *data, u8 elt, u8 reg,
        ipmi->tx_message.data_len = sizeof(rs_req);
        rs_size = sizeof(*rs_resp) + size;
-        rs_resp = kzalloc(rs_size, GFP_KERNEL);
-        if (!rs_resp)
-                return -ENOMEM;
        ipmi->rx_msg_data = rs_resp;
        ipmi->rx_msg_len = rs_size;
@@ -435,7 +431,6 @@ static int aem_read_sensor(struct aem_data *data, u8 elt, u8 reg,
        res = 0;
 out:
-        kfree(rs_resp);
        return res;
 }
@@ -493,6 +488,7 @@ static void aem_delete(struct aem_data *data)
 {
        list_del(&data->list);
        aem_remove_sensors(data);
+        kfree(data->rs_resp);
        hwmon_device_unregister(data->hwmon_dev);
        ipmi_destroy_user(data->ipmi.user);
        platform_set_drvdata(data->pdev, NULL);
@@ -570,24 +566,31 @@ static int aem_init_aem1_inst(struct aem_ipmi_data *probe, u8 module_handle)
        platform_set_drvdata(data->pdev, data);
        /* Set up IPMI interface */
-        if (aem_init_ipmi_data(&data->ipmi, probe->interface,
+        res = aem_init_ipmi_data(&data->ipmi, probe->interface,
-                               probe->bmc_device))
+                                 probe->bmc_device);
+        if (res)
                goto ipmi_err;
        /* Register with hwmon */
        data->hwmon_dev = hwmon_device_register(&data->pdev->dev);
        if (IS_ERR(data->hwmon_dev)) {
                dev_err(&data->pdev->dev, "Unable to register hwmon "
                        "device for IPMI interface %d\n",
                        probe->interface);
+                res = PTR_ERR(data->hwmon_dev);
                goto hwmon_reg_err;
        }
        data->update = update_aem1_sensors;
+        data->rs_resp = kzalloc(sizeof(*(data->rs_resp)) + 8, GFP_KERNEL);
+        if (!data->rs_resp) {
+                res = -ENOMEM;
+                goto alloc_resp_err;
+        }
        /* Find sensors */
-        if (aem1_find_sensors(data))
+        res = aem1_find_sensors(data);
+        if (res)
                goto sensor_err;
        /* Add to our list of AEM devices */
@@ -599,6 +602,8 @@ static int aem_init_aem1_inst(struct aem_ipmi_data *probe, u8 module_handle)
        return 0;
 sensor_err:
+        kfree(data->rs_resp);
+alloc_resp_err:
        hwmon_device_unregister(data->hwmon_dev);
 hwmon_reg_err:
        ipmi_destroy_user(data->ipmi.user);
@@ -614,7 +619,7 @@ id_err:
 }
 /* Find and initialize all AEM1 instances */
-static int aem_init_aem1(struct aem_ipmi_data *probe)
+static void aem_init_aem1(struct aem_ipmi_data *probe)
 {
        int num, i, err;
@@ -625,11 +630,8 @@ static int aem_init_aem1(struct aem_ipmi_data *probe)
                        dev_err(probe->bmc_device,
                                "Error %d initializing AEM1 0x%X\n",
                                err, i);
-                        return err;
                }
        }
-        return 0;
 }
 /* Probe functions for AEM2 devices */
@@ -704,24 +706,31 @@ static int aem_init_aem2_inst(struct aem_ipmi_data *probe,
        platform_set_drvdata(data->pdev, data);
        /* Set up IPMI interface */
-        if (aem_init_ipmi_data(&data->ipmi, probe->interface,
+        res = aem_init_ipmi_data(&data->ipmi, probe->interface,
-                               probe->bmc_device))
+                                 probe->bmc_device);
+        if (res)
                goto ipmi_err;
        /* Register with hwmon */
        data->hwmon_dev = hwmon_device_register(&data->pdev->dev);
        if (IS_ERR(data->hwmon_dev)) {
                dev_err(&data->pdev->dev, "Unable to register hwmon "
                        "device for IPMI interface %d\n",
                        probe->interface);
+                res = PTR_ERR(data->hwmon_dev);
                goto hwmon_reg_err;
        }
        data->update = update_aem2_sensors;
+        data->rs_resp = kzalloc(sizeof(*(data->rs_resp)) + 8, GFP_KERNEL);
+        if (!data->rs_resp) {
+                res = -ENOMEM;
+                goto alloc_resp_err;
+        }
        /* Find sensors */
-        if (aem2_find_sensors(data))
+        res = aem2_find_sensors(data);
+        if (res)
                goto sensor_err;
        /* Add to our list of AEM devices */
@@ -733,6 +742,8 @@ static int aem_init_aem2_inst(struct aem_ipmi_data *probe,
        return 0;
 sensor_err:
+        kfree(data->rs_resp);
+alloc_resp_err:
        hwmon_device_unregister(data->hwmon_dev);
 hwmon_reg_err:
        ipmi_destroy_user(data->ipmi.user);
@@ -748,7 +759,7 @@ id_err:
 }
 /* Find and initialize all AEM2 instances */
-static int aem_init_aem2(struct aem_ipmi_data *probe)
+static void aem_init_aem2(struct aem_ipmi_data *probe)
 {
        struct aem_find_instance_resp fi_resp;
        int err;
@@ -767,12 +778,9 @@ static int aem_init_aem2(struct aem_ipmi_data *probe)
                        dev_err(probe->bmc_device,
                                "Error %d initializing AEM2 0x%X\n",
                                err, fi_resp.module_handle);
-                        return err;
                }
                i++;
        }
-        return 0;
 }
 /* Probe a BMC for AEM firmware instances */
diff --git a/drivers/hwmon/jc42.c b/drivers/hwmon/jc42.c
index 02cebb74e206..2d3d72805ff4 100644
--- a/drivers/hwmon/jc42.c
+++ b/drivers/hwmon/jc42.c
@@ -154,8 +154,6 @@ static int jc42_probe(struct i2c_client *client,
                      const struct i2c_device_id *id);
 static int jc42_detect(struct i2c_client *client, struct i2c_board_info *info);
 static int jc42_remove(struct i2c_client *client);
-static int jc42_read_value(struct i2c_client *client, u8 reg);
-static int jc42_write_value(struct i2c_client *client, u8 reg, u16 value);
 static struct jc42_data *jc42_update_device(struct device *dev);
@@ -187,7 +185,7 @@ static int jc42_suspend(struct device *dev)
        struct jc42_data *data = i2c_get_clientdata(client);
        data->config |= JC42_CFG_SHUTDOWN;
-        jc42_write_value(client, JC42_REG_CONFIG, data->config);
+        i2c_smbus_write_word_swapped(client, JC42_REG_CONFIG, data->config);
        return 0;
 }
@@ -197,7 +195,7 @@ static int jc42_resume(struct device *dev)
        struct jc42_data *data = i2c_get_clientdata(client);
        data->config &= ~JC42_CFG_SHUTDOWN;
-        jc42_write_value(client, JC42_REG_CONFIG, data->config);
+        i2c_smbus_write_word_swapped(client, JC42_REG_CONFIG, data->config);
        return 0;
 }
@@ -315,7 +313,7 @@ static ssize_t set_##value(struct device *dev,				\
                return -EINVAL;                                         \
        mutex_lock(&data->update_lock);                                 \
        data->value = jc42_temp_to_reg(val, data->extended);            \
-        err = jc42_write_value(client, reg, data->value);               \
+        err = i2c_smbus_write_word_swapped(client, reg, data->value);   \
        if (err < 0)                                                    \
                ret = err;                                              \
        mutex_unlock(&data->update_lock);                               \
@@ -357,7 +355,8 @@ static ssize_t set_temp_crit_hyst(struct device *dev,
        data->config = (data->config
                        & ~(JC42_CFG_HYST_MASK << JC42_CFG_HYST_SHIFT))
          | (hyst << JC42_CFG_HYST_SHIFT);
-        err = jc42_write_value(client, JC42_REG_CONFIG, data->config);
+        err = i2c_smbus_write_word_swapped(client, JC42_REG_CONFIG,
+                                           data->config);
        if (err < 0)
                ret = err;
        mutex_unlock(&data->update_lock);
@@ -452,10 +451,10 @@ static int jc42_detect(struct i2c_client *new_client,
                                     I2C_FUNC_SMBUS_WORD_DATA))
                return -ENODEV;
-        cap = jc42_read_value(new_client, JC42_REG_CAP);
+        cap = i2c_smbus_read_word_swapped(new_client, JC42_REG_CAP);
-        config = jc42_read_value(new_client, JC42_REG_CONFIG);
+        config = i2c_smbus_read_word_swapped(new_client, JC42_REG_CONFIG);
-        manid = jc42_read_value(new_client, JC42_REG_MANID);
+        manid = i2c_smbus_read_word_swapped(new_client, JC42_REG_MANID);
-        devid = jc42_read_value(new_client, JC42_REG_DEVICEID);
+        devid = i2c_smbus_read_word_swapped(new_client, JC42_REG_DEVICEID);
        if (cap < 0 || config < 0 || manid < 0 || devid < 0)
                return -ENODEV;
@@ -489,14 +488,14 @@ static int jc42_probe(struct i2c_client *new_client,
        i2c_set_clientdata(new_client, data);
        mutex_init(&data->update_lock);
-        cap = jc42_read_value(new_client, JC42_REG_CAP);
+        cap = i2c_smbus_read_word_swapped(new_client, JC42_REG_CAP);
        if (cap < 0) {
                err = -EINVAL;
                goto exit_free;
        }
        data->extended = !!(cap & JC42_CAP_RANGE);
-        config = jc42_read_value(new_client, JC42_REG_CONFIG);
+        config = i2c_smbus_read_word_swapped(new_client, JC42_REG_CONFIG);
        if (config < 0) {
                err = -EINVAL;
                goto exit_free;
@@ -504,7 +503,8 @@ static int jc42_probe(struct i2c_client *new_client,
        data->orig_config = config;
        if (config & JC42_CFG_SHUTDOWN) {
                config &= ~JC42_CFG_SHUTDOWN;
-                jc42_write_value(new_client, JC42_REG_CONFIG, config);
+                i2c_smbus_write_word_swapped(new_client, JC42_REG_CONFIG,
+                                             config);
        }
        data->config = config;
@@ -535,25 +535,12 @@ static int jc42_remove(struct i2c_client *client)
        hwmon_device_unregister(data->hwmon_dev);
        sysfs_remove_group(&client->dev.kobj, &jc42_group);
        if (data->config != data->orig_config)
-                jc42_write_value(client, JC42_REG_CONFIG, data->orig_config);
+                i2c_smbus_write_word_swapped(client, JC42_REG_CONFIG,
+                                             data->orig_config);
        kfree(data);
        return 0;
 }
-/* All registers are word-sized. */
-static int jc42_read_value(struct i2c_client *client, u8 reg)
-{
-        int ret = i2c_smbus_read_word_data(client, reg);
-        if (ret < 0)
-                return ret;
-        return swab16(ret);
-}
-static int jc42_write_value(struct i2c_client *client, u8 reg, u16 value)
-{
-        return i2c_smbus_write_word_data(client, reg, swab16(value));
-}
 static struct jc42_data *jc42_update_device(struct device *dev)
 {
        struct i2c_client *client = to_i2c_client(dev);
@@ -564,28 +551,29 @@ static struct jc42_data *jc42_update_device(struct device *dev)
        mutex_lock(&data->update_lock);
        if (time_after(jiffies, data->last_updated + HZ) || !data->valid) {
-                val = jc42_read_value(client, JC42_REG_TEMP);
+                val = i2c_smbus_read_word_swapped(client, JC42_REG_TEMP);
                if (val < 0) {
                        ret = ERR_PTR(val);
                        goto abort;
                }
                data->temp_input = val;
-                val = jc42_read_value(client, JC42_REG_TEMP_CRITICAL);
+                val = i2c_smbus_read_word_swapped(client,
+                                                  JC42_REG_TEMP_CRITICAL);
                if (val < 0) {
                        ret = ERR_PTR(val);
                        goto abort;
                }
                data->temp_crit = val;
-                val = jc42_read_value(client, JC42_REG_TEMP_LOWER);
+                val = i2c_smbus_read_word_swapped(client, JC42_REG_TEMP_LOWER);
                if (val < 0) {
                        ret = ERR_PTR(val);
                        goto abort;
                }
                data->temp_min = val;
-                val = jc42_read_value(client, JC42_REG_TEMP_UPPER);
+                val = i2c_smbus_read_word_swapped(client, JC42_REG_TEMP_UPPER);
                if (val < 0) {
                        ret = ERR_PTR(val);
                        goto abort;
diff --git a/drivers/hwmon/lm73.c b/drivers/hwmon/lm73.c
index 29b9030d42c3..9e64d96620d3 100644
--- a/drivers/hwmon/lm73.c
+++ b/drivers/hwmon/lm73.c
@@ -34,7 +34,7 @@ static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4c,
 #define LM73_REG_CTRL           0x04
 #define LM73_REG_ID             0x07
-#define LM73_ID                 0x9001 /* or 0x190 after a swab16() */
+#define LM73_ID                 0x9001  /* 0x0190, byte-swapped */
 #define DRVNAME                 "lm73"
 #define LM73_TEMP_MIN           (-40)
 #define LM73_TEMP_MAX           150
@@ -57,7 +57,7 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *da,
        /* Write value */
        value = (short) SENSORS_LIMIT(temp/250, (LM73_TEMP_MIN*4),
                (LM73_TEMP_MAX*4)) << 5;
-        i2c_smbus_write_word_data(client, attr->index, swab16(value));
+        i2c_smbus_write_word_swapped(client, attr->index, value);
        return count;
 }
@@ -68,8 +68,8 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *da,
        struct i2c_client *client = to_i2c_client(dev);
        /* use integer division instead of equivalent right shift to
           guarantee arithmetic shift and preserve the sign */
-        int temp = ((s16) (swab16(i2c_smbus_read_word_data(client,
+        int temp = ((s16) (i2c_smbus_read_word_swapped(client,
-                attr->index)))*250) / 32;
+                    attr->index))*250) / 32;
        return sprintf(buf, "%d\n", temp);
 }
@@ -150,17 +150,31 @@ static int lm73_detect(struct i2c_client *new_client,
                        struct i2c_board_info *info)
 {
        struct i2c_adapter *adapter = new_client->adapter;
-        u16 id;
+        int id, ctrl, conf;
-        u8 ctrl;
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |
                                        I2C_FUNC_SMBUS_WORD_DATA))
                return -ENODEV;
+        /*
+         * Do as much detection as possible with byte reads first, as word
+         * reads can confuse other devices.
+         */
+        ctrl = i2c_smbus_read_byte_data(new_client, LM73_REG_CTRL);
+        if (ctrl < 0 || (ctrl & 0x10))
+                return -ENODEV;
+        conf = i2c_smbus_read_byte_data(new_client, LM73_REG_CONF);
+        if (conf < 0 || (conf & 0x0c))
+                return -ENODEV;
+        id = i2c_smbus_read_byte_data(new_client, LM73_REG_ID);
+        if (id < 0 || id != (LM73_ID & 0xff))
+                return -ENODEV;
        /* Check device ID */
        id = i2c_smbus_read_word_data(new_client, LM73_REG_ID);
-        ctrl = i2c_smbus_read_byte_data(new_client, LM73_REG_CTRL);
+        if (id < 0 || id != LM73_ID)
-        if ((id != LM73_ID) || (ctrl & 0x10))
                return -ENODEV;
        strlcpy(info->type, "lm73", I2C_NAME_SIZE);
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index 90126a2a1e44..1888dd0fc05f 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -384,13 +384,10 @@ static struct i2c_driver lm75_driver = {
 */
 static int lm75_read_value(struct i2c_client *client, u8 reg)
 {
-        int value;
        if (reg == LM75_REG_CONF)
                return i2c_smbus_read_byte_data(client, reg);
+        else
-        value = i2c_smbus_read_word_data(client, reg);
+                return i2c_smbus_read_word_swapped(client, reg);
-        return (value < 0) ? value : swab16(value);
 }
 static int lm75_write_value(struct i2c_client *client, u8 reg, u16 value)
@@ -398,7 +395,7 @@ static int lm75_write_value(struct i2c_client *client, u8 reg, u16 value)
        if (reg == LM75_REG_CONF)
                return i2c_smbus_write_byte_data(client, reg, value);
        else
-                return i2c_smbus_write_word_data(client, reg, swab16(value));
+                return i2c_smbus_write_word_swapped(client, reg, value);
 }
 static struct lm75_data *lm75_update_device(struct device *dev)
diff --git a/drivers/hwmon/lm77.c b/drivers/hwmon/lm77.c
index b28a297be50c..8dfc6782d596 100644
--- a/drivers/hwmon/lm77.c
+++ b/drivers/hwmon/lm77.c
@@ -365,7 +365,7 @@ static u16 lm77_read_value(struct i2c_client *client, u8 reg)
        if (reg == LM77_REG_CONF)
                return i2c_smbus_read_byte_data(client, reg);
        else
-                return swab16(i2c_smbus_read_word_data(client, reg));
+                return i2c_smbus_read_word_swapped(client, reg);
 }
 static int lm77_write_value(struct i2c_client *client, u8 reg, u16 value)
@@ -373,7 +373,7 @@ static int lm77_write_value(struct i2c_client *client, u8 reg, u16 value)
        if (reg == LM77_REG_CONF)
                return i2c_smbus_write_byte_data(client, reg, value);
        else
-                return i2c_smbus_write_word_data(client, reg, swab16(value));
+                return i2c_smbus_write_word_swapped(client, reg, value);
 }
 static void lm77_init_client(struct i2c_client *client)
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index 90ddb8774210..615bc4f4e530 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -1105,41 +1105,37 @@ static DEVICE_ATTR(pec, S_IWUSR | S_IRUGO, show_pec, set_pec);
 */
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int lm90_detect(struct i2c_client *new_client,
+static int lm90_detect(struct i2c_client *client,
                       struct i2c_board_info *info)
 {
-        struct i2c_adapter *adapter = new_client->adapter;
+        struct i2c_adapter *adapter = client->adapter;
-        int address = new_client->addr;
+        int address = client->addr;
        const char *name = NULL;
-        int man_id, chip_id, reg_config1, reg_config2, reg_convrate;
+        int man_id, chip_id, config1, config2, convrate;
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                return -ENODEV;
        /* detection and identification */
-        if ((man_id = i2c_smbus_read_byte_data(new_client,
+        man_id = i2c_smbus_read_byte_data(client, LM90_REG_R_MAN_ID);
-                                                LM90_REG_R_MAN_ID)) < 0
+        chip_id = i2c_smbus_read_byte_data(client, LM90_REG_R_CHIP_ID);
-         || (chip_id = i2c_smbus_read_byte_data(new_client,
+        config1 = i2c_smbus_read_byte_data(client, LM90_REG_R_CONFIG1);
-                                                LM90_REG_R_CHIP_ID)) < 0
+        convrate = i2c_smbus_read_byte_data(client, LM90_REG_R_CONVRATE);
-         || (reg_config1 = i2c_smbus_read_byte_data(new_client,
+        if (man_id < 0 || chip_id < 0 || config1 < 0 || convrate < 0)
-                                                LM90_REG_R_CONFIG1)) < 0
-         || (reg_convrate = i2c_smbus_read_byte_data(new_client,
-                                                LM90_REG_R_CONVRATE)) < 0)
                return -ENODEV;
        if (man_id == 0x01 || man_id == 0x5C || man_id == 0x41) {
-                reg_config2 = i2c_smbus_read_byte_data(new_client,
+                config2 = i2c_smbus_read_byte_data(client, LM90_REG_R_CONFIG2);
-                                                LM90_REG_R_CONFIG2);
+                if (config2 < 0)
-                if (reg_config2 < 0)
                        return -ENODEV;
        } else
-                reg_config2 = 0;        /* Make compiler happy */
+                config2 = 0;            /* Make compiler happy */
        if ((address == 0x4C || address == 0x4D)
         && man_id == 0x01) { /* National Semiconductor */
-                if ((reg_config1 & 0x2A) == 0x00
+                if ((config1 & 0x2A) == 0x00
-                 && (reg_config2 & 0xF8) == 0x00
+                 && (config2 & 0xF8) == 0x00
-                 && reg_convrate <= 0x09) {
+                 && convrate <= 0x09) {
                        if (address == 0x4C
                         && (chip_id & 0xF0) == 0x20) { /* LM90 */
                                name = "lm90";
@@ -1163,8 +1159,8 @@ static int lm90_detect(struct i2c_client *new_client,
        if ((address == 0x4C || address == 0x4D)
         && man_id == 0x41) { /* Analog Devices */
                if ((chip_id & 0xF0) == 0x40 /* ADM1032 */
-                 && (reg_config1 & 0x3F) == 0x00
+                 && (config1 & 0x3F) == 0x00
-                 && reg_convrate <= 0x0A) {
+                 && convrate <= 0x0A) {
                        name = "adm1032";
                        /* The ADM1032 supports PEC, but only if combined
                           transactions are not used. */
@@ -1173,18 +1169,18 @@ static int lm90_detect(struct i2c_client *new_client,
                                info->flags |= I2C_CLIENT_PEC;
                } else
                if (chip_id == 0x51 /* ADT7461 */
-                 && (reg_config1 & 0x1B) == 0x00
+                 && (config1 & 0x1B) == 0x00
-                 && reg_convrate <= 0x0A) {
+                 && convrate <= 0x0A) {
                        name = "adt7461";
                } else
                if (chip_id == 0x57 /* ADT7461A, NCT1008 */
-                 && (reg_config1 & 0x1B) == 0x00
+                 && (config1 & 0x1B) == 0x00
-                 && reg_convrate <= 0x0A) {
+                 && convrate <= 0x0A) {
                        name = "adt7461a";
                }
        } else
        if (man_id == 0x4D) { /* Maxim */
-                int reg_emerg, reg_emerg2, reg_status2;
+                int emerg, emerg2, status2;
                /*
                 * We read MAX6659_REG_R_REMOTE_EMERG twice, and re-read
@@ -1192,13 +1188,15 @@ static int lm90_detect(struct i2c_client *new_client,
                 * exists, both readings will reflect the same value. Otherwise,
                 * the readings will be different.
                 */
-                if ((reg_emerg = i2c_smbus_read_byte_data(new_client,
+                emerg = i2c_smbus_read_byte_data(client,
-                                                MAX6659_REG_R_REMOTE_EMERG)) < 0
+                                                 MAX6659_REG_R_REMOTE_EMERG);
-                 || i2c_smbus_read_byte_data(new_client, LM90_REG_R_MAN_ID) < 0
+                man_id = i2c_smbus_read_byte_data(client,
-                 || (reg_emerg2 = i2c_smbus_read_byte_data(new_client,
+                                                  LM90_REG_R_MAN_ID);
-                                                MAX6659_REG_R_REMOTE_EMERG)) < 0
+                emerg2 = i2c_smbus_read_byte_data(client,
-                 || (reg_status2 = i2c_smbus_read_byte_data(new_client,
+                                                  MAX6659_REG_R_REMOTE_EMERG);
-                                                MAX6696_REG_R_STATUS2)) < 0)
+                status2 = i2c_smbus_read_byte_data(client,
+                                                   MAX6696_REG_R_STATUS2);
+                if (emerg < 0 || man_id < 0 || emerg2 < 0 || status2 < 0)
                        return -ENODEV;
                /*
@@ -1216,8 +1214,8 @@ static int lm90_detect(struct i2c_client *new_client,
                 */
                if (chip_id == man_id
                 && (address == 0x4C || address == 0x4D || address == 0x4E)
-                 && (reg_config1 & 0x1F) == (man_id & 0x0F)
+                 && (config1 & 0x1F) == (man_id & 0x0F)
-                 && reg_convrate <= 0x09) {
+                 && convrate <= 0x09) {
                        if (address == 0x4C)
                                name = "max6657";
                        else
@@ -1235,10 +1233,10 @@ static int lm90_detect(struct i2c_client *new_client,
                 * one of those registers exists.
                 */
                if (chip_id == 0x01
-                 && (reg_config1 & 0x10) == 0x00
+                 && (config1 & 0x10) == 0x00
-                 && (reg_status2 & 0x01) == 0x00
+                 && (status2 & 0x01) == 0x00
-                 && reg_emerg == reg_emerg2
+                 && emerg == emerg2
-                 && reg_convrate <= 0x07) {
+                 && convrate <= 0x07) {
                        name = "max6696";
                } else
                /*
@@ -1248,8 +1246,8 @@ static int lm90_detect(struct i2c_client *new_client,
                 * second to last bit of config1 (software reset).
                 */
                if (chip_id == 0x01
-                 && (reg_config1 & 0x03) == 0x00
+                 && (config1 & 0x03) == 0x00
-                 && reg_convrate <= 0x07) {
+                 && convrate <= 0x07) {
                        name = "max6680";
                } else
                /*
@@ -1258,21 +1256,21 @@ static int lm90_detect(struct i2c_client *new_client,
                 * register are unused and should return zero when read.
                 */
                if (chip_id == 0x59
-                 && (reg_config1 & 0x3f) == 0x00
+                 && (config1 & 0x3f) == 0x00
-                 && reg_convrate <= 0x07) {
+                 && convrate <= 0x07) {
                        name = "max6646";
                }
        } else
        if (address == 0x4C
         && man_id == 0x5C) { /* Winbond/Nuvoton */
-                if ((reg_config1 & 0x2A) == 0x00
+                if ((config1 & 0x2A) == 0x00
-                 && (reg_config2 & 0xF8) == 0x00) {
+                 && (config2 & 0xF8) == 0x00) {
                        if (chip_id == 0x01 /* W83L771W/G */
-                         && reg_convrate <= 0x09) {
+                         && convrate <= 0x09) {
                                name = "w83l771";
                        } else
                        if ((chip_id & 0xFE) == 0x10 /* W83L771AWG/ASG */
-                         && reg_convrate <= 0x08) {
+                         && convrate <= 0x08) {
                                name = "w83l771";
                        }
                }
@@ -1280,9 +1278,9 @@ static int lm90_detect(struct i2c_client *new_client,
        if (address >= 0x48 && address <= 0x4F
         && man_id == 0xA1) { /*  NXP Semiconductor/Philips */
                if (chip_id == 0x00
-                 && (reg_config1 & 0x2A) == 0x00
+                 && (config1 & 0x2A) == 0x00
-                 && (reg_config2 & 0xFE) == 0x00
+                 && (config2 & 0xFE) == 0x00
-                 && reg_convrate <= 0x09) {
+                 && convrate <= 0x09) {
                        name = "sa56004";
                }
        }
@@ -1301,19 +1299,18 @@ static int lm90_detect(struct i2c_client *new_client,
 static void lm90_remove_files(struct i2c_client *client, struct lm90_data *data)
 {
+        struct device *dev = &client->dev;
        if (data->flags & LM90_HAVE_TEMP3)
-                sysfs_remove_group(&client->dev.kobj, &lm90_temp3_group);
+                sysfs_remove_group(&dev->kobj, &lm90_temp3_group);
        if (data->flags & LM90_HAVE_EMERGENCY_ALARM)
-                sysfs_remove_group(&client->dev.kobj,
+                sysfs_remove_group(&dev->kobj, &lm90_emergency_alarm_group);
-                                   &lm90_emergency_alarm_group);
        if (data->flags & LM90_HAVE_EMERGENCY)
-                sysfs_remove_group(&client->dev.kobj,
+                sysfs_remove_group(&dev->kobj, &lm90_emergency_group);
-                                   &lm90_emergency_group);
        if (data->flags & LM90_HAVE_OFFSET)
-                device_remove_file(&client->dev,
+                device_remove_file(dev, &sensor_dev_attr_temp2_offset.dev_attr);
-                                   &sensor_dev_attr_temp2_offset.dev_attr);
+        device_remove_file(dev, &dev_attr_pec);
-        device_remove_file(&client->dev, &dev_attr_pec);
+        sysfs_remove_group(&dev->kobj, &lm90_group);
-        sysfs_remove_group(&client->dev.kobj, &lm90_group);
 }
 static void lm90_init_client(struct i2c_client *client)
@@ -1362,10 +1359,11 @@ static void lm90_init_client(struct i2c_client *client)
                i2c_smbus_write_byte_data(client, LM90_REG_W_CONFIG1, config);
 }
-static int lm90_probe(struct i2c_client *new_client,
+static int lm90_probe(struct i2c_client *client,
                      const struct i2c_device_id *id)
 {
-        struct i2c_adapter *adapter = to_i2c_adapter(new_client->dev.parent);
+        struct device *dev = &client->dev;
+        struct i2c_adapter *adapter = to_i2c_adapter(dev->parent);
        struct lm90_data *data;
        int err;
@@ -1374,14 +1372,14 @@ static int lm90_probe(struct i2c_client *new_client,
                err = -ENOMEM;
                goto exit;
        }
-        i2c_set_clientdata(new_client, data);
+        i2c_set_clientdata(client, data);
        mutex_init(&data->update_lock);
        /* Set the device type */
        data->kind = id->driver_data;
        if (data->kind == adm1032) {
                if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE))
-                        new_client->flags &= ~I2C_CLIENT_PEC;
+                        client->flags &= ~I2C_CLIENT_PEC;
        }
        /* Different devices have different alarm bits triggering the
@@ -1396,43 +1394,41 @@ static int lm90_probe(struct i2c_client *new_client,
        data->max_convrate = lm90_params[data->kind].max_convrate;
        /* Initialize the LM90 chip */
-        lm90_init_client(new_client);
+        lm90_init_client(client);
        /* Register sysfs hooks */
-        err = sysfs_create_group(&new_client->dev.kobj, &lm90_group);
+        err = sysfs_create_group(&dev->kobj, &lm90_group);
        if (err)
                goto exit_free;
-        if (new_client->flags & I2C_CLIENT_PEC) {
+        if (client->flags & I2C_CLIENT_PEC) {
-                err = device_create_file(&new_client->dev, &dev_attr_pec);
+                err = device_create_file(dev, &dev_attr_pec);
                if (err)
                        goto exit_remove_files;
        }
        if (data->flags & LM90_HAVE_OFFSET) {
-                err = device_create_file(&new_client->dev,
+                err = device_create_file(dev,
                                        &sensor_dev_attr_temp2_offset.dev_attr);
                if (err)
                        goto exit_remove_files;
        }
        if (data->flags & LM90_HAVE_EMERGENCY) {
-                err = sysfs_create_group(&new_client->dev.kobj,
+                err = sysfs_create_group(&dev->kobj, &lm90_emergency_group);
-                                         &lm90_emergency_group);
                if (err)
                        goto exit_remove_files;
        }
        if (data->flags & LM90_HAVE_EMERGENCY_ALARM) {
-                err = sysfs_create_group(&new_client->dev.kobj,
+                err = sysfs_create_group(&dev->kobj,
                                         &lm90_emergency_alarm_group);
                if (err)
                        goto exit_remove_files;
        }
        if (data->flags & LM90_HAVE_TEMP3) {
-                err = sysfs_create_group(&new_client->dev.kobj,
+                err = sysfs_create_group(&dev->kobj, &lm90_temp3_group);
-                                         &lm90_temp3_group);
                if (err)
                        goto exit_remove_files;
        }
-        data->hwmon_dev = hwmon_device_register(&new_client->dev);
+        data->hwmon_dev = hwmon_device_register(dev);
        if (IS_ERR(data->hwmon_dev)) {
                err = PTR_ERR(data->hwmon_dev);
                goto exit_remove_files;
@@ -1441,7 +1437,7 @@ static int lm90_probe(struct i2c_client *new_client,
        return 0;
 exit_remove_files:
-        lm90_remove_files(new_client, data);
+        lm90_remove_files(client, data);
 exit_free:
        kfree(data);
 exit:
diff --git a/drivers/hwmon/lm92.c b/drivers/hwmon/lm92.c
index 7c31e6205f85..8fcbd4d422c5 100644
--- a/drivers/hwmon/lm92.c
+++ b/drivers/hwmon/lm92.c
@@ -117,16 +117,16 @@ static struct lm92_data *lm92_update_device(struct device *dev)
        if (time_after(jiffies, data->last_updated + HZ)
         || !data->valid) {
                dev_dbg(&client->dev, "Updating lm92 data\n");
-                data->temp1_input = swab16(i2c_smbus_read_word_data(client,
+                data->temp1_input = i2c_smbus_read_word_swapped(client,
-                                    LM92_REG_TEMP));
+                                    LM92_REG_TEMP);
-                data->temp1_hyst = swab16(i2c_smbus_read_word_data(client,
+                data->temp1_hyst = i2c_smbus_read_word_swapped(client,
-                                    LM92_REG_TEMP_HYST));
+                                    LM92_REG_TEMP_HYST);
-                data->temp1_crit = swab16(i2c_smbus_read_word_data(client,
+                data->temp1_crit = i2c_smbus_read_word_swapped(client,
-                                    LM92_REG_TEMP_CRIT));
+                                    LM92_REG_TEMP_CRIT);
-                data->temp1_min = swab16(i2c_smbus_read_word_data(client,
+                data->temp1_min = i2c_smbus_read_word_swapped(client,
-                                    LM92_REG_TEMP_LOW));
+                                    LM92_REG_TEMP_LOW);
-                data->temp1_max = swab16(i2c_smbus_read_word_data(client,
+                data->temp1_max = i2c_smbus_read_word_swapped(client,
-                                    LM92_REG_TEMP_HIGH));
+                                    LM92_REG_TEMP_HIGH);
                data->last_updated = jiffies;
                data->valid = 1;
@@ -158,7 +158,7 @@ static ssize_t set_##value(struct device *dev, struct device_attribute *attr, co
 \
        mutex_lock(&data->update_lock); \
        data->value = TEMP_TO_REG(val); \
-        i2c_smbus_write_word_data(client, reg, swab16(data->value)); \
+        i2c_smbus_write_word_swapped(client, reg, data->value); \
        mutex_unlock(&data->update_lock); \
        return count; \
 }
@@ -194,8 +194,8 @@ static ssize_t set_temp1_crit_hyst(struct device *dev, struct device_attribute *
        mutex_lock(&data->update_lock);
        data->temp1_hyst = TEMP_FROM_REG(data->temp1_crit) - val;
-        i2c_smbus_write_word_data(client, LM92_REG_TEMP_HYST,
+        i2c_smbus_write_word_swapped(client, LM92_REG_TEMP_HYST,
-                                  swab16(TEMP_TO_REG(data->temp1_hyst)));
+                                     TEMP_TO_REG(data->temp1_hyst));
        mutex_unlock(&data->update_lock);
        return count;
 }
diff --git a/drivers/hwmon/max16065.c b/drivers/hwmon/max16065.c
index dd2d7b9620c2..385886a4f224 100644
--- a/drivers/hwmon/max16065.c
+++ b/drivers/hwmon/max16065.c
@@ -137,10 +137,10 @@ static int max16065_read_adc(struct i2c_client *client, int reg)
 {
        int rv;
-        rv = i2c_smbus_read_word_data(client, reg);
+        rv = i2c_smbus_read_word_swapped(client, reg);
        if (unlikely(rv < 0))
                return rv;
-        return ((rv & 0xff) << 2) | ((rv >> 14) & 0x03);
+        return rv >> 6;
 }
 static struct max16065_data *max16065_update_device(struct device *dev)
diff --git a/drivers/hwmon/mc13783-adc.c b/drivers/hwmon/mc13783-adc.c
index d5226c9e1201..ef65ab56b094 100644
--- a/drivers/hwmon/mc13783-adc.c
+++ b/drivers/hwmon/mc13783-adc.c
@@ -31,7 +31,7 @@
 #define MC13783_ADC_NAME        "mc13783-adc"
 struct mc13783_adc_priv {
-        struct mc13783 *mc13783;
+        struct mc13xxx *mc13xxx;
        struct device *hwmon_dev;
 };
@@ -51,8 +51,8 @@ static int mc13783_adc_read(struct device *dev,
        unsigned int sample[4];
        int ret;
-        ret = mc13783_adc_do_conversion(priv->mc13783,
+        ret = mc13xxx_adc_do_conversion(priv->mc13xxx,
-                        MC13783_ADC_MODE_MULT_CHAN,
+                        MC13XXX_ADC_MODE_MULT_CHAN,
                        channel, sample);
        if (ret)
                return ret;
@@ -147,9 +147,9 @@ static const struct attribute_group mc13783_group_ts = {
 static int mc13783_adc_use_touchscreen(struct platform_device *pdev)
 {
        struct mc13783_adc_priv *priv = platform_get_drvdata(pdev);
-        unsigned flags = mc13783_get_flags(priv->mc13783);
+        unsigned flags = mc13xxx_get_flags(priv->mc13xxx);
-        return flags & MC13783_USE_TOUCHSCREEN;
+        return flags & MC13XXX_USE_TOUCHSCREEN;
 }
 static int __init mc13783_adc_probe(struct platform_device *pdev)
@@ -161,7 +161,7 @@ static int __init mc13783_adc_probe(struct platform_device *pdev)
        if (!priv)
                return -ENOMEM;
-        priv->mc13783 = dev_get_drvdata(pdev->dev.parent);
+        priv->mc13xxx = dev_get_drvdata(pdev->dev.parent);
        platform_set_drvdata(pdev, priv);
diff --git a/drivers/hwmon/sht21.c b/drivers/hwmon/sht21.c
index 1c8c9812f244..15398780cc00 100644
--- a/drivers/hwmon/sht21.c
+++ b/drivers/hwmon/sht21.c
@@ -83,25 +83,6 @@ static inline int sht21_rh_ticks_to_per_cent_mille(int ticks)
 }
 /**
- * sht21_read_word_data() - read word from register
- * @client: I2C client device
- * @reg: I2C command byte
- *
- * Returns value, negative errno on error.
- */
-static inline int sht21_read_word_data(struct i2c_client *client, u8 reg)
-{
-        int ret = i2c_smbus_read_word_data(client, reg);
-        if (ret < 0)
-                return ret;
-        /*
-         * SMBus specifies low byte first, but the SHT21 returns MSB
-         * first, so we have to swab16 the values
-         */
-        return swab16(ret);
-}
-/**
 * sht21_update_measurements() - get updated measurements from device
 * @client: I2C client device
 *
@@ -119,12 +100,13 @@ static int sht21_update_measurements(struct i2c_client *client)
         * maximum two measurements per second at 12bit accuracy shall be made.
         */
        if (time_after(jiffies, sht21->last_update + HZ / 2) || !sht21->valid) {
-                ret = sht21_read_word_data(client, SHT21_TRIG_T_MEASUREMENT_HM);
+                ret = i2c_smbus_read_word_swapped(client,
+                                                  SHT21_TRIG_T_MEASUREMENT_HM);
                if (ret < 0)
                        goto out;
                sht21->temperature = sht21_temp_ticks_to_millicelsius(ret);
-                ret = sht21_read_word_data(client,
+                ret = i2c_smbus_read_word_swapped(client,
-                                        SHT21_TRIG_RH_MEASUREMENT_HM);
+                                                  SHT21_TRIG_RH_MEASUREMENT_HM);
                if (ret < 0)
                        goto out;
                sht21->humidity = sht21_rh_ticks_to_per_cent_mille(ret);
diff --git a/drivers/hwmon/smm665.c b/drivers/hwmon/smm665.c
index 425df5bccd45..411638181fd8 100644
--- a/drivers/hwmon/smm665.c
+++ b/drivers/hwmon/smm665.c
@@ -214,33 +214,26 @@ static int smm665_read_adc(struct smm665_data *data, int adc)
         *
         * Neither i2c_smbus_read_byte() nor
         * i2c_smbus_read_block_data() worked here,
-         * so use i2c_smbus_read_word_data() instead.
+         * so use i2c_smbus_read_word_swapped() instead.
         * We could also try to use i2c_master_recv(),
         * but that is not always supported.
         */
-        rv = i2c_smbus_read_word_data(client, 0);
+        rv = i2c_smbus_read_word_swapped(client, 0);
        if (rv < 0) {
                dev_dbg(&client->dev, "Failed to read ADC value: error %d", rv);
                return -1;
        }
        /*
         * Validate/verify readback adc channel (in bit 11..14).
-         * High byte is in lower 8 bit of rv, so only shift by 3.
         */
-        radc = (rv >> 3) & 0x0f;
+        radc = (rv >> 11) & 0x0f;
        if (radc != adc) {
                dev_dbg(&client->dev, "Unexpected RADC: Expected %d got %d",
                        adc, radc);
                return -EIO;
        }
-        /*
-         * Chip replies with H/L, while SMBus expects L/H.
-         * Thus, byte order is reversed, and we have to swap
-         * the result.
-         */
-        rv = swab16(rv) & SMM665_ADC_MASK;
-        return rv;
+        return rv & SMM665_ADC_MASK;
 }
 static struct smm665_data *smm665_update_device(struct device *dev)
diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c
index 9fb7516e6f45..65c88ff5645a 100644
--- a/drivers/hwmon/smsc47b397.c
+++ b/drivers/hwmon/smsc47b397.c
@@ -113,7 +113,7 @@ struct smsc47b397_data {
        u8 temp[4];
 };
-static int smsc47b397_read_value(struct smsc47b397_data* data, u8 reg)
+static int smsc47b397_read_value(struct smsc47b397_data *data, u8 reg)
 {
        int res;
@@ -265,7 +265,8 @@ static int __devinit smsc47b397_probe(struct platform_device *pdev)
                return -EBUSY;
        }
-        if (!(data = kzalloc(sizeof(struct smsc47b397_data), GFP_KERNEL))) {
+        data = kzalloc(sizeof(struct smsc47b397_data), GFP_KERNEL);
+        if (!data) {
                err = -ENOMEM;
                goto error_release;
        }
@@ -276,7 +277,8 @@ static int __devinit smsc47b397_probe(struct platform_device *pdev)
        mutex_init(&data->update_lock);
        platform_set_drvdata(pdev, data);
-        if ((err = sysfs_create_group(&dev->kobj, &smsc47b397_group)))
+        err = sysfs_create_group(&dev->kobj, &smsc47b397_group);
+        if (err)
                goto error_free;
        data->hwmon_dev = hwmon_device_register(dev);
@@ -345,7 +347,7 @@ static int __init smsc47b397_find(unsigned short *addr)
        superio_enter();
        id = force_id ? force_id : superio_inb(SUPERIO_REG_DEVID);
-        switch(id) {
+        switch (id) {
        case 0x81:
                name = "SCH5307-NS";
                break;
@@ -379,7 +381,8 @@ static int __init smsc47b397_init(void)
        unsigned short address;
        int ret;
-        if ((ret = smsc47b397_find(&address)))
+        ret = smsc47b397_find(&address);
+        if (ret)
                return ret;
        ret = platform_driver_register(&smsc47b397_driver);
diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c
index 5bd194968801..643aa8c94535 100644
--- a/drivers/hwmon/tmp102.c
+++ b/drivers/hwmon/tmp102.c
@@ -55,19 +55,6 @@ struct tmp102 {
        int temp[3];
 };
-/* SMBus specifies low byte first, but the TMP102 returns high byte first,
- * so we have to swab16 the values */
-static inline int tmp102_read_reg(struct i2c_client *client, u8 reg)
-{
-        int result = i2c_smbus_read_word_data(client, reg);
-        return result < 0 ? result : swab16(result);
-}
-static inline int tmp102_write_reg(struct i2c_client *client, u8 reg, u16 val)
-{
-        return i2c_smbus_write_word_data(client, reg, swab16(val));
-}
 /* convert left adjusted 13-bit TMP102 register value to milliCelsius */
 static inline int tmp102_reg_to_mC(s16 val)
 {
@@ -94,7 +81,8 @@ static struct tmp102 *tmp102_update_device(struct i2c_client *client)
        if (time_after(jiffies, tmp102->last_update + HZ / 3)) {
                int i;
                for (i = 0; i < ARRAY_SIZE(tmp102->temp); ++i) {
-                        int status = tmp102_read_reg(client, tmp102_reg[i]);
+                        int status = i2c_smbus_read_word_swapped(client,
+                                                                 tmp102_reg[i]);
                        if (status > -1)
                                tmp102->temp[i] = tmp102_reg_to_mC(status);
                }
@@ -130,8 +118,8 @@ static ssize_t tmp102_set_temp(struct device *dev,
        mutex_lock(&tmp102->lock);
        tmp102->temp[sda->index] = val;
-        status = tmp102_write_reg(client, tmp102_reg[sda->index],
+        status = i2c_smbus_write_word_swapped(client, tmp102_reg[sda->index],
-                                  tmp102_mC_to_reg(val));
+                                              tmp102_mC_to_reg(val));
        mutex_unlock(&tmp102->lock);
        return status ? : count;
 }
@@ -178,18 +166,19 @@ static int __devinit tmp102_probe(struct i2c_client *client,
        }
        i2c_set_clientdata(client, tmp102);
-        status = tmp102_read_reg(client, TMP102_CONF_REG);
+        status = i2c_smbus_read_word_swapped(client, TMP102_CONF_REG);
        if (status < 0) {
                dev_err(&client->dev, "error reading config register\n");
                goto fail_free;
        }
        tmp102->config_orig = status;
-        status = tmp102_write_reg(client, TMP102_CONF_REG, TMP102_CONFIG);
+        status = i2c_smbus_write_word_swapped(client, TMP102_CONF_REG,
+                                              TMP102_CONFIG);
        if (status < 0) {
                dev_err(&client->dev, "error writing config register\n");
                goto fail_restore_config;
        }
-        status = tmp102_read_reg(client, TMP102_CONF_REG);
+        status = i2c_smbus_read_word_swapped(client, TMP102_CONF_REG);
        if (status < 0) {
                dev_err(&client->dev, "error reading config register\n");
                goto fail_restore_config;
@@ -222,7 +211,8 @@ static int __devinit tmp102_probe(struct i2c_client *client,
 fail_remove_sysfs:
        sysfs_remove_group(&client->dev.kobj, &tmp102_attr_group);
 fail_restore_config:
-        tmp102_write_reg(client, TMP102_CONF_REG, tmp102->config_orig);
+        i2c_smbus_write_word_swapped(client, TMP102_CONF_REG,
+                                     tmp102->config_orig);
 fail_free:
        kfree(tmp102);
@@ -240,10 +230,10 @@ static int __devexit tmp102_remove(struct i2c_client *client)
        if (tmp102->config_orig & TMP102_CONF_SD) {
                int config;
-                config = tmp102_read_reg(client, TMP102_CONF_REG);
+                config = i2c_smbus_read_word_swapped(client, TMP102_CONF_REG);
                if (config >= 0)
-                        tmp102_write_reg(client, TMP102_CONF_REG,
+                        i2c_smbus_write_word_swapped(client, TMP102_CONF_REG,
-                                         config | TMP102_CONF_SD);
+                                                     config | TMP102_CONF_SD);
        }
        kfree(tmp102);
@@ -257,12 +247,12 @@ static int tmp102_suspend(struct device *dev)
        struct i2c_client *client = to_i2c_client(dev);
        int config;
-        config = tmp102_read_reg(client, TMP102_CONF_REG);
+        config = i2c_smbus_read_word_swapped(client, TMP102_CONF_REG);
        if (config < 0)
                return config;
        config |= TMP102_CONF_SD;
-        return tmp102_write_reg(client, TMP102_CONF_REG, config);
+        return i2c_smbus_write_word_swapped(client, TMP102_CONF_REG, config);
 }
 static int tmp102_resume(struct device *dev)
@@ -270,12 +260,12 @@ static int tmp102_resume(struct device *dev)
        struct i2c_client *client = to_i2c_client(dev);
        int config;
-        config = tmp102_read_reg(client, TMP102_CONF_REG);
+        config = i2c_smbus_read_word_swapped(client, TMP102_CONF_REG);
        if (config < 0)
                return config;
        config &= ~TMP102_CONF_SD;
-        return tmp102_write_reg(client, TMP102_CONF_REG, config);
+        return i2c_smbus_write_word_swapped(client, TMP102_CONF_REG, config);
 }
 static const struct dev_pm_ops tmp102_dev_pm_ops = {
diff --git a/drivers/hwmon/ultra45_env.c b/drivers/hwmon/ultra45_env.c
index 27a62711e0a6..3cd07bf42dca 100644
--- a/drivers/hwmon/ultra45_env.c
+++ b/drivers/hwmon/ultra45_env.c
@@ -6,6 +6,7 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/io.h>
 #include <linux/hwmon.h>
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 98aab4bea342..93f5fc7d6059 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -1,7 +1,7 @@
 /*
    w83627ehf - Driver for the hardware monitoring functionality of
                the Winbond W83627EHF Super-I/O chip
-    Copyright (C) 2005  Jean Delvare <khali@linux-fr.org>
+    Copyright (C) 2005-2011  Jean Delvare <khali@linux-fr.org>
    Copyright (C) 2006  Yuan Mu (Winbond),
                        Rudolf Marek <r.marek@assembler.cz>
                        David Hubbard <david.c.hubbard@gmail.com>
@@ -39,6 +39,7 @@
                                               0x8860 0xa1
    w83627dhg    9      5       4       3      0xa020 0xc1    0x5ca3
    w83627dhg-p  9      5       4       3      0xb070 0xc1    0x5ca3
+    w83627uhg    8      2       2       2      0xa230 0xc1    0x5ca3
    w83667hg     9      5       3       3      0xa510 0xc1    0x5ca3
    w83667hg-b   9      5       3       4      0xb350 0xc1    0x5ca3
    nct6775f     9      4       3       9      0xb470 0xc1    0x5ca3
@@ -61,14 +62,17 @@
 #include <linux/io.h>
 #include "lm75.h"
-enum kinds { w83627ehf, w83627dhg, w83627dhg_p, w83667hg, w83667hg_b, nct6775,
+enum kinds {
-        nct6776 };
+        w83627ehf, w83627dhg, w83627dhg_p, w83627uhg,
+        w83667hg, w83667hg_b, nct6775, nct6776,
+};
 /* used to set data->name = w83627ehf_device_names[data->sio_kind] */
 static const char * const w83627ehf_device_names[] = {
        "w83627ehf",
        "w83627dhg",
        "w83627dhg",
+        "w83627uhg",
        "w83667hg",
        "w83667hg",
        "nct6775",
@@ -104,6 +108,7 @@ MODULE_PARM_DESC(fan_debounce, "Enable debouncing for fan RPM signal");
 #define SIO_W83627EHG_ID        0x8860
 #define SIO_W83627DHG_ID        0xa020
 #define SIO_W83627DHG_P_ID      0xb070
+#define SIO_W83627UHG_ID        0xa230
 #define SIO_W83667HG_ID         0xa510
 #define SIO_W83667HG_B_ID       0xb350
 #define SIO_NCT6775_ID          0xb470
@@ -388,18 +393,23 @@ div_from_reg(u8 reg)
        return 1 << reg;
 }
-/* Some of analog inputs have internal scaling (2x), 8mV is ADC LSB */
+/* Some of the voltage inputs have internal scaling, the tables below
+ * contain 8 (the ADC LSB in mV) * scaling factor * 100 */
-static u8 scale_in[10] = { 8, 8, 16, 16, 8, 8, 8, 16, 16, 8 };
+static const u16 scale_in_common[10] = {
+        800, 800, 1600, 1600, 800, 800, 800, 1600, 1600, 800
+};
+static const u16 scale_in_w83627uhg[9] = {
+        800, 800, 3328, 3424, 800, 800, 0, 3328, 3400
+};
-static inline long in_from_reg(u8 reg, u8 nr)
+static inline long in_from_reg(u8 reg, u8 nr, const u16 *scale_in)
 {
-        return reg * scale_in[nr];
+        return DIV_ROUND_CLOSEST(reg * scale_in[nr], 100);
 }
-static inline u8 in_to_reg(u32 val, u8 nr)
+static inline u8 in_to_reg(u32 val, u8 nr, const u16 *scale_in)
 {
-        return SENSORS_LIMIT(((val + (scale_in[nr] / 2)) / scale_in[nr]), 0,
+        return SENSORS_LIMIT(DIV_ROUND_CLOSEST(val * 100, scale_in[nr]), 0,
                             255);
 }
@@ -430,6 +440,7 @@ struct w83627ehf_data {
        const u16 *REG_FAN_STOP_TIME;
        const u16 *REG_FAN_MAX_OUTPUT;
        const u16 *REG_FAN_STEP_OUTPUT;
+        const u16 *scale_in;
        unsigned int (*fan_from_reg)(u16 reg, unsigned int divreg);
        unsigned int (*fan_from_reg_min)(u16 reg, unsigned int divreg);
@@ -481,7 +492,8 @@ struct w83627ehf_data {
        u8 vrm;
        u16 have_temp;
-        u8 in6_skip;
+        u8 in6_skip:1;
+        u8 temp3_val_only:1;
 };
 struct w83627ehf_sio_data {
@@ -907,7 +919,8 @@ show_##reg(struct device *dev, struct device_attribute *attr, \
        struct sensor_device_attribute *sensor_attr = \
                to_sensor_dev_attr(attr); \
        int nr = sensor_attr->index; \
-        return sprintf(buf, "%ld\n", in_from_reg(data->reg[nr], nr)); \
+        return sprintf(buf, "%ld\n", in_from_reg(data->reg[nr], nr, \
+                       data->scale_in)); \
 }
 show_in_reg(in)
 show_in_reg(in_min)
@@ -928,7 +941,7 @@ store_in_##reg(struct device *dev, struct device_attribute *attr, \
        if (err < 0) \
                return err; \
        mutex_lock(&data->update_lock); \
-        data->in_##reg[nr] = in_to_reg(val, nr); \
+        data->in_##reg[nr] = in_to_reg(val, nr, data->scale_in); \
        w83627ehf_write_value(data, W83627EHF_REG_IN_##REG(nr), \
                              data->in_##reg[nr]); \
        mutex_unlock(&data->update_lock); \
@@ -1617,25 +1630,28 @@ static struct sensor_device_attribute sda_sf3_arrays_fan4[] = {
                    store_fan_step_output, 3),
 };
+static struct sensor_device_attribute sda_sf3_arrays_fan3[] = {
+        SENSOR_ATTR(pwm3_stop_time, S_IWUSR | S_IRUGO, show_fan_stop_time,
+                    store_fan_stop_time, 2),
+        SENSOR_ATTR(pwm3_start_output, S_IWUSR | S_IRUGO, show_fan_start_output,
+                    store_fan_start_output, 2),
+        SENSOR_ATTR(pwm3_stop_output, S_IWUSR | S_IRUGO, show_fan_stop_output,
+                    store_fan_stop_output, 2),
+};
 static struct sensor_device_attribute sda_sf3_arrays[] = {
        SENSOR_ATTR(pwm1_stop_time, S_IWUSR | S_IRUGO, show_fan_stop_time,
                    store_fan_stop_time, 0),
        SENSOR_ATTR(pwm2_stop_time, S_IWUSR | S_IRUGO, show_fan_stop_time,
                    store_fan_stop_time, 1),
-        SENSOR_ATTR(pwm3_stop_time, S_IWUSR | S_IRUGO, show_fan_stop_time,
-                    store_fan_stop_time, 2),
        SENSOR_ATTR(pwm1_start_output, S_IWUSR | S_IRUGO, show_fan_start_output,
                    store_fan_start_output, 0),
        SENSOR_ATTR(pwm2_start_output, S_IWUSR | S_IRUGO, show_fan_start_output,
                    store_fan_start_output, 1),
-        SENSOR_ATTR(pwm3_start_output, S_IWUSR | S_IRUGO, show_fan_start_output,
-                    store_fan_start_output, 2),
        SENSOR_ATTR(pwm1_stop_output, S_IWUSR | S_IRUGO, show_fan_stop_output,
                    store_fan_stop_output, 0),
        SENSOR_ATTR(pwm2_stop_output, S_IWUSR | S_IRUGO, show_fan_stop_output,
                    store_fan_stop_output, 1),
-        SENSOR_ATTR(pwm3_stop_output, S_IWUSR | S_IRUGO, show_fan_stop_output,
-                    store_fan_stop_output, 2),
 };
@@ -1728,6 +1744,8 @@ static void w83627ehf_device_remove_files(struct device *dev)
                    data->REG_FAN_STEP_OUTPUT[attr->index] != 0xff)
                        device_remove_file(dev, &attr->dev_attr);
        }
+        for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays_fan3); i++)
+                device_remove_file(dev, &sda_sf3_arrays_fan3[i].dev_attr);
        for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays_fan4); i++)
                device_remove_file(dev, &sda_sf3_arrays_fan4[i].dev_attr);
        for (i = 0; i < data->in_num; i++) {
@@ -1756,6 +1774,8 @@ static void w83627ehf_device_remove_files(struct device *dev)
                        continue;
                device_remove_file(dev, &sda_temp_input[i].dev_attr);
                device_remove_file(dev, &sda_temp_label[i].dev_attr);
+                if (i == 2 && data->temp3_val_only)
+                        continue;
                device_remove_file(dev, &sda_temp_max[i].dev_attr);
                device_remove_file(dev, &sda_temp_max_hyst[i].dev_attr);
                if (i > 2)
@@ -1808,11 +1828,24 @@ static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data,
        case w83627ehf:
                diode = w83627ehf_read_value(data, W83627EHF_REG_DIODE);
                break;
+        case w83627uhg:
+                diode = 0x00;
+                break;
        default:
                diode = 0x70;
        }
        for (i = 0; i < 3; i++) {
-                if ((tmp & (0x02 << i)))
+                const char *label = NULL;
+                if (data->temp_label)
+                        label = data->temp_label[data->temp_src[i]];
+                /* Digital source overrides analog type */
+                if (label && strncmp(label, "PECI", 4) == 0)
+                        data->temp_type[i] = 6;
+                else if (label && strncmp(label, "AMD", 3) == 0)
+                        data->temp_type[i] = 5;
+                else if ((tmp & (0x02 << i)))
                        data->temp_type[i] = (diode & (0x10 << i)) ? 1 : 3;
                else
                        data->temp_type[i] = 4; /* thermistor */
@@ -1846,11 +1879,31 @@ static void w82627ehf_swap_tempreg(struct w83627ehf_data *data,
 }
 static void __devinit
+w83627ehf_set_temp_reg_ehf(struct w83627ehf_data *data, int n_temp)
+{
+        int i;
+        for (i = 0; i < n_temp; i++) {
+                data->reg_temp[i] = W83627EHF_REG_TEMP[i];
+                data->reg_temp_over[i] = W83627EHF_REG_TEMP_OVER[i];
+                data->reg_temp_hyst[i] = W83627EHF_REG_TEMP_HYST[i];
+                data->reg_temp_config[i] = W83627EHF_REG_TEMP_CONFIG[i];
+        }
+}
+static void __devinit
 w83627ehf_check_fan_inputs(const struct w83627ehf_sio_data *sio_data,
                           struct w83627ehf_data *data)
 {
        int fan3pin, fan4pin, fan4min, fan5pin, regval;
+        /* The W83627UHG is simple, only two fan inputs, no config */
+        if (sio_data->kind == w83627uhg) {
+                data->has_fan = 0x03; /* fan1 and fan2 */
+                data->has_fan_min = 0x03;
+                return;
+        }
        superio_enter(sio_data->sioreg);
        /* fan4 and fan5 share some pins with the GPIO and serial flash */
@@ -1942,23 +1995,24 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
        /* 627EHG and 627EHF have 10 voltage inputs; 627DHG and 667HG have 9 */
        data->in_num = (sio_data->kind == w83627ehf) ? 10 : 9;
-        /* 667HG, NCT6775F, and NCT6776F have 3 pwms */
+        /* 667HG, NCT6775F, and NCT6776F have 3 pwms, and 627UHG has only 2 */
-        data->pwm_num = (sio_data->kind == w83667hg
+        switch (sio_data->kind) {
-                         || sio_data->kind == w83667hg_b
+        default:
-                         || sio_data->kind == nct6775
+                data->pwm_num = 4;
-                         || sio_data->kind == nct6776) ? 3 : 4;
+                break;
+        case w83667hg:
+        case w83667hg_b:
+        case nct6775:
+        case nct6776:
+                data->pwm_num = 3;
+                break;
+        case w83627uhg:
+                data->pwm_num = 2;
+                break;
+        }
+        /* Default to 3 temperature inputs, code below will adjust as needed */
        data->have_temp = 0x07;
-        /* Check temp3 configuration bit for 667HG */
-        if (sio_data->kind == w83667hg) {
-                u8 reg;
-                reg = w83627ehf_read_value(data, W83627EHF_REG_TEMP_CONFIG[2]);
-                if (reg & 0x01)
-                        data->have_temp &= ~(1 << 2);
-                else
-                        data->in6_skip = 1;     /* either temp3 or in6 */
-        }
        /* Deal with temperature register setup first. */
        if (sio_data->kind == nct6775 || sio_data->kind == nct6776) {
@@ -2035,16 +2089,12 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
        } else if (sio_data->kind == w83667hg_b) {
                u8 reg;
+                w83627ehf_set_temp_reg_ehf(data, 4);
                /*
                 * Temperature sources are selected with bank 0, registers 0x49
                 * and 0x4a.
                 */
-                for (i = 0; i < ARRAY_SIZE(W83627EHF_REG_TEMP); i++) {
-                        data->reg_temp[i] = W83627EHF_REG_TEMP[i];
-                        data->reg_temp_over[i] = W83627EHF_REG_TEMP_OVER[i];
-                        data->reg_temp_hyst[i] = W83627EHF_REG_TEMP_HYST[i];
-                        data->reg_temp_config[i] = W83627EHF_REG_TEMP_CONFIG[i];
-                }
                reg = w83627ehf_read_value(data, 0x4a);
                data->temp_src[0] = reg >> 5;
                reg = w83627ehf_read_value(data, 0x49);
@@ -2078,13 +2128,60 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
                        data->in6_skip = 1;
                data->temp_label = w83667hg_b_temp_label;
+        } else if (sio_data->kind == w83627uhg) {
+                u8 reg;
+                w83627ehf_set_temp_reg_ehf(data, 3);
+                /*
+                 * Temperature sources for temp1 and temp2 are selected with
+                 * bank 0, registers 0x49 and 0x4a.
+                 */
+                data->temp_src[0] = 0;  /* SYSTIN */
+                reg = w83627ehf_read_value(data, 0x49) & 0x07;
+                /* Adjust to have the same mapping as other source registers */
+                if (reg == 0)
+                        data->temp_src[1]++;
+                else if (reg >= 2 && reg <= 5)
+                        data->temp_src[1] += 2;
+                else    /* should never happen */
+                        data->have_temp &= ~(1 << 1);
+                reg = w83627ehf_read_value(data, 0x4a);
+                data->temp_src[2] = reg >> 5;
+                /*
+                 * Skip temp3 if source is invalid or the same as temp1
+                 * or temp2.
+                 */
+                if (data->temp_src[2] == 2 || data->temp_src[2] == 3 ||
+                    data->temp_src[2] == data->temp_src[0] ||
+                    ((data->have_temp & (1 << 1)) &&
+                     data->temp_src[2] == data->temp_src[1]))
+                        data->have_temp &= ~(1 << 2);
+                else
+                        data->temp3_val_only = 1;       /* No limit regs */
+                data->in6_skip = 1;                     /* No VIN3 */
+                data->temp_label = w83667hg_b_temp_label;
        } else {
+                w83627ehf_set_temp_reg_ehf(data, 3);
                /* Temperature sources are fixed */
-                for (i = 0; i < 3; i++) {
-                        data->reg_temp[i] = W83627EHF_REG_TEMP[i];
+                if (sio_data->kind == w83667hg) {
-                        data->reg_temp_over[i] = W83627EHF_REG_TEMP_OVER[i];
+                        u8 reg;
-                        data->reg_temp_hyst[i] = W83627EHF_REG_TEMP_HYST[i];
-                        data->reg_temp_config[i] = W83627EHF_REG_TEMP_CONFIG[i];
+                        /*
+                         * Chip supports either AUXTIN or VIN3. Try to find
+                         * out which one.
+                         */
+                        reg = w83627ehf_read_value(data,
+                                                W83627EHF_REG_TEMP_CONFIG[2]);
+                        if (reg & 0x01)
+                                data->have_temp &= ~(1 << 2);
+                        else
+                                data->in6_skip = 1;
                }
        }
@@ -2144,6 +2241,12 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
                  W83627EHF_REG_FAN_STEP_OUTPUT_COMMON;
        }
+        /* Setup input voltage scaling factors */
+        if (sio_data->kind == w83627uhg)
+                data->scale_in = scale_in_w83627uhg;
+        else
+                data->scale_in = scale_in_common;
        /* Initialize the chip */
        w83627ehf_init_device(data, sio_data->kind);
@@ -2160,7 +2263,7 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
                err = device_create_file(dev, &dev_attr_cpu0_vid);
                if (err)
                        goto exit_release;
-        } else {
+        } else if (sio_data->kind != w83627uhg) {
                superio_select(sio_data->sioreg, W83627EHF_LD_HWM);
                if (superio_inb(sio_data->sioreg, SIO_REG_VID_CTRL) & 0x80) {
                        /* Set VID input sensibility if needed. In theory the
@@ -2250,7 +2353,14 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
                                goto exit_remove;
                }
        }
-        /* if fan4 is enabled create the sf3 files for it */
+        /* if fan3 and fan4 are enabled create the sf3 files for them */
+        if ((data->has_fan & (1 << 2)) && data->pwm_num >= 3)
+                for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays_fan3); i++) {
+                        err = device_create_file(dev,
+                                        &sda_sf3_arrays_fan3[i].dev_attr);
+                        if (err)
+                                goto exit_remove;
+                }
        if ((data->has_fan & (1 << 3)) && data->pwm_num >= 4)
                for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays_fan4); i++) {
                        err = device_create_file(dev,
@@ -2318,6 +2428,8 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
                        if (err)
                                goto exit_remove;
                }
+                if (i == 2 && data->temp3_val_only)
+                        continue;
                if (data->reg_temp_over[i]) {
                        err = device_create_file(dev,
                                &sda_temp_max[i].dev_attr);
@@ -2401,6 +2513,7 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr,
        static const char __initdata sio_name_W83627EHG[] = "W83627EHG";
        static const char __initdata sio_name_W83627DHG[] = "W83627DHG";
        static const char __initdata sio_name_W83627DHG_P[] = "W83627DHG-P";
+        static const char __initdata sio_name_W83627UHG[] = "W83627UHG";
        static const char __initdata sio_name_W83667HG[] = "W83667HG";
        static const char __initdata sio_name_W83667HG_B[] = "W83667HG-B";
        static const char __initdata sio_name_NCT6775[] = "NCT6775F";
@@ -2433,6 +2546,10 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr,
                sio_data->kind = w83627dhg_p;
                sio_name = sio_name_W83627DHG_P;
                break;
+        case SIO_W83627UHG_ID:
+                sio_data->kind = w83627uhg;
+                sio_name = sio_name_W83627UHG;
+                break;
        case SIO_W83667HG_ID:
                sio_data->kind = w83667hg;
                sio_name = sio_name_W83667HG;
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index eed43a008be1..65b685e2c7b7 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -1245,17 +1245,17 @@ w83781d_read_value_i2c(struct w83781d_data *data, u16 reg)
                /* convert from ISA to LM75 I2C addresses */
                switch (reg & 0xff) {
                case 0x50:      /* TEMP */
-                        res = swab16(i2c_smbus_read_word_data(cl, 0));
+                        res = i2c_smbus_read_word_swapped(cl, 0);
                        break;
                case 0x52:      /* CONFIG */
                        res = i2c_smbus_read_byte_data(cl, 1);
                        break;
                case 0x53:      /* HYST */
-                        res = swab16(i2c_smbus_read_word_data(cl, 2));
+                        res = i2c_smbus_read_word_swapped(cl, 2);
                        break;
                case 0x55:      /* OVER */
                default:
-                        res = swab16(i2c_smbus_read_word_data(cl, 3));
+                        res = i2c_smbus_read_word_swapped(cl, 3);
                        break;
                }
        }
@@ -1289,10 +1289,10 @@ w83781d_write_value_i2c(struct w83781d_data *data, u16 reg, u16 value)
                        i2c_smbus_write_byte_data(cl, 1, value & 0xff);
                        break;
                case 0x53:      /* HYST */
-                        i2c_smbus_write_word_data(cl, 2, swab16(value));
+                        i2c_smbus_write_word_swapped(cl, 2, value);
                        break;
                case 0x55:      /* OVER */
-                        i2c_smbus_write_word_data(cl, 3, swab16(value));
+                        i2c_smbus_write_word_swapped(cl, 3, value);
                        break;
                }
        }
diff --git a/drivers/hwspinlock/Kconfig b/drivers/hwspinlock/Kconfig
index 1f29bab6b3e5..c7c3128393d1 100644
--- a/drivers/hwspinlock/Kconfig
+++ b/drivers/hwspinlock/Kconfig
@@ -2,22 +2,31 @@
 # Generic HWSPINLOCK framework
 #
+# HWSPINLOCK always gets selected by whoever wants it.
 config HWSPINLOCK
-        tristate "Generic Hardware Spinlock framework"
+        tristate
-        depends on ARCH_OMAP4
-        help
-          Say y here to support the generic hardware spinlock framework.
-          You only need to enable this if you have hardware spinlock module
-          on your system (usually only relevant if your system has remote slave
-          coprocessors).
-          If unsure, say N.
+menu "Hardware Spinlock drivers"
 config HWSPINLOCK_OMAP
        tristate "OMAP Hardware Spinlock device"
-        depends on HWSPINLOCK && ARCH_OMAP4
+        depends on ARCH_OMAP4
+        select HWSPINLOCK
        help
          Say y here to support the OMAP Hardware Spinlock device (firstly
          introduced in OMAP4).
          If unsure, say N.
+config HSEM_U8500
+        tristate "STE Hardware Semaphore functionality"
+        depends on ARCH_U8500
+        select HWSPINLOCK
+        help
+          Say y here to support the STE Hardware Semaphore functionality, which
+          provides a synchronisation mechanism for the various processor on the
+          SoC.
+          If unsure, say N.
+endmenu
diff --git a/drivers/hwspinlock/Makefile b/drivers/hwspinlock/Makefile
index 5729a3f7ed3d..93eb64b66486 100644
--- a/drivers/hwspinlock/Makefile
+++ b/drivers/hwspinlock/Makefile
@@ -4,3 +4,4 @@
 obj-$(CONFIG_HWSPINLOCK)                += hwspinlock_core.o
 obj-$(CONFIG_HWSPINLOCK_OMAP)           += omap_hwspinlock.o
+obj-$(CONFIG_HSEM_U8500)                += u8500_hsem.o
diff --git a/drivers/hwspinlock/hwspinlock_core.c b/drivers/hwspinlock/hwspinlock_core.c
index 43a62714b4fb..61c9cf15fa52 100644
--- a/drivers/hwspinlock/hwspinlock_core.c
+++ b/drivers/hwspinlock/hwspinlock_core.c
@@ -26,6 +26,7 @@
 #include <linux/radix-tree.h>
 #include <linux/hwspinlock.h>
 #include <linux/pm_runtime.h>
+#include <linux/mutex.h>
 #include "hwspinlock_internal.h"
@@ -52,10 +53,12 @@
 static RADIX_TREE(hwspinlock_tree, GFP_KERNEL);
 /*
- * Synchronization of access to the tree is achieved using this spinlock,
+ * Synchronization of access to the tree is achieved using this mutex,
 * as the radix-tree API requires that users provide all synchronisation.
+ * A mutex is needed because we're using non-atomic radix tree allocations.
 */
-static DEFINE_SPINLOCK(hwspinlock_tree_lock);
+static DEFINE_MUTEX(hwspinlock_tree_lock);
 /**
 * __hwspin_trylock() - attempt to lock a specific hwspinlock
@@ -114,7 +117,7 @@ int __hwspin_trylock(struct hwspinlock *hwlock, int mode, unsigned long *flags)
                return -EBUSY;
        /* try to take the hwspinlock device */
-        ret = hwlock->ops->trylock(hwlock);
+        ret = hwlock->bank->ops->trylock(hwlock);
        /* if hwlock is already taken, undo spin_trylock_* and exit */
        if (!ret) {
@@ -196,8 +199,8 @@ int __hwspin_lock_timeout(struct hwspinlock *hwlock, unsigned int to,
                 * Allow platform-specific relax handlers to prevent
                 * hogging the interconnect (no sleeping, though)
                 */
-                if (hwlock->ops->relax)
+                if (hwlock->bank->ops->relax)
-                        hwlock->ops->relax(hwlock);
+                        hwlock->bank->ops->relax(hwlock);
        }
        return ret;
@@ -242,7 +245,7 @@ void __hwspin_unlock(struct hwspinlock *hwlock, int mode, unsigned long *flags)
         */
        mb();
-        hwlock->ops->unlock(hwlock);
+        hwlock->bank->ops->unlock(hwlock);
        /* Undo the spin_trylock{_irq, _irqsave} called while locking */
        if (mode == HWLOCK_IRQSTATE)
@@ -254,68 +257,37 @@ void __hwspin_unlock(struct hwspinlock *hwlock, int mode, unsigned long *flags)
 }
 EXPORT_SYMBOL_GPL(__hwspin_unlock);
-/**
+static int hwspin_lock_register_single(struct hwspinlock *hwlock, int id)
- * hwspin_lock_register() - register a new hw spinlock
- * @hwlock: hwspinlock to register.
- *
- * This function should be called from the underlying platform-specific
- * implementation, to register a new hwspinlock instance.
- *
- * Can be called from an atomic context (will not sleep) but not from
- * within interrupt context.
- *
- * Returns 0 on success, or an appropriate error code on failure
- */
-int hwspin_lock_register(struct hwspinlock *hwlock)
 {
        struct hwspinlock *tmp;
        int ret;
-        if (!hwlock || !hwlock->ops ||
+        mutex_lock(&hwspinlock_tree_lock);
-                !hwlock->ops->trylock || !hwlock->ops->unlock) {
-                pr_err("invalid parameters\n");
-                return -EINVAL;
-        }
-        spin_lock_init(&hwlock->lock);
-        spin_lock(&hwspinlock_tree_lock);
-        ret = radix_tree_insert(&hwspinlock_tree, hwlock->id, hwlock);
+        ret = radix_tree_insert(&hwspinlock_tree, id, hwlock);
-        if (ret)
+        if (ret) {
+                if (ret == -EEXIST)
+                        pr_err("hwspinlock id %d already exists!\n", id);
                goto out;
+        }
        /* mark this hwspinlock as available */
-        tmp = radix_tree_tag_set(&hwspinlock_tree, hwlock->id,
+        tmp = radix_tree_tag_set(&hwspinlock_tree, id, HWSPINLOCK_UNUSED);
-                                                        HWSPINLOCK_UNUSED);
        /* self-sanity check which should never fail */
        WARN_ON(tmp != hwlock);
 out:
-        spin_unlock(&hwspinlock_tree_lock);
+        mutex_unlock(&hwspinlock_tree_lock);
-        return ret;
+        return 0;
 }
-EXPORT_SYMBOL_GPL(hwspin_lock_register);
-/**
+static struct hwspinlock *hwspin_lock_unregister_single(unsigned int id)
- * hwspin_lock_unregister() - unregister an hw spinlock
- * @id: index of the specific hwspinlock to unregister
- *
- * This function should be called from the underlying platform-specific
- * implementation, to unregister an existing (and unused) hwspinlock.
- *
- * Can be called from an atomic context (will not sleep) but not from
- * within interrupt context.
- *
- * Returns the address of hwspinlock @id on success, or NULL on failure
- */
-struct hwspinlock *hwspin_lock_unregister(unsigned int id)
 {
        struct hwspinlock *hwlock = NULL;
        int ret;
-        spin_lock(&hwspinlock_tree_lock);
+        mutex_lock(&hwspinlock_tree_lock);
        /* make sure the hwspinlock is not in use (tag is set) */
        ret = radix_tree_tag_get(&hwspinlock_tree, id, HWSPINLOCK_UNUSED);
@@ -331,9 +303,91 @@ struct hwspinlock *hwspin_lock_unregister(unsigned int id)
        }
 out:
-        spin_unlock(&hwspinlock_tree_lock);
+        mutex_unlock(&hwspinlock_tree_lock);
        return hwlock;
 }
+/**
+ * hwspin_lock_register() - register a new hw spinlock device
+ * @bank: the hwspinlock device, which usually provides numerous hw locks
+ * @dev: the backing device
+ * @ops: hwspinlock handlers for this device
+ * @base_id: id of the first hardware spinlock in this bank
+ * @num_locks: number of hwspinlocks provided by this device
+ *
+ * This function should be called from the underlying platform-specific
+ * implementation, to register a new hwspinlock device instance.
+ *
+ * Should be called from a process context (might sleep)
+ *
+ * Returns 0 on success, or an appropriate error code on failure
+ */
+int hwspin_lock_register(struct hwspinlock_device *bank, struct device *dev,
+                const struct hwspinlock_ops *ops, int base_id, int num_locks)
+{
+        struct hwspinlock *hwlock;
+        int ret = 0, i;
+        if (!bank || !ops || !dev || !num_locks || !ops->trylock ||
+                                                        !ops->unlock) {
+                pr_err("invalid parameters\n");
+                return -EINVAL;
+        }
+        bank->dev = dev;
+        bank->ops = ops;
+        bank->base_id = base_id;
+        bank->num_locks = num_locks;
+        for (i = 0; i < num_locks; i++) {
+                hwlock = &bank->lock[i];
+                spin_lock_init(&hwlock->lock);
+                hwlock->bank = bank;
+                ret = hwspin_lock_register_single(hwlock, i);
+                if (ret)
+                        goto reg_failed;
+        }
+        return 0;
+reg_failed:
+        while (--i >= 0)
+                hwspin_lock_unregister_single(i);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(hwspin_lock_register);
+/**
+ * hwspin_lock_unregister() - unregister an hw spinlock device
+ * @bank: the hwspinlock device, which usually provides numerous hw locks
+ *
+ * This function should be called from the underlying platform-specific
+ * implementation, to unregister an existing (and unused) hwspinlock.
+ *
+ * Should be called from a process context (might sleep)
+ *
+ * Returns 0 on success, or an appropriate error code on failure
+ */
+int hwspin_lock_unregister(struct hwspinlock_device *bank)
+{
+        struct hwspinlock *hwlock, *tmp;
+        int i;
+        for (i = 0; i < bank->num_locks; i++) {
+                hwlock = &bank->lock[i];
+                tmp = hwspin_lock_unregister_single(bank->base_id + i);
+                if (!tmp)
+                        return -EBUSY;
+                /* self-sanity check that should never fail */
+                WARN_ON(tmp != hwlock);
+        }
+        return 0;
+}
 EXPORT_SYMBOL_GPL(hwspin_lock_unregister);
 /**
@@ -348,24 +402,25 @@ EXPORT_SYMBOL_GPL(hwspin_lock_unregister);
 */
 static int __hwspin_lock_request(struct hwspinlock *hwlock)
 {
+        struct device *dev = hwlock->bank->dev;
        struct hwspinlock *tmp;
        int ret;
        /* prevent underlying implementation from being removed */
-        if (!try_module_get(hwlock->owner)) {
+        if (!try_module_get(dev->driver->owner)) {
-                dev_err(hwlock->dev, "%s: can't get owner\n", __func__);
+                dev_err(dev, "%s: can't get owner\n", __func__);
                return -EINVAL;
        }
        /* notify PM core that power is now needed */
-        ret = pm_runtime_get_sync(hwlock->dev);
+        ret = pm_runtime_get_sync(dev);
        if (ret < 0) {
-                dev_err(hwlock->dev, "%s: can't power on device\n", __func__);
+                dev_err(dev, "%s: can't power on device\n", __func__);
                return ret;
        }
        /* mark hwspinlock as used, should not fail */
-        tmp = radix_tree_tag_clear(&hwspinlock_tree, hwlock->id,
+        tmp = radix_tree_tag_clear(&hwspinlock_tree, hwlock_to_id(hwlock),
                                                        HWSPINLOCK_UNUSED);
        /* self-sanity check that should never fail */
@@ -387,7 +442,7 @@ int hwspin_lock_get_id(struct hwspinlock *hwlock)
                return -EINVAL;
        }
-        return hwlock->id;
+        return hwlock_to_id(hwlock);
 }
 EXPORT_SYMBOL_GPL(hwspin_lock_get_id);
@@ -400,9 +455,7 @@ EXPORT_SYMBOL_GPL(hwspin_lock_get_id);
 * to the remote core before it can be used for synchronization (to get the
 * id of a given hwlock, use hwspin_lock_get_id()).
 *
- * Can be called from an atomic context (will not sleep) but not from
+ * Should be called from a process context (might sleep)
- * within interrupt context (simply because there is no use case for
- * that yet).
 *
 * Returns the address of the assigned hwspinlock, or NULL on error
 */
@@ -411,7 +464,7 @@ struct hwspinlock *hwspin_lock_request(void)
        struct hwspinlock *hwlock;
        int ret;
-        spin_lock(&hwspinlock_tree_lock);
+        mutex_lock(&hwspinlock_tree_lock);
        /* look for an unused lock */
        ret = radix_tree_gang_lookup_tag(&hwspinlock_tree, (void **)&hwlock,
@@ -431,7 +484,7 @@ struct hwspinlock *hwspin_lock_request(void)
                hwlock = NULL;
 out:
-        spin_unlock(&hwspinlock_tree_lock);
+        mutex_unlock(&hwspinlock_tree_lock);
        return hwlock;
 }
 EXPORT_SYMBOL_GPL(hwspin_lock_request);
@@ -445,9 +498,7 @@ EXPORT_SYMBOL_GPL(hwspin_lock_request);
 * Usually early board code will be calling this function in order to
 * reserve specific hwspinlock ids for predefined purposes.
 *
- * Can be called from an atomic context (will not sleep) but not from
+ * Should be called from a process context (might sleep)
- * within interrupt context (simply because there is no use case for
- * that yet).
 *
 * Returns the address of the assigned hwspinlock, or NULL on error
 */
@@ -456,7 +507,7 @@ struct hwspinlock *hwspin_lock_request_specific(unsigned int id)
        struct hwspinlock *hwlock;
        int ret;
-        spin_lock(&hwspinlock_tree_lock);
+        mutex_lock(&hwspinlock_tree_lock);
        /* make sure this hwspinlock exists */
        hwlock = radix_tree_lookup(&hwspinlock_tree, id);
@@ -466,7 +517,7 @@ struct hwspinlock *hwspin_lock_request_specific(unsigned int id)
        }
        /* sanity check (this shouldn't happen) */
-        WARN_ON(hwlock->id != id);
+        WARN_ON(hwlock_to_id(hwlock) != id);
        /* make sure this hwspinlock is unused */
        ret = radix_tree_tag_get(&hwspinlock_tree, id, HWSPINLOCK_UNUSED);
@@ -482,7 +533,7 @@ struct hwspinlock *hwspin_lock_request_specific(unsigned int id)
                hwlock = NULL;
 out:
-        spin_unlock(&hwspinlock_tree_lock);
+        mutex_unlock(&hwspinlock_tree_lock);
        return hwlock;
 }
 EXPORT_SYMBOL_GPL(hwspin_lock_request_specific);
@@ -495,14 +546,13 @@ EXPORT_SYMBOL_GPL(hwspin_lock_request_specific);
 * Should only be called with an @hwlock that was retrieved from
 * an earlier call to omap_hwspin_lock_request{_specific}.
 *
- * Can be called from an atomic context (will not sleep) but not from
+ * Should be called from a process context (might sleep)
- * within interrupt context (simply because there is no use case for
- * that yet).
 *
 * Returns 0 on success, or an appropriate error code on failure
 */
 int hwspin_lock_free(struct hwspinlock *hwlock)
 {
+        struct device *dev = hwlock->bank->dev;
        struct hwspinlock *tmp;
        int ret;
@@ -511,34 +561,34 @@ int hwspin_lock_free(struct hwspinlock *hwlock)
                return -EINVAL;
        }
-        spin_lock(&hwspinlock_tree_lock);
+        mutex_lock(&hwspinlock_tree_lock);
        /* make sure the hwspinlock is used */
-        ret = radix_tree_tag_get(&hwspinlock_tree, hwlock->id,
+        ret = radix_tree_tag_get(&hwspinlock_tree, hwlock_to_id(hwlock),
                                                        HWSPINLOCK_UNUSED);
        if (ret == 1) {
-                dev_err(hwlock->dev, "%s: hwlock is already free\n", __func__);
+                dev_err(dev, "%s: hwlock is already free\n", __func__);
                dump_stack();
                ret = -EINVAL;
                goto out;
        }
        /* notify the underlying device that power is not needed */
-        ret = pm_runtime_put(hwlock->dev);
+        ret = pm_runtime_put(dev);
        if (ret < 0)
                goto out;
        /* mark this hwspinlock as available */
-        tmp = radix_tree_tag_set(&hwspinlock_tree, hwlock->id,
+        tmp = radix_tree_tag_set(&hwspinlock_tree, hwlock_to_id(hwlock),
                                                        HWSPINLOCK_UNUSED);
        /* sanity check (this shouldn't happen) */
        WARN_ON(tmp != hwlock);
-        module_put(hwlock->owner);
+        module_put(dev->driver->owner);
 out:
-        spin_unlock(&hwspinlock_tree_lock);
+        mutex_unlock(&hwspinlock_tree_lock);
        return ret;
 }
 EXPORT_SYMBOL_GPL(hwspin_lock_free);
diff --git a/drivers/hwspinlock/hwspinlock_internal.h b/drivers/hwspinlock/hwspinlock_internal.h
index 69935e6b93e5..d26f78b8f214 100644
--- a/drivers/hwspinlock/hwspinlock_internal.h
+++ b/drivers/hwspinlock/hwspinlock_internal.h
@@ -21,6 +21,8 @@
 #include <linux/spinlock.h>
 #include <linux/device.h>
+struct hwspinlock_device;
 /**
 * struct hwspinlock_ops - platform-specific hwspinlock handlers
 *
@@ -39,23 +41,37 @@ struct hwspinlock_ops {
 /**
 * struct hwspinlock - this struct represents a single hwspinlock instance
- *
+ * @bank: the hwspinlock_device structure which owns this lock
- * @dev: underlying device, will be used to invoke runtime PM api
- * @ops: platform-specific hwspinlock handlers
- * @id: a global, unique, system-wide, index of the lock.
 * @lock: initialized and used by hwspinlock core
- * @owner: underlying implementation module, used to maintain module ref count
+ * @priv: private data, owned by the underlying platform-specific hwspinlock drv
- *
- * Note: currently simplicity was opted for, but later we can squeeze some
- * memory bytes by grouping the dev, ops and owner members in a single
- * per-platform struct, and have all hwspinlocks point at it.
 */
 struct hwspinlock {
+        struct hwspinlock_device *bank;
+        spinlock_t lock;
+        void *priv;
+};
+/**
+ * struct hwspinlock_device - a device which usually spans numerous hwspinlocks
+ * @dev: underlying device, will be used to invoke runtime PM api
+ * @ops: platform-specific hwspinlock handlers
+ * @base_id: id index of the first lock in this device
+ * @num_locks: number of locks in this device
+ * @lock: dynamically allocated array of 'struct hwspinlock'
+ */
+struct hwspinlock_device {
        struct device *dev;
        const struct hwspinlock_ops *ops;
-        int id;
+        int base_id;
-        spinlock_t lock;
+        int num_locks;
-        struct module *owner;
+        struct hwspinlock lock[0];
 };
+static inline int hwlock_to_id(struct hwspinlock *hwlock)
+{
+        int local_id = hwlock - &hwlock->bank->lock[0];
+        return hwlock->bank->base_id + local_id;
+}
 #endif /* __HWSPINLOCK_HWSPINLOCK_H */
diff --git a/drivers/hwspinlock/omap_hwspinlock.c b/drivers/hwspinlock/omap_hwspinlock.c
index a8f02734c026..887d34effb3a 100644
--- a/drivers/hwspinlock/omap_hwspinlock.c
+++ b/drivers/hwspinlock/omap_hwspinlock.c
@@ -41,33 +41,20 @@
 #define SPINLOCK_NOTTAKEN               (0)     /* free */
 #define SPINLOCK_TAKEN                  (1)     /* locked */
-#define to_omap_hwspinlock(lock)        \
-        container_of(lock, struct omap_hwspinlock, lock)
-struct omap_hwspinlock {
-        struct hwspinlock lock;
-        void __iomem *addr;
-};
-struct omap_hwspinlock_state {
-        int num_locks;                  /* Total number of locks in system */
-        void __iomem *io_base;          /* Mapped base address */
-};
 static int omap_hwspinlock_trylock(struct hwspinlock *lock)
 {
-        struct omap_hwspinlock *omap_lock = to_omap_hwspinlock(lock);
+        void __iomem *lock_addr = lock->priv;
        /* attempt to acquire the lock by reading its value */
-        return (SPINLOCK_NOTTAKEN == readl(omap_lock->addr));
+        return (SPINLOCK_NOTTAKEN == readl(lock_addr));
 }
 static void omap_hwspinlock_unlock(struct hwspinlock *lock)
 {
-        struct omap_hwspinlock *omap_lock = to_omap_hwspinlock(lock);
+        void __iomem *lock_addr = lock->priv;
        /* release the lock by writing 0 to it */
-        writel(SPINLOCK_NOTTAKEN, omap_lock->addr);
+        writel(SPINLOCK_NOTTAKEN, lock_addr);
 }
 /*
@@ -93,26 +80,23 @@ static const struct hwspinlock_ops omap_hwspinlock_ops = {
 static int __devinit omap_hwspinlock_probe(struct platform_device *pdev)
 {
-        struct omap_hwspinlock *omap_lock;
+        struct hwspinlock_pdata *pdata = pdev->dev.platform_data;
-        struct omap_hwspinlock_state *state;
+        struct hwspinlock_device *bank;
-        struct hwspinlock *lock;
+        struct hwspinlock *hwlock;
        struct resource *res;
        void __iomem *io_base;
-        int i, ret;
+        int num_locks, i, ret;
+        if (!pdata)
+                return -ENODEV;
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res)
                return -ENODEV;
-        state = kzalloc(sizeof(*state), GFP_KERNEL);
-        if (!state)
-                return -ENOMEM;
        io_base = ioremap(res->start, resource_size(res));
-        if (!io_base) {
+        if (!io_base)
-                ret = -ENOMEM;
+                return -ENOMEM;
-                goto free_state;
-        }
        /* Determine number of locks */
        i = readl(io_base + SYSSTATUS_OFFSET);
@@ -124,10 +108,18 @@ static int __devinit omap_hwspinlock_probe(struct platform_device *pdev)
                goto iounmap_base;
        }
-        state->num_locks = i * 32;
+        num_locks = i * 32; /* actual number of locks in this device */
-        state->io_base = io_base;
+        bank = kzalloc(sizeof(*bank) + num_locks * sizeof(*hwlock), GFP_KERNEL);
+        if (!bank) {
+                ret = -ENOMEM;
+                goto iounmap_base;
+        }
+        platform_set_drvdata(pdev, bank);
-        platform_set_drvdata(pdev, state);
+        for (i = 0, hwlock = &bank->lock[0]; i < num_locks; i++, hwlock++)
+                hwlock->priv = io_base + LOCK_BASE_OFFSET + sizeof(u32) * i;
        /*
         * runtime PM will make sure the clock of this module is
@@ -135,79 +127,46 @@ static int __devinit omap_hwspinlock_probe(struct platform_device *pdev)
         */
        pm_runtime_enable(&pdev->dev);
-        for (i = 0; i < state->num_locks; i++) {
+        ret = hwspin_lock_register(bank, &pdev->dev, &omap_hwspinlock_ops,
-                omap_lock = kzalloc(sizeof(*omap_lock), GFP_KERNEL);
+                                                pdata->base_id, num_locks);
-                if (!omap_lock) {
+        if (ret)
-                        ret = -ENOMEM;
+                goto reg_fail;
-                        goto free_locks;
-                }
-                omap_lock->lock.dev = &pdev->dev;
-                omap_lock->lock.owner = THIS_MODULE;
-                omap_lock->lock.id = i;
-                omap_lock->lock.ops = &omap_hwspinlock_ops;
-                omap_lock->addr = io_base + LOCK_BASE_OFFSET + sizeof(u32) * i;
-                ret = hwspin_lock_register(&omap_lock->lock);
-                if (ret) {
-                        kfree(omap_lock);
-                        goto free_locks;
-                }
-        }
        return 0;
-free_locks:
+reg_fail:
-        while (--i >= 0) {
-                lock = hwspin_lock_unregister(i);
-                /* this should't happen, but let's give our best effort */
-                if (!lock) {
-                        dev_err(&pdev->dev, "%s: cleanups failed\n", __func__);
-                        continue;
-                }
-                omap_lock = to_omap_hwspinlock(lock);
-                kfree(omap_lock);
-        }
        pm_runtime_disable(&pdev->dev);
+        kfree(bank);
 iounmap_base:
        iounmap(io_base);
-free_state:
-        kfree(state);
        return ret;
 }
-static int omap_hwspinlock_remove(struct platform_device *pdev)
+static int __devexit omap_hwspinlock_remove(struct platform_device *pdev)
 {
-        struct omap_hwspinlock_state *state = platform_get_drvdata(pdev);
+        struct hwspinlock_device *bank = platform_get_drvdata(pdev);
-        struct hwspinlock *lock;
+        void __iomem *io_base = bank->lock[0].priv - LOCK_BASE_OFFSET;
-        struct omap_hwspinlock *omap_lock;
+        int ret;
-        int i;
+        ret = hwspin_lock_unregister(bank);
-        for (i = 0; i < state->num_locks; i++) {
+        if (ret) {
-                lock = hwspin_lock_unregister(i);
+                dev_err(&pdev->dev, "%s failed: %d\n", __func__, ret);
-                /* this shouldn't happen at this point. if it does, at least
+                return ret;
-                 * don't continue with the remove */
-                if (!lock) {
-                        dev_err(&pdev->dev, "%s: failed on %d\n", __func__, i);
-                        return -EBUSY;
-                }
-                omap_lock = to_omap_hwspinlock(lock);
-                kfree(omap_lock);
        }
        pm_runtime_disable(&pdev->dev);
-        iounmap(state->io_base);
+        iounmap(io_base);
-        kfree(state);
+        kfree(bank);
        return 0;
 }
 static struct platform_driver omap_hwspinlock_driver = {
        .probe          = omap_hwspinlock_probe,
-        .remove         = omap_hwspinlock_remove,
+        .remove         = __devexit_p(omap_hwspinlock_remove),
        .driver         = {
                .name   = "omap_hwspinlock",
+                .owner  = THIS_MODULE,
        },
 };
diff --git a/drivers/hwspinlock/u8500_hsem.c b/drivers/hwspinlock/u8500_hsem.c
new file mode 100644
index 000000000000..143461a95ae4
--- /dev/null
+++ b/drivers/hwspinlock/u8500_hsem.c
@@ -0,0 +1,198 @@
+/*
+ * u8500 HWSEM driver
+ *
+ * Copyright (C) 2010-2011 ST-Ericsson
+ *
+ * Implements u8500 semaphore handling for protocol 1, no interrupts.
+ *
+ * Author: Mathieu Poirier <mathieu.poirier@linaro.org>
+ * Heavily borrowed from the work of :
+ *   Simon Que <sque@ti.com>
+ *   Hari Kanigeri <h-kanigeri2@ti.com>
+ *   Ohad Ben-Cohen <ohad@wizery.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.
+ */
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/pm_runtime.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/hwspinlock.h>
+#include <linux/platform_device.h>
+#include "hwspinlock_internal.h"
+/*
+ * Implementation of STE's HSem protocol 1 without interrutps.
+ * The only masterID we allow is '0x01' to force people to use
+ * HSems for synchronisation between processors rather than processes
+ * on the ARM core.
+ */
+#define U8500_MAX_SEMAPHORE             32      /* a total of 32 semaphore */
+#define RESET_SEMAPHORE                 (0)     /* free */
+/*
+ * CPU ID for master running u8500 kernel.
+ * Hswpinlocks should only be used to synchonise operations
+ * between the Cortex A9 core and the other CPUs.  Hence
+ * forcing the masterID to a preset value.
+ */
+#define HSEM_MASTER_ID                  0x01
+#define HSEM_REGISTER_OFFSET            0x08
+#define HSEM_CTRL_REG                   0x00
+#define HSEM_ICRALL                     0x90
+#define HSEM_PROTOCOL_1                 0x01
+static int u8500_hsem_trylock(struct hwspinlock *lock)
+{
+        void __iomem *lock_addr = lock->priv;
+        writel(HSEM_MASTER_ID, lock_addr);
+        /* get only first 4 bit and compare to masterID.
+         * if equal, we have the semaphore, otherwise
+         * someone else has it.
+         */
+        return (HSEM_MASTER_ID == (0x0F & readl(lock_addr)));
+}
+static void u8500_hsem_unlock(struct hwspinlock *lock)
+{
+        void __iomem *lock_addr = lock->priv;
+        /* release the lock by writing 0 to it */
+        writel(RESET_SEMAPHORE, lock_addr);
+}
+/*
+ * u8500: what value is recommended here ?
+ */
+static void u8500_hsem_relax(struct hwspinlock *lock)
+{
+        ndelay(50);
+}
+static const struct hwspinlock_ops u8500_hwspinlock_ops = {
+        .trylock        = u8500_hsem_trylock,
+        .unlock         = u8500_hsem_unlock,
+        .relax          = u8500_hsem_relax,
+};
+static int __devinit u8500_hsem_probe(struct platform_device *pdev)
+{
+        struct hwspinlock_pdata *pdata = pdev->dev.platform_data;
+        struct hwspinlock_device *bank;
+        struct hwspinlock *hwlock;
+        struct resource *res;
+        void __iomem *io_base;
+        int i, ret, num_locks = U8500_MAX_SEMAPHORE;
+        ulong val;
+        if (!pdata)
+                return -ENODEV;
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res)
+                return -ENODEV;
+        io_base = ioremap(res->start, resource_size(res));
+        if (!io_base) {
+                ret = -ENOMEM;
+                goto free_state;
+        }
+        /* make sure protocol 1 is selected */
+        val = readl(io_base + HSEM_CTRL_REG);
+        writel((val & ~HSEM_PROTOCOL_1), io_base + HSEM_CTRL_REG);
+        /* clear all interrupts */
+        writel(0xFFFF, io_base + HSEM_ICRALL);
+        bank = kzalloc(sizeof(*bank) + num_locks * sizeof(*hwlock), GFP_KERNEL);
+        if (!bank) {
+                ret = -ENOMEM;
+                goto iounmap_base;
+        }
+        platform_set_drvdata(pdev, bank);
+        for (i = 0, hwlock = &bank->lock[0]; i < num_locks; i++, hwlock++)
+                hwlock->priv = io_base + HSEM_REGISTER_OFFSET + sizeof(u32) * i;
+        /* no pm needed for HSem but required to comply with hwspilock core */
+        pm_runtime_enable(&pdev->dev);
+        ret = hwspin_lock_register(bank, &pdev->dev, &u8500_hwspinlock_ops,
+                                                pdata->base_id, num_locks);
+        if (ret)
+                goto reg_fail;
+        return 0;
+reg_fail:
+        pm_runtime_disable(&pdev->dev);
+        kfree(bank);
+iounmap_base:
+        iounmap(io_base);
+        return ret;
+}
+static int __devexit u8500_hsem_remove(struct platform_device *pdev)
+{
+        struct hwspinlock_device *bank = platform_get_drvdata(pdev);
+        void __iomem *io_base = bank->lock[0].priv - HSEM_REGISTER_OFFSET;
+        int ret;
+        /* clear all interrupts */
+        writel(0xFFFF, io_base + HSEM_ICRALL);
+        ret = hwspin_lock_unregister(bank);
+        if (ret) {
+                dev_err(&pdev->dev, "%s failed: %d\n", __func__, ret);
+                return ret;
+        }
+        pm_runtime_disable(&pdev->dev);
+        iounmap(io_base);
+        kfree(bank);
+        return 0;
+}
+static struct platform_driver u8500_hsem_driver = {
+        .probe          = u8500_hsem_probe,
+        .remove         = __devexit_p(u8500_hsem_remove),
+        .driver         = {
+                .name   = "u8500_hsem",
+                .owner  = THIS_MODULE,
+        },
+};
+static int __init u8500_hsem_init(void)
+{
+        return platform_driver_register(&u8500_hsem_driver);
+}
+/* board init code might need to reserve hwspinlocks for predefined purposes */
+postcore_initcall(u8500_hsem_init);
+static void __exit u8500_hsem_exit(void)
+{
+        platform_driver_unregister(&u8500_hsem_driver);
+}
+module_exit(u8500_hsem_exit);
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("Hardware Spinlock driver for u8500");
+MODULE_AUTHOR("Mathieu Poirier <mathieu.poirier@linaro.org>");
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index b2b85629d074..a3afac4be734 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -110,7 +110,6 @@ config I2C_I801
 config I2C_ISCH
        tristate "Intel SCH SMBus 1.0"
        depends on PCI
-        select MFD_CORE
        select LPC_SCH
        help
          Say Y here if you want to use SMBus controller on the Intel SCH
@@ -301,7 +300,7 @@ config I2C_AT91
 config I2C_AU1550
        tristate "Au1550/Au1200 SMBus interface"
-        depends on SOC_AU1550 || SOC_AU1200
+        depends on MIPS_ALCHEMY
        help
          If you say yes to this option, support will be included for the
          Au1550 and Au1200 SMBus interface.
diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c
index 4f757a2da8cc..f314d7f433d3 100644
--- a/drivers/i2c/busses/i2c-au1550.c
+++ b/drivers/i2c/busses/i2c-au1550.c
@@ -36,7 +36,7 @@
 #include <linux/i2c.h>
 #include <linux/slab.h>
-#include <asm/mach-au1x00/au1xxx.h>
+#include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-au1x00/au1xxx_psc.h>
 #define PSC_SEL         0x00
diff --git a/drivers/i2c/busses/i2c-pxa-pci.c b/drivers/i2c/busses/i2c-pxa-pci.c
index b73da6cd6f91..632e088760a3 100644
--- a/drivers/i2c/busses/i2c-pxa-pci.c
+++ b/drivers/i2c/busses/i2c-pxa-pci.c
@@ -3,6 +3,7 @@
 * It does not support slave mode, the register slightly moved. This PCI
 * device provides three bars, every contains a single I2C controller.
 */
+#include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
 #include <linux/i2c/pxa-i2c.h>
diff --git a/drivers/i2c/busses/i2c-sh7760.c b/drivers/i2c/busses/i2c-sh7760.c
index c418c41eff3d..a67132b2e092 100644
--- a/drivers/i2c/busses/i2c-sh7760.c
+++ b/drivers/i2c/busses/i2c-sh7760.c
@@ -17,6 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/io.h>
+#include <linux/module.h>
 #include <asm/clock.h>
 #include <asm/i2c-sh7760.h>
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index b0505309faa7..46b6500c5478 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -27,6 +27,7 @@
 #include <linux/slab.h>
 #include <linux/i2c-tegra.h>
 #include <linux/of_i2c.h>
+#include <linux/module.h>
 #include <asm/unaligned.h>
diff --git a/drivers/i2c/i2c-boardinfo.c b/drivers/i2c/i2c-boardinfo.c
index 3ca2e012e789..10274ffb66d7 100644
--- a/drivers/i2c/i2c-boardinfo.c
+++ b/drivers/i2c/i2c-boardinfo.c
@@ -19,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/i2c.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <linux/rwsem.h>
 #include "i2c-core.h"
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 76b6d98bd295..5a26584934ca 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -677,19 +677,19 @@ config BLK_DEV_IDE_PMAC_ATA100FIRST
 config BLK_DEV_IDE_AU1XXX
       bool "IDE for AMD Alchemy Au1200"
-       depends on SOC_AU1200
+       depends on MIPS_ALCHEMY
       select IDE_XFER_MODE
 choice
       prompt "IDE Mode for AMD Alchemy Au1200"
       default BLK_DEV_IDE_AU1XXX_PIO_DBDMA
-       depends on SOC_AU1200 && BLK_DEV_IDE_AU1XXX
+       depends on BLK_DEV_IDE_AU1XXX
 config BLK_DEV_IDE_AU1XXX_PIO_DBDMA
       bool "PIO+DbDMA IDE for AMD Alchemy Au1200"
 config BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
       bool "MDMA2+DbDMA IDE for AMD Alchemy Au1200"
-       depends on SOC_AU1200 && BLK_DEV_IDE_AU1XXX
+       depends on BLK_DEV_IDE_AU1XXX
 endchoice
 config BLK_DEV_IDE_TX4938
diff --git a/drivers/ide/au1xxx-ide.c b/drivers/ide/au1xxx-ide.c
index b26c23416fa7..259786ca8b75 100644
--- a/drivers/ide/au1xxx-ide.c
+++ b/drivers/ide/au1xxx-ide.c
@@ -36,13 +36,17 @@
 #include <linux/ide.h>
 #include <linux/scatterlist.h>
-#include <asm/mach-au1x00/au1xxx.h>
+#include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-au1x00/au1xxx_dbdma.h>
 #include <asm/mach-au1x00/au1xxx_ide.h>
 #define DRV_NAME        "au1200-ide"
 #define DRV_AUTHOR      "Enrico Walther <enrico.walther@amd.com> / Pete Popov <ppopov@embeddedalley.com>"
+#ifndef IDE_REG_SHIFT
+#define IDE_REG_SHIFT 5
+#endif
 /* enable the burstmode in the dbdma */
 #define IDE_AU1XXX_BURSTMODE    1
@@ -317,10 +321,11 @@ static void auide_ddma_rx_callback(int irq, void *param)
 }
 #endif /* end CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA */
-static void auide_init_dbdma_dev(dbdev_tab_t *dev, u32 dev_id, u32 tsize, u32 devwidth, u32 flags)
+static void auide_init_dbdma_dev(dbdev_tab_t *dev, u32 dev_id, u32 tsize,
+                                 u32 devwidth, u32 flags, u32 regbase)
 {
        dev->dev_id          = dev_id;
-        dev->dev_physaddr    = (u32)IDE_PHYS_ADDR;
+        dev->dev_physaddr    = CPHYSADDR(regbase);
        dev->dev_intlevel    = 0;
        dev->dev_intpolarity = 0;
        dev->dev_tsize       = tsize;
@@ -344,7 +349,7 @@ static int auide_ddma_init(ide_hwif_t *hwif, const struct ide_port_info *d)
        dbdev_tab_t source_dev_tab, target_dev_tab;
        u32 dev_id, tsize, devwidth, flags;
-        dev_id   = IDE_DDMA_REQ;
+        dev_id   = hwif->ddma_id;
        tsize    =  8; /*  1 */
        devwidth = 32; /* 16 */
@@ -356,20 +361,17 @@ static int auide_ddma_init(ide_hwif_t *hwif, const struct ide_port_info *d)
 #endif
        /* setup dev_tab for tx channel */
-        auide_init_dbdma_dev( &source_dev_tab,
+        auide_init_dbdma_dev(&source_dev_tab, dev_id, tsize, devwidth,
-                              dev_id,
+                             DEV_FLAGS_OUT | flags, auide->regbase);
-                              tsize, devwidth, DEV_FLAGS_OUT | flags);
        auide->tx_dev_id = au1xxx_ddma_add_device( &source_dev_tab );
-        auide_init_dbdma_dev( &source_dev_tab,
+        auide_init_dbdma_dev(&source_dev_tab, dev_id, tsize, devwidth,
-                              dev_id,
+                             DEV_FLAGS_IN | flags, auide->regbase);
-                              tsize, devwidth, DEV_FLAGS_IN | flags);
        auide->rx_dev_id = au1xxx_ddma_add_device( &source_dev_tab );
        
        /* We also need to add a target device for the DMA */
-        auide_init_dbdma_dev( &target_dev_tab,
+        auide_init_dbdma_dev(&target_dev_tab, (u32)DSCR_CMD0_ALWAYS, tsize,
-                              (u32)DSCR_CMD0_ALWAYS,
+                             devwidth, DEV_FLAGS_ANYUSE, auide->regbase);
-                              tsize, devwidth, DEV_FLAGS_ANYUSE);
        auide->target_dev_id = au1xxx_ddma_add_device(&target_dev_tab); 
 
        /* Get a channel for TX */
@@ -411,14 +413,12 @@ static int auide_ddma_init(ide_hwif_t *hwif, const struct ide_port_info *d)
 #endif
        /* setup dev_tab for tx channel */
-        auide_init_dbdma_dev( &source_dev_tab,
+        auide_init_dbdma_dev(&source_dev_tab, (u32)DSCR_CMD0_ALWAYS, 8, 32,
-                              (u32)DSCR_CMD0_ALWAYS,
+                             DEV_FLAGS_OUT | flags, auide->regbase);
-                              8, 32, DEV_FLAGS_OUT | flags);
        auide->tx_dev_id = au1xxx_ddma_add_device( &source_dev_tab );
-        auide_init_dbdma_dev( &source_dev_tab,
+        auide_init_dbdma_dev(&source_dev_tab, (u32)DSCR_CMD0_ALWAYS, 8, 32,
-                              (u32)DSCR_CMD0_ALWAYS,
+                             DEV_FLAGS_IN | flags, auide->regbase);
-                              8, 32, DEV_FLAGS_IN | flags);
        auide->rx_dev_id = au1xxx_ddma_add_device( &source_dev_tab );
        
        /* Get a channel for TX */
@@ -540,6 +540,14 @@ static int au_ide_probe(struct platform_device *dev)
                goto out;
        }
+        res = platform_get_resource(dev, IORESOURCE_DMA, 0);
+        if (!res) {
+                pr_debug("%s: no DDMA ID resource\n", DRV_NAME);
+                ret = -ENODEV;
+                goto out;
+        }
+        ahwif->ddma_id = res->start;
        memset(&hw, 0, sizeof(hw));
        auide_setup_ports(&hw, ahwif);
        hw.irq = ahwif->irq;
diff --git a/drivers/ide/buddha.c b/drivers/ide/buddha.c
index ab4f169d0837..b1d38590ac01 100644
--- a/drivers/ide/buddha.c
+++ b/drivers/ide/buddha.c
@@ -23,6 +23,7 @@
 #include <linux/zorro.h>
 #include <linux/ide.h>
 #include <linux/init.h>
+#include <linux/module.h>
 #include <asm/amigahw.h>
 #include <asm/amigaints.h>
diff --git a/drivers/ide/cmd640.c b/drivers/ide/cmd640.c
index cb10201a15ed..a81bd7575792 100644
--- a/drivers/ide/cmd640.c
+++ b/drivers/ide/cmd640.c
@@ -105,6 +105,7 @@
 #include <linux/delay.h>
 #include <linux/ide.h>
 #include <linux/init.h>
+#include <linux/module.h>
 #include <asm/io.h>
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c
index 2af8cb460a3b..f22edc66b030 100644
--- a/drivers/ide/ide-acpi.c
+++ b/drivers/ide/ide-acpi.c
@@ -17,6 +17,7 @@
 #include <linux/ide.h>
 #include <linux/pci.h>
 #include <linux/dmi.h>
+#include <linux/module.h>
 #include <acpi/acpi_bus.h>
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 6f218e014e99..fac3d9da2e07 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -5,6 +5,7 @@
 #include <linux/kernel.h>
 #include <linux/cdrom.h>
 #include <linux/delay.h>
+#include <linux/export.h>
 #include <linux/ide.h>
 #include <linux/scatterlist.h>
 #include <linux/gfp.h>
diff --git a/drivers/ide/ide-disk_proc.c b/drivers/ide/ide-disk_proc.c
index f9bbd904eae7..8b570a17bcd9 100644
--- a/drivers/ide/ide-disk_proc.c
+++ b/drivers/ide/ide-disk_proc.c
@@ -1,6 +1,7 @@
 #include <linux/kernel.h>
 #include <linux/ide.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <linux/seq_file.h>
 #include "ide-disk.h"
diff --git a/drivers/ide/ide-dma-sff.c b/drivers/ide/ide-dma-sff.c
index e4cdf78cc3e9..289d16c87b8f 100644
--- a/drivers/ide/ide-dma-sff.c
+++ b/drivers/ide/ide-dma-sff.c
@@ -1,5 +1,6 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/ide.h>
 #include <linux/scatterlist.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index d4136908f916..17a65ac56491 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -31,6 +31,7 @@
 #include <linux/types.h>
 #include <linux/gfp.h>
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/ide.h>
 #include <linux/scatterlist.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/ide/ide-eh.c b/drivers/ide/ide-eh.c
index c0aa93fb7a60..32970664c275 100644
--- a/drivers/ide/ide-eh.c
+++ b/drivers/ide/ide-eh.c
@@ -1,5 +1,6 @@
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/ide.h>
 #include <linux/delay.h>
diff --git a/drivers/ide/ide-floppy_proc.c b/drivers/ide/ide-floppy_proc.c
index d711d9b883de..1600720f3e86 100644
--- a/drivers/ide/ide-floppy_proc.c
+++ b/drivers/ide/ide-floppy_proc.c
@@ -1,4 +1,5 @@
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/ide.h>
 #include <linux/seq_file.h>
diff --git a/drivers/ide/ide-io-std.c b/drivers/ide/ide-io-std.c
index 46721c454518..19763977568c 100644
--- a/drivers/ide/ide-io-std.c
+++ b/drivers/ide/ide-io-std.c
@@ -1,5 +1,6 @@
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/ide.h>
 #if defined(CONFIG_ARM) || defined(CONFIG_M68K) || defined(CONFIG_MIPS) || \
diff --git a/drivers/ide/ide-ioctls.c b/drivers/ide/ide-ioctls.c
index 9965ecd5078c..4d19eb9772a1 100644
--- a/drivers/ide/ide-ioctls.c
+++ b/drivers/ide/ide-ioctls.c
@@ -2,6 +2,7 @@
 * IDE ioctls handling.
 */
+#include <linux/export.h>
 #include <linux/hdreg.h>
 #include <linux/ide.h>
 #include <linux/slab.h>
diff --git a/drivers/ide/ide-legacy.c b/drivers/ide/ide-legacy.c
index b9654a7bb7be..30fe3630734f 100644
--- a/drivers/ide/ide-legacy.c
+++ b/drivers/ide/ide-legacy.c
@@ -1,4 +1,5 @@
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/ide.h>
 static void ide_legacy_init_one(struct ide_hw **hws, struct ide_hw *hw,
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index e386a32dc9ba..d9c9829c8b20 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -1,6 +1,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/interrupt.h>
 #include <linux/ide.h>
 #include <linux/bitops.h>
diff --git a/drivers/ide/ide-pnp.c b/drivers/ide/ide-pnp.c
index 017b1df3b805..e5f3db831373 100644
--- a/drivers/ide/ide-pnp.c
+++ b/drivers/ide/ide-pnp.c
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/pnp.h>
 #include <linux/ide.h>
+#include <linux/module.h>
 #define DRV_NAME "ide-pnp"
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 600c89a3d137..5bc2839ebcfd 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -11,6 +11,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/errno.h>
diff --git a/drivers/ide/ide-xfer-mode.c b/drivers/ide/ide-xfer-mode.c
index 5fc8d5c17de9..eb421883c16d 100644
--- a/drivers/ide/ide-xfer-mode.c
+++ b/drivers/ide/ide-xfer-mode.c
@@ -1,6 +1,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/interrupt.h>
 #include <linux/ide.h>
 #include <linux/bitops.h>
diff --git a/drivers/ide/macide.c b/drivers/ide/macide.c
index 505ec43e5606..adc5fe9daafc 100644
--- a/drivers/ide/macide.c
+++ b/drivers/ide/macide.c
@@ -17,6 +17,7 @@
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/ide.h>
+#include <linux/module.h>
 #include <asm/macintosh.h>
 #include <asm/macints.h>
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c
index 1db7c4368dbf..e944c7f705f7 100644
--- a/drivers/ide/pmac.c
+++ b/drivers/ide/pmac.c
@@ -28,6 +28,7 @@
 #include <linux/delay.h>
 #include <linux/ide.h>
 #include <linux/notifier.h>
+#include <linux/module.h>
 #include <linux/reboot.h>
 #include <linux/pci.h>
 #include <linux/adb.h>
diff --git a/drivers/ide/q40ide.c b/drivers/ide/q40ide.c
index 90786083b439..ecd0a69245f6 100644
--- a/drivers/ide/q40ide.c
+++ b/drivers/ide/q40ide.c
@@ -15,6 +15,7 @@
 #include <linux/interrupt.h>
 #include <linux/blkdev.h>
 #include <linux/ide.h>
+#include <linux/module.h>
 #include <asm/ide.h>
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index ab3db61d2ba0..34a5e5223d50 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -8,6 +8,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
diff --git a/drivers/ide/tc86c001.c b/drivers/ide/tc86c001.c
index e444d24934b3..4799d5c384e7 100644
--- a/drivers/ide/tc86c001.c
+++ b/drivers/ide/tc86c001.c
@@ -10,6 +10,7 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/ide.h>
+#include <linux/module.h>
 #define DRV_NAME "tc86c001"
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index a46dddf61078..18767f8ab090 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -61,6 +61,7 @@
 #include <linux/sched.h>
 #include <linux/notifier.h>
 #include <linux/cpu.h>
+#include <linux/module.h>
 #include <asm/mwait.h>
 #include <asm/msr.h>
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index 236ad9a89c0a..691276bafd78 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -37,6 +37,7 @@
 #include <linux/inetdevice.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
+#include <linux/module.h>
 #include <net/arp.h>
 #include <net/neighbour.h>
 #include <net/route.h>
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 4104ea2427c2..8b72f39202fb 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -36,6 +36,7 @@
 #include <linux/completion.h>
 #include <linux/dma-mapping.h>
 #include <linux/device.h>
+#include <linux/module.h>
 #include <linux/err.h>
 #include <linux/idr.h>
 #include <linux/interrupt.h>
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 872b1842598a..75ff821c0af0 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -41,6 +41,7 @@
 #include <linux/idr.h>
 #include <linux/inetdevice.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <net/tcp.h>
 #include <net/ipv6.h>
diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
index 4507043d24c8..176c8f90f2bb 100644
--- a/drivers/infiniband/core/fmr_pool.c
+++ b/drivers/infiniband/core/fmr_pool.c
@@ -33,6 +33,7 @@
 #include <linux/errno.h>
 #include <linux/spinlock.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/jhash.h>
 #include <linux/kthread.h>
diff --git a/drivers/infiniband/core/iwcm.c b/drivers/infiniband/core/iwcm.c
index a9c042345c6f..1a696f76b616 100644
--- a/drivers/infiniband/core/iwcm.c
+++ b/drivers/infiniband/core/iwcm.c
@@ -45,6 +45,7 @@
 #include <linux/workqueue.h>
 #include <linux/completion.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <rdma/iw_cm.h>
 #include <rdma/ib_addr.h>
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 056389229ea7..2fe428bba54c 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -35,6 +35,7 @@
 */
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <rdma/ib_cache.h>
 #include "mad_priv.h"
diff --git a/drivers/infiniband/core/multicast.c b/drivers/infiniband/core/multicast.c
index 68b4162fd9d2..d2360a8ef0b2 100644
--- a/drivers/infiniband/core/multicast.c
+++ b/drivers/infiniband/core/multicast.c
@@ -34,6 +34,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
 #include <linux/interrupt.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/bitops.h>
 #include <linux/random.h>
diff --git a/drivers/infiniband/core/netlink.c b/drivers/infiniband/core/netlink.c
index 9227f4acd79c..d1c8196d15d7 100644
--- a/drivers/infiniband/core/netlink.c
+++ b/drivers/infiniband/core/netlink.c
@@ -32,6 +32,7 @@
 #define pr_fmt(fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__
+#include <linux/export.h>
 #include <net/netlink.h>
 #include <net/net_namespace.h>
 #include <net/sock.h>
diff --git a/drivers/infiniband/core/packer.c b/drivers/infiniband/core/packer.c
index 019bd4b0863e..1b65986c0be3 100644
--- a/drivers/infiniband/core/packer.c
+++ b/drivers/infiniband/core/packer.c
@@ -31,6 +31,7 @@
 * SOFTWARE.
 */
+#include <linux/export.h>
 #include <linux/string.h>
 #include <rdma/ib_pack.h>
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index 2b59b72b57f9..c61bca30fd2d 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -35,6 +35,7 @@
 #include "core_priv.h"
 #include <linux/slab.h>
+#include <linux/stat.h>
 #include <linux/string.h>
 #include <rdma/ib_mad.h>
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index b69307f4f6d0..b37b0c02a7b9 100644
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -41,6 +41,7 @@
 #include <linux/miscdevice.h>
 #include <linux/slab.h>
 #include <linux/sysctl.h>
+#include <linux/module.h>
 #include <rdma/rdma_user_cm.h>
 #include <rdma/ib_marshall.h>
diff --git a/drivers/infiniband/core/ud_header.c b/drivers/infiniband/core/ud_header.c
index 9b737ff133e2..72feee620ebf 100644
--- a/drivers/infiniband/core/ud_header.c
+++ b/drivers/infiniband/core/ud_header.c
@@ -33,6 +33,7 @@
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/export.h>
 #include <linux/if_ether.h>
 #include <rdma/ib_pack.h>
diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
index 9155f91d66bf..71f0c0f7df94 100644
--- a/drivers/infiniband/core/umem.c
+++ b/drivers/infiniband/core/umem.c
@@ -35,6 +35,7 @@
 #include <linux/mm.h>
 #include <linux/dma-mapping.h>
 #include <linux/sched.h>
+#include <linux/export.h>
 #include <linux/hugetlb.h>
 #include <linux/dma-attrs.h>
 #include <linux/slab.h>
diff --git a/drivers/infiniband/core/uverbs_marshall.c b/drivers/infiniband/core/uverbs_marshall.c
index 1b1146f87124..e7bee46868d1 100644
--- a/drivers/infiniband/core/uverbs_marshall.c
+++ b/drivers/infiniband/core/uverbs_marshall.c
@@ -30,6 +30,7 @@
 * SOFTWARE.
 */
+#include <linux/export.h>
 #include <rdma/ib_marshall.h>
 void ib_copy_ah_attr_to_user(struct ib_uverbs_ah_attr *dst,
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 42517500b223..602b1bd723a9 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -38,6 +38,7 @@
 #include <linux/errno.h>
 #include <linux/err.h>
+#include <linux/export.h>
 #include <linux/string.h>
 #include <linux/slab.h>
diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index d6ccc7e84802..5f940aeaab1e 100644
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -29,6 +29,9 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
 */
+#include <linux/module.h>
 #include "iw_cxgb4.h"
 static int ocqp_support = 1;
diff --git a/drivers/infiniband/hw/ipath/ipath_diag.c b/drivers/infiniband/hw/ipath/ipath_diag.c
index daef61d5e5bb..714293b78518 100644
--- a/drivers/infiniband/hw/ipath/ipath_diag.c
+++ b/drivers/infiniband/hw/ipath/ipath_diag.c
@@ -45,6 +45,7 @@
 #include <linux/pci.h>
 #include <linux/vmalloc.h>
 #include <linux/fs.h>
+#include <linux/export.h>
 #include <asm/uaccess.h>
 #include "ipath_kernel.h"
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
index be24ac726114..bfca37b2432f 100644
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -41,6 +41,7 @@
 #include <linux/vmalloc.h>
 #include <linux/bitmap.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include "ipath_kernel.h"
 #include "ipath_verbs.h"
diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c
index 8697eca14356..736d9edbdbe7 100644
--- a/drivers/infiniband/hw/ipath/ipath_file_ops.c
+++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c
@@ -35,6 +35,7 @@
 #include <linux/poll.h>
 #include <linux/cdev.h>
 #include <linux/swap.h>
+#include <linux/export.h>
 #include <linux/vmalloc.h>
 #include <linux/slab.h>
 #include <linux/highmem.h>
diff --git a/drivers/infiniband/hw/ipath/ipath_init_chip.c b/drivers/infiniband/hw/ipath/ipath_init_chip.c
index 824a4d508836..49b09c697c7c 100644
--- a/drivers/infiniband/hw/ipath/ipath_init_chip.c
+++ b/drivers/infiniband/hw/ipath/ipath_init_chip.c
@@ -33,6 +33,7 @@
 #include <linux/pci.h>
 #include <linux/netdevice.h>
+#include <linux/moduleparam.h>
 #include <linux/slab.h>
 #include <linux/stat.h>
 #include <linux/vmalloc.h>
diff --git a/drivers/infiniband/hw/ipath/ipath_sysfs.c b/drivers/infiniband/hw/ipath/ipath_sysfs.c
index 8991677e9a08..75558f33f1cb 100644
--- a/drivers/infiniband/hw/ipath/ipath_sysfs.c
+++ b/drivers/infiniband/hw/ipath/ipath_sysfs.c
@@ -32,6 +32,7 @@
 */
 #include <linux/ctype.h>
+#include <linux/stat.h>
 #include "ipath_kernel.h"
 #include "ipath_verbs.h"
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
index dd7f26d04d46..439c35d4a669 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -35,6 +35,7 @@
 #include <rdma/ib_user_verbs.h>
 #include <linux/io.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <linux/utsname.h>
 #include <linux/rculist.h>
diff --git a/drivers/infiniband/hw/mthca/mthca_catas.c b/drivers/infiniband/hw/mthca/mthca_catas.c
index e4a08c2819e4..712d2a30fbe5 100644
--- a/drivers/infiniband/hw/mthca/mthca_catas.c
+++ b/drivers/infiniband/hw/mthca/mthca_catas.c
@@ -31,6 +31,7 @@
 */
 #include <linux/jiffies.h>
+#include <linux/module.h>
 #include <linux/timer.h>
 #include <linux/workqueue.h>
diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
index 3082b3b3d620..9d3e5c1ac60e 100644
--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
@@ -36,6 +36,7 @@
 #include <linux/pci.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <asm/io.h>
 #include <rdma/ib_mad.h>
diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
index ab876f928a1b..ed9a989e501b 100644
--- a/drivers/infiniband/hw/mthca/mthca_mr.c
+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
@@ -146,7 +146,7 @@ static int mthca_buddy_init(struct mthca_buddy *buddy, int max_order)
        buddy->bits = kzalloc((buddy->max_order + 1) * sizeof (long *),
                              GFP_KERNEL);
-        buddy->num_free = kzalloc((buddy->max_order + 1) * sizeof (int *),
+        buddy->num_free = kcalloc((buddy->max_order + 1), sizeof *buddy->num_free,
                                  GFP_KERNEL);
        if (!buddy->bits || !buddy->num_free)
                goto err_out;
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
index cb9a0b976804..5b71d43bd89c 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -40,7 +40,9 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/stat.h>
 #include <linux/mm.h>
+#include <linux/export.h>
 #include "mthca_dev.h"
 #include "mthca_cmd.h"
diff --git a/drivers/infiniband/hw/qib/qib_diag.c b/drivers/infiniband/hw/qib/qib_diag.c
index 204c4dd9dce0..9892456a4348 100644
--- a/drivers/infiniband/hw/qib/qib_diag.c
+++ b/drivers/infiniband/hw/qib/qib_diag.c
@@ -46,6 +46,7 @@
 #include <linux/pci.h>
 #include <linux/poll.h>
 #include <linux/vmalloc.h>
+#include <linux/export.h>
 #include <linux/fs.h>
 #include <linux/uaccess.h>
diff --git a/drivers/infiniband/hw/qib/qib_driver.c b/drivers/infiniband/hw/qib/qib_driver.c
index 9a9047f385ae..c90a55f4120f 100644
--- a/drivers/infiniband/hw/qib/qib_driver.c
+++ b/drivers/infiniband/hw/qib/qib_driver.c
@@ -37,6 +37,7 @@
 #include <linux/delay.h>
 #include <linux/netdevice.h>
 #include <linux/vmalloc.h>
+#include <linux/module.h>
 #include "qib.h"
diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c
index 77633666f81c..574600ef5b42 100644
--- a/drivers/infiniband/hw/qib/qib_file_ops.c
+++ b/drivers/infiniband/hw/qib/qib_file_ops.c
@@ -43,6 +43,7 @@
 #include <linux/jiffies.h>
 #include <asm/pgtable.h>
 #include <linux/delay.h>
+#include <linux/export.h>
 #include "qib.h"
 #include "qib_common.h"
diff --git a/drivers/infiniband/hw/qib/qib_iba7220.c b/drivers/infiniband/hw/qib/qib_iba7220.c
index 3f1d562ba898..439d3c503cd5 100644
--- a/drivers/infiniband/hw/qib/qib_iba7220.c
+++ b/drivers/infiniband/hw/qib/qib_iba7220.c
@@ -39,6 +39,7 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 #include <linux/io.h>
 #include <rdma/ib_verbs.h>
diff --git a/drivers/infiniband/hw/qib/qib_iba7322.c b/drivers/infiniband/hw/qib/qib_iba7322.c
index efd0a110091f..5bd2162b95dc 100644
--- a/drivers/infiniband/hw/qib/qib_iba7322.c
+++ b/drivers/infiniband/hw/qib/qib_iba7322.c
@@ -40,6 +40,7 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/jiffies.h>
+#include <linux/module.h>
 #include <rdma/ib_verbs.h>
 #include <rdma/ib_smi.h>
diff --git a/drivers/infiniband/hw/qib/qib_init.c b/drivers/infiniband/hw/qib/qib_init.c
index b093a0b53b2f..58b0f8ad4a29 100644
--- a/drivers/infiniband/hw/qib/qib_init.c
+++ b/drivers/infiniband/hw/qib/qib_init.c
@@ -37,6 +37,7 @@
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/idr.h>
+#include <linux/module.h>
 #include "qib.h"
 #include "qib_common.h"
diff --git a/drivers/infiniband/hw/qib/qib_pcie.c b/drivers/infiniband/hw/qib/qib_pcie.c
index 4426782ad288..97a8bdf68e60 100644
--- a/drivers/infiniband/hw/qib/qib_pcie.c
+++ b/drivers/infiniband/hw/qib/qib_pcie.c
@@ -35,6 +35,7 @@
 #include <linux/delay.h>
 #include <linux/vmalloc.h>
 #include <linux/aer.h>
+#include <linux/module.h>
 #include "qib.h"
diff --git a/drivers/infiniband/hw/qib/qib_rc.c b/drivers/infiniband/hw/qib/qib_rc.c
index afaf4ac79f42..894afac26f3b 100644
--- a/drivers/infiniband/hw/qib/qib_rc.c
+++ b/drivers/infiniband/hw/qib/qib_rc.c
@@ -271,13 +271,9 @@ int qib_make_rc_req(struct qib_qp *qp)
                        goto bail;
                }
                wqe = get_swqe_ptr(qp, qp->s_last);
-                while (qp->s_last != qp->s_acked) {
+                qib_send_complete(qp, wqe, qp->s_last != qp->s_acked ?
-                        qib_send_complete(qp, wqe, IB_WC_SUCCESS);
+                        IB_WC_SUCCESS : IB_WC_WR_FLUSH_ERR);
-                        if (++qp->s_last >= qp->s_size)
+                /* will get called again */
-                                qp->s_last = 0;
-                        wqe = get_swqe_ptr(qp, qp->s_last);
-                }
-                qib_send_complete(qp, wqe, IB_WC_WR_FLUSH_ERR);
                goto done;
        }
diff --git a/drivers/infiniband/hw/qib/qib_sd7220.c b/drivers/infiniband/hw/qib/qib_sd7220.c
index e9f9f8bc3204..de1a4b2f33c0 100644
--- a/drivers/infiniband/hw/qib/qib_sd7220.c
+++ b/drivers/infiniband/hw/qib/qib_sd7220.c
@@ -38,6 +38,7 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 #include <linux/firmware.h>
 #include "qib.h"
diff --git a/drivers/infiniband/hw/qib/qib_sdma.c b/drivers/infiniband/hw/qib/qib_sdma.c
index cad44491320b..12a9604310d7 100644
--- a/drivers/infiniband/hw/qib/qib_sdma.c
+++ b/drivers/infiniband/hw/qib/qib_sdma.c
@@ -32,6 +32,7 @@
 #include <linux/spinlock.h>
 #include <linux/netdevice.h>
+#include <linux/moduleparam.h>
 #include "qib.h"
 #include "qib_common.h"
diff --git a/drivers/infiniband/hw/qib/qib_tx.c b/drivers/infiniband/hw/qib/qib_tx.c
index 7f36454c225e..1bf626c40172 100644
--- a/drivers/infiniband/hw/qib/qib_tx.c
+++ b/drivers/infiniband/hw/qib/qib_tx.c
@@ -36,6 +36,7 @@
 #include <linux/delay.h>
 #include <linux/netdevice.h>
 #include <linux/vmalloc.h>
+#include <linux/moduleparam.h>
 #include "qib.h"
diff --git a/drivers/infiniband/hw/qib/qib_verbs.c b/drivers/infiniband/hw/qib/qib_verbs.c
index 9627cb737125..a894762da462 100644
--- a/drivers/infiniband/hw/qib/qib_verbs.c
+++ b/drivers/infiniband/hw/qib/qib_verbs.c
@@ -35,6 +35,7 @@
 #include <rdma/ib_mad.h>
 #include <rdma/ib_user_verbs.h>
 #include <linux/io.h>
+#include <linux/module.h>
 #include <linux/utsname.h>
 #include <linux/rculist.h>
 #include <linux/mm.h>
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 231c2f2f52f8..014504d8e43c 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -37,6 +37,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <linux/moduleparam.h>
 #include "ipoib.h"
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_fs.c b/drivers/infiniband/ulp/ipoib/ipoib_fs.c
index 0e2fe4631ba8..50061854616e 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_fs.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_fs.c
@@ -37,6 +37,7 @@
 struct file_operations;
 #include <linux/debugfs.h>
+#include <linux/export.h>
 #include "ipoib.h"
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 2b060f45bec3..0ef9af94997d 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -34,6 +34,7 @@
 */
 #include <linux/delay.h>
+#include <linux/moduleparam.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index ecea4fe1ed00..1b7a97686356 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -34,6 +34,7 @@
 #include <linux/skbuff.h>
 #include <linux/rtnetlink.h>
+#include <linux/moduleparam.h>
 #include <linux/ip.h>
 #include <linux/in.h>
 #include <linux/igmp.h>
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c
index 84e8c293a715..7e7373a700e6 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -57,6 +57,7 @@
 #include <linux/scatterlist.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <net/sock.h>
@@ -151,7 +152,6 @@ int iser_initialize_task_headers(struct iscsi_task *task,
        tx_desc->tx_sg[0].length = ISER_HEADERS_LEN;
        tx_desc->tx_sg[0].lkey   = device->mr->lkey;
-        iser_task->headers_initialized  = 1;
        iser_task->iser_conn            = iser_conn;
        return 0;
 }
@@ -166,8 +166,7 @@ iscsi_iser_task_init(struct iscsi_task *task)
 {
        struct iscsi_iser_task *iser_task = task->dd_data;
-        if (!iser_task->headers_initialized)
+        if (iser_initialize_task_headers(task, &iser_task->desc))
-                if (iser_initialize_task_headers(task, &iser_task->desc))
                        return -ENOMEM;
        /* mgmt task */
@@ -278,6 +277,13 @@ iscsi_iser_task_xmit(struct iscsi_task *task)
 static void iscsi_iser_cleanup_task(struct iscsi_task *task)
 {
        struct iscsi_iser_task *iser_task = task->dd_data;
+        struct iser_tx_desc     *tx_desc = &iser_task->desc;
+        struct iscsi_iser_conn *iser_conn = task->conn->dd_data;
+        struct iser_device     *device    = iser_conn->ib_conn->device;
+        ib_dma_unmap_single(device->ib_device,
+                tx_desc->dma_addr, ISER_HEADERS_LEN, DMA_TO_DEVICE);
        /* mgmt tasks do not need special cleanup */
        if (!task->sc)
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h
index db6f3ce9f3bf..db7ea3704da7 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -257,7 +257,8 @@ struct iser_conn {
        struct list_head             conn_list;       /* entry in ig conn list */
        char                         *login_buf;
-        u64                          login_dma;
+        char                         *login_req_buf, *login_resp_buf;
+        u64                          login_req_dma, login_resp_dma;
        unsigned int                 rx_desc_head;
        struct iser_rx_desc          *rx_descs;
        struct ib_recv_wr            rx_wr[ISER_MIN_POSTED_RX];
@@ -277,7 +278,6 @@ struct iscsi_iser_task {
        struct iser_regd_buf         rdma_regd[ISER_DIRS_NUM];/* regd rdma buf */
        struct iser_data_buf         data[ISER_DIRS_NUM];     /* orig. data des*/
        struct iser_data_buf         data_copy[ISER_DIRS_NUM];/* contig. copy  */
-        int                          headers_initialized;
 };
 struct iser_page_vec {
diff --git a/drivers/infiniband/ulp/iser/iser_initiator.c b/drivers/infiniband/ulp/iser/iser_initiator.c
index f299de6b419b..a607542fc796 100644
--- a/drivers/infiniband/ulp/iser/iser_initiator.c
+++ b/drivers/infiniband/ulp/iser/iser_initiator.c
@@ -221,8 +221,14 @@ void iser_free_rx_descriptors(struct iser_conn *ib_conn)
        struct iser_device *device = ib_conn->device;
        if (ib_conn->login_buf) {
-                ib_dma_unmap_single(device->ib_device, ib_conn->login_dma,
+                if (ib_conn->login_req_dma)
-                        ISER_RX_LOGIN_SIZE, DMA_FROM_DEVICE);
+                        ib_dma_unmap_single(device->ib_device,
+                                ib_conn->login_req_dma,
+                                ISCSI_DEF_MAX_RECV_SEG_LEN, DMA_TO_DEVICE);
+                if (ib_conn->login_resp_dma)
+                        ib_dma_unmap_single(device->ib_device,
+                                ib_conn->login_resp_dma,
+                                ISER_RX_LOGIN_SIZE, DMA_FROM_DEVICE);
                kfree(ib_conn->login_buf);
        }
@@ -394,6 +400,7 @@ int iser_send_control(struct iscsi_conn *conn,
        unsigned long data_seg_len;
        int err = 0;
        struct iser_device *device;
+        struct iser_conn *ib_conn = iser_conn->ib_conn;
        /* build the tx desc regd header and add it to the tx desc dto */
        mdesc->type = ISCSI_TX_CONTROL;
@@ -409,9 +416,19 @@ int iser_send_control(struct iscsi_conn *conn,
                        iser_err("data present on non login task!!!\n");
                        goto send_control_error;
                }
-                memcpy(iser_conn->ib_conn->login_buf, task->data,
+                ib_dma_sync_single_for_cpu(device->ib_device,
+                        ib_conn->login_req_dma, task->data_count,
+                        DMA_TO_DEVICE);
+                memcpy(iser_conn->ib_conn->login_req_buf, task->data,
                                                        task->data_count);
-                tx_dsg->addr    = iser_conn->ib_conn->login_dma;
+                ib_dma_sync_single_for_device(device->ib_device,
+                        ib_conn->login_req_dma, task->data_count,
+                        DMA_TO_DEVICE);
+                tx_dsg->addr    = iser_conn->ib_conn->login_req_dma;
                tx_dsg->length  = task->data_count;
                tx_dsg->lkey    = device->mr->lkey;
                mdesc->num_sge = 2;
@@ -445,8 +462,8 @@ void iser_rcv_completion(struct iser_rx_desc *rx_desc,
        int rx_buflen, outstanding, count, err;
        /* differentiate between login to all other PDUs */
-        if ((char *)rx_desc == ib_conn->login_buf) {
+        if ((char *)rx_desc == ib_conn->login_resp_buf) {
-                rx_dma = ib_conn->login_dma;
+                rx_dma = ib_conn->login_resp_dma;
                rx_buflen = ISER_RX_LOGIN_SIZE;
        } else {
                rx_dma = rx_desc->dma_addr;
@@ -473,7 +490,7 @@ void iser_rcv_completion(struct iser_rx_desc *rx_desc,
         * for the posted rx bufs refcount to become zero handles everything   */
        conn->ib_conn->post_recv_buf_count--;
-        if (rx_dma == ib_conn->login_dma)
+        if (rx_dma == ib_conn->login_resp_dma)
                return;
        outstanding = ib_conn->post_recv_buf_count;
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index ede1475bee09..e28877c4ce15 100644
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -155,20 +155,39 @@ static int iser_create_ib_conn_res(struct iser_conn *ib_conn)
 {
        struct iser_device      *device;
        struct ib_qp_init_attr  init_attr;
-        int                     ret = -ENOMEM;
+        int                     req_err, resp_err, ret = -ENOMEM;
        struct ib_fmr_pool_param params;
        BUG_ON(ib_conn->device == NULL);
        device = ib_conn->device;
-        ib_conn->login_buf = kmalloc(ISER_RX_LOGIN_SIZE, GFP_KERNEL);
+        ib_conn->login_buf = kmalloc(ISCSI_DEF_MAX_RECV_SEG_LEN +
+                                        ISER_RX_LOGIN_SIZE, GFP_KERNEL);
        if (!ib_conn->login_buf)
                goto out_err;
-        ib_conn->login_dma = ib_dma_map_single(ib_conn->device->ib_device,
+        ib_conn->login_req_buf  = ib_conn->login_buf;
-                                (void *)ib_conn->login_buf, ISER_RX_LOGIN_SIZE,
+        ib_conn->login_resp_buf = ib_conn->login_buf + ISCSI_DEF_MAX_RECV_SEG_LEN;
-                                DMA_FROM_DEVICE);
+        ib_conn->login_req_dma = ib_dma_map_single(ib_conn->device->ib_device,
+                                (void *)ib_conn->login_req_buf,
+                                ISCSI_DEF_MAX_RECV_SEG_LEN, DMA_TO_DEVICE);
+        ib_conn->login_resp_dma = ib_dma_map_single(ib_conn->device->ib_device,
+                                (void *)ib_conn->login_resp_buf,
+                                ISER_RX_LOGIN_SIZE, DMA_FROM_DEVICE);
+        req_err  = ib_dma_mapping_error(device->ib_device, ib_conn->login_req_dma);
+        resp_err = ib_dma_mapping_error(device->ib_device, ib_conn->login_resp_dma);
+        if (req_err || resp_err) {
+                if (req_err)
+                        ib_conn->login_req_dma = 0;
+                if (resp_err)
+                        ib_conn->login_resp_dma = 0;
+                goto out_err;
+        }
        ib_conn->page_vec = kmalloc(sizeof(struct iser_page_vec) +
                                    (sizeof(u64) * (ISCSI_ISER_SG_TABLESIZE +1)),
@@ -658,11 +677,11 @@ int iser_post_recvl(struct iser_conn *ib_conn)
        struct ib_sge     sge;
        int ib_ret;
-        sge.addr   = ib_conn->login_dma;
+        sge.addr   = ib_conn->login_resp_dma;
        sge.length = ISER_RX_LOGIN_SIZE;
        sge.lkey   = ib_conn->device->mr->lkey;
-        rx_wr.wr_id   = (unsigned long)ib_conn->login_buf;
+        rx_wr.wr_id   = (unsigned long)ib_conn->login_resp_buf;
        rx_wr.sg_list = &sge;
        rx_wr.num_sge = 1;
        rx_wr.next    = NULL;
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 23e82e46656d..001b147c7f95 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -3,7 +3,7 @@
 #
 menu "Input device support"
-        depends on !S390
+        depends on !S390 && !UML
 config INPUT
        tristate "Generic input layer (needed for keyboard, mouse, ...)" if EXPERT
diff --git a/drivers/input/input-compat.c b/drivers/input/input-compat.c
index 1accb89ae66f..e46a86776a6b 100644
--- a/drivers/input/input-compat.c
+++ b/drivers/input/input-compat.c
@@ -8,6 +8,7 @@
 * the Free Software Foundation.
 */
+#include <linux/export.h>
 #include <asm/uaccess.h>
 #include "input-compat.h"
diff --git a/drivers/input/input-mt.c b/drivers/input/input-mt.c
index 9150ee78e00a..f658086fbbe0 100644
--- a/drivers/input/input-mt.c
+++ b/drivers/input/input-mt.c
@@ -9,6 +9,7 @@
 */
 #include <linux/input/mt.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #define TRKID_SGN       ((TRKID_MAX + 1) >> 1)
diff --git a/drivers/input/input-polldev.c b/drivers/input/input-polldev.c
index b253973881b8..7dfe1009fae0 100644
--- a/drivers/input/input-polldev.c
+++ b/drivers/input/input-polldev.c
@@ -14,6 +14,7 @@
 #include <linux/slab.h>
 #include <linux/mutex.h>
 #include <linux/workqueue.h>
+#include <linux/module.h>
 #include <linux/input-polldev.h>
 MODULE_AUTHOR("Dmitry Torokhov <dtor@mail.ru>");
diff --git a/drivers/input/joystick/as5011.c b/drivers/input/joystick/as5011.c
index f6732b57ca07..6d6e7418dc21 100644
--- a/drivers/input/joystick/as5011.c
+++ b/drivers/input/joystick/as5011.c
@@ -30,6 +30,7 @@
 #include <linux/delay.h>
 #include <linux/input/as5011.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #define DRIVER_DESC "Driver for Austria Microsystems AS5011 joystick"
 #define MODULE_DEVICE_ALIAS "as5011"
diff --git a/drivers/input/keyboard/nomadik-ske-keypad.c b/drivers/input/keyboard/nomadik-ske-keypad.c
index 6e0f23091360..fcdec5e2b297 100644
--- a/drivers/input/keyboard/nomadik-ske-keypad.c
+++ b/drivers/input/keyboard/nomadik-ske-keypad.c
@@ -18,6 +18,7 @@
 #include <linux/input.h>
 #include <linux/slab.h>
 #include <linux/clk.h>
+#include <linux/module.h>
 #include <plat/ske.h>
diff --git a/drivers/input/keyboard/tnetv107x-keypad.c b/drivers/input/keyboard/tnetv107x-keypad.c
index 1c58681de81f..66e55e5cfdd6 100644
--- a/drivers/input/keyboard/tnetv107x-keypad.c
+++ b/drivers/input/keyboard/tnetv107x-keypad.c
@@ -24,6 +24,7 @@
 #include <linux/io.h>
 #include <linux/clk.h>
 #include <linux/input/matrix_keypad.h>
+#include <linux/module.h>
 #define BITS(x)                 (BIT(x) - 1)
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 56aa465d1b99..22d875fde53a 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -134,6 +134,16 @@ config INPUT_MAX8925_ONKEY
          To compile this driver as a module, choose M here: the module
          will be called max8925_onkey.
+config INPUT_MC13783_PWRBUTTON
+        tristate "MC13783 ON buttons"
+        depends on MFD_MC13783
+        help
+          Support the ON buttons of MC13783 PMIC as an input device
+          reporting power button status.
+          To compile this driver as a module, choose M here: the module
+          will be called mc13783-pwrbutton.
 config INPUT_MMA8450
        tristate "MMA8450 - Freescale's 3-Axis, 8/12-bit Digital Accelerometer"
        depends on I2C
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 62dcd79d548f..a244fc6a781c 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_INPUT_KEYSPAN_REMOTE)	+= keyspan_remote.o
 obj-$(CONFIG_INPUT_KXTJ9)               += kxtj9.o
 obj-$(CONFIG_INPUT_M68K_BEEP)           += m68kspkr.o
 obj-$(CONFIG_INPUT_MAX8925_ONKEY)       += max8925_onkey.o
+obj-$(CONFIG_INPUT_MC13783_PWRBUTTON)   += mc13783-pwrbutton.o
 obj-$(CONFIG_INPUT_MMA8450)             += mma8450.o
 obj-$(CONFIG_INPUT_MPU3050)             += mpu3050.o
 obj-$(CONFIG_INPUT_PCAP)                += pcap_keys.o
diff --git a/drivers/input/misc/ad714x.c b/drivers/input/misc/ad714x.c
index ca42c7d2a3c7..0ac75bbad4d6 100644
--- a/drivers/input/misc/ad714x.c
+++ b/drivers/input/misc/ad714x.c
@@ -12,6 +12,7 @@
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/input/ad714x.h>
+#include <linux/module.h>
 #include "ad714x.h"
 #define AD714X_PWR_CTRL           0x0
diff --git a/drivers/input/misc/adxl34x.c b/drivers/input/misc/adxl34x.c
index 144ddbdeb9b3..09244804fb97 100644
--- a/drivers/input/misc/adxl34x.c
+++ b/drivers/input/misc/adxl34x.c
@@ -16,6 +16,7 @@
 #include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <linux/input/adxl34x.h>
+#include <linux/module.h>
 #include "adxl34x.h"
diff --git a/drivers/input/misc/ati_remote2.c b/drivers/input/misc/ati_remote2.c
index 1de58e8a1b71..8d345e87075e 100644
--- a/drivers/input/misc/ati_remote2.c
+++ b/drivers/input/misc/ati_remote2.c
@@ -11,6 +11,7 @@
 #include <linux/usb/input.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #define DRIVER_DESC    "ATI/Philips USB RF remote driver"
 #define DRIVER_VERSION "0.3"
diff --git a/drivers/input/misc/cma3000_d0x.c b/drivers/input/misc/cma3000_d0x.c
index 1633b6342267..80793f1608eb 100644
--- a/drivers/input/misc/cma3000_d0x.c
+++ b/drivers/input/misc/cma3000_d0x.c
@@ -23,6 +23,7 @@
 #include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/input/cma3000.h>
+#include <linux/module.h>
 #include "cma3000_d0x.h"
diff --git a/drivers/input/misc/dm355evm_keys.c b/drivers/input/misc/dm355evm_keys.c
index 19af682c24fb..7283dd2a1ad3 100644
--- a/drivers/input/misc/dm355evm_keys.c
+++ b/drivers/input/misc/dm355evm_keys.c
@@ -17,6 +17,7 @@
 #include <linux/interrupt.h>
 #include <linux/i2c/dm355evm_msp.h>
+#include <linux/module.h>
 /*
diff --git a/drivers/input/misc/mc13783-pwrbutton.c b/drivers/input/misc/mc13783-pwrbutton.c
new file mode 100644
index 000000000000..09b052288657
--- /dev/null
+++ b/drivers/input/misc/mc13783-pwrbutton.c
@@ -0,0 +1,282 @@
+/**
+ * Copyright (C) 2011 Philippe Rétornaz
+ *
+ * Based on twl4030-pwrbutton driver by:
+ *     Peter De Schrijver <peter.de-schrijver@nokia.com>
+ *     Felipe Balbi <felipe.balbi@nokia.com>
+ *
+ * This file is subject to the terms and conditions of the GNU General
+ * Public License. See the file "COPYING" in the main directory of this
+ * archive for more details.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335  USA
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/mfd/mc13783.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+struct mc13783_pwrb {
+        struct input_dev *pwr;
+        struct mc13xxx *mc13783;
+#define MC13783_PWRB_B1_POL_INVERT      (1 << 0)
+#define MC13783_PWRB_B2_POL_INVERT      (1 << 1)
+#define MC13783_PWRB_B3_POL_INVERT      (1 << 2)
+        int flags;
+        unsigned short keymap[3];
+};
+#define MC13783_REG_INTERRUPT_SENSE_1           5
+#define MC13783_IRQSENSE1_ONOFD1S               (1 << 3)
+#define MC13783_IRQSENSE1_ONOFD2S               (1 << 4)
+#define MC13783_IRQSENSE1_ONOFD3S               (1 << 5)
+#define MC13783_REG_POWER_CONTROL_2             15
+#define MC13783_POWER_CONTROL_2_ON1BDBNC        4
+#define MC13783_POWER_CONTROL_2_ON2BDBNC        6
+#define MC13783_POWER_CONTROL_2_ON3BDBNC        8
+#define MC13783_POWER_CONTROL_2_ON1BRSTEN       (1 << 1)
+#define MC13783_POWER_CONTROL_2_ON2BRSTEN       (1 << 2)
+#define MC13783_POWER_CONTROL_2_ON3BRSTEN       (1 << 3)
+static irqreturn_t button_irq(int irq, void *_priv)
+{
+        struct mc13783_pwrb *priv = _priv;
+        int val;
+        mc13xxx_irq_ack(priv->mc13783, irq);
+        mc13xxx_reg_read(priv->mc13783, MC13783_REG_INTERRUPT_SENSE_1, &val);
+        switch (irq) {
+        case MC13783_IRQ_ONOFD1:
+                val = val & MC13783_IRQSENSE1_ONOFD1S ? 1 : 0;
+                if (priv->flags & MC13783_PWRB_B1_POL_INVERT)
+                        val ^= 1;
+                input_report_key(priv->pwr, priv->keymap[0], val);
+                break;
+        case MC13783_IRQ_ONOFD2:
+                val = val & MC13783_IRQSENSE1_ONOFD2S ? 1 : 0;
+                if (priv->flags & MC13783_PWRB_B2_POL_INVERT)
+                        val ^= 1;
+                input_report_key(priv->pwr, priv->keymap[1], val);
+                break;
+        case MC13783_IRQ_ONOFD3:
+                val = val & MC13783_IRQSENSE1_ONOFD3S ? 1 : 0;
+                if (priv->flags & MC13783_PWRB_B3_POL_INVERT)
+                        val ^= 1;
+                input_report_key(priv->pwr, priv->keymap[2], val);
+                break;
+        }
+        input_sync(priv->pwr);
+        return IRQ_HANDLED;
+}
+static int __devinit mc13783_pwrbutton_probe(struct platform_device *pdev)
+{
+        const struct mc13xxx_buttons_platform_data *pdata;
+        struct mc13xxx *mc13783 = dev_get_drvdata(pdev->dev.parent);
+        struct input_dev *pwr;
+        struct mc13783_pwrb *priv;
+        int err = 0;
+        int reg = 0;
+        pdata = dev_get_platdata(&pdev->dev);
+        if (!pdata) {
+                dev_err(&pdev->dev, "missing platform data\n");
+                return -ENODEV;
+        }
+        pwr = input_allocate_device();
+        if (!pwr) {
+                dev_dbg(&pdev->dev, "Can't allocate power button\n");
+                return -ENOMEM;
+        }
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv) {
+                err = -ENOMEM;
+                dev_dbg(&pdev->dev, "Can't allocate power button\n");
+                goto free_input_dev;
+        }
+        reg |= (pdata->b1on_flags & 0x3) << MC13783_POWER_CONTROL_2_ON1BDBNC;
+        reg |= (pdata->b2on_flags & 0x3) << MC13783_POWER_CONTROL_2_ON2BDBNC;
+        reg |= (pdata->b3on_flags & 0x3) << MC13783_POWER_CONTROL_2_ON3BDBNC;
+        priv->pwr = pwr;
+        priv->mc13783 = mc13783;
+        mc13xxx_lock(mc13783);
+        if (pdata->b1on_flags & MC13783_BUTTON_ENABLE) {
+                priv->keymap[0] = pdata->b1on_key;
+                if (pdata->b1on_key != KEY_RESERVED)
+                        __set_bit(pdata->b1on_key, pwr->keybit);
+                if (pdata->b1on_flags & MC13783_BUTTON_POL_INVERT)
+                        priv->flags |= MC13783_PWRB_B1_POL_INVERT;
+                if (pdata->b1on_flags & MC13783_BUTTON_RESET_EN)
+                        reg |= MC13783_POWER_CONTROL_2_ON1BRSTEN;
+                err = mc13xxx_irq_request(mc13783, MC13783_IRQ_ONOFD1,
+                                          button_irq, "b1on", priv);
+                if (err) {
+                        dev_dbg(&pdev->dev, "Can't request irq\n");
+                        goto free_priv;
+                }
+        }
+        if (pdata->b2on_flags & MC13783_BUTTON_ENABLE) {
+                priv->keymap[1] = pdata->b2on_key;
+                if (pdata->b2on_key != KEY_RESERVED)
+                        __set_bit(pdata->b2on_key, pwr->keybit);
+                if (pdata->b2on_flags & MC13783_BUTTON_POL_INVERT)
+                        priv->flags |= MC13783_PWRB_B2_POL_INVERT;
+                if (pdata->b2on_flags & MC13783_BUTTON_RESET_EN)
+                        reg |= MC13783_POWER_CONTROL_2_ON2BRSTEN;
+                err = mc13xxx_irq_request(mc13783, MC13783_IRQ_ONOFD2,
+                                          button_irq, "b2on", priv);
+                if (err) {
+                        dev_dbg(&pdev->dev, "Can't request irq\n");
+                        goto free_irq_b1;
+                }
+        }
+        if (pdata->b3on_flags & MC13783_BUTTON_ENABLE) {
+                priv->keymap[2] = pdata->b3on_key;
+                if (pdata->b3on_key != KEY_RESERVED)
+                        __set_bit(pdata->b3on_key, pwr->keybit);
+                if (pdata->b3on_flags & MC13783_BUTTON_POL_INVERT)
+                        priv->flags |= MC13783_PWRB_B3_POL_INVERT;
+                if (pdata->b3on_flags & MC13783_BUTTON_RESET_EN)
+                        reg |= MC13783_POWER_CONTROL_2_ON3BRSTEN;
+                err = mc13xxx_irq_request(mc13783, MC13783_IRQ_ONOFD3,
+                                          button_irq, "b3on", priv);
+                if (err) {
+                        dev_dbg(&pdev->dev, "Can't request irq: %d\n", err);
+                        goto free_irq_b2;
+                }
+        }
+        mc13xxx_reg_rmw(mc13783, MC13783_REG_POWER_CONTROL_2, 0x3FE, reg);
+        mc13xxx_unlock(mc13783);
+        pwr->name = "mc13783_pwrbutton";
+        pwr->phys = "mc13783_pwrbutton/input0";
+        pwr->dev.parent = &pdev->dev;
+        pwr->keycode = priv->keymap;
+        pwr->keycodemax = ARRAY_SIZE(priv->keymap);
+        pwr->keycodesize = sizeof(priv->keymap[0]);
+        __set_bit(EV_KEY, pwr->evbit);
+        err = input_register_device(pwr);
+        if (err) {
+                dev_dbg(&pdev->dev, "Can't register power button: %d\n", err);
+                goto free_irq;
+        }
+        platform_set_drvdata(pdev, priv);
+        return 0;
+free_irq:
+        mc13xxx_lock(mc13783);
+        if (pdata->b3on_flags & MC13783_BUTTON_ENABLE)
+                mc13xxx_irq_free(mc13783, MC13783_IRQ_ONOFD3, priv);
+free_irq_b2:
+        if (pdata->b2on_flags & MC13783_BUTTON_ENABLE)
+                mc13xxx_irq_free(mc13783, MC13783_IRQ_ONOFD2, priv);
+free_irq_b1:
+        if (pdata->b1on_flags & MC13783_BUTTON_ENABLE)
+                mc13xxx_irq_free(mc13783, MC13783_IRQ_ONOFD1, priv);
+free_priv:
+        mc13xxx_unlock(mc13783);
+        kfree(priv);
+free_input_dev:
+        input_free_device(pwr);
+        return err;
+}
+static int __devexit mc13783_pwrbutton_remove(struct platform_device *pdev)
+{
+        struct mc13783_pwrb *priv = platform_get_drvdata(pdev);
+        const struct mc13xxx_buttons_platform_data *pdata;
+        pdata = dev_get_platdata(&pdev->dev);
+        mc13xxx_lock(priv->mc13783);
+        if (pdata->b3on_flags & MC13783_BUTTON_ENABLE)
+                mc13xxx_irq_free(priv->mc13783, MC13783_IRQ_ONOFD3, priv);
+        if (pdata->b2on_flags & MC13783_BUTTON_ENABLE)
+                mc13xxx_irq_free(priv->mc13783, MC13783_IRQ_ONOFD2, priv);
+        if (pdata->b1on_flags & MC13783_BUTTON_ENABLE)
+                mc13xxx_irq_free(priv->mc13783, MC13783_IRQ_ONOFD1, priv);
+        mc13xxx_unlock(priv->mc13783);
+        input_unregister_device(priv->pwr);
+        kfree(priv);
+        platform_set_drvdata(pdev, NULL);
+        return 0;
+}
+struct platform_driver mc13783_pwrbutton_driver = {
+        .probe          = mc13783_pwrbutton_probe,
+        .remove         = __devexit_p(mc13783_pwrbutton_remove),
+        .driver         = {
+                .name   = "mc13783-pwrbutton",
+                .owner  = THIS_MODULE,
+        },
+};
+static int __init mc13783_pwrbutton_init(void)
+{
+        return platform_driver_register(&mc13783_pwrbutton_driver);
+}
+module_init(mc13783_pwrbutton_init);
+static void __exit mc13783_pwrbutton_exit(void)
+{
+        platform_driver_unregister(&mc13783_pwrbutton_driver);
+}
+module_exit(mc13783_pwrbutton_exit);
+MODULE_ALIAS("platform:mc13783-pwrbutton");
+MODULE_DESCRIPTION("MC13783 Power Button");
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Philippe Retornaz");
diff --git a/drivers/input/sparse-keymap.c b/drivers/input/sparse-keymap.c
index fdb6a3976f94..75fb040a3435 100644
--- a/drivers/input/sparse-keymap.c
+++ b/drivers/input/sparse-keymap.c
@@ -15,6 +15,7 @@
 #include <linux/input.h>
 #include <linux/input/sparse-keymap.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 MODULE_AUTHOR("Dmitry Torokhov <dtor@mail.ru>");
diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c
index 714d4e0f9f95..400131df677b 100644
--- a/drivers/input/touchscreen/ad7877.c
+++ b/drivers/input/touchscreen/ad7877.c
@@ -45,6 +45,7 @@
 #include <linux/slab.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ad7877.h>
+#include <linux/module.h>
 #include <asm/irq.h>
 #define TS_PEN_UP_TIMEOUT       msecs_to_jiffies(100)
diff --git a/drivers/input/touchscreen/ad7879-spi.c b/drivers/input/touchscreen/ad7879-spi.c
index ddf732f3cafc..b1643c8fa7c9 100644
--- a/drivers/input/touchscreen/ad7879-spi.c
+++ b/drivers/input/touchscreen/ad7879-spi.c
@@ -9,6 +9,7 @@
 #include <linux/input.h>        /* BUS_SPI */
 #include <linux/pm.h>
 #include <linux/spi/spi.h>
+#include <linux/module.h>
 #include "ad7879.h"
diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c
index 131f9d1c921b..3b2e9ed2aeec 100644
--- a/drivers/input/touchscreen/ad7879.c
+++ b/drivers/input/touchscreen/ad7879.c
@@ -33,6 +33,7 @@
 #include <linux/gpio.h>
 #include <linux/spi/ad7879.h>
+#include <linux/module.h>
 #include "ad7879.h"
 #define AD7879_REG_ZEROS                0
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index d507b9b67806..de31ec6fe9e4 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -31,6 +31,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 #include <linux/regulator/consumer.h>
+#include <linux/module.h>
 #include <asm/irq.h>
 /*
diff --git a/drivers/input/touchscreen/bu21013_ts.c b/drivers/input/touchscreen/bu21013_ts.c
index 1507ce108d5b..902c7214e887 100644
--- a/drivers/input/touchscreen/bu21013_ts.c
+++ b/drivers/input/touchscreen/bu21013_ts.c
@@ -13,6 +13,7 @@
 #include <linux/input/bu21013.h>
 #include <linux/slab.h>
 #include <linux/regulator/consumer.h>
+#include <linux/module.h>
 #define PEN_DOWN_INTR   0
 #define MAX_FINGERS     2
diff --git a/drivers/input/touchscreen/mc13783_ts.c b/drivers/input/touchscreen/mc13783_ts.c
index c5bc62d85bb6..ede02743eac1 100644
--- a/drivers/input/touchscreen/mc13783_ts.c
+++ b/drivers/input/touchscreen/mc13783_ts.c
@@ -35,7 +35,7 @@ MODULE_PARM_DESC(sample_tolerance,
 struct mc13783_ts_priv {
        struct input_dev *idev;
-        struct mc13783 *mc13783;
+        struct mc13xxx *mc13xxx;
        struct delayed_work work;
        struct workqueue_struct *workq;
        unsigned int sample[4];
@@ -45,7 +45,7 @@ static irqreturn_t mc13783_ts_handler(int irq, void *data)
 {
        struct mc13783_ts_priv *priv = data;
-        mc13783_irq_ack(priv->mc13783, irq);
+        mc13xxx_irq_ack(priv->mc13xxx, irq);
        /*
         * Kick off reading coordinates. Note that if work happens already
@@ -121,10 +121,10 @@ static void mc13783_ts_work(struct work_struct *work)
 {
        struct mc13783_ts_priv *priv =
                container_of(work, struct mc13783_ts_priv, work.work);
-        unsigned int mode = MC13783_ADC_MODE_TS;
+        unsigned int mode = MC13XXX_ADC_MODE_TS;
        unsigned int channel = 12;
-        if (mc13783_adc_do_conversion(priv->mc13783,
+        if (mc13xxx_adc_do_conversion(priv->mc13xxx,
                                mode, channel, priv->sample) == 0)
                mc13783_ts_report_sample(priv);
 }
@@ -134,21 +134,21 @@ static int mc13783_ts_open(struct input_dev *dev)
        struct mc13783_ts_priv *priv = input_get_drvdata(dev);
        int ret;
-        mc13783_lock(priv->mc13783);
+        mc13xxx_lock(priv->mc13xxx);
-        mc13783_irq_ack(priv->mc13783, MC13783_IRQ_TS);
+        mc13xxx_irq_ack(priv->mc13xxx, MC13XXX_IRQ_TS);
-        ret = mc13783_irq_request(priv->mc13783, MC13783_IRQ_TS,
+        ret = mc13xxx_irq_request(priv->mc13xxx, MC13XXX_IRQ_TS,
                mc13783_ts_handler, MC13783_TS_NAME, priv);
        if (ret)
                goto out;
-        ret = mc13783_reg_rmw(priv->mc13783, MC13783_ADC0,
+        ret = mc13xxx_reg_rmw(priv->mc13xxx, MC13XXX_ADC0,
-                        MC13783_ADC0_TSMOD_MASK, MC13783_ADC0_TSMOD0);
+                        MC13XXX_ADC0_TSMOD_MASK, MC13XXX_ADC0_TSMOD0);
        if (ret)
-                mc13783_irq_free(priv->mc13783, MC13783_IRQ_TS, priv);
+                mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_TS, priv);
 out:
-        mc13783_unlock(priv->mc13783);
+        mc13xxx_unlock(priv->mc13xxx);
        return ret;
 }
@@ -156,11 +156,11 @@ static void mc13783_ts_close(struct input_dev *dev)
 {
        struct mc13783_ts_priv *priv = input_get_drvdata(dev);
-        mc13783_lock(priv->mc13783);
+        mc13xxx_lock(priv->mc13xxx);
-        mc13783_reg_rmw(priv->mc13783, MC13783_ADC0,
+        mc13xxx_reg_rmw(priv->mc13xxx, MC13XXX_ADC0,
-                        MC13783_ADC0_TSMOD_MASK, 0);
+                        MC13XXX_ADC0_TSMOD_MASK, 0);
-        mc13783_irq_free(priv->mc13783, MC13783_IRQ_TS, priv);
+        mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_TS, priv);
-        mc13783_unlock(priv->mc13783);
+        mc13xxx_unlock(priv->mc13xxx);
        cancel_delayed_work_sync(&priv->work);
 }
@@ -177,7 +177,7 @@ static int __init mc13783_ts_probe(struct platform_device *pdev)
                goto err_free_mem;
        INIT_DELAYED_WORK(&priv->work, mc13783_ts_work);
-        priv->mc13783 = dev_get_drvdata(pdev->dev.parent);
+        priv->mc13xxx = dev_get_drvdata(pdev->dev.parent);
        priv->idev = idev;
        /*
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index bb161d2fa03c..c0c7820d4c46 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -24,6 +24,7 @@
 #include <linux/init.h>
 #include <linux/bitmap.h>
 #include <linux/debugfs.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig
index 4fb601670de3..a233ed53913a 100644
--- a/drivers/isdn/Kconfig
+++ b/drivers/isdn/Kconfig
@@ -5,7 +5,7 @@
 menuconfig ISDN
        bool "ISDN support"
        depends on NET
-        depends on !S390
+        depends on !S390 && !UML
        ---help---
          ISDN ("Integrated Services Digital Network", called RNIS in France)
          is a fully digital telephone service that can be used for voice and
diff --git a/drivers/isdn/capi/kcapi_proc.c b/drivers/isdn/capi/kcapi_proc.c
index ea2dff602e49..8d51cd1bf674 100644
--- a/drivers/isdn/capi/kcapi_proc.c
+++ b/drivers/isdn/capi/kcapi_proc.c
@@ -14,6 +14,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/init.h>
+#include <linux/export.h>
 static char *state2str(unsigned short state)
 {
diff --git a/drivers/isdn/gigaset/asyncdata.c b/drivers/isdn/gigaset/asyncdata.c
index c3b1dc3a13a0..fddae72e3f98 100644
--- a/drivers/isdn/gigaset/asyncdata.c
+++ b/drivers/isdn/gigaset/asyncdata.c
@@ -16,6 +16,7 @@
 #include "gigaset.h"
 #include <linux/crc-ccitt.h>
 #include <linux/bitrev.h>
+#include <linux/export.h>
 /* check if byte must be stuffed/escaped
 * I'm not sure which data should be encoded.
diff --git a/drivers/isdn/gigaset/capi.c b/drivers/isdn/gigaset/capi.c
index 658e75f18d05..6d5ceeece9f2 100644
--- a/drivers/isdn/gigaset/capi.c
+++ b/drivers/isdn/gigaset/capi.c
@@ -17,6 +17,7 @@
 #include <linux/isdn/capilli.h>
 #include <linux/isdn/capicmd.h>
 #include <linux/isdn/capiutil.h>
+#include <linux/export.h>
 /* missing from kernelcapi.h */
 #define CapiNcpiNotSupportedByProtocol  0x0001
diff --git a/drivers/isdn/gigaset/dummyll.c b/drivers/isdn/gigaset/dummyll.c
index bd0b1eaa7572..19b1c779d50f 100644
--- a/drivers/isdn/gigaset/dummyll.c
+++ b/drivers/isdn/gigaset/dummyll.c
@@ -11,6 +11,7 @@
 * =====================================================================
 */
+#include <linux/export.h>
 #include "gigaset.h"
 void gigaset_skb_sent(struct bc_state *bcs, struct sk_buff *skb)
diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/isdn/gigaset/ev-layer.c
index ba74646cf0e4..6d12623c1db0 100644
--- a/drivers/isdn/gigaset/ev-layer.c
+++ b/drivers/isdn/gigaset/ev-layer.c
@@ -13,6 +13,7 @@
 * =====================================================================
 */
+#include <linux/export.h>
 #include "gigaset.h"
 /* ========================================================== */
diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c
index 9bec8b969964..04231cb2f031 100644
--- a/drivers/isdn/gigaset/i4l.c
+++ b/drivers/isdn/gigaset/i4l.c
@@ -15,6 +15,7 @@
 #include "gigaset.h"
 #include <linux/isdnif.h>
+#include <linux/export.h>
 #define SBUFSIZE        4096    /* sk_buff payload size */
 #define TRANSBUFSIZE    768     /* bytes per skb for transparent receive */
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
index e35058bcd7b9..ee0a549a933a 100644
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@ -14,6 +14,7 @@
 #include "gigaset.h"
 #include <linux/gigaset_dev.h>
 #include <linux/tty_flip.h>
+#include <linux/module.h>
 /*** our ioctls ***/
diff --git a/drivers/isdn/hardware/mISDN/mISDNisar.c b/drivers/isdn/hardware/mISDN/mISDNisar.c
index d13fa5b119f5..7034af28d464 100644
--- a/drivers/isdn/hardware/mISDN/mISDNisar.c
+++ b/drivers/isdn/hardware/mISDN/mISDNisar.c
@@ -29,6 +29,7 @@
 #include <linux/delay.h>
 #include <linux/vmalloc.h>
 #include <linux/mISDNhw.h>
+#include <linux/module.h>
 #include "isar.h"
 #define ISAR_REV        "2.1"
diff --git a/drivers/isdn/hisax/l3dss1.c b/drivers/isdn/hisax/l3dss1.c
index b0d9ab1f21c0..6a8acf65777d 100644
--- a/drivers/isdn/hisax/l3dss1.c
+++ b/drivers/isdn/hisax/l3dss1.c
@@ -353,7 +353,7 @@ l3dss1_parse_facility(struct PStack *st, struct l3_process *pc,
                                 { l3dss1_dummy_invoke(st, cr, id, ident, p, nlen);
                                   return;
                                 } 
-#ifdef HISAX_DE_AOC
+#ifdef CONFIG_DE_AOC
                        {
 #define FOO1(s,a,b) \
@@ -422,9 +422,9 @@ l3dss1_parse_facility(struct PStack *st, struct l3_process *pc,
 #undef FOO1
                        }
-#else  /* not HISAX_DE_AOC */
+#else  /* not CONFIG_DE_AOC */
                        l3_debug(st, "invoke break");
-#endif /* not HISAX_DE_AOC */
+#endif /* not CONFIG_DE_AOC */
                        break;
                case 2: /* return result */
                         /* if no process available handle separately */ 
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index e5546cb3ac69..2c26b64ebbea 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -750,6 +750,7 @@ isdn_tty_modem_hup(modem_info * info, int local)
 * supplementary service (CAPI 2.0 part III)
 */
 #include <linux/isdn/capicmd.h>
+#include <linux/module.h>
 int
 isdn_tty_capi_facility(capi_msg *cm) {
diff --git a/drivers/isdn/mISDN/clock.c b/drivers/isdn/mISDN/clock.c
index 1fa629b3b940..7418f2d811d8 100644
--- a/drivers/isdn/mISDN/clock.c
+++ b/drivers/isdn/mISDN/clock.c
@@ -38,6 +38,7 @@
 #include <linux/stddef.h>
 #include <linux/spinlock.h>
 #include <linux/mISDNif.h>
+#include <linux/export.h>
 #include "core.h"
 static u_int *debug;
diff --git a/drivers/isdn/mISDN/dsp_audio.c b/drivers/isdn/mISDN/dsp_audio.c
index 9c7c6451bf3d..b8f18bd09e43 100644
--- a/drivers/isdn/mISDN/dsp_audio.c
+++ b/drivers/isdn/mISDN/dsp_audio.c
@@ -12,6 +12,7 @@
 #include <linux/delay.h>
 #include <linux/mISDNif.h>
 #include <linux/mISDNdsp.h>
+#include <linux/export.h>
 #include "core.h"
 #include "dsp.h"
diff --git a/drivers/isdn/mISDN/dsp_pipeline.c b/drivers/isdn/mISDN/dsp_pipeline.c
index 621f31007095..b6c9a5889346 100644
--- a/drivers/isdn/mISDN/dsp_pipeline.c
+++ b/drivers/isdn/mISDN/dsp_pipeline.c
@@ -30,6 +30,7 @@
 #include <linux/string.h>
 #include <linux/mISDNif.h>
 #include <linux/mISDNdsp.h>
+#include <linux/export.h>
 #include "dsp.h"
 #include "dsp_hwec.h"
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
index 8e325227b4c0..738ea8dd0adf 100644
--- a/drivers/isdn/mISDN/socket.c
+++ b/drivers/isdn/mISDN/socket.c
@@ -17,6 +17,7 @@
 #include <linux/mISDNif.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "core.h"
 static u_int    *debug;
diff --git a/drivers/leds/dell-led.c b/drivers/leds/dell-led.c
index 52590296af33..e5c57389efd6 100644
--- a/drivers/leds/dell-led.c
+++ b/drivers/leds/dell-led.c
@@ -14,6 +14,7 @@
 #include <linux/acpi.h>
 #include <linux/leds.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 MODULE_AUTHOR("Louis Davis/Jim Dailey");
 MODULE_DESCRIPTION("Dell LED Control Driver");
diff --git a/drivers/leds/leds-88pm860x.c b/drivers/leds/leds-88pm860x.c
index 0d4c16678ace..0810604dc701 100644
--- a/drivers/leds/leds-88pm860x.c
+++ b/drivers/leds/leds-88pm860x.c
@@ -18,6 +18,7 @@
 #include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <linux/mfd/88pm860x.h>
+#include <linux/module.h>
 #define LED_PWM_SHIFT           (3)
 #define LED_PWM_MASK            (0x1F)
diff --git a/drivers/leds/leds-asic3.c b/drivers/leds/leds-asic3.c
index 22f847c890c9..48d9fe61bdfc 100644
--- a/drivers/leds/leds-asic3.c
+++ b/drivers/leds/leds-asic3.c
@@ -14,6 +14,7 @@
 #include <linux/mfd/asic3.h>
 #include <linux/mfd/core.h>
+#include <linux/module.h>
 /*
 *      The HTC ASIC3 LED GPIOs are inputs, not outputs.
@@ -107,9 +108,10 @@ static int __devinit asic3_led_probe(struct platform_device *pdev)
        }
        led->cdev->name = led->name;
-        led->cdev->default_trigger = led->default_trigger;
+        led->cdev->flags = LED_CORE_SUSPENDRESUME;
        led->cdev->brightness_set = brightness_set;
        led->cdev->blink_set = blink_set;
+        led->cdev->default_trigger = led->default_trigger;
        ret = led_classdev_register(&pdev->dev, led->cdev);
        if (ret < 0)
@@ -136,12 +138,44 @@ static int __devexit asic3_led_remove(struct platform_device *pdev)
        return mfd_cell_disable(pdev);
 }
+static int asic3_led_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        const struct mfd_cell *cell = mfd_get_cell(pdev);
+        int ret;
+        ret = 0;
+        if (cell->suspend)
+                ret = (*cell->suspend)(pdev);
+        return ret;
+}
+static int asic3_led_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        const struct mfd_cell *cell = mfd_get_cell(pdev);
+        int ret;
+        ret = 0;
+        if (cell->resume)
+                ret = (*cell->resume)(pdev);
+        return ret;
+}
+static const struct dev_pm_ops asic3_led_pm_ops = {
+        .suspend        = asic3_led_suspend,
+        .resume         = asic3_led_resume,
+};
 static struct platform_driver asic3_led_driver = {
        .probe          = asic3_led_probe,
        .remove         = __devexit_p(asic3_led_remove),
        .driver         = {
                .name   = "leds-asic3",
                .owner  = THIS_MODULE,
+                .pm     = &asic3_led_pm_ops,
        },
 };
diff --git a/drivers/leds/leds-atmel-pwm.c b/drivers/leds/leds-atmel-pwm.c
index c941d906bba6..109c875ea233 100644
--- a/drivers/leds/leds-atmel-pwm.c
+++ b/drivers/leds/leds-atmel-pwm.c
@@ -4,6 +4,7 @@
 #include <linux/io.h>
 #include <linux/atmel_pwm.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 struct pwmled {
diff --git a/drivers/leds/leds-cobalt-raq.c b/drivers/leds/leds-cobalt-raq.c
index 438d48384636..aac1c073fe7b 100644
--- a/drivers/leds/leds-cobalt-raq.c
+++ b/drivers/leds/leds-cobalt-raq.c
@@ -24,6 +24,7 @@
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
+#include <linux/export.h>
 #define LED_WEB         0x04
 #define LED_POWER_OFF   0x08
diff --git a/drivers/leds/leds-fsg.c b/drivers/leds/leds-fsg.c
index d11d05be0dee..49aceffaa5b6 100644
--- a/drivers/leds/leds-fsg.c
+++ b/drivers/leds/leds-fsg.c
@@ -19,6 +19,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
+#include <linux/module.h>
 #include <mach/hardware.h>
 #include <asm/io.h>
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index 504cc26c7e4b..399a86f2013a 100644
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -18,6 +18,7 @@
 #include <linux/of_gpio.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
+#include <linux/module.h>
 #include <asm/gpio.h>
diff --git a/drivers/leds/leds-lm3530.c b/drivers/leds/leds-lm3530.c
index 4dc510fdfa06..0630e4f4b286 100644
--- a/drivers/leds/leds-lm3530.c
+++ b/drivers/leds/leds-lm3530.c
@@ -18,6 +18,7 @@
 #include <linux/led-lm3530.h>
 #include <linux/types.h>
 #include <linux/regulator/consumer.h>
+#include <linux/module.h>
 #define LM3530_LED_DEV "lcd-backlight"
 #define LM3530_NAME "lm3530-led"
diff --git a/drivers/leds/leds-locomo.c b/drivers/leds/leds-locomo.c
index 1f7c10f6b7f2..80ba048889d6 100644
--- a/drivers/leds/leds-locomo.c
+++ b/drivers/leds/leds-locomo.c
@@ -10,6 +10,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/module.h>
 #include <linux/device.h>
 #include <linux/leds.h>
diff --git a/drivers/leds/leds-lt3593.c b/drivers/leds/leds-lt3593.c
index 2579678f97a6..53f67b8ce55d 100644
--- a/drivers/leds/leds-lt3593.c
+++ b/drivers/leds/leds-lt3593.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/gpio.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 struct lt3593_led_data {
        struct led_classdev cdev;
diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c
index f369e56d6547..b3393a9f2139 100644
--- a/drivers/leds/leds-mc13783.c
+++ b/drivers/leds/leds-mc13783.c
@@ -21,13 +21,13 @@
 #include <linux/platform_device.h>
 #include <linux/leds.h>
 #include <linux/workqueue.h>
-#include <linux/mfd/mc13783.h>
+#include <linux/mfd/mc13xxx.h>
 #include <linux/slab.h>
 struct mc13783_led {
        struct led_classdev     cdev;
        struct work_struct      work;
-        struct mc13783          *master;
+        struct mc13xxx          *master;
        enum led_brightness     new_brightness;
        int                     id;
 };
@@ -111,11 +111,11 @@ static void mc13783_led_work(struct work_struct *work)
                break;
        }
-        mc13783_lock(led->master);
+        mc13xxx_lock(led->master);
-        mc13783_reg_rmw(led->master, reg, mask, value);
+        mc13xxx_reg_rmw(led->master, reg, mask, value);
-        mc13783_unlock(led->master);
+        mc13xxx_unlock(led->master);
 }
 static void mc13783_led_set(struct led_classdev *led_cdev,
@@ -172,23 +172,23 @@ static int __devinit mc13783_led_setup(struct mc13783_led *led, int max_current)
                break;
        }
-        mc13783_lock(led->master);
+        mc13xxx_lock(led->master);
-        ret = mc13783_reg_rmw(led->master, reg, mask << shift,
+        ret = mc13xxx_reg_rmw(led->master, reg, mask << shift,
                                                value << shift);
-        mc13783_unlock(led->master);
+        mc13xxx_unlock(led->master);
        return ret;
 }
 static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
 {
-        struct mc13783_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
+        struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
-        struct mc13783 *dev = dev_get_drvdata(pdev->dev.parent);
+        struct mc13xxx *dev = dev_get_drvdata(pdev->dev.parent);
        int ret = 0;
        int reg = 0;
-        mc13783_lock(dev);
+        mc13xxx_lock(dev);
        if (pdata->flags & MC13783_LED_TC1HALF)
                reg |= MC13783_LED_C1_TC1HALF_BIT;
@@ -196,7 +196,7 @@ static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
        if (pdata->flags & MC13783_LED_SLEWLIMTC)
                reg |= MC13783_LED_Cx_SLEWLIM_BIT;
-        ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_1, reg);
+        ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_1, reg);
        if (ret)
                goto out;
@@ -206,7 +206,7 @@ static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
        if (pdata->flags & MC13783_LED_SLEWLIMBL)
                reg |= MC13783_LED_Cx_SLEWLIM_BIT;
-        ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_2, reg);
+        ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_2, reg);
        if (ret)
                goto out;
@@ -216,7 +216,7 @@ static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
        if (pdata->flags & MC13783_LED_TRIODE_TC1)
                reg |= MC13783_LED_Cx_TRIODE_TC_BIT;
-        ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_3, reg);
+        ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_3, reg);
        if (ret)
                goto out;
@@ -226,7 +226,7 @@ static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
        if (pdata->flags & MC13783_LED_TRIODE_TC2)
                reg |= MC13783_LED_Cx_TRIODE_TC_BIT;
-        ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_4, reg);
+        ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_4, reg);
        if (ret)
                goto out;
@@ -236,7 +236,7 @@ static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
        if (pdata->flags & MC13783_LED_TRIODE_TC3)
                reg |= MC13783_LED_Cx_TRIODE_TC_BIT;
-        ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_5, reg);
+        ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_5, reg);
        if (ret)
                goto out;
@@ -255,17 +255,17 @@ static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
        reg |= (pdata->abref & MC13783_LED_C0_ABREF_MASK) <<
                                                        MC13783_LED_C0_ABREF;
-        ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_0, reg);
+        ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_0, reg);
 out:
-        mc13783_unlock(dev);
+        mc13xxx_unlock(dev);
        return ret;
 }
 static int __devinit mc13783_led_probe(struct platform_device *pdev)
 {
-        struct mc13783_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
+        struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
-        struct mc13783_led_platform_data *led_cur;
+        struct mc13xxx_led_platform_data *led_cur;
        struct mc13783_led *led, *led_dat;
        int ret, i;
        int init_led = 0;
@@ -351,9 +351,9 @@ err_free:
 static int __devexit mc13783_led_remove(struct platform_device *pdev)
 {
-        struct mc13783_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
+        struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
        struct mc13783_led *led = platform_get_drvdata(pdev);
-        struct mc13783 *dev = dev_get_drvdata(pdev->dev.parent);
+        struct mc13xxx *dev = dev_get_drvdata(pdev->dev.parent);
        int i;
        for (i = 0; i < pdata->num_leds; i++) {
@@ -361,16 +361,16 @@ static int __devexit mc13783_led_remove(struct platform_device *pdev)
                cancel_work_sync(&led[i].work);
        }
-        mc13783_lock(dev);
+        mc13xxx_lock(dev);
-        mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_0, 0);
+        mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_0, 0);
-        mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_1, 0);
+        mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_1, 0);
-        mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_2, 0);
+        mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_2, 0);
-        mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_3, 0);
+        mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_3, 0);
-        mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_4, 0);
+        mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_4, 0);
-        mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_5, 0);
+        mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_5, 0);
-        mc13783_unlock(dev);
+        mc13xxx_unlock(dev);
        kfree(led);
        return 0;
diff --git a/drivers/leds/leds-net48xx.c b/drivers/leds/leds-net48xx.c
index 93987a12da49..f117f7326c5b 100644
--- a/drivers/leds/leds-net48xx.c
+++ b/drivers/leds/leds-net48xx.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <linux/nsc_gpio.h>
 #include <linux/scx200_gpio.h>
+#include <linux/module.h>
 #define DRVNAME "net48xx-led"
 #define NET48XX_ERROR_LED_GPIO  20
diff --git a/drivers/leds/leds-net5501.c b/drivers/leds/leds-net5501.c
index 7e764b8365e6..0555d4709a7c 100644
--- a/drivers/leds/leds-net5501.c
+++ b/drivers/leds/leds-net5501.c
@@ -16,6 +16,7 @@
 #include <linux/leds.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
+#include <linux/module.h>
 #include <asm/geode.h>
diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c
index f77d48d0b3e4..37b7d0cfe586 100644
--- a/drivers/leds/leds-ns2.c
+++ b/drivers/leds/leds-ns2.c
@@ -28,6 +28,7 @@
 #include <linux/slab.h>
 #include <linux/gpio.h>
 #include <linux/leds.h>
+#include <linux/module.h>
 #include <mach/leds-ns2.h>
 /*
diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c
index a77771dc2e95..29f8b0f0e2c6 100644
--- a/drivers/leds/leds-s3c24xx.c
+++ b/drivers/leds/leds-s3c24xx.c
@@ -17,6 +17,7 @@
 #include <linux/leds.h>
 #include <linux/gpio.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <mach/hardware.h>
 #include <mach/regs-gpio.h>
diff --git a/drivers/leds/leds-wm831x-status.c b/drivers/leds/leds-wm831x-status.c
index ef5c24140a44..b1eb34c3e81f 100644
--- a/drivers/leds/leds-wm831x-status.c
+++ b/drivers/leds/leds-wm831x-status.c
@@ -18,6 +18,7 @@
 #include <linux/mfd/wm831x/core.h>
 #include <linux/mfd/wm831x/pdata.h>
 #include <linux/mfd/wm831x/status.h>
+#include <linux/module.h>
 struct wm831x_status {
diff --git a/drivers/leds/leds-wm8350.c b/drivers/leds/leds-wm8350.c
index f14edd82cb00..4a1276578352 100644
--- a/drivers/leds/leds-wm8350.c
+++ b/drivers/leds/leds-wm8350.c
@@ -17,6 +17,7 @@
 #include <linux/mfd/wm8350/pmic.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 /* Microamps */
 static const int isink_cur[] = {
diff --git a/drivers/leds/leds-wrap.c b/drivers/leds/leds-wrap.c
index 2982c86ac4cf..6e21e654bb02 100644
--- a/drivers/leds/leds-wrap.c
+++ b/drivers/leds/leds-wrap.c
@@ -17,6 +17,7 @@
 #include <linux/err.h>
 #include <asm/io.h>
 #include <linux/scx200_gpio.h>
+#include <linux/module.h>
 #define DRVNAME "wrap-led"
 #define WRAP_POWER_LED_GPIO     2
diff --git a/drivers/lguest/lguest_device.c b/drivers/lguest/lguest_device.c
index 5289ffa2e500..0dc30ffde5ad 100644
--- a/drivers/lguest/lguest_device.c
+++ b/drivers/lguest/lguest_device.c
@@ -15,6 +15,7 @@
 #include <linux/interrupt.h>
 #include <linux/virtio_ring.h>
 #include <linux/err.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <asm/io.h>
 #include <asm/paravirt.h>
diff --git a/drivers/lguest/lguest_user.c b/drivers/lguest/lguest_user.c
index f97e625241ad..ff4a0bc9904d 100644
--- a/drivers/lguest/lguest_user.c
+++ b/drivers/lguest/lguest_user.c
@@ -13,6 +13,7 @@
 #include <linux/eventfd.h>
 #include <linux/file.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "lg.h"
 /*L:056
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index f75a66e7d312..faa4741df6d3 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -208,6 +208,16 @@ config DM_DEBUG
          If unsure, say N.
+config DM_BUFIO
+       tristate
+       depends on BLK_DEV_DM && EXPERIMENTAL
+       ---help---
+         This interface allows you to do buffered I/O on a device and acts
+         as a cache, holding recently-read blocks in memory and performing
+         delayed writes.
+source "drivers/md/persistent-data/Kconfig"
 config DM_CRYPT
        tristate "Crypt target support"
        depends on BLK_DEV_DM
@@ -233,6 +243,32 @@ config DM_SNAPSHOT
       ---help---
         Allow volume managers to take writable snapshots of a device.
+config DM_THIN_PROVISIONING
+       tristate "Thin provisioning target (EXPERIMENTAL)"
+       depends on BLK_DEV_DM && EXPERIMENTAL
+       select DM_PERSISTENT_DATA
+       ---help---
+         Provides thin provisioning and snapshots that share a data store.
+config DM_DEBUG_BLOCK_STACK_TRACING
+        boolean "Keep stack trace of thin provisioning block lock holders"
+        depends on STACKTRACE_SUPPORT && DM_THIN_PROVISIONING
+        select STACKTRACE
+        ---help---
+          Enable this for messages that may help debug problems with the
+          block manager locking used by thin provisioning.
+          If unsure, say N.
+config DM_DEBUG_SPACE_MAPS
+        boolean "Extra validation for thin provisioning space maps"
+        depends on DM_THIN_PROVISIONING
+        ---help---
+          Enable this for messages that may help debug problems with the
+          space maps used by thin provisioning.
+          If unsure, say N.
 config DM_MIRROR
       tristate "Mirror target"
       depends on BLK_DEV_DM
diff --git a/drivers/md/Makefile b/drivers/md/Makefile
index 448838b1f92a..046860c7a166 100644
--- a/drivers/md/Makefile
+++ b/drivers/md/Makefile
@@ -10,6 +10,7 @@ dm-snapshot-y	+= dm-snap.o dm-exception-store.o dm-snap-transient.o \
 dm-mirror-y     += dm-raid1.o
 dm-log-userspace-y \
                += dm-log-userspace-base.o dm-log-userspace-transfer.o
+dm-thin-pool-y  += dm-thin.o dm-thin-metadata.o
 md-mod-y        += md.o bitmap.o
 raid456-y       += raid5.o
@@ -27,6 +28,7 @@ obj-$(CONFIG_MD_MULTIPATH)	+= multipath.o
 obj-$(CONFIG_MD_FAULTY)         += faulty.o
 obj-$(CONFIG_BLK_DEV_MD)        += md-mod.o
 obj-$(CONFIG_BLK_DEV_DM)        += dm-mod.o
+obj-$(CONFIG_DM_BUFIO)          += dm-bufio.o
 obj-$(CONFIG_DM_CRYPT)          += dm-crypt.o
 obj-$(CONFIG_DM_DELAY)          += dm-delay.o
 obj-$(CONFIG_DM_FLAKEY)         += dm-flakey.o
@@ -34,10 +36,12 @@ obj-$(CONFIG_DM_MULTIPATH)	+= dm-multipath.o dm-round-robin.o
 obj-$(CONFIG_DM_MULTIPATH_QL)   += dm-queue-length.o
 obj-$(CONFIG_DM_MULTIPATH_ST)   += dm-service-time.o
 obj-$(CONFIG_DM_SNAPSHOT)       += dm-snapshot.o
+obj-$(CONFIG_DM_PERSISTENT_DATA)        += persistent-data/
 obj-$(CONFIG_DM_MIRROR)         += dm-mirror.o dm-log.o dm-region-hash.o
 obj-$(CONFIG_DM_LOG_USERSPACE)  += dm-log-userspace.o
 obj-$(CONFIG_DM_ZERO)           += dm-zero.o
 obj-$(CONFIG_DM_RAID)   += dm-raid.o
+obj-$(CONFIG_DM_THIN_PROVISIONING)      += dm-thin-pool.o
 ifeq ($(CONFIG_DM_UEVENT),y)
 dm-mod-objs                     += dm-uevent.o
diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c
new file mode 100644
index 000000000000..cb246667dd52
--- /dev/null
+++ b/drivers/md/dm-bufio.c
@@ -0,0 +1,1699 @@
+/*
+ * Copyright (C) 2009-2011 Red Hat, Inc.
+ *
+ * Author: Mikulas Patocka <mpatocka@redhat.com>
+ *
+ * This file is released under the GPL.
+ */
+#include "dm-bufio.h"
+#include <linux/device-mapper.h>
+#include <linux/dm-io.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/version.h>
+#include <linux/shrinker.h>
+#define DM_MSG_PREFIX "bufio"
+/*
+ * Memory management policy:
+ *      Limit the number of buffers to DM_BUFIO_MEMORY_PERCENT of main memory
+ *      or DM_BUFIO_VMALLOC_PERCENT of vmalloc memory (whichever is lower).
+ *      Always allocate at least DM_BUFIO_MIN_BUFFERS buffers.
+ *      Start background writeback when there are DM_BUFIO_WRITEBACK_PERCENT
+ *      dirty buffers.
+ */
+#define DM_BUFIO_MIN_BUFFERS            8
+#define DM_BUFIO_MEMORY_PERCENT         2
+#define DM_BUFIO_VMALLOC_PERCENT        25
+#define DM_BUFIO_WRITEBACK_PERCENT      75
+/*
+ * Check buffer ages in this interval (seconds)
+ */
+#define DM_BUFIO_WORK_TIMER_SECS        10
+/*
+ * Free buffers when they are older than this (seconds)
+ */
+#define DM_BUFIO_DEFAULT_AGE_SECS       60
+/*
+ * The number of bvec entries that are embedded directly in the buffer.
+ * If the chunk size is larger, dm-io is used to do the io.
+ */
+#define DM_BUFIO_INLINE_VECS            16
+/*
+ * Buffer hash
+ */
+#define DM_BUFIO_HASH_BITS      20
+#define DM_BUFIO_HASH(block) \
+        ((((block) >> DM_BUFIO_HASH_BITS) ^ (block)) & \
+         ((1 << DM_BUFIO_HASH_BITS) - 1))
+/*
+ * Don't try to use kmem_cache_alloc for blocks larger than this.
+ * For explanation, see alloc_buffer_data below.
+ */
+#define DM_BUFIO_BLOCK_SIZE_SLAB_LIMIT  (PAGE_SIZE >> 1)
+#define DM_BUFIO_BLOCK_SIZE_GFP_LIMIT   (PAGE_SIZE << (MAX_ORDER - 1))
+/*
+ * dm_buffer->list_mode
+ */
+#define LIST_CLEAN      0
+#define LIST_DIRTY      1
+#define LIST_SIZE       2
+/*
+ * Linking of buffers:
+ *      All buffers are linked to cache_hash with their hash_list field.
+ *
+ *      Clean buffers that are not being written (B_WRITING not set)
+ *      are linked to lru[LIST_CLEAN] with their lru_list field.
+ *
+ *      Dirty and clean buffers that are being written are linked to
+ *      lru[LIST_DIRTY] with their lru_list field. When the write
+ *      finishes, the buffer cannot be relinked immediately (because we
+ *      are in an interrupt context and relinking requires process
+ *      context), so some clean-not-writing buffers can be held on
+ *      dirty_lru too.  They are later added to lru in the process
+ *      context.
+ */
+struct dm_bufio_client {
+        struct mutex lock;
+        struct list_head lru[LIST_SIZE];
+        unsigned long n_buffers[LIST_SIZE];
+        struct block_device *bdev;
+        unsigned block_size;
+        unsigned char sectors_per_block_bits;
+        unsigned char pages_per_block_bits;
+        unsigned char blocks_per_page_bits;
+        unsigned aux_size;
+        void (*alloc_callback)(struct dm_buffer *);
+        void (*write_callback)(struct dm_buffer *);
+        struct dm_io_client *dm_io;
+        struct list_head reserved_buffers;
+        unsigned need_reserved_buffers;
+        struct hlist_head *cache_hash;
+        wait_queue_head_t free_buffer_wait;
+        int async_write_error;
+        struct list_head client_list;
+        struct shrinker shrinker;
+};
+/*
+ * Buffer state bits.
+ */
+#define B_READING       0
+#define B_WRITING       1
+#define B_DIRTY         2
+/*
+ * Describes how the block was allocated:
+ * kmem_cache_alloc(), __get_free_pages() or vmalloc().
+ * See the comment at alloc_buffer_data.
+ */
+enum data_mode {
+        DATA_MODE_SLAB = 0,
+        DATA_MODE_GET_FREE_PAGES = 1,
+        DATA_MODE_VMALLOC = 2,
+        DATA_MODE_LIMIT = 3
+};
+struct dm_buffer {
+        struct hlist_node hash_list;
+        struct list_head lru_list;
+        sector_t block;
+        void *data;
+        enum data_mode data_mode;
+        unsigned char list_mode;                /* LIST_* */
+        unsigned hold_count;
+        int read_error;
+        int write_error;
+        unsigned long state;
+        unsigned long last_accessed;
+        struct dm_bufio_client *c;
+        struct bio bio;
+        struct bio_vec bio_vec[DM_BUFIO_INLINE_VECS];
+};
+/*----------------------------------------------------------------*/
+static struct kmem_cache *dm_bufio_caches[PAGE_SHIFT - SECTOR_SHIFT];
+static char *dm_bufio_cache_names[PAGE_SHIFT - SECTOR_SHIFT];
+static inline int dm_bufio_cache_index(struct dm_bufio_client *c)
+{
+        unsigned ret = c->blocks_per_page_bits - 1;
+        BUG_ON(ret >= ARRAY_SIZE(dm_bufio_caches));
+        return ret;
+}
+#define DM_BUFIO_CACHE(c)       (dm_bufio_caches[dm_bufio_cache_index(c)])
+#define DM_BUFIO_CACHE_NAME(c)  (dm_bufio_cache_names[dm_bufio_cache_index(c)])
+#define dm_bufio_in_request()   (!!current->bio_list)
+static void dm_bufio_lock(struct dm_bufio_client *c)
+{
+        mutex_lock_nested(&c->lock, dm_bufio_in_request());
+}
+static int dm_bufio_trylock(struct dm_bufio_client *c)
+{
+        return mutex_trylock(&c->lock);
+}
+static void dm_bufio_unlock(struct dm_bufio_client *c)
+{
+        mutex_unlock(&c->lock);
+}
+/*
+ * FIXME Move to sched.h?
+ */
+#ifdef CONFIG_PREEMPT_VOLUNTARY
+#  define dm_bufio_cond_resched()               \
+do {                                            \
+        if (unlikely(need_resched()))           \
+                _cond_resched();                \
+} while (0)
+#else
+#  define dm_bufio_cond_resched()                do { } while (0)
+#endif
+/*----------------------------------------------------------------*/
+/*
+ * Default cache size: available memory divided by the ratio.
+ */
+static unsigned long dm_bufio_default_cache_size;
+/*
+ * Total cache size set by the user.
+ */
+static unsigned long dm_bufio_cache_size;
+/*
+ * A copy of dm_bufio_cache_size because dm_bufio_cache_size can change
+ * at any time.  If it disagrees, the user has changed cache size.
+ */
+static unsigned long dm_bufio_cache_size_latch;
+static DEFINE_SPINLOCK(param_spinlock);
+/*
+ * Buffers are freed after this timeout
+ */
+static unsigned dm_bufio_max_age = DM_BUFIO_DEFAULT_AGE_SECS;
+static unsigned long dm_bufio_peak_allocated;
+static unsigned long dm_bufio_allocated_kmem_cache;
+static unsigned long dm_bufio_allocated_get_free_pages;
+static unsigned long dm_bufio_allocated_vmalloc;
+static unsigned long dm_bufio_current_allocated;
+/*----------------------------------------------------------------*/
+/*
+ * Per-client cache: dm_bufio_cache_size / dm_bufio_client_count
+ */
+static unsigned long dm_bufio_cache_size_per_client;
+/*
+ * The current number of clients.
+ */
+static int dm_bufio_client_count;
+/*
+ * The list of all clients.
+ */
+static LIST_HEAD(dm_bufio_all_clients);
+/*
+ * This mutex protects dm_bufio_cache_size_latch,
+ * dm_bufio_cache_size_per_client and dm_bufio_client_count
+ */
+static DEFINE_MUTEX(dm_bufio_clients_lock);
+/*----------------------------------------------------------------*/
+static void adjust_total_allocated(enum data_mode data_mode, long diff)
+{
+        static unsigned long * const class_ptr[DATA_MODE_LIMIT] = {
+                &dm_bufio_allocated_kmem_cache,
+                &dm_bufio_allocated_get_free_pages,
+                &dm_bufio_allocated_vmalloc,
+        };
+        spin_lock(&param_spinlock);
+        *class_ptr[data_mode] += diff;
+        dm_bufio_current_allocated += diff;
+        if (dm_bufio_current_allocated > dm_bufio_peak_allocated)
+                dm_bufio_peak_allocated = dm_bufio_current_allocated;
+        spin_unlock(&param_spinlock);
+}
+/*
+ * Change the number of clients and recalculate per-client limit.
+ */
+static void __cache_size_refresh(void)
+{
+        BUG_ON(!mutex_is_locked(&dm_bufio_clients_lock));
+        BUG_ON(dm_bufio_client_count < 0);
+        dm_bufio_cache_size_latch = dm_bufio_cache_size;
+        barrier();
+        /*
+         * Use default if set to 0 and report the actual cache size used.
+         */
+        if (!dm_bufio_cache_size_latch) {
+                (void)cmpxchg(&dm_bufio_cache_size, 0,
+                              dm_bufio_default_cache_size);
+                dm_bufio_cache_size_latch = dm_bufio_default_cache_size;
+        }
+        dm_bufio_cache_size_per_client = dm_bufio_cache_size_latch /
+                                         (dm_bufio_client_count ? : 1);
+}
+/*
+ * Allocating buffer data.
+ *
+ * Small buffers are allocated with kmem_cache, to use space optimally.
+ *
+ * For large buffers, we choose between get_free_pages and vmalloc.
+ * Each has advantages and disadvantages.
+ *
+ * __get_free_pages can randomly fail if the memory is fragmented.
+ * __vmalloc won't randomly fail, but vmalloc space is limited (it may be
+ * as low as 128M) so using it for caching is not appropriate.
+ *
+ * If the allocation may fail we use __get_free_pages. Memory fragmentation
+ * won't have a fatal effect here, but it just causes flushes of some other
+ * buffers and more I/O will be performed. Don't use __get_free_pages if it
+ * always fails (i.e. order >= MAX_ORDER).
+ *
+ * If the allocation shouldn't fail we use __vmalloc. This is only for the
+ * initial reserve allocation, so there's no risk of wasting all vmalloc
+ * space.
+ */
+static void *alloc_buffer_data(struct dm_bufio_client *c, gfp_t gfp_mask,
+                               enum data_mode *data_mode)
+{
+        if (c->block_size <= DM_BUFIO_BLOCK_SIZE_SLAB_LIMIT) {
+                *data_mode = DATA_MODE_SLAB;
+                return kmem_cache_alloc(DM_BUFIO_CACHE(c), gfp_mask);
+        }
+        if (c->block_size <= DM_BUFIO_BLOCK_SIZE_GFP_LIMIT &&
+            gfp_mask & __GFP_NORETRY) {
+                *data_mode = DATA_MODE_GET_FREE_PAGES;
+                return (void *)__get_free_pages(gfp_mask,
+                                                c->pages_per_block_bits);
+        }
+        *data_mode = DATA_MODE_VMALLOC;
+        return __vmalloc(c->block_size, gfp_mask, PAGE_KERNEL);
+}
+/*
+ * Free buffer's data.
+ */
+static void free_buffer_data(struct dm_bufio_client *c,
+                             void *data, enum data_mode data_mode)
+{
+        switch (data_mode) {
+        case DATA_MODE_SLAB:
+                kmem_cache_free(DM_BUFIO_CACHE(c), data);
+                break;
+        case DATA_MODE_GET_FREE_PAGES:
+                free_pages((unsigned long)data, c->pages_per_block_bits);
+                break;
+        case DATA_MODE_VMALLOC:
+                vfree(data);
+                break;
+        default:
+                DMCRIT("dm_bufio_free_buffer_data: bad data mode: %d",
+                       data_mode);
+                BUG();
+        }
+}
+/*
+ * Allocate buffer and its data.
+ */
+static struct dm_buffer *alloc_buffer(struct dm_bufio_client *c, gfp_t gfp_mask)
+{
+        struct dm_buffer *b = kmalloc(sizeof(struct dm_buffer) + c->aux_size,
+                                      gfp_mask);
+        if (!b)
+                return NULL;
+        b->c = c;
+        b->data = alloc_buffer_data(c, gfp_mask, &b->data_mode);
+        if (!b->data) {
+                kfree(b);
+                return NULL;
+        }
+        adjust_total_allocated(b->data_mode, (long)c->block_size);
+        return b;
+}
+/*
+ * Free buffer and its data.
+ */
+static void free_buffer(struct dm_buffer *b)
+{
+        struct dm_bufio_client *c = b->c;
+        adjust_total_allocated(b->data_mode, -(long)c->block_size);
+        free_buffer_data(c, b->data, b->data_mode);
+        kfree(b);
+}
+/*
+ * Link buffer to the hash list and clean or dirty queue.
+ */
+static void __link_buffer(struct dm_buffer *b, sector_t block, int dirty)
+{
+        struct dm_bufio_client *c = b->c;
+        c->n_buffers[dirty]++;
+        b->block = block;
+        b->list_mode = dirty;
+        list_add(&b->lru_list, &c->lru[dirty]);
+        hlist_add_head(&b->hash_list, &c->cache_hash[DM_BUFIO_HASH(block)]);
+        b->last_accessed = jiffies;
+}
+/*
+ * Unlink buffer from the hash list and dirty or clean queue.
+ */
+static void __unlink_buffer(struct dm_buffer *b)
+{
+        struct dm_bufio_client *c = b->c;
+        BUG_ON(!c->n_buffers[b->list_mode]);
+        c->n_buffers[b->list_mode]--;
+        hlist_del(&b->hash_list);
+        list_del(&b->lru_list);
+}
+/*
+ * Place the buffer to the head of dirty or clean LRU queue.
+ */
+static void __relink_lru(struct dm_buffer *b, int dirty)
+{
+        struct dm_bufio_client *c = b->c;
+        BUG_ON(!c->n_buffers[b->list_mode]);
+        c->n_buffers[b->list_mode]--;
+        c->n_buffers[dirty]++;
+        b->list_mode = dirty;
+        list_del(&b->lru_list);
+        list_add(&b->lru_list, &c->lru[dirty]);
+}
+/*----------------------------------------------------------------
+ * Submit I/O on the buffer.
+ *
+ * Bio interface is faster but it has some problems:
+ *      the vector list is limited (increasing this limit increases
+ *      memory-consumption per buffer, so it is not viable);
+ *
+ *      the memory must be direct-mapped, not vmalloced;
+ *
+ *      the I/O driver can reject requests spuriously if it thinks that
+ *      the requests are too big for the device or if they cross a
+ *      controller-defined memory boundary.
+ *
+ * If the buffer is small enough (up to DM_BUFIO_INLINE_VECS pages) and
+ * it is not vmalloced, try using the bio interface.
+ *
+ * If the buffer is big, if it is vmalloced or if the underlying device
+ * rejects the bio because it is too large, use dm-io layer to do the I/O.
+ * The dm-io layer splits the I/O into multiple requests, avoiding the above
+ * shortcomings.
+ *--------------------------------------------------------------*/
+/*
+ * dm-io completion routine. It just calls b->bio.bi_end_io, pretending
+ * that the request was handled directly with bio interface.
+ */
+static void dmio_complete(unsigned long error, void *context)
+{
+        struct dm_buffer *b = context;
+        b->bio.bi_end_io(&b->bio, error ? -EIO : 0);
+}
+static void use_dmio(struct dm_buffer *b, int rw, sector_t block,
+                     bio_end_io_t *end_io)
+{
+        int r;
+        struct dm_io_request io_req = {
+                .bi_rw = rw,
+                .notify.fn = dmio_complete,
+                .notify.context = b,
+                .client = b->c->dm_io,
+        };
+        struct dm_io_region region = {
+                .bdev = b->c->bdev,
+                .sector = block << b->c->sectors_per_block_bits,
+                .count = b->c->block_size >> SECTOR_SHIFT,
+        };
+        if (b->data_mode != DATA_MODE_VMALLOC) {
+                io_req.mem.type = DM_IO_KMEM;
+                io_req.mem.ptr.addr = b->data;
+        } else {
+                io_req.mem.type = DM_IO_VMA;
+                io_req.mem.ptr.vma = b->data;
+        }
+        b->bio.bi_end_io = end_io;
+        r = dm_io(&io_req, 1, &region, NULL);
+        if (r)
+                end_io(&b->bio, r);
+}
+static void use_inline_bio(struct dm_buffer *b, int rw, sector_t block,
+                           bio_end_io_t *end_io)
+{
+        char *ptr;
+        int len;
+        bio_init(&b->bio);
+        b->bio.bi_io_vec = b->bio_vec;
+        b->bio.bi_max_vecs = DM_BUFIO_INLINE_VECS;
+        b->bio.bi_sector = block << b->c->sectors_per_block_bits;
+        b->bio.bi_bdev = b->c->bdev;
+        b->bio.bi_end_io = end_io;
+        /*
+         * We assume that if len >= PAGE_SIZE ptr is page-aligned.
+         * If len < PAGE_SIZE the buffer doesn't cross page boundary.
+         */
+        ptr = b->data;
+        len = b->c->block_size;
+        if (len >= PAGE_SIZE)
+                BUG_ON((unsigned long)ptr & (PAGE_SIZE - 1));
+        else
+                BUG_ON((unsigned long)ptr & (len - 1));
+        do {
+                if (!bio_add_page(&b->bio, virt_to_page(ptr),
+                                  len < PAGE_SIZE ? len : PAGE_SIZE,
+                                  virt_to_phys(ptr) & (PAGE_SIZE - 1))) {
+                        BUG_ON(b->c->block_size <= PAGE_SIZE);
+                        use_dmio(b, rw, block, end_io);
+                        return;
+                }
+                len -= PAGE_SIZE;
+                ptr += PAGE_SIZE;
+        } while (len > 0);
+        submit_bio(rw, &b->bio);
+}
+static void submit_io(struct dm_buffer *b, int rw, sector_t block,
+                      bio_end_io_t *end_io)
+{
+        if (rw == WRITE && b->c->write_callback)
+                b->c->write_callback(b);
+        if (b->c->block_size <= DM_BUFIO_INLINE_VECS * PAGE_SIZE &&
+            b->data_mode != DATA_MODE_VMALLOC)
+                use_inline_bio(b, rw, block, end_io);
+        else
+                use_dmio(b, rw, block, end_io);
+}
+/*----------------------------------------------------------------
+ * Writing dirty buffers
+ *--------------------------------------------------------------*/
+/*
+ * The endio routine for write.
+ *
+ * Set the error, clear B_WRITING bit and wake anyone who was waiting on
+ * it.
+ */
+static void write_endio(struct bio *bio, int error)
+{
+        struct dm_buffer *b = container_of(bio, struct dm_buffer, bio);
+        b->write_error = error;
+        if (error) {
+                struct dm_bufio_client *c = b->c;
+                (void)cmpxchg(&c->async_write_error, 0, error);
+        }
+        BUG_ON(!test_bit(B_WRITING, &b->state));
+        smp_mb__before_clear_bit();
+        clear_bit(B_WRITING, &b->state);
+        smp_mb__after_clear_bit();
+        wake_up_bit(&b->state, B_WRITING);
+}
+/*
+ * This function is called when wait_on_bit is actually waiting.
+ */
+static int do_io_schedule(void *word)
+{
+        io_schedule();
+        return 0;
+}
+/*
+ * Initiate a write on a dirty buffer, but don't wait for it.
+ *
+ * - If the buffer is not dirty, exit.
+ * - If there some previous write going on, wait for it to finish (we can't
+ *   have two writes on the same buffer simultaneously).
+ * - Submit our write and don't wait on it. We set B_WRITING indicating
+ *   that there is a write in progress.
+ */
+static void __write_dirty_buffer(struct dm_buffer *b)
+{
+        if (!test_bit(B_DIRTY, &b->state))
+                return;
+        clear_bit(B_DIRTY, &b->state);
+        wait_on_bit_lock(&b->state, B_WRITING,
+                         do_io_schedule, TASK_UNINTERRUPTIBLE);
+        submit_io(b, WRITE, b->block, write_endio);
+}
+/*
+ * Wait until any activity on the buffer finishes.  Possibly write the
+ * buffer if it is dirty.  When this function finishes, there is no I/O
+ * running on the buffer and the buffer is not dirty.
+ */
+static void __make_buffer_clean(struct dm_buffer *b)
+{
+        BUG_ON(b->hold_count);
+        if (!b->state)  /* fast case */
+                return;
+        wait_on_bit(&b->state, B_READING, do_io_schedule, TASK_UNINTERRUPTIBLE);
+        __write_dirty_buffer(b);
+        wait_on_bit(&b->state, B_WRITING, do_io_schedule, TASK_UNINTERRUPTIBLE);
+}
+/*
+ * Find some buffer that is not held by anybody, clean it, unlink it and
+ * return it.
+ */
+static struct dm_buffer *__get_unclaimed_buffer(struct dm_bufio_client *c)
+{
+        struct dm_buffer *b;
+        list_for_each_entry_reverse(b, &c->lru[LIST_CLEAN], lru_list) {
+                BUG_ON(test_bit(B_WRITING, &b->state));
+                BUG_ON(test_bit(B_DIRTY, &b->state));
+                if (!b->hold_count) {
+                        __make_buffer_clean(b);
+                        __unlink_buffer(b);
+                        return b;
+                }
+                dm_bufio_cond_resched();
+        }
+        list_for_each_entry_reverse(b, &c->lru[LIST_DIRTY], lru_list) {
+                BUG_ON(test_bit(B_READING, &b->state));
+                if (!b->hold_count) {
+                        __make_buffer_clean(b);
+                        __unlink_buffer(b);
+                        return b;
+                }
+                dm_bufio_cond_resched();
+        }
+        return NULL;
+}
+/*
+ * Wait until some other threads free some buffer or release hold count on
+ * some buffer.
+ *
+ * This function is entered with c->lock held, drops it and regains it
+ * before exiting.
+ */
+static void __wait_for_free_buffer(struct dm_bufio_client *c)
+{
+        DECLARE_WAITQUEUE(wait, current);
+        add_wait_queue(&c->free_buffer_wait, &wait);
+        set_task_state(current, TASK_UNINTERRUPTIBLE);
+        dm_bufio_unlock(c);
+        io_schedule();
+        set_task_state(current, TASK_RUNNING);
+        remove_wait_queue(&c->free_buffer_wait, &wait);
+        dm_bufio_lock(c);
+}
+/*
+ * Allocate a new buffer. If the allocation is not possible, wait until
+ * some other thread frees a buffer.
+ *
+ * May drop the lock and regain it.
+ */
+static struct dm_buffer *__alloc_buffer_wait_no_callback(struct dm_bufio_client *c)
+{
+        struct dm_buffer *b;
+        /*
+         * dm-bufio is resistant to allocation failures (it just keeps
+         * one buffer reserved in cases all the allocations fail).
+         * So set flags to not try too hard:
+         *      GFP_NOIO: don't recurse into the I/O layer
+         *      __GFP_NORETRY: don't retry and rather return failure
+         *      __GFP_NOMEMALLOC: don't use emergency reserves
+         *      __GFP_NOWARN: don't print a warning in case of failure
+         *
+         * For debugging, if we set the cache size to 1, no new buffers will
+         * be allocated.
+         */
+        while (1) {
+                if (dm_bufio_cache_size_latch != 1) {
+                        b = alloc_buffer(c, GFP_NOIO | __GFP_NORETRY | __GFP_NOMEMALLOC | __GFP_NOWARN);
+                        if (b)
+                                return b;
+                }
+                if (!list_empty(&c->reserved_buffers)) {
+                        b = list_entry(c->reserved_buffers.next,
+                                       struct dm_buffer, lru_list);
+                        list_del(&b->lru_list);
+                        c->need_reserved_buffers++;
+                        return b;
+                }
+                b = __get_unclaimed_buffer(c);
+                if (b)
+                        return b;
+                __wait_for_free_buffer(c);
+        }
+}
+static struct dm_buffer *__alloc_buffer_wait(struct dm_bufio_client *c)
+{
+        struct dm_buffer *b = __alloc_buffer_wait_no_callback(c);
+        if (c->alloc_callback)
+                c->alloc_callback(b);
+        return b;
+}
+/*
+ * Free a buffer and wake other threads waiting for free buffers.
+ */
+static void __free_buffer_wake(struct dm_buffer *b)
+{
+        struct dm_bufio_client *c = b->c;
+        if (!c->need_reserved_buffers)
+                free_buffer(b);
+        else {
+                list_add(&b->lru_list, &c->reserved_buffers);
+                c->need_reserved_buffers--;
+        }
+        wake_up(&c->free_buffer_wait);
+}
+static void __write_dirty_buffers_async(struct dm_bufio_client *c, int no_wait)
+{
+        struct dm_buffer *b, *tmp;
+        list_for_each_entry_safe_reverse(b, tmp, &c->lru[LIST_DIRTY], lru_list) {
+                BUG_ON(test_bit(B_READING, &b->state));
+                if (!test_bit(B_DIRTY, &b->state) &&
+                    !test_bit(B_WRITING, &b->state)) {
+                        __relink_lru(b, LIST_CLEAN);
+                        continue;
+                }
+                if (no_wait && test_bit(B_WRITING, &b->state))
+                        return;
+                __write_dirty_buffer(b);
+                dm_bufio_cond_resched();
+        }
+}
+/*
+ * Get writeback threshold and buffer limit for a given client.
+ */
+static void __get_memory_limit(struct dm_bufio_client *c,
+                               unsigned long *threshold_buffers,
+                               unsigned long *limit_buffers)
+{
+        unsigned long buffers;
+        if (dm_bufio_cache_size != dm_bufio_cache_size_latch) {
+                mutex_lock(&dm_bufio_clients_lock);
+                __cache_size_refresh();
+                mutex_unlock(&dm_bufio_clients_lock);
+        }
+        buffers = dm_bufio_cache_size_per_client >>
+                  (c->sectors_per_block_bits + SECTOR_SHIFT);
+        if (buffers < DM_BUFIO_MIN_BUFFERS)
+                buffers = DM_BUFIO_MIN_BUFFERS;
+        *limit_buffers = buffers;
+        *threshold_buffers = buffers * DM_BUFIO_WRITEBACK_PERCENT / 100;
+}
+/*
+ * Check if we're over watermark.
+ * If we are over threshold_buffers, start freeing buffers.
+ * If we're over "limit_buffers", block until we get under the limit.
+ */
+static void __check_watermark(struct dm_bufio_client *c)
+{
+        unsigned long threshold_buffers, limit_buffers;
+        __get_memory_limit(c, &threshold_buffers, &limit_buffers);
+        while (c->n_buffers[LIST_CLEAN] + c->n_buffers[LIST_DIRTY] >
+               limit_buffers) {
+                struct dm_buffer *b = __get_unclaimed_buffer(c);
+                if (!b)
+                        return;
+                __free_buffer_wake(b);
+                dm_bufio_cond_resched();
+        }
+        if (c->n_buffers[LIST_DIRTY] > threshold_buffers)
+                __write_dirty_buffers_async(c, 1);
+}
+/*
+ * Find a buffer in the hash.
+ */
+static struct dm_buffer *__find(struct dm_bufio_client *c, sector_t block)
+{
+        struct dm_buffer *b;
+        struct hlist_node *hn;
+        hlist_for_each_entry(b, hn, &c->cache_hash[DM_BUFIO_HASH(block)],
+                             hash_list) {
+                dm_bufio_cond_resched();
+                if (b->block == block)
+                        return b;
+        }
+        return NULL;
+}
+/*----------------------------------------------------------------
+ * Getting a buffer
+ *--------------------------------------------------------------*/
+enum new_flag {
+        NF_FRESH = 0,
+        NF_READ = 1,
+        NF_GET = 2
+};
+static struct dm_buffer *__bufio_new(struct dm_bufio_client *c, sector_t block,
+                                     enum new_flag nf, struct dm_buffer **bp,
+                                     int *need_submit)
+{
+        struct dm_buffer *b, *new_b = NULL;
+        *need_submit = 0;
+        b = __find(c, block);
+        if (b) {
+                b->hold_count++;
+                __relink_lru(b, test_bit(B_DIRTY, &b->state) ||
+                             test_bit(B_WRITING, &b->state));
+                return b;
+        }
+        if (nf == NF_GET)
+                return NULL;
+        new_b = __alloc_buffer_wait(c);
+        /*
+         * We've had a period where the mutex was unlocked, so need to
+         * recheck the hash table.
+         */
+        b = __find(c, block);
+        if (b) {
+                __free_buffer_wake(new_b);
+                b->hold_count++;
+                __relink_lru(b, test_bit(B_DIRTY, &b->state) ||
+                             test_bit(B_WRITING, &b->state));
+                return b;
+        }
+        __check_watermark(c);
+        b = new_b;
+        b->hold_count = 1;
+        b->read_error = 0;
+        b->write_error = 0;
+        __link_buffer(b, block, LIST_CLEAN);
+        if (nf == NF_FRESH) {
+                b->state = 0;
+                return b;
+        }
+        b->state = 1 << B_READING;
+        *need_submit = 1;
+        return b;
+}
+/*
+ * The endio routine for reading: set the error, clear the bit and wake up
+ * anyone waiting on the buffer.
+ */
+static void read_endio(struct bio *bio, int error)
+{
+        struct dm_buffer *b = container_of(bio, struct dm_buffer, bio);
+        b->read_error = error;
+        BUG_ON(!test_bit(B_READING, &b->state));
+        smp_mb__before_clear_bit();
+        clear_bit(B_READING, &b->state);
+        smp_mb__after_clear_bit();
+        wake_up_bit(&b->state, B_READING);
+}
+/*
+ * A common routine for dm_bufio_new and dm_bufio_read.  Operation of these
+ * functions is similar except that dm_bufio_new doesn't read the
+ * buffer from the disk (assuming that the caller overwrites all the data
+ * and uses dm_bufio_mark_buffer_dirty to write new data back).
+ */
+static void *new_read(struct dm_bufio_client *c, sector_t block,
+                      enum new_flag nf, struct dm_buffer **bp)
+{
+        int need_submit;
+        struct dm_buffer *b;
+        dm_bufio_lock(c);
+        b = __bufio_new(c, block, nf, bp, &need_submit);
+        dm_bufio_unlock(c);
+        if (!b || IS_ERR(b))
+                return b;
+        if (need_submit)
+                submit_io(b, READ, b->block, read_endio);
+        wait_on_bit(&b->state, B_READING, do_io_schedule, TASK_UNINTERRUPTIBLE);
+        if (b->read_error) {
+                int error = b->read_error;
+                dm_bufio_release(b);
+                return ERR_PTR(error);
+        }
+        *bp = b;
+        return b->data;
+}
+void *dm_bufio_get(struct dm_bufio_client *c, sector_t block,
+                   struct dm_buffer **bp)
+{
+        return new_read(c, block, NF_GET, bp);
+}
+EXPORT_SYMBOL_GPL(dm_bufio_get);
+void *dm_bufio_read(struct dm_bufio_client *c, sector_t block,
+                    struct dm_buffer **bp)
+{
+        BUG_ON(dm_bufio_in_request());
+        return new_read(c, block, NF_READ, bp);
+}
+EXPORT_SYMBOL_GPL(dm_bufio_read);
+void *dm_bufio_new(struct dm_bufio_client *c, sector_t block,
+                   struct dm_buffer **bp)
+{
+        BUG_ON(dm_bufio_in_request());
+        return new_read(c, block, NF_FRESH, bp);
+}
+EXPORT_SYMBOL_GPL(dm_bufio_new);
+void dm_bufio_release(struct dm_buffer *b)
+{
+        struct dm_bufio_client *c = b->c;
+        dm_bufio_lock(c);
+        BUG_ON(test_bit(B_READING, &b->state));
+        BUG_ON(!b->hold_count);
+        b->hold_count--;
+        if (!b->hold_count) {
+                wake_up(&c->free_buffer_wait);
+                /*
+                 * If there were errors on the buffer, and the buffer is not
+                 * to be written, free the buffer. There is no point in caching
+                 * invalid buffer.
+                 */
+                if ((b->read_error || b->write_error) &&
+                    !test_bit(B_WRITING, &b->state) &&
+                    !test_bit(B_DIRTY, &b->state)) {
+                        __unlink_buffer(b);
+                        __free_buffer_wake(b);
+                }
+        }
+        dm_bufio_unlock(c);
+}
+EXPORT_SYMBOL_GPL(dm_bufio_release);
+void dm_bufio_mark_buffer_dirty(struct dm_buffer *b)
+{
+        struct dm_bufio_client *c = b->c;
+        dm_bufio_lock(c);
+        if (!test_and_set_bit(B_DIRTY, &b->state))
+                __relink_lru(b, LIST_DIRTY);
+        dm_bufio_unlock(c);
+}
+EXPORT_SYMBOL_GPL(dm_bufio_mark_buffer_dirty);
+void dm_bufio_write_dirty_buffers_async(struct dm_bufio_client *c)
+{
+        BUG_ON(dm_bufio_in_request());
+        dm_bufio_lock(c);
+        __write_dirty_buffers_async(c, 0);
+        dm_bufio_unlock(c);
+}
+EXPORT_SYMBOL_GPL(dm_bufio_write_dirty_buffers_async);
+/*
+ * For performance, it is essential that the buffers are written asynchronously
+ * and simultaneously (so that the block layer can merge the writes) and then
+ * waited upon.
+ *
+ * Finally, we flush hardware disk cache.
+ */
+int dm_bufio_write_dirty_buffers(struct dm_bufio_client *c)
+{
+        int a, f;
+        unsigned long buffers_processed = 0;
+        struct dm_buffer *b, *tmp;
+        dm_bufio_lock(c);
+        __write_dirty_buffers_async(c, 0);
+again:
+        list_for_each_entry_safe_reverse(b, tmp, &c->lru[LIST_DIRTY], lru_list) {
+                int dropped_lock = 0;
+                if (buffers_processed < c->n_buffers[LIST_DIRTY])
+                        buffers_processed++;
+                BUG_ON(test_bit(B_READING, &b->state));
+                if (test_bit(B_WRITING, &b->state)) {
+                        if (buffers_processed < c->n_buffers[LIST_DIRTY]) {
+                                dropped_lock = 1;
+                                b->hold_count++;
+                                dm_bufio_unlock(c);
+                                wait_on_bit(&b->state, B_WRITING,
+                                            do_io_schedule,
+                                            TASK_UNINTERRUPTIBLE);
+                                dm_bufio_lock(c);
+                                b->hold_count--;
+                        } else
+                                wait_on_bit(&b->state, B_WRITING,
+                                            do_io_schedule,
+                                            TASK_UNINTERRUPTIBLE);
+                }
+                if (!test_bit(B_DIRTY, &b->state) &&
+                    !test_bit(B_WRITING, &b->state))
+                        __relink_lru(b, LIST_CLEAN);
+                dm_bufio_cond_resched();
+                /*
+                 * If we dropped the lock, the list is no longer consistent,
+                 * so we must restart the search.
+                 *
+                 * In the most common case, the buffer just processed is
+                 * relinked to the clean list, so we won't loop scanning the
+                 * same buffer again and again.
+                 *
+                 * This may livelock if there is another thread simultaneously
+                 * dirtying buffers, so we count the number of buffers walked
+                 * and if it exceeds the total number of buffers, it means that
+                 * someone is doing some writes simultaneously with us.  In
+                 * this case, stop, dropping the lock.
+                 */
+                if (dropped_lock)
+                        goto again;
+        }
+        wake_up(&c->free_buffer_wait);
+        dm_bufio_unlock(c);
+        a = xchg(&c->async_write_error, 0);
+        f = dm_bufio_issue_flush(c);
+        if (a)
+                return a;
+        return f;
+}
+EXPORT_SYMBOL_GPL(dm_bufio_write_dirty_buffers);
+/*
+ * Use dm-io to send and empty barrier flush the device.
+ */
+int dm_bufio_issue_flush(struct dm_bufio_client *c)
+{
+        struct dm_io_request io_req = {
+                .bi_rw = REQ_FLUSH,
+                .mem.type = DM_IO_KMEM,
+                .mem.ptr.addr = NULL,
+                .client = c->dm_io,
+        };
+        struct dm_io_region io_reg = {
+                .bdev = c->bdev,
+                .sector = 0,
+                .count = 0,
+        };
+        BUG_ON(dm_bufio_in_request());
+        return dm_io(&io_req, 1, &io_reg, NULL);
+}
+EXPORT_SYMBOL_GPL(dm_bufio_issue_flush);
+/*
+ * We first delete any other buffer that may be at that new location.
+ *
+ * Then, we write the buffer to the original location if it was dirty.
+ *
+ * Then, if we are the only one who is holding the buffer, relink the buffer
+ * in the hash queue for the new location.
+ *
+ * If there was someone else holding the buffer, we write it to the new
+ * location but not relink it, because that other user needs to have the buffer
+ * at the same place.
+ */
+void dm_bufio_release_move(struct dm_buffer *b, sector_t new_block)
+{
+        struct dm_bufio_client *c = b->c;
+        struct dm_buffer *new;
+        BUG_ON(dm_bufio_in_request());
+        dm_bufio_lock(c);
+retry:
+        new = __find(c, new_block);
+        if (new) {
+                if (new->hold_count) {
+                        __wait_for_free_buffer(c);
+                        goto retry;
+                }
+                /*
+                 * FIXME: Is there any point waiting for a write that's going
+                 * to be overwritten in a bit?
+                 */
+                __make_buffer_clean(new);
+                __unlink_buffer(new);
+                __free_buffer_wake(new);
+        }
+        BUG_ON(!b->hold_count);
+        BUG_ON(test_bit(B_READING, &b->state));
+        __write_dirty_buffer(b);
+        if (b->hold_count == 1) {
+                wait_on_bit(&b->state, B_WRITING,
+                            do_io_schedule, TASK_UNINTERRUPTIBLE);
+                set_bit(B_DIRTY, &b->state);
+                __unlink_buffer(b);
+                __link_buffer(b, new_block, LIST_DIRTY);
+        } else {
+                sector_t old_block;
+                wait_on_bit_lock(&b->state, B_WRITING,
+                                 do_io_schedule, TASK_UNINTERRUPTIBLE);
+                /*
+                 * Relink buffer to "new_block" so that write_callback
+                 * sees "new_block" as a block number.
+                 * After the write, link the buffer back to old_block.
+                 * All this must be done in bufio lock, so that block number
+                 * change isn't visible to other threads.
+                 */
+                old_block = b->block;
+                __unlink_buffer(b);
+                __link_buffer(b, new_block, b->list_mode);
+                submit_io(b, WRITE, new_block, write_endio);
+                wait_on_bit(&b->state, B_WRITING,
+                            do_io_schedule, TASK_UNINTERRUPTIBLE);
+                __unlink_buffer(b);
+                __link_buffer(b, old_block, b->list_mode);
+        }
+        dm_bufio_unlock(c);
+        dm_bufio_release(b);
+}
+EXPORT_SYMBOL_GPL(dm_bufio_release_move);
+unsigned dm_bufio_get_block_size(struct dm_bufio_client *c)
+{
+        return c->block_size;
+}
+EXPORT_SYMBOL_GPL(dm_bufio_get_block_size);
+sector_t dm_bufio_get_device_size(struct dm_bufio_client *c)
+{
+        return i_size_read(c->bdev->bd_inode) >>
+                           (SECTOR_SHIFT + c->sectors_per_block_bits);
+}
+EXPORT_SYMBOL_GPL(dm_bufio_get_device_size);
+sector_t dm_bufio_get_block_number(struct dm_buffer *b)
+{
+        return b->block;
+}
+EXPORT_SYMBOL_GPL(dm_bufio_get_block_number);
+void *dm_bufio_get_block_data(struct dm_buffer *b)
+{
+        return b->data;
+}
+EXPORT_SYMBOL_GPL(dm_bufio_get_block_data);
+void *dm_bufio_get_aux_data(struct dm_buffer *b)
+{
+        return b + 1;
+}
+EXPORT_SYMBOL_GPL(dm_bufio_get_aux_data);
+struct dm_bufio_client *dm_bufio_get_client(struct dm_buffer *b)
+{
+        return b->c;
+}
+EXPORT_SYMBOL_GPL(dm_bufio_get_client);
+static void drop_buffers(struct dm_bufio_client *c)
+{
+        struct dm_buffer *b;
+        int i;
+        BUG_ON(dm_bufio_in_request());
+        /*
+         * An optimization so that the buffers are not written one-by-one.
+         */
+        dm_bufio_write_dirty_buffers_async(c);
+        dm_bufio_lock(c);
+        while ((b = __get_unclaimed_buffer(c)))
+                __free_buffer_wake(b);
+        for (i = 0; i < LIST_SIZE; i++)
+                list_for_each_entry(b, &c->lru[i], lru_list)
+                        DMERR("leaked buffer %llx, hold count %u, list %d",
+                              (unsigned long long)b->block, b->hold_count, i);
+        for (i = 0; i < LIST_SIZE; i++)
+                BUG_ON(!list_empty(&c->lru[i]));
+        dm_bufio_unlock(c);
+}
+/*
+ * Test if the buffer is unused and too old, and commit it.
+ * At if noio is set, we must not do any I/O because we hold
+ * dm_bufio_clients_lock and we would risk deadlock if the I/O gets rerouted to
+ * different bufio client.
+ */
+static int __cleanup_old_buffer(struct dm_buffer *b, gfp_t gfp,
+                                unsigned long max_jiffies)
+{
+        if (jiffies - b->last_accessed < max_jiffies)
+                return 1;
+        if (!(gfp & __GFP_IO)) {
+                if (test_bit(B_READING, &b->state) ||
+                    test_bit(B_WRITING, &b->state) ||
+                    test_bit(B_DIRTY, &b->state))
+                        return 1;
+        }
+        if (b->hold_count)
+                return 1;
+        __make_buffer_clean(b);
+        __unlink_buffer(b);
+        __free_buffer_wake(b);
+        return 0;
+}
+static void __scan(struct dm_bufio_client *c, unsigned long nr_to_scan,
+                   struct shrink_control *sc)
+{
+        int l;
+        struct dm_buffer *b, *tmp;
+        for (l = 0; l < LIST_SIZE; l++) {
+                list_for_each_entry_safe_reverse(b, tmp, &c->lru[l], lru_list)
+                        if (!__cleanup_old_buffer(b, sc->gfp_mask, 0) &&
+                            !--nr_to_scan)
+                                return;
+                dm_bufio_cond_resched();
+        }
+}
+static int shrink(struct shrinker *shrinker, struct shrink_control *sc)
+{
+        struct dm_bufio_client *c =
+            container_of(shrinker, struct dm_bufio_client, shrinker);
+        unsigned long r;
+        unsigned long nr_to_scan = sc->nr_to_scan;
+        if (sc->gfp_mask & __GFP_IO)
+                dm_bufio_lock(c);
+        else if (!dm_bufio_trylock(c))
+                return !nr_to_scan ? 0 : -1;
+        if (nr_to_scan)
+                __scan(c, nr_to_scan, sc);
+        r = c->n_buffers[LIST_CLEAN] + c->n_buffers[LIST_DIRTY];
+        if (r > INT_MAX)
+                r = INT_MAX;
+        dm_bufio_unlock(c);
+        return r;
+}
+/*
+ * Create the buffering interface
+ */
+struct dm_bufio_client *dm_bufio_client_create(struct block_device *bdev, unsigned block_size,
+                                               unsigned reserved_buffers, unsigned aux_size,
+                                               void (*alloc_callback)(struct dm_buffer *),
+                                               void (*write_callback)(struct dm_buffer *))
+{
+        int r;
+        struct dm_bufio_client *c;
+        unsigned i;
+        BUG_ON(block_size < 1 << SECTOR_SHIFT ||
+               (block_size & (block_size - 1)));
+        c = kmalloc(sizeof(*c), GFP_KERNEL);
+        if (!c) {
+                r = -ENOMEM;
+                goto bad_client;
+        }
+        c->cache_hash = vmalloc(sizeof(struct hlist_head) << DM_BUFIO_HASH_BITS);
+        if (!c->cache_hash) {
+                r = -ENOMEM;
+                goto bad_hash;
+        }
+        c->bdev = bdev;
+        c->block_size = block_size;
+        c->sectors_per_block_bits = ffs(block_size) - 1 - SECTOR_SHIFT;
+        c->pages_per_block_bits = (ffs(block_size) - 1 >= PAGE_SHIFT) ?
+                                  ffs(block_size) - 1 - PAGE_SHIFT : 0;
+        c->blocks_per_page_bits = (ffs(block_size) - 1 < PAGE_SHIFT ?
+                                  PAGE_SHIFT - (ffs(block_size) - 1) : 0);
+        c->aux_size = aux_size;
+        c->alloc_callback = alloc_callback;
+        c->write_callback = write_callback;
+        for (i = 0; i < LIST_SIZE; i++) {
+                INIT_LIST_HEAD(&c->lru[i]);
+                c->n_buffers[i] = 0;
+        }
+        for (i = 0; i < 1 << DM_BUFIO_HASH_BITS; i++)
+                INIT_HLIST_HEAD(&c->cache_hash[i]);
+        mutex_init(&c->lock);
+        INIT_LIST_HEAD(&c->reserved_buffers);
+        c->need_reserved_buffers = reserved_buffers;
+        init_waitqueue_head(&c->free_buffer_wait);
+        c->async_write_error = 0;
+        c->dm_io = dm_io_client_create();
+        if (IS_ERR(c->dm_io)) {
+                r = PTR_ERR(c->dm_io);
+                goto bad_dm_io;
+        }
+        mutex_lock(&dm_bufio_clients_lock);
+        if (c->blocks_per_page_bits) {
+                if (!DM_BUFIO_CACHE_NAME(c)) {
+                        DM_BUFIO_CACHE_NAME(c) = kasprintf(GFP_KERNEL, "dm_bufio_cache-%u", c->block_size);
+                        if (!DM_BUFIO_CACHE_NAME(c)) {
+                                r = -ENOMEM;
+                                mutex_unlock(&dm_bufio_clients_lock);
+                                goto bad_cache;
+                        }
+                }
+                if (!DM_BUFIO_CACHE(c)) {
+                        DM_BUFIO_CACHE(c) = kmem_cache_create(DM_BUFIO_CACHE_NAME(c),
+                                                              c->block_size,
+                                                              c->block_size, 0, NULL);
+                        if (!DM_BUFIO_CACHE(c)) {
+                                r = -ENOMEM;
+                                mutex_unlock(&dm_bufio_clients_lock);
+                                goto bad_cache;
+                        }
+                }
+        }
+        mutex_unlock(&dm_bufio_clients_lock);
+        while (c->need_reserved_buffers) {
+                struct dm_buffer *b = alloc_buffer(c, GFP_KERNEL);
+                if (!b) {
+                        r = -ENOMEM;
+                        goto bad_buffer;
+                }
+                __free_buffer_wake(b);
+        }
+        mutex_lock(&dm_bufio_clients_lock);
+        dm_bufio_client_count++;
+        list_add(&c->client_list, &dm_bufio_all_clients);
+        __cache_size_refresh();
+        mutex_unlock(&dm_bufio_clients_lock);
+        c->shrinker.shrink = shrink;
+        c->shrinker.seeks = 1;
+        c->shrinker.batch = 0;
+        register_shrinker(&c->shrinker);
+        return c;
+bad_buffer:
+bad_cache:
+        while (!list_empty(&c->reserved_buffers)) {
+                struct dm_buffer *b = list_entry(c->reserved_buffers.next,
+                                                 struct dm_buffer, lru_list);
+                list_del(&b->lru_list);
+                free_buffer(b);
+        }
+        dm_io_client_destroy(c->dm_io);
+bad_dm_io:
+        vfree(c->cache_hash);
+bad_hash:
+        kfree(c);
+bad_client:
+        return ERR_PTR(r);
+}
+EXPORT_SYMBOL_GPL(dm_bufio_client_create);
+/*
+ * Free the buffering interface.
+ * It is required that there are no references on any buffers.
+ */
+void dm_bufio_client_destroy(struct dm_bufio_client *c)
+{
+        unsigned i;
+        drop_buffers(c);
+        unregister_shrinker(&c->shrinker);
+        mutex_lock(&dm_bufio_clients_lock);
+        list_del(&c->client_list);
+        dm_bufio_client_count--;
+        __cache_size_refresh();
+        mutex_unlock(&dm_bufio_clients_lock);
+        for (i = 0; i < 1 << DM_BUFIO_HASH_BITS; i++)
+                BUG_ON(!hlist_empty(&c->cache_hash[i]));
+        BUG_ON(c->need_reserved_buffers);
+        while (!list_empty(&c->reserved_buffers)) {
+                struct dm_buffer *b = list_entry(c->reserved_buffers.next,
+                                                 struct dm_buffer, lru_list);
+                list_del(&b->lru_list);
+                free_buffer(b);
+        }
+        for (i = 0; i < LIST_SIZE; i++)
+                if (c->n_buffers[i])
+                        DMERR("leaked buffer count %d: %ld", i, c->n_buffers[i]);
+        for (i = 0; i < LIST_SIZE; i++)
+                BUG_ON(c->n_buffers[i]);
+        dm_io_client_destroy(c->dm_io);
+        vfree(c->cache_hash);
+        kfree(c);
+}
+EXPORT_SYMBOL_GPL(dm_bufio_client_destroy);
+static void cleanup_old_buffers(void)
+{
+        unsigned long max_age = dm_bufio_max_age;
+        struct dm_bufio_client *c;
+        barrier();
+        if (max_age > ULONG_MAX / HZ)
+                max_age = ULONG_MAX / HZ;
+        mutex_lock(&dm_bufio_clients_lock);
+        list_for_each_entry(c, &dm_bufio_all_clients, client_list) {
+                if (!dm_bufio_trylock(c))
+                        continue;
+                while (!list_empty(&c->lru[LIST_CLEAN])) {
+                        struct dm_buffer *b;
+                        b = list_entry(c->lru[LIST_CLEAN].prev,
+                                       struct dm_buffer, lru_list);
+                        if (__cleanup_old_buffer(b, 0, max_age * HZ))
+                                break;
+                        dm_bufio_cond_resched();
+                }
+                dm_bufio_unlock(c);
+                dm_bufio_cond_resched();
+        }
+        mutex_unlock(&dm_bufio_clients_lock);
+}
+static struct workqueue_struct *dm_bufio_wq;
+static struct delayed_work dm_bufio_work;
+static void work_fn(struct work_struct *w)
+{
+        cleanup_old_buffers();
+        queue_delayed_work(dm_bufio_wq, &dm_bufio_work,
+                           DM_BUFIO_WORK_TIMER_SECS * HZ);
+}
+/*----------------------------------------------------------------
+ * Module setup
+ *--------------------------------------------------------------*/
+/*
+ * This is called only once for the whole dm_bufio module.
+ * It initializes memory limit.
+ */
+static int __init dm_bufio_init(void)
+{
+        __u64 mem;
+        memset(&dm_bufio_caches, 0, sizeof dm_bufio_caches);
+        memset(&dm_bufio_cache_names, 0, sizeof dm_bufio_cache_names);
+        mem = (__u64)((totalram_pages - totalhigh_pages) *
+                      DM_BUFIO_MEMORY_PERCENT / 100) << PAGE_SHIFT;
+        if (mem > ULONG_MAX)
+                mem = ULONG_MAX;
+#ifdef CONFIG_MMU
+        /*
+         * Get the size of vmalloc space the same way as VMALLOC_TOTAL
+         * in fs/proc/internal.h
+         */
+        if (mem > (VMALLOC_END - VMALLOC_START) * DM_BUFIO_VMALLOC_PERCENT / 100)
+                mem = (VMALLOC_END - VMALLOC_START) * DM_BUFIO_VMALLOC_PERCENT / 100;
+#endif
+        dm_bufio_default_cache_size = mem;
+        mutex_lock(&dm_bufio_clients_lock);
+        __cache_size_refresh();
+        mutex_unlock(&dm_bufio_clients_lock);
+        dm_bufio_wq = create_singlethread_workqueue("dm_bufio_cache");
+        if (!dm_bufio_wq)
+                return -ENOMEM;
+        INIT_DELAYED_WORK(&dm_bufio_work, work_fn);
+        queue_delayed_work(dm_bufio_wq, &dm_bufio_work,
+                           DM_BUFIO_WORK_TIMER_SECS * HZ);
+        return 0;
+}
+/*
+ * This is called once when unloading the dm_bufio module.
+ */
+static void __exit dm_bufio_exit(void)
+{
+        int bug = 0;
+        int i;
+        cancel_delayed_work_sync(&dm_bufio_work);
+        destroy_workqueue(dm_bufio_wq);
+        for (i = 0; i < ARRAY_SIZE(dm_bufio_caches); i++) {
+                struct kmem_cache *kc = dm_bufio_caches[i];
+                if (kc)
+                        kmem_cache_destroy(kc);
+        }
+        for (i = 0; i < ARRAY_SIZE(dm_bufio_cache_names); i++)
+                kfree(dm_bufio_cache_names[i]);
+        if (dm_bufio_client_count) {
+                DMCRIT("%s: dm_bufio_client_count leaked: %d",
+                        __func__, dm_bufio_client_count);
+                bug = 1;
+        }
+        if (dm_bufio_current_allocated) {
+                DMCRIT("%s: dm_bufio_current_allocated leaked: %lu",
+                        __func__, dm_bufio_current_allocated);
+                bug = 1;
+        }
+        if (dm_bufio_allocated_get_free_pages) {
+                DMCRIT("%s: dm_bufio_allocated_get_free_pages leaked: %lu",
+                       __func__, dm_bufio_allocated_get_free_pages);
+                bug = 1;
+        }
+        if (dm_bufio_allocated_vmalloc) {
+                DMCRIT("%s: dm_bufio_vmalloc leaked: %lu",
+                       __func__, dm_bufio_allocated_vmalloc);
+                bug = 1;
+        }
+        if (bug)
+                BUG();
+}
+module_init(dm_bufio_init)
+module_exit(dm_bufio_exit)
+module_param_named(max_cache_size_bytes, dm_bufio_cache_size, ulong, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(max_cache_size_bytes, "Size of metadata cache");
+module_param_named(max_age_seconds, dm_bufio_max_age, uint, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(max_age_seconds, "Max age of a buffer in seconds");
+module_param_named(peak_allocated_bytes, dm_bufio_peak_allocated, ulong, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(peak_allocated_bytes, "Tracks the maximum allocated memory");
+module_param_named(allocated_kmem_cache_bytes, dm_bufio_allocated_kmem_cache, ulong, S_IRUGO);
+MODULE_PARM_DESC(allocated_kmem_cache_bytes, "Memory allocated with kmem_cache_alloc");
+module_param_named(allocated_get_free_pages_bytes, dm_bufio_allocated_get_free_pages, ulong, S_IRUGO);
+MODULE_PARM_DESC(allocated_get_free_pages_bytes, "Memory allocated with get_free_pages");
+module_param_named(allocated_vmalloc_bytes, dm_bufio_allocated_vmalloc, ulong, S_IRUGO);
+MODULE_PARM_DESC(allocated_vmalloc_bytes, "Memory allocated with vmalloc");
+module_param_named(current_allocated_bytes, dm_bufio_current_allocated, ulong, S_IRUGO);
+MODULE_PARM_DESC(current_allocated_bytes, "Memory currently used by the cache");
+MODULE_AUTHOR("Mikulas Patocka <dm-devel@redhat.com>");
+MODULE_DESCRIPTION(DM_NAME " buffered I/O library");
+MODULE_LICENSE("GPL");
diff --git a/drivers/md/dm-bufio.h b/drivers/md/dm-bufio.h
new file mode 100644
index 000000000000..5c4c3a04e381
--- /dev/null
+++ b/drivers/md/dm-bufio.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2009-2011 Red Hat, Inc.
+ *
+ * Author: Mikulas Patocka <mpatocka@redhat.com>
+ *
+ * This file is released under the GPL.
+ */
+#ifndef DM_BUFIO_H
+#define DM_BUFIO_H
+#include <linux/blkdev.h>
+#include <linux/types.h>
+/*----------------------------------------------------------------*/
+struct dm_bufio_client;
+struct dm_buffer;
+/*
+ * Create a buffered IO cache on a given device
+ */
+struct dm_bufio_client *
+dm_bufio_client_create(struct block_device *bdev, unsigned block_size,
+                       unsigned reserved_buffers, unsigned aux_size,
+                       void (*alloc_callback)(struct dm_buffer *),
+                       void (*write_callback)(struct dm_buffer *));
+/*
+ * Release a buffered IO cache.
+ */
+void dm_bufio_client_destroy(struct dm_bufio_client *c);
+/*
+ * WARNING: to avoid deadlocks, these conditions are observed:
+ *
+ * - At most one thread can hold at most "reserved_buffers" simultaneously.
+ * - Each other threads can hold at most one buffer.
+ * - Threads which call only dm_bufio_get can hold unlimited number of
+ *   buffers.
+ */
+/*
+ * Read a given block from disk. Returns pointer to data.  Returns a
+ * pointer to dm_buffer that can be used to release the buffer or to make
+ * it dirty.
+ */
+void *dm_bufio_read(struct dm_bufio_client *c, sector_t block,
+                    struct dm_buffer **bp);
+/*
+ * Like dm_bufio_read, but return buffer from cache, don't read
+ * it. If the buffer is not in the cache, return NULL.
+ */
+void *dm_bufio_get(struct dm_bufio_client *c, sector_t block,
+                   struct dm_buffer **bp);
+/*
+ * Like dm_bufio_read, but don't read anything from the disk.  It is
+ * expected that the caller initializes the buffer and marks it dirty.
+ */
+void *dm_bufio_new(struct dm_bufio_client *c, sector_t block,
+                   struct dm_buffer **bp);
+/*
+ * Release a reference obtained with dm_bufio_{read,get,new}. The data
+ * pointer and dm_buffer pointer is no longer valid after this call.
+ */
+void dm_bufio_release(struct dm_buffer *b);
+/*
+ * Mark a buffer dirty. It should be called after the buffer is modified.
+ *
+ * In case of memory pressure, the buffer may be written after
+ * dm_bufio_mark_buffer_dirty, but before dm_bufio_write_dirty_buffers.  So
+ * dm_bufio_write_dirty_buffers guarantees that the buffer is on-disk but
+ * the actual writing may occur earlier.
+ */
+void dm_bufio_mark_buffer_dirty(struct dm_buffer *b);
+/*
+ * Initiate writing of dirty buffers, without waiting for completion.
+ */
+void dm_bufio_write_dirty_buffers_async(struct dm_bufio_client *c);
+/*
+ * Write all dirty buffers. Guarantees that all dirty buffers created prior
+ * to this call are on disk when this call exits.
+ */
+int dm_bufio_write_dirty_buffers(struct dm_bufio_client *c);
+/*
+ * Send an empty write barrier to the device to flush hardware disk cache.
+ */
+int dm_bufio_issue_flush(struct dm_bufio_client *c);
+/*
+ * Like dm_bufio_release but also move the buffer to the new
+ * block. dm_bufio_write_dirty_buffers is needed to commit the new block.
+ */
+void dm_bufio_release_move(struct dm_buffer *b, sector_t new_block);
+unsigned dm_bufio_get_block_size(struct dm_bufio_client *c);
+sector_t dm_bufio_get_device_size(struct dm_bufio_client *c);
+sector_t dm_bufio_get_block_number(struct dm_buffer *b);
+void *dm_bufio_get_block_data(struct dm_buffer *b);
+void *dm_bufio_get_aux_data(struct dm_buffer *b);
+struct dm_bufio_client *dm_bufio_get_client(struct dm_buffer *b);
+/*----------------------------------------------------------------*/
+#endif
diff --git a/drivers/md/dm-exception-store.c b/drivers/md/dm-exception-store.c
index 0bdb201c2c2a..042e71996569 100644
--- a/drivers/md/dm-exception-store.c
+++ b/drivers/md/dm-exception-store.c
@@ -11,6 +11,7 @@
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 #include <linux/vmalloc.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #define DM_MSG_PREFIX "snapshot exception stores"
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 2e9a3ca37bdd..31c2dc25886d 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -1215,6 +1215,7 @@ static int table_load(struct dm_ioctl *param, size_t param_size)
        struct hash_cell *hc;
        struct dm_table *t;
        struct mapped_device *md;
+        struct target_type *immutable_target_type;
        md = find_device(param);
        if (!md)
@@ -1230,6 +1231,16 @@ static int table_load(struct dm_ioctl *param, size_t param_size)
                goto out;
        }
+        immutable_target_type = dm_get_immutable_target_type(md);
+        if (immutable_target_type &&
+            (immutable_target_type != dm_table_get_immutable_target_type(t))) {
+                DMWARN("can't replace immutable target type %s",
+                       immutable_target_type->name);
+                dm_table_destroy(t);
+                r = -EINVAL;
+                goto out;
+        }
        /* Protect md->type and md->queue against concurrent table loads. */
        dm_lock_md_type(md);
        if (dm_get_md_type(md) == DM_TYPE_NONE)
diff --git a/drivers/md/dm-kcopyd.c b/drivers/md/dm-kcopyd.c
index 32ac70861d66..bed444c93d8d 100644
--- a/drivers/md/dm-kcopyd.c
+++ b/drivers/md/dm-kcopyd.c
@@ -66,6 +66,8 @@ struct dm_kcopyd_client {
        struct list_head pages_jobs;
 };
+static struct page_list zero_page_list;
 static void wake(struct dm_kcopyd_client *kc)
 {
        queue_work(kc->kcopyd_wq, &kc->kcopyd_work);
@@ -254,6 +256,9 @@ int __init dm_kcopyd_init(void)
        if (!_job_cache)
                return -ENOMEM;
+        zero_page_list.next = &zero_page_list;
+        zero_page_list.page = ZERO_PAGE(0);
        return 0;
 }
@@ -322,7 +327,7 @@ static int run_complete_job(struct kcopyd_job *job)
        dm_kcopyd_notify_fn fn = job->fn;
        struct dm_kcopyd_client *kc = job->kc;
-        if (job->pages)
+        if (job->pages && job->pages != &zero_page_list)
                kcopyd_put_pages(kc, job->pages);
        /*
         * If this is the master job, the sub jobs have already
@@ -484,6 +489,8 @@ static void dispatch_job(struct kcopyd_job *job)
        atomic_inc(&kc->nr_jobs);
        if (unlikely(!job->source.count))
                push(&kc->complete_jobs, job);
+        else if (job->pages == &zero_page_list)
+                push(&kc->io_jobs, job);
        else
                push(&kc->pages_jobs, job);
        wake(kc);
@@ -592,14 +599,20 @@ int dm_kcopyd_copy(struct dm_kcopyd_client *kc, struct dm_io_region *from,
        job->flags = flags;
        job->read_err = 0;
        job->write_err = 0;
-        job->rw = READ;
-        job->source = *from;
        job->num_dests = num_dests;
        memcpy(&job->dests, dests, sizeof(*dests) * num_dests);
-        job->pages = NULL;
+        if (from) {
+                job->source = *from;
+                job->pages = NULL;
+                job->rw = READ;
+        } else {
+                memset(&job->source, 0, sizeof job->source);
+                job->source.count = job->dests[0].count;
+                job->pages = &zero_page_list;
+                job->rw = WRITE;
+        }
        job->fn = fn;
        job->context = context;
@@ -617,6 +630,14 @@ int dm_kcopyd_copy(struct dm_kcopyd_client *kc, struct dm_io_region *from,
 }
 EXPORT_SYMBOL(dm_kcopyd_copy);
+int dm_kcopyd_zero(struct dm_kcopyd_client *kc,
+                   unsigned num_dests, struct dm_io_region *dests,
+                   unsigned flags, dm_kcopyd_notify_fn fn, void *context)
+{
+        return dm_kcopyd_copy(kc, NULL, num_dests, dests, flags, fn, context);
+}
+EXPORT_SYMBOL(dm_kcopyd_zero);
 void *dm_kcopyd_prepare_callback(struct dm_kcopyd_client *kc,
                                 dm_kcopyd_notify_fn fn, void *context)
 {
diff --git a/drivers/md/dm-log-userspace-base.c b/drivers/md/dm-log-userspace-base.c
index 1021c8986011..9429159d9ee3 100644
--- a/drivers/md/dm-log-userspace-base.c
+++ b/drivers/md/dm-log-userspace-base.c
@@ -9,6 +9,7 @@
 #include <linux/dm-dirty-log.h>
 #include <linux/device-mapper.h>
 #include <linux/dm-log-userspace.h>
+#include <linux/module.h>
 #include "dm-log-userspace-transfer.h"
@@ -30,6 +31,7 @@ struct flush_entry {
 struct log_c {
        struct dm_target *ti;
+        struct dm_dev *log_dev;
        uint32_t region_size;
        region_t region_count;
        uint64_t luid;
@@ -146,7 +148,7 @@ static int build_constructor_string(struct dm_target *ti,
 *      <UUID> <other args>
 * Where 'other args' is the userspace implementation specific log
 * arguments.  An example might be:
- *      <UUID> clustered_disk <arg count> <log dev> <region_size> [[no]sync]
+ *      <UUID> clustered-disk <arg count> <log dev> <region_size> [[no]sync]
 *
 * So, this module will strip off the <UUID> for identification purposes
 * when communicating with userspace about a log; but will pass on everything
@@ -161,13 +163,15 @@ static int userspace_ctr(struct dm_dirty_log *log, struct dm_target *ti,
        struct log_c *lc = NULL;
        uint64_t rdata;
        size_t rdata_size = sizeof(rdata);
+        char *devices_rdata = NULL;
+        size_t devices_rdata_size = DM_NAME_LEN;
        if (argc < 3) {
                DMWARN("Too few arguments to userspace dirty log");
                return -EINVAL;
        }
-        lc = kmalloc(sizeof(*lc), GFP_KERNEL);
+        lc = kzalloc(sizeof(*lc), GFP_KERNEL);
        if (!lc) {
                DMWARN("Unable to allocate userspace log context.");
                return -ENOMEM;
@@ -195,9 +199,19 @@ static int userspace_ctr(struct dm_dirty_log *log, struct dm_target *ti,
                return str_size;
        }
-        /* Send table string */
+        devices_rdata = kzalloc(devices_rdata_size, GFP_KERNEL);
+        if (!devices_rdata) {
+                DMERR("Failed to allocate memory for device information");
+                r = -ENOMEM;
+                goto out;
+        }
+        /*
+         * Send table string and get back any opened device.
+         */
        r = dm_consult_userspace(lc->uuid, lc->luid, DM_ULOG_CTR,
-                                 ctr_str, str_size, NULL, NULL);
+                                 ctr_str, str_size,
+                                 devices_rdata, &devices_rdata_size);
        if (r < 0) {
                if (r == -ESRCH)
@@ -220,7 +234,20 @@ static int userspace_ctr(struct dm_dirty_log *log, struct dm_target *ti,
        lc->region_size = (uint32_t)rdata;
        lc->region_count = dm_sector_div_up(ti->len, lc->region_size);
+        if (devices_rdata_size) {
+                if (devices_rdata[devices_rdata_size - 1] != '\0') {
+                        DMERR("DM_ULOG_CTR device return string not properly terminated");
+                        r = -EINVAL;
+                        goto out;
+                }
+                r = dm_get_device(ti, devices_rdata,
+                                  dm_table_get_mode(ti->table), &lc->log_dev);
+                if (r)
+                        DMERR("Failed to register %s with device-mapper",
+                              devices_rdata);
+        }
 out:
+        kfree(devices_rdata);
        if (r) {
                kfree(lc);
                kfree(ctr_str);
@@ -241,6 +268,9 @@ static void userspace_dtr(struct dm_dirty_log *log)
                                 NULL, 0,
                                 NULL, NULL);
+        if (lc->log_dev)
+                dm_put_device(lc->ti, lc->log_dev);
        kfree(lc->usr_argv_str);
        kfree(lc);
diff --git a/drivers/md/dm-path-selector.c b/drivers/md/dm-path-selector.c
index 42c04f04a0c4..fa0ccc585cb4 100644
--- a/drivers/md/dm-path-selector.c
+++ b/drivers/md/dm-path-selector.c
@@ -10,6 +10,7 @@
 */
 #include <linux/device-mapper.h>
+#include <linux/module.h>
 #include "dm-path-selector.h"
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index 37a37266a1e3..c2907d836e4e 100644
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -6,6 +6,7 @@
 */
 #include <linux/slab.h>
+#include <linux/module.h>
 #include "md.h"
 #include "raid1.h"
@@ -1017,30 +1018,56 @@ static int raid_status(struct dm_target *ti, status_type_t type,
        struct raid_set *rs = ti->private;
        unsigned raid_param_cnt = 1; /* at least 1 for chunksize */
        unsigned sz = 0;
-        int i;
+        int i, array_in_sync = 0;
        sector_t sync;
        switch (type) {
        case STATUSTYPE_INFO:
                DMEMIT("%s %d ", rs->raid_type->name, rs->md.raid_disks);
-                for (i = 0; i < rs->md.raid_disks; i++) {
-                        if (test_bit(Faulty, &rs->dev[i].rdev.flags))
-                                DMEMIT("D");
-                        else if (test_bit(In_sync, &rs->dev[i].rdev.flags))
-                                DMEMIT("A");
-                        else
-                                DMEMIT("a");
-                }
                if (test_bit(MD_RECOVERY_RUNNING, &rs->md.recovery))
                        sync = rs->md.curr_resync_completed;
                else
                        sync = rs->md.recovery_cp;
-                if (sync > rs->md.resync_max_sectors)
+                if (sync >= rs->md.resync_max_sectors) {
+                        array_in_sync = 1;
                        sync = rs->md.resync_max_sectors;
+                } else {
+                        /*
+                         * The array may be doing an initial sync, or it may
+                         * be rebuilding individual components.  If all the
+                         * devices are In_sync, then it is the array that is
+                         * being initialized.
+                         */
+                        for (i = 0; i < rs->md.raid_disks; i++)
+                                if (!test_bit(In_sync, &rs->dev[i].rdev.flags))
+                                        array_in_sync = 1;
+                }
+                /*
+                 * Status characters:
+                 *  'D' = Dead/Failed device
+                 *  'a' = Alive but not in-sync
+                 *  'A' = Alive and in-sync
+                 */
+                for (i = 0; i < rs->md.raid_disks; i++) {
+                        if (test_bit(Faulty, &rs->dev[i].rdev.flags))
+                                DMEMIT("D");
+                        else if (!array_in_sync ||
+                                 !test_bit(In_sync, &rs->dev[i].rdev.flags))
+                                DMEMIT("a");
+                        else
+                                DMEMIT("A");
+                }
+                /*
+                 * In-sync ratio:
+                 *  The in-sync ratio shows the progress of:
+                 *   - Initializing the array
+                 *   - Rebuilding a subset of devices of the array
+                 *  The user can distinguish between the two by referring
+                 *  to the status characters.
+                 */
                DMEMIT(" %llu/%llu",
                       (unsigned long long) sync,
                       (unsigned long long) rs->md.resync_max_sectors);
diff --git a/drivers/md/dm-round-robin.c b/drivers/md/dm-round-robin.c
index 24752f449bef..27f1d423b76c 100644
--- a/drivers/md/dm-round-robin.c
+++ b/drivers/md/dm-round-robin.c
@@ -14,6 +14,7 @@
 #include "dm-path-selector.h"
 #include <linux/slab.h>
+#include <linux/module.h>
 #define DM_MSG_PREFIX "multipath round-robin"
diff --git a/drivers/md/dm-service-time.c b/drivers/md/dm-service-time.c
index 9c6c2e47ad62..59883bd78214 100644
--- a/drivers/md/dm-service-time.c
+++ b/drivers/md/dm-service-time.c
@@ -12,6 +12,7 @@
 #include "dm-path-selector.h"
 #include <linux/slab.h>
+#include <linux/module.h>
 #define DM_MSG_PREFIX   "multipath service-time"
 #define ST_MIN_IO       1
diff --git a/drivers/md/dm-snap-persistent.c b/drivers/md/dm-snap-persistent.c
index d1f1d7017103..3ac415675b6c 100644
--- a/drivers/md/dm-snap-persistent.c
+++ b/drivers/md/dm-snap-persistent.c
@@ -10,6 +10,7 @@
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 #include <linux/vmalloc.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/dm-io.h>
diff --git a/drivers/md/dm-snap-transient.c b/drivers/md/dm-snap-transient.c
index a0898a66a2f8..1ce9a2586e41 100644
--- a/drivers/md/dm-snap-transient.c
+++ b/drivers/md/dm-snap-transient.c
@@ -10,6 +10,7 @@
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 #include <linux/vmalloc.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/dm-io.h>
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index bc04518e9d8b..8e9132130142 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -54,7 +54,9 @@ struct dm_table {
        sector_t *highs;
        struct dm_target *targets;
+        struct target_type *immutable_target_type;
        unsigned integrity_supported:1;
+        unsigned singleton:1;
        /*
         * Indicates the rw permissions for the new logical
@@ -740,6 +742,12 @@ int dm_table_add_target(struct dm_table *t, const char *type,
        char **argv;
        struct dm_target *tgt;
+        if (t->singleton) {
+                DMERR("%s: target type %s must appear alone in table",
+                      dm_device_name(t->md), t->targets->type->name);
+                return -EINVAL;
+        }
        if ((r = check_space(t)))
                return r;
@@ -758,6 +766,36 @@ int dm_table_add_target(struct dm_table *t, const char *type,
                return -EINVAL;
        }
+        if (dm_target_needs_singleton(tgt->type)) {
+                if (t->num_targets) {
+                        DMERR("%s: target type %s must appear alone in table",
+                              dm_device_name(t->md), type);
+                        return -EINVAL;
+                }
+                t->singleton = 1;
+        }
+        if (dm_target_always_writeable(tgt->type) && !(t->mode & FMODE_WRITE)) {
+                DMERR("%s: target type %s may not be included in read-only tables",
+                      dm_device_name(t->md), type);
+                return -EINVAL;
+        }
+        if (t->immutable_target_type) {
+                if (t->immutable_target_type != tgt->type) {
+                        DMERR("%s: immutable target type %s cannot be mixed with other target types",
+                              dm_device_name(t->md), t->immutable_target_type->name);
+                        return -EINVAL;
+                }
+        } else if (dm_target_is_immutable(tgt->type)) {
+                if (t->num_targets) {
+                        DMERR("%s: immutable target type %s cannot be mixed with other target types",
+                              dm_device_name(t->md), tgt->type->name);
+                        return -EINVAL;
+                }
+                t->immutable_target_type = tgt->type;
+        }
        tgt->table = t;
        tgt->begin = start;
        tgt->len = len;
@@ -915,6 +953,11 @@ unsigned dm_table_get_type(struct dm_table *t)
        return t->type;
 }
+struct target_type *dm_table_get_immutable_target_type(struct dm_table *t)
+{
+        return t->immutable_target_type;
+}
 bool dm_table_request_based(struct dm_table *t)
 {
        return dm_table_get_type(t) == DM_TYPE_REQUEST_BASED;
@@ -1299,6 +1342,31 @@ static bool dm_table_discard_zeroes_data(struct dm_table *t)
        return 1;
 }
+static int device_is_nonrot(struct dm_target *ti, struct dm_dev *dev,
+                            sector_t start, sector_t len, void *data)
+{
+        struct request_queue *q = bdev_get_queue(dev->bdev);
+        return q && blk_queue_nonrot(q);
+}
+static bool dm_table_is_nonrot(struct dm_table *t)
+{
+        struct dm_target *ti;
+        unsigned i = 0;
+        /* Ensure that all underlying device are non-rotational. */
+        while (i < dm_table_get_num_targets(t)) {
+                ti = dm_table_get_target(t, i++);
+                if (!ti->type->iterate_devices ||
+                    !ti->type->iterate_devices(ti, device_is_nonrot, NULL))
+                        return 0;
+        }
+        return 1;
+}
 void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
                               struct queue_limits *limits)
 {
@@ -1324,6 +1392,11 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
        if (!dm_table_discard_zeroes_data(t))
                q->limits.discard_zeroes_data = 0;
+        if (dm_table_is_nonrot(t))
+                queue_flag_set_unlocked(QUEUE_FLAG_NONROT, q);
+        else
+                queue_flag_clear_unlocked(QUEUE_FLAG_NONROT, q);
        dm_table_set_integrity(t);
        /*
diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
new file mode 100644
index 000000000000..59c4f0446ffa
--- /dev/null
+++ b/drivers/md/dm-thin-metadata.c
@@ -0,0 +1,1391 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This file is released under the GPL.
+ */
+#include "dm-thin-metadata.h"
+#include "persistent-data/dm-btree.h"
+#include "persistent-data/dm-space-map.h"
+#include "persistent-data/dm-space-map-disk.h"
+#include "persistent-data/dm-transaction-manager.h"
+#include <linux/list.h>
+#include <linux/device-mapper.h>
+#include <linux/workqueue.h>
+/*--------------------------------------------------------------------------
+ * As far as the metadata goes, there is:
+ *
+ * - A superblock in block zero, taking up fewer than 512 bytes for
+ *   atomic writes.
+ *
+ * - A space map managing the metadata blocks.
+ *
+ * - A space map managing the data blocks.
+ *
+ * - A btree mapping our internal thin dev ids onto struct disk_device_details.
+ *
+ * - A hierarchical btree, with 2 levels which effectively maps (thin
+ *   dev id, virtual block) -> block_time.  Block time is a 64-bit
+ *   field holding the time in the low 24 bits, and block in the top 48
+ *   bits.
+ *
+ * BTrees consist solely of btree_nodes, that fill a block.  Some are
+ * internal nodes, as such their values are a __le64 pointing to other
+ * nodes.  Leaf nodes can store data of any reasonable size (ie. much
+ * smaller than the block size).  The nodes consist of the header,
+ * followed by an array of keys, followed by an array of values.  We have
+ * to binary search on the keys so they're all held together to help the
+ * cpu cache.
+ *
+ * Space maps have 2 btrees:
+ *
+ * - One maps a uint64_t onto a struct index_entry.  Which points to a
+ *   bitmap block, and has some details about how many free entries there
+ *   are etc.
+ *
+ * - The bitmap blocks have a header (for the checksum).  Then the rest
+ *   of the block is pairs of bits.  With the meaning being:
+ *
+ *   0 - ref count is 0
+ *   1 - ref count is 1
+ *   2 - ref count is 2
+ *   3 - ref count is higher than 2
+ *
+ * - If the count is higher than 2 then the ref count is entered in a
+ *   second btree that directly maps the block_address to a uint32_t ref
+ *   count.
+ *
+ * The space map metadata variant doesn't have a bitmaps btree.  Instead
+ * it has one single blocks worth of index_entries.  This avoids
+ * recursive issues with the bitmap btree needing to allocate space in
+ * order to insert.  With a small data block size such as 64k the
+ * metadata support data devices that are hundreds of terrabytes.
+ *
+ * The space maps allocate space linearly from front to back.  Space that
+ * is freed in a transaction is never recycled within that transaction.
+ * To try and avoid fragmenting _free_ space the allocator always goes
+ * back and fills in gaps.
+ *
+ * All metadata io is in THIN_METADATA_BLOCK_SIZE sized/aligned chunks
+ * from the block manager.
+ *--------------------------------------------------------------------------*/
+#define DM_MSG_PREFIX   "thin metadata"
+#define THIN_SUPERBLOCK_MAGIC 27022010
+#define THIN_SUPERBLOCK_LOCATION 0
+#define THIN_VERSION 1
+#define THIN_METADATA_CACHE_SIZE 64
+#define SECTOR_TO_BLOCK_SHIFT 3
+/* This should be plenty */
+#define SPACE_MAP_ROOT_SIZE 128
+/*
+ * Little endian on-disk superblock and device details.
+ */
+struct thin_disk_superblock {
+        __le32 csum;    /* Checksum of superblock except for this field. */
+        __le32 flags;
+        __le64 blocknr; /* This block number, dm_block_t. */
+        __u8 uuid[16];
+        __le64 magic;
+        __le32 version;
+        __le32 time;
+        __le64 trans_id;
+        /*
+         * Root held by userspace transactions.
+         */
+        __le64 held_root;
+        __u8 data_space_map_root[SPACE_MAP_ROOT_SIZE];
+        __u8 metadata_space_map_root[SPACE_MAP_ROOT_SIZE];
+        /*
+         * 2-level btree mapping (dev_id, (dev block, time)) -> data block
+         */
+        __le64 data_mapping_root;
+        /*
+         * Device detail root mapping dev_id -> device_details
+         */
+        __le64 device_details_root;
+        __le32 data_block_size;         /* In 512-byte sectors. */
+        __le32 metadata_block_size;     /* In 512-byte sectors. */
+        __le64 metadata_nr_blocks;
+        __le32 compat_flags;
+        __le32 compat_ro_flags;
+        __le32 incompat_flags;
+} __packed;
+struct disk_device_details {
+        __le64 mapped_blocks;
+        __le64 transaction_id;          /* When created. */
+        __le32 creation_time;
+        __le32 snapshotted_time;
+} __packed;
+struct dm_pool_metadata {
+        struct hlist_node hash;
+        struct block_device *bdev;
+        struct dm_block_manager *bm;
+        struct dm_space_map *metadata_sm;
+        struct dm_space_map *data_sm;
+        struct dm_transaction_manager *tm;
+        struct dm_transaction_manager *nb_tm;
+        /*
+         * Two-level btree.
+         * First level holds thin_dev_t.
+         * Second level holds mappings.
+         */
+        struct dm_btree_info info;
+        /*
+         * Non-blocking version of the above.
+         */
+        struct dm_btree_info nb_info;
+        /*
+         * Just the top level for deleting whole devices.
+         */
+        struct dm_btree_info tl_info;
+        /*
+         * Just the bottom level for creating new devices.
+         */
+        struct dm_btree_info bl_info;
+        /*
+         * Describes the device details btree.
+         */
+        struct dm_btree_info details_info;
+        struct rw_semaphore root_lock;
+        uint32_t time;
+        int need_commit;
+        dm_block_t root;
+        dm_block_t details_root;
+        struct list_head thin_devices;
+        uint64_t trans_id;
+        unsigned long flags;
+        sector_t data_block_size;
+};
+struct dm_thin_device {
+        struct list_head list;
+        struct dm_pool_metadata *pmd;
+        dm_thin_id id;
+        int open_count;
+        int changed;
+        uint64_t mapped_blocks;
+        uint64_t transaction_id;
+        uint32_t creation_time;
+        uint32_t snapshotted_time;
+};
+/*----------------------------------------------------------------
+ * superblock validator
+ *--------------------------------------------------------------*/
+#define SUPERBLOCK_CSUM_XOR 160774
+static void sb_prepare_for_write(struct dm_block_validator *v,
+                                 struct dm_block *b,
+                                 size_t block_size)
+{
+        struct thin_disk_superblock *disk_super = dm_block_data(b);
+        disk_super->blocknr = cpu_to_le64(dm_block_location(b));
+        disk_super->csum = cpu_to_le32(dm_bm_checksum(&disk_super->flags,
+                                                      block_size - sizeof(__le32),
+                                                      SUPERBLOCK_CSUM_XOR));
+}
+static int sb_check(struct dm_block_validator *v,
+                    struct dm_block *b,
+                    size_t block_size)
+{
+        struct thin_disk_superblock *disk_super = dm_block_data(b);
+        __le32 csum_le;
+        if (dm_block_location(b) != le64_to_cpu(disk_super->blocknr)) {
+                DMERR("sb_check failed: blocknr %llu: "
+                      "wanted %llu", le64_to_cpu(disk_super->blocknr),
+                      (unsigned long long)dm_block_location(b));
+                return -ENOTBLK;
+        }
+        if (le64_to_cpu(disk_super->magic) != THIN_SUPERBLOCK_MAGIC) {
+                DMERR("sb_check failed: magic %llu: "
+                      "wanted %llu", le64_to_cpu(disk_super->magic),
+                      (unsigned long long)THIN_SUPERBLOCK_MAGIC);
+                return -EILSEQ;
+        }
+        csum_le = cpu_to_le32(dm_bm_checksum(&disk_super->flags,
+                                             block_size - sizeof(__le32),
+                                             SUPERBLOCK_CSUM_XOR));
+        if (csum_le != disk_super->csum) {
+                DMERR("sb_check failed: csum %u: wanted %u",
+                      le32_to_cpu(csum_le), le32_to_cpu(disk_super->csum));
+                return -EILSEQ;
+        }
+        return 0;
+}
+static struct dm_block_validator sb_validator = {
+        .name = "superblock",
+        .prepare_for_write = sb_prepare_for_write,
+        .check = sb_check
+};
+/*----------------------------------------------------------------
+ * Methods for the btree value types
+ *--------------------------------------------------------------*/
+static uint64_t pack_block_time(dm_block_t b, uint32_t t)
+{
+        return (b << 24) | t;
+}
+static void unpack_block_time(uint64_t v, dm_block_t *b, uint32_t *t)
+{
+        *b = v >> 24;
+        *t = v & ((1 << 24) - 1);
+}
+static void data_block_inc(void *context, void *value_le)
+{
+        struct dm_space_map *sm = context;
+        __le64 v_le;
+        uint64_t b;
+        uint32_t t;
+        memcpy(&v_le, value_le, sizeof(v_le));
+        unpack_block_time(le64_to_cpu(v_le), &b, &t);
+        dm_sm_inc_block(sm, b);
+}
+static void data_block_dec(void *context, void *value_le)
+{
+        struct dm_space_map *sm = context;
+        __le64 v_le;
+        uint64_t b;
+        uint32_t t;
+        memcpy(&v_le, value_le, sizeof(v_le));
+        unpack_block_time(le64_to_cpu(v_le), &b, &t);
+        dm_sm_dec_block(sm, b);
+}
+static int data_block_equal(void *context, void *value1_le, void *value2_le)
+{
+        __le64 v1_le, v2_le;
+        uint64_t b1, b2;
+        uint32_t t;
+        memcpy(&v1_le, value1_le, sizeof(v1_le));
+        memcpy(&v2_le, value2_le, sizeof(v2_le));
+        unpack_block_time(le64_to_cpu(v1_le), &b1, &t);
+        unpack_block_time(le64_to_cpu(v2_le), &b2, &t);
+        return b1 == b2;
+}
+static void subtree_inc(void *context, void *value)
+{
+        struct dm_btree_info *info = context;
+        __le64 root_le;
+        uint64_t root;
+        memcpy(&root_le, value, sizeof(root_le));
+        root = le64_to_cpu(root_le);
+        dm_tm_inc(info->tm, root);
+}
+static void subtree_dec(void *context, void *value)
+{
+        struct dm_btree_info *info = context;
+        __le64 root_le;
+        uint64_t root;
+        memcpy(&root_le, value, sizeof(root_le));
+        root = le64_to_cpu(root_le);
+        if (dm_btree_del(info, root))
+                DMERR("btree delete failed\n");
+}
+static int subtree_equal(void *context, void *value1_le, void *value2_le)
+{
+        __le64 v1_le, v2_le;
+        memcpy(&v1_le, value1_le, sizeof(v1_le));
+        memcpy(&v2_le, value2_le, sizeof(v2_le));
+        return v1_le == v2_le;
+}
+/*----------------------------------------------------------------*/
+static int superblock_all_zeroes(struct dm_block_manager *bm, int *result)
+{
+        int r;
+        unsigned i;
+        struct dm_block *b;
+        __le64 *data_le, zero = cpu_to_le64(0);
+        unsigned block_size = dm_bm_block_size(bm) / sizeof(__le64);
+        /*
+         * We can't use a validator here - it may be all zeroes.
+         */
+        r = dm_bm_read_lock(bm, THIN_SUPERBLOCK_LOCATION, NULL, &b);
+        if (r)
+                return r;
+        data_le = dm_block_data(b);
+        *result = 1;
+        for (i = 0; i < block_size; i++) {
+                if (data_le[i] != zero) {
+                        *result = 0;
+                        break;
+                }
+        }
+        return dm_bm_unlock(b);
+}
+static int init_pmd(struct dm_pool_metadata *pmd,
+                    struct dm_block_manager *bm,
+                    dm_block_t nr_blocks, int create)
+{
+        int r;
+        struct dm_space_map *sm, *data_sm;
+        struct dm_transaction_manager *tm;
+        struct dm_block *sblock;
+        if (create) {
+                r = dm_tm_create_with_sm(bm, THIN_SUPERBLOCK_LOCATION,
+                                         &sb_validator, &tm, &sm, &sblock);
+                if (r < 0) {
+                        DMERR("tm_create_with_sm failed");
+                        return r;
+                }
+                data_sm = dm_sm_disk_create(tm, nr_blocks);
+                if (IS_ERR(data_sm)) {
+                        DMERR("sm_disk_create failed");
+                        r = PTR_ERR(data_sm);
+                        goto bad;
+                }
+        } else {
+                struct thin_disk_superblock *disk_super = NULL;
+                size_t space_map_root_offset =
+                        offsetof(struct thin_disk_superblock, metadata_space_map_root);
+                r = dm_tm_open_with_sm(bm, THIN_SUPERBLOCK_LOCATION,
+                                       &sb_validator, space_map_root_offset,
+                                       SPACE_MAP_ROOT_SIZE, &tm, &sm, &sblock);
+                if (r < 0) {
+                        DMERR("tm_open_with_sm failed");
+                        return r;
+                }
+                disk_super = dm_block_data(sblock);
+                data_sm = dm_sm_disk_open(tm, disk_super->data_space_map_root,
+                                          sizeof(disk_super->data_space_map_root));
+                if (IS_ERR(data_sm)) {
+                        DMERR("sm_disk_open failed");
+                        r = PTR_ERR(data_sm);
+                        goto bad;
+                }
+        }
+        r = dm_tm_unlock(tm, sblock);
+        if (r < 0) {
+                DMERR("couldn't unlock superblock");
+                goto bad_data_sm;
+        }
+        pmd->bm = bm;
+        pmd->metadata_sm = sm;
+        pmd->data_sm = data_sm;
+        pmd->tm = tm;
+        pmd->nb_tm = dm_tm_create_non_blocking_clone(tm);
+        if (!pmd->nb_tm) {
+                DMERR("could not create clone tm");
+                r = -ENOMEM;
+                goto bad_data_sm;
+        }
+        pmd->info.tm = tm;
+        pmd->info.levels = 2;
+        pmd->info.value_type.context = pmd->data_sm;
+        pmd->info.value_type.size = sizeof(__le64);
+        pmd->info.value_type.inc = data_block_inc;
+        pmd->info.value_type.dec = data_block_dec;
+        pmd->info.value_type.equal = data_block_equal;
+        memcpy(&pmd->nb_info, &pmd->info, sizeof(pmd->nb_info));
+        pmd->nb_info.tm = pmd->nb_tm;
+        pmd->tl_info.tm = tm;
+        pmd->tl_info.levels = 1;
+        pmd->tl_info.value_type.context = &pmd->info;
+        pmd->tl_info.value_type.size = sizeof(__le64);
+        pmd->tl_info.value_type.inc = subtree_inc;
+        pmd->tl_info.value_type.dec = subtree_dec;
+        pmd->tl_info.value_type.equal = subtree_equal;
+        pmd->bl_info.tm = tm;
+        pmd->bl_info.levels = 1;
+        pmd->bl_info.value_type.context = pmd->data_sm;
+        pmd->bl_info.value_type.size = sizeof(__le64);
+        pmd->bl_info.value_type.inc = data_block_inc;
+        pmd->bl_info.value_type.dec = data_block_dec;
+        pmd->bl_info.value_type.equal = data_block_equal;
+        pmd->details_info.tm = tm;
+        pmd->details_info.levels = 1;
+        pmd->details_info.value_type.context = NULL;
+        pmd->details_info.value_type.size = sizeof(struct disk_device_details);
+        pmd->details_info.value_type.inc = NULL;
+        pmd->details_info.value_type.dec = NULL;
+        pmd->details_info.value_type.equal = NULL;
+        pmd->root = 0;
+        init_rwsem(&pmd->root_lock);
+        pmd->time = 0;
+        pmd->need_commit = 0;
+        pmd->details_root = 0;
+        pmd->trans_id = 0;
+        pmd->flags = 0;
+        INIT_LIST_HEAD(&pmd->thin_devices);
+        return 0;
+bad_data_sm:
+        dm_sm_destroy(data_sm);
+bad:
+        dm_tm_destroy(tm);
+        dm_sm_destroy(sm);
+        return r;
+}
+static int __begin_transaction(struct dm_pool_metadata *pmd)
+{
+        int r;
+        u32 features;
+        struct thin_disk_superblock *disk_super;
+        struct dm_block *sblock;
+        /*
+         * __maybe_commit_transaction() resets these
+         */
+        WARN_ON(pmd->need_commit);
+        /*
+         * We re-read the superblock every time.  Shouldn't need to do this
+         * really.
+         */
+        r = dm_bm_read_lock(pmd->bm, THIN_SUPERBLOCK_LOCATION,
+                            &sb_validator, &sblock);
+        if (r)
+                return r;
+        disk_super = dm_block_data(sblock);
+        pmd->time = le32_to_cpu(disk_super->time);
+        pmd->root = le64_to_cpu(disk_super->data_mapping_root);
+        pmd->details_root = le64_to_cpu(disk_super->device_details_root);
+        pmd->trans_id = le64_to_cpu(disk_super->trans_id);
+        pmd->flags = le32_to_cpu(disk_super->flags);
+        pmd->data_block_size = le32_to_cpu(disk_super->data_block_size);
+        features = le32_to_cpu(disk_super->incompat_flags) & ~THIN_FEATURE_INCOMPAT_SUPP;
+        if (features) {
+                DMERR("could not access metadata due to "
+                      "unsupported optional features (%lx).",
+                      (unsigned long)features);
+                r = -EINVAL;
+                goto out;
+        }
+        /*
+         * Check for read-only metadata to skip the following RDWR checks.
+         */
+        if (get_disk_ro(pmd->bdev->bd_disk))
+                goto out;
+        features = le32_to_cpu(disk_super->compat_ro_flags) & ~THIN_FEATURE_COMPAT_RO_SUPP;
+        if (features) {
+                DMERR("could not access metadata RDWR due to "
+                      "unsupported optional features (%lx).",
+                      (unsigned long)features);
+                r = -EINVAL;
+        }
+out:
+        dm_bm_unlock(sblock);
+        return r;
+}
+static int __write_changed_details(struct dm_pool_metadata *pmd)
+{
+        int r;
+        struct dm_thin_device *td, *tmp;
+        struct disk_device_details details;
+        uint64_t key;
+        list_for_each_entry_safe(td, tmp, &pmd->thin_devices, list) {
+                if (!td->changed)
+                        continue;
+                key = td->id;
+                details.mapped_blocks = cpu_to_le64(td->mapped_blocks);
+                details.transaction_id = cpu_to_le64(td->transaction_id);
+                details.creation_time = cpu_to_le32(td->creation_time);
+                details.snapshotted_time = cpu_to_le32(td->snapshotted_time);
+                __dm_bless_for_disk(&details);
+                r = dm_btree_insert(&pmd->details_info, pmd->details_root,
+                                    &key, &details, &pmd->details_root);
+                if (r)
+                        return r;
+                if (td->open_count)
+                        td->changed = 0;
+                else {
+                        list_del(&td->list);
+                        kfree(td);
+                }
+                pmd->need_commit = 1;
+        }
+        return 0;
+}
+static int __commit_transaction(struct dm_pool_metadata *pmd)
+{
+        /*
+         * FIXME: Associated pool should be made read-only on failure.
+         */
+        int r;
+        size_t metadata_len, data_len;
+        struct thin_disk_superblock *disk_super;
+        struct dm_block *sblock;
+        /*
+         * We need to know if the thin_disk_superblock exceeds a 512-byte sector.
+         */
+        BUILD_BUG_ON(sizeof(struct thin_disk_superblock) > 512);
+        r = __write_changed_details(pmd);
+        if (r < 0)
+                goto out;
+        if (!pmd->need_commit)
+                goto out;
+        r = dm_sm_commit(pmd->data_sm);
+        if (r < 0)
+                goto out;
+        r = dm_tm_pre_commit(pmd->tm);
+        if (r < 0)
+                goto out;
+        r = dm_sm_root_size(pmd->metadata_sm, &metadata_len);
+        if (r < 0)
+                goto out;
+        r = dm_sm_root_size(pmd->metadata_sm, &data_len);
+        if (r < 0)
+                goto out;
+        r = dm_bm_write_lock(pmd->bm, THIN_SUPERBLOCK_LOCATION,
+                             &sb_validator, &sblock);
+        if (r)
+                goto out;
+        disk_super = dm_block_data(sblock);
+        disk_super->time = cpu_to_le32(pmd->time);
+        disk_super->data_mapping_root = cpu_to_le64(pmd->root);
+        disk_super->device_details_root = cpu_to_le64(pmd->details_root);
+        disk_super->trans_id = cpu_to_le64(pmd->trans_id);
+        disk_super->flags = cpu_to_le32(pmd->flags);
+        r = dm_sm_copy_root(pmd->metadata_sm, &disk_super->metadata_space_map_root,
+                            metadata_len);
+        if (r < 0)
+                goto out_locked;
+        r = dm_sm_copy_root(pmd->data_sm, &disk_super->data_space_map_root,
+                            data_len);
+        if (r < 0)
+                goto out_locked;
+        r = dm_tm_commit(pmd->tm, sblock);
+        if (!r)
+                pmd->need_commit = 0;
+out:
+        return r;
+out_locked:
+        dm_bm_unlock(sblock);
+        return r;
+}
+struct dm_pool_metadata *dm_pool_metadata_open(struct block_device *bdev,
+                                               sector_t data_block_size)
+{
+        int r;
+        struct thin_disk_superblock *disk_super;
+        struct dm_pool_metadata *pmd;
+        sector_t bdev_size = i_size_read(bdev->bd_inode) >> SECTOR_SHIFT;
+        struct dm_block_manager *bm;
+        int create;
+        struct dm_block *sblock;
+        pmd = kmalloc(sizeof(*pmd), GFP_KERNEL);
+        if (!pmd) {
+                DMERR("could not allocate metadata struct");
+                return ERR_PTR(-ENOMEM);
+        }
+        /*
+         * Max hex locks:
+         *  3 for btree insert +
+         *  2 for btree lookup used within space map
+         */
+        bm = dm_block_manager_create(bdev, THIN_METADATA_BLOCK_SIZE,
+                                     THIN_METADATA_CACHE_SIZE, 5);
+        if (!bm) {
+                DMERR("could not create block manager");
+                kfree(pmd);
+                return ERR_PTR(-ENOMEM);
+        }
+        r = superblock_all_zeroes(bm, &create);
+        if (r) {
+                dm_block_manager_destroy(bm);
+                kfree(pmd);
+                return ERR_PTR(r);
+        }
+        r = init_pmd(pmd, bm, 0, create);
+        if (r) {
+                dm_block_manager_destroy(bm);
+                kfree(pmd);
+                return ERR_PTR(r);
+        }
+        pmd->bdev = bdev;
+        if (!create) {
+                r = __begin_transaction(pmd);
+                if (r < 0)
+                        goto bad;
+                return pmd;
+        }
+        /*
+         * Create.
+         */
+        r = dm_bm_write_lock(pmd->bm, THIN_SUPERBLOCK_LOCATION,
+                             &sb_validator, &sblock);
+        if (r)
+                goto bad;
+        disk_super = dm_block_data(sblock);
+        disk_super->magic = cpu_to_le64(THIN_SUPERBLOCK_MAGIC);
+        disk_super->version = cpu_to_le32(THIN_VERSION);
+        disk_super->time = 0;
+        disk_super->metadata_block_size = cpu_to_le32(THIN_METADATA_BLOCK_SIZE >> SECTOR_SHIFT);
+        disk_super->metadata_nr_blocks = cpu_to_le64(bdev_size >> SECTOR_TO_BLOCK_SHIFT);
+        disk_super->data_block_size = cpu_to_le32(data_block_size);
+        r = dm_bm_unlock(sblock);
+        if (r < 0)
+                goto bad;
+        r = dm_btree_empty(&pmd->info, &pmd->root);
+        if (r < 0)
+                goto bad;
+        r = dm_btree_empty(&pmd->details_info, &pmd->details_root);
+        if (r < 0) {
+                DMERR("couldn't create devices root");
+                goto bad;
+        }
+        pmd->flags = 0;
+        pmd->need_commit = 1;
+        r = dm_pool_commit_metadata(pmd);
+        if (r < 0) {
+                DMERR("%s: dm_pool_commit_metadata() failed, error = %d",
+                      __func__, r);
+                goto bad;
+        }
+        return pmd;
+bad:
+        if (dm_pool_metadata_close(pmd) < 0)
+                DMWARN("%s: dm_pool_metadata_close() failed.", __func__);
+        return ERR_PTR(r);
+}
+int dm_pool_metadata_close(struct dm_pool_metadata *pmd)
+{
+        int r;
+        unsigned open_devices = 0;
+        struct dm_thin_device *td, *tmp;
+        down_read(&pmd->root_lock);
+        list_for_each_entry_safe(td, tmp, &pmd->thin_devices, list) {
+                if (td->open_count)
+                        open_devices++;
+                else {
+                        list_del(&td->list);
+                        kfree(td);
+                }
+        }
+        up_read(&pmd->root_lock);
+        if (open_devices) {
+                DMERR("attempt to close pmd when %u device(s) are still open",
+                       open_devices);
+                return -EBUSY;
+        }
+        r = __commit_transaction(pmd);
+        if (r < 0)
+                DMWARN("%s: __commit_transaction() failed, error = %d",
+                       __func__, r);
+        dm_tm_destroy(pmd->tm);
+        dm_tm_destroy(pmd->nb_tm);
+        dm_block_manager_destroy(pmd->bm);
+        dm_sm_destroy(pmd->metadata_sm);
+        dm_sm_destroy(pmd->data_sm);
+        kfree(pmd);
+        return 0;
+}
+static int __open_device(struct dm_pool_metadata *pmd,
+                         dm_thin_id dev, int create,
+                         struct dm_thin_device **td)
+{
+        int r, changed = 0;
+        struct dm_thin_device *td2;
+        uint64_t key = dev;
+        struct disk_device_details details_le;
+        /*
+         * Check the device isn't already open.
+         */
+        list_for_each_entry(td2, &pmd->thin_devices, list)
+                if (td2->id == dev) {
+                        td2->open_count++;
+                        *td = td2;
+                        return 0;
+                }
+        /*
+         * Check the device exists.
+         */
+        r = dm_btree_lookup(&pmd->details_info, pmd->details_root,
+                            &key, &details_le);
+        if (r) {
+                if (r != -ENODATA || !create)
+                        return r;
+                changed = 1;
+                details_le.mapped_blocks = 0;
+                details_le.transaction_id = cpu_to_le64(pmd->trans_id);
+                details_le.creation_time = cpu_to_le32(pmd->time);
+                details_le.snapshotted_time = cpu_to_le32(pmd->time);
+        }
+        *td = kmalloc(sizeof(**td), GFP_NOIO);
+        if (!*td)
+                return -ENOMEM;
+        (*td)->pmd = pmd;
+        (*td)->id = dev;
+        (*td)->open_count = 1;
+        (*td)->changed = changed;
+        (*td)->mapped_blocks = le64_to_cpu(details_le.mapped_blocks);
+        (*td)->transaction_id = le64_to_cpu(details_le.transaction_id);
+        (*td)->creation_time = le32_to_cpu(details_le.creation_time);
+        (*td)->snapshotted_time = le32_to_cpu(details_le.snapshotted_time);
+        list_add(&(*td)->list, &pmd->thin_devices);
+        return 0;
+}
+static void __close_device(struct dm_thin_device *td)
+{
+        --td->open_count;
+}
+static int __create_thin(struct dm_pool_metadata *pmd,
+                         dm_thin_id dev)
+{
+        int r;
+        dm_block_t dev_root;
+        uint64_t key = dev;
+        struct disk_device_details details_le;
+        struct dm_thin_device *td;
+        __le64 value;
+        r = dm_btree_lookup(&pmd->details_info, pmd->details_root,
+                            &key, &details_le);
+        if (!r)
+                return -EEXIST;
+        /*
+         * Create an empty btree for the mappings.
+         */
+        r = dm_btree_empty(&pmd->bl_info, &dev_root);
+        if (r)
+                return r;
+        /*
+         * Insert it into the main mapping tree.
+         */
+        value = cpu_to_le64(dev_root);
+        __dm_bless_for_disk(&value);
+        r = dm_btree_insert(&pmd->tl_info, pmd->root, &key, &value, &pmd->root);
+        if (r) {
+                dm_btree_del(&pmd->bl_info, dev_root);
+                return r;
+        }
+        r = __open_device(pmd, dev, 1, &td);
+        if (r) {
+                __close_device(td);
+                dm_btree_remove(&pmd->tl_info, pmd->root, &key, &pmd->root);
+                dm_btree_del(&pmd->bl_info, dev_root);
+                return r;
+        }
+        td->changed = 1;
+        __close_device(td);
+        return r;
+}
+int dm_pool_create_thin(struct dm_pool_metadata *pmd, dm_thin_id dev)
+{
+        int r;
+        down_write(&pmd->root_lock);
+        r = __create_thin(pmd, dev);
+        up_write(&pmd->root_lock);
+        return r;
+}
+static int __set_snapshot_details(struct dm_pool_metadata *pmd,
+                                  struct dm_thin_device *snap,
+                                  dm_thin_id origin, uint32_t time)
+{
+        int r;
+        struct dm_thin_device *td;
+        r = __open_device(pmd, origin, 0, &td);
+        if (r)
+                return r;
+        td->changed = 1;
+        td->snapshotted_time = time;
+        snap->mapped_blocks = td->mapped_blocks;
+        snap->snapshotted_time = time;
+        __close_device(td);
+        return 0;
+}
+static int __create_snap(struct dm_pool_metadata *pmd,
+                         dm_thin_id dev, dm_thin_id origin)
+{
+        int r;
+        dm_block_t origin_root;
+        uint64_t key = origin, dev_key = dev;
+        struct dm_thin_device *td;
+        struct disk_device_details details_le;
+        __le64 value;
+        /* check this device is unused */
+        r = dm_btree_lookup(&pmd->details_info, pmd->details_root,
+                            &dev_key, &details_le);
+        if (!r)
+                return -EEXIST;
+        /* find the mapping tree for the origin */
+        r = dm_btree_lookup(&pmd->tl_info, pmd->root, &key, &value);
+        if (r)
+                return r;
+        origin_root = le64_to_cpu(value);
+        /* clone the origin, an inc will do */
+        dm_tm_inc(pmd->tm, origin_root);
+        /* insert into the main mapping tree */
+        value = cpu_to_le64(origin_root);
+        __dm_bless_for_disk(&value);
+        key = dev;
+        r = dm_btree_insert(&pmd->tl_info, pmd->root, &key, &value, &pmd->root);
+        if (r) {
+                dm_tm_dec(pmd->tm, origin_root);
+                return r;
+        }
+        pmd->time++;
+        r = __open_device(pmd, dev, 1, &td);
+        if (r)
+                goto bad;
+        r = __set_snapshot_details(pmd, td, origin, pmd->time);
+        if (r)
+                goto bad;
+        __close_device(td);
+        return 0;
+bad:
+        __close_device(td);
+        dm_btree_remove(&pmd->tl_info, pmd->root, &key, &pmd->root);
+        dm_btree_remove(&pmd->details_info, pmd->details_root,
+                        &key, &pmd->details_root);
+        return r;
+}
+int dm_pool_create_snap(struct dm_pool_metadata *pmd,
+                                 dm_thin_id dev,
+                                 dm_thin_id origin)
+{
+        int r;
+        down_write(&pmd->root_lock);
+        r = __create_snap(pmd, dev, origin);
+        up_write(&pmd->root_lock);
+        return r;
+}
+static int __delete_device(struct dm_pool_metadata *pmd, dm_thin_id dev)
+{
+        int r;
+        uint64_t key = dev;
+        struct dm_thin_device *td;
+        /* TODO: failure should mark the transaction invalid */
+        r = __open_device(pmd, dev, 0, &td);
+        if (r)
+                return r;
+        if (td->open_count > 1) {
+                __close_device(td);
+                return -EBUSY;
+        }
+        list_del(&td->list);
+        kfree(td);
+        r = dm_btree_remove(&pmd->details_info, pmd->details_root,
+                            &key, &pmd->details_root);
+        if (r)
+                return r;
+        r = dm_btree_remove(&pmd->tl_info, pmd->root, &key, &pmd->root);
+        if (r)
+                return r;
+        pmd->need_commit = 1;
+        return 0;
+}
+int dm_pool_delete_thin_device(struct dm_pool_metadata *pmd,
+                               dm_thin_id dev)
+{
+        int r;
+        down_write(&pmd->root_lock);
+        r = __delete_device(pmd, dev);
+        up_write(&pmd->root_lock);
+        return r;
+}
+int dm_pool_set_metadata_transaction_id(struct dm_pool_metadata *pmd,
+                                        uint64_t current_id,
+                                        uint64_t new_id)
+{
+        down_write(&pmd->root_lock);
+        if (pmd->trans_id != current_id) {
+                up_write(&pmd->root_lock);
+                DMERR("mismatched transaction id");
+                return -EINVAL;
+        }
+        pmd->trans_id = new_id;
+        pmd->need_commit = 1;
+        up_write(&pmd->root_lock);
+        return 0;
+}
+int dm_pool_get_metadata_transaction_id(struct dm_pool_metadata *pmd,
+                                        uint64_t *result)
+{
+        down_read(&pmd->root_lock);
+        *result = pmd->trans_id;
+        up_read(&pmd->root_lock);
+        return 0;
+}
+static int __get_held_metadata_root(struct dm_pool_metadata *pmd,
+                                    dm_block_t *result)
+{
+        int r;
+        struct thin_disk_superblock *disk_super;
+        struct dm_block *sblock;
+        r = dm_bm_write_lock(pmd->bm, THIN_SUPERBLOCK_LOCATION,
+                             &sb_validator, &sblock);
+        if (r)
+                return r;
+        disk_super = dm_block_data(sblock);
+        *result = le64_to_cpu(disk_super->held_root);
+        return dm_bm_unlock(sblock);
+}
+int dm_pool_get_held_metadata_root(struct dm_pool_metadata *pmd,
+                                   dm_block_t *result)
+{
+        int r;
+        down_read(&pmd->root_lock);
+        r = __get_held_metadata_root(pmd, result);
+        up_read(&pmd->root_lock);
+        return r;
+}
+int dm_pool_open_thin_device(struct dm_pool_metadata *pmd, dm_thin_id dev,
+                             struct dm_thin_device **td)
+{
+        int r;
+        down_write(&pmd->root_lock);
+        r = __open_device(pmd, dev, 0, td);
+        up_write(&pmd->root_lock);
+        return r;
+}
+int dm_pool_close_thin_device(struct dm_thin_device *td)
+{
+        down_write(&td->pmd->root_lock);
+        __close_device(td);
+        up_write(&td->pmd->root_lock);
+        return 0;
+}
+dm_thin_id dm_thin_dev_id(struct dm_thin_device *td)
+{
+        return td->id;
+}
+static int __snapshotted_since(struct dm_thin_device *td, uint32_t time)
+{
+        return td->snapshotted_time > time;
+}
+int dm_thin_find_block(struct dm_thin_device *td, dm_block_t block,
+                       int can_block, struct dm_thin_lookup_result *result)
+{
+        int r;
+        uint64_t block_time = 0;
+        __le64 value;
+        struct dm_pool_metadata *pmd = td->pmd;
+        dm_block_t keys[2] = { td->id, block };
+        if (can_block) {
+                down_read(&pmd->root_lock);
+                r = dm_btree_lookup(&pmd->info, pmd->root, keys, &value);
+                if (!r)
+                        block_time = le64_to_cpu(value);
+                up_read(&pmd->root_lock);
+        } else if (down_read_trylock(&pmd->root_lock)) {
+                r = dm_btree_lookup(&pmd->nb_info, pmd->root, keys, &value);
+                if (!r)
+                        block_time = le64_to_cpu(value);
+                up_read(&pmd->root_lock);
+        } else
+                return -EWOULDBLOCK;
+        if (!r) {
+                dm_block_t exception_block;
+                uint32_t exception_time;
+                unpack_block_time(block_time, &exception_block,
+                                  &exception_time);
+                result->block = exception_block;
+                result->shared = __snapshotted_since(td, exception_time);
+        }
+        return r;
+}
+static int __insert(struct dm_thin_device *td, dm_block_t block,
+                    dm_block_t data_block)
+{
+        int r, inserted;
+        __le64 value;
+        struct dm_pool_metadata *pmd = td->pmd;
+        dm_block_t keys[2] = { td->id, block };
+        pmd->need_commit = 1;
+        value = cpu_to_le64(pack_block_time(data_block, pmd->time));
+        __dm_bless_for_disk(&value);
+        r = dm_btree_insert_notify(&pmd->info, pmd->root, keys, &value,
+                                   &pmd->root, &inserted);
+        if (r)
+                return r;
+        if (inserted) {
+                td->mapped_blocks++;
+                td->changed = 1;
+        }
+        return 0;
+}
+int dm_thin_insert_block(struct dm_thin_device *td, dm_block_t block,
+                         dm_block_t data_block)
+{
+        int r;
+        down_write(&td->pmd->root_lock);
+        r = __insert(td, block, data_block);
+        up_write(&td->pmd->root_lock);
+        return r;
+}
+static int __remove(struct dm_thin_device *td, dm_block_t block)
+{
+        int r;
+        struct dm_pool_metadata *pmd = td->pmd;
+        dm_block_t keys[2] = { td->id, block };
+        r = dm_btree_remove(&pmd->info, pmd->root, keys, &pmd->root);
+        if (r)
+                return r;
+        pmd->need_commit = 1;
+        return 0;
+}
+int dm_thin_remove_block(struct dm_thin_device *td, dm_block_t block)
+{
+        int r;
+        down_write(&td->pmd->root_lock);
+        r = __remove(td, block);
+        up_write(&td->pmd->root_lock);
+        return r;
+}
+int dm_pool_alloc_data_block(struct dm_pool_metadata *pmd, dm_block_t *result)
+{
+        int r;
+        down_write(&pmd->root_lock);
+        r = dm_sm_new_block(pmd->data_sm, result);
+        pmd->need_commit = 1;
+        up_write(&pmd->root_lock);
+        return r;
+}
+int dm_pool_commit_metadata(struct dm_pool_metadata *pmd)
+{
+        int r;
+        down_write(&pmd->root_lock);
+        r = __commit_transaction(pmd);
+        if (r <= 0)
+                goto out;
+        /*
+         * Open the next transaction.
+         */
+        r = __begin_transaction(pmd);
+out:
+        up_write(&pmd->root_lock);
+        return r;
+}
+int dm_pool_get_free_block_count(struct dm_pool_metadata *pmd, dm_block_t *result)
+{
+        int r;
+        down_read(&pmd->root_lock);
+        r = dm_sm_get_nr_free(pmd->data_sm, result);
+        up_read(&pmd->root_lock);
+        return r;
+}
+int dm_pool_get_free_metadata_block_count(struct dm_pool_metadata *pmd,
+                                          dm_block_t *result)
+{
+        int r;
+        down_read(&pmd->root_lock);
+        r = dm_sm_get_nr_free(pmd->metadata_sm, result);
+        up_read(&pmd->root_lock);
+        return r;
+}
+int dm_pool_get_metadata_dev_size(struct dm_pool_metadata *pmd,
+                                  dm_block_t *result)
+{
+        int r;
+        down_read(&pmd->root_lock);
+        r = dm_sm_get_nr_blocks(pmd->metadata_sm, result);
+        up_read(&pmd->root_lock);
+        return r;
+}
+int dm_pool_get_data_block_size(struct dm_pool_metadata *pmd, sector_t *result)
+{
+        down_read(&pmd->root_lock);
+        *result = pmd->data_block_size;
+        up_read(&pmd->root_lock);
+        return 0;
+}
+int dm_pool_get_data_dev_size(struct dm_pool_metadata *pmd, dm_block_t *result)
+{
+        int r;
+        down_read(&pmd->root_lock);
+        r = dm_sm_get_nr_blocks(pmd->data_sm, result);
+        up_read(&pmd->root_lock);
+        return r;
+}
+int dm_thin_get_mapped_count(struct dm_thin_device *td, dm_block_t *result)
+{
+        struct dm_pool_metadata *pmd = td->pmd;
+        down_read(&pmd->root_lock);
+        *result = td->mapped_blocks;
+        up_read(&pmd->root_lock);
+        return 0;
+}
+static int __highest_block(struct dm_thin_device *td, dm_block_t *result)
+{
+        int r;
+        __le64 value_le;
+        dm_block_t thin_root;
+        struct dm_pool_metadata *pmd = td->pmd;
+        r = dm_btree_lookup(&pmd->tl_info, pmd->root, &td->id, &value_le);
+        if (r)
+                return r;
+        thin_root = le64_to_cpu(value_le);
+        return dm_btree_find_highest_key(&pmd->bl_info, thin_root, result);
+}
+int dm_thin_get_highest_mapped_block(struct dm_thin_device *td,
+                                     dm_block_t *result)
+{
+        int r;
+        struct dm_pool_metadata *pmd = td->pmd;
+        down_read(&pmd->root_lock);
+        r = __highest_block(td, result);
+        up_read(&pmd->root_lock);
+        return r;
+}
+static int __resize_data_dev(struct dm_pool_metadata *pmd, dm_block_t new_count)
+{
+        int r;
+        dm_block_t old_count;
+        r = dm_sm_get_nr_blocks(pmd->data_sm, &old_count);
+        if (r)
+                return r;
+        if (new_count == old_count)
+                return 0;
+        if (new_count < old_count) {
+                DMERR("cannot reduce size of data device");
+                return -EINVAL;
+        }
+        r = dm_sm_extend(pmd->data_sm, new_count - old_count);
+        if (!r)
+                pmd->need_commit = 1;
+        return r;
+}
+int dm_pool_resize_data_dev(struct dm_pool_metadata *pmd, dm_block_t new_count)
+{
+        int r;
+        down_write(&pmd->root_lock);
+        r = __resize_data_dev(pmd, new_count);
+        up_write(&pmd->root_lock);
+        return r;
+}
diff --git a/drivers/md/dm-thin-metadata.h b/drivers/md/dm-thin-metadata.h
new file mode 100644
index 000000000000..859c16896877
--- /dev/null
+++ b/drivers/md/dm-thin-metadata.h
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2010-2011 Red Hat, Inc.
+ *
+ * This file is released under the GPL.
+ */
+#ifndef DM_THIN_METADATA_H
+#define DM_THIN_METADATA_H
+#include "persistent-data/dm-block-manager.h"
+#define THIN_METADATA_BLOCK_SIZE 4096
+/*----------------------------------------------------------------*/
+struct dm_pool_metadata;
+struct dm_thin_device;
+/*
+ * Device identifier
+ */
+typedef uint64_t dm_thin_id;
+/*
+ * Reopens or creates a new, empty metadata volume.
+ */
+struct dm_pool_metadata *dm_pool_metadata_open(struct block_device *bdev,
+                                               sector_t data_block_size);
+int dm_pool_metadata_close(struct dm_pool_metadata *pmd);
+/*
+ * Compat feature flags.  Any incompat flags beyond the ones
+ * specified below will prevent use of the thin metadata.
+ */
+#define THIN_FEATURE_COMPAT_SUPP          0UL
+#define THIN_FEATURE_COMPAT_RO_SUPP       0UL
+#define THIN_FEATURE_INCOMPAT_SUPP        0UL
+/*
+ * Device creation/deletion.
+ */
+int dm_pool_create_thin(struct dm_pool_metadata *pmd, dm_thin_id dev);
+/*
+ * An internal snapshot.
+ *
+ * You can only snapshot a quiesced origin i.e. one that is either
+ * suspended or not instanced at all.
+ */
+int dm_pool_create_snap(struct dm_pool_metadata *pmd, dm_thin_id dev,
+                        dm_thin_id origin);
+/*
+ * Deletes a virtual device from the metadata.  It _is_ safe to call this
+ * when that device is open.  Operations on that device will just start
+ * failing.  You still need to call close() on the device.
+ */
+int dm_pool_delete_thin_device(struct dm_pool_metadata *pmd,
+                               dm_thin_id dev);
+/*
+ * Commits _all_ metadata changes: device creation, deletion, mapping
+ * updates.
+ */
+int dm_pool_commit_metadata(struct dm_pool_metadata *pmd);
+/*
+ * Set/get userspace transaction id.
+ */
+int dm_pool_set_metadata_transaction_id(struct dm_pool_metadata *pmd,
+                                        uint64_t current_id,
+                                        uint64_t new_id);
+int dm_pool_get_metadata_transaction_id(struct dm_pool_metadata *pmd,
+                                        uint64_t *result);
+/*
+ * Hold/get root for userspace transaction.
+ */
+int dm_pool_hold_metadata_root(struct dm_pool_metadata *pmd);
+int dm_pool_get_held_metadata_root(struct dm_pool_metadata *pmd,
+                                   dm_block_t *result);
+/*
+ * Actions on a single virtual device.
+ */
+/*
+ * Opening the same device more than once will fail with -EBUSY.
+ */
+int dm_pool_open_thin_device(struct dm_pool_metadata *pmd, dm_thin_id dev,
+                             struct dm_thin_device **td);
+int dm_pool_close_thin_device(struct dm_thin_device *td);
+dm_thin_id dm_thin_dev_id(struct dm_thin_device *td);
+struct dm_thin_lookup_result {
+        dm_block_t block;
+        int shared;
+};
+/*
+ * Returns:
+ *   -EWOULDBLOCK iff @can_block is set and would block.
+ *   -ENODATA iff that mapping is not present.
+ *   0 success
+ */
+int dm_thin_find_block(struct dm_thin_device *td, dm_block_t block,
+                       int can_block, struct dm_thin_lookup_result *result);
+/*
+ * Obtain an unused block.
+ */
+int dm_pool_alloc_data_block(struct dm_pool_metadata *pmd, dm_block_t *result);
+/*
+ * Insert or remove block.
+ */
+int dm_thin_insert_block(struct dm_thin_device *td, dm_block_t block,
+                         dm_block_t data_block);
+int dm_thin_remove_block(struct dm_thin_device *td, dm_block_t block);
+/*
+ * Queries.
+ */
+int dm_thin_get_highest_mapped_block(struct dm_thin_device *td,
+                                     dm_block_t *highest_mapped);
+int dm_thin_get_mapped_count(struct dm_thin_device *td, dm_block_t *result);
+int dm_pool_get_free_block_count(struct dm_pool_metadata *pmd,
+                                 dm_block_t *result);
+int dm_pool_get_free_metadata_block_count(struct dm_pool_metadata *pmd,
+                                          dm_block_t *result);
+int dm_pool_get_metadata_dev_size(struct dm_pool_metadata *pmd,
+                                  dm_block_t *result);
+int dm_pool_get_data_block_size(struct dm_pool_metadata *pmd, sector_t *result);
+int dm_pool_get_data_dev_size(struct dm_pool_metadata *pmd, dm_block_t *result);
+/*
+ * Returns -ENOSPC if the new size is too small and already allocated
+ * blocks would be lost.
+ */
+int dm_pool_resize_data_dev(struct dm_pool_metadata *pmd, dm_block_t new_size);
+/*----------------------------------------------------------------*/
+#endif
diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c
new file mode 100644
index 000000000000..c3087575fef0
--- /dev/null
+++ b/drivers/md/dm-thin.c
@@ -0,0 +1,2428 @@
+/*
+ * Copyright (C) 2011 Red Hat UK.
+ *
+ * This file is released under the GPL.
+ */
+#include "dm-thin-metadata.h"
+#include <linux/device-mapper.h>
+#include <linux/dm-io.h>
+#include <linux/dm-kcopyd.h>
+#include <linux/list.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#define DM_MSG_PREFIX   "thin"
+/*
+ * Tunable constants
+ */
+#define ENDIO_HOOK_POOL_SIZE 10240
+#define DEFERRED_SET_SIZE 64
+#define MAPPING_POOL_SIZE 1024
+#define PRISON_CELLS 1024
+/*
+ * The block size of the device holding pool data must be
+ * between 64KB and 1GB.
+ */
+#define DATA_DEV_BLOCK_SIZE_MIN_SECTORS (64 * 1024 >> SECTOR_SHIFT)
+#define DATA_DEV_BLOCK_SIZE_MAX_SECTORS (1024 * 1024 * 1024 >> SECTOR_SHIFT)
+/*
+ * The metadata device is currently limited in size.  The limitation is
+ * checked lower down in dm-space-map-metadata, but we also check it here
+ * so we can fail early.
+ *
+ * We have one block of index, which can hold 255 index entries.  Each
+ * index entry contains allocation info about 16k metadata blocks.
+ */
+#define METADATA_DEV_MAX_SECTORS (255 * (1 << 14) * (THIN_METADATA_BLOCK_SIZE / (1 << SECTOR_SHIFT)))
+/*
+ * Device id is restricted to 24 bits.
+ */
+#define MAX_DEV_ID ((1 << 24) - 1)
+/*
+ * How do we handle breaking sharing of data blocks?
+ * =================================================
+ *
+ * We use a standard copy-on-write btree to store the mappings for the
+ * devices (note I'm talking about copy-on-write of the metadata here, not
+ * the data).  When you take an internal snapshot you clone the root node
+ * of the origin btree.  After this there is no concept of an origin or a
+ * snapshot.  They are just two device trees that happen to point to the
+ * same data blocks.
+ *
+ * When we get a write in we decide if it's to a shared data block using
+ * some timestamp magic.  If it is, we have to break sharing.
+ *
+ * Let's say we write to a shared block in what was the origin.  The
+ * steps are:
+ *
+ * i) plug io further to this physical block. (see bio_prison code).
+ *
+ * ii) quiesce any read io to that shared data block.  Obviously
+ * including all devices that share this block.  (see deferred_set code)
+ *
+ * iii) copy the data block to a newly allocate block.  This step can be
+ * missed out if the io covers the block. (schedule_copy).
+ *
+ * iv) insert the new mapping into the origin's btree
+ * (process_prepared_mappings).  This act of inserting breaks some
+ * sharing of btree nodes between the two devices.  Breaking sharing only
+ * effects the btree of that specific device.  Btrees for the other
+ * devices that share the block never change.  The btree for the origin
+ * device as it was after the last commit is untouched, ie. we're using
+ * persistent data structures in the functional programming sense.
+ *
+ * v) unplug io to this physical block, including the io that triggered
+ * the breaking of sharing.
+ *
+ * Steps (ii) and (iii) occur in parallel.
+ *
+ * The metadata _doesn't_ need to be committed before the io continues.  We
+ * get away with this because the io is always written to a _new_ block.
+ * If there's a crash, then:
+ *
+ * - The origin mapping will point to the old origin block (the shared
+ * one).  This will contain the data as it was before the io that triggered
+ * the breaking of sharing came in.
+ *
+ * - The snap mapping still points to the old block.  As it would after
+ * the commit.
+ *
+ * The downside of this scheme is the timestamp magic isn't perfect, and
+ * will continue to think that data block in the snapshot device is shared
+ * even after the write to the origin has broken sharing.  I suspect data
+ * blocks will typically be shared by many different devices, so we're
+ * breaking sharing n + 1 times, rather than n, where n is the number of
+ * devices that reference this data block.  At the moment I think the
+ * benefits far, far outweigh the disadvantages.
+ */
+/*----------------------------------------------------------------*/
+/*
+ * Sometimes we can't deal with a bio straight away.  We put them in prison
+ * where they can't cause any mischief.  Bios are put in a cell identified
+ * by a key, multiple bios can be in the same cell.  When the cell is
+ * subsequently unlocked the bios become available.
+ */
+struct bio_prison;
+struct cell_key {
+        int virtual;
+        dm_thin_id dev;
+        dm_block_t block;
+};
+struct cell {
+        struct hlist_node list;
+        struct bio_prison *prison;
+        struct cell_key key;
+        unsigned count;
+        struct bio_list bios;
+};
+struct bio_prison {
+        spinlock_t lock;
+        mempool_t *cell_pool;
+        unsigned nr_buckets;
+        unsigned hash_mask;
+        struct hlist_head *cells;
+};
+static uint32_t calc_nr_buckets(unsigned nr_cells)
+{
+        uint32_t n = 128;
+        nr_cells /= 4;
+        nr_cells = min(nr_cells, 8192u);
+        while (n < nr_cells)
+                n <<= 1;
+        return n;
+}
+/*
+ * @nr_cells should be the number of cells you want in use _concurrently_.
+ * Don't confuse it with the number of distinct keys.
+ */
+static struct bio_prison *prison_create(unsigned nr_cells)
+{
+        unsigned i;
+        uint32_t nr_buckets = calc_nr_buckets(nr_cells);
+        size_t len = sizeof(struct bio_prison) +
+                (sizeof(struct hlist_head) * nr_buckets);
+        struct bio_prison *prison = kmalloc(len, GFP_KERNEL);
+        if (!prison)
+                return NULL;
+        spin_lock_init(&prison->lock);
+        prison->cell_pool = mempool_create_kmalloc_pool(nr_cells,
+                                                        sizeof(struct cell));
+        if (!prison->cell_pool) {
+                kfree(prison);
+                return NULL;
+        }
+        prison->nr_buckets = nr_buckets;
+        prison->hash_mask = nr_buckets - 1;
+        prison->cells = (struct hlist_head *) (prison + 1);
+        for (i = 0; i < nr_buckets; i++)
+                INIT_HLIST_HEAD(prison->cells + i);
+        return prison;
+}
+static void prison_destroy(struct bio_prison *prison)
+{
+        mempool_destroy(prison->cell_pool);
+        kfree(prison);
+}
+static uint32_t hash_key(struct bio_prison *prison, struct cell_key *key)
+{
+        const unsigned long BIG_PRIME = 4294967291UL;
+        uint64_t hash = key->block * BIG_PRIME;
+        return (uint32_t) (hash & prison->hash_mask);
+}
+static int keys_equal(struct cell_key *lhs, struct cell_key *rhs)
+{
+               return (lhs->virtual == rhs->virtual) &&
+                       (lhs->dev == rhs->dev) &&
+                       (lhs->block == rhs->block);
+}
+static struct cell *__search_bucket(struct hlist_head *bucket,
+                                    struct cell_key *key)
+{
+        struct cell *cell;
+        struct hlist_node *tmp;
+        hlist_for_each_entry(cell, tmp, bucket, list)
+                if (keys_equal(&cell->key, key))
+                        return cell;
+        return NULL;
+}
+/*
+ * This may block if a new cell needs allocating.  You must ensure that
+ * cells will be unlocked even if the calling thread is blocked.
+ *
+ * Returns the number of entries in the cell prior to the new addition
+ * or < 0 on failure.
+ */
+static int bio_detain(struct bio_prison *prison, struct cell_key *key,
+                      struct bio *inmate, struct cell **ref)
+{
+        int r;
+        unsigned long flags;
+        uint32_t hash = hash_key(prison, key);
+        struct cell *uninitialized_var(cell), *cell2 = NULL;
+        BUG_ON(hash > prison->nr_buckets);
+        spin_lock_irqsave(&prison->lock, flags);
+        cell = __search_bucket(prison->cells + hash, key);
+        if (!cell) {
+                /*
+                 * Allocate a new cell
+                 */
+                spin_unlock_irqrestore(&prison->lock, flags);
+                cell2 = mempool_alloc(prison->cell_pool, GFP_NOIO);
+                spin_lock_irqsave(&prison->lock, flags);
+                /*
+                 * We've been unlocked, so we have to double check that
+                 * nobody else has inserted this cell in the meantime.
+                 */
+                cell = __search_bucket(prison->cells + hash, key);
+                if (!cell) {
+                        cell = cell2;
+                        cell2 = NULL;
+                        cell->prison = prison;
+                        memcpy(&cell->key, key, sizeof(cell->key));
+                        cell->count = 0;
+                        bio_list_init(&cell->bios);
+                        hlist_add_head(&cell->list, prison->cells + hash);
+                }
+        }
+        r = cell->count++;
+        bio_list_add(&cell->bios, inmate);
+        spin_unlock_irqrestore(&prison->lock, flags);
+        if (cell2)
+                mempool_free(cell2, prison->cell_pool);
+        *ref = cell;
+        return r;
+}
+/*
+ * @inmates must have been initialised prior to this call
+ */
+static void __cell_release(struct cell *cell, struct bio_list *inmates)
+{
+        struct bio_prison *prison = cell->prison;
+        hlist_del(&cell->list);
+        if (inmates)
+                bio_list_merge(inmates, &cell->bios);
+        mempool_free(cell, prison->cell_pool);
+}
+static void cell_release(struct cell *cell, struct bio_list *bios)
+{
+        unsigned long flags;
+        struct bio_prison *prison = cell->prison;
+        spin_lock_irqsave(&prison->lock, flags);
+        __cell_release(cell, bios);
+        spin_unlock_irqrestore(&prison->lock, flags);
+}
+/*
+ * There are a couple of places where we put a bio into a cell briefly
+ * before taking it out again.  In these situations we know that no other
+ * bio may be in the cell.  This function releases the cell, and also does
+ * a sanity check.
+ */
+static void cell_release_singleton(struct cell *cell, struct bio *bio)
+{
+        struct bio_prison *prison = cell->prison;
+        struct bio_list bios;
+        struct bio *b;
+        unsigned long flags;
+        bio_list_init(&bios);
+        spin_lock_irqsave(&prison->lock, flags);
+        __cell_release(cell, &bios);
+        spin_unlock_irqrestore(&prison->lock, flags);
+        b = bio_list_pop(&bios);
+        BUG_ON(b != bio);
+        BUG_ON(!bio_list_empty(&bios));
+}
+static void cell_error(struct cell *cell)
+{
+        struct bio_prison *prison = cell->prison;
+        struct bio_list bios;
+        struct bio *bio;
+        unsigned long flags;
+        bio_list_init(&bios);
+        spin_lock_irqsave(&prison->lock, flags);
+        __cell_release(cell, &bios);
+        spin_unlock_irqrestore(&prison->lock, flags);
+        while ((bio = bio_list_pop(&bios)))
+                bio_io_error(bio);
+}
+/*----------------------------------------------------------------*/
+/*
+ * We use the deferred set to keep track of pending reads to shared blocks.
+ * We do this to ensure the new mapping caused by a write isn't performed
+ * until these prior reads have completed.  Otherwise the insertion of the
+ * new mapping could free the old block that the read bios are mapped to.
+ */
+struct deferred_set;
+struct deferred_entry {
+        struct deferred_set *ds;
+        unsigned count;
+        struct list_head work_items;
+};
+struct deferred_set {
+        spinlock_t lock;
+        unsigned current_entry;
+        unsigned sweeper;
+        struct deferred_entry entries[DEFERRED_SET_SIZE];
+};
+static void ds_init(struct deferred_set *ds)
+{
+        int i;
+        spin_lock_init(&ds->lock);
+        ds->current_entry = 0;
+        ds->sweeper = 0;
+        for (i = 0; i < DEFERRED_SET_SIZE; i++) {
+                ds->entries[i].ds = ds;
+                ds->entries[i].count = 0;
+                INIT_LIST_HEAD(&ds->entries[i].work_items);
+        }
+}
+static struct deferred_entry *ds_inc(struct deferred_set *ds)
+{
+        unsigned long flags;
+        struct deferred_entry *entry;
+        spin_lock_irqsave(&ds->lock, flags);
+        entry = ds->entries + ds->current_entry;
+        entry->count++;
+        spin_unlock_irqrestore(&ds->lock, flags);
+        return entry;
+}
+static unsigned ds_next(unsigned index)
+{
+        return (index + 1) % DEFERRED_SET_SIZE;
+}
+static void __sweep(struct deferred_set *ds, struct list_head *head)
+{
+        while ((ds->sweeper != ds->current_entry) &&
+               !ds->entries[ds->sweeper].count) {
+                list_splice_init(&ds->entries[ds->sweeper].work_items, head);
+                ds->sweeper = ds_next(ds->sweeper);
+        }
+        if ((ds->sweeper == ds->current_entry) && !ds->entries[ds->sweeper].count)
+                list_splice_init(&ds->entries[ds->sweeper].work_items, head);
+}
+static void ds_dec(struct deferred_entry *entry, struct list_head *head)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&entry->ds->lock, flags);
+        BUG_ON(!entry->count);
+        --entry->count;
+        __sweep(entry->ds, head);
+        spin_unlock_irqrestore(&entry->ds->lock, flags);
+}
+/*
+ * Returns 1 if deferred or 0 if no pending items to delay job.
+ */
+static int ds_add_work(struct deferred_set *ds, struct list_head *work)
+{
+        int r = 1;
+        unsigned long flags;
+        unsigned next_entry;
+        spin_lock_irqsave(&ds->lock, flags);
+        if ((ds->sweeper == ds->current_entry) &&
+            !ds->entries[ds->current_entry].count)
+                r = 0;
+        else {
+                list_add(work, &ds->entries[ds->current_entry].work_items);
+                next_entry = ds_next(ds->current_entry);
+                if (!ds->entries[next_entry].count)
+                        ds->current_entry = next_entry;
+        }
+        spin_unlock_irqrestore(&ds->lock, flags);
+        return r;
+}
+/*----------------------------------------------------------------*/
+/*
+ * Key building.
+ */
+static void build_data_key(struct dm_thin_device *td,
+                           dm_block_t b, struct cell_key *key)
+{
+        key->virtual = 0;
+        key->dev = dm_thin_dev_id(td);
+        key->block = b;
+}
+static void build_virtual_key(struct dm_thin_device *td, dm_block_t b,
+                              struct cell_key *key)
+{
+        key->virtual = 1;
+        key->dev = dm_thin_dev_id(td);
+        key->block = b;
+}
+/*----------------------------------------------------------------*/
+/*
+ * A pool device ties together a metadata device and a data device.  It
+ * also provides the interface for creating and destroying internal
+ * devices.
+ */
+struct new_mapping;
+struct pool {
+        struct list_head list;
+        struct dm_target *ti;   /* Only set if a pool target is bound */
+        struct mapped_device *pool_md;
+        struct block_device *md_dev;
+        struct dm_pool_metadata *pmd;
+        uint32_t sectors_per_block;
+        unsigned block_shift;
+        dm_block_t offset_mask;
+        dm_block_t low_water_blocks;
+        unsigned zero_new_blocks:1;
+        unsigned low_water_triggered:1; /* A dm event has been sent */
+        unsigned no_free_space:1;       /* A -ENOSPC warning has been issued */
+        struct bio_prison *prison;
+        struct dm_kcopyd_client *copier;
+        struct workqueue_struct *wq;
+        struct work_struct worker;
+        unsigned ref_count;
+        spinlock_t lock;
+        struct bio_list deferred_bios;
+        struct bio_list deferred_flush_bios;
+        struct list_head prepared_mappings;
+        struct bio_list retry_on_resume_list;
+        struct deferred_set ds; /* FIXME: move to thin_c */
+        struct new_mapping *next_mapping;
+        mempool_t *mapping_pool;
+        mempool_t *endio_hook_pool;
+};
+/*
+ * Target context for a pool.
+ */
+struct pool_c {
+        struct dm_target *ti;
+        struct pool *pool;
+        struct dm_dev *data_dev;
+        struct dm_dev *metadata_dev;
+        struct dm_target_callbacks callbacks;
+        dm_block_t low_water_blocks;
+        unsigned zero_new_blocks:1;
+};
+/*
+ * Target context for a thin.
+ */
+struct thin_c {
+        struct dm_dev *pool_dev;
+        dm_thin_id dev_id;
+        struct pool *pool;
+        struct dm_thin_device *td;
+};
+/*----------------------------------------------------------------*/
+/*
+ * A global list of pools that uses a struct mapped_device as a key.
+ */
+static struct dm_thin_pool_table {
+        struct mutex mutex;
+        struct list_head pools;
+} dm_thin_pool_table;
+static void pool_table_init(void)
+{
+        mutex_init(&dm_thin_pool_table.mutex);
+        INIT_LIST_HEAD(&dm_thin_pool_table.pools);
+}
+static void __pool_table_insert(struct pool *pool)
+{
+        BUG_ON(!mutex_is_locked(&dm_thin_pool_table.mutex));
+        list_add(&pool->list, &dm_thin_pool_table.pools);
+}
+static void __pool_table_remove(struct pool *pool)
+{
+        BUG_ON(!mutex_is_locked(&dm_thin_pool_table.mutex));
+        list_del(&pool->list);
+}
+static struct pool *__pool_table_lookup(struct mapped_device *md)
+{
+        struct pool *pool = NULL, *tmp;
+        BUG_ON(!mutex_is_locked(&dm_thin_pool_table.mutex));
+        list_for_each_entry(tmp, &dm_thin_pool_table.pools, list) {
+                if (tmp->pool_md == md) {
+                        pool = tmp;
+                        break;
+                }
+        }
+        return pool;
+}
+static struct pool *__pool_table_lookup_metadata_dev(struct block_device *md_dev)
+{
+        struct pool *pool = NULL, *tmp;
+        BUG_ON(!mutex_is_locked(&dm_thin_pool_table.mutex));
+        list_for_each_entry(tmp, &dm_thin_pool_table.pools, list) {
+                if (tmp->md_dev == md_dev) {
+                        pool = tmp;
+                        break;
+                }
+        }
+        return pool;
+}
+/*----------------------------------------------------------------*/
+static void __requeue_bio_list(struct thin_c *tc, struct bio_list *master)
+{
+        struct bio *bio;
+        struct bio_list bios;
+        bio_list_init(&bios);
+        bio_list_merge(&bios, master);
+        bio_list_init(master);
+        while ((bio = bio_list_pop(&bios))) {
+                if (dm_get_mapinfo(bio)->ptr == tc)
+                        bio_endio(bio, DM_ENDIO_REQUEUE);
+                else
+                        bio_list_add(master, bio);
+        }
+}
+static void requeue_io(struct thin_c *tc)
+{
+        struct pool *pool = tc->pool;
+        unsigned long flags;
+        spin_lock_irqsave(&pool->lock, flags);
+        __requeue_bio_list(tc, &pool->deferred_bios);
+        __requeue_bio_list(tc, &pool->retry_on_resume_list);
+        spin_unlock_irqrestore(&pool->lock, flags);
+}
+/*
+ * This section of code contains the logic for processing a thin device's IO.
+ * Much of the code depends on pool object resources (lists, workqueues, etc)
+ * but most is exclusively called from the thin target rather than the thin-pool
+ * target.
+ */
+static dm_block_t get_bio_block(struct thin_c *tc, struct bio *bio)
+{
+        return bio->bi_sector >> tc->pool->block_shift;
+}
+static void remap(struct thin_c *tc, struct bio *bio, dm_block_t block)
+{
+        struct pool *pool = tc->pool;
+        bio->bi_bdev = tc->pool_dev->bdev;
+        bio->bi_sector = (block << pool->block_shift) +
+                (bio->bi_sector & pool->offset_mask);
+}
+static void remap_and_issue(struct thin_c *tc, struct bio *bio,
+                            dm_block_t block)
+{
+        struct pool *pool = tc->pool;
+        unsigned long flags;
+        remap(tc, bio, block);
+        /*
+         * Batch together any FUA/FLUSH bios we find and then issue
+         * a single commit for them in process_deferred_bios().
+         */
+        if (bio->bi_rw & (REQ_FLUSH | REQ_FUA)) {
+                spin_lock_irqsave(&pool->lock, flags);
+                bio_list_add(&pool->deferred_flush_bios, bio);
+                spin_unlock_irqrestore(&pool->lock, flags);
+        } else
+                generic_make_request(bio);
+}
+/*
+ * wake_worker() is used when new work is queued and when pool_resume is
+ * ready to continue deferred IO processing.
+ */
+static void wake_worker(struct pool *pool)
+{
+        queue_work(pool->wq, &pool->worker);
+}
+/*----------------------------------------------------------------*/
+/*
+ * Bio endio functions.
+ */
+struct endio_hook {
+        struct thin_c *tc;
+        bio_end_io_t *saved_bi_end_io;
+        struct deferred_entry *entry;
+};
+struct new_mapping {
+        struct list_head list;
+        int prepared;
+        struct thin_c *tc;
+        dm_block_t virt_block;
+        dm_block_t data_block;
+        struct cell *cell;
+        int err;
+        /*
+         * If the bio covers the whole area of a block then we can avoid
+         * zeroing or copying.  Instead this bio is hooked.  The bio will
+         * still be in the cell, so care has to be taken to avoid issuing
+         * the bio twice.
+         */
+        struct bio *bio;
+        bio_end_io_t *saved_bi_end_io;
+};
+static void __maybe_add_mapping(struct new_mapping *m)
+{
+        struct pool *pool = m->tc->pool;
+        if (list_empty(&m->list) && m->prepared) {
+                list_add(&m->list, &pool->prepared_mappings);
+                wake_worker(pool);
+        }
+}
+static void copy_complete(int read_err, unsigned long write_err, void *context)
+{
+        unsigned long flags;
+        struct new_mapping *m = context;
+        struct pool *pool = m->tc->pool;
+        m->err = read_err || write_err ? -EIO : 0;
+        spin_lock_irqsave(&pool->lock, flags);
+        m->prepared = 1;
+        __maybe_add_mapping(m);
+        spin_unlock_irqrestore(&pool->lock, flags);
+}
+static void overwrite_endio(struct bio *bio, int err)
+{
+        unsigned long flags;
+        struct new_mapping *m = dm_get_mapinfo(bio)->ptr;
+        struct pool *pool = m->tc->pool;
+        m->err = err;
+        spin_lock_irqsave(&pool->lock, flags);
+        m->prepared = 1;
+        __maybe_add_mapping(m);
+        spin_unlock_irqrestore(&pool->lock, flags);
+}
+static void shared_read_endio(struct bio *bio, int err)
+{
+        struct list_head mappings;
+        struct new_mapping *m, *tmp;
+        struct endio_hook *h = dm_get_mapinfo(bio)->ptr;
+        unsigned long flags;
+        struct pool *pool = h->tc->pool;
+        bio->bi_end_io = h->saved_bi_end_io;
+        bio_endio(bio, err);
+        INIT_LIST_HEAD(&mappings);
+        ds_dec(h->entry, &mappings);
+        spin_lock_irqsave(&pool->lock, flags);
+        list_for_each_entry_safe(m, tmp, &mappings, list) {
+                list_del(&m->list);
+                INIT_LIST_HEAD(&m->list);
+                __maybe_add_mapping(m);
+        }
+        spin_unlock_irqrestore(&pool->lock, flags);
+        mempool_free(h, pool->endio_hook_pool);
+}
+/*----------------------------------------------------------------*/
+/*
+ * Workqueue.
+ */
+/*
+ * Prepared mapping jobs.
+ */
+/*
+ * This sends the bios in the cell back to the deferred_bios list.
+ */
+static void cell_defer(struct thin_c *tc, struct cell *cell,
+                       dm_block_t data_block)
+{
+        struct pool *pool = tc->pool;
+        unsigned long flags;
+        spin_lock_irqsave(&pool->lock, flags);
+        cell_release(cell, &pool->deferred_bios);
+        spin_unlock_irqrestore(&tc->pool->lock, flags);
+        wake_worker(pool);
+}
+/*
+ * Same as cell_defer above, except it omits one particular detainee,
+ * a write bio that covers the block and has already been processed.
+ */
+static void cell_defer_except(struct thin_c *tc, struct cell *cell,
+                              struct bio *exception)
+{
+        struct bio_list bios;
+        struct bio *bio;
+        struct pool *pool = tc->pool;
+        unsigned long flags;
+        bio_list_init(&bios);
+        cell_release(cell, &bios);
+        spin_lock_irqsave(&pool->lock, flags);
+        while ((bio = bio_list_pop(&bios)))
+                if (bio != exception)
+                        bio_list_add(&pool->deferred_bios, bio);
+        spin_unlock_irqrestore(&pool->lock, flags);
+        wake_worker(pool);
+}
+static void process_prepared_mapping(struct new_mapping *m)
+{
+        struct thin_c *tc = m->tc;
+        struct bio *bio;
+        int r;
+        bio = m->bio;
+        if (bio)
+                bio->bi_end_io = m->saved_bi_end_io;
+        if (m->err) {
+                cell_error(m->cell);
+                return;
+        }
+        /*
+         * Commit the prepared block into the mapping btree.
+         * Any I/O for this block arriving after this point will get
+         * remapped to it directly.
+         */
+        r = dm_thin_insert_block(tc->td, m->virt_block, m->data_block);
+        if (r) {
+                DMERR("dm_thin_insert_block() failed");
+                cell_error(m->cell);
+                return;
+        }
+        /*
+         * Release any bios held while the block was being provisioned.
+         * If we are processing a write bio that completely covers the block,
+         * we already processed it so can ignore it now when processing
+         * the bios in the cell.
+         */
+        if (bio) {
+                cell_defer_except(tc, m->cell, bio);
+                bio_endio(bio, 0);
+        } else
+                cell_defer(tc, m->cell, m->data_block);
+        list_del(&m->list);
+        mempool_free(m, tc->pool->mapping_pool);
+}
+static void process_prepared_mappings(struct pool *pool)
+{
+        unsigned long flags;
+        struct list_head maps;
+        struct new_mapping *m, *tmp;
+        INIT_LIST_HEAD(&maps);
+        spin_lock_irqsave(&pool->lock, flags);
+        list_splice_init(&pool->prepared_mappings, &maps);
+        spin_unlock_irqrestore(&pool->lock, flags);
+        list_for_each_entry_safe(m, tmp, &maps, list)
+                process_prepared_mapping(m);
+}
+/*
+ * Deferred bio jobs.
+ */
+static int io_overwrites_block(struct pool *pool, struct bio *bio)
+{
+        return ((bio_data_dir(bio) == WRITE) &&
+                !(bio->bi_sector & pool->offset_mask)) &&
+                (bio->bi_size == (pool->sectors_per_block << SECTOR_SHIFT));
+}
+static void save_and_set_endio(struct bio *bio, bio_end_io_t **save,
+                               bio_end_io_t *fn)
+{
+        *save = bio->bi_end_io;
+        bio->bi_end_io = fn;
+}
+static int ensure_next_mapping(struct pool *pool)
+{
+        if (pool->next_mapping)
+                return 0;
+        pool->next_mapping = mempool_alloc(pool->mapping_pool, GFP_ATOMIC);
+        return pool->next_mapping ? 0 : -ENOMEM;
+}
+static struct new_mapping *get_next_mapping(struct pool *pool)
+{
+        struct new_mapping *r = pool->next_mapping;
+        BUG_ON(!pool->next_mapping);
+        pool->next_mapping = NULL;
+        return r;
+}
+static void schedule_copy(struct thin_c *tc, dm_block_t virt_block,
+                          dm_block_t data_origin, dm_block_t data_dest,
+                          struct cell *cell, struct bio *bio)
+{
+        int r;
+        struct pool *pool = tc->pool;
+        struct new_mapping *m = get_next_mapping(pool);
+        INIT_LIST_HEAD(&m->list);
+        m->prepared = 0;
+        m->tc = tc;
+        m->virt_block = virt_block;
+        m->data_block = data_dest;
+        m->cell = cell;
+        m->err = 0;
+        m->bio = NULL;
+        ds_add_work(&pool->ds, &m->list);
+        /*
+         * IO to pool_dev remaps to the pool target's data_dev.
+         *
+         * If the whole block of data is being overwritten, we can issue the
+         * bio immediately. Otherwise we use kcopyd to clone the data first.
+         */
+        if (io_overwrites_block(pool, bio)) {
+                m->bio = bio;
+                save_and_set_endio(bio, &m->saved_bi_end_io, overwrite_endio);
+                dm_get_mapinfo(bio)->ptr = m;
+                remap_and_issue(tc, bio, data_dest);
+        } else {
+                struct dm_io_region from, to;
+                from.bdev = tc->pool_dev->bdev;
+                from.sector = data_origin * pool->sectors_per_block;
+                from.count = pool->sectors_per_block;
+                to.bdev = tc->pool_dev->bdev;
+                to.sector = data_dest * pool->sectors_per_block;
+                to.count = pool->sectors_per_block;
+                r = dm_kcopyd_copy(pool->copier, &from, 1, &to,
+                                   0, copy_complete, m);
+                if (r < 0) {
+                        mempool_free(m, pool->mapping_pool);
+                        DMERR("dm_kcopyd_copy() failed");
+                        cell_error(cell);
+                }
+        }
+}
+static void schedule_zero(struct thin_c *tc, dm_block_t virt_block,
+                          dm_block_t data_block, struct cell *cell,
+                          struct bio *bio)
+{
+        struct pool *pool = tc->pool;
+        struct new_mapping *m = get_next_mapping(pool);
+        INIT_LIST_HEAD(&m->list);
+        m->prepared = 0;
+        m->tc = tc;
+        m->virt_block = virt_block;
+        m->data_block = data_block;
+        m->cell = cell;
+        m->err = 0;
+        m->bio = NULL;
+        /*
+         * If the whole block of data is being overwritten or we are not
+         * zeroing pre-existing data, we can issue the bio immediately.
+         * Otherwise we use kcopyd to zero the data first.
+         */
+        if (!pool->zero_new_blocks)
+                process_prepared_mapping(m);
+        else if (io_overwrites_block(pool, bio)) {
+                m->bio = bio;
+                save_and_set_endio(bio, &m->saved_bi_end_io, overwrite_endio);
+                dm_get_mapinfo(bio)->ptr = m;
+                remap_and_issue(tc, bio, data_block);
+        } else {
+                int r;
+                struct dm_io_region to;
+                to.bdev = tc->pool_dev->bdev;
+                to.sector = data_block * pool->sectors_per_block;
+                to.count = pool->sectors_per_block;
+                r = dm_kcopyd_zero(pool->copier, 1, &to, 0, copy_complete, m);
+                if (r < 0) {
+                        mempool_free(m, pool->mapping_pool);
+                        DMERR("dm_kcopyd_zero() failed");
+                        cell_error(cell);
+                }
+        }
+}
+static int alloc_data_block(struct thin_c *tc, dm_block_t *result)
+{
+        int r;
+        dm_block_t free_blocks;
+        unsigned long flags;
+        struct pool *pool = tc->pool;
+        r = dm_pool_get_free_block_count(pool->pmd, &free_blocks);
+        if (r)
+                return r;
+        if (free_blocks <= pool->low_water_blocks && !pool->low_water_triggered) {
+                DMWARN("%s: reached low water mark, sending event.",
+                       dm_device_name(pool->pool_md));
+                spin_lock_irqsave(&pool->lock, flags);
+                pool->low_water_triggered = 1;
+                spin_unlock_irqrestore(&pool->lock, flags);
+                dm_table_event(pool->ti->table);
+        }
+        if (!free_blocks) {
+                if (pool->no_free_space)
+                        return -ENOSPC;
+                else {
+                        /*
+                         * Try to commit to see if that will free up some
+                         * more space.
+                         */
+                        r = dm_pool_commit_metadata(pool->pmd);
+                        if (r) {
+                                DMERR("%s: dm_pool_commit_metadata() failed, error = %d",
+                                      __func__, r);
+                                return r;
+                        }
+                        r = dm_pool_get_free_block_count(pool->pmd, &free_blocks);
+                        if (r)
+                                return r;
+                        /*
+                         * If we still have no space we set a flag to avoid
+                         * doing all this checking and return -ENOSPC.
+                         */
+                        if (!free_blocks) {
+                                DMWARN("%s: no free space available.",
+                                       dm_device_name(pool->pool_md));
+                                spin_lock_irqsave(&pool->lock, flags);
+                                pool->no_free_space = 1;
+                                spin_unlock_irqrestore(&pool->lock, flags);
+                                return -ENOSPC;
+                        }
+                }
+        }
+        r = dm_pool_alloc_data_block(pool->pmd, result);
+        if (r)
+                return r;
+        return 0;
+}
+/*
+ * If we have run out of space, queue bios until the device is
+ * resumed, presumably after having been reloaded with more space.
+ */
+static void retry_on_resume(struct bio *bio)
+{
+        struct thin_c *tc = dm_get_mapinfo(bio)->ptr;
+        struct pool *pool = tc->pool;
+        unsigned long flags;
+        spin_lock_irqsave(&pool->lock, flags);
+        bio_list_add(&pool->retry_on_resume_list, bio);
+        spin_unlock_irqrestore(&pool->lock, flags);
+}
+static void no_space(struct cell *cell)
+{
+        struct bio *bio;
+        struct bio_list bios;
+        bio_list_init(&bios);
+        cell_release(cell, &bios);
+        while ((bio = bio_list_pop(&bios)))
+                retry_on_resume(bio);
+}
+static void break_sharing(struct thin_c *tc, struct bio *bio, dm_block_t block,
+                          struct cell_key *key,
+                          struct dm_thin_lookup_result *lookup_result,
+                          struct cell *cell)
+{
+        int r;
+        dm_block_t data_block;
+        r = alloc_data_block(tc, &data_block);
+        switch (r) {
+        case 0:
+                schedule_copy(tc, block, lookup_result->block,
+                              data_block, cell, bio);
+                break;
+        case -ENOSPC:
+                no_space(cell);
+                break;
+        default:
+                DMERR("%s: alloc_data_block() failed, error = %d", __func__, r);
+                cell_error(cell);
+                break;
+        }
+}
+static void process_shared_bio(struct thin_c *tc, struct bio *bio,
+                               dm_block_t block,
+                               struct dm_thin_lookup_result *lookup_result)
+{
+        struct cell *cell;
+        struct pool *pool = tc->pool;
+        struct cell_key key;
+        /*
+         * If cell is already occupied, then sharing is already in the process
+         * of being broken so we have nothing further to do here.
+         */
+        build_data_key(tc->td, lookup_result->block, &key);
+        if (bio_detain(pool->prison, &key, bio, &cell))
+                return;
+        if (bio_data_dir(bio) == WRITE)
+                break_sharing(tc, bio, block, &key, lookup_result, cell);
+        else {
+                struct endio_hook *h;
+                h = mempool_alloc(pool->endio_hook_pool, GFP_NOIO);
+                h->tc = tc;
+                h->entry = ds_inc(&pool->ds);
+                save_and_set_endio(bio, &h->saved_bi_end_io, shared_read_endio);
+                dm_get_mapinfo(bio)->ptr = h;
+                cell_release_singleton(cell, bio);
+                remap_and_issue(tc, bio, lookup_result->block);
+        }
+}
+static void provision_block(struct thin_c *tc, struct bio *bio, dm_block_t block,
+                            struct cell *cell)
+{
+        int r;
+        dm_block_t data_block;
+        /*
+         * Remap empty bios (flushes) immediately, without provisioning.
+         */
+        if (!bio->bi_size) {
+                cell_release_singleton(cell, bio);
+                remap_and_issue(tc, bio, 0);
+                return;
+        }
+        /*
+         * Fill read bios with zeroes and complete them immediately.
+         */
+        if (bio_data_dir(bio) == READ) {
+                zero_fill_bio(bio);
+                cell_release_singleton(cell, bio);
+                bio_endio(bio, 0);
+                return;
+        }
+        r = alloc_data_block(tc, &data_block);
+        switch (r) {
+        case 0:
+                schedule_zero(tc, block, data_block, cell, bio);
+                break;
+        case -ENOSPC:
+                no_space(cell);
+                break;
+        default:
+                DMERR("%s: alloc_data_block() failed, error = %d", __func__, r);
+                cell_error(cell);
+                break;
+        }
+}
+static void process_bio(struct thin_c *tc, struct bio *bio)
+{
+        int r;
+        dm_block_t block = get_bio_block(tc, bio);
+        struct cell *cell;
+        struct cell_key key;
+        struct dm_thin_lookup_result lookup_result;
+        /*
+         * If cell is already occupied, then the block is already
+         * being provisioned so we have nothing further to do here.
+         */
+        build_virtual_key(tc->td, block, &key);
+        if (bio_detain(tc->pool->prison, &key, bio, &cell))
+                return;
+        r = dm_thin_find_block(tc->td, block, 1, &lookup_result);
+        switch (r) {
+        case 0:
+                /*
+                 * We can release this cell now.  This thread is the only
+                 * one that puts bios into a cell, and we know there were
+                 * no preceding bios.
+                 */
+                /*
+                 * TODO: this will probably have to change when discard goes
+                 * back in.
+                 */
+                cell_release_singleton(cell, bio);
+                if (lookup_result.shared)
+                        process_shared_bio(tc, bio, block, &lookup_result);
+                else
+                        remap_and_issue(tc, bio, lookup_result.block);
+                break;
+        case -ENODATA:
+                provision_block(tc, bio, block, cell);
+                break;
+        default:
+                DMERR("dm_thin_find_block() failed, error = %d", r);
+                bio_io_error(bio);
+                break;
+        }
+}
+static void process_deferred_bios(struct pool *pool)
+{
+        unsigned long flags;
+        struct bio *bio;
+        struct bio_list bios;
+        int r;
+        bio_list_init(&bios);
+        spin_lock_irqsave(&pool->lock, flags);
+        bio_list_merge(&bios, &pool->deferred_bios);
+        bio_list_init(&pool->deferred_bios);
+        spin_unlock_irqrestore(&pool->lock, flags);
+        while ((bio = bio_list_pop(&bios))) {
+                struct thin_c *tc = dm_get_mapinfo(bio)->ptr;
+                /*
+                 * If we've got no free new_mapping structs, and processing
+                 * this bio might require one, we pause until there are some
+                 * prepared mappings to process.
+                 */
+                if (ensure_next_mapping(pool)) {
+                        spin_lock_irqsave(&pool->lock, flags);
+                        bio_list_merge(&pool->deferred_bios, &bios);
+                        spin_unlock_irqrestore(&pool->lock, flags);
+                        break;
+                }
+                process_bio(tc, bio);
+        }
+        /*
+         * If there are any deferred flush bios, we must commit
+         * the metadata before issuing them.
+         */
+        bio_list_init(&bios);
+        spin_lock_irqsave(&pool->lock, flags);
+        bio_list_merge(&bios, &pool->deferred_flush_bios);
+        bio_list_init(&pool->deferred_flush_bios);
+        spin_unlock_irqrestore(&pool->lock, flags);
+        if (bio_list_empty(&bios))
+                return;
+        r = dm_pool_commit_metadata(pool->pmd);
+        if (r) {
+                DMERR("%s: dm_pool_commit_metadata() failed, error = %d",
+                      __func__, r);
+                while ((bio = bio_list_pop(&bios)))
+                        bio_io_error(bio);
+                return;
+        }
+        while ((bio = bio_list_pop(&bios)))
+                generic_make_request(bio);
+}
+static void do_worker(struct work_struct *ws)
+{
+        struct pool *pool = container_of(ws, struct pool, worker);
+        process_prepared_mappings(pool);
+        process_deferred_bios(pool);
+}
+/*----------------------------------------------------------------*/
+/*
+ * Mapping functions.
+ */
+/*
+ * Called only while mapping a thin bio to hand it over to the workqueue.
+ */
+static void thin_defer_bio(struct thin_c *tc, struct bio *bio)
+{
+        unsigned long flags;
+        struct pool *pool = tc->pool;
+        spin_lock_irqsave(&pool->lock, flags);
+        bio_list_add(&pool->deferred_bios, bio);
+        spin_unlock_irqrestore(&pool->lock, flags);
+        wake_worker(pool);
+}
+/*
+ * Non-blocking function called from the thin target's map function.
+ */
+static int thin_bio_map(struct dm_target *ti, struct bio *bio,
+                        union map_info *map_context)
+{
+        int r;
+        struct thin_c *tc = ti->private;
+        dm_block_t block = get_bio_block(tc, bio);
+        struct dm_thin_device *td = tc->td;
+        struct dm_thin_lookup_result result;
+        /*
+         * Save the thin context for easy access from the deferred bio later.
+         */
+        map_context->ptr = tc;
+        if (bio->bi_rw & (REQ_FLUSH | REQ_FUA)) {
+                thin_defer_bio(tc, bio);
+                return DM_MAPIO_SUBMITTED;
+        }
+        r = dm_thin_find_block(td, block, 0, &result);
+        /*
+         * Note that we defer readahead too.
+         */
+        switch (r) {
+        case 0:
+                if (unlikely(result.shared)) {
+                        /*
+                         * We have a race condition here between the
+                         * result.shared value returned by the lookup and
+                         * snapshot creation, which may cause new
+                         * sharing.
+                         *
+                         * To avoid this always quiesce the origin before
+                         * taking the snap.  You want to do this anyway to
+                         * ensure a consistent application view
+                         * (i.e. lockfs).
+                         *
+                         * More distant ancestors are irrelevant. The
+                         * shared flag will be set in their case.
+                         */
+                        thin_defer_bio(tc, bio);
+                        r = DM_MAPIO_SUBMITTED;
+                } else {
+                        remap(tc, bio, result.block);
+                        r = DM_MAPIO_REMAPPED;
+                }
+                break;
+        case -ENODATA:
+                /*
+                 * In future, the failed dm_thin_find_block above could
+                 * provide the hint to load the metadata into cache.
+                 */
+        case -EWOULDBLOCK:
+                thin_defer_bio(tc, bio);
+                r = DM_MAPIO_SUBMITTED;
+                break;
+        }
+        return r;
+}
+static int pool_is_congested(struct dm_target_callbacks *cb, int bdi_bits)
+{
+        int r;
+        unsigned long flags;
+        struct pool_c *pt = container_of(cb, struct pool_c, callbacks);
+        spin_lock_irqsave(&pt->pool->lock, flags);
+        r = !bio_list_empty(&pt->pool->retry_on_resume_list);
+        spin_unlock_irqrestore(&pt->pool->lock, flags);
+        if (!r) {
+                struct request_queue *q = bdev_get_queue(pt->data_dev->bdev);
+                r = bdi_congested(&q->backing_dev_info, bdi_bits);
+        }
+        return r;
+}
+static void __requeue_bios(struct pool *pool)
+{
+        bio_list_merge(&pool->deferred_bios, &pool->retry_on_resume_list);
+        bio_list_init(&pool->retry_on_resume_list);
+}
+/*----------------------------------------------------------------
+ * Binding of control targets to a pool object
+ *--------------------------------------------------------------*/
+static int bind_control_target(struct pool *pool, struct dm_target *ti)
+{
+        struct pool_c *pt = ti->private;
+        pool->ti = ti;
+        pool->low_water_blocks = pt->low_water_blocks;
+        pool->zero_new_blocks = pt->zero_new_blocks;
+        return 0;
+}
+static void unbind_control_target(struct pool *pool, struct dm_target *ti)
+{
+        if (pool->ti == ti)
+                pool->ti = NULL;
+}
+/*----------------------------------------------------------------
+ * Pool creation
+ *--------------------------------------------------------------*/
+static void __pool_destroy(struct pool *pool)
+{
+        __pool_table_remove(pool);
+        if (dm_pool_metadata_close(pool->pmd) < 0)
+                DMWARN("%s: dm_pool_metadata_close() failed.", __func__);
+        prison_destroy(pool->prison);
+        dm_kcopyd_client_destroy(pool->copier);
+        if (pool->wq)
+                destroy_workqueue(pool->wq);
+        if (pool->next_mapping)
+                mempool_free(pool->next_mapping, pool->mapping_pool);
+        mempool_destroy(pool->mapping_pool);
+        mempool_destroy(pool->endio_hook_pool);
+        kfree(pool);
+}
+static struct pool *pool_create(struct mapped_device *pool_md,
+                                struct block_device *metadata_dev,
+                                unsigned long block_size, char **error)
+{
+        int r;
+        void *err_p;
+        struct pool *pool;
+        struct dm_pool_metadata *pmd;
+        pmd = dm_pool_metadata_open(metadata_dev, block_size);
+        if (IS_ERR(pmd)) {
+                *error = "Error creating metadata object";
+                return (struct pool *)pmd;
+        }
+        pool = kmalloc(sizeof(*pool), GFP_KERNEL);
+        if (!pool) {
+                *error = "Error allocating memory for pool";
+                err_p = ERR_PTR(-ENOMEM);
+                goto bad_pool;
+        }
+        pool->pmd = pmd;
+        pool->sectors_per_block = block_size;
+        pool->block_shift = ffs(block_size) - 1;
+        pool->offset_mask = block_size - 1;
+        pool->low_water_blocks = 0;
+        pool->zero_new_blocks = 1;
+        pool->prison = prison_create(PRISON_CELLS);
+        if (!pool->prison) {
+                *error = "Error creating pool's bio prison";
+                err_p = ERR_PTR(-ENOMEM);
+                goto bad_prison;
+        }
+        pool->copier = dm_kcopyd_client_create();
+        if (IS_ERR(pool->copier)) {
+                r = PTR_ERR(pool->copier);
+                *error = "Error creating pool's kcopyd client";
+                err_p = ERR_PTR(r);
+                goto bad_kcopyd_client;
+        }
+        /*
+         * Create singlethreaded workqueue that will service all devices
+         * that use this metadata.
+         */
+        pool->wq = alloc_ordered_workqueue("dm-" DM_MSG_PREFIX, WQ_MEM_RECLAIM);
+        if (!pool->wq) {
+                *error = "Error creating pool's workqueue";
+                err_p = ERR_PTR(-ENOMEM);
+                goto bad_wq;
+        }
+        INIT_WORK(&pool->worker, do_worker);
+        spin_lock_init(&pool->lock);
+        bio_list_init(&pool->deferred_bios);
+        bio_list_init(&pool->deferred_flush_bios);
+        INIT_LIST_HEAD(&pool->prepared_mappings);
+        pool->low_water_triggered = 0;
+        pool->no_free_space = 0;
+        bio_list_init(&pool->retry_on_resume_list);
+        ds_init(&pool->ds);
+        pool->next_mapping = NULL;
+        pool->mapping_pool =
+                mempool_create_kmalloc_pool(MAPPING_POOL_SIZE, sizeof(struct new_mapping));
+        if (!pool->mapping_pool) {
+                *error = "Error creating pool's mapping mempool";
+                err_p = ERR_PTR(-ENOMEM);
+                goto bad_mapping_pool;
+        }
+        pool->endio_hook_pool =
+                mempool_create_kmalloc_pool(ENDIO_HOOK_POOL_SIZE, sizeof(struct endio_hook));
+        if (!pool->endio_hook_pool) {
+                *error = "Error creating pool's endio_hook mempool";
+                err_p = ERR_PTR(-ENOMEM);
+                goto bad_endio_hook_pool;
+        }
+        pool->ref_count = 1;
+        pool->pool_md = pool_md;
+        pool->md_dev = metadata_dev;
+        __pool_table_insert(pool);
+        return pool;
+bad_endio_hook_pool:
+        mempool_destroy(pool->mapping_pool);
+bad_mapping_pool:
+        destroy_workqueue(pool->wq);
+bad_wq:
+        dm_kcopyd_client_destroy(pool->copier);
+bad_kcopyd_client:
+        prison_destroy(pool->prison);
+bad_prison:
+        kfree(pool);
+bad_pool:
+        if (dm_pool_metadata_close(pmd))
+                DMWARN("%s: dm_pool_metadata_close() failed.", __func__);
+        return err_p;
+}
+static void __pool_inc(struct pool *pool)
+{
+        BUG_ON(!mutex_is_locked(&dm_thin_pool_table.mutex));
+        pool->ref_count++;
+}
+static void __pool_dec(struct pool *pool)
+{
+        BUG_ON(!mutex_is_locked(&dm_thin_pool_table.mutex));
+        BUG_ON(!pool->ref_count);
+        if (!--pool->ref_count)
+                __pool_destroy(pool);
+}
+static struct pool *__pool_find(struct mapped_device *pool_md,
+                                struct block_device *metadata_dev,
+                                unsigned long block_size, char **error)
+{
+        struct pool *pool = __pool_table_lookup_metadata_dev(metadata_dev);
+        if (pool) {
+                if (pool->pool_md != pool_md)
+                        return ERR_PTR(-EBUSY);
+                __pool_inc(pool);
+        } else {
+                pool = __pool_table_lookup(pool_md);
+                if (pool) {
+                        if (pool->md_dev != metadata_dev)
+                                return ERR_PTR(-EINVAL);
+                        __pool_inc(pool);
+                } else
+                        pool = pool_create(pool_md, metadata_dev, block_size, error);
+        }
+        return pool;
+}
+/*----------------------------------------------------------------
+ * Pool target methods
+ *--------------------------------------------------------------*/
+static void pool_dtr(struct dm_target *ti)
+{
+        struct pool_c *pt = ti->private;
+        mutex_lock(&dm_thin_pool_table.mutex);
+        unbind_control_target(pt->pool, ti);
+        __pool_dec(pt->pool);
+        dm_put_device(ti, pt->metadata_dev);
+        dm_put_device(ti, pt->data_dev);
+        kfree(pt);
+        mutex_unlock(&dm_thin_pool_table.mutex);
+}
+struct pool_features {
+        unsigned zero_new_blocks:1;
+};
+static int parse_pool_features(struct dm_arg_set *as, struct pool_features *pf,
+                               struct dm_target *ti)
+{
+        int r;
+        unsigned argc;
+        const char *arg_name;
+        static struct dm_arg _args[] = {
+                {0, 1, "Invalid number of pool feature arguments"},
+        };
+        /*
+         * No feature arguments supplied.
+         */
+        if (!as->argc)
+                return 0;
+        r = dm_read_arg_group(_args, as, &argc, &ti->error);
+        if (r)
+                return -EINVAL;
+        while (argc && !r) {
+                arg_name = dm_shift_arg(as);
+                argc--;
+                if (!strcasecmp(arg_name, "skip_block_zeroing")) {
+                        pf->zero_new_blocks = 0;
+                        continue;
+                }
+                ti->error = "Unrecognised pool feature requested";
+                r = -EINVAL;
+        }
+        return r;
+}
+/*
+ * thin-pool <metadata dev> <data dev>
+ *           <data block size (sectors)>
+ *           <low water mark (blocks)>
+ *           [<#feature args> [<arg>]*]
+ *
+ * Optional feature arguments are:
+ *           skip_block_zeroing: skips the zeroing of newly-provisioned blocks.
+ */
+static int pool_ctr(struct dm_target *ti, unsigned argc, char **argv)
+{
+        int r;
+        struct pool_c *pt;
+        struct pool *pool;
+        struct pool_features pf;
+        struct dm_arg_set as;
+        struct dm_dev *data_dev;
+        unsigned long block_size;
+        dm_block_t low_water_blocks;
+        struct dm_dev *metadata_dev;
+        sector_t metadata_dev_size;
+        /*
+         * FIXME Remove validation from scope of lock.
+         */
+        mutex_lock(&dm_thin_pool_table.mutex);
+        if (argc < 4) {
+                ti->error = "Invalid argument count";
+                r = -EINVAL;
+                goto out_unlock;
+        }
+        as.argc = argc;
+        as.argv = argv;
+        r = dm_get_device(ti, argv[0], FMODE_READ | FMODE_WRITE, &metadata_dev);
+        if (r) {
+                ti->error = "Error opening metadata block device";
+                goto out_unlock;
+        }
+        metadata_dev_size = i_size_read(metadata_dev->bdev->bd_inode) >> SECTOR_SHIFT;
+        if (metadata_dev_size > METADATA_DEV_MAX_SECTORS) {
+                ti->error = "Metadata device is too large";
+                r = -EINVAL;
+                goto out_metadata;
+        }
+        r = dm_get_device(ti, argv[1], FMODE_READ | FMODE_WRITE, &data_dev);
+        if (r) {
+                ti->error = "Error getting data device";
+                goto out_metadata;
+        }
+        if (kstrtoul(argv[2], 10, &block_size) || !block_size ||
+            block_size < DATA_DEV_BLOCK_SIZE_MIN_SECTORS ||
+            block_size > DATA_DEV_BLOCK_SIZE_MAX_SECTORS ||
+            !is_power_of_2(block_size)) {
+                ti->error = "Invalid block size";
+                r = -EINVAL;
+                goto out;
+        }
+        if (kstrtoull(argv[3], 10, (unsigned long long *)&low_water_blocks)) {
+                ti->error = "Invalid low water mark";
+                r = -EINVAL;
+                goto out;
+        }
+        /*
+         * Set default pool features.
+         */
+        memset(&pf, 0, sizeof(pf));
+        pf.zero_new_blocks = 1;
+        dm_consume_args(&as, 4);
+        r = parse_pool_features(&as, &pf, ti);
+        if (r)
+                goto out;
+        pt = kzalloc(sizeof(*pt), GFP_KERNEL);
+        if (!pt) {
+                r = -ENOMEM;
+                goto out;
+        }
+        pool = __pool_find(dm_table_get_md(ti->table), metadata_dev->bdev,
+                           block_size, &ti->error);
+        if (IS_ERR(pool)) {
+                r = PTR_ERR(pool);
+                goto out_free_pt;
+        }
+        pt->pool = pool;
+        pt->ti = ti;
+        pt->metadata_dev = metadata_dev;
+        pt->data_dev = data_dev;
+        pt->low_water_blocks = low_water_blocks;
+        pt->zero_new_blocks = pf.zero_new_blocks;
+        ti->num_flush_requests = 1;
+        ti->num_discard_requests = 0;
+        ti->private = pt;
+        pt->callbacks.congested_fn = pool_is_congested;
+        dm_table_add_target_callbacks(ti->table, &pt->callbacks);
+        mutex_unlock(&dm_thin_pool_table.mutex);
+        return 0;
+out_free_pt:
+        kfree(pt);
+out:
+        dm_put_device(ti, data_dev);
+out_metadata:
+        dm_put_device(ti, metadata_dev);
+out_unlock:
+        mutex_unlock(&dm_thin_pool_table.mutex);
+        return r;
+}
+static int pool_map(struct dm_target *ti, struct bio *bio,
+                    union map_info *map_context)
+{
+        int r;
+        struct pool_c *pt = ti->private;
+        struct pool *pool = pt->pool;
+        unsigned long flags;
+        /*
+         * As this is a singleton target, ti->begin is always zero.
+         */
+        spin_lock_irqsave(&pool->lock, flags);
+        bio->bi_bdev = pt->data_dev->bdev;
+        r = DM_MAPIO_REMAPPED;
+        spin_unlock_irqrestore(&pool->lock, flags);
+        return r;
+}
+/*
+ * Retrieves the number of blocks of the data device from
+ * the superblock and compares it to the actual device size,
+ * thus resizing the data device in case it has grown.
+ *
+ * This both copes with opening preallocated data devices in the ctr
+ * being followed by a resume
+ * -and-
+ * calling the resume method individually after userspace has
+ * grown the data device in reaction to a table event.
+ */
+static int pool_preresume(struct dm_target *ti)
+{
+        int r;
+        struct pool_c *pt = ti->private;
+        struct pool *pool = pt->pool;
+        dm_block_t data_size, sb_data_size;
+        /*
+         * Take control of the pool object.
+         */
+        r = bind_control_target(pool, ti);
+        if (r)
+                return r;
+        data_size = ti->len >> pool->block_shift;
+        r = dm_pool_get_data_dev_size(pool->pmd, &sb_data_size);
+        if (r) {
+                DMERR("failed to retrieve data device size");
+                return r;
+        }
+        if (data_size < sb_data_size) {
+                DMERR("pool target too small, is %llu blocks (expected %llu)",
+                      data_size, sb_data_size);
+                return -EINVAL;
+        } else if (data_size > sb_data_size) {
+                r = dm_pool_resize_data_dev(pool->pmd, data_size);
+                if (r) {
+                        DMERR("failed to resize data device");
+                        return r;
+                }
+                r = dm_pool_commit_metadata(pool->pmd);
+                if (r) {
+                        DMERR("%s: dm_pool_commit_metadata() failed, error = %d",
+                              __func__, r);
+                        return r;
+                }
+        }
+        return 0;
+}
+static void pool_resume(struct dm_target *ti)
+{
+        struct pool_c *pt = ti->private;
+        struct pool *pool = pt->pool;
+        unsigned long flags;
+        spin_lock_irqsave(&pool->lock, flags);
+        pool->low_water_triggered = 0;
+        pool->no_free_space = 0;
+        __requeue_bios(pool);
+        spin_unlock_irqrestore(&pool->lock, flags);
+        wake_worker(pool);
+}
+static void pool_postsuspend(struct dm_target *ti)
+{
+        int r;
+        struct pool_c *pt = ti->private;
+        struct pool *pool = pt->pool;
+        flush_workqueue(pool->wq);
+        r = dm_pool_commit_metadata(pool->pmd);
+        if (r < 0) {
+                DMERR("%s: dm_pool_commit_metadata() failed, error = %d",
+                      __func__, r);
+                /* FIXME: invalidate device? error the next FUA or FLUSH bio ?*/
+        }
+}
+static int check_arg_count(unsigned argc, unsigned args_required)
+{
+        if (argc != args_required) {
+                DMWARN("Message received with %u arguments instead of %u.",
+                       argc, args_required);
+                return -EINVAL;
+        }
+        return 0;
+}
+static int read_dev_id(char *arg, dm_thin_id *dev_id, int warning)
+{
+        if (!kstrtoull(arg, 10, (unsigned long long *)dev_id) &&
+            *dev_id <= MAX_DEV_ID)
+                return 0;
+        if (warning)
+                DMWARN("Message received with invalid device id: %s", arg);
+        return -EINVAL;
+}
+static int process_create_thin_mesg(unsigned argc, char **argv, struct pool *pool)
+{
+        dm_thin_id dev_id;
+        int r;
+        r = check_arg_count(argc, 2);
+        if (r)
+                return r;
+        r = read_dev_id(argv[1], &dev_id, 1);
+        if (r)
+                return r;
+        r = dm_pool_create_thin(pool->pmd, dev_id);
+        if (r) {
+                DMWARN("Creation of new thinly-provisioned device with id %s failed.",
+                       argv[1]);
+                return r;
+        }
+        return 0;
+}
+static int process_create_snap_mesg(unsigned argc, char **argv, struct pool *pool)
+{
+        dm_thin_id dev_id;
+        dm_thin_id origin_dev_id;
+        int r;
+        r = check_arg_count(argc, 3);
+        if (r)
+                return r;
+        r = read_dev_id(argv[1], &dev_id, 1);
+        if (r)
+                return r;
+        r = read_dev_id(argv[2], &origin_dev_id, 1);
+        if (r)
+                return r;
+        r = dm_pool_create_snap(pool->pmd, dev_id, origin_dev_id);
+        if (r) {
+                DMWARN("Creation of new snapshot %s of device %s failed.",
+                       argv[1], argv[2]);
+                return r;
+        }
+        return 0;
+}
+static int process_delete_mesg(unsigned argc, char **argv, struct pool *pool)
+{
+        dm_thin_id dev_id;
+        int r;
+        r = check_arg_count(argc, 2);
+        if (r)
+                return r;
+        r = read_dev_id(argv[1], &dev_id, 1);
+        if (r)
+                return r;
+        r = dm_pool_delete_thin_device(pool->pmd, dev_id);
+        if (r)
+                DMWARN("Deletion of thin device %s failed.", argv[1]);
+        return r;
+}
+static int process_set_transaction_id_mesg(unsigned argc, char **argv, struct pool *pool)
+{
+        dm_thin_id old_id, new_id;
+        int r;
+        r = check_arg_count(argc, 3);
+        if (r)
+                return r;
+        if (kstrtoull(argv[1], 10, (unsigned long long *)&old_id)) {
+                DMWARN("set_transaction_id message: Unrecognised id %s.", argv[1]);
+                return -EINVAL;
+        }
+        if (kstrtoull(argv[2], 10, (unsigned long long *)&new_id)) {
+                DMWARN("set_transaction_id message: Unrecognised new id %s.", argv[2]);
+                return -EINVAL;
+        }
+        r = dm_pool_set_metadata_transaction_id(pool->pmd, old_id, new_id);
+        if (r) {
+                DMWARN("Failed to change transaction id from %s to %s.",
+                       argv[1], argv[2]);
+                return r;
+        }
+        return 0;
+}
+/*
+ * Messages supported:
+ *   create_thin        <dev_id>
+ *   create_snap        <dev_id> <origin_id>
+ *   delete             <dev_id>
+ *   trim               <dev_id> <new_size_in_sectors>
+ *   set_transaction_id <current_trans_id> <new_trans_id>
+ */
+static int pool_message(struct dm_target *ti, unsigned argc, char **argv)
+{
+        int r = -EINVAL;
+        struct pool_c *pt = ti->private;
+        struct pool *pool = pt->pool;
+        if (!strcasecmp(argv[0], "create_thin"))
+                r = process_create_thin_mesg(argc, argv, pool);
+        else if (!strcasecmp(argv[0], "create_snap"))
+                r = process_create_snap_mesg(argc, argv, pool);
+        else if (!strcasecmp(argv[0], "delete"))
+                r = process_delete_mesg(argc, argv, pool);
+        else if (!strcasecmp(argv[0], "set_transaction_id"))
+                r = process_set_transaction_id_mesg(argc, argv, pool);
+        else
+                DMWARN("Unrecognised thin pool target message received: %s", argv[0]);
+        if (!r) {
+                r = dm_pool_commit_metadata(pool->pmd);
+                if (r)
+                        DMERR("%s message: dm_pool_commit_metadata() failed, error = %d",
+                              argv[0], r);
+        }
+        return r;
+}
+/*
+ * Status line is:
+ *    <transaction id> <used metadata sectors>/<total metadata sectors>
+ *    <used data sectors>/<total data sectors> <held metadata root>
+ */
+static int pool_status(struct dm_target *ti, status_type_t type,
+                       char *result, unsigned maxlen)
+{
+        int r;
+        unsigned sz = 0;
+        uint64_t transaction_id;
+        dm_block_t nr_free_blocks_data;
+        dm_block_t nr_free_blocks_metadata;
+        dm_block_t nr_blocks_data;
+        dm_block_t nr_blocks_metadata;
+        dm_block_t held_root;
+        char buf[BDEVNAME_SIZE];
+        char buf2[BDEVNAME_SIZE];
+        struct pool_c *pt = ti->private;
+        struct pool *pool = pt->pool;
+        switch (type) {
+        case STATUSTYPE_INFO:
+                r = dm_pool_get_metadata_transaction_id(pool->pmd,
+                                                        &transaction_id);
+                if (r)
+                        return r;
+                r = dm_pool_get_free_metadata_block_count(pool->pmd,
+                                                          &nr_free_blocks_metadata);
+                if (r)
+                        return r;
+                r = dm_pool_get_metadata_dev_size(pool->pmd, &nr_blocks_metadata);
+                if (r)
+                        return r;
+                r = dm_pool_get_free_block_count(pool->pmd,
+                                                 &nr_free_blocks_data);
+                if (r)
+                        return r;
+                r = dm_pool_get_data_dev_size(pool->pmd, &nr_blocks_data);
+                if (r)
+                        return r;
+                r = dm_pool_get_held_metadata_root(pool->pmd, &held_root);
+                if (r)
+                        return r;
+                DMEMIT("%llu %llu/%llu %llu/%llu ",
+                       (unsigned long long)transaction_id,
+                       (unsigned long long)(nr_blocks_metadata - nr_free_blocks_metadata),
+                       (unsigned long long)nr_blocks_metadata,
+                       (unsigned long long)(nr_blocks_data - nr_free_blocks_data),
+                       (unsigned long long)nr_blocks_data);
+                if (held_root)
+                        DMEMIT("%llu", held_root);
+                else
+                        DMEMIT("-");
+                break;
+        case STATUSTYPE_TABLE:
+                DMEMIT("%s %s %lu %llu ",
+                       format_dev_t(buf, pt->metadata_dev->bdev->bd_dev),
+                       format_dev_t(buf2, pt->data_dev->bdev->bd_dev),
+                       (unsigned long)pool->sectors_per_block,
+                       (unsigned long long)pt->low_water_blocks);
+                DMEMIT("%u ", !pool->zero_new_blocks);
+                if (!pool->zero_new_blocks)
+                        DMEMIT("skip_block_zeroing ");
+                break;
+        }
+        return 0;
+}
+static int pool_iterate_devices(struct dm_target *ti,
+                                iterate_devices_callout_fn fn, void *data)
+{
+        struct pool_c *pt = ti->private;
+        return fn(ti, pt->data_dev, 0, ti->len, data);
+}
+static int pool_merge(struct dm_target *ti, struct bvec_merge_data *bvm,
+                      struct bio_vec *biovec, int max_size)
+{
+        struct pool_c *pt = ti->private;
+        struct request_queue *q = bdev_get_queue(pt->data_dev->bdev);
+        if (!q->merge_bvec_fn)
+                return max_size;
+        bvm->bi_bdev = pt->data_dev->bdev;
+        return min(max_size, q->merge_bvec_fn(q, bvm, biovec));
+}
+static void pool_io_hints(struct dm_target *ti, struct queue_limits *limits)
+{
+        struct pool_c *pt = ti->private;
+        struct pool *pool = pt->pool;
+        blk_limits_io_min(limits, 0);
+        blk_limits_io_opt(limits, pool->sectors_per_block << SECTOR_SHIFT);
+}
+static struct target_type pool_target = {
+        .name = "thin-pool",
+        .features = DM_TARGET_SINGLETON | DM_TARGET_ALWAYS_WRITEABLE |
+                    DM_TARGET_IMMUTABLE,
+        .version = {1, 0, 0},
+        .module = THIS_MODULE,
+        .ctr = pool_ctr,
+        .dtr = pool_dtr,
+        .map = pool_map,
+        .postsuspend = pool_postsuspend,
+        .preresume = pool_preresume,
+        .resume = pool_resume,
+        .message = pool_message,
+        .status = pool_status,
+        .merge = pool_merge,
+        .iterate_devices = pool_iterate_devices,
+        .io_hints = pool_io_hints,
+};
+/*----------------------------------------------------------------
+ * Thin target methods
+ *--------------------------------------------------------------*/
+static void thin_dtr(struct dm_target *ti)
+{
+        struct thin_c *tc = ti->private;
+        mutex_lock(&dm_thin_pool_table.mutex);
+        __pool_dec(tc->pool);
+        dm_pool_close_thin_device(tc->td);
+        dm_put_device(ti, tc->pool_dev);
+        kfree(tc);
+        mutex_unlock(&dm_thin_pool_table.mutex);
+}
+/*
+ * Thin target parameters:
+ *
+ * <pool_dev> <dev_id>
+ *
+ * pool_dev: the path to the pool (eg, /dev/mapper/my_pool)
+ * dev_id: the internal device identifier
+ */
+static int thin_ctr(struct dm_target *ti, unsigned argc, char **argv)
+{
+        int r;
+        struct thin_c *tc;
+        struct dm_dev *pool_dev;
+        struct mapped_device *pool_md;
+        mutex_lock(&dm_thin_pool_table.mutex);
+        if (argc != 2) {
+                ti->error = "Invalid argument count";
+                r = -EINVAL;
+                goto out_unlock;
+        }
+        tc = ti->private = kzalloc(sizeof(*tc), GFP_KERNEL);
+        if (!tc) {
+                ti->error = "Out of memory";
+                r = -ENOMEM;
+                goto out_unlock;
+        }
+        r = dm_get_device(ti, argv[0], dm_table_get_mode(ti->table), &pool_dev);
+        if (r) {
+                ti->error = "Error opening pool device";
+                goto bad_pool_dev;
+        }
+        tc->pool_dev = pool_dev;
+        if (read_dev_id(argv[1], (unsigned long long *)&tc->dev_id, 0)) {
+                ti->error = "Invalid device id";
+                r = -EINVAL;
+                goto bad_common;
+        }
+        pool_md = dm_get_md(tc->pool_dev->bdev->bd_dev);
+        if (!pool_md) {
+                ti->error = "Couldn't get pool mapped device";
+                r = -EINVAL;
+                goto bad_common;
+        }
+        tc->pool = __pool_table_lookup(pool_md);
+        if (!tc->pool) {
+                ti->error = "Couldn't find pool object";
+                r = -EINVAL;
+                goto bad_pool_lookup;
+        }
+        __pool_inc(tc->pool);
+        r = dm_pool_open_thin_device(tc->pool->pmd, tc->dev_id, &tc->td);
+        if (r) {
+                ti->error = "Couldn't open thin internal device";
+                goto bad_thin_open;
+        }
+        ti->split_io = tc->pool->sectors_per_block;
+        ti->num_flush_requests = 1;
+        ti->num_discard_requests = 0;
+        ti->discards_supported = 0;
+        dm_put(pool_md);
+        mutex_unlock(&dm_thin_pool_table.mutex);
+        return 0;
+bad_thin_open:
+        __pool_dec(tc->pool);
+bad_pool_lookup:
+        dm_put(pool_md);
+bad_common:
+        dm_put_device(ti, tc->pool_dev);
+bad_pool_dev:
+        kfree(tc);
+out_unlock:
+        mutex_unlock(&dm_thin_pool_table.mutex);
+        return r;
+}
+static int thin_map(struct dm_target *ti, struct bio *bio,
+                    union map_info *map_context)
+{
+        bio->bi_sector -= ti->begin;
+        return thin_bio_map(ti, bio, map_context);
+}
+static void thin_postsuspend(struct dm_target *ti)
+{
+        if (dm_noflush_suspending(ti))
+                requeue_io((struct thin_c *)ti->private);
+}
+/*
+ * <nr mapped sectors> <highest mapped sector>
+ */
+static int thin_status(struct dm_target *ti, status_type_t type,
+                       char *result, unsigned maxlen)
+{
+        int r;
+        ssize_t sz = 0;
+        dm_block_t mapped, highest;
+        char buf[BDEVNAME_SIZE];
+        struct thin_c *tc = ti->private;
+        if (!tc->td)
+                DMEMIT("-");
+        else {
+                switch (type) {
+                case STATUSTYPE_INFO:
+                        r = dm_thin_get_mapped_count(tc->td, &mapped);
+                        if (r)
+                                return r;
+                        r = dm_thin_get_highest_mapped_block(tc->td, &highest);
+                        if (r < 0)
+                                return r;
+                        DMEMIT("%llu ", mapped * tc->pool->sectors_per_block);
+                        if (r)
+                                DMEMIT("%llu", ((highest + 1) *
+                                                tc->pool->sectors_per_block) - 1);
+                        else
+                                DMEMIT("-");
+                        break;
+                case STATUSTYPE_TABLE:
+                        DMEMIT("%s %lu",
+                               format_dev_t(buf, tc->pool_dev->bdev->bd_dev),
+                               (unsigned long) tc->dev_id);
+                        break;
+                }
+        }
+        return 0;
+}
+static int thin_iterate_devices(struct dm_target *ti,
+                                iterate_devices_callout_fn fn, void *data)
+{
+        dm_block_t blocks;
+        struct thin_c *tc = ti->private;
+        /*
+         * We can't call dm_pool_get_data_dev_size() since that blocks.  So
+         * we follow a more convoluted path through to the pool's target.
+         */
+        if (!tc->pool->ti)
+                return 0;       /* nothing is bound */
+        blocks = tc->pool->ti->len >> tc->pool->block_shift;
+        if (blocks)
+                return fn(ti, tc->pool_dev, 0, tc->pool->sectors_per_block * blocks, data);
+        return 0;
+}
+static void thin_io_hints(struct dm_target *ti, struct queue_limits *limits)
+{
+        struct thin_c *tc = ti->private;
+        blk_limits_io_min(limits, 0);
+        blk_limits_io_opt(limits, tc->pool->sectors_per_block << SECTOR_SHIFT);
+}
+static struct target_type thin_target = {
+        .name = "thin",
+        .version = {1, 0, 0},
+        .module = THIS_MODULE,
+        .ctr = thin_ctr,
+        .dtr = thin_dtr,
+        .map = thin_map,
+        .postsuspend = thin_postsuspend,
+        .status = thin_status,
+        .iterate_devices = thin_iterate_devices,
+        .io_hints = thin_io_hints,
+};
+/*----------------------------------------------------------------*/
+static int __init dm_thin_init(void)
+{
+        int r;
+        pool_table_init();
+        r = dm_register_target(&thin_target);
+        if (r)
+                return r;
+        r = dm_register_target(&pool_target);
+        if (r)
+                dm_unregister_target(&thin_target);
+        return r;
+}
+static void dm_thin_exit(void)
+{
+        dm_unregister_target(&thin_target);
+        dm_unregister_target(&pool_target);
+}
+module_init(dm_thin_init);
+module_exit(dm_thin_exit);
+MODULE_DESCRIPTION(DM_NAME "device-mapper thin provisioning target");
+MODULE_AUTHOR("Joe Thornber <dm-devel@redhat.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/md/dm-uevent.c b/drivers/md/dm-uevent.c
index 6b1e3b61b25e..8efe033bab55 100644
--- a/drivers/md/dm-uevent.c
+++ b/drivers/md/dm-uevent.c
@@ -22,6 +22,7 @@
 #include <linux/slab.h>
 #include <linux/kobject.h>
 #include <linux/dm-ioctl.h>
+#include <linux/export.h>
 #include "dm.h"
 #include "dm-uevent.h"
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 52b39f335bb3..4720f68f817e 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -25,6 +25,16 @@
 #define DM_MSG_PREFIX "core"
+#ifdef CONFIG_PRINTK
+/*
+ * ratelimit state to be used in DMXXX_LIMIT().
+ */
+DEFINE_RATELIMIT_STATE(dm_ratelimit_state,
+                       DEFAULT_RATELIMIT_INTERVAL,
+                       DEFAULT_RATELIMIT_BURST);
+EXPORT_SYMBOL(dm_ratelimit_state);
+#endif
 /*
 * Cookies are numeric values sent with CHANGE and REMOVE
 * uevents while resuming, removing or renaming the device.
@@ -130,6 +140,8 @@ struct mapped_device {
        /* Protect queue and type against concurrent access. */
        struct mutex type_lock;
+        struct target_type *immutable_target_type;
        struct gendisk *disk;
        char name[16];
@@ -180,9 +192,6 @@ struct mapped_device {
        /* forced geometry settings */
        struct hd_geometry geometry;
-        /* For saving the address of __make_request for request based dm */
-        make_request_fn *saved_make_request_fn;
        /* sysfs handle */
        struct kobject kobj;
@@ -1391,7 +1400,7 @@ out:
 * The request function that just remaps the bio built up by
 * dm_merge_bvec.
 */
-static int _dm_request(struct request_queue *q, struct bio *bio)
+static void _dm_request(struct request_queue *q, struct bio *bio)
 {
        int rw = bio_data_dir(bio);
        struct mapped_device *md = q->queuedata;
@@ -1412,19 +1421,12 @@ static int _dm_request(struct request_queue *q, struct bio *bio)
                        queue_io(md, bio);
                else
                        bio_io_error(bio);
-                return 0;
+                return;
        }
        __split_and_process_bio(md, bio);
        up_read(&md->io_lock);
-        return 0;
+        return;
-}
-static int dm_make_request(struct request_queue *q, struct bio *bio)
-{
-        struct mapped_device *md = q->queuedata;
-        return md->saved_make_request_fn(q, bio); /* call __make_request() */
 }
 static int dm_request_based(struct mapped_device *md)
@@ -1432,14 +1434,14 @@ static int dm_request_based(struct mapped_device *md)
        return blk_queue_stackable(md->queue);
 }
-static int dm_request(struct request_queue *q, struct bio *bio)
+static void dm_request(struct request_queue *q, struct bio *bio)
 {
        struct mapped_device *md = q->queuedata;
        if (dm_request_based(md))
-                return dm_make_request(q, bio);
+                blk_queue_bio(q, bio);
+        else
-        return _dm_request(q, bio);
+                _dm_request(q, bio);
 }
 void dm_dispatch_request(struct request *rq)
@@ -2086,6 +2088,8 @@ static struct dm_table *__bind(struct mapped_device *md, struct dm_table *t,
        write_lock_irqsave(&md->map_lock, flags);
        old_map = md->map;
        md->map = t;
+        md->immutable_target_type = dm_table_get_immutable_target_type(t);
        dm_table_set_restrictions(t, q, limits);
        if (merge_is_optional)
                set_bit(DMF_MERGE_IS_OPTIONAL, &md->flags);
@@ -2156,6 +2160,11 @@ unsigned dm_get_md_type(struct mapped_device *md)
        return md->type;
 }
+struct target_type *dm_get_immutable_target_type(struct mapped_device *md)
+{
+        return md->immutable_target_type;
+}
 /*
 * Fully initialize a request-based queue (->elevator, ->request_fn, etc).
 */
@@ -2172,7 +2181,6 @@ static int dm_init_request_based_queue(struct mapped_device *md)
                return 0;
        md->queue = q;
-        md->saved_make_request_fn = md->queue->make_request_fn;
        dm_init_md_queue(md);
        blk_queue_softirq_done(md->queue, dm_softirq_done);
        blk_queue_prep_rq(md->queue, dm_prep_fn);
@@ -2231,6 +2239,7 @@ struct mapped_device *dm_get_md(dev_t dev)
        return md;
 }
+EXPORT_SYMBOL_GPL(dm_get_md);
 void *dm_get_mdptr(struct mapped_device *md)
 {
@@ -2316,7 +2325,6 @@ static int dm_wait_for_completion(struct mapped_device *md, int interruptible)
        while (1) {
                set_current_state(interruptible);
-                smp_mb();
                if (!md_in_flight(md))
                        break;
diff --git a/drivers/md/dm.h b/drivers/md/dm.h
index 6745dbd278a4..b7dacd59d8d7 100644
--- a/drivers/md/dm.h
+++ b/drivers/md/dm.h
@@ -60,6 +60,7 @@ int dm_table_resume_targets(struct dm_table *t);
 int dm_table_any_congested(struct dm_table *t, int bdi_bits);
 int dm_table_any_busy_target(struct dm_table *t);
 unsigned dm_table_get_type(struct dm_table *t);
+struct target_type *dm_table_get_immutable_target_type(struct dm_table *t);
 bool dm_table_request_based(struct dm_table *t);
 bool dm_table_supports_discards(struct dm_table *t);
 int dm_table_alloc_md_mempools(struct dm_table *t);
@@ -72,6 +73,7 @@ void dm_lock_md_type(struct mapped_device *md);
 void dm_unlock_md_type(struct mapped_device *md);
 void dm_set_md_type(struct mapped_device *md, unsigned type);
 unsigned dm_get_md_type(struct mapped_device *md);
+struct target_type *dm_get_immutable_target_type(struct mapped_device *md);
 int dm_setup_md_queue(struct mapped_device *md);
diff --git a/drivers/md/faulty.c b/drivers/md/faulty.c
index 60816b132c2e..feb2c3c7bb44 100644
--- a/drivers/md/faulty.c
+++ b/drivers/md/faulty.c
@@ -63,6 +63,7 @@
 #define MaxFault        50
 #include <linux/blkdev.h>
+#include <linux/module.h>
 #include <linux/raid/md_u.h>
 #include <linux/slab.h>
 #include "md.h"
@@ -169,7 +170,7 @@ static void add_sector(struct faulty_conf *conf, sector_t start, int mode)
                conf->nfaults = n+1;
 }
-static int make_request(struct mddev *mddev, struct bio *bio)
+static void make_request(struct mddev *mddev, struct bio *bio)
 {
        struct faulty_conf *conf = mddev->private;
        int failit = 0;
@@ -181,7 +182,7 @@ static int make_request(struct mddev *mddev, struct bio *bio)
                         * just fail immediately
                         */
                        bio_endio(bio, -EIO);
-                        return 0;
+                        return;
                }
                if (check_sector(conf, bio->bi_sector, bio->bi_sector+(bio->bi_size>>9),
@@ -211,15 +212,15 @@ static int make_request(struct mddev *mddev, struct bio *bio)
        }
        if (failit) {
                struct bio *b = bio_clone_mddev(bio, GFP_NOIO, mddev);
                b->bi_bdev = conf->rdev->bdev;
                b->bi_private = bio;
                b->bi_end_io = faulty_fail;
-                generic_make_request(b);
+                bio = b;
-                return 0;
+        } else
-        } else {
                bio->bi_bdev = conf->rdev->bdev;
-                return 1;
-        }
+        generic_make_request(bio);
 }
 static void status(struct seq_file *seq, struct mddev *mddev)
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index 10c5844460cb..c3273efd08cb 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -19,6 +19,7 @@
 #include <linux/blkdev.h>
 #include <linux/raid/md_u.h>
 #include <linux/seq_file.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include "md.h"
 #include "linear.h"
@@ -264,14 +265,14 @@ static int linear_stop (struct mddev *mddev)
        return 0;
 }
-static int linear_make_request (struct mddev *mddev, struct bio *bio)
+static void linear_make_request(struct mddev *mddev, struct bio *bio)
 {
        struct dev_info *tmp_dev;
        sector_t start_sector;
        if (unlikely(bio->bi_rw & REQ_FLUSH)) {
                md_flush_request(mddev, bio);
-                return 0;
+                return;
        }
        rcu_read_lock();
@@ -293,7 +294,7 @@ static int linear_make_request (struct mddev *mddev, struct bio *bio)
                       (unsigned long long)start_sector);
                rcu_read_unlock();
                bio_io_error(bio);
-                return 0;
+                return;
        }
        if (unlikely(bio->bi_sector + (bio->bi_size >> 9) >
                     tmp_dev->end_sector)) {
@@ -307,20 +308,17 @@ static int linear_make_request (struct mddev *mddev, struct bio *bio)
                bp = bio_split(bio, end_sector - bio->bi_sector);
-                if (linear_make_request(mddev, &bp->bio1))
+                linear_make_request(mddev, &bp->bio1);
-                        generic_make_request(&bp->bio1);
+                linear_make_request(mddev, &bp->bio2);
-                if (linear_make_request(mddev, &bp->bio2))
-                        generic_make_request(&bp->bio2);
                bio_pair_release(bp);
-                return 0;
+                return;
        }
                    
        bio->bi_bdev = tmp_dev->rdev->bdev;
        bio->bi_sector = bio->bi_sector - start_sector
                + tmp_dev->rdev->data_offset;
        rcu_read_unlock();
+        generic_make_request(bio);
-        return 1;
 }
 static void linear_status (struct seq_file *seq, struct mddev *mddev)
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 266e82ebaf11..84acfe7d10e4 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -44,6 +44,7 @@
 #include <linux/hdreg.h>
 #include <linux/proc_fs.h>
 #include <linux/random.h>
+#include <linux/module.h>
 #include <linux/reboot.h>
 #include <linux/file.h>
 #include <linux/compat.h>
@@ -332,18 +333,17 @@ static DEFINE_SPINLOCK(all_mddevs_lock);
 * call has finished, the bio has been linked into some internal structure
 * and so is visible to ->quiesce(), so we don't need the refcount any more.
 */
-static int md_make_request(struct request_queue *q, struct bio *bio)
+static void md_make_request(struct request_queue *q, struct bio *bio)
 {
        const int rw = bio_data_dir(bio);
        struct mddev *mddev = q->queuedata;
-        int rv;
        int cpu;
        unsigned int sectors;
        if (mddev == NULL || mddev->pers == NULL
            || !mddev->ready) {
                bio_io_error(bio);
-                return 0;
+                return;
        }
        smp_rmb(); /* Ensure implications of  'active' are visible */
        rcu_read_lock();
@@ -368,7 +368,7 @@ static int md_make_request(struct request_queue *q, struct bio *bio)
         * go away inside make_request
         */
        sectors = bio_sectors(bio);
-        rv = mddev->pers->make_request(mddev, bio);
+        mddev->pers->make_request(mddev, bio);
        cpu = part_stat_lock();
        part_stat_inc(cpu, &mddev->gendisk->part0, ios[rw]);
@@ -377,8 +377,6 @@ static int md_make_request(struct request_queue *q, struct bio *bio)
        if (atomic_dec_and_test(&mddev->active_io) && mddev->suspended)
                wake_up(&mddev->sb_wait);
-        return rv;
 }
 /* mddev_suspend makes sure no new requests are submitted
@@ -477,8 +475,7 @@ static void md_submit_flush_data(struct work_struct *ws)
                bio_endio(bio, 0);
        else {
                bio->bi_rw &= ~REQ_FLUSH;
-                if (mddev->pers->make_request(mddev, bio))
+                mddev->pers->make_request(mddev, bio);
-                        generic_make_request(bio);
        }
        mddev->flush_bio = NULL;
diff --git a/drivers/md/md.h b/drivers/md/md.h
index 51c1d91557e0..cf742d9306ec 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -419,7 +419,7 @@ struct md_personality
        int level;
        struct list_head list;
        struct module *owner;
-        int (*make_request)(struct mddev *mddev, struct bio *bio);
+        void (*make_request)(struct mddev *mddev, struct bio *bio);
        int (*run)(struct mddev *mddev);
        int (*stop)(struct mddev *mddev);
        void (*status)(struct seq_file *seq, struct mddev *mddev);
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index d32c785e17d4..5899246fa37e 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -20,6 +20,7 @@
 */
 #include <linux/blkdev.h>
+#include <linux/module.h>
 #include <linux/raid/md_u.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
@@ -106,7 +107,7 @@ static void multipath_end_request(struct bio *bio, int error)
        rdev_dec_pending(rdev, conf->mddev);
 }
-static int multipath_make_request(struct mddev *mddev, struct bio * bio)
+static void multipath_make_request(struct mddev *mddev, struct bio * bio)
 {
        struct mpconf *conf = mddev->private;
        struct multipath_bh * mp_bh;
@@ -114,7 +115,7 @@ static int multipath_make_request(struct mddev *mddev, struct bio * bio)
        if (unlikely(bio->bi_rw & REQ_FLUSH)) {
                md_flush_request(mddev, bio);
-                return 0;
+                return;
        }
        mp_bh = mempool_alloc(conf->pool, GFP_NOIO);
@@ -126,7 +127,7 @@ static int multipath_make_request(struct mddev *mddev, struct bio * bio)
        if (mp_bh->path < 0) {
                bio_endio(bio, -EIO);
                mempool_free(mp_bh, conf->pool);
-                return 0;
+                return;
        }
        multipath = conf->multipaths + mp_bh->path;
@@ -137,7 +138,7 @@ static int multipath_make_request(struct mddev *mddev, struct bio * bio)
        mp_bh->bio.bi_end_io = multipath_end_request;
        mp_bh->bio.bi_private = mp_bh;
        generic_make_request(&mp_bh->bio);
-        return 0;
+        return;
 }
 static void multipath_status (struct seq_file *seq, struct mddev *mddev)
diff --git a/drivers/md/persistent-data/Kconfig b/drivers/md/persistent-data/Kconfig
new file mode 100644
index 000000000000..ceb359050a59
--- /dev/null
+++ b/drivers/md/persistent-data/Kconfig
@@ -0,0 +1,8 @@
+config DM_PERSISTENT_DATA
+       tristate
+       depends on BLK_DEV_DM && EXPERIMENTAL
+       select LIBCRC32C
+       select DM_BUFIO
+       ---help---
+         Library providing immutable on-disk data structure support for
+         device-mapper targets such as the thin provisioning target.
diff --git a/drivers/md/persistent-data/Makefile b/drivers/md/persistent-data/Makefile
new file mode 100644
index 000000000000..cfa95f662230
--- /dev/null
+++ b/drivers/md/persistent-data/Makefile
@@ -0,0 +1,11 @@
+obj-$(CONFIG_DM_PERSISTENT_DATA) += dm-persistent-data.o
+dm-persistent-data-objs := \
+        dm-block-manager.o \
+        dm-space-map-checker.o \
+        dm-space-map-common.o \
+        dm-space-map-disk.o \
+        dm-space-map-metadata.o \
+        dm-transaction-manager.o \
+        dm-btree.o \
+        dm-btree-remove.o \
+        dm-btree-spine.o
diff --git a/drivers/md/persistent-data/dm-block-manager.c b/drivers/md/persistent-data/dm-block-manager.c
new file mode 100644
index 000000000000..0317ecdc6e53
--- /dev/null
+++ b/drivers/md/persistent-data/dm-block-manager.c
@@ -0,0 +1,620 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This file is released under the GPL.
+ */
+#include "dm-block-manager.h"
+#include "dm-persistent-data-internal.h"
+#include "../dm-bufio.h"
+#include <linux/crc32c.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/rwsem.h>
+#include <linux/device-mapper.h>
+#include <linux/stacktrace.h>
+#define DM_MSG_PREFIX "block manager"
+/*----------------------------------------------------------------*/
+/*
+ * This is a read/write semaphore with a couple of differences.
+ *
+ * i) There is a restriction on the number of concurrent read locks that
+ * may be held at once.  This is just an implementation detail.
+ *
+ * ii) Recursive locking attempts are detected and return EINVAL.  A stack
+ * trace is also emitted for the previous lock aquisition.
+ *
+ * iii) Priority is given to write locks.
+ */
+#define MAX_HOLDERS 4
+#define MAX_STACK 10
+typedef unsigned long stack_entries[MAX_STACK];
+struct block_lock {
+        spinlock_t lock;
+        __s32 count;
+        struct list_head waiters;
+        struct task_struct *holders[MAX_HOLDERS];
+#ifdef CONFIG_DM_DEBUG_BLOCK_STACK_TRACING
+        struct stack_trace traces[MAX_HOLDERS];
+        stack_entries entries[MAX_HOLDERS];
+#endif
+};
+struct waiter {
+        struct list_head list;
+        struct task_struct *task;
+        int wants_write;
+};
+static unsigned __find_holder(struct block_lock *lock,
+                              struct task_struct *task)
+{
+        unsigned i;
+        for (i = 0; i < MAX_HOLDERS; i++)
+                if (lock->holders[i] == task)
+                        break;
+        BUG_ON(i == MAX_HOLDERS);
+        return i;
+}
+/* call this *after* you increment lock->count */
+static void __add_holder(struct block_lock *lock, struct task_struct *task)
+{
+        unsigned h = __find_holder(lock, NULL);
+#ifdef CONFIG_DM_DEBUG_BLOCK_STACK_TRACING
+        struct stack_trace *t;
+#endif
+        get_task_struct(task);
+        lock->holders[h] = task;
+#ifdef CONFIG_DM_DEBUG_BLOCK_STACK_TRACING
+        t = lock->traces + h;
+        t->nr_entries = 0;
+        t->max_entries = MAX_STACK;
+        t->entries = lock->entries[h];
+        t->skip = 2;
+        save_stack_trace(t);
+#endif
+}
+/* call this *before* you decrement lock->count */
+static void __del_holder(struct block_lock *lock, struct task_struct *task)
+{
+        unsigned h = __find_holder(lock, task);
+        lock->holders[h] = NULL;
+        put_task_struct(task);
+}
+static int __check_holder(struct block_lock *lock)
+{
+        unsigned i;
+#ifdef CONFIG_DM_DEBUG_BLOCK_STACK_TRACING
+        static struct stack_trace t;
+        static stack_entries entries;
+#endif
+        for (i = 0; i < MAX_HOLDERS; i++) {
+                if (lock->holders[i] == current) {
+                        DMERR("recursive lock detected in pool metadata");
+#ifdef CONFIG_DM_DEBUG_BLOCK_STACK_TRACING
+                        DMERR("previously held here:");
+                        print_stack_trace(lock->traces + i, 4);
+                        DMERR("subsequent aquisition attempted here:");
+                        t.nr_entries = 0;
+                        t.max_entries = MAX_STACK;
+                        t.entries = entries;
+                        t.skip = 3;
+                        save_stack_trace(&t);
+                        print_stack_trace(&t, 4);
+#endif
+                        return -EINVAL;
+                }
+        }
+        return 0;
+}
+static void __wait(struct waiter *w)
+{
+        for (;;) {
+                set_task_state(current, TASK_UNINTERRUPTIBLE);
+                if (!w->task)
+                        break;
+                schedule();
+        }
+        set_task_state(current, TASK_RUNNING);
+}
+static void __wake_waiter(struct waiter *w)
+{
+        struct task_struct *task;
+        list_del(&w->list);
+        task = w->task;
+        smp_mb();
+        w->task = NULL;
+        wake_up_process(task);
+}
+/*
+ * We either wake a few readers or a single writer.
+ */
+static void __wake_many(struct block_lock *lock)
+{
+        struct waiter *w, *tmp;
+        BUG_ON(lock->count < 0);
+        list_for_each_entry_safe(w, tmp, &lock->waiters, list) {
+                if (lock->count >= MAX_HOLDERS)
+                        return;
+                if (w->wants_write) {
+                        if (lock->count > 0)
+                                return; /* still read locked */
+                        lock->count = -1;
+                        __add_holder(lock, w->task);
+                        __wake_waiter(w);
+                        return;
+                }
+                lock->count++;
+                __add_holder(lock, w->task);
+                __wake_waiter(w);
+        }
+}
+static void bl_init(struct block_lock *lock)
+{
+        int i;
+        spin_lock_init(&lock->lock);
+        lock->count = 0;
+        INIT_LIST_HEAD(&lock->waiters);
+        for (i = 0; i < MAX_HOLDERS; i++)
+                lock->holders[i] = NULL;
+}
+static int __available_for_read(struct block_lock *lock)
+{
+        return lock->count >= 0 &&
+                lock->count < MAX_HOLDERS &&
+                list_empty(&lock->waiters);
+}
+static int bl_down_read(struct block_lock *lock)
+{
+        int r;
+        struct waiter w;
+        spin_lock(&lock->lock);
+        r = __check_holder(lock);
+        if (r) {
+                spin_unlock(&lock->lock);
+                return r;
+        }
+        if (__available_for_read(lock)) {
+                lock->count++;
+                __add_holder(lock, current);
+                spin_unlock(&lock->lock);
+                return 0;
+        }
+        get_task_struct(current);
+        w.task = current;
+        w.wants_write = 0;
+        list_add_tail(&w.list, &lock->waiters);
+        spin_unlock(&lock->lock);
+        __wait(&w);
+        put_task_struct(current);
+        return 0;
+}
+static int bl_down_read_nonblock(struct block_lock *lock)
+{
+        int r;
+        spin_lock(&lock->lock);
+        r = __check_holder(lock);
+        if (r)
+                goto out;
+        if (__available_for_read(lock)) {
+                lock->count++;
+                __add_holder(lock, current);
+                r = 0;
+        } else
+                r = -EWOULDBLOCK;
+out:
+        spin_unlock(&lock->lock);
+        return r;
+}
+static void bl_up_read(struct block_lock *lock)
+{
+        spin_lock(&lock->lock);
+        BUG_ON(lock->count <= 0);
+        __del_holder(lock, current);
+        --lock->count;
+        if (!list_empty(&lock->waiters))
+                __wake_many(lock);
+        spin_unlock(&lock->lock);
+}
+static int bl_down_write(struct block_lock *lock)
+{
+        int r;
+        struct waiter w;
+        spin_lock(&lock->lock);
+        r = __check_holder(lock);
+        if (r) {
+                spin_unlock(&lock->lock);
+                return r;
+        }
+        if (lock->count == 0 && list_empty(&lock->waiters)) {
+                lock->count = -1;
+                __add_holder(lock, current);
+                spin_unlock(&lock->lock);
+                return 0;
+        }
+        get_task_struct(current);
+        w.task = current;
+        w.wants_write = 1;
+        /*
+         * Writers given priority. We know there's only one mutator in the
+         * system, so ignoring the ordering reversal.
+         */
+        list_add(&w.list, &lock->waiters);
+        spin_unlock(&lock->lock);
+        __wait(&w);
+        put_task_struct(current);
+        return 0;
+}
+static void bl_up_write(struct block_lock *lock)
+{
+        spin_lock(&lock->lock);
+        __del_holder(lock, current);
+        lock->count = 0;
+        if (!list_empty(&lock->waiters))
+                __wake_many(lock);
+        spin_unlock(&lock->lock);
+}
+static void report_recursive_bug(dm_block_t b, int r)
+{
+        if (r == -EINVAL)
+                DMERR("recursive acquisition of block %llu requested.",
+                      (unsigned long long) b);
+}
+/*----------------------------------------------------------------*/
+/*
+ * Block manager is currently implemented using dm-bufio.  struct
+ * dm_block_manager and struct dm_block map directly onto a couple of
+ * structs in the bufio interface.  I want to retain the freedom to move
+ * away from bufio in the future.  So these structs are just cast within
+ * this .c file, rather than making it through to the public interface.
+ */
+static struct dm_buffer *to_buffer(struct dm_block *b)
+{
+        return (struct dm_buffer *) b;
+}
+static struct dm_bufio_client *to_bufio(struct dm_block_manager *bm)
+{
+        return (struct dm_bufio_client *) bm;
+}
+dm_block_t dm_block_location(struct dm_block *b)
+{
+        return dm_bufio_get_block_number(to_buffer(b));
+}
+EXPORT_SYMBOL_GPL(dm_block_location);
+void *dm_block_data(struct dm_block *b)
+{
+        return dm_bufio_get_block_data(to_buffer(b));
+}
+EXPORT_SYMBOL_GPL(dm_block_data);
+struct buffer_aux {
+        struct dm_block_validator *validator;
+        struct block_lock lock;
+        int write_locked;
+};
+static void dm_block_manager_alloc_callback(struct dm_buffer *buf)
+{
+        struct buffer_aux *aux = dm_bufio_get_aux_data(buf);
+        aux->validator = NULL;
+        bl_init(&aux->lock);
+}
+static void dm_block_manager_write_callback(struct dm_buffer *buf)
+{
+        struct buffer_aux *aux = dm_bufio_get_aux_data(buf);
+        if (aux->validator) {
+                aux->validator->prepare_for_write(aux->validator, (struct dm_block *) buf,
+                         dm_bufio_get_block_size(dm_bufio_get_client(buf)));
+        }
+}
+/*----------------------------------------------------------------
+ * Public interface
+ *--------------------------------------------------------------*/
+struct dm_block_manager *dm_block_manager_create(struct block_device *bdev,
+                                                 unsigned block_size,
+                                                 unsigned cache_size,
+                                                 unsigned max_held_per_thread)
+{
+        return (struct dm_block_manager *)
+                dm_bufio_client_create(bdev, block_size, max_held_per_thread,
+                                       sizeof(struct buffer_aux),
+                                       dm_block_manager_alloc_callback,
+                                       dm_block_manager_write_callback);
+}
+EXPORT_SYMBOL_GPL(dm_block_manager_create);
+void dm_block_manager_destroy(struct dm_block_manager *bm)
+{
+        return dm_bufio_client_destroy(to_bufio(bm));
+}
+EXPORT_SYMBOL_GPL(dm_block_manager_destroy);
+unsigned dm_bm_block_size(struct dm_block_manager *bm)
+{
+        return dm_bufio_get_block_size(to_bufio(bm));
+}
+EXPORT_SYMBOL_GPL(dm_bm_block_size);
+dm_block_t dm_bm_nr_blocks(struct dm_block_manager *bm)
+{
+        return dm_bufio_get_device_size(to_bufio(bm));
+}
+static int dm_bm_validate_buffer(struct dm_block_manager *bm,
+                                 struct dm_buffer *buf,
+                                 struct buffer_aux *aux,
+                                 struct dm_block_validator *v)
+{
+        if (unlikely(!aux->validator)) {
+                int r;
+                if (!v)
+                        return 0;
+                r = v->check(v, (struct dm_block *) buf, dm_bufio_get_block_size(to_bufio(bm)));
+                if (unlikely(r))
+                        return r;
+                aux->validator = v;
+        } else {
+                if (unlikely(aux->validator != v)) {
+                        DMERR("validator mismatch (old=%s vs new=%s) for block %llu",
+                                aux->validator->name, v ? v->name : "NULL",
+                                (unsigned long long)
+                                        dm_bufio_get_block_number(buf));
+                        return -EINVAL;
+                }
+        }
+        return 0;
+}
+int dm_bm_read_lock(struct dm_block_manager *bm, dm_block_t b,
+                    struct dm_block_validator *v,
+                    struct dm_block **result)
+{
+        struct buffer_aux *aux;
+        void *p;
+        int r;
+        p = dm_bufio_read(to_bufio(bm), b, (struct dm_buffer **) result);
+        if (unlikely(IS_ERR(p)))
+                return PTR_ERR(p);
+        aux = dm_bufio_get_aux_data(to_buffer(*result));
+        r = bl_down_read(&aux->lock);
+        if (unlikely(r)) {
+                dm_bufio_release(to_buffer(*result));
+                report_recursive_bug(b, r);
+                return r;
+        }
+        aux->write_locked = 0;
+        r = dm_bm_validate_buffer(bm, to_buffer(*result), aux, v);
+        if (unlikely(r)) {
+                bl_up_read(&aux->lock);
+                dm_bufio_release(to_buffer(*result));
+                return r;
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(dm_bm_read_lock);
+int dm_bm_write_lock(struct dm_block_manager *bm,
+                     dm_block_t b, struct dm_block_validator *v,
+                     struct dm_block **result)
+{
+        struct buffer_aux *aux;
+        void *p;
+        int r;
+        p = dm_bufio_read(to_bufio(bm), b, (struct dm_buffer **) result);
+        if (unlikely(IS_ERR(p)))
+                return PTR_ERR(p);
+        aux = dm_bufio_get_aux_data(to_buffer(*result));
+        r = bl_down_write(&aux->lock);
+        if (r) {
+                dm_bufio_release(to_buffer(*result));
+                report_recursive_bug(b, r);
+                return r;
+        }
+        aux->write_locked = 1;
+        r = dm_bm_validate_buffer(bm, to_buffer(*result), aux, v);
+        if (unlikely(r)) {
+                bl_up_write(&aux->lock);
+                dm_bufio_release(to_buffer(*result));
+                return r;
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(dm_bm_write_lock);
+int dm_bm_read_try_lock(struct dm_block_manager *bm,
+                        dm_block_t b, struct dm_block_validator *v,
+                        struct dm_block **result)
+{
+        struct buffer_aux *aux;
+        void *p;
+        int r;
+        p = dm_bufio_get(to_bufio(bm), b, (struct dm_buffer **) result);
+        if (unlikely(IS_ERR(p)))
+                return PTR_ERR(p);
+        if (unlikely(!p))
+                return -EWOULDBLOCK;
+        aux = dm_bufio_get_aux_data(to_buffer(*result));
+        r = bl_down_read_nonblock(&aux->lock);
+        if (r < 0) {
+                dm_bufio_release(to_buffer(*result));
+                report_recursive_bug(b, r);
+                return r;
+        }
+        aux->write_locked = 0;
+        r = dm_bm_validate_buffer(bm, to_buffer(*result), aux, v);
+        if (unlikely(r)) {
+                bl_up_read(&aux->lock);
+                dm_bufio_release(to_buffer(*result));
+                return r;
+        }
+        return 0;
+}
+int dm_bm_write_lock_zero(struct dm_block_manager *bm,
+                          dm_block_t b, struct dm_block_validator *v,
+                          struct dm_block **result)
+{
+        int r;
+        struct buffer_aux *aux;
+        void *p;
+        p = dm_bufio_new(to_bufio(bm), b, (struct dm_buffer **) result);
+        if (unlikely(IS_ERR(p)))
+                return PTR_ERR(p);
+        memset(p, 0, dm_bm_block_size(bm));
+        aux = dm_bufio_get_aux_data(to_buffer(*result));
+        r = bl_down_write(&aux->lock);
+        if (r) {
+                dm_bufio_release(to_buffer(*result));
+                return r;
+        }
+        aux->write_locked = 1;
+        aux->validator = v;
+        return 0;
+}
+int dm_bm_unlock(struct dm_block *b)
+{
+        struct buffer_aux *aux;
+        aux = dm_bufio_get_aux_data(to_buffer(b));
+        if (aux->write_locked) {
+                dm_bufio_mark_buffer_dirty(to_buffer(b));
+                bl_up_write(&aux->lock);
+        } else
+                bl_up_read(&aux->lock);
+        dm_bufio_release(to_buffer(b));
+        return 0;
+}
+EXPORT_SYMBOL_GPL(dm_bm_unlock);
+int dm_bm_unlock_move(struct dm_block *b, dm_block_t n)
+{
+        struct buffer_aux *aux;
+        aux = dm_bufio_get_aux_data(to_buffer(b));
+        if (aux->write_locked) {
+                dm_bufio_mark_buffer_dirty(to_buffer(b));
+                bl_up_write(&aux->lock);
+        } else
+                bl_up_read(&aux->lock);
+        dm_bufio_release_move(to_buffer(b), n);
+        return 0;
+}
+int dm_bm_flush_and_unlock(struct dm_block_manager *bm,
+                           struct dm_block *superblock)
+{
+        int r;
+        r = dm_bufio_write_dirty_buffers(to_bufio(bm));
+        if (unlikely(r))
+                return r;
+        r = dm_bufio_issue_flush(to_bufio(bm));
+        if (unlikely(r))
+                return r;
+        dm_bm_unlock(superblock);
+        r = dm_bufio_write_dirty_buffers(to_bufio(bm));
+        if (unlikely(r))
+                return r;
+        r = dm_bufio_issue_flush(to_bufio(bm));
+        if (unlikely(r))
+                return r;
+        return 0;
+}
+u32 dm_bm_checksum(const void *data, size_t len, u32 init_xor)
+{
+        return crc32c(~(u32) 0, data, len) ^ init_xor;
+}
+EXPORT_SYMBOL_GPL(dm_bm_checksum);
+/*----------------------------------------------------------------*/
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Joe Thornber <dm-devel@redhat.com>");
+MODULE_DESCRIPTION("Immutable metadata library for dm");
+/*----------------------------------------------------------------*/
diff --git a/drivers/md/persistent-data/dm-block-manager.h b/drivers/md/persistent-data/dm-block-manager.h
new file mode 100644
index 000000000000..924833d2dfa6
--- /dev/null
+++ b/drivers/md/persistent-data/dm-block-manager.h
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This file is released under the GPL.
+ */
+#ifndef _LINUX_DM_BLOCK_MANAGER_H
+#define _LINUX_DM_BLOCK_MANAGER_H
+#include <linux/types.h>
+#include <linux/blkdev.h>
+/*----------------------------------------------------------------*/
+/*
+ * Block number.
+ */
+typedef uint64_t dm_block_t;
+struct dm_block;
+dm_block_t dm_block_location(struct dm_block *b);
+void *dm_block_data(struct dm_block *b);
+/*----------------------------------------------------------------*/
+/*
+ * @name should be a unique identifier for the block manager, no longer
+ * than 32 chars.
+ *
+ * @max_held_per_thread should be the maximum number of locks, read or
+ * write, that an individual thread holds at any one time.
+ */
+struct dm_block_manager;
+struct dm_block_manager *dm_block_manager_create(
+        struct block_device *bdev, unsigned block_size,
+        unsigned cache_size, unsigned max_held_per_thread);
+void dm_block_manager_destroy(struct dm_block_manager *bm);
+unsigned dm_bm_block_size(struct dm_block_manager *bm);
+dm_block_t dm_bm_nr_blocks(struct dm_block_manager *bm);
+/*----------------------------------------------------------------*/
+/*
+ * The validator allows the caller to verify newly-read data and modify
+ * the data just before writing, e.g. to calculate checksums.  It's
+ * important to be consistent with your use of validators.  The only time
+ * you can change validators is if you call dm_bm_write_lock_zero.
+ */
+struct dm_block_validator {
+        const char *name;
+        void (*prepare_for_write)(struct dm_block_validator *v, struct dm_block *b, size_t block_size);
+        /*
+         * Return 0 if the checksum is valid or < 0 on error.
+         */
+        int (*check)(struct dm_block_validator *v, struct dm_block *b, size_t block_size);
+};
+/*----------------------------------------------------------------*/
+/*
+ * You can have multiple concurrent readers or a single writer holding a
+ * block lock.
+ */
+/*
+ * dm_bm_lock() locks a block and returns through @result a pointer to
+ * memory that holds a copy of that block.  If you have write-locked the
+ * block then any changes you make to memory pointed to by @result will be
+ * written back to the disk sometime after dm_bm_unlock is called.
+ */
+int dm_bm_read_lock(struct dm_block_manager *bm, dm_block_t b,
+                    struct dm_block_validator *v,
+                    struct dm_block **result);
+int dm_bm_write_lock(struct dm_block_manager *bm, dm_block_t b,
+                     struct dm_block_validator *v,
+                     struct dm_block **result);
+/*
+ * The *_try_lock variants return -EWOULDBLOCK if the block isn't
+ * available immediately.
+ */
+int dm_bm_read_try_lock(struct dm_block_manager *bm, dm_block_t b,
+                        struct dm_block_validator *v,
+                        struct dm_block **result);
+/*
+ * Use dm_bm_write_lock_zero() when you know you're going to
+ * overwrite the block completely.  It saves a disk read.
+ */
+int dm_bm_write_lock_zero(struct dm_block_manager *bm, dm_block_t b,
+                          struct dm_block_validator *v,
+                          struct dm_block **result);
+int dm_bm_unlock(struct dm_block *b);
+/*
+ * An optimisation; we often want to copy a block's contents to a new
+ * block.  eg, as part of the shadowing operation.  It's far better for
+ * bufio to do this move behind the scenes than hold 2 locks and memcpy the
+ * data.
+ */
+int dm_bm_unlock_move(struct dm_block *b, dm_block_t n);
+/*
+ * It's a common idiom to have a superblock that should be committed last.
+ *
+ * @superblock should be write-locked on entry. It will be unlocked during
+ * this function.  All dirty blocks are guaranteed to be written and flushed
+ * before the superblock.
+ *
+ * This method always blocks.
+ */
+int dm_bm_flush_and_unlock(struct dm_block_manager *bm,
+                           struct dm_block *superblock);
+u32 dm_bm_checksum(const void *data, size_t len, u32 init_xor);
+/*----------------------------------------------------------------*/
+#endif  /* _LINUX_DM_BLOCK_MANAGER_H */
diff --git a/drivers/md/persistent-data/dm-btree-internal.h b/drivers/md/persistent-data/dm-btree-internal.h
new file mode 100644
index 000000000000..d279c768f8f1
--- /dev/null
+++ b/drivers/md/persistent-data/dm-btree-internal.h
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This file is released under the GPL.
+ */
+#ifndef DM_BTREE_INTERNAL_H
+#define DM_BTREE_INTERNAL_H
+#include "dm-btree.h"
+/*----------------------------------------------------------------*/
+/*
+ * We'll need 2 accessor functions for n->csum and n->blocknr
+ * to support dm-btree-spine.c in that case.
+ */
+enum node_flags {
+        INTERNAL_NODE = 1,
+        LEAF_NODE = 1 << 1
+};
+/*
+ * Every btree node begins with this structure.  Make sure it's a multiple
+ * of 8-bytes in size, otherwise the 64bit keys will be mis-aligned.
+ */
+struct node_header {
+        __le32 csum;
+        __le32 flags;
+        __le64 blocknr; /* Block this node is supposed to live in. */
+        __le32 nr_entries;
+        __le32 max_entries;
+        __le32 value_size;
+        __le32 padding;
+} __packed;
+struct node {
+        struct node_header header;
+        __le64 keys[0];
+} __packed;
+void inc_children(struct dm_transaction_manager *tm, struct node *n,
+                  struct dm_btree_value_type *vt);
+int new_block(struct dm_btree_info *info, struct dm_block **result);
+int unlock_block(struct dm_btree_info *info, struct dm_block *b);
+/*
+ * Spines keep track of the rolling locks.  There are 2 variants, read-only
+ * and one that uses shadowing.  These are separate structs to allow the
+ * type checker to spot misuse, for example accidentally calling read_lock
+ * on a shadow spine.
+ */
+struct ro_spine {
+        struct dm_btree_info *info;
+        int count;
+        struct dm_block *nodes[2];
+};
+void init_ro_spine(struct ro_spine *s, struct dm_btree_info *info);
+int exit_ro_spine(struct ro_spine *s);
+int ro_step(struct ro_spine *s, dm_block_t new_child);
+struct node *ro_node(struct ro_spine *s);
+struct shadow_spine {
+        struct dm_btree_info *info;
+        int count;
+        struct dm_block *nodes[2];
+        dm_block_t root;
+};
+void init_shadow_spine(struct shadow_spine *s, struct dm_btree_info *info);
+int exit_shadow_spine(struct shadow_spine *s);
+int shadow_step(struct shadow_spine *s, dm_block_t b,
+                struct dm_btree_value_type *vt);
+/*
+ * The spine must have at least one entry before calling this.
+ */
+struct dm_block *shadow_current(struct shadow_spine *s);
+/*
+ * The spine must have at least two entries before calling this.
+ */
+struct dm_block *shadow_parent(struct shadow_spine *s);
+int shadow_has_parent(struct shadow_spine *s);
+int shadow_root(struct shadow_spine *s);
+/*
+ * Some inlines.
+ */
+static inline __le64 *key_ptr(struct node *n, uint32_t index)
+{
+        return n->keys + index;
+}
+static inline void *value_base(struct node *n)
+{
+        return &n->keys[le32_to_cpu(n->header.max_entries)];
+}
+/*
+ * FIXME: Now that value size is stored in node we don't need the third parm.
+ */
+static inline void *value_ptr(struct node *n, uint32_t index, size_t value_size)
+{
+        BUG_ON(value_size != le32_to_cpu(n->header.value_size));
+        return value_base(n) + (value_size * index);
+}
+/*
+ * Assumes the values are suitably-aligned and converts to core format.
+ */
+static inline uint64_t value64(struct node *n, uint32_t index)
+{
+        __le64 *values_le = value_base(n);
+        return le64_to_cpu(values_le[index]);
+}
+/*
+ * Searching for a key within a single node.
+ */
+int lower_bound(struct node *n, uint64_t key);
+extern struct dm_block_validator btree_node_validator;
+#endif  /* DM_BTREE_INTERNAL_H */
diff --git a/drivers/md/persistent-data/dm-btree-remove.c b/drivers/md/persistent-data/dm-btree-remove.c
new file mode 100644
index 000000000000..65fd85ec6514
--- /dev/null
+++ b/drivers/md/persistent-data/dm-btree-remove.c
@@ -0,0 +1,566 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This file is released under the GPL.
+ */
+#include "dm-btree.h"
+#include "dm-btree-internal.h"
+#include "dm-transaction-manager.h"
+#include <linux/module.h>
+/*
+ * Removing an entry from a btree
+ * ==============================
+ *
+ * A very important constraint for our btree is that no node, except the
+ * root, may have fewer than a certain number of entries.
+ * (MIN_ENTRIES <= nr_entries <= MAX_ENTRIES).
+ *
+ * Ensuring this is complicated by the way we want to only ever hold the
+ * locks on 2 nodes concurrently, and only change nodes in a top to bottom
+ * fashion.
+ *
+ * Each node may have a left or right sibling.  When decending the spine,
+ * if a node contains only MIN_ENTRIES then we try and increase this to at
+ * least MIN_ENTRIES + 1.  We do this in the following ways:
+ *
+ * [A] No siblings => this can only happen if the node is the root, in which
+ *     case we copy the childs contents over the root.
+ *
+ * [B] No left sibling
+ *     ==> rebalance(node, right sibling)
+ *
+ * [C] No right sibling
+ *     ==> rebalance(left sibling, node)
+ *
+ * [D] Both siblings, total_entries(left, node, right) <= DEL_THRESHOLD
+ *     ==> delete node adding it's contents to left and right
+ *
+ * [E] Both siblings, total_entries(left, node, right) > DEL_THRESHOLD
+ *     ==> rebalance(left, node, right)
+ *
+ * After these operations it's possible that the our original node no
+ * longer contains the desired sub tree.  For this reason this rebalancing
+ * is performed on the children of the current node.  This also avoids
+ * having a special case for the root.
+ *
+ * Once this rebalancing has occurred we can then step into the child node
+ * for internal nodes.  Or delete the entry for leaf nodes.
+ */
+/*
+ * Some little utilities for moving node data around.
+ */
+static void node_shift(struct node *n, int shift)
+{
+        uint32_t nr_entries = le32_to_cpu(n->header.nr_entries);
+        uint32_t value_size = le32_to_cpu(n->header.value_size);
+        if (shift < 0) {
+                shift = -shift;
+                BUG_ON(shift > nr_entries);
+                BUG_ON((void *) key_ptr(n, shift) >= value_ptr(n, shift, value_size));
+                memmove(key_ptr(n, 0),
+                        key_ptr(n, shift),
+                        (nr_entries - shift) * sizeof(__le64));
+                memmove(value_ptr(n, 0, value_size),
+                        value_ptr(n, shift, value_size),
+                        (nr_entries - shift) * value_size);
+        } else {
+                BUG_ON(nr_entries + shift > le32_to_cpu(n->header.max_entries));
+                memmove(key_ptr(n, shift),
+                        key_ptr(n, 0),
+                        nr_entries * sizeof(__le64));
+                memmove(value_ptr(n, shift, value_size),
+                        value_ptr(n, 0, value_size),
+                        nr_entries * value_size);
+        }
+}
+static void node_copy(struct node *left, struct node *right, int shift)
+{
+        uint32_t nr_left = le32_to_cpu(left->header.nr_entries);
+        uint32_t value_size = le32_to_cpu(left->header.value_size);
+        BUG_ON(value_size != le32_to_cpu(right->header.value_size));
+        if (shift < 0) {
+                shift = -shift;
+                BUG_ON(nr_left + shift > le32_to_cpu(left->header.max_entries));
+                memcpy(key_ptr(left, nr_left),
+                       key_ptr(right, 0),
+                       shift * sizeof(__le64));
+                memcpy(value_ptr(left, nr_left, value_size),
+                       value_ptr(right, 0, value_size),
+                       shift * value_size);
+        } else {
+                BUG_ON(shift > le32_to_cpu(right->header.max_entries));
+                memcpy(key_ptr(right, 0),
+                       key_ptr(left, nr_left - shift),
+                       shift * sizeof(__le64));
+                memcpy(value_ptr(right, 0, value_size),
+                       value_ptr(left, nr_left - shift, value_size),
+                       shift * value_size);
+        }
+}
+/*
+ * Delete a specific entry from a leaf node.
+ */
+static void delete_at(struct node *n, unsigned index)
+{
+        unsigned nr_entries = le32_to_cpu(n->header.nr_entries);
+        unsigned nr_to_copy = nr_entries - (index + 1);
+        uint32_t value_size = le32_to_cpu(n->header.value_size);
+        BUG_ON(index >= nr_entries);
+        if (nr_to_copy) {
+                memmove(key_ptr(n, index),
+                        key_ptr(n, index + 1),
+                        nr_to_copy * sizeof(__le64));
+                memmove(value_ptr(n, index, value_size),
+                        value_ptr(n, index + 1, value_size),
+                        nr_to_copy * value_size);
+        }
+        n->header.nr_entries = cpu_to_le32(nr_entries - 1);
+}
+static unsigned del_threshold(struct node *n)
+{
+        return le32_to_cpu(n->header.max_entries) / 3;
+}
+static unsigned merge_threshold(struct node *n)
+{
+        /*
+         * The extra one is because we know we're potentially going to
+         * delete an entry.
+         */
+        return 2 * (le32_to_cpu(n->header.max_entries) / 3) + 1;
+}
+struct child {
+        unsigned index;
+        struct dm_block *block;
+        struct node *n;
+};
+static struct dm_btree_value_type le64_type = {
+        .context = NULL,
+        .size = sizeof(__le64),
+        .inc = NULL,
+        .dec = NULL,
+        .equal = NULL
+};
+static int init_child(struct dm_btree_info *info, struct node *parent,
+                      unsigned index, struct child *result)
+{
+        int r, inc;
+        dm_block_t root;
+        result->index = index;
+        root = value64(parent, index);
+        r = dm_tm_shadow_block(info->tm, root, &btree_node_validator,
+                               &result->block, &inc);
+        if (r)
+                return r;
+        result->n = dm_block_data(result->block);
+        if (inc)
+                inc_children(info->tm, result->n, &le64_type);
+        *((__le64 *) value_ptr(parent, index, sizeof(__le64))) =
+                cpu_to_le64(dm_block_location(result->block));
+        return 0;
+}
+static int exit_child(struct dm_btree_info *info, struct child *c)
+{
+        return dm_tm_unlock(info->tm, c->block);
+}
+static void shift(struct node *left, struct node *right, int count)
+{
+        if (!count)
+                return;
+        if (count > 0) {
+                node_shift(right, count);
+                node_copy(left, right, count);
+        } else {
+                node_copy(left, right, count);
+                node_shift(right, count);
+        }
+        left->header.nr_entries =
+                cpu_to_le32(le32_to_cpu(left->header.nr_entries) - count);
+        BUG_ON(le32_to_cpu(left->header.nr_entries) > le32_to_cpu(left->header.max_entries));
+        right->header.nr_entries =
+                cpu_to_le32(le32_to_cpu(right->header.nr_entries) + count);
+        BUG_ON(le32_to_cpu(right->header.nr_entries) > le32_to_cpu(right->header.max_entries));
+}
+static void __rebalance2(struct dm_btree_info *info, struct node *parent,
+                         struct child *l, struct child *r)
+{
+        struct node *left = l->n;
+        struct node *right = r->n;
+        uint32_t nr_left = le32_to_cpu(left->header.nr_entries);
+        uint32_t nr_right = le32_to_cpu(right->header.nr_entries);
+        if (nr_left + nr_right <= merge_threshold(left)) {
+                /*
+                 * Merge
+                 */
+                node_copy(left, right, -nr_right);
+                left->header.nr_entries = cpu_to_le32(nr_left + nr_right);
+                delete_at(parent, r->index);
+                /*
+                 * We need to decrement the right block, but not it's
+                 * children, since they're still referenced by left.
+                 */
+                dm_tm_dec(info->tm, dm_block_location(r->block));
+        } else {
+                /*
+                 * Rebalance.
+                 */
+                unsigned target_left = (nr_left + nr_right) / 2;
+                unsigned shift_ = nr_left - target_left;
+                BUG_ON(le32_to_cpu(left->header.max_entries) <= nr_left - shift_);
+                BUG_ON(le32_to_cpu(right->header.max_entries) <= nr_right + shift_);
+                shift(left, right, nr_left - target_left);
+                *key_ptr(parent, r->index) = right->keys[0];
+        }
+}
+static int rebalance2(struct shadow_spine *s, struct dm_btree_info *info,
+                      unsigned left_index)
+{
+        int r;
+        struct node *parent;
+        struct child left, right;
+        parent = dm_block_data(shadow_current(s));
+        r = init_child(info, parent, left_index, &left);
+        if (r)
+                return r;
+        r = init_child(info, parent, left_index + 1, &right);
+        if (r) {
+                exit_child(info, &left);
+                return r;
+        }
+        __rebalance2(info, parent, &left, &right);
+        r = exit_child(info, &left);
+        if (r) {
+                exit_child(info, &right);
+                return r;
+        }
+        return exit_child(info, &right);
+}
+static void __rebalance3(struct dm_btree_info *info, struct node *parent,
+                         struct child *l, struct child *c, struct child *r)
+{
+        struct node *left = l->n;
+        struct node *center = c->n;
+        struct node *right = r->n;
+        uint32_t nr_left = le32_to_cpu(left->header.nr_entries);
+        uint32_t nr_center = le32_to_cpu(center->header.nr_entries);
+        uint32_t nr_right = le32_to_cpu(right->header.nr_entries);
+        uint32_t max_entries = le32_to_cpu(left->header.max_entries);
+        unsigned target;
+        BUG_ON(left->header.max_entries != center->header.max_entries);
+        BUG_ON(center->header.max_entries != right->header.max_entries);
+        if (((nr_left + nr_center + nr_right) / 2) < merge_threshold(center)) {
+                /*
+                 * Delete center node:
+                 *
+                 * We dump as many entries from center as possible into
+                 * left, then the rest in right, then rebalance2.  This
+                 * wastes some cpu, but I want something simple atm.
+                 */
+                unsigned shift = min(max_entries - nr_left, nr_center);
+                BUG_ON(nr_left + shift > max_entries);
+                node_copy(left, center, -shift);
+                left->header.nr_entries = cpu_to_le32(nr_left + shift);
+                if (shift != nr_center) {
+                        shift = nr_center - shift;
+                        BUG_ON((nr_right + shift) >= max_entries);
+                        node_shift(right, shift);
+                        node_copy(center, right, shift);
+                        right->header.nr_entries = cpu_to_le32(nr_right + shift);
+                }
+                *key_ptr(parent, r->index) = right->keys[0];
+                delete_at(parent, c->index);
+                r->index--;
+                dm_tm_dec(info->tm, dm_block_location(c->block));
+                __rebalance2(info, parent, l, r);
+                return;
+        }
+        /*
+         * Rebalance
+         */
+        target = (nr_left + nr_center + nr_right) / 3;
+        BUG_ON(target > max_entries);
+        /*
+         * Adjust the left node
+         */
+        shift(left, center, nr_left - target);
+        /*
+         * Adjust the right node
+         */
+        shift(center, right, target - nr_right);
+        *key_ptr(parent, c->index) = center->keys[0];
+        *key_ptr(parent, r->index) = right->keys[0];
+}
+static int rebalance3(struct shadow_spine *s, struct dm_btree_info *info,
+                      unsigned left_index)
+{
+        int r;
+        struct node *parent = dm_block_data(shadow_current(s));
+        struct child left, center, right;
+        /*
+         * FIXME: fill out an array?
+         */
+        r = init_child(info, parent, left_index, &left);
+        if (r)
+                return r;
+        r = init_child(info, parent, left_index + 1, &center);
+        if (r) {
+                exit_child(info, &left);
+                return r;
+        }
+        r = init_child(info, parent, left_index + 2, &right);
+        if (r) {
+                exit_child(info, &left);
+                exit_child(info, &center);
+                return r;
+        }
+        __rebalance3(info, parent, &left, &center, &right);
+        r = exit_child(info, &left);
+        if (r) {
+                exit_child(info, &center);
+                exit_child(info, &right);
+                return r;
+        }
+        r = exit_child(info, &center);
+        if (r) {
+                exit_child(info, &right);
+                return r;
+        }
+        r = exit_child(info, &right);
+        if (r)
+                return r;
+        return 0;
+}
+static int get_nr_entries(struct dm_transaction_manager *tm,
+                          dm_block_t b, uint32_t *result)
+{
+        int r;
+        struct dm_block *block;
+        struct node *n;
+        r = dm_tm_read_lock(tm, b, &btree_node_validator, &block);
+        if (r)
+                return r;
+        n = dm_block_data(block);
+        *result = le32_to_cpu(n->header.nr_entries);
+        return dm_tm_unlock(tm, block);
+}
+static int rebalance_children(struct shadow_spine *s,
+                              struct dm_btree_info *info, uint64_t key)
+{
+        int i, r, has_left_sibling, has_right_sibling;
+        uint32_t child_entries;
+        struct node *n;
+        n = dm_block_data(shadow_current(s));
+        if (le32_to_cpu(n->header.nr_entries) == 1) {
+                struct dm_block *child;
+                dm_block_t b = value64(n, 0);
+                r = dm_tm_read_lock(info->tm, b, &btree_node_validator, &child);
+                if (r)
+                        return r;
+                memcpy(n, dm_block_data(child),
+                       dm_bm_block_size(dm_tm_get_bm(info->tm)));
+                r = dm_tm_unlock(info->tm, child);
+                if (r)
+                        return r;
+                dm_tm_dec(info->tm, dm_block_location(child));
+                return 0;
+        }
+        i = lower_bound(n, key);
+        if (i < 0)
+                return -ENODATA;
+        r = get_nr_entries(info->tm, value64(n, i), &child_entries);
+        if (r)
+                return r;
+        if (child_entries > del_threshold(n))
+                return 0;
+        has_left_sibling = i > 0;
+        has_right_sibling = i < (le32_to_cpu(n->header.nr_entries) - 1);
+        if (!has_left_sibling)
+                r = rebalance2(s, info, i);
+        else if (!has_right_sibling)
+                r = rebalance2(s, info, i - 1);
+        else
+                r = rebalance3(s, info, i - 1);
+        return r;
+}
+static int do_leaf(struct node *n, uint64_t key, unsigned *index)
+{
+        int i = lower_bound(n, key);
+        if ((i < 0) ||
+            (i >= le32_to_cpu(n->header.nr_entries)) ||
+            (le64_to_cpu(n->keys[i]) != key))
+                return -ENODATA;
+        *index = i;
+        return 0;
+}
+/*
+ * Prepares for removal from one level of the hierarchy.  The caller must
+ * call delete_at() to remove the entry at index.
+ */
+static int remove_raw(struct shadow_spine *s, struct dm_btree_info *info,
+                      struct dm_btree_value_type *vt, dm_block_t root,
+                      uint64_t key, unsigned *index)
+{
+        int i = *index, r;
+        struct node *n;
+        for (;;) {
+                r = shadow_step(s, root, vt);
+                if (r < 0)
+                        break;
+                /*
+                 * We have to patch up the parent node, ugly, but I don't
+                 * see a way to do this automatically as part of the spine
+                 * op.
+                 */
+                if (shadow_has_parent(s)) {
+                        __le64 location = cpu_to_le64(dm_block_location(shadow_current(s)));
+                        memcpy(value_ptr(dm_block_data(shadow_parent(s)), i, sizeof(__le64)),
+                               &location, sizeof(__le64));
+                }
+                n = dm_block_data(shadow_current(s));
+                if (le32_to_cpu(n->header.flags) & LEAF_NODE)
+                        return do_leaf(n, key, index);
+                r = rebalance_children(s, info, key);
+                if (r)
+                        break;
+                n = dm_block_data(shadow_current(s));
+                if (le32_to_cpu(n->header.flags) & LEAF_NODE)
+                        return do_leaf(n, key, index);
+                i = lower_bound(n, key);
+                /*
+                 * We know the key is present, or else
+                 * rebalance_children would have returned
+                 * -ENODATA
+                 */
+                root = value64(n, i);
+        }
+        return r;
+}
+int dm_btree_remove(struct dm_btree_info *info, dm_block_t root,
+                    uint64_t *keys, dm_block_t *new_root)
+{
+        unsigned level, last_level = info->levels - 1;
+        int index = 0, r = 0;
+        struct shadow_spine spine;
+        struct node *n;
+        init_shadow_spine(&spine, info);
+        for (level = 0; level < info->levels; level++) {
+                r = remove_raw(&spine, info,
+                               (level == last_level ?
+                                &info->value_type : &le64_type),
+                               root, keys[level], (unsigned *)&index);
+                if (r < 0)
+                        break;
+                n = dm_block_data(shadow_current(&spine));
+                if (level != last_level) {
+                        root = value64(n, index);
+                        continue;
+                }
+                BUG_ON(index < 0 || index >= le32_to_cpu(n->header.nr_entries));
+                if (info->value_type.dec)
+                        info->value_type.dec(info->value_type.context,
+                                             value_ptr(n, index, info->value_type.size));
+                delete_at(n, index);
+        }
+        *new_root = shadow_root(&spine);
+        exit_shadow_spine(&spine);
+        return r;
+}
+EXPORT_SYMBOL_GPL(dm_btree_remove);
diff --git a/drivers/md/persistent-data/dm-btree-spine.c b/drivers/md/persistent-data/dm-btree-spine.c
new file mode 100644
index 000000000000..d9a7912ee8ee
--- /dev/null
+++ b/drivers/md/persistent-data/dm-btree-spine.c
@@ -0,0 +1,244 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This file is released under the GPL.
+ */
+#include "dm-btree-internal.h"
+#include "dm-transaction-manager.h"
+#include <linux/device-mapper.h>
+#define DM_MSG_PREFIX "btree spine"
+/*----------------------------------------------------------------*/
+#define BTREE_CSUM_XOR 121107
+static int node_check(struct dm_block_validator *v,
+                      struct dm_block *b,
+                      size_t block_size);
+static void node_prepare_for_write(struct dm_block_validator *v,
+                                   struct dm_block *b,
+                                   size_t block_size)
+{
+        struct node *n = dm_block_data(b);
+        struct node_header *h = &n->header;
+        h->blocknr = cpu_to_le64(dm_block_location(b));
+        h->csum = cpu_to_le32(dm_bm_checksum(&h->flags,
+                                             block_size - sizeof(__le32),
+                                             BTREE_CSUM_XOR));
+        BUG_ON(node_check(v, b, 4096));
+}
+static int node_check(struct dm_block_validator *v,
+                      struct dm_block *b,
+                      size_t block_size)
+{
+        struct node *n = dm_block_data(b);
+        struct node_header *h = &n->header;
+        size_t value_size;
+        __le32 csum_disk;
+        uint32_t flags;
+        if (dm_block_location(b) != le64_to_cpu(h->blocknr)) {
+                DMERR("node_check failed blocknr %llu wanted %llu",
+                      le64_to_cpu(h->blocknr), dm_block_location(b));
+                return -ENOTBLK;
+        }
+        csum_disk = cpu_to_le32(dm_bm_checksum(&h->flags,
+                                               block_size - sizeof(__le32),
+                                               BTREE_CSUM_XOR));
+        if (csum_disk != h->csum) {
+                DMERR("node_check failed csum %u wanted %u",
+                      le32_to_cpu(csum_disk), le32_to_cpu(h->csum));
+                return -EILSEQ;
+        }
+        value_size = le32_to_cpu(h->value_size);
+        if (sizeof(struct node_header) +
+            (sizeof(__le64) + value_size) * le32_to_cpu(h->max_entries) > block_size) {
+                DMERR("node_check failed: max_entries too large");
+                return -EILSEQ;
+        }
+        if (le32_to_cpu(h->nr_entries) > le32_to_cpu(h->max_entries)) {
+                DMERR("node_check failed, too many entries");
+                return -EILSEQ;
+        }
+        /*
+         * The node must be either INTERNAL or LEAF.
+         */
+        flags = le32_to_cpu(h->flags);
+        if (!(flags & INTERNAL_NODE) && !(flags & LEAF_NODE)) {
+                DMERR("node_check failed, node is neither INTERNAL or LEAF");
+                return -EILSEQ;
+        }
+        return 0;
+}
+struct dm_block_validator btree_node_validator = {
+        .name = "btree_node",
+        .prepare_for_write = node_prepare_for_write,
+        .check = node_check
+};
+/*----------------------------------------------------------------*/
+static int bn_read_lock(struct dm_btree_info *info, dm_block_t b,
+                 struct dm_block **result)
+{
+        return dm_tm_read_lock(info->tm, b, &btree_node_validator, result);
+}
+static int bn_shadow(struct dm_btree_info *info, dm_block_t orig,
+              struct dm_btree_value_type *vt,
+              struct dm_block **result)
+{
+        int r, inc;
+        r = dm_tm_shadow_block(info->tm, orig, &btree_node_validator,
+                               result, &inc);
+        if (!r && inc)
+                inc_children(info->tm, dm_block_data(*result), vt);
+        return r;
+}
+int new_block(struct dm_btree_info *info, struct dm_block **result)
+{
+        return dm_tm_new_block(info->tm, &btree_node_validator, result);
+}
+int unlock_block(struct dm_btree_info *info, struct dm_block *b)
+{
+        return dm_tm_unlock(info->tm, b);
+}
+/*----------------------------------------------------------------*/
+void init_ro_spine(struct ro_spine *s, struct dm_btree_info *info)
+{
+        s->info = info;
+        s->count = 0;
+        s->nodes[0] = NULL;
+        s->nodes[1] = NULL;
+}
+int exit_ro_spine(struct ro_spine *s)
+{
+        int r = 0, i;
+        for (i = 0; i < s->count; i++) {
+                int r2 = unlock_block(s->info, s->nodes[i]);
+                if (r2 < 0)
+                        r = r2;
+        }
+        return r;
+}
+int ro_step(struct ro_spine *s, dm_block_t new_child)
+{
+        int r;
+        if (s->count == 2) {
+                r = unlock_block(s->info, s->nodes[0]);
+                if (r < 0)
+                        return r;
+                s->nodes[0] = s->nodes[1];
+                s->count--;
+        }
+        r = bn_read_lock(s->info, new_child, s->nodes + s->count);
+        if (!r)
+                s->count++;
+        return r;
+}
+struct node *ro_node(struct ro_spine *s)
+{
+        struct dm_block *block;
+        BUG_ON(!s->count);
+        block = s->nodes[s->count - 1];
+        return dm_block_data(block);
+}
+/*----------------------------------------------------------------*/
+void init_shadow_spine(struct shadow_spine *s, struct dm_btree_info *info)
+{
+        s->info = info;
+        s->count = 0;
+}
+int exit_shadow_spine(struct shadow_spine *s)
+{
+        int r = 0, i;
+        for (i = 0; i < s->count; i++) {
+                int r2 = unlock_block(s->info, s->nodes[i]);
+                if (r2 < 0)
+                        r = r2;
+        }
+        return r;
+}
+int shadow_step(struct shadow_spine *s, dm_block_t b,
+                struct dm_btree_value_type *vt)
+{
+        int r;
+        if (s->count == 2) {
+                r = unlock_block(s->info, s->nodes[0]);
+                if (r < 0)
+                        return r;
+                s->nodes[0] = s->nodes[1];
+                s->count--;
+        }
+        r = bn_shadow(s->info, b, vt, s->nodes + s->count);
+        if (!r) {
+                if (!s->count)
+                        s->root = dm_block_location(s->nodes[0]);
+                s->count++;
+        }
+        return r;
+}
+struct dm_block *shadow_current(struct shadow_spine *s)
+{
+        BUG_ON(!s->count);
+        return s->nodes[s->count - 1];
+}
+struct dm_block *shadow_parent(struct shadow_spine *s)
+{
+        BUG_ON(s->count != 2);
+        return s->count == 2 ? s->nodes[0] : NULL;
+}
+int shadow_has_parent(struct shadow_spine *s)
+{
+        return s->count >= 2;
+}
+int shadow_root(struct shadow_spine *s)
+{
+        return s->root;
+}
diff --git a/drivers/md/persistent-data/dm-btree.c b/drivers/md/persistent-data/dm-btree.c
new file mode 100644
index 000000000000..e0638be53ea4
--- /dev/null
+++ b/drivers/md/persistent-data/dm-btree.c
@@ -0,0 +1,805 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This file is released under the GPL.
+ */
+#include "dm-btree-internal.h"
+#include "dm-space-map.h"
+#include "dm-transaction-manager.h"
+#include <linux/module.h>
+#include <linux/device-mapper.h>
+#define DM_MSG_PREFIX "btree"
+/*----------------------------------------------------------------
+ * Array manipulation
+ *--------------------------------------------------------------*/
+static void memcpy_disk(void *dest, const void *src, size_t len)
+        __dm_written_to_disk(src)
+{
+        memcpy(dest, src, len);
+        __dm_unbless_for_disk(src);
+}
+static void array_insert(void *base, size_t elt_size, unsigned nr_elts,
+                         unsigned index, void *elt)
+        __dm_written_to_disk(elt)
+{
+        if (index < nr_elts)
+                memmove(base + (elt_size * (index + 1)),
+                        base + (elt_size * index),
+                        (nr_elts - index) * elt_size);
+        memcpy_disk(base + (elt_size * index), elt, elt_size);
+}
+/*----------------------------------------------------------------*/
+/* makes the assumption that no two keys are the same. */
+static int bsearch(struct node *n, uint64_t key, int want_hi)
+{
+        int lo = -1, hi = le32_to_cpu(n->header.nr_entries);
+        while (hi - lo > 1) {
+                int mid = lo + ((hi - lo) / 2);
+                uint64_t mid_key = le64_to_cpu(n->keys[mid]);
+                if (mid_key == key)
+                        return mid;
+                if (mid_key < key)
+                        lo = mid;
+                else
+                        hi = mid;
+        }
+        return want_hi ? hi : lo;
+}
+int lower_bound(struct node *n, uint64_t key)
+{
+        return bsearch(n, key, 0);
+}
+void inc_children(struct dm_transaction_manager *tm, struct node *n,
+                  struct dm_btree_value_type *vt)
+{
+        unsigned i;
+        uint32_t nr_entries = le32_to_cpu(n->header.nr_entries);
+        if (le32_to_cpu(n->header.flags) & INTERNAL_NODE)
+                for (i = 0; i < nr_entries; i++)
+                        dm_tm_inc(tm, value64(n, i));
+        else if (vt->inc)
+                for (i = 0; i < nr_entries; i++)
+                        vt->inc(vt->context,
+                                value_ptr(n, i, vt->size));
+}
+static int insert_at(size_t value_size, struct node *node, unsigned index,
+                      uint64_t key, void *value)
+                      __dm_written_to_disk(value)
+{
+        uint32_t nr_entries = le32_to_cpu(node->header.nr_entries);
+        __le64 key_le = cpu_to_le64(key);
+        if (index > nr_entries ||
+            index >= le32_to_cpu(node->header.max_entries)) {
+                DMERR("too many entries in btree node for insert");
+                __dm_unbless_for_disk(value);
+                return -ENOMEM;
+        }
+        __dm_bless_for_disk(&key_le);
+        array_insert(node->keys, sizeof(*node->keys), nr_entries, index, &key_le);
+        array_insert(value_base(node), value_size, nr_entries, index, value);
+        node->header.nr_entries = cpu_to_le32(nr_entries + 1);
+        return 0;
+}
+/*----------------------------------------------------------------*/
+/*
+ * We want 3n entries (for some n).  This works more nicely for repeated
+ * insert remove loops than (2n + 1).
+ */
+static uint32_t calc_max_entries(size_t value_size, size_t block_size)
+{
+        uint32_t total, n;
+        size_t elt_size = sizeof(uint64_t) + value_size; /* key + value */
+        block_size -= sizeof(struct node_header);
+        total = block_size / elt_size;
+        n = total / 3;          /* rounds down */
+        return 3 * n;
+}
+int dm_btree_empty(struct dm_btree_info *info, dm_block_t *root)
+{
+        int r;
+        struct dm_block *b;
+        struct node *n;
+        size_t block_size;
+        uint32_t max_entries;
+        r = new_block(info, &b);
+        if (r < 0)
+                return r;
+        block_size = dm_bm_block_size(dm_tm_get_bm(info->tm));
+        max_entries = calc_max_entries(info->value_type.size, block_size);
+        n = dm_block_data(b);
+        memset(n, 0, block_size);
+        n->header.flags = cpu_to_le32(LEAF_NODE);
+        n->header.nr_entries = cpu_to_le32(0);
+        n->header.max_entries = cpu_to_le32(max_entries);
+        n->header.value_size = cpu_to_le32(info->value_type.size);
+        *root = dm_block_location(b);
+        return unlock_block(info, b);
+}
+EXPORT_SYMBOL_GPL(dm_btree_empty);
+/*----------------------------------------------------------------*/
+/*
+ * Deletion uses a recursive algorithm, since we have limited stack space
+ * we explicitly manage our own stack on the heap.
+ */
+#define MAX_SPINE_DEPTH 64
+struct frame {
+        struct dm_block *b;
+        struct node *n;
+        unsigned level;
+        unsigned nr_children;
+        unsigned current_child;
+};
+struct del_stack {
+        struct dm_transaction_manager *tm;
+        int top;
+        struct frame spine[MAX_SPINE_DEPTH];
+};
+static int top_frame(struct del_stack *s, struct frame **f)
+{
+        if (s->top < 0) {
+                DMERR("btree deletion stack empty");
+                return -EINVAL;
+        }
+        *f = s->spine + s->top;
+        return 0;
+}
+static int unprocessed_frames(struct del_stack *s)
+{
+        return s->top >= 0;
+}
+static int push_frame(struct del_stack *s, dm_block_t b, unsigned level)
+{
+        int r;
+        uint32_t ref_count;
+        if (s->top >= MAX_SPINE_DEPTH - 1) {
+                DMERR("btree deletion stack out of memory");
+                return -ENOMEM;
+        }
+        r = dm_tm_ref(s->tm, b, &ref_count);
+        if (r)
+                return r;
+        if (ref_count > 1)
+                /*
+                 * This is a shared node, so we can just decrement it's
+                 * reference counter and leave the children.
+                 */
+                dm_tm_dec(s->tm, b);
+        else {
+                struct frame *f = s->spine + ++s->top;
+                r = dm_tm_read_lock(s->tm, b, &btree_node_validator, &f->b);
+                if (r) {
+                        s->top--;
+                        return r;
+                }
+                f->n = dm_block_data(f->b);
+                f->level = level;
+                f->nr_children = le32_to_cpu(f->n->header.nr_entries);
+                f->current_child = 0;
+        }
+        return 0;
+}
+static void pop_frame(struct del_stack *s)
+{
+        struct frame *f = s->spine + s->top--;
+        dm_tm_dec(s->tm, dm_block_location(f->b));
+        dm_tm_unlock(s->tm, f->b);
+}
+int dm_btree_del(struct dm_btree_info *info, dm_block_t root)
+{
+        int r;
+        struct del_stack *s;
+        s = kmalloc(sizeof(*s), GFP_KERNEL);
+        if (!s)
+                return -ENOMEM;
+        s->tm = info->tm;
+        s->top = -1;
+        r = push_frame(s, root, 1);
+        if (r)
+                goto out;
+        while (unprocessed_frames(s)) {
+                uint32_t flags;
+                struct frame *f;
+                dm_block_t b;
+                r = top_frame(s, &f);
+                if (r)
+                        goto out;
+                if (f->current_child >= f->nr_children) {
+                        pop_frame(s);
+                        continue;
+                }
+                flags = le32_to_cpu(f->n->header.flags);
+                if (flags & INTERNAL_NODE) {
+                        b = value64(f->n, f->current_child);
+                        f->current_child++;
+                        r = push_frame(s, b, f->level);
+                        if (r)
+                                goto out;
+                } else if (f->level != (info->levels - 1)) {
+                        b = value64(f->n, f->current_child);
+                        f->current_child++;
+                        r = push_frame(s, b, f->level + 1);
+                        if (r)
+                                goto out;
+                } else {
+                        if (info->value_type.dec) {
+                                unsigned i;
+                                for (i = 0; i < f->nr_children; i++)
+                                        info->value_type.dec(info->value_type.context,
+                                                             value_ptr(f->n, i, info->value_type.size));
+                        }
+                        f->current_child = f->nr_children;
+                }
+        }
+out:
+        kfree(s);
+        return r;
+}
+EXPORT_SYMBOL_GPL(dm_btree_del);
+/*----------------------------------------------------------------*/
+static int btree_lookup_raw(struct ro_spine *s, dm_block_t block, uint64_t key,
+                            int (*search_fn)(struct node *, uint64_t),
+                            uint64_t *result_key, void *v, size_t value_size)
+{
+        int i, r;
+        uint32_t flags, nr_entries;
+        do {
+                r = ro_step(s, block);
+                if (r < 0)
+                        return r;
+                i = search_fn(ro_node(s), key);
+                flags = le32_to_cpu(ro_node(s)->header.flags);
+                nr_entries = le32_to_cpu(ro_node(s)->header.nr_entries);
+                if (i < 0 || i >= nr_entries)
+                        return -ENODATA;
+                if (flags & INTERNAL_NODE)
+                        block = value64(ro_node(s), i);
+        } while (!(flags & LEAF_NODE));
+        *result_key = le64_to_cpu(ro_node(s)->keys[i]);
+        memcpy(v, value_ptr(ro_node(s), i, value_size), value_size);
+        return 0;
+}
+int dm_btree_lookup(struct dm_btree_info *info, dm_block_t root,
+                    uint64_t *keys, void *value_le)
+{
+        unsigned level, last_level = info->levels - 1;
+        int r = -ENODATA;
+        uint64_t rkey;
+        __le64 internal_value_le;
+        struct ro_spine spine;
+        init_ro_spine(&spine, info);
+        for (level = 0; level < info->levels; level++) {
+                size_t size;
+                void *value_p;
+                if (level == last_level) {
+                        value_p = value_le;
+                        size = info->value_type.size;
+                } else {
+                        value_p = &internal_value_le;
+                        size = sizeof(uint64_t);
+                }
+                r = btree_lookup_raw(&spine, root, keys[level],
+                                     lower_bound, &rkey,
+                                     value_p, size);
+                if (!r) {
+                        if (rkey != keys[level]) {
+                                exit_ro_spine(&spine);
+                                return -ENODATA;
+                        }
+                } else {
+                        exit_ro_spine(&spine);
+                        return r;
+                }
+                root = le64_to_cpu(internal_value_le);
+        }
+        exit_ro_spine(&spine);
+        return r;
+}
+EXPORT_SYMBOL_GPL(dm_btree_lookup);
+/*
+ * Splits a node by creating a sibling node and shifting half the nodes
+ * contents across.  Assumes there is a parent node, and it has room for
+ * another child.
+ *
+ * Before:
+ *        +--------+
+ *        | Parent |
+ *        +--------+
+ *           |
+ *           v
+ *      +----------+
+ *      | A ++++++ |
+ *      +----------+
+ *
+ *
+ * After:
+ *              +--------+
+ *              | Parent |
+ *              +--------+
+ *                |     |
+ *                v     +------+
+ *          +---------+        |
+ *          | A* +++  |        v
+ *          +---------+   +-------+
+ *                        | B +++ |
+ *                        +-------+
+ *
+ * Where A* is a shadow of A.
+ */
+static int btree_split_sibling(struct shadow_spine *s, dm_block_t root,
+                               unsigned parent_index, uint64_t key)
+{
+        int r;
+        size_t size;
+        unsigned nr_left, nr_right;
+        struct dm_block *left, *right, *parent;
+        struct node *ln, *rn, *pn;
+        __le64 location;
+        left = shadow_current(s);
+        r = new_block(s->info, &right);
+        if (r < 0)
+                return r;
+        ln = dm_block_data(left);
+        rn = dm_block_data(right);
+        nr_left = le32_to_cpu(ln->header.nr_entries) / 2;
+        nr_right = le32_to_cpu(ln->header.nr_entries) - nr_left;
+        ln->header.nr_entries = cpu_to_le32(nr_left);
+        rn->header.flags = ln->header.flags;
+        rn->header.nr_entries = cpu_to_le32(nr_right);
+        rn->header.max_entries = ln->header.max_entries;
+        rn->header.value_size = ln->header.value_size;
+        memcpy(rn->keys, ln->keys + nr_left, nr_right * sizeof(rn->keys[0]));
+        size = le32_to_cpu(ln->header.flags) & INTERNAL_NODE ?
+                sizeof(uint64_t) : s->info->value_type.size;
+        memcpy(value_ptr(rn, 0, size), value_ptr(ln, nr_left, size),
+               size * nr_right);
+        /*
+         * Patch up the parent
+         */
+        parent = shadow_parent(s);
+        pn = dm_block_data(parent);
+        location = cpu_to_le64(dm_block_location(left));
+        __dm_bless_for_disk(&location);
+        memcpy_disk(value_ptr(pn, parent_index, sizeof(__le64)),
+                    &location, sizeof(__le64));
+        location = cpu_to_le64(dm_block_location(right));
+        __dm_bless_for_disk(&location);
+        r = insert_at(sizeof(__le64), pn, parent_index + 1,
+                      le64_to_cpu(rn->keys[0]), &location);
+        if (r)
+                return r;
+        if (key < le64_to_cpu(rn->keys[0])) {
+                unlock_block(s->info, right);
+                s->nodes[1] = left;
+        } else {
+                unlock_block(s->info, left);
+                s->nodes[1] = right;
+        }
+        return 0;
+}
+/*
+ * Splits a node by creating two new children beneath the given node.
+ *
+ * Before:
+ *        +----------+
+ *        | A ++++++ |
+ *        +----------+
+ *
+ *
+ * After:
+ *      +------------+
+ *      | A (shadow) |
+ *      +------------+
+ *          |   |
+ *   +------+   +----+
+ *   |               |
+ *   v               v
+ * +-------+     +-------+
+ * | B +++ |     | C +++ |
+ * +-------+     +-------+
+ */
+static int btree_split_beneath(struct shadow_spine *s, uint64_t key)
+{
+        int r;
+        size_t size;
+        unsigned nr_left, nr_right;
+        struct dm_block *left, *right, *new_parent;
+        struct node *pn, *ln, *rn;
+        __le64 val;
+        new_parent = shadow_current(s);
+        r = new_block(s->info, &left);
+        if (r < 0)
+                return r;
+        r = new_block(s->info, &right);
+        if (r < 0) {
+                /* FIXME: put left */
+                return r;
+        }
+        pn = dm_block_data(new_parent);
+        ln = dm_block_data(left);
+        rn = dm_block_data(right);
+        nr_left = le32_to_cpu(pn->header.nr_entries) / 2;
+        nr_right = le32_to_cpu(pn->header.nr_entries) - nr_left;
+        ln->header.flags = pn->header.flags;
+        ln->header.nr_entries = cpu_to_le32(nr_left);
+        ln->header.max_entries = pn->header.max_entries;
+        ln->header.value_size = pn->header.value_size;
+        rn->header.flags = pn->header.flags;
+        rn->header.nr_entries = cpu_to_le32(nr_right);
+        rn->header.max_entries = pn->header.max_entries;
+        rn->header.value_size = pn->header.value_size;
+        memcpy(ln->keys, pn->keys, nr_left * sizeof(pn->keys[0]));
+        memcpy(rn->keys, pn->keys + nr_left, nr_right * sizeof(pn->keys[0]));
+        size = le32_to_cpu(pn->header.flags) & INTERNAL_NODE ?
+                sizeof(__le64) : s->info->value_type.size;
+        memcpy(value_ptr(ln, 0, size), value_ptr(pn, 0, size), nr_left * size);
+        memcpy(value_ptr(rn, 0, size), value_ptr(pn, nr_left, size),
+               nr_right * size);
+        /* new_parent should just point to l and r now */
+        pn->header.flags = cpu_to_le32(INTERNAL_NODE);
+        pn->header.nr_entries = cpu_to_le32(2);
+        pn->header.max_entries = cpu_to_le32(
+                calc_max_entries(sizeof(__le64),
+                                 dm_bm_block_size(
+                                         dm_tm_get_bm(s->info->tm))));
+        pn->header.value_size = cpu_to_le32(sizeof(__le64));
+        val = cpu_to_le64(dm_block_location(left));
+        __dm_bless_for_disk(&val);
+        pn->keys[0] = ln->keys[0];
+        memcpy_disk(value_ptr(pn, 0, sizeof(__le64)), &val, sizeof(__le64));
+        val = cpu_to_le64(dm_block_location(right));
+        __dm_bless_for_disk(&val);
+        pn->keys[1] = rn->keys[0];
+        memcpy_disk(value_ptr(pn, 1, sizeof(__le64)), &val, sizeof(__le64));
+        /*
+         * rejig the spine.  This is ugly, since it knows too
+         * much about the spine
+         */
+        if (s->nodes[0] != new_parent) {
+                unlock_block(s->info, s->nodes[0]);
+                s->nodes[0] = new_parent;
+        }
+        if (key < le64_to_cpu(rn->keys[0])) {
+                unlock_block(s->info, right);
+                s->nodes[1] = left;
+        } else {
+                unlock_block(s->info, left);
+                s->nodes[1] = right;
+        }
+        s->count = 2;
+        return 0;
+}
+static int btree_insert_raw(struct shadow_spine *s, dm_block_t root,
+                            struct dm_btree_value_type *vt,
+                            uint64_t key, unsigned *index)
+{
+        int r, i = *index, top = 1;
+        struct node *node;
+        for (;;) {
+                r = shadow_step(s, root, vt);
+                if (r < 0)
+                        return r;
+                node = dm_block_data(shadow_current(s));
+                /*
+                 * We have to patch up the parent node, ugly, but I don't
+                 * see a way to do this automatically as part of the spine
+                 * op.
+                 */
+                if (shadow_has_parent(s) && i >= 0) { /* FIXME: second clause unness. */
+                        __le64 location = cpu_to_le64(dm_block_location(shadow_current(s)));
+                        __dm_bless_for_disk(&location);
+                        memcpy_disk(value_ptr(dm_block_data(shadow_parent(s)), i, sizeof(uint64_t)),
+                                    &location, sizeof(__le64));
+                }
+                node = dm_block_data(shadow_current(s));
+                if (node->header.nr_entries == node->header.max_entries) {
+                        if (top)
+                                r = btree_split_beneath(s, key);
+                        else
+                                r = btree_split_sibling(s, root, i, key);
+                        if (r < 0)
+                                return r;
+                }
+                node = dm_block_data(shadow_current(s));
+                i = lower_bound(node, key);
+                if (le32_to_cpu(node->header.flags) & LEAF_NODE)
+                        break;
+                if (i < 0) {
+                        /* change the bounds on the lowest key */
+                        node->keys[0] = cpu_to_le64(key);
+                        i = 0;
+                }
+                root = value64(node, i);
+                top = 0;
+        }
+        if (i < 0 || le64_to_cpu(node->keys[i]) != key)
+                i++;
+        *index = i;
+        return 0;
+}
+static int insert(struct dm_btree_info *info, dm_block_t root,
+                  uint64_t *keys, void *value, dm_block_t *new_root,
+                  int *inserted)
+                  __dm_written_to_disk(value)
+{
+        int r, need_insert;
+        unsigned level, index = -1, last_level = info->levels - 1;
+        dm_block_t block = root;
+        struct shadow_spine spine;
+        struct node *n;
+        struct dm_btree_value_type le64_type;
+        le64_type.context = NULL;
+        le64_type.size = sizeof(__le64);
+        le64_type.inc = NULL;
+        le64_type.dec = NULL;
+        le64_type.equal = NULL;
+        init_shadow_spine(&spine, info);
+        for (level = 0; level < (info->levels - 1); level++) {
+                r = btree_insert_raw(&spine, block, &le64_type, keys[level], &index);
+                if (r < 0)
+                        goto bad;
+                n = dm_block_data(shadow_current(&spine));
+                need_insert = ((index >= le32_to_cpu(n->header.nr_entries)) ||
+                               (le64_to_cpu(n->keys[index]) != keys[level]));
+                if (need_insert) {
+                        dm_block_t new_tree;
+                        __le64 new_le;
+                        r = dm_btree_empty(info, &new_tree);
+                        if (r < 0)
+                                goto bad;
+                        new_le = cpu_to_le64(new_tree);
+                        __dm_bless_for_disk(&new_le);
+                        r = insert_at(sizeof(uint64_t), n, index,
+                                      keys[level], &new_le);
+                        if (r)
+                                goto bad;
+                }
+                if (level < last_level)
+                        block = value64(n, index);
+        }
+        r = btree_insert_raw(&spine, block, &info->value_type,
+                             keys[level], &index);
+        if (r < 0)
+                goto bad;
+        n = dm_block_data(shadow_current(&spine));
+        need_insert = ((index >= le32_to_cpu(n->header.nr_entries)) ||
+                       (le64_to_cpu(n->keys[index]) != keys[level]));
+        if (need_insert) {
+                if (inserted)
+                        *inserted = 1;
+                r = insert_at(info->value_type.size, n, index,
+                              keys[level], value);
+                if (r)
+                        goto bad_unblessed;
+        } else {
+                if (inserted)
+                        *inserted = 0;
+                if (info->value_type.dec &&
+                    (!info->value_type.equal ||
+                     !info->value_type.equal(
+                             info->value_type.context,
+                             value_ptr(n, index, info->value_type.size),
+                             value))) {
+                        info->value_type.dec(info->value_type.context,
+                                             value_ptr(n, index, info->value_type.size));
+                }
+                memcpy_disk(value_ptr(n, index, info->value_type.size),
+                            value, info->value_type.size);
+        }
+        *new_root = shadow_root(&spine);
+        exit_shadow_spine(&spine);
+        return 0;
+bad:
+        __dm_unbless_for_disk(value);
+bad_unblessed:
+        exit_shadow_spine(&spine);
+        return r;
+}
+int dm_btree_insert(struct dm_btree_info *info, dm_block_t root,
+                    uint64_t *keys, void *value, dm_block_t *new_root)
+                    __dm_written_to_disk(value)
+{
+        return insert(info, root, keys, value, new_root, NULL);
+}
+EXPORT_SYMBOL_GPL(dm_btree_insert);
+int dm_btree_insert_notify(struct dm_btree_info *info, dm_block_t root,
+                           uint64_t *keys, void *value, dm_block_t *new_root,
+                           int *inserted)
+                           __dm_written_to_disk(value)
+{
+        return insert(info, root, keys, value, new_root, inserted);
+}
+EXPORT_SYMBOL_GPL(dm_btree_insert_notify);
+/*----------------------------------------------------------------*/
+static int find_highest_key(struct ro_spine *s, dm_block_t block,
+                            uint64_t *result_key, dm_block_t *next_block)
+{
+        int i, r;
+        uint32_t flags;
+        do {
+                r = ro_step(s, block);
+                if (r < 0)
+                        return r;
+                flags = le32_to_cpu(ro_node(s)->header.flags);
+                i = le32_to_cpu(ro_node(s)->header.nr_entries);
+                if (!i)
+                        return -ENODATA;
+                else
+                        i--;
+                *result_key = le64_to_cpu(ro_node(s)->keys[i]);
+                if (next_block || flags & INTERNAL_NODE)
+                        block = value64(ro_node(s), i);
+        } while (flags & INTERNAL_NODE);
+        if (next_block)
+                *next_block = block;
+        return 0;
+}
+int dm_btree_find_highest_key(struct dm_btree_info *info, dm_block_t root,
+                              uint64_t *result_keys)
+{
+        int r = 0, count = 0, level;
+        struct ro_spine spine;
+        init_ro_spine(&spine, info);
+        for (level = 0; level < info->levels; level++) {
+                r = find_highest_key(&spine, root, result_keys + level,
+                                     level == info->levels - 1 ? NULL : &root);
+                if (r == -ENODATA) {
+                        r = 0;
+                        break;
+                } else if (r)
+                        break;
+                count++;
+        }
+        exit_ro_spine(&spine);
+        return r ? r : count;
+}
+EXPORT_SYMBOL_GPL(dm_btree_find_highest_key);
diff --git a/drivers/md/persistent-data/dm-btree.h b/drivers/md/persistent-data/dm-btree.h
new file mode 100644
index 000000000000..ae02c84410ff
--- /dev/null
+++ b/drivers/md/persistent-data/dm-btree.h
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This file is released under the GPL.
+ */
+#ifndef _LINUX_DM_BTREE_H
+#define _LINUX_DM_BTREE_H
+#include "dm-block-manager.h"
+struct dm_transaction_manager;
+/*----------------------------------------------------------------*/
+/*
+ * Annotations used to check on-disk metadata is handled as little-endian.
+ */
+#ifdef __CHECKER__
+#  define __dm_written_to_disk(x) __releases(x)
+#  define __dm_reads_from_disk(x) __acquires(x)
+#  define __dm_bless_for_disk(x) __acquire(x)
+#  define __dm_unbless_for_disk(x) __release(x)
+#else
+#  define __dm_written_to_disk(x)
+#  define __dm_reads_from_disk(x)
+#  define __dm_bless_for_disk(x)
+#  define __dm_unbless_for_disk(x)
+#endif
+/*----------------------------------------------------------------*/
+/*
+ * Manipulates hierarchical B+ trees with 64-bit keys and arbitrary-sized
+ * values.
+ */
+/*
+ * Infomation about the values stored within the btree.
+ */
+struct dm_btree_value_type {
+        void *context;
+        /*
+         * The size in bytes of each value.
+         */
+        uint32_t size;
+        /*
+         * Any of these methods can be safely set to NULL if you do not
+         * need the corresponding feature.
+         */
+        /*
+         * The btree is making a duplicate of the value, for instance
+         * because previously-shared btree nodes have now diverged.
+         * @value argument is the new copy that the copy function may modify.
+         * (Probably it just wants to increment a reference count
+         * somewhere.) This method is _not_ called for insertion of a new
+         * value: It is assumed the ref count is already 1.
+         */
+        void (*inc)(void *context, void *value);
+        /*
+         * This value is being deleted.  The btree takes care of freeing
+         * the memory pointed to by @value.  Often the del function just
+         * needs to decrement a reference count somewhere.
+         */
+        void (*dec)(void *context, void *value);
+        /*
+         * A test for equality between two values.  When a value is
+         * overwritten with a new one, the old one has the dec method
+         * called _unless_ the new and old value are deemed equal.
+         */
+        int (*equal)(void *context, void *value1, void *value2);
+};
+/*
+ * The shape and contents of a btree.
+ */
+struct dm_btree_info {
+        struct dm_transaction_manager *tm;
+        /*
+         * Number of nested btrees. (Not the depth of a single tree.)
+         */
+        unsigned levels;
+        struct dm_btree_value_type value_type;
+};
+/*
+ * Set up an empty tree.  O(1).
+ */
+int dm_btree_empty(struct dm_btree_info *info, dm_block_t *root);
+/*
+ * Delete a tree.  O(n) - this is the slow one!  It can also block, so
+ * please don't call it on an IO path.
+ */
+int dm_btree_del(struct dm_btree_info *info, dm_block_t root);
+/*
+ * All the lookup functions return -ENODATA if the key cannot be found.
+ */
+/*
+ * Tries to find a key that matches exactly.  O(ln(n))
+ */
+int dm_btree_lookup(struct dm_btree_info *info, dm_block_t root,
+                    uint64_t *keys, void *value_le);
+/*
+ * Insertion (or overwrite an existing value).  O(ln(n))
+ */
+int dm_btree_insert(struct dm_btree_info *info, dm_block_t root,
+                    uint64_t *keys, void *value, dm_block_t *new_root)
+                    __dm_written_to_disk(value);
+/*
+ * A variant of insert that indicates whether it actually inserted or just
+ * overwrote.  Useful if you're keeping track of the number of entries in a
+ * tree.
+ */
+int dm_btree_insert_notify(struct dm_btree_info *info, dm_block_t root,
+                           uint64_t *keys, void *value, dm_block_t *new_root,
+                           int *inserted)
+                           __dm_written_to_disk(value);
+/*
+ * Remove a key if present.  This doesn't remove empty sub trees.  Normally
+ * subtrees represent a separate entity, like a snapshot map, so this is
+ * correct behaviour.  O(ln(n)).
+ */
+int dm_btree_remove(struct dm_btree_info *info, dm_block_t root,
+                    uint64_t *keys, dm_block_t *new_root);
+/*
+ * Returns < 0 on failure.  Otherwise the number of key entries that have
+ * been filled out.  Remember trees can have zero entries, and as such have
+ * no highest key.
+ */
+int dm_btree_find_highest_key(struct dm_btree_info *info, dm_block_t root,
+                              uint64_t *result_keys);
+#endif  /* _LINUX_DM_BTREE_H */
diff --git a/drivers/md/persistent-data/dm-persistent-data-internal.h b/drivers/md/persistent-data/dm-persistent-data-internal.h
new file mode 100644
index 000000000000..c49e26fff36c
--- /dev/null
+++ b/drivers/md/persistent-data/dm-persistent-data-internal.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This file is released under the GPL.
+ */
+#ifndef _DM_PERSISTENT_DATA_INTERNAL_H
+#define _DM_PERSISTENT_DATA_INTERNAL_H
+#include "dm-block-manager.h"
+static inline unsigned dm_hash_block(dm_block_t b, unsigned hash_mask)
+{
+        const unsigned BIG_PRIME = 4294967291UL;
+        return (((unsigned) b) * BIG_PRIME) & hash_mask;
+}
+#endif  /* _PERSISTENT_DATA_INTERNAL_H */
diff --git a/drivers/md/persistent-data/dm-space-map-checker.c b/drivers/md/persistent-data/dm-space-map-checker.c
new file mode 100644
index 000000000000..bb44a937fe63
--- /dev/null
+++ b/drivers/md/persistent-data/dm-space-map-checker.c
@@ -0,0 +1,437 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This file is released under the GPL.
+ */
+#include "dm-space-map-checker.h"
+#include <linux/device-mapper.h>
+#ifdef CONFIG_DM_DEBUG_SPACE_MAPS
+#define DM_MSG_PREFIX "space map checker"
+/*----------------------------------------------------------------*/
+struct count_array {
+        dm_block_t nr;
+        dm_block_t nr_free;
+        uint32_t *counts;
+};
+static int ca_get_count(struct count_array *ca, dm_block_t b, uint32_t *count)
+{
+        if (b >= ca->nr)
+                return -EINVAL;
+        *count = ca->counts[b];
+        return 0;
+}
+static int ca_count_more_than_one(struct count_array *ca, dm_block_t b, int *r)
+{
+        if (b >= ca->nr)
+                return -EINVAL;
+        *r = ca->counts[b] > 1;
+        return 0;
+}
+static int ca_set_count(struct count_array *ca, dm_block_t b, uint32_t count)
+{
+        uint32_t old_count;
+        if (b >= ca->nr)
+                return -EINVAL;
+        old_count = ca->counts[b];
+        if (!count && old_count)
+                ca->nr_free++;
+        else if (count && !old_count)
+                ca->nr_free--;
+        ca->counts[b] = count;
+        return 0;
+}
+static int ca_inc_block(struct count_array *ca, dm_block_t b)
+{
+        if (b >= ca->nr)
+                return -EINVAL;
+        ca_set_count(ca, b, ca->counts[b] + 1);
+        return 0;
+}
+static int ca_dec_block(struct count_array *ca, dm_block_t b)
+{
+        if (b >= ca->nr)
+                return -EINVAL;
+        BUG_ON(ca->counts[b] == 0);
+        ca_set_count(ca, b, ca->counts[b] - 1);
+        return 0;
+}
+static int ca_create(struct count_array *ca, struct dm_space_map *sm)
+{
+        int r;
+        dm_block_t nr_blocks;
+        r = dm_sm_get_nr_blocks(sm, &nr_blocks);
+        if (r)
+                return r;
+        ca->nr = nr_blocks;
+        ca->nr_free = nr_blocks;
+        ca->counts = kzalloc(sizeof(*ca->counts) * nr_blocks, GFP_KERNEL);
+        if (!ca->counts)
+                return -ENOMEM;
+        return 0;
+}
+static int ca_load(struct count_array *ca, struct dm_space_map *sm)
+{
+        int r;
+        uint32_t count;
+        dm_block_t nr_blocks, i;
+        r = dm_sm_get_nr_blocks(sm, &nr_blocks);
+        if (r)
+                return r;
+        BUG_ON(ca->nr != nr_blocks);
+        DMWARN("Loading debug space map from disk.  This may take some time");
+        for (i = 0; i < nr_blocks; i++) {
+                r = dm_sm_get_count(sm, i, &count);
+                if (r) {
+                        DMERR("load failed");
+                        return r;
+                }
+                ca_set_count(ca, i, count);
+        }
+        DMWARN("Load complete");
+        return 0;
+}
+static int ca_extend(struct count_array *ca, dm_block_t extra_blocks)
+{
+        dm_block_t nr_blocks = ca->nr + extra_blocks;
+        uint32_t *counts = kzalloc(sizeof(*counts) * nr_blocks, GFP_KERNEL);
+        if (!counts)
+                return -ENOMEM;
+        memcpy(counts, ca->counts, sizeof(*counts) * ca->nr);
+        kfree(ca->counts);
+        ca->nr = nr_blocks;
+        ca->nr_free += extra_blocks;
+        ca->counts = counts;
+        return 0;
+}
+static int ca_commit(struct count_array *old, struct count_array *new)
+{
+        if (old->nr != new->nr) {
+                BUG_ON(old->nr > new->nr);
+                ca_extend(old, new->nr - old->nr);
+        }
+        BUG_ON(old->nr != new->nr);
+        old->nr_free = new->nr_free;
+        memcpy(old->counts, new->counts, sizeof(*old->counts) * old->nr);
+        return 0;
+}
+static void ca_destroy(struct count_array *ca)
+{
+        kfree(ca->counts);
+}
+/*----------------------------------------------------------------*/
+struct sm_checker {
+        struct dm_space_map sm;
+        struct count_array old_counts;
+        struct count_array counts;
+        struct dm_space_map *real_sm;
+};
+static void sm_checker_destroy(struct dm_space_map *sm)
+{
+        struct sm_checker *smc = container_of(sm, struct sm_checker, sm);
+        dm_sm_destroy(smc->real_sm);
+        ca_destroy(&smc->old_counts);
+        ca_destroy(&smc->counts);
+        kfree(smc);
+}
+static int sm_checker_get_nr_blocks(struct dm_space_map *sm, dm_block_t *count)
+{
+        struct sm_checker *smc = container_of(sm, struct sm_checker, sm);
+        int r = dm_sm_get_nr_blocks(smc->real_sm, count);
+        if (!r)
+                BUG_ON(smc->old_counts.nr != *count);
+        return r;
+}
+static int sm_checker_get_nr_free(struct dm_space_map *sm, dm_block_t *count)
+{
+        struct sm_checker *smc = container_of(sm, struct sm_checker, sm);
+        int r = dm_sm_get_nr_free(smc->real_sm, count);
+        if (!r) {
+                /*
+                 * Slow, but we know it's correct.
+                 */
+                dm_block_t b, n = 0;
+                for (b = 0; b < smc->old_counts.nr; b++)
+                        if (smc->old_counts.counts[b] == 0 &&
+                            smc->counts.counts[b] == 0)
+                                n++;
+                if (n != *count)
+                        DMERR("free block counts differ, checker %u, sm-disk:%u",
+                              (unsigned) n, (unsigned) *count);
+        }
+        return r;
+}
+static int sm_checker_new_block(struct dm_space_map *sm, dm_block_t *b)
+{
+        struct sm_checker *smc = container_of(sm, struct sm_checker, sm);
+        int r = dm_sm_new_block(smc->real_sm, b);
+        if (!r) {
+                BUG_ON(*b >= smc->old_counts.nr);
+                BUG_ON(smc->old_counts.counts[*b] != 0);
+                BUG_ON(*b >= smc->counts.nr);
+                BUG_ON(smc->counts.counts[*b] != 0);
+                ca_set_count(&smc->counts, *b, 1);
+        }
+        return r;
+}
+static int sm_checker_inc_block(struct dm_space_map *sm, dm_block_t b)
+{
+        struct sm_checker *smc = container_of(sm, struct sm_checker, sm);
+        int r = dm_sm_inc_block(smc->real_sm, b);
+        int r2 = ca_inc_block(&smc->counts, b);
+        BUG_ON(r != r2);
+        return r;
+}
+static int sm_checker_dec_block(struct dm_space_map *sm, dm_block_t b)
+{
+        struct sm_checker *smc = container_of(sm, struct sm_checker, sm);
+        int r = dm_sm_dec_block(smc->real_sm, b);
+        int r2 = ca_dec_block(&smc->counts, b);
+        BUG_ON(r != r2);
+        return r;
+}
+static int sm_checker_get_count(struct dm_space_map *sm, dm_block_t b, uint32_t *result)
+{
+        struct sm_checker *smc = container_of(sm, struct sm_checker, sm);
+        uint32_t result2 = 0;
+        int r = dm_sm_get_count(smc->real_sm, b, result);
+        int r2 = ca_get_count(&smc->counts, b, &result2);
+        BUG_ON(r != r2);
+        if (!r)
+                BUG_ON(*result != result2);
+        return r;
+}
+static int sm_checker_count_more_than_one(struct dm_space_map *sm, dm_block_t b, int *result)
+{
+        struct sm_checker *smc = container_of(sm, struct sm_checker, sm);
+        int result2 = 0;
+        int r = dm_sm_count_is_more_than_one(smc->real_sm, b, result);
+        int r2 = ca_count_more_than_one(&smc->counts, b, &result2);
+        BUG_ON(r != r2);
+        if (!r)
+                BUG_ON(!(*result) && result2);
+        return r;
+}
+static int sm_checker_set_count(struct dm_space_map *sm, dm_block_t b, uint32_t count)
+{
+        struct sm_checker *smc = container_of(sm, struct sm_checker, sm);
+        uint32_t old_rc;
+        int r = dm_sm_set_count(smc->real_sm, b, count);
+        int r2;
+        BUG_ON(b >= smc->counts.nr);
+        old_rc = smc->counts.counts[b];
+        r2 = ca_set_count(&smc->counts, b, count);
+        BUG_ON(r != r2);
+        return r;
+}
+static int sm_checker_commit(struct dm_space_map *sm)
+{
+        struct sm_checker *smc = container_of(sm, struct sm_checker, sm);
+        int r;
+        r = dm_sm_commit(smc->real_sm);
+        if (r)
+                return r;
+        r = ca_commit(&smc->old_counts, &smc->counts);
+        if (r)
+                return r;
+        return 0;
+}
+static int sm_checker_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
+{
+        struct sm_checker *smc = container_of(sm, struct sm_checker, sm);
+        int r = dm_sm_extend(smc->real_sm, extra_blocks);
+        if (r)
+                return r;
+        return ca_extend(&smc->counts, extra_blocks);
+}
+static int sm_checker_root_size(struct dm_space_map *sm, size_t *result)
+{
+        struct sm_checker *smc = container_of(sm, struct sm_checker, sm);
+        return dm_sm_root_size(smc->real_sm, result);
+}
+static int sm_checker_copy_root(struct dm_space_map *sm, void *copy_to_here_le, size_t len)
+{
+        struct sm_checker *smc = container_of(sm, struct sm_checker, sm);
+        return dm_sm_copy_root(smc->real_sm, copy_to_here_le, len);
+}
+/*----------------------------------------------------------------*/
+static struct dm_space_map ops_ = {
+        .destroy = sm_checker_destroy,
+        .get_nr_blocks = sm_checker_get_nr_blocks,
+        .get_nr_free = sm_checker_get_nr_free,
+        .inc_block = sm_checker_inc_block,
+        .dec_block = sm_checker_dec_block,
+        .new_block = sm_checker_new_block,
+        .get_count = sm_checker_get_count,
+        .count_is_more_than_one = sm_checker_count_more_than_one,
+        .set_count = sm_checker_set_count,
+        .commit = sm_checker_commit,
+        .extend = sm_checker_extend,
+        .root_size = sm_checker_root_size,
+        .copy_root = sm_checker_copy_root
+};
+struct dm_space_map *dm_sm_checker_create(struct dm_space_map *sm)
+{
+        int r;
+        struct sm_checker *smc;
+        if (!sm)
+                return NULL;
+        smc = kmalloc(sizeof(*smc), GFP_KERNEL);
+        if (!smc)
+                return NULL;
+        memcpy(&smc->sm, &ops_, sizeof(smc->sm));
+        r = ca_create(&smc->old_counts, sm);
+        if (r) {
+                kfree(smc);
+                return NULL;
+        }
+        r = ca_create(&smc->counts, sm);
+        if (r) {
+                ca_destroy(&smc->old_counts);
+                kfree(smc);
+                return NULL;
+        }
+        smc->real_sm = sm;
+        r = ca_load(&smc->counts, sm);
+        if (r) {
+                ca_destroy(&smc->counts);
+                ca_destroy(&smc->old_counts);
+                kfree(smc);
+                return NULL;
+        }
+        r = ca_commit(&smc->old_counts, &smc->counts);
+        if (r) {
+                ca_destroy(&smc->counts);
+                ca_destroy(&smc->old_counts);
+                kfree(smc);
+                return NULL;
+        }
+        return &smc->sm;
+}
+EXPORT_SYMBOL_GPL(dm_sm_checker_create);
+struct dm_space_map *dm_sm_checker_create_fresh(struct dm_space_map *sm)
+{
+        int r;
+        struct sm_checker *smc;
+        if (!sm)
+                return NULL;
+        smc = kmalloc(sizeof(*smc), GFP_KERNEL);
+        if (!smc)
+                return NULL;
+        memcpy(&smc->sm, &ops_, sizeof(smc->sm));
+        r = ca_create(&smc->old_counts, sm);
+        if (r) {
+                kfree(smc);
+                return NULL;
+        }
+        r = ca_create(&smc->counts, sm);
+        if (r) {
+                ca_destroy(&smc->old_counts);
+                kfree(smc);
+                return NULL;
+        }
+        smc->real_sm = sm;
+        return &smc->sm;
+}
+EXPORT_SYMBOL_GPL(dm_sm_checker_create_fresh);
+/*----------------------------------------------------------------*/
+#else
+struct dm_space_map *dm_sm_checker_create(struct dm_space_map *sm)
+{
+        return sm;
+}
+EXPORT_SYMBOL_GPL(dm_sm_checker_create);
+struct dm_space_map *dm_sm_checker_create_fresh(struct dm_space_map *sm)
+{
+        return sm;
+}
+EXPORT_SYMBOL_GPL(dm_sm_checker_create_fresh);
+/*----------------------------------------------------------------*/
+#endif
diff --git a/drivers/md/persistent-data/dm-space-map-checker.h b/drivers/md/persistent-data/dm-space-map-checker.h
new file mode 100644
index 000000000000..444dccf6688c
--- /dev/null
+++ b/drivers/md/persistent-data/dm-space-map-checker.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This file is released under the GPL.
+ */
+#ifndef SNAPSHOTS_SPACE_MAP_CHECKER_H
+#define SNAPSHOTS_SPACE_MAP_CHECKER_H
+#include "dm-space-map.h"
+/*----------------------------------------------------------------*/
+/*
+ * This space map wraps a real on-disk space map, and verifies all of its
+ * operations.  It uses a lot of memory, so only use if you have a specific
+ * problem that you're debugging.
+ *
+ * Ownership of @sm passes.
+ */
+struct dm_space_map *dm_sm_checker_create(struct dm_space_map *sm);
+struct dm_space_map *dm_sm_checker_create_fresh(struct dm_space_map *sm);
+/*----------------------------------------------------------------*/
+#endif
diff --git a/drivers/md/persistent-data/dm-space-map-common.c b/drivers/md/persistent-data/dm-space-map-common.c
new file mode 100644
index 000000000000..df2494c06cdc
--- /dev/null
+++ b/drivers/md/persistent-data/dm-space-map-common.c
@@ -0,0 +1,705 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This file is released under the GPL.
+ */
+#include "dm-space-map-common.h"
+#include "dm-transaction-manager.h"
+#include <linux/bitops.h>
+#include <linux/device-mapper.h>
+#define DM_MSG_PREFIX "space map common"
+/*----------------------------------------------------------------*/
+/*
+ * Index validator.
+ */
+#define INDEX_CSUM_XOR 160478
+static void index_prepare_for_write(struct dm_block_validator *v,
+                                    struct dm_block *b,
+                                    size_t block_size)
+{
+        struct disk_metadata_index *mi_le = dm_block_data(b);
+        mi_le->blocknr = cpu_to_le64(dm_block_location(b));
+        mi_le->csum = cpu_to_le32(dm_bm_checksum(&mi_le->padding,
+                                                 block_size - sizeof(__le32),
+                                                 INDEX_CSUM_XOR));
+}
+static int index_check(struct dm_block_validator *v,
+                       struct dm_block *b,
+                       size_t block_size)
+{
+        struct disk_metadata_index *mi_le = dm_block_data(b);
+        __le32 csum_disk;
+        if (dm_block_location(b) != le64_to_cpu(mi_le->blocknr)) {
+                DMERR("index_check failed blocknr %llu wanted %llu",
+                      le64_to_cpu(mi_le->blocknr), dm_block_location(b));
+                return -ENOTBLK;
+        }
+        csum_disk = cpu_to_le32(dm_bm_checksum(&mi_le->padding,
+                                               block_size - sizeof(__le32),
+                                               INDEX_CSUM_XOR));
+        if (csum_disk != mi_le->csum) {
+                DMERR("index_check failed csum %u wanted %u",
+                      le32_to_cpu(csum_disk), le32_to_cpu(mi_le->csum));
+                return -EILSEQ;
+        }
+        return 0;
+}
+static struct dm_block_validator index_validator = {
+        .name = "index",
+        .prepare_for_write = index_prepare_for_write,
+        .check = index_check
+};
+/*----------------------------------------------------------------*/
+/*
+ * Bitmap validator
+ */
+#define BITMAP_CSUM_XOR 240779
+static void bitmap_prepare_for_write(struct dm_block_validator *v,
+                                     struct dm_block *b,
+                                     size_t block_size)
+{
+        struct disk_bitmap_header *disk_header = dm_block_data(b);
+        disk_header->blocknr = cpu_to_le64(dm_block_location(b));
+        disk_header->csum = cpu_to_le32(dm_bm_checksum(&disk_header->not_used,
+                                                       block_size - sizeof(__le32),
+                                                       BITMAP_CSUM_XOR));
+}
+static int bitmap_check(struct dm_block_validator *v,
+                        struct dm_block *b,
+                        size_t block_size)
+{
+        struct disk_bitmap_header *disk_header = dm_block_data(b);
+        __le32 csum_disk;
+        if (dm_block_location(b) != le64_to_cpu(disk_header->blocknr)) {
+                DMERR("bitmap check failed blocknr %llu wanted %llu",
+                      le64_to_cpu(disk_header->blocknr), dm_block_location(b));
+                return -ENOTBLK;
+        }
+        csum_disk = cpu_to_le32(dm_bm_checksum(&disk_header->not_used,
+                                               block_size - sizeof(__le32),
+                                               BITMAP_CSUM_XOR));
+        if (csum_disk != disk_header->csum) {
+                DMERR("bitmap check failed csum %u wanted %u",
+                      le32_to_cpu(csum_disk), le32_to_cpu(disk_header->csum));
+                return -EILSEQ;
+        }
+        return 0;
+}
+static struct dm_block_validator dm_sm_bitmap_validator = {
+        .name = "sm_bitmap",
+        .prepare_for_write = bitmap_prepare_for_write,
+        .check = bitmap_check
+};
+/*----------------------------------------------------------------*/
+#define ENTRIES_PER_WORD 32
+#define ENTRIES_SHIFT   5
+static void *dm_bitmap_data(struct dm_block *b)
+{
+        return dm_block_data(b) + sizeof(struct disk_bitmap_header);
+}
+#define WORD_MASK_HIGH 0xAAAAAAAAAAAAAAAAULL
+static unsigned bitmap_word_used(void *addr, unsigned b)
+{
+        __le64 *words_le = addr;
+        __le64 *w_le = words_le + (b >> ENTRIES_SHIFT);
+        uint64_t bits = le64_to_cpu(*w_le);
+        uint64_t mask = (bits + WORD_MASK_HIGH + 1) & WORD_MASK_HIGH;
+        return !(~bits & mask);
+}
+static unsigned sm_lookup_bitmap(void *addr, unsigned b)
+{
+        __le64 *words_le = addr;
+        __le64 *w_le = words_le + (b >> ENTRIES_SHIFT);
+        unsigned hi, lo;
+        b = (b & (ENTRIES_PER_WORD - 1)) << 1;
+        hi = !!test_bit_le(b, (void *) w_le);
+        lo = !!test_bit_le(b + 1, (void *) w_le);
+        return (hi << 1) | lo;
+}
+static void sm_set_bitmap(void *addr, unsigned b, unsigned val)
+{
+        __le64 *words_le = addr;
+        __le64 *w_le = words_le + (b >> ENTRIES_SHIFT);
+        b = (b & (ENTRIES_PER_WORD - 1)) << 1;
+        if (val & 2)
+                __set_bit_le(b, (void *) w_le);
+        else
+                __clear_bit_le(b, (void *) w_le);
+        if (val & 1)
+                __set_bit_le(b + 1, (void *) w_le);
+        else
+                __clear_bit_le(b + 1, (void *) w_le);
+}
+static int sm_find_free(void *addr, unsigned begin, unsigned end,
+                        unsigned *result)
+{
+        while (begin < end) {
+                if (!(begin & (ENTRIES_PER_WORD - 1)) &&
+                    bitmap_word_used(addr, begin)) {
+                        begin += ENTRIES_PER_WORD;
+                        continue;
+                }
+                if (!sm_lookup_bitmap(addr, begin)) {
+                        *result = begin;
+                        return 0;
+                }
+                begin++;
+        }
+        return -ENOSPC;
+}
+/*----------------------------------------------------------------*/
+static int sm_ll_init(struct ll_disk *ll, struct dm_transaction_manager *tm)
+{
+        ll->tm = tm;
+        ll->bitmap_info.tm = tm;
+        ll->bitmap_info.levels = 1;
+        /*
+         * Because the new bitmap blocks are created via a shadow
+         * operation, the old entry has already had its reference count
+         * decremented and we don't need the btree to do any bookkeeping.
+         */
+        ll->bitmap_info.value_type.size = sizeof(struct disk_index_entry);
+        ll->bitmap_info.value_type.inc = NULL;
+        ll->bitmap_info.value_type.dec = NULL;
+        ll->bitmap_info.value_type.equal = NULL;
+        ll->ref_count_info.tm = tm;
+        ll->ref_count_info.levels = 1;
+        ll->ref_count_info.value_type.size = sizeof(uint32_t);
+        ll->ref_count_info.value_type.inc = NULL;
+        ll->ref_count_info.value_type.dec = NULL;
+        ll->ref_count_info.value_type.equal = NULL;
+        ll->block_size = dm_bm_block_size(dm_tm_get_bm(tm));
+        if (ll->block_size > (1 << 30)) {
+                DMERR("block size too big to hold bitmaps");
+                return -EINVAL;
+        }
+        ll->entries_per_block = (ll->block_size - sizeof(struct disk_bitmap_header)) *
+                ENTRIES_PER_BYTE;
+        ll->nr_blocks = 0;
+        ll->bitmap_root = 0;
+        ll->ref_count_root = 0;
+        return 0;
+}
+int sm_ll_extend(struct ll_disk *ll, dm_block_t extra_blocks)
+{
+        int r;
+        dm_block_t i, nr_blocks, nr_indexes;
+        unsigned old_blocks, blocks;
+        nr_blocks = ll->nr_blocks + extra_blocks;
+        old_blocks = dm_sector_div_up(ll->nr_blocks, ll->entries_per_block);
+        blocks = dm_sector_div_up(nr_blocks, ll->entries_per_block);
+        nr_indexes = dm_sector_div_up(nr_blocks, ll->entries_per_block);
+        if (nr_indexes > ll->max_entries(ll)) {
+                DMERR("space map too large");
+                return -EINVAL;
+        }
+        for (i = old_blocks; i < blocks; i++) {
+                struct dm_block *b;
+                struct disk_index_entry idx;
+                r = dm_tm_new_block(ll->tm, &dm_sm_bitmap_validator, &b);
+                if (r < 0)
+                        return r;
+                idx.blocknr = cpu_to_le64(dm_block_location(b));
+                r = dm_tm_unlock(ll->tm, b);
+                if (r < 0)
+                        return r;
+                idx.nr_free = cpu_to_le32(ll->entries_per_block);
+                idx.none_free_before = 0;
+                r = ll->save_ie(ll, i, &idx);
+                if (r < 0)
+                        return r;
+        }
+        ll->nr_blocks = nr_blocks;
+        return 0;
+}
+int sm_ll_lookup_bitmap(struct ll_disk *ll, dm_block_t b, uint32_t *result)
+{
+        int r;
+        dm_block_t index = b;
+        struct disk_index_entry ie_disk;
+        struct dm_block *blk;
+        b = do_div(index, ll->entries_per_block);
+        r = ll->load_ie(ll, index, &ie_disk);
+        if (r < 0)
+                return r;
+        r = dm_tm_read_lock(ll->tm, le64_to_cpu(ie_disk.blocknr),
+                            &dm_sm_bitmap_validator, &blk);
+        if (r < 0)
+                return r;
+        *result = sm_lookup_bitmap(dm_bitmap_data(blk), b);
+        return dm_tm_unlock(ll->tm, blk);
+}
+int sm_ll_lookup(struct ll_disk *ll, dm_block_t b, uint32_t *result)
+{
+        __le32 le_rc;
+        int r = sm_ll_lookup_bitmap(ll, b, result);
+        if (r)
+                return r;
+        if (*result != 3)
+                return r;
+        r = dm_btree_lookup(&ll->ref_count_info, ll->ref_count_root, &b, &le_rc);
+        if (r < 0)
+                return r;
+        *result = le32_to_cpu(le_rc);
+        return r;
+}
+int sm_ll_find_free_block(struct ll_disk *ll, dm_block_t begin,
+                          dm_block_t end, dm_block_t *result)
+{
+        int r;
+        struct disk_index_entry ie_disk;
+        dm_block_t i, index_begin = begin;
+        dm_block_t index_end = dm_sector_div_up(end, ll->entries_per_block);
+        /*
+         * FIXME: Use shifts
+         */
+        begin = do_div(index_begin, ll->entries_per_block);
+        end = do_div(end, ll->entries_per_block);
+        for (i = index_begin; i < index_end; i++, begin = 0) {
+                struct dm_block *blk;
+                unsigned position;
+                uint32_t bit_end;
+                r = ll->load_ie(ll, i, &ie_disk);
+                if (r < 0)
+                        return r;
+                if (le32_to_cpu(ie_disk.nr_free) == 0)
+                        continue;
+                r = dm_tm_read_lock(ll->tm, le64_to_cpu(ie_disk.blocknr),
+                                    &dm_sm_bitmap_validator, &blk);
+                if (r < 0)
+                        return r;
+                bit_end = (i == index_end - 1) ?  end : ll->entries_per_block;
+                r = sm_find_free(dm_bitmap_data(blk),
+                                 max_t(unsigned, begin, le32_to_cpu(ie_disk.none_free_before)),
+                                 bit_end, &position);
+                if (r == -ENOSPC) {
+                        /*
+                         * This might happen because we started searching
+                         * part way through the bitmap.
+                         */
+                        dm_tm_unlock(ll->tm, blk);
+                        continue;
+                } else if (r < 0) {
+                        dm_tm_unlock(ll->tm, blk);
+                        return r;
+                }
+                r = dm_tm_unlock(ll->tm, blk);
+                if (r < 0)
+                        return r;
+                *result = i * ll->entries_per_block + (dm_block_t) position;
+                return 0;
+        }
+        return -ENOSPC;
+}
+int sm_ll_insert(struct ll_disk *ll, dm_block_t b,
+                 uint32_t ref_count, enum allocation_event *ev)
+{
+        int r;
+        uint32_t bit, old;
+        struct dm_block *nb;
+        dm_block_t index = b;
+        struct disk_index_entry ie_disk;
+        void *bm_le;
+        int inc;
+        bit = do_div(index, ll->entries_per_block);
+        r = ll->load_ie(ll, index, &ie_disk);
+        if (r < 0)
+                return r;
+        r = dm_tm_shadow_block(ll->tm, le64_to_cpu(ie_disk.blocknr),
+                               &dm_sm_bitmap_validator, &nb, &inc);
+        if (r < 0) {
+                DMERR("dm_tm_shadow_block() failed");
+                return r;
+        }
+        ie_disk.blocknr = cpu_to_le64(dm_block_location(nb));
+        bm_le = dm_bitmap_data(nb);
+        old = sm_lookup_bitmap(bm_le, bit);
+        if (ref_count <= 2) {
+                sm_set_bitmap(bm_le, bit, ref_count);
+                r = dm_tm_unlock(ll->tm, nb);
+                if (r < 0)
+                        return r;
+#if 0
+                /* FIXME: dm_btree_remove doesn't handle this yet */
+                if (old > 2) {
+                        r = dm_btree_remove(&ll->ref_count_info,
+                                            ll->ref_count_root,
+                                            &b, &ll->ref_count_root);
+                        if (r)
+                                return r;
+                }
+#endif
+        } else {
+                __le32 le_rc = cpu_to_le32(ref_count);
+                sm_set_bitmap(bm_le, bit, 3);
+                r = dm_tm_unlock(ll->tm, nb);
+                if (r < 0)
+                        return r;
+                __dm_bless_for_disk(&le_rc);
+                r = dm_btree_insert(&ll->ref_count_info, ll->ref_count_root,
+                                    &b, &le_rc, &ll->ref_count_root);
+                if (r < 0) {
+                        DMERR("ref count insert failed");
+                        return r;
+                }
+        }
+        if (ref_count && !old) {
+                *ev = SM_ALLOC;
+                ll->nr_allocated++;
+                ie_disk.nr_free = cpu_to_le32(le32_to_cpu(ie_disk.nr_free) - 1);
+                if (le32_to_cpu(ie_disk.none_free_before) == bit)
+                        ie_disk.none_free_before = cpu_to_le32(bit + 1);
+        } else if (old && !ref_count) {
+                *ev = SM_FREE;
+                ll->nr_allocated--;
+                ie_disk.nr_free = cpu_to_le32(le32_to_cpu(ie_disk.nr_free) + 1);
+                ie_disk.none_free_before = cpu_to_le32(min(le32_to_cpu(ie_disk.none_free_before), bit));
+        }
+        return ll->save_ie(ll, index, &ie_disk);
+}
+int sm_ll_inc(struct ll_disk *ll, dm_block_t b, enum allocation_event *ev)
+{
+        int r;
+        uint32_t rc;
+        r = sm_ll_lookup(ll, b, &rc);
+        if (r)
+                return r;
+        return sm_ll_insert(ll, b, rc + 1, ev);
+}
+int sm_ll_dec(struct ll_disk *ll, dm_block_t b, enum allocation_event *ev)
+{
+        int r;
+        uint32_t rc;
+        r = sm_ll_lookup(ll, b, &rc);
+        if (r)
+                return r;
+        if (!rc)
+                return -EINVAL;
+        return sm_ll_insert(ll, b, rc - 1, ev);
+}
+int sm_ll_commit(struct ll_disk *ll)
+{
+        return ll->commit(ll);
+}
+/*----------------------------------------------------------------*/
+static int metadata_ll_load_ie(struct ll_disk *ll, dm_block_t index,
+                               struct disk_index_entry *ie)
+{
+        memcpy(ie, ll->mi_le.index + index, sizeof(*ie));
+        return 0;
+}
+static int metadata_ll_save_ie(struct ll_disk *ll, dm_block_t index,
+                               struct disk_index_entry *ie)
+{
+        memcpy(ll->mi_le.index + index, ie, sizeof(*ie));
+        return 0;
+}
+static int metadata_ll_init_index(struct ll_disk *ll)
+{
+        int r;
+        struct dm_block *b;
+        r = dm_tm_new_block(ll->tm, &index_validator, &b);
+        if (r < 0)
+                return r;
+        memcpy(dm_block_data(b), &ll->mi_le, sizeof(ll->mi_le));
+        ll->bitmap_root = dm_block_location(b);
+        return dm_tm_unlock(ll->tm, b);
+}
+static int metadata_ll_open(struct ll_disk *ll)
+{
+        int r;
+        struct dm_block *block;
+        r = dm_tm_read_lock(ll->tm, ll->bitmap_root,
+                            &index_validator, &block);
+        if (r)
+                return r;
+        memcpy(&ll->mi_le, dm_block_data(block), sizeof(ll->mi_le));
+        return dm_tm_unlock(ll->tm, block);
+}
+static dm_block_t metadata_ll_max_entries(struct ll_disk *ll)
+{
+        return MAX_METADATA_BITMAPS;
+}
+static int metadata_ll_commit(struct ll_disk *ll)
+{
+        int r, inc;
+        struct dm_block *b;
+        r = dm_tm_shadow_block(ll->tm, ll->bitmap_root, &index_validator, &b, &inc);
+        if (r)
+                return r;
+        memcpy(dm_block_data(b), &ll->mi_le, sizeof(ll->mi_le));
+        ll->bitmap_root = dm_block_location(b);
+        return dm_tm_unlock(ll->tm, b);
+}
+int sm_ll_new_metadata(struct ll_disk *ll, struct dm_transaction_manager *tm)
+{
+        int r;
+        r = sm_ll_init(ll, tm);
+        if (r < 0)
+                return r;
+        ll->load_ie = metadata_ll_load_ie;
+        ll->save_ie = metadata_ll_save_ie;
+        ll->init_index = metadata_ll_init_index;
+        ll->open_index = metadata_ll_open;
+        ll->max_entries = metadata_ll_max_entries;
+        ll->commit = metadata_ll_commit;
+        ll->nr_blocks = 0;
+        ll->nr_allocated = 0;
+        r = ll->init_index(ll);
+        if (r < 0)
+                return r;
+        r = dm_btree_empty(&ll->ref_count_info, &ll->ref_count_root);
+        if (r < 0)
+                return r;
+        return 0;
+}
+int sm_ll_open_metadata(struct ll_disk *ll, struct dm_transaction_manager *tm,
+                        void *root_le, size_t len)
+{
+        int r;
+        struct disk_sm_root *smr = root_le;
+        if (len < sizeof(struct disk_sm_root)) {
+                DMERR("sm_metadata root too small");
+                return -ENOMEM;
+        }
+        r = sm_ll_init(ll, tm);
+        if (r < 0)
+                return r;
+        ll->load_ie = metadata_ll_load_ie;
+        ll->save_ie = metadata_ll_save_ie;
+        ll->init_index = metadata_ll_init_index;
+        ll->open_index = metadata_ll_open;
+        ll->max_entries = metadata_ll_max_entries;
+        ll->commit = metadata_ll_commit;
+        ll->nr_blocks = le64_to_cpu(smr->nr_blocks);
+        ll->nr_allocated = le64_to_cpu(smr->nr_allocated);
+        ll->bitmap_root = le64_to_cpu(smr->bitmap_root);
+        ll->ref_count_root = le64_to_cpu(smr->ref_count_root);
+        return ll->open_index(ll);
+}
+/*----------------------------------------------------------------*/
+static int disk_ll_load_ie(struct ll_disk *ll, dm_block_t index,
+                           struct disk_index_entry *ie)
+{
+        return dm_btree_lookup(&ll->bitmap_info, ll->bitmap_root, &index, ie);
+}
+static int disk_ll_save_ie(struct ll_disk *ll, dm_block_t index,
+                           struct disk_index_entry *ie)
+{
+        __dm_bless_for_disk(ie);
+        return dm_btree_insert(&ll->bitmap_info, ll->bitmap_root,
+                               &index, ie, &ll->bitmap_root);
+}
+static int disk_ll_init_index(struct ll_disk *ll)
+{
+        return dm_btree_empty(&ll->bitmap_info, &ll->bitmap_root);
+}
+static int disk_ll_open(struct ll_disk *ll)
+{
+        /* nothing to do */
+        return 0;
+}
+static dm_block_t disk_ll_max_entries(struct ll_disk *ll)
+{
+        return -1ULL;
+}
+static int disk_ll_commit(struct ll_disk *ll)
+{
+        return 0;
+}
+int sm_ll_new_disk(struct ll_disk *ll, struct dm_transaction_manager *tm)
+{
+        int r;
+        r = sm_ll_init(ll, tm);
+        if (r < 0)
+                return r;
+        ll->load_ie = disk_ll_load_ie;
+        ll->save_ie = disk_ll_save_ie;
+        ll->init_index = disk_ll_init_index;
+        ll->open_index = disk_ll_open;
+        ll->max_entries = disk_ll_max_entries;
+        ll->commit = disk_ll_commit;
+        ll->nr_blocks = 0;
+        ll->nr_allocated = 0;
+        r = ll->init_index(ll);
+        if (r < 0)
+                return r;
+        r = dm_btree_empty(&ll->ref_count_info, &ll->ref_count_root);
+        if (r < 0)
+                return r;
+        return 0;
+}
+int sm_ll_open_disk(struct ll_disk *ll, struct dm_transaction_manager *tm,
+                    void *root_le, size_t len)
+{
+        int r;
+        struct disk_sm_root *smr = root_le;
+        if (len < sizeof(struct disk_sm_root)) {
+                DMERR("sm_metadata root too small");
+                return -ENOMEM;
+        }
+        r = sm_ll_init(ll, tm);
+        if (r < 0)
+                return r;
+        ll->load_ie = disk_ll_load_ie;
+        ll->save_ie = disk_ll_save_ie;
+        ll->init_index = disk_ll_init_index;
+        ll->open_index = disk_ll_open;
+        ll->max_entries = disk_ll_max_entries;
+        ll->commit = disk_ll_commit;
+        ll->nr_blocks = le64_to_cpu(smr->nr_blocks);
+        ll->nr_allocated = le64_to_cpu(smr->nr_allocated);
+        ll->bitmap_root = le64_to_cpu(smr->bitmap_root);
+        ll->ref_count_root = le64_to_cpu(smr->ref_count_root);
+        return ll->open_index(ll);
+}
+/*----------------------------------------------------------------*/
diff --git a/drivers/md/persistent-data/dm-space-map-common.h b/drivers/md/persistent-data/dm-space-map-common.h
new file mode 100644
index 000000000000..8f220821a9a9
--- /dev/null
+++ b/drivers/md/persistent-data/dm-space-map-common.h
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This file is released under the GPL.
+ */
+#ifndef DM_SPACE_MAP_COMMON_H
+#define DM_SPACE_MAP_COMMON_H
+#include "dm-btree.h"
+/*----------------------------------------------------------------*/
+/*
+ * Low level disk format
+ *
+ * Bitmap btree
+ * ------------
+ *
+ * Each value stored in the btree is an index_entry.  This points to a
+ * block that is used as a bitmap.  Within the bitmap hold 2 bits per
+ * entry, which represent UNUSED = 0, REF_COUNT = 1, REF_COUNT = 2 and
+ * REF_COUNT = many.
+ *
+ * Refcount btree
+ * --------------
+ *
+ * Any entry that has a ref count higher than 2 gets entered in the ref
+ * count tree.  The leaf values for this tree is the 32-bit ref count.
+ */
+struct disk_index_entry {
+        __le64 blocknr;
+        __le32 nr_free;
+        __le32 none_free_before;
+} __packed;
+#define MAX_METADATA_BITMAPS 255
+struct disk_metadata_index {
+        __le32 csum;
+        __le32 padding;
+        __le64 blocknr;
+        struct disk_index_entry index[MAX_METADATA_BITMAPS];
+} __packed;
+struct ll_disk;
+typedef int (*load_ie_fn)(struct ll_disk *ll, dm_block_t index, struct disk_index_entry *result);
+typedef int (*save_ie_fn)(struct ll_disk *ll, dm_block_t index, struct disk_index_entry *ie);
+typedef int (*init_index_fn)(struct ll_disk *ll);
+typedef int (*open_index_fn)(struct ll_disk *ll);
+typedef dm_block_t (*max_index_entries_fn)(struct ll_disk *ll);
+typedef int (*commit_fn)(struct ll_disk *ll);
+struct ll_disk {
+        struct dm_transaction_manager *tm;
+        struct dm_btree_info bitmap_info;
+        struct dm_btree_info ref_count_info;
+        uint32_t block_size;
+        uint32_t entries_per_block;
+        dm_block_t nr_blocks;
+        dm_block_t nr_allocated;
+        /*
+         * bitmap_root may be a btree root or a simple index.
+         */
+        dm_block_t bitmap_root;
+        dm_block_t ref_count_root;
+        struct disk_metadata_index mi_le;
+        load_ie_fn load_ie;
+        save_ie_fn save_ie;
+        init_index_fn init_index;
+        open_index_fn open_index;
+        max_index_entries_fn max_entries;
+        commit_fn commit;
+};
+struct disk_sm_root {
+        __le64 nr_blocks;
+        __le64 nr_allocated;
+        __le64 bitmap_root;
+        __le64 ref_count_root;
+} __packed;
+#define ENTRIES_PER_BYTE 4
+struct disk_bitmap_header {
+        __le32 csum;
+        __le32 not_used;
+        __le64 blocknr;
+} __packed;
+enum allocation_event {
+        SM_NONE,
+        SM_ALLOC,
+        SM_FREE,
+};
+/*----------------------------------------------------------------*/
+int sm_ll_extend(struct ll_disk *ll, dm_block_t extra_blocks);
+int sm_ll_lookup_bitmap(struct ll_disk *ll, dm_block_t b, uint32_t *result);
+int sm_ll_lookup(struct ll_disk *ll, dm_block_t b, uint32_t *result);
+int sm_ll_find_free_block(struct ll_disk *ll, dm_block_t begin,
+                          dm_block_t end, dm_block_t *result);
+int sm_ll_insert(struct ll_disk *ll, dm_block_t b, uint32_t ref_count, enum allocation_event *ev);
+int sm_ll_inc(struct ll_disk *ll, dm_block_t b, enum allocation_event *ev);
+int sm_ll_dec(struct ll_disk *ll, dm_block_t b, enum allocation_event *ev);
+int sm_ll_commit(struct ll_disk *ll);
+int sm_ll_new_metadata(struct ll_disk *ll, struct dm_transaction_manager *tm);
+int sm_ll_open_metadata(struct ll_disk *ll, struct dm_transaction_manager *tm,
+                        void *root_le, size_t len);
+int sm_ll_new_disk(struct ll_disk *ll, struct dm_transaction_manager *tm);
+int sm_ll_open_disk(struct ll_disk *ll, struct dm_transaction_manager *tm,
+                    void *root_le, size_t len);
+/*----------------------------------------------------------------*/
+#endif  /* DM_SPACE_MAP_COMMON_H */
diff --git a/drivers/md/persistent-data/dm-space-map-disk.c b/drivers/md/persistent-data/dm-space-map-disk.c
new file mode 100644
index 000000000000..aeff7852cf79
--- /dev/null
+++ b/drivers/md/persistent-data/dm-space-map-disk.c
@@ -0,0 +1,335 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This file is released under the GPL.
+ */
+#include "dm-space-map-checker.h"
+#include "dm-space-map-common.h"
+#include "dm-space-map-disk.h"
+#include "dm-space-map.h"
+#include "dm-transaction-manager.h"
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/device-mapper.h>
+#define DM_MSG_PREFIX "space map disk"
+/*----------------------------------------------------------------*/
+/*
+ * Space map interface.
+ */
+struct sm_disk {
+        struct dm_space_map sm;
+        struct ll_disk ll;
+        struct ll_disk old_ll;
+        dm_block_t begin;
+        dm_block_t nr_allocated_this_transaction;
+};
+static void sm_disk_destroy(struct dm_space_map *sm)
+{
+        struct sm_disk *smd = container_of(sm, struct sm_disk, sm);
+        kfree(smd);
+}
+static int sm_disk_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
+{
+        struct sm_disk *smd = container_of(sm, struct sm_disk, sm);
+        return sm_ll_extend(&smd->ll, extra_blocks);
+}
+static int sm_disk_get_nr_blocks(struct dm_space_map *sm, dm_block_t *count)
+{
+        struct sm_disk *smd = container_of(sm, struct sm_disk, sm);
+        *count = smd->old_ll.nr_blocks;
+        return 0;
+}
+static int sm_disk_get_nr_free(struct dm_space_map *sm, dm_block_t *count)
+{
+        struct sm_disk *smd = container_of(sm, struct sm_disk, sm);
+        *count = (smd->old_ll.nr_blocks - smd->old_ll.nr_allocated) - smd->nr_allocated_this_transaction;
+        return 0;
+}
+static int sm_disk_get_count(struct dm_space_map *sm, dm_block_t b,
+                             uint32_t *result)
+{
+        struct sm_disk *smd = container_of(sm, struct sm_disk, sm);
+        return sm_ll_lookup(&smd->ll, b, result);
+}
+static int sm_disk_count_is_more_than_one(struct dm_space_map *sm, dm_block_t b,
+                                          int *result)
+{
+        int r;
+        uint32_t count;
+        r = sm_disk_get_count(sm, b, &count);
+        if (r)
+                return r;
+        return count > 1;
+}
+static int sm_disk_set_count(struct dm_space_map *sm, dm_block_t b,
+                             uint32_t count)
+{
+        int r;
+        uint32_t old_count;
+        enum allocation_event ev;
+        struct sm_disk *smd = container_of(sm, struct sm_disk, sm);
+        r = sm_ll_insert(&smd->ll, b, count, &ev);
+        if (!r) {
+                switch (ev) {
+                case SM_NONE:
+                        break;
+                case SM_ALLOC:
+                        /*
+                         * This _must_ be free in the prior transaction
+                         * otherwise we've lost atomicity.
+                         */
+                        smd->nr_allocated_this_transaction++;
+                        break;
+                case SM_FREE:
+                        /*
+                         * It's only free if it's also free in the last
+                         * transaction.
+                         */
+                        r = sm_ll_lookup(&smd->old_ll, b, &old_count);
+                        if (r)
+                                return r;
+                        if (!old_count)
+                                smd->nr_allocated_this_transaction--;
+                        break;
+                }
+        }
+        return r;
+}
+static int sm_disk_inc_block(struct dm_space_map *sm, dm_block_t b)
+{
+        int r;
+        enum allocation_event ev;
+        struct sm_disk *smd = container_of(sm, struct sm_disk, sm);
+        r = sm_ll_inc(&smd->ll, b, &ev);
+        if (!r && (ev == SM_ALLOC))
+                /*
+                 * This _must_ be free in the prior transaction
+                 * otherwise we've lost atomicity.
+                 */
+                smd->nr_allocated_this_transaction++;
+        return r;
+}
+static int sm_disk_dec_block(struct dm_space_map *sm, dm_block_t b)
+{
+        int r;
+        uint32_t old_count;
+        enum allocation_event ev;
+        struct sm_disk *smd = container_of(sm, struct sm_disk, sm);
+        r = sm_ll_dec(&smd->ll, b, &ev);
+        if (!r && (ev == SM_FREE)) {
+                /*
+                 * It's only free if it's also free in the last
+                 * transaction.
+                 */
+                r = sm_ll_lookup(&smd->old_ll, b, &old_count);
+                if (r)
+                        return r;
+                if (!old_count)
+                        smd->nr_allocated_this_transaction--;
+        }
+        return r;
+}
+static int sm_disk_new_block(struct dm_space_map *sm, dm_block_t *b)
+{
+        int r;
+        enum allocation_event ev;
+        struct sm_disk *smd = container_of(sm, struct sm_disk, sm);
+        /* FIXME: we should loop round a couple of times */
+        r = sm_ll_find_free_block(&smd->old_ll, smd->begin, smd->old_ll.nr_blocks, b);
+        if (r)
+                return r;
+        smd->begin = *b + 1;
+        r = sm_ll_inc(&smd->ll, *b, &ev);
+        if (!r) {
+                BUG_ON(ev != SM_ALLOC);
+                smd->nr_allocated_this_transaction++;
+        }
+        return r;
+}
+static int sm_disk_commit(struct dm_space_map *sm)
+{
+        int r;
+        dm_block_t nr_free;
+        struct sm_disk *smd = container_of(sm, struct sm_disk, sm);
+        r = sm_disk_get_nr_free(sm, &nr_free);
+        if (r)
+                return r;
+        r = sm_ll_commit(&smd->ll);
+        if (r)
+                return r;
+        memcpy(&smd->old_ll, &smd->ll, sizeof(smd->old_ll));
+        smd->begin = 0;
+        smd->nr_allocated_this_transaction = 0;
+        r = sm_disk_get_nr_free(sm, &nr_free);
+        if (r)
+                return r;
+        return 0;
+}
+static int sm_disk_root_size(struct dm_space_map *sm, size_t *result)
+{
+        *result = sizeof(struct disk_sm_root);
+        return 0;
+}
+static int sm_disk_copy_root(struct dm_space_map *sm, void *where_le, size_t max)
+{
+        struct sm_disk *smd = container_of(sm, struct sm_disk, sm);
+        struct disk_sm_root root_le;
+        root_le.nr_blocks = cpu_to_le64(smd->ll.nr_blocks);
+        root_le.nr_allocated = cpu_to_le64(smd->ll.nr_allocated);
+        root_le.bitmap_root = cpu_to_le64(smd->ll.bitmap_root);
+        root_le.ref_count_root = cpu_to_le64(smd->ll.ref_count_root);
+        if (max < sizeof(root_le))
+                return -ENOSPC;
+        memcpy(where_le, &root_le, sizeof(root_le));
+        return 0;
+}
+/*----------------------------------------------------------------*/
+static struct dm_space_map ops = {
+        .destroy = sm_disk_destroy,
+        .extend = sm_disk_extend,
+        .get_nr_blocks = sm_disk_get_nr_blocks,
+        .get_nr_free = sm_disk_get_nr_free,
+        .get_count = sm_disk_get_count,
+        .count_is_more_than_one = sm_disk_count_is_more_than_one,
+        .set_count = sm_disk_set_count,
+        .inc_block = sm_disk_inc_block,
+        .dec_block = sm_disk_dec_block,
+        .new_block = sm_disk_new_block,
+        .commit = sm_disk_commit,
+        .root_size = sm_disk_root_size,
+        .copy_root = sm_disk_copy_root
+};
+static struct dm_space_map *dm_sm_disk_create_real(
+        struct dm_transaction_manager *tm,
+        dm_block_t nr_blocks)
+{
+        int r;
+        struct sm_disk *smd;
+        smd = kmalloc(sizeof(*smd), GFP_KERNEL);
+        if (!smd)
+                return ERR_PTR(-ENOMEM);
+        smd->begin = 0;
+        smd->nr_allocated_this_transaction = 0;
+        memcpy(&smd->sm, &ops, sizeof(smd->sm));
+        r = sm_ll_new_disk(&smd->ll, tm);
+        if (r)
+                goto bad;
+        r = sm_ll_extend(&smd->ll, nr_blocks);
+        if (r)
+                goto bad;
+        r = sm_disk_commit(&smd->sm);
+        if (r)
+                goto bad;
+        return &smd->sm;
+bad:
+        kfree(smd);
+        return ERR_PTR(r);
+}
+struct dm_space_map *dm_sm_disk_create(struct dm_transaction_manager *tm,
+                                       dm_block_t nr_blocks)
+{
+        struct dm_space_map *sm = dm_sm_disk_create_real(tm, nr_blocks);
+        return dm_sm_checker_create_fresh(sm);
+}
+EXPORT_SYMBOL_GPL(dm_sm_disk_create);
+static struct dm_space_map *dm_sm_disk_open_real(
+        struct dm_transaction_manager *tm,
+        void *root_le, size_t len)
+{
+        int r;
+        struct sm_disk *smd;
+        smd = kmalloc(sizeof(*smd), GFP_KERNEL);
+        if (!smd)
+                return ERR_PTR(-ENOMEM);
+        smd->begin = 0;
+        smd->nr_allocated_this_transaction = 0;
+        memcpy(&smd->sm, &ops, sizeof(smd->sm));
+        r = sm_ll_open_disk(&smd->ll, tm, root_le, len);
+        if (r)
+                goto bad;
+        r = sm_disk_commit(&smd->sm);
+        if (r)
+                goto bad;
+        return &smd->sm;
+bad:
+        kfree(smd);
+        return ERR_PTR(r);
+}
+struct dm_space_map *dm_sm_disk_open(struct dm_transaction_manager *tm,
+                                     void *root_le, size_t len)
+{
+        return dm_sm_checker_create(
+                dm_sm_disk_open_real(tm, root_le, len));
+}
+EXPORT_SYMBOL_GPL(dm_sm_disk_open);
+/*----------------------------------------------------------------*/
diff --git a/drivers/md/persistent-data/dm-space-map-disk.h b/drivers/md/persistent-data/dm-space-map-disk.h
new file mode 100644
index 000000000000..447a0a9a2d9f
--- /dev/null
+++ b/drivers/md/persistent-data/dm-space-map-disk.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This file is released under the GPL.
+ */
+#ifndef _LINUX_DM_SPACE_MAP_DISK_H
+#define _LINUX_DM_SPACE_MAP_DISK_H
+#include "dm-block-manager.h"
+struct dm_space_map;
+struct dm_transaction_manager;
+/*
+ * Unfortunately we have to use two-phase construction due to the cycle
+ * between the tm and sm.
+ */
+struct dm_space_map *dm_sm_disk_create(struct dm_transaction_manager *tm,
+                                       dm_block_t nr_blocks);
+struct dm_space_map *dm_sm_disk_open(struct dm_transaction_manager *tm,
+                                     void *root, size_t len);
+#endif /* _LINUX_DM_SPACE_MAP_DISK_H */
diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
new file mode 100644
index 000000000000..e89ae5e7a519
--- /dev/null
+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
@@ -0,0 +1,596 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This file is released under the GPL.
+ */
+#include "dm-space-map.h"
+#include "dm-space-map-common.h"
+#include "dm-space-map-metadata.h"
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/device-mapper.h>
+#define DM_MSG_PREFIX "space map metadata"
+/*----------------------------------------------------------------*/
+/*
+ * Space map interface.
+ *
+ * The low level disk format is written using the standard btree and
+ * transaction manager.  This means that performing disk operations may
+ * cause us to recurse into the space map in order to allocate new blocks.
+ * For this reason we have a pool of pre-allocated blocks large enough to
+ * service any metadata_ll_disk operation.
+ */
+/*
+ * FIXME: we should calculate this based on the size of the device.
+ * Only the metadata space map needs this functionality.
+ */
+#define MAX_RECURSIVE_ALLOCATIONS 1024
+enum block_op_type {
+        BOP_INC,
+        BOP_DEC
+};
+struct block_op {
+        enum block_op_type type;
+        dm_block_t block;
+};
+struct sm_metadata {
+        struct dm_space_map sm;
+        struct ll_disk ll;
+        struct ll_disk old_ll;
+        dm_block_t begin;
+        unsigned recursion_count;
+        unsigned allocated_this_transaction;
+        unsigned nr_uncommitted;
+        struct block_op uncommitted[MAX_RECURSIVE_ALLOCATIONS];
+};
+static int add_bop(struct sm_metadata *smm, enum block_op_type type, dm_block_t b)
+{
+        struct block_op *op;
+        if (smm->nr_uncommitted == MAX_RECURSIVE_ALLOCATIONS) {
+                DMERR("too many recursive allocations");
+                return -ENOMEM;
+        }
+        op = smm->uncommitted + smm->nr_uncommitted++;
+        op->type = type;
+        op->block = b;
+        return 0;
+}
+static int commit_bop(struct sm_metadata *smm, struct block_op *op)
+{
+        int r = 0;
+        enum allocation_event ev;
+        switch (op->type) {
+        case BOP_INC:
+                r = sm_ll_inc(&smm->ll, op->block, &ev);
+                break;
+        case BOP_DEC:
+                r = sm_ll_dec(&smm->ll, op->block, &ev);
+                break;
+        }
+        return r;
+}
+static void in(struct sm_metadata *smm)
+{
+        smm->recursion_count++;
+}
+static int out(struct sm_metadata *smm)
+{
+        int r = 0;
+        /*
+         * If we're not recursing then very bad things are happening.
+         */
+        if (!smm->recursion_count) {
+                DMERR("lost track of recursion depth");
+                return -ENOMEM;
+        }
+        if (smm->recursion_count == 1 && smm->nr_uncommitted) {
+                while (smm->nr_uncommitted && !r) {
+                        smm->nr_uncommitted--;
+                        r = commit_bop(smm, smm->uncommitted +
+                                       smm->nr_uncommitted);
+                        if (r)
+                                break;
+                }
+        }
+        smm->recursion_count--;
+        return r;
+}
+/*
+ * When using the out() function above, we often want to combine an error
+ * code for the operation run in the recursive context with that from
+ * out().
+ */
+static int combine_errors(int r1, int r2)
+{
+        return r1 ? r1 : r2;
+}
+static int recursing(struct sm_metadata *smm)
+{
+        return smm->recursion_count;
+}
+static void sm_metadata_destroy(struct dm_space_map *sm)
+{
+        struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);
+        kfree(smm);
+}
+static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
+{
+        DMERR("doesn't support extend");
+        return -EINVAL;
+}
+static int sm_metadata_get_nr_blocks(struct dm_space_map *sm, dm_block_t *count)
+{
+        struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);
+        *count = smm->ll.nr_blocks;
+        return 0;
+}
+static int sm_metadata_get_nr_free(struct dm_space_map *sm, dm_block_t *count)
+{
+        struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);
+        *count = smm->old_ll.nr_blocks - smm->old_ll.nr_allocated -
+                 smm->allocated_this_transaction;
+        return 0;
+}
+static int sm_metadata_get_count(struct dm_space_map *sm, dm_block_t b,
+                                 uint32_t *result)
+{
+        int r, i;
+        struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);
+        unsigned adjustment = 0;
+        /*
+         * We may have some uncommitted adjustments to add.  This list
+         * should always be really short.
+         */
+        for (i = 0; i < smm->nr_uncommitted; i++) {
+                struct block_op *op = smm->uncommitted + i;
+                if (op->block != b)
+                        continue;
+                switch (op->type) {
+                case BOP_INC:
+                        adjustment++;
+                        break;
+                case BOP_DEC:
+                        adjustment--;
+                        break;
+                }
+        }
+        r = sm_ll_lookup(&smm->ll, b, result);
+        if (r)
+                return r;
+        *result += adjustment;
+        return 0;
+}
+static int sm_metadata_count_is_more_than_one(struct dm_space_map *sm,
+                                              dm_block_t b, int *result)
+{
+        int r, i, adjustment = 0;
+        struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);
+        uint32_t rc;
+        /*
+         * We may have some uncommitted adjustments to add.  This list
+         * should always be really short.
+         */
+        for (i = 0; i < smm->nr_uncommitted; i++) {
+                struct block_op *op = smm->uncommitted + i;
+                if (op->block != b)
+                        continue;
+                switch (op->type) {
+                case BOP_INC:
+                        adjustment++;
+                        break;
+                case BOP_DEC:
+                        adjustment--;
+                        break;
+                }
+        }
+        if (adjustment > 1) {
+                *result = 1;
+                return 0;
+        }
+        r = sm_ll_lookup_bitmap(&smm->ll, b, &rc);
+        if (r)
+                return r;
+        if (rc == 3)
+                /*
+                 * We err on the side of caution, and always return true.
+                 */
+                *result = 1;
+        else
+                *result = rc + adjustment > 1;
+        return 0;
+}
+static int sm_metadata_set_count(struct dm_space_map *sm, dm_block_t b,
+                                 uint32_t count)
+{
+        int r, r2;
+        enum allocation_event ev;
+        struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);
+        if (smm->recursion_count) {
+                DMERR("cannot recurse set_count()");
+                return -EINVAL;
+        }
+        in(smm);
+        r = sm_ll_insert(&smm->ll, b, count, &ev);
+        r2 = out(smm);
+        return combine_errors(r, r2);
+}
+static int sm_metadata_inc_block(struct dm_space_map *sm, dm_block_t b)
+{
+        int r, r2 = 0;
+        enum allocation_event ev;
+        struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);
+        if (recursing(smm))
+                r = add_bop(smm, BOP_INC, b);
+        else {
+                in(smm);
+                r = sm_ll_inc(&smm->ll, b, &ev);
+                r2 = out(smm);
+        }
+        return combine_errors(r, r2);
+}
+static int sm_metadata_dec_block(struct dm_space_map *sm, dm_block_t b)
+{
+        int r, r2 = 0;
+        enum allocation_event ev;
+        struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);
+        if (recursing(smm))
+                r = add_bop(smm, BOP_DEC, b);
+        else {
+                in(smm);
+                r = sm_ll_dec(&smm->ll, b, &ev);
+                r2 = out(smm);
+        }
+        return combine_errors(r, r2);
+}
+static int sm_metadata_new_block_(struct dm_space_map *sm, dm_block_t *b)
+{
+        int r, r2 = 0;
+        enum allocation_event ev;
+        struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);
+        r = sm_ll_find_free_block(&smm->old_ll, smm->begin, smm->old_ll.nr_blocks, b);
+        if (r)
+                return r;
+        smm->begin = *b + 1;
+        if (recursing(smm))
+                r = add_bop(smm, BOP_INC, *b);
+        else {
+                in(smm);
+                r = sm_ll_inc(&smm->ll, *b, &ev);
+                r2 = out(smm);
+        }
+        if (!r)
+                smm->allocated_this_transaction++;
+        return combine_errors(r, r2);
+}
+static int sm_metadata_new_block(struct dm_space_map *sm, dm_block_t *b)
+{
+        int r = sm_metadata_new_block_(sm, b);
+        if (r)
+                DMERR("out of metadata space");
+        return r;
+}
+static int sm_metadata_commit(struct dm_space_map *sm)
+{
+        int r;
+        struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);
+        r = sm_ll_commit(&smm->ll);
+        if (r)
+                return r;
+        memcpy(&smm->old_ll, &smm->ll, sizeof(smm->old_ll));
+        smm->begin = 0;
+        smm->allocated_this_transaction = 0;
+        return 0;
+}
+static int sm_metadata_root_size(struct dm_space_map *sm, size_t *result)
+{
+        *result = sizeof(struct disk_sm_root);
+        return 0;
+}
+static int sm_metadata_copy_root(struct dm_space_map *sm, void *where_le, size_t max)
+{
+        struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);
+        struct disk_sm_root root_le;
+        root_le.nr_blocks = cpu_to_le64(smm->ll.nr_blocks);
+        root_le.nr_allocated = cpu_to_le64(smm->ll.nr_allocated);
+        root_le.bitmap_root = cpu_to_le64(smm->ll.bitmap_root);
+        root_le.ref_count_root = cpu_to_le64(smm->ll.ref_count_root);
+        if (max < sizeof(root_le))
+                return -ENOSPC;
+        memcpy(where_le, &root_le, sizeof(root_le));
+        return 0;
+}
+static struct dm_space_map ops = {
+        .destroy = sm_metadata_destroy,
+        .extend = sm_metadata_extend,
+        .get_nr_blocks = sm_metadata_get_nr_blocks,
+        .get_nr_free = sm_metadata_get_nr_free,
+        .get_count = sm_metadata_get_count,
+        .count_is_more_than_one = sm_metadata_count_is_more_than_one,
+        .set_count = sm_metadata_set_count,
+        .inc_block = sm_metadata_inc_block,
+        .dec_block = sm_metadata_dec_block,
+        .new_block = sm_metadata_new_block,
+        .commit = sm_metadata_commit,
+        .root_size = sm_metadata_root_size,
+        .copy_root = sm_metadata_copy_root
+};
+/*----------------------------------------------------------------*/
+/*
+ * When a new space map is created that manages its own space.  We use
+ * this tiny bootstrap allocator.
+ */
+static void sm_bootstrap_destroy(struct dm_space_map *sm)
+{
+}
+static int sm_bootstrap_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
+{
+        DMERR("boostrap doesn't support extend");
+        return -EINVAL;
+}
+static int sm_bootstrap_get_nr_blocks(struct dm_space_map *sm, dm_block_t *count)
+{
+        struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);
+        return smm->ll.nr_blocks;
+}
+static int sm_bootstrap_get_nr_free(struct dm_space_map *sm, dm_block_t *count)
+{
+        struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);
+        *count = smm->ll.nr_blocks - smm->begin;
+        return 0;
+}
+static int sm_bootstrap_get_count(struct dm_space_map *sm, dm_block_t b,
+                                  uint32_t *result)
+{
+        struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);
+        return b < smm->begin ? 1 : 0;
+}
+static int sm_bootstrap_count_is_more_than_one(struct dm_space_map *sm,
+                                               dm_block_t b, int *result)
+{
+        *result = 0;
+        return 0;
+}
+static int sm_bootstrap_set_count(struct dm_space_map *sm, dm_block_t b,
+                                  uint32_t count)
+{
+        DMERR("boostrap doesn't support set_count");
+        return -EINVAL;
+}
+static int sm_bootstrap_new_block(struct dm_space_map *sm, dm_block_t *b)
+{
+        struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);
+        /*
+         * We know the entire device is unused.
+         */
+        if (smm->begin == smm->ll.nr_blocks)
+                return -ENOSPC;
+        *b = smm->begin++;
+        return 0;
+}
+static int sm_bootstrap_inc_block(struct dm_space_map *sm, dm_block_t b)
+{
+        struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);
+        return add_bop(smm, BOP_INC, b);
+}
+static int sm_bootstrap_dec_block(struct dm_space_map *sm, dm_block_t b)
+{
+        struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);
+        return add_bop(smm, BOP_DEC, b);
+}
+static int sm_bootstrap_commit(struct dm_space_map *sm)
+{
+        return 0;
+}
+static int sm_bootstrap_root_size(struct dm_space_map *sm, size_t *result)
+{
+        DMERR("boostrap doesn't support root_size");
+        return -EINVAL;
+}
+static int sm_bootstrap_copy_root(struct dm_space_map *sm, void *where,
+                                  size_t max)
+{
+        DMERR("boostrap doesn't support copy_root");
+        return -EINVAL;
+}
+static struct dm_space_map bootstrap_ops = {
+        .destroy = sm_bootstrap_destroy,
+        .extend = sm_bootstrap_extend,
+        .get_nr_blocks = sm_bootstrap_get_nr_blocks,
+        .get_nr_free = sm_bootstrap_get_nr_free,
+        .get_count = sm_bootstrap_get_count,
+        .count_is_more_than_one = sm_bootstrap_count_is_more_than_one,
+        .set_count = sm_bootstrap_set_count,
+        .inc_block = sm_bootstrap_inc_block,
+        .dec_block = sm_bootstrap_dec_block,
+        .new_block = sm_bootstrap_new_block,
+        .commit = sm_bootstrap_commit,
+        .root_size = sm_bootstrap_root_size,
+        .copy_root = sm_bootstrap_copy_root
+};
+/*----------------------------------------------------------------*/
+struct dm_space_map *dm_sm_metadata_init(void)
+{
+        struct sm_metadata *smm;
+        smm = kmalloc(sizeof(*smm), GFP_KERNEL);
+        if (!smm)
+                return ERR_PTR(-ENOMEM);
+        memcpy(&smm->sm, &ops, sizeof(smm->sm));
+        return &smm->sm;
+}
+int dm_sm_metadata_create(struct dm_space_map *sm,
+                          struct dm_transaction_manager *tm,
+                          dm_block_t nr_blocks,
+                          dm_block_t superblock)
+{
+        int r;
+        dm_block_t i;
+        enum allocation_event ev;
+        struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);
+        smm->begin = superblock + 1;
+        smm->recursion_count = 0;
+        smm->allocated_this_transaction = 0;
+        smm->nr_uncommitted = 0;
+        memcpy(&smm->sm, &bootstrap_ops, sizeof(smm->sm));
+        r = sm_ll_new_metadata(&smm->ll, tm);
+        if (r)
+                return r;
+        r = sm_ll_extend(&smm->ll, nr_blocks);
+        if (r)
+                return r;
+        memcpy(&smm->sm, &ops, sizeof(smm->sm));
+        /*
+         * Now we need to update the newly created data structures with the
+         * allocated blocks that they were built from.
+         */
+        for (i = superblock; !r && i < smm->begin; i++)
+                r = sm_ll_inc(&smm->ll, i, &ev);
+        if (r)
+                return r;
+        return sm_metadata_commit(sm);
+}
+int dm_sm_metadata_open(struct dm_space_map *sm,
+                        struct dm_transaction_manager *tm,
+                        void *root_le, size_t len)
+{
+        int r;
+        struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);
+        r = sm_ll_open_metadata(&smm->ll, tm, root_le, len);
+        if (r)
+                return r;
+        smm->begin = 0;
+        smm->recursion_count = 0;
+        smm->allocated_this_transaction = 0;
+        smm->nr_uncommitted = 0;
+        memcpy(&smm->old_ll, &smm->ll, sizeof(smm->old_ll));
+        return 0;
+}
diff --git a/drivers/md/persistent-data/dm-space-map-metadata.h b/drivers/md/persistent-data/dm-space-map-metadata.h
new file mode 100644
index 000000000000..39bba0801cf2
--- /dev/null
+++ b/drivers/md/persistent-data/dm-space-map-metadata.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This file is released under the GPL.
+ */
+#ifndef DM_SPACE_MAP_METADATA_H
+#define DM_SPACE_MAP_METADATA_H
+#include "dm-transaction-manager.h"
+/*
+ * Unfortunately we have to use two-phase construction due to the cycle
+ * between the tm and sm.
+ */
+struct dm_space_map *dm_sm_metadata_init(void);
+/*
+ * Create a fresh space map.
+ */
+int dm_sm_metadata_create(struct dm_space_map *sm,
+                          struct dm_transaction_manager *tm,
+                          dm_block_t nr_blocks,
+                          dm_block_t superblock);
+/*
+ * Open from a previously-recorded root.
+ */
+int dm_sm_metadata_open(struct dm_space_map *sm,
+                        struct dm_transaction_manager *tm,
+                        void *root_le, size_t len);
+#endif  /* DM_SPACE_MAP_METADATA_H */
diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
new file mode 100644
index 000000000000..1cbfc6b1638a
--- /dev/null
+++ b/drivers/md/persistent-data/dm-space-map.h
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This file is released under the GPL.
+ */
+#ifndef _LINUX_DM_SPACE_MAP_H
+#define _LINUX_DM_SPACE_MAP_H
+#include "dm-block-manager.h"
+/*
+ * struct dm_space_map keeps a record of how many times each block in a device
+ * is referenced.  It needs to be fixed on disk as part of the transaction.
+ */
+struct dm_space_map {
+        void (*destroy)(struct dm_space_map *sm);
+        /*
+         * You must commit before allocating the newly added space.
+         */
+        int (*extend)(struct dm_space_map *sm, dm_block_t extra_blocks);
+        /*
+         * Extensions do not appear in this count until after commit has
+         * been called.
+         */
+        int (*get_nr_blocks)(struct dm_space_map *sm, dm_block_t *count);
+        /*
+         * Space maps must never allocate a block from the previous
+         * transaction, in case we need to rollback.  This complicates the
+         * semantics of get_nr_free(), it should return the number of blocks
+         * that are available for allocation _now_.  For instance you may
+         * have blocks with a zero reference count that will not be
+         * available for allocation until after the next commit.
+         */
+        int (*get_nr_free)(struct dm_space_map *sm, dm_block_t *count);
+        int (*get_count)(struct dm_space_map *sm, dm_block_t b, uint32_t *result);
+        int (*count_is_more_than_one)(struct dm_space_map *sm, dm_block_t b,
+                                      int *result);
+        int (*set_count)(struct dm_space_map *sm, dm_block_t b, uint32_t count);
+        int (*commit)(struct dm_space_map *sm);
+        int (*inc_block)(struct dm_space_map *sm, dm_block_t b);
+        int (*dec_block)(struct dm_space_map *sm, dm_block_t b);
+        /*
+         * new_block will increment the returned block.
+         */
+        int (*new_block)(struct dm_space_map *sm, dm_block_t *b);
+        /*
+         * The root contains all the information needed to fix the space map.
+         * Generally this info is small, so squirrel it away in a disk block
+         * along with other info.
+         */
+        int (*root_size)(struct dm_space_map *sm, size_t *result);
+        int (*copy_root)(struct dm_space_map *sm, void *copy_to_here_le, size_t len);
+};
+/*----------------------------------------------------------------*/
+static inline void dm_sm_destroy(struct dm_space_map *sm)
+{
+        sm->destroy(sm);
+}
+static inline int dm_sm_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
+{
+        return sm->extend(sm, extra_blocks);
+}
+static inline int dm_sm_get_nr_blocks(struct dm_space_map *sm, dm_block_t *count)
+{
+        return sm->get_nr_blocks(sm, count);
+}
+static inline int dm_sm_get_nr_free(struct dm_space_map *sm, dm_block_t *count)
+{
+        return sm->get_nr_free(sm, count);
+}
+static inline int dm_sm_get_count(struct dm_space_map *sm, dm_block_t b,
+                                  uint32_t *result)
+{
+        return sm->get_count(sm, b, result);
+}
+static inline int dm_sm_count_is_more_than_one(struct dm_space_map *sm,
+                                               dm_block_t b, int *result)
+{
+        return sm->count_is_more_than_one(sm, b, result);
+}
+static inline int dm_sm_set_count(struct dm_space_map *sm, dm_block_t b,
+                                  uint32_t count)
+{
+        return sm->set_count(sm, b, count);
+}
+static inline int dm_sm_commit(struct dm_space_map *sm)
+{
+        return sm->commit(sm);
+}
+static inline int dm_sm_inc_block(struct dm_space_map *sm, dm_block_t b)
+{
+        return sm->inc_block(sm, b);
+}
+static inline int dm_sm_dec_block(struct dm_space_map *sm, dm_block_t b)
+{
+        return sm->dec_block(sm, b);
+}
+static inline int dm_sm_new_block(struct dm_space_map *sm, dm_block_t *b)
+{
+        return sm->new_block(sm, b);
+}
+static inline int dm_sm_root_size(struct dm_space_map *sm, size_t *result)
+{
+        return sm->root_size(sm, result);
+}
+static inline int dm_sm_copy_root(struct dm_space_map *sm, void *copy_to_here_le, size_t len)
+{
+        return sm->copy_root(sm, copy_to_here_le, len);
+}
+#endif  /* _LINUX_DM_SPACE_MAP_H */
diff --git a/drivers/md/persistent-data/dm-transaction-manager.c b/drivers/md/persistent-data/dm-transaction-manager.c
new file mode 100644
index 000000000000..728e89a3f978
--- /dev/null
+++ b/drivers/md/persistent-data/dm-transaction-manager.c
@@ -0,0 +1,400 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This file is released under the GPL.
+ */
+#include "dm-transaction-manager.h"
+#include "dm-space-map.h"
+#include "dm-space-map-checker.h"
+#include "dm-space-map-disk.h"
+#include "dm-space-map-metadata.h"
+#include "dm-persistent-data-internal.h"
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/device-mapper.h>
+#define DM_MSG_PREFIX "transaction manager"
+/*----------------------------------------------------------------*/
+struct shadow_info {
+        struct hlist_node hlist;
+        dm_block_t where;
+};
+/*
+ * It would be nice if we scaled with the size of transaction.
+ */
+#define HASH_SIZE 256
+#define HASH_MASK (HASH_SIZE - 1)
+struct dm_transaction_manager {
+        int is_clone;
+        struct dm_transaction_manager *real;
+        struct dm_block_manager *bm;
+        struct dm_space_map *sm;
+        spinlock_t lock;
+        struct hlist_head buckets[HASH_SIZE];
+};
+/*----------------------------------------------------------------*/
+static int is_shadow(struct dm_transaction_manager *tm, dm_block_t b)
+{
+        int r = 0;
+        unsigned bucket = dm_hash_block(b, HASH_MASK);
+        struct shadow_info *si;
+        struct hlist_node *n;
+        spin_lock(&tm->lock);
+        hlist_for_each_entry(si, n, tm->buckets + bucket, hlist)
+                if (si->where == b) {
+                        r = 1;
+                        break;
+                }
+        spin_unlock(&tm->lock);
+        return r;
+}
+/*
+ * This can silently fail if there's no memory.  We're ok with this since
+ * creating redundant shadows causes no harm.
+ */
+static void insert_shadow(struct dm_transaction_manager *tm, dm_block_t b)
+{
+        unsigned bucket;
+        struct shadow_info *si;
+        si = kmalloc(sizeof(*si), GFP_NOIO);
+        if (si) {
+                si->where = b;
+                bucket = dm_hash_block(b, HASH_MASK);
+                spin_lock(&tm->lock);
+                hlist_add_head(&si->hlist, tm->buckets + bucket);
+                spin_unlock(&tm->lock);
+        }
+}
+static void wipe_shadow_table(struct dm_transaction_manager *tm)
+{
+        struct shadow_info *si;
+        struct hlist_node *n, *tmp;
+        struct hlist_head *bucket;
+        int i;
+        spin_lock(&tm->lock);
+        for (i = 0; i < HASH_SIZE; i++) {
+                bucket = tm->buckets + i;
+                hlist_for_each_entry_safe(si, n, tmp, bucket, hlist)
+                        kfree(si);
+                INIT_HLIST_HEAD(bucket);
+        }
+        spin_unlock(&tm->lock);
+}
+/*----------------------------------------------------------------*/
+static struct dm_transaction_manager *dm_tm_create(struct dm_block_manager *bm,
+                                                   struct dm_space_map *sm)
+{
+        int i;
+        struct dm_transaction_manager *tm;
+        tm = kmalloc(sizeof(*tm), GFP_KERNEL);
+        if (!tm)
+                return ERR_PTR(-ENOMEM);
+        tm->is_clone = 0;
+        tm->real = NULL;
+        tm->bm = bm;
+        tm->sm = sm;
+        spin_lock_init(&tm->lock);
+        for (i = 0; i < HASH_SIZE; i++)
+                INIT_HLIST_HEAD(tm->buckets + i);
+        return tm;
+}
+struct dm_transaction_manager *dm_tm_create_non_blocking_clone(struct dm_transaction_manager *real)
+{
+        struct dm_transaction_manager *tm;
+        tm = kmalloc(sizeof(*tm), GFP_KERNEL);
+        if (tm) {
+                tm->is_clone = 1;
+                tm->real = real;
+        }
+        return tm;
+}
+EXPORT_SYMBOL_GPL(dm_tm_create_non_blocking_clone);
+void dm_tm_destroy(struct dm_transaction_manager *tm)
+{
+        kfree(tm);
+}
+EXPORT_SYMBOL_GPL(dm_tm_destroy);
+int dm_tm_pre_commit(struct dm_transaction_manager *tm)
+{
+        int r;
+        if (tm->is_clone)
+                return -EWOULDBLOCK;
+        r = dm_sm_commit(tm->sm);
+        if (r < 0)
+                return r;
+        return 0;
+}
+EXPORT_SYMBOL_GPL(dm_tm_pre_commit);
+int dm_tm_commit(struct dm_transaction_manager *tm, struct dm_block *root)
+{
+        if (tm->is_clone)
+                return -EWOULDBLOCK;
+        wipe_shadow_table(tm);
+        return dm_bm_flush_and_unlock(tm->bm, root);
+}
+EXPORT_SYMBOL_GPL(dm_tm_commit);
+int dm_tm_new_block(struct dm_transaction_manager *tm,
+                    struct dm_block_validator *v,
+                    struct dm_block **result)
+{
+        int r;
+        dm_block_t new_block;
+        if (tm->is_clone)
+                return -EWOULDBLOCK;
+        r = dm_sm_new_block(tm->sm, &new_block);
+        if (r < 0)
+                return r;
+        r = dm_bm_write_lock_zero(tm->bm, new_block, v, result);
+        if (r < 0) {
+                dm_sm_dec_block(tm->sm, new_block);
+                return r;
+        }
+        /*
+         * New blocks count as shadows in that they don't need to be
+         * shadowed again.
+         */
+        insert_shadow(tm, new_block);
+        return 0;
+}
+static int __shadow_block(struct dm_transaction_manager *tm, dm_block_t orig,
+                          struct dm_block_validator *v,
+                          struct dm_block **result)
+{
+        int r;
+        dm_block_t new;
+        struct dm_block *orig_block;
+        r = dm_sm_new_block(tm->sm, &new);
+        if (r < 0)
+                return r;
+        r = dm_sm_dec_block(tm->sm, orig);
+        if (r < 0)
+                return r;
+        r = dm_bm_read_lock(tm->bm, orig, v, &orig_block);
+        if (r < 0)
+                return r;
+        r = dm_bm_unlock_move(orig_block, new);
+        if (r < 0) {
+                dm_bm_unlock(orig_block);
+                return r;
+        }
+        return dm_bm_write_lock(tm->bm, new, v, result);
+}
+int dm_tm_shadow_block(struct dm_transaction_manager *tm, dm_block_t orig,
+                       struct dm_block_validator *v, struct dm_block **result,
+                       int *inc_children)
+{
+        int r;
+        if (tm->is_clone)
+                return -EWOULDBLOCK;
+        r = dm_sm_count_is_more_than_one(tm->sm, orig, inc_children);
+        if (r < 0)
+                return r;
+        if (is_shadow(tm, orig) && !*inc_children)
+                return dm_bm_write_lock(tm->bm, orig, v, result);
+        r = __shadow_block(tm, orig, v, result);
+        if (r < 0)
+                return r;
+        insert_shadow(tm, dm_block_location(*result));
+        return r;
+}
+int dm_tm_read_lock(struct dm_transaction_manager *tm, dm_block_t b,
+                    struct dm_block_validator *v,
+                    struct dm_block **blk)
+{
+        if (tm->is_clone)
+                return dm_bm_read_try_lock(tm->real->bm, b, v, blk);
+        return dm_bm_read_lock(tm->bm, b, v, blk);
+}
+int dm_tm_unlock(struct dm_transaction_manager *tm, struct dm_block *b)
+{
+        return dm_bm_unlock(b);
+}
+EXPORT_SYMBOL_GPL(dm_tm_unlock);
+void dm_tm_inc(struct dm_transaction_manager *tm, dm_block_t b)
+{
+        /*
+         * The non-blocking clone doesn't support this.
+         */
+        BUG_ON(tm->is_clone);
+        dm_sm_inc_block(tm->sm, b);
+}
+EXPORT_SYMBOL_GPL(dm_tm_inc);
+void dm_tm_dec(struct dm_transaction_manager *tm, dm_block_t b)
+{
+        /*
+         * The non-blocking clone doesn't support this.
+         */
+        BUG_ON(tm->is_clone);
+        dm_sm_dec_block(tm->sm, b);
+}
+EXPORT_SYMBOL_GPL(dm_tm_dec);
+int dm_tm_ref(struct dm_transaction_manager *tm, dm_block_t b,
+              uint32_t *result)
+{
+        if (tm->is_clone)
+                return -EWOULDBLOCK;
+        return dm_sm_get_count(tm->sm, b, result);
+}
+struct dm_block_manager *dm_tm_get_bm(struct dm_transaction_manager *tm)
+{
+        return tm->bm;
+}
+/*----------------------------------------------------------------*/
+static int dm_tm_create_internal(struct dm_block_manager *bm,
+                                 dm_block_t sb_location,
+                                 struct dm_block_validator *sb_validator,
+                                 size_t root_offset, size_t root_max_len,
+                                 struct dm_transaction_manager **tm,
+                                 struct dm_space_map **sm,
+                                 struct dm_block **sblock,
+                                 int create)
+{
+        int r;
+        struct dm_space_map *inner;
+        inner = dm_sm_metadata_init();
+        if (IS_ERR(inner))
+                return PTR_ERR(inner);
+        *tm = dm_tm_create(bm, inner);
+        if (IS_ERR(*tm)) {
+                dm_sm_destroy(inner);
+                return PTR_ERR(*tm);
+        }
+        if (create) {
+                r = dm_bm_write_lock_zero(dm_tm_get_bm(*tm), sb_location,
+                                          sb_validator, sblock);
+                if (r < 0) {
+                        DMERR("couldn't lock superblock");
+                        goto bad1;
+                }
+                r = dm_sm_metadata_create(inner, *tm, dm_bm_nr_blocks(bm),
+                                          sb_location);
+                if (r) {
+                        DMERR("couldn't create metadata space map");
+                        goto bad2;
+                }
+                *sm = dm_sm_checker_create(inner);
+                if (!*sm)
+                        goto bad2;
+        } else {
+                r = dm_bm_write_lock(dm_tm_get_bm(*tm), sb_location,
+                                     sb_validator, sblock);
+                if (r < 0) {
+                        DMERR("couldn't lock superblock");
+                        goto bad1;
+                }
+                r = dm_sm_metadata_open(inner, *tm,
+                                        dm_block_data(*sblock) + root_offset,
+                                        root_max_len);
+                if (r) {
+                        DMERR("couldn't open metadata space map");
+                        goto bad2;
+                }
+                *sm = dm_sm_checker_create(inner);
+                if (!*sm)
+                        goto bad2;
+        }
+        return 0;
+bad2:
+        dm_tm_unlock(*tm, *sblock);
+bad1:
+        dm_tm_destroy(*tm);
+        dm_sm_destroy(inner);
+        return r;
+}
+int dm_tm_create_with_sm(struct dm_block_manager *bm, dm_block_t sb_location,
+                         struct dm_block_validator *sb_validator,
+                         struct dm_transaction_manager **tm,
+                         struct dm_space_map **sm, struct dm_block **sblock)
+{
+        return dm_tm_create_internal(bm, sb_location, sb_validator,
+                                     0, 0, tm, sm, sblock, 1);
+}
+EXPORT_SYMBOL_GPL(dm_tm_create_with_sm);
+int dm_tm_open_with_sm(struct dm_block_manager *bm, dm_block_t sb_location,
+                       struct dm_block_validator *sb_validator,
+                       size_t root_offset, size_t root_max_len,
+                       struct dm_transaction_manager **tm,
+                       struct dm_space_map **sm, struct dm_block **sblock)
+{
+        return dm_tm_create_internal(bm, sb_location, sb_validator, root_offset,
+                                     root_max_len, tm, sm, sblock, 0);
+}
+EXPORT_SYMBOL_GPL(dm_tm_open_with_sm);
+/*----------------------------------------------------------------*/
diff --git a/drivers/md/persistent-data/dm-transaction-manager.h b/drivers/md/persistent-data/dm-transaction-manager.h
new file mode 100644
index 000000000000..6da784871db4
--- /dev/null
+++ b/drivers/md/persistent-data/dm-transaction-manager.h
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This file is released under the GPL.
+ */
+#ifndef _LINUX_DM_TRANSACTION_MANAGER_H
+#define _LINUX_DM_TRANSACTION_MANAGER_H
+#include "dm-block-manager.h"
+struct dm_transaction_manager;
+struct dm_space_map;
+/*----------------------------------------------------------------*/
+/*
+ * This manages the scope of a transaction.  It also enforces immutability
+ * of the on-disk data structures by limiting access to writeable blocks.
+ *
+ * Clients should not fiddle with the block manager directly.
+ */
+void dm_tm_destroy(struct dm_transaction_manager *tm);
+/*
+ * The non-blocking version of a transaction manager is intended for use in
+ * fast path code that needs to do lookups e.g. a dm mapping function.
+ * You create the non-blocking variant from a normal tm.  The interface is
+ * the same, except that most functions will just return -EWOULDBLOCK.
+ * Methods that return void yet may block should not be called on a clone
+ * viz. dm_tm_inc, dm_tm_dec.  Call dm_tm_destroy() as you would with a normal
+ * tm when you've finished with it.  You may not destroy the original prior
+ * to clones.
+ */
+struct dm_transaction_manager *dm_tm_create_non_blocking_clone(struct dm_transaction_manager *real);
+/*
+ * We use a 2-phase commit here.
+ *
+ * i) In the first phase the block manager is told to start flushing, and
+ * the changes to the space map are written to disk.  You should interrogate
+ * your particular space map to get detail of its root node etc. to be
+ * included in your superblock.
+ *
+ * ii) @root will be committed last.  You shouldn't use more than the
+ * first 512 bytes of @root if you wish the transaction to survive a power
+ * failure.  You *must* have a write lock held on @root for both stage (i)
+ * and (ii).  The commit will drop the write lock.
+ */
+int dm_tm_pre_commit(struct dm_transaction_manager *tm);
+int dm_tm_commit(struct dm_transaction_manager *tm, struct dm_block *root);
+/*
+ * These methods are the only way to get hold of a writeable block.
+ */
+/*
+ * dm_tm_new_block() is pretty self-explanatory.  Make sure you do actually
+ * write to the whole of @data before you unlock, otherwise you could get
+ * a data leak.  (The other option is for tm_new_block() to zero new blocks
+ * before handing them out, which will be redundant in most, if not all,
+ * cases).
+ * Zeroes the new block and returns with write lock held.
+ */
+int dm_tm_new_block(struct dm_transaction_manager *tm,
+                    struct dm_block_validator *v,
+                    struct dm_block **result);
+/*
+ * dm_tm_shadow_block() allocates a new block and copies the data from @orig
+ * to it.  It then decrements the reference count on original block.  Use
+ * this to update the contents of a block in a data structure, don't
+ * confuse this with a clone - you shouldn't access the orig block after
+ * this operation.  Because the tm knows the scope of the transaction it
+ * can optimise requests for a shadow of a shadow to a no-op.  Don't forget
+ * to unlock when you've finished with the shadow.
+ *
+ * The @inc_children flag is used to tell the caller whether it needs to
+ * adjust reference counts for children.  (Data in the block may refer to
+ * other blocks.)
+ *
+ * Shadowing implicitly drops a reference on @orig so you must not have
+ * it locked when you call this.
+ */
+int dm_tm_shadow_block(struct dm_transaction_manager *tm, dm_block_t orig,
+                       struct dm_block_validator *v,
+                       struct dm_block **result, int *inc_children);
+/*
+ * Read access.  You can lock any block you want.  If there's a write lock
+ * on it outstanding then it'll block.
+ */
+int dm_tm_read_lock(struct dm_transaction_manager *tm, dm_block_t b,
+                    struct dm_block_validator *v,
+                    struct dm_block **result);
+int dm_tm_unlock(struct dm_transaction_manager *tm, struct dm_block *b);
+/*
+ * Functions for altering the reference count of a block directly.
+ */
+void dm_tm_inc(struct dm_transaction_manager *tm, dm_block_t b);
+void dm_tm_dec(struct dm_transaction_manager *tm, dm_block_t b);
+int dm_tm_ref(struct dm_transaction_manager *tm, dm_block_t b,
+              uint32_t *result);
+struct dm_block_manager *dm_tm_get_bm(struct dm_transaction_manager *tm);
+/*
+ * A little utility that ties the knot by producing a transaction manager
+ * that has a space map managed by the transaction manager...
+ *
+ * Returns a tm that has an open transaction to write the new disk sm.
+ * Caller should store the new sm root and commit.
+ */
+int dm_tm_create_with_sm(struct dm_block_manager *bm, dm_block_t sb_location,
+                         struct dm_block_validator *sb_validator,
+                         struct dm_transaction_manager **tm,
+                         struct dm_space_map **sm, struct dm_block **sblock);
+int dm_tm_open_with_sm(struct dm_block_manager *bm, dm_block_t sb_location,
+                       struct dm_block_validator *sb_validator,
+                       size_t root_offset, size_t root_max_len,
+                       struct dm_transaction_manager **tm,
+                       struct dm_space_map **sm, struct dm_block **sblock);
+#endif  /* _LINUX_DM_TRANSACTION_MANAGER_H */
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 0eb08a4df759..7294bd115e34 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -20,6 +20,7 @@
 #include <linux/blkdev.h>
 #include <linux/seq_file.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include "md.h"
 #include "raid0.h"
@@ -468,7 +469,7 @@ static inline int is_io_in_chunk_boundary(struct mddev *mddev,
        }
 }
-static int raid0_make_request(struct mddev *mddev, struct bio *bio)
+static void raid0_make_request(struct mddev *mddev, struct bio *bio)
 {
        unsigned int chunk_sects;
        sector_t sector_offset;
@@ -477,7 +478,7 @@ static int raid0_make_request(struct mddev *mddev, struct bio *bio)
        if (unlikely(bio->bi_rw & REQ_FLUSH)) {
                md_flush_request(mddev, bio);
-                return 0;
+                return;
        }
        chunk_sects = mddev->chunk_sectors;
@@ -497,13 +498,10 @@ static int raid0_make_request(struct mddev *mddev, struct bio *bio)
                else
                        bp = bio_split(bio, chunk_sects -
                                       sector_div(sector, chunk_sects));
-                if (raid0_make_request(mddev, &bp->bio1))
+                raid0_make_request(mddev, &bp->bio1);
-                        generic_make_request(&bp->bio1);
+                raid0_make_request(mddev, &bp->bio2);
-                if (raid0_make_request(mddev, &bp->bio2))
-                        generic_make_request(&bp->bio2);
                bio_pair_release(bp);
-                return 0;
+                return;
        }
        sector_offset = bio->bi_sector;
@@ -513,10 +511,9 @@ static int raid0_make_request(struct mddev *mddev, struct bio *bio)
        bio->bi_bdev = tmp_dev->bdev;
        bio->bi_sector = sector_offset + zone->dev_start +
                tmp_dev->data_offset;
-        /*
-         * Let the main block layer submit the IO and resolve recursion:
+        generic_make_request(bio);
-         */
+        return;
-        return 1;
 bad_map:
        printk("md/raid0:%s: make_request bug: can't convert block across chunks"
@@ -525,7 +522,7 @@ bad_map:
               (unsigned long long)bio->bi_sector, bio->bi_size >> 10);
        bio_io_error(bio);
-        return 0;
+        return;
 }
 static void raid0_status(struct seq_file *seq, struct mddev *mddev)
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 4602fc57c961..ede2461e79c5 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -34,6 +34,7 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/blkdev.h>
+#include <linux/module.h>
 #include <linux/seq_file.h>
 #include <linux/ratelimit.h>
 #include "md.h"
@@ -807,7 +808,7 @@ do_sync_io:
        pr_debug("%dB behind alloc failed, doing sync I/O\n", bio->bi_size);
 }
-static int make_request(struct mddev *mddev, struct bio * bio)
+static void make_request(struct mddev *mddev, struct bio * bio)
 {
        struct r1conf *conf = mddev->private;
        struct mirror_info *mirror;
@@ -892,7 +893,7 @@ read_again:
                if (rdisk < 0) {
                        /* couldn't find anywhere to read from */
                        raid_end_bio_io(r1_bio);
-                        return 0;
+                        return;
                }
                mirror = conf->mirrors + rdisk;
@@ -950,7 +951,7 @@ read_again:
                        goto read_again;
                } else
                        generic_make_request(read_bio);
-                return 0;
+                return;
        }
        /*
@@ -1151,8 +1152,6 @@ read_again:
        if (do_sync || !bitmap || !plugged)
                md_wakeup_thread(mddev->thread);
-        return 0;
 }
 static void status(struct seq_file *seq, struct mddev *mddev)
@@ -2193,7 +2192,6 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipp
                bio->bi_next = NULL;
                bio->bi_flags &= ~(BIO_POOL_MASK-1);
                bio->bi_flags |= 1 << BIO_UPTODATE;
-                bio->bi_comp_cpu = -1;
                bio->bi_rw = READ;
                bio->bi_vcnt = 0;
                bio->bi_idx = 0;
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index c025a8276dc1..685ddf325ee4 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -21,6 +21,7 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/blkdev.h>
+#include <linux/module.h>
 #include <linux/seq_file.h>
 #include <linux/ratelimit.h>
 #include "md.h"
@@ -842,7 +843,7 @@ static void unfreeze_array(struct r10conf *conf)
        spin_unlock_irq(&conf->resync_lock);
 }
-static int make_request(struct mddev *mddev, struct bio * bio)
+static void make_request(struct mddev *mddev, struct bio * bio)
 {
        struct r10conf *conf = mddev->private;
        struct mirror_info *mirror;
@@ -861,7 +862,7 @@ static int make_request(struct mddev *mddev, struct bio * bio)
        if (unlikely(bio->bi_rw & REQ_FLUSH)) {
                md_flush_request(mddev, bio);
-                return 0;
+                return;
        }
        /* If this request crosses a chunk boundary, we need to
@@ -893,10 +894,8 @@ static int make_request(struct mddev *mddev, struct bio * bio)
                conf->nr_waiting++;
                spin_unlock_irq(&conf->resync_lock);
-                if (make_request(mddev, &bp->bio1))
+                make_request(mddev, &bp->bio1);
-                        generic_make_request(&bp->bio1);
+                make_request(mddev, &bp->bio2);
-                if (make_request(mddev, &bp->bio2))
-                        generic_make_request(&bp->bio2);
                spin_lock_irq(&conf->resync_lock);
                conf->nr_waiting--;
@@ -904,14 +903,14 @@ static int make_request(struct mddev *mddev, struct bio * bio)
                spin_unlock_irq(&conf->resync_lock);
                bio_pair_release(bp);
-                return 0;
+                return;
        bad_map:
                printk("md/raid10:%s: make_request bug: can't convert block across chunks"
                       " or bigger than %dk %llu %d\n", mdname(mddev), chunk_sects/2,
                       (unsigned long long)bio->bi_sector, bio->bi_size >> 10);
                bio_io_error(bio);
-                return 0;
+                return;
        }
        md_write_start(mddev, bio);
@@ -954,7 +953,7 @@ read_again:
                slot = r10_bio->read_slot;
                if (disk < 0) {
                        raid_end_bio_io(r10_bio);
-                        return 0;
+                        return;
                }
                mirror = conf->mirrors + disk;
@@ -1002,7 +1001,7 @@ read_again:
                        goto read_again;
                } else
                        generic_make_request(read_bio);
-                return 0;
+                return;
        }
        /*
@@ -1176,7 +1175,6 @@ retry_write:
        if (do_sync || !mddev->bitmap || !plugged)
                md_wakeup_thread(mddev->thread);
-        return 0;
 }
 static void status(struct seq_file *seq, struct mddev *mddev)
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index f6fe053a5bed..472aedfb07cf 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -47,6 +47,7 @@
 #include <linux/kthread.h>
 #include <linux/raid/pq.h>
 #include <linux/async_tx.h>
+#include <linux/module.h>
 #include <linux/async.h>
 #include <linux/seq_file.h>
 #include <linux/cpu.h>
@@ -3688,7 +3689,7 @@ static struct stripe_head *__get_priority_stripe(struct r5conf *conf)
        return sh;
 }
-static int make_request(struct mddev *mddev, struct bio * bi)
+static void make_request(struct mddev *mddev, struct bio * bi)
 {
        struct r5conf *conf = mddev->private;
        int dd_idx;
@@ -3701,7 +3702,7 @@ static int make_request(struct mddev *mddev, struct bio * bi)
        if (unlikely(bi->bi_rw & REQ_FLUSH)) {
                md_flush_request(mddev, bi);
-                return 0;
+                return;
        }
        md_write_start(mddev, bi);
@@ -3709,7 +3710,7 @@ static int make_request(struct mddev *mddev, struct bio * bi)
        if (rw == READ &&
             mddev->reshape_position == MaxSector &&
             chunk_aligned_read(mddev,bi))
-                return 0;
+                return;
        logical_sector = bi->bi_sector & ~((sector_t)STRIPE_SECTORS-1);
        last_sector = bi->bi_sector + (bi->bi_size>>9);
@@ -3844,8 +3845,6 @@ static int make_request(struct mddev *mddev, struct bio * bi)
                bio_endio(bi, 0);
        }
-        return 0;
 }
 static sector_t raid5_size(struct mddev *mddev, sector_t sectors, int raid_disks);
diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index f5d53a202344..d6b1cf66042d 100644
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -21,6 +21,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <media/saa7146.h>
+#include <linux/module.h>
 LIST_HEAD(saa7146_devices);
 DEFINE_MUTEX(saa7146_devices_lock);
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index a92546144eaa..71f8e018e564 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -1,6 +1,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <media/saa7146_vv.h>
+#include <linux/module.h>
 /****************************************************************************/
 /* resource management functions, shamelessly stolen from saa7134 driver */
diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146_hlp.c
index 79ad73accb27..bc1f545c95cb 100644
--- a/drivers/media/common/saa7146_hlp.c
+++ b/drivers/media/common/saa7146_hlp.c
@@ -1,6 +1,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <media/saa7146_vv.h>
 static void calculate_output_format_register(struct saa7146_dev* saa, u32 palette, u32* clip_format)
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index 384b358d3037..ce30533fd972 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -2,6 +2,7 @@
 #include <media/saa7146_vv.h>
 #include <media/v4l2-chip-ident.h>
+#include <linux/module.h>
 static int max_memory = 32;
diff --git a/drivers/media/common/tuners/tuner-types.c b/drivers/media/common/tuners/tuner-types.c
index 94a603a60842..e13683bab6b3 100644
--- a/drivers/media/common/tuners/tuner-types.c
+++ b/drivers/media/common/tuners/tuner-types.c
@@ -5,6 +5,7 @@
 */
 #include <linux/i2c.h>
+#include <linux/module.h>
 #include <media/tuner.h>
 #include <media/tuner-types.h>
diff --git a/drivers/media/dvb/ddbridge/Makefile b/drivers/media/dvb/ddbridge/Makefile
index cf7214edf65f..38019bafb862 100644
--- a/drivers/media/dvb/ddbridge/Makefile
+++ b/drivers/media/dvb/ddbridge/Makefile
@@ -11,4 +11,4 @@ ccflags-y += -Idrivers/media/dvb/frontends/
 ccflags-y += -Idrivers/media/common/tuners/
 # For the staging CI driver cxd2099
-ccflags-y += -Idrivers/staging/cxd2099/
+ccflags-y += -Idrivers/staging/media/cxd2099/
diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Makefile
index 7d0710bb1978..26c8b9e57050 100644
--- a/drivers/media/dvb/dvb-usb/Makefile
+++ b/drivers/media/dvb/dvb-usb/Makefile
@@ -102,6 +102,7 @@ obj-$(CONFIG_DVB_USB_IT913X) += dvb-usb-it913x.o
 dvb-usb-mxl111sf-objs = mxl111sf.o mxl111sf-phy.o mxl111sf-i2c.o mxl111sf-gpio.o
 obj-$(CONFIG_DVB_USB_MXL111SF) += dvb-usb-mxl111sf.o
+obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-demod.o
 obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-tuner.o
 ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 2ad33ba92ba2..2d08c9b5128a 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -37,6 +37,7 @@
 #define USB_VID_HAUPPAUGE                       0x2040
 #define USB_VID_HYPER_PALTEK                    0x1025
 #define USB_VID_INTEL                           0x8086
+#define USB_VID_ITETECH                         0x048d
 #define USB_VID_KWORLD                          0xeb2a
 #define USB_VID_KWORLD_2                        0x1b80
 #define USB_VID_KYE                             0x0458
@@ -126,6 +127,7 @@
 #define USB_PID_GRANDTEC_DVBT_USB_COLD                  0x0fa0
 #define USB_PID_GRANDTEC_DVBT_USB_WARM                  0x0fa1
 #define USB_PID_INTEL_CE9500                            0x9500
+#define USB_PID_ITETECH_IT9135                          0x9135
 #define USB_PID_KWORLD_399U                             0xe399
 #define USB_PID_KWORLD_399U_2                           0xe400
 #define USB_PID_KWORLD_395U                             0xe396
diff --git a/drivers/media/dvb/dvb-usb/it913x.c b/drivers/media/dvb/dvb-usb/it913x.c
index f027a2c1c3e8..c46226187143 100644
--- a/drivers/media/dvb/dvb-usb/it913x.c
+++ b/drivers/media/dvb/dvb-usb/it913x.c
@@ -60,6 +60,17 @@ struct it913x_state {
        u8 id;
 };
+struct ite_config {
+        u8 chip_ver;
+        u16 chip_type;
+        u32 firmware;
+        u8 tuner_id_0;
+        u8 tuner_id_1;
+        u8 dual_mode;
+};
+struct ite_config it913x_config;
 static int it913x_bulk_write(struct usb_device *dev,
                                u8 *snd, int len, u8 pipe)
 {
@@ -191,18 +202,23 @@ static int it913x_read_reg(struct usb_device *udev, u32 reg)
 static u32 it913x_query(struct usb_device *udev, u8 pro)
 {
        int ret;
-        u32 res = 0;
        u8 data[4];
        ret = it913x_io(udev, READ_LONG, pro, CMD_DEMOD_READ,
-                0x1222, 0, &data[0], 1);
+                0x1222, 0, &data[0], 3);
-        if (data[0] == 0x1) {
-                ret = it913x_io(udev, READ_SHORT, pro,
+        it913x_config.chip_ver = data[0];
+        it913x_config.chip_type = (u16)(data[2] << 8) + data[1];
+        info("Chip Version=%02x Chip Type=%04x", it913x_config.chip_ver,
+                it913x_config.chip_type);
+        ret |= it913x_io(udev, READ_SHORT, pro,
                        CMD_QUERYINFO, 0, 0x1, &data[0], 4);
-                res = (data[0] << 24) + (data[1] << 16) +
+        it913x_config.firmware = (data[0] << 24) + (data[1] << 16) +
                        (data[2] << 8) + data[3];
-        }
-        return (ret < 0) ? 0 : res;
+        return (ret < 0) ? 0 : it913x_config.firmware;
 }
 static int it913x_pid_filter_ctrl(struct dvb_usb_adapter *adap, int onoff)
@@ -336,26 +352,35 @@ static int it913x_identify_state(struct usb_device *udev,
                int *cold)
 {
        int ret = 0, firm_no;
-        u8 reg, adap, ep, tun0, tun1;
+        u8 reg, remote;
        firm_no = it913x_return_status(udev);
-        ep = it913x_read_reg(udev, 0x49ac);
+        /* checnk for dual mode */
-        adap = it913x_read_reg(udev, 0x49c5);
+        it913x_config.dual_mode =  it913x_read_reg(udev, 0x49c5);
-        tun0 = it913x_read_reg(udev, 0x49d0);
-        info("No. Adapters=%x Endpoints=%x Tuner Type=%x", adap, ep, tun0);
+        /* TODO different remotes */
+        remote = it913x_read_reg(udev, 0x49ac); /* Remote */
+        if (remote == 0)
+                props->rc.core.rc_codes = NULL;
+        /* TODO at the moment tuner_id is always assigned to 0x38 */
+        it913x_config.tuner_id_0 = it913x_read_reg(udev, 0x49d0);
+        info("Dual mode=%x Remote=%x Tuner Type=%x", it913x_config.dual_mode
+                , remote, it913x_config.tuner_id_0);
        if (firm_no > 0) {
                *cold = 0;
                return 0;
        }
-        if (adap > 2) {
+        if (it913x_config.dual_mode) {
-                tun1 = it913x_read_reg(udev, 0x49e0);
+                it913x_config.tuner_id_1 = it913x_read_reg(udev, 0x49e0);
                ret = it913x_wr_reg(udev, DEV_0, GPIOH1_EN, 0x1);
                ret |= it913x_wr_reg(udev, DEV_0, GPIOH1_ON, 0x1);
                ret |= it913x_wr_reg(udev, DEV_0, GPIOH1_O, 0x1);
-                msleep(50); /* Delay noticed reset cycle ? */
+                msleep(50);
                ret |= it913x_wr_reg(udev, DEV_0, GPIOH1_O, 0x0);
                msleep(50);
                reg = it913x_read_reg(udev, GPIOH1_O);
@@ -366,14 +391,19 @@ static int it913x_identify_state(struct usb_device *udev,
                                ret = it913x_wr_reg(udev, DEV_0,
                                        GPIOH1_O, 0x0);
                }
+                props->num_adapters = 2;
        } else
                props->num_adapters = 1;
        reg = it913x_read_reg(udev, IO_MUX_POWER_CLK);
-        ret |= it913x_wr_reg(udev, DEV_0, 0x4bfb, CHIP2_I2C_ADDR);
+        if (it913x_config.dual_mode) {
+                ret |= it913x_wr_reg(udev, DEV_0, 0x4bfb, CHIP2_I2C_ADDR);
-        ret |= it913x_wr_reg(udev, DEV_0,  CLK_O_EN, 0x1);
+                ret |= it913x_wr_reg(udev, DEV_0,  CLK_O_EN, 0x1);
+        } else {
+                ret |= it913x_wr_reg(udev, DEV_0, 0x4bfb, 0x0);
+                ret |= it913x_wr_reg(udev, DEV_0,  CLK_O_EN, 0x0);
+        }
        *cold = 1;
@@ -403,13 +433,11 @@ static int it913x_download_firmware(struct usb_device *udev,
                                        const struct firmware *fw)
 {
        int ret = 0, i;
-        u8 packet_size, dlen, tun1;
+        u8 packet_size, dlen;
        u8 *fw_data;
        packet_size = 0x29;
-        tun1 = it913x_read_reg(udev, 0x49e0);
        ret = it913x_wr_reg(udev, DEV_0,  I2C_CLK, I2C_CLK_100);
        info("FRM Starting Firmware Download");
@@ -444,11 +472,12 @@ static int it913x_download_firmware(struct usb_device *udev,
        ret |= it913x_wr_reg(udev, DEV_0,  I2C_CLK, I2C_CLK_400);
        /* Tuner function */
-        ret |= it913x_wr_reg(udev, DEV_0_DMOD , 0xec4c, 0xa0);
+        if (it913x_config.dual_mode)
+                ret |= it913x_wr_reg(udev, DEV_0_DMOD , 0xec4c, 0xa0);
        ret |= it913x_wr_reg(udev, DEV_0,  PADODPU, 0x0);
        ret |= it913x_wr_reg(udev, DEV_0,  AGC_O_D, 0x0);
-        if (tun1 > 0) {
+        if (it913x_config.dual_mode) {
                ret |= it913x_wr_reg(udev, DEV_1,  PADODPU, 0x0);
                ret |= it913x_wr_reg(udev, DEV_1,  AGC_O_D, 0x0);
        }
@@ -475,9 +504,28 @@ static int it913x_frontend_attach(struct dvb_usb_adapter *adap)
        u8 adf = it913x_read_reg(udev, IO_MUX_POWER_CLK);
        u8 adap_addr = I2C_BASE_ADDR + (adap->id << 5);
        u16 ep_size = adap->props.fe[0].stream.u.bulk.buffersize;
+        u8 tuner_id, tuner_type;
+        if (adap->id == 0)
+                tuner_id = it913x_config.tuner_id_0;
+        else
+                tuner_id = it913x_config.tuner_id_1;
+        /* TODO we always use IT9137 possible references here*/
+        /* Documentation suggests don't care */
+        switch (tuner_id) {
+        case 0x51:
+        case 0x52:
+        case 0x60:
+        case 0x61:
+        case 0x62:
+        default:
+        case 0x38:
+                tuner_type = IT9137;
+        }
        adap->fe_adap[0].fe = dvb_attach(it913x_fe_attach,
-                &adap->dev->i2c_adap, adap_addr, adf, IT9137);
+                &adap->dev->i2c_adap, adap_addr, adf, tuner_type);
        if (adap->id == 0 && adap->fe_adap[0].fe) {
                ret = it913x_wr_reg(udev, DEV_0_DMOD, MP2_SW_RST, 0x1);
@@ -533,6 +581,7 @@ static int it913x_probe(struct usb_interface *intf,
 static struct usb_device_id it913x_table[] = {
        { USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_UB499_2T_T09) },
+        { USB_DEVICE(USB_VID_ITETECH, USB_PID_ITETECH_IT9135) },
        {}              /* Terminating entry */
 };
@@ -608,12 +657,14 @@ static struct dvb_usb_device_properties it913x_properties = {
                .rc_codes       = RC_MAP_KWORLD_315U,
        },
        .i2c_algo         = &it913x_i2c_algo,
-        .num_device_descs = 1,
+        .num_device_descs = 2,
        .devices = {
                {   "Kworld UB499-2T T09(IT9137)",
                        { &it913x_table[0], NULL },
                        },
+                {   "ITE 9135 Generic",
+                        { &it913x_table[1], NULL },
+                        },
        }
 };
@@ -647,5 +698,5 @@ module_exit(it913x_module_exit);
 MODULE_AUTHOR("Malcolm Priestley <tvboxspy@gmail.com>");
 MODULE_DESCRIPTION("it913x USB 2 Driver");
-MODULE_VERSION("1.06");
+MODULE_VERSION("1.07");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-demod.c b/drivers/media/dvb/dvb-usb/mxl111sf-demod.c
new file mode 100644
index 000000000000..d1f58371c711
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/mxl111sf-demod.c
@@ -0,0 +1,614 @@
+/*
+ *  mxl111sf-demod.c - driver for the MaxLinear MXL111SF DVB-T demodulator
+ *
+ *  Copyright (C) 2010 Michael Krufky <mkrufky@kernellabs.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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include "mxl111sf-demod.h"
+#include "mxl111sf-reg.h"
+/* debug */
+static int mxl111sf_demod_debug;
+module_param_named(debug, mxl111sf_demod_debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level (1=info (or-able)).");
+#define mxl_dbg(fmt, arg...) \
+        if (mxl111sf_demod_debug) \
+                mxl_printk(KERN_DEBUG, fmt, ##arg)
+/* ------------------------------------------------------------------------ */
+struct mxl111sf_demod_state {
+        struct mxl111sf_state *mxl_state;
+        struct mxl111sf_demod_config *cfg;
+        struct dvb_frontend fe;
+};
+/* ------------------------------------------------------------------------ */
+static int mxl111sf_demod_read_reg(struct mxl111sf_demod_state *state,
+                                   u8 addr, u8 *data)
+{
+        return (state->cfg->read_reg) ?
+                state->cfg->read_reg(state->mxl_state, addr, data) :
+                -EINVAL;
+}
+static int mxl111sf_demod_write_reg(struct mxl111sf_demod_state *state,
+                                    u8 addr, u8 data)
+{
+        return (state->cfg->write_reg) ?
+                state->cfg->write_reg(state->mxl_state, addr, data) :
+                -EINVAL;
+}
+static
+int mxl111sf_demod_program_regs(struct mxl111sf_demod_state *state,
+                                struct mxl111sf_reg_ctrl_info *ctrl_reg_info)
+{
+        return (state->cfg->program_regs) ?
+                state->cfg->program_regs(state->mxl_state, ctrl_reg_info) :
+                -EINVAL;
+}
+/* ------------------------------------------------------------------------ */
+/* TPS */
+static
+int mxl1x1sf_demod_get_tps_code_rate(struct mxl111sf_demod_state *state,
+                                     fe_code_rate_t *code_rate)
+{
+        u8 val;
+        int ret = mxl111sf_demod_read_reg(state, V6_CODE_RATE_TPS_REG, &val);
+        /* bit<2:0> - 000:1/2, 001:2/3, 010:3/4, 011:5/6, 100:7/8 */
+        if (mxl_fail(ret))
+                goto fail;
+        switch (val & V6_CODE_RATE_TPS_MASK) {
+        case 0:
+                *code_rate = FEC_1_2;
+                break;
+        case 1:
+                *code_rate = FEC_2_3;
+                break;
+        case 2:
+                *code_rate = FEC_3_4;
+                break;
+        case 3:
+                *code_rate = FEC_5_6;
+                break;
+        case 4:
+                *code_rate = FEC_7_8;
+                break;
+        }
+fail:
+        return ret;
+}
+static
+int mxl1x1sf_demod_get_tps_constellation(struct mxl111sf_demod_state *state,
+                                         fe_modulation_t *constellation)
+{
+        u8 val;
+        int ret = mxl111sf_demod_read_reg(state, V6_MODORDER_TPS_REG, &val);
+        /* Constellation, 00 : QPSK, 01 : 16QAM, 10:64QAM */
+        if (mxl_fail(ret))
+                goto fail;
+        switch ((val & V6_PARAM_CONSTELLATION_MASK) >> 4) {
+        case 0:
+                *constellation = QPSK;
+                break;
+        case 1:
+                *constellation = QAM_16;
+                break;
+        case 2:
+                *constellation = QAM_64;
+                break;
+        }
+fail:
+        return ret;
+}
+static
+int mxl1x1sf_demod_get_tps_guard_fft_mode(struct mxl111sf_demod_state *state,
+                                          fe_transmit_mode_t *fft_mode)
+{
+        u8 val;
+        int ret = mxl111sf_demod_read_reg(state, V6_MODE_TPS_REG, &val);
+        /* FFT Mode, 00:2K, 01:8K, 10:4K */
+        if (mxl_fail(ret))
+                goto fail;
+        switch ((val & V6_PARAM_FFT_MODE_MASK) >> 2) {
+        case 0:
+                *fft_mode = TRANSMISSION_MODE_2K;
+                break;
+        case 1:
+                *fft_mode = TRANSMISSION_MODE_8K;
+                break;
+        case 2:
+                *fft_mode = TRANSMISSION_MODE_4K;
+                break;
+        }
+fail:
+        return ret;
+}
+static
+int mxl1x1sf_demod_get_tps_guard_interval(struct mxl111sf_demod_state *state,
+                                          fe_guard_interval_t *guard)
+{
+        u8 val;
+        int ret = mxl111sf_demod_read_reg(state, V6_CP_TPS_REG, &val);
+        /* 00:1/32, 01:1/16, 10:1/8, 11:1/4 */
+        if (mxl_fail(ret))
+                goto fail;
+        switch ((val & V6_PARAM_GI_MASK) >> 4) {
+        case 0:
+                *guard = GUARD_INTERVAL_1_32;
+                break;
+        case 1:
+                *guard = GUARD_INTERVAL_1_16;
+                break;
+        case 2:
+                *guard = GUARD_INTERVAL_1_8;
+                break;
+        case 3:
+                *guard = GUARD_INTERVAL_1_4;
+                break;
+        }
+fail:
+        return ret;
+}
+static
+int mxl1x1sf_demod_get_tps_hierarchy(struct mxl111sf_demod_state *state,
+                                     fe_hierarchy_t *hierarchy)
+{
+        u8 val;
+        int ret = mxl111sf_demod_read_reg(state, V6_TPS_HIERACHY_REG, &val);
+        /* bit<6:4> - 000:Non hierarchy, 001:1, 010:2, 011:4 */
+        if (mxl_fail(ret))
+                goto fail;
+        switch ((val & V6_TPS_HIERARCHY_INFO_MASK) >> 6) {
+        case 0:
+                *hierarchy = HIERARCHY_NONE;
+                break;
+        case 1:
+                *hierarchy = HIERARCHY_1;
+                break;
+        case 2:
+                *hierarchy = HIERARCHY_2;
+                break;
+        case 3:
+                *hierarchy = HIERARCHY_4;
+                break;
+        }
+fail:
+        return ret;
+}
+/* ------------------------------------------------------------------------ */
+/* LOCKS */
+static
+int mxl1x1sf_demod_get_sync_lock_status(struct mxl111sf_demod_state *state,
+                                        int *sync_lock)
+{
+        u8 val = 0;
+        int ret = mxl111sf_demod_read_reg(state, V6_SYNC_LOCK_REG, &val);
+        if (mxl_fail(ret))
+                goto fail;
+        *sync_lock = (val & SYNC_LOCK_MASK) >> 4;
+fail:
+        return ret;
+}
+static
+int mxl1x1sf_demod_get_rs_lock_status(struct mxl111sf_demod_state *state,
+                                      int *rs_lock)
+{
+        u8 val = 0;
+        int ret = mxl111sf_demod_read_reg(state, V6_RS_LOCK_DET_REG, &val);
+        if (mxl_fail(ret))
+                goto fail;
+        *rs_lock = (val & RS_LOCK_DET_MASK) >> 3;
+fail:
+        return ret;
+}
+static
+int mxl1x1sf_demod_get_tps_lock_status(struct mxl111sf_demod_state *state,
+                                       int *tps_lock)
+{
+        u8 val = 0;
+        int ret = mxl111sf_demod_read_reg(state, V6_TPS_LOCK_REG, &val);
+        if (mxl_fail(ret))
+                goto fail;
+        *tps_lock = (val & V6_PARAM_TPS_LOCK_MASK) >> 6;
+fail:
+        return ret;
+}
+static
+int mxl1x1sf_demod_get_fec_lock_status(struct mxl111sf_demod_state *state,
+                                       int *fec_lock)
+{
+        u8 val = 0;
+        int ret = mxl111sf_demod_read_reg(state, V6_IRQ_STATUS_REG, &val);
+        if (mxl_fail(ret))
+                goto fail;
+        *fec_lock = (val & IRQ_MASK_FEC_LOCK) >> 4;
+fail:
+        return ret;
+}
+#if 0
+static
+int mxl1x1sf_demod_get_cp_lock_status(struct mxl111sf_demod_state *state,
+                                      int *cp_lock)
+{
+        u8 val = 0;
+        int ret = mxl111sf_demod_read_reg(state, V6_CP_LOCK_DET_REG, &val);
+        if (mxl_fail(ret))
+                goto fail;
+        *cp_lock = (val & V6_CP_LOCK_DET_MASK) >> 2;
+fail:
+        return ret;
+}
+#endif
+static int mxl1x1sf_demod_reset_irq_status(struct mxl111sf_demod_state *state)
+{
+        return mxl111sf_demod_write_reg(state, 0x0e, 0xff);
+}
+/* ------------------------------------------------------------------------ */
+static int mxl111sf_demod_set_frontend(struct dvb_frontend *fe,
+                                       struct dvb_frontend_parameters *param)
+{
+        struct mxl111sf_demod_state *state = fe->demodulator_priv;
+        int ret = 0;
+        struct mxl111sf_reg_ctrl_info phy_pll_patch[] = {
+                {0x00, 0xff, 0x01}, /* change page to 1 */
+                {0x40, 0xff, 0x05},
+                {0x40, 0xff, 0x01},
+                {0x41, 0xff, 0xca},
+                {0x41, 0xff, 0xc0},
+                {0x00, 0xff, 0x00}, /* change page to 0 */
+                {0,    0,    0}
+        };
+        mxl_dbg("()");
+        if (fe->ops.tuner_ops.set_params) {
+                ret = fe->ops.tuner_ops.set_params(fe, param);
+                if (mxl_fail(ret))
+                        goto fail;
+                msleep(50);
+        }
+        ret = mxl111sf_demod_program_regs(state, phy_pll_patch);
+        mxl_fail(ret);
+        msleep(50);
+        ret = mxl1x1sf_demod_reset_irq_status(state);
+        mxl_fail(ret);
+        msleep(100);
+fail:
+        return ret;
+}
+/* ------------------------------------------------------------------------ */
+#if 0
+/* resets TS Packet error count */
+/* After setting 7th bit of V5_PER_COUNT_RESET_REG, it should be reset to 0. */
+static
+int mxl1x1sf_demod_reset_packet_error_count(struct mxl111sf_demod_state *state)
+{
+        struct mxl111sf_reg_ctrl_info reset_per_count[] = {
+                {0x20, 0x01, 0x01},
+                {0x20, 0x01, 0x00},
+                {0,    0,    0}
+        };
+        return mxl111sf_demod_program_regs(state, reset_per_count);
+}
+#endif
+/* returns TS Packet error count */
+/* PER Count = FEC_PER_COUNT * (2 ** (FEC_PER_SCALE * 4)) */
+static int mxl111sf_demod_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
+{
+        struct mxl111sf_demod_state *state = fe->demodulator_priv;
+        u32 fec_per_count, fec_per_scale;
+        u8 val;
+        int ret;
+        *ucblocks = 0;
+        /* FEC_PER_COUNT Register */
+        ret = mxl111sf_demod_read_reg(state, V6_FEC_PER_COUNT_REG, &val);
+        if (mxl_fail(ret))
+                goto fail;
+        fec_per_count = val;
+        /* FEC_PER_SCALE Register */
+        ret = mxl111sf_demod_read_reg(state, V6_FEC_PER_SCALE_REG, &val);
+        if (mxl_fail(ret))
+                goto fail;
+        val &= V6_FEC_PER_SCALE_MASK;
+        val *= 4;
+        fec_per_scale = 1 << val;
+        fec_per_count *= fec_per_scale;
+        *ucblocks = fec_per_count;
+fail:
+        return ret;
+}
+#ifdef MXL111SF_DEMOD_ENABLE_CALCULATIONS
+/* FIXME: leaving this enabled breaks the build on some architectures,
+ * and we shouldn't have any floating point math in the kernel, anyway.
+ *
+ * These macros need to be re-written, but it's harmless to simply
+ * return zero for now. */
+#define CALCULATE_BER(avg_errors, count) \
+        ((u32)(avg_errors * 4)/(count*64*188*8))
+#define CALCULATE_SNR(data) \
+        ((u32)((10 * (u32)data / 64) - 2.5))
+#else
+#define CALCULATE_BER(avg_errors, count) 0
+#define CALCULATE_SNR(data) 0
+#endif
+static int mxl111sf_demod_read_ber(struct dvb_frontend *fe, u32 *ber)
+{
+        struct mxl111sf_demod_state *state = fe->demodulator_priv;
+        u8 val1, val2, val3;
+        int ret;
+        *ber = 0;
+        ret = mxl111sf_demod_read_reg(state, V6_RS_AVG_ERRORS_LSB_REG, &val1);
+        if (mxl_fail(ret))
+                goto fail;
+        ret = mxl111sf_demod_read_reg(state, V6_RS_AVG_ERRORS_MSB_REG, &val2);
+        if (mxl_fail(ret))
+                goto fail;
+        ret = mxl111sf_demod_read_reg(state, V6_N_ACCUMULATE_REG, &val3);
+        if (mxl_fail(ret))
+                goto fail;
+        *ber = CALCULATE_BER((val1 | (val2 << 8)), val3);
+fail:
+        return ret;
+}
+static int mxl111sf_demod_calc_snr(struct mxl111sf_demod_state *state,
+                                   u16 *snr)
+{
+        u8 val1, val2;
+        int ret;
+        *snr = 0;
+        ret = mxl111sf_demod_read_reg(state, V6_SNR_RB_LSB_REG, &val1);
+        if (mxl_fail(ret))
+                goto fail;
+        ret = mxl111sf_demod_read_reg(state, V6_SNR_RB_MSB_REG, &val2);
+        if (mxl_fail(ret))
+                goto fail;
+        *snr = CALCULATE_SNR(val1 | ((val2 & 0x03) << 8));
+fail:
+        return ret;
+}
+static int mxl111sf_demod_read_snr(struct dvb_frontend *fe, u16 *snr)
+{
+        struct mxl111sf_demod_state *state = fe->demodulator_priv;
+        int ret = mxl111sf_demod_calc_snr(state, snr);
+        if (mxl_fail(ret))
+                goto fail;
+        *snr /= 10; /* 0.1 dB */
+fail:
+        return ret;
+}
+static int mxl111sf_demod_read_status(struct dvb_frontend *fe,
+                                      fe_status_t *status)
+{
+        struct mxl111sf_demod_state *state = fe->demodulator_priv;
+        int ret, locked, cr_lock, sync_lock, fec_lock;
+        *status = 0;
+        ret = mxl1x1sf_demod_get_rs_lock_status(state, &locked);
+        if (mxl_fail(ret))
+                goto fail;
+        ret = mxl1x1sf_demod_get_tps_lock_status(state, &cr_lock);
+        if (mxl_fail(ret))
+                goto fail;
+        ret = mxl1x1sf_demod_get_sync_lock_status(state, &sync_lock);
+        if (mxl_fail(ret))
+                goto fail;
+        ret = mxl1x1sf_demod_get_fec_lock_status(state, &fec_lock);
+        if (mxl_fail(ret))
+                goto fail;
+        if (locked)
+                *status |= FE_HAS_SIGNAL;
+        if (cr_lock)
+                *status |= FE_HAS_CARRIER;
+        if (sync_lock)
+                *status |= FE_HAS_SYNC;
+        if (fec_lock) /* false positives? */
+                *status |= FE_HAS_VITERBI;
+        if ((locked) && (cr_lock) && (sync_lock))
+                *status |= FE_HAS_LOCK;
+fail:
+        return ret;
+}
+static int mxl111sf_demod_read_signal_strength(struct dvb_frontend *fe,
+                                               u16 *signal_strength)
+{
+        struct mxl111sf_demod_state *state = fe->demodulator_priv;
+        fe_modulation_t constellation;
+        u16 snr;
+        mxl111sf_demod_calc_snr(state, &snr);
+        mxl1x1sf_demod_get_tps_constellation(state, &constellation);
+        switch (constellation) {
+        case QPSK:
+                *signal_strength = (snr >= 1300) ?
+                        min(65535, snr * 44) : snr * 38;
+                break;
+        case QAM_16:
+                *signal_strength = (snr >= 1500) ?
+                        min(65535, snr * 38) : snr * 33;
+                break;
+        case QAM_64:
+                *signal_strength = (snr >= 2000) ?
+                        min(65535, snr * 29) : snr * 25;
+                break;
+        default:
+                *signal_strength = 0;
+                return -EINVAL;
+        }
+        return 0;
+}
+static int mxl111sf_demod_get_frontend(struct dvb_frontend *fe,
+                                       struct dvb_frontend_parameters *p)
+{
+        struct mxl111sf_demod_state *state = fe->demodulator_priv;
+        mxl_dbg("()");
+#if 0
+        p->inversion = /* FIXME */ ? INVERSION_ON : INVERSION_OFF;
+#endif
+        if (fe->ops.tuner_ops.get_bandwidth)
+                fe->ops.tuner_ops.get_bandwidth(fe, &p->u.ofdm.bandwidth);
+        if (fe->ops.tuner_ops.get_frequency)
+                fe->ops.tuner_ops.get_frequency(fe, &p->frequency);
+        mxl1x1sf_demod_get_tps_code_rate(state, &p->u.ofdm.code_rate_HP);
+        mxl1x1sf_demod_get_tps_code_rate(state, &p->u.ofdm.code_rate_LP);
+        mxl1x1sf_demod_get_tps_constellation(state, &p->u.ofdm.constellation);
+        mxl1x1sf_demod_get_tps_guard_fft_mode(state,
+                                              &p->u.ofdm.transmission_mode);
+        mxl1x1sf_demod_get_tps_guard_interval(state,
+                                              &p->u.ofdm.guard_interval);
+        mxl1x1sf_demod_get_tps_hierarchy(state,
+                                         &p->u.ofdm.hierarchy_information);
+        return 0;
+}
+static
+int mxl111sf_demod_get_tune_settings(struct dvb_frontend *fe,
+                                     struct dvb_frontend_tune_settings *tune)
+{
+        tune->min_delay_ms = 1000;
+        return 0;
+}
+static void mxl111sf_demod_release(struct dvb_frontend *fe)
+{
+        struct mxl111sf_demod_state *state = fe->demodulator_priv;
+        mxl_dbg("()");
+        kfree(state);
+        fe->demodulator_priv = NULL;
+}
+static struct dvb_frontend_ops mxl111sf_demod_ops = {
+        .info = {
+                .name               = "MaxLinear MxL111SF DVB-T demodulator",
+                .type               = FE_OFDM,
+                .frequency_min      = 177000000,
+                .frequency_max      = 858000000,
+                .frequency_stepsize = 166666,
+                .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+                        FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
+                        FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 |
+                        FE_CAN_QAM_AUTO |
+                        FE_CAN_HIERARCHY_AUTO | FE_CAN_GUARD_INTERVAL_AUTO |
+                        FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_RECOVER
+        },
+        .release              = mxl111sf_demod_release,
+#if 0
+        .init                 = mxl111sf_init,
+        .i2c_gate_ctrl        = mxl111sf_i2c_gate_ctrl,
+#endif
+        .set_frontend         = mxl111sf_demod_set_frontend,
+        .get_frontend         = mxl111sf_demod_get_frontend,
+        .get_tune_settings    = mxl111sf_demod_get_tune_settings,
+        .read_status          = mxl111sf_demod_read_status,
+        .read_signal_strength = mxl111sf_demod_read_signal_strength,
+        .read_ber             = mxl111sf_demod_read_ber,
+        .read_snr             = mxl111sf_demod_read_snr,
+        .read_ucblocks        = mxl111sf_demod_read_ucblocks,
+};
+struct dvb_frontend *mxl111sf_demod_attach(struct mxl111sf_state *mxl_state,
+                                           struct mxl111sf_demod_config *cfg)
+{
+        struct mxl111sf_demod_state *state = NULL;
+        mxl_dbg("()");
+        state = kzalloc(sizeof(struct mxl111sf_demod_state), GFP_KERNEL);
+        if (state == NULL)
+                return NULL;
+        state->mxl_state = mxl_state;
+        state->cfg = cfg;
+        memcpy(&state->fe.ops, &mxl111sf_demod_ops,
+               sizeof(struct dvb_frontend_ops));
+        state->fe.demodulator_priv = state;
+        return &state->fe;
+}
+EXPORT_SYMBOL_GPL(mxl111sf_demod_attach);
+MODULE_DESCRIPTION("MaxLinear MxL111SF DVB-T demodulator driver");
+MODULE_AUTHOR("Michael Krufky <mkrufky@kernellabs.com>");
+MODULE_LICENSE("GPL");
+MODULE_VERSION("0.1");
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-demod.h b/drivers/media/dvb/dvb-usb/mxl111sf-demod.h
new file mode 100644
index 000000000000..432706ae5274
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/mxl111sf-demod.h
@@ -0,0 +1,55 @@
+/*
+ *  mxl111sf-demod.h - driver for the MaxLinear MXL111SF DVB-T demodulator
+ *
+ *  Copyright (C) 2010 Michael Krufky <mkrufky@kernellabs.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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef __MXL111SF_DEMOD_H__
+#define __MXL111SF_DEMOD_H__
+#include "dvb_frontend.h"
+#include "mxl111sf.h"
+struct mxl111sf_demod_config {
+        int (*read_reg)(struct mxl111sf_state *state, u8 addr, u8 *data);
+        int (*write_reg)(struct mxl111sf_state *state, u8 addr, u8 data);
+        int (*program_regs)(struct mxl111sf_state *state,
+                            struct mxl111sf_reg_ctrl_info *ctrl_reg_info);
+};
+#if defined(CONFIG_DVB_USB_MXL111SF) || \
+        (defined(CONFIG_DVB_USB_MXL111SF_MODULE) && defined(MODULE))
+extern
+struct dvb_frontend *mxl111sf_demod_attach(struct mxl111sf_state *mxl_state,
+                                           struct mxl111sf_demod_config *cfg);
+#else
+static inline
+struct dvb_frontend *mxl111sf_demod_attach(struct mxl111sf_state *mxl_state,
+                                           struct mxl111sf_demod_config *cfg)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return NULL;
+}
+#endif /* CONFIG_DVB_USB_MXL111SF */
+#endif /* __MXL111SF_DEMOD_H__ */
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf.c b/drivers/media/dvb/dvb-usb/mxl111sf.c
index 546ba5915a5b..b5c98da5d9e2 100644
--- a/drivers/media/dvb/dvb-usb/mxl111sf.c
+++ b/drivers/media/dvb/dvb-usb/mxl111sf.c
@@ -17,6 +17,7 @@
 #include "mxl111sf-i2c.h"
 #include "mxl111sf-gpio.h"
+#include "mxl111sf-demod.h"
 #include "mxl111sf-tuner.h"
 #include "lgdt3305.h"
@@ -362,6 +363,22 @@ static int mxl111sf_ep6_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
        return ret;
 }
+static int mxl111sf_ep4_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
+{
+        struct dvb_usb_device *d = adap->dev;
+        struct mxl111sf_state *state = d->priv;
+        int ret = 0;
+        deb_info("%s(%d)\n", __func__, onoff);
+        if (onoff) {
+                ret = mxl111sf_enable_usb_output(state);
+                mxl_fail(ret);
+        }
+        return ret;
+}
 /* ------------------------------------------------------------------------ */
 static struct lgdt3305_config hauppauge_lgdt3305_config = {
@@ -438,6 +455,70 @@ fail:
        return ret;
 }
+static struct mxl111sf_demod_config mxl_demod_config = {
+        .read_reg        = mxl111sf_read_reg,
+        .write_reg       = mxl111sf_write_reg,
+        .program_regs    = mxl111sf_ctrl_program_regs,
+};
+static int mxl111sf_attach_demod(struct dvb_usb_adapter *adap)
+{
+        struct dvb_usb_device *d = adap->dev;
+        struct mxl111sf_state *state = d->priv;
+        int fe_id = adap->num_frontends_initialized;
+        struct mxl111sf_adap_state *adap_state = adap->fe_adap[fe_id].priv;
+        int ret;
+        deb_adv("%s()\n", __func__);
+        /* save a pointer to the dvb_usb_device in device state */
+        state->d = d;
+        adap_state->alt_mode = (dvb_usb_mxl111sf_isoc) ? 1 : 2;
+        state->alt_mode = adap_state->alt_mode;
+        if (usb_set_interface(adap->dev->udev, 0, state->alt_mode) < 0)
+                err("set interface failed");
+        state->gpio_mode = MXL111SF_GPIO_MOD_DVBT;
+        adap_state->gpio_mode = state->gpio_mode;
+        adap_state->device_mode = MXL_SOC_MODE;
+        adap_state->ep6_clockphase = 1;
+        ret = mxl1x1sf_soft_reset(state);
+        if (mxl_fail(ret))
+                goto fail;
+        ret = mxl111sf_init_tuner_demod(state);
+        if (mxl_fail(ret))
+                goto fail;
+        ret = mxl1x1sf_set_device_mode(state, adap_state->device_mode);
+        if (mxl_fail(ret))
+                goto fail;
+        ret = mxl111sf_enable_usb_output(state);
+        if (mxl_fail(ret))
+                goto fail;
+        ret = mxl1x1sf_top_master_ctrl(state, 1);
+        if (mxl_fail(ret))
+                goto fail;
+        /* dont care if this fails */
+        mxl111sf_init_port_expander(state);
+        adap->fe_adap[fe_id].fe = dvb_attach(mxl111sf_demod_attach, state,
+                              &mxl_demod_config);
+        if (adap->fe_adap[fe_id].fe) {
+                adap_state->fe_init = adap->fe_adap[fe_id].fe->ops.init;
+                adap->fe_adap[fe_id].fe->ops.init = mxl111sf_adap_fe_init;
+                adap_state->fe_sleep = adap->fe_adap[fe_id].fe->ops.sleep;
+                adap->fe_adap[fe_id].fe->ops.sleep = mxl111sf_adap_fe_sleep;
+                return 0;
+        }
+        ret = -EIO;
+fail:
+        return ret;
+}
 static inline int mxl111sf_set_ant_path(struct mxl111sf_state *state,
                                        int antpath)
 {
@@ -567,7 +648,8 @@ struct i2c_algorithm mxl111sf_i2c_algo = {
 #endif
 };
-/* DVB USB Driver stuff */
+static struct dvb_usb_device_properties mxl111sf_dvbt_bulk_properties;
+static struct dvb_usb_device_properties mxl111sf_dvbt_isoc_properties;
 static struct dvb_usb_device_properties mxl111sf_atsc_bulk_properties;
 static struct dvb_usb_device_properties mxl111sf_atsc_isoc_properties;
@@ -580,9 +662,15 @@ static int mxl111sf_probe(struct usb_interface *intf,
        if (((dvb_usb_mxl111sf_isoc) &&
             (0 == dvb_usb_device_init(intf,
+                                       &mxl111sf_dvbt_isoc_properties,
+                                       THIS_MODULE, &d, adapter_nr) ||
+              0 == dvb_usb_device_init(intf,
                                       &mxl111sf_atsc_isoc_properties,
                                       THIS_MODULE, &d, adapter_nr))) ||
            0 == dvb_usb_device_init(intf,
+                                     &mxl111sf_dvbt_bulk_properties,
+                                     THIS_MODULE, &d, adapter_nr) ||
+            0 == dvb_usb_device_init(intf,
                                     &mxl111sf_atsc_bulk_properties,
                                     THIS_MODULE, &d, adapter_nr) || 0) {
@@ -669,6 +757,36 @@ static struct usb_device_id mxl111sf_table[] = {
 MODULE_DEVICE_TABLE(usb, mxl111sf_table);
+#define MXL111SF_EP4_BULK_STREAMING_CONFIG              \
+        .streaming_ctrl = mxl111sf_ep4_streaming_ctrl,  \
+        .stream = {                                     \
+                .type = USB_BULK,                       \
+                .count = 5,                             \
+                .endpoint = 0x04,                       \
+                .u = {                                  \
+                        .bulk = {                       \
+                                .buffersize = 8192,     \
+                        }                               \
+                }                                       \
+        }
+/* FIXME: works for v6 but not v8 silicon */
+#define MXL111SF_EP4_ISOC_STREAMING_CONFIG              \
+        .streaming_ctrl = mxl111sf_ep4_streaming_ctrl,  \
+        .stream = {                                     \
+                .type = USB_ISOC,                       \
+                .count = 5,                             \
+                .endpoint = 0x04,                       \
+                .u = {                                  \
+                        .isoc = {                       \
+                                .framesperurb = 96,     \
+                                /* FIXME: v6 SILICON: */        \
+                                .framesize = 564,       \
+                                .interval = 1,          \
+                        }                               \
+                }                                       \
+        }
 #define MXL111SF_EP6_BULK_STREAMING_CONFIG              \
        .streaming_ctrl = mxl111sf_ep6_streaming_ctrl,  \
        .stream = {                                     \
@@ -712,7 +830,7 @@ MODULE_DEVICE_TABLE(usb, mxl111sf_table);
        .generic_bulk_ctrl_endpoint_response = MXL_EP1_REG_READ, \
        .size_of_priv     = sizeof(struct mxl111sf_state)
-static struct dvb_usb_device_properties mxl111sf_atsc_bulk_properties = {
+static struct dvb_usb_device_properties mxl111sf_dvbt_bulk_properties = {
        MXL111SF_DEFAULT_DEVICE_PROPERTIES,
        .num_adapters = 1,
@@ -723,10 +841,106 @@ static struct dvb_usb_device_properties mxl111sf_atsc_bulk_properties = {
                .fe = {{
                        .size_of_priv     = sizeof(struct mxl111sf_adap_state),
+                        .frontend_attach  = mxl111sf_attach_demod,
+                        .tuner_attach     = mxl111sf_attach_tuner,
+                        MXL111SF_EP4_BULK_STREAMING_CONFIG,
+                } },
+                },
+        },
+        .num_device_descs = 4,
+        .devices = {
+                {   "Hauppauge 126xxx DVBT (bulk)",
+                        { NULL },
+                        { &mxl111sf_table[4], &mxl111sf_table[8],
+                          NULL },
+                },
+                {   "Hauppauge 117xxx DVBT (bulk)",
+                        { NULL },
+                        { &mxl111sf_table[15], &mxl111sf_table[18],
+                          NULL },
+                },
+                {   "Hauppauge 138xxx DVBT (bulk)",
+                        { NULL },
+                        { &mxl111sf_table[20], &mxl111sf_table[22],
+                          &mxl111sf_table[24], &mxl111sf_table[26],
+                          NULL },
+                },
+                {   "Hauppauge 126xxx (tp-bulk)",
+                        { NULL },
+                        { &mxl111sf_table[28], &mxl111sf_table[30],
+                          NULL },
+                },
+        }
+};
+static struct dvb_usb_device_properties mxl111sf_dvbt_isoc_properties = {
+        MXL111SF_DEFAULT_DEVICE_PROPERTIES,
+        .num_adapters = 1,
+        .adapter = {
+                {
+                .fe_ioctl_override = mxl111sf_fe_ioctl_override,
+                .num_frontends = 1,
+                .fe = {{
+                        .size_of_priv     = sizeof(struct mxl111sf_adap_state),
+                        .frontend_attach  = mxl111sf_attach_demod,
+                        .tuner_attach     = mxl111sf_attach_tuner,
+                        MXL111SF_EP4_ISOC_STREAMING_CONFIG,
+                } },
+                },
+        },
+        .num_device_descs = 4,
+        .devices = {
+                {   "Hauppauge 126xxx DVBT (isoc)",
+                        { NULL },
+                        { &mxl111sf_table[4], &mxl111sf_table[8],
+                          NULL },
+                },
+                {   "Hauppauge 117xxx DVBT (isoc)",
+                        { NULL },
+                        { &mxl111sf_table[15], &mxl111sf_table[18],
+                          NULL },
+                },
+                {   "Hauppauge 138xxx DVBT (isoc)",
+                        { NULL },
+                        { &mxl111sf_table[20], &mxl111sf_table[22],
+                          &mxl111sf_table[24], &mxl111sf_table[26],
+                          NULL },
+                },
+                {   "Hauppauge 126xxx (tp-isoc)",
+                        { NULL },
+                        { &mxl111sf_table[28], &mxl111sf_table[30],
+                          NULL },
+                },
+        }
+};
+static struct dvb_usb_device_properties mxl111sf_atsc_bulk_properties = {
+        MXL111SF_DEFAULT_DEVICE_PROPERTIES,
+        .num_adapters = 1,
+        .adapter = {
+                {
+                .fe_ioctl_override = mxl111sf_fe_ioctl_override,
+                .num_frontends = 2,
+                .fe = {{
+                        .size_of_priv     = sizeof(struct mxl111sf_adap_state),
                        .frontend_attach  = mxl111sf_lgdt3305_frontend_attach,
                        .tuner_attach     = mxl111sf_attach_tuner,
                        MXL111SF_EP6_BULK_STREAMING_CONFIG,
+                },
+                {
+                        .size_of_priv     = sizeof(struct mxl111sf_adap_state),
+                        .frontend_attach  = mxl111sf_attach_demod,
+                        .tuner_attach     = mxl111sf_attach_tuner,
+                        MXL111SF_EP4_BULK_STREAMING_CONFIG,
                }},
                },
        },
@@ -776,7 +990,7 @@ static struct dvb_usb_device_properties mxl111sf_atsc_isoc_properties = {
        .adapter = {
                {
                .fe_ioctl_override = mxl111sf_fe_ioctl_override,
-                .num_frontends = 1,
+                .num_frontends = 2,
                .fe = {{
                        .size_of_priv     = sizeof(struct mxl111sf_adap_state),
@@ -784,6 +998,14 @@ static struct dvb_usb_device_properties mxl111sf_atsc_isoc_properties = {
                        .tuner_attach     = mxl111sf_attach_tuner,
                        MXL111SF_EP6_ISOC_STREAMING_CONFIG,
+                },
+                {
+                        .size_of_priv     = sizeof(struct mxl111sf_adap_state),
+                        .frontend_attach  = mxl111sf_attach_demod,
+                        .tuner_attach     = mxl111sf_attach_tuner,
+                        MXL111SF_EP4_ISOC_STREAMING_CONFIG,
                }},
                },
        },
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf.h b/drivers/media/dvb/dvb-usb/mxl111sf.h
index 5a2c7bb386cd..364d89f826bd 100644
--- a/drivers/media/dvb/dvb-usb/mxl111sf.h
+++ b/drivers/media/dvb/dvb-usb/mxl111sf.h
@@ -133,7 +133,7 @@ extern int dvb_usb_mxl111sf_debug;
 /* The following allows the mxl_fail() macro defined below to work
 * in externel modules, such as mxl111sf-tuner.ko, even though
 * dvb_usb_mxl111sf_debug is not defined within those modules */
-#ifdef __MXL111SF_TUNER_H__
+#if (defined(__MXL111SF_TUNER_H__)) || (defined(__MXL111SF_DEMOD_H__))
 #define MXL_ADV_DEBUG_ENABLED MXL_ADV_DBG
 #else
 #define MXL_ADV_DEBUG_ENABLED dvb_usb_mxl111sf_debug
diff --git a/drivers/media/dvb/frontends/dibx000_common.c b/drivers/media/dvb/frontends/dibx000_common.c
index 774d507b66cc..43be7238311e 100644
--- a/drivers/media/dvb/frontends/dibx000_common.c
+++ b/drivers/media/dvb/frontends/dibx000_common.c
@@ -1,5 +1,6 @@
 #include <linux/i2c.h>
 #include <linux/mutex.h>
+#include <linux/module.h>
 #include "dibx000_common.h"
diff --git a/drivers/media/dvb/ngene/Makefile b/drivers/media/dvb/ngene/Makefile
index 89873615e683..13ebeffb705f 100644
--- a/drivers/media/dvb/ngene/Makefile
+++ b/drivers/media/dvb/ngene/Makefile
@@ -11,4 +11,4 @@ ccflags-y += -Idrivers/media/dvb/frontends/
 ccflags-y += -Idrivers/media/common/tuners/
 # For the staging CI driver cxd2099
-ccflags-y += -Idrivers/staging/cxd2099/
+ccflags-y += -Idrivers/staging/media/cxd2099/
diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c
index af121db88ea0..680c781c8dd6 100644
--- a/drivers/media/dvb/siano/sms-cards.c
+++ b/drivers/media/dvb/siano/sms-cards.c
@@ -19,6 +19,7 @@
 #include "sms-cards.h"
 #include "smsir.h"
+#include <linux/module.h>
 static int sms_dbg;
 module_param_named(cards_dbg, sms_dbg, int, 0644);
diff --git a/drivers/media/dvb/siano/smsendian.c b/drivers/media/dvb/siano/smsendian.c
index 457b6d02ef85..e2657c2f0109 100644
--- a/drivers/media/dvb/siano/smsendian.c
+++ b/drivers/media/dvb/siano/smsendian.c
@@ -19,6 +19,7 @@
 ****************************************************************/
+#include <linux/export.h>
 #include <asm/byteorder.h>
 #include "smsendian.h"
diff --git a/drivers/media/dvb/siano/smssdio.c b/drivers/media/dvb/siano/smssdio.c
index e57d38b0197c..91f8c8291e2b 100644
--- a/drivers/media/dvb/siano/smssdio.c
+++ b/drivers/media/dvb/siano/smssdio.c
@@ -39,6 +39,7 @@
 #include <linux/mmc/card.h>
 #include <linux/mmc/sdio_func.h>
 #include <linux/mmc/sdio_ids.h>
+#include <linux/module.h>
 #include "smscoreapi.h"
 #include "sms-cards.h"
diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c
index 0c8164a2cc36..51c7121b321a 100644
--- a/drivers/media/dvb/siano/smsusb.c
+++ b/drivers/media/dvb/siano/smsusb.c
@@ -24,6 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <linux/usb.h>
 #include <linux/firmware.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include "smscoreapi.h"
 #include "sms-cards.h"
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index 16b70b4412f7..6edc9ba81203 100644
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -23,6 +23,7 @@
 #include <linux/types.h>
 #include <linux/ioctl.h>
 #include <linux/media.h>
+#include <linux/export.h>
 #include <media/media-device.h>
 #include <media/media-devnode.h>
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 52798a111e16..ccd5f0d8a012 100644
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -426,7 +426,6 @@ config RADIO_TIMBERDALE
 config RADIO_WL1273
        tristate "Texas Instruments WL1273 I2C FM Radio"
        depends on I2C && VIDEO_V4L2
-        select MFD_CORE
        select MFD_WL1273_CORE
        select FW_LOADER
        ---help---
diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c
index 95ddcc4845d3..db20904d01f0 100644
--- a/drivers/media/radio/radio-tea5764.c
+++ b/drivers/media/radio/radio-tea5764.c
@@ -128,8 +128,10 @@ struct tea5764_write_regs {
        u16 rdsbbl;                             /* PAUSEDET & RDSBBL */
 } __attribute__ ((packed));
-#ifndef RADIO_TEA5764_XTAL
+#ifdef CONFIG_RADIO_TEA5764_XTAL
 #define RADIO_TEA5764_XTAL 1
+#else
+#define RADIO_TEA5764_XTAL 0
 #endif
 static int radio_nr = -1;
diff --git a/drivers/media/radio/radio-timb.c b/drivers/media/radio/radio-timb.c
index f17b540d68a5..3e9209f84e09 100644
--- a/drivers/media/radio/radio-timb.c
+++ b/drivers/media/radio/radio-timb.c
@@ -23,6 +23,7 @@
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
+#include <linux/module.h>
 #include <media/timb_radio.h>
 #define DRIVER_NAME "timb-radio"
diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c
index 6d1e4e750f63..8aa4968d57bc 100644
--- a/drivers/media/radio/radio-wl1273.c
+++ b/drivers/media/radio/radio-wl1273.c
@@ -23,6 +23,7 @@
 #include <linux/interrupt.h>
 #include <linux/mfd/wl1273-core.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-device.h>
diff --git a/drivers/media/radio/si4713-i2c.c b/drivers/media/radio/si4713-i2c.c
index c9f4a8e65dc4..27aba936fb2b 100644
--- a/drivers/media/radio/si4713-i2c.c
+++ b/drivers/media/radio/si4713-i2c.c
@@ -29,6 +29,7 @@
 #include <linux/slab.h>
 #include <linux/gpio.h>
 #include <linux/regulator/consumer.h>
+#include <linux/module.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-common.h>
diff --git a/drivers/media/radio/wl128x/fmdrv_v4l2.c b/drivers/media/radio/wl128x/fmdrv_v4l2.c
index b93d8cf23b03..4f5c43d2566c 100644
--- a/drivers/media/radio/wl128x/fmdrv_v4l2.c
+++ b/drivers/media/radio/wl128x/fmdrv_v4l2.c
@@ -28,6 +28,8 @@
 *
 */
+#include <linux/export.h>
 #include "fmdrv.h"
 #include "fmdrv_v4l2.h"
 #include "fmdrv_common.h"
diff --git a/drivers/media/rc/ir-jvc-decoder.c b/drivers/media/rc/ir-jvc-decoder.c
index 624449afaa61..035668e27f6b 100644
--- a/drivers/media/rc/ir-jvc-decoder.c
+++ b/drivers/media/rc/ir-jvc-decoder.c
@@ -13,6 +13,7 @@
 */
 #include <linux/bitrev.h>
+#include <linux/module.h>
 #include "rc-core-priv.h"
 #define JVC_NBITS               16              /* dev(8) + func(8) */
diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
index ec2e67fd236b..5faba2a2fdd3 100644
--- a/drivers/media/rc/ir-lirc-codec.c
+++ b/drivers/media/rc/ir-lirc-codec.c
@@ -14,6 +14,7 @@
 #include <linux/sched.h>
 #include <linux/wait.h>
+#include <linux/module.h>
 #include <media/lirc.h>
 #include <media/lirc_dev.h>
 #include <media/rc-core.h>
diff --git a/drivers/media/rc/ir-nec-decoder.c b/drivers/media/rc/ir-nec-decoder.c
index 63ee722dbd02..17f8db00435a 100644
--- a/drivers/media/rc/ir-nec-decoder.c
+++ b/drivers/media/rc/ir-nec-decoder.c
@@ -13,6 +13,7 @@
 */
 #include <linux/bitrev.h>
+#include <linux/module.h>
 #include "rc-core-priv.h"
 #define NEC_NBITS               32
diff --git a/drivers/media/rc/ir-raw.c b/drivers/media/rc/ir-raw.c
index 27808bb59eba..2e5cd3100b64 100644
--- a/drivers/media/rc/ir-raw.c
+++ b/drivers/media/rc/ir-raw.c
@@ -12,8 +12,10 @@
 *  GNU General Public License for more details.
 */
+#include <linux/export.h>
 #include <linux/kthread.h>
 #include <linux/mutex.h>
+#include <linux/kmod.h>
 #include <linux/sched.h>
 #include <linux/freezer.h>
 #include "rc-core-priv.h"
diff --git a/drivers/media/rc/ir-rc5-decoder.c b/drivers/media/rc/ir-rc5-decoder.c
index ebdba5539916..9ab663a507a4 100644
--- a/drivers/media/rc/ir-rc5-decoder.c
+++ b/drivers/media/rc/ir-rc5-decoder.c
@@ -21,6 +21,7 @@
 */
 #include "rc-core-priv.h"
+#include <linux/module.h>
 #define RC5_NBITS               14
 #define RC5X_NBITS              20
diff --git a/drivers/media/rc/ir-rc5-sz-decoder.c b/drivers/media/rc/ir-rc5-sz-decoder.c
index 90aa8868629a..ec8d4a2e2c5a 100644
--- a/drivers/media/rc/ir-rc5-sz-decoder.c
+++ b/drivers/media/rc/ir-rc5-sz-decoder.c
@@ -21,6 +21,7 @@
 */
 #include "rc-core-priv.h"
+#include <linux/module.h>
 #define RC5_SZ_NBITS            15
 #define RC5_UNIT                888888 /* ns */
diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c
index 755dafa3871b..140fb67e2f89 100644
--- a/drivers/media/rc/ir-rc6-decoder.c
+++ b/drivers/media/rc/ir-rc6-decoder.c
@@ -13,6 +13,7 @@
 */
 #include "rc-core-priv.h"
+#include <linux/module.h>
 /*
 * This decoder currently supports:
diff --git a/drivers/media/rc/ir-sony-decoder.c b/drivers/media/rc/ir-sony-decoder.c
index a92de80c48db..d5e2b50aff1f 100644
--- a/drivers/media/rc/ir-sony-decoder.c
+++ b/drivers/media/rc/ir-sony-decoder.c
@@ -13,6 +13,7 @@
 */
 #include <linux/bitrev.h>
+#include <linux/module.h>
 #include "rc-core-priv.h"
 #define SONY_UNIT               600000 /* ns */
diff --git a/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c b/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c
index 9a8752fdcca1..b0e42df7ff82 100644
--- a/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c
+++ b/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* ADS Tech Instant TV DVB-T PCI Remote */
diff --git a/drivers/media/rc/keymaps/rc-alink-dtu-m.c b/drivers/media/rc/keymaps/rc-alink-dtu-m.c
index fe652e928dc0..4e6ade8e616f 100644
--- a/drivers/media/rc/keymaps/rc-alink-dtu-m.c
+++ b/drivers/media/rc/keymaps/rc-alink-dtu-m.c
@@ -19,6 +19,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* A-Link DTU(m) slim remote, 6 rows, 3 columns. */
 static struct rc_map_table alink_dtu_m[] = {
diff --git a/drivers/media/rc/keymaps/rc-anysee.c b/drivers/media/rc/keymaps/rc-anysee.c
index 884f1b51a8ee..c735fe10a390 100644
--- a/drivers/media/rc/keymaps/rc-anysee.c
+++ b/drivers/media/rc/keymaps/rc-anysee.c
@@ -19,6 +19,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table anysee[] = {
        { 0x0800, KEY_0 },
diff --git a/drivers/media/rc/keymaps/rc-apac-viewcomp.c b/drivers/media/rc/keymaps/rc-apac-viewcomp.c
index 7af188209ff9..8c92ff95f94d 100644
--- a/drivers/media/rc/keymaps/rc-apac-viewcomp.c
+++ b/drivers/media/rc/keymaps/rc-apac-viewcomp.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Attila Kondoros <attila.kondoros@chello.hu> */
diff --git a/drivers/media/rc/keymaps/rc-asus-pc39.c b/drivers/media/rc/keymaps/rc-asus-pc39.c
index b2481154491b..2caf2117759b 100644
--- a/drivers/media/rc/keymaps/rc-asus-pc39.c
+++ b/drivers/media/rc/keymaps/rc-asus-pc39.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /*
 * Marc Fargas <telenieko@telenieko.com>
diff --git a/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c b/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c
index f766b24b0158..2031224a2027 100644
--- a/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c
+++ b/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* ATI TV Wonder HD 600 USB
   Devin Heitmueller <devin.heitmueller@gmail.com>
diff --git a/drivers/media/rc/keymaps/rc-avermedia-a16d.c b/drivers/media/rc/keymaps/rc-avermedia-a16d.c
index ec9beeebd410..894939ac17f2 100644
--- a/drivers/media/rc/keymaps/rc-avermedia-a16d.c
+++ b/drivers/media/rc/keymaps/rc-avermedia-a16d.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table avermedia_a16d[] = {
        { 0x20, KEY_LIST},
diff --git a/drivers/media/rc/keymaps/rc-avermedia-cardbus.c b/drivers/media/rc/keymaps/rc-avermedia-cardbus.c
index 22f54d413a35..d2aaf5b9e39f 100644
--- a/drivers/media/rc/keymaps/rc-avermedia-cardbus.c
+++ b/drivers/media/rc/keymaps/rc-avermedia-cardbus.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Oldrich Jedlicka <oldium.pro@seznam.cz> */
diff --git a/drivers/media/rc/keymaps/rc-avermedia-dvbt.c b/drivers/media/rc/keymaps/rc-avermedia-dvbt.c
index c25809d4c813..dc2baf062398 100644
--- a/drivers/media/rc/keymaps/rc-avermedia-dvbt.c
+++ b/drivers/media/rc/keymaps/rc-avermedia-dvbt.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Matt Jesson <dvb@jesson.eclipse.co.uk */
diff --git a/drivers/media/rc/keymaps/rc-avermedia-m135a.c b/drivers/media/rc/keymaps/rc-avermedia-m135a.c
index 3d2cbe4e5e46..04269d31fa19 100644
--- a/drivers/media/rc/keymaps/rc-avermedia-m135a.c
+++ b/drivers/media/rc/keymaps/rc-avermedia-m135a.c
@@ -10,6 +10,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /*
 * Avermedia M135A with RM-JX and RM-K6 remote controls
diff --git a/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c b/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c
index 8cd7f28808bd..e83b1a1939bf 100644
--- a/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c
+++ b/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c
@@ -9,6 +9,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /*
 * Avermedia M733A with IR model RM-K6
diff --git a/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c b/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c
index 9d68af217d8b..8344bcc595be 100644
--- a/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c
+++ b/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c
@@ -19,6 +19,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Initial keytable is from Jose Alberto Reguero <jareguero@telefonica.net>
   and Felipe Morales Moreno <felipe.morales.moreno@gmail.com> */
diff --git a/drivers/media/rc/keymaps/rc-avermedia.c b/drivers/media/rc/keymaps/rc-avermedia.c
index edfa71506d3e..c6063dfcd507 100644
--- a/drivers/media/rc/keymaps/rc-avermedia.c
+++ b/drivers/media/rc/keymaps/rc-avermedia.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Alex Hermann <gaaf@gmx.net> */
diff --git a/drivers/media/rc/keymaps/rc-avertv-303.c b/drivers/media/rc/keymaps/rc-avertv-303.c
index 32e94988dc94..14f78451e64e 100644
--- a/drivers/media/rc/keymaps/rc-avertv-303.c
+++ b/drivers/media/rc/keymaps/rc-avertv-303.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* AVERTV STUDIO 303 Remote */
diff --git a/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c b/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c
index c3f6d62ac892..ea7f2d0f31eb 100644
--- a/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c
+++ b/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c
@@ -19,6 +19,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table azurewave_ad_tu700[] = {
        { 0x0000, KEY_TAB },             /* Tab */
diff --git a/drivers/media/rc/keymaps/rc-behold-columbus.c b/drivers/media/rc/keymaps/rc-behold-columbus.c
index 8bf058f67f0c..086b4b1f19e1 100644
--- a/drivers/media/rc/keymaps/rc-behold-columbus.c
+++ b/drivers/media/rc/keymaps/rc-behold-columbus.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Beholder Intl. Ltd. 2008
 * Dmitry Belimov d.belimov@google.com
diff --git a/drivers/media/rc/keymaps/rc-behold.c b/drivers/media/rc/keymaps/rc-behold.c
index c909a234c776..0877e3480941 100644
--- a/drivers/media/rc/keymaps/rc-behold.c
+++ b/drivers/media/rc/keymaps/rc-behold.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /*
 * Igor Kuznetsov <igk72@ya.ru>
diff --git a/drivers/media/rc/keymaps/rc-budget-ci-old.c b/drivers/media/rc/keymaps/rc-budget-ci-old.c
index 2f66e4310d20..8311e092c098 100644
--- a/drivers/media/rc/keymaps/rc-budget-ci-old.c
+++ b/drivers/media/rc/keymaps/rc-budget-ci-old.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /*
 * From reading the following remotes:
diff --git a/drivers/media/rc/keymaps/rc-cinergy-1400.c b/drivers/media/rc/keymaps/rc-cinergy-1400.c
index 284534b67e7d..0c87fbaf99ab 100644
--- a/drivers/media/rc/keymaps/rc-cinergy-1400.c
+++ b/drivers/media/rc/keymaps/rc-cinergy-1400.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Cinergy 1400 DVB-T */
diff --git a/drivers/media/rc/keymaps/rc-cinergy.c b/drivers/media/rc/keymaps/rc-cinergy.c
index cf3a6bfb190c..309e9e3fb6f3 100644
--- a/drivers/media/rc/keymaps/rc-cinergy.c
+++ b/drivers/media/rc/keymaps/rc-cinergy.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table cinergy[] = {
        { 0x00, KEY_0 },
diff --git a/drivers/media/rc/keymaps/rc-dib0700-nec.c b/drivers/media/rc/keymaps/rc-dib0700-nec.c
index 7a5f5300caf9..4d13a7f2e5c3 100644
--- a/drivers/media/rc/keymaps/rc-dib0700-nec.c
+++ b/drivers/media/rc/keymaps/rc-dib0700-nec.c
@@ -16,6 +16,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table dib0700_nec_table[] = {
        /* Key codes for the Pixelview SBTVD remote */
diff --git a/drivers/media/rc/keymaps/rc-dib0700-rc5.c b/drivers/media/rc/keymaps/rc-dib0700-rc5.c
index 4af12e45dfba..ba81d9697cfc 100644
--- a/drivers/media/rc/keymaps/rc-dib0700-rc5.c
+++ b/drivers/media/rc/keymaps/rc-dib0700-rc5.c
@@ -16,6 +16,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table dib0700_rc5_table[] = {
        /* Key codes for the tiny Pinnacle remote*/
diff --git a/drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c b/drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c
index f68b450f5593..bed78acb9198 100644
--- a/drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c
+++ b/drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c
@@ -19,6 +19,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table digitalnow_tinytwin[] = {
        { 0x0000, KEY_MUTE },            /* [symbol speaker] */
diff --git a/drivers/media/rc/keymaps/rc-digittrade.c b/drivers/media/rc/keymaps/rc-digittrade.c
index 21d49871f2a3..a3b97a1fe223 100644
--- a/drivers/media/rc/keymaps/rc-digittrade.c
+++ b/drivers/media/rc/keymaps/rc-digittrade.c
@@ -19,6 +19,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Digittrade DVB-T USB Stick remote controller. */
 /* Imported from af9015.h.
diff --git a/drivers/media/rc/keymaps/rc-dm1105-nec.c b/drivers/media/rc/keymaps/rc-dm1105-nec.c
index d024fbf88bc4..67fc9fb0c007 100644
--- a/drivers/media/rc/keymaps/rc-dm1105-nec.c
+++ b/drivers/media/rc/keymaps/rc-dm1105-nec.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* DVBWorld remotes
   Igor M. Liplianin <liplianin@me.by>
diff --git a/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c b/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c
index 82c0200029af..91ea91de9179 100644
--- a/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c
+++ b/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* DigitalNow DNTV Live DVB-T Remote */
diff --git a/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c b/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c
index 015e99de06de..fd680d4d3eb6 100644
--- a/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c
+++ b/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* DigitalNow DNTV Live! DVB-T Pro Remote */
diff --git a/drivers/media/rc/keymaps/rc-em-terratec.c b/drivers/media/rc/keymaps/rc-em-terratec.c
index 269d4299da34..d1fcd64c0f90 100644
--- a/drivers/media/rc/keymaps/rc-em-terratec.c
+++ b/drivers/media/rc/keymaps/rc-em-terratec.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table em_terratec[] = {
        { 0x01, KEY_CHANNEL },
diff --git a/drivers/media/rc/keymaps/rc-encore-enltv-fm53.c b/drivers/media/rc/keymaps/rc-encore-enltv-fm53.c
index e388698a0697..2fe45e41fe49 100644
--- a/drivers/media/rc/keymaps/rc-encore-enltv-fm53.c
+++ b/drivers/media/rc/keymaps/rc-encore-enltv-fm53.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Encore ENLTV-FM v5.3
   Mauro Carvalho Chehab <mchehab@infradead.org>
diff --git a/drivers/media/rc/keymaps/rc-encore-enltv.c b/drivers/media/rc/keymaps/rc-encore-enltv.c
index e56ac6e9670a..223de75a6d1c 100644
--- a/drivers/media/rc/keymaps/rc-encore-enltv.c
+++ b/drivers/media/rc/keymaps/rc-encore-enltv.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Encore ENLTV-FM  - black plastic, white front cover with white glowing buttons
    Juan Pablo Sormani <sorman@gmail.com> */
diff --git a/drivers/media/rc/keymaps/rc-encore-enltv2.c b/drivers/media/rc/keymaps/rc-encore-enltv2.c
index b6264f1bc4c1..669cbff22b7e 100644
--- a/drivers/media/rc/keymaps/rc-encore-enltv2.c
+++ b/drivers/media/rc/keymaps/rc-encore-enltv2.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Encore ENLTV2-FM  - silver plastic - "Wand Media" written at the botton
    Mauro Carvalho Chehab <mchehab@infradead.org> */
diff --git a/drivers/media/rc/keymaps/rc-evga-indtube.c b/drivers/media/rc/keymaps/rc-evga-indtube.c
index a2bf24f6dfbb..2c647fc25916 100644
--- a/drivers/media/rc/keymaps/rc-evga-indtube.c
+++ b/drivers/media/rc/keymaps/rc-evga-indtube.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* EVGA inDtube
   Devin Heitmueller <devin.heitmueller@gmail.com>
diff --git a/drivers/media/rc/keymaps/rc-eztv.c b/drivers/media/rc/keymaps/rc-eztv.c
index 1e8e5b2d6e36..76921445c1d9 100644
--- a/drivers/media/rc/keymaps/rc-eztv.c
+++ b/drivers/media/rc/keymaps/rc-eztv.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Alfons Geser <a.geser@cox.net>
 * updates from Job D. R. Borges <jobdrb@ig.com.br> */
diff --git a/drivers/media/rc/keymaps/rc-flydvb.c b/drivers/media/rc/keymaps/rc-flydvb.c
index a8b0f66edaa9..3a6bba311b08 100644
--- a/drivers/media/rc/keymaps/rc-flydvb.c
+++ b/drivers/media/rc/keymaps/rc-flydvb.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table flydvb[] = {
        { 0x01, KEY_ZOOM },             /* Full Screen */
diff --git a/drivers/media/rc/keymaps/rc-flyvideo.c b/drivers/media/rc/keymaps/rc-flyvideo.c
index 5bbe68371756..bf9da584643b 100644
--- a/drivers/media/rc/keymaps/rc-flyvideo.c
+++ b/drivers/media/rc/keymaps/rc-flyvideo.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table flyvideo[] = {
        { 0x0f, KEY_0 },
diff --git a/drivers/media/rc/keymaps/rc-fusionhdtv-mce.c b/drivers/media/rc/keymaps/rc-fusionhdtv-mce.c
index c80b25c65b57..2f0970fe7832 100644
--- a/drivers/media/rc/keymaps/rc-fusionhdtv-mce.c
+++ b/drivers/media/rc/keymaps/rc-fusionhdtv-mce.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* DViCO FUSION HDTV MCE remote */
diff --git a/drivers/media/rc/keymaps/rc-gadmei-rm008z.c b/drivers/media/rc/keymaps/rc-gadmei-rm008z.c
index 068c9ead98dd..0e98ec467c34 100644
--- a/drivers/media/rc/keymaps/rc-gadmei-rm008z.c
+++ b/drivers/media/rc/keymaps/rc-gadmei-rm008z.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* GADMEI UTV330+ RM008Z remote
   Shine Liu <shinel@foxmail.com>
diff --git a/drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c b/drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c
index cdbbed467926..a2e2faa1d1b3 100644
--- a/drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c
+++ b/drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /*
 * Remote control for the Genius TVGO A11MCE
diff --git a/drivers/media/rc/keymaps/rc-gotview7135.c b/drivers/media/rc/keymaps/rc-gotview7135.c
index a38bdde8c140..864614e19314 100644
--- a/drivers/media/rc/keymaps/rc-gotview7135.c
+++ b/drivers/media/rc/keymaps/rc-gotview7135.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Mike Baikov <mike@baikov.com> */
diff --git a/drivers/media/rc/keymaps/rc-hauppauge.c b/drivers/media/rc/keymaps/rc-hauppauge.c
index cd3db7779772..e51c6163378b 100644
--- a/drivers/media/rc/keymaps/rc-hauppauge.c
+++ b/drivers/media/rc/keymaps/rc-hauppauge.c
@@ -17,6 +17,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /*
 * Hauppauge:the newer, gray remotes (seems there are multiple
diff --git a/drivers/media/rc/keymaps/rc-imon-mce.c b/drivers/media/rc/keymaps/rc-imon-mce.c
index 0ea2aa190d81..124c7228ba8c 100644
--- a/drivers/media/rc/keymaps/rc-imon-mce.c
+++ b/drivers/media/rc/keymaps/rc-imon-mce.c
@@ -10,6 +10,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* mce-mode imon mce remote key table */
 static struct rc_map_table imon_mce[] = {
diff --git a/drivers/media/rc/keymaps/rc-imon-pad.c b/drivers/media/rc/keymaps/rc-imon-pad.c
index 75d3843fdc30..999c6295c70e 100644
--- a/drivers/media/rc/keymaps/rc-imon-pad.c
+++ b/drivers/media/rc/keymaps/rc-imon-pad.c
@@ -10,6 +10,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /*
 * standard imon remote key table, which isn't really entirely
diff --git a/drivers/media/rc/keymaps/rc-iodata-bctv7e.c b/drivers/media/rc/keymaps/rc-iodata-bctv7e.c
index 1f59e163f75d..34540dfc3df5 100644
--- a/drivers/media/rc/keymaps/rc-iodata-bctv7e.c
+++ b/drivers/media/rc/keymaps/rc-iodata-bctv7e.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* IO-DATA BCTV7E Remote */
diff --git a/drivers/media/rc/keymaps/rc-kaiomy.c b/drivers/media/rc/keymaps/rc-kaiomy.c
index f31dc5c1ad9c..4264a787c150 100644
--- a/drivers/media/rc/keymaps/rc-kaiomy.c
+++ b/drivers/media/rc/keymaps/rc-kaiomy.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Kaiomy TVnPC U2
   Mauro Carvalho Chehab <mchehab@infradead.org>
diff --git a/drivers/media/rc/keymaps/rc-kworld-315u.c b/drivers/media/rc/keymaps/rc-kworld-315u.c
index 7f33edb47244..e48cd267dda6 100644
--- a/drivers/media/rc/keymaps/rc-kworld-315u.c
+++ b/drivers/media/rc/keymaps/rc-kworld-315u.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Kworld 315U
 */
diff --git a/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c b/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c
index 7fa17a369f2d..32998d6b787d 100644
--- a/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c
+++ b/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Kworld Plus TV Analog Lite PCI IR
   Mauro Carvalho Chehab <mchehab@infradead.org>
diff --git a/drivers/media/rc/keymaps/rc-leadtek-y04g0051.c b/drivers/media/rc/keymaps/rc-leadtek-y04g0051.c
index 8faa54ff16e6..03d762d986ee 100644
--- a/drivers/media/rc/keymaps/rc-leadtek-y04g0051.c
+++ b/drivers/media/rc/keymaps/rc-leadtek-y04g0051.c
@@ -19,6 +19,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table leadtek_y04g0051[] = {
        { 0x0300, KEY_POWER2 },
diff --git a/drivers/media/rc/keymaps/rc-lirc.c b/drivers/media/rc/keymaps/rc-lirc.c
index e8e23e233c39..fbf08fa6f46e 100644
--- a/drivers/media/rc/keymaps/rc-lirc.c
+++ b/drivers/media/rc/keymaps/rc-lirc.c
@@ -10,6 +10,7 @@
 */
 #include <media/rc-core.h>
+#include <linux/module.h>
 static struct rc_map_table lirc[] = {
        { },
diff --git a/drivers/media/rc/keymaps/rc-lme2510.c b/drivers/media/rc/keymaps/rc-lme2510.c
index 129d3f9a461d..51f18bb50a37 100644
--- a/drivers/media/rc/keymaps/rc-lme2510.c
+++ b/drivers/media/rc/keymaps/rc-lme2510.c
@@ -10,6 +10,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table lme2510_rc[] = {
diff --git a/drivers/media/rc/keymaps/rc-manli.c b/drivers/media/rc/keymaps/rc-manli.c
index 23b2d04e7a9f..e7038bb71bf6 100644
--- a/drivers/media/rc/keymaps/rc-manli.c
+++ b/drivers/media/rc/keymaps/rc-manli.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Michael Tokarev <mjt@tls.msk.ru>
   keytable is used by MANLI MTV00[0x0c] and BeholdTV 40[13] at
diff --git a/drivers/media/rc/keymaps/rc-msi-digivox-ii.c b/drivers/media/rc/keymaps/rc-msi-digivox-ii.c
index 7b9a01b6e4cf..c64e9e30045d 100644
--- a/drivers/media/rc/keymaps/rc-msi-digivox-ii.c
+++ b/drivers/media/rc/keymaps/rc-msi-digivox-ii.c
@@ -19,6 +19,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table msi_digivox_ii[] = {
        { 0x0002, KEY_2 },
diff --git a/drivers/media/rc/keymaps/rc-msi-digivox-iii.c b/drivers/media/rc/keymaps/rc-msi-digivox-iii.c
index ae9d06b39157..303a0b73175b 100644
--- a/drivers/media/rc/keymaps/rc-msi-digivox-iii.c
+++ b/drivers/media/rc/keymaps/rc-msi-digivox-iii.c
@@ -19,6 +19,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* MSI DIGIVOX mini III */
 /* Uses NEC extended 0x61d6. */
diff --git a/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c b/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c
index 8e9969d1239b..c393d8a50bca 100644
--- a/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c
+++ b/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /*
  Keycodes for remote on the MSI TV@nywhere Plus. The controller IC on the card
diff --git a/drivers/media/rc/keymaps/rc-msi-tvanywhere.c b/drivers/media/rc/keymaps/rc-msi-tvanywhere.c
index fdd213ff1adf..a7003d3a3c8a 100644
--- a/drivers/media/rc/keymaps/rc-msi-tvanywhere.c
+++ b/drivers/media/rc/keymaps/rc-msi-tvanywhere.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* MSI TV@nywhere MASTER remote */
diff --git a/drivers/media/rc/keymaps/rc-nebula.c b/drivers/media/rc/keymaps/rc-nebula.c
index ddae20e9cd96..3f0ddd7afd30 100644
--- a/drivers/media/rc/keymaps/rc-nebula.c
+++ b/drivers/media/rc/keymaps/rc-nebula.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table nebula[] = {
        { 0x00, KEY_0 },
diff --git a/drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c b/drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c
index 26f114c5c0de..f3b86c8db679 100644
--- a/drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c
+++ b/drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Terratec Cinergy Hybrid T USB XS FM
   Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/rc/keymaps/rc-norwood.c b/drivers/media/rc/keymaps/rc-norwood.c
index f9f2fa2819b8..9e65f07157ab 100644
--- a/drivers/media/rc/keymaps/rc-norwood.c
+++ b/drivers/media/rc/keymaps/rc-norwood.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Norwood Micro (non-Pro) TV Tuner
   By Peter Naulls <peter@chocky.org>
diff --git a/drivers/media/rc/keymaps/rc-npgtech.c b/drivers/media/rc/keymaps/rc-npgtech.c
index 4aa588bf6d69..65d0cfc3c33b 100644
--- a/drivers/media/rc/keymaps/rc-npgtech.c
+++ b/drivers/media/rc/keymaps/rc-npgtech.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table npgtech[] = {
        { 0x1d, KEY_SWITCHVIDEOMODE },  /* switch inputs */
diff --git a/drivers/media/rc/keymaps/rc-pctv-sedna.c b/drivers/media/rc/keymaps/rc-pctv-sedna.c
index 7cdef6e6cc0f..bf2cbdfe2e32 100644
--- a/drivers/media/rc/keymaps/rc-pctv-sedna.c
+++ b/drivers/media/rc/keymaps/rc-pctv-sedna.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Mapping for the 28 key remote control as seen at
   http://www.sednacomputer.com/photo/cardbus-tv.jpg
diff --git a/drivers/media/rc/keymaps/rc-pinnacle-color.c b/drivers/media/rc/keymaps/rc-pinnacle-color.c
index 23b8c505c6aa..b46cd8fe6438 100644
--- a/drivers/media/rc/keymaps/rc-pinnacle-color.c
+++ b/drivers/media/rc/keymaps/rc-pinnacle-color.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table pinnacle_color[] = {
        { 0x59, KEY_MUTE },
diff --git a/drivers/media/rc/keymaps/rc-pinnacle-grey.c b/drivers/media/rc/keymaps/rc-pinnacle-grey.c
index 6ba8c368d10a..d525df9ad868 100644
--- a/drivers/media/rc/keymaps/rc-pinnacle-grey.c
+++ b/drivers/media/rc/keymaps/rc-pinnacle-grey.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table pinnacle_grey[] = {
        { 0x3a, KEY_0 },
diff --git a/drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c b/drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c
index 31fc64cd17ba..a4603d035374 100644
--- a/drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c
+++ b/drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Pinnacle PCTV HD 800i mini remote */
diff --git a/drivers/media/rc/keymaps/rc-pixelview-002t.c b/drivers/media/rc/keymaps/rc-pixelview-002t.c
index e5ab071f635a..33eb64333c6f 100644
--- a/drivers/media/rc/keymaps/rc-pixelview-002t.c
+++ b/drivers/media/rc/keymaps/rc-pixelview-002t.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /*
 * Keytable for 002-T IR remote provided together with Pixelview
diff --git a/drivers/media/rc/keymaps/rc-pixelview-mk12.c b/drivers/media/rc/keymaps/rc-pixelview-mk12.c
index 125fc3949c15..21f4dd25c2ec 100644
--- a/drivers/media/rc/keymaps/rc-pixelview-mk12.c
+++ b/drivers/media/rc/keymaps/rc-pixelview-mk12.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /*
 * Keytable for MK-F12 IR remote provided together with Pixelview
diff --git a/drivers/media/rc/keymaps/rc-pixelview-new.c b/drivers/media/rc/keymaps/rc-pixelview-new.c
index bd78d6ac1e16..f944ad2cac2b 100644
--- a/drivers/media/rc/keymaps/rc-pixelview-new.c
+++ b/drivers/media/rc/keymaps/rc-pixelview-new.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /*
   Mauro Carvalho Chehab <mchehab@infradead.org>
diff --git a/drivers/media/rc/keymaps/rc-pixelview.c b/drivers/media/rc/keymaps/rc-pixelview.c
index 06187e7db446..a6020eea7b95 100644
--- a/drivers/media/rc/keymaps/rc-pixelview.c
+++ b/drivers/media/rc/keymaps/rc-pixelview.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table pixelview[] = {
diff --git a/drivers/media/rc/keymaps/rc-powercolor-real-angel.c b/drivers/media/rc/keymaps/rc-powercolor-real-angel.c
index 5f9d546a86c4..e74c571a5e44 100644
--- a/drivers/media/rc/keymaps/rc-powercolor-real-angel.c
+++ b/drivers/media/rc/keymaps/rc-powercolor-real-angel.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /*
 * Remote control for Powercolor Real Angel 330
diff --git a/drivers/media/rc/keymaps/rc-proteus-2309.c b/drivers/media/rc/keymaps/rc-proteus-2309.c
index 8a3a643879d4..adee8035ce96 100644
--- a/drivers/media/rc/keymaps/rc-proteus-2309.c
+++ b/drivers/media/rc/keymaps/rc-proteus-2309.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Michal Majchrowicz <mmajchrowicz@gmail.com> */
diff --git a/drivers/media/rc/keymaps/rc-purpletv.c b/drivers/media/rc/keymaps/rc-purpletv.c
index ef90296bfd68..722597a20e4a 100644
--- a/drivers/media/rc/keymaps/rc-purpletv.c
+++ b/drivers/media/rc/keymaps/rc-purpletv.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table purpletv[] = {
        { 0x03, KEY_POWER },
diff --git a/drivers/media/rc/keymaps/rc-pv951.c b/drivers/media/rc/keymaps/rc-pv951.c
index 5e8beee94de4..0105d63c07a9 100644
--- a/drivers/media/rc/keymaps/rc-pv951.c
+++ b/drivers/media/rc/keymaps/rc-pv951.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Mark Phalan <phalanm@o2.ie> */
diff --git a/drivers/media/rc/keymaps/rc-rc6-mce.c b/drivers/media/rc/keymaps/rc-rc6-mce.c
index c3907e211d39..753e43ec787b 100644
--- a/drivers/media/rc/keymaps/rc-rc6-mce.c
+++ b/drivers/media/rc/keymaps/rc-rc6-mce.c
@@ -13,6 +13,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table rc6_mce[] = {
diff --git a/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c b/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c
index 6813d1102118..073694d50f49 100644
--- a/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c
+++ b/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Zogis Real Audio 220 - 32 keys IR */
diff --git a/drivers/media/rc/keymaps/rc-streamzap.c b/drivers/media/rc/keymaps/rc-streamzap.c
index 92cc10d2f9cd..f9a07578d985 100644
--- a/drivers/media/rc/keymaps/rc-streamzap.c
+++ b/drivers/media/rc/keymaps/rc-streamzap.c
@@ -10,6 +10,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table streamzap[] = {
 /*
diff --git a/drivers/media/rc/keymaps/rc-tbs-nec.c b/drivers/media/rc/keymaps/rc-tbs-nec.c
index 7242ee66f6e0..5039be782bc5 100644
--- a/drivers/media/rc/keymaps/rc-tbs-nec.c
+++ b/drivers/media/rc/keymaps/rc-tbs-nec.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table tbs_nec[] = {
        { 0x84, KEY_POWER2},            /* power */
diff --git a/drivers/media/rc/keymaps/rc-technisat-usb2.c b/drivers/media/rc/keymaps/rc-technisat-usb2.c
index 4afe5774f192..f9733bb289d6 100644
--- a/drivers/media/rc/keymaps/rc-technisat-usb2.c
+++ b/drivers/media/rc/keymaps/rc-technisat-usb2.c
@@ -30,6 +30,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table technisat_usb2[] = {
        {0x0a0c, KEY_POWER},
diff --git a/drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c b/drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c
index bc38e34b9fda..53629fb0151f 100644
--- a/drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c
+++ b/drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Terratec Cinergy Hybrid T USB XS
   Devin Heitmueller <dheitmueller@linuxtv.org>
diff --git a/drivers/media/rc/keymaps/rc-terratec-slim-2.c b/drivers/media/rc/keymaps/rc-terratec-slim-2.c
index 44093918cf03..4c149ef712dc 100644
--- a/drivers/media/rc/keymaps/rc-terratec-slim-2.c
+++ b/drivers/media/rc/keymaps/rc-terratec-slim-2.c
@@ -20,6 +20,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /*
 * TerraTec slim remote, 6 rows, 3 columns.
diff --git a/drivers/media/rc/keymaps/rc-terratec-slim.c b/drivers/media/rc/keymaps/rc-terratec-slim.c
index 1abafa5fd303..3d8a19cdb5a2 100644
--- a/drivers/media/rc/keymaps/rc-terratec-slim.c
+++ b/drivers/media/rc/keymaps/rc-terratec-slim.c
@@ -19,6 +19,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* TerraTec slim remote, 7 rows, 4 columns. */
 /* Uses NEC extended 0x02bd. */
diff --git a/drivers/media/rc/keymaps/rc-tevii-nec.c b/drivers/media/rc/keymaps/rc-tevii-nec.c
index ef5ba3f32735..f2c3b75d8580 100644
--- a/drivers/media/rc/keymaps/rc-tevii-nec.c
+++ b/drivers/media/rc/keymaps/rc-tevii-nec.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table tevii_nec[] = {
        { 0x0a, KEY_POWER2},
diff --git a/drivers/media/rc/keymaps/rc-tivo.c b/drivers/media/rc/keymaps/rc-tivo.c
index 98ad085531fd..454e06295692 100644
--- a/drivers/media/rc/keymaps/rc-tivo.c
+++ b/drivers/media/rc/keymaps/rc-tivo.c
@@ -9,6 +9,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /*
 * Initial mapping is for the TiVo remote included in the Nero LiquidTV bundle,
diff --git a/drivers/media/rc/keymaps/rc-total-media-in-hand.c b/drivers/media/rc/keymaps/rc-total-media-in-hand.c
index 20ac4e19fb3f..5b9f9ec13680 100644
--- a/drivers/media/rc/keymaps/rc-total-media-in-hand.c
+++ b/drivers/media/rc/keymaps/rc-total-media-in-hand.c
@@ -19,6 +19,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Uses NEC extended 0x02bd */
 static struct rc_map_table total_media_in_hand[] = {
diff --git a/drivers/media/rc/keymaps/rc-trekstor.c b/drivers/media/rc/keymaps/rc-trekstor.c
index f8190ead2e32..f9a2e0fabb9f 100644
--- a/drivers/media/rc/keymaps/rc-trekstor.c
+++ b/drivers/media/rc/keymaps/rc-trekstor.c
@@ -19,6 +19,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* TrekStor DVB-T USB Stick remote controller. */
 /* Imported from af9015.h.
diff --git a/drivers/media/rc/keymaps/rc-tt-1500.c b/drivers/media/rc/keymaps/rc-tt-1500.c
index 295f3738e301..caeff85603e3 100644
--- a/drivers/media/rc/keymaps/rc-tt-1500.c
+++ b/drivers/media/rc/keymaps/rc-tt-1500.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* for the Technotrend 1500 bundled remotes (grey and black): */
diff --git a/drivers/media/rc/keymaps/rc-twinhan1027.c b/drivers/media/rc/keymaps/rc-twinhan1027.c
index 8bf8df64b081..509299b90c90 100644
--- a/drivers/media/rc/keymaps/rc-twinhan1027.c
+++ b/drivers/media/rc/keymaps/rc-twinhan1027.c
@@ -1,4 +1,5 @@
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table twinhan_vp1027[] = {
        { 0x16, KEY_POWER2 },
diff --git a/drivers/media/rc/keymaps/rc-videomate-m1f.c b/drivers/media/rc/keymaps/rc-videomate-m1f.c
index 4994d405c0a1..3bd1de1f585c 100644
--- a/drivers/media/rc/keymaps/rc-videomate-m1f.c
+++ b/drivers/media/rc/keymaps/rc-videomate-m1f.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table videomate_m1f[] = {
        { 0x01, KEY_POWER },
diff --git a/drivers/media/rc/keymaps/rc-videomate-s350.c b/drivers/media/rc/keymaps/rc-videomate-s350.c
index 9e474a6024e5..8bfc3e8d909d 100644
--- a/drivers/media/rc/keymaps/rc-videomate-s350.c
+++ b/drivers/media/rc/keymaps/rc-videomate-s350.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table videomate_s350[] = {
        { 0x00, KEY_TV},
diff --git a/drivers/media/rc/keymaps/rc-videomate-tv-pvr.c b/drivers/media/rc/keymaps/rc-videomate-tv-pvr.c
index 5f2a46e1f8f6..390ce9431b35 100644
--- a/drivers/media/rc/keymaps/rc-videomate-tv-pvr.c
+++ b/drivers/media/rc/keymaps/rc-videomate-tv-pvr.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 static struct rc_map_table videomate_tv_pvr[] = {
        { 0x14, KEY_MUTE },
diff --git a/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c b/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c
index bd8d021f40aa..2852bf705064 100644
--- a/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c
+++ b/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Leadtek Winfast TV USB II Deluxe remote
   Magnus Alm <magnus.alm@gmail.com>
diff --git a/drivers/media/rc/keymaps/rc-winfast.c b/drivers/media/rc/keymaps/rc-winfast.c
index d8a34c14676a..2df1cba23600 100644
--- a/drivers/media/rc/keymaps/rc-winfast.c
+++ b/drivers/media/rc/keymaps/rc-winfast.c
@@ -11,6 +11,7 @@
 */
 #include <media/rc-map.h>
+#include <linux/module.h>
 /* Table for Leadtek Winfast Remote Controls - used by both bttv and cx88 */
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 666d4bb5b1fb..29f900065d8a 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -18,6 +18,7 @@
 #include <linux/input.h>
 #include <linux/slab.h>
 #include <linux/device.h>
+#include <linux/module.h>
 #include "rc-core-priv.h"
 /* Sizes are in bytes, 256 bytes allows for 32 entries on x64 */
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index d285c8c92819..b303a3f8a9f8 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -517,6 +517,13 @@ config VIDEO_NOON010PC30
 source "drivers/media/video/m5mols/Kconfig"
+config VIDEO_S5K6AA
+        tristate "Samsung S5K6AAFX sensor support"
+        depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+        ---help---
+          This is a V4L2 sensor-level driver for Samsung S5K6AA(FX) 1.3M
+          camera sensor with an embedded SoC image signal processor.
 comment "Flash devices"
 config VIDEO_ADP1653
@@ -736,6 +743,8 @@ source "drivers/media/video/cx88/Kconfig"
 source "drivers/media/video/cx23885/Kconfig"
+source "drivers/media/video/cx25821/Kconfig"
 source "drivers/media/video/au0828/Kconfig"
 source "drivers/media/video/ivtv/Kconfig"
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 11fff97e7196..117f9c4b4cb9 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -72,6 +72,7 @@ obj-$(CONFIG_VIDEO_MT9V032) += mt9v032.o
 obj-$(CONFIG_VIDEO_SR030PC30)   += sr030pc30.o
 obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o
 obj-$(CONFIG_VIDEO_M5MOLS)      += m5mols/
+obj-$(CONFIG_VIDEO_S5K6AA)      += s5k6aa.o
 obj-$(CONFIG_VIDEO_ADP1653)     += adp1653.o
 obj-$(CONFIG_SOC_CAMERA_IMX074)         += imx074.o
@@ -104,6 +105,7 @@ obj-$(CONFIG_VIDEO_CX88) += cx88/
 obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
 obj-$(CONFIG_VIDEO_TLG2300) += tlg2300/
 obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/
+obj-$(CONFIG_VIDEO_CX25821) += cx25821/
 obj-$(CONFIG_VIDEO_USBVISION) += usbvision/
 obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/
 obj-$(CONFIG_VIDEO_CPIA2) += cpia2/
diff --git a/drivers/media/video/adp1653.c b/drivers/media/video/adp1653.c
index 5914390211ff..12eedf4d515a 100644
--- a/drivers/media/video/adp1653.c
+++ b/drivers/media/video/adp1653.c
@@ -31,6 +31,7 @@
 */
 #include <linux/delay.h>
+#include <linux/module.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/slab.h>
diff --git a/drivers/media/video/ak881x.c b/drivers/media/video/ak881x.c
index b388654d48cd..53c496c00fb6 100644
--- a/drivers/media/video/ak881x.c
+++ b/drivers/media/video/ak881x.c
@@ -13,6 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/videodev2.h>
+#include <linux/module.h>
 #include <media/ak881x.h>
 #include <media/v4l2-chip-ident.h>
diff --git a/drivers/media/video/atmel-isi.c b/drivers/media/video/atmel-isi.c
index 774715d2f84f..8c775c59e120 100644
--- a/drivers/media/video/atmel-isi.c
+++ b/drivers/media/video/atmel-isi.c
@@ -94,6 +94,7 @@ struct atmel_isi {
        unsigned int                    irq;
        struct isi_platform_data        *pdata;
+        u16                             width_flags;    /* max 12 bits */
        struct list_head                video_buffer_list;
        struct frame_buffer             *active;
@@ -248,9 +249,9 @@ static int atmel_isi_wait_status(struct atmel_isi *isi, int wait_reset)
 /* ------------------------------------------------------------------
        Videobuf operations
   ------------------------------------------------------------------*/
-static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
+static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
-                                unsigned int *nplanes, unsigned int sizes[],
+                                unsigned int *nbuffers, unsigned int *nplanes,
-                                void *alloc_ctxs[])
+                                unsigned int sizes[], void *alloc_ctxs[])
 {
        struct soc_camera_device *icd = soc_camera_from_vb2q(vq);
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
@@ -647,50 +648,42 @@ static bool isi_camera_packing_supported(const struct soc_mbus_pixelfmt *fmt)
                 fmt->packing == SOC_MBUS_PACKING_EXTEND16);
 }
-static unsigned long make_bus_param(struct atmel_isi *isi)
+#define ISI_BUS_PARAM (V4L2_MBUS_MASTER |       \
-{
+                V4L2_MBUS_HSYNC_ACTIVE_HIGH |   \
-        unsigned long flags;
+                V4L2_MBUS_HSYNC_ACTIVE_LOW |    \
-        /*
+                V4L2_MBUS_VSYNC_ACTIVE_HIGH |   \
-         * Platform specified synchronization and pixel clock polarities are
+                V4L2_MBUS_VSYNC_ACTIVE_LOW |    \
-         * only a recommendation and are only used during probing. Atmel ISI
+                V4L2_MBUS_PCLK_SAMPLE_RISING |  \
-         * camera interface only works in master mode, i.e., uses HSYNC and
+                V4L2_MBUS_PCLK_SAMPLE_FALLING | \
-         * VSYNC signals from the sensor
+                V4L2_MBUS_DATA_ACTIVE_HIGH)
-         */
-        flags = SOCAM_MASTER |
-                SOCAM_HSYNC_ACTIVE_HIGH |
-                SOCAM_HSYNC_ACTIVE_LOW |
-                SOCAM_VSYNC_ACTIVE_HIGH |
-                SOCAM_VSYNC_ACTIVE_LOW |
-                SOCAM_PCLK_SAMPLE_RISING |
-                SOCAM_PCLK_SAMPLE_FALLING |
-                SOCAM_DATA_ACTIVE_HIGH;
-        if (isi->pdata->data_width_flags & ISI_DATAWIDTH_10)
-                flags |= SOCAM_DATAWIDTH_10;
-        if (isi->pdata->data_width_flags & ISI_DATAWIDTH_8)
-                flags |= SOCAM_DATAWIDTH_8;
-        if (flags & SOCAM_DATAWIDTH_MASK)
-                return flags;
-        return 0;
-}
 static int isi_camera_try_bus_param(struct soc_camera_device *icd,
                                    unsigned char buswidth)
 {
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct atmel_isi *isi = ici->priv;
-        unsigned long camera_flags;
+        struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
+        unsigned long common_flags;
        int ret;
-        camera_flags = icd->ops->query_bus_param(icd);
+        ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
-        ret = soc_camera_bus_param_compatible(camera_flags,
+        if (!ret) {
-                                        make_bus_param(isi));
+                common_flags = soc_mbus_config_compatible(&cfg,
-        if (!ret)
+                                                          ISI_BUS_PARAM);
-                return -EINVAL;
+                if (!common_flags) {
-        return 0;
+                        dev_warn(icd->parent,
+                                 "Flags incompatible: camera 0x%x, host 0x%x\n",
+                                 cfg.flags, ISI_BUS_PARAM);
+                        return -EINVAL;
+                }
+        } else if (ret != -ENOIOCTLCMD) {
+                return ret;
+        }
+        if ((1 << (buswidth - 1)) & isi->width_flags)
+                return 0;
+        return -EINVAL;
 }
@@ -812,59 +805,71 @@ static int isi_camera_querycap(struct soc_camera_host *ici,
 static int isi_camera_set_bus_param(struct soc_camera_device *icd, u32 pixfmt)
 {
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct atmel_isi *isi = ici->priv;
-        unsigned long bus_flags, camera_flags, common_flags;
+        struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
+        unsigned long common_flags;
        int ret;
        u32 cfg1 = 0;
-        camera_flags = icd->ops->query_bus_param(icd);
+        ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
+        if (!ret) {
-        bus_flags = make_bus_param(isi);
+                common_flags = soc_mbus_config_compatible(&cfg,
-        common_flags = soc_camera_bus_param_compatible(camera_flags, bus_flags);
+                                                          ISI_BUS_PARAM);
-        dev_dbg(icd->parent, "Flags cam: 0x%lx host: 0x%lx common: 0x%lx\n",
+                if (!common_flags) {
-                camera_flags, bus_flags, common_flags);
+                        dev_warn(icd->parent,
-        if (!common_flags)
+                                 "Flags incompatible: camera 0x%x, host 0x%x\n",
-                return -EINVAL;
+                                 cfg.flags, ISI_BUS_PARAM);
+                        return -EINVAL;
+                }
+        } else if (ret != -ENOIOCTLCMD) {
+                return ret;
+        } else {
+                common_flags = ISI_BUS_PARAM;
+        }
+        dev_dbg(icd->parent, "Flags cam: 0x%x host: 0x%x common: 0x%lx\n",
+                cfg.flags, ISI_BUS_PARAM, common_flags);
        /* Make choises, based on platform preferences */
-        if ((common_flags & SOCAM_HSYNC_ACTIVE_HIGH) &&
+        if ((common_flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH) &&
-            (common_flags & SOCAM_HSYNC_ACTIVE_LOW)) {
+            (common_flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)) {
                if (isi->pdata->hsync_act_low)
-                        common_flags &= ~SOCAM_HSYNC_ACTIVE_HIGH;
+                        common_flags &= ~V4L2_MBUS_HSYNC_ACTIVE_HIGH;
                else
-                        common_flags &= ~SOCAM_HSYNC_ACTIVE_LOW;
+                        common_flags &= ~V4L2_MBUS_HSYNC_ACTIVE_LOW;
        }
-        if ((common_flags & SOCAM_VSYNC_ACTIVE_HIGH) &&
+        if ((common_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH) &&
-            (common_flags & SOCAM_VSYNC_ACTIVE_LOW)) {
+            (common_flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)) {
                if (isi->pdata->vsync_act_low)
-                        common_flags &= ~SOCAM_VSYNC_ACTIVE_HIGH;
+                        common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_HIGH;
                else
-                        common_flags &= ~SOCAM_VSYNC_ACTIVE_LOW;
+                        common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_LOW;
        }
-        if ((common_flags & SOCAM_PCLK_SAMPLE_RISING) &&
+        if ((common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING) &&
-            (common_flags & SOCAM_PCLK_SAMPLE_FALLING)) {
+            (common_flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)) {
                if (isi->pdata->pclk_act_falling)
-                        common_flags &= ~SOCAM_PCLK_SAMPLE_RISING;
+                        common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_RISING;
                else
-                        common_flags &= ~SOCAM_PCLK_SAMPLE_FALLING;
+                        common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_FALLING;
        }
-        ret = icd->ops->set_bus_param(icd, common_flags);
+        cfg.flags = common_flags;
-        if (ret < 0) {
+        ret = v4l2_subdev_call(sd, video, s_mbus_config, &cfg);
-                dev_dbg(icd->parent, "Camera set_bus_param(%lx) returned %d\n",
+        if (ret < 0 && ret != -ENOIOCTLCMD) {
+                dev_dbg(icd->parent, "camera s_mbus_config(0x%lx) returned %d\n",
                        common_flags, ret);
                return ret;
        }
        /* set bus param for ISI */
-        if (common_flags & SOCAM_HSYNC_ACTIVE_LOW)
+        if (common_flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)
                cfg1 |= ISI_CFG1_HSYNC_POL_ACTIVE_LOW;
-        if (common_flags & SOCAM_VSYNC_ACTIVE_LOW)
+        if (common_flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)
                cfg1 |= ISI_CFG1_VSYNC_POL_ACTIVE_LOW;
-        if (common_flags & SOCAM_PCLK_SAMPLE_FALLING)
+        if (common_flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)
                cfg1 |= ISI_CFG1_PIXCLK_POL_ACTIVE_FALLING;
        if (isi->pdata->has_emb_sync)
@@ -983,6 +988,11 @@ static int __devinit atmel_isi_probe(struct platform_device *pdev)
                goto err_ioremap;
        }
+        if (pdata->data_width_flags & ISI_DATAWIDTH_8)
+                isi->width_flags = 1 << 7;
+        if (pdata->data_width_flags & ISI_DATAWIDTH_10)
+                isi->width_flags |= 1 << 9;
        isi_writel(isi, ISI_CTRL, ISI_CTRL_DIS);
        irq = platform_get_irq(pdev, 0);
diff --git a/drivers/media/video/cpia2/cpia2_usb.c b/drivers/media/video/cpia2/cpia2_usb.c
index dc5b07a20f69..59c797c15277 100644
--- a/drivers/media/video/cpia2/cpia2_usb.c
+++ b/drivers/media/video/cpia2/cpia2_usb.c
@@ -31,6 +31,7 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/usb.h>
+#include <linux/module.h>
 #include "cpia2.h"
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 9e2f870f4258..c6ff32a6137c 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -1085,6 +1085,8 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev,
                setup.addr = ADDR_UNSET;
                setup.type = cx->options.tuner;
                setup.mode_mask = T_ANALOG_TV;  /* matches TV tuners */
+                if (cx->options.radio > 0)
+                        setup.mode_mask |= T_RADIO;
                setup.tuner_callback = (setup.type == TUNER_XC2028) ?
                        cx18_reset_tuner_gpio : NULL;
                cx18_call_all(cx, tuner, s_type_addr, &setup);
diff --git a/drivers/staging/cx25821/Kconfig b/drivers/media/video/cx25821/Kconfig
index 5f6b54213713..5f6b54213713 100644
--- a/drivers/staging/cx25821/Kconfig
+++ b/drivers/media/video/cx25821/Kconfig
diff --git a/drivers/staging/cx25821/Makefile b/drivers/media/video/cx25821/Makefile
index aedde18c68f9..aedde18c68f9 100644
--- a/drivers/staging/cx25821/Makefile
+++ b/drivers/media/video/cx25821/Makefile
diff --git a/drivers/staging/cx25821/cx25821-alsa.c b/drivers/media/video/cx25821/cx25821-alsa.c
index 09e99de5fd21..09e99de5fd21 100644
--- a/drivers/staging/cx25821/cx25821-alsa.c
+++ b/drivers/media/video/cx25821/cx25821-alsa.c
diff --git a/drivers/staging/cx25821/cx25821-audio-upstream.c b/drivers/media/video/cx25821/cx25821-audio-upstream.c
index c20d6dece154..c20d6dece154 100644
--- a/drivers/staging/cx25821/cx25821-audio-upstream.c
+++ b/drivers/media/video/cx25821/cx25821-audio-upstream.c
diff --git a/drivers/staging/cx25821/cx25821-audio-upstream.h b/drivers/media/video/cx25821/cx25821-audio-upstream.h
index af2ae7c5815a..af2ae7c5815a 100644
--- a/drivers/staging/cx25821/cx25821-audio-upstream.h
+++ b/drivers/media/video/cx25821/cx25821-audio-upstream.h
diff --git a/drivers/staging/cx25821/cx25821-audio.h b/drivers/media/video/cx25821/cx25821-audio.h
index 8eb55b7b88cb..8eb55b7b88cb 100644
--- a/drivers/staging/cx25821/cx25821-audio.h
+++ b/drivers/media/video/cx25821/cx25821-audio.h
diff --git a/drivers/staging/cx25821/cx25821-biffuncs.h b/drivers/media/video/cx25821/cx25821-biffuncs.h
index 9326a7c729ec..9326a7c729ec 100644
--- a/drivers/staging/cx25821/cx25821-biffuncs.h
+++ b/drivers/media/video/cx25821/cx25821-biffuncs.h
diff --git a/drivers/staging/cx25821/cx25821-cards.c b/drivers/media/video/cx25821/cx25821-cards.c
index 6ace60313b49..6ace60313b49 100644
--- a/drivers/staging/cx25821/cx25821-cards.c
+++ b/drivers/media/video/cx25821/cx25821-cards.c
diff --git a/drivers/staging/cx25821/cx25821-core.c b/drivers/media/video/cx25821/cx25821-core.c
index a7fa38f9594e..a7fa38f9594e 100644
--- a/drivers/staging/cx25821/cx25821-core.c
+++ b/drivers/media/video/cx25821/cx25821-core.c
diff --git a/drivers/staging/cx25821/cx25821-gpio.c b/drivers/media/video/cx25821/cx25821-gpio.c
index 29e43b03c85e..29e43b03c85e 100644
--- a/drivers/staging/cx25821/cx25821-gpio.c
+++ b/drivers/media/video/cx25821/cx25821-gpio.c
diff --git a/drivers/staging/cx25821/cx25821-i2c.c b/drivers/media/video/cx25821/cx25821-i2c.c
index 4d3d0ce40785..4d3d0ce40785 100644
--- a/drivers/staging/cx25821/cx25821-i2c.c
+++ b/drivers/media/video/cx25821/cx25821-i2c.c
diff --git a/drivers/staging/cx25821/cx25821-medusa-defines.h b/drivers/media/video/cx25821/cx25821-medusa-defines.h
index 60d197f57556..60d197f57556 100644
--- a/drivers/staging/cx25821/cx25821-medusa-defines.h
+++ b/drivers/media/video/cx25821/cx25821-medusa-defines.h
diff --git a/drivers/staging/cx25821/cx25821-medusa-reg.h b/drivers/media/video/cx25821/cx25821-medusa-reg.h
index 1c1c228352d1..1c1c228352d1 100644
--- a/drivers/staging/cx25821/cx25821-medusa-reg.h
+++ b/drivers/media/video/cx25821/cx25821-medusa-reg.h
diff --git a/drivers/staging/cx25821/cx25821-medusa-video.c b/drivers/media/video/cx25821/cx25821-medusa-video.c
index fc780d0908dc..fc780d0908dc 100644
--- a/drivers/staging/cx25821/cx25821-medusa-video.c
+++ b/drivers/media/video/cx25821/cx25821-medusa-video.c
diff --git a/drivers/staging/cx25821/cx25821-medusa-video.h b/drivers/media/video/cx25821/cx25821-medusa-video.h
index 6175e0961855..6175e0961855 100644
--- a/drivers/staging/cx25821/cx25821-medusa-video.h
+++ b/drivers/media/video/cx25821/cx25821-medusa-video.h
diff --git a/drivers/staging/cx25821/cx25821-reg.h b/drivers/media/video/cx25821/cx25821-reg.h
index a3fc25a4dc0b..a3fc25a4dc0b 100644
--- a/drivers/staging/cx25821/cx25821-reg.h
+++ b/drivers/media/video/cx25821/cx25821-reg.h
diff --git a/drivers/staging/cx25821/cx25821-sram.h b/drivers/media/video/cx25821/cx25821-sram.h
index 5f05d153bc4d..5f05d153bc4d 100644
--- a/drivers/staging/cx25821/cx25821-sram.h
+++ b/drivers/media/video/cx25821/cx25821-sram.h
diff --git a/drivers/staging/cx25821/cx25821-video-upstream-ch2.c b/drivers/media/video/cx25821/cx25821-video-upstream-ch2.c
index 2a724ddfa53f..2a724ddfa53f 100644
--- a/drivers/staging/cx25821/cx25821-video-upstream-ch2.c
+++ b/drivers/media/video/cx25821/cx25821-video-upstream-ch2.c
diff --git a/drivers/staging/cx25821/cx25821-video-upstream-ch2.h b/drivers/media/video/cx25821/cx25821-video-upstream-ch2.h
index d42dab59b663..d42dab59b663 100644
--- a/drivers/staging/cx25821/cx25821-video-upstream-ch2.h
+++ b/drivers/media/video/cx25821/cx25821-video-upstream-ch2.h
diff --git a/drivers/staging/cx25821/cx25821-video-upstream.c b/drivers/media/video/cx25821/cx25821-video-upstream.c
index c0b80068f468..c0b80068f468 100644
--- a/drivers/staging/cx25821/cx25821-video-upstream.c
+++ b/drivers/media/video/cx25821/cx25821-video-upstream.c
diff --git a/drivers/staging/cx25821/cx25821-video-upstream.h b/drivers/media/video/cx25821/cx25821-video-upstream.h
index 268ec8aa6a61..268ec8aa6a61 100644
--- a/drivers/staging/cx25821/cx25821-video-upstream.h
+++ b/drivers/media/video/cx25821/cx25821-video-upstream.h
diff --git a/drivers/staging/cx25821/cx25821-video.c b/drivers/media/video/cx25821/cx25821-video.c
index 084fc0899e13..4d6907cda75b 100644
--- a/drivers/staging/cx25821/cx25821-video.c
+++ b/drivers/media/video/cx25821/cx25821-video.c
@@ -1312,7 +1312,7 @@ int cx25821_vidioc_s_input(struct file *file, void *priv, unsigned int i)
                        return err;
        }
-        if (i > 2) {
+        if (i >= CX25821_NR_INPUT) {
                dprintk(1, "%s(): -EINVAL\n", __func__);
                return -EINVAL;
        }
diff --git a/drivers/staging/cx25821/cx25821-video.h b/drivers/media/video/cx25821/cx25821-video.h
index d0d9538ca5b3..d0d9538ca5b3 100644
--- a/drivers/staging/cx25821/cx25821-video.h
+++ b/drivers/media/video/cx25821/cx25821-video.h
diff --git a/drivers/staging/cx25821/cx25821.h b/drivers/media/video/cx25821/cx25821.h
index db2615b2bac3..2d2d00932823 100644
--- a/drivers/staging/cx25821/cx25821.h
+++ b/drivers/media/video/cx25821/cx25821.h
@@ -98,6 +98,7 @@
 #define CX25821_BOARD_CONEXANT_ATHENA10 1
 #define MAX_VID_CHANNEL_NUM     12
 #define VID_CHANNEL_NUM 8
+#define CX25821_NR_INPUT 2
 struct cx25821_fmt {
        char *name;
@@ -196,7 +197,7 @@ struct cx25821_board {
        unsigned char radio_addr;
        u32 clk_freq;
-        struct cx25821_input input[2];
+        struct cx25821_input input[CX25821_NR_INPUT];
 };
 struct cx25821_subid {
diff --git a/drivers/media/video/cx25840/cx25840-ir.c b/drivers/media/video/cx25840/cx25840-ir.c
index b718a3a4bed3..13c380ebb562 100644
--- a/drivers/media/video/cx25840/cx25840-ir.c
+++ b/drivers/media/video/cx25840/cx25840-ir.c
@@ -23,6 +23,7 @@
 #include <linux/slab.h>
 #include <linux/kfifo.h>
+#include <linux/module.h>
 #include <media/cx25840.h>
 #include <media/rc-core.h>
diff --git a/drivers/media/video/davinci/dm355_ccdc.c b/drivers/media/video/davinci/dm355_ccdc.c
index c29ac88ffd78..bd443ee76fff 100644
--- a/drivers/media/video/davinci/dm355_ccdc.c
+++ b/drivers/media/video/davinci/dm355_ccdc.c
@@ -39,6 +39,7 @@
 #include <linux/videodev2.h>
 #include <linux/clk.h>
 #include <linux/err.h>
+#include <linux/module.h>
 #include <media/davinci/dm355_ccdc.h>
 #include <media/davinci/vpss.h>
diff --git a/drivers/media/video/davinci/dm644x_ccdc.c b/drivers/media/video/davinci/dm644x_ccdc.c
index c8b32c1c7386..8051c2956478 100644
--- a/drivers/media/video/davinci/dm644x_ccdc.c
+++ b/drivers/media/video/davinci/dm644x_ccdc.c
@@ -40,6 +40,7 @@
 #include <linux/gfp.h>
 #include <linux/clk.h>
 #include <linux/err.h>
+#include <linux/module.h>
 #include <media/davinci/dm644x_ccdc.h>
 #include <media/davinci/vpss.h>
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 4240f0b720fa..9b747c266afa 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1923,6 +1923,8 @@ struct usb_device_id em28xx_id_table[] = {
                        .driver_info = EM2860_BOARD_TERRATEC_AV350 },
        { USB_DEVICE(0x0ccd, 0x0096),
                        .driver_info = EM2860_BOARD_TERRATEC_GRABBY },
+        { USB_DEVICE(0x0ccd, 0x10AF),
+                        .driver_info = EM2860_BOARD_TERRATEC_GRABBY },
        { USB_DEVICE(0x0fd9, 0x0033),
                        .driver_info = EM2860_BOARD_ELGATO_VIDEO_CAPTURE},
        { USB_DEVICE(0x185b, 0x2870),
diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
index 2a1ac287591d..82e819fa91c0 100644
--- a/drivers/media/video/hdpvr/hdpvr-i2c.c
+++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
@@ -17,6 +17,7 @@
 #include <linux/i2c.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "hdpvr.h"
diff --git a/drivers/media/video/hexium_gemini.c b/drivers/media/video/hexium_gemini.c
index 9cb039e593db..a62322d5c0d8 100644
--- a/drivers/media/video/hexium_gemini.c
+++ b/drivers/media/video/hexium_gemini.c
@@ -26,6 +26,7 @@
 #define DEBUG_VARIABLE debug
 #include <media/saa7146_vv.h>
+#include <linux/module.h>
 static int debug;
 module_param(debug, int, 0);
diff --git a/drivers/media/video/hexium_orion.c b/drivers/media/video/hexium_orion.c
index 74861a4b601a..23debc967d94 100644
--- a/drivers/media/video/hexium_orion.c
+++ b/drivers/media/video/hexium_orion.c
@@ -26,6 +26,7 @@
 #define DEBUG_VARIABLE debug
 #include <media/saa7146_vv.h>
+#include <linux/module.h>
 static int debug;
 module_param(debug, int, 0);
diff --git a/drivers/media/video/imx074.c b/drivers/media/video/imx074.c
index 0382ea752e6f..eec75bb57203 100644
--- a/drivers/media/video/imx074.c
+++ b/drivers/media/video/imx074.c
@@ -12,11 +12,12 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
+#include <linux/v4l2-mediabus.h>
 #include <linux/slab.h>
 #include <linux/videodev2.h>
+#include <linux/module.h>
 #include <media/soc_camera.h>
-#include <media/soc_mediabus.h>
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-chip-ident.h>
@@ -267,6 +268,17 @@ static int imx074_g_chip_ident(struct v4l2_subdev *sd,
        return 0;
 }
+static int imx074_g_mbus_config(struct v4l2_subdev *sd,
+                                struct v4l2_mbus_config *cfg)
+{
+        cfg->type = V4L2_MBUS_CSI2;
+        cfg->flags = V4L2_MBUS_CSI2_2_LANE |
+                V4L2_MBUS_CSI2_CHANNEL_0 |
+                V4L2_MBUS_CSI2_CONTINUOUS_CLOCK;
+        return 0;
+}
 static struct v4l2_subdev_video_ops imx074_subdev_video_ops = {
        .s_stream       = imx074_s_stream,
        .s_mbus_fmt     = imx074_s_fmt,
@@ -275,6 +287,7 @@ static struct v4l2_subdev_video_ops imx074_subdev_video_ops = {
        .enum_mbus_fmt  = imx074_enum_fmt,
        .g_crop         = imx074_g_crop,
        .cropcap        = imx074_cropcap,
+        .g_mbus_config  = imx074_g_mbus_config,
 };
 static struct v4l2_subdev_core_ops imx074_subdev_core_ops = {
@@ -286,28 +299,7 @@ static struct v4l2_subdev_ops imx074_subdev_ops = {
        .video  = &imx074_subdev_video_ops,
 };
-/*
+static int imx074_video_probe(struct i2c_client *client)
- * We have to provide soc-camera operations, but we don't have anything to say
- * there. The MIPI CSI2 driver will provide .query_bus_param and .set_bus_param
- */
-static unsigned long imx074_query_bus_param(struct soc_camera_device *icd)
-{
-        return 0;
-}
-static int imx074_set_bus_param(struct soc_camera_device *icd,
-                                 unsigned long flags)
-{
-        return -EINVAL;
-}
-static struct soc_camera_ops imx074_ops = {
-        .query_bus_param        = imx074_query_bus_param,
-        .set_bus_param          = imx074_set_bus_param,
-};
-static int imx074_video_probe(struct soc_camera_device *icd,
-                              struct i2c_client *client)
 {
        int ret;
        u16 id;
@@ -417,17 +409,10 @@ static int imx074_probe(struct i2c_client *client,
                        const struct i2c_device_id *did)
 {
        struct imx074 *priv;
-        struct soc_camera_device *icd = client->dev.platform_data;
        struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
-        struct soc_camera_link *icl;
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
        int ret;
-        if (!icd) {
-                dev_err(&client->dev, "IMX074: missing soc-camera data!\n");
-                return -EINVAL;
-        }
-        icl = to_soc_camera_link(icd);
        if (!icl) {
                dev_err(&client->dev, "IMX074: missing platform data!\n");
                return -EINVAL;
@@ -445,12 +430,10 @@ static int imx074_probe(struct i2c_client *client,
        v4l2_i2c_subdev_init(&priv->subdev, client, &imx074_subdev_ops);
-        icd->ops        = &imx074_ops;
        priv->fmt       = &imx074_colour_fmts[0];
-        ret = imx074_video_probe(icd, client);
+        ret = imx074_video_probe(client);
        if (ret < 0) {
-                icd->ops = NULL;
                kfree(priv);
                return ret;
        }
@@ -461,10 +444,8 @@ static int imx074_probe(struct i2c_client *client,
 static int imx074_remove(struct i2c_client *client)
 {
        struct imx074 *priv = to_imx074(client);
-        struct soc_camera_device *icd = client->dev.platform_data;
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        icd->ops = NULL;
        if (icl->free_bus)
                icl->free_bus(icl);
        kfree(priv);
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 0fb75524484d..41108a9a195e 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -1180,6 +1180,8 @@ static int __devinit ivtv_probe(struct pci_dev *pdev,
                setup.addr = ADDR_UNSET;
                setup.type = itv->options.tuner;
                setup.mode_mask = T_ANALOG_TV;  /* matches TV tuners */
+                if (itv->options.radio > 0)
+                        setup.mode_mask |= T_RADIO;
                setup.tuner_callback = (setup.type == TUNER_XC2028) ?
                        ivtv_reset_tuner_gpio : NULL;
                ivtv_call_all(itv, tuner, s_type_addr, &setup);
diff --git a/drivers/media/video/m5mols/m5mols_core.c b/drivers/media/video/m5mols/m5mols_core.c
index 5d21d056d6a3..05ab3700647e 100644
--- a/drivers/media/video/m5mols/m5mols_core.c
+++ b/drivers/media/video/m5mols/m5mols_core.c
@@ -21,6 +21,7 @@
 #include <linux/gpio.h>
 #include <linux/regulator/consumer.h>
 #include <linux/videodev2.h>
+#include <linux/module.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-subdev.h>
diff --git a/drivers/media/video/marvell-ccic/mcam-core.c b/drivers/media/video/marvell-ccic/mcam-core.c
index 1141b976dff4..80ec64d2d6d8 100644
--- a/drivers/media/video/marvell-ccic/mcam-core.c
+++ b/drivers/media/video/marvell-ccic/mcam-core.c
@@ -883,7 +883,8 @@ static int mcam_read_setup(struct mcam_camera *cam)
 * Videobuf2 interface code.
 */
-static int mcam_vb_queue_setup(struct vb2_queue *vq, unsigned int *nbufs,
+static int mcam_vb_queue_setup(struct vb2_queue *vq,
+                const struct v4l2_format *fmt, unsigned int *nbufs,
                unsigned int *num_planes, unsigned int sizes[],
                void *alloc_ctxs[])
 {
diff --git a/drivers/media/video/mem2mem_testdev.c b/drivers/media/video/mem2mem_testdev.c
index 9594b52f8605..12897e8a3314 100644
--- a/drivers/media/video/mem2mem_testdev.c
+++ b/drivers/media/video/mem2mem_testdev.c
@@ -738,9 +738,10 @@ static const struct v4l2_ioctl_ops m2mtest_ioctl_ops = {
 * Queue operations
 */
-static int m2mtest_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
+static int m2mtest_queue_setup(struct vb2_queue *vq,
-                                unsigned int *nplanes, unsigned int sizes[],
+                                const struct v4l2_format *fmt,
-                                void *alloc_ctxs[])
+                                unsigned int *nbuffers, unsigned int *nplanes,
+                                unsigned int sizes[], void *alloc_ctxs[])
 {
        struct m2mtest_ctx *ctx = vb2_get_drv_priv(vq);
        struct m2mtest_q_data *q_data;
diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c
index 4da9cca939c1..e2b1029b16cd 100644
--- a/drivers/media/video/mt9m001.c
+++ b/drivers/media/video/mt9m001.c
@@ -12,10 +12,13 @@
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/log2.h>
+#include <linux/module.h>
+#include <media/soc_camera.h>
+#include <media/soc_mediabus.h>
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/soc_camera.h>
+#include <media/v4l2-ctrls.h>
 /*
 * mt9m001 i2c address 0x5d
@@ -84,15 +87,19 @@ static const struct mt9m001_datafmt mt9m001_monochrome_fmts[] = {
 struct mt9m001 {
        struct v4l2_subdev subdev;
+        struct v4l2_ctrl_handler hdl;
+        struct {
+                /* exposure/auto-exposure cluster */
+                struct v4l2_ctrl *autoexposure;
+                struct v4l2_ctrl *exposure;
+        };
        struct v4l2_rect rect;  /* Sensor window */
        const struct mt9m001_datafmt *fmt;
        const struct mt9m001_datafmt *fmts;
        int num_fmts;
        int model;      /* V4L2_IDENT_MT9M001* codes from v4l2-chip-ident.h */
-        unsigned int gain;
+        unsigned int total_h;
-        unsigned int exposure;
        unsigned short y_skip_top;      /* Lines to skip at the top */
-        unsigned char autoexposure;
 };
 static struct mt9m001 *to_mt9m001(const struct i2c_client *client)
@@ -165,54 +172,13 @@ static int mt9m001_s_stream(struct v4l2_subdev *sd, int enable)
        return 0;
 }
-static int mt9m001_set_bus_param(struct soc_camera_device *icd,
-                                 unsigned long flags)
-{
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        unsigned long width_flag = flags & SOCAM_DATAWIDTH_MASK;
-        /* Only one width bit may be set */
-        if (!is_power_of_2(width_flag))
-                return -EINVAL;
-        if (icl->set_bus_param)
-                return icl->set_bus_param(icl, width_flag);
-        /*
-         * Without board specific bus width settings we only support the
-         * sensors native bus width
-         */
-        if (width_flag == SOCAM_DATAWIDTH_10)
-                return 0;
-        return -EINVAL;
-}
-static unsigned long mt9m001_query_bus_param(struct soc_camera_device *icd)
-{
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        /* MT9M001 has all capture_format parameters fixed */
-        unsigned long flags = SOCAM_PCLK_SAMPLE_FALLING |
-                SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH |
-                SOCAM_DATA_ACTIVE_HIGH | SOCAM_MASTER;
-        if (icl->query_bus_param)
-                flags |= icl->query_bus_param(icl) & SOCAM_DATAWIDTH_MASK;
-        else
-                flags |= SOCAM_DATAWIDTH_10;
-        return soc_camera_apply_sensor_flags(icl, flags);
-}
 static int mt9m001_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
 {
        struct i2c_client *client = v4l2_get_subdevdata(sd);
        struct mt9m001 *mt9m001 = to_mt9m001(client);
        struct v4l2_rect rect = a->c;
-        struct soc_camera_device *icd = client->dev.platform_data;
        int ret;
        const u16 hblank = 9, vblank = 25;
-        unsigned int total_h;
        if (mt9m001->fmts == mt9m001_colour_fmts)
                /*
@@ -231,7 +197,7 @@ static int mt9m001_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
        soc_camera_limit_side(&rect.top, &rect.height,
                     MT9M001_ROW_SKIP, MT9M001_MIN_HEIGHT, MT9M001_MAX_HEIGHT);
-        total_h = rect.height + mt9m001->y_skip_top + vblank;
+        mt9m001->total_h = rect.height + mt9m001->y_skip_top + vblank;
        /* Blanking and start values - default... */
        ret = reg_write(client, MT9M001_HORIZONTAL_BLANKING, hblank);
@@ -240,7 +206,7 @@ static int mt9m001_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
        /*
         * The caller provides a supported format, as verified per
-         * call to icd->try_fmt()
+         * call to .try_mbus_fmt()
         */
        if (!ret)
                ret = reg_write(client, MT9M001_COLUMN_START, rect.left);
@@ -251,17 +217,8 @@ static int mt9m001_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
        if (!ret)
                ret = reg_write(client, MT9M001_WINDOW_HEIGHT,
                                rect.height + mt9m001->y_skip_top - 1);
-        if (!ret && mt9m001->autoexposure) {
+        if (!ret && v4l2_ctrl_g_ctrl(mt9m001->autoexposure) == V4L2_EXPOSURE_AUTO)
-                ret = reg_write(client, MT9M001_SHUTTER_WIDTH, total_h);
+                ret = reg_write(client, MT9M001_SHUTTER_WIDTH, mt9m001->total_h);
-                if (!ret) {
-                        const struct v4l2_queryctrl *qctrl =
-                                soc_camera_find_qctrl(icd->ops,
-                                                      V4L2_CID_EXPOSURE);
-                        mt9m001->exposure = (524 + (total_h - 1) *
-                                 (qctrl->maximum - qctrl->minimum)) /
-                                1048 + qctrl->minimum;
-                }
-        }
        if (!ret)
                mt9m001->rect = rect;
@@ -421,107 +378,48 @@ static int mt9m001_s_register(struct v4l2_subdev *sd,
 }
 #endif
-static const struct v4l2_queryctrl mt9m001_controls[] = {
+static int mt9m001_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
-        {
-                .id             = V4L2_CID_VFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Flip Vertically",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        }, {
-                .id             = V4L2_CID_GAIN,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "Gain",
-                .minimum        = 0,
-                .maximum        = 127,
-                .step           = 1,
-                .default_value  = 64,
-                .flags          = V4L2_CTRL_FLAG_SLIDER,
-        }, {
-                .id             = V4L2_CID_EXPOSURE,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "Exposure",
-                .minimum        = 1,
-                .maximum        = 255,
-                .step           = 1,
-                .default_value  = 255,
-                .flags          = V4L2_CTRL_FLAG_SLIDER,
-        }, {
-                .id             = V4L2_CID_EXPOSURE_AUTO,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Automatic Exposure",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 1,
-        }
-};
-static struct soc_camera_ops mt9m001_ops = {
-        .set_bus_param          = mt9m001_set_bus_param,
-        .query_bus_param        = mt9m001_query_bus_param,
-        .controls               = mt9m001_controls,
-        .num_controls           = ARRAY_SIZE(mt9m001_controls),
-};
-static int mt9m001_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
-        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct mt9m001 *mt9m001 = container_of(ctrl->handler,
-        struct mt9m001 *mt9m001 = to_mt9m001(client);
+                                               struct mt9m001, hdl);
-        int data;
+        s32 min, max;
        switch (ctrl->id) {
-        case V4L2_CID_VFLIP:
-                data = reg_read(client, MT9M001_READ_OPTIONS2);
-                if (data < 0)
-                        return -EIO;
-                ctrl->value = !!(data & 0x8000);
-                break;
        case V4L2_CID_EXPOSURE_AUTO:
-                ctrl->value = mt9m001->autoexposure;
+                min = mt9m001->exposure->minimum;
-                break;
+                max = mt9m001->exposure->maximum;
-        case V4L2_CID_GAIN:
+                mt9m001->exposure->val =
-                ctrl->value = mt9m001->gain;
+                        (524 + (mt9m001->total_h - 1) * (max - min)) / 1048 + min;
-                break;
-        case V4L2_CID_EXPOSURE:
-                ctrl->value = mt9m001->exposure;
                break;
        }
        return 0;
 }
-static int mt9m001_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
+static int mt9m001_s_ctrl(struct v4l2_ctrl *ctrl)
 {
+        struct mt9m001 *mt9m001 = container_of(ctrl->handler,
+                                               struct mt9m001, hdl);
+        struct v4l2_subdev *sd = &mt9m001->subdev;
        struct i2c_client *client = v4l2_get_subdevdata(sd);
-        struct mt9m001 *mt9m001 = to_mt9m001(client);
+        struct v4l2_ctrl *exp = mt9m001->exposure;
-        struct soc_camera_device *icd = client->dev.platform_data;
-        const struct v4l2_queryctrl *qctrl;
        int data;
-        qctrl = soc_camera_find_qctrl(&mt9m001_ops, ctrl->id);
-        if (!qctrl)
-                return -EINVAL;
        switch (ctrl->id) {
        case V4L2_CID_VFLIP:
-                if (ctrl->value)
+                if (ctrl->val)
                        data = reg_set(client, MT9M001_READ_OPTIONS2, 0x8000);
                else
                        data = reg_clear(client, MT9M001_READ_OPTIONS2, 0x8000);
                if (data < 0)
                        return -EIO;
-                break;
+                return 0;
        case V4L2_CID_GAIN:
-                if (ctrl->value > qctrl->maximum || ctrl->value < qctrl->minimum)
-                        return -EINVAL;
                /* See Datasheet Table 7, Gain settings. */
-                if (ctrl->value <= qctrl->default_value) {
+                if (ctrl->val <= ctrl->default_value) {
                        /* Pack it into 0..1 step 0.125, register values 0..8 */
-                        unsigned long range = qctrl->default_value - qctrl->minimum;
+                        unsigned long range = ctrl->default_value - ctrl->minimum;
-                        data = ((ctrl->value - qctrl->minimum) * 8 + range / 2) / range;
+                        data = ((ctrl->val - ctrl->minimum) * 8 + range / 2) / range;
                        dev_dbg(&client->dev, "Setting gain %d\n", data);
                        data = reg_write(client, MT9M001_GLOBAL_GAIN, data);
@@ -530,8 +428,8 @@ static int mt9m001_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
                } else {
                        /* Pack it into 1.125..15 variable step, register values 9..67 */
                        /* We assume qctrl->maximum - qctrl->default_value - 1 > 0 */
-                        unsigned long range = qctrl->maximum - qctrl->default_value - 1;
+                        unsigned long range = ctrl->maximum - ctrl->default_value - 1;
-                        unsigned long gain = ((ctrl->value - qctrl->default_value - 1) *
+                        unsigned long gain = ((ctrl->val - ctrl->default_value - 1) *
                                               111 + range / 2) / range + 9;
                        if (gain <= 32)
@@ -547,66 +445,44 @@ static int mt9m001_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
                        if (data < 0)
                                return -EIO;
                }
+                return 0;
-                /* Success */
+        case V4L2_CID_EXPOSURE_AUTO:
-                mt9m001->gain = ctrl->value;
+                if (ctrl->val == V4L2_EXPOSURE_MANUAL) {
-                break;
+                        unsigned long range = exp->maximum - exp->minimum;
-        case V4L2_CID_EXPOSURE:
+                        unsigned long shutter = ((exp->val - exp->minimum) * 1048 +
-                /* mt9m001 has maximum == default */
-                if (ctrl->value > qctrl->maximum || ctrl->value < qctrl->minimum)
-                        return -EINVAL;
-                else {
-                        unsigned long range = qctrl->maximum - qctrl->minimum;
-                        unsigned long shutter = ((ctrl->value - qctrl->minimum) * 1048 +
                                                 range / 2) / range + 1;
                        dev_dbg(&client->dev,
                                "Setting shutter width from %d to %lu\n",
-                                reg_read(client, MT9M001_SHUTTER_WIDTH),
+                                reg_read(client, MT9M001_SHUTTER_WIDTH), shutter);
-                                shutter);
                        if (reg_write(client, MT9M001_SHUTTER_WIDTH, shutter) < 0)
                                return -EIO;
-                        mt9m001->exposure = ctrl->value;
+                } else {
-                        mt9m001->autoexposure = 0;
-                }
-                break;
-        case V4L2_CID_EXPOSURE_AUTO:
-                if (ctrl->value) {
                        const u16 vblank = 25;
-                        unsigned int total_h = mt9m001->rect.height +
+                        mt9m001->total_h = mt9m001->rect.height +
                                mt9m001->y_skip_top + vblank;
-                        if (reg_write(client, MT9M001_SHUTTER_WIDTH,
+                        if (reg_write(client, MT9M001_SHUTTER_WIDTH, mt9m001->total_h) < 0)
-                                      total_h) < 0)
                                return -EIO;
-                        qctrl = soc_camera_find_qctrl(icd->ops, V4L2_CID_EXPOSURE);
+                }
-                        mt9m001->exposure = (524 + (total_h - 1) *
+                return 0;
-                                 (qctrl->maximum - qctrl->minimum)) /
-                                1048 + qctrl->minimum;
-                        mt9m001->autoexposure = 1;
-                } else
-                        mt9m001->autoexposure = 0;
-                break;
        }
-        return 0;
+        return -EINVAL;
 }
 /*
 * Interface active, can use i2c. If it fails, it can indeed mean, that
 * this wasn't our capture interface, so, we wait for the right one
 */
-static int mt9m001_video_probe(struct soc_camera_device *icd,
+static int mt9m001_video_probe(struct soc_camera_link *icl,
                               struct i2c_client *client)
 {
        struct mt9m001 *mt9m001 = to_mt9m001(client);
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
        s32 data;
        unsigned long flags;
        int ret;
-        /* We must have a parent by now. And it cannot be a wrong one. */
-        BUG_ON(!icd->parent ||
-               to_soc_camera_host(icd->parent)->nr != icd->iface);
        /* Enable the chip */
        data = reg_write(client, MT9M001_CHIP_ENABLE, 1);
        dev_dbg(&client->dev, "write: %d\n", data);
@@ -661,18 +537,11 @@ static int mt9m001_video_probe(struct soc_camera_device *icd,
                dev_err(&client->dev, "Failed to initialise the camera\n");
        /* mt9m001_init() has reset the chip, returning registers to defaults */
-        mt9m001->gain = 64;
+        return v4l2_ctrl_handler_setup(&mt9m001->hdl);
-        mt9m001->exposure = 255;
-        return ret;
 }
-static void mt9m001_video_remove(struct soc_camera_device *icd)
+static void mt9m001_video_remove(struct soc_camera_link *icl)
 {
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        dev_dbg(icd->pdev, "Video removed: %p, %p\n",
-                icd->parent, icd->vdev);
        if (icl->free_bus)
                icl->free_bus(icl);
 }
@@ -687,9 +556,12 @@ static int mt9m001_g_skip_top_lines(struct v4l2_subdev *sd, u32 *lines)
        return 0;
 }
+static const struct v4l2_ctrl_ops mt9m001_ctrl_ops = {
+        .g_volatile_ctrl = mt9m001_g_volatile_ctrl,
+        .s_ctrl = mt9m001_s_ctrl,
+};
 static struct v4l2_subdev_core_ops mt9m001_subdev_core_ops = {
-        .g_ctrl         = mt9m001_g_ctrl,
-        .s_ctrl         = mt9m001_s_ctrl,
        .g_chip_ident   = mt9m001_g_chip_ident,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
        .g_register     = mt9m001_g_register,
@@ -710,6 +582,40 @@ static int mt9m001_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
        return 0;
 }
+static int mt9m001_g_mbus_config(struct v4l2_subdev *sd,
+                                struct v4l2_mbus_config *cfg)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        /* MT9M001 has all capture_format parameters fixed */
+        cfg->flags = V4L2_MBUS_PCLK_SAMPLE_FALLING |
+                V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_HIGH |
+                V4L2_MBUS_DATA_ACTIVE_HIGH | V4L2_MBUS_MASTER;
+        cfg->type = V4L2_MBUS_PARALLEL;
+        cfg->flags = soc_camera_apply_board_flags(icl, cfg);
+        return 0;
+}
+static int mt9m001_s_mbus_config(struct v4l2_subdev *sd,
+                                const struct v4l2_mbus_config *cfg)
+{
+        const struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        struct mt9m001 *mt9m001 = to_mt9m001(client);
+        unsigned int bps = soc_mbus_get_fmtdesc(mt9m001->fmt->code)->bits_per_sample;
+        if (icl->set_bus_param)
+                return icl->set_bus_param(icl, 1 << (bps - 1));
+        /*
+         * Without board specific bus width settings we only support the
+         * sensors native bus width
+         */
+        return bps == 10 ? 0 : -EINVAL;
+}
 static struct v4l2_subdev_video_ops mt9m001_subdev_video_ops = {
        .s_stream       = mt9m001_s_stream,
        .s_mbus_fmt     = mt9m001_s_fmt,
@@ -719,6 +625,8 @@ static struct v4l2_subdev_video_ops mt9m001_subdev_video_ops = {
        .g_crop         = mt9m001_g_crop,
        .cropcap        = mt9m001_cropcap,
        .enum_mbus_fmt  = mt9m001_enum_fmt,
+        .g_mbus_config  = mt9m001_g_mbus_config,
+        .s_mbus_config  = mt9m001_s_mbus_config,
 };
 static struct v4l2_subdev_sensor_ops mt9m001_subdev_sensor_ops = {
@@ -735,17 +643,10 @@ static int mt9m001_probe(struct i2c_client *client,
                         const struct i2c_device_id *did)
 {
        struct mt9m001 *mt9m001;
-        struct soc_camera_device *icd = client->dev.platform_data;
        struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
-        struct soc_camera_link *icl;
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
        int ret;
-        if (!icd) {
-                dev_err(&client->dev, "MT9M001: missing soc-camera data!\n");
-                return -EINVAL;
-        }
-        icl = to_soc_camera_link(icd);
        if (!icl) {
                dev_err(&client->dev, "MT9M001 driver needs platform data\n");
                return -EINVAL;
@@ -762,25 +663,40 @@ static int mt9m001_probe(struct i2c_client *client,
                return -ENOMEM;
        v4l2_i2c_subdev_init(&mt9m001->subdev, client, &mt9m001_subdev_ops);
+        v4l2_ctrl_handler_init(&mt9m001->hdl, 4);
+        v4l2_ctrl_new_std(&mt9m001->hdl, &mt9m001_ctrl_ops,
+                        V4L2_CID_VFLIP, 0, 1, 1, 0);
+        v4l2_ctrl_new_std(&mt9m001->hdl, &mt9m001_ctrl_ops,
+                        V4L2_CID_GAIN, 0, 127, 1, 64);
+        mt9m001->exposure = v4l2_ctrl_new_std(&mt9m001->hdl, &mt9m001_ctrl_ops,
+                        V4L2_CID_EXPOSURE, 1, 255, 1, 255);
+        /*
+         * Simulated autoexposure. If enabled, we calculate shutter width
+         * ourselves in the driver based on vertical blanking and frame width
+         */
+        mt9m001->autoexposure = v4l2_ctrl_new_std_menu(&mt9m001->hdl,
+                        &mt9m001_ctrl_ops, V4L2_CID_EXPOSURE_AUTO, 1, 0,
+                        V4L2_EXPOSURE_AUTO);
+        mt9m001->subdev.ctrl_handler = &mt9m001->hdl;
+        if (mt9m001->hdl.error) {
+                int err = mt9m001->hdl.error;
-        /* Second stage probe - when a capture adapter is there */
+                kfree(mt9m001);
-        icd->ops                = &mt9m001_ops;
+                return err;
+        }
+        v4l2_ctrl_auto_cluster(2, &mt9m001->autoexposure,
+                                        V4L2_EXPOSURE_MANUAL, true);
+        /* Second stage probe - when a capture adapter is there */
        mt9m001->y_skip_top     = 0;
        mt9m001->rect.left      = MT9M001_COLUMN_SKIP;
        mt9m001->rect.top       = MT9M001_ROW_SKIP;
        mt9m001->rect.width     = MT9M001_MAX_WIDTH;
        mt9m001->rect.height    = MT9M001_MAX_HEIGHT;
-        /*
+        ret = mt9m001_video_probe(icl, client);
-         * Simulated autoexposure. If enabled, we calculate shutter width
-         * ourselves in the driver based on vertical blanking and frame width
-         */
-        mt9m001->autoexposure = 1;
-        ret = mt9m001_video_probe(icd, client);
        if (ret) {
-                icd->ops = NULL;
+                v4l2_ctrl_handler_free(&mt9m001->hdl);
                kfree(mt9m001);
        }
@@ -790,10 +706,11 @@ static int mt9m001_probe(struct i2c_client *client,
 static int mt9m001_remove(struct i2c_client *client)
 {
        struct mt9m001 *mt9m001 = to_mt9m001(client);
-        struct soc_camera_device *icd = client->dev.platform_data;
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
-        icd->ops = NULL;
+        v4l2_device_unregister_subdev(&mt9m001->subdev);
-        mt9m001_video_remove(icd);
+        v4l2_ctrl_handler_free(&mt9m001->hdl);
+        mt9m001_video_remove(icl);
        kfree(mt9m001);
        return 0;
diff --git a/drivers/media/video/mt9m111.c b/drivers/media/video/mt9m111.c
index 07af26e6bebd..cf2c0fb95f2f 100644
--- a/drivers/media/video/mt9m111.c
+++ b/drivers/media/video/mt9m111.c
@@ -13,10 +13,13 @@
 #include <linux/log2.h>
 #include <linux/gpio.h>
 #include <linux/delay.h>
+#include <linux/v4l2-mediabus.h>
+#include <linux/module.h>
+#include <media/soc_camera.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ctrls.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/soc_camera.h>
 /*
 * MT9M111, MT9M112 and MT9M131:
@@ -177,6 +180,8 @@ enum mt9m111_context {
 struct mt9m111 {
        struct v4l2_subdev subdev;
+        struct v4l2_ctrl_handler hdl;
+        struct v4l2_ctrl *gain;
        int model;      /* V4L2_IDENT_MT9M111 or V4L2_IDENT_MT9M112 code
                         * from v4l2-chip-ident.h */
        enum mt9m111_context context;
@@ -185,13 +190,8 @@ struct mt9m111 {
        int power_count;
        const struct mt9m111_datafmt *fmt;
        int lastpage;   /* PageMap cache value */
-        unsigned int gain;
-        unsigned char autoexposure;
        unsigned char datawidth;
        unsigned int powered:1;
-        unsigned int hflip:1;
-        unsigned int vflip:1;
-        unsigned int autowhitebalance:1;
 };
 static struct mt9m111 *to_mt9m111(const struct i2c_client *client)
@@ -363,21 +363,6 @@ static int mt9m111_reset(struct mt9m111 *mt9m111)
        return ret;
 }
-static unsigned long mt9m111_query_bus_param(struct soc_camera_device *icd)
-{
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        unsigned long flags = SOCAM_MASTER | SOCAM_PCLK_SAMPLE_RISING |
-                SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH |
-                SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATAWIDTH_8;
-        return soc_camera_apply_sensor_flags(icl, flags);
-}
-static int mt9m111_set_bus_param(struct soc_camera_device *icd, unsigned long f)
-{
-        return 0;
-}
 static int mt9m111_make_rect(struct mt9m111 *mt9m111,
                             struct v4l2_rect *rect)
 {
@@ -660,50 +645,6 @@ static int mt9m111_s_register(struct v4l2_subdev *sd,
 }
 #endif
-static const struct v4l2_queryctrl mt9m111_controls[] = {
-        {
-                .id             = V4L2_CID_VFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Flip Verticaly",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        }, {
-                .id             = V4L2_CID_HFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Flip Horizontaly",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        }, {    /* gain = 1/32*val (=>gain=1 if val==32) */
-                .id             = V4L2_CID_GAIN,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "Gain",
-                .minimum        = 0,
-                .maximum        = 63 * 2 * 2,
-                .step           = 1,
-                .default_value  = 32,
-                .flags          = V4L2_CTRL_FLAG_SLIDER,
-        }, {
-                .id             = V4L2_CID_EXPOSURE_AUTO,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Auto Exposure",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 1,
-        }
-};
-static struct soc_camera_ops mt9m111_ops = {
-        .query_bus_param        = mt9m111_query_bus_param,
-        .set_bus_param          = mt9m111_set_bus_param,
-        .controls               = mt9m111_controls,
-        .num_controls           = ARRAY_SIZE(mt9m111_controls),
-};
 static int mt9m111_set_flip(struct mt9m111 *mt9m111, int flip, int mask)
 {
        struct i2c_client *client = v4l2_get_subdevdata(&mt9m111->subdev);
@@ -744,7 +685,6 @@ static int mt9m111_set_global_gain(struct mt9m111 *mt9m111, int gain)
        if (gain > 63 * 2 * 2)
                return -EINVAL;
-        mt9m111->gain = gain;
        if ((gain >= 64 * 2) && (gain < 63 * 2 * 2))
                val = (1 << 10) | (1 << 9) | (gain / 4);
        else if ((gain >= 64) && (gain < 64 * 2))
@@ -758,118 +698,47 @@ static int mt9m111_set_global_gain(struct mt9m111 *mt9m111, int gain)
 static int mt9m111_set_autoexposure(struct mt9m111 *mt9m111, int on)
 {
        struct i2c_client *client = v4l2_get_subdevdata(&mt9m111->subdev);
-        int ret;
        if (on)
-                ret = reg_set(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOEXPO_EN);
+                return reg_set(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOEXPO_EN);
-        else
+        return reg_clear(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOEXPO_EN);
-                ret = reg_clear(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOEXPO_EN);
-        if (!ret)
-                mt9m111->autoexposure = on;
-        return ret;
 }
 static int mt9m111_set_autowhitebalance(struct mt9m111 *mt9m111, int on)
 {
        struct i2c_client *client = v4l2_get_subdevdata(&mt9m111->subdev);
-        int ret;
        if (on)
-                ret = reg_set(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOWHITEBAL_EN);
+                return reg_set(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOWHITEBAL_EN);
-        else
+        return reg_clear(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOWHITEBAL_EN);
-                ret = reg_clear(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOWHITEBAL_EN);
-        if (!ret)
-                mt9m111->autowhitebalance = on;
-        return ret;
-}
-static int mt9m111_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
-{
-        struct i2c_client *client = v4l2_get_subdevdata(sd);
-        struct mt9m111 *mt9m111 = container_of(sd, struct mt9m111, subdev);
-        int data;
-        switch (ctrl->id) {
-        case V4L2_CID_VFLIP:
-                if (mt9m111->context == HIGHPOWER)
-                        data = reg_read(READ_MODE_B);
-                else
-                        data = reg_read(READ_MODE_A);
-                if (data < 0)
-                        return -EIO;
-                ctrl->value = !!(data & MT9M111_RMB_MIRROR_ROWS);
-                break;
-        case V4L2_CID_HFLIP:
-                if (mt9m111->context == HIGHPOWER)
-                        data = reg_read(READ_MODE_B);
-                else
-                        data = reg_read(READ_MODE_A);
-                if (data < 0)
-                        return -EIO;
-                ctrl->value = !!(data & MT9M111_RMB_MIRROR_COLS);
-                break;
-        case V4L2_CID_GAIN:
-                data = mt9m111_get_global_gain(mt9m111);
-                if (data < 0)
-                        return data;
-                ctrl->value = data;
-                break;
-        case V4L2_CID_EXPOSURE_AUTO:
-                ctrl->value = mt9m111->autoexposure;
-                break;
-        case V4L2_CID_AUTO_WHITE_BALANCE:
-                ctrl->value = mt9m111->autowhitebalance;
-                break;
-        }
-        return 0;
 }
-static int mt9m111_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
+static int mt9m111_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct mt9m111 *mt9m111 = container_of(sd, struct mt9m111, subdev);
+        struct mt9m111 *mt9m111 = container_of(ctrl->handler,
-        const struct v4l2_queryctrl *qctrl;
+                                               struct mt9m111, hdl);
-        int ret;
-        qctrl = soc_camera_find_qctrl(&mt9m111_ops, ctrl->id);
-        if (!qctrl)
-                return -EINVAL;
        switch (ctrl->id) {
        case V4L2_CID_VFLIP:
-                mt9m111->vflip = ctrl->value;
+                return mt9m111_set_flip(mt9m111, ctrl->val,
-                ret = mt9m111_set_flip(mt9m111, ctrl->value,
                                        MT9M111_RMB_MIRROR_ROWS);
-                break;
        case V4L2_CID_HFLIP:
-                mt9m111->hflip = ctrl->value;
+                return mt9m111_set_flip(mt9m111, ctrl->val,
-                ret = mt9m111_set_flip(mt9m111, ctrl->value,
                                        MT9M111_RMB_MIRROR_COLS);
-                break;
        case V4L2_CID_GAIN:
-                ret = mt9m111_set_global_gain(mt9m111, ctrl->value);
+                return mt9m111_set_global_gain(mt9m111, ctrl->val);
-                break;
        case V4L2_CID_EXPOSURE_AUTO:
-                ret =  mt9m111_set_autoexposure(mt9m111, ctrl->value);
+                return mt9m111_set_autoexposure(mt9m111, ctrl->val);
-                break;
        case V4L2_CID_AUTO_WHITE_BALANCE:
-                ret =  mt9m111_set_autowhitebalance(mt9m111, ctrl->value);
+                return mt9m111_set_autowhitebalance(mt9m111, ctrl->val);
-                break;
-        default:
-                ret = -EINVAL;
        }
-        return ret;
+        return -EINVAL;
 }
 static int mt9m111_suspend(struct mt9m111 *mt9m111)
 {
-        mt9m111->gain = mt9m111_get_global_gain(mt9m111);
+        v4l2_ctrl_s_ctrl(mt9m111->gain, mt9m111_get_global_gain(mt9m111));
        return 0;
 }
@@ -879,11 +748,7 @@ static void mt9m111_restore_state(struct mt9m111 *mt9m111)
        mt9m111_set_context(mt9m111, mt9m111->context);
        mt9m111_set_pixfmt(mt9m111, mt9m111->fmt->code);
        mt9m111_setup_rect(mt9m111, &mt9m111->rect);
-        mt9m111_set_flip(mt9m111, mt9m111->hflip, MT9M111_RMB_MIRROR_COLS);
+        v4l2_ctrl_handler_setup(&mt9m111->hdl);
-        mt9m111_set_flip(mt9m111, mt9m111->vflip, MT9M111_RMB_MIRROR_ROWS);
-        mt9m111_set_global_gain(mt9m111, mt9m111->gain);
-        mt9m111_set_autoexposure(mt9m111, mt9m111->autoexposure);
-        mt9m111_set_autowhitebalance(mt9m111, mt9m111->autowhitebalance);
 }
 static int mt9m111_resume(struct mt9m111 *mt9m111)
@@ -911,8 +776,6 @@ static int mt9m111_init(struct mt9m111 *mt9m111)
                ret = mt9m111_reset(mt9m111);
        if (!ret)
                ret = mt9m111_set_context(mt9m111, mt9m111->context);
-        if (!ret)
-                ret = mt9m111_set_autoexposure(mt9m111, mt9m111->autoexposure);
        if (ret)
                dev_err(&client->dev, "mt9m111 init failed: %d\n", ret);
        return ret;
@@ -922,22 +785,12 @@ static int mt9m111_init(struct mt9m111 *mt9m111)
 * Interface active, can use i2c. If it fails, it can indeed mean, that
 * this wasn't our capture interface, so, we wait for the right one
 */
-static int mt9m111_video_probe(struct soc_camera_device *icd,
+static int mt9m111_video_probe(struct i2c_client *client)
-                               struct i2c_client *client)
 {
        struct mt9m111 *mt9m111 = to_mt9m111(client);
        s32 data;
        int ret;
-        /* We must have a parent by now. And it cannot be a wrong one. */
-        BUG_ON(!icd->parent ||
-               to_soc_camera_host(icd->parent)->nr != icd->iface);
-        mt9m111->lastpage = -1;
-        mt9m111->autoexposure = 1;
-        mt9m111->autowhitebalance = 1;
        data = reg_read(CHIP_VERSION);
        switch (data) {
@@ -951,17 +804,16 @@ static int mt9m111_video_probe(struct soc_camera_device *icd,
                dev_info(&client->dev, "Detected a MT9M112 chip ID %x\n", data);
                break;
        default:
-                ret = -ENODEV;
                dev_err(&client->dev,
                        "No MT9M111/MT9M112/MT9M131 chip detected register read %x\n",
                        data);
-                goto ei2c;
+                return -ENODEV;
        }
        ret = mt9m111_init(mt9m111);
+        if (ret)
-ei2c:
+                return ret;
-        return ret;
+        return v4l2_ctrl_handler_setup(&mt9m111->hdl);
 }
 static int mt9m111_s_power(struct v4l2_subdev *sd, int on)
@@ -998,9 +850,11 @@ out:
        return ret;
 }
+static const struct v4l2_ctrl_ops mt9m111_ctrl_ops = {
+        .s_ctrl = mt9m111_s_ctrl,
+};
 static struct v4l2_subdev_core_ops mt9m111_subdev_core_ops = {
-        .g_ctrl         = mt9m111_g_ctrl,
-        .s_ctrl         = mt9m111_s_ctrl,
        .g_chip_ident   = mt9m111_g_chip_ident,
        .s_power        = mt9m111_s_power,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
@@ -1019,6 +873,21 @@ static int mt9m111_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
        return 0;
 }
+static int mt9m111_g_mbus_config(struct v4l2_subdev *sd,
+                                struct v4l2_mbus_config *cfg)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        cfg->flags = V4L2_MBUS_MASTER | V4L2_MBUS_PCLK_SAMPLE_RISING |
+                V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_HIGH |
+                V4L2_MBUS_DATA_ACTIVE_HIGH;
+        cfg->type = V4L2_MBUS_PARALLEL;
+        cfg->flags = soc_camera_apply_board_flags(icl, cfg);
+        return 0;
+}
 static struct v4l2_subdev_video_ops mt9m111_subdev_video_ops = {
        .s_mbus_fmt     = mt9m111_s_fmt,
        .g_mbus_fmt     = mt9m111_g_fmt,
@@ -1027,6 +896,7 @@ static struct v4l2_subdev_video_ops mt9m111_subdev_video_ops = {
        .g_crop         = mt9m111_g_crop,
        .cropcap        = mt9m111_cropcap,
        .enum_mbus_fmt  = mt9m111_enum_fmt,
+        .g_mbus_config  = mt9m111_g_mbus_config,
 };
 static struct v4l2_subdev_ops mt9m111_subdev_ops = {
@@ -1038,17 +908,10 @@ static int mt9m111_probe(struct i2c_client *client,
                         const struct i2c_device_id *did)
 {
        struct mt9m111 *mt9m111;
-        struct soc_camera_device *icd = client->dev.platform_data;
        struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
-        struct soc_camera_link *icl;
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
        int ret;
-        if (!icd) {
-                dev_err(&client->dev, "mt9m111: soc-camera data missing!\n");
-                return -EINVAL;
-        }
-        icl = to_soc_camera_link(icd);
        if (!icl) {
                dev_err(&client->dev, "mt9m111: driver needs platform data\n");
                return -EINVAL;
@@ -1065,19 +928,37 @@ static int mt9m111_probe(struct i2c_client *client,
                return -ENOMEM;
        v4l2_i2c_subdev_init(&mt9m111->subdev, client, &mt9m111_subdev_ops);
+        v4l2_ctrl_handler_init(&mt9m111->hdl, 5);
+        v4l2_ctrl_new_std(&mt9m111->hdl, &mt9m111_ctrl_ops,
+                        V4L2_CID_VFLIP, 0, 1, 1, 0);
+        v4l2_ctrl_new_std(&mt9m111->hdl, &mt9m111_ctrl_ops,
+                        V4L2_CID_HFLIP, 0, 1, 1, 0);
+        v4l2_ctrl_new_std(&mt9m111->hdl, &mt9m111_ctrl_ops,
+                        V4L2_CID_AUTO_WHITE_BALANCE, 0, 1, 1, 1);
+        mt9m111->gain = v4l2_ctrl_new_std(&mt9m111->hdl, &mt9m111_ctrl_ops,
+                        V4L2_CID_GAIN, 0, 63 * 2 * 2, 1, 32);
+        v4l2_ctrl_new_std_menu(&mt9m111->hdl,
+                        &mt9m111_ctrl_ops, V4L2_CID_EXPOSURE_AUTO, 1, 0,
+                        V4L2_EXPOSURE_AUTO);
+        mt9m111->subdev.ctrl_handler = &mt9m111->hdl;
+        if (mt9m111->hdl.error) {
+                int err = mt9m111->hdl.error;
-        /* Second stage probe - when a capture adapter is there */
+                kfree(mt9m111);
-        icd->ops                = &mt9m111_ops;
+                return err;
+        }
+        /* Second stage probe - when a capture adapter is there */
        mt9m111->rect.left      = MT9M111_MIN_DARK_COLS;
        mt9m111->rect.top       = MT9M111_MIN_DARK_ROWS;
        mt9m111->rect.width     = MT9M111_MAX_WIDTH;
        mt9m111->rect.height    = MT9M111_MAX_HEIGHT;
        mt9m111->fmt            = &mt9m111_colour_fmts[0];
+        mt9m111->lastpage       = -1;
-        ret = mt9m111_video_probe(icd, client);
+        ret = mt9m111_video_probe(client);
        if (ret) {
-                icd->ops = NULL;
+                v4l2_ctrl_handler_free(&mt9m111->hdl);
                kfree(mt9m111);
        }
@@ -1087,9 +968,9 @@ static int mt9m111_probe(struct i2c_client *client,
 static int mt9m111_remove(struct i2c_client *client)
 {
        struct mt9m111 *mt9m111 = to_mt9m111(client);
-        struct soc_camera_device *icd = client->dev.platform_data;
-        icd->ops = NULL;
+        v4l2_device_unregister_subdev(&mt9m111->subdev);
+        v4l2_ctrl_handler_free(&mt9m111->hdl);
        kfree(mt9m111);
        return 0;
diff --git a/drivers/media/video/mt9t031.c b/drivers/media/video/mt9t031.c
index 30547cc3f89b..0e78477452ff 100644
--- a/drivers/media/video/mt9t031.c
+++ b/drivers/media/video/mt9t031.c
@@ -13,11 +13,21 @@
 #include <linux/log2.h>
 #include <linux/pm.h>
 #include <linux/slab.h>
+#include <linux/v4l2-mediabus.h>
 #include <linux/videodev2.h>
+#include <linux/module.h>
 #include <media/soc_camera.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-subdev.h>
+#include <media/v4l2-ctrls.h>
+/*
+ * ATTENTION: this driver still cannot be used outside of the soc-camera
+ * framework because of its PM implementation, using the video_device node.
+ * If hardware becomes available for testing, alternative PM approaches shall
+ * be considered and tested.
+ */
 /*
 * mt9t031 i2c address 0x5d
@@ -57,21 +67,20 @@
 #define MT9T031_COLUMN_SKIP             32
 #define MT9T031_ROW_SKIP                20
-#define MT9T031_BUS_PARAM       (SOCAM_PCLK_SAMPLE_RISING |     \
-        SOCAM_PCLK_SAMPLE_FALLING | SOCAM_HSYNC_ACTIVE_HIGH |   \
-        SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_HIGH |      \
-        SOCAM_MASTER | SOCAM_DATAWIDTH_10)
 struct mt9t031 {
        struct v4l2_subdev subdev;
+        struct v4l2_ctrl_handler hdl;
+        struct {
+                /* exposure/auto-exposure cluster */
+                struct v4l2_ctrl *autoexposure;
+                struct v4l2_ctrl *exposure;
+        };
        struct v4l2_rect rect;  /* Sensor window */
        int model;      /* V4L2_IDENT_MT9T031* codes from v4l2-chip-ident.h */
        u16 xskip;
        u16 yskip;
-        unsigned int gain;
+        unsigned int total_h;
        unsigned short y_skip_top;      /* Lines to skip at the top */
-        unsigned int exposure;
-        unsigned char autoexposure;
 };
 static struct mt9t031 *to_mt9t031(const struct i2c_client *client)
@@ -179,95 +188,6 @@ static int mt9t031_s_stream(struct v4l2_subdev *sd, int enable)
        return 0;
 }
-static int mt9t031_set_bus_param(struct soc_camera_device *icd,
-                                 unsigned long flags)
-{
-        struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
-        /* The caller should have queried our parameters, check anyway */
-        if (flags & ~MT9T031_BUS_PARAM)
-                return -EINVAL;
-        if (flags & SOCAM_PCLK_SAMPLE_FALLING)
-                reg_clear(client, MT9T031_PIXEL_CLOCK_CONTROL, 0x8000);
-        else
-                reg_set(client, MT9T031_PIXEL_CLOCK_CONTROL, 0x8000);
-        return 0;
-}
-static unsigned long mt9t031_query_bus_param(struct soc_camera_device *icd)
-{
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        return soc_camera_apply_sensor_flags(icl, MT9T031_BUS_PARAM);
-}
-enum {
-        MT9T031_CTRL_VFLIP,
-        MT9T031_CTRL_HFLIP,
-        MT9T031_CTRL_GAIN,
-        MT9T031_CTRL_EXPOSURE,
-        MT9T031_CTRL_EXPOSURE_AUTO,
-};
-static const struct v4l2_queryctrl mt9t031_controls[] = {
-        [MT9T031_CTRL_VFLIP] = {
-                .id             = V4L2_CID_VFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Flip Vertically",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        },
-        [MT9T031_CTRL_HFLIP] = {
-                .id             = V4L2_CID_HFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Flip Horizontally",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        },
-        [MT9T031_CTRL_GAIN] = {
-                .id             = V4L2_CID_GAIN,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "Gain",
-                .minimum        = 0,
-                .maximum        = 127,
-                .step           = 1,
-                .default_value  = 64,
-                .flags          = V4L2_CTRL_FLAG_SLIDER,
-        },
-        [MT9T031_CTRL_EXPOSURE] = {
-                .id             = V4L2_CID_EXPOSURE,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "Exposure",
-                .minimum        = 1,
-                .maximum        = 255,
-                .step           = 1,
-                .default_value  = 255,
-                .flags          = V4L2_CTRL_FLAG_SLIDER,
-        },
-        [MT9T031_CTRL_EXPOSURE_AUTO] = {
-                .id             = V4L2_CID_EXPOSURE_AUTO,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Automatic Exposure",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 1,
-        }
-};
-static struct soc_camera_ops mt9t031_ops = {
-        .set_bus_param          = mt9t031_set_bus_param,
-        .query_bus_param        = mt9t031_query_bus_param,
-        .controls               = mt9t031_controls,
-        .num_controls           = ARRAY_SIZE(mt9t031_controls),
-};
 /* target must be _even_ */
 static u16 mt9t031_skip(s32 *source, s32 target, s32 max)
 {
@@ -353,7 +273,7 @@ static int mt9t031_set_params(struct i2c_client *client,
        /*
         * The caller provides a supported format, as guaranteed by
-         * icd->try_fmt_cap(), soc_camera_s_crop() and soc_camera_cropcap()
+         * .try_mbus_fmt(), soc_camera_s_crop() and soc_camera_cropcap()
         */
        if (ret >= 0)
                ret = reg_write(client, MT9T031_COLUMN_START, rect->left);
@@ -364,17 +284,10 @@ static int mt9t031_set_params(struct i2c_client *client,
        if (ret >= 0)
                ret = reg_write(client, MT9T031_WINDOW_HEIGHT,
                                rect->height + mt9t031->y_skip_top - 1);
-        if (ret >= 0 && mt9t031->autoexposure) {
+        if (ret >= 0 && v4l2_ctrl_g_ctrl(mt9t031->autoexposure) == V4L2_EXPOSURE_AUTO) {
-                unsigned int total_h = rect->height + mt9t031->y_skip_top + vblank;
+                mt9t031->total_h = rect->height + mt9t031->y_skip_top + vblank;
-                ret = set_shutter(client, total_h);
-                if (ret >= 0) {
+                ret = set_shutter(client, mt9t031->total_h);
-                        const u32 shutter_max = MT9T031_MAX_HEIGHT + vblank;
-                        const struct v4l2_queryctrl *qctrl =
-                                &mt9t031_controls[MT9T031_CTRL_EXPOSURE];
-                        mt9t031->exposure = (shutter_max / 2 + (total_h - 1) *
-                                 (qctrl->maximum - qctrl->minimum)) /
-                                shutter_max + qctrl->minimum;
-                }
        }
        /* Re-enable register update, commit all changes */
@@ -543,71 +456,57 @@ static int mt9t031_s_register(struct v4l2_subdev *sd,
 }
 #endif
-static int mt9t031_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
+static int mt9t031_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct mt9t031 *mt9t031 = container_of(ctrl->handler,
-        struct mt9t031 *mt9t031 = to_mt9t031(client);
+                                               struct mt9t031, hdl);
-        int data;
+        const u32 shutter_max = MT9T031_MAX_HEIGHT + MT9T031_VERTICAL_BLANK;
+        s32 min, max;
        switch (ctrl->id) {
-        case V4L2_CID_VFLIP:
-                data = reg_read(client, MT9T031_READ_MODE_2);
-                if (data < 0)
-                        return -EIO;
-                ctrl->value = !!(data & 0x8000);
-                break;
-        case V4L2_CID_HFLIP:
-                data = reg_read(client, MT9T031_READ_MODE_2);
-                if (data < 0)
-                        return -EIO;
-                ctrl->value = !!(data & 0x4000);
-                break;
        case V4L2_CID_EXPOSURE_AUTO:
-                ctrl->value = mt9t031->autoexposure;
+                min = mt9t031->exposure->minimum;
-                break;
+                max = mt9t031->exposure->maximum;
-        case V4L2_CID_GAIN:
+                mt9t031->exposure->val =
-                ctrl->value = mt9t031->gain;
+                        (shutter_max / 2 + (mt9t031->total_h - 1) * (max - min))
-                break;
+                                / shutter_max + min;
-        case V4L2_CID_EXPOSURE:
-                ctrl->value = mt9t031->exposure;
                break;
        }
        return 0;
 }
-static int mt9t031_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
+static int mt9t031_s_ctrl(struct v4l2_ctrl *ctrl)
 {
+        struct mt9t031 *mt9t031 = container_of(ctrl->handler,
+                                               struct mt9t031, hdl);
+        struct v4l2_subdev *sd = &mt9t031->subdev;
        struct i2c_client *client = v4l2_get_subdevdata(sd);
-        struct mt9t031 *mt9t031 = to_mt9t031(client);
+        struct v4l2_ctrl *exp = mt9t031->exposure;
-        const struct v4l2_queryctrl *qctrl;
        int data;
        switch (ctrl->id) {
        case V4L2_CID_VFLIP:
-                if (ctrl->value)
+                if (ctrl->val)
                        data = reg_set(client, MT9T031_READ_MODE_2, 0x8000);
                else
                        data = reg_clear(client, MT9T031_READ_MODE_2, 0x8000);
                if (data < 0)
                        return -EIO;
-                break;
+                return 0;
        case V4L2_CID_HFLIP:
-                if (ctrl->value)
+                if (ctrl->val)
                        data = reg_set(client, MT9T031_READ_MODE_2, 0x4000);
                else
                        data = reg_clear(client, MT9T031_READ_MODE_2, 0x4000);
                if (data < 0)
                        return -EIO;
-                break;
+                return 0;
        case V4L2_CID_GAIN:
-                qctrl = &mt9t031_controls[MT9T031_CTRL_GAIN];
-                if (ctrl->value > qctrl->maximum || ctrl->value < qctrl->minimum)
-                        return -EINVAL;
                /* See Datasheet Table 7, Gain settings. */
-                if (ctrl->value <= qctrl->default_value) {
+                if (ctrl->val <= ctrl->default_value) {
                        /* Pack it into 0..1 step 0.125, register values 0..8 */
-                        unsigned long range = qctrl->default_value - qctrl->minimum;
+                        unsigned long range = ctrl->default_value - ctrl->minimum;
-                        data = ((ctrl->value - qctrl->minimum) * 8 + range / 2) / range;
+                        data = ((ctrl->val - ctrl->minimum) * 8 + range / 2) / range;
                        dev_dbg(&client->dev, "Setting gain %d\n", data);
                        data = reg_write(client, MT9T031_GLOBAL_GAIN, data);
@@ -616,9 +515,9 @@ static int mt9t031_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
                } else {
                        /* Pack it into 1.125..128 variable step, register values 9..0x7860 */
                        /* We assume qctrl->maximum - qctrl->default_value - 1 > 0 */
-                        unsigned long range = qctrl->maximum - qctrl->default_value - 1;
+                        unsigned long range = ctrl->maximum - ctrl->default_value - 1;
                        /* calculated gain: map 65..127 to 9..1024 step 0.125 */
-                        unsigned long gain = ((ctrl->value - qctrl->default_value - 1) *
+                        unsigned long gain = ((ctrl->val - ctrl->default_value - 1) *
                                               1015 + range / 2) / range + 9;
                        if (gain <= 32)         /* calculated gain 9..32 -> 9..32 */
@@ -635,19 +534,13 @@ static int mt9t031_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
                        if (data < 0)
                                return -EIO;
                }
+                return 0;
-                /* Success */
+        case V4L2_CID_EXPOSURE_AUTO:
-                mt9t031->gain = ctrl->value;
+                if (ctrl->val == V4L2_EXPOSURE_MANUAL) {
-                break;
+                        unsigned int range = exp->maximum - exp->minimum;
-        case V4L2_CID_EXPOSURE:
+                        unsigned int shutter = ((exp->val - exp->minimum) * 1048 +
-                qctrl = &mt9t031_controls[MT9T031_CTRL_EXPOSURE];
+                                                 range / 2) / range + 1;
-                /* mt9t031 has maximum == default */
-                if (ctrl->value > qctrl->maximum || ctrl->value < qctrl->minimum)
-                        return -EINVAL;
-                else {
-                        const unsigned long range = qctrl->maximum - qctrl->minimum;
-                        const u32 shutter = ((ctrl->value - qctrl->minimum) * 1048 +
-                                             range / 2) / range + 1;
                        u32 old;
                        get_shutter(client, &old);
@@ -655,27 +548,15 @@ static int mt9t031_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
                                old, shutter);
                        if (set_shutter(client, shutter) < 0)
                                return -EIO;
-                        mt9t031->exposure = ctrl->value;
+                } else {
-                        mt9t031->autoexposure = 0;
-                }
-                break;
-        case V4L2_CID_EXPOSURE_AUTO:
-                if (ctrl->value) {
                        const u16 vblank = MT9T031_VERTICAL_BLANK;
-                        const u32 shutter_max = MT9T031_MAX_HEIGHT + vblank;
+                        mt9t031->total_h = mt9t031->rect.height +
-                        unsigned int total_h = mt9t031->rect.height +
                                mt9t031->y_skip_top + vblank;
-                        if (set_shutter(client, total_h) < 0)
+                        if (set_shutter(client, mt9t031->total_h) < 0)
                                return -EIO;
-                        qctrl = &mt9t031_controls[MT9T031_CTRL_EXPOSURE];
+                }
-                        mt9t031->exposure = (shutter_max / 2 + (total_h - 1) *
+                return 0;
-                                 (qctrl->maximum - qctrl->minimum)) /
-                                shutter_max + qctrl->minimum;
-                        mt9t031->autoexposure = 1;
-                } else
-                        mt9t031->autoexposure = 0;
-                break;
        default:
                return -EINVAL;
        }
@@ -700,8 +581,7 @@ static int mt9t031_runtime_suspend(struct device *dev)
 static int mt9t031_runtime_resume(struct device *dev)
 {
        struct video_device *vdev = to_video_device(dev);
-        struct soc_camera_device *icd = dev_get_drvdata(vdev->parent);
+        struct v4l2_subdev *sd = soc_camera_vdev_to_subdev(vdev);
-        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
        struct i2c_client *client = v4l2_get_subdevdata(sd);
        struct mt9t031 *mt9t031 = to_mt9t031(client);
@@ -734,6 +614,19 @@ static struct device_type mt9t031_dev_type = {
        .pm     = &mt9t031_dev_pm_ops,
 };
+static int mt9t031_s_power(struct v4l2_subdev *sd, int on)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct video_device *vdev = soc_camera_i2c_to_vdev(client);
+        if (on)
+                vdev->dev.type = &mt9t031_dev_type;
+        else
+                vdev->dev.type = NULL;
+        return 0;
+}
 /*
 * Interface active, can use i2c. If it fails, it can indeed mean, that
 * this wasn't our capture interface, so, we wait for the right one
@@ -741,7 +634,6 @@ static struct device_type mt9t031_dev_type = {
 static int mt9t031_video_probe(struct i2c_client *client)
 {
        struct mt9t031 *mt9t031 = to_mt9t031(client);
-        struct video_device *vdev = soc_camera_i2c_to_vdev(client);
        s32 data;
        int ret;
@@ -768,11 +660,7 @@ static int mt9t031_video_probe(struct i2c_client *client)
        if (ret < 0)
                dev_err(&client->dev, "Failed to initialise the camera\n");
        else
-                vdev->dev.type = &mt9t031_dev_type;
+                v4l2_ctrl_handler_setup(&mt9t031->hdl);
-        /* mt9t031_idle() has reset the chip to default. */
-        mt9t031->exposure = 255;
-        mt9t031->gain = 64;
        return ret;
 }
@@ -787,10 +675,14 @@ static int mt9t031_g_skip_top_lines(struct v4l2_subdev *sd, u32 *lines)
        return 0;
 }
+static const struct v4l2_ctrl_ops mt9t031_ctrl_ops = {
+        .g_volatile_ctrl = mt9t031_g_volatile_ctrl,
+        .s_ctrl = mt9t031_s_ctrl,
+};
 static struct v4l2_subdev_core_ops mt9t031_subdev_core_ops = {
-        .g_ctrl         = mt9t031_g_ctrl,
-        .s_ctrl         = mt9t031_s_ctrl,
        .g_chip_ident   = mt9t031_g_chip_ident,
+        .s_power        = mt9t031_s_power,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
        .g_register     = mt9t031_g_register,
        .s_register     = mt9t031_s_register,
@@ -807,6 +699,34 @@ static int mt9t031_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
        return 0;
 }
+static int mt9t031_g_mbus_config(struct v4l2_subdev *sd,
+                                struct v4l2_mbus_config *cfg)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        cfg->flags = V4L2_MBUS_MASTER | V4L2_MBUS_PCLK_SAMPLE_RISING |
+                V4L2_MBUS_PCLK_SAMPLE_FALLING | V4L2_MBUS_HSYNC_ACTIVE_HIGH |
+                V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_DATA_ACTIVE_HIGH;
+        cfg->type = V4L2_MBUS_PARALLEL;
+        cfg->flags = soc_camera_apply_board_flags(icl, cfg);
+        return 0;
+}
+static int mt9t031_s_mbus_config(struct v4l2_subdev *sd,
+                                const struct v4l2_mbus_config *cfg)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        if (soc_camera_apply_board_flags(icl, cfg) &
+            V4L2_MBUS_PCLK_SAMPLE_FALLING)
+                return reg_clear(client, MT9T031_PIXEL_CLOCK_CONTROL, 0x8000);
+        else
+                return reg_set(client, MT9T031_PIXEL_CLOCK_CONTROL, 0x8000);
+}
 static struct v4l2_subdev_video_ops mt9t031_subdev_video_ops = {
        .s_stream       = mt9t031_s_stream,
        .s_mbus_fmt     = mt9t031_s_fmt,
@@ -816,6 +736,8 @@ static struct v4l2_subdev_video_ops mt9t031_subdev_video_ops = {
        .g_crop         = mt9t031_g_crop,
        .cropcap        = mt9t031_cropcap,
        .enum_mbus_fmt  = mt9t031_enum_fmt,
+        .g_mbus_config  = mt9t031_g_mbus_config,
+        .s_mbus_config  = mt9t031_s_mbus_config,
 };
 static struct v4l2_subdev_sensor_ops mt9t031_subdev_sensor_ops = {
@@ -832,18 +754,13 @@ static int mt9t031_probe(struct i2c_client *client,
                         const struct i2c_device_id *did)
 {
        struct mt9t031 *mt9t031;
-        struct soc_camera_device *icd = client->dev.platform_data;
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
        struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
        int ret;
-        if (icd) {
+        if (!icl) {
-                struct soc_camera_link *icl = to_soc_camera_link(icd);
+                dev_err(&client->dev, "MT9T031 driver needs platform data\n");
-                if (!icl) {
+                return -EINVAL;
-                        dev_err(&client->dev, "MT9T031 driver needs platform data\n");
-                        return -EINVAL;
-                }
-                icd->ops = &mt9t031_ops;
        }
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA)) {
@@ -857,6 +774,33 @@ static int mt9t031_probe(struct i2c_client *client,
                return -ENOMEM;
        v4l2_i2c_subdev_init(&mt9t031->subdev, client, &mt9t031_subdev_ops);
+        v4l2_ctrl_handler_init(&mt9t031->hdl, 5);
+        v4l2_ctrl_new_std(&mt9t031->hdl, &mt9t031_ctrl_ops,
+                        V4L2_CID_VFLIP, 0, 1, 1, 0);
+        v4l2_ctrl_new_std(&mt9t031->hdl, &mt9t031_ctrl_ops,
+                        V4L2_CID_HFLIP, 0, 1, 1, 0);
+        v4l2_ctrl_new_std(&mt9t031->hdl, &mt9t031_ctrl_ops,
+                        V4L2_CID_GAIN, 0, 127, 1, 64);
+        /*
+         * Simulated autoexposure. If enabled, we calculate shutter width
+         * ourselves in the driver based on vertical blanking and frame width
+         */
+        mt9t031->autoexposure = v4l2_ctrl_new_std_menu(&mt9t031->hdl,
+                        &mt9t031_ctrl_ops, V4L2_CID_EXPOSURE_AUTO, 1, 0,
+                        V4L2_EXPOSURE_AUTO);
+        mt9t031->exposure = v4l2_ctrl_new_std(&mt9t031->hdl, &mt9t031_ctrl_ops,
+                        V4L2_CID_EXPOSURE, 1, 255, 1, 255);
+        mt9t031->subdev.ctrl_handler = &mt9t031->hdl;
+        if (mt9t031->hdl.error) {
+                int err = mt9t031->hdl.error;
+                kfree(mt9t031);
+                return err;
+        }
+        v4l2_ctrl_auto_cluster(2, &mt9t031->autoexposure,
+                                V4L2_EXPOSURE_MANUAL, true);
        mt9t031->y_skip_top     = 0;
        mt9t031->rect.left      = MT9T031_COLUMN_SKIP;
@@ -864,12 +808,6 @@ static int mt9t031_probe(struct i2c_client *client,
        mt9t031->rect.width     = MT9T031_MAX_WIDTH;
        mt9t031->rect.height    = MT9T031_MAX_HEIGHT;
-        /*
-         * Simulated autoexposure. If enabled, we calculate shutter width
-         * ourselves in the driver based on vertical blanking and frame width
-         */
-        mt9t031->autoexposure = 1;
        mt9t031->xskip = 1;
        mt9t031->yskip = 1;
@@ -880,8 +818,7 @@ static int mt9t031_probe(struct i2c_client *client,
        mt9t031_disable(client);
        if (ret) {
-                if (icd)
+                v4l2_ctrl_handler_free(&mt9t031->hdl);
-                        icd->ops = NULL;
                kfree(mt9t031);
        }
@@ -891,10 +828,9 @@ static int mt9t031_probe(struct i2c_client *client,
 static int mt9t031_remove(struct i2c_client *client)
 {
        struct mt9t031 *mt9t031 = to_mt9t031(client);
-        struct soc_camera_device *icd = client->dev.platform_data;
-        if (icd)
+        v4l2_device_unregister_subdev(&mt9t031->subdev);
-                icd->ops = NULL;
+        v4l2_ctrl_handler_free(&mt9t031->hdl);
        kfree(mt9t031);
        return 0;
diff --git a/drivers/media/video/mt9t112.c b/drivers/media/video/mt9t112.c
index d2e0a50063a2..32114a3c0ca7 100644
--- a/drivers/media/video/mt9t112.c
+++ b/drivers/media/video/mt9t112.c
@@ -22,11 +22,11 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/v4l2-mediabus.h>
 #include <linux/videodev2.h>
 #include <media/mt9t112.h>
 #include <media/soc_camera.h>
-#include <media/soc_mediabus.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-common.h>
@@ -34,11 +34,7 @@
 /* #define EXT_CLOCK 24000000 */
 /************************************************************************
                        macro
 ************************************************************************/
 /*
 * frame size
@@ -80,17 +76,8 @@
 #define VAR8(id, offset) _VAR(id, offset, 0x8000)
 /************************************************************************
                        struct
 ************************************************************************/
-struct mt9t112_frame_size {
-        u16 width;
-        u16 height;
-};
 struct mt9t112_format {
        enum v4l2_mbus_pixelcode code;
        enum v4l2_colorspace colorspace;
@@ -102,21 +89,17 @@ struct mt9t112_priv {
        struct v4l2_subdev               subdev;
        struct mt9t112_camera_info      *info;
        struct i2c_client               *client;
-        struct soc_camera_device         icd;
+        struct v4l2_rect                 frame;
-        struct mt9t112_frame_size        frame;
        const struct mt9t112_format     *format;
        int                              model;
        u32                              flags;
 /* for flags */
-#define INIT_DONE  (1<<0)
+#define INIT_DONE       (1 << 0)
+#define PCLK_RISING     (1 << 1)
 };
 /************************************************************************
                        supported format
 ************************************************************************/
 static const struct mt9t112_format mt9t112_cfmts[] = {
@@ -154,11 +137,7 @@ static const struct mt9t112_format mt9t112_cfmts[] = {
 };
 /************************************************************************
                        general function
 ************************************************************************/
 static struct mt9t112_priv *to_mt9t112(const struct i2c_client *client)
 {
@@ -326,50 +305,47 @@ static int mt9t112_clock_info(const struct i2c_client *client, u32 ext)
        n = (n >> 8) & 0x003f;
        enable = ((6000 > ext) || (54000 < ext)) ? "X" : "";
-        dev_info(&client->dev, "EXTCLK          : %10u K %s\n", ext, enable);
+        dev_dbg(&client->dev, "EXTCLK          : %10u K %s\n", ext, enable);
        vco = 2 * m * ext / (n+1);
        enable = ((384000 > vco) || (768000 < vco)) ? "X" : "";
-        dev_info(&client->dev, "VCO             : %10u K %s\n", vco, enable);
+        dev_dbg(&client->dev, "VCO             : %10u K %s\n", vco, enable);
        clk = vco / (p1+1) / (p2+1);
        enable = (96000 < clk) ? "X" : "";
-        dev_info(&client->dev, "PIXCLK          : %10u K %s\n", clk, enable);
+        dev_dbg(&client->dev, "PIXCLK          : %10u K %s\n", clk, enable);
        clk = vco / (p3+1);
        enable = (768000 < clk) ? "X" : "";
-        dev_info(&client->dev, "MIPICLK         : %10u K %s\n", clk, enable);
+        dev_dbg(&client->dev, "MIPICLK         : %10u K %s\n", clk, enable);
        clk = vco / (p6+1);
        enable = (96000 < clk) ? "X" : "";
-        dev_info(&client->dev, "MCU CLK         : %10u K %s\n", clk, enable);
+        dev_dbg(&client->dev, "MCU CLK         : %10u K %s\n", clk, enable);
        clk = vco / (p5+1);
        enable = (54000 < clk) ? "X" : "";
-        dev_info(&client->dev, "SOC CLK         : %10u K %s\n", clk, enable);
+        dev_dbg(&client->dev, "SOC CLK         : %10u K %s\n", clk, enable);
        clk = vco / (p4+1);
        enable = (70000 < clk) ? "X" : "";
-        dev_info(&client->dev, "Sensor CLK      : %10u K %s\n", clk, enable);
+        dev_dbg(&client->dev, "Sensor CLK      : %10u K %s\n", clk, enable);
        clk = vco / (p7+1);
-        dev_info(&client->dev, "External sensor : %10u K\n", clk);
+        dev_dbg(&client->dev, "External sensor : %10u K\n", clk);
        clk = ext / (n+1);
        enable = ((2000 > clk) || (24000 < clk)) ? "X" : "";
-        dev_info(&client->dev, "PFD             : %10u K %s\n", clk, enable);
+        dev_dbg(&client->dev, "PFD             : %10u K %s\n", clk, enable);
        return 0;
 }
 #endif
-static void mt9t112_frame_check(u32 *width, u32 *height)
+static void mt9t112_frame_check(u32 *width, u32 *height, u32 *left, u32 *top)
 {
-        if (*width > MAX_WIDTH)
+        soc_camera_limit_side(left, width, 0, 0, MAX_WIDTH);
-                *width = MAX_WIDTH;
+        soc_camera_limit_side(top, height, 0, 0, MAX_HEIGHT);
-        if (*height > MAX_HEIGHT)
-                *height = MAX_HEIGHT;
 }
 static int mt9t112_set_a_frame_size(const struct i2c_client *client,
@@ -758,48 +734,7 @@ static int mt9t112_init_camera(const struct i2c_client *client)
 }
 /************************************************************************
-                        soc_camera_ops
-************************************************************************/
-static int mt9t112_set_bus_param(struct soc_camera_device *icd,
-                                 unsigned long  flags)
-{
-        return 0;
-}
-static unsigned long mt9t112_query_bus_param(struct soc_camera_device *icd)
-{
-        struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
-        struct mt9t112_priv *priv = to_mt9t112(client);
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        unsigned long flags = SOCAM_MASTER | SOCAM_VSYNC_ACTIVE_HIGH |
-                SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_HIGH;
-        flags |= (priv->info->flags & MT9T112_FLAG_PCLK_RISING_EDGE) ?
-                SOCAM_PCLK_SAMPLE_RISING : SOCAM_PCLK_SAMPLE_FALLING;
-        if (priv->info->flags & MT9T112_FLAG_DATAWIDTH_8)
-                flags |= SOCAM_DATAWIDTH_8;
-        else
-                flags |= SOCAM_DATAWIDTH_10;
-        return soc_camera_apply_sensor_flags(icl, flags);
-}
-static struct soc_camera_ops mt9t112_ops = {
-        .set_bus_param          = mt9t112_set_bus_param,
-        .query_bus_param        = mt9t112_query_bus_param,
-};
-/************************************************************************
                        v4l2_subdev_core_ops
 ************************************************************************/
 static int mt9t112_g_chip_ident(struct v4l2_subdev *sd,
                                struct v4l2_dbg_chip_ident *id)
@@ -850,11 +785,7 @@ static struct v4l2_subdev_core_ops mt9t112_subdev_core_ops = {
 /************************************************************************
                        v4l2_subdev_video_ops
 ************************************************************************/
 static int mt9t112_s_stream(struct v4l2_subdev *sd, int enable)
 {
@@ -877,8 +808,7 @@ static int mt9t112_s_stream(struct v4l2_subdev *sd, int enable)
        }
        if (!(priv->flags & INIT_DONE)) {
-                u16 param = (MT9T112_FLAG_PCLK_RISING_EDGE &
+                u16 param = PCLK_RISING & priv->flags ? 0x0001 : 0x0000;
-                             priv->info->flags) ? 0x0001 : 0x0000;
                ECHECKER(ret, mt9t112_init_camera(client));
@@ -910,19 +840,12 @@ static int mt9t112_s_stream(struct v4l2_subdev *sd, int enable)
        return ret;
 }
-static int mt9t112_set_params(struct i2c_client *client, u32 width, u32 height,
+static int mt9t112_set_params(struct mt9t112_priv *priv,
+                              const struct v4l2_rect *rect,
                              enum v4l2_mbus_pixelcode code)
 {
-        struct mt9t112_priv *priv = to_mt9t112(client);
        int i;
-        priv->format = NULL;
-        /*
-         * frame size check
-         */
-        mt9t112_frame_check(&width, &height);
        /*
         * get color format
         */
@@ -933,8 +856,13 @@ static int mt9t112_set_params(struct i2c_client *client, u32 width, u32 height,
        if (i == ARRAY_SIZE(mt9t112_cfmts))
                return -EINVAL;
-        priv->frame.width  = (u16)width;
+        priv->frame  = *rect;
-        priv->frame.height = (u16)height;
+        /*
+         * frame size check
+         */
+        mt9t112_frame_check(&priv->frame.width, &priv->frame.height,
+                            &priv->frame.left, &priv->frame.top);
        priv->format = mt9t112_cfmts + i;
@@ -945,9 +873,12 @@ static int mt9t112_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
 {
        a->bounds.left                  = 0;
        a->bounds.top                   = 0;
-        a->bounds.width                 = VGA_WIDTH;
+        a->bounds.width                 = MAX_WIDTH;
-        a->bounds.height                = VGA_HEIGHT;
+        a->bounds.height                = MAX_HEIGHT;
-        a->defrect                      = a->bounds;
+        a->defrect.left                 = 0;
+        a->defrect.top                  = 0;
+        a->defrect.width                = VGA_WIDTH;
+        a->defrect.height               = VGA_HEIGHT;
        a->type                         = V4L2_BUF_TYPE_VIDEO_CAPTURE;
        a->pixelaspect.numerator        = 1;
        a->pixelaspect.denominator      = 1;
@@ -957,11 +888,11 @@ static int mt9t112_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
 static int mt9t112_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
 {
-        a->c.left       = 0;
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
-        a->c.top        = 0;
+        struct mt9t112_priv *priv = to_mt9t112(client);
-        a->c.width      = VGA_WIDTH;
-        a->c.height     = VGA_HEIGHT;
+        a->c    = priv->frame;
-        a->type         = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
        return 0;
 }
@@ -969,10 +900,10 @@ static int mt9t112_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
 static int mt9t112_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
 {
        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct mt9t112_priv *priv = to_mt9t112(client);
        struct v4l2_rect *rect = &a->c;
-        return mt9t112_set_params(client, rect->width, rect->height,
+        return mt9t112_set_params(priv, rect, priv->format->code);
-                                 V4L2_MBUS_FMT_UYVY8_2X8);
 }
 static int mt9t112_g_fmt(struct v4l2_subdev *sd,
@@ -981,16 +912,9 @@ static int mt9t112_g_fmt(struct v4l2_subdev *sd,
        struct i2c_client *client = v4l2_get_subdevdata(sd);
        struct mt9t112_priv *priv = to_mt9t112(client);
-        if (!priv->format) {
-                int ret = mt9t112_set_params(client, VGA_WIDTH, VGA_HEIGHT,
-                                             V4L2_MBUS_FMT_UYVY8_2X8);
-                if (ret < 0)
-                        return ret;
-        }
        mf->width       = priv->frame.width;
        mf->height      = priv->frame.height;
-        /* TODO: set colorspace */
+        mf->colorspace  = priv->format->colorspace;
        mf->code        = priv->format->code;
        mf->field       = V4L2_FIELD_NONE;
@@ -1001,17 +925,42 @@ static int mt9t112_s_fmt(struct v4l2_subdev *sd,
                         struct v4l2_mbus_framefmt *mf)
 {
        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct mt9t112_priv *priv = to_mt9t112(client);
+        struct v4l2_rect rect = {
+                .width = mf->width,
+                .height = mf->height,
+                .left = priv->frame.left,
+                .top = priv->frame.top,
+        };
+        int ret;
+        ret = mt9t112_set_params(priv, &rect, mf->code);
+        if (!ret)
+                mf->colorspace = priv->format->colorspace;
-        /* TODO: set colorspace */
+        return ret;
-        return mt9t112_set_params(client, mf->width, mf->height, mf->code);
 }
 static int mt9t112_try_fmt(struct v4l2_subdev *sd,
                           struct v4l2_mbus_framefmt *mf)
 {
-        mt9t112_frame_check(&mf->width, &mf->height);
+        unsigned int top, left;
+        int i;
+        for (i = 0; i < ARRAY_SIZE(mt9t112_cfmts); i++)
+                if (mt9t112_cfmts[i].code == mf->code)
+                        break;
+        if (i == ARRAY_SIZE(mt9t112_cfmts)) {
+                mf->code = V4L2_MBUS_FMT_UYVY8_2X8;
+                mf->colorspace = V4L2_COLORSPACE_JPEG;
+        } else {
+                mf->colorspace  = mt9t112_cfmts[i].colorspace;
+        }
+        mt9t112_frame_check(&mf->width, &mf->height, &left, &top);
-        /* TODO: set colorspace */
        mf->field = V4L2_FIELD_NONE;
        return 0;
@@ -1024,6 +973,35 @@ static int mt9t112_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
                return -EINVAL;
        *code = mt9t112_cfmts[index].code;
+        return 0;
+}
+static int mt9t112_g_mbus_config(struct v4l2_subdev *sd,
+                                 struct v4l2_mbus_config *cfg)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        cfg->flags = V4L2_MBUS_MASTER | V4L2_MBUS_VSYNC_ACTIVE_HIGH |
+                V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_DATA_ACTIVE_HIGH |
+                V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_PCLK_SAMPLE_FALLING;
+        cfg->type = V4L2_MBUS_PARALLEL;
+        cfg->flags = soc_camera_apply_board_flags(icl, cfg);
+        return 0;
+}
+static int mt9t112_s_mbus_config(struct v4l2_subdev *sd,
+                                 const struct v4l2_mbus_config *cfg)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        struct mt9t112_priv *priv = to_mt9t112(client);
+        if (soc_camera_apply_board_flags(icl, cfg) & V4L2_MBUS_PCLK_SAMPLE_RISING)
+                priv->flags |= PCLK_RISING;
        return 0;
 }
@@ -1036,31 +1014,24 @@ static struct v4l2_subdev_video_ops mt9t112_subdev_video_ops = {
        .g_crop         = mt9t112_g_crop,
        .s_crop         = mt9t112_s_crop,
        .enum_mbus_fmt  = mt9t112_enum_fmt,
+        .g_mbus_config  = mt9t112_g_mbus_config,
+        .s_mbus_config  = mt9t112_s_mbus_config,
 };
 /************************************************************************
                        i2c driver
 ************************************************************************/
 static struct v4l2_subdev_ops mt9t112_subdev_ops = {
        .core   = &mt9t112_subdev_core_ops,
        .video  = &mt9t112_subdev_video_ops,
 };
-static int mt9t112_camera_probe(struct soc_camera_device *icd,
+static int mt9t112_camera_probe(struct i2c_client *client)
-                                struct i2c_client *client)
 {
        struct mt9t112_priv *priv = to_mt9t112(client);
        const char          *devname;
        int                  chipid;
-        /* We must have a parent by now. And it cannot be a wrong one. */
-        BUG_ON(!icd->parent ||
-               to_soc_camera_host(icd->parent)->nr != icd->iface);
        /*
         * check and show chip ID
         */
@@ -1088,20 +1059,21 @@ static int mt9t112_camera_probe(struct soc_camera_device *icd,
 static int mt9t112_probe(struct i2c_client *client,
                         const struct i2c_device_id *did)
 {
-        struct mt9t112_priv        *priv;
+        struct mt9t112_priv *priv;
-        struct soc_camera_device   *icd = client->dev.platform_data;
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
-        struct soc_camera_link     *icl;
+        struct v4l2_rect rect = {
-        int                         ret;
+                .width = VGA_WIDTH,
+                .height = VGA_HEIGHT,
+                .left = (MAX_WIDTH - VGA_WIDTH) / 2,
+                .top = (MAX_HEIGHT - VGA_HEIGHT) / 2,
+        };
+        int ret;
-        if (!icd) {
+        if (!icl || !icl->priv) {
-                dev_err(&client->dev, "mt9t112: missing soc-camera data!\n");
+                dev_err(&client->dev, "mt9t112: missing platform data!\n");
                return -EINVAL;
        }
-        icl = to_soc_camera_link(icd);
-        if (!icl || !icl->priv)
-                return -EINVAL;
        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
@@ -1110,13 +1082,12 @@ static int mt9t112_probe(struct i2c_client *client,
        v4l2_i2c_subdev_init(&priv->subdev, client, &mt9t112_subdev_ops);
-        icd->ops = &mt9t112_ops;
+        ret = mt9t112_camera_probe(client);
+        if (ret)
-        ret = mt9t112_camera_probe(icd, client);
-        if (ret) {
-                icd->ops = NULL;
                kfree(priv);
-        }
+        /* Cannot fail: using the default supported pixel code */
+        mt9t112_set_params(priv, &rect, V4L2_MBUS_FMT_UYVY8_2X8);
        return ret;
 }
@@ -1124,9 +1095,7 @@ static int mt9t112_probe(struct i2c_client *client,
 static int mt9t112_remove(struct i2c_client *client)
 {
        struct mt9t112_priv *priv = to_mt9t112(client);
-        struct soc_camera_device *icd = client->dev.platform_data;
-        icd->ops = NULL;
        kfree(priv);
        return 0;
 }
@@ -1147,11 +1116,7 @@ static struct i2c_driver mt9t112_i2c_driver = {
 };
 /************************************************************************
                        module function
 ************************************************************************/
 static int __init mt9t112_module_init(void)
 {
diff --git a/drivers/media/video/mt9v011.c b/drivers/media/video/mt9v011.c
index 893a8b8f5141..db74dd27c722 100644
--- a/drivers/media/video/mt9v011.c
+++ b/drivers/media/video/mt9v011.c
@@ -9,6 +9,7 @@
 #include <linux/slab.h>
 #include <linux/videodev2.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 #include <asm/div64.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-chip-ident.h>
diff --git a/drivers/media/video/mt9v022.c b/drivers/media/video/mt9v022.c
index 51b0fccbfe70..690ee0d42eeb 100644
--- a/drivers/media/video/mt9v022.c
+++ b/drivers/media/video/mt9v022.c
@@ -13,10 +13,13 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <linux/log2.h>
+#include <linux/module.h>
+#include <media/soc_camera.h>
+#include <media/soc_mediabus.h>
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/soc_camera.h>
+#include <media/v4l2-ctrls.h>
 /*
 * mt9v022 i2c address 0x48, 0x4c, 0x58, 0x5c
@@ -100,6 +103,17 @@ static const struct mt9v022_datafmt mt9v022_monochrome_fmts[] = {
 struct mt9v022 {
        struct v4l2_subdev subdev;
+        struct v4l2_ctrl_handler hdl;
+        struct {
+                /* exposure/auto-exposure cluster */
+                struct v4l2_ctrl *autoexposure;
+                struct v4l2_ctrl *exposure;
+        };
+        struct {
+                /* gain/auto-gain cluster */
+                struct v4l2_ctrl *autogain;
+                struct v4l2_ctrl *gain;
+        };
        struct v4l2_rect rect;  /* Sensor window */
        const struct mt9v022_datafmt *fmt;
        const struct mt9v022_datafmt *fmts;
@@ -178,6 +192,8 @@ static int mt9v022_init(struct i2c_client *client)
                ret = reg_clear(client, MT9V022_BLACK_LEVEL_CALIB_CTRL, 1);
        if (!ret)
                ret = reg_write(client, MT9V022_DIGITAL_TEST_PATTERN, 0);
+        if (!ret)
+                return v4l2_ctrl_handler_setup(&mt9v022->hdl);
        return ret;
 }
@@ -199,78 +215,6 @@ static int mt9v022_s_stream(struct v4l2_subdev *sd, int enable)
        return 0;
 }
-static int mt9v022_set_bus_param(struct soc_camera_device *icd,
-                                 unsigned long flags)
-{
-        struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
-        struct mt9v022 *mt9v022 = to_mt9v022(client);
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        unsigned int width_flag = flags & SOCAM_DATAWIDTH_MASK;
-        int ret;
-        u16 pixclk = 0;
-        /* Only one width bit may be set */
-        if (!is_power_of_2(width_flag))
-                return -EINVAL;
-        if (icl->set_bus_param) {
-                ret = icl->set_bus_param(icl, width_flag);
-                if (ret)
-                        return ret;
-        } else {
-                /*
-                 * Without board specific bus width settings we only support the
-                 * sensors native bus width
-                 */
-                if (width_flag != SOCAM_DATAWIDTH_10)
-                        return -EINVAL;
-        }
-        flags = soc_camera_apply_sensor_flags(icl, flags);
-        if (flags & SOCAM_PCLK_SAMPLE_FALLING)
-                pixclk |= 0x10;
-        if (!(flags & SOCAM_HSYNC_ACTIVE_HIGH))
-                pixclk |= 0x1;
-        if (!(flags & SOCAM_VSYNC_ACTIVE_HIGH))
-                pixclk |= 0x2;
-        ret = reg_write(client, MT9V022_PIXCLK_FV_LV, pixclk);
-        if (ret < 0)
-                return ret;
-        if (!(flags & SOCAM_MASTER))
-                mt9v022->chip_control &= ~0x8;
-        ret = reg_write(client, MT9V022_CHIP_CONTROL, mt9v022->chip_control);
-        if (ret < 0)
-                return ret;
-        dev_dbg(&client->dev, "Calculated pixclk 0x%x, chip control 0x%x\n",
-                pixclk, mt9v022->chip_control);
-        return 0;
-}
-static unsigned long mt9v022_query_bus_param(struct soc_camera_device *icd)
-{
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        unsigned int flags = SOCAM_MASTER | SOCAM_SLAVE |
-                SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING |
-                SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_LOW |
-                SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW |
-                SOCAM_DATA_ACTIVE_HIGH;
-        if (icl->query_bus_param)
-                flags |= icl->query_bus_param(icl) & SOCAM_DATAWIDTH_MASK;
-        else
-                flags |= SOCAM_DATAWIDTH_10;
-        return soc_camera_apply_sensor_flags(icl, flags);
-}
 static int mt9v022_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
 {
        struct i2c_client *client = v4l2_get_subdevdata(sd);
@@ -389,7 +333,7 @@ static int mt9v022_s_fmt(struct v4l2_subdev *sd,
        /*
         * The caller provides a supported format, as verified per call to
-         * icd->try_fmt(), datawidth is from our supported format list
+         * .try_mbus_fmt(), datawidth is from our supported format list
         */
        switch (mf->code) {
        case V4L2_MBUS_FMT_Y8_1X8:
@@ -502,236 +446,131 @@ static int mt9v022_s_register(struct v4l2_subdev *sd,
 }
 #endif
-static const struct v4l2_queryctrl mt9v022_controls[] = {
+static int mt9v022_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
-        {
-                .id             = V4L2_CID_VFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Flip Vertically",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        }, {
-                .id             = V4L2_CID_HFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Flip Horizontally",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        }, {
-                .id             = V4L2_CID_GAIN,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "Analog Gain",
-                .minimum        = 64,
-                .maximum        = 127,
-                .step           = 1,
-                .default_value  = 64,
-                .flags          = V4L2_CTRL_FLAG_SLIDER,
-        }, {
-                .id             = V4L2_CID_EXPOSURE,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "Exposure",
-                .minimum        = 1,
-                .maximum        = 255,
-                .step           = 1,
-                .default_value  = 255,
-                .flags          = V4L2_CTRL_FLAG_SLIDER,
-        }, {
-                .id             = V4L2_CID_AUTOGAIN,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Automatic Gain",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 1,
-        }, {
-                .id             = V4L2_CID_EXPOSURE_AUTO,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Automatic Exposure",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 1,
-        }
-};
-static struct soc_camera_ops mt9v022_ops = {
-        .set_bus_param          = mt9v022_set_bus_param,
-        .query_bus_param        = mt9v022_query_bus_param,
-        .controls               = mt9v022_controls,
-        .num_controls           = ARRAY_SIZE(mt9v022_controls),
-};
-static int mt9v022_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
+        struct mt9v022 *mt9v022 = container_of(ctrl->handler,
+                                               struct mt9v022, hdl);
+        struct v4l2_subdev *sd = &mt9v022->subdev;
        struct i2c_client *client = v4l2_get_subdevdata(sd);
-        const struct v4l2_queryctrl *qctrl;
+        struct v4l2_ctrl *gain = mt9v022->gain;
+        struct v4l2_ctrl *exp = mt9v022->exposure;
        unsigned long range;
        int data;
-        qctrl = soc_camera_find_qctrl(&mt9v022_ops, ctrl->id);
        switch (ctrl->id) {
-        case V4L2_CID_VFLIP:
-                data = reg_read(client, MT9V022_READ_MODE);
-                if (data < 0)
-                        return -EIO;
-                ctrl->value = !!(data & 0x10);
-                break;
-        case V4L2_CID_HFLIP:
-                data = reg_read(client, MT9V022_READ_MODE);
-                if (data < 0)
-                        return -EIO;
-                ctrl->value = !!(data & 0x20);
-                break;
-        case V4L2_CID_EXPOSURE_AUTO:
-                data = reg_read(client, MT9V022_AEC_AGC_ENABLE);
-                if (data < 0)
-                        return -EIO;
-                ctrl->value = !!(data & 0x1);
-                break;
        case V4L2_CID_AUTOGAIN:
-                data = reg_read(client, MT9V022_AEC_AGC_ENABLE);
-                if (data < 0)
-                        return -EIO;
-                ctrl->value = !!(data & 0x2);
-                break;
-        case V4L2_CID_GAIN:
                data = reg_read(client, MT9V022_ANALOG_GAIN);
                if (data < 0)
                        return -EIO;
-                range = qctrl->maximum - qctrl->minimum;
+                range = gain->maximum - gain->minimum;
-                ctrl->value = ((data - 16) * range + 24) / 48 + qctrl->minimum;
+                gain->val = ((data - 16) * range + 24) / 48 + gain->minimum;
+                return 0;
-                break;
+        case V4L2_CID_EXPOSURE_AUTO:
-        case V4L2_CID_EXPOSURE:
                data = reg_read(client, MT9V022_TOTAL_SHUTTER_WIDTH);
                if (data < 0)
                        return -EIO;
-                range = qctrl->maximum - qctrl->minimum;
+                range = exp->maximum - exp->minimum;
-                ctrl->value = ((data - 1) * range + 239) / 479 + qctrl->minimum;
+                exp->val = ((data - 1) * range + 239) / 479 + exp->minimum;
+                return 0;
-                break;
        }
-        return 0;
+        return -EINVAL;
 }
-static int mt9v022_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
+static int mt9v022_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        int data;
+        struct mt9v022 *mt9v022 = container_of(ctrl->handler,
+                                               struct mt9v022, hdl);
+        struct v4l2_subdev *sd = &mt9v022->subdev;
        struct i2c_client *client = v4l2_get_subdevdata(sd);
-        const struct v4l2_queryctrl *qctrl;
+        int data;
-        qctrl = soc_camera_find_qctrl(&mt9v022_ops, ctrl->id);
-        if (!qctrl)
-                return -EINVAL;
        switch (ctrl->id) {
        case V4L2_CID_VFLIP:
-                if (ctrl->value)
+                if (ctrl->val)
                        data = reg_set(client, MT9V022_READ_MODE, 0x10);
                else
                        data = reg_clear(client, MT9V022_READ_MODE, 0x10);
                if (data < 0)
                        return -EIO;
-                break;
+                return 0;
        case V4L2_CID_HFLIP:
-                if (ctrl->value)
+                if (ctrl->val)
                        data = reg_set(client, MT9V022_READ_MODE, 0x20);
                else
                        data = reg_clear(client, MT9V022_READ_MODE, 0x20);
                if (data < 0)
                        return -EIO;
-                break;
+                return 0;
-        case V4L2_CID_GAIN:
+        case V4L2_CID_AUTOGAIN:
-                /* mt9v022 has minimum == default */
+                if (ctrl->val) {
-                if (ctrl->value > qctrl->maximum || ctrl->value < qctrl->minimum)
+                        if (reg_set(client, MT9V022_AEC_AGC_ENABLE, 0x2) < 0)
-                        return -EINVAL;
+                                return -EIO;
-                else {
+                } else {
-                        unsigned long range = qctrl->maximum - qctrl->minimum;
+                        struct v4l2_ctrl *gain = mt9v022->gain;
+                        /* mt9v022 has minimum == default */
+                        unsigned long range = gain->maximum - gain->minimum;
                        /* Valid values 16 to 64, 32 to 64 must be even. */
-                        unsigned long gain = ((ctrl->value - qctrl->minimum) *
+                        unsigned long gain_val = ((gain->val - gain->minimum) *
                                              48 + range / 2) / range + 16;
-                        if (gain >= 32)
-                                gain &= ~1;
+                        if (gain_val >= 32)
+                                gain_val &= ~1;
                        /*
                         * The user wants to set gain manually, hope, she
                         * knows, what she's doing... Switch AGC off.
                         */
                        if (reg_clear(client, MT9V022_AEC_AGC_ENABLE, 0x2) < 0)
                                return -EIO;
                        dev_dbg(&client->dev, "Setting gain from %d to %lu\n",
-                                reg_read(client, MT9V022_ANALOG_GAIN), gain);
+                                reg_read(client, MT9V022_ANALOG_GAIN), gain_val);
-                        if (reg_write(client, MT9V022_ANALOG_GAIN, gain) < 0)
+                        if (reg_write(client, MT9V022_ANALOG_GAIN, gain_val) < 0)
                                return -EIO;
                }
-                break;
+                return 0;
-        case V4L2_CID_EXPOSURE:
+        case V4L2_CID_EXPOSURE_AUTO:
-                /* mt9v022 has maximum == default */
+                if (ctrl->val == V4L2_EXPOSURE_AUTO) {
-                if (ctrl->value > qctrl->maximum || ctrl->value < qctrl->minimum)
+                        data = reg_set(client, MT9V022_AEC_AGC_ENABLE, 0x1);
-                        return -EINVAL;
+                } else {
-                else {
+                        struct v4l2_ctrl *exp = mt9v022->exposure;
-                        unsigned long range = qctrl->maximum - qctrl->minimum;
+                        unsigned long range = exp->maximum - exp->minimum;
-                        unsigned long shutter = ((ctrl->value - qctrl->minimum) *
+                        unsigned long shutter = ((exp->val - exp->minimum) *
-                                                 479 + range / 2) / range + 1;
+                                        479 + range / 2) / range + 1;
                        /*
                         * The user wants to set shutter width manually, hope,
                         * she knows, what she's doing... Switch AEC off.
                         */
+                        data = reg_clear(client, MT9V022_AEC_AGC_ENABLE, 0x1);
-                        if (reg_clear(client, MT9V022_AEC_AGC_ENABLE, 0x1) < 0)
+                        if (data < 0)
                                return -EIO;
                        dev_dbg(&client->dev, "Shutter width from %d to %lu\n",
-                                reg_read(client, MT9V022_TOTAL_SHUTTER_WIDTH),
+                                        reg_read(client, MT9V022_TOTAL_SHUTTER_WIDTH),
-                                shutter);
+                                        shutter);
                        if (reg_write(client, MT9V022_TOTAL_SHUTTER_WIDTH,
-                                      shutter) < 0)
+                                                shutter) < 0)
                                return -EIO;
                }
-                break;
+                return 0;
-        case V4L2_CID_AUTOGAIN:
-                if (ctrl->value)
-                        data = reg_set(client, MT9V022_AEC_AGC_ENABLE, 0x2);
-                else
-                        data = reg_clear(client, MT9V022_AEC_AGC_ENABLE, 0x2);
-                if (data < 0)
-                        return -EIO;
-                break;
-        case V4L2_CID_EXPOSURE_AUTO:
-                if (ctrl->value)
-                        data = reg_set(client, MT9V022_AEC_AGC_ENABLE, 0x1);
-                else
-                        data = reg_clear(client, MT9V022_AEC_AGC_ENABLE, 0x1);
-                if (data < 0)
-                        return -EIO;
-                break;
        }
-        return 0;
+        return -EINVAL;
 }
 /*
 * Interface active, can use i2c. If it fails, it can indeed mean, that
 * this wasn't our capture interface, so, we wait for the right one
 */
-static int mt9v022_video_probe(struct soc_camera_device *icd,
+static int mt9v022_video_probe(struct i2c_client *client)
-                               struct i2c_client *client)
 {
        struct mt9v022 *mt9v022 = to_mt9v022(client);
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
        s32 data;
        int ret;
        unsigned long flags;
-        /* We must have a parent by now. And it cannot be a wrong one. */
-        BUG_ON(!icd->parent ||
-               to_soc_camera_host(icd->parent)->nr != icd->iface);
        /* Read out the chip version register */
        data = reg_read(client, MT9V022_CHIP_VERSION);
@@ -805,16 +644,6 @@ ei2c:
        return ret;
 }
-static void mt9v022_video_remove(struct soc_camera_device *icd)
-{
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        dev_dbg(icd->pdev, "Video removed: %p, %p\n",
-                icd->parent, icd->vdev);
-        if (icl->free_bus)
-                icl->free_bus(icl);
-}
 static int mt9v022_g_skip_top_lines(struct v4l2_subdev *sd, u32 *lines)
 {
        struct i2c_client *client = v4l2_get_subdevdata(sd);
@@ -825,9 +654,12 @@ static int mt9v022_g_skip_top_lines(struct v4l2_subdev *sd, u32 *lines)
        return 0;
 }
+static const struct v4l2_ctrl_ops mt9v022_ctrl_ops = {
+        .g_volatile_ctrl = mt9v022_g_volatile_ctrl,
+        .s_ctrl = mt9v022_s_ctrl,
+};
 static struct v4l2_subdev_core_ops mt9v022_subdev_core_ops = {
-        .g_ctrl         = mt9v022_g_ctrl,
-        .s_ctrl         = mt9v022_s_ctrl,
        .g_chip_ident   = mt9v022_g_chip_ident,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
        .g_register     = mt9v022_g_register,
@@ -848,6 +680,72 @@ static int mt9v022_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
        return 0;
 }
+static int mt9v022_g_mbus_config(struct v4l2_subdev *sd,
+                                struct v4l2_mbus_config *cfg)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        cfg->flags = V4L2_MBUS_MASTER | V4L2_MBUS_SLAVE |
+                V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_PCLK_SAMPLE_FALLING |
+                V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_LOW |
+                V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_LOW |
+                V4L2_MBUS_DATA_ACTIVE_HIGH;
+        cfg->type = V4L2_MBUS_PARALLEL;
+        cfg->flags = soc_camera_apply_board_flags(icl, cfg);
+        return 0;
+}
+static int mt9v022_s_mbus_config(struct v4l2_subdev *sd,
+                                 const struct v4l2_mbus_config *cfg)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        struct mt9v022 *mt9v022 = to_mt9v022(client);
+        unsigned long flags = soc_camera_apply_board_flags(icl, cfg);
+        unsigned int bps = soc_mbus_get_fmtdesc(mt9v022->fmt->code)->bits_per_sample;
+        int ret;
+        u16 pixclk = 0;
+        if (icl->set_bus_param) {
+                ret = icl->set_bus_param(icl, 1 << (bps - 1));
+                if (ret)
+                        return ret;
+        } else if (bps != 10) {
+                /*
+                 * Without board specific bus width settings we only support the
+                 * sensors native bus width
+                 */
+                return -EINVAL;
+        }
+        if (flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)
+                pixclk |= 0x10;
+        if (!(flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH))
+                pixclk |= 0x1;
+        if (!(flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH))
+                pixclk |= 0x2;
+        ret = reg_write(client, MT9V022_PIXCLK_FV_LV, pixclk);
+        if (ret < 0)
+                return ret;
+        if (!(flags & V4L2_MBUS_MASTER))
+                mt9v022->chip_control &= ~0x8;
+        ret = reg_write(client, MT9V022_CHIP_CONTROL, mt9v022->chip_control);
+        if (ret < 0)
+                return ret;
+        dev_dbg(&client->dev, "Calculated pixclk 0x%x, chip control 0x%x\n",
+                pixclk, mt9v022->chip_control);
+        return 0;
+}
 static struct v4l2_subdev_video_ops mt9v022_subdev_video_ops = {
        .s_stream       = mt9v022_s_stream,
        .s_mbus_fmt     = mt9v022_s_fmt,
@@ -857,6 +755,8 @@ static struct v4l2_subdev_video_ops mt9v022_subdev_video_ops = {
        .g_crop         = mt9v022_g_crop,
        .cropcap        = mt9v022_cropcap,
        .enum_mbus_fmt  = mt9v022_enum_fmt,
+        .g_mbus_config  = mt9v022_g_mbus_config,
+        .s_mbus_config  = mt9v022_s_mbus_config,
 };
 static struct v4l2_subdev_sensor_ops mt9v022_subdev_sensor_ops = {
@@ -873,17 +773,10 @@ static int mt9v022_probe(struct i2c_client *client,
                         const struct i2c_device_id *did)
 {
        struct mt9v022 *mt9v022;
-        struct soc_camera_device *icd = client->dev.platform_data;
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
        struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
-        struct soc_camera_link *icl;
        int ret;
-        if (!icd) {
-                dev_err(&client->dev, "MT9V022: missing soc-camera data!\n");
-                return -EINVAL;
-        }
-        icl = to_soc_camera_link(icd);
        if (!icl) {
                dev_err(&client->dev, "MT9V022 driver needs platform data\n");
                return -EINVAL;
@@ -900,10 +793,39 @@ static int mt9v022_probe(struct i2c_client *client,
                return -ENOMEM;
        v4l2_i2c_subdev_init(&mt9v022->subdev, client, &mt9v022_subdev_ops);
+        v4l2_ctrl_handler_init(&mt9v022->hdl, 6);
+        v4l2_ctrl_new_std(&mt9v022->hdl, &mt9v022_ctrl_ops,
+                        V4L2_CID_VFLIP, 0, 1, 1, 0);
+        v4l2_ctrl_new_std(&mt9v022->hdl, &mt9v022_ctrl_ops,
+                        V4L2_CID_HFLIP, 0, 1, 1, 0);
+        mt9v022->autogain = v4l2_ctrl_new_std(&mt9v022->hdl, &mt9v022_ctrl_ops,
+                        V4L2_CID_AUTOGAIN, 0, 1, 1, 1);
+        mt9v022->gain = v4l2_ctrl_new_std(&mt9v022->hdl, &mt9v022_ctrl_ops,
+                        V4L2_CID_GAIN, 0, 127, 1, 64);
+        /*
+         * Simulated autoexposure. If enabled, we calculate shutter width
+         * ourselves in the driver based on vertical blanking and frame width
+         */
+        mt9v022->autoexposure = v4l2_ctrl_new_std_menu(&mt9v022->hdl,
+                        &mt9v022_ctrl_ops, V4L2_CID_EXPOSURE_AUTO, 1, 0,
+                        V4L2_EXPOSURE_AUTO);
+        mt9v022->exposure = v4l2_ctrl_new_std(&mt9v022->hdl, &mt9v022_ctrl_ops,
+                        V4L2_CID_EXPOSURE, 1, 255, 1, 255);
+        mt9v022->subdev.ctrl_handler = &mt9v022->hdl;
+        if (mt9v022->hdl.error) {
+                int err = mt9v022->hdl.error;
+                kfree(mt9v022);
+                return err;
+        }
+        v4l2_ctrl_auto_cluster(2, &mt9v022->autoexposure,
+                                V4L2_EXPOSURE_MANUAL, true);
+        v4l2_ctrl_auto_cluster(2, &mt9v022->autogain, 0, true);
        mt9v022->chip_control = MT9V022_CHIP_CONTROL_DEFAULT;
-        icd->ops                = &mt9v022_ops;
        /*
         * MT9V022 _really_ corrupts the first read out line.
         * TODO: verify on i.MX31
@@ -914,9 +836,9 @@ static int mt9v022_probe(struct i2c_client *client,
        mt9v022->rect.width     = MT9V022_MAX_WIDTH;
        mt9v022->rect.height    = MT9V022_MAX_HEIGHT;
-        ret = mt9v022_video_probe(icd, client);
+        ret = mt9v022_video_probe(client);
        if (ret) {
-                icd->ops = NULL;
+                v4l2_ctrl_handler_free(&mt9v022->hdl);
                kfree(mt9v022);
        }
@@ -926,10 +848,12 @@ static int mt9v022_probe(struct i2c_client *client,
 static int mt9v022_remove(struct i2c_client *client)
 {
        struct mt9v022 *mt9v022 = to_mt9v022(client);
-        struct soc_camera_device *icd = client->dev.platform_data;
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
-        icd->ops = NULL;
+        v4l2_device_unregister_subdev(&mt9v022->subdev);
-        mt9v022_video_remove(icd);
+        if (icl->free_bus)
+                icl->free_bus(icl);
+        v4l2_ctrl_handler_free(&mt9v022->hdl);
        kfree(mt9v022);
        return 0;
diff --git a/drivers/media/video/mt9v032.c b/drivers/media/video/mt9v032.c
index c64e1dc4cb4e..f080c162123f 100644
--- a/drivers/media/video/mt9v032.c
+++ b/drivers/media/video/mt9v032.c
@@ -19,6 +19,7 @@
 #include <linux/slab.h>
 #include <linux/videodev2.h>
 #include <linux/v4l2-mediabus.h>
+#include <linux/module.h>
 #include <media/mt9v032.h>
 #include <media/v4l2-ctrls.h>
diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c
index 087db12a3a67..18e94c7d2be8 100644
--- a/drivers/media/video/mx1_camera.c
+++ b/drivers/media/video/mx1_camera.c
@@ -78,11 +78,10 @@
 #define CSI_IRQ_MASK    (CSISR_SFF_OR_INT | CSISR_RFF_OR_INT | \
                        CSISR_STATFF_INT | CSISR_RXFF_INT | CSISR_SOF_INT)
-#define CSI_BUS_FLAGS   (SOCAM_MASTER | SOCAM_HSYNC_ACTIVE_HIGH | \
+#define CSI_BUS_FLAGS   (V4L2_MBUS_MASTER | V4L2_MBUS_HSYNC_ACTIVE_HIGH | \
-                        SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW | \
+                        V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_LOW | \
-                        SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING | \
+                        V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_PCLK_SAMPLE_FALLING | \
-                        SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_LOW | \
+                        V4L2_MBUS_DATA_ACTIVE_HIGH | V4L2_MBUS_DATA_ACTIVE_LOW)
-                        SOCAM_DATAWIDTH_8)
 #define MAX_VIDEO_MEM 16        /* Video memory limit in megabytes */
@@ -490,59 +489,73 @@ static int mx1_camera_set_crop(struct soc_camera_device *icd,
 static int mx1_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
 {
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct mx1_camera_dev *pcdev = ici->priv;
-        unsigned long camera_flags, common_flags;
+        struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
+        unsigned long common_flags;
        unsigned int csicr1;
        int ret;
-        camera_flags = icd->ops->query_bus_param(icd);
        /* MX1 supports only 8bit buswidth */
-        common_flags = soc_camera_bus_param_compatible(camera_flags,
+        ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
-                                                       CSI_BUS_FLAGS);
+        if (!ret) {
-        if (!common_flags)
+                common_flags = soc_mbus_config_compatible(&cfg, CSI_BUS_FLAGS);
-                return -EINVAL;
+                if (!common_flags) {
+                        dev_warn(icd->parent,
+                                 "Flags incompatible: camera 0x%x, host 0x%x\n",
+                                 cfg.flags, CSI_BUS_FLAGS);
+                        return -EINVAL;
+                }
+        } else if (ret != -ENOIOCTLCMD) {
+                return ret;
+        } else {
+                common_flags = CSI_BUS_FLAGS;
+        }
        /* Make choises, based on platform choice */
-        if ((common_flags & SOCAM_VSYNC_ACTIVE_HIGH) &&
+        if ((common_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH) &&
-                (common_flags & SOCAM_VSYNC_ACTIVE_LOW)) {
+                (common_flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)) {
                        if (!pcdev->pdata ||
                             pcdev->pdata->flags & MX1_CAMERA_VSYNC_HIGH)
-                                common_flags &= ~SOCAM_VSYNC_ACTIVE_LOW;
+                                common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_LOW;
                        else
-                                common_flags &= ~SOCAM_VSYNC_ACTIVE_HIGH;
+                                common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_HIGH;
        }
-        if ((common_flags & SOCAM_PCLK_SAMPLE_RISING) &&
+        if ((common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING) &&
-                (common_flags & SOCAM_PCLK_SAMPLE_FALLING)) {
+                (common_flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)) {
                        if (!pcdev->pdata ||
                             pcdev->pdata->flags & MX1_CAMERA_PCLK_RISING)
-                                common_flags &= ~SOCAM_PCLK_SAMPLE_FALLING;
+                                common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_FALLING;
                        else
-                                common_flags &= ~SOCAM_PCLK_SAMPLE_RISING;
+                                common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_RISING;
        }
-        if ((common_flags & SOCAM_DATA_ACTIVE_HIGH) &&
+        if ((common_flags & V4L2_MBUS_DATA_ACTIVE_HIGH) &&
-                (common_flags & SOCAM_DATA_ACTIVE_LOW)) {
+                (common_flags & V4L2_MBUS_DATA_ACTIVE_LOW)) {
                        if (!pcdev->pdata ||
                             pcdev->pdata->flags & MX1_CAMERA_DATA_HIGH)
-                                common_flags &= ~SOCAM_DATA_ACTIVE_LOW;
+                                common_flags &= ~V4L2_MBUS_DATA_ACTIVE_LOW;
                        else
-                                common_flags &= ~SOCAM_DATA_ACTIVE_HIGH;
+                                common_flags &= ~V4L2_MBUS_DATA_ACTIVE_HIGH;
        }
-        ret = icd->ops->set_bus_param(icd, common_flags);
+        cfg.flags = common_flags;
-        if (ret < 0)
+        ret = v4l2_subdev_call(sd, video, s_mbus_config, &cfg);
+        if (ret < 0 && ret != -ENOIOCTLCMD) {
+                dev_dbg(icd->parent, "camera s_mbus_config(0x%lx) returned %d\n",
+                        common_flags, ret);
                return ret;
+        }
        csicr1 = __raw_readl(pcdev->base + CSICR1);
-        if (common_flags & SOCAM_PCLK_SAMPLE_RISING)
+        if (common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING)
                csicr1 |= CSICR1_REDGE;
-        if (common_flags & SOCAM_VSYNC_ACTIVE_HIGH)
+        if (common_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH)
                csicr1 |= CSICR1_SOF_POL;
-        if (common_flags & SOCAM_DATA_ACTIVE_LOW)
+        if (common_flags & V4L2_MBUS_DATA_ACTIVE_LOW)
                csicr1 |= CSICR1_DATA_POL;
        __raw_writel(csicr1, pcdev->base + CSICR1);
diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c
index ec2410c0c806..a803d9ea8fd6 100644
--- a/drivers/media/video/mx2_camera.c
+++ b/drivers/media/video/mx2_camera.c
@@ -686,16 +686,15 @@ static void mx2_camera_init_videobuf(struct videobuf_queue *q,
                        icd, &icd->video_lock);
 }
-#define MX2_BUS_FLAGS   (SOCAM_DATAWIDTH_8 | \
+#define MX2_BUS_FLAGS   (V4L2_MBUS_MASTER | \
-                        SOCAM_MASTER | \
+                        V4L2_MBUS_VSYNC_ACTIVE_HIGH | \
-                        SOCAM_VSYNC_ACTIVE_HIGH | \
+                        V4L2_MBUS_VSYNC_ACTIVE_LOW | \
-                        SOCAM_VSYNC_ACTIVE_LOW | \
+                        V4L2_MBUS_HSYNC_ACTIVE_HIGH | \
-                        SOCAM_HSYNC_ACTIVE_HIGH | \
+                        V4L2_MBUS_HSYNC_ACTIVE_LOW | \
-                        SOCAM_HSYNC_ACTIVE_LOW | \
+                        V4L2_MBUS_PCLK_SAMPLE_RISING | \
-                        SOCAM_PCLK_SAMPLE_RISING | \
+                        V4L2_MBUS_PCLK_SAMPLE_FALLING | \
-                        SOCAM_PCLK_SAMPLE_FALLING | \
+                        V4L2_MBUS_DATA_ACTIVE_HIGH | \
-                        SOCAM_DATA_ACTIVE_HIGH | \
+                        V4L2_MBUS_DATA_ACTIVE_LOW)
-                        SOCAM_DATA_ACTIVE_LOW)
 static int mx27_camera_emma_prp_reset(struct mx2_camera_dev *pcdev)
 {
@@ -770,46 +769,59 @@ static void mx27_camera_emma_buf_init(struct soc_camera_device *icd,
 static int mx2_camera_set_bus_param(struct soc_camera_device *icd,
                __u32 pixfmt)
 {
-        struct soc_camera_host *ici =
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
-                to_soc_camera_host(icd->parent);
+        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct mx2_camera_dev *pcdev = ici->priv;
-        unsigned long camera_flags, common_flags;
+        struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
-        int ret = 0;
+        unsigned long common_flags;
+        int ret;
        int bytesperline;
        u32 csicr1 = pcdev->csicr1;
-        camera_flags = icd->ops->query_bus_param(icd);
+        ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
+        if (!ret) {
-        common_flags = soc_camera_bus_param_compatible(camera_flags,
+                common_flags = soc_mbus_config_compatible(&cfg, MX2_BUS_FLAGS);
-                                MX2_BUS_FLAGS);
+                if (!common_flags) {
-        if (!common_flags)
+                        dev_warn(icd->parent,
-                return -EINVAL;
+                                 "Flags incompatible: camera 0x%x, host 0x%x\n",
+                                 cfg.flags, MX2_BUS_FLAGS);
+                        return -EINVAL;
+                }
+        } else if (ret != -ENOIOCTLCMD) {
+                return ret;
+        } else {
+                common_flags = MX2_BUS_FLAGS;
+        }
-        if ((common_flags & SOCAM_HSYNC_ACTIVE_HIGH) &&
+        if ((common_flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH) &&
-            (common_flags & SOCAM_HSYNC_ACTIVE_LOW)) {
+            (common_flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)) {
                if (pcdev->platform_flags & MX2_CAMERA_HSYNC_HIGH)
-                        common_flags &= ~SOCAM_HSYNC_ACTIVE_LOW;
+                        common_flags &= ~V4L2_MBUS_HSYNC_ACTIVE_LOW;
                else
-                        common_flags &= ~SOCAM_HSYNC_ACTIVE_HIGH;
+                        common_flags &= ~V4L2_MBUS_HSYNC_ACTIVE_HIGH;
        }
-        if ((common_flags & SOCAM_PCLK_SAMPLE_RISING) &&
+        if ((common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING) &&
-            (common_flags & SOCAM_PCLK_SAMPLE_FALLING)) {
+            (common_flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)) {
                if (pcdev->platform_flags & MX2_CAMERA_PCLK_SAMPLE_RISING)
-                        common_flags &= ~SOCAM_PCLK_SAMPLE_FALLING;
+                        common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_FALLING;
                else
-                        common_flags &= ~SOCAM_PCLK_SAMPLE_RISING;
+                        common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_RISING;
        }
-        ret = icd->ops->set_bus_param(icd, common_flags);
+        cfg.flags = common_flags;
-        if (ret < 0)
+        ret = v4l2_subdev_call(sd, video, s_mbus_config, &cfg);
+        if (ret < 0 && ret != -ENOIOCTLCMD) {
+                dev_dbg(icd->parent, "camera s_mbus_config(0x%lx) returned %d\n",
+                        common_flags, ret);
                return ret;
+        }
-        if (common_flags & SOCAM_PCLK_SAMPLE_RISING)
+        if (common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING)
                csicr1 |= CSICR1_REDGE;
-        if (common_flags & SOCAM_VSYNC_ACTIVE_HIGH)
+        if (common_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH)
                csicr1 |= CSICR1_SOF_POL;
-        if (common_flags & SOCAM_HSYNC_ACTIVE_HIGH)
+        if (common_flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH)
                csicr1 |= CSICR1_HSYNC_POL;
        if (pcdev->platform_flags & MX2_CAMERA_SWAP16)
                csicr1 |= CSICR1_SWAP16_EN;
diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c
index c8e958a07e91..f96f92f00f92 100644
--- a/drivers/media/video/mx3_camera.c
+++ b/drivers/media/video/mx3_camera.c
@@ -109,10 +109,12 @@ struct mx3_camera_dev {
        unsigned long           platform_flags;
        unsigned long           mclk;
+        u16                     width_flags;    /* max 15 bits */
        struct list_head        capture;
        spinlock_t              lock;           /* Protects video buffer lists */
        struct mx3_camera_buffer *active;
+        size_t                  buf_total;
        struct vb2_alloc_ctx    *alloc_ctx;
        enum v4l2_field         field;
        int                     sequence;
@@ -190,79 +192,53 @@ static void mx3_cam_dma_done(void *arg)
 * Calculate the __buffer__ (not data) size and number of buffers.
 */
 static int mx3_videobuf_setup(struct vb2_queue *vq,
+                        const struct v4l2_format *fmt,
                        unsigned int *count, unsigned int *num_planes,
                        unsigned int sizes[], void *alloc_ctxs[])
 {
        struct soc_camera_device *icd = soc_camera_from_vb2q(vq);
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct mx3_camera_dev *mx3_cam = ici->priv;
-        int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
+        int bytes_per_line;
-                                                icd->current_fmt->host_fmt);
+        unsigned int height;
-        if (bytes_per_line < 0)
-                return bytes_per_line;
        if (!mx3_cam->idmac_channel[0])
                return -EINVAL;
-        *num_planes = 1;
+        if (fmt) {
+                const struct soc_camera_format_xlate *xlate = soc_camera_xlate_by_fourcc(icd,
-        mx3_cam->sequence = 0;
+                                                                fmt->fmt.pix.pixelformat);
-        sizes[0] = bytes_per_line * icd->user_height;
+                if (!xlate)
-        alloc_ctxs[0] = mx3_cam->alloc_ctx;
+                        return -EINVAL;
+                bytes_per_line = soc_mbus_bytes_per_line(fmt->fmt.pix.width,
-        if (!*count)
+                                                         xlate->host_fmt);
-                *count = 32;
+                height = fmt->fmt.pix.height;
+        } else {
-        if (sizes[0] * *count > MAX_VIDEO_MEM * 1024 * 1024)
+                /* Called from VIDIOC_REQBUFS or in compatibility mode */
-                *count = MAX_VIDEO_MEM * 1024 * 1024 / sizes[0];
+                bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
-        return 0;
-}
-static int mx3_videobuf_prepare(struct vb2_buffer *vb)
-{
-        struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
-        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
-        struct mx3_camera_dev *mx3_cam = ici->priv;
-        struct idmac_channel *ichan = mx3_cam->idmac_channel[0];
-        struct scatterlist *sg;
-        struct mx3_camera_buffer *buf;
-        size_t new_size;
-        int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
                                                icd->current_fmt->host_fmt);
+                height = icd->user_height;
+        }
        if (bytes_per_line < 0)
                return bytes_per_line;
-        buf = to_mx3_vb(vb);
+        sizes[0] = bytes_per_line * height;
-        sg = &buf->sg;
-        new_size = bytes_per_line * icd->user_height;
-        if (vb2_plane_size(vb, 0) < new_size) {
+        alloc_ctxs[0] = mx3_cam->alloc_ctx;
-                dev_err(icd->parent, "Buffer too small (%lu < %zu)\n",
-                        vb2_plane_size(vb, 0), new_size);
-                return -ENOBUFS;
-        }
-        if (buf->state == CSI_BUF_NEEDS_INIT) {
+        if (!vq->num_buffers)
-                sg_dma_address(sg)      = vb2_dma_contig_plane_dma_addr(vb, 0);
+                mx3_cam->sequence = 0;
-                sg_dma_len(sg)          = new_size;
-                buf->txd = ichan->dma_chan.device->device_prep_slave_sg(
+        if (!*count)
-                        &ichan->dma_chan, sg, 1, DMA_FROM_DEVICE,
+                *count = 2;
-                        DMA_PREP_INTERRUPT);
-                if (!buf->txd)
-                        return -EIO;
-                buf->txd->callback_param        = buf->txd;
-                buf->txd->callback              = mx3_cam_dma_done;
-                buf->state = CSI_BUF_PREPARED;
+        /* If *num_planes != 0, we have already verified *count. */
-        }
+        if (!*num_planes &&
+            sizes[0] * *count + mx3_cam->buf_total > MAX_VIDEO_MEM * 1024 * 1024)
+                *count = (MAX_VIDEO_MEM * 1024 * 1024 - mx3_cam->buf_total) /
+                        sizes[0];
-        vb2_set_plane_payload(vb, 0, new_size);
+        *num_planes = 1;
        return 0;
 }
@@ -286,28 +262,58 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb)
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct mx3_camera_dev *mx3_cam = ici->priv;
        struct mx3_camera_buffer *buf = to_mx3_vb(vb);
-        struct dma_async_tx_descriptor *txd = buf->txd;
+        struct scatterlist *sg = &buf->sg;
-        struct idmac_channel *ichan = to_idmac_chan(txd->chan);
+        struct dma_async_tx_descriptor *txd;
+        struct idmac_channel *ichan = mx3_cam->idmac_channel[0];
        struct idmac_video_param *video = &ichan->params.video;
-        dma_cookie_t cookie;
+        const struct soc_mbus_pixelfmt *host_fmt = icd->current_fmt->host_fmt;
-        u32 fourcc = icd->current_fmt->host_fmt->fourcc;
+        int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width, host_fmt);
        unsigned long flags;
+        dma_cookie_t cookie;
+        size_t new_size;
+        BUG_ON(bytes_per_line <= 0);
+        new_size = bytes_per_line * icd->user_height;
+        if (vb2_plane_size(vb, 0) < new_size) {
+                dev_err(icd->parent, "Buffer #%d too small (%lu < %zu)\n",
+                        vb->v4l2_buf.index, vb2_plane_size(vb, 0), new_size);
+                goto error;
+        }
+        if (buf->state == CSI_BUF_NEEDS_INIT) {
+                sg_dma_address(sg)      = vb2_dma_contig_plane_dma_addr(vb, 0);
+                sg_dma_len(sg)          = new_size;
+                txd = ichan->dma_chan.device->device_prep_slave_sg(
+                        &ichan->dma_chan, sg, 1, DMA_FROM_DEVICE,
+                        DMA_PREP_INTERRUPT);
+                if (!txd)
+                        goto error;
+                txd->callback_param     = txd;
+                txd->callback           = mx3_cam_dma_done;
+                buf->state              = CSI_BUF_PREPARED;
+                buf->txd                = txd;
+        } else {
+                txd = buf->txd;
+        }
+        vb2_set_plane_payload(vb, 0, new_size);
        /* This is the configuration of one sg-element */
-        video->out_pixel_fmt    = fourcc_to_ipu_pix(fourcc);
+        video->out_pixel_fmt = fourcc_to_ipu_pix(host_fmt->fourcc);
        if (video->out_pixel_fmt == IPU_PIX_FMT_GENERIC) {
                /*
-                 * If the IPU DMA channel is configured to transport
+                 * If the IPU DMA channel is configured to transfer generic
-                 * generic 8-bit data, we have to set up correctly the
+                 * 8-bit data, we have to set up the geometry parameters
-                 * geometry parameters upon the current pixel format.
+                 * correctly, according to the current pixel format. The DMA
-                 * So, since the DMA horizontal parameters are expressed
+                 * horizontal parameters in this case are expressed in bytes,
-                 * in bytes not pixels, convert these in the right unit.
+                 * not in pixels.
                 */
-                int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
-                                                icd->current_fmt->host_fmt);
-                BUG_ON(bytes_per_line <= 0);
                video->out_width        = bytes_per_line;
                video->out_height       = icd->user_height;
                video->out_stride       = bytes_per_line;
@@ -351,6 +357,7 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb)
                mx3_cam->active = NULL;
        spin_unlock_irqrestore(&mx3_cam->lock, flags);
+error:
        vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);
 }
@@ -384,17 +391,24 @@ static void mx3_videobuf_release(struct vb2_buffer *vb)
        }
        spin_unlock_irqrestore(&mx3_cam->lock, flags);
+        mx3_cam->buf_total -= vb2_plane_size(vb, 0);
 }
 static int mx3_videobuf_init(struct vb2_buffer *vb)
 {
+        struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
+        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
+        struct mx3_camera_dev *mx3_cam = ici->priv;
        struct mx3_camera_buffer *buf = to_mx3_vb(vb);
        /* This is for locking debugging only */
        INIT_LIST_HEAD(&buf->queue);
        sg_init_table(&buf->sg, 1);
        buf->state = CSI_BUF_NEEDS_INIT;
-        buf->txd = NULL;
+        mx3_cam->buf_total += vb2_plane_size(vb, 0);
        return 0;
 }
@@ -405,13 +419,12 @@ static int mx3_stop_streaming(struct vb2_queue *q)
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct mx3_camera_dev *mx3_cam = ici->priv;
        struct idmac_channel *ichan = mx3_cam->idmac_channel[0];
-        struct dma_chan *chan;
        struct mx3_camera_buffer *buf, *tmp;
        unsigned long flags;
        if (ichan) {
-                chan = &ichan->dma_chan;
+                struct dma_chan *chan = &ichan->dma_chan;
-                chan->device->device_control(chan, DMA_TERMINATE_ALL, 0);
+                chan->device->device_control(chan, DMA_PAUSE, 0);
        }
        spin_lock_irqsave(&mx3_cam->lock, flags);
@@ -419,8 +432,8 @@ static int mx3_stop_streaming(struct vb2_queue *q)
        mx3_cam->active = NULL;
        list_for_each_entry_safe(buf, tmp, &mx3_cam->capture, queue) {
-                buf->state = CSI_BUF_NEEDS_INIT;
                list_del_init(&buf->queue);
+                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&mx3_cam->lock, flags);
@@ -430,7 +443,6 @@ static int mx3_stop_streaming(struct vb2_queue *q)
 static struct vb2_ops mx3_videobuf_ops = {
        .queue_setup    = mx3_videobuf_setup,
-        .buf_prepare    = mx3_videobuf_prepare,
        .buf_queue      = mx3_videobuf_queue,
        .buf_cleanup    = mx3_videobuf_release,
        .buf_init       = mx3_videobuf_init,
@@ -514,6 +526,7 @@ static int mx3_camera_add_device(struct soc_camera_device *icd)
        mx3_camera_activate(mx3_cam, icd);
+        mx3_cam->buf_total = 0;
        mx3_cam->icd = icd;
        dev_info(icd->parent, "MX3 Camera driver attached to camera %d\n",
@@ -548,58 +561,27 @@ static int test_platform_param(struct mx3_camera_dev *mx3_cam,
                               unsigned char buswidth, unsigned long *flags)
 {
        /*
+         * If requested data width is supported by the platform, use it or any
+         * possible lower value - i.MX31 is smart enough to shift bits
+         */
+        if (buswidth > fls(mx3_cam->width_flags))
+                return -EINVAL;
+        /*
         * Platform specified synchronization and pixel clock polarities are
         * only a recommendation and are only used during probing. MX3x
         * camera interface only works in master mode, i.e., uses HSYNC and
         * VSYNC signals from the sensor
         */
-        *flags = SOCAM_MASTER |
+        *flags = V4L2_MBUS_MASTER |
-                SOCAM_HSYNC_ACTIVE_HIGH |
+                V4L2_MBUS_HSYNC_ACTIVE_HIGH |
-                SOCAM_HSYNC_ACTIVE_LOW |
+                V4L2_MBUS_HSYNC_ACTIVE_LOW |
-                SOCAM_VSYNC_ACTIVE_HIGH |
+                V4L2_MBUS_VSYNC_ACTIVE_HIGH |
-                SOCAM_VSYNC_ACTIVE_LOW |
+                V4L2_MBUS_VSYNC_ACTIVE_LOW |
-                SOCAM_PCLK_SAMPLE_RISING |
+                V4L2_MBUS_PCLK_SAMPLE_RISING |
-                SOCAM_PCLK_SAMPLE_FALLING |
+                V4L2_MBUS_PCLK_SAMPLE_FALLING |
-                SOCAM_DATA_ACTIVE_HIGH |
+                V4L2_MBUS_DATA_ACTIVE_HIGH |
-                SOCAM_DATA_ACTIVE_LOW;
+                V4L2_MBUS_DATA_ACTIVE_LOW;
-        /*
-         * If requested data width is supported by the platform, use it or any
-         * possible lower value - i.MX31 is smart enough to schift bits
-         */
-        if (mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_15)
-                *flags |= SOCAM_DATAWIDTH_15 | SOCAM_DATAWIDTH_10 |
-                        SOCAM_DATAWIDTH_8 | SOCAM_DATAWIDTH_4;
-        else if (mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_10)
-                *flags |= SOCAM_DATAWIDTH_10 | SOCAM_DATAWIDTH_8 |
-                        SOCAM_DATAWIDTH_4;
-        else if (mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_8)
-                *flags |= SOCAM_DATAWIDTH_8 | SOCAM_DATAWIDTH_4;
-        else if (mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_4)
-                *flags |= SOCAM_DATAWIDTH_4;
-        switch (buswidth) {
-        case 15:
-                if (!(*flags & SOCAM_DATAWIDTH_15))
-                        return -EINVAL;
-                break;
-        case 10:
-                if (!(*flags & SOCAM_DATAWIDTH_10))
-                        return -EINVAL;
-                break;
-        case 8:
-                if (!(*flags & SOCAM_DATAWIDTH_8))
-                        return -EINVAL;
-                break;
-        case 4:
-                if (!(*flags & SOCAM_DATAWIDTH_4))
-                        return -EINVAL;
-                break;
-        default:
-                dev_warn(mx3_cam->soc_host.v4l2_dev.dev,
-                         "Unsupported bus width %d\n", buswidth);
-                return -EINVAL;
-        }
        return 0;
 }
@@ -607,9 +589,11 @@ static int test_platform_param(struct mx3_camera_dev *mx3_cam,
 static int mx3_camera_try_bus_param(struct soc_camera_device *icd,
                                    const unsigned int depth)
 {
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct mx3_camera_dev *mx3_cam = ici->priv;
-        unsigned long bus_flags, camera_flags;
+        struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
+        unsigned long bus_flags, common_flags;
        int ret = test_platform_param(mx3_cam, depth, &bus_flags);
        dev_dbg(icd->parent, "request bus width %d bit: %d\n", depth, ret);
@@ -617,15 +601,21 @@ static int mx3_camera_try_bus_param(struct soc_camera_device *icd,
        if (ret < 0)
                return ret;
-        camera_flags = icd->ops->query_bus_param(icd);
+        ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
+        if (!ret) {
-        ret = soc_camera_bus_param_compatible(camera_flags, bus_flags);
+                common_flags = soc_mbus_config_compatible(&cfg,
-        if (ret < 0)
+                                                          bus_flags);
-                dev_warn(icd->parent,
+                if (!common_flags) {
-                         "Flags incompatible: camera %lx, host %lx\n",
+                        dev_warn(icd->parent,
-                         camera_flags, bus_flags);
+                                 "Flags incompatible: camera 0x%x, host 0x%lx\n",
+                                 cfg.flags, bus_flags);
+                        return -EINVAL;
+                }
+        } else if (ret != -ENOIOCTLCMD) {
+                return ret;
+        }
-        return ret;
+        return 0;
 }
 static bool chan_filter(struct dma_chan *chan, void *arg)
@@ -994,9 +984,11 @@ static int mx3_camera_querycap(struct soc_camera_host *ici,
 static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
 {
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct mx3_camera_dev *mx3_cam = ici->priv;
-        unsigned long bus_flags, camera_flags, common_flags;
+        struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
+        unsigned long bus_flags, common_flags;
        u32 dw, sens_conf;
        const struct soc_mbus_pixelfmt *fmt;
        int buswidth;
@@ -1008,83 +1000,76 @@ static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
        if (!fmt)
                return -EINVAL;
-        buswidth = fmt->bits_per_sample;
-        ret = test_platform_param(mx3_cam, buswidth, &bus_flags);
        xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
        if (!xlate) {
                dev_warn(dev, "Format %x not found\n", pixfmt);
                return -EINVAL;
        }
+        buswidth = fmt->bits_per_sample;
+        ret = test_platform_param(mx3_cam, buswidth, &bus_flags);
        dev_dbg(dev, "requested bus width %d bit: %d\n", buswidth, ret);
        if (ret < 0)
                return ret;
-        camera_flags = icd->ops->query_bus_param(icd);
+        ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
+        if (!ret) {
-        common_flags = soc_camera_bus_param_compatible(camera_flags, bus_flags);
+                common_flags = soc_mbus_config_compatible(&cfg,
-        dev_dbg(dev, "Flags cam: 0x%lx host: 0x%lx common: 0x%lx\n",
+                                                          bus_flags);
-                camera_flags, bus_flags, common_flags);
+                if (!common_flags) {
-        if (!common_flags) {
+                        dev_warn(icd->parent,
-                dev_dbg(dev, "no common flags");
+                                 "Flags incompatible: camera 0x%x, host 0x%lx\n",
-                return -EINVAL;
+                                 cfg.flags, bus_flags);
+                        return -EINVAL;
+                }
+        } else if (ret != -ENOIOCTLCMD) {
+                return ret;
+        } else {
+                common_flags = bus_flags;
        }
+        dev_dbg(dev, "Flags cam: 0x%x host: 0x%lx common: 0x%lx\n",
+                cfg.flags, bus_flags, common_flags);
        /* Make choices, based on platform preferences */
-        if ((common_flags & SOCAM_HSYNC_ACTIVE_HIGH) &&
+        if ((common_flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH) &&
-            (common_flags & SOCAM_HSYNC_ACTIVE_LOW)) {
+            (common_flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)) {
                if (mx3_cam->platform_flags & MX3_CAMERA_HSP)
-                        common_flags &= ~SOCAM_HSYNC_ACTIVE_HIGH;
+                        common_flags &= ~V4L2_MBUS_HSYNC_ACTIVE_HIGH;
                else
-                        common_flags &= ~SOCAM_HSYNC_ACTIVE_LOW;
+                        common_flags &= ~V4L2_MBUS_HSYNC_ACTIVE_LOW;
        }
-        if ((common_flags & SOCAM_VSYNC_ACTIVE_HIGH) &&
+        if ((common_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH) &&
-            (common_flags & SOCAM_VSYNC_ACTIVE_LOW)) {
+            (common_flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)) {
                if (mx3_cam->platform_flags & MX3_CAMERA_VSP)
-                        common_flags &= ~SOCAM_VSYNC_ACTIVE_HIGH;
+                        common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_HIGH;
                else
-                        common_flags &= ~SOCAM_VSYNC_ACTIVE_LOW;
+                        common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_LOW;
        }
-        if ((common_flags & SOCAM_DATA_ACTIVE_HIGH) &&
+        if ((common_flags & V4L2_MBUS_DATA_ACTIVE_HIGH) &&
-            (common_flags & SOCAM_DATA_ACTIVE_LOW)) {
+            (common_flags & V4L2_MBUS_DATA_ACTIVE_LOW)) {
                if (mx3_cam->platform_flags & MX3_CAMERA_DP)
-                        common_flags &= ~SOCAM_DATA_ACTIVE_HIGH;
+                        common_flags &= ~V4L2_MBUS_DATA_ACTIVE_HIGH;
                else
-                        common_flags &= ~SOCAM_DATA_ACTIVE_LOW;
+                        common_flags &= ~V4L2_MBUS_DATA_ACTIVE_LOW;
        }
-        if ((common_flags & SOCAM_PCLK_SAMPLE_RISING) &&
+        if ((common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING) &&
-            (common_flags & SOCAM_PCLK_SAMPLE_FALLING)) {
+            (common_flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)) {
                if (mx3_cam->platform_flags & MX3_CAMERA_PCP)
-                        common_flags &= ~SOCAM_PCLK_SAMPLE_RISING;
+                        common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_RISING;
                else
-                        common_flags &= ~SOCAM_PCLK_SAMPLE_FALLING;
+                        common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_FALLING;
        }
-        /*
+        cfg.flags = common_flags;
-         * Make the camera work in widest common mode, we'll take care of
+        ret = v4l2_subdev_call(sd, video, s_mbus_config, &cfg);
-         * the rest
+        if (ret < 0 && ret != -ENOIOCTLCMD) {
-         */
+                dev_dbg(dev, "camera s_mbus_config(0x%lx) returned %d\n",
-        if (common_flags & SOCAM_DATAWIDTH_15)
-                common_flags = (common_flags & ~SOCAM_DATAWIDTH_MASK) |
-                        SOCAM_DATAWIDTH_15;
-        else if (common_flags & SOCAM_DATAWIDTH_10)
-                common_flags = (common_flags & ~SOCAM_DATAWIDTH_MASK) |
-                        SOCAM_DATAWIDTH_10;
-        else if (common_flags & SOCAM_DATAWIDTH_8)
-                common_flags = (common_flags & ~SOCAM_DATAWIDTH_MASK) |
-                        SOCAM_DATAWIDTH_8;
-        else
-                common_flags = (common_flags & ~SOCAM_DATAWIDTH_MASK) |
-                        SOCAM_DATAWIDTH_4;
-        ret = icd->ops->set_bus_param(icd, common_flags);
-        if (ret < 0) {
-                dev_dbg(dev, "camera set_bus_param(%lx) returned %d\n",
                        common_flags, ret);
                return ret;
        }
@@ -1108,13 +1093,13 @@ static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
        /* This has been set in mx3_camera_activate(), but we clear it above */
        sens_conf |= CSI_SENS_CONF_DATA_FMT_BAYER;
-        if (common_flags & SOCAM_PCLK_SAMPLE_FALLING)
+        if (common_flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)
                sens_conf |= 1 << CSI_SENS_CONF_PIX_CLK_POL_SHIFT;
-        if (common_flags & SOCAM_HSYNC_ACTIVE_LOW)
+        if (common_flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)
                sens_conf |= 1 << CSI_SENS_CONF_HSYNC_POL_SHIFT;
-        if (common_flags & SOCAM_VSYNC_ACTIVE_LOW)
+        if (common_flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)
                sens_conf |= 1 << CSI_SENS_CONF_VSYNC_POL_SHIFT;
-        if (common_flags & SOCAM_DATA_ACTIVE_LOW)
+        if (common_flags & V4L2_MBUS_DATA_ACTIVE_LOW)
                sens_conf |= 1 << CSI_SENS_CONF_DATA_POL_SHIFT;
        /* Just do what we're asked to do */
@@ -1199,6 +1184,14 @@ static int __devinit mx3_camera_probe(struct platform_device *pdev)
                         "data widths, using default 8 bit\n");
                mx3_cam->platform_flags |= MX3_CAMERA_DATAWIDTH_8;
        }
+        if (mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_4)
+                mx3_cam->width_flags = 1 << 3;
+        if (mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_8)
+                mx3_cam->width_flags |= 1 << 7;
+        if (mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_10)
+                mx3_cam->width_flags |= 1 << 9;
+        if (mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_15)
+                mx3_cam->width_flags |= 1 << 14;
        mx3_cam->mclk = mx3_cam->pdata->mclk_10khz * 10000;
        if (!mx3_cam->mclk) {
@@ -1281,8 +1274,6 @@ static int __devexit mx3_camera_remove(struct platform_device *pdev)
        dmaengine_put();
-        dev_info(&pdev->dev, "i.MX3x Camera driver unloaded\n");
        return 0;
 }
diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index f0c3968ac7eb..2e4131748438 100644
--- a/drivers/media/video/mxb.c
+++ b/drivers/media/video/mxb.c
@@ -29,6 +29,7 @@
 #include <media/tuner.h>
 #include <media/v4l2-common.h>
 #include <media/saa7115.h>
+#include <linux/module.h>
 #include "mxb.h"
 #include "tea6415c.h"
diff --git a/drivers/media/video/noon010pc30.c b/drivers/media/video/noon010pc30.c
index 6cd21cf91b44..50838bf84204 100644
--- a/drivers/media/video/noon010pc30.c
+++ b/drivers/media/video/noon010pc30.c
@@ -21,6 +21,7 @@
 #include <media/noon010pc30.h>
 #include <media/v4l2-chip-ident.h>
 #include <linux/videodev2.h>
+#include <linux/module.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-mediabus.h>
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
index 30d8896bb710..9c5c19f142de 100644
--- a/drivers/media/video/omap/omap_vout.c
+++ b/drivers/media/video/omap/omap_vout.c
@@ -833,6 +833,15 @@ static void omap_vout_buffer_release(struct videobuf_queue *q,
 /*
 *  File operations
 */
+static unsigned int omap_vout_poll(struct file *file,
+                                   struct poll_table_struct *wait)
+{
+        struct omap_vout_device *vout = file->private_data;
+        struct videobuf_queue *q = &vout->vbq;
+        return videobuf_poll_stream(file, q, wait);
+}
 static void omap_vout_vm_open(struct vm_area_struct *vma)
 {
        struct omap_vout_device *vout = vma->vm_private_data;
@@ -1861,6 +1870,7 @@ static const struct v4l2_ioctl_ops vout_ioctl_ops = {
 static const struct v4l2_file_operations omap_vout_fops = {
        .owner          = THIS_MODULE,
+        .poll           = omap_vout_poll,
        .unlocked_ioctl = video_ioctl2,
        .mmap           = omap_vout_mmap,
        .open           = omap_vout_open,
diff --git a/drivers/media/video/omap1_camera.c b/drivers/media/video/omap1_camera.c
index 8a947e603aca..e87ae2f634b2 100644
--- a/drivers/media/video/omap1_camera.c
+++ b/drivers/media/video/omap1_camera.c
@@ -102,10 +102,10 @@
 /* end of OMAP1 Camera Interface registers */
-#define SOCAM_BUS_FLAGS (SOCAM_MASTER | \
+#define SOCAM_BUS_FLAGS (V4L2_MBUS_MASTER | \
-                        SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH | \
+                        V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_HIGH | \
-                        SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING | \
+                        V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_PCLK_SAMPLE_FALLING | \
-                        SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATAWIDTH_8)
+                        V4L2_MBUS_DATA_ACTIVE_HIGH)
 #define FIFO_SIZE               ((THRESHOLD_MASK >> THRESHOLD_SHIFT) + 1)
@@ -1438,41 +1438,55 @@ static int omap1_cam_querycap(struct soc_camera_host *ici,
 static int omap1_cam_set_bus_param(struct soc_camera_device *icd,
                __u32 pixfmt)
 {
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
        struct device *dev = icd->parent;
        struct soc_camera_host *ici = to_soc_camera_host(dev);
        struct omap1_cam_dev *pcdev = ici->priv;
        const struct soc_camera_format_xlate *xlate;
        const struct soc_mbus_pixelfmt *fmt;
-        unsigned long camera_flags, common_flags;
+        struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
+        unsigned long common_flags;
        u32 ctrlclock, mode;
        int ret;
-        camera_flags = icd->ops->query_bus_param(icd);
+        ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
+        if (!ret) {
-        common_flags = soc_camera_bus_param_compatible(camera_flags,
+                common_flags = soc_mbus_config_compatible(&cfg, SOCAM_BUS_FLAGS);
-                        SOCAM_BUS_FLAGS);
+                if (!common_flags) {
-        if (!common_flags)
+                        dev_warn(dev,
-                return -EINVAL;
+                                 "Flags incompatible: camera 0x%x, host 0x%x\n",
+                                 cfg.flags, SOCAM_BUS_FLAGS);
+                        return -EINVAL;
+                }
+        } else if (ret != -ENOIOCTLCMD) {
+                return ret;
+        } else {
+                common_flags = SOCAM_BUS_FLAGS;
+        }
        /* Make choices, possibly based on platform configuration */
-        if ((common_flags & SOCAM_PCLK_SAMPLE_RISING) &&
+        if ((common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING) &&
-                        (common_flags & SOCAM_PCLK_SAMPLE_FALLING)) {
+                        (common_flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)) {
                if (!pcdev->pdata ||
                                pcdev->pdata->flags & OMAP1_CAMERA_LCLK_RISING)
-                        common_flags &= ~SOCAM_PCLK_SAMPLE_FALLING;
+                        common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_FALLING;
                else
-                        common_flags &= ~SOCAM_PCLK_SAMPLE_RISING;
+                        common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_RISING;
        }
-        ret = icd->ops->set_bus_param(icd, common_flags);
+        cfg.flags = common_flags;
-        if (ret < 0)
+        ret = v4l2_subdev_call(sd, video, s_mbus_config, &cfg);
+        if (ret < 0 && ret != -ENOIOCTLCMD) {
+                dev_dbg(dev, "camera s_mbus_config(0x%lx) returned %d\n",
+                        common_flags, ret);
                return ret;
+        }
        ctrlclock = CAM_READ_CACHE(pcdev, CTRLCLOCK);
        if (ctrlclock & LCLK_EN)
                CAM_WRITE(pcdev, CTRLCLOCK, ctrlclock & ~LCLK_EN);
-        if (common_flags & SOCAM_PCLK_SAMPLE_RISING) {
+        if (common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING) {
                dev_dbg(dev, "CTRLCLOCK_REG |= POLCLK\n");
                ctrlclock |= POLCLK;
        } else {
@@ -1565,10 +1579,10 @@ static int __init omap1_cam_probe(struct platform_device *pdev)
        pcdev->clk = clk;
        pcdev->pdata = pdev->dev.platform_data;
-        pcdev->pflags = pcdev->pdata->flags;
+        if (pcdev->pdata) {
+                pcdev->pflags = pcdev->pdata->flags;
-        if (pcdev->pdata)
                pcdev->camexclk = pcdev->pdata->camexclk_khz * 1000;
+        }
        switch (pcdev->camexclk) {
        case 6000000:
@@ -1578,6 +1592,7 @@ static int __init omap1_cam_probe(struct platform_device *pdev)
        case 24000000:
                break;
        default:
+                /* pcdev->camexclk != 0 => pcdev->pdata != NULL */
                dev_warn(&pdev->dev,
                                "Incorrect sensor clock frequency %ld kHz, "
                                "should be one of 0, 6, 8, 9.6, 12 or 24 MHz, "
@@ -1585,8 +1600,7 @@ static int __init omap1_cam_probe(struct platform_device *pdev)
                                pcdev->pdata->camexclk_khz);
                pcdev->camexclk = 0;
        case 0:
-                dev_info(&pdev->dev,
+                dev_info(&pdev->dev, "Not providing sensor clock\n");
-                                "Not providing sensor clock\n");
        }
        INIT_LIST_HEAD(&pcdev->capture);
@@ -1716,5 +1730,5 @@ MODULE_PARM_DESC(sg_mode, "videobuf mode, 0: dma-contig (default), 1: dma-sg");
 MODULE_DESCRIPTION("OMAP1 Camera Interface driver");
 MODULE_AUTHOR("Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>");
 MODULE_LICENSE("GPL v2");
-MODULE_LICENSE(DRIVER_VERSION);
+MODULE_VERSION(DRIVER_VERSION);
 MODULE_ALIAS("platform:" DRIVER_NAME);
diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c
index eb97bff7116f..45522e603185 100644
--- a/drivers/media/video/omap24xxcam.c
+++ b/drivers/media/video/omap24xxcam.c
@@ -36,6 +36,7 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
+#include <linux/module.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
diff --git a/drivers/media/video/omap3isp/isp.c b/drivers/media/video/omap3isp/isp.c
index 678e1252047a..b818cacf420f 100644
--- a/drivers/media/video/omap3isp/isp.c
+++ b/drivers/media/video/omap3isp/isp.c
@@ -1704,6 +1704,7 @@ static int isp_register_entities(struct isp_device *isp)
        isp->media_dev.dev = isp->dev;
        strlcpy(isp->media_dev.model, "TI OMAP3 ISP",
                sizeof(isp->media_dev.model));
+        isp->media_dev.hw_revision = isp->revision;
        isp->media_dev.link_notify = isp_pipeline_link_notify;
        ret = media_device_register(&isp->media_dev);
        if (ret < 0) {
@@ -2210,6 +2211,8 @@ error:
        regulator_put(isp->isp_csiphy2.vdd);
        regulator_put(isp->isp_csiphy1.vdd);
        platform_set_drvdata(pdev, NULL);
+        mutex_destroy(&isp->isp_mutex);
        kfree(isp);
        return ret;
diff --git a/drivers/media/video/omap3isp/ispccdc.c b/drivers/media/video/omap3isp/ispccdc.c
index 253fdcce2df2..b0b0fa5a3572 100644
--- a/drivers/media/video/omap3isp/ispccdc.c
+++ b/drivers/media/video/omap3isp/ispccdc.c
@@ -1836,7 +1836,7 @@ ccdc_try_format(struct isp_ccdc_device *ccdc, struct v4l2_subdev_fh *fh,
                 * callers to request an output size bigger than the input size
                 * up to the nearest multiple of 16.
                 */
-                fmt->width = clamp_t(u32, width, 32, (fmt->width + 15) & ~15);
+                fmt->width = clamp_t(u32, width, 32, fmt->width + 15);
                fmt->width &= ~15;
                fmt->height = clamp_t(u32, height, 32, fmt->height);
                break;
@@ -2152,6 +2152,37 @@ static const struct media_entity_operations ccdc_media_ops = {
        .link_setup = ccdc_link_setup,
 };
+void omap3isp_ccdc_unregister_entities(struct isp_ccdc_device *ccdc)
+{
+        v4l2_device_unregister_subdev(&ccdc->subdev);
+        omap3isp_video_unregister(&ccdc->video_out);
+}
+int omap3isp_ccdc_register_entities(struct isp_ccdc_device *ccdc,
+        struct v4l2_device *vdev)
+{
+        int ret;
+        /* Register the subdev and video node. */
+        ret = v4l2_device_register_subdev(vdev, &ccdc->subdev);
+        if (ret < 0)
+                goto error;
+        ret = omap3isp_video_register(&ccdc->video_out, vdev);
+        if (ret < 0)
+                goto error;
+        return 0;
+error:
+        omap3isp_ccdc_unregister_entities(ccdc);
+        return ret;
+}
+/* -----------------------------------------------------------------------------
+ * ISP CCDC initialisation and cleanup
+ */
 /*
 * ccdc_init_entities - Initialize V4L2 subdev and media entity
 * @ccdc: ISP CCDC module
@@ -2193,50 +2224,23 @@ static int ccdc_init_entities(struct isp_ccdc_device *ccdc)
        ret = omap3isp_video_init(&ccdc->video_out, "CCDC");
        if (ret < 0)
-                return ret;
+                goto error_video;
        /* Connect the CCDC subdev to the video node. */
        ret = media_entity_create_link(&ccdc->subdev.entity, CCDC_PAD_SOURCE_OF,
                        &ccdc->video_out.video.entity, 0, 0);
        if (ret < 0)
-                return ret;
+                goto error_link;
-        return 0;
-}
-void omap3isp_ccdc_unregister_entities(struct isp_ccdc_device *ccdc)
-{
-        media_entity_cleanup(&ccdc->subdev.entity);
-        v4l2_device_unregister_subdev(&ccdc->subdev);
-        omap3isp_video_unregister(&ccdc->video_out);
-}
-int omap3isp_ccdc_register_entities(struct isp_ccdc_device *ccdc,
-        struct v4l2_device *vdev)
-{
-        int ret;
-        /* Register the subdev and video node. */
-        ret = v4l2_device_register_subdev(vdev, &ccdc->subdev);
-        if (ret < 0)
-                goto error;
-        ret = omap3isp_video_register(&ccdc->video_out, vdev);
-        if (ret < 0)
-                goto error;
        return 0;
-error:
+error_link:
-        omap3isp_ccdc_unregister_entities(ccdc);
+        omap3isp_video_cleanup(&ccdc->video_out);
+error_video:
+        media_entity_cleanup(me);
        return ret;
 }
-/* -----------------------------------------------------------------------------
- * ISP CCDC initialisation and cleanup
- */
 /*
 * omap3isp_ccdc_init - CCDC module initialization.
 * @dev: Device pointer specific to the OMAP3 ISP.
@@ -2248,6 +2252,7 @@ error:
 int omap3isp_ccdc_init(struct isp_device *isp)
 {
        struct isp_ccdc_device *ccdc = &isp->isp_ccdc;
+        int ret;
        spin_lock_init(&ccdc->lock);
        init_waitqueue_head(&ccdc->wait);
@@ -2276,7 +2281,13 @@ int omap3isp_ccdc_init(struct isp_device *isp)
        ccdc->update = OMAP3ISP_CCDC_BLCLAMP;
        ccdc_apply_controls(ccdc);
-        return ccdc_init_entities(ccdc);
+        ret = ccdc_init_entities(ccdc);
+        if (ret < 0) {
+                mutex_destroy(&ccdc->ioctl_lock);
+                return ret;
+        }
+        return 0;
 }
 /*
@@ -2287,6 +2298,9 @@ void omap3isp_ccdc_cleanup(struct isp_device *isp)
 {
        struct isp_ccdc_device *ccdc = &isp->isp_ccdc;
+        omap3isp_video_cleanup(&ccdc->video_out);
+        media_entity_cleanup(&ccdc->subdev.entity);
        /* Free LSC requests. As the CCDC is stopped there's no active request,
         * so only the pending request and the free queue need to be handled.
         */
@@ -2296,4 +2310,6 @@ void omap3isp_ccdc_cleanup(struct isp_device *isp)
        if (ccdc->fpc.fpcaddr != 0)
                omap_iommu_vfree(isp->domain, isp->iommu, ccdc->fpc.fpcaddr);
+        mutex_destroy(&ccdc->ioctl_lock);
 }
diff --git a/drivers/media/video/omap3isp/ispccp2.c b/drivers/media/video/omap3isp/ispccp2.c
index fa1d09b0ad98..904ca8c8b17f 100644
--- a/drivers/media/video/omap3isp/ispccp2.c
+++ b/drivers/media/video/omap3isp/ispccp2.c
@@ -1032,6 +1032,48 @@ static const struct media_entity_operations ccp2_media_ops = {
 };
 /*
+ * omap3isp_ccp2_unregister_entities - Unregister media entities: subdev
+ * @ccp2: Pointer to ISP CCP2 device
+ */
+void omap3isp_ccp2_unregister_entities(struct isp_ccp2_device *ccp2)
+{
+        v4l2_device_unregister_subdev(&ccp2->subdev);
+        omap3isp_video_unregister(&ccp2->video_in);
+}
+/*
+ * omap3isp_ccp2_register_entities - Register the subdev media entity
+ * @ccp2: Pointer to ISP CCP2 device
+ * @vdev: Pointer to v4l device
+ * return negative error code or zero on success
+ */
+int omap3isp_ccp2_register_entities(struct isp_ccp2_device *ccp2,
+                                    struct v4l2_device *vdev)
+{
+        int ret;
+        /* Register the subdev and video nodes. */
+        ret = v4l2_device_register_subdev(vdev, &ccp2->subdev);
+        if (ret < 0)
+                goto error;
+        ret = omap3isp_video_register(&ccp2->video_in, vdev);
+        if (ret < 0)
+                goto error;
+        return 0;
+error:
+        omap3isp_ccp2_unregister_entities(ccp2);
+        return ret;
+}
+/* -----------------------------------------------------------------------------
+ * ISP ccp2 initialisation and cleanup
+ */
+/*
 * ccp2_init_entities - Initialize ccp2 subdev and media entity.
 * @ccp2: Pointer to ISP CCP2 device
 * return negative error code or zero on success
@@ -1083,72 +1125,23 @@ static int ccp2_init_entities(struct isp_ccp2_device *ccp2)
        ret = omap3isp_video_init(&ccp2->video_in, "CCP2");
        if (ret < 0)
-                return ret;
+                goto error_video;
        /* Connect the video node to the ccp2 subdev. */
        ret = media_entity_create_link(&ccp2->video_in.video.entity, 0,
                                       &ccp2->subdev.entity, CCP2_PAD_SINK, 0);
        if (ret < 0)
-                return ret;
+                goto error_link;
        return 0;
-}
-/*
+error_link:
- * omap3isp_ccp2_unregister_entities - Unregister media entities: subdev
+        omap3isp_video_cleanup(&ccp2->video_in);
- * @ccp2: Pointer to ISP CCP2 device
+error_video:
- */
-void omap3isp_ccp2_unregister_entities(struct isp_ccp2_device *ccp2)
-{
        media_entity_cleanup(&ccp2->subdev.entity);
-        v4l2_device_unregister_subdev(&ccp2->subdev);
-        omap3isp_video_unregister(&ccp2->video_in);
-}
-/*
- * omap3isp_ccp2_register_entities - Register the subdev media entity
- * @ccp2: Pointer to ISP CCP2 device
- * @vdev: Pointer to v4l device
- * return negative error code or zero on success
- */
-int omap3isp_ccp2_register_entities(struct isp_ccp2_device *ccp2,
-                                    struct v4l2_device *vdev)
-{
-        int ret;
-        /* Register the subdev and video nodes. */
-        ret = v4l2_device_register_subdev(vdev, &ccp2->subdev);
-        if (ret < 0)
-                goto error;
-        ret = omap3isp_video_register(&ccp2->video_in, vdev);
-        if (ret < 0)
-                goto error;
-        return 0;
-error:
-        omap3isp_ccp2_unregister_entities(ccp2);
        return ret;
 }
-/* -----------------------------------------------------------------------------
- * ISP ccp2 initialisation and cleanup
- */
-/*
- * omap3isp_ccp2_cleanup - CCP2 un-initialization
- * @isp : Pointer to ISP device
- */
-void omap3isp_ccp2_cleanup(struct isp_device *isp)
-{
-        struct isp_ccp2_device *ccp2 = &isp->isp_ccp2;
-        regulator_put(ccp2->vdds_csib);
-}
 /*
 * omap3isp_ccp2_init - CCP2 initialization.
 * @isp : Pointer to ISP device
@@ -1184,13 +1177,25 @@ int omap3isp_ccp2_init(struct isp_device *isp)
        }
        ret = ccp2_init_entities(ccp2);
-        if (ret < 0)
+        if (ret < 0) {
-                goto out;
+                regulator_put(ccp2->vdds_csib);
+                return ret;
+        }
        ccp2_reset(ccp2);
-out:
+        return 0;
-        if (ret)
+}
-                omap3isp_ccp2_cleanup(isp);
-        return ret;
+/*
+ * omap3isp_ccp2_cleanup - CCP2 un-initialization
+ * @isp : Pointer to ISP device
+ */
+void omap3isp_ccp2_cleanup(struct isp_device *isp)
+{
+        struct isp_ccp2_device *ccp2 = &isp->isp_ccp2;
+        omap3isp_video_cleanup(&ccp2->video_in);
+        media_entity_cleanup(&ccp2->subdev.entity);
+        regulator_put(ccp2->vdds_csib);
 }
diff --git a/drivers/media/video/omap3isp/ispcsi2.c b/drivers/media/video/omap3isp/ispcsi2.c
index 69161a682b3d..0c5f1cb9d99d 100644
--- a/drivers/media/video/omap3isp/ispcsi2.c
+++ b/drivers/media/video/omap3isp/ispcsi2.c
@@ -1187,6 +1187,37 @@ static const struct media_entity_operations csi2_media_ops = {
        .link_setup = csi2_link_setup,
 };
+void omap3isp_csi2_unregister_entities(struct isp_csi2_device *csi2)
+{
+        v4l2_device_unregister_subdev(&csi2->subdev);
+        omap3isp_video_unregister(&csi2->video_out);
+}
+int omap3isp_csi2_register_entities(struct isp_csi2_device *csi2,
+                                    struct v4l2_device *vdev)
+{
+        int ret;
+        /* Register the subdev and video nodes. */
+        ret = v4l2_device_register_subdev(vdev, &csi2->subdev);
+        if (ret < 0)
+                goto error;
+        ret = omap3isp_video_register(&csi2->video_out, vdev);
+        if (ret < 0)
+                goto error;
+        return 0;
+error:
+        omap3isp_csi2_unregister_entities(csi2);
+        return ret;
+}
+/* -----------------------------------------------------------------------------
+ * ISP CSI2 initialisation and cleanup
+ */
 /*
 * csi2_init_entities - Initialize subdev and media entity.
 * @csi2: Pointer to csi2 structure.
@@ -1228,57 +1259,23 @@ static int csi2_init_entities(struct isp_csi2_device *csi2)
        ret = omap3isp_video_init(&csi2->video_out, "CSI2a");
        if (ret < 0)
-                return ret;
+                goto error_video;
        /* Connect the CSI2 subdev to the video node. */
        ret = media_entity_create_link(&csi2->subdev.entity, CSI2_PAD_SOURCE,
                                       &csi2->video_out.video.entity, 0, 0);
        if (ret < 0)
-                return ret;
+                goto error_link;
        return 0;
-}
-void omap3isp_csi2_unregister_entities(struct isp_csi2_device *csi2)
+error_link:
-{
+        omap3isp_video_cleanup(&csi2->video_out);
+error_video:
        media_entity_cleanup(&csi2->subdev.entity);
-        v4l2_device_unregister_subdev(&csi2->subdev);
-        omap3isp_video_unregister(&csi2->video_out);
-}
-int omap3isp_csi2_register_entities(struct isp_csi2_device *csi2,
-                                    struct v4l2_device *vdev)
-{
-        int ret;
-        /* Register the subdev and video nodes. */
-        ret = v4l2_device_register_subdev(vdev, &csi2->subdev);
-        if (ret < 0)
-                goto error;
-        ret = omap3isp_video_register(&csi2->video_out, vdev);
-        if (ret < 0)
-                goto error;
-        return 0;
-error:
-        omap3isp_csi2_unregister_entities(csi2);
        return ret;
 }
-/* -----------------------------------------------------------------------------
- * ISP CSI2 initialisation and cleanup
- */
-/*
- * omap3isp_csi2_cleanup - Routine for module driver cleanup
- */
-void omap3isp_csi2_cleanup(struct isp_device *isp)
-{
-}
 /*
 * omap3isp_csi2_init - Routine for module driver init
 */
@@ -1298,7 +1295,7 @@ int omap3isp_csi2_init(struct isp_device *isp)
        ret = csi2_init_entities(csi2a);
        if (ret < 0)
-                goto fail;
+                return ret;
        if (isp->revision == ISP_REVISION_15_0) {
                csi2c->isp = isp;
@@ -1311,7 +1308,15 @@ int omap3isp_csi2_init(struct isp_device *isp)
        }
        return 0;
-fail:
+}
-        omap3isp_csi2_cleanup(isp);
-        return ret;
+/*
+ * omap3isp_csi2_cleanup - Routine for module driver cleanup
+ */
+void omap3isp_csi2_cleanup(struct isp_device *isp)
+{
+        struct isp_csi2_device *csi2a = &isp->isp_csi2a;
+        omap3isp_video_cleanup(&csi2a->video_out);
+        media_entity_cleanup(&csi2a->subdev.entity);
 }
diff --git a/drivers/media/video/omap3isp/isph3a_aewb.c b/drivers/media/video/omap3isp/isph3a_aewb.c
index 8068cefd8d89..a3c76bf18175 100644
--- a/drivers/media/video/omap3isp/isph3a_aewb.c
+++ b/drivers/media/video/omap3isp/isph3a_aewb.c
@@ -370,5 +370,5 @@ void omap3isp_h3a_aewb_cleanup(struct isp_device *isp)
 {
        kfree(isp->isp_aewb.priv);
        kfree(isp->isp_aewb.recover_priv);
-        omap3isp_stat_free(&isp->isp_aewb);
+        omap3isp_stat_cleanup(&isp->isp_aewb);
 }
diff --git a/drivers/media/video/omap3isp/isph3a_af.c b/drivers/media/video/omap3isp/isph3a_af.c
index ba54d0acdecf..58e0bc414899 100644
--- a/drivers/media/video/omap3isp/isph3a_af.c
+++ b/drivers/media/video/omap3isp/isph3a_af.c
@@ -425,5 +425,5 @@ void omap3isp_h3a_af_cleanup(struct isp_device *isp)
 {
        kfree(isp->isp_af.priv);
        kfree(isp->isp_af.recover_priv);
-        omap3isp_stat_free(&isp->isp_af);
+        omap3isp_stat_cleanup(&isp->isp_af);
 }
diff --git a/drivers/media/video/omap3isp/isphist.c b/drivers/media/video/omap3isp/isphist.c
index 1743856b30d1..1163907bcddc 100644
--- a/drivers/media/video/omap3isp/isphist.c
+++ b/drivers/media/video/omap3isp/isphist.c
@@ -516,5 +516,5 @@ void omap3isp_hist_cleanup(struct isp_device *isp)
        if (HIST_USING_DMA(&isp->isp_hist))
                omap_free_dma(isp->isp_hist.dma_ch);
        kfree(isp->isp_hist.priv);
-        omap3isp_stat_free(&isp->isp_hist);
+        omap3isp_stat_cleanup(&isp->isp_hist);
 }
diff --git a/drivers/media/video/omap3isp/isppreview.c b/drivers/media/video/omap3isp/isppreview.c
index aba537af87e4..ccb876fe023f 100644
--- a/drivers/media/video/omap3isp/isppreview.c
+++ b/drivers/media/video/omap3isp/isppreview.c
@@ -76,9 +76,51 @@ static struct omap3isp_prev_csc flr_prev_csc = {
 #define DEF_DETECT_CORRECT_VAL  0xe
-#define PREV_MIN_WIDTH          64
+/*
-#define PREV_MIN_HEIGHT         8
+ * Margins and image size limits.
-#define PREV_MAX_HEIGHT         16384
+ *
+ * The preview engine crops several rows and columns internally depending on
+ * which filters are enabled. To avoid format changes when the filters are
+ * enabled or disabled (which would prevent them from being turned on or off
+ * during streaming), the driver assumes all the filters are enabled when
+ * computing sink crop and source format limits.
+ *
+ * If a filter is disabled, additional cropping is automatically added at the
+ * preview engine input by the driver to avoid overflow at line and frame end.
+ * This is completely transparent for applications.
+ *
+ * Median filter                4 pixels
+ * Noise filter,
+ * Faulty pixels correction     4 pixels, 4 lines
+ * CFA filter                   4 pixels, 4 lines in Bayer mode
+ *                                        2 lines in other modes
+ * Color suppression            2 pixels
+ * or luma enhancement
+ * -------------------------------------------------------------
+ * Maximum total                14 pixels, 8 lines
+ *
+ * The color suppression and luma enhancement filters are applied after bayer to
+ * YUV conversion. They thus can crop one pixel on the left and one pixel on the
+ * right side of the image without changing the color pattern. When both those
+ * filters are disabled, the driver must crop the two pixels on the same side of
+ * the image to avoid changing the bayer pattern. The left margin is thus set to
+ * 8 pixels and the right margin to 6 pixels.
+ */
+#define PREV_MARGIN_LEFT        8
+#define PREV_MARGIN_RIGHT       6
+#define PREV_MARGIN_TOP         4
+#define PREV_MARGIN_BOTTOM      4
+#define PREV_MIN_IN_WIDTH       64
+#define PREV_MIN_IN_HEIGHT      8
+#define PREV_MAX_IN_HEIGHT      16384
+#define PREV_MIN_OUT_WIDTH      0
+#define PREV_MIN_OUT_HEIGHT     0
+#define PREV_MAX_OUT_WIDTH      1280
+#define PREV_MAX_OUT_WIDTH_ES2  3300
+#define PREV_MAX_OUT_WIDTH_3630 4096
 /*
 * Coeficient Tables for the submodules in Preview.
@@ -979,52 +1021,36 @@ static void preview_config_averager(struct isp_prev_device *prev, u8 average)
 * enabled when reporting source pad formats to userspace. If this assumption is
 * not true, rows and columns must be manually cropped at the preview engine
 * input to avoid overflows at the end of lines and frames.
+ *
+ * See the explanation at the PREV_MARGIN_* definitions for more details.
 */
 static void preview_config_input_size(struct isp_prev_device *prev)
 {
        struct isp_device *isp = to_isp_device(prev);
        struct prev_params *params = &prev->params;
-        struct v4l2_mbus_framefmt *format = &prev->formats[PREV_PAD_SINK];
+        unsigned int sph = prev->crop.left;
-        unsigned int sph = 0;
+        unsigned int eph = prev->crop.left + prev->crop.width - 1;
-        unsigned int eph = format->width - 1;
+        unsigned int slv = prev->crop.top;
-        unsigned int slv = 0;
+        unsigned int elv = prev->crop.top + prev->crop.height - 1;
-        unsigned int elv = format->height - 1;
+        if (params->features & PREV_CFA) {
-        if (prev->input == PREVIEW_INPUT_CCDC) {
+                sph -= 2;
-                sph += 2;
+                eph += 2;
-                eph -= 2;
+                slv -= 2;
+                elv += 2;
        }
+        if (params->features & (PREV_DEFECT_COR | PREV_NOISE_FILTER)) {
-        /*
+                sph -= 2;
-         * Median filter        4 pixels
+                eph += 2;
-         * Noise filter         4 pixels, 4 lines
+                slv -= 2;
-         * or faulty pixels correction
+                elv += 2;
-         * CFA filter           4 pixels, 4 lines in Bayer mode
-         *                                2 lines in other modes
-         * Color suppression    2 pixels
-         * or luma enhancement
-         * -------------------------------------------------------------
-         * Maximum total        14 pixels, 8 lines
-         */
-        if (!(params->features & PREV_CFA)) {
-                sph += 2;
-                eph -= 2;
-                slv += 2;
-                elv -= 2;
        }
-        if (!(params->features & (PREV_DEFECT_COR | PREV_NOISE_FILTER))) {
+        if (params->features & PREV_HORZ_MEDIAN_FILTER) {
-                sph += 2;
+                sph -= 2;
-                eph -= 2;
+                eph += 2;
-                slv += 2;
-                elv -= 2;
        }
-        if (!(params->features & PREV_HORZ_MEDIAN_FILTER)) {
+        if (params->features & (PREV_CHROMA_SUPPRESS | PREV_LUMA_ENHANCE))
-                sph += 2;
+                sph -= 2;
-                eph -= 2;
-        }
-        if (!(params->features & (PREV_CHROMA_SUPPRESS | PREV_LUMA_ENHANCE)))
-                sph += 2;
        isp_reg_writel(isp, (sph << ISPPRV_HORZ_INFO_SPH_SHIFT) | eph,
                       OMAP3_ISP_IOMEM_PREV, ISPPRV_HORZ_INFO);
@@ -1228,7 +1254,6 @@ static void preview_init_params(struct isp_prev_device *prev)
        /* Init values */
        params->contrast = ISPPRV_CONTRAST_DEF * ISPPRV_CONTRAST_UNITS;
        params->brightness = ISPPRV_BRIGHT_DEF * ISPPRV_BRIGHT_UNITS;
-        params->average = NO_AVE;
        params->cfa.format = OMAP3ISP_CFAFMT_BAYER;
        memcpy(params->cfa.table, cfa_coef_table,
               sizeof(params->cfa.table));
@@ -1281,14 +1306,14 @@ static unsigned int preview_max_out_width(struct isp_prev_device *prev)
        switch (isp->revision) {
        case ISP_REVISION_1_0:
-                return ISPPRV_MAXOUTPUT_WIDTH;
+                return PREV_MAX_OUT_WIDTH;
        case ISP_REVISION_2_0:
        default:
-                return ISPPRV_MAXOUTPUT_WIDTH_ES2;
+                return PREV_MAX_OUT_WIDTH_ES2;
        case ISP_REVISION_15_0:
-                return ISPPRV_MAXOUTPUT_WIDTH_3630;
+                return PREV_MAX_OUT_WIDTH_3630;
        }
 }
@@ -1296,8 +1321,6 @@ static void preview_configure(struct isp_prev_device *prev)
 {
        struct isp_device *isp = to_isp_device(prev);
        struct v4l2_mbus_framefmt *format;
-        unsigned int max_out_width;
-        unsigned int format_avg;
        preview_setup_hw(prev);
@@ -1335,10 +1358,7 @@ static void preview_configure(struct isp_prev_device *prev)
                preview_config_outlineoffset(prev,
                                ALIGN(format->width, 0x10) * 2);
-        max_out_width = preview_max_out_width(prev);
+        preview_config_averager(prev, 0);
-        format_avg = fls(DIV_ROUND_UP(format->width, max_out_width) - 1);
-        preview_config_averager(prev, format_avg);
        preview_config_ycpos(prev, format->code);
 }
@@ -1597,6 +1617,16 @@ __preview_get_format(struct isp_prev_device *prev, struct v4l2_subdev_fh *fh,
                return &prev->formats[pad];
 }
+static struct v4l2_rect *
+__preview_get_crop(struct isp_prev_device *prev, struct v4l2_subdev_fh *fh,
+                   enum v4l2_subdev_format_whence which)
+{
+        if (which == V4L2_SUBDEV_FORMAT_TRY)
+                return v4l2_subdev_get_try_crop(fh, PREV_PAD_SINK);
+        else
+                return &prev->crop;
+}
 /* previewer format descriptions */
 static const unsigned int preview_input_fmts[] = {
        V4L2_MBUS_FMT_SGRBG10_1X10,
@@ -1611,24 +1641,25 @@ static const unsigned int preview_output_fmts[] = {
 };
 /*
- * preview_try_format - Handle try format by pad subdev method
+ * preview_try_format - Validate a format
- * @prev: ISP preview device
+ * @prev: ISP preview engine
- * @fh : V4L2 subdev file handle
+ * @fh: V4L2 subdev file handle
- * @pad: pad num
+ * @pad: pad number
- * @fmt: pointer to v4l2 format structure
+ * @fmt: format to be validated
+ * @which: try/active format selector
+ *
+ * Validate and adjust the given format for the given pad based on the preview
+ * engine limits and the format and crop rectangles on other pads.
 */
 static void preview_try_format(struct isp_prev_device *prev,
                               struct v4l2_subdev_fh *fh, unsigned int pad,
                               struct v4l2_mbus_framefmt *fmt,
                               enum v4l2_subdev_format_whence which)
 {
-        struct v4l2_mbus_framefmt *format;
-        unsigned int max_out_width;
        enum v4l2_mbus_pixelcode pixelcode;
+        struct v4l2_rect *crop;
        unsigned int i;
-        max_out_width = preview_max_out_width(prev);
        switch (pad) {
        case PREV_PAD_SINK:
                /* When reading data from the CCDC, the input size has already
@@ -1641,10 +1672,11 @@ static void preview_try_format(struct isp_prev_device *prev,
                 * filter array interpolation.
                 */
                if (prev->input == PREVIEW_INPUT_MEMORY) {
-                        fmt->width = clamp_t(u32, fmt->width, PREV_MIN_WIDTH,
+                        fmt->width = clamp_t(u32, fmt->width, PREV_MIN_IN_WIDTH,
-                                             max_out_width * 8);
+                                             preview_max_out_width(prev));
-                        fmt->height = clamp_t(u32, fmt->height, PREV_MIN_HEIGHT,
+                        fmt->height = clamp_t(u32, fmt->height,
-                                              PREV_MAX_HEIGHT);
+                                              PREV_MIN_IN_HEIGHT,
+                                              PREV_MAX_IN_HEIGHT);
                }
                fmt->colorspace = V4L2_COLORSPACE_SRGB;
@@ -1661,15 +1693,8 @@ static void preview_try_format(struct isp_prev_device *prev,
        case PREV_PAD_SOURCE:
                pixelcode = fmt->code;
-                format = __preview_get_format(prev, fh, PREV_PAD_SINK, which);
+                *fmt = *__preview_get_format(prev, fh, PREV_PAD_SINK, which);
-                memcpy(fmt, format, sizeof(*fmt));
-                /* The preview module output size is configurable through the
-                 * input interface (horizontal and vertical cropping) and the
-                 * averager (horizontal scaling by 1/1, 1/2, 1/4 or 1/8). In
-                 * spite of this, hardcode the output size to the biggest
-                 * possible value for simplicity reasons.
-                 */
                switch (pixelcode) {
                case V4L2_MBUS_FMT_YUYV8_1X16:
                case V4L2_MBUS_FMT_UYVY8_1X16:
@@ -1681,31 +1706,14 @@ static void preview_try_format(struct isp_prev_device *prev,
                        break;
                }
-                /* The TRM states (12.1.4.7.1.2) that 2 pixels must be cropped
+                /* The preview module output size is configurable through the
-                 * from the left and right sides when the input source is the
+                 * averager (horizontal scaling by 1/1, 1/2, 1/4 or 1/8). This
-                 * CCDC. This seems not to be needed in practice, investigation
+                 * is not supported yet, hardcode the output size to the crop
-                 * is required.
+                 * rectangle size.
-                 */
-                if (prev->input == PREVIEW_INPUT_CCDC)
-                        fmt->width -= 4;
-                /* The preview module can output a maximum of 3312 pixels
-                 * horizontally due to fixed memory-line sizes. Compute the
-                 * horizontal averaging factor accordingly. Note that the limit
-                 * applies to the noise filter and CFA interpolation blocks, so
-                 * it doesn't take cropping by further blocks into account.
-                 *
-                 * ES 1.0 hardware revision is limited to 1280 pixels
-                 * horizontally.
-                 */
-                fmt->width >>= fls(DIV_ROUND_UP(fmt->width, max_out_width) - 1);
-                /* Assume that all blocks are enabled and crop pixels and lines
-                 * accordingly. See preview_config_input_size() for more
-                 * information.
                 */
-                fmt->width -= 14;
+                crop = __preview_get_crop(prev, fh, which);
-                fmt->height -= 8;
+                fmt->width = crop->width;
+                fmt->height = crop->height;
                fmt->colorspace = V4L2_COLORSPACE_JPEG;
                break;
@@ -1715,6 +1723,49 @@ static void preview_try_format(struct isp_prev_device *prev,
 }
 /*
+ * preview_try_crop - Validate a crop rectangle
+ * @prev: ISP preview engine
+ * @sink: format on the sink pad
+ * @crop: crop rectangle to be validated
+ *
+ * The preview engine crops lines and columns for its internal operation,
+ * depending on which filters are enabled. Enforce minimum crop margins to
+ * handle that transparently for userspace.
+ *
+ * See the explanation at the PREV_MARGIN_* definitions for more details.
+ */
+static void preview_try_crop(struct isp_prev_device *prev,
+                             const struct v4l2_mbus_framefmt *sink,
+                             struct v4l2_rect *crop)
+{
+        unsigned int left = PREV_MARGIN_LEFT;
+        unsigned int right = sink->width - PREV_MARGIN_RIGHT;
+        unsigned int top = PREV_MARGIN_TOP;
+        unsigned int bottom = sink->height - PREV_MARGIN_BOTTOM;
+        /* When processing data on-the-fly from the CCDC, at least 2 pixels must
+         * be cropped from the left and right sides of the image. As we don't
+         * know which filters will be enabled, increase the left and right
+         * margins by two.
+         */
+        if (prev->input == PREVIEW_INPUT_CCDC) {
+                left += 2;
+                right -= 2;
+        }
+        /* Restrict left/top to even values to keep the Bayer pattern. */
+        crop->left &= ~1;
+        crop->top &= ~1;
+        crop->left = clamp_t(u32, crop->left, left, right - PREV_MIN_OUT_WIDTH);
+        crop->top = clamp_t(u32, crop->top, top, bottom - PREV_MIN_OUT_HEIGHT);
+        crop->width = clamp_t(u32, crop->width, PREV_MIN_OUT_WIDTH,
+                              right - crop->left);
+        crop->height = clamp_t(u32, crop->height, PREV_MIN_OUT_HEIGHT,
+                               bottom - crop->top);
+}
+/*
 * preview_enum_mbus_code - Handle pixel format enumeration
 * @sd     : pointer to v4l2 subdev structure
 * @fh     : V4L2 subdev file handle
@@ -1776,6 +1827,60 @@ static int preview_enum_frame_size(struct v4l2_subdev *sd,
 }
 /*
+ * preview_get_crop - Retrieve the crop rectangle on a pad
+ * @sd: ISP preview V4L2 subdevice
+ * @fh: V4L2 subdev file handle
+ * @crop: crop rectangle
+ *
+ * Return 0 on success or a negative error code otherwise.
+ */
+static int preview_get_crop(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+                            struct v4l2_subdev_crop *crop)
+{
+        struct isp_prev_device *prev = v4l2_get_subdevdata(sd);
+        /* Cropping is only supported on the sink pad. */
+        if (crop->pad != PREV_PAD_SINK)
+                return -EINVAL;
+        crop->rect = *__preview_get_crop(prev, fh, crop->which);
+        return 0;
+}
+/*
+ * preview_set_crop - Retrieve the crop rectangle on a pad
+ * @sd: ISP preview V4L2 subdevice
+ * @fh: V4L2 subdev file handle
+ * @crop: crop rectangle
+ *
+ * Return 0 on success or a negative error code otherwise.
+ */
+static int preview_set_crop(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+                            struct v4l2_subdev_crop *crop)
+{
+        struct isp_prev_device *prev = v4l2_get_subdevdata(sd);
+        struct v4l2_mbus_framefmt *format;
+        /* Cropping is only supported on the sink pad. */
+        if (crop->pad != PREV_PAD_SINK)
+                return -EINVAL;
+        /* The crop rectangle can't be changed while streaming. */
+        if (prev->state != ISP_PIPELINE_STREAM_STOPPED)
+                return -EBUSY;
+        format = __preview_get_format(prev, fh, PREV_PAD_SINK, crop->which);
+        preview_try_crop(prev, format, &crop->rect);
+        *__preview_get_crop(prev, fh, crop->which) = crop->rect;
+        /* Update the source format. */
+        format = __preview_get_format(prev, fh, PREV_PAD_SOURCE, crop->which);
+        preview_try_format(prev, fh, PREV_PAD_SOURCE, format, crop->which);
+        return 0;
+}
+/*
 * preview_get_format - Handle get format by pads subdev method
 * @sd : pointer to v4l2 subdev structure
 * @fh : V4L2 subdev file handle
@@ -1808,6 +1913,7 @@ static int preview_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
 {
        struct isp_prev_device *prev = v4l2_get_subdevdata(sd);
        struct v4l2_mbus_framefmt *format;
+        struct v4l2_rect *crop;
        format = __preview_get_format(prev, fh, fmt->pad, fmt->which);
        if (format == NULL)
@@ -1818,9 +1924,18 @@ static int preview_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
        /* Propagate the format from sink to source */
        if (fmt->pad == PREV_PAD_SINK) {
+                /* Reset the crop rectangle. */
+                crop = __preview_get_crop(prev, fh, fmt->which);
+                crop->left = 0;
+                crop->top = 0;
+                crop->width = fmt->format.width;
+                crop->height = fmt->format.height;
+                preview_try_crop(prev, &fmt->format, crop);
+                /* Update the source format. */
                format = __preview_get_format(prev, fh, PREV_PAD_SOURCE,
                                              fmt->which);
-                *format = fmt->format;
                preview_try_format(prev, fh, PREV_PAD_SOURCE, format,
                                   fmt->which);
        }
@@ -1869,6 +1984,8 @@ static const struct v4l2_subdev_pad_ops preview_v4l2_pad_ops = {
        .enum_frame_size = preview_enum_frame_size,
        .get_fmt = preview_get_format,
        .set_fmt = preview_set_format,
+        .get_crop = preview_get_crop,
+        .set_crop = preview_set_crop,
 };
 /* subdev operations */
@@ -1966,8 +2083,44 @@ static const struct media_entity_operations preview_media_ops = {
        .link_setup = preview_link_setup,
 };
+void omap3isp_preview_unregister_entities(struct isp_prev_device *prev)
+{
+        v4l2_device_unregister_subdev(&prev->subdev);
+        omap3isp_video_unregister(&prev->video_in);
+        omap3isp_video_unregister(&prev->video_out);
+}
+int omap3isp_preview_register_entities(struct isp_prev_device *prev,
+        struct v4l2_device *vdev)
+{
+        int ret;
+        /* Register the subdev and video nodes. */
+        ret = v4l2_device_register_subdev(vdev, &prev->subdev);
+        if (ret < 0)
+                goto error;
+        ret = omap3isp_video_register(&prev->video_in, vdev);
+        if (ret < 0)
+                goto error;
+        ret = omap3isp_video_register(&prev->video_out, vdev);
+        if (ret < 0)
+                goto error;
+        return 0;
+error:
+        omap3isp_preview_unregister_entities(prev);
+        return ret;
+}
+/* -----------------------------------------------------------------------------
+ * ISP previewer initialisation and cleanup
+ */
 /*
- * review_init_entities - Initialize subdev and media entity.
+ * preview_init_entities - Initialize subdev and media entity.
 * @prev : Pointer to preview structure
 * return -ENOMEM or zero on success
 */
@@ -2024,69 +2177,34 @@ static int preview_init_entities(struct isp_prev_device *prev)
        ret = omap3isp_video_init(&prev->video_in, "preview");
        if (ret < 0)
-                return ret;
+                goto error_video_in;
        ret = omap3isp_video_init(&prev->video_out, "preview");
        if (ret < 0)
-                return ret;
+                goto error_video_out;
        /* Connect the video nodes to the previewer subdev. */
        ret = media_entity_create_link(&prev->video_in.video.entity, 0,
                        &prev->subdev.entity, PREV_PAD_SINK, 0);
        if (ret < 0)
-                return ret;
+                goto error_link;
        ret = media_entity_create_link(&prev->subdev.entity, PREV_PAD_SOURCE,
                        &prev->video_out.video.entity, 0, 0);
        if (ret < 0)
-                return ret;
+                goto error_link;
        return 0;
-}
-void omap3isp_preview_unregister_entities(struct isp_prev_device *prev)
+error_link:
-{
+        omap3isp_video_cleanup(&prev->video_out);
+error_video_out:
+        omap3isp_video_cleanup(&prev->video_in);
+error_video_in:
        media_entity_cleanup(&prev->subdev.entity);
-        v4l2_device_unregister_subdev(&prev->subdev);
-        v4l2_ctrl_handler_free(&prev->ctrls);
-        omap3isp_video_unregister(&prev->video_in);
-        omap3isp_video_unregister(&prev->video_out);
-}
-int omap3isp_preview_register_entities(struct isp_prev_device *prev,
-        struct v4l2_device *vdev)
-{
-        int ret;
-        /* Register the subdev and video nodes. */
-        ret = v4l2_device_register_subdev(vdev, &prev->subdev);
-        if (ret < 0)
-                goto error;
-        ret = omap3isp_video_register(&prev->video_in, vdev);
-        if (ret < 0)
-                goto error;
-        ret = omap3isp_video_register(&prev->video_out, vdev);
-        if (ret < 0)
-                goto error;
-        return 0;
-error:
-        omap3isp_preview_unregister_entities(prev);
        return ret;
 }
-/* -----------------------------------------------------------------------------
- * ISP previewer initialisation and cleanup
- */
-void omap3isp_preview_cleanup(struct isp_device *isp)
-{
-}
 /*
 * isp_preview_init - Previewer initialization.
 * @dev : Pointer to ISP device
@@ -2095,19 +2213,20 @@ void omap3isp_preview_cleanup(struct isp_device *isp)
 int omap3isp_preview_init(struct isp_device *isp)
 {
        struct isp_prev_device *prev = &isp->isp_prev;
-        int ret;
        spin_lock_init(&prev->lock);
        init_waitqueue_head(&prev->wait);
        preview_init_params(prev);
-        ret = preview_init_entities(prev);
+        return preview_init_entities(prev);
-        if (ret < 0)
+}
-                goto out;
-out:
+void omap3isp_preview_cleanup(struct isp_device *isp)
-        if (ret)
+{
-                omap3isp_preview_cleanup(isp);
+        struct isp_prev_device *prev = &isp->isp_prev;
-        return ret;
+        v4l2_ctrl_handler_free(&prev->ctrls);
+        omap3isp_video_cleanup(&prev->video_in);
+        omap3isp_video_cleanup(&prev->video_out);
+        media_entity_cleanup(&prev->subdev.entity);
 }
diff --git a/drivers/media/video/omap3isp/isppreview.h b/drivers/media/video/omap3isp/isppreview.h
index fa943bd05c7f..f54e775c2df4 100644
--- a/drivers/media/video/omap3isp/isppreview.h
+++ b/drivers/media/video/omap3isp/isppreview.h
@@ -45,11 +45,6 @@
 #define ISPPRV_CONTRAST_HIGH            0xFF
 #define ISPPRV_CONTRAST_UNITS           0x1
-#define NO_AVE                          0x0
-#define AVE_2_PIX                       0x1
-#define AVE_4_PIX                       0x2
-#define AVE_8_PIX                       0x3
 /* Features list */
 #define PREV_LUMA_ENHANCE               OMAP3ISP_PREV_LUMAENH
 #define PREV_INVERSE_ALAW               OMAP3ISP_PREV_INVALAW
@@ -106,7 +101,6 @@ enum preview_ycpos_mode {
 * @rgb2ycbcr: RGB to ycbcr parameters.
 * @hmed: Horizontal median filter.
 * @yclimit: YC limits parameters.
- * @average: Downsampling rate for averager.
 * @contrast: Contrast.
 * @brightness: Brightness.
 */
@@ -124,7 +118,6 @@ struct prev_params {
        struct omap3isp_prev_csc rgb2ycbcr;
        struct omap3isp_prev_hmed hmed;
        struct omap3isp_prev_yclimit yclimit;
-        u8 average;
        u8 contrast;
        u8 brightness;
 };
@@ -159,6 +152,7 @@ struct isptables_update {
 * @subdev: V4L2 subdevice
 * @pads: Media entity pads
 * @formats: Active formats at the subdev pad
+ * @crop: Active crop rectangle
 * @input: Module currently connected to the input pad
 * @output: Bitmask of the active output
 * @video_in: Input video entity
@@ -177,6 +171,7 @@ struct isp_prev_device {
        struct v4l2_subdev subdev;
        struct media_pad pads[PREV_PADS_NUM];
        struct v4l2_mbus_framefmt formats[PREV_PADS_NUM];
+        struct v4l2_rect crop;
        struct v4l2_ctrl_handler ctrls;
diff --git a/drivers/media/video/omap3isp/ispreg.h b/drivers/media/video/omap3isp/ispreg.h
index 69f6af6f6b9c..084ea77d65a7 100644
--- a/drivers/media/video/omap3isp/ispreg.h
+++ b/drivers/media/video/omap3isp/ispreg.h
@@ -402,9 +402,6 @@
 #define ISPPRV_YENH_TABLE_ADDR          0x1000
 #define ISPPRV_CFA_TABLE_ADDR           0x1400
-#define ISPPRV_MAXOUTPUT_WIDTH          1280
-#define ISPPRV_MAXOUTPUT_WIDTH_ES2      3300
-#define ISPPRV_MAXOUTPUT_WIDTH_3630     4096
 #define ISPRSZ_MIN_OUTPUT               64
 #define ISPRSZ_MAX_OUTPUT               3312
diff --git a/drivers/media/video/omap3isp/ispresizer.c b/drivers/media/video/omap3isp/ispresizer.c
index 0bb0f8cd36f5..50e593bfcfaf 100644
--- a/drivers/media/video/omap3isp/ispresizer.c
+++ b/drivers/media/video/omap3isp/ispresizer.c
@@ -1608,6 +1608,42 @@ static const struct media_entity_operations resizer_media_ops = {
        .link_setup = resizer_link_setup,
 };
+void omap3isp_resizer_unregister_entities(struct isp_res_device *res)
+{
+        v4l2_device_unregister_subdev(&res->subdev);
+        omap3isp_video_unregister(&res->video_in);
+        omap3isp_video_unregister(&res->video_out);
+}
+int omap3isp_resizer_register_entities(struct isp_res_device *res,
+                                       struct v4l2_device *vdev)
+{
+        int ret;
+        /* Register the subdev and video nodes. */
+        ret = v4l2_device_register_subdev(vdev, &res->subdev);
+        if (ret < 0)
+                goto error;
+        ret = omap3isp_video_register(&res->video_in, vdev);
+        if (ret < 0)
+                goto error;
+        ret = omap3isp_video_register(&res->video_out, vdev);
+        if (ret < 0)
+                goto error;
+        return 0;
+error:
+        omap3isp_resizer_unregister_entities(res);
+        return ret;
+}
+/* -----------------------------------------------------------------------------
+ * ISP resizer initialization and cleanup
+ */
 /*
 * resizer_init_entities - Initialize resizer subdev and media entity.
 * @res : Pointer to resizer device structure
@@ -1652,68 +1688,34 @@ static int resizer_init_entities(struct isp_res_device *res)
        ret = omap3isp_video_init(&res->video_in, "resizer");
        if (ret < 0)
-                return ret;
+                goto error_video_in;
        ret = omap3isp_video_init(&res->video_out, "resizer");
        if (ret < 0)
-                return ret;
+                goto error_video_out;
        /* Connect the video nodes to the resizer subdev. */
        ret = media_entity_create_link(&res->video_in.video.entity, 0,
                        &res->subdev.entity, RESZ_PAD_SINK, 0);
        if (ret < 0)
-                return ret;
+                goto error_link;
        ret = media_entity_create_link(&res->subdev.entity, RESZ_PAD_SOURCE,
                        &res->video_out.video.entity, 0, 0);
        if (ret < 0)
-                return ret;
+                goto error_link;
        return 0;
-}
-void omap3isp_resizer_unregister_entities(struct isp_res_device *res)
+error_link:
-{
+        omap3isp_video_cleanup(&res->video_out);
+error_video_out:
+        omap3isp_video_cleanup(&res->video_in);
+error_video_in:
        media_entity_cleanup(&res->subdev.entity);
-        v4l2_device_unregister_subdev(&res->subdev);
-        omap3isp_video_unregister(&res->video_in);
-        omap3isp_video_unregister(&res->video_out);
-}
-int omap3isp_resizer_register_entities(struct isp_res_device *res,
-                                       struct v4l2_device *vdev)
-{
-        int ret;
-        /* Register the subdev and video nodes. */
-        ret = v4l2_device_register_subdev(vdev, &res->subdev);
-        if (ret < 0)
-                goto error;
-        ret = omap3isp_video_register(&res->video_in, vdev);
-        if (ret < 0)
-                goto error;
-        ret = omap3isp_video_register(&res->video_out, vdev);
-        if (ret < 0)
-                goto error;
-        return 0;
-error:
-        omap3isp_resizer_unregister_entities(res);
        return ret;
 }
-/* -----------------------------------------------------------------------------
- * ISP resizer initialization and cleanup
- */
-void omap3isp_resizer_cleanup(struct isp_device *isp)
-{
-}
 /*
 * isp_resizer_init - Resizer initialization.
 * @isp : Pointer to ISP device
@@ -1722,17 +1724,17 @@ void omap3isp_resizer_cleanup(struct isp_device *isp)
 int omap3isp_resizer_init(struct isp_device *isp)
 {
        struct isp_res_device *res = &isp->isp_res;
-        int ret;
        init_waitqueue_head(&res->wait);
        atomic_set(&res->stopping, 0);
-        ret = resizer_init_entities(res);
+        return resizer_init_entities(res);
-        if (ret < 0)
+}
-                goto out;
-out:
+void omap3isp_resizer_cleanup(struct isp_device *isp)
-        if (ret)
+{
-                omap3isp_resizer_cleanup(isp);
+        struct isp_res_device *res = &isp->isp_res;
-        return ret;
+        omap3isp_video_cleanup(&res->video_in);
+        omap3isp_video_cleanup(&res->video_out);
+        media_entity_cleanup(&res->subdev.entity);
 }
diff --git a/drivers/media/video/omap3isp/ispstat.c b/drivers/media/video/omap3isp/ispstat.c
index 732905552261..68d539456c55 100644
--- a/drivers/media/video/omap3isp/ispstat.c
+++ b/drivers/media/video/omap3isp/ispstat.c
@@ -1023,24 +1023,6 @@ void omap3isp_stat_dma_isr(struct ispstat *stat)
        __stat_isr(stat, 1);
 }
-static int isp_stat_init_entities(struct ispstat *stat, const char *name,
-                                  const struct v4l2_subdev_ops *sd_ops)
-{
-        struct v4l2_subdev *subdev = &stat->subdev;
-        struct media_entity *me = &subdev->entity;
-        v4l2_subdev_init(subdev, sd_ops);
-        snprintf(subdev->name, V4L2_SUBDEV_NAME_SIZE, "OMAP3 ISP %s", name);
-        subdev->grp_id = 1 << 16;       /* group ID for isp subdevs */
-        subdev->flags |= V4L2_SUBDEV_FL_HAS_EVENTS | V4L2_SUBDEV_FL_HAS_DEVNODE;
-        v4l2_set_subdevdata(subdev, stat);
-        stat->pad.flags = MEDIA_PAD_FL_SINK;
-        me->ops = NULL;
-        return media_entity_init(me, 1, &stat->pad, 0);
-}
 int omap3isp_stat_subscribe_event(struct v4l2_subdev *subdev,
                                  struct v4l2_fh *fh,
                                  struct v4l2_event_subscription *sub)
@@ -1062,7 +1044,6 @@ int omap3isp_stat_unsubscribe_event(struct v4l2_subdev *subdev,
 void omap3isp_stat_unregister_entities(struct ispstat *stat)
 {
-        media_entity_cleanup(&stat->subdev.entity);
        v4l2_device_unregister_subdev(&stat->subdev);
 }
@@ -1072,21 +1053,50 @@ int omap3isp_stat_register_entities(struct ispstat *stat,
        return v4l2_device_register_subdev(vdev, &stat->subdev);
 }
+static int isp_stat_init_entities(struct ispstat *stat, const char *name,
+                                  const struct v4l2_subdev_ops *sd_ops)
+{
+        struct v4l2_subdev *subdev = &stat->subdev;
+        struct media_entity *me = &subdev->entity;
+        v4l2_subdev_init(subdev, sd_ops);
+        snprintf(subdev->name, V4L2_SUBDEV_NAME_SIZE, "OMAP3 ISP %s", name);
+        subdev->grp_id = 1 << 16;       /* group ID for isp subdevs */
+        subdev->flags |= V4L2_SUBDEV_FL_HAS_EVENTS | V4L2_SUBDEV_FL_HAS_DEVNODE;
+        v4l2_set_subdevdata(subdev, stat);
+        stat->pad.flags = MEDIA_PAD_FL_SINK;
+        me->ops = NULL;
+        return media_entity_init(me, 1, &stat->pad, 0);
+}
 int omap3isp_stat_init(struct ispstat *stat, const char *name,
                       const struct v4l2_subdev_ops *sd_ops)
 {
+        int ret;
        stat->buf = kcalloc(STAT_MAX_BUFS, sizeof(*stat->buf), GFP_KERNEL);
        if (!stat->buf)
                return -ENOMEM;
        isp_stat_buf_clear(stat);
        mutex_init(&stat->ioctl_lock);
        atomic_set(&stat->buf_err, 0);
-        return isp_stat_init_entities(stat, name, sd_ops);
+        ret = isp_stat_init_entities(stat, name, sd_ops);
+        if (ret < 0) {
+                mutex_destroy(&stat->ioctl_lock);
+                kfree(stat->buf);
+        }
+        return ret;
 }
-void omap3isp_stat_free(struct ispstat *stat)
+void omap3isp_stat_cleanup(struct ispstat *stat)
 {
+        media_entity_cleanup(&stat->subdev.entity);
+        mutex_destroy(&stat->ioctl_lock);
        isp_stat_bufs_free(stat);
        kfree(stat->buf);
 }
diff --git a/drivers/media/video/omap3isp/ispstat.h b/drivers/media/video/omap3isp/ispstat.h
index d86da94fa50d..9b7c8654dc8a 100644
--- a/drivers/media/video/omap3isp/ispstat.h
+++ b/drivers/media/video/omap3isp/ispstat.h
@@ -144,7 +144,7 @@ int omap3isp_stat_request_statistics(struct ispstat *stat,
                                     struct omap3isp_stat_data *data);
 int omap3isp_stat_init(struct ispstat *stat, const char *name,
                       const struct v4l2_subdev_ops *sd_ops);
-void omap3isp_stat_free(struct ispstat *stat);
+void omap3isp_stat_cleanup(struct ispstat *stat);
 int omap3isp_stat_subscribe_event(struct v4l2_subdev *subdev,
                                  struct v4l2_fh *fh,
                                  struct v4l2_event_subscription *sub);
diff --git a/drivers/media/video/omap3isp/ispvideo.c b/drivers/media/video/omap3isp/ispvideo.c
index 0cb8a9f9d675..d1000723c5ae 100644
--- a/drivers/media/video/omap3isp/ispvideo.c
+++ b/drivers/media/video/omap3isp/ispvideo.c
@@ -1325,6 +1325,13 @@ int omap3isp_video_init(struct isp_video *video, const char *name)
        return 0;
 }
+void omap3isp_video_cleanup(struct isp_video *video)
+{
+        media_entity_cleanup(&video->video.entity);
+        mutex_destroy(&video->stream_lock);
+        mutex_destroy(&video->mutex);
+}
 int omap3isp_video_register(struct isp_video *video, struct v4l2_device *vdev)
 {
        int ret;
@@ -1341,8 +1348,6 @@ int omap3isp_video_register(struct isp_video *video, struct v4l2_device *vdev)
 void omap3isp_video_unregister(struct isp_video *video)
 {
-        if (video_is_registered(&video->video)) {
+        if (video_is_registered(&video->video))
-                media_entity_cleanup(&video->video.entity);
                video_unregister_device(&video->video);
-        }
 }
diff --git a/drivers/media/video/omap3isp/ispvideo.h b/drivers/media/video/omap3isp/ispvideo.h
index 53160aa24e6e..08cbfa144e6e 100644
--- a/drivers/media/video/omap3isp/ispvideo.h
+++ b/drivers/media/video/omap3isp/ispvideo.h
@@ -190,6 +190,7 @@ struct isp_video_fh {
                                container_of(q, struct isp_video_fh, queue)
 int omap3isp_video_init(struct isp_video *video, const char *name);
+void omap3isp_video_cleanup(struct isp_video *video);
 int omap3isp_video_register(struct isp_video *video,
                            struct v4l2_device *vdev);
 void omap3isp_video_unregister(struct isp_video *video);
diff --git a/drivers/media/video/ov2640.c b/drivers/media/video/ov2640.c
index 9ce2fa037b94..b5247cb64fde 100644
--- a/drivers/media/video/ov2640.c
+++ b/drivers/media/video/ov2640.c
@@ -18,11 +18,13 @@
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
+#include <linux/v4l2-mediabus.h>
 #include <linux/videodev2.h>
+#include <media/soc_camera.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-subdev.h>
-#include <media/soc_camera.h>
+#include <media/v4l2-ctrls.h>
-#include <media/soc_mediabus.h>
 #define VAL_SET(x, mask, rshift, lshift)  \
                ((((x) >> rshift) & mask) << lshift)
@@ -299,12 +301,10 @@ struct ov2640_win_size {
 struct ov2640_priv {
        struct v4l2_subdev              subdev;
-        struct ov2640_camera_info       *info;
+        struct v4l2_ctrl_handler        hdl;
        enum v4l2_mbus_pixelcode        cfmt_code;
        const struct ov2640_win_size    *win;
        int                             model;
-        u16                             flag_vflip:1;
-        u16                             flag_hflip:1;
 };
 /*
@@ -610,29 +610,6 @@ static enum v4l2_mbus_pixelcode ov2640_codes[] = {
 };
 /*
- * Supported controls
- */
-static const struct v4l2_queryctrl ov2640_controls[] = {
-        {
-                .id             = V4L2_CID_VFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Flip Vertically",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        }, {
-                .id             = V4L2_CID_HFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Flip Horizontally",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        },
-};
-/*
 * General functions
 */
 static struct ov2640_priv *to_ov2640(const struct i2c_client *client)
@@ -701,81 +678,23 @@ static int ov2640_s_stream(struct v4l2_subdev *sd, int enable)
        return 0;
 }
-static int ov2640_set_bus_param(struct soc_camera_device *icd,
+static int ov2640_s_ctrl(struct v4l2_ctrl *ctrl)
-                                unsigned long flags)
-{
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        unsigned long width_flag = flags & SOCAM_DATAWIDTH_MASK;
-        /* Only one width bit may be set */
-        if (!is_power_of_2(width_flag))
-                return -EINVAL;
-        if (icl->set_bus_param)
-                return icl->set_bus_param(icl, width_flag);
-        /*
-         * Without board specific bus width settings we support only the
-         * sensors native bus width witch are tested working
-         */
-        if (width_flag & (SOCAM_DATAWIDTH_10 | SOCAM_DATAWIDTH_8))
-                return 0;
-        return 0;
-}
-static unsigned long ov2640_query_bus_param(struct soc_camera_device *icd)
-{
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        unsigned long flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_MASTER |
-                SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_HIGH |
-                SOCAM_DATA_ACTIVE_HIGH;
-        if (icl->query_bus_param)
-                flags |= icl->query_bus_param(icl) & SOCAM_DATAWIDTH_MASK;
-        else
-                flags |= SOCAM_DATAWIDTH_10;
-        return soc_camera_apply_sensor_flags(icl, flags);
-}
-static int ov2640_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
+        struct v4l2_subdev *sd =
+                &container_of(ctrl->handler, struct ov2640_priv, hdl)->subdev;
        struct i2c_client  *client = v4l2_get_subdevdata(sd);
-        struct ov2640_priv *priv = to_ov2640(client);
-        switch (ctrl->id) {
-        case V4L2_CID_VFLIP:
-                ctrl->value = priv->flag_vflip;
-                break;
-        case V4L2_CID_HFLIP:
-                ctrl->value = priv->flag_hflip;
-                break;
-        }
-        return 0;
-}
-static int ov2640_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
-{
-        struct i2c_client  *client = v4l2_get_subdevdata(sd);
-        struct ov2640_priv *priv = to_ov2640(client);
-        int ret = 0;
        u8 val;
        switch (ctrl->id) {
        case V4L2_CID_VFLIP:
-                val = ctrl->value ? REG04_VFLIP_IMG : 0x00;
+                val = ctrl->val ? REG04_VFLIP_IMG : 0x00;
-                priv->flag_vflip = ctrl->value ? 1 : 0;
+                return ov2640_mask_set(client, REG04, REG04_VFLIP_IMG, val);
-                ret = ov2640_mask_set(client, REG04, REG04_VFLIP_IMG, val);
-                break;
        case V4L2_CID_HFLIP:
-                val = ctrl->value ? REG04_HFLIP_IMG : 0x00;
+                val = ctrl->val ? REG04_HFLIP_IMG : 0x00;
-                priv->flag_hflip = ctrl->value ? 1 : 0;
+                return ov2640_mask_set(client, REG04, REG04_HFLIP_IMG, val);
-                ret = ov2640_mask_set(client, REG04, REG04_HFLIP_IMG, val);
-                break;
        }
-        return ret;
+        return -EINVAL;
 }
 static int ov2640_g_chip_ident(struct v4l2_subdev *sd,
@@ -1023,18 +942,13 @@ static int ov2640_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
        return 0;
 }
-static int ov2640_video_probe(struct soc_camera_device *icd,
+static int ov2640_video_probe(struct i2c_client *client)
-                              struct i2c_client *client)
 {
        struct ov2640_priv *priv = to_ov2640(client);
        u8 pid, ver, midh, midl;
        const char *devname;
        int ret;
-        /* We must have a parent by now. And it cannot be a wrong one. */
-        BUG_ON(!icd->parent ||
-               to_soc_camera_host(icd->parent)->nr != icd->iface);
        /*
         * check and show product ID and manufacturer ID
         */
@@ -1060,22 +974,17 @@ static int ov2640_video_probe(struct soc_camera_device *icd,
                 "%s Product ID %0x:%0x Manufacturer ID %x:%x\n",
                 devname, pid, ver, midh, midl);
-        return 0;
+        return v4l2_ctrl_handler_setup(&priv->hdl);
 err:
        return ret;
 }
-static struct soc_camera_ops ov2640_ops = {
+static const struct v4l2_ctrl_ops ov2640_ctrl_ops = {
-        .set_bus_param          = ov2640_set_bus_param,
+        .s_ctrl = ov2640_s_ctrl,
-        .query_bus_param        = ov2640_query_bus_param,
-        .controls               = ov2640_controls,
-        .num_controls           = ARRAY_SIZE(ov2640_controls),
 };
 static struct v4l2_subdev_core_ops ov2640_subdev_core_ops = {
-        .g_ctrl         = ov2640_g_ctrl,
-        .s_ctrl         = ov2640_s_ctrl,
        .g_chip_ident   = ov2640_g_chip_ident,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
        .g_register     = ov2640_g_register,
@@ -1083,6 +992,21 @@ static struct v4l2_subdev_core_ops ov2640_subdev_core_ops = {
 #endif
 };
+static int ov2640_g_mbus_config(struct v4l2_subdev *sd,
+                                struct v4l2_mbus_config *cfg)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        cfg->flags = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER |
+                V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH |
+                V4L2_MBUS_DATA_ACTIVE_HIGH;
+        cfg->type = V4L2_MBUS_PARALLEL;
+        cfg->flags = soc_camera_apply_board_flags(icl, cfg);
+        return 0;
+}
 static struct v4l2_subdev_video_ops ov2640_subdev_video_ops = {
        .s_stream       = ov2640_s_stream,
        .g_mbus_fmt     = ov2640_g_fmt,
@@ -1091,6 +1015,7 @@ static struct v4l2_subdev_video_ops ov2640_subdev_video_ops = {
        .cropcap        = ov2640_cropcap,
        .g_crop         = ov2640_g_crop,
        .enum_mbus_fmt  = ov2640_enum_fmt,
+        .g_mbus_config  = ov2640_g_mbus_config,
 };
 static struct v4l2_subdev_ops ov2640_subdev_ops = {
@@ -1104,18 +1029,11 @@ static struct v4l2_subdev_ops ov2640_subdev_ops = {
 static int ov2640_probe(struct i2c_client *client,
                        const struct i2c_device_id *did)
 {
-        struct ov2640_priv        *priv;
+        struct ov2640_priv      *priv;
-        struct soc_camera_device  *icd = client->dev.platform_data;
+        struct soc_camera_link  *icl = soc_camera_i2c_to_link(client);
-        struct i2c_adapter        *adapter = to_i2c_adapter(client->dev.parent);
+        struct i2c_adapter      *adapter = to_i2c_adapter(client->dev.parent);
-        struct soc_camera_link    *icl;
+        int                     ret;
-        int                        ret;
-        if (!icd) {
-                dev_err(&adapter->dev, "OV2640: missing soc-camera data!\n");
-                return -EINVAL;
-        }
-        icl = to_soc_camera_link(icd);
        if (!icl) {
                dev_err(&adapter->dev,
                        "OV2640: Missing platform_data for driver\n");
@@ -1135,15 +1053,23 @@ static int ov2640_probe(struct i2c_client *client,
                return -ENOMEM;
        }
-        priv->info = icl->priv;
        v4l2_i2c_subdev_init(&priv->subdev, client, &ov2640_subdev_ops);
+        v4l2_ctrl_handler_init(&priv->hdl, 2);
+        v4l2_ctrl_new_std(&priv->hdl, &ov2640_ctrl_ops,
+                        V4L2_CID_VFLIP, 0, 1, 1, 0);
+        v4l2_ctrl_new_std(&priv->hdl, &ov2640_ctrl_ops,
+                        V4L2_CID_HFLIP, 0, 1, 1, 0);
+        priv->subdev.ctrl_handler = &priv->hdl;
+        if (priv->hdl.error) {
+                int err = priv->hdl.error;
-        icd->ops = &ov2640_ops;
+                kfree(priv);
+                return err;
+        }
-        ret = ov2640_video_probe(icd, client);
+        ret = ov2640_video_probe(client);
        if (ret) {
-                icd->ops = NULL;
+                v4l2_ctrl_handler_free(&priv->hdl);
                kfree(priv);
        } else {
                dev_info(&adapter->dev, "OV2640 Probed\n");
@@ -1155,9 +1081,9 @@ static int ov2640_probe(struct i2c_client *client,
 static int ov2640_remove(struct i2c_client *client)
 {
        struct ov2640_priv       *priv = to_ov2640(client);
-        struct soc_camera_device *icd = client->dev.platform_data;
-        icd->ops = NULL;
+        v4l2_device_unregister_subdev(&priv->subdev);
+        v4l2_ctrl_handler_free(&priv->hdl);
        kfree(priv);
        return 0;
 }
diff --git a/drivers/media/video/ov5642.c b/drivers/media/video/ov5642.c
index 349a4ad3ccc1..bb37ec80f274 100644
--- a/drivers/media/video/ov5642.c
+++ b/drivers/media/video/ov5642.c
@@ -14,14 +14,16 @@
 * published by the Free Software Foundation.
 */
+#include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/i2c.h>
+#include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/videodev2.h>
 #include <linux/module.h>
+#include <linux/v4l2-mediabus.h>
 #include <media/soc_camera.h>
-#include <media/soc_mediabus.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-subdev.h>
@@ -35,7 +37,7 @@
 #define REG_WINDOW_START_Y_LOW          0x3803
 #define REG_WINDOW_WIDTH_HIGH           0x3804
 #define REG_WINDOW_WIDTH_LOW            0x3805
-#define REG_WINDOW_HEIGHT_HIGH          0x3806
+#define REG_WINDOW_HEIGHT_HIGH          0x3806
 #define REG_WINDOW_HEIGHT_LOW           0x3807
 #define REG_OUT_WIDTH_HIGH              0x3808
 #define REG_OUT_WIDTH_LOW               0x3809
@@ -45,19 +47,44 @@
 #define REG_OUT_TOTAL_WIDTH_LOW         0x380d
 #define REG_OUT_TOTAL_HEIGHT_HIGH       0x380e
 #define REG_OUT_TOTAL_HEIGHT_LOW        0x380f
+#define REG_OUTPUT_FORMAT               0x4300
+#define REG_ISP_CTRL_01                 0x5001
+#define REG_AVG_WINDOW_END_X_HIGH       0x5682
+#define REG_AVG_WINDOW_END_X_LOW        0x5683
+#define REG_AVG_WINDOW_END_Y_HIGH       0x5686
+#define REG_AVG_WINDOW_END_Y_LOW        0x5687
+/* active pixel array size */
+#define OV5642_SENSOR_SIZE_X    2592
+#define OV5642_SENSOR_SIZE_Y    1944
 /*
- * define standard resolution.
+ * About OV5642 resolution, cropping and binning:
- * Works currently only for up to 720 lines
+ * This sensor supports it all, at least in the feature description.
- * eg. 320x240, 640x480, 800x600, 1280x720, 2048x720
+ * Unfortunately, no combination of appropriate registers settings could make
+ * the chip work the intended way. As it works with predefined register lists,
+ * some undocumented registers are presumably changed there to achieve their
+ * goals.
+ * This driver currently only works for resolutions up to 720 lines with a
+ * 1:1 scale. Hopefully these restrictions will be removed in the future.
 */
+#define OV5642_MAX_WIDTH        OV5642_SENSOR_SIZE_X
+#define OV5642_MAX_HEIGHT       720
-#define OV5642_WIDTH            1280
+/* default sizes */
-#define OV5642_HEIGHT           720
+#define OV5642_DEFAULT_WIDTH    1280
-#define OV5642_TOTAL_WIDTH      3200
+#define OV5642_DEFAULT_HEIGHT   OV5642_MAX_HEIGHT
-#define OV5642_TOTAL_HEIGHT     2000
-#define OV5642_SENSOR_SIZE_X    2592
+/* minimum extra blanking */
-#define OV5642_SENSOR_SIZE_Y    1944
+#define BLANKING_EXTRA_WIDTH            500
+#define BLANKING_EXTRA_HEIGHT           20
+/*
+ * the sensor's autoexposure is buggy when setting total_height low.
+ * It tries to expose longer than 1 frame period without taking care of it
+ * and this leads to weird output. So we set 1000 lines as minimum.
+ */
+#define BLANKING_MIN_HEIGHT             1000
 struct regval_list {
        u16 reg_num;
@@ -582,6 +609,11 @@ struct ov5642_datafmt {
 struct ov5642 {
        struct v4l2_subdev              subdev;
        const struct ov5642_datafmt     *fmt;
+        struct v4l2_rect                crop_rect;
+        /* blanking information */
+        int total_width;
+        int total_height;
 };
 static const struct ov5642_datafmt ov5642_colour_fmts[] = {
@@ -642,6 +674,21 @@ static int reg_write(struct i2c_client *client, u16 reg, u8 val)
        return 0;
 }
+/*
+ * convenience function to write 16 bit register values that are split up
+ * into two consecutive high and low parts
+ */
+static int reg_write16(struct i2c_client *client, u16 reg, u16 val16)
+{
+        int ret;
+        ret = reg_write(client, reg, val16 >> 8);
+        if (ret)
+                return ret;
+        return reg_write(client, reg + 1, val16 & 0x00ff);
+}
 #ifdef CONFIG_VIDEO_ADV_DEBUG
 static int ov5642_get_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg)
 {
@@ -685,58 +732,55 @@ static int ov5642_write_array(struct i2c_client *client,
        return 0;
 }
-static int ov5642_set_resolution(struct i2c_client *client)
+static int ov5642_set_resolution(struct v4l2_subdev *sd)
 {
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct ov5642 *priv = to_ov5642(client);
+        int width = priv->crop_rect.width;
+        int height = priv->crop_rect.height;
+        int total_width = priv->total_width;
+        int total_height = priv->total_height;
+        int start_x = (OV5642_SENSOR_SIZE_X - width) / 2;
+        int start_y = (OV5642_SENSOR_SIZE_Y - height) / 2;
        int ret;
-        u8 start_x_high = ((OV5642_SENSOR_SIZE_X - OV5642_WIDTH) / 2) >> 8;
-        u8 start_x_low  = ((OV5642_SENSOR_SIZE_X - OV5642_WIDTH) / 2) & 0xff;
-        u8 start_y_high = ((OV5642_SENSOR_SIZE_Y - OV5642_HEIGHT) / 2) >> 8;
-        u8 start_y_low  = ((OV5642_SENSOR_SIZE_Y - OV5642_HEIGHT) / 2) & 0xff;
-        u8 width_high   = OV5642_WIDTH  >> 8;
-        u8 width_low    = OV5642_WIDTH  & 0xff;
-        u8 height_high  = OV5642_HEIGHT >> 8;
-        u8 height_low   = OV5642_HEIGHT & 0xff;
-        u8 total_width_high  = OV5642_TOTAL_WIDTH  >> 8;
-        u8 total_width_low   = OV5642_TOTAL_WIDTH  & 0xff;
-        u8 total_height_high = OV5642_TOTAL_HEIGHT >> 8;
-        u8 total_height_low  = OV5642_TOTAL_HEIGHT & 0xff;
-        ret = reg_write(client, REG_WINDOW_START_X_HIGH, start_x_high);
-        if (!ret)
-                ret = reg_write(client, REG_WINDOW_START_X_LOW, start_x_low);
-        if (!ret)
-                ret = reg_write(client, REG_WINDOW_START_Y_HIGH, start_y_high);
-        if (!ret)
-                ret = reg_write(client, REG_WINDOW_START_Y_LOW, start_y_low);
+        /*
+         * This should set the starting point for cropping.
+         * Doesn't work so far.
+         */
+        ret = reg_write16(client, REG_WINDOW_START_X_HIGH, start_x);
        if (!ret)
-                ret = reg_write(client, REG_WINDOW_WIDTH_HIGH, width_high);
+                ret = reg_write16(client, REG_WINDOW_START_Y_HIGH, start_y);
-        if (!ret)
+        if (!ret) {
-                ret = reg_write(client, REG_WINDOW_WIDTH_LOW , width_low);
+                priv->crop_rect.left = start_x;
-        if (!ret)
+                priv->crop_rect.top = start_y;
-                ret = reg_write(client, REG_WINDOW_HEIGHT_HIGH, height_high);
+        }
-        if (!ret)
-                ret = reg_write(client, REG_WINDOW_HEIGHT_LOW,  height_low);
        if (!ret)
-                ret = reg_write(client, REG_OUT_WIDTH_HIGH, width_high);
+                ret = reg_write16(client, REG_WINDOW_WIDTH_HIGH, width);
        if (!ret)
-                ret = reg_write(client, REG_OUT_WIDTH_LOW , width_low);
+                ret = reg_write16(client, REG_WINDOW_HEIGHT_HIGH, height);
-        if (!ret)
+        if (ret)
-                ret = reg_write(client, REG_OUT_HEIGHT_HIGH, height_high);
+                return ret;
+        priv->crop_rect.width = width;
+        priv->crop_rect.height = height;
+        /* Set the output window size. Only 1:1 scale is supported so far. */
+        ret = reg_write16(client, REG_OUT_WIDTH_HIGH, width);
        if (!ret)
-                ret = reg_write(client, REG_OUT_HEIGHT_LOW,  height_low);
+                ret = reg_write16(client, REG_OUT_HEIGHT_HIGH, height);
+        /* Total width = output size + blanking */
        if (!ret)
-                ret = reg_write(client, REG_OUT_TOTAL_WIDTH_HIGH, total_width_high);
+                ret = reg_write16(client, REG_OUT_TOTAL_WIDTH_HIGH, total_width);
        if (!ret)
-                ret = reg_write(client, REG_OUT_TOTAL_WIDTH_LOW, total_width_low);
+                ret = reg_write16(client, REG_OUT_TOTAL_HEIGHT_HIGH, total_height);
+        /* Sets the window for AWB calculations */
        if (!ret)
-                ret = reg_write(client, REG_OUT_TOTAL_HEIGHT_HIGH, total_height_high);
+                ret = reg_write16(client, REG_AVG_WINDOW_END_X_HIGH, width);
        if (!ret)
-                ret = reg_write(client, REG_OUT_TOTAL_HEIGHT_LOW,  total_height_low);
+                ret = reg_write16(client, REG_AVG_WINDOW_END_Y_HIGH, height);
        return ret;
 }
@@ -744,18 +788,18 @@ static int ov5642_set_resolution(struct i2c_client *client)
 static int ov5642_try_fmt(struct v4l2_subdev *sd,
                          struct v4l2_mbus_framefmt *mf)
 {
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct ov5642 *priv = to_ov5642(client);
        const struct ov5642_datafmt *fmt = ov5642_find_datafmt(mf->code);
-        dev_dbg(sd->v4l2_dev->dev, "%s(%u) width: %u heigth: %u\n",
+        mf->width = priv->crop_rect.width;
-                        __func__, mf->code, mf->width, mf->height);
+        mf->height = priv->crop_rect.height;
        if (!fmt) {
                mf->code        = ov5642_colour_fmts[0].code;
                mf->colorspace  = ov5642_colour_fmts[0].colorspace;
        }
-        mf->width       = OV5642_WIDTH;
-        mf->height      = OV5642_HEIGHT;
        mf->field       = V4L2_FIELD_NONE;
        return 0;
@@ -767,20 +811,13 @@ static int ov5642_s_fmt(struct v4l2_subdev *sd,
        struct i2c_client *client = v4l2_get_subdevdata(sd);
        struct ov5642 *priv = to_ov5642(client);
-        dev_dbg(sd->v4l2_dev->dev, "%s(%u)\n", __func__, mf->code);
        /* MIPI CSI could have changed the format, double-check */
        if (!ov5642_find_datafmt(mf->code))
                return -EINVAL;
        ov5642_try_fmt(sd, mf);
        priv->fmt = ov5642_find_datafmt(mf->code);
-        ov5642_write_array(client, ov5642_default_regs_init);
-        ov5642_set_resolution(client);
-        ov5642_write_array(client, ov5642_default_regs_finalise);
        return 0;
 }
@@ -794,8 +831,8 @@ static int ov5642_g_fmt(struct v4l2_subdev *sd,
        mf->code        = fmt->code;
        mf->colorspace  = fmt->colorspace;
-        mf->width       = OV5642_WIDTH;
+        mf->width       = priv->crop_rect.width;
-        mf->height      = OV5642_HEIGHT;
+        mf->height      = priv->crop_rect.height;
        mf->field       = V4L2_FIELD_NONE;
        return 0;
@@ -828,15 +865,44 @@ static int ov5642_g_chip_ident(struct v4l2_subdev *sd,
        return 0;
 }
+static int ov5642_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct ov5642 *priv = to_ov5642(client);
+        struct v4l2_rect *rect = &a->c;
+        int ret;
+        v4l_bound_align_image(&rect->width, 48, OV5642_MAX_WIDTH, 1,
+                              &rect->height, 32, OV5642_MAX_HEIGHT, 1, 0);
+        priv->crop_rect.width   = rect->width;
+        priv->crop_rect.height  = rect->height;
+        priv->total_width       = rect->width + BLANKING_EXTRA_WIDTH;
+        priv->total_height      = max_t(int, rect->height +
+                                                        BLANKING_EXTRA_HEIGHT,
+                                                        BLANKING_MIN_HEIGHT);
+        priv->crop_rect.width           = rect->width;
+        priv->crop_rect.height          = rect->height;
+        ret = ov5642_write_array(client, ov5642_default_regs_init);
+        if (!ret)
+                ret = ov5642_set_resolution(sd);
+        if (!ret)
+                ret = ov5642_write_array(client, ov5642_default_regs_finalise);
+        return ret;
+}
 static int ov5642_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
 {
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct ov5642 *priv = to_ov5642(client);
        struct v4l2_rect *rect = &a->c;
-        a->type         = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-        rect->top       = 0;
+                return -EINVAL;
-        rect->left      = 0;
-        rect->width     = OV5642_WIDTH;
+        *rect = priv->crop_rect;
-        rect->height    = OV5642_HEIGHT;
        return 0;
 }
@@ -845,8 +911,8 @@ static int ov5642_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
 {
        a->bounds.left                  = 0;
        a->bounds.top                   = 0;
-        a->bounds.width                 = OV5642_WIDTH;
+        a->bounds.width                 = OV5642_MAX_WIDTH;
-        a->bounds.height                = OV5642_HEIGHT;
+        a->bounds.height                = OV5642_MAX_HEIGHT;
        a->defrect                      = a->bounds;
        a->type                         = V4L2_BUF_TYPE_VIDEO_CAPTURE;
        a->pixelaspect.numerator        = 1;
@@ -855,16 +921,47 @@ static int ov5642_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
        return 0;
 }
+static int ov5642_g_mbus_config(struct v4l2_subdev *sd,
+                                struct v4l2_mbus_config *cfg)
+{
+        cfg->type = V4L2_MBUS_CSI2;
+        cfg->flags = V4L2_MBUS_CSI2_2_LANE | V4L2_MBUS_CSI2_CHANNEL_0 |
+                                        V4L2_MBUS_CSI2_CONTINUOUS_CLOCK;
+        return 0;
+}
+static int ov5642_s_power(struct v4l2_subdev *sd, int on)
+{
+        struct i2c_client *client;
+        int ret;
+        if (!on)
+                return 0;
+        client = v4l2_get_subdevdata(sd);
+        ret = ov5642_write_array(client, ov5642_default_regs_init);
+        if (!ret)
+                ret = ov5642_set_resolution(sd);
+        if (!ret)
+                ret = ov5642_write_array(client, ov5642_default_regs_finalise);
+        return ret;
+}
 static struct v4l2_subdev_video_ops ov5642_subdev_video_ops = {
        .s_mbus_fmt     = ov5642_s_fmt,
        .g_mbus_fmt     = ov5642_g_fmt,
        .try_mbus_fmt   = ov5642_try_fmt,
        .enum_mbus_fmt  = ov5642_enum_fmt,
+        .s_crop         = ov5642_s_crop,
        .g_crop         = ov5642_g_crop,
        .cropcap        = ov5642_cropcap,
+        .g_mbus_config  = ov5642_g_mbus_config,
 };
 static struct v4l2_subdev_core_ops ov5642_subdev_core_ops = {
+        .s_power        = ov5642_s_power,
        .g_chip_ident   = ov5642_g_chip_ident,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
        .g_register     = ov5642_get_register,
@@ -877,28 +974,7 @@ static struct v4l2_subdev_ops ov5642_subdev_ops = {
        .video  = &ov5642_subdev_video_ops,
 };
-/*
+static int ov5642_video_probe(struct i2c_client *client)
- * We have to provide soc-camera operations, but we don't have anything to say
- * there. The MIPI CSI2 driver will provide .query_bus_param and .set_bus_param
- */
-static unsigned long soc_ov5642_query_bus_param(struct soc_camera_device *icd)
-{
-        return 0;
-}
-static int soc_ov5642_set_bus_param(struct soc_camera_device *icd,
-                                 unsigned long flags)
-{
-        return -EINVAL;
-}
-static struct soc_camera_ops soc_ov5642_ops = {
-        .query_bus_param        = soc_ov5642_query_bus_param,
-        .set_bus_param          = soc_ov5642_set_bus_param,
-};
-static int ov5642_video_probe(struct soc_camera_device *icd,
-                              struct i2c_client *client)
 {
        int ret;
        u8 id_high, id_low;
@@ -929,16 +1005,9 @@ static int ov5642_probe(struct i2c_client *client,
                        const struct i2c_device_id *did)
 {
        struct ov5642 *priv;
-        struct soc_camera_device *icd = client->dev.platform_data;
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
-        struct soc_camera_link *icl;
        int ret;
-        if (!icd) {
-                dev_err(&client->dev, "OV5642: missing soc-camera data!\n");
-                return -EINVAL;
-        }
-        icl = to_soc_camera_link(icd);
        if (!icl) {
                dev_err(&client->dev, "OV5642: missing platform data!\n");
                return -EINVAL;
@@ -950,17 +1019,24 @@ static int ov5642_probe(struct i2c_client *client,
        v4l2_i2c_subdev_init(&priv->subdev, client, &ov5642_subdev_ops);
-        icd->ops        = &soc_ov5642_ops;
+        priv->fmt               = &ov5642_colour_fmts[0];
-        priv->fmt       = &ov5642_colour_fmts[0];
+        priv->crop_rect.width   = OV5642_DEFAULT_WIDTH;
+        priv->crop_rect.height  = OV5642_DEFAULT_HEIGHT;
+        priv->crop_rect.left    = (OV5642_MAX_WIDTH - OV5642_DEFAULT_WIDTH) / 2;
+        priv->crop_rect.top     = (OV5642_MAX_HEIGHT - OV5642_DEFAULT_HEIGHT) / 2;
+        priv->crop_rect.width   = OV5642_DEFAULT_WIDTH;
+        priv->crop_rect.height  = OV5642_DEFAULT_HEIGHT;
+        priv->total_width = OV5642_DEFAULT_WIDTH + BLANKING_EXTRA_WIDTH;
+        priv->total_height = BLANKING_MIN_HEIGHT;
-        ret = ov5642_video_probe(icd, client);
+        ret = ov5642_video_probe(client);
        if (ret < 0)
                goto error;
        return 0;
 error:
-        icd->ops = NULL;
        kfree(priv);
        return ret;
 }
@@ -968,10 +1044,8 @@ error:
 static int ov5642_remove(struct i2c_client *client)
 {
        struct ov5642 *priv = to_ov5642(client);
-        struct soc_camera_device *icd = client->dev.platform_data;
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        icd->ops = NULL;
        if (icl->free_bus)
                icl->free_bus(icl);
        kfree(priv);
diff --git a/drivers/media/video/ov6650.c b/drivers/media/video/ov6650.c
index 456d9ad9ae5a..9f2d26b1d4cb 100644
--- a/drivers/media/video/ov6650.c
+++ b/drivers/media/video/ov6650.c
@@ -28,10 +28,12 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/slab.h>
+#include <linux/v4l2-mediabus.h>
+#include <linux/module.h>
 #include <media/soc_camera.h>
 #include <media/v4l2-chip-ident.h>
+#include <media/v4l2-ctrls.h>
 /* Register definitions */
 #define REG_GAIN                0x00    /* range 00 - 3F */
@@ -177,20 +179,23 @@ struct ov6650_reg {
 struct ov6650 {
        struct v4l2_subdev      subdev;
+        struct v4l2_ctrl_handler hdl;
-        int                     gain;
+        struct {
-        int                     blue;
+                /* exposure/autoexposure cluster */
-        int                     red;
+                struct v4l2_ctrl *autoexposure;
-        int                     saturation;
+                struct v4l2_ctrl *exposure;
-        int                     hue;
+        };
-        int                     brightness;
+        struct {
-        int                     exposure;
+                /* gain/autogain cluster */
-        int                     gamma;
+                struct v4l2_ctrl *autogain;
-        int                     aec;
+                struct v4l2_ctrl *gain;
-        bool                    vflip;
+        };
-        bool                    hflip;
+        struct {
-        bool                    awb;
+                /* blue/red/autowhitebalance cluster */
-        bool                    agc;
+                struct v4l2_ctrl *autowb;
+                struct v4l2_ctrl *blue;
+                struct v4l2_ctrl *red;
+        };
        bool                    half_scale;     /* scale down output by 2 */
        struct v4l2_rect        rect;           /* sensor cropping window */
        unsigned long           pclk_limit;     /* from host */
@@ -210,126 +215,6 @@ static enum v4l2_mbus_pixelcode ov6650_codes[] = {
        V4L2_MBUS_FMT_Y8_1X8,
 };
-static const struct v4l2_queryctrl ov6650_controls[] = {
-        {
-                .id             = V4L2_CID_AUTOGAIN,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "AGC",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 1,
-        },
-        {
-                .id             = V4L2_CID_GAIN,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "Gain",
-                .minimum        = 0,
-                .maximum        = 0x3f,
-                .step           = 1,
-                .default_value  = DEF_GAIN,
-        },
-        {
-                .id             = V4L2_CID_AUTO_WHITE_BALANCE,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "AWB",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 1,
-        },
-        {
-                .id             = V4L2_CID_BLUE_BALANCE,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "Blue",
-                .minimum        = 0,
-                .maximum        = 0xff,
-                .step           = 1,
-                .default_value  = DEF_BLUE,
-        },
-        {
-                .id             = V4L2_CID_RED_BALANCE,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "Red",
-                .minimum        = 0,
-                .maximum        = 0xff,
-                .step           = 1,
-                .default_value  = DEF_RED,
-        },
-        {
-                .id             = V4L2_CID_SATURATION,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "Saturation",
-                .minimum        = 0,
-                .maximum        = 0xf,
-                .step           = 1,
-                .default_value  = 0x8,
-        },
-        {
-                .id             = V4L2_CID_HUE,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "Hue",
-                .minimum        = 0,
-                .maximum        = HUE_MASK,
-                .step           = 1,
-                .default_value  = DEF_HUE,
-        },
-        {
-                .id             = V4L2_CID_BRIGHTNESS,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "Brightness",
-                .minimum        = 0,
-                .maximum        = 0xff,
-                .step           = 1,
-                .default_value  = 0x80,
-        },
-        {
-                .id             = V4L2_CID_EXPOSURE_AUTO,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "AEC",
-                .minimum        = 0,
-                .maximum        = 3,
-                .step           = 1,
-                .default_value  = 0,
-        },
-        {
-                .id             = V4L2_CID_EXPOSURE,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "Exposure",
-                .minimum        = 0,
-                .maximum        = 0xff,
-                .step           = 1,
-                .default_value  = DEF_AECH,
-        },
-        {
-                .id             = V4L2_CID_GAMMA,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "Gamma",
-                .minimum        = 0,
-                .maximum        = 0xff,
-                .step           = 1,
-                .default_value  = 0x12,
-        },
-        {
-                .id             = V4L2_CID_VFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Flip Vertically",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        },
-        {
-                .id             = V4L2_CID_HFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Flip Horizontally",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        },
-};
 /* read a register */
 static int ov6650_reg_read(struct i2c_client *client, u8 reg, u8 *val)
 {
@@ -419,213 +304,90 @@ static int ov6650_s_stream(struct v4l2_subdev *sd, int enable)
        return 0;
 }
-/* Alter bus settings on camera side */
-static int ov6650_set_bus_param(struct soc_camera_device *icd,
-                                unsigned long flags)
-{
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
-        int ret;
-        flags = soc_camera_apply_sensor_flags(icl, flags);
-        if (flags & SOCAM_PCLK_SAMPLE_RISING)
-                ret = ov6650_reg_rmw(client, REG_COMJ, COMJ_PCLK_RISING, 0);
-        else
-                ret = ov6650_reg_rmw(client, REG_COMJ, 0, COMJ_PCLK_RISING);
-        if (ret)
-                return ret;
-        if (flags & SOCAM_HSYNC_ACTIVE_LOW)
-                ret = ov6650_reg_rmw(client, REG_COMF, COMF_HREF_LOW, 0);
-        else
-                ret = ov6650_reg_rmw(client, REG_COMF, 0, COMF_HREF_LOW);
-        if (ret)
-                return ret;
-        if (flags & SOCAM_VSYNC_ACTIVE_HIGH)
-                ret = ov6650_reg_rmw(client, REG_COMJ, COMJ_VSYNC_HIGH, 0);
-        else
-                ret = ov6650_reg_rmw(client, REG_COMJ, 0, COMJ_VSYNC_HIGH);
-        return ret;
-}
-/* Request bus settings on camera side */
-static unsigned long ov6650_query_bus_param(struct soc_camera_device *icd)
-{
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        unsigned long flags = SOCAM_MASTER |
-                SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING |
-                SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_LOW |
-                SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW |
-                SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATAWIDTH_8;
-        return soc_camera_apply_sensor_flags(icl, flags);
-}
 /* Get status of additional camera capabilities */
-static int ov6650_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
+static int ov6550_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
 {
+        struct ov6650 *priv = container_of(ctrl->handler, struct ov6650, hdl);
+        struct v4l2_subdev *sd = &priv->subdev;
        struct i2c_client *client = v4l2_get_subdevdata(sd);
-        struct ov6650 *priv = to_ov6650(client);
+        uint8_t reg, reg2;
-        uint8_t reg;
+        int ret;
-        int ret = 0;
        switch (ctrl->id) {
        case V4L2_CID_AUTOGAIN:
-                ctrl->value = priv->agc;
+                ret = ov6650_reg_read(client, REG_GAIN, &reg);
-                break;
+                if (!ret)
-        case V4L2_CID_GAIN:
+                        priv->gain->val = reg;
-                if (priv->agc) {
+                return ret;
-                        ret = ov6650_reg_read(client, REG_GAIN, &reg);
-                        ctrl->value = reg;
-                } else {
-                        ctrl->value = priv->gain;
-                }
-                break;
        case V4L2_CID_AUTO_WHITE_BALANCE:
-                ctrl->value = priv->awb;
+                ret = ov6650_reg_read(client, REG_BLUE, &reg);
-                break;
+                if (!ret)
-        case V4L2_CID_BLUE_BALANCE:
+                        ret = ov6650_reg_read(client, REG_RED, &reg2);
-                if (priv->awb) {
+                if (!ret) {
-                        ret = ov6650_reg_read(client, REG_BLUE, &reg);
+                        priv->blue->val = reg;
-                        ctrl->value = reg;
+                        priv->red->val = reg2;
-                } else {
-                        ctrl->value = priv->blue;
-                }
-                break;
-        case V4L2_CID_RED_BALANCE:
-                if (priv->awb) {
-                        ret = ov6650_reg_read(client, REG_RED, &reg);
-                        ctrl->value = reg;
-                } else {
-                        ctrl->value = priv->red;
                }
-                break;
+                return ret;
-        case V4L2_CID_SATURATION:
-                ctrl->value = priv->saturation;
-                break;
-        case V4L2_CID_HUE:
-                ctrl->value = priv->hue;
-                break;
-        case V4L2_CID_BRIGHTNESS:
-                ctrl->value = priv->brightness;
-                break;
        case V4L2_CID_EXPOSURE_AUTO:
-                ctrl->value = priv->aec;
+                ret = ov6650_reg_read(client, REG_AECH, &reg);
-                break;
+                if (!ret)
-        case V4L2_CID_EXPOSURE:
+                        priv->exposure->val = reg;
-                if (priv->aec) {
+                return ret;
-                        ret = ov6650_reg_read(client, REG_AECH, &reg);
-                        ctrl->value = reg;
-                } else {
-                        ctrl->value = priv->exposure;
-                }
-                break;
-        case V4L2_CID_GAMMA:
-                ctrl->value = priv->gamma;
-                break;
-        case V4L2_CID_VFLIP:
-                ctrl->value = priv->vflip;
-                break;
-        case V4L2_CID_HFLIP:
-                ctrl->value = priv->hflip;
-                break;
        }
-        return ret;
+        return -EINVAL;
 }
 /* Set status of additional camera capabilities */
-static int ov6650_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
+static int ov6550_s_ctrl(struct v4l2_ctrl *ctrl)
 {
+        struct ov6650 *priv = container_of(ctrl->handler, struct ov6650, hdl);
+        struct v4l2_subdev *sd = &priv->subdev;
        struct i2c_client *client = v4l2_get_subdevdata(sd);
-        struct ov6650 *priv = to_ov6650(client);
+        int ret;
-        int ret = 0;
        switch (ctrl->id) {
        case V4L2_CID_AUTOGAIN:
                ret = ov6650_reg_rmw(client, REG_COMB,
-                                ctrl->value ? COMB_AGC : 0, COMB_AGC);
+                                ctrl->val ? COMB_AGC : 0, COMB_AGC);
-                if (!ret)
+                if (!ret && !ctrl->val)
-                        priv->agc = ctrl->value;
+                        ret = ov6650_reg_write(client, REG_GAIN, priv->gain->val);
-                break;
+                return ret;
-        case V4L2_CID_GAIN:
-                ret = ov6650_reg_write(client, REG_GAIN, ctrl->value);
-                if (!ret)
-                        priv->gain = ctrl->value;
-                break;
        case V4L2_CID_AUTO_WHITE_BALANCE:
                ret = ov6650_reg_rmw(client, REG_COMB,
-                                ctrl->value ? COMB_AWB : 0, COMB_AWB);
+                                ctrl->val ? COMB_AWB : 0, COMB_AWB);
-                if (!ret)
+                if (!ret && !ctrl->val) {
-                        priv->awb = ctrl->value;
+                        ret = ov6650_reg_write(client, REG_BLUE, priv->blue->val);
-                break;
+                        if (!ret)
-        case V4L2_CID_BLUE_BALANCE:
+                                ret = ov6650_reg_write(client, REG_RED,
-                ret = ov6650_reg_write(client, REG_BLUE, ctrl->value);
+                                                        priv->red->val);
-                if (!ret)
+                }
-                        priv->blue = ctrl->value;
+                return ret;
-                break;
-        case V4L2_CID_RED_BALANCE:
-                ret = ov6650_reg_write(client, REG_RED, ctrl->value);
-                if (!ret)
-                        priv->red = ctrl->value;
-                break;
        case V4L2_CID_SATURATION:
-                ret = ov6650_reg_rmw(client, REG_SAT, SET_SAT(ctrl->value),
+                return ov6650_reg_rmw(client, REG_SAT, SET_SAT(ctrl->val),
                                SAT_MASK);
-                if (!ret)
-                        priv->saturation = ctrl->value;
-                break;
        case V4L2_CID_HUE:
-                ret = ov6650_reg_rmw(client, REG_HUE, SET_HUE(ctrl->value),
+                return ov6650_reg_rmw(client, REG_HUE, SET_HUE(ctrl->val),
                                HUE_MASK);
-                if (!ret)
-                        priv->hue = ctrl->value;
-                break;
        case V4L2_CID_BRIGHTNESS:
-                ret = ov6650_reg_write(client, REG_BRT, ctrl->value);
+                return ov6650_reg_write(client, REG_BRT, ctrl->val);
-                if (!ret)
-                        priv->brightness = ctrl->value;
-                break;
        case V4L2_CID_EXPOSURE_AUTO:
-                switch (ctrl->value) {
+                ret = ov6650_reg_rmw(client, REG_COMB, ctrl->val ==
-                case V4L2_EXPOSURE_AUTO:
+                                V4L2_EXPOSURE_AUTO ? COMB_AEC : 0, COMB_AEC);
-                        ret = ov6650_reg_rmw(client, REG_COMB, COMB_AEC, 0);
+                if (!ret && ctrl->val == V4L2_EXPOSURE_MANUAL)
-                        break;
+                        ret = ov6650_reg_write(client, REG_AECH,
-                default:
+                                                priv->exposure->val);
-                        ret = ov6650_reg_rmw(client, REG_COMB, 0, COMB_AEC);
+                return ret;
-                        break;
-                }
-                if (!ret)
-                        priv->aec = ctrl->value;
-                break;
-        case V4L2_CID_EXPOSURE:
-                ret = ov6650_reg_write(client, REG_AECH, ctrl->value);
-                if (!ret)
-                        priv->exposure = ctrl->value;
-                break;
        case V4L2_CID_GAMMA:
-                ret = ov6650_reg_write(client, REG_GAM1, ctrl->value);
+                return ov6650_reg_write(client, REG_GAM1, ctrl->val);
-                if (!ret)
-                        priv->gamma = ctrl->value;
-                break;
        case V4L2_CID_VFLIP:
-                ret = ov6650_reg_rmw(client, REG_COMB,
+                return ov6650_reg_rmw(client, REG_COMB,
-                                ctrl->value ? COMB_FLIP_V : 0, COMB_FLIP_V);
+                                ctrl->val ? COMB_FLIP_V : 0, COMB_FLIP_V);
-                if (!ret)
-                        priv->vflip = ctrl->value;
-                break;
        case V4L2_CID_HFLIP:
-                ret = ov6650_reg_rmw(client, REG_COMB,
+                return ov6650_reg_rmw(client, REG_COMB,
-                                ctrl->value ? COMB_FLIP_H : 0, COMB_FLIP_H);
+                                ctrl->val ? COMB_FLIP_H : 0, COMB_FLIP_H);
-                if (!ret)
-                        priv->hflip = ctrl->value;
-                break;
        }
-        return ret;
+        return -EINVAL;
 }
 /* Get chip identification */
@@ -778,7 +540,7 @@ static u8 to_clkrc(struct v4l2_fract *timeperframe,
 static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
 {
        struct i2c_client *client = v4l2_get_subdevdata(sd);
-        struct soc_camera_device *icd = client->dev.platform_data;
+        struct soc_camera_device *icd = (struct soc_camera_device *)sd->grp_id;
        struct soc_camera_sense *sense = icd->sense;
        struct ov6650 *priv = to_ov6650(client);
        bool half_scale = !is_unscaled_ok(mf->width, mf->height, &priv->rect);
@@ -1057,8 +819,7 @@ static int ov6650_prog_dflt(struct i2c_client *client)
        return ret;
 }
-static int ov6650_video_probe(struct soc_camera_device *icd,
+static int ov6650_video_probe(struct i2c_client *client)
-                                struct i2c_client *client)
 {
        u8              pidh, pidl, midh, midl;
        int             ret = 0;
@@ -1094,16 +855,12 @@ static int ov6650_video_probe(struct soc_camera_device *icd,
        return ret;
 }
-static struct soc_camera_ops ov6650_ops = {
+static const struct v4l2_ctrl_ops ov6550_ctrl_ops = {
-        .set_bus_param          = ov6650_set_bus_param,
+        .g_volatile_ctrl = ov6550_g_volatile_ctrl,
-        .query_bus_param        = ov6650_query_bus_param,
+        .s_ctrl = ov6550_s_ctrl,
-        .controls               = ov6650_controls,
-        .num_controls           = ARRAY_SIZE(ov6650_controls),
 };
 static struct v4l2_subdev_core_ops ov6650_core_ops = {
-        .g_ctrl                 = ov6650_g_ctrl,
-        .s_ctrl                 = ov6650_s_ctrl,
        .g_chip_ident           = ov6650_g_chip_ident,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
        .g_register             = ov6650_get_register,
@@ -1111,6 +868,55 @@ static struct v4l2_subdev_core_ops ov6650_core_ops = {
 #endif
 };
+/* Request bus settings on camera side */
+static int ov6650_g_mbus_config(struct v4l2_subdev *sd,
+                                struct v4l2_mbus_config *cfg)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        cfg->flags = V4L2_MBUS_MASTER |
+                V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_PCLK_SAMPLE_FALLING |
+                V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_LOW |
+                V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_LOW |
+                V4L2_MBUS_DATA_ACTIVE_HIGH;
+        cfg->type = V4L2_MBUS_PARALLEL;
+        cfg->flags = soc_camera_apply_board_flags(icl, cfg);
+        return 0;
+}
+/* Alter bus settings on camera side */
+static int ov6650_s_mbus_config(struct v4l2_subdev *sd,
+                                const struct v4l2_mbus_config *cfg)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        unsigned long flags = soc_camera_apply_board_flags(icl, cfg);
+        int ret;
+        if (flags & V4L2_MBUS_PCLK_SAMPLE_RISING)
+                ret = ov6650_reg_rmw(client, REG_COMJ, COMJ_PCLK_RISING, 0);
+        else
+                ret = ov6650_reg_rmw(client, REG_COMJ, 0, COMJ_PCLK_RISING);
+        if (ret)
+                return ret;
+        if (flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)
+                ret = ov6650_reg_rmw(client, REG_COMF, COMF_HREF_LOW, 0);
+        else
+                ret = ov6650_reg_rmw(client, REG_COMF, 0, COMF_HREF_LOW);
+        if (ret)
+                return ret;
+        if (flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH)
+                ret = ov6650_reg_rmw(client, REG_COMJ, COMJ_VSYNC_HIGH, 0);
+        else
+                ret = ov6650_reg_rmw(client, REG_COMJ, 0, COMJ_VSYNC_HIGH);
+        return ret;
+}
 static struct v4l2_subdev_video_ops ov6650_video_ops = {
        .s_stream       = ov6650_s_stream,
        .g_mbus_fmt     = ov6650_g_fmt,
@@ -1122,6 +928,8 @@ static struct v4l2_subdev_video_ops ov6650_video_ops = {
        .s_crop         = ov6650_s_crop,
        .g_parm         = ov6650_g_parm,
        .s_parm         = ov6650_s_parm,
+        .g_mbus_config  = ov6650_g_mbus_config,
+        .s_mbus_config  = ov6650_s_mbus_config,
 };
 static struct v4l2_subdev_ops ov6650_subdev_ops = {
@@ -1136,16 +944,9 @@ static int ov6650_probe(struct i2c_client *client,
                        const struct i2c_device_id *did)
 {
        struct ov6650 *priv;
-        struct soc_camera_device *icd = client->dev.platform_data;
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
-        struct soc_camera_link *icl;
        int ret;
-        if (!icd) {
-                dev_err(&client->dev, "Missing soc-camera data!\n");
-                return -EINVAL;
-        }
-        icl = to_soc_camera_link(icd);
        if (!icl) {
                dev_err(&client->dev, "Missing platform_data for driver\n");
                return -EINVAL;
@@ -1159,8 +960,46 @@ static int ov6650_probe(struct i2c_client *client,
        }
        v4l2_i2c_subdev_init(&priv->subdev, client, &ov6650_subdev_ops);
+        v4l2_ctrl_handler_init(&priv->hdl, 13);
+        v4l2_ctrl_new_std(&priv->hdl, &ov6550_ctrl_ops,
+                        V4L2_CID_VFLIP, 0, 1, 1, 0);
+        v4l2_ctrl_new_std(&priv->hdl, &ov6550_ctrl_ops,
+                        V4L2_CID_HFLIP, 0, 1, 1, 0);
+        priv->autogain = v4l2_ctrl_new_std(&priv->hdl, &ov6550_ctrl_ops,
+                        V4L2_CID_AUTOGAIN, 0, 1, 1, 1);
+        priv->gain = v4l2_ctrl_new_std(&priv->hdl, &ov6550_ctrl_ops,
+                        V4L2_CID_GAIN, 0, 0x3f, 1, DEF_GAIN);
+        priv->autowb = v4l2_ctrl_new_std(&priv->hdl, &ov6550_ctrl_ops,
+                        V4L2_CID_AUTO_WHITE_BALANCE, 0, 1, 1, 1);
+        priv->blue = v4l2_ctrl_new_std(&priv->hdl, &ov6550_ctrl_ops,
+                        V4L2_CID_BLUE_BALANCE, 0, 0xff, 1, DEF_BLUE);
+        priv->red = v4l2_ctrl_new_std(&priv->hdl, &ov6550_ctrl_ops,
+                        V4L2_CID_RED_BALANCE, 0, 0xff, 1, DEF_RED);
+        v4l2_ctrl_new_std(&priv->hdl, &ov6550_ctrl_ops,
+                        V4L2_CID_SATURATION, 0, 0xf, 1, 0x8);
+        v4l2_ctrl_new_std(&priv->hdl, &ov6550_ctrl_ops,
+                        V4L2_CID_HUE, 0, HUE_MASK, 1, DEF_HUE);
+        v4l2_ctrl_new_std(&priv->hdl, &ov6550_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, 0, 0xff, 1, 0x80);
+        priv->autoexposure = v4l2_ctrl_new_std_menu(&priv->hdl,
+                        &ov6550_ctrl_ops, V4L2_CID_EXPOSURE_AUTO,
+                        V4L2_EXPOSURE_MANUAL, 0, V4L2_EXPOSURE_AUTO);
+        priv->exposure = v4l2_ctrl_new_std(&priv->hdl, &ov6550_ctrl_ops,
+                        V4L2_CID_EXPOSURE, 0, 0xff, 1, DEF_AECH);
+        v4l2_ctrl_new_std(&priv->hdl, &ov6550_ctrl_ops,
+                        V4L2_CID_GAMMA, 0, 0xff, 1, 0x12);
+        priv->subdev.ctrl_handler = &priv->hdl;
+        if (priv->hdl.error) {
+                int err = priv->hdl.error;
-        icd->ops = &ov6650_ops;
+                kfree(priv);
+                return err;
+        }
+        v4l2_ctrl_auto_cluster(2, &priv->autogain, 0, true);
+        v4l2_ctrl_auto_cluster(3, &priv->autowb, 0, true);
+        v4l2_ctrl_auto_cluster(2, &priv->autoexposure,
+                                V4L2_EXPOSURE_MANUAL, true);
        priv->rect.left   = DEF_HSTRT << 1;
        priv->rect.top    = DEF_VSTRT << 1;
@@ -1170,10 +1009,12 @@ static int ov6650_probe(struct i2c_client *client,
        priv->code        = V4L2_MBUS_FMT_YUYV8_2X8;
        priv->colorspace  = V4L2_COLORSPACE_JPEG;
-        ret = ov6650_video_probe(icd, client);
+        ret = ov6650_video_probe(client);
+        if (!ret)
+                ret = v4l2_ctrl_handler_setup(&priv->hdl);
        if (ret) {
-                icd->ops = NULL;
+                v4l2_ctrl_handler_free(&priv->hdl);
                kfree(priv);
        }
@@ -1184,6 +1025,8 @@ static int ov6650_remove(struct i2c_client *client)
 {
        struct ov6650 *priv = to_ov6650(client);
+        v4l2_device_unregister_subdev(&priv->subdev);
+        v4l2_ctrl_handler_free(&priv->hdl);
        kfree(priv);
        return 0;
 }
diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c
index 397870f076c1..9f6ce3d8a29e 100644
--- a/drivers/media/video/ov772x.c
+++ b/drivers/media/video/ov772x.c
@@ -20,12 +20,14 @@
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
+#include <linux/v4l2-mediabus.h>
 #include <linux/videodev2.h>
+#include <media/ov772x.h>
+#include <media/soc_camera.h>
+#include <media/v4l2-ctrls.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-subdev.h>
-#include <media/soc_camera.h>
-#include <media/soc_mediabus.h>
-#include <media/ov772x.h>
 /*
 * register offset
@@ -400,6 +402,7 @@ struct ov772x_win_size {
 struct ov772x_priv {
        struct v4l2_subdev                subdev;
+        struct v4l2_ctrl_handler          hdl;
        struct ov772x_camera_info        *info;
        const struct ov772x_color_format *cfmt;
        const struct ov772x_win_size     *win;
@@ -517,36 +520,6 @@ static const struct ov772x_win_size ov772x_win_qvga = {
        .regs     = ov772x_qvga_regs,
 };
-static const struct v4l2_queryctrl ov772x_controls[] = {
-        {
-                .id             = V4L2_CID_VFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Flip Vertically",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        },
-        {
-                .id             = V4L2_CID_HFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Flip Horizontally",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        },
-        {
-                .id             = V4L2_CID_BAND_STOP_FILTER,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "Band-stop filter",
-                .minimum        = 0,
-                .maximum        = 256,
-                .step           = 1,
-                .default_value  = 0,
-        },
-};
 /*
 * general function
 */
@@ -620,75 +593,30 @@ static int ov772x_s_stream(struct v4l2_subdev *sd, int enable)
        return 0;
 }
-static int ov772x_set_bus_param(struct soc_camera_device *icd,
+static int ov772x_s_ctrl(struct v4l2_ctrl *ctrl)
-                                unsigned long             flags)
-{
-        return 0;
-}
-static unsigned long ov772x_query_bus_param(struct soc_camera_device *icd)
-{
-        struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
-        struct ov772x_priv *priv = i2c_get_clientdata(client);
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        unsigned long flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_MASTER |
-                SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_HIGH |
-                SOCAM_DATA_ACTIVE_HIGH;
-        if (priv->info->flags & OV772X_FLAG_8BIT)
-                flags |= SOCAM_DATAWIDTH_8;
-        else
-                flags |= SOCAM_DATAWIDTH_10;
-        return soc_camera_apply_sensor_flags(icl, flags);
-}
-static int ov772x_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
-{
-        struct ov772x_priv *priv = container_of(sd, struct ov772x_priv, subdev);
-        switch (ctrl->id) {
-        case V4L2_CID_VFLIP:
-                ctrl->value = priv->flag_vflip;
-                break;
-        case V4L2_CID_HFLIP:
-                ctrl->value = priv->flag_hflip;
-                break;
-        case V4L2_CID_BAND_STOP_FILTER:
-                ctrl->value = priv->band_filter;
-                break;
-        }
-        return 0;
-}
-static int ov772x_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
+        struct ov772x_priv *priv = container_of(ctrl->handler,
+                                                struct ov772x_priv, hdl);
+        struct v4l2_subdev *sd = &priv->subdev;
        struct i2c_client *client = v4l2_get_subdevdata(sd);
-        struct ov772x_priv *priv = container_of(sd, struct ov772x_priv, subdev);
        int ret = 0;
        u8 val;
        switch (ctrl->id) {
        case V4L2_CID_VFLIP:
-                val = ctrl->value ? VFLIP_IMG : 0x00;
+                val = ctrl->val ? VFLIP_IMG : 0x00;
-                priv->flag_vflip = ctrl->value;
+                priv->flag_vflip = ctrl->val;
                if (priv->info->flags & OV772X_FLAG_VFLIP)
                        val ^= VFLIP_IMG;
-                ret = ov772x_mask_set(client, COM3, VFLIP_IMG, val);
+                return ov772x_mask_set(client, COM3, VFLIP_IMG, val);
-                break;
        case V4L2_CID_HFLIP:
-                val = ctrl->value ? HFLIP_IMG : 0x00;
+                val = ctrl->val ? HFLIP_IMG : 0x00;
-                priv->flag_hflip = ctrl->value;
+                priv->flag_hflip = ctrl->val;
                if (priv->info->flags & OV772X_FLAG_HFLIP)
                        val ^= HFLIP_IMG;
-                ret = ov772x_mask_set(client, COM3, HFLIP_IMG, val);
+                return ov772x_mask_set(client, COM3, HFLIP_IMG, val);
-                break;
        case V4L2_CID_BAND_STOP_FILTER:
-                if ((unsigned)ctrl->value > 256)
+                if (!ctrl->val) {
-                        ctrl->value = 256;
-                if (ctrl->value == priv->band_filter)
-                        break;
-                if (!ctrl->value) {
                        /* Switch the filter off, it is on now */
                        ret = ov772x_mask_set(client, BDBASE, 0xff, 0xff);
                        if (!ret)
@@ -696,7 +624,7 @@ static int ov772x_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
                                                      BNDF_ON_OFF, 0);
                } else {
                        /* Switch the filter on, set AEC low limit */
-                        val = 256 - ctrl->value;
+                        val = 256 - ctrl->val;
                        ret = ov772x_mask_set(client, COM8,
                                              BNDF_ON_OFF, BNDF_ON_OFF);
                        if (!ret)
@@ -704,11 +632,11 @@ static int ov772x_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
                                                      0xff, val);
                }
                if (!ret)
-                        priv->band_filter = ctrl->value;
+                        priv->band_filter = ctrl->val;
-                break;
+                return ret;
        }
-        return ret;
+        return -EINVAL;
 }
 static int ov772x_g_chip_ident(struct v4l2_subdev *sd,
@@ -822,13 +750,13 @@ static int ov772x_set_params(struct i2c_client *client, u32 *width, u32 *height,
                        goto ov772x_set_fmt_error;
                ret = ov772x_mask_set(client,
-                                      EDGE_TRSHLD, EDGE_THRESHOLD_MASK,
+                                      EDGE_TRSHLD, OV772X_EDGE_THRESHOLD_MASK,
                                      priv->info->edgectrl.threshold);
                if (ret < 0)
                        goto ov772x_set_fmt_error;
                ret = ov772x_mask_set(client,
-                                      EDGE_STRNGT, EDGE_STRENGTH_MASK,
+                                      EDGE_STRNGT, OV772X_EDGE_STRENGTH_MASK,
                                      priv->info->edgectrl.strength);
                if (ret < 0)
                        goto ov772x_set_fmt_error;
@@ -840,13 +768,13 @@ static int ov772x_set_params(struct i2c_client *client, u32 *width, u32 *height,
                 * set upper and lower limit
                 */
                ret = ov772x_mask_set(client,
-                                      EDGE_UPPER, EDGE_UPPER_MASK,
+                                      EDGE_UPPER, OV772X_EDGE_UPPER_MASK,
                                      priv->info->edgectrl.upper);
                if (ret < 0)
                        goto ov772x_set_fmt_error;
                ret = ov772x_mask_set(client,
-                                      EDGE_LOWER, EDGE_LOWER_MASK,
+                                      EDGE_LOWER, OV772X_EDGE_LOWER_MASK,
                                      priv->info->edgectrl.lower);
                if (ret < 0)
                        goto ov772x_set_fmt_error;
@@ -1025,17 +953,12 @@ static int ov772x_try_fmt(struct v4l2_subdev *sd,
        return 0;
 }
-static int ov772x_video_probe(struct soc_camera_device *icd,
+static int ov772x_video_probe(struct i2c_client *client)
-                              struct i2c_client *client)
 {
        struct ov772x_priv *priv = to_ov772x(client);
        u8                  pid, ver;
        const char         *devname;
-        /* We must have a parent by now. And it cannot be a wrong one. */
-        BUG_ON(!icd->parent ||
-               to_soc_camera_host(icd->parent)->nr != icd->iface);
        /*
         * check and show product ID and manufacturer ID
         */
@@ -1064,20 +987,14 @@ static int ov772x_video_probe(struct soc_camera_device *icd,
                 ver,
                 i2c_smbus_read_byte_data(client, MIDH),
                 i2c_smbus_read_byte_data(client, MIDL));
+        return v4l2_ctrl_handler_setup(&priv->hdl);
-        return 0;
 }
-static struct soc_camera_ops ov772x_ops = {
+static const struct v4l2_ctrl_ops ov772x_ctrl_ops = {
-        .set_bus_param          = ov772x_set_bus_param,
+        .s_ctrl = ov772x_s_ctrl,
-        .query_bus_param        = ov772x_query_bus_param,
-        .controls               = ov772x_controls,
-        .num_controls           = ARRAY_SIZE(ov772x_controls),
 };
 static struct v4l2_subdev_core_ops ov772x_subdev_core_ops = {
-        .g_ctrl         = ov772x_g_ctrl,
-        .s_ctrl         = ov772x_s_ctrl,
        .g_chip_ident   = ov772x_g_chip_ident,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
        .g_register     = ov772x_g_register,
@@ -1095,6 +1012,21 @@ static int ov772x_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
        return 0;
 }
+static int ov772x_g_mbus_config(struct v4l2_subdev *sd,
+                                struct v4l2_mbus_config *cfg)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        cfg->flags = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER |
+                V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH |
+                V4L2_MBUS_DATA_ACTIVE_HIGH;
+        cfg->type = V4L2_MBUS_PARALLEL;
+        cfg->flags = soc_camera_apply_board_flags(icl, cfg);
+        return 0;
+}
 static struct v4l2_subdev_video_ops ov772x_subdev_video_ops = {
        .s_stream       = ov772x_s_stream,
        .g_mbus_fmt     = ov772x_g_fmt,
@@ -1103,6 +1035,7 @@ static struct v4l2_subdev_video_ops ov772x_subdev_video_ops = {
        .cropcap        = ov772x_cropcap,
        .g_crop         = ov772x_g_crop,
        .enum_mbus_fmt  = ov772x_enum_fmt,
+        .g_mbus_config  = ov772x_g_mbus_config,
 };
 static struct v4l2_subdev_ops ov772x_subdev_ops = {
@@ -1117,20 +1050,15 @@ static struct v4l2_subdev_ops ov772x_subdev_ops = {
 static int ov772x_probe(struct i2c_client *client,
                        const struct i2c_device_id *did)
 {
-        struct ov772x_priv        *priv;
+        struct ov772x_priv      *priv;
-        struct soc_camera_device  *icd = client->dev.platform_data;
+        struct soc_camera_link  *icl = soc_camera_i2c_to_link(client);
-        struct i2c_adapter        *adapter = to_i2c_adapter(client->dev.parent);
+        struct i2c_adapter      *adapter = to_i2c_adapter(client->dev.parent);
-        struct soc_camera_link    *icl;
+        int                     ret;
-        int                        ret;
-        if (!icd) {
-                dev_err(&client->dev, "OV772X: missing soc-camera data!\n");
-                return -EINVAL;
-        }
-        icl = to_soc_camera_link(icd);
+        if (!icl || !icl->priv) {
-        if (!icl || !icl->priv)
+                dev_err(&client->dev, "OV772X: missing platform data!\n");
                return -EINVAL;
+        }
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
                dev_err(&adapter->dev,
@@ -1146,12 +1074,24 @@ static int ov772x_probe(struct i2c_client *client,
        priv->info = icl->priv;
        v4l2_i2c_subdev_init(&priv->subdev, client, &ov772x_subdev_ops);
+        v4l2_ctrl_handler_init(&priv->hdl, 3);
+        v4l2_ctrl_new_std(&priv->hdl, &ov772x_ctrl_ops,
+                        V4L2_CID_VFLIP, 0, 1, 1, 0);
+        v4l2_ctrl_new_std(&priv->hdl, &ov772x_ctrl_ops,
+                        V4L2_CID_HFLIP, 0, 1, 1, 0);
+        v4l2_ctrl_new_std(&priv->hdl, &ov772x_ctrl_ops,
+                        V4L2_CID_BAND_STOP_FILTER, 0, 256, 1, 0);
+        priv->subdev.ctrl_handler = &priv->hdl;
+        if (priv->hdl.error) {
+                int err = priv->hdl.error;
-        icd->ops                = &ov772x_ops;
+                kfree(priv);
+                return err;
+        }
-        ret = ov772x_video_probe(icd, client);
+        ret = ov772x_video_probe(client);
        if (ret) {
-                icd->ops = NULL;
+                v4l2_ctrl_handler_free(&priv->hdl);
                kfree(priv);
        }
@@ -1161,9 +1101,9 @@ static int ov772x_probe(struct i2c_client *client,
 static int ov772x_remove(struct i2c_client *client)
 {
        struct ov772x_priv *priv = to_ov772x(client);
-        struct soc_camera_device *icd = client->dev.platform_data;
-        icd->ops = NULL;
+        v4l2_device_unregister_subdev(&priv->subdev);
+        v4l2_ctrl_handler_free(&priv->hdl);
        kfree(priv);
        return 0;
 }
diff --git a/drivers/media/video/ov9640.c b/drivers/media/video/ov9640.c
index 3681a6ff0815..a4f99797eb56 100644
--- a/drivers/media/video/ov9640.c
+++ b/drivers/media/video/ov9640.c
@@ -24,10 +24,13 @@
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
+#include <linux/v4l2-mediabus.h>
 #include <linux/videodev2.h>
+#include <media/soc_camera.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-common.h>
-#include <media/soc_camera.h>
+#include <media/v4l2-ctrls.h>
 #include "ov9640.h"
@@ -162,27 +165,6 @@ static enum v4l2_mbus_pixelcode ov9640_codes[] = {
        V4L2_MBUS_FMT_RGB565_2X8_LE,
 };
-static const struct v4l2_queryctrl ov9640_controls[] = {
-        {
-                .id             = V4L2_CID_VFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Flip Vertically",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        },
-        {
-                .id             = V4L2_CID_HFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Flip Horizontally",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        },
-};
 /* read a register */
 static int ov9640_reg_read(struct i2c_client *client, u8 reg, u8 *val)
 {
@@ -284,75 +266,25 @@ static int ov9640_s_stream(struct v4l2_subdev *sd, int enable)
        return 0;
 }
-/* Alter bus settings on camera side */
-static int ov9640_set_bus_param(struct soc_camera_device *icd,
-                                unsigned long flags)
-{
-        return 0;
-}
-/* Request bus settings on camera side */
-static unsigned long ov9640_query_bus_param(struct soc_camera_device *icd)
-{
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        /*
-         * REVISIT: the camera probably can do 10 bit transfers, but I don't
-         *          have those pins connected on my hardware.
-         */
-        unsigned long flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_MASTER |
-                SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_HIGH |
-                SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATAWIDTH_8;
-        return soc_camera_apply_sensor_flags(icl, flags);
-}
-/* Get status of additional camera capabilities */
-static int ov9640_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
-{
-        struct ov9640_priv *priv = to_ov9640_sensor(sd);
-        switch (ctrl->id) {
-        case V4L2_CID_VFLIP:
-                ctrl->value = priv->flag_vflip;
-                break;
-        case V4L2_CID_HFLIP:
-                ctrl->value = priv->flag_hflip;
-                break;
-        }
-        return 0;
-}
 /* Set status of additional camera capabilities */
-static int ov9640_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
+static int ov9640_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct ov9640_priv *priv = container_of(ctrl->handler, struct ov9640_priv, hdl);
-        struct ov9640_priv *priv = to_ov9640_sensor(sd);
+        struct i2c_client *client = v4l2_get_subdevdata(&priv->subdev);
-        int ret = 0;
        switch (ctrl->id) {
        case V4L2_CID_VFLIP:
-                priv->flag_vflip = ctrl->value;
+                if (ctrl->val)
-                if (ctrl->value)
+                        return ov9640_reg_rmw(client, OV9640_MVFP,
-                        ret = ov9640_reg_rmw(client, OV9640_MVFP,
                                                        OV9640_MVFP_V, 0);
-                else
+                return ov9640_reg_rmw(client, OV9640_MVFP, 0, OV9640_MVFP_V);
-                        ret = ov9640_reg_rmw(client, OV9640_MVFP,
-                                                        0, OV9640_MVFP_V);
-                break;
        case V4L2_CID_HFLIP:
-                priv->flag_hflip = ctrl->value;
+                if (ctrl->val)
-                if (ctrl->value)
+                        return ov9640_reg_rmw(client, OV9640_MVFP,
-                        ret = ov9640_reg_rmw(client, OV9640_MVFP,
                                                        OV9640_MVFP_H, 0);
-                else
+                return ov9640_reg_rmw(client, OV9640_MVFP, 0, OV9640_MVFP_H);
-                        ret = ov9640_reg_rmw(client, OV9640_MVFP,
-                                                        0, OV9640_MVFP_H);
-                break;
        }
+        return -EINVAL;
-        return ret;
 }
 /* Get chip identification */
@@ -646,10 +578,7 @@ static int ov9640_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
        return 0;
 }
+static int ov9640_video_probe(struct i2c_client *client)
-static int ov9640_video_probe(struct soc_camera_device *icd,
-                                struct i2c_client *client)
 {
        struct v4l2_subdev *sd = i2c_get_clientdata(client);
        struct ov9640_priv *priv = to_ov9640_sensor(sd);
@@ -657,29 +586,19 @@ static int ov9640_video_probe(struct soc_camera_device *icd,
        const char      *devname;
        int             ret = 0;
-        /* We must have a parent by now. And it cannot be a wrong one. */
-        BUG_ON(!icd->parent ||
-               to_soc_camera_host(icd->parent)->nr != icd->iface);
        /*
         * check and show product ID and manufacturer ID
         */
        ret = ov9640_reg_read(client, OV9640_PID, &pid);
+        if (!ret)
+                ret = ov9640_reg_read(client, OV9640_VER, &ver);
+        if (!ret)
+                ret = ov9640_reg_read(client, OV9640_MIDH, &midh);
+        if (!ret)
+                ret = ov9640_reg_read(client, OV9640_MIDL, &midl);
        if (ret)
-                goto err;
+                return ret;
-        ret = ov9640_reg_read(client, OV9640_VER, &ver);
-        if (ret)
-                goto err;
-        ret = ov9640_reg_read(client, OV9640_MIDH, &midh);
-        if (ret)
-                goto err;
-        ret = ov9640_reg_read(client, OV9640_MIDL, &midl);
-        if (ret)
-                goto err;
        switch (VERSION(pid, ver)) {
        case OV9640_V2:
@@ -693,27 +612,20 @@ static int ov9640_video_probe(struct soc_camera_device *icd,
                break;
        default:
                dev_err(&client->dev, "Product ID error %x:%x\n", pid, ver);
-                ret = -ENODEV;
+                return -ENODEV;
-                goto err;
        }
        dev_info(&client->dev, "%s Product ID %0x:%0x Manufacturer ID %x:%x\n",
                 devname, pid, ver, midh, midl);
-err:
+        return v4l2_ctrl_handler_setup(&priv->hdl);
-        return ret;
 }
-static struct soc_camera_ops ov9640_ops = {
+static const struct v4l2_ctrl_ops ov9640_ctrl_ops = {
-        .set_bus_param          = ov9640_set_bus_param,
+        .s_ctrl = ov9640_s_ctrl,
-        .query_bus_param        = ov9640_query_bus_param,
-        .controls               = ov9640_controls,
-        .num_controls           = ARRAY_SIZE(ov9640_controls),
 };
 static struct v4l2_subdev_core_ops ov9640_core_ops = {
-        .g_ctrl                 = ov9640_g_ctrl,
-        .s_ctrl                 = ov9640_s_ctrl,
        .g_chip_ident           = ov9640_g_chip_ident,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
        .g_register             = ov9640_get_register,
@@ -722,6 +634,22 @@ static struct v4l2_subdev_core_ops ov9640_core_ops = {
 };
+/* Request bus settings on camera side */
+static int ov9640_g_mbus_config(struct v4l2_subdev *sd,
+                                struct v4l2_mbus_config *cfg)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        cfg->flags = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER |
+                V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH |
+                V4L2_MBUS_DATA_ACTIVE_HIGH;
+        cfg->type = V4L2_MBUS_PARALLEL;
+        cfg->flags = soc_camera_apply_board_flags(icl, cfg);
+        return 0;
+}
 static struct v4l2_subdev_video_ops ov9640_video_ops = {
        .s_stream       = ov9640_s_stream,
        .s_mbus_fmt     = ov9640_s_fmt,
@@ -729,7 +657,7 @@ static struct v4l2_subdev_video_ops ov9640_video_ops = {
        .enum_mbus_fmt  = ov9640_enum_fmt,
        .cropcap        = ov9640_cropcap,
        .g_crop         = ov9640_g_crop,
+        .g_mbus_config  = ov9640_g_mbus_config,
 };
 static struct v4l2_subdev_ops ov9640_subdev_ops = {
@@ -744,16 +672,9 @@ static int ov9640_probe(struct i2c_client *client,
                        const struct i2c_device_id *did)
 {
        struct ov9640_priv *priv;
-        struct soc_camera_device *icd   = client->dev.platform_data;
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
-        struct soc_camera_link *icl;
        int ret;
-        if (!icd) {
-                dev_err(&client->dev, "Missing soc-camera data!\n");
-                return -EINVAL;
-        }
-        icl = to_soc_camera_link(icd);
        if (!icl) {
                dev_err(&client->dev, "Missing platform_data for driver\n");
                return -EINVAL;
@@ -768,12 +689,23 @@ static int ov9640_probe(struct i2c_client *client,
        v4l2_i2c_subdev_init(&priv->subdev, client, &ov9640_subdev_ops);
-        icd->ops        = &ov9640_ops;
+        v4l2_ctrl_handler_init(&priv->hdl, 2);
+        v4l2_ctrl_new_std(&priv->hdl, &ov9640_ctrl_ops,
+                        V4L2_CID_VFLIP, 0, 1, 1, 0);
+        v4l2_ctrl_new_std(&priv->hdl, &ov9640_ctrl_ops,
+                        V4L2_CID_HFLIP, 0, 1, 1, 0);
+        priv->subdev.ctrl_handler = &priv->hdl;
+        if (priv->hdl.error) {
+                int err = priv->hdl.error;
+                kfree(priv);
+                return err;
+        }
-        ret = ov9640_video_probe(icd, client);
+        ret = ov9640_video_probe(client);
        if (ret) {
-                icd->ops = NULL;
+                v4l2_ctrl_handler_free(&priv->hdl);
                kfree(priv);
        }
@@ -785,6 +717,8 @@ static int ov9640_remove(struct i2c_client *client)
        struct v4l2_subdev *sd = i2c_get_clientdata(client);
        struct ov9640_priv *priv = to_ov9640_sensor(sd);
+        v4l2_device_unregister_subdev(&priv->subdev);
+        v4l2_ctrl_handler_free(&priv->hdl);
        kfree(priv);
        return 0;
 }
diff --git a/drivers/media/video/ov9640.h b/drivers/media/video/ov9640.h
index f8a51b70792e..6b33a972c83c 100644
--- a/drivers/media/video/ov9640.h
+++ b/drivers/media/video/ov9640.h
@@ -198,12 +198,10 @@ struct ov9640_reg {
 struct ov9640_priv {
        struct v4l2_subdev              subdev;
+        struct v4l2_ctrl_handler        hdl;
        int                             model;
        int                             revision;
-        bool                            flag_vflip;
-        bool                            flag_hflip;
 };
 #endif  /* __DRIVERS_MEDIA_VIDEO_OV9640_H__ */
diff --git a/drivers/media/video/ov9740.c b/drivers/media/video/ov9740.c
index edd1ffcca30b..d9a9f7174f7a 100644
--- a/drivers/media/video/ov9740.c
+++ b/drivers/media/video/ov9740.c
@@ -14,8 +14,11 @@
 #include <linux/module.h>
 #include <linux/i2c.h>
 #include <linux/slab.h>
-#include <media/v4l2-chip-ident.h>
+#include <linux/v4l2-mediabus.h>
 #include <media/soc_camera.h>
+#include <media/v4l2-chip-ident.h>
+#include <media/v4l2-ctrls.h>
 #define to_ov9740(sd)           container_of(sd, struct ov9740_priv, subdev)
@@ -192,6 +195,7 @@ struct ov9740_reg {
 struct ov9740_priv {
        struct v4l2_subdev              subdev;
+        struct v4l2_ctrl_handler        hdl;
        int                             ident;
        u16                             model;
@@ -392,27 +396,6 @@ static enum v4l2_mbus_pixelcode ov9740_codes[] = {
        V4L2_MBUS_FMT_YUYV8_2X8,
 };
-static const struct v4l2_queryctrl ov9740_controls[] = {
-        {
-                .id             = V4L2_CID_VFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Flip Vertically",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        },
-        {
-                .id             = V4L2_CID_HFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Flip Horizontally",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        },
-};
 /* read a register */
 static int ov9740_reg_read(struct i2c_client *client, u16 reg, u8 *val)
 {
@@ -560,25 +543,6 @@ static int ov9740_s_stream(struct v4l2_subdev *sd, int enable)
        return ret;
 }
-/* Alter bus settings on camera side */
-static int ov9740_set_bus_param(struct soc_camera_device *icd,
-                                unsigned long flags)
-{
-        return 0;
-}
-/* Request bus settings on camera side */
-static unsigned long ov9740_query_bus_param(struct soc_camera_device *icd)
-{
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        unsigned long flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_MASTER |
-                SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_HIGH |
-                SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATAWIDTH_8;
-        return soc_camera_apply_sensor_flags(icl, flags);
-}
 /* select nearest higher resolution for capture */
 static void ov9740_res_roundup(u32 *width, u32 *height)
 {
@@ -788,36 +752,18 @@ static int ov9740_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
        return 0;
 }
-/* Get status of additional camera capabilities */
-static int ov9740_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
-{
-        struct ov9740_priv *priv = to_ov9740(sd);
-        switch (ctrl->id) {
-        case V4L2_CID_VFLIP:
-                ctrl->value = priv->flag_vflip;
-                break;
-        case V4L2_CID_HFLIP:
-                ctrl->value = priv->flag_hflip;
-                break;
-        default:
-                return -EINVAL;
-        }
-        return 0;
-}
 /* Set status of additional camera capabilities */
-static int ov9740_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
+static int ov9740_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct ov9740_priv *priv = to_ov9740(sd);
+        struct ov9740_priv *priv =
+                container_of(ctrl->handler, struct ov9740_priv, hdl);
        switch (ctrl->id) {
        case V4L2_CID_VFLIP:
-                priv->flag_vflip = ctrl->value;
+                priv->flag_vflip = ctrl->val;
                break;
        case V4L2_CID_HFLIP:
-                priv->flag_hflip = ctrl->value;
+                priv->flag_hflip = ctrl->val;
                break;
        default:
                return -EINVAL;
@@ -890,18 +836,13 @@ static int ov9740_set_register(struct v4l2_subdev *sd,
 }
 #endif
-static int ov9740_video_probe(struct soc_camera_device *icd,
+static int ov9740_video_probe(struct i2c_client *client)
-                              struct i2c_client *client)
 {
        struct v4l2_subdev *sd = i2c_get_clientdata(client);
        struct ov9740_priv *priv = to_ov9740(sd);
        u8 modelhi, modello;
        int ret;
-        /* We must have a parent by now. And it cannot be a wrong one. */
-        BUG_ON(!icd->parent ||
-               to_soc_camera_host(icd->parent)->nr != icd->iface);
        /*
         * check and show product ID and manufacturer ID
         */
@@ -942,25 +883,33 @@ err:
        return ret;
 }
-static struct soc_camera_ops ov9740_ops = {
+/* Request bus settings on camera side */
-        .set_bus_param          = ov9740_set_bus_param,
+static int ov9740_g_mbus_config(struct v4l2_subdev *sd,
-        .query_bus_param        = ov9740_query_bus_param,
+                                struct v4l2_mbus_config *cfg)
-        .controls               = ov9740_controls,
+{
-        .num_controls           = ARRAY_SIZE(ov9740_controls),
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
-};
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        cfg->flags = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER |
+                V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH |
+                V4L2_MBUS_DATA_ACTIVE_HIGH;
+        cfg->type = V4L2_MBUS_PARALLEL;
+        cfg->flags = soc_camera_apply_board_flags(icl, cfg);
+        return 0;
+}
 static struct v4l2_subdev_video_ops ov9740_video_ops = {
-        .s_stream               = ov9740_s_stream,
+        .s_stream       = ov9740_s_stream,
-        .s_mbus_fmt             = ov9740_s_fmt,
+        .s_mbus_fmt     = ov9740_s_fmt,
-        .try_mbus_fmt           = ov9740_try_fmt,
+        .try_mbus_fmt   = ov9740_try_fmt,
-        .enum_mbus_fmt          = ov9740_enum_fmt,
+        .enum_mbus_fmt  = ov9740_enum_fmt,
-        .cropcap                = ov9740_cropcap,
+        .cropcap        = ov9740_cropcap,
-        .g_crop                 = ov9740_g_crop,
+        .g_crop         = ov9740_g_crop,
+        .g_mbus_config  = ov9740_g_mbus_config,
 };
 static struct v4l2_subdev_core_ops ov9740_core_ops = {
-        .g_ctrl                 = ov9740_g_ctrl,
-        .s_ctrl                 = ov9740_s_ctrl,
        .g_chip_ident           = ov9740_g_chip_ident,
        .s_power                = ov9740_s_power,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
@@ -974,6 +923,10 @@ static struct v4l2_subdev_ops ov9740_subdev_ops = {
        .video                  = &ov9740_video_ops,
 };
+static const struct v4l2_ctrl_ops ov9740_ctrl_ops = {
+        .s_ctrl = ov9740_s_ctrl,
+};
 /*
 * i2c_driver function
 */
@@ -981,16 +934,9 @@ static int ov9740_probe(struct i2c_client *client,
                        const struct i2c_device_id *did)
 {
        struct ov9740_priv *priv;
-        struct soc_camera_device *icd   = client->dev.platform_data;
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
-        struct soc_camera_link *icl;
        int ret;
-        if (!icd) {
-                dev_err(&client->dev, "Missing soc-camera data!\n");
-                return -EINVAL;
-        }
-        icl = to_soc_camera_link(icd);
        if (!icl) {
                dev_err(&client->dev, "Missing platform_data for driver\n");
                return -EINVAL;
@@ -1003,12 +949,24 @@ static int ov9740_probe(struct i2c_client *client,
        }
        v4l2_i2c_subdev_init(&priv->subdev, client, &ov9740_subdev_ops);
+        v4l2_ctrl_handler_init(&priv->hdl, 13);
+        v4l2_ctrl_new_std(&priv->hdl, &ov9740_ctrl_ops,
+                        V4L2_CID_VFLIP, 0, 1, 1, 0);
+        v4l2_ctrl_new_std(&priv->hdl, &ov9740_ctrl_ops,
+                        V4L2_CID_HFLIP, 0, 1, 1, 0);
+        priv->subdev.ctrl_handler = &priv->hdl;
+        if (priv->hdl.error) {
+                int err = priv->hdl.error;
-        icd->ops = &ov9740_ops;
+                kfree(priv);
+                return err;
+        }
-        ret = ov9740_video_probe(icd, client);
+        ret = ov9740_video_probe(client);
+        if (!ret)
+                ret = v4l2_ctrl_handler_setup(&priv->hdl);
        if (ret < 0) {
-                icd->ops = NULL;
+                v4l2_ctrl_handler_free(&priv->hdl);
                kfree(priv);
        }
@@ -1019,8 +977,9 @@ static int ov9740_remove(struct i2c_client *client)
 {
        struct ov9740_priv *priv = i2c_get_clientdata(client);
+        v4l2_device_unregister_subdev(&priv->subdev);
+        v4l2_ctrl_handler_free(&priv->hdl);
        kfree(priv);
        return 0;
 }
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
index e799331389b1..c6da8f77e1a2 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
@@ -28,6 +28,7 @@ pvr2_device_desc structures.
 #include "pvrusb2-devattr.h"
 #include <linux/usb.h>
+#include <linux/module.h>
 /* This is needed in order to pull in tuner type ids... */
 #include <linux/i2c.h>
 #include <media/tuner.h>
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 5a6f24d1246d..122b45760f0d 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -21,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <linux/firmware.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index e72d5103e778..885ce11f222d 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -19,6 +19,7 @@
 */
 #include <linux/i2c.h>
+#include <linux/module.h>
 #include <media/ir-kbd-i2c.h>
 #include "pvrusb2-i2c-core.h"
 #include "pvrusb2-hdw-internal.h"
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index ce7ac4595276..6d666174dbb4 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -29,6 +29,7 @@
 #include "pvrusb2-v4l2.h"
 #include "pvrusb2-ioread.h"
 #include <linux/videodev2.h>
+#include <linux/module.h>
 #include <media/v4l2-dev.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 360be226718d..01ff643e682d 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -744,9 +744,9 @@ static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma)
 /***************************************************************************/
 /* Videobuf2 operations */
-static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
+static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
-                                unsigned int *nplanes, unsigned int sizes[],
+                                unsigned int *nbuffers, unsigned int *nplanes,
-                                void *alloc_ctxs[])
+                                unsigned int sizes[], void *alloc_ctxs[])
 {
        struct pwc_device *pdev = vb2_get_drv_priv(vq);
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
index d07df22a5ec6..79fb22c89ae9 100644
--- a/drivers/media/video/pxa_camera.c
+++ b/drivers/media/video/pxa_camera.c
@@ -214,6 +214,7 @@ struct pxa_camera_dev {
        unsigned long           ciclk;
        unsigned long           mclk;
        u32                     mclk_divisor;
+        u16                     width_flags;    /* max 10 bits */
        struct list_head        capture;
@@ -1020,37 +1021,20 @@ static int test_platform_param(struct pxa_camera_dev *pcdev,
         * quick capture interface supports both.
         */
        *flags = (pcdev->platform_flags & PXA_CAMERA_MASTER ?
-                  SOCAM_MASTER : SOCAM_SLAVE) |
+                  V4L2_MBUS_MASTER : V4L2_MBUS_SLAVE) |
-                SOCAM_HSYNC_ACTIVE_HIGH |
+                V4L2_MBUS_HSYNC_ACTIVE_HIGH |
-                SOCAM_HSYNC_ACTIVE_LOW |
+                V4L2_MBUS_HSYNC_ACTIVE_LOW |
-                SOCAM_VSYNC_ACTIVE_HIGH |
+                V4L2_MBUS_VSYNC_ACTIVE_HIGH |
-                SOCAM_VSYNC_ACTIVE_LOW |
+                V4L2_MBUS_VSYNC_ACTIVE_LOW |
-                SOCAM_DATA_ACTIVE_HIGH |
+                V4L2_MBUS_DATA_ACTIVE_HIGH |
-                SOCAM_PCLK_SAMPLE_RISING |
+                V4L2_MBUS_PCLK_SAMPLE_RISING |
-                SOCAM_PCLK_SAMPLE_FALLING;
+                V4L2_MBUS_PCLK_SAMPLE_FALLING;
        /* If requested data width is supported by the platform, use it */
-        switch (buswidth) {
+        if ((1 << (buswidth - 1)) & pcdev->width_flags)
-        case 10:
+                return 0;
-                if (!(pcdev->platform_flags & PXA_CAMERA_DATAWIDTH_10))
-                        return -EINVAL;
-                *flags |= SOCAM_DATAWIDTH_10;
-                break;
-        case 9:
-                if (!(pcdev->platform_flags & PXA_CAMERA_DATAWIDTH_9))
-                        return -EINVAL;
-                *flags |= SOCAM_DATAWIDTH_9;
-                break;
-        case 8:
-                if (!(pcdev->platform_flags & PXA_CAMERA_DATAWIDTH_8))
-                        return -EINVAL;
-                *flags |= SOCAM_DATAWIDTH_8;
-                break;
-        default:
-                return -EINVAL;
-        }
-        return 0;
+        return -EINVAL;
 }
 static void pxa_camera_setup_cicr(struct soc_camera_device *icd,
@@ -1070,12 +1054,12 @@ static void pxa_camera_setup_cicr(struct soc_camera_device *icd,
         * Datawidth is now guaranteed to be equal to one of the three values.
         * We fix bit-per-pixel equal to data-width...
         */
-        switch (flags & SOCAM_DATAWIDTH_MASK) {
+        switch (icd->current_fmt->host_fmt->bits_per_sample) {
-        case SOCAM_DATAWIDTH_10:
+        case 10:
                dw = 4;
                bpp = 0x40;
                break;
-        case SOCAM_DATAWIDTH_9:
+        case 9:
                dw = 3;
                bpp = 0x20;
                break;
@@ -1084,7 +1068,7 @@ static void pxa_camera_setup_cicr(struct soc_camera_device *icd,
                 * Actually it can only be 8 now,
                 * default is just to silence compiler warnings
                 */
-        case SOCAM_DATAWIDTH_8:
+        case 8:
                dw = 2;
                bpp = 0;
        }
@@ -1093,11 +1077,11 @@ static void pxa_camera_setup_cicr(struct soc_camera_device *icd,
                cicr4 |= CICR4_PCLK_EN;
        if (pcdev->platform_flags & PXA_CAMERA_MCLK_EN)
                cicr4 |= CICR4_MCLK_EN;
-        if (flags & SOCAM_PCLK_SAMPLE_FALLING)
+        if (flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)
                cicr4 |= CICR4_PCP;
-        if (flags & SOCAM_HSYNC_ACTIVE_LOW)
+        if (flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)
                cicr4 |= CICR4_HSP;
-        if (flags & SOCAM_VSYNC_ACTIVE_LOW)
+        if (flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)
                cicr4 |= CICR4_VSP;
        cicr0 = __raw_readl(pcdev->base + CICR0);
@@ -1151,9 +1135,11 @@ static void pxa_camera_setup_cicr(struct soc_camera_device *icd,
 static int pxa_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
 {
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct pxa_camera_dev *pcdev = ici->priv;
-        unsigned long bus_flags, camera_flags, common_flags;
+        struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
+        unsigned long bus_flags, common_flags;
        int ret;
        struct pxa_cam *cam = icd->host_priv;
@@ -1162,44 +1148,58 @@ static int pxa_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
        if (ret < 0)
                return ret;
-        camera_flags = icd->ops->query_bus_param(icd);
+        ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
+        if (!ret) {
-        common_flags = soc_camera_bus_param_compatible(camera_flags, bus_flags);
+                common_flags = soc_mbus_config_compatible(&cfg,
-        if (!common_flags)
+                                                          bus_flags);
-                return -EINVAL;
+                if (!common_flags) {
+                        dev_warn(icd->parent,
+                                 "Flags incompatible: camera 0x%x, host 0x%lx\n",
+                                 cfg.flags, bus_flags);
+                        return -EINVAL;
+                }
+        } else if (ret != -ENOIOCTLCMD) {
+                return ret;
+        } else {
+                common_flags = bus_flags;
+        }
        pcdev->channels = 1;
        /* Make choises, based on platform preferences */
-        if ((common_flags & SOCAM_HSYNC_ACTIVE_HIGH) &&
+        if ((common_flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH) &&
-            (common_flags & SOCAM_HSYNC_ACTIVE_LOW)) {
+            (common_flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)) {
                if (pcdev->platform_flags & PXA_CAMERA_HSP)
-                        common_flags &= ~SOCAM_HSYNC_ACTIVE_HIGH;
+                        common_flags &= ~V4L2_MBUS_HSYNC_ACTIVE_HIGH;
                else
-                        common_flags &= ~SOCAM_HSYNC_ACTIVE_LOW;
+                        common_flags &= ~V4L2_MBUS_HSYNC_ACTIVE_LOW;
        }
-        if ((common_flags & SOCAM_VSYNC_ACTIVE_HIGH) &&
+        if ((common_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH) &&
-            (common_flags & SOCAM_VSYNC_ACTIVE_LOW)) {
+            (common_flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)) {
                if (pcdev->platform_flags & PXA_CAMERA_VSP)
-                        common_flags &= ~SOCAM_VSYNC_ACTIVE_HIGH;
+                        common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_HIGH;
                else
-                        common_flags &= ~SOCAM_VSYNC_ACTIVE_LOW;
+                        common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_LOW;
        }
-        if ((common_flags & SOCAM_PCLK_SAMPLE_RISING) &&
+        if ((common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING) &&
-            (common_flags & SOCAM_PCLK_SAMPLE_FALLING)) {
+            (common_flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)) {
                if (pcdev->platform_flags & PXA_CAMERA_PCP)
-                        common_flags &= ~SOCAM_PCLK_SAMPLE_RISING;
+                        common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_RISING;
                else
-                        common_flags &= ~SOCAM_PCLK_SAMPLE_FALLING;
+                        common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_FALLING;
        }
-        cam->flags = common_flags;
+        cfg.flags = common_flags;
+        ret = v4l2_subdev_call(sd, video, s_mbus_config, &cfg);
-        ret = icd->ops->set_bus_param(icd, common_flags);
+        if (ret < 0 && ret != -ENOIOCTLCMD) {
-        if (ret < 0)
+                dev_dbg(icd->parent, "camera s_mbus_config(0x%lx) returned %d\n",
+                        common_flags, ret);
                return ret;
+        }
+        cam->flags = common_flags;
        pxa_camera_setup_cicr(icd, common_flags, pixfmt);
@@ -1209,17 +1209,31 @@ static int pxa_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
 static int pxa_camera_try_bus_param(struct soc_camera_device *icd,
                                    unsigned char buswidth)
 {
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct pxa_camera_dev *pcdev = ici->priv;
-        unsigned long bus_flags, camera_flags;
+        struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
+        unsigned long bus_flags, common_flags;
        int ret = test_platform_param(pcdev, buswidth, &bus_flags);
        if (ret < 0)
                return ret;
-        camera_flags = icd->ops->query_bus_param(icd);
+        ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
+        if (!ret) {
+                common_flags = soc_mbus_config_compatible(&cfg,
+                                                          bus_flags);
+                if (!common_flags) {
+                        dev_warn(icd->parent,
+                                 "Flags incompatible: camera 0x%x, host 0x%lx\n",
+                                 cfg.flags, bus_flags);
+                        return -EINVAL;
+                }
+        } else if (ret == -ENOIOCTLCMD) {
+                ret = 0;
+        }
-        return soc_camera_bus_param_compatible(camera_flags, bus_flags) ? 0 : -EINVAL;
+        return ret;
 }
 static const struct soc_mbus_pixelfmt pxa_camera_formats[] = {
@@ -1687,6 +1701,12 @@ static int __devinit pxa_camera_probe(struct platform_device *pdev)
                         "data widths, using default 10 bit\n");
                pcdev->platform_flags |= PXA_CAMERA_DATAWIDTH_10;
        }
+        if (pcdev->platform_flags & PXA_CAMERA_DATAWIDTH_8)
+                pcdev->width_flags = 1 << 7;
+        if (pcdev->platform_flags & PXA_CAMERA_DATAWIDTH_9)
+                pcdev->width_flags |= 1 << 8;
+        if (pcdev->platform_flags & PXA_CAMERA_DATAWIDTH_10)
+                pcdev->width_flags |= 1 << 9;
        pcdev->mclk = pcdev->pdata->mclk_10khz * 10000;
        if (!pcdev->mclk) {
                dev_warn(&pdev->dev,
diff --git a/drivers/media/video/rj54n1cb0c.c b/drivers/media/video/rj54n1cb0c.c
index 847ccc067e87..9937386a3bae 100644
--- a/drivers/media/video/rj54n1cb0c.c
+++ b/drivers/media/video/rj54n1cb0c.c
@@ -11,13 +11,15 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/slab.h>
+#include <linux/v4l2-mediabus.h>
 #include <linux/videodev2.h>
+#include <linux/module.h>
 #include <media/rj54n1cb0c.h>
 #include <media/soc_camera.h>
-#include <media/soc_mediabus.h>
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-chip-ident.h>
+#include <media/v4l2-ctrls.h>
 #define RJ54N1_DEV_CODE                 0x0400
 #define RJ54N1_DEV_CODE2                0x0401
@@ -148,6 +150,7 @@ struct rj54n1_clock_div {
 struct rj54n1 {
        struct v4l2_subdev subdev;
+        struct v4l2_ctrl_handler hdl;
        struct rj54n1_clock_div clk_div;
        const struct rj54n1_datafmt *fmt;
        struct v4l2_rect rect;  /* Sensor window */
@@ -499,31 +502,6 @@ static int rj54n1_s_stream(struct v4l2_subdev *sd, int enable)
        return reg_set(client, RJ54N1_STILL_CONTROL, (!enable) << 7, 0x80);
 }
-static int rj54n1_set_bus_param(struct soc_camera_device *icd,
-                                unsigned long flags)
-{
-        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
-        struct i2c_client *client = v4l2_get_subdevdata(sd);
-        /* Figures 2.5-1 to 2.5-3 - default falling pixclk edge */
-        if (flags & SOCAM_PCLK_SAMPLE_RISING)
-                return reg_write(client, RJ54N1_OUT_SIGPO, 1 << 4);
-        else
-                return reg_write(client, RJ54N1_OUT_SIGPO, 0);
-}
-static unsigned long rj54n1_query_bus_param(struct soc_camera_device *icd)
-{
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        const unsigned long flags =
-                SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING |
-                SOCAM_MASTER | SOCAM_DATAWIDTH_8 |
-                SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH |
-                SOCAM_DATA_ACTIVE_HIGH;
-        return soc_camera_apply_sensor_flags(icl, flags);
-}
 static int rj54n1_set_rect(struct i2c_client *client,
                           u16 reg_x, u16 reg_y, u16 reg_xy,
                           u32 width, u32 height)
@@ -1202,134 +1180,51 @@ static int rj54n1_s_register(struct v4l2_subdev *sd,
 }
 #endif
-static const struct v4l2_queryctrl rj54n1_controls[] = {
+static int rj54n1_s_ctrl(struct v4l2_ctrl *ctrl)
-        {
-                .id             = V4L2_CID_VFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Flip Vertically",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        }, {
-                .id             = V4L2_CID_HFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Flip Horizontally",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        }, {
-                .id             = V4L2_CID_GAIN,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "Gain",
-                .minimum        = 0,
-                .maximum        = 127,
-                .step           = 1,
-                .default_value  = 66,
-                .flags          = V4L2_CTRL_FLAG_SLIDER,
-        }, {
-                .id             = V4L2_CID_AUTO_WHITE_BALANCE,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Auto white balance",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 1,
-        },
-};
-static struct soc_camera_ops rj54n1_ops = {
-        .set_bus_param          = rj54n1_set_bus_param,
-        .query_bus_param        = rj54n1_query_bus_param,
-        .controls               = rj54n1_controls,
-        .num_controls           = ARRAY_SIZE(rj54n1_controls),
-};
-static int rj54n1_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
+        struct rj54n1 *rj54n1 = container_of(ctrl->handler, struct rj54n1, hdl);
+        struct v4l2_subdev *sd = &rj54n1->subdev;
        struct i2c_client *client = v4l2_get_subdevdata(sd);
-        struct rj54n1 *rj54n1 = to_rj54n1(client);
        int data;
        switch (ctrl->id) {
        case V4L2_CID_VFLIP:
-                data = reg_read(client, RJ54N1_MIRROR_STILL_MODE);
+                if (ctrl->val)
-                if (data < 0)
-                        return -EIO;
-                ctrl->value = !(data & 1);
-                break;
-        case V4L2_CID_HFLIP:
-                data = reg_read(client, RJ54N1_MIRROR_STILL_MODE);
-                if (data < 0)
-                        return -EIO;
-                ctrl->value = !(data & 2);
-                break;
-        case V4L2_CID_GAIN:
-                data = reg_read(client, RJ54N1_Y_GAIN);
-                if (data < 0)
-                        return -EIO;
-                ctrl->value = data / 2;
-                break;
-        case V4L2_CID_AUTO_WHITE_BALANCE:
-                ctrl->value = rj54n1->auto_wb;
-                break;
-        }
-        return 0;
-}
-static int rj54n1_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
-{
-        int data;
-        struct i2c_client *client = v4l2_get_subdevdata(sd);
-        struct rj54n1 *rj54n1 = to_rj54n1(client);
-        const struct v4l2_queryctrl *qctrl;
-        qctrl = soc_camera_find_qctrl(&rj54n1_ops, ctrl->id);
-        if (!qctrl)
-                return -EINVAL;
-        switch (ctrl->id) {
-        case V4L2_CID_VFLIP:
-                if (ctrl->value)
                        data = reg_set(client, RJ54N1_MIRROR_STILL_MODE, 0, 1);
                else
                        data = reg_set(client, RJ54N1_MIRROR_STILL_MODE, 1, 1);
                if (data < 0)
                        return -EIO;
-                break;
+                return 0;
        case V4L2_CID_HFLIP:
-                if (ctrl->value)
+                if (ctrl->val)
                        data = reg_set(client, RJ54N1_MIRROR_STILL_MODE, 0, 2);
                else
                        data = reg_set(client, RJ54N1_MIRROR_STILL_MODE, 2, 2);
                if (data < 0)
                        return -EIO;
-                break;
+                return 0;
        case V4L2_CID_GAIN:
-                if (ctrl->value > qctrl->maximum ||
+                if (reg_write(client, RJ54N1_Y_GAIN, ctrl->val * 2) < 0)
-                    ctrl->value < qctrl->minimum)
-                        return -EINVAL;
-                else if (reg_write(client, RJ54N1_Y_GAIN, ctrl->value * 2) < 0)
                        return -EIO;
-                break;
+                return 0;
        case V4L2_CID_AUTO_WHITE_BALANCE:
                /* Auto WB area - whole image */
-                if (reg_set(client, RJ54N1_WB_SEL_WEIGHT_I, ctrl->value << 7,
+                if (reg_set(client, RJ54N1_WB_SEL_WEIGHT_I, ctrl->val << 7,
                            0x80) < 0)
                        return -EIO;
-                rj54n1->auto_wb = ctrl->value;
+                rj54n1->auto_wb = ctrl->val;
-                break;
+                return 0;
        }
-        return 0;
+        return -EINVAL;
 }
+static const struct v4l2_ctrl_ops rj54n1_ctrl_ops = {
+        .s_ctrl = rj54n1_s_ctrl,
+};
 static struct v4l2_subdev_core_ops rj54n1_subdev_core_ops = {
-        .g_ctrl         = rj54n1_g_ctrl,
-        .s_ctrl         = rj54n1_s_ctrl,
        .g_chip_ident   = rj54n1_g_chip_ident,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
        .g_register     = rj54n1_g_register,
@@ -1337,6 +1232,36 @@ static struct v4l2_subdev_core_ops rj54n1_subdev_core_ops = {
 #endif
 };
+static int rj54n1_g_mbus_config(struct v4l2_subdev *sd,
+                                struct v4l2_mbus_config *cfg)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        cfg->flags =
+                V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_PCLK_SAMPLE_FALLING |
+                V4L2_MBUS_MASTER | V4L2_MBUS_DATA_ACTIVE_HIGH |
+                V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_HIGH;
+        cfg->type = V4L2_MBUS_PARALLEL;
+        cfg->flags = soc_camera_apply_board_flags(icl, cfg);
+        return 0;
+}
+static int rj54n1_s_mbus_config(struct v4l2_subdev *sd,
+                                const struct v4l2_mbus_config *cfg)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        /* Figures 2.5-1 to 2.5-3 - default falling pixclk edge */
+        if (soc_camera_apply_board_flags(icl, cfg) &
+            V4L2_MBUS_PCLK_SAMPLE_RISING)
+                return reg_write(client, RJ54N1_OUT_SIGPO, 1 << 4);
+        else
+                return reg_write(client, RJ54N1_OUT_SIGPO, 0);
+}
 static struct v4l2_subdev_video_ops rj54n1_subdev_video_ops = {
        .s_stream       = rj54n1_s_stream,
        .s_mbus_fmt     = rj54n1_s_fmt,
@@ -1346,6 +1271,8 @@ static struct v4l2_subdev_video_ops rj54n1_subdev_video_ops = {
        .g_crop         = rj54n1_g_crop,
        .s_crop         = rj54n1_s_crop,
        .cropcap        = rj54n1_cropcap,
+        .g_mbus_config  = rj54n1_g_mbus_config,
+        .s_mbus_config  = rj54n1_s_mbus_config,
 };
 static struct v4l2_subdev_ops rj54n1_subdev_ops = {
@@ -1357,17 +1284,12 @@ static struct v4l2_subdev_ops rj54n1_subdev_ops = {
 * Interface active, can use i2c. If it fails, it can indeed mean, that
 * this wasn't our capture interface, so, we wait for the right one
 */
-static int rj54n1_video_probe(struct soc_camera_device *icd,
+static int rj54n1_video_probe(struct i2c_client *client,
-                              struct i2c_client *client,
                              struct rj54n1_pdata *priv)
 {
        int data1, data2;
        int ret;
-        /* We must have a parent by now. And it cannot be a wrong one. */
-        BUG_ON(!icd->parent ||
-               to_soc_camera_host(icd->parent)->nr != icd->iface);
        /* Read out the chip version register */
        data1 = reg_read(client, RJ54N1_DEV_CODE);
        data2 = reg_read(client, RJ54N1_DEV_CODE2);
@@ -1395,18 +1317,11 @@ static int rj54n1_probe(struct i2c_client *client,
                        const struct i2c_device_id *did)
 {
        struct rj54n1 *rj54n1;
-        struct soc_camera_device *icd = client->dev.platform_data;
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
        struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
-        struct soc_camera_link *icl;
        struct rj54n1_pdata *rj54n1_priv;
        int ret;
-        if (!icd) {
-                dev_err(&client->dev, "RJ54N1CB0C: missing soc-camera data!\n");
-                return -EINVAL;
-        }
-        icl = to_soc_camera_link(icd);
        if (!icl || !icl->priv) {
                dev_err(&client->dev, "RJ54N1CB0C: missing platform data!\n");
                return -EINVAL;
@@ -1425,8 +1340,22 @@ static int rj54n1_probe(struct i2c_client *client,
                return -ENOMEM;
        v4l2_i2c_subdev_init(&rj54n1->subdev, client, &rj54n1_subdev_ops);
+        v4l2_ctrl_handler_init(&rj54n1->hdl, 4);
+        v4l2_ctrl_new_std(&rj54n1->hdl, &rj54n1_ctrl_ops,
+                        V4L2_CID_VFLIP, 0, 1, 1, 0);
+        v4l2_ctrl_new_std(&rj54n1->hdl, &rj54n1_ctrl_ops,
+                        V4L2_CID_HFLIP, 0, 1, 1, 0);
+        v4l2_ctrl_new_std(&rj54n1->hdl, &rj54n1_ctrl_ops,
+                        V4L2_CID_GAIN, 0, 127, 1, 66);
+        v4l2_ctrl_new_std(&rj54n1->hdl, &rj54n1_ctrl_ops,
+                        V4L2_CID_AUTO_WHITE_BALANCE, 0, 1, 1, 1);
+        rj54n1->subdev.ctrl_handler = &rj54n1->hdl;
+        if (rj54n1->hdl.error) {
+                int err = rj54n1->hdl.error;
-        icd->ops                = &rj54n1_ops;
+                kfree(rj54n1);
+                return err;
+        }
        rj54n1->clk_div         = clk_div;
        rj54n1->rect.left       = RJ54N1_COLUMN_SKIP;
@@ -1440,25 +1369,24 @@ static int rj54n1_probe(struct i2c_client *client,
        rj54n1->tgclk_mhz       = (rj54n1_priv->mclk_freq / PLL_L * PLL_N) /
                (clk_div.ratio_tg + 1) / (clk_div.ratio_t + 1);
-        ret = rj54n1_video_probe(icd, client, rj54n1_priv);
+        ret = rj54n1_video_probe(client, rj54n1_priv);
        if (ret < 0) {
-                icd->ops = NULL;
+                v4l2_ctrl_handler_free(&rj54n1->hdl);
                kfree(rj54n1);
                return ret;
        }
+        return v4l2_ctrl_handler_setup(&rj54n1->hdl);
-        return ret;
 }
 static int rj54n1_remove(struct i2c_client *client)
 {
        struct rj54n1 *rj54n1 = to_rj54n1(client);
-        struct soc_camera_device *icd = client->dev.platform_data;
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        icd->ops = NULL;
+        v4l2_device_unregister_subdev(&rj54n1->subdev);
        if (icl->free_bus)
                icl->free_bus(icl);
+        v4l2_ctrl_handler_free(&rj54n1->hdl);
        kfree(rj54n1);
        return 0;
diff --git a/drivers/media/video/s5k6aa.c b/drivers/media/video/s5k6aa.c
new file mode 100644
index 000000000000..2446736b7871
--- /dev/null
+++ b/drivers/media/video/s5k6aa.c
@@ -0,0 +1,1680 @@
+/*
+ * Driver for Samsung S5K6AAFX SXGA 1/6" 1.3M CMOS Image Sensor
+ * with embedded SoC ISP.
+ *
+ * Copyright (C) 2011, Samsung Electronics Co., Ltd.
+ * Sylwester Nawrocki <s.nawrocki@samsung.com>
+ *
+ * Based on a driver authored by Dongsoo Nathaniel Kim.
+ * Copyright (C) 2009, Dongsoo Nathaniel Kim <dongsoo45.kim@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.
+ */
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/gpio.h>
+#include <linux/i2c.h>
+#include <linux/media.h>
+#include <linux/regulator/consumer.h>
+#include <linux/slab.h>
+#include <media/media-entity.h>
+#include <media/v4l2-ctrls.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-subdev.h>
+#include <media/v4l2-mediabus.h>
+#include <media/s5k6aa.h>
+static int debug;
+module_param(debug, int, 0644);
+#define DRIVER_NAME                     "S5K6AA"
+/* The token to indicate array termination */
+#define S5K6AA_TERM                     0xffff
+#define S5K6AA_OUT_WIDTH_DEF            640
+#define S5K6AA_OUT_HEIGHT_DEF           480
+#define S5K6AA_WIN_WIDTH_MAX            1280
+#define S5K6AA_WIN_HEIGHT_MAX           1024
+#define S5K6AA_WIN_WIDTH_MIN            8
+#define S5K6AA_WIN_HEIGHT_MIN           8
+/*
+ * H/W register Interface (0xD0000000 - 0xD0000FFF)
+ */
+#define AHB_MSB_ADDR_PTR                0xfcfc
+#define GEN_REG_OFFSH                   0xd000
+#define REG_CMDWR_ADDRH                 0x0028
+#define REG_CMDWR_ADDRL                 0x002a
+#define REG_CMDRD_ADDRH                 0x002c
+#define REG_CMDRD_ADDRL                 0x002e
+#define REG_CMDBUF0_ADDR                0x0f12
+#define REG_CMDBUF1_ADDR                0x0f10
+/*
+ * Host S/W Register interface (0x70000000 - 0x70002000)
+ * The value of the two most significant address bytes is 0x7000,
+ * (HOST_SWIF_OFFS_H). The register addresses below specify 2 LSBs.
+ */
+#define HOST_SWIF_OFFSH                 0x7000
+/* Initialization parameters */
+/* Master clock frequency in KHz */
+#define REG_I_INCLK_FREQ_L              0x01b8
+#define REG_I_INCLK_FREQ_H              0x01ba
+#define  MIN_MCLK_FREQ_KHZ              6000U
+#define  MAX_MCLK_FREQ_KHZ              27000U
+#define REG_I_USE_NPVI_CLOCKS           0x01c6
+#define REG_I_USE_NMIPI_CLOCKS          0x01c8
+/* Clock configurations, n = 0..2. REG_I_* frequency unit is 4 kHz. */
+#define REG_I_OPCLK_4KHZ(n)             ((n) * 6 + 0x01cc)
+#define REG_I_MIN_OUTRATE_4KHZ(n)       ((n) * 6 + 0x01ce)
+#define REG_I_MAX_OUTRATE_4KHZ(n)       ((n) * 6 + 0x01d0)
+#define  SYS_PLL_OUT_FREQ               (48000000 / 4000)
+#define  PCLK_FREQ_MIN                  (24000000 / 4000)
+#define  PCLK_FREQ_MAX                  (48000000 / 4000)
+#define REG_I_INIT_PARAMS_UPDATED       0x01e0
+#define REG_I_ERROR_INFO                0x01e2
+/* General purpose parameters */
+#define REG_USER_BRIGHTNESS             0x01e4
+#define REG_USER_CONTRAST               0x01e6
+#define REG_USER_SATURATION             0x01e8
+#define REG_USER_SHARPBLUR              0x01ea
+#define REG_G_SPEC_EFFECTS              0x01ee
+#define REG_G_ENABLE_PREV               0x01f0
+#define REG_G_ENABLE_PREV_CHG           0x01f2
+#define REG_G_NEW_CFG_SYNC              0x01f8
+#define REG_G_PREVZOOM_IN_WIDTH         0x020a
+#define REG_G_PREVZOOM_IN_HEIGHT        0x020c
+#define REG_G_PREVZOOM_IN_XOFFS         0x020e
+#define REG_G_PREVZOOM_IN_YOFFS         0x0210
+#define REG_G_INPUTS_CHANGE_REQ         0x021a
+#define REG_G_ACTIVE_PREV_CFG           0x021c
+#define REG_G_PREV_CFG_CHG              0x021e
+#define REG_G_PREV_OPEN_AFTER_CH        0x0220
+#define REG_G_PREV_CFG_ERROR            0x0222
+/* Preview control section. n = 0...4. */
+#define PREG(n, x)                      ((n) * 0x26 + x)
+#define REG_P_OUT_WIDTH(n)              PREG(n, 0x0242)
+#define REG_P_OUT_HEIGHT(n)             PREG(n, 0x0244)
+#define REG_P_FMT(n)                    PREG(n, 0x0246)
+#define REG_P_MAX_OUT_RATE(n)           PREG(n, 0x0248)
+#define REG_P_MIN_OUT_RATE(n)           PREG(n, 0x024a)
+#define REG_P_PVI_MASK(n)               PREG(n, 0x024c)
+#define REG_P_CLK_INDEX(n)              PREG(n, 0x024e)
+#define REG_P_FR_RATE_TYPE(n)           PREG(n, 0x0250)
+#define  FR_RATE_DYNAMIC                0
+#define  FR_RATE_FIXED                  1
+#define  FR_RATE_FIXED_ACCURATE         2
+#define REG_P_FR_RATE_Q_TYPE(n)         PREG(n, 0x0252)
+#define  FR_RATE_Q_BEST_FRRATE          1 /* Binning enabled */
+#define  FR_RATE_Q_BEST_QUALITY         2 /* Binning disabled */
+/* Frame period in 0.1 ms units */
+#define REG_P_MAX_FR_TIME(n)            PREG(n, 0x0254)
+#define REG_P_MIN_FR_TIME(n)            PREG(n, 0x0256)
+/* Conversion to REG_P_[MAX/MIN]_FR_TIME value; __t: time in us */
+#define  US_TO_FR_TIME(__t)             ((__t) / 100)
+#define  S5K6AA_MIN_FR_TIME             33300  /* us */
+#define  S5K6AA_MAX_FR_TIME             650000 /* us */
+#define  S5K6AA_MAX_HIGHRES_FR_TIME     666    /* x100 us */
+/* The below 5 registers are for "device correction" values */
+#define REG_P_COLORTEMP(n)              PREG(n, 0x025e)
+#define REG_P_PREV_MIRROR(n)            PREG(n, 0x0262)
+/* Extended image property controls */
+/* Exposure time in 10 us units */
+#define REG_SF_USR_EXPOSURE_L           0x03c6
+#define REG_SF_USR_EXPOSURE_H           0x03c8
+#define REG_SF_USR_EXPOSURE_CHG         0x03ca
+#define REG_SF_USR_TOT_GAIN             0x03cc
+#define REG_SF_USR_TOT_GAIN_CHG         0x03ce
+#define REG_SF_RGAIN                    0x03d0
+#define REG_SF_RGAIN_CHG                0x03d2
+#define REG_SF_GGAIN                    0x03d4
+#define REG_SF_GGAIN_CHG                0x03d6
+#define REG_SF_BGAIN                    0x03d8
+#define REG_SF_BGAIN_CHG                0x03da
+#define REG_SF_FLICKER_QUANT            0x03dc
+#define REG_SF_FLICKER_QUANT_CHG        0x03de
+/* Output interface (parallel/MIPI) setup */
+#define REG_OIF_EN_MIPI_LANES           0x03fa
+#define REG_OIF_EN_PACKETS              0x03fc
+#define REG_OIF_CFG_CHG                 0x03fe
+/* Auto-algorithms enable mask */
+#define REG_DBG_AUTOALG_EN              0x0400
+#define  AALG_ALL_EN_MASK               (1 << 0)
+#define  AALG_AE_EN_MASK                (1 << 1)
+#define  AALG_DIVLEI_EN_MASK            (1 << 2)
+#define  AALG_WB_EN_MASK                (1 << 3)
+#define  AALG_FLICKER_EN_MASK           (1 << 5)
+#define  AALG_FIT_EN_MASK               (1 << 6)
+#define  AALG_WRHW_EN_MASK              (1 << 7)
+/* Firmware revision information */
+#define REG_FW_APIVER                   0x012e
+#define  S5K6AAFX_FW_APIVER             0x0001
+#define REG_FW_REVISION                 0x0130
+/* For now we use only one user configuration register set */
+#define S5K6AA_MAX_PRESETS              1
+static const char * const s5k6aa_supply_names[] = {
+        "vdd_core",     /* Digital core supply 1.5V (1.4V to 1.6V) */
+        "vdda",         /* Analog power supply 2.8V (2.6V to 3.0V) */
+        "vdd_reg",      /* Regulator input power 1.8V (1.7V to 1.9V)
+                           or 2.8V (2.6V to 3.0) */
+        "vddio",        /* I/O supply 1.8V (1.65V to 1.95V)
+                           or 2.8V (2.5V to 3.1V) */
+};
+#define S5K6AA_NUM_SUPPLIES ARRAY_SIZE(s5k6aa_supply_names)
+enum s5k6aa_gpio_id {
+        STBY,
+        RST,
+        GPIO_NUM,
+};
+struct s5k6aa_regval {
+        u16 addr;
+        u16 val;
+};
+struct s5k6aa_pixfmt {
+        enum v4l2_mbus_pixelcode code;
+        u32 colorspace;
+        /* REG_P_FMT(x) register value */
+        u16 reg_p_fmt;
+};
+struct s5k6aa_preset {
+        /* output pixel format and resolution */
+        struct v4l2_mbus_framefmt mbus_fmt;
+        u8 clk_id;
+        u8 index;
+};
+struct s5k6aa_ctrls {
+        struct v4l2_ctrl_handler handler;
+        /* Auto / manual white balance cluster */
+        struct v4l2_ctrl *awb;
+        struct v4l2_ctrl *gain_red;
+        struct v4l2_ctrl *gain_blue;
+        struct v4l2_ctrl *gain_green;
+        /* Mirror cluster */
+        struct v4l2_ctrl *hflip;
+        struct v4l2_ctrl *vflip;
+        /* Auto exposure / manual exposure and gain cluster */
+        struct v4l2_ctrl *auto_exp;
+        struct v4l2_ctrl *exposure;
+        struct v4l2_ctrl *gain;
+};
+struct s5k6aa_interval {
+        u16 reg_fr_time;
+        struct v4l2_fract interval;
+        /* Maximum rectangle for the interval */
+        struct v4l2_frmsize_discrete size;
+};
+struct s5k6aa {
+        struct v4l2_subdev sd;
+        struct media_pad pad;
+        enum v4l2_mbus_type bus_type;
+        u8 mipi_lanes;
+        int (*s_power)(int enable);
+        struct regulator_bulk_data supplies[S5K6AA_NUM_SUPPLIES];
+        struct s5k6aa_gpio gpio[GPIO_NUM];
+        /* external master clock frequency */
+        unsigned long mclk_frequency;
+        /* ISP internal master clock frequency */
+        u16 clk_fop;
+        /* output pixel clock frequency range */
+        u16 pclk_fmin;
+        u16 pclk_fmax;
+        unsigned int inv_hflip:1;
+        unsigned int inv_vflip:1;
+        /* protects the struct members below */
+        struct mutex lock;
+        /* sensor matrix scan window */
+        struct v4l2_rect ccd_rect;
+        struct s5k6aa_ctrls ctrls;
+        struct s5k6aa_preset presets[S5K6AA_MAX_PRESETS];
+        struct s5k6aa_preset *preset;
+        const struct s5k6aa_interval *fiv;
+        unsigned int streaming:1;
+        unsigned int apply_cfg:1;
+        unsigned int apply_crop:1;
+        unsigned int power;
+};
+static struct s5k6aa_regval s5k6aa_analog_config[] = {
+        /* Analog settings */
+        { 0x112a, 0x0000 }, { 0x1132, 0x0000 },
+        { 0x113e, 0x0000 }, { 0x115c, 0x0000 },
+        { 0x1164, 0x0000 }, { 0x1174, 0x0000 },
+        { 0x1178, 0x0000 }, { 0x077a, 0x0000 },
+        { 0x077c, 0x0000 }, { 0x077e, 0x0000 },
+        { 0x0780, 0x0000 }, { 0x0782, 0x0000 },
+        { 0x0784, 0x0000 }, { 0x0786, 0x0000 },
+        { 0x0788, 0x0000 }, { 0x07a2, 0x0000 },
+        { 0x07a4, 0x0000 }, { 0x07a6, 0x0000 },
+        { 0x07a8, 0x0000 }, { 0x07b6, 0x0000 },
+        { 0x07b8, 0x0002 }, { 0x07ba, 0x0004 },
+        { 0x07bc, 0x0004 }, { 0x07be, 0x0005 },
+        { 0x07c0, 0x0005 }, { S5K6AA_TERM, 0 },
+};
+/* TODO: Add RGB888 and Bayer format */
+static const struct s5k6aa_pixfmt s5k6aa_formats[] = {
+        { V4L2_MBUS_FMT_YUYV8_2X8,      V4L2_COLORSPACE_JPEG,   5 },
+        /* range 16-240 */
+        { V4L2_MBUS_FMT_YUYV8_2X8,      V4L2_COLORSPACE_REC709, 6 },
+        { V4L2_MBUS_FMT_RGB565_2X8_BE,  V4L2_COLORSPACE_JPEG,   0 },
+};
+static const struct s5k6aa_interval s5k6aa_intervals[] = {
+        { 1000, {10000, 1000000}, {1280, 1024} }, /* 10 fps */
+        { 666,  {15000, 1000000}, {1280, 1024} }, /* 15 fps */
+        { 500,  {20000, 1000000}, {1280, 720} },  /* 20 fps */
+        { 400,  {25000, 1000000}, {640, 480} },   /* 25 fps */
+        { 333,  {33300, 1000000}, {640, 480} },   /* 30 fps */
+};
+#define S5K6AA_INTERVAL_DEF_INDEX 1 /* 15 fps */
+static inline struct v4l2_subdev *ctrl_to_sd(struct v4l2_ctrl *ctrl)
+{
+        return &container_of(ctrl->handler, struct s5k6aa, ctrls.handler)->sd;
+}
+static inline struct s5k6aa *to_s5k6aa(struct v4l2_subdev *sd)
+{
+        return container_of(sd, struct s5k6aa, sd);
+}
+/* Set initial values for all preview presets */
+static void s5k6aa_presets_data_init(struct s5k6aa *s5k6aa)
+{
+        struct s5k6aa_preset *preset = &s5k6aa->presets[0];
+        int i;
+        for (i = 0; i < S5K6AA_MAX_PRESETS; i++) {
+                preset->mbus_fmt.width  = S5K6AA_OUT_WIDTH_DEF;
+                preset->mbus_fmt.height = S5K6AA_OUT_HEIGHT_DEF;
+                preset->mbus_fmt.code   = s5k6aa_formats[0].code;
+                preset->index           = i;
+                preset->clk_id          = 0;
+                preset++;
+        }
+        s5k6aa->fiv = &s5k6aa_intervals[S5K6AA_INTERVAL_DEF_INDEX];
+        s5k6aa->preset = &s5k6aa->presets[0];
+}
+static int s5k6aa_i2c_read(struct i2c_client *client, u16 addr, u16 *val)
+{
+        u8 wbuf[2] = {addr >> 8, addr & 0xFF};
+        struct i2c_msg msg[2];
+        u8 rbuf[2];
+        int ret;
+        msg[0].addr = client->addr;
+        msg[0].flags = 0;
+        msg[0].len = 2;
+        msg[0].buf = wbuf;
+        msg[1].addr = client->addr;
+        msg[1].flags = I2C_M_RD;
+        msg[1].len = 2;
+        msg[1].buf = rbuf;
+        ret = i2c_transfer(client->adapter, msg, 2);
+        *val = be16_to_cpu(*((u16 *)rbuf));
+        v4l2_dbg(3, debug, client, "i2c_read: 0x%04X : 0x%04x\n", addr, *val);
+        return ret == 2 ? 0 : ret;
+}
+static int s5k6aa_i2c_write(struct i2c_client *client, u16 addr, u16 val)
+{
+        u8 buf[4] = {addr >> 8, addr & 0xFF, val >> 8, val & 0xFF};
+        int ret = i2c_master_send(client, buf, 4);
+        v4l2_dbg(3, debug, client, "i2c_write: 0x%04X : 0x%04x\n", addr, val);
+        return ret == 4 ? 0 : ret;
+}
+/* The command register write, assumes Command_Wr_addH = 0x7000. */
+static int s5k6aa_write(struct i2c_client *c, u16 addr, u16 val)
+{
+        int ret = s5k6aa_i2c_write(c, REG_CMDWR_ADDRL, addr);
+        if (ret)
+                return ret;
+        return s5k6aa_i2c_write(c, REG_CMDBUF0_ADDR, val);
+}
+/* The command register read, assumes Command_Rd_addH = 0x7000. */
+static int s5k6aa_read(struct i2c_client *client, u16 addr, u16 *val)
+{
+        int ret = s5k6aa_i2c_write(client, REG_CMDRD_ADDRL, addr);
+        if (ret)
+                return ret;
+        return s5k6aa_i2c_read(client, REG_CMDBUF0_ADDR, val);
+}
+static int s5k6aa_write_array(struct v4l2_subdev *sd,
+                              const struct s5k6aa_regval *msg)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        u16 addr_incr = 0;
+        int ret = 0;
+        while (msg->addr != S5K6AA_TERM) {
+                if (addr_incr != 2)
+                        ret = s5k6aa_i2c_write(client, REG_CMDWR_ADDRL,
+                                               msg->addr);
+                if (ret)
+                        break;
+                ret = s5k6aa_i2c_write(client, REG_CMDBUF0_ADDR, msg->val);
+                if (ret)
+                        break;
+                /* Assume that msg->addr is always less than 0xfffc */
+                addr_incr = (msg + 1)->addr - msg->addr;
+                msg++;
+        }
+        return ret;
+}
+/* Configure the AHB high address bytes for GTG registers access */
+static int s5k6aa_set_ahb_address(struct i2c_client *client)
+{
+        int ret = s5k6aa_i2c_write(client, AHB_MSB_ADDR_PTR, GEN_REG_OFFSH);
+        if (ret)
+                return ret;
+        ret = s5k6aa_i2c_write(client, REG_CMDRD_ADDRH, HOST_SWIF_OFFSH);
+        if (ret)
+                return ret;
+        return s5k6aa_i2c_write(client, REG_CMDWR_ADDRH, HOST_SWIF_OFFSH);
+}
+/**
+ * s5k6aa_configure_pixel_clock - apply ISP main clock/PLL configuration
+ *
+ * Configure the internal ISP PLL for the required output frequency.
+ * Locking: called with s5k6aa.lock mutex held.
+ */
+static int s5k6aa_configure_pixel_clocks(struct s5k6aa *s5k6aa)
+{
+        struct i2c_client *c = v4l2_get_subdevdata(&s5k6aa->sd);
+        unsigned long fmclk = s5k6aa->mclk_frequency / 1000;
+        u16 status;
+        int ret;
+        if (WARN(fmclk < MIN_MCLK_FREQ_KHZ || fmclk > MAX_MCLK_FREQ_KHZ,
+                 "Invalid clock frequency: %ld\n", fmclk))
+                return -EINVAL;
+        s5k6aa->pclk_fmin = PCLK_FREQ_MIN;
+        s5k6aa->pclk_fmax = PCLK_FREQ_MAX;
+        s5k6aa->clk_fop = SYS_PLL_OUT_FREQ;
+        /* External input clock frequency in kHz */
+        ret = s5k6aa_write(c, REG_I_INCLK_FREQ_H, fmclk >> 16);
+        if (!ret)
+                ret = s5k6aa_write(c, REG_I_INCLK_FREQ_L, fmclk & 0xFFFF);
+        if (!ret)
+                ret = s5k6aa_write(c, REG_I_USE_NPVI_CLOCKS, 1);
+        /* Internal PLL frequency */
+        if (!ret)
+                ret = s5k6aa_write(c, REG_I_OPCLK_4KHZ(0), s5k6aa->clk_fop);
+        if (!ret)
+                ret = s5k6aa_write(c, REG_I_MIN_OUTRATE_4KHZ(0),
+                                   s5k6aa->pclk_fmin);
+        if (!ret)
+                ret = s5k6aa_write(c, REG_I_MAX_OUTRATE_4KHZ(0),
+                                   s5k6aa->pclk_fmax);
+        if (!ret)
+                ret = s5k6aa_write(c, REG_I_INIT_PARAMS_UPDATED, 1);
+        if (!ret)
+                ret = s5k6aa_read(c, REG_I_ERROR_INFO, &status);
+        return ret ? ret : (status ? -EINVAL : 0);
+}
+/* Set horizontal and vertical image flipping */
+static int s5k6aa_set_mirror(struct s5k6aa *s5k6aa, int horiz_flip)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd);
+        int index = s5k6aa->preset->index;
+        unsigned int vflip = s5k6aa->ctrls.vflip->val ^ s5k6aa->inv_vflip;
+        unsigned int flip = (horiz_flip ^ s5k6aa->inv_hflip) | (vflip << 1);
+        return s5k6aa_write(client, REG_P_PREV_MIRROR(index), flip);
+}
+/* Configure auto/manual white balance and R/G/B gains */
+static int s5k6aa_set_awb(struct s5k6aa *s5k6aa, int awb)
+{
+        struct i2c_client *c = v4l2_get_subdevdata(&s5k6aa->sd);
+        struct s5k6aa_ctrls *ctrls = &s5k6aa->ctrls;
+        u16 reg;
+        int ret = s5k6aa_read(c, REG_DBG_AUTOALG_EN, &reg);
+        if (!ret && !awb) {
+                ret = s5k6aa_write(c, REG_SF_RGAIN, ctrls->gain_red->val);
+                if (!ret)
+                        ret = s5k6aa_write(c, REG_SF_RGAIN_CHG, 1);
+                if (ret)
+                        return ret;
+                ret = s5k6aa_write(c, REG_SF_GGAIN, ctrls->gain_green->val);
+                if (!ret)
+                        ret = s5k6aa_write(c, REG_SF_GGAIN_CHG, 1);
+                if (ret)
+                        return ret;
+                ret = s5k6aa_write(c, REG_SF_BGAIN, ctrls->gain_blue->val);
+                if (!ret)
+                        ret = s5k6aa_write(c, REG_SF_BGAIN_CHG, 1);
+        }
+        if (!ret) {
+                reg = awb ? reg | AALG_WB_EN_MASK : reg & ~AALG_WB_EN_MASK;
+                ret = s5k6aa_write(c, REG_DBG_AUTOALG_EN, reg);
+        }
+        return ret;
+}
+/* Program FW with exposure time, 'exposure' in us units */
+static int s5k6aa_set_user_exposure(struct i2c_client *client, int exposure)
+{
+        unsigned int time = exposure / 10;
+        int ret = s5k6aa_write(client, REG_SF_USR_EXPOSURE_L, time & 0xffff);
+        if (!ret)
+                ret = s5k6aa_write(client, REG_SF_USR_EXPOSURE_H, time >> 16);
+        if (ret)
+                return ret;
+        return s5k6aa_write(client, REG_SF_USR_EXPOSURE_CHG, 1);
+}
+static int s5k6aa_set_user_gain(struct i2c_client *client, int gain)
+{
+        int ret = s5k6aa_write(client, REG_SF_USR_TOT_GAIN, gain);
+        if (ret)
+                return ret;
+        return s5k6aa_write(client, REG_SF_USR_TOT_GAIN_CHG, 1);
+}
+/* Set auto/manual exposure and total gain */
+static int s5k6aa_set_auto_exposure(struct s5k6aa *s5k6aa, int value)
+{
+        struct i2c_client *c = v4l2_get_subdevdata(&s5k6aa->sd);
+        unsigned int exp_time = s5k6aa->ctrls.exposure->val;
+        u16 auto_alg;
+        int ret = s5k6aa_read(c, REG_DBG_AUTOALG_EN, &auto_alg);
+        if (ret)
+                return ret;
+        v4l2_dbg(1, debug, c, "man_exp: %d, auto_exp: %d, a_alg: 0x%x\n",
+                 exp_time, value, auto_alg);
+        if (value == V4L2_EXPOSURE_AUTO) {
+                auto_alg |= AALG_AE_EN_MASK | AALG_DIVLEI_EN_MASK;
+        } else {
+                ret = s5k6aa_set_user_exposure(c, exp_time);
+                if (ret)
+                        return ret;
+                ret = s5k6aa_set_user_gain(c, s5k6aa->ctrls.gain->val);
+                if (ret)
+                        return ret;
+                auto_alg &= ~(AALG_AE_EN_MASK | AALG_DIVLEI_EN_MASK);
+        }
+        return s5k6aa_write(c, REG_DBG_AUTOALG_EN, auto_alg);
+}
+static int s5k6aa_set_anti_flicker(struct s5k6aa *s5k6aa, int value)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd);
+        u16 auto_alg;
+        int ret;
+        ret = s5k6aa_read(client, REG_DBG_AUTOALG_EN, &auto_alg);
+        if (ret)
+                return ret;
+        if (value == V4L2_CID_POWER_LINE_FREQUENCY_AUTO) {
+                auto_alg |= AALG_FLICKER_EN_MASK;
+        } else {
+                auto_alg &= ~AALG_FLICKER_EN_MASK;
+                /* The V4L2_CID_LINE_FREQUENCY control values match
+                 * the register values */
+                ret = s5k6aa_write(client, REG_SF_FLICKER_QUANT, value);
+                if (ret)
+                        return ret;
+                ret = s5k6aa_write(client, REG_SF_FLICKER_QUANT_CHG, 1);
+                if (ret)
+                        return ret;
+        }
+        return s5k6aa_write(client, REG_DBG_AUTOALG_EN, auto_alg);
+}
+static int s5k6aa_set_colorfx(struct s5k6aa *s5k6aa, int val)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd);
+        static const struct v4l2_control colorfx[] = {
+                { V4L2_COLORFX_NONE,     0 },
+                { V4L2_COLORFX_BW,       1 },
+                { V4L2_COLORFX_NEGATIVE, 2 },
+                { V4L2_COLORFX_SEPIA,    3 },
+                { V4L2_COLORFX_SKY_BLUE, 4 },
+                { V4L2_COLORFX_SKETCH,   5 },
+        };
+        int i;
+        for (i = 0; i < ARRAY_SIZE(colorfx); i++) {
+                if (colorfx[i].id == val)
+                        return s5k6aa_write(client, REG_G_SPEC_EFFECTS,
+                                            colorfx[i].value);
+        }
+        return -EINVAL;
+}
+static int s5k6aa_preview_config_status(struct i2c_client *client)
+{
+        u16 error = 0;
+        int ret = s5k6aa_read(client, REG_G_PREV_CFG_ERROR, &error);
+        v4l2_dbg(1, debug, client, "error: 0x%x (%d)\n", error, ret);
+        return ret ? ret : (error ? -EINVAL : 0);
+}
+static int s5k6aa_get_pixfmt_index(struct s5k6aa *s5k6aa,
+                                   struct v4l2_mbus_framefmt *mf)
+{
+        unsigned int i;
+        for (i = 0; i < ARRAY_SIZE(s5k6aa_formats); i++)
+                if (mf->colorspace == s5k6aa_formats[i].colorspace &&
+                    mf->code == s5k6aa_formats[i].code)
+                        return i;
+        return 0;
+}
+static int s5k6aa_set_output_framefmt(struct s5k6aa *s5k6aa,
+                                      struct s5k6aa_preset *preset)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd);
+        int fmt_index = s5k6aa_get_pixfmt_index(s5k6aa, &preset->mbus_fmt);
+        int ret;
+        ret = s5k6aa_write(client, REG_P_OUT_WIDTH(preset->index),
+                           preset->mbus_fmt.width);
+        if (!ret)
+                ret = s5k6aa_write(client, REG_P_OUT_HEIGHT(preset->index),
+                                   preset->mbus_fmt.height);
+        if (!ret)
+                ret = s5k6aa_write(client, REG_P_FMT(preset->index),
+                                   s5k6aa_formats[fmt_index].reg_p_fmt);
+        return ret;
+}
+static int s5k6aa_set_input_params(struct s5k6aa *s5k6aa)
+{
+        struct i2c_client *c = v4l2_get_subdevdata(&s5k6aa->sd);
+        struct v4l2_rect *r = &s5k6aa->ccd_rect;
+        int ret;
+        ret = s5k6aa_write(c, REG_G_PREVZOOM_IN_WIDTH, r->width);
+        if (!ret)
+                ret = s5k6aa_write(c, REG_G_PREVZOOM_IN_HEIGHT, r->height);
+        if (!ret)
+                ret = s5k6aa_write(c, REG_G_PREVZOOM_IN_XOFFS, r->left);
+        if (!ret)
+                ret = s5k6aa_write(c, REG_G_PREVZOOM_IN_YOFFS, r->top);
+        if (!ret)
+                ret = s5k6aa_write(c, REG_G_INPUTS_CHANGE_REQ, 1);
+        if (!ret)
+                s5k6aa->apply_crop = 0;
+        return ret;
+}
+/**
+ * s5k6aa_configure_video_bus - configure the video output interface
+ * @bus_type: video bus type: parallel or MIPI-CSI
+ * @nlanes: number of MIPI lanes to be used (MIPI-CSI only)
+ *
+ * Note: Only parallel bus operation has been tested.
+ */
+static int s5k6aa_configure_video_bus(struct s5k6aa *s5k6aa,
+                                      enum v4l2_mbus_type bus_type, int nlanes)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd);
+        u16 cfg = 0;
+        int ret;
+        /*
+         * TODO: The sensor is supposed to support BT.601 and BT.656
+         * but there is nothing indicating how to switch between both
+         * in the datasheet. For now default BT.601 interface is assumed.
+         */
+        if (bus_type == V4L2_MBUS_CSI2)
+                cfg = nlanes;
+        else if (bus_type != V4L2_MBUS_PARALLEL)
+                return -EINVAL;
+        ret = s5k6aa_write(client, REG_OIF_EN_MIPI_LANES, cfg);
+        if (ret)
+                return ret;
+        return s5k6aa_write(client, REG_OIF_CFG_CHG, 1);
+}
+/* This function should be called when switching to new user configuration set*/
+static int s5k6aa_new_config_sync(struct i2c_client *client, int timeout,
+                                  int cid)
+{
+        unsigned long end = jiffies + msecs_to_jiffies(timeout);
+        u16 reg = 1;
+        int ret;
+        ret = s5k6aa_write(client, REG_G_ACTIVE_PREV_CFG, cid);
+        if (!ret)
+                ret = s5k6aa_write(client, REG_G_PREV_CFG_CHG, 1);
+        if (!ret)
+                ret = s5k6aa_write(client, REG_G_NEW_CFG_SYNC, 1);
+        if (timeout == 0)
+                return ret;
+        while (ret >= 0 && time_is_after_jiffies(end)) {
+                ret = s5k6aa_read(client, REG_G_NEW_CFG_SYNC, &reg);
+                if (!reg)
+                        return 0;
+                usleep_range(1000, 5000);
+        }
+        return ret ? ret : -ETIMEDOUT;
+}
+/**
+ * s5k6aa_set_prev_config - write user preview register set
+ *
+ * Configure output resolution and color fromat, pixel clock
+ * frequency range, device frame rate type and frame period range.
+ */
+static int s5k6aa_set_prev_config(struct s5k6aa *s5k6aa,
+                                  struct s5k6aa_preset *preset)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd);
+        int idx = preset->index;
+        u16 frame_rate_q;
+        int ret;
+        if (s5k6aa->fiv->reg_fr_time >= S5K6AA_MAX_HIGHRES_FR_TIME)
+                frame_rate_q = FR_RATE_Q_BEST_FRRATE;
+        else
+                frame_rate_q = FR_RATE_Q_BEST_QUALITY;
+        ret = s5k6aa_set_output_framefmt(s5k6aa, preset);
+        if (!ret)
+                ret = s5k6aa_write(client, REG_P_MAX_OUT_RATE(idx),
+                                   s5k6aa->pclk_fmax);
+        if (!ret)
+                ret = s5k6aa_write(client, REG_P_MIN_OUT_RATE(idx),
+                                   s5k6aa->pclk_fmin);
+        if (!ret)
+                ret = s5k6aa_write(client, REG_P_CLK_INDEX(idx),
+                                   preset->clk_id);
+        if (!ret)
+                ret = s5k6aa_write(client, REG_P_FR_RATE_TYPE(idx),
+                                   FR_RATE_DYNAMIC);
+        if (!ret)
+                ret = s5k6aa_write(client, REG_P_FR_RATE_Q_TYPE(idx),
+                                   frame_rate_q);
+        if (!ret)
+                ret = s5k6aa_write(client, REG_P_MAX_FR_TIME(idx),
+                                   s5k6aa->fiv->reg_fr_time + 33);
+        if (!ret)
+                ret = s5k6aa_write(client, REG_P_MIN_FR_TIME(idx),
+                                   s5k6aa->fiv->reg_fr_time - 33);
+        if (!ret)
+                ret = s5k6aa_new_config_sync(client, 250, idx);
+        if (!ret)
+                ret = s5k6aa_preview_config_status(client);
+        if (!ret)
+                s5k6aa->apply_cfg = 0;
+        v4l2_dbg(1, debug, client, "Frame interval: %d +/- 3.3ms. (%d)\n",
+                 s5k6aa->fiv->reg_fr_time, ret);
+        return ret;
+}
+/**
+ * s5k6aa_initialize_isp - basic ISP MCU initialization
+ *
+ * Configure AHB addresses for registers read/write; configure PLLs for
+ * required output pixel clock. The ISP power supply needs to be already
+ * enabled, with an optional H/W reset.
+ * Locking: called with s5k6aa.lock mutex held.
+ */
+static int s5k6aa_initialize_isp(struct v4l2_subdev *sd)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct s5k6aa *s5k6aa = to_s5k6aa(sd);
+        int ret;
+        s5k6aa->apply_crop = 1;
+        s5k6aa->apply_cfg = 1;
+        msleep(100);
+        ret = s5k6aa_set_ahb_address(client);
+        if (ret)
+                return ret;
+        ret = s5k6aa_configure_video_bus(s5k6aa, s5k6aa->bus_type,
+                                         s5k6aa->mipi_lanes);
+        if (ret)
+                return ret;
+        ret = s5k6aa_write_array(sd, s5k6aa_analog_config);
+        if (ret)
+                return ret;
+        msleep(20);
+        return s5k6aa_configure_pixel_clocks(s5k6aa);
+}
+static int s5k6aa_gpio_set_value(struct s5k6aa *priv, int id, u32 val)
+{
+        if (!gpio_is_valid(priv->gpio[id].gpio))
+                return 0;
+        gpio_set_value(priv->gpio[id].gpio, !!val);
+        return 1;
+}
+static int s5k6aa_gpio_assert(struct s5k6aa *priv, int id)
+{
+        return s5k6aa_gpio_set_value(priv, id, priv->gpio[id].level);
+}
+static int s5k6aa_gpio_deassert(struct s5k6aa *priv, int id)
+{
+        return s5k6aa_gpio_set_value(priv, id, !priv->gpio[id].level);
+}
+static int __s5k6aa_power_on(struct s5k6aa *s5k6aa)
+{
+        int ret;
+        ret = regulator_bulk_enable(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies);
+        if (ret)
+                return ret;
+        if (s5k6aa_gpio_deassert(s5k6aa, STBY))
+                usleep_range(150, 200);
+        if (s5k6aa->s_power)
+                ret = s5k6aa->s_power(1);
+        usleep_range(4000, 4000);
+        if (s5k6aa_gpio_deassert(s5k6aa, RST))
+                msleep(20);
+        return ret;
+}
+static int __s5k6aa_power_off(struct s5k6aa *s5k6aa)
+{
+        int ret;
+        if (s5k6aa_gpio_assert(s5k6aa, RST))
+                usleep_range(100, 150);
+        if (s5k6aa->s_power) {
+                ret = s5k6aa->s_power(0);
+                if (ret)
+                        return ret;
+        }
+        if (s5k6aa_gpio_assert(s5k6aa, STBY))
+                usleep_range(50, 100);
+        s5k6aa->streaming = 0;
+        return regulator_bulk_disable(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies);
+}
+/*
+ * V4L2 subdev core and video operations
+ */
+static int s5k6aa_set_power(struct v4l2_subdev *sd, int on)
+{
+        struct s5k6aa *s5k6aa = to_s5k6aa(sd);
+        int ret = 0;
+        mutex_lock(&s5k6aa->lock);
+        if (!on == s5k6aa->power) {
+                if (on) {
+                        ret = __s5k6aa_power_on(s5k6aa);
+                        if (!ret)
+                                ret = s5k6aa_initialize_isp(sd);
+                } else {
+                        ret = __s5k6aa_power_off(s5k6aa);
+                }
+                if (!ret)
+                        s5k6aa->power += on ? 1 : -1;
+        }
+        mutex_unlock(&s5k6aa->lock);
+        if (!on || ret || s5k6aa->power != 1)
+                return ret;
+        return v4l2_ctrl_handler_setup(sd->ctrl_handler);
+}
+static int __s5k6aa_stream(struct s5k6aa *s5k6aa, int enable)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd);
+        int ret = 0;
+        ret = s5k6aa_write(client, REG_G_ENABLE_PREV, enable);
+        if (!ret)
+                ret = s5k6aa_write(client, REG_G_ENABLE_PREV_CHG, 1);
+        if (!ret)
+                s5k6aa->streaming = enable;
+        return ret;
+}
+static int s5k6aa_s_stream(struct v4l2_subdev *sd, int on)
+{
+        struct s5k6aa *s5k6aa = to_s5k6aa(sd);
+        int ret = 0;
+        mutex_lock(&s5k6aa->lock);
+        if (s5k6aa->streaming == !on) {
+                if (!ret && s5k6aa->apply_cfg)
+                        ret = s5k6aa_set_prev_config(s5k6aa, s5k6aa->preset);
+                if (s5k6aa->apply_crop)
+                        ret = s5k6aa_set_input_params(s5k6aa);
+                if (!ret)
+                        ret = __s5k6aa_stream(s5k6aa, !!on);
+        }
+        mutex_unlock(&s5k6aa->lock);
+        return ret;
+}
+static int s5k6aa_g_frame_interval(struct v4l2_subdev *sd,
+                                   struct v4l2_subdev_frame_interval *fi)
+{
+        struct s5k6aa *s5k6aa = to_s5k6aa(sd);
+        mutex_lock(&s5k6aa->lock);
+        fi->interval = s5k6aa->fiv->interval;
+        mutex_unlock(&s5k6aa->lock);
+        return 0;
+}
+static int __s5k6aa_set_frame_interval(struct s5k6aa *s5k6aa,
+                                       struct v4l2_subdev_frame_interval *fi)
+{
+        struct v4l2_mbus_framefmt *mbus_fmt = &s5k6aa->preset->mbus_fmt;
+        const struct s5k6aa_interval *fiv = &s5k6aa_intervals[0];
+        unsigned int err, min_err = UINT_MAX;
+        unsigned int i, fr_time;
+        if (fi->interval.denominator == 0)
+                return -EINVAL;
+        fr_time = fi->interval.numerator * 10000 / fi->interval.denominator;
+        for (i = 0; i < ARRAY_SIZE(s5k6aa_intervals); i++) {
+                const struct s5k6aa_interval *iv = &s5k6aa_intervals[i];
+                if (mbus_fmt->width > iv->size.width ||
+                    mbus_fmt->height > iv->size.height)
+                        continue;
+                err = abs(iv->reg_fr_time - fr_time);
+                if (err < min_err) {
+                        fiv = iv;
+                        min_err = err;
+                }
+        }
+        s5k6aa->fiv = fiv;
+        v4l2_dbg(1, debug, &s5k6aa->sd, "Changed frame interval to %d us\n",
+                 fiv->reg_fr_time * 100);
+        return 0;
+}
+static int s5k6aa_s_frame_interval(struct v4l2_subdev *sd,
+                                   struct v4l2_subdev_frame_interval *fi)
+{
+        struct s5k6aa *s5k6aa = to_s5k6aa(sd);
+        int ret;
+        v4l2_dbg(1, debug, sd, "Setting %d/%d frame interval\n",
+                 fi->interval.numerator, fi->interval.denominator);
+        mutex_lock(&s5k6aa->lock);
+        ret = __s5k6aa_set_frame_interval(s5k6aa, fi);
+        s5k6aa->apply_cfg = 1;
+        mutex_unlock(&s5k6aa->lock);
+        return ret;
+}
+/*
+ * V4L2 subdev pad level and video operations
+ */
+static int s5k6aa_enum_frame_interval(struct v4l2_subdev *sd,
+                              struct v4l2_subdev_fh *fh,
+                              struct v4l2_subdev_frame_interval_enum *fie)
+{
+        struct s5k6aa *s5k6aa = to_s5k6aa(sd);
+        const struct s5k6aa_interval *fi;
+        int ret = 0;
+        if (fie->index > ARRAY_SIZE(s5k6aa_intervals))
+                return -EINVAL;
+        v4l_bound_align_image(&fie->width, S5K6AA_WIN_WIDTH_MIN,
+                              S5K6AA_WIN_WIDTH_MAX, 1,
+                              &fie->height, S5K6AA_WIN_HEIGHT_MIN,
+                              S5K6AA_WIN_HEIGHT_MAX, 1, 0);
+        mutex_lock(&s5k6aa->lock);
+        fi = &s5k6aa_intervals[fie->index];
+        if (fie->width > fi->size.width || fie->height > fi->size.height)
+                ret = -EINVAL;
+        else
+                fie->interval = fi->interval;
+        mutex_unlock(&s5k6aa->lock);
+        return ret;
+}
+static int s5k6aa_enum_mbus_code(struct v4l2_subdev *sd,
+                                 struct v4l2_subdev_fh *fh,
+                                 struct v4l2_subdev_mbus_code_enum *code)
+{
+        if (code->index >= ARRAY_SIZE(s5k6aa_formats))
+                return -EINVAL;
+        code->code = s5k6aa_formats[code->index].code;
+        return 0;
+}
+static int s5k6aa_enum_frame_size(struct v4l2_subdev *sd,
+                                  struct v4l2_subdev_fh *fh,
+                                  struct v4l2_subdev_frame_size_enum *fse)
+{
+        int i = ARRAY_SIZE(s5k6aa_formats);
+        if (fse->index > 0)
+                return -EINVAL;
+        while (--i)
+                if (fse->code == s5k6aa_formats[i].code)
+                        break;
+        fse->code = s5k6aa_formats[i].code;
+        fse->min_width  = S5K6AA_WIN_WIDTH_MIN;
+        fse->max_width  = S5K6AA_WIN_WIDTH_MAX;
+        fse->max_height = S5K6AA_WIN_HEIGHT_MIN;
+        fse->min_height = S5K6AA_WIN_HEIGHT_MAX;
+        return 0;
+}
+static struct v4l2_rect *
+__s5k6aa_get_crop_rect(struct s5k6aa *s5k6aa, struct v4l2_subdev_fh *fh,
+                       enum v4l2_subdev_format_whence which)
+{
+        if (which == V4L2_SUBDEV_FORMAT_ACTIVE)
+                return &s5k6aa->ccd_rect;
+        if (which == V4L2_SUBDEV_FORMAT_TRY)
+                return v4l2_subdev_get_try_crop(fh, 0);
+        return NULL;
+}
+static void s5k6aa_try_format(struct s5k6aa *s5k6aa,
+                              struct v4l2_mbus_framefmt *mf)
+{
+        unsigned int index;
+        v4l_bound_align_image(&mf->width, S5K6AA_WIN_WIDTH_MIN,
+                              S5K6AA_WIN_WIDTH_MAX, 1,
+                              &mf->height, S5K6AA_WIN_HEIGHT_MIN,
+                              S5K6AA_WIN_HEIGHT_MAX, 1, 0);
+        if (mf->colorspace != V4L2_COLORSPACE_JPEG &&
+            mf->colorspace != V4L2_COLORSPACE_REC709)
+                mf->colorspace = V4L2_COLORSPACE_JPEG;
+        index = s5k6aa_get_pixfmt_index(s5k6aa, mf);
+        mf->colorspace  = s5k6aa_formats[index].colorspace;
+        mf->code        = s5k6aa_formats[index].code;
+        mf->field       = V4L2_FIELD_NONE;
+}
+static int s5k6aa_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+                          struct v4l2_subdev_format *fmt)
+{
+        struct s5k6aa *s5k6aa = to_s5k6aa(sd);
+        struct v4l2_mbus_framefmt *mf;
+        memset(fmt->reserved, 0, sizeof(fmt->reserved));
+        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
+                mf = v4l2_subdev_get_try_format(fh, 0);
+                fmt->format = *mf;
+                return 0;
+        }
+        mutex_lock(&s5k6aa->lock);
+        fmt->format = s5k6aa->preset->mbus_fmt;
+        mutex_unlock(&s5k6aa->lock);
+        return 0;
+}
+static int s5k6aa_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+                          struct v4l2_subdev_format *fmt)
+{
+        struct s5k6aa *s5k6aa = to_s5k6aa(sd);
+        struct s5k6aa_preset *preset = s5k6aa->preset;
+        struct v4l2_mbus_framefmt *mf;
+        struct v4l2_rect *crop;
+        int ret = 0;
+        mutex_lock(&s5k6aa->lock);
+        s5k6aa_try_format(s5k6aa, &fmt->format);
+        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
+                mf = v4l2_subdev_get_try_format(fh, fmt->pad);
+                crop = v4l2_subdev_get_try_crop(fh, 0);
+        } else {
+                if (s5k6aa->streaming) {
+                        ret = -EBUSY;
+                } else {
+                        mf = &preset->mbus_fmt;
+                        crop = &s5k6aa->ccd_rect;
+                        s5k6aa->apply_cfg = 1;
+                }
+        }
+        if (ret == 0) {
+                struct v4l2_subdev_frame_interval fiv = {
+                        .interval = {0, 1}
+                };
+                *mf = fmt->format;
+                /*
+                 * Make sure the crop window is valid, i.e. its size is
+                 * greater than the output window, as the ISP supports
+                 * only down-scaling.
+                 */
+                crop->width = clamp_t(unsigned int, crop->width, mf->width,
+                                      S5K6AA_WIN_WIDTH_MAX);
+                crop->height = clamp_t(unsigned int, crop->height, mf->height,
+                                       S5K6AA_WIN_HEIGHT_MAX);
+                crop->left = clamp_t(unsigned int, crop->left, 0,
+                                     S5K6AA_WIN_WIDTH_MAX - crop->width);
+                crop->top  = clamp_t(unsigned int, crop->top, 0,
+                                     S5K6AA_WIN_HEIGHT_MAX - crop->height);
+                /* Reset to minimum possible frame interval */
+                ret = __s5k6aa_set_frame_interval(s5k6aa, &fiv);
+        }
+        mutex_unlock(&s5k6aa->lock);
+        return ret;
+}
+static int s5k6aa_get_crop(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+                           struct v4l2_subdev_crop *crop)
+{
+        struct s5k6aa *s5k6aa = to_s5k6aa(sd);
+        struct v4l2_rect *rect;
+        memset(crop->reserved, 0, sizeof(crop->reserved));
+        mutex_lock(&s5k6aa->lock);
+        rect = __s5k6aa_get_crop_rect(s5k6aa, fh, crop->which);
+        if (rect)
+                crop->rect = *rect;
+        mutex_unlock(&s5k6aa->lock);
+        v4l2_dbg(1, debug, sd, "Current crop rectangle: (%d,%d)/%dx%d\n",
+                 rect->left, rect->top, rect->width, rect->height);
+        return 0;
+}
+static int s5k6aa_set_crop(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+                           struct v4l2_subdev_crop *crop)
+{
+        struct s5k6aa *s5k6aa = to_s5k6aa(sd);
+        struct v4l2_mbus_framefmt *mf;
+        unsigned int max_x, max_y;
+        struct v4l2_rect *crop_r;
+        mutex_lock(&s5k6aa->lock);
+        crop_r = __s5k6aa_get_crop_rect(s5k6aa, fh, crop->which);
+        if (crop->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
+                mf = &s5k6aa->preset->mbus_fmt;
+                s5k6aa->apply_crop = 1;
+        } else {
+                mf = v4l2_subdev_get_try_format(fh, 0);
+        }
+        v4l_bound_align_image(&crop->rect.width, mf->width,
+                              S5K6AA_WIN_WIDTH_MAX, 1,
+                              &crop->rect.height, mf->height,
+                              S5K6AA_WIN_HEIGHT_MAX, 1, 0);
+        max_x = (S5K6AA_WIN_WIDTH_MAX - crop->rect.width) & ~1;
+        max_y = (S5K6AA_WIN_HEIGHT_MAX - crop->rect.height) & ~1;
+        crop->rect.left = clamp_t(unsigned int, crop->rect.left, 0, max_x);
+        crop->rect.top  = clamp_t(unsigned int, crop->rect.top, 0, max_y);
+        *crop_r = crop->rect;
+        mutex_unlock(&s5k6aa->lock);
+        v4l2_dbg(1, debug, sd, "Set crop rectangle: (%d,%d)/%dx%d\n",
+                 crop_r->left, crop_r->top, crop_r->width, crop_r->height);
+        return 0;
+}
+static const struct v4l2_subdev_pad_ops s5k6aa_pad_ops = {
+        .enum_mbus_code         = s5k6aa_enum_mbus_code,
+        .enum_frame_size        = s5k6aa_enum_frame_size,
+        .enum_frame_interval    = s5k6aa_enum_frame_interval,
+        .get_fmt                = s5k6aa_get_fmt,
+        .set_fmt                = s5k6aa_set_fmt,
+        .get_crop               = s5k6aa_get_crop,
+        .set_crop               = s5k6aa_set_crop,
+};
+static const struct v4l2_subdev_video_ops s5k6aa_video_ops = {
+        .g_frame_interval       = s5k6aa_g_frame_interval,
+        .s_frame_interval       = s5k6aa_s_frame_interval,
+        .s_stream               = s5k6aa_s_stream,
+};
+/*
+ * V4L2 subdev controls
+ */
+static int s5k6aa_s_ctrl(struct v4l2_ctrl *ctrl)
+{
+        struct v4l2_subdev *sd = ctrl_to_sd(ctrl);
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct s5k6aa *s5k6aa = to_s5k6aa(sd);
+        int idx, err = 0;
+        v4l2_dbg(1, debug, sd, "ctrl: 0x%x, value: %d\n", ctrl->id, ctrl->val);
+        mutex_lock(&s5k6aa->lock);
+        /*
+         * If the device is not powered up by the host driver do
+         * not apply any controls to H/W at this time. Instead
+         * the controls will be restored right after power-up.
+         */
+        if (s5k6aa->power == 0)
+                goto unlock;
+        idx = s5k6aa->preset->index;
+        switch (ctrl->id) {
+        case V4L2_CID_AUTO_WHITE_BALANCE:
+                err = s5k6aa_set_awb(s5k6aa, ctrl->val);
+                break;
+        case V4L2_CID_BRIGHTNESS:
+                err = s5k6aa_write(client, REG_USER_BRIGHTNESS, ctrl->val);
+                break;
+        case V4L2_CID_COLORFX:
+                err = s5k6aa_set_colorfx(s5k6aa, ctrl->val);
+                break;
+        case V4L2_CID_CONTRAST:
+                err = s5k6aa_write(client, REG_USER_CONTRAST, ctrl->val);
+                break;
+        case V4L2_CID_EXPOSURE_AUTO:
+                err = s5k6aa_set_auto_exposure(s5k6aa, ctrl->val);
+                break;
+        case V4L2_CID_HFLIP:
+                err = s5k6aa_set_mirror(s5k6aa, ctrl->val);
+                if (err)
+                        break;
+                err = s5k6aa_write(client, REG_G_PREV_CFG_CHG, 1);
+                break;
+        case V4L2_CID_POWER_LINE_FREQUENCY:
+                err = s5k6aa_set_anti_flicker(s5k6aa, ctrl->val);
+                break;
+        case V4L2_CID_SATURATION:
+                err = s5k6aa_write(client, REG_USER_SATURATION, ctrl->val);
+                break;
+        case V4L2_CID_SHARPNESS:
+                err = s5k6aa_write(client, REG_USER_SHARPBLUR, ctrl->val);
+                break;
+        case V4L2_CID_WHITE_BALANCE_TEMPERATURE:
+                err = s5k6aa_write(client, REG_P_COLORTEMP(idx), ctrl->val);
+                if (err)
+                        break;
+                err = s5k6aa_write(client, REG_G_PREV_CFG_CHG, 1);
+                break;
+        }
+unlock:
+        mutex_unlock(&s5k6aa->lock);
+        return err;
+}
+static const struct v4l2_ctrl_ops s5k6aa_ctrl_ops = {
+        .s_ctrl = s5k6aa_s_ctrl,
+};
+static int s5k6aa_log_status(struct v4l2_subdev *sd)
+{
+        v4l2_ctrl_handler_log_status(sd->ctrl_handler, sd->name);
+        return 0;
+}
+#define V4L2_CID_RED_GAIN       (V4L2_CTRL_CLASS_CAMERA | 0x1001)
+#define V4L2_CID_GREEN_GAIN     (V4L2_CTRL_CLASS_CAMERA | 0x1002)
+#define V4L2_CID_BLUE_GAIN      (V4L2_CTRL_CLASS_CAMERA | 0x1003)
+static const struct v4l2_ctrl_config s5k6aa_ctrls[] = {
+        {
+                .ops    = &s5k6aa_ctrl_ops,
+                .id     = V4L2_CID_RED_GAIN,
+                .type   = V4L2_CTRL_TYPE_INTEGER,
+                .name   = "Gain, Red",
+                .min    = 0,
+                .max    = 256,
+                .def    = 127,
+                .step   = 1,
+        }, {
+                .ops    = &s5k6aa_ctrl_ops,
+                .id     = V4L2_CID_GREEN_GAIN,
+                .type   = V4L2_CTRL_TYPE_INTEGER,
+                .name   = "Gain, Green",
+                .min    = 0,
+                .max    = 256,
+                .def    = 127,
+                .step   = 1,
+        }, {
+                .ops    = &s5k6aa_ctrl_ops,
+                .id     = V4L2_CID_BLUE_GAIN,
+                .type   = V4L2_CTRL_TYPE_INTEGER,
+                .name   = "Gain, Blue",
+                .min    = 0,
+                .max    = 256,
+                .def    = 127,
+                .step   = 1,
+        },
+};
+static int s5k6aa_initialize_ctrls(struct s5k6aa *s5k6aa)
+{
+        const struct v4l2_ctrl_ops *ops = &s5k6aa_ctrl_ops;
+        struct s5k6aa_ctrls *ctrls = &s5k6aa->ctrls;
+        struct v4l2_ctrl_handler *hdl = &ctrls->handler;
+        int ret = v4l2_ctrl_handler_init(hdl, 16);
+        if (ret)
+                return ret;
+        /* Auto white balance cluster */
+        ctrls->awb = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_AUTO_WHITE_BALANCE,
+                                       0, 1, 1, 1);
+        ctrls->gain_red = v4l2_ctrl_new_custom(hdl, &s5k6aa_ctrls[0], NULL);
+        ctrls->gain_green = v4l2_ctrl_new_custom(hdl, &s5k6aa_ctrls[1], NULL);
+        ctrls->gain_blue = v4l2_ctrl_new_custom(hdl, &s5k6aa_ctrls[2], NULL);
+        v4l2_ctrl_auto_cluster(4, &ctrls->awb, 0, false);
+        ctrls->hflip = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_HFLIP, 0, 1, 1, 0);
+        ctrls->vflip = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_VFLIP, 0, 1, 1, 0);
+        v4l2_ctrl_cluster(2, &ctrls->hflip);
+        ctrls->auto_exp = v4l2_ctrl_new_std_menu(hdl, ops,
+                                V4L2_CID_EXPOSURE_AUTO,
+                                V4L2_EXPOSURE_MANUAL, 0, V4L2_EXPOSURE_AUTO);
+        /* Exposure time: x 1 us */
+        ctrls->exposure = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_EXPOSURE,
+                                            0, 6000000U, 1, 100000U);
+        /* Total gain: 256 <=> 1x */
+        ctrls->gain = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_GAIN,
+                                        0, 256, 1, 256);
+        v4l2_ctrl_auto_cluster(3, &ctrls->auto_exp, 0, false);
+        v4l2_ctrl_new_std_menu(hdl, ops, V4L2_CID_POWER_LINE_FREQUENCY,
+                               V4L2_CID_POWER_LINE_FREQUENCY_AUTO, 0,
+                               V4L2_CID_POWER_LINE_FREQUENCY_AUTO);
+        v4l2_ctrl_new_std_menu(hdl, ops, V4L2_CID_COLORFX,
+                               V4L2_COLORFX_SKY_BLUE, ~0x6f, V4L2_COLORFX_NONE);
+        v4l2_ctrl_new_std(hdl, ops, V4L2_CID_WHITE_BALANCE_TEMPERATURE,
+                          0, 256, 1, 0);
+        v4l2_ctrl_new_std(hdl, ops, V4L2_CID_SATURATION, -127, 127, 1, 0);
+        v4l2_ctrl_new_std(hdl, ops, V4L2_CID_BRIGHTNESS, -127, 127, 1, 0);
+        v4l2_ctrl_new_std(hdl, ops, V4L2_CID_CONTRAST, -127, 127, 1, 0);
+        v4l2_ctrl_new_std(hdl, ops, V4L2_CID_SHARPNESS, -127, 127, 1, 0);
+        if (hdl->error) {
+                ret = hdl->error;
+                v4l2_ctrl_handler_free(hdl);
+                return ret;
+        }
+        s5k6aa->sd.ctrl_handler = hdl;
+        return 0;
+}
+/*
+ * V4L2 subdev internal operations
+ */
+static int s5k6aa_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
+{
+        struct v4l2_mbus_framefmt *format = v4l2_subdev_get_try_format(fh, 0);
+        struct v4l2_rect *crop = v4l2_subdev_get_try_crop(fh, 0);
+        format->colorspace = s5k6aa_formats[0].colorspace;
+        format->code = s5k6aa_formats[0].code;
+        format->width = S5K6AA_OUT_WIDTH_DEF;
+        format->height = S5K6AA_OUT_HEIGHT_DEF;
+        format->field = V4L2_FIELD_NONE;
+        crop->width = S5K6AA_WIN_WIDTH_MAX;
+        crop->height = S5K6AA_WIN_HEIGHT_MAX;
+        crop->left = 0;
+        crop->top = 0;
+        return 0;
+}
+int s5k6aa_check_fw_revision(struct s5k6aa *s5k6aa)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd);
+        u16 api_ver = 0, fw_rev = 0;
+        int ret = s5k6aa_set_ahb_address(client);
+        if (!ret)
+                ret = s5k6aa_read(client, REG_FW_APIVER, &api_ver);
+        if (!ret)
+                ret = s5k6aa_read(client, REG_FW_REVISION, &fw_rev);
+        if (ret) {
+                v4l2_err(&s5k6aa->sd, "FW revision check failed!\n");
+                return ret;
+        }
+        v4l2_info(&s5k6aa->sd, "FW API ver.: 0x%X, FW rev.: 0x%X\n",
+                  api_ver, fw_rev);
+        return api_ver == S5K6AAFX_FW_APIVER ? 0 : -ENODEV;
+}
+static int s5k6aa_registered(struct v4l2_subdev *sd)
+{
+        struct s5k6aa *s5k6aa = to_s5k6aa(sd);
+        int ret;
+        mutex_lock(&s5k6aa->lock);
+        ret = __s5k6aa_power_on(s5k6aa);
+        if (!ret) {
+                msleep(100);
+                ret = s5k6aa_check_fw_revision(s5k6aa);
+                __s5k6aa_power_off(s5k6aa);
+        }
+        mutex_unlock(&s5k6aa->lock);
+        return ret;
+}
+static const struct v4l2_subdev_internal_ops s5k6aa_subdev_internal_ops = {
+        .registered = s5k6aa_registered,
+        .open = s5k6aa_open,
+};
+static const struct v4l2_subdev_core_ops s5k6aa_core_ops = {
+        .s_power = s5k6aa_set_power,
+        .log_status = s5k6aa_log_status,
+};
+static const struct v4l2_subdev_ops s5k6aa_subdev_ops = {
+        .core = &s5k6aa_core_ops,
+        .pad = &s5k6aa_pad_ops,
+        .video = &s5k6aa_video_ops,
+};
+/*
+ * GPIO setup
+ */
+static int s5k6aa_configure_gpio(int nr, int val, const char *name)
+{
+        unsigned long flags = val ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW;
+        int ret;
+        if (!gpio_is_valid(nr))
+                return 0;
+        ret = gpio_request_one(nr, flags, name);
+        if (!ret)
+                gpio_export(nr, 0);
+        return ret;
+}
+static void s5k6aa_free_gpios(struct s5k6aa *s5k6aa)
+{
+        int i;
+        for (i = 0; i < ARRAY_SIZE(s5k6aa->gpio); i++) {
+                if (!gpio_is_valid(s5k6aa->gpio[i].gpio))
+                        continue;
+                gpio_free(s5k6aa->gpio[i].gpio);
+                s5k6aa->gpio[i].gpio = -EINVAL;
+        }
+}
+static int s5k6aa_configure_gpios(struct s5k6aa *s5k6aa,
+                                  const struct s5k6aa_platform_data *pdata)
+{
+        const struct s5k6aa_gpio *gpio = &pdata->gpio_stby;
+        int ret;
+        s5k6aa->gpio[STBY].gpio = -EINVAL;
+        s5k6aa->gpio[RST].gpio  = -EINVAL;
+        ret = s5k6aa_configure_gpio(gpio->gpio, gpio->level, "S5K6AA_STBY");
+        if (ret) {
+                s5k6aa_free_gpios(s5k6aa);
+                return ret;
+        }
+        s5k6aa->gpio[STBY] = *gpio;
+        if (gpio_is_valid(gpio->gpio))
+                gpio_set_value(gpio->gpio, 0);
+        gpio = &pdata->gpio_reset;
+        ret = s5k6aa_configure_gpio(gpio->gpio, gpio->level, "S5K6AA_RST");
+        if (ret) {
+                s5k6aa_free_gpios(s5k6aa);
+                return ret;
+        }
+        s5k6aa->gpio[RST] = *gpio;
+        if (gpio_is_valid(gpio->gpio))
+                gpio_set_value(gpio->gpio, 0);
+        return 0;
+}
+static int s5k6aa_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+{
+        const struct s5k6aa_platform_data *pdata = client->dev.platform_data;
+        struct v4l2_subdev *sd;
+        struct s5k6aa *s5k6aa;
+        int i, ret;
+        if (pdata == NULL) {
+                dev_err(&client->dev, "Platform data not specified\n");
+                return -EINVAL;
+        }
+        if (pdata->mclk_frequency == 0) {
+                dev_err(&client->dev, "MCLK frequency not specified\n");
+                return -EINVAL;
+        }
+        s5k6aa = kzalloc(sizeof(*s5k6aa), GFP_KERNEL);
+        if (!s5k6aa)
+                return -ENOMEM;
+        mutex_init(&s5k6aa->lock);
+        s5k6aa->mclk_frequency = pdata->mclk_frequency;
+        s5k6aa->bus_type = pdata->bus_type;
+        s5k6aa->mipi_lanes = pdata->nlanes;
+        s5k6aa->s_power = pdata->set_power;
+        s5k6aa->inv_hflip = pdata->horiz_flip;
+        s5k6aa->inv_vflip = pdata->vert_flip;
+        sd = &s5k6aa->sd;
+        strlcpy(sd->name, DRIVER_NAME, sizeof(sd->name));
+        v4l2_i2c_subdev_init(sd, client, &s5k6aa_subdev_ops);
+        sd->internal_ops = &s5k6aa_subdev_internal_ops;
+        sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
+        s5k6aa->pad.flags = MEDIA_PAD_FL_SOURCE;
+        sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV_SENSOR;
+        ret = media_entity_init(&sd->entity, 1, &s5k6aa->pad, 0);
+        if (ret)
+                goto out_err1;
+        ret = s5k6aa_configure_gpios(s5k6aa, pdata);
+        if (ret)
+                goto out_err2;
+        for (i = 0; i < S5K6AA_NUM_SUPPLIES; i++)
+                s5k6aa->supplies[i].supply = s5k6aa_supply_names[i];
+        ret = regulator_bulk_get(&client->dev, S5K6AA_NUM_SUPPLIES,
+                                 s5k6aa->supplies);
+        if (ret) {
+                dev_err(&client->dev, "Failed to get regulators\n");
+                goto out_err3;
+        }
+        ret = s5k6aa_initialize_ctrls(s5k6aa);
+        if (ret)
+                goto out_err4;
+        s5k6aa_presets_data_init(s5k6aa);
+        s5k6aa->ccd_rect.width = S5K6AA_WIN_WIDTH_MAX;
+        s5k6aa->ccd_rect.height = S5K6AA_WIN_HEIGHT_MAX;
+        s5k6aa->ccd_rect.left = 0;
+        s5k6aa->ccd_rect.top = 0;
+        return 0;
+out_err4:
+        regulator_bulk_free(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies);
+out_err3:
+        s5k6aa_free_gpios(s5k6aa);
+out_err2:
+        media_entity_cleanup(&s5k6aa->sd.entity);
+out_err1:
+        kfree(s5k6aa);
+        return ret;
+}
+static int s5k6aa_remove(struct i2c_client *client)
+{
+        struct v4l2_subdev *sd = i2c_get_clientdata(client);
+        struct s5k6aa *s5k6aa = to_s5k6aa(sd);
+        v4l2_device_unregister_subdev(sd);
+        v4l2_ctrl_handler_free(sd->ctrl_handler);
+        media_entity_cleanup(&sd->entity);
+        regulator_bulk_free(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies);
+        s5k6aa_free_gpios(s5k6aa);
+        kfree(s5k6aa);
+        return 0;
+}
+static const struct i2c_device_id s5k6aa_id[] = {
+        { DRIVER_NAME, 0 },
+        { },
+};
+MODULE_DEVICE_TABLE(i2c, s5k6aa_id);
+static struct i2c_driver s5k6aa_i2c_driver = {
+        .driver = {
+                .name = DRIVER_NAME
+        },
+        .probe          = s5k6aa_probe,
+        .remove         = s5k6aa_remove,
+        .id_table       = s5k6aa_id,
+};
+static int __init s5k6aa_init(void)
+{
+        return i2c_add_driver(&s5k6aa_i2c_driver);
+}
+static void __exit s5k6aa_exit(void)
+{
+        i2c_del_driver(&s5k6aa_i2c_driver);
+}
+module_init(s5k6aa_init);
+module_exit(s5k6aa_exit);
+MODULE_DESCRIPTION("Samsung S5K6AA(FX) SXGA camera driver");
+MODULE_AUTHOR("Sylwester Nawrocki <s.nawrocki@samsung.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c
index 931f469604b0..c8d91b0cd9bd 100644
--- a/drivers/media/video/s5p-fimc/fimc-capture.c
+++ b/drivers/media/video/s5p-fimc/fimc-capture.c
@@ -246,9 +246,9 @@ static unsigned int get_plane_size(struct fimc_frame *fr, unsigned int plane)
        return fr->f_width * fr->f_height * fr->fmt->depth[plane] / 8;
 }
-static int queue_setup(struct vb2_queue *vq, unsigned int *num_buffers,
+static int queue_setup(struct vb2_queue *vq,  const struct v4l2_format *pfmt,
-                       unsigned int *num_planes, unsigned int sizes[],
+                       unsigned int *num_buffers, unsigned int *num_planes,
-                       void *allocators[])
+                       unsigned int sizes[], void *allocators[])
 {
        struct fimc_ctx *ctx = vq->drv_priv;
        struct fimc_fmt *fmt = ctx->d_frame.fmt;
diff --git a/drivers/media/video/s5p-fimc/fimc-core.c b/drivers/media/video/s5p-fimc/fimc-core.c
index 6c1c9cb55378..19ca6db38b2f 100644
--- a/drivers/media/video/s5p-fimc/fimc-core.c
+++ b/drivers/media/video/s5p-fimc/fimc-core.c
@@ -670,9 +670,9 @@ static void fimc_job_abort(void *priv)
        fimc_m2m_shutdown(priv);
 }
-static int fimc_queue_setup(struct vb2_queue *vq, unsigned int *num_buffers,
+static int fimc_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
-                            unsigned int *num_planes, unsigned int sizes[],
+                            unsigned int *num_buffers, unsigned int *num_planes,
-                            void *allocators[])
+                            unsigned int sizes[], void *allocators[])
 {
        struct fimc_ctx *ctx = vb2_get_drv_priv(vq);
        struct fimc_frame *f;
diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c b/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c
index 5f4da80051bb..f2481a85e0a2 100644
--- a/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c
+++ b/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c
@@ -38,7 +38,7 @@ int s5p_mfc_alloc_and_load_firmware(struct s5p_mfc_dev *dev)
         * into kernel. */
        mfc_debug_enter();
        err = request_firmware((const struct firmware **)&fw_blob,
-                                     "s5pc110-mfc.fw", dev->v4l2_dev.dev);
+                                     "s5p-mfc.fw", dev->v4l2_dev.dev);
        if (err != 0) {
                mfc_err("Firmware is not present in the /lib/firmware directory nor compiled in kernel\n");
                return -EINVAL;
@@ -116,7 +116,7 @@ int s5p_mfc_reload_firmware(struct s5p_mfc_dev *dev)
         * into kernel. */
        mfc_debug_enter();
        err = request_firmware((const struct firmware **)&fw_blob,
-                                     "s5pc110-mfc.fw", dev->v4l2_dev.dev);
+                                     "s5p-mfc.fw", dev->v4l2_dev.dev);
        if (err != 0) {
                mfc_err("Firmware is not present in the /lib/firmware directory nor compiled in kernel\n");
                return -EINVAL;
diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_dec.c b/drivers/media/video/s5p-mfc/s5p_mfc_dec.c
index bfbe08432050..725634d9736d 100644
--- a/drivers/media/video/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/video/s5p-mfc/s5p_mfc_dec.c
@@ -744,9 +744,10 @@ static const struct v4l2_ioctl_ops s5p_mfc_dec_ioctl_ops = {
        .vidioc_g_crop = vidioc_g_crop,
 };
-static int s5p_mfc_queue_setup(struct vb2_queue *vq, unsigned int *buf_count,
+static int s5p_mfc_queue_setup(struct vb2_queue *vq,
-                               unsigned int *plane_count, unsigned int psize[],
+                        const struct v4l2_format *fmt, unsigned int *buf_count,
-                               void *allocators[])
+                        unsigned int *plane_count, unsigned int psize[],
+                        void *allocators[])
 {
        struct s5p_mfc_ctx *ctx = fh_to_ctx(vq->drv_priv);
diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
index 4c90e53bd964..ecef127dbc66 100644
--- a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
@@ -1513,8 +1513,9 @@ static int check_vb_with_fmt(struct s5p_mfc_fmt *fmt, struct vb2_buffer *vb)
 }
 static int s5p_mfc_queue_setup(struct vb2_queue *vq,
-                       unsigned int *buf_count, unsigned int *plane_count,
+                        const struct v4l2_format *fmt,
-                       unsigned int psize[], void *allocators[])
+                        unsigned int *buf_count, unsigned int *plane_count,
+                        unsigned int psize[], void *allocators[])
 {
        struct s5p_mfc_ctx *ctx = fh_to_ctx(vq->drv_priv);
diff --git a/drivers/media/video/s5p-tv/mixer_video.c b/drivers/media/video/s5p-tv/mixer_video.c
index 4917e2c2b321..e16d3a4bc1dc 100644
--- a/drivers/media/video/s5p-tv/mixer_video.c
+++ b/drivers/media/video/s5p-tv/mixer_video.c
@@ -727,8 +727,8 @@ static const struct v4l2_file_operations mxr_fops = {
        .unlocked_ioctl = video_ioctl2,
 };
-static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
+static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *pfmt,
-        unsigned int *nplanes, unsigned int sizes[],
+        unsigned int *nbuffers, unsigned int *nplanes, unsigned int sizes[],
        void *alloc_ctxs[])
 {
        struct mxr_layer *layer = vb2_get_drv_priv(vq);
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index bc8d6bba8ee5..9b550687213a 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -843,10 +843,10 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev);
 int saa7134_ir_start(struct saa7134_dev *dev);
 void saa7134_ir_stop(struct saa7134_dev *dev);
 #else
-#define saa7134_input_init1(dev)        (0)
+#define saa7134_input_init1(dev)        ((void)0)
-#define saa7134_input_fini(dev)         (0)
+#define saa7134_input_fini(dev)         ((void)0)
-#define saa7134_input_irq(dev)          (0)
+#define saa7134_input_irq(dev)          ((void)0)
-#define saa7134_probe_i2c_ir(dev)       (0)
+#define saa7134_probe_i2c_ir(dev)       ((void)0)
-#define saa7134_ir_start(dev)           (0)
+#define saa7134_ir_start(dev)           ((void)0)
-#define saa7134_ir_stop(dev)            (0)
+#define saa7134_ir_stop(dev)            ((void)0)
 #endif
diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c
index 8615fb81775f..f390682629cf 100644
--- a/drivers/media/video/sh_mobile_ceu_camera.c
+++ b/drivers/media/video/sh_mobile_ceu_camera.c
@@ -90,7 +90,6 @@
 struct sh_mobile_ceu_buffer {
        struct vb2_buffer vb; /* v4l buffer must be first */
        struct list_head queue;
-        enum v4l2_mbus_pixelcode code;
 };
 struct sh_mobile_ceu_dev {
@@ -100,7 +99,8 @@ struct sh_mobile_ceu_dev {
        unsigned int irq;
        void __iomem *base;
-        unsigned long video_limit;
+        size_t video_limit;
+        size_t buf_total;
        spinlock_t lock;                /* Protects video buffer lists */
        struct list_head capture;
@@ -121,7 +121,7 @@ struct sh_mobile_ceu_dev {
 };
 struct sh_mobile_ceu_cam {
-        /* CEU offsets within scaled by the CEU camera output */
+        /* CEU offsets within the camera output, before the CEU scaler */
        unsigned int ceu_left;
        unsigned int ceu_top;
        /* Client output, as seen by the CEU */
@@ -144,30 +144,6 @@ static struct sh_mobile_ceu_buffer *to_ceu_vb(struct vb2_buffer *vb)
        return container_of(vb, struct sh_mobile_ceu_buffer, vb);
 }
-static unsigned long make_bus_param(struct sh_mobile_ceu_dev *pcdev)
-{
-        unsigned long flags;
-        flags = SOCAM_MASTER |
-                SOCAM_PCLK_SAMPLE_RISING |
-                SOCAM_HSYNC_ACTIVE_HIGH |
-                SOCAM_HSYNC_ACTIVE_LOW |
-                SOCAM_VSYNC_ACTIVE_HIGH |
-                SOCAM_VSYNC_ACTIVE_LOW |
-                SOCAM_DATA_ACTIVE_HIGH;
-        if (pcdev->pdata->flags & SH_CEU_FLAG_USE_8BIT_BUS)
-                flags |= SOCAM_DATAWIDTH_8;
-        if (pcdev->pdata->flags & SH_CEU_FLAG_USE_16BIT_BUS)
-                flags |= SOCAM_DATAWIDTH_16;
-        if (flags & SOCAM_DATAWIDTH_MASK)
-                return flags;
-        return 0;
-}
 static void ceu_write(struct sh_mobile_ceu_dev *priv,
                      unsigned long reg_offs, u32 data)
 {
@@ -216,33 +192,61 @@ static int sh_mobile_ceu_soft_reset(struct sh_mobile_ceu_dev *pcdev)
 /*
 *  Videobuf operations
 */
+/*
+ * .queue_setup() is called to check, whether the driver can accept the
+ *                requested number of buffers and to fill in plane sizes
+ *                for the current frame format if required
+ */
 static int sh_mobile_ceu_videobuf_setup(struct vb2_queue *vq,
+                        const struct v4l2_format *fmt,
                        unsigned int *count, unsigned int *num_planes,
                        unsigned int sizes[], void *alloc_ctxs[])
 {
        struct soc_camera_device *icd = container_of(vq, struct soc_camera_device, vb2_vidq);
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct sh_mobile_ceu_dev *pcdev = ici->priv;
-        int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
+        int bytes_per_line;
-                                                icd->current_fmt->host_fmt);
+        unsigned int height;
+        if (fmt) {
+                const struct soc_camera_format_xlate *xlate = soc_camera_xlate_by_fourcc(icd,
+                                                                fmt->fmt.pix.pixelformat);
+                if (!xlate)
+                        return -EINVAL;
+                bytes_per_line = soc_mbus_bytes_per_line(fmt->fmt.pix.width,
+                                                         xlate->host_fmt);
+                height = fmt->fmt.pix.height;
+        } else {
+                /* Called from VIDIOC_REQBUFS or in compatibility mode */
+                bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
+                                                icd->current_fmt->host_fmt);
+                height = icd->user_height;
+        }
        if (bytes_per_line < 0)
                return bytes_per_line;
-        *num_planes = 1;
+        sizes[0] = bytes_per_line * height;
-        pcdev->sequence = 0;
-        sizes[0] = bytes_per_line * icd->user_height;
        alloc_ctxs[0] = pcdev->alloc_ctx;
+        if (!vq->num_buffers)
+                pcdev->sequence = 0;
        if (!*count)
                *count = 2;
-        if (pcdev->video_limit) {
+        /* If *num_planes != 0, we have already verified *count. */
-                if (PAGE_ALIGN(sizes[0]) * *count > pcdev->video_limit)
+        if (pcdev->video_limit && !*num_planes) {
-                        *count = pcdev->video_limit / PAGE_ALIGN(sizes[0]);
+                size_t size = PAGE_ALIGN(sizes[0]) * *count;
+                if (size + pcdev->buf_total > pcdev->video_limit)
+                        *count = (pcdev->video_limit - pcdev->buf_total) /
+                                PAGE_ALIGN(sizes[0]);
        }
+        *num_planes = 1;
        dev_dbg(icd->parent, "count=%d, size=%u\n", *count, sizes[0]);
        return 0;
@@ -267,6 +271,7 @@ static int sh_mobile_ceu_capture(struct sh_mobile_ceu_dev *pcdev)
        unsigned long top1, top2;
        unsigned long bottom1, bottom2;
        u32 status;
+        bool planar;
        int ret = 0;
        /*
@@ -314,17 +319,29 @@ static int sh_mobile_ceu_capture(struct sh_mobile_ceu_dev *pcdev)
        phys_addr_top = vb2_dma_contig_plane_dma_addr(pcdev->active, 0);
-        ceu_write(pcdev, top1, phys_addr_top);
-        if (V4L2_FIELD_NONE != pcdev->field) {
-                phys_addr_bottom = phys_addr_top + icd->user_width;
-                ceu_write(pcdev, bottom1, phys_addr_bottom);
-        }
        switch (icd->current_fmt->host_fmt->fourcc) {
        case V4L2_PIX_FMT_NV12:
        case V4L2_PIX_FMT_NV21:
        case V4L2_PIX_FMT_NV16:
        case V4L2_PIX_FMT_NV61:
+                planar = true;
+                break;
+        default:
+                planar = false;
+        }
+        ceu_write(pcdev, top1, phys_addr_top);
+        if (V4L2_FIELD_NONE != pcdev->field) {
+                if (planar)
+                        phys_addr_bottom = phys_addr_top + icd->user_width;
+                else
+                        phys_addr_bottom = phys_addr_top +
+                                soc_mbus_bytes_per_line(icd->user_width,
+                                                        icd->current_fmt->host_fmt);
+                ceu_write(pcdev, bottom1, phys_addr_bottom);
+        }
+        if (planar) {
                phys_addr_top += icd->user_width *
                        icd->user_height;
                ceu_write(pcdev, top2, phys_addr_top);
@@ -341,23 +358,40 @@ static int sh_mobile_ceu_capture(struct sh_mobile_ceu_dev *pcdev)
 static int sh_mobile_ceu_videobuf_prepare(struct vb2_buffer *vb)
 {
+        struct sh_mobile_ceu_buffer *buf = to_ceu_vb(vb);
+        /* Added list head initialization on alloc */
+        WARN(!list_empty(&buf->queue), "Buffer %p on queue!\n", vb);
+        return 0;
+}
+static void sh_mobile_ceu_videobuf_queue(struct vb2_buffer *vb)
+{
        struct soc_camera_device *icd = container_of(vb->vb2_queue, struct soc_camera_device, vb2_vidq);
-        struct sh_mobile_ceu_buffer *buf;
+        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
+        struct sh_mobile_ceu_dev *pcdev = ici->priv;
+        struct sh_mobile_ceu_buffer *buf = to_ceu_vb(vb);
+        unsigned long size;
        int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
                                                icd->current_fmt->host_fmt);
-        unsigned long size;
        if (bytes_per_line < 0)
-                return bytes_per_line;
+                goto error;
-        buf = to_ceu_vb(vb);
+        size = icd->user_height * bytes_per_line;
+        if (vb2_plane_size(vb, 0) < size) {
+                dev_err(icd->parent, "Buffer #%d too small (%lu < %lu)\n",
+                        vb->v4l2_buf.index, vb2_plane_size(vb, 0), size);
+                goto error;
+        }
+        vb2_set_plane_payload(vb, 0, size);
        dev_dbg(icd->parent, "%s (vb=0x%p) 0x%p %lu\n", __func__,
                vb, vb2_plane_vaddr(vb, 0), vb2_get_plane_payload(vb, 0));
-        /* Added list head initialization on alloc */
-        WARN(!list_empty(&buf->queue), "Buffer %p on queue!\n", vb);
 #ifdef DEBUG
        /*
         * This can be useful if you want to see if we actually fill
@@ -367,31 +401,6 @@ static int sh_mobile_ceu_videobuf_prepare(struct vb2_buffer *vb)
                memset(vb2_plane_vaddr(vb, 0), 0xaa, vb2_get_plane_payload(vb, 0));
 #endif
-        BUG_ON(NULL == icd->current_fmt);
-        size = icd->user_height * bytes_per_line;
-        if (vb2_plane_size(vb, 0) < size) {
-                dev_err(icd->parent, "Buffer too small (%lu < %lu)\n",
-                        vb2_plane_size(vb, 0), size);
-                return -ENOBUFS;
-        }
-        vb2_set_plane_payload(vb, 0, size);
-        return 0;
-}
-static void sh_mobile_ceu_videobuf_queue(struct vb2_buffer *vb)
-{
-        struct soc_camera_device *icd = container_of(vb->vb2_queue, struct soc_camera_device, vb2_vidq);
-        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
-        struct sh_mobile_ceu_dev *pcdev = ici->priv;
-        struct sh_mobile_ceu_buffer *buf = to_ceu_vb(vb);
-        dev_dbg(icd->parent, "%s (vb=0x%p) 0x%p %lu\n", __func__,
-                vb, vb2_plane_vaddr(vb, 0), vb2_get_plane_payload(vb, 0));
        spin_lock_irq(&pcdev->lock);
        list_add_tail(&buf->queue, &pcdev->capture);
@@ -405,6 +414,11 @@ static void sh_mobile_ceu_videobuf_queue(struct vb2_buffer *vb)
                sh_mobile_ceu_capture(pcdev);
        }
        spin_unlock_irq(&pcdev->lock);
+        return;
+error:
+        vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);
 }
 static void sh_mobile_ceu_videobuf_release(struct vb2_buffer *vb)
@@ -429,11 +443,23 @@ static void sh_mobile_ceu_videobuf_release(struct vb2_buffer *vb)
        if (buf->queue.next)
                list_del_init(&buf->queue);
+        pcdev->buf_total -= PAGE_ALIGN(vb2_plane_size(vb, 0));
+        dev_dbg(icd->parent, "%s() %zu bytes buffers\n", __func__,
+                pcdev->buf_total);
        spin_unlock_irq(&pcdev->lock);
 }
 static int sh_mobile_ceu_videobuf_init(struct vb2_buffer *vb)
 {
+        struct soc_camera_device *icd = container_of(vb->vb2_queue, struct soc_camera_device, vb2_vidq);
+        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
+        struct sh_mobile_ceu_dev *pcdev = ici->priv;
+        pcdev->buf_total += PAGE_ALIGN(vb2_plane_size(vb, 0));
+        dev_dbg(icd->parent, "%s() %zu bytes buffers\n", __func__,
+                pcdev->buf_total);
        /* This is for locking debugging only */
        INIT_LIST_HEAD(&to_ceu_vb(vb)->queue);
        return 0;
@@ -535,19 +561,29 @@ static int sh_mobile_ceu_add_device(struct soc_camera_device *icd)
        pm_runtime_get_sync(ici->v4l2_dev.dev);
+        pcdev->buf_total = 0;
        ret = sh_mobile_ceu_soft_reset(pcdev);
        csi2_sd = find_csi2(pcdev);
+        if (csi2_sd)
+                csi2_sd->grp_id = (long)icd;
        ret = v4l2_subdev_call(csi2_sd, core, s_power, 1);
-        if (ret != -ENODEV && ret != -ENOIOCTLCMD && ret < 0) {
+        if (ret < 0 && ret != -ENOIOCTLCMD && ret != -ENODEV) {
                pm_runtime_put_sync(ici->v4l2_dev.dev);
-        } else {
+                return ret;
-                pcdev->icd = icd;
-                ret = 0;
        }
-        return ret;
+        /*
+         * -ENODEV is special: either csi2_sd == NULL or the CSI-2 driver
+         * has not found this soc-camera device among its clients
+         */
+        if (ret == -ENODEV && csi2_sd)
+                csi2_sd->grp_id = 0;
+        pcdev->icd = icd;
+        return 0;
 }
 /* Called with .video_lock held */
@@ -560,6 +596,8 @@ static void sh_mobile_ceu_remove_device(struct soc_camera_device *icd)
        BUG_ON(icd != pcdev->icd);
        v4l2_subdev_call(csi2_sd, core, s_power, 0);
+        if (csi2_sd)
+                csi2_sd->grp_id = 0;
        /* disable capture, disable interrupts */
        ceu_write(pcdev, CEIER, 0);
        sh_mobile_ceu_soft_reset(pcdev);
@@ -628,22 +666,22 @@ static void sh_mobile_ceu_set_rect(struct soc_camera_device *icd)
        left_offset     = cam->ceu_left;
        top_offset      = cam->ceu_top;
-        /* CEU cropping (CFSZR) is applied _after_ the scaling filter (CFLCR) */
+        WARN_ON(icd->user_width & 3 || icd->user_height & 3);
+        width = icd->user_width;
        if (pcdev->image_mode) {
                in_width = cam->width;
                if (!pcdev->is_16bit) {
                        in_width *= 2;
                        left_offset *= 2;
                }
-                width = icd->user_width;
+                cdwdr_width = width;
-                cdwdr_width = icd->user_width;
        } else {
-                int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
+                int bytes_per_line = soc_mbus_bytes_per_line(width,
                                                icd->current_fmt->host_fmt);
                unsigned int w_factor;
-                width = icd->user_width;
                switch (icd->current_fmt->host_fmt->packing) {
                case SOC_MBUS_PACKING_2X8_PADHI:
                        w_factor = 2;
@@ -653,10 +691,10 @@ static void sh_mobile_ceu_set_rect(struct soc_camera_device *icd)
                }
                in_width = cam->width * w_factor;
-                left_offset = left_offset * w_factor;
+                left_offset *= w_factor;
                if (bytes_per_line < 0)
-                        cdwdr_width = icd->user_width;
+                        cdwdr_width = width;
                else
                        cdwdr_width = bytes_per_line;
        }
@@ -664,7 +702,7 @@ static void sh_mobile_ceu_set_rect(struct soc_camera_device *icd)
        height = icd->user_height;
        in_height = cam->height;
        if (V4L2_FIELD_NONE != pcdev->field) {
-                height /= 2;
+                height = (height / 2) & ~3;
                in_height /= 2;
                top_offset /= 2;
                cdwdr_width *= 2;
@@ -686,6 +724,7 @@ static void sh_mobile_ceu_set_rect(struct soc_camera_device *icd)
        ceu_write(pcdev, CAMOR, camor);
        ceu_write(pcdev, CAPWR, (in_height << 16) | in_width);
+        /* CFSZR clipping is applied _after_ the scaling filter (CFLCR) */
        ceu_write(pcdev, CFSZR, (height << 16) | width);
        ceu_write(pcdev, CDWDR, cdwdr_width);
 }
@@ -723,66 +762,93 @@ static void capture_restore(struct sh_mobile_ceu_dev *pcdev, u32 capsr)
                ceu_write(pcdev, CAPSR, capsr);
 }
+/* Find the bus subdevice driver, e.g., CSI2 */
+static struct v4l2_subdev *find_bus_subdev(struct sh_mobile_ceu_dev *pcdev,
+                                           struct soc_camera_device *icd)
+{
+        if (pcdev->csi2_pdev) {
+                struct v4l2_subdev *csi2_sd = find_csi2(pcdev);
+                if (csi2_sd && csi2_sd->grp_id == (u32)icd)
+                        return csi2_sd;
+        }
+        return soc_camera_to_subdev(icd);
+}
+#define CEU_BUS_FLAGS (V4L2_MBUS_MASTER |       \
+                V4L2_MBUS_PCLK_SAMPLE_RISING |  \
+                V4L2_MBUS_HSYNC_ACTIVE_HIGH |   \
+                V4L2_MBUS_HSYNC_ACTIVE_LOW |    \
+                V4L2_MBUS_VSYNC_ACTIVE_HIGH |   \
+                V4L2_MBUS_VSYNC_ACTIVE_LOW |    \
+                V4L2_MBUS_DATA_ACTIVE_HIGH)
 /* Capture is not running, no interrupts, no locking needed */
 static int sh_mobile_ceu_set_bus_param(struct soc_camera_device *icd,
                                       __u32 pixfmt)
 {
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct sh_mobile_ceu_dev *pcdev = ici->priv;
-        int ret;
+        struct v4l2_subdev *sd = find_bus_subdev(pcdev, icd);
-        unsigned long camera_flags, common_flags, value;
-        int yuv_lineskip;
        struct sh_mobile_ceu_cam *cam = icd->host_priv;
+        struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
+        unsigned long value, common_flags = CEU_BUS_FLAGS;
        u32 capsr = capture_save_reset(pcdev);
+        unsigned int yuv_lineskip;
+        int ret;
-        camera_flags = icd->ops->query_bus_param(icd);
+        /*
-        common_flags = soc_camera_bus_param_compatible(camera_flags,
+         * If the client doesn't implement g_mbus_config, we just use our
-                                                       make_bus_param(pcdev));
+         * platform data
-        if (!common_flags)
+         */
-                return -EINVAL;
+        ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
+        if (!ret) {
+                common_flags = soc_mbus_config_compatible(&cfg,
+                                                          common_flags);
+                if (!common_flags)
+                        return -EINVAL;
+        } else if (ret != -ENOIOCTLCMD) {
+                return ret;
+        }
        /* Make choises, based on platform preferences */
-        if ((common_flags & SOCAM_HSYNC_ACTIVE_HIGH) &&
+        if ((common_flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH) &&
-            (common_flags & SOCAM_HSYNC_ACTIVE_LOW)) {
+            (common_flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)) {
                if (pcdev->pdata->flags & SH_CEU_FLAG_HSYNC_LOW)
-                        common_flags &= ~SOCAM_HSYNC_ACTIVE_HIGH;
+                        common_flags &= ~V4L2_MBUS_HSYNC_ACTIVE_HIGH;
                else
-                        common_flags &= ~SOCAM_HSYNC_ACTIVE_LOW;
+                        common_flags &= ~V4L2_MBUS_HSYNC_ACTIVE_LOW;
        }
-        if ((common_flags & SOCAM_VSYNC_ACTIVE_HIGH) &&
+        if ((common_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH) &&
-            (common_flags & SOCAM_VSYNC_ACTIVE_LOW)) {
+            (common_flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)) {
                if (pcdev->pdata->flags & SH_CEU_FLAG_VSYNC_LOW)
-                        common_flags &= ~SOCAM_VSYNC_ACTIVE_HIGH;
+                        common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_HIGH;
                else
-                        common_flags &= ~SOCAM_VSYNC_ACTIVE_LOW;
+                        common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_LOW;
        }
-        ret = icd->ops->set_bus_param(icd, common_flags);
+        cfg.flags = common_flags;
-        if (ret < 0)
+        ret = v4l2_subdev_call(sd, video, s_mbus_config, &cfg);
+        if (ret < 0 && ret != -ENOIOCTLCMD)
                return ret;
-        switch (common_flags & SOCAM_DATAWIDTH_MASK) {
+        if (icd->current_fmt->host_fmt->bits_per_sample > 8)
-        case SOCAM_DATAWIDTH_8:
-                pcdev->is_16bit = 0;
-                break;
-        case SOCAM_DATAWIDTH_16:
                pcdev->is_16bit = 1;
-                break;
+        else
-        default:
+                pcdev->is_16bit = 0;
-                return -EINVAL;
-        }
        ceu_write(pcdev, CRCNTR, 0);
        ceu_write(pcdev, CRCMPR, 0);
        value = 0x00000010; /* data fetch by default */
-        yuv_lineskip = 0;
+        yuv_lineskip = 0x10;
        switch (icd->current_fmt->host_fmt->fourcc) {
        case V4L2_PIX_FMT_NV12:
        case V4L2_PIX_FMT_NV21:
-                yuv_lineskip = 1; /* skip for NV12/21, no skip for NV16/61 */
+                /* convert 4:2:2 -> 4:2:0 */
+                yuv_lineskip = 0; /* skip for NV12/21, no skip for NV16/61 */
                /* fall-through */
        case V4L2_PIX_FMT_NV16:
        case V4L2_PIX_FMT_NV61:
@@ -808,8 +874,8 @@ static int sh_mobile_ceu_set_bus_param(struct soc_camera_device *icd,
            icd->current_fmt->host_fmt->fourcc == V4L2_PIX_FMT_NV61)
                value ^= 0x00000100; /* swap U, V to change from NV1x->NVx1 */
-        value |= common_flags & SOCAM_VSYNC_ACTIVE_LOW ? 1 << 1 : 0;
+        value |= common_flags & V4L2_MBUS_VSYNC_ACTIVE_LOW ? 1 << 1 : 0;
-        value |= common_flags & SOCAM_HSYNC_ACTIVE_LOW ? 1 << 0 : 0;
+        value |= common_flags & V4L2_MBUS_HSYNC_ACTIVE_LOW ? 1 << 0 : 0;
        value |= pcdev->is_16bit ? 1 << 12 : 0;
        /* CSI2 mode */
@@ -852,9 +918,7 @@ static int sh_mobile_ceu_set_bus_param(struct soc_camera_device *icd,
         * using 7 we swap the data bytes to match the incoming order:
         * D0, D1, D2, D3, D4, D5, D6, D7
         */
-        value = 0x00000017;
+        value = 0x00000007 | yuv_lineskip;
-        if (yuv_lineskip)
-                value &= ~0x00000010; /* convert 4:2:2 -> 4:2:0 */
        ceu_write(pcdev, CDOCR, value);
        ceu_write(pcdev, CFWCR, 0); /* keep "datafetch firewall" disabled */
@@ -875,13 +939,19 @@ static int sh_mobile_ceu_try_bus_param(struct soc_camera_device *icd,
 {
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct sh_mobile_ceu_dev *pcdev = ici->priv;
-        unsigned long camera_flags, common_flags;
+        struct v4l2_subdev *sd = find_bus_subdev(pcdev, icd);
+        unsigned long common_flags = CEU_BUS_FLAGS;
+        struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
+        int ret;
-        camera_flags = icd->ops->query_bus_param(icd);
+        ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
-        common_flags = soc_camera_bus_param_compatible(camera_flags,
+        if (!ret)
-                                                       make_bus_param(pcdev));
+                common_flags = soc_mbus_config_compatible(&cfg,
-        if (!common_flags || buswidth > 16 ||
+                                                          common_flags);
-            (buswidth > 8 && !(common_flags & SOCAM_DATAWIDTH_16)))
+        else if (ret != -ENOIOCTLCMD)
+                return ret;
+        if (!common_flags || buswidth > 16)
                return -EINVAL;
        return 0;
@@ -891,26 +961,26 @@ static const struct soc_mbus_pixelfmt sh_mobile_ceu_formats[] = {
        {
                .fourcc                 = V4L2_PIX_FMT_NV12,
                .name                   = "NV12",
-                .bits_per_sample        = 12,
+                .bits_per_sample        = 8,
-                .packing                = SOC_MBUS_PACKING_NONE,
+                .packing                = SOC_MBUS_PACKING_1_5X8,
                .order                  = SOC_MBUS_ORDER_LE,
        }, {
                .fourcc                 = V4L2_PIX_FMT_NV21,
                .name                   = "NV21",
-                .bits_per_sample        = 12,
+                .bits_per_sample        = 8,
-                .packing                = SOC_MBUS_PACKING_NONE,
+                .packing                = SOC_MBUS_PACKING_1_5X8,
                .order                  = SOC_MBUS_ORDER_LE,
        }, {
                .fourcc                 = V4L2_PIX_FMT_NV16,
                .name                   = "NV16",
-                .bits_per_sample        = 16,
+                .bits_per_sample        = 8,
-                .packing                = SOC_MBUS_PACKING_NONE,
+                .packing                = SOC_MBUS_PACKING_2X8_PADHI,
                .order                  = SOC_MBUS_ORDER_LE,
        }, {
                .fourcc                 = V4L2_PIX_FMT_NV61,
                .name                   = "NV61",
-                .bits_per_sample        = 16,
+                .bits_per_sample        = 8,
-                .packing                = SOC_MBUS_PACKING_NONE,
+                .packing                = SOC_MBUS_PACKING_2X8_PADHI,
                .order                  = SOC_MBUS_ORDER_LE,
        },
 };
@@ -920,6 +990,8 @@ static bool sh_mobile_ceu_packing_supported(const struct soc_mbus_pixelfmt *fmt)
 {
        return  fmt->packing == SOC_MBUS_PACKING_NONE ||
                (fmt->bits_per_sample == 8 &&
+                 fmt->packing == SOC_MBUS_PACKING_1_5X8) ||
+                (fmt->bits_per_sample == 8 &&
                 fmt->packing == SOC_MBUS_PACKING_2X8_PADHI) ||
                (fmt->bits_per_sample > 8 &&
                 fmt->packing == SOC_MBUS_PACKING_EXTEND16);
@@ -927,6 +999,38 @@ static bool sh_mobile_ceu_packing_supported(const struct soc_mbus_pixelfmt *fmt)
 static int client_g_rect(struct v4l2_subdev *sd, struct v4l2_rect *rect);
+static struct soc_camera_device *ctrl_to_icd(struct v4l2_ctrl *ctrl)
+{
+        return container_of(ctrl->handler, struct soc_camera_device,
+                                                        ctrl_handler);
+}
+static int sh_mobile_ceu_s_ctrl(struct v4l2_ctrl *ctrl)
+{
+        struct soc_camera_device *icd = ctrl_to_icd(ctrl);
+        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
+        struct sh_mobile_ceu_dev *pcdev = ici->priv;
+        switch (ctrl->id) {
+        case V4L2_CID_SHARPNESS:
+                switch (icd->current_fmt->host_fmt->fourcc) {
+                case V4L2_PIX_FMT_NV12:
+                case V4L2_PIX_FMT_NV21:
+                case V4L2_PIX_FMT_NV16:
+                case V4L2_PIX_FMT_NV61:
+                        ceu_write(pcdev, CLFCR, !ctrl->val);
+                        return 0;
+                }
+                break;
+        }
+        return -EINVAL;
+}
+static const struct v4l2_ctrl_ops sh_mobile_ceu_ctrl_ops = {
+        .s_ctrl = sh_mobile_ceu_s_ctrl,
+};
 static int sh_mobile_ceu_get_formats(struct soc_camera_device *icd, unsigned int idx,
                                     struct soc_camera_format_xlate *xlate)
 {
@@ -952,6 +1056,7 @@ static int sh_mobile_ceu_get_formats(struct soc_camera_device *icd, unsigned int
        }
        if (!pcdev->pdata->csi2) {
+                /* Are there any restrictions in the CSI-2 case? */
                ret = sh_mobile_ceu_try_bus_param(icd, fmt->bits_per_sample);
                if (ret < 0)
                        return 0;
@@ -962,6 +1067,12 @@ static int sh_mobile_ceu_get_formats(struct soc_camera_device *icd, unsigned int
                struct v4l2_rect rect;
                int shift = 0;
+                /* Add our control */
+                v4l2_ctrl_new_std(&icd->ctrl_handler, &sh_mobile_ceu_ctrl_ops,
+                                  V4L2_CID_SHARPNESS, 0, 1, 1, 0);
+                if (icd->ctrl_handler.error)
+                        return icd->ctrl_handler.error;
                /* FIXME: subwindow is lost between close / open */
                /* Cache current client geometry */
@@ -1004,9 +1115,6 @@ static int sh_mobile_ceu_get_formats(struct soc_camera_device *icd, unsigned int
                cam->width      = mf.width;
                cam->height     = mf.height;
-                cam->width      = mf.width;
-                cam->height     = mf.height;
                icd->host_priv = cam;
        } else {
                cam = icd->host_priv;
@@ -1278,6 +1386,7 @@ static int client_s_fmt(struct soc_camera_device *icd,
        unsigned int width = mf->width, height = mf->height, tmp_w, tmp_h;
        unsigned int max_width, max_height;
        struct v4l2_cropcap cap;
+        bool ceu_1to1;
        int ret;
        ret = v4l2_device_call_until_err(sd->v4l2_dev, (long)icd, video,
@@ -1287,7 +1396,14 @@ static int client_s_fmt(struct soc_camera_device *icd,
        dev_geo(dev, "camera scaled to %ux%u\n", mf->width, mf->height);
-        if ((width == mf->width && height == mf->height) || !ceu_can_scale)
+        if (width == mf->width && height == mf->height) {
+                /* Perfect! The client has done it all. */
+                ceu_1to1 = true;
+                goto update_cache;
+        }
+        ceu_1to1 = false;
+        if (!ceu_can_scale)
                goto update_cache;
        cap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -1327,7 +1443,10 @@ update_cache:
        if (ret < 0)
                return ret;
-        update_subrect(cam);
+        if (ceu_1to1)
+                cam->subrect = cam->rect;
+        else
+                update_subrect(cam);
        return 0;
 }
@@ -1414,7 +1533,10 @@ static int sh_mobile_ceu_set_crop(struct soc_camera_device *icd,
        capsr = capture_save_reset(pcdev);
        dev_dbg(dev, "CAPSR 0x%x, CFLCR 0x%x\n", capsr, pcdev->cflcr);
-        /* 1. - 2. Apply iterative camera S_CROP for new input window. */
+        /*
+         * 1. - 2. Apply iterative camera S_CROP for new input window, read back
+         * actual camera rectangle.
+         */
        ret = client_s_crop(icd, a, &cam_crop);
        if (ret < 0)
                return ret;
@@ -1498,8 +1620,9 @@ static int sh_mobile_ceu_set_crop(struct soc_camera_device *icd,
                ceu_write(pcdev, CFLCR, cflcr);
        }
-        icd->user_width  = out_width;
+        icd->user_width  = out_width & ~3;
-        icd->user_height = out_height;
+        icd->user_height = out_height & ~3;
+        /* Offsets are applied at the CEU scaling filter input */
        cam->ceu_left    = scale_down(rect->left - cam_rect->left, scale_cam_h) & ~1;
        cam->ceu_top     = scale_down(rect->top - cam_rect->top, scale_cam_v) & ~1;
@@ -1538,7 +1661,7 @@ static int sh_mobile_ceu_get_crop(struct soc_camera_device *icd,
 * CEU crop, mapped backed onto the client input (subrect).
 */
 static void calculate_client_output(struct soc_camera_device *icd,
-                struct v4l2_pix_format *pix, struct v4l2_mbus_framefmt *mf)
+                const struct v4l2_pix_format *pix, struct v4l2_mbus_framefmt *mf)
 {
        struct sh_mobile_ceu_cam *cam = icd->host_priv;
        struct device *dev = icd->parent;
@@ -1574,8 +1697,8 @@ static void calculate_client_output(struct soc_camera_device *icd,
        dev_geo(dev, "3: scales %u:%u\n", scale_h, scale_v);
        /*
-         * 4. Calculate client output window by applying combined scales to real
+         * 4. Calculate desired client output window by applying combined scales
-         *    input window.
+         *    to client (real) input window.
         */
        mf->width       = scale_down(cam->rect.width, scale_h);
        mf->height      = scale_down(cam->rect.height, scale_v);
@@ -1600,8 +1723,6 @@ static int sh_mobile_ceu_set_fmt(struct soc_camera_device *icd,
        bool image_mode;
        enum v4l2_field field;
-        dev_geo(dev, "S_FMT(pix=0x%x, %ux%u)\n", pixfmt, pix->width, pix->height);
        switch (pix->field) {
        default:
                pix->field = V4L2_FIELD_NONE;
@@ -1622,8 +1743,8 @@ static int sh_mobile_ceu_set_fmt(struct soc_camera_device *icd,
                return -EINVAL;
        }
-        /* 1.-4. Calculate client output geometry */
+        /* 1.-4. Calculate desired client output geometry */
-        calculate_client_output(icd, &f->fmt.pix, &mf);
+        calculate_client_output(icd, pix, &mf);
        mf.field        = pix->field;
        mf.colorspace   = pix->colorspace;
        mf.code         = xlate->code;
@@ -1639,6 +1760,9 @@ static int sh_mobile_ceu_set_fmt(struct soc_camera_device *icd,
                image_mode = false;
        }
+        dev_geo(dev, "S_FMT(pix=0x%x, fld 0x%x, code 0x%x, %ux%u)\n", pixfmt, mf.field, mf.code,
+                pix->width, pix->height);
        dev_geo(dev, "4: request camera output %ux%u\n", mf.width, mf.height);
        /* 5. - 9. */
@@ -1700,6 +1824,10 @@ static int sh_mobile_ceu_set_fmt(struct soc_camera_device *icd,
        pcdev->field = field;
        pcdev->image_mode = image_mode;
+        /* CFSZR requirement */
+        pix->width      &= ~3;
+        pix->height     &= ~3;
        return 0;
 }
@@ -1725,7 +1853,8 @@ static int sh_mobile_ceu_try_fmt(struct soc_camera_device *icd,
        /* FIXME: calculate using depth and bus width */
-        v4l_bound_align_image(&pix->width, 2, 2560, 1,
+        /* CFSZR requires height and width to be 4-pixel aligned */
+        v4l_bound_align_image(&pix->width, 2, 2560, 2,
                              &pix->height, 4, 1920, 2, 0);
        width = pix->width;
@@ -1778,6 +1907,9 @@ static int sh_mobile_ceu_try_fmt(struct soc_camera_device *icd,
                        pix->height = height;
        }
+        pix->width      &= ~3;
+        pix->height     &= ~3;
        dev_geo(icd->parent, "%s(): return %d, fmt 0x%x, %ux%u\n",
                __func__, ret, pix->pixelformat, pix->width, pix->height);
@@ -1824,8 +1956,8 @@ static int sh_mobile_ceu_set_livecrop(struct soc_camera_device *icd,
                             out_height != f.fmt.pix.height))
                        ret = -EINVAL;
                if (!ret) {
-                        icd->user_width         = out_width;
+                        icd->user_width         = out_width & ~3;
-                        icd->user_height        = out_height;
+                        icd->user_height        = out_height & ~3;
                        ret = sh_mobile_ceu_set_bus_param(icd,
                                        icd->current_fmt->host_fmt->fourcc);
                }
@@ -1869,55 +2001,6 @@ static int sh_mobile_ceu_init_videobuf(struct vb2_queue *q,
        return vb2_queue_init(q);
 }
-static int sh_mobile_ceu_get_ctrl(struct soc_camera_device *icd,
-                                  struct v4l2_control *ctrl)
-{
-        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
-        struct sh_mobile_ceu_dev *pcdev = ici->priv;
-        u32 val;
-        switch (ctrl->id) {
-        case V4L2_CID_SHARPNESS:
-                val = ceu_read(pcdev, CLFCR);
-                ctrl->value = val ^ 1;
-                return 0;
-        }
-        return -ENOIOCTLCMD;
-}
-static int sh_mobile_ceu_set_ctrl(struct soc_camera_device *icd,
-                                  struct v4l2_control *ctrl)
-{
-        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
-        struct sh_mobile_ceu_dev *pcdev = ici->priv;
-        switch (ctrl->id) {
-        case V4L2_CID_SHARPNESS:
-                switch (icd->current_fmt->host_fmt->fourcc) {
-                case V4L2_PIX_FMT_NV12:
-                case V4L2_PIX_FMT_NV21:
-                case V4L2_PIX_FMT_NV16:
-                case V4L2_PIX_FMT_NV61:
-                        ceu_write(pcdev, CLFCR, !ctrl->value);
-                        return 0;
-                }
-                return -EINVAL;
-        }
-        return -ENOIOCTLCMD;
-}
-static const struct v4l2_queryctrl sh_mobile_ceu_controls[] = {
-        {
-                .id             = V4L2_CID_SHARPNESS,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Low-pass filter",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        },
-};
 static struct soc_camera_host_ops sh_mobile_ceu_host_ops = {
        .owner          = THIS_MODULE,
        .add            = sh_mobile_ceu_add_device,
@@ -1929,14 +2012,10 @@ static struct soc_camera_host_ops sh_mobile_ceu_host_ops = {
        .set_livecrop   = sh_mobile_ceu_set_livecrop,
        .set_fmt        = sh_mobile_ceu_set_fmt,
        .try_fmt        = sh_mobile_ceu_try_fmt,
-        .set_ctrl       = sh_mobile_ceu_set_ctrl,
-        .get_ctrl       = sh_mobile_ceu_get_ctrl,
        .poll           = sh_mobile_ceu_poll,
        .querycap       = sh_mobile_ceu_querycap,
        .set_bus_param  = sh_mobile_ceu_set_bus_param,
        .init_videobuf2 = sh_mobile_ceu_init_videobuf,
-        .controls       = sh_mobile_ceu_controls,
-        .num_controls   = ARRAY_SIZE(sh_mobile_ceu_controls),
 };
 struct bus_wait {
diff --git a/drivers/media/video/sh_mobile_csi2.c b/drivers/media/video/sh_mobile_csi2.c
index 2893a0134c7e..ea4f0473ed3b 100644
--- a/drivers/media/video/sh_mobile_csi2.c
+++ b/drivers/media/video/sh_mobile_csi2.c
@@ -15,10 +15,12 @@
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
 #include <linux/videodev2.h>
+#include <linux/module.h>
 #include <media/sh_mobile_ceu.h>
 #include <media/sh_mobile_csi2.h>
 #include <media/soc_camera.h>
+#include <media/soc_mediabus.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-dev.h>
 #include <media/v4l2-device.h>
@@ -35,11 +37,10 @@ struct sh_csi2 {
        struct v4l2_subdev              subdev;
        struct list_head                list;
        unsigned int                    irq;
+        unsigned long                   mipi_flags;
        void __iomem                    *base;
        struct platform_device          *pdev;
        struct sh_csi2_client_config    *client;
-        unsigned long (*query_bus_param)(struct soc_camera_device *);
-        int (*set_bus_param)(struct soc_camera_device *, unsigned long);
 };
 static int sh_csi2_try_fmt(struct v4l2_subdev *sd,
@@ -127,9 +128,34 @@ static int sh_csi2_s_fmt(struct v4l2_subdev *sd,
        return 0;
 }
+static int sh_csi2_g_mbus_config(struct v4l2_subdev *sd,
+                                 struct v4l2_mbus_config *cfg)
+{
+        cfg->flags = V4L2_MBUS_PCLK_SAMPLE_RISING |
+                V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_HIGH |
+                V4L2_MBUS_MASTER | V4L2_MBUS_DATA_ACTIVE_HIGH;
+        cfg->type = V4L2_MBUS_PARALLEL;
+        return 0;
+}
+static int sh_csi2_s_mbus_config(struct v4l2_subdev *sd,
+                                 const struct v4l2_mbus_config *cfg)
+{
+        struct sh_csi2 *priv = container_of(sd, struct sh_csi2, subdev);
+        struct soc_camera_device *icd = (struct soc_camera_device *)sd->grp_id;
+        struct v4l2_subdev *client_sd = soc_camera_to_subdev(icd);
+        struct v4l2_mbus_config client_cfg = {.type = V4L2_MBUS_CSI2,
+                                              .flags = priv->mipi_flags};
+        return v4l2_subdev_call(client_sd, video, s_mbus_config, &client_cfg);
+}
 static struct v4l2_subdev_video_ops sh_csi2_subdev_video_ops = {
        .s_mbus_fmt     = sh_csi2_s_fmt,
        .try_mbus_fmt   = sh_csi2_try_fmt,
+        .g_mbus_config  = sh_csi2_g_mbus_config,
+        .s_mbus_config  = sh_csi2_s_mbus_config,
 };
 static void sh_csi2_hwinit(struct sh_csi2 *priv)
@@ -144,11 +170,21 @@ static void sh_csi2_hwinit(struct sh_csi2 *priv)
        udelay(5);
        iowrite32(0x00000000, priv->base + SH_CSI2_SRST);
-        if (priv->client->lanes & 3)
+        switch (pdata->type) {
-                tmp |= priv->client->lanes & 3;
+        case SH_CSI2C:
-        else
+                if (priv->client->lanes == 1)
-                /* Default - both lanes */
+                        tmp |= 1;
-                tmp |= 3;
+                else
+                        /* Default - both lanes */
+                        tmp |= 3;
+                break;
+        case SH_CSI2I:
+                if (!priv->client->lanes || priv->client->lanes > 4)
+                        /* Default - all 4 lanes */
+                        tmp |= 0xf;
+                else
+                        tmp |= (1 << priv->client->lanes) - 1;
+        }
        if (priv->client->phy == SH_CSI2_PHY_MAIN)
                tmp |= 0x8000;
@@ -163,38 +199,18 @@ static void sh_csi2_hwinit(struct sh_csi2 *priv)
        iowrite32(tmp, priv->base + SH_CSI2_CHKSUM);
 }
-static int sh_csi2_set_bus_param(struct soc_camera_device *icd,
-                                 unsigned long flags)
-{
-        return 0;
-}
-static unsigned long sh_csi2_query_bus_param(struct soc_camera_device *icd)
-{
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        const unsigned long flags = SOCAM_PCLK_SAMPLE_RISING |
-                SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH |
-                SOCAM_MASTER | SOCAM_DATAWIDTH_8 | SOCAM_DATA_ACTIVE_HIGH;
-        return soc_camera_apply_sensor_flags(icl, flags);
-}
 static int sh_csi2_client_connect(struct sh_csi2 *priv)
 {
        struct sh_csi2_pdata *pdata = priv->pdev->dev.platform_data;
-        struct v4l2_subdev *sd, *csi2_sd = &priv->subdev;
+        struct soc_camera_device *icd = (struct soc_camera_device *)priv->subdev.grp_id;
-        struct soc_camera_device *icd = NULL;
+        struct v4l2_subdev *client_sd = soc_camera_to_subdev(icd);
        struct device *dev = v4l2_get_subdevdata(&priv->subdev);
-        int i;
+        struct v4l2_mbus_config cfg;
+        unsigned long common_flags, csi2_flags;
+        int i, ret;
-        v4l2_device_for_each_subdev(sd, csi2_sd->v4l2_dev)
+        if (priv->client)
-                if (sd->grp_id) {
+                return -EBUSY;
-                        icd = (struct soc_camera_device *)sd->grp_id;
-                        break;
-                }
-        if (!icd)
-                return -EINVAL;
        for (i = 0; i < pdata->num_clients; i++)
                if (&pdata->clients[i].pdev->dev == icd->pdev)
@@ -205,14 +221,41 @@ static int sh_csi2_client_connect(struct sh_csi2 *priv)
        if (i == pdata->num_clients)
                return -ENODEV;
-        priv->client = pdata->clients + i;
+        /* Check if we can support this camera */
+        csi2_flags = V4L2_MBUS_CSI2_CONTINUOUS_CLOCK | V4L2_MBUS_CSI2_1_LANE;
+        switch (pdata->type) {
+        case SH_CSI2C:
+                if (pdata->clients[i].lanes != 1)
+                        csi2_flags |= V4L2_MBUS_CSI2_2_LANE;
+                break;
+        case SH_CSI2I:
+                switch (pdata->clients[i].lanes) {
+                default:
+                        csi2_flags |= V4L2_MBUS_CSI2_4_LANE;
+                case 3:
+                        csi2_flags |= V4L2_MBUS_CSI2_3_LANE;
+                case 2:
+                        csi2_flags |= V4L2_MBUS_CSI2_2_LANE;
+                }
+        }
-        priv->set_bus_param             = icd->ops->set_bus_param;
+        cfg.type = V4L2_MBUS_CSI2;
-        priv->query_bus_param           = icd->ops->query_bus_param;
+        ret = v4l2_subdev_call(client_sd, video, g_mbus_config, &cfg);
-        icd->ops->set_bus_param         = sh_csi2_set_bus_param;
+        if (ret == -ENOIOCTLCMD)
-        icd->ops->query_bus_param       = sh_csi2_query_bus_param;
+                common_flags = csi2_flags;
+        else if (!ret)
+                common_flags = soc_mbus_config_compatible(&cfg,
+                                                          csi2_flags);
+        else
+                common_flags = 0;
-        csi2_sd->grp_id = (long)icd;
+        if (!common_flags)
+                return -EINVAL;
+        /* All good: camera MIPI configuration supported */
+        priv->mipi_flags = common_flags;
+        priv->client = pdata->clients + i;
        pm_runtime_get_sync(dev);
@@ -223,16 +266,10 @@ static int sh_csi2_client_connect(struct sh_csi2 *priv)
 static void sh_csi2_client_disconnect(struct sh_csi2 *priv)
 {
-        struct soc_camera_device *icd = (struct soc_camera_device *)priv->subdev.grp_id;
+        if (!priv->client)
+                return;
        priv->client = NULL;
-        priv->subdev.grp_id = 0;
-        /* Driver is about to be unbound */
-        icd->ops->set_bus_param         = priv->set_bus_param;
-        icd->ops->query_bus_param       = priv->query_bus_param;
-        priv->set_bus_param             = NULL;
-        priv->query_bus_param           = NULL;
        pm_runtime_put(v4l2_get_subdevdata(&priv->subdev));
 }
diff --git a/drivers/media/video/sh_vou.c b/drivers/media/video/sh_vou.c
index 6a729879d89e..9644bd861abc 100644
--- a/drivers/media/video/sh_vou.c
+++ b/drivers/media/video/sh_vou.c
@@ -20,6 +20,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
 #include <linux/videodev2.h>
+#include <linux/module.h>
 #include <media/sh_vou.h>
 #include <media/v4l2-common.h>
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index 5bdfe7e16bc1..b72580c38957 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -50,49 +50,65 @@ static LIST_HEAD(hosts);
 static LIST_HEAD(devices);
 static DEFINE_MUTEX(list_lock);         /* Protects the list of hosts */
-static int soc_camera_power_set(struct soc_camera_device *icd,
+static int soc_camera_power_on(struct soc_camera_device *icd,
-                                struct soc_camera_link *icl,
+                               struct soc_camera_link *icl)
-                                int power_on)
 {
-        int ret;
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+        int ret = regulator_bulk_enable(icl->num_regulators,
-        if (power_on) {
+                                        icl->regulators);
-                ret = regulator_bulk_enable(icl->num_regulators,
+        if (ret < 0) {
-                                            icl->regulators);
+                dev_err(icd->pdev, "Cannot enable regulators\n");
-                if (ret < 0) {
+                return ret;
-                        dev_err(icd->pdev, "Cannot enable regulators\n");
+        }
-                        return ret;
-                }
-                if (icl->power)
+        if (icl->power) {
-                        ret = icl->power(icd->pdev, power_on);
+                ret = icl->power(icd->pdev, 1);
                if (ret < 0) {
                        dev_err(icd->pdev,
                                "Platform failed to power-on the camera.\n");
+                        goto elinkpwr;
-                        regulator_bulk_disable(icl->num_regulators,
-                                               icl->regulators);
-                        return ret;
                }
-        } else {
+        }
-                ret = 0;
-                if (icl->power)
+        ret = v4l2_subdev_call(sd, core, s_power, 1);
-                        ret = icl->power(icd->pdev, 0);
+        if (ret < 0 && ret != -ENOIOCTLCMD && ret != -ENODEV)
+                goto esdpwr;
+        return 0;
+esdpwr:
+        if (icl->power)
+                icl->power(icd->pdev, 0);
+elinkpwr:
+        regulator_bulk_disable(icl->num_regulators,
+                               icl->regulators);
+        return ret;
+}
+static int soc_camera_power_off(struct soc_camera_device *icd,
+                                struct soc_camera_link *icl)
+{
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+        int ret = v4l2_subdev_call(sd, core, s_power, 0);
+        if (ret < 0 && ret != -ENOIOCTLCMD && ret != -ENODEV)
+                return ret;
+        if (icl->power) {
+                ret = icl->power(icd->pdev, 0);
                if (ret < 0) {
                        dev_err(icd->pdev,
                                "Platform failed to power-off the camera.\n");
                        return ret;
                }
-                ret = regulator_bulk_disable(icl->num_regulators,
-                                             icl->regulators);
-                if (ret < 0) {
-                        dev_err(icd->pdev, "Cannot disable regulators\n");
-                        return ret;
-                }
        }
-        return 0;
+        ret = regulator_bulk_disable(icl->num_regulators,
+                                     icl->regulators);
+        if (ret < 0)
+                dev_err(icd->pdev, "Cannot disable regulators\n");
+        return ret;
 }
 const struct soc_camera_format_xlate *soc_camera_xlate_by_fourcc(
@@ -108,38 +124,38 @@ const struct soc_camera_format_xlate *soc_camera_xlate_by_fourcc(
 EXPORT_SYMBOL(soc_camera_xlate_by_fourcc);
 /**
- * soc_camera_apply_sensor_flags() - apply platform SOCAM_SENSOR_INVERT_* flags
+ * soc_camera_apply_board_flags() - apply platform SOCAM_SENSOR_INVERT_* flags
 * @icl:        camera platform parameters
- * @flags:      flags to be inverted according to platform configuration
+ * @cfg:        media bus configuration
 * @return:     resulting flags
 */
-unsigned long soc_camera_apply_sensor_flags(struct soc_camera_link *icl,
+unsigned long soc_camera_apply_board_flags(struct soc_camera_link *icl,
-                                            unsigned long flags)
+                                           const struct v4l2_mbus_config *cfg)
 {
-        unsigned long f;
+        unsigned long f, flags = cfg->flags;
        /* If only one of the two polarities is supported, switch to the opposite */
        if (icl->flags & SOCAM_SENSOR_INVERT_HSYNC) {
-                f = flags & (SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_LOW);
+                f = flags & (V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_LOW);
-                if (f == SOCAM_HSYNC_ACTIVE_HIGH || f == SOCAM_HSYNC_ACTIVE_LOW)
+                if (f == V4L2_MBUS_HSYNC_ACTIVE_HIGH || f == V4L2_MBUS_HSYNC_ACTIVE_LOW)
-                        flags ^= SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_LOW;
+                        flags ^= V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_LOW;
        }
        if (icl->flags & SOCAM_SENSOR_INVERT_VSYNC) {
-                f = flags & (SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW);
+                f = flags & (V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_LOW);
-                if (f == SOCAM_VSYNC_ACTIVE_HIGH || f == SOCAM_VSYNC_ACTIVE_LOW)
+                if (f == V4L2_MBUS_VSYNC_ACTIVE_HIGH || f == V4L2_MBUS_VSYNC_ACTIVE_LOW)
-                        flags ^= SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW;
+                        flags ^= V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_LOW;
        }
        if (icl->flags & SOCAM_SENSOR_INVERT_PCLK) {
-                f = flags & (SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING);
+                f = flags & (V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_PCLK_SAMPLE_FALLING);
-                if (f == SOCAM_PCLK_SAMPLE_RISING || f == SOCAM_PCLK_SAMPLE_FALLING)
+                if (f == V4L2_MBUS_PCLK_SAMPLE_RISING || f == V4L2_MBUS_PCLK_SAMPLE_FALLING)
-                        flags ^= SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING;
+                        flags ^= V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_PCLK_SAMPLE_FALLING;
        }
        return flags;
 }
-EXPORT_SYMBOL(soc_camera_apply_sensor_flags);
+EXPORT_SYMBOL(soc_camera_apply_board_flags);
 #define pixfmtstr(x) (x) & 0xff, ((x) >> 8) & 0xff, ((x) >> 16) & 0xff, \
        ((x) >> 24) & 0xff
@@ -233,6 +249,14 @@ static int soc_camera_s_std(struct file *file, void *priv, v4l2_std_id *a)
        return v4l2_subdev_call(sd, core, s_std, *a);
 }
+static int soc_camera_g_std(struct file *file, void *priv, v4l2_std_id *a)
+{
+        struct soc_camera_device *icd = file->private_data;
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+        return v4l2_subdev_call(sd, core, g_std, a);
+}
 static int soc_camera_enum_fsizes(struct file *file, void *fh,
                                         struct v4l2_frmsizeenum *fsize)
 {
@@ -318,6 +342,32 @@ static int soc_camera_dqbuf(struct file *file, void *priv,
                return vb2_dqbuf(&icd->vb2_vidq, p, file->f_flags & O_NONBLOCK);
 }
+static int soc_camera_create_bufs(struct file *file, void *priv,
+                            struct v4l2_create_buffers *create)
+{
+        struct soc_camera_device *icd = file->private_data;
+        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
+        /* videobuf2 only */
+        if (ici->ops->init_videobuf)
+                return -EINVAL;
+        else
+                return vb2_create_bufs(&icd->vb2_vidq, create);
+}
+static int soc_camera_prepare_buf(struct file *file, void *priv,
+                                  struct v4l2_buffer *b)
+{
+        struct soc_camera_device *icd = file->private_data;
+        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
+        /* videobuf2 only */
+        if (ici->ops->init_videobuf)
+                return -EINVAL;
+        else
+                return vb2_prepare_buf(&icd->vb2_vidq, b);
+}
 /* Always entered with .video_lock held */
 static int soc_camera_init_user_formats(struct soc_camera_device *icd)
 {
@@ -448,7 +498,7 @@ static int soc_camera_open(struct file *file)
        struct soc_camera_host *ici;
        int ret;
-        if (!icd->ops)
+        if (!to_soc_camera_control(icd))
                /* No device driver attached */
                return -ENODEV;
@@ -476,7 +526,7 @@ static int soc_camera_open(struct file *file)
                        },
                };
-                ret = soc_camera_power_set(icd, icl, 1);
+                ret = soc_camera_power_on(icd, icl);
                if (ret < 0)
                        goto epower;
@@ -512,6 +562,7 @@ static int soc_camera_open(struct file *file)
                        if (ret < 0)
                                goto einitvb;
                }
+                v4l2_ctrl_handler_setup(&icd->ctrl_handler);
        }
        file->private_data = icd;
@@ -529,7 +580,7 @@ esfmt:
 eresume:
        ici->ops->remove(icd);
 eiciadd:
-        soc_camera_power_set(icd, icl, 0);
+        soc_camera_power_off(icd, icl);
 epower:
        icd->use_count--;
        module_put(ici->ops->owner);
@@ -553,7 +604,7 @@ static int soc_camera_close(struct file *file)
                if (ici->ops->init_videobuf2)
                        vb2_queue_release(&icd->vb2_vidq);
-                soc_camera_power_set(icd, icl, 0);
+                soc_camera_power_off(icd, icl);
        }
        if (icd->streamer == file)
@@ -781,75 +832,6 @@ static int soc_camera_streamoff(struct file *file, void *priv,
        return 0;
 }
-static int soc_camera_queryctrl(struct file *file, void *priv,
-                                struct v4l2_queryctrl *qc)
-{
-        struct soc_camera_device *icd = file->private_data;
-        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
-        int i;
-        WARN_ON(priv != file->private_data);
-        if (!qc->id)
-                return -EINVAL;
-        /* First check host controls */
-        for (i = 0; i < ici->ops->num_controls; i++)
-                if (qc->id == ici->ops->controls[i].id) {
-                        memcpy(qc, &(ici->ops->controls[i]),
-                                sizeof(*qc));
-                        return 0;
-                }
-        /* Then device controls */
-        for (i = 0; i < icd->ops->num_controls; i++)
-                if (qc->id == icd->ops->controls[i].id) {
-                        memcpy(qc, &(icd->ops->controls[i]),
-                                sizeof(*qc));
-                        return 0;
-                }
-        return -EINVAL;
-}
-static int soc_camera_g_ctrl(struct file *file, void *priv,
-                             struct v4l2_control *ctrl)
-{
-        struct soc_camera_device *icd = file->private_data;
-        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
-        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
-        int ret;
-        WARN_ON(priv != file->private_data);
-        if (ici->ops->get_ctrl) {
-                ret = ici->ops->get_ctrl(icd, ctrl);
-                if (ret != -ENOIOCTLCMD)
-                        return ret;
-        }
-        return v4l2_subdev_call(sd, core, g_ctrl, ctrl);
-}
-static int soc_camera_s_ctrl(struct file *file, void *priv,
-                             struct v4l2_control *ctrl)
-{
-        struct soc_camera_device *icd = file->private_data;
-        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
-        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
-        int ret;
-        WARN_ON(priv != file->private_data);
-        if (ici->ops->set_ctrl) {
-                ret = ici->ops->set_ctrl(icd, ctrl);
-                if (ret != -ENOIOCTLCMD)
-                        return ret;
-        }
-        return v4l2_subdev_call(sd, core, s_ctrl, ctrl);
-}
 static int soc_camera_cropcap(struct file *file, void *fh,
                              struct v4l2_cropcap *a)
 {
@@ -1003,7 +985,7 @@ static int soc_camera_init_i2c(struct soc_camera_device *icd,
                goto ei2cga;
        }
-        icl->board_info->platform_data = icd;
+        icl->board_info->platform_data = icl;
        subdev = v4l2_i2c_new_subdev_board(&ici->v4l2_dev, adap,
                                icl->board_info, NULL);
@@ -1052,12 +1034,29 @@ static int soc_camera_probe(struct soc_camera_device *icd)
        dev_info(icd->pdev, "Probing %s\n", dev_name(icd->pdev));
+        /*
+         * Currently the subdev with the largest number of controls (13) is
+         * ov6550. So let's pick 16 as a hint for the control handler. Note
+         * that this is a hint only: too large and you waste some memory, too
+         * small and there is a (very) small performance hit when looking up
+         * controls in the internal hash.
+         */
+        ret = v4l2_ctrl_handler_init(&icd->ctrl_handler, 16);
+        if (ret < 0)
+                return ret;
        ret = regulator_bulk_get(icd->pdev, icl->num_regulators,
                                 icl->regulators);
        if (ret < 0)
                goto ereg;
-        ret = soc_camera_power_set(icd, icl, 1);
+        /*
+         * This will not yet call v4l2_subdev_core_ops::s_power(1), because the
+         * subdevice has not been initialised yet. We'll have to call it once
+         * again after initialisation, even though it shouldn't be needed, we
+         * don't do any IO here.
+         */
+        ret = soc_camera_power_on(icd, icl);
        if (ret < 0)
                goto epower;
@@ -1098,6 +1097,7 @@ static int soc_camera_probe(struct soc_camera_device *icd)
                if (!control || !control->driver || !dev_get_drvdata(control) ||
                    !try_module_get(control->driver->owner)) {
                        icl->del_device(icd);
+                        ret = -ENODEV;
                        goto enodrv;
                }
        }
@@ -1105,6 +1105,9 @@ static int soc_camera_probe(struct soc_camera_device *icd)
        sd = soc_camera_to_subdev(icd);
        sd->grp_id = (long)icd;
+        if (v4l2_ctrl_add_handler(&icd->ctrl_handler, sd->ctrl_handler))
+                goto ectrl;
        /* At this point client .probe() should have run already */
        ret = soc_camera_init_user_formats(icd);
        if (ret < 0)
@@ -1123,6 +1126,10 @@ static int soc_camera_probe(struct soc_camera_device *icd)
        if (ret < 0)
                goto evidstart;
+        ret = v4l2_subdev_call(sd, core, s_power, 1);
+        if (ret < 0 && ret != -ENOIOCTLCMD)
+                goto esdpwr;
        /* Try to improve our guess of a reasonable window format */
        if (!v4l2_subdev_call(sd, video, g_mbus_fmt, &mf)) {
                icd->user_width         = mf.width;
@@ -1133,16 +1140,19 @@ static int soc_camera_probe(struct soc_camera_device *icd)
        ici->ops->remove(icd);
-        soc_camera_power_set(icd, icl, 0);
+        soc_camera_power_off(icd, icl);
        mutex_unlock(&icd->video_lock);
        return 0;
+esdpwr:
+        video_unregister_device(icd->vdev);
 evidstart:
        mutex_unlock(&icd->video_lock);
        soc_camera_free_user_formats(icd);
 eiufmt:
+ectrl:
        if (icl->board_info) {
                soc_camera_free_i2c(icd);
        } else {
@@ -1152,13 +1162,15 @@ eiufmt:
 enodrv:
 eadddev:
        video_device_release(icd->vdev);
+        icd->vdev = NULL;
 evdc:
        ici->ops->remove(icd);
 eadd:
-        soc_camera_power_set(icd, icl, 0);
+        soc_camera_power_off(icd, icl);
 epower:
        regulator_bulk_free(icl->num_regulators, icl->regulators);
 ereg:
+        v4l2_ctrl_handler_free(&icd->ctrl_handler);
        return ret;
 }
@@ -1173,6 +1185,7 @@ static int soc_camera_remove(struct soc_camera_device *icd)
        BUG_ON(!icd->parent);
+        v4l2_ctrl_handler_free(&icd->ctrl_handler);
        if (vdev) {
                video_unregister_device(vdev);
                icd->vdev = NULL;
@@ -1363,24 +1376,24 @@ static int soc_camera_device_register(struct soc_camera_device *icd)
 static const struct v4l2_ioctl_ops soc_camera_ioctl_ops = {
        .vidioc_querycap         = soc_camera_querycap,
+        .vidioc_try_fmt_vid_cap  = soc_camera_try_fmt_vid_cap,
        .vidioc_g_fmt_vid_cap    = soc_camera_g_fmt_vid_cap,
-        .vidioc_enum_fmt_vid_cap = soc_camera_enum_fmt_vid_cap,
        .vidioc_s_fmt_vid_cap    = soc_camera_s_fmt_vid_cap,
+        .vidioc_enum_fmt_vid_cap = soc_camera_enum_fmt_vid_cap,
        .vidioc_enum_input       = soc_camera_enum_input,
        .vidioc_g_input          = soc_camera_g_input,
        .vidioc_s_input          = soc_camera_s_input,
        .vidioc_s_std            = soc_camera_s_std,
+        .vidioc_g_std            = soc_camera_g_std,
        .vidioc_enum_framesizes  = soc_camera_enum_fsizes,
        .vidioc_reqbufs          = soc_camera_reqbufs,
-        .vidioc_try_fmt_vid_cap  = soc_camera_try_fmt_vid_cap,
        .vidioc_querybuf         = soc_camera_querybuf,
        .vidioc_qbuf             = soc_camera_qbuf,
        .vidioc_dqbuf            = soc_camera_dqbuf,
+        .vidioc_create_bufs      = soc_camera_create_bufs,
+        .vidioc_prepare_buf      = soc_camera_prepare_buf,
        .vidioc_streamon         = soc_camera_streamon,
        .vidioc_streamoff        = soc_camera_streamoff,
-        .vidioc_queryctrl        = soc_camera_queryctrl,
-        .vidioc_g_ctrl           = soc_camera_g_ctrl,
-        .vidioc_s_ctrl           = soc_camera_s_ctrl,
        .vidioc_cropcap          = soc_camera_cropcap,
        .vidioc_g_crop           = soc_camera_g_crop,
        .vidioc_s_crop           = soc_camera_s_crop,
@@ -1409,6 +1422,7 @@ static int video_dev_create(struct soc_camera_device *icd)
        vdev->ioctl_ops         = &soc_camera_ioctl_ops;
        vdev->release           = video_device_release;
        vdev->tvnorms           = V4L2_STD_UNKNOWN;
+        vdev->ctrl_handler      = &icd->ctrl_handler;
        vdev->lock              = &icd->video_lock;
        icd->vdev = vdev;
@@ -1427,11 +1441,6 @@ static int soc_camera_video_start(struct soc_camera_device *icd)
        if (!icd->parent)
                return -ENODEV;
-        if (!icd->ops ||
-            !icd->ops->query_bus_param ||
-            !icd->ops->set_bus_param)
-                return -EINVAL;
        ret = video_register_device(icd->vdev, VFL_TYPE_GRABBER, -1);
        if (ret < 0) {
                dev_err(icd->pdev, "video_register_device failed: %d\n", ret);
diff --git a/drivers/media/video/soc_camera_platform.c b/drivers/media/video/soc_camera_platform.c
index 8069cd6bc5e8..4402a8a74f7a 100644
--- a/drivers/media/video/soc_camera_platform.c
+++ b/drivers/media/video/soc_camera_platform.c
@@ -30,32 +30,12 @@ static struct soc_camera_platform_priv *get_priv(struct platform_device *pdev)
        return container_of(subdev, struct soc_camera_platform_priv, subdev);
 }
-static struct soc_camera_platform_info *get_info(struct soc_camera_device *icd)
-{
-        struct platform_device *pdev =
-                to_platform_device(to_soc_camera_control(icd));
-        return pdev->dev.platform_data;
-}
 static int soc_camera_platform_s_stream(struct v4l2_subdev *sd, int enable)
 {
        struct soc_camera_platform_info *p = v4l2_get_subdevdata(sd);
        return p->set_capture(p, enable);
 }
-static int soc_camera_platform_set_bus_param(struct soc_camera_device *icd,
-                                             unsigned long flags)
-{
-        return 0;
-}
-static unsigned long
-soc_camera_platform_query_bus_param(struct soc_camera_device *icd)
-{
-        struct soc_camera_platform_info *p = get_info(icd);
-        return p->bus_param;
-}
 static int soc_camera_platform_fill_fmt(struct v4l2_subdev *sd,
                                        struct v4l2_mbus_framefmt *mf)
 {
@@ -115,6 +95,17 @@ static int soc_camera_platform_cropcap(struct v4l2_subdev *sd,
        return 0;
 }
+static int soc_camera_platform_g_mbus_config(struct v4l2_subdev *sd,
+                                             struct v4l2_mbus_config *cfg)
+{
+        struct soc_camera_platform_info *p = v4l2_get_subdevdata(sd);
+        cfg->flags = p->mbus_param;
+        cfg->type = p->mbus_type;
+        return 0;
+}
 static struct v4l2_subdev_video_ops platform_subdev_video_ops = {
        .s_stream       = soc_camera_platform_s_stream,
        .enum_mbus_fmt  = soc_camera_platform_enum_fmt,
@@ -123,6 +114,7 @@ static struct v4l2_subdev_video_ops platform_subdev_video_ops = {
        .try_mbus_fmt   = soc_camera_platform_fill_fmt,
        .g_mbus_fmt     = soc_camera_platform_fill_fmt,
        .s_mbus_fmt     = soc_camera_platform_fill_fmt,
+        .g_mbus_config  = soc_camera_platform_g_mbus_config,
 };
 static struct v4l2_subdev_ops platform_subdev_ops = {
@@ -130,11 +122,6 @@ static struct v4l2_subdev_ops platform_subdev_ops = {
        .video  = &platform_subdev_video_ops,
 };
-static struct soc_camera_ops soc_camera_platform_ops = {
-        .set_bus_param          = soc_camera_platform_set_bus_param,
-        .query_bus_param        = soc_camera_platform_query_bus_param,
-};
 static int soc_camera_platform_probe(struct platform_device *pdev)
 {
        struct soc_camera_host *ici;
@@ -163,8 +150,6 @@ static int soc_camera_platform_probe(struct platform_device *pdev)
        /* Set the control device reference */
        icd->control = &pdev->dev;
-        icd->ops = &soc_camera_platform_ops;
        ici = to_soc_camera_host(icd->parent);
        v4l2_subdev_init(&priv->subdev, &platform_subdev_ops);
@@ -178,7 +163,6 @@ static int soc_camera_platform_probe(struct platform_device *pdev)
        return ret;
 evdrs:
-        icd->ops = NULL;
        platform_set_drvdata(pdev, NULL);
        kfree(priv);
        return ret;
@@ -187,11 +171,10 @@ evdrs:
 static int soc_camera_platform_remove(struct platform_device *pdev)
 {
        struct soc_camera_platform_priv *priv = get_priv(pdev);
-        struct soc_camera_platform_info *p = pdev->dev.platform_data;
+        struct soc_camera_platform_info *p = v4l2_get_subdevdata(&priv->subdev);
-        struct soc_camera_device *icd = p->icd;
+        p->icd->control = NULL;
        v4l2_device_unregister_subdev(&priv->subdev);
-        icd->ops = NULL;
        platform_set_drvdata(pdev, NULL);
        kfree(priv);
        return 0;
diff --git a/drivers/media/video/soc_mediabus.c b/drivers/media/video/soc_mediabus.c
index bea7c9cf4f88..cf7f2194ded4 100644
--- a/drivers/media/video/soc_mediabus.c
+++ b/drivers/media/video/soc_mediabus.c
@@ -383,6 +383,39 @@ const struct soc_mbus_pixelfmt *soc_mbus_get_fmtdesc(
 }
 EXPORT_SYMBOL(soc_mbus_get_fmtdesc);
+unsigned int soc_mbus_config_compatible(const struct v4l2_mbus_config *cfg,
+                                        unsigned int flags)
+{
+        unsigned long common_flags;
+        bool hsync = true, vsync = true, pclk, data, mode;
+        bool mipi_lanes, mipi_clock;
+        common_flags = cfg->flags & flags;
+        switch (cfg->type) {
+        case V4L2_MBUS_PARALLEL:
+                hsync = common_flags & (V4L2_MBUS_HSYNC_ACTIVE_HIGH |
+                                        V4L2_MBUS_HSYNC_ACTIVE_LOW);
+                vsync = common_flags & (V4L2_MBUS_VSYNC_ACTIVE_HIGH |
+                                        V4L2_MBUS_VSYNC_ACTIVE_LOW);
+        case V4L2_MBUS_BT656:
+                pclk = common_flags & (V4L2_MBUS_PCLK_SAMPLE_RISING |
+                                       V4L2_MBUS_PCLK_SAMPLE_FALLING);
+                data = common_flags & (V4L2_MBUS_DATA_ACTIVE_HIGH |
+                                       V4L2_MBUS_DATA_ACTIVE_LOW);
+                mode = common_flags & (V4L2_MBUS_MASTER | V4L2_MBUS_SLAVE);
+                return (!hsync || !vsync || !pclk || !data || !mode) ?
+                        0 : common_flags;
+        case V4L2_MBUS_CSI2:
+                mipi_lanes = common_flags & V4L2_MBUS_CSI2_LANES;
+                mipi_clock = common_flags & (V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK |
+                                             V4L2_MBUS_CSI2_CONTINUOUS_CLOCK);
+                return (!mipi_lanes || !mipi_clock) ? 0 : common_flags;
+        }
+        return 0;
+}
+EXPORT_SYMBOL(soc_mbus_config_compatible);
 static int __init soc_mbus_init(void)
 {
        return 0;
diff --git a/drivers/media/video/sr030pc30.c b/drivers/media/video/sr030pc30.c
index 10aff3f943a8..d1b07aceaf94 100644
--- a/drivers/media/video/sr030pc30.c
+++ b/drivers/media/video/sr030pc30.c
@@ -19,6 +19,7 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-mediabus.h>
diff --git a/drivers/media/video/tcm825x.c b/drivers/media/video/tcm825x.c
index b6ee1bd342dc..462caa44ae00 100644
--- a/drivers/media/video/tcm825x.c
+++ b/drivers/media/video/tcm825x.c
@@ -27,6 +27,7 @@
 */
 #include <linux/i2c.h>
+#include <linux/module.h>
 #include <media/v4l2-int-device.h>
 #include "tcm825x.h"
diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c
index 84cd1b65b765..a0895bf07487 100644
--- a/drivers/media/video/timblogiw.c
+++ b/drivers/media/video/timblogiw.c
@@ -27,6 +27,7 @@
 #include <linux/interrupt.h>
 #include <linux/list.h>
 #include <linux/i2c.h>
+#include <linux/module.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-device.h>
 #include <media/videobuf-dma-contig.h>
diff --git a/drivers/media/video/tvp514x.c b/drivers/media/video/tvp514x.c
index 9b3e828b0775..926f03931156 100644
--- a/drivers/media/video/tvp514x.c
+++ b/drivers/media/video/tvp514x.c
@@ -32,6 +32,7 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/videodev2.h>
+#include <linux/module.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-common.h>
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index e927d25e0d35..6abaa16ae136 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -9,6 +9,7 @@
 #include <linux/slab.h>
 #include <linux/videodev2.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 #include <media/v4l2-device.h>
 #include <media/tvp5150.h>
 #include <media/v4l2-chip-ident.h>
diff --git a/drivers/media/video/tvp7002.c b/drivers/media/video/tvp7002.c
index 2e6059a52e9f..7875e80cb2ff 100644
--- a/drivers/media/video/tvp7002.c
+++ b/drivers/media/video/tvp7002.c
@@ -28,6 +28,7 @@
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/videodev2.h>
+#include <linux/module.h>
 #include <media/tvp7002.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-chip-ident.h>
diff --git a/drivers/media/video/tw9910.c b/drivers/media/video/tw9910.c
index 742482e30011..a514fa61116c 100644
--- a/drivers/media/video/tw9910.c
+++ b/drivers/media/video/tw9910.c
@@ -22,11 +22,13 @@
 #include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
+#include <linux/v4l2-mediabus.h>
 #include <linux/videodev2.h>
-#include <media/v4l2-chip-ident.h>
-#include <media/v4l2-subdev.h>
 #include <media/soc_camera.h>
 #include <media/tw9910.h>
+#include <media/v4l2-chip-ident.h>
+#include <media/v4l2-subdev.h>
 #define GET_ID(val)  ((val & 0xF8) >> 3)
 #define GET_REV(val) (val & 0x07)
@@ -203,6 +205,10 @@
 #define RTSEL_FIELD 0x06 /* 0110 = FIELD */
 #define RTSEL_RTCO  0x07 /* 0111 = RTCO ( Real Time Control ) */
+/* HSYNC start and end are constant for now */
+#define HSYNC_START     0x0260
+#define HSYNC_END       0x0300
 /*
 * structure
 */
@@ -220,22 +226,11 @@ struct tw9910_scale_ctrl {
        u16             vscale;
 };
-struct tw9910_cropping_ctrl {
-        u16 vdelay;
-        u16 vactive;
-        u16 hdelay;
-        u16 hactive;
-};
-struct tw9910_hsync_ctrl {
-        u16 start;
-        u16 end;
-};
 struct tw9910_priv {
        struct v4l2_subdev              subdev;
        struct tw9910_video_info        *info;
        const struct tw9910_scale_ctrl  *scale;
+        v4l2_std_id                     norm;
        u32                             revision;
 };
@@ -329,11 +324,6 @@ static const struct tw9910_scale_ctrl tw9910_pal_scales[] = {
        },
 };
-static const struct tw9910_hsync_ctrl tw9910_hsync_ctrl = {
-        .start = 0x0260,
-        .end   = 0x0300,
-};
 /*
 * general function
 */
@@ -378,21 +368,20 @@ static int tw9910_set_scale(struct i2c_client *client,
        return ret;
 }
-static int tw9910_set_hsync(struct i2c_client *client,
+static int tw9910_set_hsync(struct i2c_client *client)
-                            const struct tw9910_hsync_ctrl *hsync)
 {
        struct tw9910_priv *priv = to_tw9910(client);
        int ret;
        /* bit 10 - 3 */
        ret = i2c_smbus_write_byte_data(client, HSBEGIN,
-                                        (hsync->start & 0x07F8) >> 3);
+                                        (HSYNC_START & 0x07F8) >> 3);
        if (ret < 0)
                return ret;
        /* bit 10 - 3 */
        ret = i2c_smbus_write_byte_data(client, HSEND,
-                                        (hsync->end & 0x07F8) >> 3);
+                                        (HSYNC_END & 0x07F8) >> 3);
        if (ret < 0)
                return ret;
@@ -400,8 +389,8 @@ static int tw9910_set_hsync(struct i2c_client *client,
        /* bit 2 - 0 */
        if (1 == priv->revision)
                ret = tw9910_mask_set(client, HSLOWCTL, 0x77,
-                                      (hsync->start & 0x0007) << 4 |
+                                      (HSYNC_START & 0x0007) << 4 |
-                                      (hsync->end   & 0x0007));
+                                      (HSYNC_END   & 0x0007));
        return ret;
 }
@@ -433,12 +422,11 @@ static int tw9910_power(struct i2c_client *client, int enable)
        return tw9910_mask_set(client, ACNTL2, ACNTL2_PDN_MASK, acntl2);
 }
-static const struct tw9910_scale_ctrl*
+static const struct tw9910_scale_ctrl *tw9910_select_norm(v4l2_std_id norm,
-tw9910_select_norm(struct soc_camera_device *icd, u32 width, u32 height)
+                                                          u32 width, u32 height)
 {
        const struct tw9910_scale_ctrl *scale;
        const struct tw9910_scale_ctrl *ret = NULL;
-        v4l2_std_id norm = icd->vdev->current_norm;
        __u32 diff = 0xffffffff, tmp;
        int size, i;
@@ -465,7 +453,7 @@ tw9910_select_norm(struct soc_camera_device *icd, u32 width, u32 height)
 }
 /*
- * soc_camera_ops function
+ * subdevice operations
 */
 static int tw9910_s_stream(struct v4l2_subdev *sd, int enable)
 {
@@ -507,49 +495,27 @@ static int tw9910_s_stream(struct v4l2_subdev *sd, int enable)
        return tw9910_power(client, enable);
 }
-static int tw9910_set_bus_param(struct soc_camera_device *icd,
+static int tw9910_g_std(struct v4l2_subdev *sd, v4l2_std_id *norm)
-                                unsigned long flags)
 {
-        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
        struct i2c_client *client = v4l2_get_subdevdata(sd);
-        u8 val = VSSL_VVALID | HSSL_DVALID;
+        struct tw9910_priv *priv = to_tw9910(client);
-        /*
+        *norm = priv->norm;
-         * set OUTCTR1
-         *
-         * We use VVALID and DVALID signals to control VSYNC and HSYNC
-         * outputs, in this mode their polarity is inverted.
-         */
-        if (flags & SOCAM_HSYNC_ACTIVE_LOW)
-                val |= HSP_HI;
-        if (flags & SOCAM_VSYNC_ACTIVE_LOW)
+        return 0;
-                val |= VSP_HI;
-        return i2c_smbus_write_byte_data(client, OUTCTR1, val);
 }
-static unsigned long tw9910_query_bus_param(struct soc_camera_device *icd)
+static int tw9910_s_std(struct v4l2_subdev *sd, v4l2_std_id norm)
 {
-        struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
        struct tw9910_priv *priv = to_tw9910(client);
-        struct soc_camera_link *icl = to_soc_camera_link(icd);
-        unsigned long flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_MASTER |
-                SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_HIGH |
-                SOCAM_VSYNC_ACTIVE_LOW  | SOCAM_HSYNC_ACTIVE_LOW  |
-                SOCAM_DATA_ACTIVE_HIGH | priv->info->buswidth;
-        return soc_camera_apply_sensor_flags(icl, flags);
+        if (!(norm & (V4L2_STD_NTSC | V4L2_STD_PAL)))
-}
+                return -EINVAL;
-static int tw9910_s_std(struct v4l2_subdev *sd, v4l2_std_id norm)
-{
-        int ret = -EINVAL;
-        if (norm & (V4L2_STD_NTSC | V4L2_STD_PAL))
+        priv->norm = norm;
-                ret = 0;
-        return ret;
+        return 0;
 }
 static int tw9910_g_chip_ident(struct v4l2_subdev *sd,
@@ -600,19 +566,17 @@ static int tw9910_s_register(struct v4l2_subdev *sd,
 }
 #endif
-static int tw9910_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
+static int tw9910_set_frame(struct v4l2_subdev *sd, u32 *width, u32 *height)
 {
-        struct v4l2_rect *rect = &a->c;
        struct i2c_client *client = v4l2_get_subdevdata(sd);
        struct tw9910_priv *priv = to_tw9910(client);
-        struct soc_camera_device *icd = client->dev.platform_data;
+        int ret = -EINVAL;
-        int                 ret  = -EINVAL;
+        u8 val;
-        u8                  val;
        /*
         * select suitable norm
         */
-        priv->scale = tw9910_select_norm(icd, rect->width, rect->height);
+        priv->scale = tw9910_select_norm(priv->norm, *width, *height);
        if (!priv->scale)
                goto tw9910_set_fmt_error;
@@ -670,14 +634,12 @@ static int tw9910_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
        /*
         * set hsync
         */
-        ret = tw9910_set_hsync(client, &tw9910_hsync_ctrl);
+        ret = tw9910_set_hsync(client);
        if (ret < 0)
                goto tw9910_set_fmt_error;
-        rect->width = priv->scale->width;
+        *width = priv->scale->width;
-        rect->height = priv->scale->height;
+        *height = priv->scale->height;
-        rect->left = 0;
-        rect->top = 0;
        return ret;
@@ -694,25 +656,15 @@ static int tw9910_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
        struct i2c_client *client = v4l2_get_subdevdata(sd);
        struct tw9910_priv *priv = to_tw9910(client);
-        if (!priv->scale) {
-                int ret;
-                struct v4l2_crop crop = {
-                        .c = {
-                                .left   = 0,
-                                .top    = 0,
-                                .width  = 640,
-                                .height = 480,
-                        },
-                };
-                ret = tw9910_s_crop(sd, &crop);
-                if (ret < 0)
-                        return ret;
-        }
        a->c.left       = 0;
        a->c.top        = 0;
-        a->c.width      = priv->scale->width;
+        if (priv->norm & V4L2_STD_NTSC) {
-        a->c.height     = priv->scale->height;
+                a->c.width      = 640;
+                a->c.height     = 480;
+        } else {
+                a->c.width      = 768;
+                a->c.height     = 576;
+        }
        a->type         = V4L2_BUF_TYPE_VIDEO_CAPTURE;
        return 0;
@@ -720,14 +672,19 @@ static int tw9910_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
 static int tw9910_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
 {
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct tw9910_priv *priv = to_tw9910(client);
        a->bounds.left                  = 0;
        a->bounds.top                   = 0;
-        a->bounds.width                 = 768;
+        if (priv->norm & V4L2_STD_NTSC) {
-        a->bounds.height                = 576;
+                a->bounds.width         = 640;
-        a->defrect.left                 = 0;
+                a->bounds.height        = 480;
-        a->defrect.top                  = 0;
+        } else {
-        a->defrect.width                = 640;
+                a->bounds.width         = 768;
-        a->defrect.height               = 480;
+                a->bounds.height        = 576;
+        }
+        a->defrect                      = a->bounds;
        a->type                         = V4L2_BUF_TYPE_VIDEO_CAPTURE;
        a->pixelaspect.numerator        = 1;
        a->pixelaspect.denominator      = 1;
@@ -743,15 +700,8 @@ static int tw9910_g_fmt(struct v4l2_subdev *sd,
        if (!priv->scale) {
                int ret;
-                struct v4l2_crop crop = {
+                u32 width = 640, height = 480;
-                        .c = {
+                ret = tw9910_set_frame(sd, &width, &height);
-                                .left   = 0,
-                                .top    = 0,
-                                .width  = 640,
-                                .height = 480,
-                        },
-                };
-                ret = tw9910_s_crop(sd, &crop);
                if (ret < 0)
                        return ret;
        }
@@ -768,17 +718,7 @@ static int tw9910_g_fmt(struct v4l2_subdev *sd,
 static int tw9910_s_fmt(struct v4l2_subdev *sd,
                        struct v4l2_mbus_framefmt *mf)
 {
-        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        u32 width = mf->width, height = mf->height;
-        struct tw9910_priv *priv = to_tw9910(client);
-        /* See tw9910_s_crop() - no proper cropping support */
-        struct v4l2_crop a = {
-                .c = {
-                        .left   = 0,
-                        .top    = 0,
-                        .width  = mf->width,
-                        .height = mf->height,
-                },
-        };
        int ret;
        WARN_ON(mf->field != V4L2_FIELD_ANY &&
@@ -792,10 +732,10 @@ static int tw9910_s_fmt(struct v4l2_subdev *sd,
        mf->colorspace = V4L2_COLORSPACE_JPEG;
-        ret = tw9910_s_crop(sd, &a);
+        ret = tw9910_set_frame(sd, &width, &height);
        if (!ret) {
-                mf->width       = priv->scale->width;
+                mf->width       = width;
-                mf->height      = priv->scale->height;
+                mf->height      = height;
        }
        return ret;
 }
@@ -804,7 +744,7 @@ static int tw9910_try_fmt(struct v4l2_subdev *sd,
                          struct v4l2_mbus_framefmt *mf)
 {
        struct i2c_client *client = v4l2_get_subdevdata(sd);
-        struct soc_camera_device *icd = client->dev.platform_data;
+        struct tw9910_priv *priv = to_tw9910(client);
        const struct tw9910_scale_ctrl *scale;
        if (V4L2_FIELD_ANY == mf->field) {
@@ -820,7 +760,7 @@ static int tw9910_try_fmt(struct v4l2_subdev *sd,
        /*
         * select suitable norm
         */
-        scale = tw9910_select_norm(icd, mf->width, mf->height);
+        scale = tw9910_select_norm(priv->norm, mf->width, mf->height);
        if (!scale)
                return -EINVAL;
@@ -830,16 +770,11 @@ static int tw9910_try_fmt(struct v4l2_subdev *sd,
        return 0;
 }
-static int tw9910_video_probe(struct soc_camera_device *icd,
+static int tw9910_video_probe(struct i2c_client *client)
-                              struct i2c_client *client)
 {
        struct tw9910_priv *priv = to_tw9910(client);
        s32 id;
-        /* We must have a parent by now. And it cannot be a wrong one. */
-        BUG_ON(!icd->parent ||
-               to_soc_camera_host(icd->parent)->nr != icd->iface);
        /*
         * tw9910 only use 8 or 16 bit bus width
         */
@@ -868,20 +803,15 @@ static int tw9910_video_probe(struct soc_camera_device *icd,
        dev_info(&client->dev,
                 "tw9910 Product ID %0x:%0x\n", id, priv->revision);
-        icd->vdev->tvnorms      = V4L2_STD_NTSC | V4L2_STD_PAL;
+        priv->norm = V4L2_STD_NTSC;
-        icd->vdev->current_norm = V4L2_STD_NTSC;
        return 0;
 }
-static struct soc_camera_ops tw9910_ops = {
-        .set_bus_param          = tw9910_set_bus_param,
-        .query_bus_param        = tw9910_query_bus_param,
-};
 static struct v4l2_subdev_core_ops tw9910_subdev_core_ops = {
        .g_chip_ident   = tw9910_g_chip_ident,
        .s_std          = tw9910_s_std,
+        .g_std          = tw9910_g_std,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
        .g_register     = tw9910_g_register,
        .s_register     = tw9910_s_register,
@@ -898,6 +828,45 @@ static int tw9910_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
        return 0;
 }
+static int tw9910_g_mbus_config(struct v4l2_subdev *sd,
+                                struct v4l2_mbus_config *cfg)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        cfg->flags = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER |
+                V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_LOW |
+                V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_LOW |
+                V4L2_MBUS_DATA_ACTIVE_HIGH;
+        cfg->type = V4L2_MBUS_PARALLEL;
+        cfg->flags = soc_camera_apply_board_flags(icl, cfg);
+        return 0;
+}
+static int tw9910_s_mbus_config(struct v4l2_subdev *sd,
+                                const struct v4l2_mbus_config *cfg)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        u8 val = VSSL_VVALID | HSSL_DVALID;
+        unsigned long flags = soc_camera_apply_board_flags(icl, cfg);
+        /*
+         * set OUTCTR1
+         *
+         * We use VVALID and DVALID signals to control VSYNC and HSYNC
+         * outputs, in this mode their polarity is inverted.
+         */
+        if (flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)
+                val |= HSP_HI;
+        if (flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)
+                val |= VSP_HI;
+        return i2c_smbus_write_byte_data(client, OUTCTR1, val);
+}
 static struct v4l2_subdev_video_ops tw9910_subdev_video_ops = {
        .s_stream       = tw9910_s_stream,
        .g_mbus_fmt     = tw9910_g_fmt,
@@ -905,8 +874,9 @@ static struct v4l2_subdev_video_ops tw9910_subdev_video_ops = {
        .try_mbus_fmt   = tw9910_try_fmt,
        .cropcap        = tw9910_cropcap,
        .g_crop         = tw9910_g_crop,
-        .s_crop         = tw9910_s_crop,
        .enum_mbus_fmt  = tw9910_enum_fmt,
+        .g_mbus_config  = tw9910_g_mbus_config,
+        .s_mbus_config  = tw9910_s_mbus_config,
 };
 static struct v4l2_subdev_ops tw9910_subdev_ops = {
@@ -922,23 +892,18 @@ static int tw9910_probe(struct i2c_client *client,
                        const struct i2c_device_id *did)
 {
-        struct tw9910_priv             *priv;
+        struct tw9910_priv              *priv;
-        struct tw9910_video_info       *info;
+        struct tw9910_video_info        *info;
-        struct soc_camera_device       *icd = client->dev.platform_data;
+        struct i2c_adapter              *adapter =
-        struct i2c_adapter             *adapter =
                to_i2c_adapter(client->dev.parent);
-        struct soc_camera_link         *icl;
+        struct soc_camera_link          *icl = soc_camera_i2c_to_link(client);
-        int                             ret;
+        int                             ret;
-        if (!icd) {
+        if (!icl || !icl->priv) {
-                dev_err(&client->dev, "TW9910: missing soc-camera data!\n");
+                dev_err(&client->dev, "TW9910: missing platform data!\n");
                return -EINVAL;
        }
-        icl = to_soc_camera_link(icd);
-        if (!icl || !icl->priv)
-                return -EINVAL;
        info = icl->priv;
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
@@ -956,14 +921,9 @@ static int tw9910_probe(struct i2c_client *client,
        v4l2_i2c_subdev_init(&priv->subdev, client, &tw9910_subdev_ops);
-        icd->ops     = &tw9910_ops;
+        ret = tw9910_video_probe(client);
-        icd->iface   = icl->bus_id;
+        if (ret)
-        ret = tw9910_video_probe(icd, client);
-        if (ret) {
-                icd->ops = NULL;
                kfree(priv);
-        }
        return ret;
 }
@@ -971,9 +931,7 @@ static int tw9910_probe(struct i2c_client *client,
 static int tw9910_remove(struct i2c_client *client)
 {
        struct tw9910_priv *priv = to_tw9910(client);
-        struct soc_camera_device *icd = client->dev.platform_data;
-        icd->ops = NULL;
        kfree(priv);
        return 0;
 }
diff --git a/drivers/media/video/usbvision/usbvision-cards.c b/drivers/media/video/usbvision/usbvision-cards.c
index 8f5266157f15..3103d0d020e8 100644
--- a/drivers/media/video/usbvision/usbvision-cards.c
+++ b/drivers/media/video/usbvision/usbvision-cards.c
@@ -24,6 +24,7 @@
 #include <linux/list.h>
+#include <linux/module.h>
 #include <media/v4l2-dev.h>
 #include <media/tuner.h>
 #include "usbvision.h"
diff --git a/drivers/media/video/v4l2-compat-ioctl32.c b/drivers/media/video/v4l2-compat-ioctl32.c
index 61979b70f388..c68531b88279 100644
--- a/drivers/media/video/v4l2-compat-ioctl32.c
+++ b/drivers/media/video/v4l2-compat-ioctl32.c
@@ -159,11 +159,25 @@ struct v4l2_format32 {
        } fmt;
 };
-static int get_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __user *up)
+/**
+ * struct v4l2_create_buffers32 - VIDIOC_CREATE_BUFS32 argument
+ * @index:      on return, index of the first created buffer
+ * @count:      entry: number of requested buffers,
+ *              return: number of created buffers
+ * @memory:     buffer memory type
+ * @format:     frame format, for which buffers are requested
+ * @reserved:   future extensions
+ */
+struct v4l2_create_buffers32 {
+        __u32                   index;
+        __u32                   count;
+        enum v4l2_memory        memory;
+        struct v4l2_format32    format;
+        __u32                   reserved[8];
+};
+static int __get_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __user *up)
 {
-        if (!access_ok(VERIFY_READ, up, sizeof(struct v4l2_format32)) ||
-                        get_user(kp->type, &up->type))
-                        return -EFAULT;
        switch (kp->type) {
        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
        case V4L2_BUF_TYPE_VIDEO_OUTPUT:
@@ -192,11 +206,24 @@ static int get_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __user
        }
 }
-static int put_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __user *up)
+static int get_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __user *up)
+{
+        if (!access_ok(VERIFY_READ, up, sizeof(struct v4l2_format32)) ||
+                        get_user(kp->type, &up->type))
+                        return -EFAULT;
+        return __get_v4l2_format32(kp, up);
+}
+static int get_v4l2_create32(struct v4l2_create_buffers *kp, struct v4l2_create_buffers32 __user *up)
+{
+        if (!access_ok(VERIFY_READ, up, sizeof(struct v4l2_create_buffers32)) ||
+            copy_from_user(kp, up, offsetof(struct v4l2_create_buffers32, format.fmt)))
+                        return -EFAULT;
+        return __get_v4l2_format32(&kp->format, &up->format);
+}
+static int __put_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __user *up)
 {
-        if (!access_ok(VERIFY_WRITE, up, sizeof(struct v4l2_format32)) ||
-                put_user(kp->type, &up->type))
-                return -EFAULT;
        switch (kp->type) {
        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
        case V4L2_BUF_TYPE_VIDEO_OUTPUT:
@@ -225,6 +252,22 @@ static int put_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __user
        }
 }
+static int put_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __user *up)
+{
+        if (!access_ok(VERIFY_WRITE, up, sizeof(struct v4l2_format32)) ||
+                put_user(kp->type, &up->type))
+                return -EFAULT;
+        return __put_v4l2_format32(kp, up);
+}
+static int put_v4l2_create32(struct v4l2_create_buffers *kp, struct v4l2_create_buffers32 __user *up)
+{
+        if (!access_ok(VERIFY_WRITE, up, sizeof(struct v4l2_create_buffers32)) ||
+            copy_to_user(up, kp, offsetof(struct v4l2_create_buffers32, format.fmt)))
+                        return -EFAULT;
+        return __put_v4l2_format32(&kp->format, &up->format);
+}
 struct v4l2_standard32 {
        __u32                index;
        __u32                id[2]; /* __u64 would get the alignment wrong */
@@ -702,6 +745,8 @@ static int put_v4l2_event32(struct v4l2_event *kp, struct v4l2_event32 __user *u
 #define VIDIOC_S_EXT_CTRLS32    _IOWR('V', 72, struct v4l2_ext_controls32)
 #define VIDIOC_TRY_EXT_CTRLS32  _IOWR('V', 73, struct v4l2_ext_controls32)
 #define VIDIOC_DQEVENT32        _IOR ('V', 89, struct v4l2_event32)
+#define VIDIOC_CREATE_BUFS32    _IOWR('V', 92, struct v4l2_create_buffers32)
+#define VIDIOC_PREPARE_BUF32    _IOWR('V', 93, struct v4l2_buffer32)
 #define VIDIOC_OVERLAY32        _IOW ('V', 14, s32)
 #define VIDIOC_STREAMON32       _IOW ('V', 18, s32)
@@ -721,6 +766,7 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar
                struct v4l2_standard v2s;
                struct v4l2_ext_controls v2ecs;
                struct v4l2_event v2ev;
+                struct v4l2_create_buffers v2crt;
                unsigned long vx;
                int vi;
        } karg;
@@ -751,6 +797,8 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar
        case VIDIOC_S_INPUT32: cmd = VIDIOC_S_INPUT; break;
        case VIDIOC_G_OUTPUT32: cmd = VIDIOC_G_OUTPUT; break;
        case VIDIOC_S_OUTPUT32: cmd = VIDIOC_S_OUTPUT; break;
+        case VIDIOC_CREATE_BUFS32: cmd = VIDIOC_CREATE_BUFS; break;
+        case VIDIOC_PREPARE_BUF32: cmd = VIDIOC_PREPARE_BUF; break;
        }
        switch (cmd) {
@@ -775,6 +823,12 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar
                compatible_arg = 0;
                break;
+        case VIDIOC_CREATE_BUFS:
+                err = get_v4l2_create32(&karg.v2crt, up);
+                compatible_arg = 0;
+                break;
+        case VIDIOC_PREPARE_BUF:
        case VIDIOC_QUERYBUF:
        case VIDIOC_QBUF:
        case VIDIOC_DQBUF:
@@ -860,6 +914,10 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar
                err = put_v4l2_format32(&karg.v2f, up);
                break;
+        case VIDIOC_CREATE_BUFS:
+                err = put_v4l2_create32(&karg.v2crt, up);
+                break;
        case VIDIOC_QUERYBUF:
        case VIDIOC_QBUF:
        case VIDIOC_DQBUF:
@@ -959,6 +1017,8 @@ long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
        case VIDIOC_DQEVENT32:
        case VIDIOC_SUBSCRIBE_EVENT:
        case VIDIOC_UNSUBSCRIBE_EVENT:
+        case VIDIOC_CREATE_BUFS32:
+        case VIDIOC_PREPARE_BUF32:
                ret = do_video_ioctl(file, cmd, arg);
                break;
diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c
index fc8666ae408f..f17f92b86a30 100644
--- a/drivers/media/video/v4l2-ctrls.c
+++ b/drivers/media/video/v4l2-ctrls.c
@@ -20,6 +20,7 @@
 #include <linux/ctype.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ctrls.h>
@@ -210,6 +211,7 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
                "Disabled",
                "50 Hz",
                "60 Hz",
+                "Auto",
                NULL
        };
        static const char * const camera_exposure_auto[] = {
diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c
index e6a2c3b302d4..0edd618b9ddf 100644
--- a/drivers/media/video/v4l2-device.c
+++ b/drivers/media/video/v4l2-device.c
@@ -20,7 +20,9 @@
 #include <linux/types.h>
 #include <linux/ioctl.h>
+#include <linux/module.h>
 #include <linux/i2c.h>
+#include <linux/slab.h>
 #if defined(CONFIG_SPI)
 #include <linux/spi/spi.h>
 #endif
@@ -193,6 +195,13 @@ int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev,
 }
 EXPORT_SYMBOL_GPL(v4l2_device_register_subdev);
+static void v4l2_device_release_subdev_node(struct video_device *vdev)
+{
+        struct v4l2_subdev *sd = video_get_drvdata(vdev);
+        sd->devnode = NULL;
+        kfree(vdev);
+}
 int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev)
 {
        struct video_device *vdev;
@@ -206,22 +215,40 @@ int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev)
                if (!(sd->flags & V4L2_SUBDEV_FL_HAS_DEVNODE))
                        continue;
-                vdev = &sd->devnode;
+                vdev = kzalloc(sizeof(*vdev), GFP_KERNEL);
+                if (!vdev) {
+                        err = -ENOMEM;
+                        goto clean_up;
+                }
+                video_set_drvdata(vdev, sd);
                strlcpy(vdev->name, sd->name, sizeof(vdev->name));
                vdev->v4l2_dev = v4l2_dev;
                vdev->fops = &v4l2_subdev_fops;
-                vdev->release = video_device_release_empty;
+                vdev->release = v4l2_device_release_subdev_node;
                vdev->ctrl_handler = sd->ctrl_handler;
                err = __video_register_device(vdev, VFL_TYPE_SUBDEV, -1, 1,
                                              sd->owner);
-                if (err < 0)
+                if (err < 0) {
-                        return err;
+                        kfree(vdev);
+                        goto clean_up;
+                }
 #if defined(CONFIG_MEDIA_CONTROLLER)
                sd->entity.v4l.major = VIDEO_MAJOR;
                sd->entity.v4l.minor = vdev->minor;
 #endif
+                sd->devnode = vdev;
        }
        return 0;
+clean_up:
+        list_for_each_entry(sd, &v4l2_dev->subdevs, list) {
+                if (!sd->devnode)
+                        break;
+                video_unregister_device(sd->devnode);
+        }
+        return err;
 }
 EXPORT_SYMBOL_GPL(v4l2_device_register_subdev_nodes);
@@ -247,7 +274,7 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd)
        if (v4l2_dev->mdev)
                media_device_unregister_entity(&sd->entity);
 #endif
-        video_unregister_device(&sd->devnode);
+        video_unregister_device(sd->devnode);
        module_put(sd->owner);
 }
 EXPORT_SYMBOL_GPL(v4l2_device_unregister_subdev);
diff --git a/drivers/media/video/v4l2-event.c b/drivers/media/video/v4l2-event.c
index 53b190cf225e..46037f225529 100644
--- a/drivers/media/video/v4l2-event.c
+++ b/drivers/media/video/v4l2-event.c
@@ -29,6 +29,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 static unsigned sev_pos(const struct v4l2_subscribed_event *sev, unsigned idx)
 {
diff --git a/drivers/media/video/v4l2-fh.c b/drivers/media/video/v4l2-fh.c
index 122822d2b8b2..9e3fc040ea20 100644
--- a/drivers/media/video/v4l2-fh.c
+++ b/drivers/media/video/v4l2-fh.c
@@ -24,6 +24,7 @@
 #include <linux/bitops.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <media/v4l2-dev.h>
 #include <media/v4l2-fh.h>
 #include <media/v4l2-event.h>
diff --git a/drivers/media/video/v4l2-int-device.c b/drivers/media/video/v4l2-int-device.c
index a935bae538ef..f4473494af7a 100644
--- a/drivers/media/video/v4l2-int-device.c
+++ b/drivers/media/video/v4l2-int-device.c
@@ -26,6 +26,7 @@
 #include <linux/list.h>
 #include <linux/sort.h>
 #include <linux/string.h>
+#include <linux/module.h>
 #include <media/v4l2-int-device.h>
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 24fd43322150..e1da8fc9dd2f 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -273,6 +273,8 @@ static const char *v4l2_ioctls[] = {
        [_IOC_NR(VIDIOC_DQEVENT)]          = "VIDIOC_DQEVENT",
        [_IOC_NR(VIDIOC_SUBSCRIBE_EVENT)]  = "VIDIOC_SUBSCRIBE_EVENT",
        [_IOC_NR(VIDIOC_UNSUBSCRIBE_EVENT)] = "VIDIOC_UNSUBSCRIBE_EVENT",
+        [_IOC_NR(VIDIOC_CREATE_BUFS)]      = "VIDIOC_CREATE_BUFS",
+        [_IOC_NR(VIDIOC_PREPARE_BUF)]      = "VIDIOC_PREPARE_BUF",
 };
 #define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)
@@ -2104,6 +2106,40 @@ static long __video_do_ioctl(struct file *file,
                dbgarg(cmd, "type=0x%8.8x", sub->type);
                break;
        }
+        case VIDIOC_CREATE_BUFS:
+        {
+                struct v4l2_create_buffers *create = arg;
+                if (!ops->vidioc_create_bufs)
+                        break;
+                if (ret_prio) {
+                        ret = ret_prio;
+                        break;
+                }
+                ret = check_fmt(ops, create->format.type);
+                if (ret)
+                        break;
+                ret = ops->vidioc_create_bufs(file, fh, create);
+                dbgarg(cmd, "count=%d @ %d\n", create->count, create->index);
+                break;
+        }
+        case VIDIOC_PREPARE_BUF:
+        {
+                struct v4l2_buffer *b = arg;
+                if (!ops->vidioc_prepare_buf)
+                        break;
+                ret = check_fmt(ops, b->type);
+                if (ret)
+                        break;
+                ret = ops->vidioc_prepare_buf(file, fh, b);
+                dbgarg(cmd, "index=%d", b->index);
+                break;
+        }
        default:
                if (!ops->vidioc_default)
                        break;
diff --git a/drivers/media/video/v4l2-subdev.c b/drivers/media/video/v4l2-subdev.c
index 179e20e23fc4..65ade5f03c2e 100644
--- a/drivers/media/video/v4l2-subdev.c
+++ b/drivers/media/video/v4l2-subdev.c
@@ -24,6 +24,7 @@
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/videodev2.h>
+#include <linux/export.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-device.h>
diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/video/videobuf2-core.c
index 3f5c7a38e6e8..979e544388cb 100644
--- a/drivers/media/video/videobuf2-core.c
+++ b/drivers/media/video/videobuf2-core.c
@@ -38,7 +38,8 @@ module_param(debug, int, 0644);
        (((q)->ops->op) ? ((q)->ops->op(args)) : 0)
 #define V4L2_BUFFER_STATE_FLAGS (V4L2_BUF_FLAG_MAPPED | V4L2_BUF_FLAG_QUEUED | \
-                                 V4L2_BUF_FLAG_DONE | V4L2_BUF_FLAG_ERROR)
+                                 V4L2_BUF_FLAG_DONE | V4L2_BUF_FLAG_ERROR | \
+                                 V4L2_BUF_FLAG_PREPARED)
 /**
 * __vb2_buf_mem_alloc() - allocate video memory for the given buffer
@@ -109,13 +110,22 @@ static void __vb2_buf_userptr_put(struct vb2_buffer *vb)
 * __setup_offsets() - setup unique offsets ("cookies") for every plane in
 * every buffer on the queue
 */
-static void __setup_offsets(struct vb2_queue *q)
+static void __setup_offsets(struct vb2_queue *q, unsigned int n)
 {
        unsigned int buffer, plane;
        struct vb2_buffer *vb;
-        unsigned long off = 0;
+        unsigned long off;
-        for (buffer = 0; buffer < q->num_buffers; ++buffer) {
+        if (q->num_buffers) {
+                struct v4l2_plane *p;
+                vb = q->bufs[q->num_buffers - 1];
+                p = &vb->v4l2_planes[vb->num_planes - 1];
+                off = PAGE_ALIGN(p->m.mem_offset + p->length);
+        } else {
+                off = 0;
+        }
+        for (buffer = q->num_buffers; buffer < q->num_buffers + n; ++buffer) {
                vb = q->bufs[buffer];
                if (!vb)
                        continue;
@@ -161,7 +171,7 @@ static int __vb2_queue_alloc(struct vb2_queue *q, enum v4l2_memory memory,
                vb->state = VB2_BUF_STATE_DEQUEUED;
                vb->vb2_queue = q;
                vb->num_planes = num_planes;
-                vb->v4l2_buf.index = buffer;
+                vb->v4l2_buf.index = q->num_buffers + buffer;
                vb->v4l2_buf.type = q->type;
                vb->v4l2_buf.memory = memory;
@@ -189,15 +199,13 @@ static int __vb2_queue_alloc(struct vb2_queue *q, enum v4l2_memory memory,
                        }
                }
-                q->bufs[buffer] = vb;
+                q->bufs[q->num_buffers + buffer] = vb;
        }
-        q->num_buffers = buffer;
+        __setup_offsets(q, buffer);
-        __setup_offsets(q);
        dprintk(1, "Allocated %d buffers, %d plane(s) each\n",
-                        q->num_buffers, num_planes);
+                        buffer, num_planes);
        return buffer;
 }
@@ -205,12 +213,13 @@ static int __vb2_queue_alloc(struct vb2_queue *q, enum v4l2_memory memory,
 /**
 * __vb2_free_mem() - release all video buffer memory for a given queue
 */
-static void __vb2_free_mem(struct vb2_queue *q)
+static void __vb2_free_mem(struct vb2_queue *q, unsigned int buffers)
 {
        unsigned int buffer;
        struct vb2_buffer *vb;
-        for (buffer = 0; buffer < q->num_buffers; ++buffer) {
+        for (buffer = q->num_buffers - buffers; buffer < q->num_buffers;
+             ++buffer) {
                vb = q->bufs[buffer];
                if (!vb)
                        continue;
@@ -224,17 +233,18 @@ static void __vb2_free_mem(struct vb2_queue *q)
 }
 /**
- * __vb2_queue_free() - free the queue - video memory and related information
+ * __vb2_queue_free() - free buffers at the end of the queue - video memory and
- * and return the queue to an uninitialized state. Might be called even if the
+ * related information, if no buffers are left return the queue to an
- * queue has already been freed.
+ * uninitialized state. Might be called even if the queue has already been freed.
 */
-static void __vb2_queue_free(struct vb2_queue *q)
+static void __vb2_queue_free(struct vb2_queue *q, unsigned int buffers)
 {
        unsigned int buffer;
        /* Call driver-provided cleanup function for each buffer, if provided */
        if (q->ops->buf_cleanup) {
-                for (buffer = 0; buffer < q->num_buffers; ++buffer) {
+                for (buffer = q->num_buffers - buffers; buffer < q->num_buffers;
+                     ++buffer) {
                        if (NULL == q->bufs[buffer])
                                continue;
                        q->ops->buf_cleanup(q->bufs[buffer]);
@@ -242,23 +252,25 @@ static void __vb2_queue_free(struct vb2_queue *q)
        }
        /* Release video buffer memory */
-        __vb2_free_mem(q);
+        __vb2_free_mem(q, buffers);
        /* Free videobuf buffers */
-        for (buffer = 0; buffer < q->num_buffers; ++buffer) {
+        for (buffer = q->num_buffers - buffers; buffer < q->num_buffers;
+             ++buffer) {
                kfree(q->bufs[buffer]);
                q->bufs[buffer] = NULL;
        }
-        q->num_buffers = 0;
+        q->num_buffers -= buffers;
-        q->memory = 0;
+        if (!q->num_buffers)
+                q->memory = 0;
 }
 /**
 * __verify_planes_array() - verify that the planes array passed in struct
 * v4l2_buffer from userspace can be safely used
 */
-static int __verify_planes_array(struct vb2_buffer *vb, struct v4l2_buffer *b)
+static int __verify_planes_array(struct vb2_buffer *vb, const struct v4l2_buffer *b)
 {
        /* Is memory for copying plane information present? */
        if (NULL == b->m.planes) {
@@ -318,7 +330,7 @@ static bool __buffers_in_use(struct vb2_queue *q)
 static int __fill_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b)
 {
        struct vb2_queue *q = vb->vb2_queue;
-        int ret = 0;
+        int ret;
        /* Copy back data such as timestamp, flags, input, etc. */
        memcpy(b, &vb->v4l2_buf, offsetof(struct v4l2_buffer, m));
@@ -365,6 +377,9 @@ static int __fill_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b)
        case VB2_BUF_STATE_DONE:
                b->flags |= V4L2_BUF_FLAG_DONE;
                break;
+        case VB2_BUF_STATE_PREPARED:
+                b->flags |= V4L2_BUF_FLAG_PREPARED;
+                break;
        case VB2_BUF_STATE_DEQUEUED:
                /* nothing */
                break;
@@ -373,7 +388,7 @@ static int __fill_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b)
        if (__buffer_in_use(q, vb))
                b->flags |= V4L2_BUF_FLAG_MAPPED;
-        return ret;
+        return 0;
 }
 /**
@@ -459,7 +474,7 @@ static int __verify_mmap_ops(struct vb2_queue *q)
 */
 int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req)
 {
-        unsigned int num_buffers, num_planes;
+        unsigned int num_buffers, allocated_buffers, num_planes = 0;
        int ret = 0;
        if (q->fileio) {
@@ -507,7 +522,7 @@ int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req)
                        return -EBUSY;
                }
-                __vb2_queue_free(q);
+                __vb2_queue_free(q, q->num_buffers);
                /*
                 * In case of REQBUFS(0) return immediately without calling
@@ -529,7 +544,7 @@ int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req)
         * Ask the driver how many buffers and planes per buffer it requires.
         * Driver also sets the size and allocator context for each plane.
         */
-        ret = call_qop(q, queue_setup, q, &num_buffers, &num_planes,
+        ret = call_qop(q, queue_setup, q, NULL, &num_buffers, &num_planes,
                       q->plane_sizes, q->alloc_ctx);
        if (ret)
                return ret;
@@ -541,44 +556,168 @@ int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req)
                return -ENOMEM;
        }
+        allocated_buffers = ret;
        /*
         * Check if driver can handle the allocated number of buffers.
         */
-        if (ret < num_buffers) {
+        if (allocated_buffers < num_buffers) {
-                unsigned int orig_num_buffers;
+                num_buffers = allocated_buffers;
-                orig_num_buffers = num_buffers = ret;
+                ret = call_qop(q, queue_setup, q, NULL, &num_buffers,
-                ret = call_qop(q, queue_setup, q, &num_buffers, &num_planes,
+                               &num_planes, q->plane_sizes, q->alloc_ctx);
-                               q->plane_sizes, q->alloc_ctx);
-                if (ret)
-                        goto free_mem;
-                if (orig_num_buffers < num_buffers) {
+                if (!ret && allocated_buffers < num_buffers)
                        ret = -ENOMEM;
-                        goto free_mem;
-                }
                /*
-                 * Ok, driver accepted smaller number of buffers.
+                 * Either the driver has accepted a smaller number of buffers,
+                 * or .queue_setup() returned an error
                 */
-                ret = num_buffers;
+        }
+        q->num_buffers = allocated_buffers;
+        if (ret < 0) {
+                __vb2_queue_free(q, allocated_buffers);
+                return ret;
        }
        /*
         * Return the number of successfully allocated buffers
         * to the userspace.
         */
-        req->count = ret;
+        req->count = allocated_buffers;
        return 0;
-free_mem:
-        __vb2_queue_free(q);
-        return ret;
 }
 EXPORT_SYMBOL_GPL(vb2_reqbufs);
 /**
+ * vb2_create_bufs() - Allocate buffers and any required auxiliary structs
+ * @q:          videobuf2 queue
+ * @create:     creation parameters, passed from userspace to vidioc_create_bufs
+ *              handler in driver
+ *
+ * Should be called from vidioc_create_bufs ioctl handler of a driver.
+ * This function:
+ * 1) verifies parameter sanity
+ * 2) calls the .queue_setup() queue operation
+ * 3) performs any necessary memory allocations
+ *
+ * The return values from this function are intended to be directly returned
+ * from vidioc_create_bufs handler in driver.
+ */
+int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create)
+{
+        unsigned int num_planes = 0, num_buffers, allocated_buffers;
+        int ret = 0;
+        if (q->fileio) {
+                dprintk(1, "%s(): file io in progress\n", __func__);
+                return -EBUSY;
+        }
+        if (create->memory != V4L2_MEMORY_MMAP
+                        && create->memory != V4L2_MEMORY_USERPTR) {
+                dprintk(1, "%s(): unsupported memory type\n", __func__);
+                return -EINVAL;
+        }
+        if (create->format.type != q->type) {
+                dprintk(1, "%s(): requested type is incorrect\n", __func__);
+                return -EINVAL;
+        }
+        /*
+         * Make sure all the required memory ops for given memory type
+         * are available.
+         */
+        if (create->memory == V4L2_MEMORY_MMAP && __verify_mmap_ops(q)) {
+                dprintk(1, "%s(): MMAP for current setup unsupported\n", __func__);
+                return -EINVAL;
+        }
+        if (create->memory == V4L2_MEMORY_USERPTR && __verify_userptr_ops(q)) {
+                dprintk(1, "%s(): USERPTR for current setup unsupported\n", __func__);
+                return -EINVAL;
+        }
+        if (q->num_buffers == VIDEO_MAX_FRAME) {
+                dprintk(1, "%s(): maximum number of buffers already allocated\n",
+                        __func__);
+                return -ENOBUFS;
+        }
+        create->index = q->num_buffers;
+        if (!q->num_buffers) {
+                memset(q->plane_sizes, 0, sizeof(q->plane_sizes));
+                memset(q->alloc_ctx, 0, sizeof(q->alloc_ctx));
+                q->memory = create->memory;
+        }
+        num_buffers = min(create->count, VIDEO_MAX_FRAME - q->num_buffers);
+        /*
+         * Ask the driver, whether the requested number of buffers, planes per
+         * buffer and their sizes are acceptable
+         */
+        ret = call_qop(q, queue_setup, q, &create->format, &num_buffers,
+                       &num_planes, q->plane_sizes, q->alloc_ctx);
+        if (ret)
+                return ret;
+        /* Finally, allocate buffers and video memory */
+        ret = __vb2_queue_alloc(q, create->memory, num_buffers,
+                                num_planes);
+        if (ret < 0) {
+                dprintk(1, "Memory allocation failed with error: %d\n", ret);
+                return ret;
+        }
+        allocated_buffers = ret;
+        /*
+         * Check if driver can handle the so far allocated number of buffers.
+         */
+        if (ret < num_buffers) {
+                num_buffers = ret;
+                /*
+                 * q->num_buffers contains the total number of buffers, that the
+                 * queue driver has set up
+                 */
+                ret = call_qop(q, queue_setup, q, &create->format, &num_buffers,
+                               &num_planes, q->plane_sizes, q->alloc_ctx);
+                if (!ret && allocated_buffers < num_buffers)
+                        ret = -ENOMEM;
+                /*
+                 * Either the driver has accepted a smaller number of buffers,
+                 * or .queue_setup() returned an error
+                 */
+        }
+        q->num_buffers += allocated_buffers;
+        if (ret < 0) {
+                __vb2_queue_free(q, allocated_buffers);
+                return ret;
+        }
+        /*
+         * Return the number of successfully allocated buffers
+         * to the userspace.
+         */
+        create->count = allocated_buffers;
+        return 0;
+}
+EXPORT_SYMBOL_GPL(vb2_create_bufs);
+/**
 * vb2_plane_vaddr() - Return a kernel virtual address of a given plane
 * @vb:         vb2_buffer to which the plane in question belongs to
 * @plane_no:   plane number for which the address is to be returned
@@ -662,7 +801,7 @@ EXPORT_SYMBOL_GPL(vb2_buffer_done);
 * __fill_vb2_buffer() - fill a vb2_buffer with information provided in
 * a v4l2_buffer by the userspace
 */
-static int __fill_vb2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b,
+static int __fill_vb2_buffer(struct vb2_buffer *vb, const struct v4l2_buffer *b,
                                struct v4l2_plane *v4l2_planes)
 {
        unsigned int plane;
@@ -726,7 +865,7 @@ static int __fill_vb2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b,
 /**
 * __qbuf_userptr() - handle qbuf of a USERPTR buffer
 */
-static int __qbuf_userptr(struct vb2_buffer *vb, struct v4l2_buffer *b)
+static int __qbuf_userptr(struct vb2_buffer *vb, const struct v4l2_buffer *b)
 {
        struct v4l2_plane planes[VIDEO_MAX_PLANES];
        struct vb2_queue *q = vb->vb2_queue;
@@ -815,7 +954,7 @@ err:
 /**
 * __qbuf_mmap() - handle qbuf of an MMAP buffer
 */
-static int __qbuf_mmap(struct vb2_buffer *vb, struct v4l2_buffer *b)
+static int __qbuf_mmap(struct vb2_buffer *vb, const struct v4l2_buffer *b)
 {
        return __fill_vb2_buffer(vb, b, vb->v4l2_planes);
 }
@@ -832,6 +971,95 @@ static void __enqueue_in_driver(struct vb2_buffer *vb)
        q->ops->buf_queue(vb);
 }
+static int __buf_prepare(struct vb2_buffer *vb, const struct v4l2_buffer *b)
+{
+        struct vb2_queue *q = vb->vb2_queue;
+        int ret;
+        switch (q->memory) {
+        case V4L2_MEMORY_MMAP:
+                ret = __qbuf_mmap(vb, b);
+                break;
+        case V4L2_MEMORY_USERPTR:
+                ret = __qbuf_userptr(vb, b);
+                break;
+        default:
+                WARN(1, "Invalid queue type\n");
+                ret = -EINVAL;
+        }
+        if (!ret)
+                ret = call_qop(q, buf_prepare, vb);
+        if (ret)
+                dprintk(1, "qbuf: buffer preparation failed: %d\n", ret);
+        else
+                vb->state = VB2_BUF_STATE_PREPARED;
+        return ret;
+}
+/**
+ * vb2_prepare_buf() - Pass ownership of a buffer from userspace to the kernel
+ * @q:          videobuf2 queue
+ * @b:          buffer structure passed from userspace to vidioc_prepare_buf
+ *              handler in driver
+ *
+ * Should be called from vidioc_prepare_buf ioctl handler of a driver.
+ * This function:
+ * 1) verifies the passed buffer,
+ * 2) calls buf_prepare callback in the driver (if provided), in which
+ *    driver-specific buffer initialization can be performed,
+ *
+ * The return values from this function are intended to be directly returned
+ * from vidioc_prepare_buf handler in driver.
+ */
+int vb2_prepare_buf(struct vb2_queue *q, struct v4l2_buffer *b)
+{
+        struct vb2_buffer *vb;
+        int ret;
+        if (q->fileio) {
+                dprintk(1, "%s(): file io in progress\n", __func__);
+                return -EBUSY;
+        }
+        if (b->type != q->type) {
+                dprintk(1, "%s(): invalid buffer type\n", __func__);
+                return -EINVAL;
+        }
+        if (b->index >= q->num_buffers) {
+                dprintk(1, "%s(): buffer index out of range\n", __func__);
+                return -EINVAL;
+        }
+        vb = q->bufs[b->index];
+        if (NULL == vb) {
+                /* Should never happen */
+                dprintk(1, "%s(): buffer is NULL\n", __func__);
+                return -EINVAL;
+        }
+        if (b->memory != q->memory) {
+                dprintk(1, "%s(): invalid memory type\n", __func__);
+                return -EINVAL;
+        }
+        if (vb->state != VB2_BUF_STATE_DEQUEUED) {
+                dprintk(1, "%s(): invalid buffer state %d\n", __func__, vb->state);
+                return -EINVAL;
+        }
+        ret = __buf_prepare(vb, b);
+        if (ret < 0)
+                return ret;
+        __fill_v4l2_buffer(vb, b);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(vb2_prepare_buf);
 /**
 * vb2_qbuf() - Queue a buffer from userspace
 * @q:          videobuf2 queue
@@ -841,8 +1069,8 @@ static void __enqueue_in_driver(struct vb2_buffer *vb)
 * Should be called from vidioc_qbuf ioctl handler of a driver.
 * This function:
 * 1) verifies the passed buffer,
- * 2) calls buf_prepare callback in the driver (if provided), in which
+ * 2) if necessary, calls buf_prepare callback in the driver (if provided), in
- *    driver-specific buffer initialization can be performed,
+ *    which driver-specific buffer initialization can be performed,
 * 3) if streaming is on, queues the buffer in driver by the means of buf_queue
 *    callback for processing.
 *
@@ -852,7 +1080,7 @@ static void __enqueue_in_driver(struct vb2_buffer *vb)
 int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b)
 {
        struct vb2_buffer *vb;
-        int ret = 0;
+        int ret;
        if (q->fileio) {
                dprintk(1, "qbuf: file io in progress\n");
@@ -881,29 +1109,18 @@ int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b)
                return -EINVAL;
        }
-        if (vb->state != VB2_BUF_STATE_DEQUEUED) {
+        switch (vb->state) {
+        case VB2_BUF_STATE_DEQUEUED:
+                ret = __buf_prepare(vb, b);
+                if (ret)
+                        return ret;
+        case VB2_BUF_STATE_PREPARED:
+                break;
+        default:
                dprintk(1, "qbuf: buffer already in use\n");
                return -EINVAL;
        }
-        if (q->memory == V4L2_MEMORY_MMAP)
-                ret = __qbuf_mmap(vb, b);
-        else if (q->memory == V4L2_MEMORY_USERPTR)
-                ret = __qbuf_userptr(vb, b);
-        else {
-                WARN(1, "Invalid queue type\n");
-                return -EINVAL;
-        }
-        if (ret)
-                return ret;
-        ret = call_qop(q, buf_prepare, vb);
-        if (ret) {
-                dprintk(1, "qbuf: buffer preparation failed\n");
-                return ret;
-        }
        /*
         * Add to the queued buffers list, a buffer will stay on it until
         * dequeued in dqbuf.
@@ -918,6 +1135,9 @@ int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b)
        if (q->streaming)
                __enqueue_in_driver(vb);
+        /* Fill buffer information for the userspace */
+        __fill_v4l2_buffer(vb, b);
        dprintk(1, "qbuf of buffer %d succeeded\n", vb->v4l2_buf.index);
        return 0;
 }
@@ -1347,6 +1567,37 @@ int vb2_mmap(struct vb2_queue *q, struct vm_area_struct *vma)
 }
 EXPORT_SYMBOL_GPL(vb2_mmap);
+#ifndef CONFIG_MMU
+unsigned long vb2_get_unmapped_area(struct vb2_queue *q,
+                                    unsigned long addr,
+                                    unsigned long len,
+                                    unsigned long pgoff,
+                                    unsigned long flags)
+{
+        unsigned long off = pgoff << PAGE_SHIFT;
+        struct vb2_buffer *vb;
+        unsigned int buffer, plane;
+        int ret;
+        if (q->memory != V4L2_MEMORY_MMAP) {
+                dprintk(1, "Queue is not currently set up for mmap\n");
+                return -EINVAL;
+        }
+        /*
+         * Find the plane corresponding to the offset passed by userspace.
+         */
+        ret = __find_plane_by_offset(q, off, &buffer, &plane);
+        if (ret)
+                return ret;
+        vb = q->bufs[buffer];
+        return (unsigned long)vb2_plane_vaddr(vb, plane);
+}
+EXPORT_SYMBOL_GPL(vb2_get_unmapped_area);
+#endif
 static int __vb2_init_fileio(struct vb2_queue *q, int read);
 static int __vb2_cleanup_fileio(struct vb2_queue *q);
@@ -1464,7 +1715,7 @@ void vb2_queue_release(struct vb2_queue *q)
 {
        __vb2_cleanup_fileio(q);
        __vb2_queue_cancel(q);
-        __vb2_queue_free(q);
+        __vb2_queue_free(q, q->num_buffers);
 }
 EXPORT_SYMBOL_GPL(vb2_queue_release);
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 7cf94c09d99a..7d754fbcccbf 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -650,9 +650,9 @@ static void vivi_stop_generating(struct vivi_dev *dev)
 /* ------------------------------------------------------------------
        Videobuf operations
   ------------------------------------------------------------------*/
-static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
+static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
-                                unsigned int *nplanes, unsigned int sizes[],
+                                unsigned int *nbuffers, unsigned int *nplanes,
-                                void *alloc_ctxs[])
+                                unsigned int sizes[], void *alloc_ctxs[])
 {
        struct vivi_dev *dev = vb2_get_drv_priv(vq);
        unsigned long size;
diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c
index 8c1d85e27be4..56ff19cdc2ad 100644
--- a/drivers/memstick/core/memstick.c
+++ b/drivers/memstick/core/memstick.c
@@ -17,6 +17,7 @@
 #include <linux/fs.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #define DRIVER_NAME "memstick"
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index 4a1909a32b60..9729b92fbfdd 100644
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -20,6 +20,7 @@
 #include <linux/slab.h>
 #include <linux/mutex.h>
 #include <linux/memstick.h>
+#include <linux/module.h>
 #define DRIVER_NAME "mspro_block"
diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c
index d89d925caecf..6ce70e9615d3 100644
--- a/drivers/memstick/host/jmb38x_ms.c
+++ b/drivers/memstick/host/jmb38x_ms.c
@@ -17,6 +17,7 @@
 #include <linux/highmem.h>
 #include <linux/memstick.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #define DRIVER_NAME "jmb38x_ms"
diff --git a/drivers/memstick/host/tifm_ms.c b/drivers/memstick/host/tifm_ms.c
index 03f71a431c82..b7aacf47703a 100644
--- a/drivers/memstick/host/tifm_ms.c
+++ b/drivers/memstick/host/tifm_ms.c
@@ -17,6 +17,7 @@
 #include <linux/highmem.h>
 #include <linux/scatterlist.h>
 #include <linux/log2.h>
+#include <linux/module.h>
 #include <asm/io.h>
 #define DRIVER_NAME "tifm_ms"
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c
index 73e4658af53c..7190d5239b4f 100644
--- a/drivers/message/i2o/pci.c
+++ b/drivers/message/i2o/pci.c
@@ -31,6 +31,7 @@
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/i2o.h>
+#include <linux/module.h>
 #include "core.h"
 #define OSM_DESCRIPTION "I2O-subsystem"
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index a67adcbd0fa1..f1391c21ef26 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -2,23 +2,8 @@
 # Multifunction miscellaneous devices
 #
-menuconfig MFD_SUPPORT
+if HAS_IOMEM
-        bool "Multifunction device drivers"
+menu "Multifunction device drivers"
-        depends on HAS_IOMEM
-        default y
-        help
-          Multifunction devices embed several functions (e.g. GPIOs,
-          touchscreens, keyboards, current regulators, power management chips,
-          etc...) in one single integrated circuit. They usually talk to the
-          main CPU through one or more IRQ lines and low speed data busses (SPI,
-          I2C, etc..). They appear as one single device to the main system
-          through the data bus and the MFD framework allows for sub devices
-          (a.k.a. functions) to appear as discrete platform devices.
-          MFDs are typically found on embedded platforms.
-          This option alone does not add any kernel code.
-if MFD_SUPPORT
 config MFD_CORE
        tristate
@@ -390,6 +375,7 @@ config MFD_WM8400
        tristate "Support Wolfson Microelectronics WM8400"
        select MFD_CORE
        depends on I2C
+        select REGMAP_I2C
        help
          Support for the Wolfson Microelecronics WM8400 PMIC and audio
          CODEC.  This driver provides common support for accessing
@@ -503,6 +489,7 @@ config MFD_WM8994
 config MFD_PCF50633
        tristate "Support for NXP PCF50633"
        depends on I2C
+        select REGMAP_I2C
        help
          Say yes here if you have NXP PCF50633 chip on your board.
          This core driver provides register access and IRQ handling
@@ -579,6 +566,23 @@ config EZX_PCAP
          This enables the PCAP ASIC present on EZX Phones. This is
          needed for MMC, TouchScreen, Sound, USB, etc..
+config AB5500_CORE
+        bool "ST-Ericsson AB5500 Mixed Signal Power Management chip"
+        depends on ABX500_CORE && MFD_DB5500_PRCMU
+        select MFD_CORE
+        help
+          Select this option to enable access to AB5500 power management
+          chip. This connects to the db5500 chip via the I2C bus via PRCMU.
+          This chip embeds various other multimedia funtionalities as well.
+config AB5500_DEBUG
+        bool "Enable debug info via debugfs"
+        depends on AB5500_CORE && DEBUG_FS
+        default y if DEBUG_FS
+        help
+          Select this option if you want debug information from the AB5500
+          using the debug filesystem, debugfs.
 config AB8500_CORE
        bool "ST-Ericsson AB8500 Mixed Signal Power Management chip"
        depends on GENERIC_HARDIRQS && ABX500_CORE
@@ -615,20 +619,6 @@ config AB8500_GPADC
        help
          AB8500 GPADC driver used to convert Acc and battery/ac/usb voltage
-config AB3550_CORE
-        bool "ST-Ericsson AB3550 Mixed Signal Circuit core functions"
-        select MFD_CORE
-        depends on I2C=y && GENERIC_HARDIRQS && ABX500_CORE
-        help
-          Select this to enable the AB3550 Mixed Signal IC core
-          functionality. This connects to a AB3550 on the I2C bus
-          and expose a number of symbols needed for dependent devices
-          to read and write registers and subscribe to events from
-          this multi-functional IC. This is needed to use other features
-          of the AB3550 such as battery-backed RTC, charging control,
-          LEDs, vibrator, system power and temperature, power management
-          and ALSA sound.
 config MFD_DB8500_PRCMU
        bool "ST-Ericsson DB8500 Power Reset Control Management Unit"
        depends on UX500_SOC_DB8500
@@ -773,7 +763,17 @@ config MFD_AAT2870_CORE
          additional drivers must be enabled in order to use the
          functionality of the device.
-endif # MFD_SUPPORT
+config MFD_INTEL_MSIC
+        bool "Support for Intel MSIC"
+        depends on INTEL_SCU_IPC
+        select MFD_CORE
+        help
+          Select this option to enable access to Intel MSIC (Avatele
+          Passage) chip. This chip embeds audio, battery, GPIO, etc.
+          devices used in Intel Medfield platforms.
+endmenu
+endif
 menu "Multimedia Capabilities Port drivers"
        depends on ARCH_SA1100
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index c58020303d18..b2292eb75242 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -79,7 +79,8 @@ obj-$(CONFIG_PCF50633_GPIO)	+= pcf50633-gpio.o
 obj-$(CONFIG_ABX500_CORE)       += abx500-core.o
 obj-$(CONFIG_AB3100_CORE)       += ab3100-core.o
 obj-$(CONFIG_AB3100_OTP)        += ab3100-otp.o
-obj-$(CONFIG_AB3550_CORE)       += ab3550-core.o
+obj-$(CONFIG_AB5500_CORE)       += ab5500-core.o
+obj-$(CONFIG_AB5500_DEBUG)      += ab5500-debugfs.o
 obj-$(CONFIG_AB8500_CORE)       += ab8500-core.o ab8500-sysctrl.o
 obj-$(CONFIG_AB8500_DEBUG)      += ab8500-debugfs.o
 obj-$(CONFIG_AB8500_GPADC)      += ab8500-gpadc.o
@@ -102,3 +103,4 @@ obj-$(CONFIG_MFD_PM8921_CORE) 	+= pm8921-core.o
 obj-$(CONFIG_MFD_PM8XXX_IRQ)    += pm8xxx-irq.o
 obj-$(CONFIG_TPS65911_COMPARATOR)       += tps65911-comparator.o
 obj-$(CONFIG_MFD_AAT2870_CORE)  += aat2870-core.o
+obj-$(CONFIG_MFD_INTEL_MSIC)    += intel_msic.o
diff --git a/drivers/mfd/aat2870-core.c b/drivers/mfd/aat2870-core.c
index 345dc658ef06..02c42015ba51 100644
--- a/drivers/mfd/aat2870-core.c
+++ b/drivers/mfd/aat2870-core.c
@@ -295,7 +295,7 @@ static ssize_t aat2870_reg_write_file(struct file *file,
 {
        struct aat2870_data *aat2870 = file->private_data;
        char buf[32];
-        int buf_size;
+        ssize_t buf_size;
        char *start = buf;
        unsigned long addr, val;
        int ret;
diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index a20e1c41bed2..60107ee166fc 100644
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@ -12,6 +12,7 @@
 #include <linux/notifier.h>
 #include <linux/slab.h>
 #include <linux/err.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/device.h>
 #include <linux/interrupt.h>
@@ -809,7 +810,7 @@ struct ab_family_id {
        char    *name;
 };
-static const struct ab_family_id ids[] __devinitdata = {
+static const struct ab_family_id ids[] __devinitconst = {
        /* AB3100 */
        {
                .id = 0xc0,
diff --git a/drivers/mfd/ab3550-core.c b/drivers/mfd/ab3550-core.c
deleted file mode 100644
index 56ba1943c91d..000000000000
--- a/drivers/mfd/ab3550-core.c
+++ /dev/null
@@ -1,1380 +0,0 @@
-/*
- * Copyright (C) 2007-2010 ST-Ericsson
- * License terms: GNU General Public License (GPL) version 2
- * Low-level core for exclusive access to the AB3550 IC on the I2C bus
- * and some basic chip-configuration.
- * Author: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
- * Author: Mattias Nilsson <mattias.i.nilsson@stericsson.com>
- * Author: Mattias Wallin <mattias.wallin@stericsson.com>
- * Author: Rickard Andersson <rickard.andersson@stericsson.com>
- */
-#include <linux/i2c.h>
-#include <linux/mutex.h>
-#include <linux/err.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-#include <linux/device.h>
-#include <linux/irq.h>
-#include <linux/interrupt.h>
-#include <linux/random.h>
-#include <linux/workqueue.h>
-#include <linux/debugfs.h>
-#include <linux/seq_file.h>
-#include <linux/uaccess.h>
-#include <linux/mfd/abx500.h>
-#include <linux/list.h>
-#include <linux/bitops.h>
-#include <linux/spinlock.h>
-#include <linux/mfd/core.h>
-#define AB3550_NAME_STRING "ab3550"
-#define AB3550_ID_FORMAT_STRING "AB3550 %s"
-#define AB3550_NUM_BANKS 2
-#define AB3550_NUM_EVENT_REG 5
-/* These are the only registers inside AB3550 used in this main file */
-/* Chip ID register */
-#define AB3550_CID_REG           0x20
-/* Interrupt event registers */
-#define AB3550_EVENT_BANK        0
-#define AB3550_EVENT_REG         0x22
-/* Read/write operation values. */
-#define AB3550_PERM_RD (0x01)
-#define AB3550_PERM_WR (0x02)
-/* Read/write permissions. */
-#define AB3550_PERM_RO (AB3550_PERM_RD)
-#define AB3550_PERM_RW (AB3550_PERM_RD | AB3550_PERM_WR)
-/**
- * struct ab3550
- * @access_mutex: lock out concurrent accesses to the AB registers
- * @i2c_client: I2C client for this chip
- * @chip_name: name of this chip variant
- * @chip_id: 8 bit chip ID for this chip variant
- * @mask_work: a worker for writing to mask registers
- * @event_lock: a lock to protect the event_mask
- * @event_mask: a local copy of the mask event registers
- * @startup_events: a copy of the first reading of the event registers
- * @startup_events_read: whether the first events have been read
- */
-struct ab3550 {
-        struct mutex access_mutex;
-        struct i2c_client *i2c_client[AB3550_NUM_BANKS];
-        char chip_name[32];
-        u8 chip_id;
-        struct work_struct mask_work;
-        spinlock_t event_lock;
-        u8 event_mask[AB3550_NUM_EVENT_REG];
-        u8 startup_events[AB3550_NUM_EVENT_REG];
-        bool startup_events_read;
-#ifdef CONFIG_DEBUG_FS
-        unsigned int debug_bank;
-        unsigned int debug_address;
-#endif
-};
-/**
- * struct ab3550_reg_range
- * @first: the first address of the range
- * @last: the last address of the range
- * @perm: access permissions for the range
- */
-struct ab3550_reg_range {
-        u8 first;
-        u8 last;
-        u8 perm;
-};
-/**
- * struct ab3550_reg_ranges
- * @count: the number of ranges in the list
- * @range: the list of register ranges
- */
-struct ab3550_reg_ranges {
-        u8 count;
-        const struct ab3550_reg_range *range;
-};
-/*
- * Permissible register ranges for reading and writing per device and bank.
- *
- * The ranges must be listed in increasing address order, and no overlaps are
- * allowed. It is assumed that write permission implies read permission
- * (i.e. only RO and RW permissions should be used).  Ranges with write
- * permission must not be split up.
- */
-#define NO_RANGE {.count = 0, .range = NULL,}
-static struct
-ab3550_reg_ranges ab3550_reg_ranges[AB3550_NUM_DEVICES][AB3550_NUM_BANKS] = {
-        [AB3550_DEVID_DAC] = {
-                NO_RANGE,
-                {
-                        .count = 2,
-                        .range = (struct ab3550_reg_range[]) {
-                                {
-                                        .first = 0xb0,
-                                        .last = 0xba,
-                                        .perm = AB3550_PERM_RW,
-                                },
-                                {
-                                        .first = 0xbc,
-                                        .last = 0xc3,
-                                        .perm = AB3550_PERM_RW,
-                                },
-                        },
-                },
-        },
-        [AB3550_DEVID_LEDS] = {
-                NO_RANGE,
-                {
-                        .count = 2,
-                        .range = (struct ab3550_reg_range[]) {
-                                {
-                                        .first = 0x5a,
-                                        .last = 0x88,
-                                        .perm = AB3550_PERM_RW,
-                                },
-                                {
-                                        .first = 0x8a,
-                                        .last = 0xad,
-                                        .perm = AB3550_PERM_RW,
-                                },
-                        }
-                },
-        },
-        [AB3550_DEVID_POWER] = {
-                {
-                        .count = 1,
-                        .range = (struct ab3550_reg_range[]) {
-                                {
-                                        .first = 0x21,
-                                        .last = 0x21,
-                                        .perm = AB3550_PERM_RO,
-                                },
-                        }
-                },
-                NO_RANGE,
-        },
-        [AB3550_DEVID_REGULATORS] = {
-                {
-                        .count = 1,
-                        .range = (struct ab3550_reg_range[]) {
-                                {
-                                        .first = 0x69,
-                                        .last = 0xa3,
-                                        .perm = AB3550_PERM_RW,
-                                },
-                        }
-                },
-                {
-                        .count = 1,
-                        .range = (struct ab3550_reg_range[]) {
-                                {
-                                        .first = 0x14,
-                                        .last = 0x16,
-                                        .perm = AB3550_PERM_RW,
-                                },
-                        }
-                },
-        },
-        [AB3550_DEVID_SIM] = {
-                {
-                        .count = 1,
-                        .range = (struct ab3550_reg_range[]) {
-                                {
-                                        .first = 0x21,
-                                        .last = 0x21,
-                                        .perm = AB3550_PERM_RO,
-                                },
-                        }
-                },
-                {
-                        .count = 1,
-                        .range = (struct ab3550_reg_range[]) {
-                                {
-                                        .first = 0x14,
-                                        .last = 0x17,
-                                        .perm = AB3550_PERM_RW,
-                                },
-                        }
-                },
-        },
-        [AB3550_DEVID_UART] = {
-                NO_RANGE,
-                NO_RANGE,
-        },
-        [AB3550_DEVID_RTC] = {
-                {
-                        .count = 1,
-                        .range = (struct ab3550_reg_range[]) {
-                                {
-                                        .first = 0x00,
-                                        .last = 0x0c,
-                                        .perm = AB3550_PERM_RW,
-                                },
-                        }
-                },
-                NO_RANGE,
-        },
-        [AB3550_DEVID_CHARGER] = {
-                {
-                        .count = 2,
-                        .range = (struct ab3550_reg_range[]) {
-                                {
-                                        .first = 0x10,
-                                        .last = 0x1a,
-                                        .perm = AB3550_PERM_RW,
-                                },
-                                {
-                                        .first = 0x21,
-                                        .last = 0x21,
-                                        .perm = AB3550_PERM_RO,
-                                },
-                        }
-                },
-                NO_RANGE,
-        },
-        [AB3550_DEVID_ADC] = {
-                NO_RANGE,
-                {
-                        .count = 1,
-                        .range = (struct ab3550_reg_range[]) {
-                                {
-                                        .first = 0x20,
-                                        .last = 0x56,
-                                        .perm = AB3550_PERM_RW,
-                                },
-                        }
-                },
-        },
-        [AB3550_DEVID_FUELGAUGE] = {
-                {
-                        .count = 1,
-                        .range = (struct ab3550_reg_range[]) {
-                                {
-                                        .first = 0x21,
-                                        .last = 0x21,
-                                        .perm = AB3550_PERM_RO,
-                                },
-                        }
-                },
-                {
-                        .count = 1,
-                        .range = (struct ab3550_reg_range[]) {
-                                {
-                                        .first = 0x00,
-                                        .last = 0x0e,
-                                        .perm = AB3550_PERM_RW,
-                                },
-                        }
-                },
-        },
-        [AB3550_DEVID_VIBRATOR] = {
-                NO_RANGE,
-                {
-                        .count = 1,
-                        .range = (struct ab3550_reg_range[]) {
-                                {
-                                        .first = 0x10,
-                                        .last = 0x13,
-                                        .perm = AB3550_PERM_RW,
-                                },
-                        }
-                },
-        },
-        [AB3550_DEVID_CODEC] = {
-                {
-                        .count = 2,
-                        .range = (struct ab3550_reg_range[]) {
-                                {
-                                        .first = 0x31,
-                                        .last = 0x63,
-                                        .perm = AB3550_PERM_RW,
-                                },
-                                {
-                                        .first = 0x65,
-                                        .last = 0x68,
-                                        .perm = AB3550_PERM_RW,
-                                },
-                        }
-                },
-                NO_RANGE,
-        },
-};
-static struct mfd_cell ab3550_devs[AB3550_NUM_DEVICES] = {
-        [AB3550_DEVID_DAC] = {
-                .name = "ab3550-dac",
-                .id = AB3550_DEVID_DAC,
-                .num_resources = 0,
-        },
-        [AB3550_DEVID_LEDS] = {
-                .name = "ab3550-leds",
-                .id = AB3550_DEVID_LEDS,
-        },
-        [AB3550_DEVID_POWER] = {
-                .name = "ab3550-power",
-                .id = AB3550_DEVID_POWER,
-        },
-        [AB3550_DEVID_REGULATORS] = {
-                .name = "ab3550-regulators",
-                .id = AB3550_DEVID_REGULATORS,
-        },
-        [AB3550_DEVID_SIM] = {
-                .name = "ab3550-sim",
-                .id = AB3550_DEVID_SIM,
-        },
-        [AB3550_DEVID_UART] = {
-                .name = "ab3550-uart",
-                .id = AB3550_DEVID_UART,
-        },
-        [AB3550_DEVID_RTC] = {
-                .name = "ab3550-rtc",
-                .id = AB3550_DEVID_RTC,
-        },
-        [AB3550_DEVID_CHARGER] = {
-                .name = "ab3550-charger",
-                .id = AB3550_DEVID_CHARGER,
-        },
-        [AB3550_DEVID_ADC] = {
-                .name = "ab3550-adc",
-                .id = AB3550_DEVID_ADC,
-                .num_resources = 10,
-                .resources = (struct resource[]) {
-                        {
-                                .name = "TRIGGER-0",
-                                .flags = IORESOURCE_IRQ,
-                                .start = 16,
-                                .end = 16,
-                        },
-                        {
-                                .name = "TRIGGER-1",
-                                .flags = IORESOURCE_IRQ,
-                                .start = 17,
-                                .end = 17,
-                        },
-                        {
-                                .name = "TRIGGER-2",
-                                .flags = IORESOURCE_IRQ,
-                                .start = 18,
-                                .end = 18,
-                        },
-                        {
-                                .name = "TRIGGER-3",
-                                .flags = IORESOURCE_IRQ,
-                                .start = 19,
-                                .end = 19,
-                        },
-                        {
-                                .name = "TRIGGER-4",
-                                .flags = IORESOURCE_IRQ,
-                                .start = 20,
-                                .end = 20,
-                        },
-                        {
-                                .name = "TRIGGER-5",
-                                .flags = IORESOURCE_IRQ,
-                                .start = 21,
-                                .end = 21,
-                        },
-                        {
-                                .name = "TRIGGER-6",
-                                .flags = IORESOURCE_IRQ,
-                                .start = 22,
-                                .end = 22,
-                        },
-                        {
-                                .name = "TRIGGER-7",
-                                .flags = IORESOURCE_IRQ,
-                                .start = 23,
-                                .end = 23,
-                        },
-                        {
-                                .name = "TRIGGER-VBAT-TXON",
-                                .flags = IORESOURCE_IRQ,
-                                .start = 13,
-                                .end = 13,
-                        },
-                        {
-                                .name = "TRIGGER-VBAT",
-                                .flags = IORESOURCE_IRQ,
-                                .start = 12,
-                                .end = 12,
-                        },
-                },
-        },
-        [AB3550_DEVID_FUELGAUGE] = {
-                .name = "ab3550-fuelgauge",
-                .id = AB3550_DEVID_FUELGAUGE,
-        },
-        [AB3550_DEVID_VIBRATOR] = {
-                .name = "ab3550-vibrator",
-                .id = AB3550_DEVID_VIBRATOR,
-        },
-        [AB3550_DEVID_CODEC] = {
-                .name = "ab3550-codec",
-                .id = AB3550_DEVID_CODEC,
-        },
-};
-/*
- * I2C transactions with error messages.
- */
-static int ab3550_i2c_master_send(struct ab3550 *ab, u8 bank, u8 *data,
-        u8 count)
-{
-        int err;
-        err = i2c_master_send(ab->i2c_client[bank], data, count);
-        if (err < 0) {
-                dev_err(&ab->i2c_client[0]->dev, "send error: %d\n", err);
-                return err;
-        }
-        return 0;
-}
-static int ab3550_i2c_master_recv(struct ab3550 *ab, u8 bank, u8 *data,
-        u8 count)
-{
-        int err;
-        err = i2c_master_recv(ab->i2c_client[bank], data, count);
-        if (err < 0) {
-                dev_err(&ab->i2c_client[0]->dev, "receive error: %d\n", err);
-                return err;
-        }
-        return 0;
-}
-/*
- * Functionality for getting/setting register values.
- */
-static int get_register_interruptible(struct ab3550 *ab, u8 bank, u8 reg,
-        u8 *value)
-{
-        int err;
-        err = mutex_lock_interruptible(&ab->access_mutex);
-        if (err)
-                return err;
-        err = ab3550_i2c_master_send(ab, bank, &reg, 1);
-        if (!err)
-                err = ab3550_i2c_master_recv(ab, bank, value, 1);
-        mutex_unlock(&ab->access_mutex);
-        return err;
-}
-static int get_register_page_interruptible(struct ab3550 *ab, u8 bank,
-        u8 first_reg, u8 *regvals, u8 numregs)
-{
-        int err;
-        err = mutex_lock_interruptible(&ab->access_mutex);
-        if (err)
-                return err;
-        err = ab3550_i2c_master_send(ab, bank, &first_reg, 1);
-        if (!err)
-                err = ab3550_i2c_master_recv(ab, bank, regvals, numregs);
-        mutex_unlock(&ab->access_mutex);
-        return err;
-}
-static int mask_and_set_register_interruptible(struct ab3550 *ab, u8 bank,
-        u8 reg, u8 bitmask, u8 bitvalues)
-{
-        int err = 0;
-        if (likely(bitmask)) {
-                u8 reg_bits[2] = {reg, 0};
-                err = mutex_lock_interruptible(&ab->access_mutex);
-                if (err)
-                        return err;
-                if (bitmask == 0xFF) /* No need to read in this case. */
-                        reg_bits[1] = bitvalues;
-                else { /* Read and modify the register value. */
-                        u8 bits;
-                        err = ab3550_i2c_master_send(ab, bank, &reg, 1);
-                        if (err)
-                                goto unlock_and_return;
-                        err = ab3550_i2c_master_recv(ab, bank, &bits, 1);
-                        if (err)
-                                goto unlock_and_return;
-                        reg_bits[1] = ((~bitmask & bits) |
-                                (bitmask & bitvalues));
-                }
-                /* Write the new value. */
-                err = ab3550_i2c_master_send(ab, bank, reg_bits, 2);
-unlock_and_return:
-                mutex_unlock(&ab->access_mutex);
-        }
-        return err;
-}
-/*
- * Read/write permission checking functions.
- */
-static bool page_write_allowed(const struct ab3550_reg_ranges *ranges,
-        u8 first_reg, u8 last_reg)
-{
-        u8 i;
-        if (last_reg < first_reg)
-                return false;
-        for (i = 0; i < ranges->count; i++) {
-                if (first_reg < ranges->range[i].first)
-                        break;
-                if ((last_reg <= ranges->range[i].last) &&
-                        (ranges->range[i].perm & AB3550_PERM_WR))
-                        return true;
-        }
-        return false;
-}
-static bool reg_write_allowed(const struct ab3550_reg_ranges *ranges, u8 reg)
-{
-        return page_write_allowed(ranges, reg, reg);
-}
-static bool page_read_allowed(const struct ab3550_reg_ranges *ranges,
-        u8 first_reg, u8 last_reg)
-{
-        u8 i;
-        if (last_reg < first_reg)
-                return false;
-        /* Find the range (if it exists in the list) that includes first_reg. */
-        for (i = 0; i < ranges->count; i++) {
-                if (first_reg < ranges->range[i].first)
-                        return false;
-                if (first_reg <= ranges->range[i].last)
-                        break;
-        }
-        /* Make sure that the entire range up to and including last_reg is
-         * readable. This may span several of the ranges in the list.
-         */
-        while ((i < ranges->count) &&
-                (ranges->range[i].perm & AB3550_PERM_RD)) {
-                if (last_reg <= ranges->range[i].last)
-                        return true;
-                if ((++i >= ranges->count) ||
-                        (ranges->range[i].first !=
-                         (ranges->range[i - 1].last + 1))) {
-                        break;
-                }
-        }
-        return false;
-}
-static bool reg_read_allowed(const struct ab3550_reg_ranges *ranges, u8 reg)
-{
-        return page_read_allowed(ranges, reg, reg);
-}
-/*
- * The register access functionality.
- */
-static int ab3550_get_chip_id(struct device *dev)
-{
-        struct ab3550 *ab = dev_get_drvdata(dev->parent);
-        return (int)ab->chip_id;
-}
-static int ab3550_mask_and_set_register_interruptible(struct device *dev,
-        u8 bank, u8 reg, u8 bitmask, u8 bitvalues)
-{
-        struct ab3550 *ab;
-        struct platform_device *pdev = to_platform_device(dev);
-        if ((AB3550_NUM_BANKS <= bank) ||
-                !reg_write_allowed(&ab3550_reg_ranges[pdev->id][bank], reg))
-                return -EINVAL;
-        ab = dev_get_drvdata(dev->parent);
-        return mask_and_set_register_interruptible(ab, bank, reg,
-                bitmask, bitvalues);
-}
-static int ab3550_set_register_interruptible(struct device *dev, u8 bank,
-        u8 reg, u8 value)
-{
-        return ab3550_mask_and_set_register_interruptible(dev, bank, reg, 0xFF,
-                value);
-}
-static int ab3550_get_register_interruptible(struct device *dev, u8 bank,
-        u8 reg, u8 *value)
-{
-        struct ab3550 *ab;
-        struct platform_device *pdev = to_platform_device(dev);
-        if ((AB3550_NUM_BANKS <= bank) ||
-                !reg_read_allowed(&ab3550_reg_ranges[pdev->id][bank], reg))
-                return -EINVAL;
-        ab = dev_get_drvdata(dev->parent);
-        return get_register_interruptible(ab, bank, reg, value);
-}
-static int ab3550_get_register_page_interruptible(struct device *dev, u8 bank,
-        u8 first_reg, u8 *regvals, u8 numregs)
-{
-        struct ab3550 *ab;
-        struct platform_device *pdev = to_platform_device(dev);
-        if ((AB3550_NUM_BANKS <= bank) ||
-                !page_read_allowed(&ab3550_reg_ranges[pdev->id][bank],
-                        first_reg, (first_reg + numregs - 1)))
-                return -EINVAL;
-        ab = dev_get_drvdata(dev->parent);
-        return get_register_page_interruptible(ab, bank, first_reg, regvals,
-                numregs);
-}
-static int ab3550_event_registers_startup_state_get(struct device *dev,
-        u8 *event)
-{
-        struct ab3550 *ab;
-        ab = dev_get_drvdata(dev->parent);
-        if (!ab->startup_events_read)
-                return -EAGAIN; /* Try again later */
-        memcpy(event, ab->startup_events, AB3550_NUM_EVENT_REG);
-        return 0;
-}
-static int ab3550_startup_irq_enabled(struct device *dev, unsigned int irq)
-{
-        struct ab3550 *ab;
-        struct ab3550_platform_data *plf_data;
-        bool val;
-        ab = irq_get_chip_data(irq);
-        plf_data = ab->i2c_client[0]->dev.platform_data;
-        irq -= plf_data->irq.base;
-        val = ((ab->startup_events[irq / 8] & BIT(irq % 8)) != 0);
-        return val;
-}
-static struct abx500_ops ab3550_ops = {
-        .get_chip_id = ab3550_get_chip_id,
-        .get_register = ab3550_get_register_interruptible,
-        .set_register = ab3550_set_register_interruptible,
-        .get_register_page = ab3550_get_register_page_interruptible,
-        .set_register_page = NULL,
-        .mask_and_set_register = ab3550_mask_and_set_register_interruptible,
-        .event_registers_startup_state_get =
-                ab3550_event_registers_startup_state_get,
-        .startup_irq_enabled = ab3550_startup_irq_enabled,
-};
-static irqreturn_t ab3550_irq_handler(int irq, void *data)
-{
-        struct ab3550 *ab = data;
-        int err;
-        unsigned int i;
-        u8 e[AB3550_NUM_EVENT_REG];
-        u8 *events;
-        unsigned long flags;
-        events = (ab->startup_events_read ? e : ab->startup_events);
-        err = get_register_page_interruptible(ab, AB3550_EVENT_BANK,
-                AB3550_EVENT_REG, events, AB3550_NUM_EVENT_REG);
-        if (err)
-                goto err_event_rd;
-        if (!ab->startup_events_read) {
-                dev_info(&ab->i2c_client[0]->dev,
-                        "startup events 0x%x,0x%x,0x%x,0x%x,0x%x\n",
-                        ab->startup_events[0], ab->startup_events[1],
-                        ab->startup_events[2], ab->startup_events[3],
-                        ab->startup_events[4]);
-                ab->startup_events_read = true;
-                goto out;
-        }
-        /* The two highest bits in event[4] are not used. */
-        events[4] &= 0x3f;
-        spin_lock_irqsave(&ab->event_lock, flags);
-        for (i = 0; i < AB3550_NUM_EVENT_REG; i++)
-                events[i] &= ~ab->event_mask[i];
-        spin_unlock_irqrestore(&ab->event_lock, flags);
-        for (i = 0; i < AB3550_NUM_EVENT_REG; i++) {
-                u8 bit;
-                u8 event_reg;
-                dev_dbg(&ab->i2c_client[0]->dev, "IRQ Event[%d]: 0x%2x\n",
-                        i, events[i]);
-                event_reg = events[i];
-                for (bit = 0; event_reg; bit++, event_reg /= 2) {
-                        if (event_reg % 2) {
-                                unsigned int irq;
-                                struct ab3550_platform_data *plf_data;
-                                plf_data = ab->i2c_client[0]->dev.platform_data;
-                                irq = plf_data->irq.base + (i * 8) + bit;
-                                handle_nested_irq(irq);
-                        }
-                }
-        }
-out:
-        return IRQ_HANDLED;
-err_event_rd:
-        dev_dbg(&ab->i2c_client[0]->dev, "error reading event registers\n");
-        return IRQ_HANDLED;
-}
-#ifdef CONFIG_DEBUG_FS
-static struct ab3550_reg_ranges debug_ranges[AB3550_NUM_BANKS] = {
-        {
-                .count = 6,
-                .range = (struct ab3550_reg_range[]) {
-                        {
-                                .first = 0x00,
-                                .last = 0x0e,
-                        },
-                        {
-                                .first = 0x10,
-                                .last = 0x1a,
-                        },
-                        {
-                                .first = 0x1e,
-                                .last = 0x4f,
-                        },
-                        {
-                                .first = 0x51,
-                                .last = 0x63,
-                        },
-                        {
-                                .first = 0x65,
-                                .last = 0xa3,
-                        },
-                        {
-                                .first = 0xa5,
-                                .last = 0xa8,
-                        },
-                }
-        },
-        {
-                .count = 8,
-                .range = (struct ab3550_reg_range[]) {
-                        {
-                                .first = 0x00,
-                                .last = 0x0e,
-                        },
-                        {
-                                .first = 0x10,
-                                .last = 0x17,
-                        },
-                        {
-                                .first = 0x1a,
-                                .last = 0x1c,
-                        },
-                        {
-                                .first = 0x20,
-                                .last = 0x56,
-                        },
-                        {
-                                .first = 0x5a,
-                                .last = 0x88,
-                        },
-                        {
-                                .first = 0x8a,
-                                .last = 0xad,
-                        },
-                        {
-                                .first = 0xb0,
-                                .last = 0xba,
-                        },
-                        {
-                                .first = 0xbc,
-                                .last = 0xc3,
-                        },
-                }
-        },
-};
-static int ab3550_registers_print(struct seq_file *s, void *p)
-{
-        struct ab3550 *ab = s->private;
-        int bank;
-        seq_printf(s, AB3550_NAME_STRING " register values:\n");
-        for (bank = 0; bank < AB3550_NUM_BANKS; bank++) {
-                unsigned int i;
-                seq_printf(s, " bank %d:\n", bank);
-                for (i = 0; i < debug_ranges[bank].count; i++) {
-                        u8 reg;
-                        for (reg = debug_ranges[bank].range[i].first;
-                                reg <= debug_ranges[bank].range[i].last;
-                                reg++) {
-                                u8 value;
-                                get_register_interruptible(ab, bank, reg,
-                                        &value);
-                                seq_printf(s, "  [%d/0x%02X]: 0x%02X\n", bank,
-                                        reg, value);
-                        }
-                }
-        }
-        return 0;
-}
-static int ab3550_registers_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ab3550_registers_print, inode->i_private);
-}
-static const struct file_operations ab3550_registers_fops = {
-        .open = ab3550_registers_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-        .owner = THIS_MODULE,
-};
-static int ab3550_bank_print(struct seq_file *s, void *p)
-{
-        struct ab3550 *ab = s->private;
-        seq_printf(s, "%d\n", ab->debug_bank);
-        return 0;
-}
-static int ab3550_bank_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ab3550_bank_print, inode->i_private);
-}
-static ssize_t ab3550_bank_write(struct file *file,
-        const char __user *user_buf,
-        size_t count, loff_t *ppos)
-{
-        struct ab3550 *ab = ((struct seq_file *)(file->private_data))->private;
-        unsigned long user_bank;
-        int err;
-        /* Get userspace string and assure termination */
-        err = kstrtoul_from_user(user_buf, count, 0, &user_bank);
-        if (err)
-                return err;
-        if (user_bank >= AB3550_NUM_BANKS) {
-                dev_err(&ab->i2c_client[0]->dev,
-                        "debugfs error input > number of banks\n");
-                return -EINVAL;
-        }
-        ab->debug_bank = user_bank;
-        return count;
-}
-static int ab3550_address_print(struct seq_file *s, void *p)
-{
-        struct ab3550 *ab = s->private;
-        seq_printf(s, "0x%02X\n", ab->debug_address);
-        return 0;
-}
-static int ab3550_address_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ab3550_address_print, inode->i_private);
-}
-static ssize_t ab3550_address_write(struct file *file,
-        const char __user *user_buf,
-        size_t count, loff_t *ppos)
-{
-        struct ab3550 *ab = ((struct seq_file *)(file->private_data))->private;
-        unsigned long user_address;
-        int err;
-        /* Get userspace string and assure termination */
-        err = kstrtoul_from_user(user_buf, count, 0, &user_address);
-        if (err)
-                return err;
-        if (user_address > 0xff) {
-                dev_err(&ab->i2c_client[0]->dev,
-                        "debugfs error input > 0xff\n");
-                return -EINVAL;
-        }
-        ab->debug_address = user_address;
-        return count;
-}
-static int ab3550_val_print(struct seq_file *s, void *p)
-{
-        struct ab3550 *ab = s->private;
-        int err;
-        u8 regvalue;
-        err = get_register_interruptible(ab, (u8)ab->debug_bank,
-                (u8)ab->debug_address, &regvalue);
-        if (err)
-                return -EINVAL;
-        seq_printf(s, "0x%02X\n", regvalue);
-        return 0;
-}
-static int ab3550_val_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ab3550_val_print, inode->i_private);
-}
-static ssize_t ab3550_val_write(struct file *file,
-        const char __user *user_buf,
-        size_t count, loff_t *ppos)
-{
-        struct ab3550 *ab = ((struct seq_file *)(file->private_data))->private;
-        unsigned long user_val;
-        int err;
-        u8 regvalue;
-        /* Get userspace string and assure termination */
-        err = kstrtoul_from_user(user_buf, count, 0, &user_val);
-        if (err)
-                return err;
-        if (user_val > 0xff) {
-                dev_err(&ab->i2c_client[0]->dev,
-                        "debugfs error input > 0xff\n");
-                return -EINVAL;
-        }
-        err = mask_and_set_register_interruptible(
-                ab, (u8)ab->debug_bank,
-                (u8)ab->debug_address, 0xFF, (u8)user_val);
-        if (err)
-                return -EINVAL;
-        get_register_interruptible(ab, (u8)ab->debug_bank,
-                (u8)ab->debug_address, &regvalue);
-        if (err)
-                return -EINVAL;
-        return count;
-}
-static const struct file_operations ab3550_bank_fops = {
-        .open = ab3550_bank_open,
-        .write = ab3550_bank_write,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-        .owner = THIS_MODULE,
-};
-static const struct file_operations ab3550_address_fops = {
-        .open = ab3550_address_open,
-        .write = ab3550_address_write,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-        .owner = THIS_MODULE,
-};
-static const struct file_operations ab3550_val_fops = {
-        .open = ab3550_val_open,
-        .write = ab3550_val_write,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-        .owner = THIS_MODULE,
-};
-static struct dentry *ab3550_dir;
-static struct dentry *ab3550_reg_file;
-static struct dentry *ab3550_bank_file;
-static struct dentry *ab3550_address_file;
-static struct dentry *ab3550_val_file;
-static inline void ab3550_setup_debugfs(struct ab3550 *ab)
-{
-        ab->debug_bank = 0;
-        ab->debug_address = 0x00;
-        ab3550_dir = debugfs_create_dir(AB3550_NAME_STRING, NULL);
-        if (!ab3550_dir)
-                goto exit_no_debugfs;
-        ab3550_reg_file = debugfs_create_file("all-registers",
-                S_IRUGO, ab3550_dir, ab, &ab3550_registers_fops);
-        if (!ab3550_reg_file)
-                goto exit_destroy_dir;
-        ab3550_bank_file = debugfs_create_file("register-bank",
-                (S_IRUGO | S_IWUSR), ab3550_dir, ab, &ab3550_bank_fops);
-        if (!ab3550_bank_file)
-                goto exit_destroy_reg;
-        ab3550_address_file = debugfs_create_file("register-address",
-                (S_IRUGO | S_IWUSR), ab3550_dir, ab, &ab3550_address_fops);
-        if (!ab3550_address_file)
-                goto exit_destroy_bank;
-        ab3550_val_file = debugfs_create_file("register-value",
-                (S_IRUGO | S_IWUSR), ab3550_dir, ab, &ab3550_val_fops);
-        if (!ab3550_val_file)
-                goto exit_destroy_address;
-        return;
-exit_destroy_address:
-        debugfs_remove(ab3550_address_file);
-exit_destroy_bank:
-        debugfs_remove(ab3550_bank_file);
-exit_destroy_reg:
-        debugfs_remove(ab3550_reg_file);
-exit_destroy_dir:
-        debugfs_remove(ab3550_dir);
-exit_no_debugfs:
-        dev_err(&ab->i2c_client[0]->dev, "failed to create debugfs entries.\n");
-        return;
-}
-static inline void ab3550_remove_debugfs(void)
-{
-        debugfs_remove(ab3550_val_file);
-        debugfs_remove(ab3550_address_file);
-        debugfs_remove(ab3550_bank_file);
-        debugfs_remove(ab3550_reg_file);
-        debugfs_remove(ab3550_dir);
-}
-#else /* !CONFIG_DEBUG_FS */
-static inline void ab3550_setup_debugfs(struct ab3550 *ab)
-{
-}
-static inline void ab3550_remove_debugfs(void)
-{
-}
-#endif
-/*
- * Basic set-up, datastructure creation/destruction and I2C interface.
- * This sets up a default config in the AB3550 chip so that it
- * will work as expected.
- */
-static int __init ab3550_setup(struct ab3550 *ab)
-{
-        int err = 0;
-        int i;
-        struct ab3550_platform_data *plf_data;
-        struct abx500_init_settings *settings;
-        plf_data = ab->i2c_client[0]->dev.platform_data;
-        settings = plf_data->init_settings;
-        for (i = 0; i < plf_data->init_settings_sz; i++) {
-                err = mask_and_set_register_interruptible(ab,
-                        settings[i].bank,
-                        settings[i].reg,
-                        0xFF, settings[i].setting);
-                if (err)
-                        goto exit_no_setup;
-                /* If event mask register update the event mask in ab3550 */
-                if ((settings[i].bank == 0) &&
-                        (AB3550_IMR1 <= settings[i].reg) &&
-                        (settings[i].reg <= AB3550_IMR5)) {
-                        ab->event_mask[settings[i].reg - AB3550_IMR1] =
-                                settings[i].setting;
-                }
-        }
-exit_no_setup:
-        return err;
-}
-static void ab3550_mask_work(struct work_struct *work)
-{
-        struct ab3550 *ab = container_of(work, struct ab3550, mask_work);
-        int i;
-        unsigned long flags;
-        u8 mask[AB3550_NUM_EVENT_REG];
-        spin_lock_irqsave(&ab->event_lock, flags);
-        for (i = 0; i < AB3550_NUM_EVENT_REG; i++)
-                mask[i] = ab->event_mask[i];
-        spin_unlock_irqrestore(&ab->event_lock, flags);
-        for (i = 0; i < AB3550_NUM_EVENT_REG; i++) {
-                int err;
-                err = mask_and_set_register_interruptible(ab, 0,
-                        (AB3550_IMR1 + i), ~0, mask[i]);
-                if (err)
-                        dev_err(&ab->i2c_client[0]->dev,
-                                "ab3550_mask_work failed 0x%x,0x%x\n",
-                                (AB3550_IMR1 + i), mask[i]);
-        }
-}
-static void ab3550_mask(struct irq_data *data)
-{
-        unsigned long flags;
-        struct ab3550 *ab;
-        struct ab3550_platform_data *plf_data;
-        int irq;
-        ab = irq_data_get_irq_chip_data(data);
-        plf_data = ab->i2c_client[0]->dev.platform_data;
-        irq = data->irq - plf_data->irq.base;
-        spin_lock_irqsave(&ab->event_lock, flags);
-        ab->event_mask[irq / 8] |= BIT(irq % 8);
-        spin_unlock_irqrestore(&ab->event_lock, flags);
-        schedule_work(&ab->mask_work);
-}
-static void ab3550_unmask(struct irq_data *data)
-{
-        unsigned long flags;
-        struct ab3550 *ab;
-        struct ab3550_platform_data *plf_data;
-        int irq;
-        ab = irq_data_get_irq_chip_data(data);
-        plf_data = ab->i2c_client[0]->dev.platform_data;
-        irq = data->irq - plf_data->irq.base;
-        spin_lock_irqsave(&ab->event_lock, flags);
-        ab->event_mask[irq / 8] &= ~BIT(irq % 8);
-        spin_unlock_irqrestore(&ab->event_lock, flags);
-        schedule_work(&ab->mask_work);
-}
-static void noop(struct irq_data *data)
-{
-}
-static struct irq_chip ab3550_irq_chip = {
-        .name           = "ab3550-core", /* Keep the same name as the request */
-        .irq_disable    = ab3550_mask, /* No default to mask in chip.c */
-        .irq_ack        = noop,
-        .irq_mask       = ab3550_mask,
-        .irq_unmask     = ab3550_unmask,
-};
-struct ab_family_id {
-        u8      id;
-        char    *name;
-};
-static const struct ab_family_id ids[] __initdata = {
-        /* AB3550 */
-        {
-                .id = AB3550_P1A,
-                .name = "P1A"
-        },
-        /* Terminator */
-        {
-                .id = 0x00,
-        }
-};
-static int __init ab3550_probe(struct i2c_client *client,
-        const struct i2c_device_id *id)
-{
-        struct ab3550 *ab;
-        struct ab3550_platform_data *ab3550_plf_data =
-                client->dev.platform_data;
-        int err;
-        int i;
-        int num_i2c_clients = 0;
-        ab = kzalloc(sizeof(struct ab3550), GFP_KERNEL);
-        if (!ab) {
-                dev_err(&client->dev,
-                        "could not allocate " AB3550_NAME_STRING " device\n");
-                return -ENOMEM;
-        }
-        /* Initialize data structure */
-        mutex_init(&ab->access_mutex);
-        spin_lock_init(&ab->event_lock);
-        ab->i2c_client[0] = client;
-        i2c_set_clientdata(client, ab);
-        /* Read chip ID register */
-        err = get_register_interruptible(ab, 0, AB3550_CID_REG, &ab->chip_id);
-        if (err) {
-                dev_err(&client->dev, "could not communicate with the analog "
-                        "baseband chip\n");
-                goto exit_no_detect;
-        }
-        for (i = 0; ids[i].id != 0x0; i++) {
-                if (ids[i].id == ab->chip_id) {
-                        snprintf(&ab->chip_name[0], sizeof(ab->chip_name) - 1,
-                                AB3550_ID_FORMAT_STRING, ids[i].name);
-                        break;
-                }
-        }
-        if (ids[i].id == 0x0) {
-                dev_err(&client->dev, "unknown analog baseband chip id: 0x%x\n",
-                        ab->chip_id);
-                dev_err(&client->dev, "driver not started!\n");
-                goto exit_no_detect;
-        }
-        dev_info(&client->dev, "detected AB chip: %s\n", &ab->chip_name[0]);
-        /* Attach other dummy I2C clients. */
-        while (++num_i2c_clients < AB3550_NUM_BANKS) {
-                ab->i2c_client[num_i2c_clients] =
-                        i2c_new_dummy(client->adapter,
-                                (client->addr + num_i2c_clients));
-                if (!ab->i2c_client[num_i2c_clients]) {
-                        err = -ENOMEM;
-                        goto exit_no_dummy_client;
-                }
-                strlcpy(ab->i2c_client[num_i2c_clients]->name, id->name,
-                        sizeof(ab->i2c_client[num_i2c_clients]->name));
-        }
-        err = ab3550_setup(ab);
-        if (err)
-                goto exit_no_setup;
-        INIT_WORK(&ab->mask_work, ab3550_mask_work);
-        for (i = 0; i < ab3550_plf_data->irq.count; i++) {
-                unsigned int irq;
-                irq = ab3550_plf_data->irq.base + i;
-                irq_set_chip_data(irq, ab);
-                irq_set_chip_and_handler(irq, &ab3550_irq_chip,
-                                         handle_simple_irq);
-                irq_set_nested_thread(irq, 1);
-#ifdef CONFIG_ARM
-                set_irq_flags(irq, IRQF_VALID);
-#else
-                irq_set_noprobe(irq);
-#endif
-        }
-        err = request_threaded_irq(client->irq, NULL, ab3550_irq_handler,
-                IRQF_ONESHOT, "ab3550-core", ab);
-        /* This real unpredictable IRQ is of course sampled for entropy */
-        rand_initialize_irq(client->irq);
-        if (err)
-                goto exit_no_irq;
-        err = abx500_register_ops(&client->dev, &ab3550_ops);
-        if (err)
-                goto exit_no_ops;
-        /* Set up and register the platform devices. */
-        for (i = 0; i < AB3550_NUM_DEVICES; i++) {
-                ab3550_devs[i].platform_data = ab3550_plf_data->dev_data[i];
-                ab3550_devs[i].pdata_size = ab3550_plf_data->dev_data_sz[i];
-        }
-        err = mfd_add_devices(&client->dev, 0, ab3550_devs,
-                ARRAY_SIZE(ab3550_devs), NULL,
-                ab3550_plf_data->irq.base);
-        ab3550_setup_debugfs(ab);
-        return 0;
-exit_no_ops:
-exit_no_irq:
-exit_no_setup:
-exit_no_dummy_client:
-        /* Unregister the dummy i2c clients. */
-        while (--num_i2c_clients)
-                i2c_unregister_device(ab->i2c_client[num_i2c_clients]);
-exit_no_detect:
-        kfree(ab);
-        return err;
-}
-static int __exit ab3550_remove(struct i2c_client *client)
-{
-        struct ab3550 *ab = i2c_get_clientdata(client);
-        int num_i2c_clients = AB3550_NUM_BANKS;
-        mfd_remove_devices(&client->dev);
-        ab3550_remove_debugfs();
-        while (--num_i2c_clients)
-                i2c_unregister_device(ab->i2c_client[num_i2c_clients]);
-        /*
-         * At this point, all subscribers should have unregistered
-         * their notifiers so deactivate IRQ
-         */
-        free_irq(client->irq, ab);
-        kfree(ab);
-        return 0;
-}
-static const struct i2c_device_id ab3550_id[] = {
-        {AB3550_NAME_STRING, 0},
-        {}
-};
-MODULE_DEVICE_TABLE(i2c, ab3550_id);
-static struct i2c_driver ab3550_driver = {
-        .driver = {
-                .name   = AB3550_NAME_STRING,
-                .owner  = THIS_MODULE,
-        },
-        .id_table       = ab3550_id,
-        .probe          = ab3550_probe,
-        .remove         = __exit_p(ab3550_remove),
-};
-static int __init ab3550_i2c_init(void)
-{
-        return i2c_add_driver(&ab3550_driver);
-}
-static void __exit ab3550_i2c_exit(void)
-{
-        i2c_del_driver(&ab3550_driver);
-}
-subsys_initcall(ab3550_i2c_init);
-module_exit(ab3550_i2c_exit);
-MODULE_AUTHOR("Mattias Wallin <mattias.wallin@stericsson.com>");
-MODULE_DESCRIPTION("AB3550 core driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/mfd/ab5500-core.c b/drivers/mfd/ab5500-core.c
new file mode 100644
index 000000000000..4175544b491b
--- /dev/null
+++ b/drivers/mfd/ab5500-core.c
@@ -0,0 +1,1439 @@
+/*
+ * Copyright (C) 2007-2011 ST-Ericsson
+ * License terms: GNU General Public License (GPL) version 2
+ * Low-level core for exclusive access to the AB5500 IC on the I2C bus
+ * and some basic chip-configuration.
+ * Author: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
+ * Author: Mattias Nilsson <mattias.i.nilsson@stericsson.com>
+ * Author: Mattias Wallin <mattias.wallin@stericsson.com>
+ * Author: Rickard Andersson <rickard.andersson@stericsson.com>
+ * Author: Karl Komierowski  <karl.komierowski@stericsson.com>
+ * Author: Bibek Basu <bibek.basu@stericsson.com>
+ *
+ * TODO: Event handling with irq_chip. Waiting for PRCMU fw support.
+ */
+#include <linux/mutex.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/device.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <linux/random.h>
+#include <linux/mfd/ab5500/ab5500.h>
+#include <linux/mfd/abx500.h>
+#include <linux/list.h>
+#include <linux/bitops.h>
+#include <linux/spinlock.h>
+#include <linux/mfd/core.h>
+#include <linux/version.h>
+#include <linux/mfd/db5500-prcmu.h>
+#include "ab5500-core.h"
+#include "ab5500-debugfs.h"
+#define AB5500_NUM_EVENT_REG 23
+#define AB5500_IT_LATCH0_REG 0x40
+#define AB5500_IT_MASK0_REG 0x60
+/*
+ * Permissible register ranges for reading and writing per device and bank.
+ *
+ * The ranges must be listed in increasing address order, and no overlaps are
+ * allowed. It is assumed that write permission implies read permission
+ * (i.e. only RO and RW permissions should be used).  Ranges with write
+ * permission must not be split up.
+ */
+#define NO_RANGE {.count = 0, .range = NULL,}
+static struct ab5500_i2c_banks ab5500_bank_ranges[AB5500_NUM_DEVICES] = {
+        [AB5500_DEVID_USB] =  {
+                .nbanks = 1,
+                .bank = (struct ab5500_i2c_ranges []) {
+                        {
+                                .bankid = AB5500_BANK_USB,
+                                .nranges = 12,
+                                .range = (struct ab5500_reg_range[]) {
+                                        {
+                                                .first = 0x01,
+                                                .last = 0x01,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x80,
+                                                .last = 0x83,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x87,
+                                                .last = 0x8A,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x8B,
+                                                .last = 0x8B,
+                                                .perm = AB5500_PERM_RO,
+                                        },
+                                        {
+                                                .first = 0x91,
+                                                .last = 0x92,
+                                                .perm = AB5500_PERM_RO,
+                                        },
+                                        {
+                                                .first = 0x93,
+                                                .last = 0x93,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x94,
+                                                .last = 0x94,
+                                                .perm = AB5500_PERM_RO,
+                                        },
+                                        {
+                                                .first = 0xA8,
+                                                .last = 0xB0,
+                                                .perm = AB5500_PERM_RO,
+                                        },
+                                        {
+                                                .first = 0xB2,
+                                                .last = 0xB2,
+                                                .perm = AB5500_PERM_RO,
+                                        },
+                                        {
+                                                .first = 0xB4,
+                                                .last = 0xBC,
+                                                .perm = AB5500_PERM_RO,
+                                        },
+                                        {
+                                                .first = 0xBF,
+                                                .last = 0xBF,
+                                                .perm = AB5500_PERM_RO,
+                                        },
+                                        {
+                                                .first = 0xC1,
+                                                .last = 0xC5,
+                                                .perm = AB5500_PERM_RO,
+                                        },
+                                },
+                        },
+                },
+        },
+        [AB5500_DEVID_ADC] =  {
+                .nbanks = 1,
+                .bank = (struct ab5500_i2c_ranges []) {
+                        {
+                                .bankid = AB5500_BANK_ADC,
+                                .nranges = 6,
+                                .range = (struct ab5500_reg_range[]) {
+                                        {
+                                                .first = 0x1F,
+                                                .last = 0x22,
+                                                .perm = AB5500_PERM_RO,
+                                        },
+                                        {
+                                                .first = 0x23,
+                                                .last = 0x24,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x26,
+                                                .last = 0x2D,
+                                                .perm = AB5500_PERM_RO,
+                                        },
+                                        {
+                                                .first = 0x2F,
+                                                .last = 0x34,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x37,
+                                                .last = 0x57,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x58,
+                                                .last = 0x58,
+                                                .perm = AB5500_PERM_RO,
+                                        },
+                                },
+                        },
+                },
+        },
+        [AB5500_DEVID_LEDS] =  {
+                .nbanks = 1,
+                .bank = (struct ab5500_i2c_ranges []) {
+                        {
+                                .bankid = AB5500_BANK_LED,
+                                .nranges = 1,
+                                .range = (struct ab5500_reg_range[]) {
+                                        {
+                                                .first = 0x00,
+                                                .last = 0x0C,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                },
+                        },
+                },
+        },
+        [AB5500_DEVID_VIDEO] =   {
+                .nbanks = 1,
+                .bank = (struct ab5500_i2c_ranges []) {
+                        {
+                                .bankid = AB5500_BANK_VDENC,
+                                .nranges = 12,
+                                .range = (struct ab5500_reg_range[]) {
+                                        {
+                                                .first = 0x00,
+                                                .last = 0x08,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x09,
+                                                .last = 0x09,
+                                                .perm = AB5500_PERM_RO,
+                                        },
+                                        {
+                                                .first = 0x0A,
+                                                .last = 0x12,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x15,
+                                                .last = 0x19,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x1B,
+                                                .last = 0x21,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x27,
+                                                .last = 0x2C,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x41,
+                                                .last = 0x41,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x45,
+                                                .last = 0x5B,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x5D,
+                                                .last = 0x5D,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x69,
+                                                .last = 0x69,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x6C,
+                                                .last = 0x6D,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x80,
+                                                .last = 0x81,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                },
+                        },
+                },
+        },
+        [AB5500_DEVID_REGULATORS] =   {
+                .nbanks = 2,
+                .bank =  (struct ab5500_i2c_ranges []) {
+                        {
+                                .bankid = AB5500_BANK_STARTUP,
+                                .nranges = 12,
+                                .range = (struct ab5500_reg_range[]) {
+                                        {
+                                                .first = 0x00,
+                                                .last = 0x01,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x1F,
+                                                .last = 0x1F,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x2E,
+                                                .last = 0x2E,
+                                                .perm = AB5500_PERM_RO,
+                                        },
+                                        {
+                                                .first = 0x2F,
+                                                .last = 0x30,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x50,
+                                                .last = 0x51,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x60,
+                                                .last = 0x61,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x66,
+                                                .last = 0x8A,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x8C,
+                                                .last = 0x96,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0xAA,
+                                                .last = 0xB4,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0xB7,
+                                                .last = 0xBF,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0xC1,
+                                                .last = 0xCA,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0xD3,
+                                                .last = 0xE0,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                },
+                        },
+                        {
+                                .bankid = AB5500_BANK_SIM_USBSIM,
+                                .nranges = 1,
+                                .range = (struct ab5500_reg_range[]) {
+                                        {
+                                                .first = 0x13,
+                                                .last = 0x19,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                },
+                        },
+                },
+        },
+        [AB5500_DEVID_SIM] =   {
+                .nbanks = 1,
+                .bank = (struct ab5500_i2c_ranges []) {
+                        {
+                                .bankid = AB5500_BANK_SIM_USBSIM,
+                                .nranges = 1,
+                                .range = (struct ab5500_reg_range[]) {
+                                        {
+                                                .first = 0x13,
+                                                .last = 0x19,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                },
+                        },
+                },
+        },
+        [AB5500_DEVID_RTC] =   {
+                .nbanks = 1,
+                .bank = (struct ab5500_i2c_ranges []) {
+                        {
+                                .bankid = AB5500_BANK_RTC,
+                                .nranges = 2,
+                                .range = (struct ab5500_reg_range[]) {
+                                        {
+                                                .first = 0x00,
+                                                .last = 0x04,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0x06,
+                                                .last = 0x0C,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                },
+                        },
+                },
+        },
+        [AB5500_DEVID_CHARGER] =   {
+                .nbanks = 1,
+                .bank = (struct ab5500_i2c_ranges []) {
+                        {
+                                .bankid = AB5500_BANK_CHG,
+                                .nranges = 2,
+                                .range = (struct ab5500_reg_range[]) {
+                                        {
+                                                .first = 0x11,
+                                                .last = 0x11,
+                                                .perm = AB5500_PERM_RO,
+                                        },
+                                        {
+                                                .first = 0x12,
+                                                .last = 0x1B,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                },
+                        },
+                },
+        },
+        [AB5500_DEVID_FUELGAUGE] =   {
+                .nbanks = 1,
+                .bank = (struct ab5500_i2c_ranges []) {
+                        {
+                                .bankid = AB5500_BANK_FG_BATTCOM_ACC,
+                                .nranges = 2,
+                                .range = (struct ab5500_reg_range[]) {
+                                        {
+                                                .first = 0x00,
+                                                .last = 0x0B,
+                                                .perm = AB5500_PERM_RO,
+                                        },
+                                        {
+                                                .first = 0x0C,
+                                                .last = 0x10,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                },
+                        },
+                },
+        },
+        [AB5500_DEVID_VIBRATOR] =   {
+                .nbanks = 1,
+                .bank = (struct ab5500_i2c_ranges []) {
+                        {
+                                .bankid = AB5500_BANK_VIBRA,
+                                .nranges = 2,
+                                .range = (struct ab5500_reg_range[]) {
+                                        {
+                                                .first = 0x10,
+                                                .last = 0x13,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0xFE,
+                                                .last = 0xFE,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                },
+                        },
+                },
+        },
+        [AB5500_DEVID_CODEC] =   {
+                .nbanks = 1,
+                .bank = (struct ab5500_i2c_ranges []) {
+                        {
+                                .bankid = AB5500_BANK_AUDIO_HEADSETUSB,
+                                .nranges = 2,
+                                .range = (struct ab5500_reg_range[]) {
+                                        {
+                                                .first = 0x00,
+                                                .last = 0x48,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                        {
+                                                .first = 0xEB,
+                                                .last = 0xFB,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                },
+                        },
+                },
+        },
+        [AB5500_DEVID_POWER] = {
+                .nbanks = 2,
+                .bank   = (struct ab5500_i2c_ranges []) {
+                        {
+                                .bankid = AB5500_BANK_STARTUP,
+                                .nranges = 1,
+                                .range = (struct ab5500_reg_range[]) {
+                                        {
+                                                .first = 0x30,
+                                                .last = 0x30,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                },
+                        },
+                        {
+                                .bankid = AB5500_BANK_VIT_IO_I2C_CLK_TST_OTP,
+                                .nranges = 1,
+                                .range = (struct ab5500_reg_range[]) {
+                                        {
+                                                .first = 0x01,
+                                                .last = 0x01,
+                                                .perm = AB5500_PERM_RW,
+                                        },
+                                },
+                        },
+                },
+        },
+};
+#define AB5500_IRQ(bank, bit)   ((bank) * 8 + (bit))
+/* I appologize for the resource names beeing a mix of upper case
+ * and lower case but I want them to be exact as the documentation */
+static struct mfd_cell ab5500_devs[AB5500_NUM_DEVICES] = {
+        [AB5500_DEVID_LEDS] = {
+                .name = "ab5500-leds",
+                .id = AB5500_DEVID_LEDS,
+        },
+        [AB5500_DEVID_POWER] = {
+                .name = "ab5500-power",
+                .id = AB5500_DEVID_POWER,
+        },
+        [AB5500_DEVID_REGULATORS] = {
+                .name = "ab5500-regulator",
+                .id = AB5500_DEVID_REGULATORS,
+        },
+        [AB5500_DEVID_SIM] = {
+                .name = "ab5500-sim",
+                .id = AB5500_DEVID_SIM,
+                .num_resources = 1,
+                .resources = (struct resource[]) {
+                        {
+                                .name = "SIMOFF",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(2, 0), /*rising*/
+                                .end = AB5500_IRQ(2, 1), /*falling*/
+                        },
+                },
+        },
+        [AB5500_DEVID_RTC] = {
+                .name = "ab5500-rtc",
+                .id = AB5500_DEVID_RTC,
+                .num_resources = 1,
+                .resources = (struct resource[]) {
+                        {
+                                .name   = "RTC_Alarm",
+                                .flags  = IORESOURCE_IRQ,
+                                .start  = AB5500_IRQ(1, 7),
+                                .end    = AB5500_IRQ(1, 7),
+                        }
+                },
+        },
+        [AB5500_DEVID_CHARGER] = {
+                .name = "ab5500-charger",
+                .id = AB5500_DEVID_CHARGER,
+        },
+        [AB5500_DEVID_ADC] = {
+                .name = "ab5500-adc",
+                .id = AB5500_DEVID_ADC,
+                .num_resources = 10,
+                .resources = (struct resource[]) {
+                        {
+                                .name = "TRIGGER-0",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(0, 0),
+                                .end = AB5500_IRQ(0, 0),
+                        },
+                        {
+                                .name = "TRIGGER-1",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(0, 1),
+                                .end = AB5500_IRQ(0, 1),
+                        },
+                        {
+                                .name = "TRIGGER-2",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(0, 2),
+                                .end = AB5500_IRQ(0, 2),
+                        },
+                        {
+                                .name = "TRIGGER-3",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(0, 3),
+                                .end = AB5500_IRQ(0, 3),
+                        },
+                        {
+                                .name = "TRIGGER-4",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(0, 4),
+                                .end = AB5500_IRQ(0, 4),
+                        },
+                        {
+                                .name = "TRIGGER-5",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(0, 5),
+                                .end = AB5500_IRQ(0, 5),
+                        },
+                        {
+                                .name = "TRIGGER-6",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(0, 6),
+                                .end = AB5500_IRQ(0, 6),
+                        },
+                        {
+                                .name = "TRIGGER-7",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(0, 7),
+                                .end = AB5500_IRQ(0, 7),
+                        },
+                        {
+                                .name = "TRIGGER-VBAT",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(0, 8),
+                                .end = AB5500_IRQ(0, 8),
+                        },
+                        {
+                                .name = "TRIGGER-VBAT-TXON",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(0, 9),
+                                .end = AB5500_IRQ(0, 9),
+                        },
+                },
+        },
+        [AB5500_DEVID_FUELGAUGE] = {
+                .name = "ab5500-fuelgauge",
+                .id = AB5500_DEVID_FUELGAUGE,
+                .num_resources = 6,
+                .resources = (struct resource[]) {
+                        {
+                                .name = "Batt_attach",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(7, 5),
+                                .end = AB5500_IRQ(7, 5),
+                        },
+                        {
+                                .name = "Batt_removal",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(7, 6),
+                                .end = AB5500_IRQ(7, 6),
+                        },
+                        {
+                                .name = "UART_framing",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(7, 7),
+                                .end = AB5500_IRQ(7, 7),
+                        },
+                        {
+                                .name = "UART_overrun",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(8, 0),
+                                .end = AB5500_IRQ(8, 0),
+                        },
+                        {
+                                .name = "UART_Rdy_RX",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(8, 1),
+                                .end = AB5500_IRQ(8, 1),
+                        },
+                        {
+                                .name = "UART_Rdy_TX",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(8, 2),
+                                .end = AB5500_IRQ(8, 2),
+                        },
+                },
+        },
+        [AB5500_DEVID_VIBRATOR] = {
+                .name = "ab5500-vibrator",
+                .id = AB5500_DEVID_VIBRATOR,
+        },
+        [AB5500_DEVID_CODEC] = {
+                .name = "ab5500-codec",
+                .id = AB5500_DEVID_CODEC,
+                .num_resources = 3,
+                .resources = (struct resource[]) {
+                        {
+                                .name = "audio_spkr1_ovc",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(9, 5),
+                                .end = AB5500_IRQ(9, 5),
+                        },
+                        {
+                                .name = "audio_plllocked",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(9, 6),
+                                .end = AB5500_IRQ(9, 6),
+                        },
+                        {
+                                .name = "audio_spkr2_ovc",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(17, 4),
+                                .end = AB5500_IRQ(17, 4),
+                        },
+                },
+        },
+        [AB5500_DEVID_USB] = {
+                .name = "ab5500-usb",
+                .id = AB5500_DEVID_USB,
+                .num_resources = 36,
+                .resources = (struct resource[]) {
+                        {
+                                .name = "Link_Update",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(22, 1),
+                                .end = AB5500_IRQ(22, 1),
+                        },
+                        {
+                                .name = "DCIO",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(8, 3),
+                                .end = AB5500_IRQ(8, 4),
+                        },
+                        {
+                                .name = "VBUS_R",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(8, 5),
+                                .end = AB5500_IRQ(8, 5),
+                        },
+                        {
+                                .name = "VBUS_F",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(8, 6),
+                                .end = AB5500_IRQ(8, 6),
+                        },
+                        {
+                                .name = "CHGstate_10_PCVBUSchg",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(8, 7),
+                                .end = AB5500_IRQ(8, 7),
+                        },
+                        {
+                                .name = "DCIOreverse_ovc",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(9, 0),
+                                .end = AB5500_IRQ(9, 0),
+                        },
+                        {
+                                .name = "USBCharDetDone",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(9, 1),
+                                .end = AB5500_IRQ(9, 1),
+                        },
+                        {
+                                .name = "DCIO_no_limit",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(9, 2),
+                                .end = AB5500_IRQ(9, 2),
+                        },
+                        {
+                                .name = "USB_suspend",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(9, 3),
+                                .end = AB5500_IRQ(9, 3),
+                        },
+                        {
+                                .name = "DCIOreverse_fwdcurrent",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(9, 4),
+                                .end = AB5500_IRQ(9, 4),
+                        },
+                        {
+                                .name = "Vbus_Imeasmax_change",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(9, 5),
+                                .end = AB5500_IRQ(9, 6),
+                        },
+                        {
+                                .name = "OVV",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(14, 5),
+                                .end = AB5500_IRQ(14, 5),
+                        },
+                        {
+                                .name = "USBcharging_NOTok",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(15, 3),
+                                .end = AB5500_IRQ(15, 3),
+                        },
+                        {
+                                .name = "usb_adp_sensoroff",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(15, 6),
+                                .end = AB5500_IRQ(15, 6),
+                        },
+                        {
+                                .name = "usb_adp_probeplug",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(15, 7),
+                                .end = AB5500_IRQ(15, 7),
+                        },
+                        {
+                                .name = "usb_adp_sinkerror",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(16, 0),
+                                .end = AB5500_IRQ(16, 6),
+                        },
+                        {
+                                .name = "usb_adp_sourceerror",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(16, 1),
+                                .end = AB5500_IRQ(16, 1),
+                        },
+                        {
+                                .name = "usb_idgnd_r",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(16, 2),
+                                .end = AB5500_IRQ(16, 2),
+                        },
+                        {
+                                .name = "usb_idgnd_f",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(16, 3),
+                                .end = AB5500_IRQ(16, 3),
+                        },
+                        {
+                                .name = "usb_iddetR1",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(16, 4),
+                                .end = AB5500_IRQ(16, 5),
+                        },
+                        {
+                                .name = "usb_iddetR2",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(16, 6),
+                                .end = AB5500_IRQ(16, 7),
+                        },
+                        {
+                                .name = "usb_iddetR3",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(17, 0),
+                                .end = AB5500_IRQ(17, 1),
+                        },
+                        {
+                                .name = "usb_iddetR4",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(17, 2),
+                                .end = AB5500_IRQ(17, 3),
+                        },
+                        {
+                                .name = "CharTempWindowOk",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(17, 7),
+                                .end = AB5500_IRQ(18, 0),
+                        },
+                        {
+                                .name = "USB_SprDetect",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(18, 1),
+                                .end = AB5500_IRQ(18, 1),
+                        },
+                        {
+                                .name = "usb_adp_probe_unplug",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(18, 2),
+                                .end = AB5500_IRQ(18, 2),
+                        },
+                        {
+                                .name = "VBUSChDrop",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(18, 3),
+                                .end = AB5500_IRQ(18, 4),
+                        },
+                        {
+                                .name = "dcio_char_rec_done",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(18, 5),
+                                .end = AB5500_IRQ(18, 5),
+                        },
+                        {
+                                .name = "Charging_stopped_by_temp",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(18, 6),
+                                .end = AB5500_IRQ(18, 6),
+                        },
+                        {
+                                .name = "CHGstate_11_SafeModeVBUS",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(21, 1),
+                                .end = AB5500_IRQ(21, 2),
+                        },
+                        {
+                                .name = "CHGstate_12_comletedVBUS",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(21, 2),
+                                .end = AB5500_IRQ(21, 2),
+                        },
+                        {
+                                .name = "CHGstate_13_completedVBUS",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(21, 3),
+                                .end = AB5500_IRQ(21, 3),
+                        },
+                        {
+                                .name = "CHGstate_14_FullChgDCIO",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(21, 4),
+                                .end = AB5500_IRQ(21, 4),
+                        },
+                        {
+                                .name = "CHGstate_15_SafeModeDCIO",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(21, 5),
+                                .end = AB5500_IRQ(21, 5),
+                        },
+                        {
+                                .name = "CHGstate_16_OFFsuspendDCIO",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(21, 6),
+                                .end = AB5500_IRQ(21, 6),
+                        },
+                        {
+                                .name = "CHGstate_17_completedDCIO",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(21, 7),
+                                .end = AB5500_IRQ(21, 7),
+                        },
+                },
+        },
+        [AB5500_DEVID_OTP] = {
+                .name = "ab5500-otp",
+                .id = AB5500_DEVID_OTP,
+        },
+        [AB5500_DEVID_VIDEO] = {
+                .name = "ab5500-video",
+                .id = AB5500_DEVID_VIDEO,
+                .num_resources = 1,
+                .resources = (struct resource[]) {
+                        {
+                                .name = "plugTVdet",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(22, 2),
+                                .end = AB5500_IRQ(22, 2),
+                        },
+                },
+        },
+        [AB5500_DEVID_DBIECI] = {
+                .name = "ab5500-dbieci",
+                .id = AB5500_DEVID_DBIECI,
+                .num_resources = 10,
+                .resources = (struct resource[]) {
+                        {
+                                .name = "COLL",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(14, 0),
+                                .end = AB5500_IRQ(14, 0),
+                        },
+                        {
+                                .name = "RESERR",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(14, 1),
+                                .end = AB5500_IRQ(14, 1),
+                        },
+                        {
+                                .name = "FRAERR",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(14, 2),
+                                .end = AB5500_IRQ(14, 2),
+                        },
+                        {
+                                .name = "COMERR",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(14, 3),
+                                .end = AB5500_IRQ(14, 3),
+                        },
+                        {
+                                .name = "BSI_indicator",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(14, 4),
+                                .end = AB5500_IRQ(14, 4),
+                        },
+                        {
+                                .name = "SPDSET",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(14, 6),
+                                .end = AB5500_IRQ(14, 6),
+                        },
+                        {
+                                .name = "DSENT",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(14, 7),
+                                .end = AB5500_IRQ(14, 7),
+                        },
+                        {
+                                .name = "DREC",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(15, 0),
+                                .end = AB5500_IRQ(15, 0),
+                        },
+                        {
+                                .name = "ACCINT",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(15, 1),
+                                .end = AB5500_IRQ(15, 1),
+                        },
+                        {
+                                .name = "NOPINT",
+                                .flags = IORESOURCE_IRQ,
+                                .start = AB5500_IRQ(15, 2),
+                                .end = AB5500_IRQ(15, 2),
+                        },
+                },
+        },
+        [AB5500_DEVID_ONSWA] = {
+                .name = "ab5500-onswa",
+                .id = AB5500_DEVID_ONSWA,
+                .num_resources = 2,
+                .resources = (struct resource[]) {
+                        {
+                                .name   = "ONSWAn_rising",
+                                .flags  = IORESOURCE_IRQ,
+                                .start  = AB5500_IRQ(1, 3),
+                                .end    = AB5500_IRQ(1, 3),
+                        },
+                        {
+                                .name   = "ONSWAn_falling",
+                                .flags  = IORESOURCE_IRQ,
+                                .start  = AB5500_IRQ(1, 4),
+                                .end    = AB5500_IRQ(1, 4),
+                        },
+                },
+        },
+};
+/*
+ * Functionality for getting/setting register values.
+ */
+int ab5500_get_register_interruptible_raw(struct ab5500 *ab,
+                                          u8 bank, u8 reg,
+                                          u8 *value)
+{
+        int err;
+        if (bank >= AB5500_NUM_BANKS)
+                return -EINVAL;
+        err = mutex_lock_interruptible(&ab->access_mutex);
+        if (err)
+                return err;
+        err = db5500_prcmu_abb_read(bankinfo[bank].slave_addr, reg, value, 1);
+        mutex_unlock(&ab->access_mutex);
+        return err;
+}
+static int get_register_page_interruptible(struct ab5500 *ab, u8 bank,
+        u8 first_reg, u8 *regvals, u8 numregs)
+{
+        int err;
+        if (bank >= AB5500_NUM_BANKS)
+                return -EINVAL;
+        err = mutex_lock_interruptible(&ab->access_mutex);
+        if (err)
+                return err;
+        while (numregs) {
+                /* The hardware limit for get page is 4 */
+                u8 curnum = min_t(u8, numregs, 4u);
+                err = db5500_prcmu_abb_read(bankinfo[bank].slave_addr,
+                                            first_reg, regvals, curnum);
+                if (err)
+                        goto out;
+                numregs -= curnum;
+                first_reg += curnum;
+                regvals += curnum;
+        }
+out:
+        mutex_unlock(&ab->access_mutex);
+        return err;
+}
+int ab5500_mask_and_set_register_interruptible_raw(struct ab5500 *ab, u8 bank,
+        u8 reg, u8 bitmask, u8 bitvalues)
+{
+        int err = 0;
+        if (bank >= AB5500_NUM_BANKS)
+                return -EINVAL;
+        if (bitmask) {
+                u8 buf;
+                err = mutex_lock_interruptible(&ab->access_mutex);
+                if (err)
+                        return err;
+                if (bitmask == 0xFF) /* No need to read in this case. */
+                        buf = bitvalues;
+                else { /* Read and modify the register value. */
+                        err = db5500_prcmu_abb_read(bankinfo[bank].slave_addr,
+                                reg, &buf, 1);
+                        if (err)
+                                return err;
+                        buf = ((~bitmask & buf) | (bitmask & bitvalues));
+                }
+                /* Write the new value. */
+                err = db5500_prcmu_abb_write(bankinfo[bank].slave_addr, reg,
+                                             &buf, 1);
+                mutex_unlock(&ab->access_mutex);
+        }
+        return err;
+}
+static int
+set_register_interruptible(struct ab5500 *ab, u8 bank, u8 reg, u8 value)
+{
+        return ab5500_mask_and_set_register_interruptible_raw(ab, bank, reg,
+                                                              0xff, value);
+}
+/*
+ * Read/write permission checking functions.
+ */
+static const struct ab5500_i2c_ranges *get_bankref(u8 devid, u8 bank)
+{
+        u8 i;
+        if (devid < AB5500_NUM_DEVICES) {
+                for (i = 0; i < ab5500_bank_ranges[devid].nbanks; i++) {
+                        if (ab5500_bank_ranges[devid].bank[i].bankid == bank)
+                                return &ab5500_bank_ranges[devid].bank[i];
+                }
+        }
+        return NULL;
+}
+static bool page_write_allowed(u8 devid, u8 bank, u8 first_reg, u8 last_reg)
+{
+        u8 i; /* range loop index */
+        const struct ab5500_i2c_ranges *bankref;
+        bankref = get_bankref(devid, bank);
+        if (bankref == NULL || last_reg < first_reg)
+                return false;
+        for (i = 0; i < bankref->nranges; i++) {
+                if (first_reg < bankref->range[i].first)
+                        break;
+                if ((last_reg <= bankref->range[i].last) &&
+                        (bankref->range[i].perm & AB5500_PERM_WR))
+                        return true;
+        }
+        return false;
+}
+static bool reg_write_allowed(u8 devid, u8 bank, u8 reg)
+{
+        return page_write_allowed(devid, bank, reg, reg);
+}
+static bool page_read_allowed(u8 devid, u8 bank, u8 first_reg, u8 last_reg)
+{
+        u8 i;
+        const struct ab5500_i2c_ranges *bankref;
+        bankref = get_bankref(devid, bank);
+        if (bankref == NULL || last_reg < first_reg)
+                return false;
+        /* Find the range (if it exists in the list) that includes first_reg. */
+        for (i = 0; i < bankref->nranges; i++) {
+                if (first_reg < bankref->range[i].first)
+                        return false;
+                if (first_reg <= bankref->range[i].last)
+                        break;
+        }
+        /* Make sure that the entire range up to and including last_reg is
+         * readable. This may span several of the ranges in the list.
+         */
+        while ((i < bankref->nranges) &&
+                (bankref->range[i].perm & AB5500_PERM_RD)) {
+                if (last_reg <= bankref->range[i].last)
+                        return true;
+                if ((++i >= bankref->nranges) ||
+                        (bankref->range[i].first !=
+                                (bankref->range[i - 1].last + 1))) {
+                        break;
+                }
+        }
+        return false;
+}
+static bool reg_read_allowed(u8 devid, u8 bank, u8 reg)
+{
+        return page_read_allowed(devid, bank, reg, reg);
+}
+/*
+ * The exported register access functionality.
+ */
+static int ab5500_get_chip_id(struct device *dev)
+{
+        struct ab5500 *ab = dev_get_drvdata(dev->parent);
+        return (int)ab->chip_id;
+}
+static int ab5500_mask_and_set_register_interruptible(struct device *dev,
+                u8 bank, u8 reg, u8 bitmask, u8 bitvalues)
+{
+        struct ab5500 *ab;
+        struct platform_device *pdev = to_platform_device(dev);
+        if ((AB5500_NUM_BANKS <= bank) ||
+                !reg_write_allowed(pdev->id, bank, reg))
+                return -EINVAL;
+        ab = dev_get_drvdata(dev->parent);
+        return ab5500_mask_and_set_register_interruptible_raw(ab, bank, reg,
+                bitmask, bitvalues);
+}
+static int ab5500_set_register_interruptible(struct device *dev, u8 bank,
+        u8 reg, u8 value)
+{
+        return ab5500_mask_and_set_register_interruptible(dev, bank, reg, 0xFF,
+                value);
+}
+static int ab5500_get_register_interruptible(struct device *dev, u8 bank,
+                u8 reg, u8 *value)
+{
+        struct ab5500 *ab;
+        struct platform_device *pdev = to_platform_device(dev);
+        if ((AB5500_NUM_BANKS <= bank) ||
+                !reg_read_allowed(pdev->id, bank, reg))
+                return -EINVAL;
+        ab = dev_get_drvdata(dev->parent);
+        return ab5500_get_register_interruptible_raw(ab, bank, reg, value);
+}
+static int ab5500_get_register_page_interruptible(struct device *dev, u8 bank,
+                u8 first_reg, u8 *regvals, u8 numregs)
+{
+        struct ab5500 *ab;
+        struct platform_device *pdev = to_platform_device(dev);
+        if ((AB5500_NUM_BANKS <= bank) ||
+                !page_read_allowed(pdev->id, bank,
+                        first_reg, (first_reg + numregs - 1)))
+                return -EINVAL;
+        ab = dev_get_drvdata(dev->parent);
+        return get_register_page_interruptible(ab, bank, first_reg, regvals,
+                numregs);
+}
+static int
+ab5500_event_registers_startup_state_get(struct device *dev, u8 *event)
+{
+        struct ab5500 *ab;
+        ab = dev_get_drvdata(dev->parent);
+        if (!ab->startup_events_read)
+                return -EAGAIN; /* Try again later */
+        memcpy(event, ab->startup_events, AB5500_NUM_EVENT_REG);
+        return 0;
+}
+static struct abx500_ops ab5500_ops = {
+        .get_chip_id = ab5500_get_chip_id,
+        .get_register = ab5500_get_register_interruptible,
+        .set_register = ab5500_set_register_interruptible,
+        .get_register_page = ab5500_get_register_page_interruptible,
+        .set_register_page = NULL,
+        .mask_and_set_register = ab5500_mask_and_set_register_interruptible,
+        .event_registers_startup_state_get =
+                ab5500_event_registers_startup_state_get,
+        .startup_irq_enabled = NULL,
+};
+/*
+ * ab5500_setup : Basic set-up, datastructure creation/destruction
+ *                and I2C interface.This sets up a default config
+ *                in the AB5500 chip so that it will work as expected.
+ * @ab :          Pointer to ab5500 structure
+ * @settings :    Pointer to struct abx500_init_settings
+ * @size :        Size of init data
+ */
+static int __init ab5500_setup(struct ab5500 *ab,
+        struct abx500_init_settings *settings, unsigned int size)
+{
+        int err = 0;
+        int i;
+        for (i = 0; i < size; i++) {
+                err = ab5500_mask_and_set_register_interruptible_raw(ab,
+                        settings[i].bank,
+                        settings[i].reg,
+                        0xFF, settings[i].setting);
+                if (err)
+                        goto exit_no_setup;
+                /* If event mask register update the event mask in ab5500 */
+                if ((settings[i].bank == AB5500_BANK_IT) &&
+                        (AB5500_MASK_BASE <= settings[i].reg) &&
+                        (settings[i].reg <= AB5500_MASK_END)) {
+                        ab->mask[settings[i].reg - AB5500_MASK_BASE] =
+                                settings[i].setting;
+                }
+        }
+exit_no_setup:
+        return err;
+}
+struct ab_family_id {
+        u8      id;
+        char    *name;
+};
+static const struct ab_family_id ids[] __initdata = {
+        /* AB5500 */
+        {
+                .id = AB5500_1_0,
+                .name = "1.0"
+        },
+        {
+                .id = AB5500_1_1,
+                .name = "1.1"
+        },
+        /* Terminator */
+        {
+                .id = 0x00,
+        }
+};
+static int __init ab5500_probe(struct platform_device *pdev)
+{
+        struct ab5500 *ab;
+        struct ab5500_platform_data *ab5500_plf_data =
+                pdev->dev.platform_data;
+        int err;
+        int i;
+        ab = kzalloc(sizeof(struct ab5500), GFP_KERNEL);
+        if (!ab) {
+                dev_err(&pdev->dev,
+                        "could not allocate ab5500 device\n");
+                return -ENOMEM;
+        }
+        /* Initialize data structure */
+        mutex_init(&ab->access_mutex);
+        mutex_init(&ab->irq_lock);
+        ab->dev = &pdev->dev;
+        platform_set_drvdata(pdev, ab);
+        /* Read chip ID register */
+        err = ab5500_get_register_interruptible_raw(ab,
+                                        AB5500_BANK_VIT_IO_I2C_CLK_TST_OTP,
+                                        AB5500_CHIP_ID, &ab->chip_id);
+        if (err) {
+                dev_err(&pdev->dev, "could not communicate with the analog "
+                        "baseband chip\n");
+                goto exit_no_detect;
+        }
+        for (i = 0; ids[i].id != 0x0; i++) {
+                if (ids[i].id == ab->chip_id) {
+                        snprintf(&ab->chip_name[0], sizeof(ab->chip_name) - 1,
+                                "AB5500 %s", ids[i].name);
+                        break;
+                }
+        }
+        if (ids[i].id == 0x0) {
+                dev_err(&pdev->dev, "unknown analog baseband chip id: 0x%x\n",
+                        ab->chip_id);
+                dev_err(&pdev->dev, "driver not started!\n");
+                goto exit_no_detect;
+        }
+        /* Clear and mask all interrupts */
+        for (i = 0; i < AB5500_NUM_IRQ_REGS; i++) {
+                u8 latchreg = AB5500_IT_LATCH0_REG + i;
+                u8 maskreg = AB5500_IT_MASK0_REG + i;
+                u8 val;
+                ab5500_get_register_interruptible_raw(ab, AB5500_BANK_IT,
+                                                      latchreg, &val);
+                set_register_interruptible(ab, AB5500_BANK_IT, maskreg, 0xff);
+                ab->mask[i] = ab->oldmask[i] = 0xff;
+        }
+        err = abx500_register_ops(&pdev->dev, &ab5500_ops);
+        if (err) {
+                dev_err(&pdev->dev, "ab5500_register ops error\n");
+                goto exit_no_detect;
+        }
+        /* Set up and register the platform devices. */
+        for (i = 0; i < AB5500_NUM_DEVICES; i++) {
+                ab5500_devs[i].platform_data = ab5500_plf_data->dev_data[i];
+                ab5500_devs[i].pdata_size =
+                        sizeof(ab5500_plf_data->dev_data[i]);
+        }
+        err = mfd_add_devices(&pdev->dev, 0, ab5500_devs,
+                ARRAY_SIZE(ab5500_devs), NULL,
+                ab5500_plf_data->irq.base);
+        if (err) {
+                dev_err(&pdev->dev, "ab5500_mfd_add_device error\n");
+                goto exit_no_detect;
+        }
+        err = ab5500_setup(ab, ab5500_plf_data->init_settings,
+                ab5500_plf_data->init_settings_sz);
+        if (err) {
+                dev_err(&pdev->dev, "ab5500_setup error\n");
+                goto exit_no_detect;
+        }
+        ab5500_setup_debugfs(ab);
+        dev_info(&pdev->dev, "detected AB chip: %s\n", &ab->chip_name[0]);
+        return 0;
+exit_no_detect:
+        kfree(ab);
+        return err;
+}
+static int __exit ab5500_remove(struct platform_device *pdev)
+{
+        struct ab5500 *ab = platform_get_drvdata(pdev);
+        ab5500_remove_debugfs();
+        mfd_remove_devices(&pdev->dev);
+        kfree(ab);
+        return 0;
+}
+static struct platform_driver ab5500_driver = {
+        .driver = {
+                .name = "ab5500-core",
+                .owner = THIS_MODULE,
+        },
+        .remove  = __exit_p(ab5500_remove),
+};
+static int __init ab5500_core_init(void)
+{
+        return platform_driver_probe(&ab5500_driver, ab5500_probe);
+}
+static void __exit ab5500_core_exit(void)
+{
+        platform_driver_unregister(&ab5500_driver);
+}
+subsys_initcall(ab5500_core_init);
+module_exit(ab5500_core_exit);
+MODULE_AUTHOR("Mattias Wallin <mattias.wallin@stericsson.com>");
+MODULE_DESCRIPTION("AB5500 core driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/mfd/ab5500-core.h b/drivers/mfd/ab5500-core.h
new file mode 100644
index 000000000000..63b30b17e4f3
--- /dev/null
+++ b/drivers/mfd/ab5500-core.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2011 ST-Ericsson
+ * License terms: GNU General Public License (GPL) version 2
+ * Shared definitions and data structures for the AB5500 MFD driver
+ */
+/* Read/write operation values. */
+#define AB5500_PERM_RD (0x01)
+#define AB5500_PERM_WR (0x02)
+/* Read/write permissions. */
+#define AB5500_PERM_RO (AB5500_PERM_RD)
+#define AB5500_PERM_RW (AB5500_PERM_RD | AB5500_PERM_WR)
+#define AB5500_MASK_BASE (0x60)
+#define AB5500_MASK_END (0x79)
+#define AB5500_CHIP_ID (0x20)
+/**
+ * struct ab5500_reg_range
+ * @first: the first address of the range
+ * @last: the last address of the range
+ * @perm: access permissions for the range
+ */
+struct ab5500_reg_range {
+        u8 first;
+        u8 last;
+        u8 perm;
+};
+/**
+ * struct ab5500_i2c_ranges
+ * @count: the number of ranges in the list
+ * @range: the list of register ranges
+ */
+struct ab5500_i2c_ranges {
+        u8 nranges;
+        u8 bankid;
+        const struct ab5500_reg_range *range;
+};
+/**
+ * struct ab5500_i2c_banks
+ * @count: the number of ranges in the list
+ * @range: the list of register ranges
+ */
+struct ab5500_i2c_banks {
+        u8 nbanks;
+        const struct ab5500_i2c_ranges *bank;
+};
+/**
+ * struct ab5500_bank
+ * @slave_addr: I2C slave_addr found in AB5500 specification
+ * @name: Documentation name of the bank. For reference
+ */
+struct ab5500_bank {
+        u8 slave_addr;
+        const char *name;
+};
+static const struct ab5500_bank bankinfo[AB5500_NUM_BANKS] = {
+        [AB5500_BANK_VIT_IO_I2C_CLK_TST_OTP] = {
+                AB5500_ADDR_VIT_IO_I2C_CLK_TST_OTP, "VIT_IO_I2C_CLK_TST_OTP"},
+        [AB5500_BANK_VDDDIG_IO_I2C_CLK_TST] = {
+                AB5500_ADDR_VDDDIG_IO_I2C_CLK_TST, "VDDDIG_IO_I2C_CLK_TST"},
+        [AB5500_BANK_VDENC] = {AB5500_ADDR_VDENC, "VDENC"},
+        [AB5500_BANK_SIM_USBSIM] = {AB5500_ADDR_SIM_USBSIM, "SIM_USBSIM"},
+        [AB5500_BANK_LED] = {AB5500_ADDR_LED, "LED"},
+        [AB5500_BANK_ADC] = {AB5500_ADDR_ADC, "ADC"},
+        [AB5500_BANK_RTC] = {AB5500_ADDR_RTC, "RTC"},
+        [AB5500_BANK_STARTUP] = {AB5500_ADDR_STARTUP, "STARTUP"},
+        [AB5500_BANK_DBI_ECI] = {AB5500_ADDR_DBI_ECI, "DBI-ECI"},
+        [AB5500_BANK_CHG] = {AB5500_ADDR_CHG, "CHG"},
+        [AB5500_BANK_FG_BATTCOM_ACC] = {
+                AB5500_ADDR_FG_BATTCOM_ACC, "FG_BATCOM_ACC"},
+        [AB5500_BANK_USB] = {AB5500_ADDR_USB, "USB"},
+        [AB5500_BANK_IT] = {AB5500_ADDR_IT, "IT"},
+        [AB5500_BANK_VIBRA] = {AB5500_ADDR_VIBRA, "VIBRA"},
+        [AB5500_BANK_AUDIO_HEADSETUSB] = {
+                AB5500_ADDR_AUDIO_HEADSETUSB, "AUDIO_HEADSETUSB"},
+};
+int ab5500_get_register_interruptible_raw(struct ab5500 *ab, u8 bank, u8 reg,
+        u8 *value);
+int ab5500_mask_and_set_register_interruptible_raw(struct ab5500 *ab, u8 bank,
+        u8 reg, u8 bitmask, u8 bitvalues);
diff --git a/drivers/mfd/ab5500-debugfs.c b/drivers/mfd/ab5500-debugfs.c
new file mode 100644
index 000000000000..6be1fe6b5f9a
--- /dev/null
+++ b/drivers/mfd/ab5500-debugfs.c
@@ -0,0 +1,806 @@
+/*
+ * Copyright (C) 2011 ST-Ericsson
+ * License terms: GNU General Public License (GPL) version 2
+ * Debugfs support for the AB5500 MFD driver
+ */
+#include <linux/debugfs.h>
+#include <linux/seq_file.h>
+#include <linux/mfd/ab5500/ab5500.h>
+#include <linux/mfd/abx500.h>
+#include <linux/uaccess.h>
+#include "ab5500-core.h"
+#include "ab5500-debugfs.h"
+static struct ab5500_i2c_ranges ab5500_reg_ranges[AB5500_NUM_BANKS] = {
+        [AB5500_BANK_LED] = {
+                .bankid = AB5500_BANK_LED,
+                .nranges = 1,
+                .range = (struct ab5500_reg_range[]) {
+                        {
+                                .first = 0x00,
+                                .last = 0x0C,
+                                .perm = AB5500_PERM_RW,
+                        },
+                },
+        },
+        [AB5500_BANK_ADC] = {
+                .bankid = AB5500_BANK_ADC,
+                .nranges = 6,
+                .range = (struct ab5500_reg_range[]) {
+                        {
+                                .first = 0x1F,
+                                .last = 0x22,
+                                .perm = AB5500_PERM_RO,
+                        },
+                        {
+                                .first = 0x23,
+                                .last = 0x24,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x26,
+                                .last = 0x2D,
+                                .perm = AB5500_PERM_RO,
+                        },
+                        {
+                                .first = 0x2F,
+                                .last = 0x34,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x37,
+                                .last = 0x57,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x58,
+                                .last = 0x58,
+                                .perm = AB5500_PERM_RO,
+                        },
+                },
+        },
+        [AB5500_BANK_RTC] = {
+                .bankid = AB5500_BANK_RTC,
+                .nranges = 2,
+                .range = (struct ab5500_reg_range[]) {
+                        {
+                                .first = 0x00,
+                                .last = 0x04,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x06,
+                                .last = 0x0C,
+                                .perm = AB5500_PERM_RW,
+                        },
+                },
+        },
+        [AB5500_BANK_STARTUP] = {
+                .bankid = AB5500_BANK_STARTUP,
+                .nranges = 12,
+                .range = (struct ab5500_reg_range[]) {
+                        {
+                                .first = 0x00,
+                                .last = 0x01,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x1F,
+                                .last = 0x1F,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x2E,
+                                .last = 0x2E,
+                                .perm = AB5500_PERM_RO,
+                        },
+                        {
+                                .first = 0x2F,
+                                .last = 0x30,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x50,
+                                .last = 0x51,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x60,
+                                .last = 0x61,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x66,
+                                .last = 0x8A,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x8C,
+                                .last = 0x96,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0xAA,
+                                .last = 0xB4,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0xB7,
+                                .last = 0xBF,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0xC1,
+                                .last = 0xCA,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0xD3,
+                                .last = 0xE0,
+                                .perm = AB5500_PERM_RW,
+                        },
+                },
+        },
+        [AB5500_BANK_DBI_ECI] = {
+                .bankid = AB5500_BANK_DBI_ECI,
+                .nranges = 3,
+                .range = (struct ab5500_reg_range[]) {
+                        {
+                                .first = 0x00,
+                                .last = 0x07,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x10,
+                                .last = 0x10,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x13,
+                                .last = 0x13,
+                                .perm = AB5500_PERM_RW,
+                        },
+                },
+        },
+        [AB5500_BANK_CHG] = {
+                .bankid = AB5500_BANK_CHG,
+                .nranges = 2,
+                .range = (struct ab5500_reg_range[]) {
+                        {
+                                .first = 0x11,
+                                .last = 0x11,
+                                .perm = AB5500_PERM_RO,
+                        },
+                        {
+                                .first = 0x12,
+                                .last = 0x1B,
+                                .perm = AB5500_PERM_RW,
+                        },
+                },
+        },
+        [AB5500_BANK_FG_BATTCOM_ACC] = {
+                .bankid = AB5500_BANK_FG_BATTCOM_ACC,
+                .nranges = 2,
+                .range = (struct ab5500_reg_range[]) {
+                        {
+                                .first = 0x00,
+                                .last = 0x0B,
+                                .perm = AB5500_PERM_RO,
+                        },
+                        {
+                                .first = 0x0C,
+                                .last = 0x10,
+                                .perm = AB5500_PERM_RW,
+                        },
+                },
+        },
+        [AB5500_BANK_USB] = {
+                .bankid = AB5500_BANK_USB,
+                .nranges = 12,
+                .range = (struct ab5500_reg_range[]) {
+                        {
+                                .first = 0x01,
+                                .last = 0x01,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x80,
+                                .last = 0x83,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x87,
+                                .last = 0x8A,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x8B,
+                                .last = 0x8B,
+                                .perm = AB5500_PERM_RO,
+                        },
+                        {
+                                .first = 0x91,
+                                .last = 0x92,
+                                .perm = AB5500_PERM_RO,
+                        },
+                        {
+                                .first = 0x93,
+                                .last = 0x93,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x94,
+                                .last = 0x94,
+                                .perm = AB5500_PERM_RO,
+                        },
+                        {
+                                .first = 0xA8,
+                                .last = 0xB0,
+                                .perm = AB5500_PERM_RO,
+                        },
+                        {
+                                .first = 0xB2,
+                                .last = 0xB2,
+                                .perm = AB5500_PERM_RO,
+                        },
+                        {
+                                .first = 0xB4,
+                                .last = 0xBC,
+                                .perm = AB5500_PERM_RO,
+                        },
+                        {
+                                .first = 0xBF,
+                                .last = 0xBF,
+                                .perm = AB5500_PERM_RO,
+                        },
+                        {
+                                .first = 0xC1,
+                                .last = 0xC5,
+                                .perm = AB5500_PERM_RO,
+                        },
+                },
+        },
+        [AB5500_BANK_IT] = {
+                .bankid = AB5500_BANK_IT,
+                .nranges = 4,
+                .range = (struct ab5500_reg_range[]) {
+                        {
+                                .first = 0x00,
+                                .last = 0x02,
+                                .perm = AB5500_PERM_RO,
+                        },
+                        {
+                                .first = 0x20,
+                                .last = 0x36,
+                                .perm = AB5500_PERM_RO,
+                        },
+                        {
+                                .first = 0x40,
+                                .last = 0x56,
+                                .perm = AB5500_PERM_RO,
+                        },
+                        {
+                                .first = 0x60,
+                                .last = 0x76,
+                                .perm = AB5500_PERM_RO,
+                        },
+                },
+        },
+        [AB5500_BANK_VDDDIG_IO_I2C_CLK_TST] = {
+                .bankid = AB5500_BANK_VDDDIG_IO_I2C_CLK_TST,
+                .nranges = 7,
+                .range = (struct ab5500_reg_range[]) {
+                        {
+                                .first = 0x02,
+                                .last = 0x02,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x12,
+                                .last = 0x12,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x30,
+                                .last = 0x34,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x40,
+                                .last = 0x44,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x50,
+                                .last = 0x54,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x60,
+                                .last = 0x64,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x70,
+                                .last = 0x74,
+                                .perm = AB5500_PERM_RW,
+                        },
+                },
+        },
+        [AB5500_BANK_VIT_IO_I2C_CLK_TST_OTP] = {
+                .bankid = AB5500_BANK_VIT_IO_I2C_CLK_TST_OTP,
+                .nranges = 13,
+                .range = (struct ab5500_reg_range[]) {
+                        {
+                                .first = 0x01,
+                                .last = 0x01,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x02,
+                                .last = 0x02,
+                                .perm = AB5500_PERM_RO,
+                        },
+                        {
+                                .first = 0x0D,
+                                .last = 0x0F,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x1C,
+                                .last = 0x1C,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x1E,
+                                .last = 0x1E,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x20,
+                                .last = 0x21,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x25,
+                                .last = 0x25,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x28,
+                                .last = 0x2A,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x30,
+                                .last = 0x33,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x40,
+                                .last = 0x43,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x50,
+                                .last = 0x53,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x60,
+                                .last = 0x63,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x70,
+                                .last = 0x73,
+                                .perm = AB5500_PERM_RW,
+                        },
+                },
+        },
+        [AB5500_BANK_VIBRA] = {
+                .bankid = AB5500_BANK_VIBRA,
+                .nranges = 2,
+                .range = (struct ab5500_reg_range[]) {
+                        {
+                                .first = 0x10,
+                                .last = 0x13,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0xFE,
+                                .last = 0xFE,
+                                .perm = AB5500_PERM_RW,
+                        },
+                },
+        },
+        [AB5500_BANK_AUDIO_HEADSETUSB] = {
+                .bankid = AB5500_BANK_AUDIO_HEADSETUSB,
+                .nranges = 2,
+                .range = (struct ab5500_reg_range[]) {
+                        {
+                                .first = 0x00,
+                                .last = 0x48,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0xEB,
+                                .last = 0xFB,
+                                .perm = AB5500_PERM_RW,
+                        },
+                },
+        },
+        [AB5500_BANK_SIM_USBSIM] = {
+                .bankid = AB5500_BANK_SIM_USBSIM,
+                .nranges = 1,
+                .range = (struct ab5500_reg_range[]) {
+                        {
+                                .first = 0x13,
+                                .last = 0x19,
+                                .perm = AB5500_PERM_RW,
+                        },
+                },
+        },
+        [AB5500_BANK_VDENC] = {
+                .bankid = AB5500_BANK_VDENC,
+                .nranges = 12,
+                .range = (struct ab5500_reg_range[]) {
+                        {
+                                .first = 0x00,
+                                .last = 0x08,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x09,
+                                .last = 0x09,
+                                .perm = AB5500_PERM_RO,
+                        },
+                        {
+                                .first = 0x0A,
+                                .last = 0x12,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x15,
+                                .last = 0x19,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x1B,
+                                .last = 0x21,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x27,
+                                .last = 0x2C,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x41,
+                                .last = 0x41,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x45,
+                                .last = 0x5B,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x5D,
+                                .last = 0x5D,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x69,
+                                .last = 0x69,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x6C,
+                                .last = 0x6D,
+                                .perm = AB5500_PERM_RW,
+                        },
+                        {
+                                .first = 0x80,
+                                .last = 0x81,
+                                .perm = AB5500_PERM_RW,
+                        },
+                },
+        },
+};
+static int ab5500_registers_print(struct seq_file *s, void *p)
+{
+        struct ab5500 *ab = s->private;
+        unsigned int i;
+        u8 bank = (u8)ab->debug_bank;
+        seq_printf(s, "ab5500 register values:\n");
+        for (bank = 0; bank < AB5500_NUM_BANKS; bank++) {
+                seq_printf(s, " bank %u, %s (0x%x):\n", bank,
+                                bankinfo[bank].name,
+                                bankinfo[bank].slave_addr);
+                for (i = 0; i < ab5500_reg_ranges[bank].nranges; i++) {
+                        u8 reg;
+                        int err;
+                        for (reg = ab5500_reg_ranges[bank].range[i].first;
+                                reg <= ab5500_reg_ranges[bank].range[i].last;
+                                reg++) {
+                                u8 value;
+                                err = ab5500_get_register_interruptible_raw(ab,
+                                                                bank, reg,
+                                                                &value);
+                                if (err < 0) {
+                                        dev_err(ab->dev, "get_reg failed %d"
+                                                "bank 0x%x reg 0x%x\n",
+                                                err, bank, reg);
+                                        return err;
+                                }
+                                err = seq_printf(s, "[%d/0x%02X]: 0x%02X\n",
+                                                bank, reg, value);
+                                if (err < 0) {
+                                        dev_err(ab->dev,
+                                                "seq_printf overflow\n");
+                                        /*
+                                         * Error is not returned here since
+                                         * the output is wanted in any case
+                                         */
+                                        return 0;
+                                }
+                        }
+                }
+        }
+        return 0;
+}
+static int ab5500_registers_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, ab5500_registers_print, inode->i_private);
+}
+static const struct file_operations ab5500_registers_fops = {
+        .open = ab5500_registers_open,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = single_release,
+        .owner = THIS_MODULE,
+};
+static int ab5500_bank_print(struct seq_file *s, void *p)
+{
+        struct ab5500 *ab = s->private;
+        seq_printf(s, "%d\n", ab->debug_bank);
+        return 0;
+}
+static int ab5500_bank_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, ab5500_bank_print, inode->i_private);
+}
+static ssize_t ab5500_bank_write(struct file *file,
+        const char __user *user_buf,
+        size_t count, loff_t *ppos)
+{
+        struct ab5500 *ab = ((struct seq_file *)(file->private_data))->private;
+        char buf[32];
+        int buf_size;
+        unsigned long user_bank;
+        int err;
+        /* Get userspace string and assure termination */
+        buf_size = min(count, (sizeof(buf) - 1));
+        if (copy_from_user(buf, user_buf, buf_size))
+                return -EFAULT;
+        buf[buf_size] = 0;
+        err = strict_strtoul(buf, 0, &user_bank);
+        if (err)
+                return -EINVAL;
+        if (user_bank >= AB5500_NUM_BANKS) {
+                dev_err(ab->dev,
+                        "debugfs error input > number of banks\n");
+                return -EINVAL;
+        }
+        ab->debug_bank = user_bank;
+        return buf_size;
+}
+static int ab5500_address_print(struct seq_file *s, void *p)
+{
+        struct ab5500 *ab = s->private;
+        seq_printf(s, "0x%02X\n", ab->debug_address);
+        return 0;
+}
+static int ab5500_address_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, ab5500_address_print, inode->i_private);
+}
+static ssize_t ab5500_address_write(struct file *file,
+        const char __user *user_buf,
+        size_t count, loff_t *ppos)
+{
+        struct ab5500 *ab = ((struct seq_file *)(file->private_data))->private;
+        char buf[32];
+        int buf_size;
+        unsigned long user_address;
+        int err;
+        /* Get userspace string and assure termination */
+        buf_size = min(count, (sizeof(buf) - 1));
+        if (copy_from_user(buf, user_buf, buf_size))
+                return -EFAULT;
+        buf[buf_size] = 0;
+        err = strict_strtoul(buf, 0, &user_address);
+        if (err)
+                return -EINVAL;
+        if (user_address > 0xff) {
+                dev_err(ab->dev,
+                        "debugfs error input > 0xff\n");
+                return -EINVAL;
+        }
+        ab->debug_address = user_address;
+        return buf_size;
+}
+static int ab5500_val_print(struct seq_file *s, void *p)
+{
+        struct ab5500 *ab = s->private;
+        int err;
+        u8 regvalue;
+        err = ab5500_get_register_interruptible_raw(ab, (u8)ab->debug_bank,
+                (u8)ab->debug_address, &regvalue);
+        if (err) {
+                dev_err(ab->dev, "get_reg failed %d, bank 0x%x"
+                        ", reg 0x%x\n", err, ab->debug_bank,
+                        ab->debug_address);
+                return -EINVAL;
+        }
+        seq_printf(s, "0x%02X\n", regvalue);
+        return 0;
+}
+static int ab5500_val_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, ab5500_val_print, inode->i_private);
+}
+static ssize_t ab5500_val_write(struct file *file,
+        const char __user *user_buf,
+        size_t count, loff_t *ppos)
+{
+        struct ab5500 *ab = ((struct seq_file *)(file->private_data))->private;
+        char buf[32];
+        int buf_size;
+        unsigned long user_val;
+        int err;
+        u8 regvalue;
+        /* Get userspace string and assure termination */
+        buf_size = min(count, (sizeof(buf)-1));
+        if (copy_from_user(buf, user_buf, buf_size))
+                return -EFAULT;
+        buf[buf_size] = 0;
+        err = strict_strtoul(buf, 0, &user_val);
+        if (err)
+                return -EINVAL;
+        if (user_val > 0xff) {
+                dev_err(ab->dev,
+                        "debugfs error input > 0xff\n");
+                return -EINVAL;
+        }
+        err = ab5500_mask_and_set_register_interruptible_raw(
+                ab, (u8)ab->debug_bank,
+                (u8)ab->debug_address, 0xFF, (u8)user_val);
+        if (err)
+                return -EINVAL;
+        ab5500_get_register_interruptible_raw(ab, (u8)ab->debug_bank,
+                (u8)ab->debug_address, &regvalue);
+        if (err)
+                return -EINVAL;
+        return buf_size;
+}
+static const struct file_operations ab5500_bank_fops = {
+        .open = ab5500_bank_open,
+        .write = ab5500_bank_write,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = single_release,
+        .owner = THIS_MODULE,
+};
+static const struct file_operations ab5500_address_fops = {
+        .open = ab5500_address_open,
+        .write = ab5500_address_write,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = single_release,
+        .owner = THIS_MODULE,
+};
+static const struct file_operations ab5500_val_fops = {
+        .open = ab5500_val_open,
+        .write = ab5500_val_write,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = single_release,
+        .owner = THIS_MODULE,
+};
+static struct dentry *ab5500_dir;
+static struct dentry *ab5500_reg_file;
+static struct dentry *ab5500_bank_file;
+static struct dentry *ab5500_address_file;
+static struct dentry *ab5500_val_file;
+void __init ab5500_setup_debugfs(struct ab5500 *ab)
+{
+        ab->debug_bank = AB5500_BANK_VIT_IO_I2C_CLK_TST_OTP;
+        ab->debug_address = AB5500_CHIP_ID;
+        ab5500_dir = debugfs_create_dir("ab5500", NULL);
+        if (!ab5500_dir)
+                goto exit_no_debugfs;
+        ab5500_reg_file = debugfs_create_file("all-bank-registers",
+                S_IRUGO, ab5500_dir, ab, &ab5500_registers_fops);
+        if (!ab5500_reg_file)
+                goto exit_destroy_dir;
+        ab5500_bank_file = debugfs_create_file("register-bank",
+                (S_IRUGO | S_IWUGO), ab5500_dir, ab, &ab5500_bank_fops);
+        if (!ab5500_bank_file)
+                goto exit_destroy_reg;
+        ab5500_address_file = debugfs_create_file("register-address",
+                (S_IRUGO | S_IWUGO), ab5500_dir, ab, &ab5500_address_fops);
+        if (!ab5500_address_file)
+                goto exit_destroy_bank;
+        ab5500_val_file = debugfs_create_file("register-value",
+                (S_IRUGO | S_IWUGO), ab5500_dir, ab, &ab5500_val_fops);
+        if (!ab5500_val_file)
+                goto exit_destroy_address;
+        return;
+exit_destroy_address:
+        debugfs_remove(ab5500_address_file);
+exit_destroy_bank:
+        debugfs_remove(ab5500_bank_file);
+exit_destroy_reg:
+        debugfs_remove(ab5500_reg_file);
+exit_destroy_dir:
+        debugfs_remove(ab5500_dir);
+exit_no_debugfs:
+        dev_err(ab->dev, "failed to create debugfs entries.\n");
+        return;
+}
+void __exit ab5500_remove_debugfs(void)
+{
+        debugfs_remove(ab5500_val_file);
+        debugfs_remove(ab5500_address_file);
+        debugfs_remove(ab5500_bank_file);
+        debugfs_remove(ab5500_reg_file);
+        debugfs_remove(ab5500_dir);
+}
diff --git a/drivers/mfd/ab5500-debugfs.h b/drivers/mfd/ab5500-debugfs.h
new file mode 100644
index 000000000000..7330a9b6afa6
--- /dev/null
+++ b/drivers/mfd/ab5500-debugfs.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2011 ST-Ericsson
+ * License terms: GNU General Public License (GPL) version 2
+ * Debugfs interface to the AB5500 core driver
+ */
+#ifdef CONFIG_DEBUG_FS
+void ab5500_setup_debugfs(struct ab5500 *ab);
+void ab5500_remove_debugfs(void);
+#else /* !CONFIG_DEBUG_FS */
+static inline void ab5500_setup_debugfs(struct ab5500 *ab)
+{
+}
+static inline void ab5500_remove_debugfs(void)
+{
+}
+#endif
diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index 387705e494b9..1e9173804ede 100644
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -92,6 +92,8 @@
 #define AB8500_REV_REG                  0x80
 #define AB8500_SWITCH_OFF_STATUS        0x00
+#define AB8500_TURN_ON_STATUS           0x00
 /*
 * Map interrupt numbers to the LATCH and MASK register offsets, Interrupt
 * numbers are indexed into this array with (num / 8).
@@ -293,6 +295,7 @@ static struct irq_chip ab8500_irq_chip = {
        .irq_bus_lock           = ab8500_irq_lock,
        .irq_bus_sync_unlock    = ab8500_irq_sync_unlock,
        .irq_mask               = ab8500_irq_mask,
+        .irq_disable            = ab8500_irq_mask,
        .irq_unmask             = ab8500_irq_unmask,
 };
@@ -811,12 +814,40 @@ static ssize_t show_switch_off_status(struct device *dev,
        return sprintf(buf, "%#x\n", value);
 }
+/*
+ * ab8500 has turned on due to (TURN_ON_STATUS):
+ * 0x01 PORnVbat
+ * 0x02 PonKey1dbF
+ * 0x04 PonKey2dbF
+ * 0x08 RTCAlarm
+ * 0x10 MainChDet
+ * 0x20 VbusDet
+ * 0x40 UsbIDDetect
+ * 0x80 Reserved
+ */
+static ssize_t show_turn_on_status(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        int ret;
+        u8 value;
+        struct ab8500 *ab8500;
+        ab8500 = dev_get_drvdata(dev);
+        ret = get_register_interruptible(ab8500, AB8500_SYS_CTRL1_BLOCK,
+                AB8500_TURN_ON_STATUS, &value);
+        if (ret < 0)
+                return ret;
+        return sprintf(buf, "%#x\n", value);
+}
 static DEVICE_ATTR(chip_id, S_IRUGO, show_chip_id, NULL);
 static DEVICE_ATTR(switch_off_status, S_IRUGO, show_switch_off_status, NULL);
+static DEVICE_ATTR(turn_on_status, S_IRUGO, show_turn_on_status, NULL);
 static struct attribute *ab8500_sysfs_entries[] = {
        &dev_attr_chip_id.attr,
        &dev_attr_switch_off_status.attr,
+        &dev_attr_turn_on_status.attr,
        NULL,
 };
@@ -843,11 +874,11 @@ int __devinit ab8500_init(struct ab8500 *ab8500)
                return ret;
        switch (value) {
-        case AB8500_CUTEARLY:
        case AB8500_CUT1P0:
        case AB8500_CUT1P1:
        case AB8500_CUT2P0:
        case AB8500_CUT3P0:
+        case AB8500_CUT3P3:
                dev_info(ab8500->dev, "detected chip, revision: %#x\n", value);
                break;
        default:
diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
index 64bdeeb1c11a..dedb7f65cea6 100644
--- a/drivers/mfd/ab8500-debugfs.c
+++ b/drivers/mfd/ab8500-debugfs.c
@@ -8,6 +8,7 @@
 #include <linux/seq_file.h>
 #include <linux/uaccess.h>
 #include <linux/fs.h>
+#include <linux/module.h>
 #include <linux/debugfs.h>
 #include <linux/platform_device.h>
diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c
index f16afb234ff9..e985d1701a83 100644
--- a/drivers/mfd/ab8500-gpadc.c
+++ b/drivers/mfd/ab8500-gpadc.c
@@ -143,12 +143,15 @@ struct ab8500_gpadc *ab8500_gpadc_get(char *name)
 }
 EXPORT_SYMBOL(ab8500_gpadc_get);
-static int ab8500_gpadc_ad_to_voltage(struct ab8500_gpadc *gpadc, u8 input,
+/**
+ * ab8500_gpadc_ad_to_voltage() - Convert a raw ADC value to a voltage
+ */
+int ab8500_gpadc_ad_to_voltage(struct ab8500_gpadc *gpadc, u8 channel,
        int ad_value)
 {
        int res;
-        switch (input) {
+        switch (channel) {
        case MAIN_CHARGER_V:
                /* For some reason we don't have calibrated data */
                if (!gpadc->cal_data[ADC_INPUT_VMAIN].gain) {
@@ -232,18 +235,46 @@ static int ab8500_gpadc_ad_to_voltage(struct ab8500_gpadc *gpadc, u8 input,
        }
        return res;
 }
+EXPORT_SYMBOL(ab8500_gpadc_ad_to_voltage);
 /**
 * ab8500_gpadc_convert() - gpadc conversion
- * @input:      analog input to be converted to digital data
+ * @channel:    analog channel to be converted to digital data
 *
 * This function converts the selected analog i/p to digital
 * data.
 */
-int ab8500_gpadc_convert(struct ab8500_gpadc *gpadc, u8 input)
+int ab8500_gpadc_convert(struct ab8500_gpadc *gpadc, u8 channel)
+{
+        int ad_value;
+        int voltage;
+        ad_value = ab8500_gpadc_read_raw(gpadc, channel);
+        if (ad_value < 0) {
+                dev_err(gpadc->dev, "GPADC raw value failed ch: %d\n", channel);
+                return ad_value;
+        }
+        voltage = ab8500_gpadc_ad_to_voltage(gpadc, channel, ad_value);
+        if (voltage < 0)
+                dev_err(gpadc->dev, "GPADC to voltage conversion failed ch:"
+                        " %d AD: 0x%x\n", channel, ad_value);
+        return voltage;
+}
+EXPORT_SYMBOL(ab8500_gpadc_convert);
+/**
+ * ab8500_gpadc_read_raw() - gpadc read
+ * @channel:    analog channel to be read
+ *
+ * This function obtains the raw ADC value, this then needs
+ * to be converted by calling ab8500_gpadc_ad_to_voltage()
+ */
+int ab8500_gpadc_read_raw(struct ab8500_gpadc *gpadc, u8 channel)
 {
        int ret;
-        u16 data = 0;
        int looplimit = 0;
        u8 val, low_data, high_data;
@@ -278,9 +309,9 @@ int ab8500_gpadc_convert(struct ab8500_gpadc *gpadc, u8 input)
                goto out;
        }
-        /* Select the input source and set average samples to 16 */
+        /* Select the channel source and set average samples to 16 */
        ret = abx500_set_register_interruptible(gpadc->dev, AB8500_GPADC,
-                AB8500_GPADC_CTRL2_REG, (input | SW_AVG_16));
+                AB8500_GPADC_CTRL2_REG, (channel | SW_AVG_16));
        if (ret < 0) {
                dev_err(gpadc->dev,
                        "gpadc_conversion: set avg samples failed\n");
@@ -292,7 +323,7 @@ int ab8500_gpadc_convert(struct ab8500_gpadc *gpadc, u8 input)
         * charging current sense if it needed, ABB 3.0 needs some special
         * treatment too.
         */
-        switch (input) {
+        switch (channel) {
        case MAIN_CHARGER_C:
        case USB_CHARGER_C:
                ret = abx500_mask_and_set_register_interruptible(gpadc->dev,
@@ -359,7 +390,6 @@ int ab8500_gpadc_convert(struct ab8500_gpadc *gpadc, u8 input)
                goto out;
        }
-        data = (high_data << 8) | low_data;
        /* Disable GPADC */
        ret = abx500_set_register_interruptible(gpadc->dev, AB8500_GPADC,
                AB8500_GPADC_CTRL1_REG, DIS_GPADC);
@@ -370,8 +400,8 @@ int ab8500_gpadc_convert(struct ab8500_gpadc *gpadc, u8 input)
        /* Disable VTVout LDO this is required for GPADC */
        regulator_disable(gpadc->regu);
        mutex_unlock(&gpadc->ab8500_gpadc_lock);
-        ret = ab8500_gpadc_ad_to_voltage(gpadc, input, data);
-        return ret;
+        return (high_data << 8) | low_data;
 out:
        /*
@@ -385,10 +415,10 @@ out:
        regulator_disable(gpadc->regu);
        mutex_unlock(&gpadc->ab8500_gpadc_lock);
        dev_err(gpadc->dev,
-                "gpadc_conversion: Failed to AD convert channel %d\n", input);
+                "gpadc_conversion: Failed to AD convert channel %d\n", channel);
        return ret;
 }
-EXPORT_SYMBOL(ab8500_gpadc_convert);
+EXPORT_SYMBOL(ab8500_gpadc_read_raw);
 /**
 * ab8500_bm_gpswadcconvend_handler() - isr for s/w gpadc conversion completion
diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c
index 392185965b39..f20feefac190 100644
--- a/drivers/mfd/ab8500-sysctrl.c
+++ b/drivers/mfd/ab8500-sysctrl.c
@@ -5,6 +5,7 @@
 */
 #include <linux/err.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/ab8500.h>
 #include <linux/mfd/abx500.h>
diff --git a/drivers/mfd/abx500-core.c b/drivers/mfd/abx500-core.c
index f12720dbe126..7ce65f49480f 100644
--- a/drivers/mfd/abx500-core.c
+++ b/drivers/mfd/abx500-core.c
@@ -8,6 +8,7 @@
 #include <linux/list.h>
 #include <linux/slab.h>
 #include <linux/err.h>
+#include <linux/module.h>
 #include <linux/mfd/abx500.h>
 static LIST_HEAD(abx500_list);
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index c71ae09430c5..b85bbd7f0d19 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/irq.h>
 #include <linux/gpio.h>
+#include <linux/export.h>
 #include <linux/io.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
@@ -584,7 +585,7 @@ static int asic3_gpio_remove(struct platform_device *pdev)
        return gpiochip_remove(&asic->gpio);
 }
-static int asic3_clk_enable(struct asic3 *asic, struct asic3_clk *clk)
+static void asic3_clk_enable(struct asic3 *asic, struct asic3_clk *clk)
 {
        unsigned long flags;
        u32 cdex;
@@ -596,8 +597,6 @@ static int asic3_clk_enable(struct asic3 *asic, struct asic3_clk *clk)
                asic3_write_register(asic, ASIC3_OFFSET(CLOCK, CDEX), cdex);
        }
        spin_unlock_irqrestore(&asic->lock, flags);
-        return 0;
 }
 static void asic3_clk_disable(struct asic3 *asic, struct asic3_clk *clk)
@@ -779,6 +778,8 @@ static struct mfd_cell asic3_cell_mmc = {
        .name          = "tmio-mmc",
        .enable        = asic3_mmc_enable,
        .disable       = asic3_mmc_disable,
+        .suspend       = asic3_mmc_disable,
+        .resume        = asic3_mmc_enable,
        .platform_data = &asic3_mmc_data,
        .pdata_size    = sizeof(asic3_mmc_data),
        .num_resources = ARRAY_SIZE(asic3_mmc_resources),
@@ -811,24 +812,43 @@ static int asic3_leds_disable(struct platform_device *pdev)
        return 0;
 }
+static int asic3_leds_suspend(struct platform_device *pdev)
+{
+        const struct mfd_cell *cell = mfd_get_cell(pdev);
+        struct asic3 *asic = dev_get_drvdata(pdev->dev.parent);
+        while (asic3_gpio_get(&asic->gpio, ASIC3_GPIO(C, cell->id)) != 0)
+                msleep(1);
+        asic3_clk_disable(asic, &asic->clocks[clock_ledn[cell->id]]);
+        return 0;
+}
 static struct mfd_cell asic3_cell_leds[ASIC3_NUM_LEDS] = {
        [0] = {
                .name          = "leds-asic3",
                .id            = 0,
                .enable        = asic3_leds_enable,
                .disable       = asic3_leds_disable,
+                .suspend       = asic3_leds_suspend,
+                .resume        = asic3_leds_enable,
        },
        [1] = {
                .name          = "leds-asic3",
                .id            = 1,
                .enable        = asic3_leds_enable,
                .disable       = asic3_leds_disable,
+                .suspend       = asic3_leds_suspend,
+                .resume        = asic3_leds_enable,
        },
        [2] = {
                .name          = "leds-asic3",
                .id            = 2,
                .enable        = asic3_leds_enable,
                .disable       = asic3_leds_disable,
+                .suspend       = asic3_leds_suspend,
+                .resume        = asic3_leds_enable,
        },
 };
@@ -949,6 +969,7 @@ static int __init asic3_probe(struct platform_device *pdev)
                goto out_unmap;
        }
+        asic->gpio.label = "asic3";
        asic->gpio.base = pdata->gpio_base;
        asic->gpio.ngpio = ASIC3_NUM_GPIOS;
        asic->gpio.get = asic3_gpio_get;
diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c
index 2fadbaeb1cb1..1b79c37fd599 100644
--- a/drivers/mfd/da903x.c
+++ b/drivers/mfd/da903x.c
@@ -523,7 +523,7 @@ static int __devinit da903x_probe(struct i2c_client *client,
        chip->ops->read_events(chip, &tmp);
        ret = request_irq(client->irq, da903x_irq_handler,
-                        IRQF_DISABLED | IRQF_TRIGGER_FALLING,
+                        IRQF_TRIGGER_FALLING,
                        "da903x", chip);
        if (ret) {
                dev_err(&client->dev, "failed to request irq %d\n",
diff --git a/drivers/mfd/db5500-prcmu.c b/drivers/mfd/db5500-prcmu.c
index 9dbb3cab4a6f..bb115b2f04e9 100644
--- a/drivers/mfd/db5500-prcmu.c
+++ b/drivers/mfd/db5500-prcmu.c
@@ -20,11 +20,11 @@
 #include <linux/jiffies.h>
 #include <linux/bitops.h>
 #include <linux/interrupt.h>
-#include <linux/mfd/db5500-prcmu.h>
+#include <linux/mfd/dbx500-prcmu.h>
 #include <mach/hardware.h>
 #include <mach/irqs.h>
 #include <mach/db5500-regs.h>
-#include "db5500-prcmu-regs.h"
+#include "dbx500-prcmu-regs.h"
 #define _PRCM_MB_HEADER (tcdm_base + 0xFE8)
 #define PRCM_REQ_MB0_HEADER (_PRCM_MB_HEADER + 0x0)
@@ -109,15 +109,18 @@ enum mb5_header {
 #define PRCMU_DSI_CLOCK_SETTING                 0x00000128
 /* TVCLK_MGT PLLSW=001 (PLLSOC0) PLLDIV=0x13, = 19.05 MHZ */
 #define PRCMU_DSI_LP_CLOCK_SETTING              0x00000135
-#define PRCMU_PLLDSI_FREQ_SETTING               0x0004013C
+#define PRCMU_PLLDSI_FREQ_SETTING               0x00020121
 #define PRCMU_DSI_PLLOUT_SEL_SETTING            0x00000002
-#define PRCMU_ENABLE_ESCAPE_CLOCK_DIV           0x03000101
+#define PRCMU_ENABLE_ESCAPE_CLOCK_DIV           0x03000201
 #define PRCMU_DISABLE_ESCAPE_CLOCK_DIV          0x00000101
 #define PRCMU_ENABLE_PLLDSI                     0x00000001
 #define PRCMU_DISABLE_PLLDSI                    0x00000000
 #define PRCMU_DSI_RESET_SW                      0x00000003
+#define PRCMU_RESOUTN0_PIN                      0x00000001
+#define PRCMU_RESOUTN1_PIN                      0x00000002
+#define PRCMU_RESOUTN2_PIN                      0x00000004
 #define PRCMU_PLLDSI_LOCKP_LOCKED               0x3
@@ -315,31 +318,31 @@ static bool read_mailbox_0(void)
                r = false;
                break;
        }
-        writel(MBOX_BIT(0), PRCM_ARM_IT1_CLEAR);
+        writel(MBOX_BIT(0), PRCM_ARM_IT1_CLR);
        return r;
 }
 static bool read_mailbox_1(void)
 {
-        writel(MBOX_BIT(1), PRCM_ARM_IT1_CLEAR);
+        writel(MBOX_BIT(1), PRCM_ARM_IT1_CLR);
        return false;
 }
 static bool read_mailbox_2(void)
 {
-        writel(MBOX_BIT(2), PRCM_ARM_IT1_CLEAR);
+        writel(MBOX_BIT(2), PRCM_ARM_IT1_CLR);
        return false;
 }
 static bool read_mailbox_3(void)
 {
-        writel(MBOX_BIT(3), PRCM_ARM_IT1_CLEAR);
+        writel(MBOX_BIT(3), PRCM_ARM_IT1_CLR);
        return false;
 }
 static bool read_mailbox_4(void)
 {
-        writel(MBOX_BIT(4), PRCM_ARM_IT1_CLEAR);
+        writel(MBOX_BIT(4), PRCM_ARM_IT1_CLR);
        return false;
 }
@@ -360,19 +363,19 @@ static bool read_mailbox_5(void)
                print_unknown_header_warning(5, header);
                break;
        }
-        writel(MBOX_BIT(5), PRCM_ARM_IT1_CLEAR);
+        writel(MBOX_BIT(5), PRCM_ARM_IT1_CLR);
        return false;
 }
 static bool read_mailbox_6(void)
 {
-        writel(MBOX_BIT(6), PRCM_ARM_IT1_CLEAR);
+        writel(MBOX_BIT(6), PRCM_ARM_IT1_CLR);
        return false;
 }
 static bool read_mailbox_7(void)
 {
-        writel(MBOX_BIT(7), PRCM_ARM_IT1_CLEAR);
+        writel(MBOX_BIT(7), PRCM_ARM_IT1_CLR);
        return false;
 }
@@ -434,7 +437,7 @@ int __init db5500_prcmu_init(void)
                return -ENODEV;
        /* Clean up the mailbox interrupts after pre-kernel code. */
-        writel(ALL_MBOX_BITS, PRCM_ARM_IT1_CLEAR);
+        writel(ALL_MBOX_BITS, PRCM_ARM_IT1_CLR);
        r = request_threaded_irq(IRQ_DB5500_PRCMU1, prcmu_irq_handler,
                prcmu_irq_thread_fn, 0, "prcmu", NULL);
diff --git a/drivers/mfd/db8500-prcmu-regs.h b/drivers/mfd/db8500-prcmu-regs.h
deleted file mode 100644
index 3bbf04d58043..000000000000
--- a/drivers/mfd/db8500-prcmu-regs.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (C) STMicroelectronics 2009
- * Copyright (C) ST-Ericsson SA 2010
- *
- * Author: Kumar Sanghvi <kumar.sanghvi@stericsson.com>
- * Author: Sundar Iyer <sundar.iyer@stericsson.com>
- *
- * License Terms: GNU General Public License v2
- *
- * PRCM Unit registers
- */
-#ifndef __DB8500_PRCMU_REGS_H
-#define __DB8500_PRCMU_REGS_H
-#include <linux/bitops.h>
-#include <mach/hardware.h>
-#define BITS(_start, _end) ((BIT(_end) - BIT(_start)) + BIT(_end))
-#define PRCM_ARM_PLLDIVPS 0x118
-#define PRCM_ARM_PLLDIVPS_ARM_BRM_RATE  BITS(0, 5)
-#define PRCM_ARM_PLLDIVPS_MAX_MASK      0xF
-#define PRCM_PLLARM_LOCKP 0x0A8
-#define PRCM_PLLARM_LOCKP_PRCM_PLLARM_LOCKP3 BIT(1)
-#define PRCM_ARM_CHGCLKREQ 0x114
-#define PRCM_ARM_CHGCLKREQ_PRCM_ARM_CHGCLKREQ BIT(0)
-#define PRCM_PLLARM_ENABLE 0x98
-#define PRCM_PLLARM_ENABLE_PRCM_PLLARM_ENABLE   BIT(0)
-#define PRCM_PLLARM_ENABLE_PRCM_PLLARM_COUNTON  BIT(8)
-#define PRCM_ARMCLKFIX_MGT      0x0
-#define PRCM_A9_RESETN_CLR      0x1f4
-#define PRCM_A9_RESETN_SET      0x1f0
-#define PRCM_ARM_LS_CLAMP       0x30C
-#define PRCM_SRAM_A9            0x308
-/* ARM WFI Standby signal register */
-#define PRCM_ARM_WFI_STANDBY    0x130
-#define PRCM_IOCR               0x310
-#define PRCM_IOCR_IOFORCE BIT(0)
-/* CPU mailbox registers */
-#define PRCM_MBOX_CPU_VAL 0x0FC
-#define PRCM_MBOX_CPU_SET 0x100
-/* Dual A9 core interrupt management unit registers */
-#define PRCM_A9_MASK_REQ 0x328
-#define PRCM_A9_MASK_REQ_PRCM_A9_MASK_REQ BIT(0)
-#define PRCM_A9_MASK_ACK        0x32C
-#define PRCM_ARMITMSK31TO0      0x11C
-#define PRCM_ARMITMSK63TO32     0x120
-#define PRCM_ARMITMSK95TO64     0x124
-#define PRCM_ARMITMSK127TO96    0x128
-#define PRCM_POWER_STATE_VAL    0x25C
-#define PRCM_ARMITVAL31TO0      0x260
-#define PRCM_ARMITVAL63TO32     0x264
-#define PRCM_ARMITVAL95TO64     0x268
-#define PRCM_ARMITVAL127TO96    0x26C
-#define PRCM_HOSTACCESS_REQ 0x334
-#define PRCM_HOSTACCESS_REQ_HOSTACCESS_REQ BIT(0)
-#define PRCM_ARM_IT1_CLR 0x48C
-#define PRCM_ARM_IT1_VAL 0x494
-#define PRCM_ITSTATUS0          0x148
-#define PRCM_ITSTATUS1          0x150
-#define PRCM_ITSTATUS2          0x158
-#define PRCM_ITSTATUS3          0x160
-#define PRCM_ITSTATUS4          0x168
-#define PRCM_ITSTATUS5          0x484
-#define PRCM_ITCLEAR5           0x488
-#define PRCM_ARMIT_MASKXP70_IT  0x1018
-/* System reset register */
-#define PRCM_APE_SOFTRST 0x228
-/* Level shifter and clamp control registers */
-#define PRCM_MMIP_LS_CLAMP_SET 0x420
-#define PRCM_MMIP_LS_CLAMP_CLR 0x424
-/* PRCMU HW semaphore */
-#define PRCM_SEM 0x400
-#define PRCM_SEM_PRCM_SEM BIT(0)
-/* PRCMU clock/PLL/reset registers */
-#define PRCM_PLLDSI_FREQ        0x500
-#define PRCM_PLLDSI_ENABLE      0x504
-#define PRCM_PLLDSI_LOCKP       0x508
-#define PRCM_DSI_PLLOUT_SEL     0x530
-#define PRCM_DSITVCLK_DIV       0x52C
-#define PRCM_APE_RESETN_SET     0x1E4
-#define PRCM_APE_RESETN_CLR     0x1E8
-#define PRCM_TCR                0x1C8
-#define PRCM_TCR_TENSEL_MASK    BITS(0, 7)
-#define PRCM_TCR_STOP_TIMERS    BIT(16)
-#define PRCM_TCR_DOZE_MODE      BIT(17)
-#define PRCM_CLKOCR                     0x1CC
-#define PRCM_CLKOCR_CLKODIV0_SHIFT      0
-#define PRCM_CLKOCR_CLKODIV0_MASK       BITS(0, 5)
-#define PRCM_CLKOCR_CLKOSEL0_SHIFT      6
-#define PRCM_CLKOCR_CLKOSEL0_MASK       BITS(6, 8)
-#define PRCM_CLKOCR_CLKODIV1_SHIFT      16
-#define PRCM_CLKOCR_CLKODIV1_MASK       BITS(16, 21)
-#define PRCM_CLKOCR_CLKOSEL1_SHIFT      22
-#define PRCM_CLKOCR_CLKOSEL1_MASK       BITS(22, 24)
-#define PRCM_CLKOCR_CLK1TYPE            BIT(28)
-#define PRCM_SGACLK_MGT         0x014
-#define PRCM_UARTCLK_MGT        0x018
-#define PRCM_MSP02CLK_MGT       0x01C
-#define PRCM_MSP1CLK_MGT        0x288
-#define PRCM_I2CCLK_MGT         0x020
-#define PRCM_SDMMCCLK_MGT       0x024
-#define PRCM_SLIMCLK_MGT        0x028
-#define PRCM_PER1CLK_MGT        0x02C
-#define PRCM_PER2CLK_MGT        0x030
-#define PRCM_PER3CLK_MGT        0x034
-#define PRCM_PER5CLK_MGT        0x038
-#define PRCM_PER6CLK_MGT        0x03C
-#define PRCM_PER7CLK_MGT        0x040
-#define PRCM_LCDCLK_MGT         0x044
-#define PRCM_BMLCLK_MGT         0x04C
-#define PRCM_HSITXCLK_MGT       0x050
-#define PRCM_HSIRXCLK_MGT       0x054
-#define PRCM_HDMICLK_MGT        0x058
-#define PRCM_APEATCLK_MGT       0x05C
-#define PRCM_APETRACECLK_MGT    0x060
-#define PRCM_MCDECLK_MGT        0x064
-#define PRCM_IPI2CCLK_MGT       0x068
-#define PRCM_DSIALTCLK_MGT      0x06C
-#define PRCM_DMACLK_MGT         0x074
-#define PRCM_B2R2CLK_MGT        0x078
-#define PRCM_TVCLK_MGT          0x07C
-#define PRCM_UNIPROCLK_MGT      0x278
-#define PRCM_SSPCLK_MGT         0x280
-#define PRCM_RNGCLK_MGT         0x284
-#define PRCM_UICCCLK_MGT        0x27C
-#define PRCM_CLK_MGT_CLKPLLDIV_MASK     BITS(0, 4)
-#define PRCM_CLK_MGT_CLKPLLSW_MASK      BITS(5, 7)
-#define PRCM_CLK_MGT_CLKEN              BIT(8)
-/* ePOD and memory power signal control registers */
-#define PRCM_EPOD_C_SET         0x410
-#define PRCM_SRAM_LS_SLEEP      0x304
-/* Debug power control unit registers */
-#define PRCM_POWER_STATE_SET 0x254
-/* Miscellaneous unit registers */
-#define PRCM_DSI_SW_RESET 0x324
-#define PRCM_GPIOCR             0x138
-/* GPIOCR register */
-#define PRCM_GPIOCR_SPI2_SELECT BIT(23)
-#define PRCM_DDR_SUBSYS_APE_MINBW  0x438
-#endif /* __DB8500_PRCMU_REGS_H */
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index 02a15d7cb3b0..a25ab9c6b5af 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -27,14 +27,14 @@
 #include <linux/platform_device.h>
 #include <linux/uaccess.h>
 #include <linux/mfd/core.h>
-#include <linux/mfd/db8500-prcmu.h>
+#include <linux/mfd/dbx500-prcmu.h>
 #include <linux/regulator/db8500-prcmu.h>
 #include <linux/regulator/machine.h>
 #include <mach/hardware.h>
 #include <mach/irqs.h>
 #include <mach/db8500-regs.h>
 #include <mach/id.h>
-#include "db8500-prcmu-regs.h"
+#include "dbx500-prcmu-regs.h"
 /* Offset for the firmware version within the TCPM */
 #define PRCMU_FW_VERSION_OFFSET 0xA4
@@ -131,12 +131,14 @@
 #define MB1H_REQUEST_APE_OPP_100_VOLT 0x3
 #define MB1H_RELEASE_APE_OPP_100_VOLT 0x4
 #define MB1H_RELEASE_USB_WAKEUP 0x5
+#define MB1H_PLL_ON_OFF 0x6
 /* Mailbox 1 Requests */
 #define PRCM_REQ_MB1_ARM_OPP                    (PRCM_REQ_MB1 + 0x0)
 #define PRCM_REQ_MB1_APE_OPP                    (PRCM_REQ_MB1 + 0x1)
-#define PRCM_REQ_MB1_APE_OPP_100_RESTORE        (PRCM_REQ_MB1 + 0x4)
+#define PRCM_REQ_MB1_PLL_ON_OFF                 (PRCM_REQ_MB1 + 0x4)
-#define PRCM_REQ_MB1_ARM_OPP_100_RESTORE        (PRCM_REQ_MB1 + 0x8)
+#define PLL_SOC1_OFF    0x4
+#define PLL_SOC1_ON     0x8
 /* Mailbox 1 ACKs */
 #define PRCM_ACK_MB1_CURRENT_ARM_OPP    (PRCM_ACK_MB1 + 0x0)
@@ -184,6 +186,11 @@
 #define MB4H_HOTDOG     0x12
 #define MB4H_HOTMON     0x13
 #define MB4H_HOT_PERIOD 0x14
+#define MB4H_A9WDOG_CONF 0x16
+#define MB4H_A9WDOG_EN   0x17
+#define MB4H_A9WDOG_DIS  0x18
+#define MB4H_A9WDOG_LOAD 0x19
+#define MB4H_A9WDOG_KICK 0x20
 /* Mailbox 4 Requests */
 #define PRCM_REQ_MB4_DDR_ST_AP_SLEEP_IDLE       (PRCM_REQ_MB4 + 0x0)
@@ -196,6 +203,13 @@
 #define PRCM_REQ_MB4_HOT_PERIOD                 (PRCM_REQ_MB4 + 0x0)
 #define HOTMON_CONFIG_LOW                       BIT(0)
 #define HOTMON_CONFIG_HIGH                      BIT(1)
+#define PRCM_REQ_MB4_A9WDOG_0                   (PRCM_REQ_MB4 + 0x0)
+#define PRCM_REQ_MB4_A9WDOG_1                   (PRCM_REQ_MB4 + 0x1)
+#define PRCM_REQ_MB4_A9WDOG_2                   (PRCM_REQ_MB4 + 0x2)
+#define PRCM_REQ_MB4_A9WDOG_3                   (PRCM_REQ_MB4 + 0x3)
+#define A9WDOG_AUTO_OFF_EN                      BIT(7)
+#define A9WDOG_AUTO_OFF_DIS                     0
+#define A9WDOG_ID_MASK                          0xf
 /* Mailbox 5 Requests */
 #define PRCM_REQ_MB5_I2C_SLAVE_OP       (PRCM_REQ_MB5 + 0x0)
@@ -412,7 +426,7 @@ struct clk_mgt {
 static DEFINE_SPINLOCK(clk_mgt_lock);
-#define CLK_MGT_ENTRY(_name)[PRCMU_##_name] = { (PRCM_##_name##_MGT), 0 }
+#define CLK_MGT_ENTRY(_name)[PRCMU_##_name] = { (PRCM_##_name##_MGT_OFF), 0 }
 struct clk_mgt clk_mgt[PRCMU_NUM_REG_CLOCKS] = {
        CLK_MGT_ENTRY(SGACLK),
        CLK_MGT_ENTRY(UARTCLK),
@@ -445,6 +459,35 @@ struct clk_mgt clk_mgt[PRCMU_NUM_REG_CLOCKS] = {
        CLK_MGT_ENTRY(UICCCLK),
 };
+static struct regulator *hwacc_regulator[NUM_HW_ACC];
+static struct regulator *hwacc_ret_regulator[NUM_HW_ACC];
+static bool hwacc_enabled[NUM_HW_ACC];
+static bool hwacc_ret_enabled[NUM_HW_ACC];
+static const char *hwacc_regulator_name[NUM_HW_ACC] = {
+        [HW_ACC_SVAMMDSP]       = "hwacc-sva-mmdsp",
+        [HW_ACC_SVAPIPE]        = "hwacc-sva-pipe",
+        [HW_ACC_SIAMMDSP]       = "hwacc-sia-mmdsp",
+        [HW_ACC_SIAPIPE]        = "hwacc-sia-pipe",
+        [HW_ACC_SGA]            = "hwacc-sga",
+        [HW_ACC_B2R2]           = "hwacc-b2r2",
+        [HW_ACC_MCDE]           = "hwacc-mcde",
+        [HW_ACC_ESRAM1]         = "hwacc-esram1",
+        [HW_ACC_ESRAM2]         = "hwacc-esram2",
+        [HW_ACC_ESRAM3]         = "hwacc-esram3",
+        [HW_ACC_ESRAM4]         = "hwacc-esram4",
+};
+static const char *hwacc_ret_regulator_name[NUM_HW_ACC] = {
+        [HW_ACC_SVAMMDSP]       = "hwacc-sva-mmdsp-ret",
+        [HW_ACC_SIAMMDSP]       = "hwacc-sia-mmdsp-ret",
+        [HW_ACC_ESRAM1]         = "hwacc-esram1-ret",
+        [HW_ACC_ESRAM2]         = "hwacc-esram2-ret",
+        [HW_ACC_ESRAM3]         = "hwacc-esram3-ret",
+        [HW_ACC_ESRAM4]         = "hwacc-esram4-ret",
+};
 /*
 * Used by MCDE to setup all necessary PRCMU registers
 */
@@ -493,55 +536,51 @@ static struct {
 } prcmu_version;
-int prcmu_enable_dsipll(void)
+int db8500_prcmu_enable_dsipll(void)
 {
        int i;
        unsigned int plldsifreq;
        /* Clear DSIPLL_RESETN */
-        writel(PRCMU_RESET_DSIPLL, (_PRCMU_BASE + PRCM_APE_RESETN_CLR));
+        writel(PRCMU_RESET_DSIPLL, PRCM_APE_RESETN_CLR);
        /* Unclamp DSIPLL in/out */
-        writel(PRCMU_UNCLAMP_DSIPLL, (_PRCMU_BASE + PRCM_MMIP_LS_CLAMP_CLR));
+        writel(PRCMU_UNCLAMP_DSIPLL, PRCM_MMIP_LS_CLAMP_CLR);
        if (prcmu_is_u8400())
                plldsifreq = PRCMU_PLLDSI_FREQ_SETTING_U8400;
        else
                plldsifreq = PRCMU_PLLDSI_FREQ_SETTING;
        /* Set DSI PLL FREQ */
-        writel(plldsifreq, (_PRCMU_BASE + PRCM_PLLDSI_FREQ));
+        writel(plldsifreq, PRCM_PLLDSI_FREQ);
-        writel(PRCMU_DSI_PLLOUT_SEL_SETTING,
+        writel(PRCMU_DSI_PLLOUT_SEL_SETTING, PRCM_DSI_PLLOUT_SEL);
-                (_PRCMU_BASE + PRCM_DSI_PLLOUT_SEL));
        /* Enable Escape clocks */
-        writel(PRCMU_ENABLE_ESCAPE_CLOCK_DIV,
+        writel(PRCMU_ENABLE_ESCAPE_CLOCK_DIV, PRCM_DSITVCLK_DIV);
-                                        (_PRCMU_BASE + PRCM_DSITVCLK_DIV));
        /* Start DSI PLL */
-        writel(PRCMU_ENABLE_PLLDSI, (_PRCMU_BASE + PRCM_PLLDSI_ENABLE));
+        writel(PRCMU_ENABLE_PLLDSI, PRCM_PLLDSI_ENABLE);
        /* Reset DSI PLL */
-        writel(PRCMU_DSI_RESET_SW, (_PRCMU_BASE + PRCM_DSI_SW_RESET));
+        writel(PRCMU_DSI_RESET_SW, PRCM_DSI_SW_RESET);
        for (i = 0; i < 10; i++) {
-                if ((readl(_PRCMU_BASE + PRCM_PLLDSI_LOCKP) &
+                if ((readl(PRCM_PLLDSI_LOCKP) & PRCMU_PLLDSI_LOCKP_LOCKED)
-                        PRCMU_PLLDSI_LOCKP_LOCKED)
                                        == PRCMU_PLLDSI_LOCKP_LOCKED)
                        break;
                udelay(100);
        }
        /* Set DSIPLL_RESETN */
-        writel(PRCMU_RESET_DSIPLL, (_PRCMU_BASE + PRCM_APE_RESETN_SET));
+        writel(PRCMU_RESET_DSIPLL, PRCM_APE_RESETN_SET);
        return 0;
 }
-int prcmu_disable_dsipll(void)
+int db8500_prcmu_disable_dsipll(void)
 {
        /* Disable dsi pll */
-        writel(PRCMU_DISABLE_PLLDSI, (_PRCMU_BASE + PRCM_PLLDSI_ENABLE));
+        writel(PRCMU_DISABLE_PLLDSI, PRCM_PLLDSI_ENABLE);
        /* Disable  escapeclock */
-        writel(PRCMU_DISABLE_ESCAPE_CLOCK_DIV,
+        writel(PRCMU_DISABLE_ESCAPE_CLOCK_DIV, PRCM_DSITVCLK_DIV);
-                                        (_PRCMU_BASE + PRCM_DSITVCLK_DIV));
        return 0;
 }
-int prcmu_set_display_clocks(void)
+int db8500_prcmu_set_display_clocks(void)
 {
        unsigned long flags;
        unsigned int dsiclk;
@@ -554,15 +593,15 @@ int prcmu_set_display_clocks(void)
        spin_lock_irqsave(&clk_mgt_lock, flags);
        /* Grab the HW semaphore. */
-        while ((readl(_PRCMU_BASE + PRCM_SEM) & PRCM_SEM_PRCM_SEM) != 0)
+        while ((readl(PRCM_SEM) & PRCM_SEM_PRCM_SEM) != 0)
                cpu_relax();
-        writel(dsiclk, (_PRCMU_BASE + PRCM_HDMICLK_MGT));
+        writel(dsiclk, PRCM_HDMICLK_MGT);
-        writel(PRCMU_DSI_LP_CLOCK_SETTING, (_PRCMU_BASE + PRCM_TVCLK_MGT));
+        writel(PRCMU_DSI_LP_CLOCK_SETTING, PRCM_TVCLK_MGT);
-        writel(PRCMU_DPI_CLOCK_SETTING, (_PRCMU_BASE + PRCM_LCDCLK_MGT));
+        writel(PRCMU_DPI_CLOCK_SETTING, PRCM_LCDCLK_MGT);
        /* Release the HW semaphore. */
-        writel(0, (_PRCMU_BASE + PRCM_SEM));
+        writel(0, PRCM_SEM);
        spin_unlock_irqrestore(&clk_mgt_lock, flags);
@@ -578,8 +617,8 @@ void prcmu_enable_spi2(void)
        unsigned long flags;
        spin_lock_irqsave(&gpiocr_lock, flags);
-        reg = readl(_PRCMU_BASE + PRCM_GPIOCR);
+        reg = readl(PRCM_GPIOCR);
-        writel(reg | PRCM_GPIOCR_SPI2_SELECT, _PRCMU_BASE + PRCM_GPIOCR);
+        writel(reg | PRCM_GPIOCR_SPI2_SELECT, PRCM_GPIOCR);
        spin_unlock_irqrestore(&gpiocr_lock, flags);
 }
@@ -592,8 +631,8 @@ void prcmu_disable_spi2(void)
        unsigned long flags;
        spin_lock_irqsave(&gpiocr_lock, flags);
-        reg = readl(_PRCMU_BASE + PRCM_GPIOCR);
+        reg = readl(PRCM_GPIOCR);
-        writel(reg & ~PRCM_GPIOCR_SPI2_SELECT, _PRCMU_BASE + PRCM_GPIOCR);
+        writel(reg & ~PRCM_GPIOCR_SPI2_SELECT, PRCM_GPIOCR);
        spin_unlock_irqrestore(&gpiocr_lock, flags);
 }
@@ -701,7 +740,7 @@ int prcmu_config_clkout(u8 clkout, u8 source, u8 div)
        spin_lock_irqsave(&clkout_lock, flags);
-        val = readl(_PRCMU_BASE + PRCM_CLKOCR);
+        val = readl(PRCM_CLKOCR);
        if (val & div_mask) {
                if (div) {
                        if ((val & mask) != bits) {
@@ -715,7 +754,7 @@ int prcmu_config_clkout(u8 clkout, u8 source, u8 div)
                        }
                }
        }
-        writel((bits | (val & ~mask)), (_PRCMU_BASE + PRCM_CLKOCR));
+        writel((bits | (val & ~mask)), PRCM_CLKOCR);
        requests[clkout] += (div ? 1 : -1);
 unlock_and_return:
@@ -724,7 +763,7 @@ unlock_and_return:
        return r;
 }
-int prcmu_set_power_state(u8 state, bool keep_ulp_clk, bool keep_ap_pll)
+int db8500_prcmu_set_power_state(u8 state, bool keep_ulp_clk, bool keep_ap_pll)
 {
        unsigned long flags;
@@ -732,7 +771,7 @@ int prcmu_set_power_state(u8 state, bool keep_ulp_clk, bool keep_ap_pll)
        spin_lock_irqsave(&mb0_transfer.lock, flags);
-        while (readl(_PRCMU_BASE + PRCM_MBOX_CPU_VAL) & MBOX_BIT(0))
+        while (readl(PRCM_MBOX_CPU_VAL) & MBOX_BIT(0))
                cpu_relax();
        writeb(MB0H_POWER_STATE_TRANS, (tcdm_base + PRCM_MBOX_HEADER_REQ_MB0));
@@ -741,7 +780,7 @@ int prcmu_set_power_state(u8 state, bool keep_ulp_clk, bool keep_ap_pll)
        writeb((keep_ulp_clk ? 1 : 0),
                (tcdm_base + PRCM_REQ_MB0_ULP_CLOCK_STATE));
        writeb(0, (tcdm_base + PRCM_REQ_MB0_DO_NOT_WFI));
-        writel(MBOX_BIT(0), (_PRCMU_BASE + PRCM_MBOX_CPU_SET));
+        writel(MBOX_BIT(0), PRCM_MBOX_CPU_SET);
        spin_unlock_irqrestore(&mb0_transfer.lock, flags);
@@ -770,18 +809,18 @@ static void config_wakeups(void)
                return;
        for (i = 0; i < 2; i++) {
-                while (readl(_PRCMU_BASE + PRCM_MBOX_CPU_VAL) & MBOX_BIT(0))
+                while (readl(PRCM_MBOX_CPU_VAL) & MBOX_BIT(0))
                        cpu_relax();
                writel(dbb_events, (tcdm_base + PRCM_REQ_MB0_WAKEUP_8500));
                writel(abb_events, (tcdm_base + PRCM_REQ_MB0_WAKEUP_4500));
                writeb(header[i], (tcdm_base + PRCM_MBOX_HEADER_REQ_MB0));
-                writel(MBOX_BIT(0), (_PRCMU_BASE + PRCM_MBOX_CPU_SET));
+                writel(MBOX_BIT(0), PRCM_MBOX_CPU_SET);
        }
        last_dbb_events = dbb_events;
        last_abb_events = abb_events;
 }
-void prcmu_enable_wakeups(u32 wakeups)
+void db8500_prcmu_enable_wakeups(u32 wakeups)
 {
        unsigned long flags;
        u32 bits;
@@ -802,7 +841,7 @@ void prcmu_enable_wakeups(u32 wakeups)
        spin_unlock_irqrestore(&mb0_transfer.lock, flags);
 }
-void prcmu_config_abb_event_readout(u32 abb_events)
+void db8500_prcmu_config_abb_event_readout(u32 abb_events)
 {
        unsigned long flags;
@@ -814,7 +853,7 @@ void prcmu_config_abb_event_readout(u32 abb_events)
        spin_unlock_irqrestore(&mb0_transfer.lock, flags);
 }
-void prcmu_get_abb_event_buffer(void __iomem **buf)
+void db8500_prcmu_get_abb_event_buffer(void __iomem **buf)
 {
        if (readb(tcdm_base + PRCM_ACK_MB0_READ_POINTER) & 1)
                *buf = (tcdm_base + PRCM_ACK_MB0_WAKEUP_1_4500);
@@ -823,13 +862,13 @@ void prcmu_get_abb_event_buffer(void __iomem **buf)
 }
 /**
- * prcmu_set_arm_opp - set the appropriate ARM OPP
+ * db8500_prcmu_set_arm_opp - set the appropriate ARM OPP
 * @opp: The new ARM operating point to which transition is to be made
 * Returns: 0 on success, non-zero on failure
 *
 * This function sets the the operating point of the ARM.
 */
-int prcmu_set_arm_opp(u8 opp)
+int db8500_prcmu_set_arm_opp(u8 opp)
 {
        int r;
@@ -840,14 +879,14 @@ int prcmu_set_arm_opp(u8 opp)
        mutex_lock(&mb1_transfer.lock);
-        while (readl(_PRCMU_BASE + PRCM_MBOX_CPU_VAL) & MBOX_BIT(1))
+        while (readl(PRCM_MBOX_CPU_VAL) & MBOX_BIT(1))
                cpu_relax();
        writeb(MB1H_ARM_APE_OPP, (tcdm_base + PRCM_MBOX_HEADER_REQ_MB1));
        writeb(opp, (tcdm_base + PRCM_REQ_MB1_ARM_OPP));
        writeb(APE_NO_CHANGE, (tcdm_base + PRCM_REQ_MB1_APE_OPP));
-        writel(MBOX_BIT(1), (_PRCMU_BASE + PRCM_MBOX_CPU_SET));
+        writel(MBOX_BIT(1), PRCM_MBOX_CPU_SET);
        wait_for_completion(&mb1_transfer.work);
        if ((mb1_transfer.ack.header != MB1H_ARM_APE_OPP) ||
@@ -860,11 +899,11 @@ int prcmu_set_arm_opp(u8 opp)
 }
 /**
- * prcmu_get_arm_opp - get the current ARM OPP
+ * db8500_prcmu_get_arm_opp - get the current ARM OPP
 *
 * Returns: the current ARM OPP
 */
-int prcmu_get_arm_opp(void)
+int db8500_prcmu_get_arm_opp(void)
 {
        return readb(tcdm_base + PRCM_ACK_MB1_CURRENT_ARM_OPP);
 }
@@ -876,7 +915,7 @@ int prcmu_get_arm_opp(void)
 */
 int prcmu_get_ddr_opp(void)
 {
-        return readb(_PRCMU_BASE + PRCM_DDR_SUBSYS_APE_MINBW);
+        return readb(PRCM_DDR_SUBSYS_APE_MINBW);
 }
 /**
@@ -892,7 +931,7 @@ int prcmu_set_ddr_opp(u8 opp)
                return -EINVAL;
        /* Changing the DDR OPP can hang the hardware pre-v21 */
        if (cpu_is_u8500v20_or_later() && !cpu_is_u8500v20())
-                writeb(opp, (_PRCMU_BASE + PRCM_DDR_SUBSYS_APE_MINBW));
+                writeb(opp, PRCM_DDR_SUBSYS_APE_MINBW);
        return 0;
 }
@@ -909,14 +948,14 @@ int prcmu_set_ape_opp(u8 opp)
        mutex_lock(&mb1_transfer.lock);
-        while (readl(_PRCMU_BASE + PRCM_MBOX_CPU_VAL) & MBOX_BIT(1))
+        while (readl(PRCM_MBOX_CPU_VAL) & MBOX_BIT(1))
                cpu_relax();
        writeb(MB1H_ARM_APE_OPP, (tcdm_base + PRCM_MBOX_HEADER_REQ_MB1));
        writeb(ARM_NO_CHANGE, (tcdm_base + PRCM_REQ_MB1_ARM_OPP));
        writeb(opp, (tcdm_base + PRCM_REQ_MB1_APE_OPP));
-        writel(MBOX_BIT(1), (_PRCMU_BASE + PRCM_MBOX_CPU_SET));
+        writel(MBOX_BIT(1), PRCM_MBOX_CPU_SET);
        wait_for_completion(&mb1_transfer.work);
        if ((mb1_transfer.ack.header != MB1H_ARM_APE_OPP) ||
@@ -966,12 +1005,12 @@ int prcmu_request_ape_opp_100_voltage(bool enable)
                header = MB1H_RELEASE_APE_OPP_100_VOLT;
        }
-        while (readl(_PRCMU_BASE + PRCM_MBOX_CPU_VAL) & MBOX_BIT(1))
+        while (readl(PRCM_MBOX_CPU_VAL) & MBOX_BIT(1))
                cpu_relax();
        writeb(header, (tcdm_base + PRCM_MBOX_HEADER_REQ_MB1));
-        writel(MBOX_BIT(1), (_PRCMU_BASE + PRCM_MBOX_CPU_SET));
+        writel(MBOX_BIT(1), PRCM_MBOX_CPU_SET);
        wait_for_completion(&mb1_transfer.work);
        if ((mb1_transfer.ack.header != header) ||
@@ -995,13 +1034,13 @@ int prcmu_release_usb_wakeup_state(void)
        mutex_lock(&mb1_transfer.lock);
-        while (readl(_PRCMU_BASE + PRCM_MBOX_CPU_VAL) & MBOX_BIT(1))
+        while (readl(PRCM_MBOX_CPU_VAL) & MBOX_BIT(1))
                cpu_relax();
        writeb(MB1H_RELEASE_USB_WAKEUP,
                (tcdm_base + PRCM_MBOX_HEADER_REQ_MB1));
-        writel(MBOX_BIT(1), (_PRCMU_BASE + PRCM_MBOX_CPU_SET));
+        writel(MBOX_BIT(1), PRCM_MBOX_CPU_SET);
        wait_for_completion(&mb1_transfer.work);
        if ((mb1_transfer.ack.header != MB1H_RELEASE_USB_WAKEUP) ||
@@ -1013,15 +1052,169 @@ int prcmu_release_usb_wakeup_state(void)
        return r;
 }
+static int request_pll(u8 clock, bool enable)
+{
+        int r = 0;
+        if (clock == PRCMU_PLLSOC1)
+                clock = (enable ? PLL_SOC1_ON : PLL_SOC1_OFF);
+        else
+                return -EINVAL;
+        mutex_lock(&mb1_transfer.lock);
+        while (readl(PRCM_MBOX_CPU_VAL) & MBOX_BIT(1))
+                cpu_relax();
+        writeb(MB1H_PLL_ON_OFF, (tcdm_base + PRCM_MBOX_HEADER_REQ_MB1));
+        writeb(clock, (tcdm_base + PRCM_REQ_MB1_PLL_ON_OFF));
+        writel(MBOX_BIT(1), PRCM_MBOX_CPU_SET);
+        wait_for_completion(&mb1_transfer.work);
+        if (mb1_transfer.ack.header != MB1H_PLL_ON_OFF)
+                r = -EIO;
+        mutex_unlock(&mb1_transfer.lock);
+        return r;
+}
 /**
- * prcmu_set_epod - set the state of a EPOD (power domain)
+ * prcmu_set_hwacc - set the power state of a h/w accelerator
+ * @hwacc_dev: The hardware accelerator (enum hw_acc_dev).
+ * @state: The new power state (enum hw_acc_state).
+ *
+ * This function sets the power state of a hardware accelerator.
+ * This function should not be called from interrupt context.
+ *
+ * NOTE! Deprecated, to be removed when all users switched over to use the
+ * regulator framework API.
+ */
+int prcmu_set_hwacc(u16 hwacc_dev, u8 state)
+{
+        int r = 0;
+        bool ram_retention = false;
+        bool enable, enable_ret;
+        /* check argument */
+        BUG_ON(hwacc_dev >= NUM_HW_ACC);
+        /* get state of switches */
+        enable = hwacc_enabled[hwacc_dev];
+        enable_ret = hwacc_ret_enabled[hwacc_dev];
+        /* set flag if retention is possible */
+        switch (hwacc_dev) {
+        case HW_ACC_SVAMMDSP:
+        case HW_ACC_SIAMMDSP:
+        case HW_ACC_ESRAM1:
+        case HW_ACC_ESRAM2:
+        case HW_ACC_ESRAM3:
+        case HW_ACC_ESRAM4:
+                ram_retention = true;
+                break;
+        }
+        /* check argument */
+        BUG_ON(state > HW_ON);
+        BUG_ON(state == HW_OFF_RAMRET && !ram_retention);
+        /* modify enable flags */
+        switch (state) {
+        case HW_OFF:
+                enable_ret = false;
+                enable = false;
+                break;
+        case HW_ON:
+                enable = true;
+                break;
+        case HW_OFF_RAMRET:
+                enable_ret = true;
+                enable = false;
+                break;
+        }
+        /* get regulator (lazy) */
+        if (hwacc_regulator[hwacc_dev] == NULL) {
+                hwacc_regulator[hwacc_dev] = regulator_get(NULL,
+                        hwacc_regulator_name[hwacc_dev]);
+                if (IS_ERR(hwacc_regulator[hwacc_dev])) {
+                        pr_err("prcmu: failed to get supply %s\n",
+                                hwacc_regulator_name[hwacc_dev]);
+                        r = PTR_ERR(hwacc_regulator[hwacc_dev]);
+                        goto out;
+                }
+        }
+        if (ram_retention) {
+                if (hwacc_ret_regulator[hwacc_dev] == NULL) {
+                        hwacc_ret_regulator[hwacc_dev] = regulator_get(NULL,
+                                hwacc_ret_regulator_name[hwacc_dev]);
+                        if (IS_ERR(hwacc_ret_regulator[hwacc_dev])) {
+                                pr_err("prcmu: failed to get supply %s\n",
+                                        hwacc_ret_regulator_name[hwacc_dev]);
+                                r = PTR_ERR(hwacc_ret_regulator[hwacc_dev]);
+                                goto out;
+                        }
+                }
+        }
+        /* set regulators */
+        if (ram_retention) {
+                if (enable_ret && !hwacc_ret_enabled[hwacc_dev]) {
+                        r = regulator_enable(hwacc_ret_regulator[hwacc_dev]);
+                        if (r < 0) {
+                                pr_err("prcmu_set_hwacc: ret enable failed\n");
+                                goto out;
+                        }
+                        hwacc_ret_enabled[hwacc_dev] = true;
+                }
+        }
+        if (enable && !hwacc_enabled[hwacc_dev]) {
+                r = regulator_enable(hwacc_regulator[hwacc_dev]);
+                if (r < 0) {
+                        pr_err("prcmu_set_hwacc: enable failed\n");
+                        goto out;
+                }
+                hwacc_enabled[hwacc_dev] = true;
+        }
+        if (!enable && hwacc_enabled[hwacc_dev]) {
+                r = regulator_disable(hwacc_regulator[hwacc_dev]);
+                if (r < 0) {
+                        pr_err("prcmu_set_hwacc: disable failed\n");
+                        goto out;
+                }
+                hwacc_enabled[hwacc_dev] = false;
+        }
+        if (ram_retention) {
+                if (!enable_ret && hwacc_ret_enabled[hwacc_dev]) {
+                        r = regulator_disable(hwacc_ret_regulator[hwacc_dev]);
+                        if (r < 0) {
+                                pr_err("prcmu_set_hwacc: ret disable failed\n");
+                                goto out;
+                        }
+                        hwacc_ret_enabled[hwacc_dev] = false;
+                }
+        }
+out:
+        return r;
+}
+EXPORT_SYMBOL(prcmu_set_hwacc);
+/**
+ * db8500_prcmu_set_epod - set the state of a EPOD (power domain)
 * @epod_id: The EPOD to set
 * @epod_state: The new EPOD state
 *
 * This function sets the state of a EPOD (power domain). It may not be called
 * from interrupt context.
 */
-int prcmu_set_epod(u16 epod_id, u8 epod_state)
+int db8500_prcmu_set_epod(u16 epod_id, u8 epod_state)
 {
        int r = 0;
        bool ram_retention = false;
@@ -1048,7 +1241,7 @@ int prcmu_set_epod(u16 epod_id, u8 epod_state)
        mutex_lock(&mb2_transfer.lock);
        /* wait for mailbox */
-        while (readl(_PRCMU_BASE + PRCM_MBOX_CPU_VAL) & MBOX_BIT(2))
+        while (readl(PRCM_MBOX_CPU_VAL) & MBOX_BIT(2))
                cpu_relax();
        /* fill in mailbox */
@@ -1058,7 +1251,7 @@ int prcmu_set_epod(u16 epod_id, u8 epod_state)
        writeb(MB2H_DPS, (tcdm_base + PRCM_MBOX_HEADER_REQ_MB2));
-        writel(MBOX_BIT(2), (_PRCMU_BASE + PRCM_MBOX_CPU_SET));
+        writel(MBOX_BIT(2), PRCM_MBOX_CPU_SET);
        /*
         * The current firmware version does not handle errors correctly,
@@ -1145,13 +1338,13 @@ static int request_sysclk(bool enable)
        spin_lock_irqsave(&mb3_transfer.lock, flags);
-        while (readl(_PRCMU_BASE + PRCM_MBOX_CPU_VAL) & MBOX_BIT(3))
+        while (readl(PRCM_MBOX_CPU_VAL) & MBOX_BIT(3))
                cpu_relax();
        writeb((enable ? ON : OFF), (tcdm_base + PRCM_REQ_MB3_SYSCLK_MGT));
        writeb(MB3H_SYSCLK, (tcdm_base + PRCM_MBOX_HEADER_REQ_MB3));
-        writel(MBOX_BIT(3), (_PRCMU_BASE + PRCM_MBOX_CPU_SET));
+        writel(MBOX_BIT(3), PRCM_MBOX_CPU_SET);
        spin_unlock_irqrestore(&mb3_transfer.lock, flags);
@@ -1177,7 +1370,7 @@ static int request_timclk(bool enable)
        if (!enable)
                val |= PRCM_TCR_STOP_TIMERS;
-        writel(val, (_PRCMU_BASE + PRCM_TCR));
+        writel(val, PRCM_TCR);
        return 0;
 }
@@ -1190,7 +1383,7 @@ static int request_reg_clock(u8 clock, bool enable)
        spin_lock_irqsave(&clk_mgt_lock, flags);
        /* Grab the HW semaphore. */
-        while ((readl(_PRCMU_BASE + PRCM_SEM) & PRCM_SEM_PRCM_SEM) != 0)
+        while ((readl(PRCM_SEM) & PRCM_SEM_PRCM_SEM) != 0)
                cpu_relax();
        val = readl(_PRCMU_BASE + clk_mgt[clock].offset);
@@ -1203,34 +1396,61 @@ static int request_reg_clock(u8 clock, bool enable)
        writel(val, (_PRCMU_BASE + clk_mgt[clock].offset));
        /* Release the HW semaphore. */
-        writel(0, (_PRCMU_BASE + PRCM_SEM));
+        writel(0, PRCM_SEM);
        spin_unlock_irqrestore(&clk_mgt_lock, flags);
        return 0;
 }
+static int request_sga_clock(u8 clock, bool enable)
+{
+        u32 val;
+        int ret;
+        if (enable) {
+                val = readl(PRCM_CGATING_BYPASS);
+                writel(val | PRCM_CGATING_BYPASS_ICN2, PRCM_CGATING_BYPASS);
+        }
+        ret = request_reg_clock(clock, enable);
+        if (!ret && !enable) {
+                val = readl(PRCM_CGATING_BYPASS);
+                writel(val & ~PRCM_CGATING_BYPASS_ICN2, PRCM_CGATING_BYPASS);
+        }
+        return ret;
+}
 /**
- * prcmu_request_clock() - Request for a clock to be enabled or disabled.
+ * db8500_prcmu_request_clock() - Request for a clock to be enabled or disabled.
 * @clock:      The clock for which the request is made.
 * @enable:     Whether the clock should be enabled (true) or disabled (false).
 *
 * This function should only be used by the clock implementation.
 * Do not use it from any other place!
 */
-int prcmu_request_clock(u8 clock, bool enable)
+int db8500_prcmu_request_clock(u8 clock, bool enable)
 {
-        if (clock < PRCMU_NUM_REG_CLOCKS)
+        switch(clock) {
-                return request_reg_clock(clock, enable);
+        case PRCMU_SGACLK:
-        else if (clock == PRCMU_TIMCLK)
+                return request_sga_clock(clock, enable);
+        case PRCMU_TIMCLK:
                return request_timclk(enable);
-        else if (clock == PRCMU_SYSCLK)
+        case PRCMU_SYSCLK:
                return request_sysclk(enable);
-        else
+        case PRCMU_PLLSOC1:
-                return -EINVAL;
+                return request_pll(clock, enable);
+        default:
+                break;
+        }
+        if (clock < PRCMU_NUM_REG_CLOCKS)
+                return request_reg_clock(clock, enable);
+        return -EINVAL;
 }
-int prcmu_config_esram0_deep_sleep(u8 state)
+int db8500_prcmu_config_esram0_deep_sleep(u8 state)
 {
        if ((state > ESRAM0_DEEP_SLEEP_STATE_RET) ||
            (state < ESRAM0_DEEP_SLEEP_STATE_OFF))
@@ -1238,7 +1458,7 @@ int prcmu_config_esram0_deep_sleep(u8 state)
        mutex_lock(&mb4_transfer.lock);
-        while (readl(_PRCMU_BASE + PRCM_MBOX_CPU_VAL) & MBOX_BIT(4))
+        while (readl(PRCM_MBOX_CPU_VAL) & MBOX_BIT(4))
                cpu_relax();
        writeb(MB4H_MEM_ST, (tcdm_base + PRCM_MBOX_HEADER_REQ_MB4));
@@ -1248,7 +1468,7 @@ int prcmu_config_esram0_deep_sleep(u8 state)
               (tcdm_base + PRCM_REQ_MB4_DDR_ST_AP_DEEP_IDLE));
        writeb(state, (tcdm_base + PRCM_REQ_MB4_ESRAM0_ST));
-        writel(MBOX_BIT(4), (_PRCMU_BASE + PRCM_MBOX_CPU_SET));
+        writel(MBOX_BIT(4), PRCM_MBOX_CPU_SET);
        wait_for_completion(&mb4_transfer.work);
        mutex_unlock(&mb4_transfer.lock);
@@ -1260,13 +1480,13 @@ int prcmu_config_hotdog(u8 threshold)
 {
        mutex_lock(&mb4_transfer.lock);
-        while (readl(_PRCMU_BASE + PRCM_MBOX_CPU_VAL) & MBOX_BIT(4))
+        while (readl(PRCM_MBOX_CPU_VAL) & MBOX_BIT(4))
                cpu_relax();
        writeb(threshold, (tcdm_base + PRCM_REQ_MB4_HOTDOG_THRESHOLD));
        writeb(MB4H_HOTDOG, (tcdm_base + PRCM_MBOX_HEADER_REQ_MB4));
-        writel(MBOX_BIT(4), (_PRCMU_BASE + PRCM_MBOX_CPU_SET));
+        writel(MBOX_BIT(4), PRCM_MBOX_CPU_SET);
        wait_for_completion(&mb4_transfer.work);
        mutex_unlock(&mb4_transfer.lock);
@@ -1278,7 +1498,7 @@ int prcmu_config_hotmon(u8 low, u8 high)
 {
        mutex_lock(&mb4_transfer.lock);
-        while (readl(_PRCMU_BASE + PRCM_MBOX_CPU_VAL) & MBOX_BIT(4))
+        while (readl(PRCM_MBOX_CPU_VAL) & MBOX_BIT(4))
                cpu_relax();
        writeb(low, (tcdm_base + PRCM_REQ_MB4_HOTMON_LOW));
@@ -1287,7 +1507,7 @@ int prcmu_config_hotmon(u8 low, u8 high)
                (tcdm_base + PRCM_REQ_MB4_HOTMON_CONFIG));
        writeb(MB4H_HOTMON, (tcdm_base + PRCM_MBOX_HEADER_REQ_MB4));
-        writel(MBOX_BIT(4), (_PRCMU_BASE + PRCM_MBOX_CPU_SET));
+        writel(MBOX_BIT(4), PRCM_MBOX_CPU_SET);
        wait_for_completion(&mb4_transfer.work);
        mutex_unlock(&mb4_transfer.lock);
@@ -1299,13 +1519,13 @@ static int config_hot_period(u16 val)
 {
        mutex_lock(&mb4_transfer.lock);
-        while (readl(_PRCMU_BASE + PRCM_MBOX_CPU_VAL) & MBOX_BIT(4))
+        while (readl(PRCM_MBOX_CPU_VAL) & MBOX_BIT(4))
                cpu_relax();
        writew(val, (tcdm_base + PRCM_REQ_MB4_HOT_PERIOD));
        writeb(MB4H_HOT_PERIOD, (tcdm_base + PRCM_MBOX_HEADER_REQ_MB4));
-        writel(MBOX_BIT(4), (_PRCMU_BASE + PRCM_MBOX_CPU_SET));
+        writel(MBOX_BIT(4), PRCM_MBOX_CPU_SET);
        wait_for_completion(&mb4_transfer.work);
        mutex_unlock(&mb4_transfer.lock);
@@ -1326,6 +1546,78 @@ int prcmu_stop_temp_sense(void)
        return config_hot_period(0xFFFF);
 }
+static int prcmu_a9wdog(u8 cmd, u8 d0, u8 d1, u8 d2, u8 d3)
+{
+        mutex_lock(&mb4_transfer.lock);
+        while (readl(PRCM_MBOX_CPU_VAL) & MBOX_BIT(4))
+                cpu_relax();
+        writeb(d0, (tcdm_base + PRCM_REQ_MB4_A9WDOG_0));
+        writeb(d1, (tcdm_base + PRCM_REQ_MB4_A9WDOG_1));
+        writeb(d2, (tcdm_base + PRCM_REQ_MB4_A9WDOG_2));
+        writeb(d3, (tcdm_base + PRCM_REQ_MB4_A9WDOG_3));
+        writeb(cmd, (tcdm_base + PRCM_MBOX_HEADER_REQ_MB4));
+        writel(MBOX_BIT(4), PRCM_MBOX_CPU_SET);
+        wait_for_completion(&mb4_transfer.work);
+        mutex_unlock(&mb4_transfer.lock);
+        return 0;
+}
+int prcmu_config_a9wdog(u8 num, bool sleep_auto_off)
+{
+        BUG_ON(num == 0 || num > 0xf);
+        return prcmu_a9wdog(MB4H_A9WDOG_CONF, num, 0, 0,
+                            sleep_auto_off ? A9WDOG_AUTO_OFF_EN :
+                            A9WDOG_AUTO_OFF_DIS);
+}
+int prcmu_enable_a9wdog(u8 id)
+{
+        return prcmu_a9wdog(MB4H_A9WDOG_EN, id, 0, 0, 0);
+}
+int prcmu_disable_a9wdog(u8 id)
+{
+        return prcmu_a9wdog(MB4H_A9WDOG_DIS, id, 0, 0, 0);
+}
+int prcmu_kick_a9wdog(u8 id)
+{
+        return prcmu_a9wdog(MB4H_A9WDOG_KICK, id, 0, 0, 0);
+}
+/*
+ * timeout is 28 bit, in ms.
+ */
+#define MAX_WATCHDOG_TIMEOUT 131000
+int prcmu_load_a9wdog(u8 id, u32 timeout)
+{
+        if (timeout > MAX_WATCHDOG_TIMEOUT)
+                /*
+                 * Due to calculation bug in prcmu fw, timeouts
+                 * can't be bigger than 131 seconds.
+                 */
+                return -EINVAL;
+        return prcmu_a9wdog(MB4H_A9WDOG_LOAD,
+                            (id & A9WDOG_ID_MASK) |
+                            /*
+                             * Put the lowest 28 bits of timeout at
+                             * offset 4. Four first bits are used for id.
+                             */
+                            (u8)((timeout << 4) & 0xf0),
+                            (u8)((timeout >> 4) & 0xff),
+                            (u8)((timeout >> 12) & 0xff),
+                            (u8)((timeout >> 20) & 0xff));
+}
 /**
 * prcmu_set_clock_divider() - Configure the clock divider.
 * @clock:      The clock for which the request is made.
@@ -1345,7 +1637,7 @@ int prcmu_set_clock_divider(u8 clock, u8 divider)
        spin_lock_irqsave(&clk_mgt_lock, flags);
        /* Grab the HW semaphore. */
-        while ((readl(_PRCMU_BASE + PRCM_SEM) & PRCM_SEM_PRCM_SEM) != 0)
+        while ((readl(PRCM_SEM) & PRCM_SEM_PRCM_SEM) != 0)
                cpu_relax();
        val = readl(_PRCMU_BASE + clk_mgt[clock].offset);
@@ -1354,7 +1646,7 @@ int prcmu_set_clock_divider(u8 clock, u8 divider)
        writel(val, (_PRCMU_BASE + clk_mgt[clock].offset));
        /* Release the HW semaphore. */
-        writel(0, (_PRCMU_BASE + PRCM_SEM));
+        writel(0, PRCM_SEM);
        spin_unlock_irqrestore(&clk_mgt_lock, flags);
@@ -1380,7 +1672,7 @@ int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size)
        mutex_lock(&mb5_transfer.lock);
-        while (readl(_PRCMU_BASE + PRCM_MBOX_CPU_VAL) & MBOX_BIT(5))
+        while (readl(PRCM_MBOX_CPU_VAL) & MBOX_BIT(5))
                cpu_relax();
        writeb(PRCMU_I2C_READ(slave), (tcdm_base + PRCM_REQ_MB5_I2C_SLAVE_OP));
@@ -1388,7 +1680,7 @@ int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size)
        writeb(reg, (tcdm_base + PRCM_REQ_MB5_I2C_REG));
        writeb(0, (tcdm_base + PRCM_REQ_MB5_I2C_VAL));
-        writel(MBOX_BIT(5), (_PRCMU_BASE + PRCM_MBOX_CPU_SET));
+        writel(MBOX_BIT(5), PRCM_MBOX_CPU_SET);
        if (!wait_for_completion_timeout(&mb5_transfer.work,
                                msecs_to_jiffies(20000))) {
@@ -1426,7 +1718,7 @@ int prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size)
        mutex_lock(&mb5_transfer.lock);
-        while (readl(_PRCMU_BASE + PRCM_MBOX_CPU_VAL) & MBOX_BIT(5))
+        while (readl(PRCM_MBOX_CPU_VAL) & MBOX_BIT(5))
                cpu_relax();
        writeb(PRCMU_I2C_WRITE(slave), (tcdm_base + PRCM_REQ_MB5_I2C_SLAVE_OP));
@@ -1434,7 +1726,7 @@ int prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size)
        writeb(reg, (tcdm_base + PRCM_REQ_MB5_I2C_REG));
        writeb(*value, (tcdm_base + PRCM_REQ_MB5_I2C_VAL));
-        writel(MBOX_BIT(5), (_PRCMU_BASE + PRCM_MBOX_CPU_SET));
+        writel(MBOX_BIT(5), PRCM_MBOX_CPU_SET);
        if (!wait_for_completion_timeout(&mb5_transfer.work,
                                msecs_to_jiffies(20000))) {
@@ -1456,21 +1748,44 @@ int prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size)
 void prcmu_ac_wake_req(void)
 {
        u32 val;
+        u32 status;
        mutex_lock(&mb0_transfer.ac_wake_lock);
-        val = readl(_PRCMU_BASE + PRCM_HOSTACCESS_REQ);
+        val = readl(PRCM_HOSTACCESS_REQ);
        if (val & PRCM_HOSTACCESS_REQ_HOSTACCESS_REQ)
                goto unlock_and_return;
        atomic_set(&ac_wake_req_state, 1);
-        writel((val | PRCM_HOSTACCESS_REQ_HOSTACCESS_REQ),
+retry:
-                (_PRCMU_BASE + PRCM_HOSTACCESS_REQ));
+        writel((val | PRCM_HOSTACCESS_REQ_HOSTACCESS_REQ), PRCM_HOSTACCESS_REQ);
        if (!wait_for_completion_timeout(&mb0_transfer.ac_wake_work,
-                        msecs_to_jiffies(20000))) {
+                        msecs_to_jiffies(5000))) {
-                pr_err("prcmu: %s timed out (20 s) waiting for a reply.\n",
+                pr_crit("prcmu: %s timed out (5 s) waiting for a reply.\n",
+                        __func__);
+                goto unlock_and_return;
+        }
+        /*
+         * The modem can generate an AC_WAKE_ACK, and then still go to sleep.
+         * As a workaround, we wait, and then check that the modem is indeed
+         * awake (in terms of the value of the PRCM_MOD_AWAKE_STATUS
+         * register, which may not be the whole truth).
+         */
+        udelay(400);
+        status = (readl(PRCM_MOD_AWAKE_STATUS) & BITS(0, 2));
+        if (status != (PRCM_MOD_AWAKE_STATUS_PRCM_MOD_AAPD_AWAKE |
+                        PRCM_MOD_AWAKE_STATUS_PRCM_MOD_COREPD_AWAKE)) {
+                pr_err("prcmu: %s received ack, but modem not awake (0x%X).\n",
+                        __func__, status);
+                udelay(1200);
+                writel(val, PRCM_HOSTACCESS_REQ);
+                if (wait_for_completion_timeout(&mb0_transfer.ac_wake_work,
+                                msecs_to_jiffies(5000)))
+                        goto retry;
+                pr_crit("prcmu: %s timed out (5 s) waiting for AC_SLEEP_ACK.\n",
                        __func__);
        }
@@ -1487,16 +1802,16 @@ void prcmu_ac_sleep_req()
        mutex_lock(&mb0_transfer.ac_wake_lock);
-        val = readl(_PRCMU_BASE + PRCM_HOSTACCESS_REQ);
+        val = readl(PRCM_HOSTACCESS_REQ);
        if (!(val & PRCM_HOSTACCESS_REQ_HOSTACCESS_REQ))
                goto unlock_and_return;
        writel((val & ~PRCM_HOSTACCESS_REQ_HOSTACCESS_REQ),
-                (_PRCMU_BASE + PRCM_HOSTACCESS_REQ));
+                PRCM_HOSTACCESS_REQ);
        if (!wait_for_completion_timeout(&mb0_transfer.ac_wake_work,
-                        msecs_to_jiffies(20000))) {
+                        msecs_to_jiffies(5000))) {
-                pr_err("prcmu: %s timed out (20 s) waiting for a reply.\n",
+                pr_crit("prcmu: %s timed out (5 s) waiting for a reply.\n",
                        __func__);
        }
@@ -1506,21 +1821,32 @@ unlock_and_return:
        mutex_unlock(&mb0_transfer.ac_wake_lock);
 }
-bool prcmu_is_ac_wake_requested(void)
+bool db8500_prcmu_is_ac_wake_requested(void)
 {
        return (atomic_read(&ac_wake_req_state) != 0);
 }
 /**
- * prcmu_system_reset - System reset
+ * db8500_prcmu_system_reset - System reset
 *
- * Saves the reset reason code and then sets the APE_SOFRST register which
+ * Saves the reset reason code and then sets the APE_SOFTRST register which
 * fires interrupt to fw
 */
-void prcmu_system_reset(u16 reset_code)
+void db8500_prcmu_system_reset(u16 reset_code)
 {
        writew(reset_code, (tcdm_base + PRCM_SW_RST_REASON));
-        writel(1, (_PRCMU_BASE + PRCM_APE_SOFTRST));
+        writel(1, PRCM_APE_SOFTRST);
+}
+/**
+ * db8500_prcmu_get_reset_code - Retrieve SW reset reason code
+ *
+ * Retrieves the reset reason code stored by prcmu_system_reset() before
+ * last restart.
+ */
+u16 db8500_prcmu_get_reset_code(void)
+{
+        return readw(tcdm_base + PRCM_SW_RST_REASON);
 }
 /**
@@ -1530,11 +1856,11 @@ void prcmu_modem_reset(void)
 {
        mutex_lock(&mb1_transfer.lock);
-        while (readl(_PRCMU_BASE + PRCM_MBOX_CPU_VAL) & MBOX_BIT(1))
+        while (readl(PRCM_MBOX_CPU_VAL) & MBOX_BIT(1))
                cpu_relax();
        writeb(MB1H_RESET_MODEM, (tcdm_base + PRCM_MBOX_HEADER_REQ_MB1));
-        writel(MBOX_BIT(1), (_PRCMU_BASE + PRCM_MBOX_CPU_SET));
+        writel(MBOX_BIT(1), PRCM_MBOX_CPU_SET);
        wait_for_completion(&mb1_transfer.work);
        /*
@@ -1551,11 +1877,11 @@ static void ack_dbb_wakeup(void)
        spin_lock_irqsave(&mb0_transfer.lock, flags);
-        while (readl(_PRCMU_BASE + PRCM_MBOX_CPU_VAL) & MBOX_BIT(0))
+        while (readl(PRCM_MBOX_CPU_VAL) & MBOX_BIT(0))
                cpu_relax();
        writeb(MB0H_READ_WAKEUP_ACK, (tcdm_base + PRCM_MBOX_HEADER_REQ_MB0));
-        writel(MBOX_BIT(0), (_PRCMU_BASE + PRCM_MBOX_CPU_SET));
+        writel(MBOX_BIT(0), PRCM_MBOX_CPU_SET);
        spin_unlock_irqrestore(&mb0_transfer.lock, flags);
 }
@@ -1600,7 +1926,7 @@ static bool read_mailbox_0(void)
                r = false;
                break;
        }
-        writel(MBOX_BIT(0), (_PRCMU_BASE + PRCM_ARM_IT1_CLR));
+        writel(MBOX_BIT(0), PRCM_ARM_IT1_CLR);
        return r;
 }
@@ -1613,7 +1939,7 @@ static bool read_mailbox_1(void)
                PRCM_ACK_MB1_CURRENT_APE_OPP);
        mb1_transfer.ack.ape_voltage_status = readb(tcdm_base +
                PRCM_ACK_MB1_APE_VOLTAGE_STATUS);
-        writel(MBOX_BIT(1), (_PRCMU_BASE + PRCM_ARM_IT1_CLR));
+        writel(MBOX_BIT(1), PRCM_ARM_IT1_CLR);
        complete(&mb1_transfer.work);
        return false;
 }
@@ -1621,14 +1947,14 @@ static bool read_mailbox_1(void)
 static bool read_mailbox_2(void)
 {
        mb2_transfer.ack.status = readb(tcdm_base + PRCM_ACK_MB2_DPS_STATUS);
-        writel(MBOX_BIT(2), (_PRCMU_BASE + PRCM_ARM_IT1_CLR));
+        writel(MBOX_BIT(2), PRCM_ARM_IT1_CLR);
        complete(&mb2_transfer.work);
        return false;
 }
 static bool read_mailbox_3(void)
 {
-        writel(MBOX_BIT(3), (_PRCMU_BASE + PRCM_ARM_IT1_CLR));
+        writel(MBOX_BIT(3), PRCM_ARM_IT1_CLR);
        return false;
 }
@@ -1643,6 +1969,11 @@ static bool read_mailbox_4(void)
        case MB4H_HOTDOG:
        case MB4H_HOTMON:
        case MB4H_HOT_PERIOD:
+        case MB4H_A9WDOG_CONF:
+        case MB4H_A9WDOG_EN:
+        case MB4H_A9WDOG_DIS:
+        case MB4H_A9WDOG_LOAD:
+        case MB4H_A9WDOG_KICK:
                break;
        default:
                print_unknown_header_warning(4, header);
@@ -1650,7 +1981,7 @@ static bool read_mailbox_4(void)
                break;
        }
-        writel(MBOX_BIT(4), (_PRCMU_BASE + PRCM_ARM_IT1_CLR));
+        writel(MBOX_BIT(4), PRCM_ARM_IT1_CLR);
        if (do_complete)
                complete(&mb4_transfer.work);
@@ -1662,20 +1993,20 @@ static bool read_mailbox_5(void)
 {
        mb5_transfer.ack.status = readb(tcdm_base + PRCM_ACK_MB5_I2C_STATUS);
        mb5_transfer.ack.value = readb(tcdm_base + PRCM_ACK_MB5_I2C_VAL);
-        writel(MBOX_BIT(5), (_PRCMU_BASE + PRCM_ARM_IT1_CLR));
+        writel(MBOX_BIT(5), PRCM_ARM_IT1_CLR);
        complete(&mb5_transfer.work);
        return false;
 }
 static bool read_mailbox_6(void)
 {
-        writel(MBOX_BIT(6), (_PRCMU_BASE + PRCM_ARM_IT1_CLR));
+        writel(MBOX_BIT(6), PRCM_ARM_IT1_CLR);
        return false;
 }
 static bool read_mailbox_7(void)
 {
-        writel(MBOX_BIT(7), (_PRCMU_BASE + PRCM_ARM_IT1_CLR));
+        writel(MBOX_BIT(7), PRCM_ARM_IT1_CLR);
        return false;
 }
@@ -1696,7 +2027,7 @@ static irqreturn_t prcmu_irq_handler(int irq, void *data)
        u8 n;
        irqreturn_t r;
-        bits = (readl(_PRCMU_BASE + PRCM_ARM_IT1_VAL) & ALL_MBOX_BITS);
+        bits = (readl(PRCM_ARM_IT1_VAL) & ALL_MBOX_BITS);
        if (unlikely(!bits))
                return IRQ_NONE;
@@ -1768,7 +2099,7 @@ static struct irq_chip prcmu_irq_chip = {
        .irq_unmask     = prcmu_irq_unmask,
 };
-void __init prcmu_early_init(void)
+void __init db8500_prcmu_early_init(void)
 {
        unsigned int i;
@@ -1826,6 +2157,16 @@ void __init prcmu_early_init(void)
        }
 }
+static void __init db8500_prcmu_init_clkforce(void)
+{
+        u32 val;
+        val = readl(PRCM_A9PL_FORCE_CLKEN);
+        val &= ~(PRCM_A9PL_FORCE_CLKEN_PRCM_A9PL_FORCE_CLKEN |
+                PRCM_A9PL_FORCE_CLKEN_PRCM_A9AXI_FORCE_CLKEN);
+        writel(val, (PRCM_A9PL_FORCE_CLKEN));
+}
 /*
 * Power domain switches (ePODs) modeled as regulators for the DB8500 SoC
 */
@@ -1861,7 +2202,42 @@ static struct regulator_consumer_supply db8500_vsmps2_consumers[] = {
 static struct regulator_consumer_supply db8500_b2r2_mcde_consumers[] = {
        REGULATOR_SUPPLY("vsupply", "b2r2.0"),
-        REGULATOR_SUPPLY("vsupply", "mcde.0"),
+        REGULATOR_SUPPLY("vsupply", "mcde"),
+};
+/* SVA MMDSP regulator switch */
+static struct regulator_consumer_supply db8500_svammdsp_consumers[] = {
+        REGULATOR_SUPPLY("sva-mmdsp", "cm_control"),
+};
+/* SVA pipe regulator switch */
+static struct regulator_consumer_supply db8500_svapipe_consumers[] = {
+        REGULATOR_SUPPLY("sva-pipe", "cm_control"),
+};
+/* SIA MMDSP regulator switch */
+static struct regulator_consumer_supply db8500_siammdsp_consumers[] = {
+        REGULATOR_SUPPLY("sia-mmdsp", "cm_control"),
+};
+/* SIA pipe regulator switch */
+static struct regulator_consumer_supply db8500_siapipe_consumers[] = {
+        REGULATOR_SUPPLY("sia-pipe", "cm_control"),
+};
+static struct regulator_consumer_supply db8500_sga_consumers[] = {
+        REGULATOR_SUPPLY("v-mali", NULL),
+};
+/* ESRAM1 and 2 regulator switch */
+static struct regulator_consumer_supply db8500_esram12_consumers[] = {
+        REGULATOR_SUPPLY("esram12", "cm_control"),
+};
+/* ESRAM3 and 4 regulator switch */
+static struct regulator_consumer_supply db8500_esram34_consumers[] = {
+        REGULATOR_SUPPLY("v-esram34", "mcde"),
+        REGULATOR_SUPPLY("esram34", "cm_control"),
 };
 static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = {
@@ -1923,6 +2299,8 @@ static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = {
                        .name = "db8500-sva-mmdsp",
                        .valid_ops_mask = REGULATOR_CHANGE_STATUS,
                },
+                .consumer_supplies = db8500_svammdsp_consumers,
+                .num_consumer_supplies = ARRAY_SIZE(db8500_svammdsp_consumers),
        },
        [DB8500_REGULATOR_SWITCH_SVAMMDSPRET] = {
                .constraints = {
@@ -1937,6 +2315,8 @@ static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = {
                        .name = "db8500-sva-pipe",
                        .valid_ops_mask = REGULATOR_CHANGE_STATUS,
                },
+                .consumer_supplies = db8500_svapipe_consumers,
+                .num_consumer_supplies = ARRAY_SIZE(db8500_svapipe_consumers),
        },
        [DB8500_REGULATOR_SWITCH_SIAMMDSP] = {
                .supply_regulator = "db8500-vape",
@@ -1944,6 +2324,8 @@ static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = {
                        .name = "db8500-sia-mmdsp",
                        .valid_ops_mask = REGULATOR_CHANGE_STATUS,
                },
+                .consumer_supplies = db8500_siammdsp_consumers,
+                .num_consumer_supplies = ARRAY_SIZE(db8500_siammdsp_consumers),
        },
        [DB8500_REGULATOR_SWITCH_SIAMMDSPRET] = {
                .constraints = {
@@ -1957,6 +2339,8 @@ static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = {
                        .name = "db8500-sia-pipe",
                        .valid_ops_mask = REGULATOR_CHANGE_STATUS,
                },
+                .consumer_supplies = db8500_siapipe_consumers,
+                .num_consumer_supplies = ARRAY_SIZE(db8500_siapipe_consumers),
        },
        [DB8500_REGULATOR_SWITCH_SGA] = {
                .supply_regulator = "db8500-vape",
@@ -1964,6 +2348,9 @@ static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = {
                        .name = "db8500-sga",
                        .valid_ops_mask = REGULATOR_CHANGE_STATUS,
                },
+                .consumer_supplies = db8500_sga_consumers,
+                .num_consumer_supplies = ARRAY_SIZE(db8500_sga_consumers),
        },
        [DB8500_REGULATOR_SWITCH_B2R2_MCDE] = {
                .supply_regulator = "db8500-vape",
@@ -1980,6 +2367,8 @@ static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = {
                        .name = "db8500-esram12",
                        .valid_ops_mask = REGULATOR_CHANGE_STATUS,
                },
+                .consumer_supplies = db8500_esram12_consumers,
+                .num_consumer_supplies = ARRAY_SIZE(db8500_esram12_consumers),
        },
        [DB8500_REGULATOR_SWITCH_ESRAM12RET] = {
                .constraints = {
@@ -1993,6 +2382,8 @@ static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = {
                        .name = "db8500-esram34",
                        .valid_ops_mask = REGULATOR_CHANGE_STATUS,
                },
+                .consumer_supplies = db8500_esram34_consumers,
+                .num_consumer_supplies = ARRAY_SIZE(db8500_esram34_consumers),
        },
        [DB8500_REGULATOR_SWITCH_ESRAM34RET] = {
                .constraints = {
@@ -2024,8 +2415,10 @@ static int __init db8500_prcmu_probe(struct platform_device *pdev)
        if (ux500_is_svp())
                return -ENODEV;
+        db8500_prcmu_init_clkforce();
        /* Clean up the mailbox interrupts after pre-kernel code. */
-        writel(ALL_MBOX_BITS, (_PRCMU_BASE + PRCM_ARM_IT1_CLR));
+        writel(ALL_MBOX_BITS, PRCM_ARM_IT1_CLR);
        err = request_threaded_irq(IRQ_DB8500_PRCMU1, prcmu_irq_handler,
                prcmu_irq_thread_fn, IRQF_NO_SUSPEND, "prcmu", NULL);
diff --git a/drivers/mfd/db5500-prcmu-regs.h b/drivers/mfd/dbx500-prcmu-regs.h
index 9a8e9e4ddd33..ec22e9f15d32 100644
--- a/drivers/mfd/db5500-prcmu-regs.h
+++ b/drivers/mfd/dbx500-prcmu-regs.h
@@ -10,11 +10,49 @@
 * PRCM Unit registers
 */
-#ifndef __MACH_PRCMU_REGS_H
+#ifndef __DB8500_PRCMU_REGS_H
-#define __MACH_PRCMU_REGS_H
+#define __DB8500_PRCMU_REGS_H
 #include <mach/hardware.h>
+#define BITS(_start, _end) ((BIT(_end) - BIT(_start)) + BIT(_end))
+#define PRCM_SVACLK_MGT_OFF             0x008
+#define PRCM_SIACLK_MGT_OFF             0x00C
+#define PRCM_SGACLK_MGT_OFF             0x014
+#define PRCM_UARTCLK_MGT_OFF            0x018
+#define PRCM_MSP02CLK_MGT_OFF           0x01C
+#define PRCM_I2CCLK_MGT_OFF             0x020
+#define PRCM_SDMMCCLK_MGT_OFF           0x024
+#define PRCM_SLIMCLK_MGT_OFF            0x028
+#define PRCM_PER1CLK_MGT_OFF            0x02C
+#define PRCM_PER2CLK_MGT_OFF            0x030
+#define PRCM_PER3CLK_MGT_OFF            0x034
+#define PRCM_PER5CLK_MGT_OFF            0x038
+#define PRCM_PER6CLK_MGT_OFF            0x03C
+#define PRCM_PER7CLK_MGT_OFF            0x040
+#define PRCM_PWMCLK_MGT_OFF             0x044 /* for DB5500 */
+#define PRCM_IRDACLK_MGT_OFF            0x048 /* for DB5500 */
+#define PRCM_IRRCCLK_MGT_OFF            0x04C /* for DB5500 */
+#define PRCM_LCDCLK_MGT_OFF             0x044
+#define PRCM_BMLCLK_MGT_OFF             0x04C
+#define PRCM_HSITXCLK_MGT_OFF           0x050
+#define PRCM_HSIRXCLK_MGT_OFF           0x054
+#define PRCM_HDMICLK_MGT_OFF            0x058
+#define PRCM_APEATCLK_MGT_OFF           0x05C
+#define PRCM_APETRACECLK_MGT_OFF        0x060
+#define PRCM_MCDECLK_MGT_OFF            0x064
+#define PRCM_IPI2CCLK_MGT_OFF           0x068
+#define PRCM_DSIALTCLK_MGT_OFF          0x06C
+#define PRCM_DMACLK_MGT_OFF             0x074
+#define PRCM_B2R2CLK_MGT_OFF            0x078
+#define PRCM_TVCLK_MGT_OFF              0x07C
+#define PRCM_UNIPROCLK_MGT_OFF          0x278
+#define PRCM_SSPCLK_MGT_OFF             0x280
+#define PRCM_RNGCLK_MGT_OFF             0x284
+#define PRCM_UICCCLK_MGT_OFF            0x27C
+#define PRCM_MSP1CLK_MGT_OFF            0x288
 #define PRCM_ARM_PLLDIVPS       (_PRCMU_BASE + 0x118)
 #define PRCM_ARM_PLLDIVPS_ARM_BRM_RATE          0x3f
 #define PRCM_ARM_PLLDIVPS_MAX_MASK              0xf
@@ -30,11 +68,15 @@
 #define PRCM_PLLARM_ENABLE_PRCM_PLLARM_COUNTON  0x100
 #define PRCM_ARMCLKFIX_MGT      (_PRCMU_BASE + 0x0)
+#define PRCM_A9PL_FORCE_CLKEN   (_PRCMU_BASE + 0x19C)
 #define PRCM_A9_RESETN_CLR      (_PRCMU_BASE + 0x1f4)
 #define PRCM_A9_RESETN_SET      (_PRCMU_BASE + 0x1f0)
 #define PRCM_ARM_LS_CLAMP       (_PRCMU_BASE + 0x30c)
 #define PRCM_SRAM_A9            (_PRCMU_BASE + 0x308)
+#define PRCM_A9PL_FORCE_CLKEN_PRCM_A9PL_FORCE_CLKEN BIT(0)
+#define PRCM_A9PL_FORCE_CLKEN_PRCM_A9AXI_FORCE_CLKEN BIT(1)
 /* ARM WFI Standby signal register */
 #define PRCM_ARM_WFI_STANDBY    (_PRCMU_BASE + 0x130)
 #define PRCM_IOCR               (_PRCMU_BASE + 0x310)
@@ -61,12 +103,18 @@
 #define PRCM_ARMITVAL127TO96    (_PRCMU_BASE + 0x26C)
 #define PRCM_HOSTACCESS_REQ     (_PRCMU_BASE + 0x334)
+#define PRCM_HOSTACCESS_REQ_HOSTACCESS_REQ 0x1
 #define ARM_WAKEUP_MODEM        0x1
-#define PRCM_ARM_IT1_CLEAR      (_PRCMU_BASE + 0x48C)
+#define PRCM_ARM_IT1_CLR        (_PRCMU_BASE + 0x48C)
 #define PRCM_ARM_IT1_VAL        (_PRCMU_BASE + 0x494)
 #define PRCM_HOLD_EVT           (_PRCMU_BASE + 0x174)
+#define PRCM_MOD_AWAKE_STATUS   (_PRCMU_BASE + 0x4A0)
+#define PRCM_MOD_AWAKE_STATUS_PRCM_MOD_COREPD_AWAKE     BIT(0)
+#define PRCM_MOD_AWAKE_STATUS_PRCM_MOD_AAPD_AWAKE       BIT(1)
+#define PRCM_MOD_AWAKE_STATUS_PRCM_MOD_VMODEM_OFF_ISO   BIT(2)
 #define PRCM_ITSTATUS0          (_PRCMU_BASE + 0x148)
 #define PRCM_ITSTATUS1          (_PRCMU_BASE + 0x150)
 #define PRCM_ITSTATUS2          (_PRCMU_BASE + 0x158)
@@ -87,16 +135,21 @@
 #define PRCM_PLLDSI_FREQ           (_PRCMU_BASE + 0x500)
 #define PRCM_PLLDSI_ENABLE         (_PRCMU_BASE + 0x504)
 #define PRCM_PLLDSI_LOCKP          (_PRCMU_BASE + 0x508)
-#define PRCM_LCDCLK_MGT            (_PRCMU_BASE + 0x044)
+#define PRCM_LCDCLK_MGT            (_PRCMU_BASE + PRCM_LCDCLK_MGT_OFF)
-#define PRCM_MCDECLK_MGT           (_PRCMU_BASE + 0x064)
+#define PRCM_MCDECLK_MGT           (_PRCMU_BASE + PRCM_MCDECLK_MGT_OFF)
-#define PRCM_HDMICLK_MGT           (_PRCMU_BASE + 0x058)
+#define PRCM_HDMICLK_MGT           (_PRCMU_BASE + PRCM_HDMICLK_MGT_OFF)
-#define PRCM_TVCLK_MGT             (_PRCMU_BASE + 0x07c)
+#define PRCM_TVCLK_MGT             (_PRCMU_BASE + PRCM_TVCLK_MGT_OFF)
 #define PRCM_DSI_PLLOUT_SEL        (_PRCMU_BASE + 0x530)
 #define PRCM_DSITVCLK_DIV          (_PRCMU_BASE + 0x52C)
 #define PRCM_PLLDSI_LOCKP          (_PRCMU_BASE + 0x508)
 #define PRCM_APE_RESETN_SET        (_PRCMU_BASE + 0x1E4)
 #define PRCM_APE_RESETN_CLR        (_PRCMU_BASE + 0x1E8)
 #define PRCM_CLKOCR                (_PRCMU_BASE + 0x1CC)
+#define PRCM_CLKOCR_CLKOUT0_REF_CLK     (1 << 0)
+#define PRCM_CLKOCR_CLKOUT0_MASK        BITS(0, 13)
+#define PRCM_CLKOCR_CLKOUT1_REF_CLK     (1 << 16)
+#define PRCM_CLKOCR_CLKOUT1_MASK        BITS(16, 29)
 /* ePOD and memory power signal control registers */
 #define PRCM_EPOD_C_SET            (_PRCMU_BASE + 0x410)
@@ -111,5 +164,41 @@
 #define PRCM_GPIOCR_DBG_STM_MOD_CMD1            0x800
 #define PRCM_GPIOCR_DBG_UARTMOD_CMD0            0x1
+/* PRCMU HW semaphore */
+#define PRCM_SEM                   (_PRCMU_BASE + 0x400)
+#define PRCM_SEM_PRCM_SEM BIT(0)
+#define PRCM_TCR                   (_PRCMU_BASE + 0x1C8)
+#define PRCM_TCR_TENSEL_MASK       BITS(0, 7)
+#define PRCM_TCR_STOP_TIMERS       BIT(16)
+#define PRCM_TCR_DOZE_MODE         BIT(17)
+#define PRCM_CLKOCR_CLKODIV0_SHIFT      0
+#define PRCM_CLKOCR_CLKODIV0_MASK       BITS(0, 5)
+#define PRCM_CLKOCR_CLKOSEL0_SHIFT      6
+#define PRCM_CLKOCR_CLKOSEL0_MASK       BITS(6, 8)
+#define PRCM_CLKOCR_CLKODIV1_SHIFT      16
+#define PRCM_CLKOCR_CLKODIV1_MASK       BITS(16, 21)
+#define PRCM_CLKOCR_CLKOSEL1_SHIFT      22
+#define PRCM_CLKOCR_CLKOSEL1_MASK       BITS(22, 24)
+#define PRCM_CLKOCR_CLK1TYPE            BIT(28)
+#define PRCM_CLK_MGT_CLKPLLDIV_MASK     BITS(0, 4)
+#define PRCM_CLK_MGT_CLKPLLSW_MASK      BITS(5, 7)
+#define PRCM_CLK_MGT_CLKEN              BIT(8)
+/* GPIOCR register */
+#define PRCM_GPIOCR_SPI2_SELECT BIT(23)
+#define PRCM_DDR_SUBSYS_APE_MINBW       (_PRCMU_BASE + 0x438)
+#define PRCM_CGATING_BYPASS             (_PRCMU_BASE + 0x134)
+#define PRCM_CGATING_BYPASS_ICN2        BIT(6)
+/* Miscellaneous unit registers */
+#define PRCM_RESOUTN_SET                (_PRCMU_BASE + 0x214)
+#define PRCM_RESOUTN_CLR                (_PRCMU_BASE + 0x218)
+/* System reset register */
+#define PRCM_APE_SOFTRST                (_PRCMU_BASE + 0x228)
-#endif /* __MACH_PRCMU__REGS_H */
+#endif /* __DB8500_PRCMU_REGS_H */
diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c
index 3d4a861976ca..8ad88da647b9 100644
--- a/drivers/mfd/dm355evm_msp.c
+++ b/drivers/mfd/dm355evm_msp.c
@@ -13,6 +13,7 @@
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
+#include <linux/module.h>
 #include <linux/err.h>
 #include <linux/gpio.h>
 #include <linux/leds.h>
diff --git a/drivers/mfd/intel_msic.c b/drivers/mfd/intel_msic.c
new file mode 100644
index 000000000000..97c27762174f
--- /dev/null
+++ b/drivers/mfd/intel_msic.c
@@ -0,0 +1,502 @@
+/*
+ * Driver for Intel MSIC
+ *
+ * Copyright (C) 2011, Intel Corporation
+ * Author: Mika Westerberg <mika.westerberg@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/gpio.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/mfd/core.h>
+#include <linux/mfd/intel_msic.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <asm/intel_scu_ipc.h>
+#define MSIC_VENDOR(id)         ((id >> 6) & 3)
+#define MSIC_VERSION(id)        (id & 0x3f)
+#define MSIC_MAJOR(id)          ('A' + ((id >> 3) & 7))
+#define MSIC_MINOR(id)          (id & 7)
+/*
+ * MSIC interrupt tree is readable from SRAM at INTEL_MSIC_IRQ_PHYS_BASE.
+ * Since IRQ block starts from address 0x002 we need to substract that from
+ * the actual IRQ status register address.
+ */
+#define MSIC_IRQ_STATUS(x)      (INTEL_MSIC_IRQ_PHYS_BASE + ((x) - 2))
+#define MSIC_IRQ_STATUS_ACCDET  MSIC_IRQ_STATUS(INTEL_MSIC_ACCDET)
+/*
+ * The SCU hardware has limitation of 16 bytes per read/write buffer on
+ * Medfield.
+ */
+#define SCU_IPC_RWBUF_LIMIT     16
+/**
+ * struct intel_msic - an MSIC MFD instance
+ * @pdev: pointer to the platform device
+ * @vendor: vendor ID
+ * @version: chip version
+ * @irq_base: base address of the mapped MSIC SRAM interrupt tree
+ */
+struct intel_msic {
+        struct platform_device          *pdev;
+        unsigned                        vendor;
+        unsigned                        version;
+        void __iomem                    *irq_base;
+};
+static struct resource msic_touch_resources[] = {
+        {
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+static struct resource msic_adc_resources[] = {
+        {
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+static struct resource msic_battery_resources[] = {
+        {
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+static struct resource msic_gpio_resources[] = {
+        {
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+static struct resource msic_audio_resources[] = {
+        {
+                .name           = "IRQ",
+                .flags          = IORESOURCE_IRQ,
+        },
+        /*
+         * We will pass IRQ_BASE to the driver now but this can be removed
+         * when/if the driver starts to use intel_msic_irq_read().
+         */
+        {
+                .name           = "IRQ_BASE",
+                .flags          = IORESOURCE_MEM,
+                .start          = MSIC_IRQ_STATUS_ACCDET,
+                .end            = MSIC_IRQ_STATUS_ACCDET,
+        },
+};
+static struct resource msic_hdmi_resources[] = {
+        {
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+static struct resource msic_thermal_resources[] = {
+        {
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+static struct resource msic_power_btn_resources[] = {
+        {
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+static struct resource msic_ocd_resources[] = {
+        {
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+/*
+ * Devices that are part of the MSIC and are available via firmware
+ * populated SFI DEVS table.
+ */
+static struct mfd_cell msic_devs[] = {
+        [INTEL_MSIC_BLOCK_TOUCH]        = {
+                .name                   = "msic_touch",
+                .num_resources          = ARRAY_SIZE(msic_touch_resources),
+                .resources              = msic_touch_resources,
+        },
+        [INTEL_MSIC_BLOCK_ADC]          = {
+                .name                   = "msic_adc",
+                .num_resources          = ARRAY_SIZE(msic_adc_resources),
+                .resources              = msic_adc_resources,
+        },
+        [INTEL_MSIC_BLOCK_BATTERY]      = {
+                .name                   = "msic_battery",
+                .num_resources          = ARRAY_SIZE(msic_battery_resources),
+                .resources              = msic_battery_resources,
+        },
+        [INTEL_MSIC_BLOCK_GPIO]         = {
+                .name                   = "msic_gpio",
+                .num_resources          = ARRAY_SIZE(msic_gpio_resources),
+                .resources              = msic_gpio_resources,
+        },
+        [INTEL_MSIC_BLOCK_AUDIO]        = {
+                .name                   = "msic_audio",
+                .num_resources          = ARRAY_SIZE(msic_audio_resources),
+                .resources              = msic_audio_resources,
+        },
+        [INTEL_MSIC_BLOCK_HDMI]         = {
+                .name                   = "msic_hdmi",
+                .num_resources          = ARRAY_SIZE(msic_hdmi_resources),
+                .resources              = msic_hdmi_resources,
+        },
+        [INTEL_MSIC_BLOCK_THERMAL]      = {
+                .name                   = "msic_thermal",
+                .num_resources          = ARRAY_SIZE(msic_thermal_resources),
+                .resources              = msic_thermal_resources,
+        },
+        [INTEL_MSIC_BLOCK_POWER_BTN]    = {
+                .name                   = "msic_power_btn",
+                .num_resources          = ARRAY_SIZE(msic_power_btn_resources),
+                .resources              = msic_power_btn_resources,
+        },
+        [INTEL_MSIC_BLOCK_OCD]          = {
+                .name                   = "msic_ocd",
+                .num_resources          = ARRAY_SIZE(msic_ocd_resources),
+                .resources              = msic_ocd_resources,
+        },
+};
+/*
+ * Other MSIC related devices which are not directly available via SFI DEVS
+ * table. These can be pseudo devices, regulators etc. which are needed for
+ * different purposes.
+ *
+ * These devices appear only after the MSIC driver itself is initialized so
+ * we can guarantee that the SCU IPC interface is ready.
+ */
+static struct mfd_cell msic_other_devs[] = {
+        /* Audio codec in the MSIC */
+        {
+                .id                     = -1,
+                .name                   = "sn95031",
+        },
+};
+/**
+ * intel_msic_reg_read - read a single MSIC register
+ * @reg: register to read
+ * @val: register value is placed here
+ *
+ * Read a single register from MSIC. Returns %0 on success and negative
+ * errno in case of failure.
+ *
+ * Function may sleep.
+ */
+int intel_msic_reg_read(unsigned short reg, u8 *val)
+{
+        return intel_scu_ipc_ioread8(reg, val);
+}
+EXPORT_SYMBOL_GPL(intel_msic_reg_read);
+/**
+ * intel_msic_reg_write - write a single MSIC register
+ * @reg: register to write
+ * @val: value to write to that register
+ *
+ * Write a single MSIC register. Returns 0 on success and negative
+ * errno in case of failure.
+ *
+ * Function may sleep.
+ */
+int intel_msic_reg_write(unsigned short reg, u8 val)
+{
+        return intel_scu_ipc_iowrite8(reg, val);
+}
+EXPORT_SYMBOL_GPL(intel_msic_reg_write);
+/**
+ * intel_msic_reg_update - update a single MSIC register
+ * @reg: register to update
+ * @val: value to write to the register
+ * @mask: specifies which of the bits are updated (%0 = don't update,
+ *        %1 = update)
+ *
+ * Perform an update to a register @reg. @mask is used to specify which
+ * bits are updated. Returns %0 in case of success and negative errno in
+ * case of failure.
+ *
+ * Function may sleep.
+ */
+int intel_msic_reg_update(unsigned short reg, u8 val, u8 mask)
+{
+        return intel_scu_ipc_update_register(reg, val, mask);
+}
+EXPORT_SYMBOL_GPL(intel_msic_reg_update);
+/**
+ * intel_msic_bulk_read - read an array of registers
+ * @reg: array of register addresses to read
+ * @buf: array where the read values are placed
+ * @count: number of registers to read
+ *
+ * Function reads @count registers from the MSIC using addresses passed in
+ * @reg. Read values are placed in @buf. Reads are performed atomically
+ * wrt. MSIC.
+ *
+ * Returns %0 in case of success and negative errno in case of failure.
+ *
+ * Function may sleep.
+ */
+int intel_msic_bulk_read(unsigned short *reg, u8 *buf, size_t count)
+{
+        if (WARN_ON(count > SCU_IPC_RWBUF_LIMIT))
+                return -EINVAL;
+        return intel_scu_ipc_readv(reg, buf, count);
+}
+EXPORT_SYMBOL_GPL(intel_msic_bulk_read);
+/**
+ * intel_msic_bulk_write - write an array of values to the MSIC registers
+ * @reg: array of registers to write
+ * @buf: values to write to each register
+ * @count: number of registers to write
+ *
+ * Function writes @count registers in @buf to MSIC. Writes are performed
+ * atomically wrt MSIC. Returns %0 in case of success and negative errno in
+ * case of failure.
+ *
+ * Function may sleep.
+ */
+int intel_msic_bulk_write(unsigned short *reg, u8 *buf, size_t count)
+{
+        if (WARN_ON(count > SCU_IPC_RWBUF_LIMIT))
+                return -EINVAL;
+        return intel_scu_ipc_writev(reg, buf, count);
+}
+EXPORT_SYMBOL_GPL(intel_msic_bulk_write);
+/**
+ * intel_msic_irq_read - read a register from an MSIC interrupt tree
+ * @msic: MSIC instance
+ * @reg: interrupt register (between %INTEL_MSIC_IRQLVL1 and
+ *       %INTEL_MSIC_RESETIRQ2)
+ * @val: value of the register is placed here
+ *
+ * This function can be used by an MSIC subdevice interrupt handler to read
+ * a register value from the MSIC interrupt tree. In this way subdevice
+ * drivers don't have to map in the interrupt tree themselves but can just
+ * call this function instead.
+ *
+ * Function doesn't sleep and is callable from interrupt context.
+ *
+ * Returns %-EINVAL if @reg is outside of the allowed register region.
+ */
+int intel_msic_irq_read(struct intel_msic *msic, unsigned short reg, u8 *val)
+{
+        if (WARN_ON(reg < INTEL_MSIC_IRQLVL1 || reg > INTEL_MSIC_RESETIRQ2))
+                return -EINVAL;
+        *val = readb(msic->irq_base + (reg - INTEL_MSIC_IRQLVL1));
+        return 0;
+}
+EXPORT_SYMBOL_GPL(intel_msic_irq_read);
+static int __devinit intel_msic_init_devices(struct intel_msic *msic)
+{
+        struct platform_device *pdev = msic->pdev;
+        struct intel_msic_platform_data *pdata = pdev->dev.platform_data;
+        int ret, i;
+        if (pdata->gpio) {
+                struct mfd_cell *cell = &msic_devs[INTEL_MSIC_BLOCK_GPIO];
+                cell->platform_data = pdata->gpio;
+                cell->pdata_size = sizeof(*pdata->gpio);
+        }
+        if (pdata->ocd) {
+                unsigned gpio = pdata->ocd->gpio;
+                ret = gpio_request_one(gpio, GPIOF_IN, "ocd_gpio");
+                if (ret) {
+                        dev_err(&pdev->dev, "failed to register OCD GPIO\n");
+                        return ret;
+                }
+                ret = gpio_to_irq(gpio);
+                if (ret < 0) {
+                        dev_err(&pdev->dev, "no IRQ number for OCD GPIO\n");
+                        gpio_free(gpio);
+                        return ret;
+                }
+                /* Update the IRQ number for the OCD */
+                pdata->irq[INTEL_MSIC_BLOCK_OCD] = ret;
+        }
+        for (i = 0; i < ARRAY_SIZE(msic_devs); i++) {
+                if (!pdata->irq[i])
+                        continue;
+                ret = mfd_add_devices(&pdev->dev, -1, &msic_devs[i], 1, NULL,
+                                      pdata->irq[i]);
+                if (ret)
+                        goto fail;
+        }
+        ret = mfd_add_devices(&pdev->dev, 0, msic_other_devs,
+                              ARRAY_SIZE(msic_other_devs), NULL, 0);
+        if (ret)
+                goto fail;
+        return 0;
+fail:
+        mfd_remove_devices(&pdev->dev);
+        if (pdata->ocd)
+                gpio_free(pdata->ocd->gpio);
+        return ret;
+}
+static void __devexit intel_msic_remove_devices(struct intel_msic *msic)
+{
+        struct platform_device *pdev = msic->pdev;
+        struct intel_msic_platform_data *pdata = pdev->dev.platform_data;
+        mfd_remove_devices(&pdev->dev);
+        if (pdata->ocd)
+                gpio_free(pdata->ocd->gpio);
+}
+static int __devinit intel_msic_probe(struct platform_device *pdev)
+{
+        struct intel_msic_platform_data *pdata = pdev->dev.platform_data;
+        struct intel_msic *msic;
+        struct resource *res;
+        u8 id0, id1;
+        int ret;
+        if (!pdata) {
+                dev_err(&pdev->dev, "no platform data passed\n");
+                return -EINVAL;
+        }
+        /* First validate that we have an MSIC in place */
+        ret = intel_scu_ipc_ioread8(INTEL_MSIC_ID0, &id0);
+        if (ret) {
+                dev_err(&pdev->dev, "failed to identify the MSIC chip (ID0)\n");
+                return -ENXIO;
+        }
+        ret = intel_scu_ipc_ioread8(INTEL_MSIC_ID1, &id1);
+        if (ret) {
+                dev_err(&pdev->dev, "failed to identify the MSIC chip (ID1)\n");
+                return -ENXIO;
+        }
+        if (MSIC_VENDOR(id0) != MSIC_VENDOR(id1)) {
+                dev_err(&pdev->dev, "invalid vendor ID: %x, %x\n", id0, id1);
+                return -ENXIO;
+        }
+        msic = kzalloc(sizeof(*msic), GFP_KERNEL);
+        if (!msic)
+                return -ENOMEM;
+        msic->vendor = MSIC_VENDOR(id0);
+        msic->version = MSIC_VERSION(id0);
+        msic->pdev = pdev;
+        /*
+         * Map in the MSIC interrupt tree area in SRAM. This is exposed to
+         * the clients via intel_msic_irq_read().
+         */
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(&pdev->dev, "failed to get SRAM iomem resource\n");
+                ret = -ENODEV;
+                goto fail_free_msic;
+        }
+        res = request_mem_region(res->start, resource_size(res), pdev->name);
+        if (!res) {
+                ret = -EBUSY;
+                goto fail_free_msic;
+        }
+        msic->irq_base = ioremap_nocache(res->start, resource_size(res));
+        if (!msic->irq_base) {
+                dev_err(&pdev->dev, "failed to map SRAM memory\n");
+                ret = -ENOMEM;
+                goto fail_release_region;
+        }
+        platform_set_drvdata(pdev, msic);
+        ret = intel_msic_init_devices(msic);
+        if (ret) {
+                dev_err(&pdev->dev, "failed to initialize MSIC devices\n");
+                goto fail_unmap_mem;
+        }
+        dev_info(&pdev->dev, "Intel MSIC version %c%d (vendor %#x)\n",
+                 MSIC_MAJOR(msic->version), MSIC_MINOR(msic->version),
+                 msic->vendor);
+        return 0;
+fail_unmap_mem:
+        iounmap(msic->irq_base);
+fail_release_region:
+        release_mem_region(res->start, resource_size(res));
+fail_free_msic:
+        kfree(msic);
+        return ret;
+}
+static int __devexit intel_msic_remove(struct platform_device *pdev)
+{
+        struct intel_msic *msic = platform_get_drvdata(pdev);
+        struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        intel_msic_remove_devices(msic);
+        platform_set_drvdata(pdev, NULL);
+        iounmap(msic->irq_base);
+        release_mem_region(res->start, resource_size(res));
+        kfree(msic);
+        return 0;
+}
+static struct platform_driver intel_msic_driver = {
+        .probe          = intel_msic_probe,
+        .remove         = __devexit_p(intel_msic_remove),
+        .driver         = {
+                .name   = "intel_msic",
+                .owner  = THIS_MODULE,
+        },
+};
+static int __init intel_msic_init(void)
+{
+        return platform_driver_register(&intel_msic_driver);
+}
+module_init(intel_msic_init);
+static void __exit intel_msic_exit(void)
+{
+        platform_driver_unregister(&intel_msic_driver);
+}
+module_exit(intel_msic_exit);
+MODULE_DESCRIPTION("Driver for Intel MSIC");
+MODULE_AUTHOR("Mika Westerberg <mika.westerberg@linux.intel.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
index 563654c9b19e..1e9ee533eacb 100644
--- a/drivers/mfd/jz4740-adc.c
+++ b/drivers/mfd/jz4740-adc.c
@@ -328,7 +328,7 @@ static int __devexit jz4740_adc_remove(struct platform_device *pdev)
        return 0;
 }
-struct platform_driver jz4740_adc_driver = {
+static struct platform_driver jz4740_adc_driver = {
        .probe  = jz4740_adc_probe,
        .remove = __devexit_p(jz4740_adc_remove),
        .driver = {
diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
index f83103b8970d..5be53ae9b61c 100644
--- a/drivers/mfd/max8997.c
+++ b/drivers/mfd/max8997.c
@@ -23,7 +23,9 @@
 #include <linux/slab.h>
 #include <linux/i2c.h>
+#include <linux/interrupt.h>
 #include <linux/pm_runtime.h>
+#include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/max8997.h>
@@ -142,7 +144,6 @@ static int max8997_i2c_probe(struct i2c_client *i2c,
        max8997->irq_base = pdata->irq_base;
        max8997->ono = pdata->ono;
-        max8997->wakeup = pdata->wakeup;
        mutex_init(&max8997->iolock);
@@ -169,6 +170,9 @@ static int max8997_i2c_probe(struct i2c_client *i2c,
        if (ret < 0)
                goto err_mfd;
+        /* MAX8997 has a power button input. */
+        device_init_wakeup(max8997->dev, pdata->wakeup);
        return ret;
 err_mfd:
@@ -398,7 +402,29 @@ static int max8997_restore(struct device *dev)
        return 0;
 }
+static int max8997_suspend(struct device *dev)
+{
+        struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
+        struct max8997_dev *max8997 = i2c_get_clientdata(i2c);
+        if (device_may_wakeup(dev))
+                irq_set_irq_wake(max8997->irq, 1);
+        return 0;
+}
+static int max8997_resume(struct device *dev)
+{
+        struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
+        struct max8997_dev *max8997 = i2c_get_clientdata(i2c);
+        if (device_may_wakeup(dev))
+                irq_set_irq_wake(max8997->irq, 0);
+        return max8997_irq_resume(max8997);
+}
 const struct dev_pm_ops max8997_pm = {
+        .suspend = max8997_suspend,
+        .resume = max8997_resume,
        .freeze = max8997_freeze,
        .restore = max8997_restore,
 };
diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
index 7e4d44bf92ab..e9619acc0237 100644
--- a/drivers/mfd/mc13xxx-core.c
+++ b/drivers/mfd/mc13xxx-core.c
@@ -26,20 +26,10 @@ struct mc13xxx {
        irq_handler_t irqhandler[MC13XXX_NUM_IRQ];
        void *irqdata[MC13XXX_NUM_IRQ];
-};
-struct mc13783 {
-        struct mc13xxx mc13xxx;
        int adcflags;
 };
-struct mc13xxx *mc13783_to_mc13xxx(struct mc13783 *mc13783)
-{
-        return &mc13783->mc13xxx;
-}
-EXPORT_SYMBOL(mc13783_to_mc13xxx);
 #define MC13XXX_IRQSTAT0        0
 #define MC13XXX_IRQSTAT0_ADCDONEI       (1 << 0)
 #define MC13XXX_IRQSTAT0_ADCBISDONEI    (1 << 1)
@@ -136,14 +126,14 @@ EXPORT_SYMBOL(mc13783_to_mc13xxx);
 #define MC13XXX_REVISION_FAB            (0x03 << 11)
 #define MC13XXX_REVISION_ICIDCODE       (0x3f << 13)
-#define MC13783_ADC1            44
+#define MC13XXX_ADC1            44
-#define MC13783_ADC1_ADEN               (1 << 0)
+#define MC13XXX_ADC1_ADEN               (1 << 0)
-#define MC13783_ADC1_RAND               (1 << 1)
+#define MC13XXX_ADC1_RAND               (1 << 1)
-#define MC13783_ADC1_ADSEL              (1 << 3)
+#define MC13XXX_ADC1_ADSEL              (1 << 3)
-#define MC13783_ADC1_ASC                (1 << 20)
+#define MC13XXX_ADC1_ASC                (1 << 20)
-#define MC13783_ADC1_ADTRIGIGN          (1 << 21)
+#define MC13XXX_ADC1_ADTRIGIGN          (1 << 21)
-#define MC13783_ADC2            45
+#define MC13XXX_ADC2            45
 #define MC13XXX_NUMREGS 0x3f
@@ -487,7 +477,7 @@ enum mc13xxx_id {
        MC13XXX_ID_INVALID,
 };
-const char *mc13xxx_chipname[] = {
+static const char *mc13xxx_chipname[] = {
        [MC13XXX_ID_MC13783] = "mc13783",
        [MC13XXX_ID_MC13892] = "mc13892",
 };
@@ -558,8 +548,6 @@ static const char *mc13xxx_get_chipname(struct mc13xxx *mc13xxx)
        return mc13xxx_chipname[devid->driver_data];
 }
-#include <linux/mfd/mc13783.h>
 int mc13xxx_get_flags(struct mc13xxx *mc13xxx)
 {
        struct mc13xxx_platform_data *pdata =
@@ -569,15 +557,15 @@ int mc13xxx_get_flags(struct mc13xxx *mc13xxx)
 }
 EXPORT_SYMBOL(mc13xxx_get_flags);
-#define MC13783_ADC1_CHAN0_SHIFT        5
+#define MC13XXX_ADC1_CHAN0_SHIFT        5
-#define MC13783_ADC1_CHAN1_SHIFT        8
+#define MC13XXX_ADC1_CHAN1_SHIFT        8
 struct mc13xxx_adcdone_data {
        struct mc13xxx *mc13xxx;
        struct completion done;
 };
-static irqreturn_t mc13783_handler_adcdone(int irq, void *data)
+static irqreturn_t mc13xxx_handler_adcdone(int irq, void *data)
 {
        struct mc13xxx_adcdone_data *adcdone_data = data;
@@ -588,12 +576,11 @@ static irqreturn_t mc13783_handler_adcdone(int irq, void *data)
        return IRQ_HANDLED;
 }
-#define MC13783_ADC_WORKING (1 << 0)
+#define MC13XXX_ADC_WORKING (1 << 0)
-int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode,
+int mc13xxx_adc_do_conversion(struct mc13xxx *mc13xxx, unsigned int mode,
                unsigned int channel, unsigned int *sample)
 {
-        struct mc13xxx *mc13xxx = &mc13783->mc13xxx;
        u32 adc0, adc1, old_adc0;
        int i, ret;
        struct mc13xxx_adcdone_data adcdone_data = {
@@ -605,51 +592,51 @@ int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode,
        mc13xxx_lock(mc13xxx);
-        if (mc13783->adcflags & MC13783_ADC_WORKING) {
+        if (mc13xxx->adcflags & MC13XXX_ADC_WORKING) {
                ret = -EBUSY;
                goto out;
        }
-        mc13783->adcflags |= MC13783_ADC_WORKING;
+        mc13xxx->adcflags |= MC13XXX_ADC_WORKING;
-        mc13xxx_reg_read(mc13xxx, MC13783_ADC0, &old_adc0);
+        mc13xxx_reg_read(mc13xxx, MC13XXX_ADC0, &old_adc0);
-        adc0 = MC13783_ADC0_ADINC1 | MC13783_ADC0_ADINC2;
+        adc0 = MC13XXX_ADC0_ADINC1 | MC13XXX_ADC0_ADINC2;
-        adc1 = MC13783_ADC1_ADEN | MC13783_ADC1_ADTRIGIGN | MC13783_ADC1_ASC;
+        adc1 = MC13XXX_ADC1_ADEN | MC13XXX_ADC1_ADTRIGIGN | MC13XXX_ADC1_ASC;
        if (channel > 7)
-                adc1 |= MC13783_ADC1_ADSEL;
+                adc1 |= MC13XXX_ADC1_ADSEL;
        switch (mode) {
-        case MC13783_ADC_MODE_TS:
+        case MC13XXX_ADC_MODE_TS:
-                adc0 |= MC13783_ADC0_ADREFEN | MC13783_ADC0_TSMOD0 |
+                adc0 |= MC13XXX_ADC0_ADREFEN | MC13XXX_ADC0_TSMOD0 |
-                        MC13783_ADC0_TSMOD1;
+                        MC13XXX_ADC0_TSMOD1;
-                adc1 |= 4 << MC13783_ADC1_CHAN1_SHIFT;
+                adc1 |= 4 << MC13XXX_ADC1_CHAN1_SHIFT;
                break;
-        case MC13783_ADC_MODE_SINGLE_CHAN:
+        case MC13XXX_ADC_MODE_SINGLE_CHAN:
-                adc0 |= old_adc0 & MC13783_ADC0_TSMOD_MASK;
+                adc0 |= old_adc0 & MC13XXX_ADC0_TSMOD_MASK;
-                adc1 |= (channel & 0x7) << MC13783_ADC1_CHAN0_SHIFT;
+                adc1 |= (channel & 0x7) << MC13XXX_ADC1_CHAN0_SHIFT;
-                adc1 |= MC13783_ADC1_RAND;
+                adc1 |= MC13XXX_ADC1_RAND;
                break;
-        case MC13783_ADC_MODE_MULT_CHAN:
+        case MC13XXX_ADC_MODE_MULT_CHAN:
-                adc0 |= old_adc0 & MC13783_ADC0_TSMOD_MASK;
+                adc0 |= old_adc0 & MC13XXX_ADC0_TSMOD_MASK;
-                adc1 |= 4 << MC13783_ADC1_CHAN1_SHIFT;
+                adc1 |= 4 << MC13XXX_ADC1_CHAN1_SHIFT;
                break;
        default:
-                mc13783_unlock(mc13783);
+                mc13xxx_unlock(mc13xxx);
                return -EINVAL;
        }
-        dev_dbg(&mc13783->mc13xxx.spidev->dev, "%s: request irq\n", __func__);
+        dev_dbg(&mc13xxx->spidev->dev, "%s: request irq\n", __func__);
-        mc13xxx_irq_request(mc13xxx, MC13783_IRQ_ADCDONE,
+        mc13xxx_irq_request(mc13xxx, MC13XXX_IRQ_ADCDONE,
-                        mc13783_handler_adcdone, __func__, &adcdone_data);
+                        mc13xxx_handler_adcdone, __func__, &adcdone_data);
-        mc13xxx_irq_ack(mc13xxx, MC13783_IRQ_ADCDONE);
+        mc13xxx_irq_ack(mc13xxx, MC13XXX_IRQ_ADCDONE);
-        mc13xxx_reg_write(mc13xxx, MC13783_ADC0, adc0);
+        mc13xxx_reg_write(mc13xxx, MC13XXX_ADC0, adc0);
-        mc13xxx_reg_write(mc13xxx, MC13783_ADC1, adc1);
+        mc13xxx_reg_write(mc13xxx, MC13XXX_ADC1, adc1);
        mc13xxx_unlock(mc13xxx);
@@ -660,27 +647,27 @@ int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode,
        mc13xxx_lock(mc13xxx);
-        mc13xxx_irq_free(mc13xxx, MC13783_IRQ_ADCDONE, &adcdone_data);
+        mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_ADCDONE, &adcdone_data);
        if (ret > 0)
                for (i = 0; i < 4; ++i) {
                        ret = mc13xxx_reg_read(mc13xxx,
-                                        MC13783_ADC2, &sample[i]);
+                                        MC13XXX_ADC2, &sample[i]);
                        if (ret)
                                break;
                }
-        if (mode == MC13783_ADC_MODE_TS)
+        if (mode == MC13XXX_ADC_MODE_TS)
                /* restore TSMOD */
-                mc13xxx_reg_write(mc13xxx, MC13783_ADC0, old_adc0);
+                mc13xxx_reg_write(mc13xxx, MC13XXX_ADC0, old_adc0);
-        mc13783->adcflags &= ~MC13783_ADC_WORKING;
+        mc13xxx->adcflags &= ~MC13XXX_ADC_WORKING;
 out:
        mc13xxx_unlock(mc13xxx);
        return ret;
 }
-EXPORT_SYMBOL_GPL(mc13783_adc_do_conversion);
+EXPORT_SYMBOL_GPL(mc13xxx_adc_do_conversion);
 static int mc13xxx_add_subdevice_pdata(struct mc13xxx *mc13xxx,
                const char *format, void *pdata, size_t pdata_size)
@@ -716,6 +703,11 @@ static int mc13xxx_probe(struct spi_device *spi)
        enum mc13xxx_id id;
        int ret;
+        if (!pdata) {
+                dev_err(&spi->dev, "invalid platform data\n");
+                return -EINVAL;
+        }
        mc13xxx = kzalloc(sizeof(*mc13xxx), GFP_KERNEL);
        if (!mc13xxx)
                return -ENOMEM;
@@ -763,10 +755,8 @@ err_revision:
        if (pdata->flags & MC13XXX_USE_CODEC)
                mc13xxx_add_subdevice(mc13xxx, "%s-codec");
-        if (pdata->flags & MC13XXX_USE_REGULATOR) {
+        mc13xxx_add_subdevice_pdata(mc13xxx, "%s-regulator",
-                mc13xxx_add_subdevice_pdata(mc13xxx, "%s-regulator",
+                &pdata->regulators, sizeof(pdata->regulators));
-                                &pdata->regulators, sizeof(pdata->regulators));
-        }
        if (pdata->flags & MC13XXX_USE_RTC)
                mc13xxx_add_subdevice(mc13xxx, "%s-rtc");
@@ -774,10 +764,14 @@ err_revision:
        if (pdata->flags & MC13XXX_USE_TOUCHSCREEN)
                mc13xxx_add_subdevice(mc13xxx, "%s-ts");
-        if (pdata->flags & MC13XXX_USE_LED)
+        if (pdata->leds)
                mc13xxx_add_subdevice_pdata(mc13xxx, "%s-led",
                                pdata->leds, sizeof(*pdata->leds));
+        if (pdata->buttons)
+                mc13xxx_add_subdevice_pdata(mc13xxx, "%s-pwrbutton",
+                                pdata->buttons, sizeof(*pdata->buttons));
        return 0;
 }
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index af5d9d061371..cb4910ac4d12 100644
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -1226,7 +1226,7 @@ static int menelaus_probe(struct i2c_client *client,
        menelaus_write_reg(MENELAUS_MCT_CTRL1, 0x73);
        if (client->irq > 0) {
-                err = request_irq(client->irq, menelaus_irq, IRQF_DISABLED,
+                err = request_irq(client->irq, menelaus_irq, 0,
                                  DRIVER_NAME, menelaus);
                if (err) {
                        dev_dbg(&client->dev,  "can't get IRQ %d, err %d\n",
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index 0902523af62d..0f5922812bff 100644
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -17,6 +17,7 @@
 #include <linux/mfd/core.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 int mfd_cell_enable(struct platform_device *pdev)
 {
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c
index 57868416c760..ff1a7e741ecd 100644
--- a/drivers/mfd/pcf50633-core.c
+++ b/drivers/mfd/pcf50633-core.c
@@ -23,45 +23,22 @@
 #include <linux/i2c.h>
 #include <linux/pm.h>
 #include <linux/slab.h>
+#include <linux/regmap.h>
+#include <linux/err.h>
 #include <linux/mfd/pcf50633/core.h>
-static int __pcf50633_read(struct pcf50633 *pcf, u8 reg, int num, u8 *data)
-{
-        int ret;
-        ret = i2c_smbus_read_i2c_block_data(pcf->i2c_client, reg,
-                                num, data);
-        if (ret < 0)
-                dev_err(pcf->dev, "Error reading %d regs at %d\n", num, reg);
-        return ret;
-}
-static int __pcf50633_write(struct pcf50633 *pcf, u8 reg, int num, u8 *data)
-{
-        int ret;
-        ret = i2c_smbus_write_i2c_block_data(pcf->i2c_client, reg,
-                                num, data);
-        if (ret < 0)
-                dev_err(pcf->dev, "Error writing %d regs at %d\n", num, reg);
-        return ret;
-}
 /* Read a block of up to 32 regs  */
 int pcf50633_read_block(struct pcf50633 *pcf, u8 reg,
                                        int nr_regs, u8 *data)
 {
        int ret;
-        mutex_lock(&pcf->lock);
+        ret = regmap_raw_read(pcf->regmap, reg, data, nr_regs);
-        ret = __pcf50633_read(pcf, reg, nr_regs, data);
+        if (ret != 0)
-        mutex_unlock(&pcf->lock);
+                return ret;
-        return ret;
+        return nr_regs;
 }
 EXPORT_SYMBOL_GPL(pcf50633_read_block);
@@ -71,21 +48,22 @@ int pcf50633_write_block(struct pcf50633 *pcf , u8 reg,
 {
        int ret;
-        mutex_lock(&pcf->lock);
+        ret = regmap_raw_write(pcf->regmap, reg, data, nr_regs);
-        ret = __pcf50633_write(pcf, reg, nr_regs, data);
+        if (ret != 0)
-        mutex_unlock(&pcf->lock);
+                return ret;
-        return ret;
+        return nr_regs;
 }
 EXPORT_SYMBOL_GPL(pcf50633_write_block);
 u8 pcf50633_reg_read(struct pcf50633 *pcf, u8 reg)
 {
-        u8 val;
+        unsigned int val;
+        int ret;
-        mutex_lock(&pcf->lock);
+        ret = regmap_read(pcf->regmap, reg, &val);
-        __pcf50633_read(pcf, reg, 1, &val);
+        if (ret < 0)
-        mutex_unlock(&pcf->lock);
+                return -1;
        return val;
 }
@@ -93,56 +71,19 @@ EXPORT_SYMBOL_GPL(pcf50633_reg_read);
 int pcf50633_reg_write(struct pcf50633 *pcf, u8 reg, u8 val)
 {
-        int ret;
+        return regmap_write(pcf->regmap, reg, val);
-        mutex_lock(&pcf->lock);
-        ret = __pcf50633_write(pcf, reg, 1, &val);
-        mutex_unlock(&pcf->lock);
-        return ret;
 }
 EXPORT_SYMBOL_GPL(pcf50633_reg_write);
 int pcf50633_reg_set_bit_mask(struct pcf50633 *pcf, u8 reg, u8 mask, u8 val)
 {
-        int ret;
+        return regmap_update_bits(pcf->regmap, reg, mask, val);
-        u8 tmp;
-        val &= mask;
-        mutex_lock(&pcf->lock);
-        ret = __pcf50633_read(pcf, reg, 1, &tmp);
-        if (ret < 0)
-                goto out;
-        tmp &= ~mask;
-        tmp |= val;
-        ret = __pcf50633_write(pcf, reg, 1, &tmp);
-out:
-        mutex_unlock(&pcf->lock);
-        return ret;
 }
 EXPORT_SYMBOL_GPL(pcf50633_reg_set_bit_mask);
 int pcf50633_reg_clear_bits(struct pcf50633 *pcf, u8 reg, u8 val)
 {
-        int ret;
+        return regmap_update_bits(pcf->regmap, reg, val, 0);
-        u8 tmp;
-        mutex_lock(&pcf->lock);
-        ret = __pcf50633_read(pcf, reg, 1, &tmp);
-        if (ret < 0)
-                goto out;
-        tmp &= ~val;
-        ret = __pcf50633_write(pcf, reg, 1, &tmp);
-out:
-        mutex_unlock(&pcf->lock);
-        return ret;
 }
 EXPORT_SYMBOL_GPL(pcf50633_reg_clear_bits);
@@ -251,6 +192,11 @@ static int pcf50633_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(pcf50633_pm, pcf50633_suspend, pcf50633_resume);
+static struct regmap_config pcf50633_regmap_config = {
+        .reg_bits = 8,
+        .val_bits = 8,
+};
 static int __devinit pcf50633_probe(struct i2c_client *client,
                                const struct i2c_device_id *ids)
 {
@@ -272,16 +218,23 @@ static int __devinit pcf50633_probe(struct i2c_client *client,
        mutex_init(&pcf->lock);
+        pcf->regmap = regmap_init_i2c(client, &pcf50633_regmap_config);
+        if (IS_ERR(pcf->regmap)) {
+                ret = PTR_ERR(pcf->regmap);
+                dev_err(pcf->dev, "Failed to allocate register map: %d\n",
+                        ret);
+                goto err_free;
+        }
        i2c_set_clientdata(client, pcf);
        pcf->dev = &client->dev;
-        pcf->i2c_client = client;
        version = pcf50633_reg_read(pcf, 0);
        variant = pcf50633_reg_read(pcf, 1);
        if (version < 0 || variant < 0) {
                dev_err(pcf->dev, "Unable to probe pcf50633\n");
                ret = -ENODEV;
-                goto err_free;
+                goto err_regmap;
        }
        dev_info(pcf->dev, "Probed device version %d variant %d\n",
@@ -328,6 +281,8 @@ static int __devinit pcf50633_probe(struct i2c_client *client,
        return 0;
+err_regmap:
+        regmap_exit(pcf->regmap);
 err_free:
        kfree(pcf);
@@ -351,6 +306,7 @@ static int __devexit pcf50633_remove(struct i2c_client *client)
        for (i = 0; i < PCF50633_NUM_REGULATORS; i++)
                platform_device_unregister(pcf->regulator_pdev[i]);
+        regmap_exit(pcf->regmap);
        kfree(pcf);
        return 0;
diff --git a/drivers/mfd/pcf50633-irq.c b/drivers/mfd/pcf50633-irq.c
index 1b0192f1efff..048a3b903b01 100644
--- a/drivers/mfd/pcf50633-irq.c
+++ b/drivers/mfd/pcf50633-irq.c
@@ -15,6 +15,7 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/mutex.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/mfd/pcf50633/core.h>
diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c
index c27e515b0722..de979742c6fc 100644
--- a/drivers/mfd/tc3589x.c
+++ b/drivers/mfd/tc3589x.c
@@ -357,6 +357,7 @@ static int __devexit tc3589x_remove(struct i2c_client *client)
        return 0;
 }
+#ifdef CONFIG_PM
 static int tc3589x_suspend(struct device *dev)
 {
        struct tc3589x *tc3589x = dev_get_drvdata(dev);
@@ -387,6 +388,7 @@ static int tc3589x_resume(struct device *dev)
 static const SIMPLE_DEV_PM_OPS(tc3589x_dev_pm_ops, tc3589x_suspend,
                                                tc3589x_resume);
+#endif
 static const struct i2c_device_id tc3589x_id[] = {
        { "tc3589x", 24 },
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index 696879e2eef7..02d65692ceb4 100644
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -697,7 +697,7 @@ static int __devinit timb_probe(struct pci_dev *dev,
                dev_err(&dev->dev, "The driver supports an older "
                        "version of the FPGA, please update the driver to "
                        "support %d.%d\n", priv->fw.major, priv->fw.minor);
-                goto err_ioremap;
+                goto err_config;
        }
        if (priv->fw.major < TIMB_SUPPORTED_MAJOR ||
                priv->fw.minor < TIMB_REQUIRED_MINOR) {
@@ -705,13 +705,13 @@ static int __devinit timb_probe(struct pci_dev *dev,
                        "please upgrade the FPGA to at least: %d.%d\n",
                        priv->fw.major, priv->fw.minor,
                        TIMB_SUPPORTED_MAJOR, TIMB_REQUIRED_MINOR);
-                goto err_ioremap;
+                goto err_config;
        }
        msix_entries = kzalloc(TIMBERDALE_NR_IRQS * sizeof(*msix_entries),
                GFP_KERNEL);
        if (!msix_entries)
-                goto err_ioremap;
+                goto err_config;
        for (i = 0; i < TIMBERDALE_NR_IRQS; i++)
                msix_entries[i].entry = i;
@@ -825,6 +825,8 @@ err_mfd:
 err_create_file:
        pci_disable_msix(dev);
 err_msix:
+        kfree(msix_entries);
+err_config:
        iounmap(priv->ctl_membase);
 err_ioremap:
        release_mem_region(priv->ctl_mapbase, CHIPCTLSIZE);
@@ -833,7 +835,6 @@ err_request:
 err_start:
        pci_disable_device(dev);
 err_enable:
-        kfree(msix_entries);
        kfree(priv);
        pci_set_drvdata(dev, NULL);
        return -ENODEV;
diff --git a/drivers/mfd/tmio_core.c b/drivers/mfd/tmio_core.c
index eddc19ae464b..83af78c1b0eb 100644
--- a/drivers/mfd/tmio_core.c
+++ b/drivers/mfd/tmio_core.c
@@ -6,6 +6,7 @@
 * published by the Free Software Foundation.
 */
+#include <linux/export.h>
 #include <linux/mfd/tmio.h>
 int tmio_core_mmc_enable(void __iomem *cnf, int shift, unsigned long base)
diff --git a/drivers/mfd/tps65912-core.c b/drivers/mfd/tps65912-core.c
index 955bc00e4b20..5fec23a9ac03 100644
--- a/drivers/mfd/tps65912-core.c
+++ b/drivers/mfd/tps65912-core.c
@@ -131,9 +131,6 @@ int tps65912_device_init(struct tps65912 *tps65912)
        if (init_data == NULL)
                return -ENOMEM;
-        init_data->irq = pmic_plat_data->irq;
-        init_data->irq_base = pmic_plat_data->irq;
        mutex_init(&tps65912->io_mutex);
        dev_set_drvdata(tps65912->dev, tps65912);
@@ -153,10 +150,13 @@ int tps65912_device_init(struct tps65912 *tps65912)
        if (ret < 0)
                goto err;
+        init_data->irq = pmic_plat_data->irq;
+        init_data->irq_base = pmic_plat_data->irq;
        ret = tps65912_irq_init(tps65912, init_data->irq, init_data);
        if (ret < 0)
                goto err;
+        kfree(init_data);
        return ret;
 err:
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 01ecfeee6524..bfbd66021afd 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -30,6 +30,7 @@
 #include <linux/init.h>
 #include <linux/mutex.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/err.h>
@@ -109,7 +110,7 @@
 #define twl_has_watchdog()        false
 #endif
-#if defined(CONFIG_TWL4030_CODEC) || defined(CONFIG_TWL4030_CODEC_MODULE) ||\
+#if defined(CONFIG_MFD_TWL4030_AUDIO) || defined(CONFIG_MFD_TWL4030_AUDIO_MODULE) ||\
        defined(CONFIG_TWL6040_CORE) || defined(CONFIG_TWL6040_CORE_MODULE)
 #define twl_has_codec() true
 #else
diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
index 8a7ee3139b86..f062c8cc6c38 100644
--- a/drivers/mfd/twl4030-irq.c
+++ b/drivers/mfd/twl4030-irq.c
@@ -30,7 +30,6 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/kthread.h>
 #include <linux/slab.h>
 #include <linux/i2c/twl.h>
@@ -278,59 +277,6 @@ static const struct sih sih_modules_twl5031[8] = {
 static unsigned twl4030_irq_base;
-static struct completion irq_event;
-/*
- * This thread processes interrupts reported by the Primary Interrupt Handler.
- */
-static int twl4030_irq_thread(void *data)
-{
-        long irq = (long)data;
-        static unsigned i2c_errors;
-        static const unsigned max_i2c_errors = 100;
-        current->flags |= PF_NOFREEZE;
-        while (!kthread_should_stop()) {
-                int ret;
-                int module_irq;
-                u8 pih_isr;
-                /* Wait for IRQ, then read PIH irq status (also blocking) */
-                wait_for_completion_interruptible(&irq_event);
-                ret = twl_i2c_read_u8(TWL4030_MODULE_PIH, &pih_isr,
-                                          REG_PIH_ISR_P1);
-                if (ret) {
-                        pr_warning("twl4030: I2C error %d reading PIH ISR\n",
-                                        ret);
-                        if (++i2c_errors >= max_i2c_errors) {
-                                printk(KERN_ERR "Maximum I2C error count"
-                                                " exceeded.  Terminating %s.\n",
-                                                __func__);
-                                break;
-                        }
-                        complete(&irq_event);
-                        continue;
-                }
-                /* these handlers deal with the relevant SIH irq status */
-                local_irq_disable();
-                for (module_irq = twl4030_irq_base;
-                                pih_isr;
-                                pih_isr >>= 1, module_irq++) {
-                        if (pih_isr & 0x1)
-                                generic_handle_irq(module_irq);
-                }
-                local_irq_enable();
-                enable_irq(irq);
-        }
-        return 0;
-}
 /*
 * handle_twl4030_pih() is the desc->handle method for the twl4030 interrupt.
 * This is a chained interrupt, so there is no desc->action method for it.
@@ -342,9 +288,25 @@ static int twl4030_irq_thread(void *data)
 */
 static irqreturn_t handle_twl4030_pih(int irq, void *devid)
 {
-        /* Acknowledge, clear *AND* mask the interrupt... */
+        int             module_irq;
-        disable_irq_nosync(irq);
+        irqreturn_t     ret;
-        complete(devid);
+        u8              pih_isr;
+        ret = twl_i2c_read_u8(TWL4030_MODULE_PIH, &pih_isr,
+                        REG_PIH_ISR_P1);
+        if (ret) {
+                pr_warning("twl4030: I2C error %d reading PIH ISR\n", ret);
+                return IRQ_NONE;
+        }
+        /* these handlers deal with the relevant SIH irq status */
+        for (module_irq = twl4030_irq_base;
+                        pih_isr;
+                        pih_isr >>= 1, module_irq++) {
+                if (pih_isr & 0x1)
+                        handle_nested_irq(module_irq);
+        }
        return IRQ_HANDLED;
 }
 /*----------------------------------------------------------------------*/
@@ -460,113 +422,17 @@ static inline void activate_irq(int irq)
 /*----------------------------------------------------------------------*/
-static DEFINE_SPINLOCK(sih_agent_lock);
-static struct workqueue_struct *wq;
 struct sih_agent {
        int                     irq_base;
        const struct sih        *sih;
        u32                     imr;
        bool                    imr_change_pending;
-        struct work_struct      mask_work;
-        u32                     edge_change;
-        struct work_struct      edge_work;
-};
-static void twl4030_sih_do_mask(struct work_struct *work)
-{
-        struct sih_agent        *agent;
-        const struct sih        *sih;
-        union {
-                u8      bytes[4];
-                u32     word;
-        }                       imr;
-        int                     status;
-        agent = container_of(work, struct sih_agent, mask_work);
-        /* see what work we have */
-        spin_lock_irq(&sih_agent_lock);
-        if (agent->imr_change_pending) {
-                sih = agent->sih;
-                /* byte[0] gets overwritten as we write ... */
-                imr.word = cpu_to_le32(agent->imr << 8);
-                agent->imr_change_pending = false;
-        } else
-                sih = NULL;
-        spin_unlock_irq(&sih_agent_lock);
-        if (!sih)
-                return;
-        /* write the whole mask ... simpler than subsetting it */
-        status = twl_i2c_write(sih->module, imr.bytes,
-                        sih->mask[irq_line].imr_offset, sih->bytes_ixr);
-        if (status)
-                pr_err("twl4030: %s, %s --> %d\n", __func__,
-                                "write", status);
-}
-static void twl4030_sih_do_edge(struct work_struct *work)
-{
-        struct sih_agent        *agent;
-        const struct sih        *sih;
-        u8                      bytes[6];
        u32                     edge_change;
-        int                     status;
-        agent = container_of(work, struct sih_agent, edge_work);
-        /* see what work we have */
-        spin_lock_irq(&sih_agent_lock);
-        edge_change = agent->edge_change;
-        agent->edge_change = 0;
-        sih = edge_change ? agent->sih : NULL;
-        spin_unlock_irq(&sih_agent_lock);
-        if (!sih)
-                return;
-        /* Read, reserving first byte for write scratch.  Yes, this
-         * could be cached for some speedup ... but be careful about
-         * any processor on the other IRQ line, EDR registers are
-         * shared.
-         */
-        status = twl_i2c_read(sih->module, bytes + 1,
-                        sih->edr_offset, sih->bytes_edr);
-        if (status) {
-                pr_err("twl4030: %s, %s --> %d\n", __func__,
-                                "read", status);
-                return;
-        }
-        /* Modify only the bits we know must change */
-        while (edge_change) {
-                int             i = fls(edge_change) - 1;
-                struct irq_data *idata = irq_get_irq_data(i + agent->irq_base);
-                int             byte = 1 + (i >> 2);
-                int             off = (i & 0x3) * 2;
-                unsigned int    type;
-                bytes[byte] &= ~(0x03 << off);
-                type = irqd_get_trigger_type(idata);
+        struct mutex            irq_lock;
-                if (type & IRQ_TYPE_EDGE_RISING)
+};
-                        bytes[byte] |= BIT(off + 1);
-                if (type & IRQ_TYPE_EDGE_FALLING)
-                        bytes[byte] |= BIT(off + 0);
-                edge_change &= ~BIT(i);
-        }
-        /* Write */
-        status = twl_i2c_write(sih->module, bytes,
-                        sih->edr_offset, sih->bytes_edr);
-        if (status)
-                pr_err("twl4030: %s, %s --> %d\n", __func__,
-                                "write", status);
-}
 /*----------------------------------------------------------------------*/
@@ -579,50 +445,125 @@ static void twl4030_sih_do_edge(struct work_struct *work)
 static void twl4030_sih_mask(struct irq_data *data)
 {
-        struct sih_agent *sih = irq_data_get_irq_chip_data(data);
+        struct sih_agent *agent = irq_data_get_irq_chip_data(data);
-        unsigned long flags;
+        agent->imr |= BIT(data->irq - agent->irq_base);
-        spin_lock_irqsave(&sih_agent_lock, flags);
+        agent->imr_change_pending = true;
-        sih->imr |= BIT(data->irq - sih->irq_base);
-        sih->imr_change_pending = true;
-        queue_work(wq, &sih->mask_work);
-        spin_unlock_irqrestore(&sih_agent_lock, flags);
 }
 static void twl4030_sih_unmask(struct irq_data *data)
 {
-        struct sih_agent *sih = irq_data_get_irq_chip_data(data);
+        struct sih_agent *agent = irq_data_get_irq_chip_data(data);
-        unsigned long flags;
+        agent->imr &= ~BIT(data->irq - agent->irq_base);
-        spin_lock_irqsave(&sih_agent_lock, flags);
+        agent->imr_change_pending = true;
-        sih->imr &= ~BIT(data->irq - sih->irq_base);
-        sih->imr_change_pending = true;
-        queue_work(wq, &sih->mask_work);
-        spin_unlock_irqrestore(&sih_agent_lock, flags);
 }
 static int twl4030_sih_set_type(struct irq_data *data, unsigned trigger)
 {
-        struct sih_agent *sih = irq_data_get_irq_chip_data(data);
+        struct sih_agent *agent = irq_data_get_irq_chip_data(data);
-        unsigned long flags;
        if (trigger & ~(IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING))
                return -EINVAL;
-        spin_lock_irqsave(&sih_agent_lock, flags);
+        if (irqd_get_trigger_type(data) != trigger)
-        if (irqd_get_trigger_type(data) != trigger) {
+                agent->edge_change |= BIT(data->irq - agent->irq_base);
-                sih->edge_change |= BIT(data->irq - sih->irq_base);
-                queue_work(wq, &sih->edge_work);
-        }
-        spin_unlock_irqrestore(&sih_agent_lock, flags);
        return 0;
 }
+static void twl4030_sih_bus_lock(struct irq_data *data)
+{
+        struct sih_agent        *agent = irq_data_get_irq_chip_data(data);
+        mutex_lock(&agent->irq_lock);
+}
+static void twl4030_sih_bus_sync_unlock(struct irq_data *data)
+{
+        struct sih_agent        *agent = irq_data_get_irq_chip_data(data);
+        const struct sih        *sih = agent->sih;
+        int                     status;
+        if (agent->imr_change_pending) {
+                union {
+                        u32     word;
+                        u8      bytes[4];
+                } imr;
+                /* byte[0] gets overwriten as we write ... */
+                imr.word = cpu_to_le32(agent->imr << 8);
+                agent->imr_change_pending = false;
+                /* write the whole mask ... simpler than subsetting it */
+                status = twl_i2c_write(sih->module, imr.bytes,
+                                sih->mask[irq_line].imr_offset,
+                                sih->bytes_ixr);
+                if (status)
+                        pr_err("twl4030: %s, %s --> %d\n", __func__,
+                                        "write", status);
+        }
+        if (agent->edge_change) {
+                u32             edge_change;
+                u8              bytes[6];
+                edge_change = agent->edge_change;
+                agent->edge_change = 0;
+                /*
+                 * Read, reserving first byte for write scratch.  Yes, this
+                 * could be cached for some speedup ... but be careful about
+                 * any processor on the other IRQ line, EDR registers are
+                 * shared.
+                 */
+                status = twl_i2c_read(sih->module, bytes + 1,
+                                sih->edr_offset, sih->bytes_edr);
+                if (status) {
+                        pr_err("twl4030: %s, %s --> %d\n", __func__,
+                                        "read", status);
+                        return;
+                }
+                /* Modify only the bits we know must change */
+                while (edge_change) {
+                        int             i = fls(edge_change) - 1;
+                        struct irq_data *idata;
+                        int             byte = 1 + (i >> 2);
+                        int             off = (i & 0x3) * 2;
+                        unsigned int    type;
+                        idata = irq_get_irq_data(i + agent->irq_base);
+                        bytes[byte] &= ~(0x03 << off);
+                        type = irqd_get_trigger_type(idata);
+                        if (type & IRQ_TYPE_EDGE_RISING)
+                                bytes[byte] |= BIT(off + 1);
+                        if (type & IRQ_TYPE_EDGE_FALLING)
+                                bytes[byte] |= BIT(off + 0);
+                        edge_change &= ~BIT(i);
+                }
+                /* Write */
+                status = twl_i2c_write(sih->module, bytes,
+                                sih->edr_offset, sih->bytes_edr);
+                if (status)
+                        pr_err("twl4030: %s, %s --> %d\n", __func__,
+                                        "write", status);
+        }
+        mutex_unlock(&agent->irq_lock);
+}
 static struct irq_chip twl4030_sih_irq_chip = {
        .name           = "twl4030",
-        .irq_mask       = twl4030_sih_mask,
+        .irq_mask       = twl4030_sih_mask,
        .irq_unmask     = twl4030_sih_unmask,
        .irq_set_type   = twl4030_sih_set_type,
+        .irq_bus_lock   = twl4030_sih_bus_lock,
+        .irq_bus_sync_unlock = twl4030_sih_bus_sync_unlock,
 };
 /*----------------------------------------------------------------------*/
@@ -655,9 +596,7 @@ static void handle_twl4030_sih(unsigned irq, struct irq_desc *desc)
        int isr;
        /* reading ISR acks the IRQs, using clear-on-read mode */
-        local_irq_enable();
        isr = sih_read_isr(sih);
-        local_irq_disable();
        if (isr < 0) {
                pr_err("twl4030: %s SIH, read ISR error %d\n",
@@ -672,7 +611,7 @@ static void handle_twl4030_sih(unsigned irq, struct irq_desc *desc)
                isr &= ~BIT(irq);
                if (irq < sih->bits)
-                        generic_handle_irq(agent->irq_base + irq);
+                        handle_nested_irq(agent->irq_base + irq);
                else
                        pr_err("twl4030: %s SIH, invalid ISR bit %d\n",
                                sih->name, irq);
@@ -718,15 +657,14 @@ int twl4030_sih_setup(int module)
        agent->irq_base = irq_base;
        agent->sih = sih;
        agent->imr = ~0;
-        INIT_WORK(&agent->mask_work, twl4030_sih_do_mask);
+        mutex_init(&agent->irq_lock);
-        INIT_WORK(&agent->edge_work, twl4030_sih_do_edge);
        for (i = 0; i < sih->bits; i++) {
                irq = irq_base + i;
+                irq_set_chip_data(irq, agent);
                irq_set_chip_and_handler(irq, &twl4030_sih_irq_chip,
                                         handle_edge_irq);
-                irq_set_chip_data(irq, agent);
                activate_irq(irq);
        }
@@ -758,7 +696,6 @@ int twl4030_init_irq(int irq_num, unsigned irq_base, unsigned irq_end)
        int                     status;
        int                     i;
-        struct task_struct      *task;
        /*
         * Mask and clear all TWL4030 interrupts since initially we do
@@ -768,12 +705,6 @@ int twl4030_init_irq(int irq_num, unsigned irq_base, unsigned irq_end)
        if (status < 0)
                return status;
-        wq = create_singlethread_workqueue("twl4030-irqchip");
-        if (!wq) {
-                pr_err("twl4030: workqueue FAIL\n");
-                return -ESRCH;
-        }
        twl4030_irq_base = irq_base;
        /* install an irq handler for each of the SIH modules;
@@ -787,6 +718,7 @@ int twl4030_init_irq(int irq_num, unsigned irq_base, unsigned irq_end)
        for (i = irq_base; i < irq_end; i++) {
                irq_set_chip_and_handler(i, &twl4030_irq_chip,
                                         handle_simple_irq);
+                irq_set_nested_thread(i, 1);
                activate_irq(i);
        }
        twl4030_irq_next = i;
@@ -801,34 +733,22 @@ int twl4030_init_irq(int irq_num, unsigned irq_base, unsigned irq_end)
        }
        /* install an irq handler to demultiplex the TWL4030 interrupt */
+        status = request_threaded_irq(irq_num, NULL, handle_twl4030_pih, 0,
+                                        "TWL4030-PIH", NULL);
-        init_completion(&irq_event);
-        status = request_irq(irq_num, handle_twl4030_pih, IRQF_DISABLED,
-                                "TWL4030-PIH", &irq_event);
        if (status < 0) {
                pr_err("twl4030: could not claim irq%d: %d\n", irq_num, status);
                goto fail_rqirq;
        }
-        task = kthread_run(twl4030_irq_thread, (void *)(long)irq_num,
-                                                                "twl4030-irq");
-        if (IS_ERR(task)) {
-                pr_err("twl4030: could not create irq %d thread!\n", irq_num);
-                status = PTR_ERR(task);
-                goto fail_kthread;
-        }
        return status;
-fail_kthread:
-        free_irq(irq_num, &irq_event);
 fail_rqirq:
        /* clean up twl4030_sih_setup */
 fail:
-        for (i = irq_base; i < irq_end; i++)
+        for (i = irq_base; i < irq_end; i++) {
+                irq_set_nested_thread(i, 0);
                irq_set_chip_and_handler(i, NULL, NULL);
-        destroy_workqueue(wq);
+        }
-        wq = NULL;
        return status;
 }
diff --git a/drivers/mfd/twl4030-madc.c b/drivers/mfd/twl4030-madc.c
index 7cbf2aa9e64f..834f824d3c11 100644
--- a/drivers/mfd/twl4030-madc.c
+++ b/drivers/mfd/twl4030-madc.c
@@ -740,6 +740,28 @@ static int __devinit twl4030_madc_probe(struct platform_device *pdev)
                        TWL4030_BCI_BCICTL1);
                goto err_i2c;
        }
+        /* Check that MADC clock is on */
+        ret = twl_i2c_read_u8(TWL4030_MODULE_INTBR, &regval, TWL4030_REG_GPBR1);
+        if (ret) {
+                dev_err(&pdev->dev, "unable to read reg GPBR1 0x%X\n",
+                                TWL4030_REG_GPBR1);
+                goto err_i2c;
+        }
+        /* If MADC clk is not on, turn it on */
+        if (!(regval & TWL4030_GPBR1_MADC_HFCLK_EN)) {
+                dev_info(&pdev->dev, "clk disabled, enabling\n");
+                regval |= TWL4030_GPBR1_MADC_HFCLK_EN;
+                ret = twl_i2c_write_u8(TWL4030_MODULE_INTBR, regval,
+                                       TWL4030_REG_GPBR1);
+                if (ret) {
+                        dev_err(&pdev->dev, "unable to write reg GPBR1 0x%X\n",
+                                        TWL4030_REG_GPBR1);
+                        goto err_i2c;
+                }
+        }
        platform_set_drvdata(pdev, madc);
        mutex_init(&madc->lock);
        ret = request_threaded_irq(platform_get_irq(pdev, 0), NULL,
diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
index eb3b5f88e566..3eee45ffb096 100644
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@ -32,11 +32,13 @@
 */
 #include <linux/init.h>
+#include <linux/export.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/kthread.h>
 #include <linux/i2c/twl.h>
 #include <linux/platform_device.h>
+#include <linux/suspend.h>
 #include "twl-core.h"
@@ -83,8 +85,48 @@ static int twl6030_interrupt_mapping[24] = {
 /*----------------------------------------------------------------------*/
 static unsigned twl6030_irq_base;
+static int twl_irq;
+static bool twl_irq_wake_enabled;
 static struct completion irq_event;
+static atomic_t twl6030_wakeirqs = ATOMIC_INIT(0);
+static int twl6030_irq_pm_notifier(struct notifier_block *notifier,
+                                   unsigned long pm_event, void *unused)
+{
+        int chained_wakeups;
+        switch (pm_event) {
+        case PM_SUSPEND_PREPARE:
+                chained_wakeups = atomic_read(&twl6030_wakeirqs);
+                if (chained_wakeups && !twl_irq_wake_enabled) {
+                        if (enable_irq_wake(twl_irq))
+                                pr_err("twl6030 IRQ wake enable failed\n");
+                        else
+                                twl_irq_wake_enabled = true;
+                } else if (!chained_wakeups && twl_irq_wake_enabled) {
+                        disable_irq_wake(twl_irq);
+                        twl_irq_wake_enabled = false;
+                }
+                disable_irq(twl_irq);
+                break;
+        case PM_POST_SUSPEND:
+                enable_irq(twl_irq);
+                break;
+        default:
+                break;
+        }
+        return NOTIFY_DONE;
+}
+static struct notifier_block twl6030_irq_pm_notifier_block = {
+        .notifier_call = twl6030_irq_pm_notifier,
+};
 /*
 * This thread processes interrupts reported by the Primary Interrupt Handler.
@@ -187,6 +229,16 @@ static inline void activate_irq(int irq)
 #endif
 }
+int twl6030_irq_set_wake(struct irq_data *d, unsigned int on)
+{
+        if (on)
+                atomic_inc(&twl6030_wakeirqs);
+        else
+                atomic_dec(&twl6030_wakeirqs);
+        return 0;
+}
 /*----------------------------------------------------------------------*/
 static unsigned twl6030_irq_next;
@@ -318,10 +370,12 @@ int twl6030_init_irq(int irq_num, unsigned irq_base, unsigned irq_end)
        twl6030_irq_chip = dummy_irq_chip;
        twl6030_irq_chip.name = "twl6030";
        twl6030_irq_chip.irq_set_type = NULL;
+        twl6030_irq_chip.irq_set_wake = twl6030_irq_set_wake;
        for (i = irq_base; i < irq_end; i++) {
                irq_set_chip_and_handler(i, &twl6030_irq_chip,
                                         handle_simple_irq);
+                irq_set_chip_data(i, (void *)irq_num);
                activate_irq(i);
        }
@@ -331,6 +385,14 @@ int twl6030_init_irq(int irq_num, unsigned irq_base, unsigned irq_end)
        /* install an irq handler to demultiplex the TWL6030 interrupt */
        init_completion(&irq_event);
+        status = request_irq(irq_num, handle_twl6030_pih, 0,
+                                "TWL6030-PIH", &irq_event);
+        if (status < 0) {
+                pr_err("twl6030: could not claim irq%d: %d\n", irq_num, status);
+                goto fail_irq;
+        }
        task = kthread_run(twl6030_irq_thread, (void *)irq_num, "twl6030-irq");
        if (IS_ERR(task)) {
                pr_err("twl6030: could not create irq %d thread!\n", irq_num);
@@ -338,17 +400,14 @@ int twl6030_init_irq(int irq_num, unsigned irq_base, unsigned irq_end)
                goto fail_kthread;
        }
-        status = request_irq(irq_num, handle_twl6030_pih, IRQF_DISABLED,
+        twl_irq = irq_num;
-                                "TWL6030-PIH", &irq_event);
+        register_pm_notifier(&twl6030_irq_pm_notifier_block);
-        if (status < 0) {
-                pr_err("twl6030: could not claim irq%d: %d\n", irq_num, status);
-                goto fail_irq;
-        }
        return status;
-fail_irq:
-        free_irq(irq_num, &irq_event);
 fail_kthread:
+        free_irq(irq_num, &irq_event);
+fail_irq:
        for (i = irq_base; i < irq_end; i++)
                irq_set_chip_and_handler(i, NULL, NULL);
        return status;
@@ -356,6 +415,7 @@ fail_kthread:
 int twl6030_exit_irq(void)
 {
+        unregister_pm_notifier(&twl6030_irq_pm_notifier_block);
        if (twl6030_irq_base) {
                pr_err("twl6030: can't yet clean up IRQs?\n");
diff --git a/drivers/mfd/wl1273-core.c b/drivers/mfd/wl1273-core.c
index d97a86945174..f39b756df561 100644
--- a/drivers/mfd/wl1273-core.c
+++ b/drivers/mfd/wl1273-core.c
@@ -22,6 +22,7 @@
 #include <linux/mfd/wl1273-core.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #define DRIVER_DESC "WL1273 FM Radio Core"
diff --git a/drivers/mfd/wm831x-irq.c b/drivers/mfd/wm831x-irq.c
index ada1835a5455..f4747a4a9a93 100644
--- a/drivers/mfd/wm831x-irq.c
+++ b/drivers/mfd/wm831x-irq.c
@@ -420,12 +420,19 @@ static int wm831x_irq_set_type(struct irq_data *data, unsigned int type)
        switch (type) {
        case IRQ_TYPE_EDGE_BOTH:
                wm831x->gpio_update[irq] = 0x10000 | WM831X_GPN_INT_MODE;
+                wm831x->gpio_level[irq] = false;
                break;
        case IRQ_TYPE_EDGE_RISING:
                wm831x->gpio_update[irq] = 0x10000 | WM831X_GPN_POL;
+                wm831x->gpio_level[irq] = false;
                break;
        case IRQ_TYPE_EDGE_FALLING:
                wm831x->gpio_update[irq] = 0x10000;
+                wm831x->gpio_level[irq] = false;
+                break;
+        case IRQ_TYPE_LEVEL_HIGH:
+                wm831x->gpio_update[irq] = 0x10000 | WM831X_GPN_POL;
+                wm831x->gpio_level[irq] = true;
                break;
        default:
                return -EINVAL;
@@ -449,7 +456,7 @@ static irqreturn_t wm831x_irq_thread(int irq, void *data)
 {
        struct wm831x *wm831x = data;
        unsigned int i;
-        int primary, status_addr;
+        int primary, status_addr, ret;
        int status_regs[WM831X_NUM_IRQ_REGS] = { 0 };
        int read[WM831X_NUM_IRQ_REGS] = { 0 };
        int *status;
@@ -507,6 +514,19 @@ static irqreturn_t wm831x_irq_thread(int irq, void *data)
                if (*status & wm831x_irqs[i].mask)
                        handle_nested_irq(wm831x->irq_base + i);
+                /* Simulate an edge triggered IRQ by polling the input
+                 * status.  This is sucky but improves interoperability.
+                 */
+                if (primary == WM831X_GP_INT &&
+                    wm831x->gpio_level[i - WM831X_IRQ_GPIO_1]) {
+                        ret = wm831x_reg_read(wm831x, WM831X_GPIO_LEVEL);
+                        while (ret & 1 << (i - WM831X_IRQ_GPIO_1)) {
+                                handle_nested_irq(wm831x->irq_base + i);
+                                ret = wm831x_reg_read(wm831x,
+                                                      WM831X_GPIO_LEVEL);
+                        }
+                }
        }
 out:
@@ -596,8 +616,6 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq)
                         "No interrupt specified - functionality limited\n");
        }
        /* Enable top level interrupts, we mask at secondary level */
        wm831x_reg_write(wm831x, WM831X_SYSTEM_INTERRUPTS_MASK, 0);
diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c
index e06ba9440cdb..62b4626f4561 100644
--- a/drivers/mfd/wm8400-core.c
+++ b/drivers/mfd/wm8400-core.c
@@ -12,6 +12,7 @@
 *
 */
+#include <linux/module.h>
 #include <linux/bug.h>
 #include <linux/err.h>
 #include <linux/i2c.h>
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index b03be1d4e0ca..5d6ba132837e 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -217,6 +217,47 @@ static int wm8994_suspend(struct device *dev)
                return 0;
        }
+        ret = wm8994_reg_read(wm8994, WM8994_POWER_MANAGEMENT_4);
+        if (ret < 0) {
+                dev_err(dev, "Failed to read power status: %d\n", ret);
+        } else if (ret & (WM8994_AIF2ADCL_ENA | WM8994_AIF2ADCR_ENA |
+                          WM8994_AIF1ADC2L_ENA | WM8994_AIF1ADC2R_ENA |
+                          WM8994_AIF1ADC1L_ENA | WM8994_AIF1ADC1R_ENA)) {
+                dev_dbg(dev, "CODEC still active, ignoring suspend\n");
+                return 0;
+        }
+        ret = wm8994_reg_read(wm8994, WM8994_POWER_MANAGEMENT_5);
+        if (ret < 0) {
+                dev_err(dev, "Failed to read power status: %d\n", ret);
+        } else if (ret & (WM8994_AIF2DACL_ENA | WM8994_AIF2DACR_ENA |
+                          WM8994_AIF1DAC2L_ENA | WM8994_AIF1DAC2R_ENA |
+                          WM8994_AIF1DAC1L_ENA | WM8994_AIF1DAC1R_ENA)) {
+                dev_dbg(dev, "CODEC still active, ignoring suspend\n");
+                return 0;
+        }
+        switch (wm8994->type) {
+        case WM8958:
+                ret = wm8994_reg_read(wm8994, WM8958_MIC_DETECT_1);
+                if (ret < 0) {
+                        dev_err(dev, "Failed to read power status: %d\n", ret);
+                } else if (ret & WM8958_MICD_ENA) {
+                        dev_dbg(dev, "CODEC still active, ignoring suspend\n");
+                        return 0;
+                }
+                break;
+        default:
+                break;
+        }
+        /* Disable LDO pulldowns while the device is suspended if we
+         * don't know that something will be driving them. */
+        if (!wm8994->ldo_ena_always_driven)
+                wm8994_set_bits(wm8994, WM8994_PULL_CONTROL_2,
+                                WM8994_LDO1ENA_PD | WM8994_LDO2ENA_PD,
+                                WM8994_LDO1ENA_PD | WM8994_LDO2ENA_PD);
        /* GPIO configuration state is saved here since we may be configuring
         * the GPIO alternate functions even if we're not using the gpiolib
         * driver for them.
@@ -286,6 +327,11 @@ static int wm8994_resume(struct device *dev)
        if (ret < 0)
                dev_err(dev, "Failed to restore GPIO registers: %d\n", ret);
+        /* Disable LDO pulldowns while the device is active */
+        wm8994_set_bits(wm8994, WM8994_PULL_CONTROL_2,
+                        WM8994_LDO1ENA_PD | WM8994_LDO2ENA_PD,
+                        0);
        wm8994->suspended = false;
        return 0;
@@ -467,8 +513,15 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
                                                pdata->gpio_defaults[i]);
                        }
                }
+                wm8994->ldo_ena_always_driven = pdata->ldo_ena_always_driven;
        }
+        /* Disable LDO pulldowns while the device is active */
+        wm8994_set_bits(wm8994, WM8994_PULL_CONTROL_2,
+                        WM8994_LDO1ENA_PD | WM8994_LDO2ENA_PD,
+                        0);
        /* In some system designs where the regulators are not in use,
         * we can achieve a small reduction in leakage currents by
         * floating LDO outputs.  This bit makes no difference if the
diff --git a/drivers/misc/ab8500-pwm.c b/drivers/misc/ab8500-pwm.c
index 35903154ca2e..2208a9d52622 100644
--- a/drivers/misc/ab8500-pwm.c
+++ b/drivers/misc/ab8500-pwm.c
@@ -10,6 +10,7 @@
 #include <linux/pwm.h>
 #include <linux/mfd/ab8500.h>
 #include <linux/mfd/abx500.h>
+#include <linux/module.h>
 /*
 * PWM Out generators
diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c
index 769a4e8e10dc..5bb187781074 100644
--- a/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
@@ -16,6 +16,7 @@
 #include <linux/spinlock.h>
 #include <linux/atmel-ssc.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 /* Serialize access to ssc_list and user count */
 static DEFINE_SPINLOCK(user_lock);
diff --git a/drivers/misc/atmel_tclib.c b/drivers/misc/atmel_tclib.c
index a844810b50f6..4bcfc3759734 100644
--- a/drivers/misc/atmel_tclib.c
+++ b/drivers/misc/atmel_tclib.c
@@ -7,6 +7,7 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 /* Number of bytes to reserve for the iomem resource */
 #define ATMEL_TC_IOMEM_SIZE     256
diff --git a/drivers/misc/bh1780gli.c b/drivers/misc/bh1780gli.c
index 82fe2d067827..bfeea9ba702e 100644
--- a/drivers/misc/bh1780gli.c
+++ b/drivers/misc/bh1780gli.c
@@ -22,6 +22,7 @@
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 #define BH1780_REG_CONTROL      0x80
 #define BH1780_REG_PARTID       0x8A
diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
index 8cebec5e85ee..3f7ad83ed740 100644
--- a/drivers/misc/kgdbts.c
+++ b/drivers/misc/kgdbts.c
@@ -102,6 +102,7 @@
 #include <linux/nmi.h>
 #include <linux/delay.h>
 #include <linux/kthread.h>
+#include <linux/module.h>
 #define v1printk(a...) do { \
        if (verbose) \
diff --git a/drivers/misc/sgi-gru/grukservices.c b/drivers/misc/sgi-gru/grukservices.c
index 9e9bddaa95ae..913de07e577c 100644
--- a/drivers/misc/sgi-gru/grukservices.c
+++ b/drivers/misc/sgi-gru/grukservices.c
@@ -31,6 +31,7 @@
 #include <linux/interrupt.h>
 #include <linux/uaccess.h>
 #include <linux/delay.h>
+#include <linux/export.h>
 #include <asm/io_apic.h>
 #include "gru.h"
 #include "grulib.h"
diff --git a/drivers/misc/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c
index 3a3580566dfc..43ef8d162f2d 100644
--- a/drivers/misc/ti-st/st_kim.c
+++ b/drivers/misc/ti-st/st_kim.c
@@ -35,6 +35,7 @@
 #include <linux/skbuff.h>
 #include <linux/ti_wilink_st.h>
+#include <linux/module.h>
 #define MAX_ST_DEVICES  3       /* Imagine 1 on each UART for now */
diff --git a/drivers/misc/tifm_7xx1.c b/drivers/misc/tifm_7xx1.c
index a6ef18259da0..ba2479022670 100644
--- a/drivers/misc/tifm_7xx1.c
+++ b/drivers/misc/tifm_7xx1.c
@@ -11,6 +11,7 @@
 #include <linux/tifm.h>
 #include <linux/dma-mapping.h>
+#include <linux/module.h>
 #define DRIVER_NAME "tifm_7xx1"
 #define DRIVER_VERSION "0.8"
diff --git a/drivers/misc/tifm_core.c b/drivers/misc/tifm_core.c
index 44d4475a09dd..0bd5349b0422 100644
--- a/drivers/misc/tifm_core.c
+++ b/drivers/misc/tifm_core.c
@@ -13,6 +13,7 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/idr.h>
+#include <linux/module.h>
 #define DRIVER_NAME "tifm_core"
 #define DRIVER_VERSION "0.8"
diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c
index 053d36caf955..cd41d403c9df 100644
--- a/drivers/misc/vmw_balloon.c
+++ b/drivers/misc/vmw_balloon.c
@@ -151,7 +151,7 @@ MODULE_LICENSE("GPL");
 struct vmballoon_stats {
        unsigned int timer;
-        /* allocation statustics */
+        /* allocation statistics */
        unsigned int alloc;
        unsigned int alloc_fail;
        unsigned int sleep_alloc;
@@ -412,6 +412,7 @@ static int vmballoon_reserve_page(struct vmballoon *b, bool can_sleep)
        gfp_t flags;
        unsigned int hv_status;
        bool locked = false;
+        flags = can_sleep ? VMW_PAGE_ALLOC_CANSLEEP : VMW_PAGE_ALLOC_NOSLEEP;
        do {
                if (!can_sleep)
@@ -419,7 +420,6 @@ static int vmballoon_reserve_page(struct vmballoon *b, bool can_sleep)
                else
                        STATS_INC(b->stats.sleep_alloc);
-                flags = can_sleep ? VMW_PAGE_ALLOC_CANSLEEP : VMW_PAGE_ALLOC_NOSLEEP;
                page = alloc_page(flags);
                if (!page) {
                        if (!can_sleep)
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 46b6e84d953e..6be49249895a 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -11,9 +11,11 @@
 *  MMC card bus driver model
 */
+#include <linux/export.h>
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/slab.h>
+#include <linux/stat.h>
 #include <linux/pm_runtime.h>
 #include <linux/mmc/card.h>
diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c
index 6045ea469362..3923880118b6 100644
--- a/drivers/mmc/core/debugfs.c
+++ b/drivers/mmc/core/debugfs.c
@@ -8,6 +8,7 @@
 * published by the Free Software Foundation.
 */
 #include <linux/moduleparam.h>
+#include <linux/export.h>
 #include <linux/debugfs.h>
 #include <linux/fs.h>
 #include <linux/seq_file.h>
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index ca2e4f50f615..e8a5eb38748b 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -16,6 +16,7 @@
 #include <linux/err.h>
 #include <linux/idr.h>
 #include <linux/pagemap.h>
+#include <linux/export.h>
 #include <linux/leds.h>
 #include <linux/slab.h>
 #include <linux/suspend.h>
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 36270449dd9d..dbf421a6279c 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -12,6 +12,7 @@
 #include <linux/err.h>
 #include <linux/slab.h>
+#include <linux/stat.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index 007863eea4fb..4d41fa984c93 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -10,6 +10,7 @@
 */
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <linux/types.h>
 #include <linux/scatterlist.h>
diff --git a/drivers/mmc/core/quirks.c b/drivers/mmc/core/quirks.c
index 6c3cf98a62eb..06ee1aeaacec 100644
--- a/drivers/mmc/core/quirks.c
+++ b/drivers/mmc/core/quirks.c
@@ -11,6 +11,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/mmc/card.h>
 #ifndef SDIO_VENDOR_ID_TI
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index a230e7f9d77a..f2a05ea40f2a 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -12,6 +12,7 @@
 #include <linux/err.h>
 #include <linux/slab.h>
+#include <linux/stat.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
diff --git a/drivers/mmc/core/sd_ops.c b/drivers/mmc/core/sd_ops.c
index 46a785419fab..274ef00b4463 100644
--- a/drivers/mmc/core/sd_ops.c
+++ b/drivers/mmc/core/sd_ops.c
@@ -11,6 +11,7 @@
 #include <linux/slab.h>
 #include <linux/types.h>
+#include <linux/export.h>
 #include <linux/scatterlist.h>
 #include <linux/mmc/host.h>
diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
index c643b2f78bf1..40989e6bb53a 100644
--- a/drivers/mmc/core/sdio_bus.c
+++ b/drivers/mmc/core/sdio_bus.c
@@ -13,6 +13,7 @@
 #include <linux/device.h>
 #include <linux/err.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/mmc/core/sdio_io.c b/drivers/mmc/core/sdio_io.c
index 0f687cdeb064..b1f3168f791b 100644
--- a/drivers/mmc/core/sdio_io.c
+++ b/drivers/mmc/core/sdio_io.c
@@ -9,6 +9,7 @@
 * your option) any later version.
 */
+#include <linux/export.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
 #include <linux/mmc/sdio.h>
diff --git a/drivers/mmc/core/sdio_irq.c b/drivers/mmc/core/sdio_irq.c
index b644dd59c16e..68f81b9ee0fb 100644
--- a/drivers/mmc/core/sdio_irq.c
+++ b/drivers/mmc/core/sdio_irq.c
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/kthread.h>
+#include <linux/export.h>
 #include <linux/wait.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 87d5067ba629..cf444b0ca2cc 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -263,7 +263,7 @@ config MMC_WBSD
 config MMC_AU1X
        tristate "Alchemy AU1XX0 MMC Card Interface support"
-        depends on SOC_AU1200
+        depends on MIPS_ALCHEMY
        help
          This selects the AMD Alchemy(R) Multimedia card interface.
          If you have a Alchemy platform with a MMC slot, say Y or M here.
diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c
index 707bc7dddd22..5d3b9ae64523 100644
--- a/drivers/mmc/host/au1xmmc.c
+++ b/drivers/mmc/host/au1xmmc.c
@@ -64,11 +64,8 @@
 #define AU1XMMC_DESCRIPTOR_COUNT 1
 /* max DMA seg size: 64KB on Au1100, 4MB on Au1200 */
-#ifdef CONFIG_SOC_AU1100
+#define AU1100_MMC_DESCRIPTOR_SIZE 0x0000ffff
-#define AU1XMMC_DESCRIPTOR_SIZE 0x0000ffff
+#define AU1200_MMC_DESCRIPTOR_SIZE 0x003fffff
-#else   /* Au1200 */
-#define AU1XMMC_DESCRIPTOR_SIZE 0x003fffff
-#endif
 #define AU1XMMC_OCR (MMC_VDD_27_28 | MMC_VDD_28_29 | MMC_VDD_29_30 | \
                     MMC_VDD_30_31 | MMC_VDD_31_32 | MMC_VDD_32_33 | \
@@ -127,6 +124,7 @@ struct au1xmmc_host {
 #define HOST_F_XMIT     0x0001
 #define HOST_F_RECV     0x0002
 #define HOST_F_DMA      0x0010
+#define HOST_F_DBDMA    0x0020
 #define HOST_F_ACTIVE   0x0100
 #define HOST_F_STOP     0x1000
@@ -151,6 +149,16 @@ struct au1xmmc_host {
 #define DMA_CHANNEL(h)  \
        (((h)->flags & HOST_F_XMIT) ? (h)->tx_chan : (h)->rx_chan)
+static inline int has_dbdma(void)
+{
+        switch (alchemy_get_cputype()) {
+        case ALCHEMY_CPU_AU1200:
+                return 1;
+        default:
+                return 0;
+        }
+}
 static inline void IRQ_ON(struct au1xmmc_host *host, u32 mask)
 {
        u32 val = au_readl(HOST_CONFIG(host));
@@ -353,14 +361,12 @@ static void au1xmmc_data_complete(struct au1xmmc_host *host, u32 status)
        data->bytes_xfered = 0;
        if (!data->error) {
-                if (host->flags & HOST_F_DMA) {
+                if (host->flags & (HOST_F_DMA | HOST_F_DBDMA)) {
-#ifdef CONFIG_SOC_AU1200        /* DBDMA */
                        u32 chan = DMA_CHANNEL(host);
                        chan_tab_t *c = *((chan_tab_t **)chan);
                        au1x_dma_chan_t *cp = c->chan_ptr;
                        data->bytes_xfered = cp->ddma_bytecnt;
-#endif
                } else
                        data->bytes_xfered =
                                (data->blocks * data->blksz) - host->pio.len;
@@ -570,11 +576,10 @@ static void au1xmmc_cmd_complete(struct au1xmmc_host *host, u32 status)
        host->status = HOST_S_DATA;
-        if (host->flags & HOST_F_DMA) {
+        if ((host->flags & (HOST_F_DMA | HOST_F_DBDMA))) {
-#ifdef CONFIG_SOC_AU1200        /* DBDMA */
                u32 channel = DMA_CHANNEL(host);
-                /* Start the DMA as soon as the buffer gets something in it */
+                /* Start the DBDMA as soon as the buffer gets something in it */
                if (host->flags & HOST_F_RECV) {
                        u32 mask = SD_STATUS_DB | SD_STATUS_NE;
@@ -584,7 +589,6 @@ static void au1xmmc_cmd_complete(struct au1xmmc_host *host, u32 status)
                }
                au1xxx_dbdma_start(channel);
-#endif
        }
 }
@@ -633,8 +637,7 @@ static int au1xmmc_prepare_data(struct au1xmmc_host *host,
        au_writel(data->blksz - 1, HOST_BLKSIZE(host));
-        if (host->flags & HOST_F_DMA) {
+        if (host->flags & (HOST_F_DMA | HOST_F_DBDMA)) {
-#ifdef CONFIG_SOC_AU1200        /* DBDMA */
                int i;
                u32 channel = DMA_CHANNEL(host);
@@ -663,7 +666,6 @@ static int au1xmmc_prepare_data(struct au1xmmc_host *host,
                        datalen -= len;
                }
-#endif
        } else {
                host->pio.index = 0;
                host->pio.offset = 0;
@@ -838,7 +840,6 @@ static irqreturn_t au1xmmc_irq(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
-#ifdef CONFIG_SOC_AU1200
 /* 8bit memory DMA device */
 static dbdev_tab_t au1xmmc_mem_dbdev = {
        .dev_id         = DSCR_CMD0_ALWAYS,
@@ -905,7 +906,7 @@ static int au1xmmc_dbdma_init(struct au1xmmc_host *host)
        au1xxx_dbdma_ring_alloc(host->rx_chan, AU1XMMC_DESCRIPTOR_COUNT);
        /* DBDMA is good to go */
-        host->flags |= HOST_F_DMA;
+        host->flags |= HOST_F_DMA | HOST_F_DBDMA;
        return 0;
 }
@@ -918,7 +919,6 @@ static void au1xmmc_dbdma_shutdown(struct au1xmmc_host *host)
                au1xxx_dbdma_chan_free(host->rx_chan);
        }
 }
-#endif
 static void au1xmmc_enable_sdio_irq(struct mmc_host *mmc, int en)
 {
@@ -997,8 +997,16 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev)
        mmc->f_min =   450000;
        mmc->f_max = 24000000;
-        mmc->max_seg_size = AU1XMMC_DESCRIPTOR_SIZE;
+        switch (alchemy_get_cputype()) {
-        mmc->max_segs = AU1XMMC_DESCRIPTOR_COUNT;
+        case ALCHEMY_CPU_AU1100:
+                mmc->max_seg_size = AU1100_MMC_DESCRIPTOR_SIZE;
+                mmc->max_segs = AU1XMMC_DESCRIPTOR_COUNT;
+                break;
+        case ALCHEMY_CPU_AU1200:
+                mmc->max_seg_size = AU1200_MMC_DESCRIPTOR_SIZE;
+                mmc->max_segs = AU1XMMC_DESCRIPTOR_COUNT;
+                break;
+        }
        mmc->max_blk_size = 2048;
        mmc->max_blk_count = 512;
@@ -1028,11 +1036,11 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev)
        tasklet_init(&host->finish_task, au1xmmc_tasklet_finish,
                        (unsigned long)host);
-#ifdef CONFIG_SOC_AU1200
+        if (has_dbdma()) {
-        ret = au1xmmc_dbdma_init(host);
+                ret = au1xmmc_dbdma_init(host);
-        if (ret)
+                if (ret)
-                pr_info(DRIVER_NAME ": DBDMA init failed; using PIO\n");
+                        pr_info(DRIVER_NAME ": DBDMA init failed; using PIO\n");
-#endif
+        }
 #ifdef CONFIG_LEDS_CLASS
        if (host->platdata && host->platdata->led) {
@@ -1073,9 +1081,8 @@ out5:
        au_writel(0, HOST_CONFIG2(host));
        au_sync();
-#ifdef CONFIG_SOC_AU1200
+        if (host->flags & HOST_F_DBDMA)
-        au1xmmc_dbdma_shutdown(host);
+                au1xmmc_dbdma_shutdown(host);
-#endif
        tasklet_kill(&host->data_task);
        tasklet_kill(&host->finish_task);
@@ -1120,9 +1127,9 @@ static int __devexit au1xmmc_remove(struct platform_device *pdev)
                tasklet_kill(&host->data_task);
                tasklet_kill(&host->finish_task);
-#ifdef CONFIG_SOC_AU1200
+                if (host->flags & HOST_F_DBDMA)
-                au1xmmc_dbdma_shutdown(host);
+                        au1xmmc_dbdma_shutdown(host);
-#endif
                au1xmmc_set_power(host, 0);
                free_irq(host->irq, host);
@@ -1181,24 +1188,23 @@ static struct platform_driver au1xmmc_driver = {
 static int __init au1xmmc_init(void)
 {
-#ifdef CONFIG_SOC_AU1200
+        if (has_dbdma()) {
-        /* DSCR_CMD0_ALWAYS has a stride of 32 bits, we need a stride
+                /* DSCR_CMD0_ALWAYS has a stride of 32 bits, we need a stride
-         * of 8 bits.  And since devices are shared, we need to create
+                * of 8 bits.  And since devices are shared, we need to create
-         * our own to avoid freaking out other devices.
+                * our own to avoid freaking out other devices.
-         */
+                */
-        memid = au1xxx_ddma_add_device(&au1xmmc_mem_dbdev);
+                memid = au1xxx_ddma_add_device(&au1xmmc_mem_dbdev);
-        if (!memid)
+                if (!memid)
-                pr_err("au1xmmc: cannot add memory dbdma dev\n");
+                        pr_err("au1xmmc: cannot add memory dbdma\n");
-#endif
+        }
        return platform_driver_register(&au1xmmc_driver);
 }
 static void __exit au1xmmc_exit(void)
 {
-#ifdef CONFIG_SOC_AU1200
+        if (has_dbdma() && memid)
-        if (memid)
                au1xxx_ddma_del_device(memid);
-#endif
        platform_driver_unregister(&au1xmmc_driver);
 }
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index e8ff12396680..101cd31c8220 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1270,7 +1270,7 @@ static void omap_hsmmc_protect_card(struct omap_hsmmc_host *host)
                }
        } else {
                if (!host->protect_card) {
-                        pr_info"%s: cover is open, "
+                        pr_info("%s: cover is open, "
                                         "card is now inaccessible\n",
                                         mmc_hostname(host->mmc));
                        host->protect_card = 1;
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index d2856b6b2a62..720f99334a7f 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -913,9 +913,9 @@ request_done:
 }
 static void s3cmci_dma_setup(struct s3cmci_host *host,
-                             enum s3c2410_dmasrc source)
+                             enum dma_data_direction source)
 {
-        static enum s3c2410_dmasrc last_source = -1;
+        static enum dma_data_direction last_source = -1;
        static int setup_ok;
        if (last_source == source)
@@ -1087,7 +1087,7 @@ static int s3cmci_prepare_dma(struct s3cmci_host *host, struct mmc_data *data)
        BUG_ON((data->flags & BOTH_DIR) == BOTH_DIR);
-        s3cmci_dma_setup(host, rw ? S3C2410_DMASRC_MEM : S3C2410_DMASRC_HW);
+        s3cmci_dma_setup(host, rw ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
        s3c2410_dma_ctrl(host->dma, S3C2410_DMAOP_FLUSH);
        dma_len = dma_map_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index 067a4cded9cf..89699e861fc1 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -13,6 +13,7 @@
 */
 #include <linux/err.h>
+#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
diff --git a/drivers/mtd/ar7part.c b/drivers/mtd/ar7part.c
index 6697a1ec72d0..95949b97de6a 100644
--- a/drivers/mtd/ar7part.c
+++ b/drivers/mtd/ar7part.c
@@ -27,6 +27,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/bootmem.h>
 #include <linux/magic.h>
+#include <linux/module.h>
 #define AR7_PARTS       4
 #define ROOT_OFFSET     0xe0000
diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c
index e790f38893b0..8cf667da2408 100644
--- a/drivers/mtd/cmdlinepart.c
+++ b/drivers/mtd/cmdlinepart.c
@@ -43,6 +43,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/bootmem.h>
+#include <linux/module.h>
 /* error message prefix */
 #define ERRP "mtd: "
diff --git a/drivers/mtd/lpddr/lpddr_cmds.c b/drivers/mtd/lpddr/lpddr_cmds.c
index 65655dd59e1f..1dca31d9a8b3 100644
--- a/drivers/mtd/lpddr/lpddr_cmds.c
+++ b/drivers/mtd/lpddr/lpddr_cmds.c
@@ -27,6 +27,7 @@
 #include <linux/mtd/pfow.h>
 #include <linux/mtd/qinfo.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 static int lpddr_read(struct mtd_info *mtd, loff_t adr, size_t len,
                                        size_t *retlen, u_char *buf);
diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c
index a90cabd7b84d..7e508969239e 100644
--- a/drivers/mtd/maps/lantiq-flash.c
+++ b/drivers/mtd/maps/lantiq-flash.c
@@ -182,7 +182,7 @@ ltq_mtd_probe(struct platform_device *pdev)
                parts = ltq_mtd_data->parts;
        }
-        err = add_mtd_partitions(ltq_mtd->mtd, parts, nr_parts);
+        err = mtd_device_register(ltq_mtd->mtd, parts, nr_parts);
        if (err) {
                dev_err(&pdev->dev, "failed to add partitions\n");
                goto err_destroy;
@@ -208,7 +208,7 @@ ltq_mtd_remove(struct platform_device *pdev)
        if (ltq_mtd) {
                if (ltq_mtd->mtd) {
-                        del_mtd_partitions(ltq_mtd->mtd);
+                        mtd_device_unregister(ltq_mtd->mtd);
                        map_destroy(ltq_mtd->mtd);
                }
                if (ltq_mtd->map->virt)
diff --git a/drivers/mtd/mtdblock_ro.c b/drivers/mtd/mtdblock_ro.c
index 795a8c0a05b8..0470a6e86309 100644
--- a/drivers/mtd/mtdblock_ro.c
+++ b/drivers/mtd/mtdblock_ro.c
@@ -23,6 +23,7 @@
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/blktrans.h>
+#include <linux/module.h>
 static int mtdblock_readsect(struct mtd_blktrans_dev *dev,
                              unsigned long block, char *buf)
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index f1af2228a1b1..61086ea3cc6b 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -1144,7 +1144,7 @@ static void mtdchar_notify_remove(struct mtd_info *mtd)
        if (mtd_ino) {
                /* Destroy the inode if it exists */
-                mtd_ino->i_nlink = 0;
+                clear_nlink(mtd_ino);
                iput(mtd_ino);
        }
 }
diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c
index 16b02a1fc100..89f8e66448ab 100644
--- a/drivers/mtd/mtdsuper.c
+++ b/drivers/mtd/mtdsuper.c
@@ -14,6 +14,7 @@
 #include <linux/mtd/super.h>
 #include <linux/namei.h>
+#include <linux/export.h>
 #include <linux/ctype.h>
 #include <linux/slab.h>
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 4c3425235adc..dbfa0f7fb464 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -138,7 +138,7 @@ config MTD_NAND_RICOH
 config MTD_NAND_AU1550
        tristate "Au1550/1200 NAND support"
-        depends on SOC_AU1200 || SOC_AU1550
+        depends on MIPS_ALCHEMY
        help
          This enables the driver for the NAND flash controller on the
          AMD/Alchemy 1550 SOC.
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c
index e7767eef4505..fa5736b9286c 100644
--- a/drivers/mtd/nand/au1550nd.c
+++ b/drivers/mtd/nand/au1550nd.c
@@ -19,7 +19,11 @@
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
-#include <asm/mach-au1x00/au1xxx.h>
+#ifdef CONFIG_MIPS_PB1550
+#include <asm/mach-pb1x00/pb1550.h>
+#elif defined(CONFIG_MIPS_DB1550)
+#include <asm/mach-db1x00/db1x00.h>
+#endif
 #include <asm/mach-db1x00/bcsr.h>
 /*
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
index 87ebb4e5b0c3..7c8df837d3b8 100644
--- a/drivers/mtd/nand/cafe_nand.c
+++ b/drivers/mtd/nand/cafe_nand.c
@@ -21,6 +21,7 @@
 #include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <asm/io.h>
 #define CAFE_NAND_CTRL1         0x00
diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c
index 6fc043a30d1e..be33b0f4634d 100644
--- a/drivers/mtd/nand/cmx270_nand.c
+++ b/drivers/mtd/nand/cmx270_nand.c
@@ -22,6 +22,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/slab.h>
 #include <linux/gpio.h>
+#include <linux/module.h>
 #include <asm/io.h>
 #include <asm/irq.h>
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index 7837728d02ff..e1b84cb90f0d 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -31,6 +31,7 @@
 #include <linux/mtd/doc2000.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/inftl.h>
+#include <linux/module.h>
 /* Where to look for the devices? */
 #ifndef CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index ccbeaa1e4a8e..4165857752ca 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -67,6 +67,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/vmalloc.h>
+#include <linux/export.h>
 static int check_pattern_no_oob(uint8_t *buf, struct nand_bbt_descr *td)
 {
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 0db2c0e7656a..ec22a5aab038 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -11,6 +11,7 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/jiffies.h>
 #include <linux/sched.h>
diff --git a/drivers/mtd/nand/sm_common.c b/drivers/mtd/nand/sm_common.c
index b6332e83b289..43469715b3fa 100644
--- a/drivers/mtd/nand/sm_common.c
+++ b/drivers/mtd/nand/sm_common.c
@@ -8,6 +8,7 @@
 */
 #include <linux/kernel.h>
 #include <linux/mtd/nand.h>
+#include <linux/module.h>
 #include "sm_common.h"
 static struct nand_ecclayout nand_oob_sm = {
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
index fc2c16a0fd1c..b2d7fc5ea25d 100644
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
@@ -15,6 +15,7 @@
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
+#include <linux/export.h>
 /**
 * check_short_pattern - [GENERIC] check if a pattern is in the buffer
diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c
index 7a87d07cd79f..84b4dda023f4 100644
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
@@ -28,6 +28,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
+#include <linux/module.h>
 struct fis_image_desc {
    unsigned char name[16];      // Null terminated name
diff --git a/drivers/mtd/rfd_ftl.c b/drivers/mtd/rfd_ftl.c
index cc4d1805b864..73ae217a4252 100644
--- a/drivers/mtd/rfd_ftl.c
+++ b/drivers/mtd/rfd_ftl.c
@@ -18,6 +18,7 @@
 #include <linux/vmalloc.h>
 #include <linux/slab.h>
 #include <linux/jiffies.h>
+#include <linux/module.h>
 #include <asm/types.h>
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index 97e093d19672..863835f4aefe 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -26,6 +26,7 @@
 #include <linux/err.h>
 #include <linux/math64.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "ubi.h"
 #ifdef CONFIG_MTD_UBI_DEBUG
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index c34cc1e7c6f6..b2b9109b6712 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -550,7 +550,7 @@ down:
 /*
 * Get link speed and duplex from the slave's base driver
 * using ethtool. If for some reason the call fails or the
- * values are invalid, fake speed and duplex to 100/Full
+ * values are invalid, set speed and duplex to -1,
 * and return error.
 */
 static int bond_update_speed_duplex(struct slave *slave)
@@ -560,9 +560,8 @@ static int bond_update_speed_duplex(struct slave *slave)
        u32 slave_speed;
        int res;
-        /* Fake speed and duplex */
+        slave->speed = -1;
-        slave->speed = SPEED_100;
+        slave->duplex = -1;
-        slave->duplex = DUPLEX_FULL;
        res = __ethtool_get_settings(slave_dev, &ecmd);
        if (res < 0)
@@ -1751,16 +1750,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                new_slave->link  = BOND_LINK_DOWN;
        }
-        if (bond_update_speed_duplex(new_slave) &&
+        bond_update_speed_duplex(new_slave);
-            (new_slave->link != BOND_LINK_DOWN)) {
-                pr_warning("%s: Warning: failed to get speed and duplex from %s, assumed to be 100Mb/sec and Full.\n",
-                           bond_dev->name, new_slave->dev->name);
-                if (bond->params.mode == BOND_MODE_8023AD) {
-                        pr_warning("%s: Warning: Operation of 802.3ad mode requires ETHTOOL support in base driver for proper aggregator selection.\n",
-                                   bond_dev->name);
-                }
-        }
        if (USES_PRIMARY(bond->params.mode) && bond->params.primary[0]) {
                /* if there is a primary slave, remember it */
@@ -3220,6 +3210,7 @@ static int bond_slave_netdev_event(unsigned long event,
 {
        struct net_device *bond_dev = slave_dev->master;
        struct bonding *bond = netdev_priv(bond_dev);
+        struct slave *slave = NULL;
        switch (event) {
        case NETDEV_UNREGISTER:
@@ -3230,20 +3221,16 @@ static int bond_slave_netdev_event(unsigned long event,
                                bond_release(bond_dev, slave_dev);
                }
                break;
+        case NETDEV_UP:
        case NETDEV_CHANGE:
-                if (bond->params.mode == BOND_MODE_8023AD || bond_is_lb(bond)) {
+                slave = bond_get_slave_by_dev(bond, slave_dev);
-                        struct slave *slave;
+                if (slave) {
+                        u32 old_speed = slave->speed;
+                        u8  old_duplex = slave->duplex;
-                        slave = bond_get_slave_by_dev(bond, slave_dev);
+                        bond_update_speed_duplex(slave);
-                        if (slave) {
-                                u32 old_speed = slave->speed;
-                                u8  old_duplex = slave->duplex;
-                                bond_update_speed_duplex(slave);
-                                if (bond_is_lb(bond))
-                                        break;
+                        if (bond->params.mode == BOND_MODE_8023AD) {
                                if (old_speed != slave->speed)
                                        bond_3ad_adapter_speed_changed(slave);
                                if (old_duplex != slave->duplex)
diff --git a/drivers/net/bonding/bond_procfs.c b/drivers/net/bonding/bond_procfs.c
index 95de93b90386..2acf0b080169 100644
--- a/drivers/net/bonding/bond_procfs.c
+++ b/drivers/net/bonding/bond_procfs.c
@@ -1,4 +1,5 @@
 #include <linux/proc_fs.h>
+#include <linux/export.h>
 #include <net/net_namespace.h>
 #include <net/netns/generic.h>
 #include "bonding.h"
@@ -157,8 +158,16 @@ static void bond_info_show_slave(struct seq_file *seq,
        seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name);
        seq_printf(seq, "MII Status: %s\n",
                   (slave->link == BOND_LINK_UP) ?  "up" : "down");
-        seq_printf(seq, "Speed: %d Mbps\n", slave->speed);
+        if (slave->speed == -1)
-        seq_printf(seq, "Duplex: %s\n", slave->duplex ? "full" : "half");
+                seq_printf(seq, "Speed: %s\n", "Unknown");
+        else
+                seq_printf(seq, "Speed: %d Mbps\n", slave->speed);
+        if (slave->duplex == -1)
+                seq_printf(seq, "Duplex: %s\n", "Unknown");
+        else
+                seq_printf(seq, "Duplex: %s\n", slave->duplex ? "full" : "half");
        seq_printf(seq, "Link Failure Count: %u\n",
                   slave->link_failure_count);
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 6dff5a0e733f..597f4d45c632 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -159,6 +159,7 @@ config S6GMAC
          will be called s6gmac.
 source "drivers/net/ethernet/seeq/Kconfig"
+source "drivers/net/ethernet/silan/Kconfig"
 source "drivers/net/ethernet/sis/Kconfig"
 source "drivers/net/ethernet/sfc/Kconfig"
 source "drivers/net/ethernet/sgi/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index c53ad3afc991..be5dde040261 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -58,6 +58,7 @@ obj-$(CONFIG_SH_ETH) += renesas/
 obj-$(CONFIG_NET_VENDOR_RDC) += rdc/
 obj-$(CONFIG_S6GMAC) += s6gmac.o
 obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/
+obj-$(CONFIG_NET_VENDOR_SILAN) += silan/
 obj-$(CONFIG_NET_VENDOR_SIS) += sis/
 obj-$(CONFIG_SFC) += sfc/
 obj-$(CONFIG_NET_VENDOR_SGI) += sgi/
diff --git a/drivers/net/ethernet/amd/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c
index 82386677bb8c..4865ff14bebf 100644
--- a/drivers/net/ethernet/amd/au1000_eth.c
+++ b/drivers/net/ethernet/amd/au1000_eth.c
@@ -541,19 +541,17 @@ static void au1000_reset_mac(struct net_device *dev)
 * these are not descriptors sitting in memory.
 */
 static void
-au1000_setup_hw_rings(struct au1000_private *aup, u32 rx_base, u32 tx_base)
+au1000_setup_hw_rings(struct au1000_private *aup, void __iomem *tx_base)
 {
        int i;
        for (i = 0; i < NUM_RX_DMA; i++) {
-                aup->rx_dma_ring[i] =
+                aup->rx_dma_ring[i] = (struct rx_dma *)
-                        (struct rx_dma *)
+                        (tx_base + 0x100 + sizeof(struct rx_dma) * i);
-                                        (rx_base + sizeof(struct rx_dma)*i);
        }
        for (i = 0; i < NUM_TX_DMA; i++) {
-                aup->tx_dma_ring[i] =
+                aup->tx_dma_ring[i] = (struct tx_dma *)
-                        (struct tx_dma *)
+                        (tx_base + sizeof(struct tx_dma) * i);
-                                        (tx_base + sizeof(struct tx_dma)*i);
        }
 }
@@ -1026,7 +1024,7 @@ static int __devinit au1000_probe(struct platform_device *pdev)
        struct net_device *dev = NULL;
        struct db_dest *pDB, *pDBfree;
        int irq, i, err = 0;
-        struct resource *base, *macen;
+        struct resource *base, *macen, *macdma;
        base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!base) {
@@ -1049,6 +1047,13 @@ static int __devinit au1000_probe(struct platform_device *pdev)
                goto out;
        }
+        macdma = platform_get_resource(pdev, IORESOURCE_MEM, 2);
+        if (!macdma) {
+                dev_err(&pdev->dev, "failed to retrieve MACDMA registers\n");
+                err = -ENODEV;
+                goto out;
+        }
        if (!request_mem_region(base->start, resource_size(base),
                                                        pdev->name)) {
                dev_err(&pdev->dev, "failed to request memory region for base registers\n");
@@ -1063,6 +1068,13 @@ static int __devinit au1000_probe(struct platform_device *pdev)
                goto err_request;
        }
+        if (!request_mem_region(macdma->start, resource_size(macdma),
+                                                        pdev->name)) {
+                dev_err(&pdev->dev, "failed to request MACDMA memory region\n");
+                err = -ENXIO;
+                goto err_macdma;
+        }
        dev = alloc_etherdev(sizeof(struct au1000_private));
        if (!dev) {
                dev_err(&pdev->dev, "alloc_etherdev failed\n");
@@ -1109,10 +1121,14 @@ static int __devinit au1000_probe(struct platform_device *pdev)
        }
        aup->mac_id = pdev->id;
-        if (pdev->id == 0)
+        aup->macdma = ioremap_nocache(macdma->start, resource_size(macdma));
-                au1000_setup_hw_rings(aup, MAC0_RX_DMA_ADDR, MAC0_TX_DMA_ADDR);
+        if (!aup->macdma) {
-        else if (pdev->id == 1)
+                dev_err(&pdev->dev, "failed to ioremap MACDMA registers\n");
-                au1000_setup_hw_rings(aup, MAC1_RX_DMA_ADDR, MAC1_TX_DMA_ADDR);
+                err = -ENXIO;
+                goto err_remap3;
+        }
+        au1000_setup_hw_rings(aup, aup->macdma);
        /* set a random MAC now in case platform_data doesn't provide one */
        random_ether_addr(dev->dev_addr);
@@ -1252,6 +1268,8 @@ err_out:
 err_mdiobus_reg:
        mdiobus_free(aup->mii_bus);
 err_mdiobus_alloc:
+        iounmap(aup->macdma);
+err_remap3:
        iounmap(aup->enable);
 err_remap2:
        iounmap(aup->mac);
@@ -1261,6 +1279,8 @@ err_remap1:
 err_vaddr:
        free_netdev(dev);
 err_alloc:
+        release_mem_region(macdma->start, resource_size(macdma));
+err_macdma:
        release_mem_region(macen->start, resource_size(macen));
 err_request:
        release_mem_region(base->start, resource_size(base));
@@ -1293,9 +1313,13 @@ static int __devexit au1000_remove(struct platform_device *pdev)
                        (NUM_TX_BUFFS + NUM_RX_BUFFS),
                        (void *)aup->vaddr, aup->dma_addr);
+        iounmap(aup->macdma);
        iounmap(aup->mac);
        iounmap(aup->enable);
+        base = platform_get_resource(pdev, IORESOURCE_MEM, 2);
+        release_mem_region(base->start, resource_size(base));
        base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        release_mem_region(base->start, resource_size(base));
diff --git a/drivers/net/ethernet/amd/au1000_eth.h b/drivers/net/ethernet/amd/au1000_eth.h
index 6229c774552c..4b7f7ad62bb8 100644
--- a/drivers/net/ethernet/amd/au1000_eth.h
+++ b/drivers/net/ethernet/amd/au1000_eth.h
@@ -124,7 +124,7 @@ struct au1000_private {
         */
        struct mac_reg *mac;  /* mac registers                      */
        u32 *enable;     /* address of MAC Enable Register     */
+        void __iomem *macdma;   /* base of MAC DMA port */
        u32 vaddr;                /* virtual address of rx/tx buffers   */
        dma_addr_t dma_addr;      /* dma address of rx/tx buffers       */
diff --git a/drivers/net/ethernet/apple/Kconfig b/drivers/net/ethernet/apple/Kconfig
index a759d5483ab9..1375e2dc9468 100644
--- a/drivers/net/ethernet/apple/Kconfig
+++ b/drivers/net/ethernet/apple/Kconfig
@@ -52,18 +52,6 @@ config BMAC
          To compile this driver as a module, choose M here: the module
          will be called bmac.
-config MAC89x0
-        tristate "Macintosh CS89x0 based ethernet cards"
-        depends on MAC
-        ---help---
-          Support for CS89x0 chipset based Ethernet cards.  If you have a
-          Nubus or LC-PDS network (Ethernet) card of this type, say Y and
-          read the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-          To compile this driver as a module, choose M here. This module will
-          be called mac89x0.
 config MACMACE
        bool "Macintosh (AV) onboard MACE ethernet"
        depends on MAC
diff --git a/drivers/net/ethernet/apple/Makefile b/drivers/net/ethernet/apple/Makefile
index 0d3a5919c95b..86eaa17af0f4 100644
--- a/drivers/net/ethernet/apple/Makefile
+++ b/drivers/net/ethernet/apple/Makefile
@@ -4,5 +4,4 @@
 obj-$(CONFIG_MACE) += mace.o
 obj-$(CONFIG_BMAC) += bmac.o
-obj-$(CONFIG_MAC89x0) += mac89x0.o
 obj-$(CONFIG_MACMACE) += macmace.o
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index 5d7872ecff52..7f3091e7eb42 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -25,6 +25,7 @@
 #include <linux/if_ether.h>
 #include <linux/ip.h>
 #include <linux/prefetch.h>
+#include <linux/module.h>
 #include "bnad.h"
 #include "bna.h"
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
index da5a5d9b8aff..90ff1318cc05 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
@@ -40,6 +40,7 @@
 #include <net/netevent.h>
 #include <linux/highmem.h>
 #include <linux/vmalloc.h>
+#include <linux/export.h>
 #include "common.h"
 #include "regs.h"
diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.c b/drivers/net/ethernet/chelsio/cxgb3/l2t.c
index 41540978a173..70fec8b1140f 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.c
@@ -35,6 +35,7 @@
 #include <linux/if_vlan.h>
 #include <linux/jhash.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <net/neighbour.h>
 #include "common.h"
 #include "t3cdev.h"
diff --git a/drivers/net/ethernet/chelsio/cxgb4/l2t.c b/drivers/net/ethernet/chelsio/cxgb4/l2t.c
index a2d323c473f8..6ac77a62f361 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/l2t.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/l2t.c
@@ -37,6 +37,9 @@
 #include <linux/if.h>
 #include <linux/if_vlan.h>
 #include <linux/jhash.h>
+#include <linux/module.h>
+#include <linux/debugfs.h>
+#include <linux/seq_file.h>
 #include <net/neighbour.h>
 #include "cxgb4.h"
 #include "l2t.h"
@@ -503,10 +506,6 @@ struct l2t_data *t4_init_l2t(void)
        return d;
 }
-#include <linux/module.h>
-#include <linux/debugfs.h>
-#include <linux/seq_file.h>
 static inline void *l2t_get_idx(struct seq_file *seq, loff_t pos)
 {
        struct l2t_entry *l2tab = seq->private;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
index ddc16985d0f6..140254c7cba9 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
@@ -40,6 +40,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/jiffies.h>
 #include <linux/prefetch.h>
+#include <linux/export.h>
 #include <net/ipv6.h>
 #include <net/tcp.h>
 #include "cxgb4.h"
diff --git a/drivers/net/ethernet/cirrus/Kconfig b/drivers/net/ethernet/cirrus/Kconfig
index 6cbb81ccc02e..1f8648f099c7 100644
--- a/drivers/net/ethernet/cirrus/Kconfig
+++ b/drivers/net/ethernet/cirrus/Kconfig
@@ -6,7 +6,7 @@ config NET_VENDOR_CIRRUS
        bool "Cirrus devices"
        default y
        depends on ISA || EISA || MACH_IXDP2351 || ARCH_IXDP2X01 \
-                || MACH_MX31ADS || MACH_QQ2440 || (ARM && ARCH_EP93XX)
+                || MACH_MX31ADS || MACH_QQ2440 || (ARM && ARCH_EP93XX) || MAC
        ---help---
          If you have a network (Ethernet) card belonging to this class, say Y
          and read the Ethernet-HOWTO, available from
@@ -47,4 +47,16 @@ config EP93XX_ETH
          This is a driver for the ethernet hardware included in EP93xx CPUs.
          Say Y if you are building a kernel for EP93xx based devices.
+config MAC89x0
+        tristate "Macintosh CS89x0 based ethernet cards"
+        depends on MAC
+        ---help---
+          Support for CS89x0 chipset based Ethernet cards.  If you have a
+          Nubus or LC-PDS network (Ethernet) card of this type, say Y and
+          read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          To compile this driver as a module, choose M here. This module will
+          be called mac89x0.
 endif # NET_VENDOR_CIRRUS
diff --git a/drivers/net/ethernet/cirrus/Makefile b/drivers/net/ethernet/cirrus/Makefile
index 14bd77e0cb57..ca245e2b5d98 100644
--- a/drivers/net/ethernet/cirrus/Makefile
+++ b/drivers/net/ethernet/cirrus/Makefile
@@ -4,3 +4,4 @@
 obj-$(CONFIG_CS89x0) += cs89x0.o
 obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o
+obj-$(CONFIG_MAC89x0) += mac89x0.o
diff --git a/drivers/net/ethernet/apple/mac89x0.c b/drivers/net/ethernet/cirrus/mac89x0.c
index 83781f316d1f..83781f316d1f 100644
--- a/drivers/net/ethernet/apple/mac89x0.c
+++ b/drivers/net/ethernet/cirrus/mac89x0.c
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 824b8e6021f6..2c7b36673dfc 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -318,8 +318,7 @@ static int be_mbox_db_ready_wait(struct be_adapter *adapter, void __iomem *db)
                if (msecs > 4000) {
                        dev_err(&adapter->pdev->dev, "mbox poll timed out\n");
-                        if (!lancer_chip(adapter))
+                        be_detect_dump_ue(adapter);
-                                be_detect_dump_ue(adapter);
                        return -1;
                }
@@ -1540,7 +1539,14 @@ int be_cmd_rx_filter(struct be_adapter *adapter, u32 flags, u32 value)
                req->if_flags_mask = req->if_flags =
                                cpu_to_le32(BE_IF_FLAGS_MULTICAST);
-                req->mcast_num = cpu_to_le16(netdev_mc_count(adapter->netdev));
+                /* Reset mcast promisc mode if already set by setting mask
+                 * and not setting flags field
+                 */
+                req->if_flags_mask |=
+                                cpu_to_le32(BE_IF_FLAGS_MCAST_PROMISCUOUS);
+                req->mcast_num = cpu_to_le32(netdev_mc_count(adapter->netdev));
                netdev_for_each_mc_addr(ha, adapter->netdev)
                        memcpy(req->mcast_mac[i++].byte, ha->addr, ETH_ALEN);
        }
diff --git a/drivers/net/ethernet/emulex/benet/be_hw.h b/drivers/net/ethernet/emulex/benet/be_hw.h
index fbc8a915519e..f2c89e3ccabd 100644
--- a/drivers/net/ethernet/emulex/benet/be_hw.h
+++ b/drivers/net/ethernet/emulex/benet/be_hw.h
@@ -48,6 +48,8 @@
 /* Lancer SLIPORT_CONTROL SLIPORT_STATUS registers */
 #define SLIPORT_STATUS_OFFSET           0x404
 #define SLIPORT_CONTROL_OFFSET          0x408
+#define SLIPORT_ERROR1_OFFSET           0x40C
+#define SLIPORT_ERROR2_OFFSET           0x410
 #define SLIPORT_STATUS_ERR_MASK         0x80000000
 #define SLIPORT_STATUS_RN_MASK          0x01000000
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 21804972fa2f..bf266a00c774 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -16,6 +16,7 @@
 */
 #include <linux/prefetch.h>
+#include <linux/module.h>
 #include "be.h"
 #include "be_cmds.h"
 #include <asm/div64.h>
@@ -1905,6 +1906,8 @@ loop_continue:
                be_rx_stats_update(rxo, rxcp);
        }
+        be_cq_notify(adapter, rx_cq->id, false, work_done);
        /* Refill the queue */
        if (work_done && atomic_read(&rxo->q.used) < RX_FRAGS_REFILL_WM)
                be_post_rx_frags(rxo, GFP_ATOMIC);
@@ -1912,10 +1915,8 @@ loop_continue:
        /* All consumed */
        if (work_done < budget) {
                napi_complete(napi);
-                be_cq_notify(adapter, rx_cq->id, true, work_done);
+                /* Arm CQ */
-        } else {
+                be_cq_notify(adapter, rx_cq->id, true, 0);
-                /* More to be consumed; continue with interrupts disabled */
-                be_cq_notify(adapter, rx_cq->id, false, work_done);
        }
        return work_done;
 }
@@ -1977,42 +1978,62 @@ static int be_poll_tx_mcc(struct napi_struct *napi, int budget)
 void be_detect_dump_ue(struct be_adapter *adapter)
 {
-        u32 ue_status_lo, ue_status_hi, ue_status_lo_mask, ue_status_hi_mask;
+        u32 ue_lo = 0, ue_hi = 0, ue_lo_mask = 0, ue_hi_mask = 0;
+        u32 sliport_status = 0, sliport_err1 = 0, sliport_err2 = 0;
        u32 i;
-        pci_read_config_dword(adapter->pdev,
+        if (lancer_chip(adapter)) {
-                                PCICFG_UE_STATUS_LOW, &ue_status_lo);
+                sliport_status = ioread32(adapter->db + SLIPORT_STATUS_OFFSET);
-        pci_read_config_dword(adapter->pdev,
+                if (sliport_status & SLIPORT_STATUS_ERR_MASK) {
-                                PCICFG_UE_STATUS_HIGH, &ue_status_hi);
+                        sliport_err1 = ioread32(adapter->db +
-        pci_read_config_dword(adapter->pdev,
+                                        SLIPORT_ERROR1_OFFSET);
-                                PCICFG_UE_STATUS_LOW_MASK, &ue_status_lo_mask);
+                        sliport_err2 = ioread32(adapter->db +
-        pci_read_config_dword(adapter->pdev,
+                                        SLIPORT_ERROR2_OFFSET);
-                                PCICFG_UE_STATUS_HI_MASK, &ue_status_hi_mask);
+                }
+        } else {
+                pci_read_config_dword(adapter->pdev,
+                                PCICFG_UE_STATUS_LOW, &ue_lo);
+                pci_read_config_dword(adapter->pdev,
+                                PCICFG_UE_STATUS_HIGH, &ue_hi);
+                pci_read_config_dword(adapter->pdev,
+                                PCICFG_UE_STATUS_LOW_MASK, &ue_lo_mask);
+                pci_read_config_dword(adapter->pdev,
+                                PCICFG_UE_STATUS_HI_MASK, &ue_hi_mask);
-        ue_status_lo = (ue_status_lo & (~ue_status_lo_mask));
+                ue_lo = (ue_lo & (~ue_lo_mask));
-        ue_status_hi = (ue_status_hi & (~ue_status_hi_mask));
+                ue_hi = (ue_hi & (~ue_hi_mask));
+        }
-        if (ue_status_lo || ue_status_hi) {
+        if (ue_lo || ue_hi ||
+                sliport_status & SLIPORT_STATUS_ERR_MASK) {
                adapter->ue_detected = true;
                adapter->eeh_err = true;
                dev_err(&adapter->pdev->dev, "UE Detected!!\n");
        }
-        if (ue_status_lo) {
+        if (ue_lo) {
-                for (i = 0; ue_status_lo; ue_status_lo >>= 1, i++) {
+                for (i = 0; ue_lo; ue_lo >>= 1, i++) {
-                        if (ue_status_lo & 1)
+                        if (ue_lo & 1)
                                dev_err(&adapter->pdev->dev,
                                "UE: %s bit set\n", ue_status_low_desc[i]);
                }
        }
-        if (ue_status_hi) {
+        if (ue_hi) {
-                for (i = 0; ue_status_hi; ue_status_hi >>= 1, i++) {
+                for (i = 0; ue_hi; ue_hi >>= 1, i++) {
-                        if (ue_status_hi & 1)
+                        if (ue_hi & 1)
                                dev_err(&adapter->pdev->dev,
                                "UE: %s bit set\n", ue_status_hi_desc[i]);
                }
        }
+        if (sliport_status & SLIPORT_STATUS_ERR_MASK) {
+                dev_err(&adapter->pdev->dev,
+                        "sliport status 0x%x\n", sliport_status);
+                dev_err(&adapter->pdev->dev,
+                        "sliport error1 0x%x\n", sliport_err1);
+                dev_err(&adapter->pdev->dev,
+                        "sliport error2 0x%x\n", sliport_err2);
+        }
 }
 static void be_worker(struct work_struct *work)
@@ -2022,7 +2043,7 @@ static void be_worker(struct work_struct *work)
        struct be_rx_obj *rxo;
        int i;
-        if (!adapter->ue_detected && !lancer_chip(adapter))
+        if (!adapter->ue_detected)
                be_detect_dump_ue(adapter);
        /* when interrupts are not yet enabled, just reap any pending
diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c
index bdb348a5ccf6..251b635fe75a 100644
--- a/drivers/net/ethernet/ethoc.c
+++ b/drivers/net/ethernet/ethoc.c
@@ -22,6 +22,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/of.h>
+#include <linux/module.h>
 #include <net/ethoc.h>
 static int buffer_size = 0x8000; /* 32 KBytes */
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 46d690a92c0b..b5dc0273a1d1 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -17,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/stddef.h>
+#include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
diff --git a/drivers/net/ethernet/i825xx/3c505.c b/drivers/net/ethernet/i825xx/3c505.c
index 40e1a175fceb..ba82a266051d 100644
--- a/drivers/net/ethernet/i825xx/3c505.c
+++ b/drivers/net/ethernet/i825xx/3c505.c
@@ -126,15 +126,13 @@
 *
 *********************************************************/
-#define filename __FILE__
 #define timeout_msg "*** timeout at %s:%s (line %d) ***\n"
 #define TIMEOUT_MSG(lineno) \
-        pr_notice(timeout_msg, filename, __func__, (lineno))
+        pr_notice(timeout_msg, __FILE__, __func__, (lineno))
 #define invalid_pcb_msg "*** invalid pcb length %d at %s:%s (line %d) ***\n"
 #define INVALID_PCB_MSG(len) \
-        pr_notice(invalid_pcb_msg, (len), filename, __func__, __LINE__)
+        pr_notice(invalid_pcb_msg, (len), __FILE__, __func__, __LINE__)
 #define search_msg "%s: Looking for 3c505 adapter at address %#x..."
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index ae17cd1a907f..5a2fdf7a00c8 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -2810,6 +2810,10 @@ static int __devinit e100_probe(struct pci_dev *pdev,
        e100_get_defaults(nic);
+        /* D100 MAC doesn't allow rx of vlan packets with normal MTU */
+        if (nic->mac < mac_82558_D101_A4)
+                netdev->features |= NETIF_F_VLAN_CHALLENGED;
        /* locks must be initialized before calling hw_reset */
        spin_lock_init(&nic->cb_lock);
        spin_lock_init(&nic->cmd_lock);
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 6a17c62cb86f..e2a80a283fd3 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -866,8 +866,7 @@ static s32 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw)
        if (test_and_set_bit(__E1000_ACCESS_SHARED_RESOURCE,
                             &hw->adapter->state)) {
-                WARN(1, "e1000e: %s: contention for Phy access\n",
+                e_dbg("contention for Phy access\n");
-                     hw->adapter->netdev->name);
                return -E1000_ERR_PHY;
        }
diff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c
index 4dd9b63273f6..20e93b08e7f3 100644
--- a/drivers/net/ethernet/intel/e1000e/param.c
+++ b/drivers/net/ethernet/intel/e1000e/param.c
@@ -27,6 +27,7 @@
 *******************************************************************************/
 #include <linux/netdevice.h>
+#include <linux/module.h>
 #include <linux/pci.h>
 #include "e1000.h"
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c
index 7edf31efe756..b17d7c20f817 100644
--- a/drivers/net/ethernet/intel/igb/e1000_phy.c
+++ b/drivers/net/ethernet/intel/igb/e1000_phy.c
@@ -1687,7 +1687,7 @@ s32 igb_get_cable_length_m88_gen2(struct e1000_hw *hw)
                if (ret_val)
                        goto out;
-                is_cm = !(phy_data & I347AT4_PCDC_CABLE_LENGTH_UNIT);
+                is_cm = !(phy_data2 & I347AT4_PCDC_CABLE_LENGTH_UNIT);
                /* Populate the phy structure with cable length in meters */
                phy->min_cable_length = phy_data / (is_cm ? 100 : 1);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
index 834f044be4c3..f1365fef4ed2 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
@@ -3344,7 +3344,7 @@ static u8 ixgbe_calculate_checksum(u8 *buffer, u32 length)
 static s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer,
                                        u32 length)
 {
-        u32 hicr, i;
+        u32 hicr, i, bi;
        u32 hdr_size = sizeof(struct ixgbe_hic_hdr);
        u8 buf_len, dword_len;
@@ -3398,9 +3398,9 @@ static s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer,
        dword_len = hdr_size >> 2;
        /* first pull in the header so we know the buffer length */
-        for (i = 0; i < dword_len; i++) {
+        for (bi = 0; bi < dword_len; bi++) {
-                buffer[i] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, i);
+                buffer[bi] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, bi);
-                le32_to_cpus(&buffer[i]);
+                le32_to_cpus(&buffer[bi]);
        }
        /* If there is any thing in data position pull it in */
@@ -3414,12 +3414,14 @@ static s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer,
                goto out;
        }
-        /* Calculate length in DWORDs, add one for odd lengths */
+        /* Calculate length in DWORDs, add 3 for odd lengths */
-        dword_len = (buf_len + 1) >> 2;
+        dword_len = (buf_len + 3) >> 2;
-        /* Pull in the rest of the buffer (i is where we left off)*/
+        /* Pull in the rest of the buffer (bi is where we left off)*/
-        for (; i < buf_len; i++)
+        for (; bi <= dword_len; bi++) {
-                buffer[i] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, i);
+                buffer[bi] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, bi);
+                le32_to_cpus(&buffer[bi]);
+        }
 out:
        return ret_val;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
index 3631d639d86a..33b93ffb87cb 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
@@ -561,11 +561,12 @@ static int ixgbe_dcbnl_ieee_getets(struct net_device *dev,
        struct ixgbe_adapter *adapter = netdev_priv(dev);
        struct ieee_ets *my_ets = adapter->ixgbe_ieee_ets;
+        ets->ets_cap = adapter->dcb_cfg.num_tcs.pg_tcs;
        /* No IEEE PFC settings available */
        if (!my_ets)
-                return -EINVAL;
+                return 0;
-        ets->ets_cap = adapter->dcb_cfg.num_tcs.pg_tcs;
        ets->cbs = my_ets->cbs;
        memcpy(ets->tc_tx_bw, my_ets->tc_tx_bw, sizeof(ets->tc_tx_bw));
        memcpy(ets->tc_rx_bw, my_ets->tc_rx_bw, sizeof(ets->tc_rx_bw));
@@ -621,11 +622,12 @@ static int ixgbe_dcbnl_ieee_getpfc(struct net_device *dev,
        struct ieee_pfc *my_pfc = adapter->ixgbe_ieee_pfc;
        int i;
+        pfc->pfc_cap = adapter->dcb_cfg.num_tcs.pfc_tcs;
        /* No IEEE PFC settings available */
        if (!my_pfc)
-                return -EINVAL;
+                return 0;
-        pfc->pfc_cap = adapter->dcb_cfg.num_tcs.pfc_tcs;
        pfc->pfc_en = my_pfc->pfc_en;
        pfc->mbc = my_pfc->mbc;
        pfc->delay = my_pfc->delay;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 09b8e88b2999..8ef92d1a6aa1 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -3345,34 +3345,25 @@ static void ixgbe_configure_dcb(struct ixgbe_adapter *adapter)
        hw->mac.ops.set_vfta(&adapter->hw, 0, 0, true);
-        /* reconfigure the hardware */
-        if (adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE) {
 #ifdef IXGBE_FCOE
-                if (adapter->netdev->features & NETIF_F_FCOE_MTU)
+        if (adapter->netdev->features & NETIF_F_FCOE_MTU)
-                        max_frame = max(max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE);
+                max_frame = max(max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE);
 #endif
+        /* reconfigure the hardware */
+        if (adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE) {
                ixgbe_dcb_calculate_tc_credits(hw, &adapter->dcb_cfg, max_frame,
                                                DCB_TX_CONFIG);
                ixgbe_dcb_calculate_tc_credits(hw, &adapter->dcb_cfg, max_frame,
                                                DCB_RX_CONFIG);
                ixgbe_dcb_hw_config(hw, &adapter->dcb_cfg);
-        } else {
+        } else if (adapter->ixgbe_ieee_ets && adapter->ixgbe_ieee_pfc) {
-                struct net_device *dev = adapter->netdev;
+                ixgbe_dcb_hw_ets(&adapter->hw,
+                                 adapter->ixgbe_ieee_ets,
-                if (adapter->ixgbe_ieee_ets) {
+                                 max_frame);
-                        struct ieee_ets *ets = adapter->ixgbe_ieee_ets;
+                ixgbe_dcb_hw_pfc_config(&adapter->hw,
-                        int max_frame = dev->mtu + ETH_HLEN + ETH_FCS_LEN;
+                                        adapter->ixgbe_ieee_pfc->pfc_en,
+                                        adapter->ixgbe_ieee_ets->prio_tc);
-                        ixgbe_dcb_hw_ets(&adapter->hw, ets, max_frame);
-                }
-                if (adapter->ixgbe_ieee_pfc) {
-                        struct ieee_pfc *pfc = adapter->ixgbe_ieee_pfc;
-                        u8 *prio_tc = adapter->ixgbe_ieee_ets->prio_tc;
-                        ixgbe_dcb_hw_pfc_config(&adapter->hw, pfc->pfc_en,
-                                                prio_tc);
-                }
        }
        /* Enable RSS Hash per TC */
@@ -6125,7 +6116,6 @@ static void ixgbe_sfp_link_config_subtask(struct ixgbe_adapter *adapter)
        autoneg = hw->phy.autoneg_advertised;
        if ((!autoneg) && (hw->mac.ops.get_link_capabilities))
                hw->mac.ops.get_link_capabilities(hw, &autoneg, &negotiation);
-        hw->mac.autotry_restart = false;
        if (hw->mac.ops.setup_link)
                hw->mac.ops.setup_link(hw, autoneg, negotiation, true);
@@ -7589,13 +7579,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
                goto err_eeprom;
        }
-        /* power down the optics for multispeed fiber and 82599 SFP+ fiber */
-        if (hw->mac.ops.disable_tx_laser &&
-            ((hw->phy.multispeed_fiber) ||
-             ((hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber) &&
-              (hw->mac.type == ixgbe_mac_82599EB))))
-                hw->mac.ops.disable_tx_laser(hw);
        setup_timer(&adapter->service_timer, &ixgbe_service_timer,
                    (unsigned long) adapter);
@@ -7693,6 +7676,13 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
        if (err)
                goto err_register;
+        /* power down the optics for multispeed fiber and 82599 SFP+ fiber */
+        if (hw->mac.ops.disable_tx_laser &&
+            ((hw->phy.multispeed_fiber) ||
+             ((hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber) &&
+              (hw->mac.type == ixgbe_mac_82599EB))))
+                hw->mac.ops.disable_tx_laser(hw);
        /* carrier off reporting is important to ethtool even BEFORE open */
        netif_carrier_off(netdev);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
index 5a7e1eb33599..4a5d8897faab 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
@@ -42,10 +42,12 @@ int ixgbe_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, bool setting);
 int ixgbe_ndo_get_vf_config(struct net_device *netdev,
                            int vf, struct ifla_vf_info *ivi);
 void ixgbe_check_vf_rate_limit(struct ixgbe_adapter *adapter);
+#ifdef CONFIG_PCI_IOV
 void ixgbe_disable_sriov(struct ixgbe_adapter *adapter);
 void ixgbe_enable_sriov(struct ixgbe_adapter *adapter,
                        const struct ixgbe_info *ii);
 int ixgbe_check_vf_assignment(struct ixgbe_adapter *adapter);
+#endif
 #endif /* _IXGBE_SRIOV_H_ */
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 5e92cc2079bd..4c8e19951d57 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -54,7 +54,7 @@ char ixgbevf_driver_name[] = "ixgbevf";
 static const char ixgbevf_driver_string[] =
        "Intel(R) 10 Gigabit PCI Express Virtual Function Network Driver";
-#define DRV_VERSION "2.1.0-k"
+#define DRV_VERSION "2.2.0-k"
 const char ixgbevf_driver_version[] = DRV_VERSION;
 static char ixgbevf_copyright[] =
        "Copyright (c) 2009 - 2010 Intel Corporation.";
diff --git a/drivers/net/ethernet/mellanox/mlx4/alloc.c b/drivers/net/ethernet/mellanox/mlx4/alloc.c
index 116cae334dad..8be20e7ea3d1 100644
--- a/drivers/net/ethernet/mellanox/mlx4/alloc.c
+++ b/drivers/net/ethernet/mellanox/mlx4/alloc.c
@@ -34,6 +34,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
+#include <linux/export.h>
 #include <linux/bitmap.h>
 #include <linux/dma-mapping.h>
 #include <linux/vmalloc.h>
diff --git a/drivers/net/ethernet/mellanox/mlx4/catas.c b/drivers/net/ethernet/mellanox/mlx4/catas.c
index 32f947154c33..45aea9c3ae2c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/catas.c
+++ b/drivers/net/ethernet/mellanox/mlx4/catas.c
@@ -32,6 +32,7 @@
 */
 #include <linux/workqueue.h>
+#include <linux/module.h>
 #include "mlx4.h"
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index 23cee7b6af91..78f5a1a0b8c8 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -34,6 +34,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <linux/pci.h>
 #include <linux/errno.h>
diff --git a/drivers/net/ethernet/mellanox/mlx4/cq.c b/drivers/net/ethernet/mellanox/mlx4/cq.c
index bd8ef9f2fa71..499a5168892a 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cq.c
@@ -35,6 +35,7 @@
 */
 #include <linux/hardirq.h>
+#include <linux/export.h>
 #include <linux/gfp.h>
 #include <linux/mlx4/cmd.h>
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index 90f2cd24faac..d901b4267537 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -39,6 +39,7 @@
 #include <linux/if_vlan.h>
 #include <linux/vmalloc.h>
 #include <linux/tcp.h>
+#include <linux/moduleparam.h>
 #include "mlx4_en.h"
diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
index 869a2c220a7b..24ee96775996 100644
--- a/drivers/net/ethernet/mellanox/mlx4/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/eq.c
@@ -33,6 +33,7 @@
 #include <linux/interrupt.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <linux/mm.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
index abdfbacab4a6..435ca6e49734 100644
--- a/drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.c
@@ -33,6 +33,7 @@
 */
 #include <linux/mlx4/cmd.h>
+#include <linux/module.h>
 #include <linux/cache.h>
 #include "fw.h"
diff --git a/drivers/net/ethernet/mellanox/mlx4/intf.c b/drivers/net/ethernet/mellanox/mlx4/intf.c
index 73c94fcdfddf..ca6feb55bd94 100644
--- a/drivers/net/ethernet/mellanox/mlx4/intf.c
+++ b/drivers/net/ethernet/mellanox/mlx4/intf.c
@@ -32,6 +32,7 @@
 */
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "mlx4.h"
diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c
index cd1784593a3c..978688c31046 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mcg.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c
@@ -35,6 +35,7 @@
 #include <linux/etherdevice.h>
 #include <linux/mlx4/cmd.h>
+#include <linux/export.h>
 #include "mlx4.h"
diff --git a/drivers/net/ethernet/mellanox/mlx4/mr.c b/drivers/net/ethernet/mellanox/mlx4/mr.c
index ab639cfef78e..efa3e77355e4 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mr.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mr.c
@@ -33,6 +33,7 @@
 */
 #include <linux/errno.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/mlx4/cmd.h>
diff --git a/drivers/net/ethernet/mellanox/mlx4/pd.c b/drivers/net/ethernet/mellanox/mlx4/pd.c
index 3736163e30e9..260ed259ce9b 100644
--- a/drivers/net/ethernet/mellanox/mlx4/pd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/pd.c
@@ -32,6 +32,7 @@
 */
 #include <linux/errno.h>
+#include <linux/export.h>
 #include <linux/io-mapping.h>
 #include <asm/page.h>
diff --git a/drivers/net/ethernet/mellanox/mlx4/port.c b/drivers/net/ethernet/mellanox/mlx4/port.c
index a44f080fdfe5..d942aea4927b 100644
--- a/drivers/net/ethernet/mellanox/mlx4/port.c
+++ b/drivers/net/ethernet/mellanox/mlx4/port.c
@@ -32,6 +32,7 @@
 #include <linux/errno.h>
 #include <linux/if_ether.h>
+#include <linux/export.h>
 #include <linux/mlx4/cmd.h>
diff --git a/drivers/net/ethernet/mellanox/mlx4/qp.c b/drivers/net/ethernet/mellanox/mlx4/qp.c
index 51c53898c35f..15f870cb2590 100644
--- a/drivers/net/ethernet/mellanox/mlx4/qp.c
+++ b/drivers/net/ethernet/mellanox/mlx4/qp.c
@@ -34,6 +34,7 @@
 */
 #include <linux/gfp.h>
+#include <linux/export.h>
 #include <linux/mlx4/cmd.h>
 #include <linux/mlx4/qp.h>
diff --git a/drivers/net/ethernet/mellanox/mlx4/srq.c b/drivers/net/ethernet/mellanox/mlx4/srq.c
index a20b141dbb5c..9cbf3fce0145 100644
--- a/drivers/net/ethernet/mellanox/mlx4/srq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/srq.c
@@ -32,6 +32,7 @@
 */
 #include <linux/mlx4/cmd.h>
+#include <linux/export.h>
 #include <linux/gfp.h>
 #include "mlx4.h"
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
index 671e166b5af1..a83197d757c1 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-main.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c
@@ -55,6 +55,7 @@
 #include <linux/firmware.h>
 #include <linux/net_tstamp.h>
 #include <linux/prefetch.h>
+#include <linux/module.h>
 #include "vxge-main.h"
 #include "vxge-reg.h"
diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c
index bc1d946b7971..212f43b308a3 100644
--- a/drivers/net/ethernet/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/octeon/octeon_mgmt.c
@@ -9,6 +9,7 @@
 #include <linux/capability.h>
 #include <linux/dma-mapping.h>
 #include <linux/init.h>
+#include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index b89f3a684aec..48406ca382f1 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -20,6 +20,7 @@
 #include "pch_gbe.h"
 #include "pch_gbe_api.h"
+#include <linux/module.h>
 #define DRV_VERSION     "1.00"
 const char pch_driver_version[] = DRV_VERSION;
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
index 5b5d90a47e29..9c075ea2682e 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
@@ -18,6 +18,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 */
+#include <linux/module.h>       /* for __MODULE_STRING */
 #include "pch_gbe.h"
 #define OPTION_UNSET   -1
diff --git a/drivers/net/ethernet/realtek/Kconfig b/drivers/net/ethernet/realtek/Kconfig
index 84083ec6e612..0578859a3c73 100644
--- a/drivers/net/ethernet/realtek/Kconfig
+++ b/drivers/net/ethernet/realtek/Kconfig
@@ -115,16 +115,4 @@ config R8169
          To compile this driver as a module, choose M here: the module
          will be called r8169.  This is recommended.
-config SC92031
-        tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
-        depends on PCI && EXPERIMENTAL
-        select CRC32
-        ---help---
-          This is a driver for the Fast Ethernet PCI network cards based on
-          the Silan SC92031 chip (sometimes also called Rsltek 8139D). If you
-          have one of these, say Y here.
-          To compile this driver as a module, choose M here: the module
-          will be called sc92031.  This is recommended.
 endif # NET_VENDOR_REALTEK
diff --git a/drivers/net/ethernet/realtek/Makefile b/drivers/net/ethernet/realtek/Makefile
index e48cfb6ac42d..71b1da30ecb5 100644
--- a/drivers/net/ethernet/realtek/Makefile
+++ b/drivers/net/ethernet/realtek/Makefile
@@ -6,4 +6,3 @@ obj-$(CONFIG_8139CP) += 8139cp.o
 obj-$(CONFIG_8139TOO) += 8139too.o
 obj-$(CONFIG_ATP) += atp.o
 obj-$(CONFIG_R8169) += r8169.o
-obj-$(CONFIG_SC92031) += sc92031.o
diff --git a/drivers/net/ethernet/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c
index adbda182f159..752d521c09b1 100644
--- a/drivers/net/ethernet/sfc/rx.c
+++ b/drivers/net/ethernet/sfc/rx.c
@@ -15,6 +15,7 @@
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/prefetch.h>
+#include <linux/moduleparam.h>
 #include <net/ip.h>
 #include <net/checksum.h>
 #include "net_driver.h"
diff --git a/drivers/net/ethernet/silan/Kconfig b/drivers/net/ethernet/silan/Kconfig
new file mode 100644
index 000000000000..ae1ce170864d
--- /dev/null
+++ b/drivers/net/ethernet/silan/Kconfig
@@ -0,0 +1,33 @@
+#
+# Silan device configuration
+#
+config NET_VENDOR_SILAN
+        bool "Silan devices"
+        default y
+        depends on PCI && EXPERIMENTAL
+        ---help---
+          If you have a network (Ethernet) card belonging to this class, say Y
+          and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+          Note that the answer to this question doesn't directly affect the
+          kernel: saying N will just cause the configurator to skip all
+          the questions about Silan devices. If you say Y, you will be asked for
+          your specific card in the following questions.
+if NET_VENDOR_SILAN
+config SC92031
+        tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
+        depends on PCI && EXPERIMENTAL
+        select CRC32
+        ---help---
+          This is a driver for the Fast Ethernet PCI network cards based on
+          the Silan SC92031 chip (sometimes also called Rsltek 8139D). If you
+          have one of these, say Y here.
+          To compile this driver as a module, choose M here: the module
+          will be called sc92031.  This is recommended.
+endif # NET_VENDOR_SILAN
diff --git a/drivers/net/ethernet/silan/Makefile b/drivers/net/ethernet/silan/Makefile
new file mode 100644
index 000000000000..4ad3523dcb92
--- /dev/null
+++ b/drivers/net/ethernet/silan/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Silan network device drivers.
+#
+obj-$(CONFIG_SC92031) += sc92031.o
diff --git a/drivers/net/ethernet/realtek/sc92031.c b/drivers/net/ethernet/silan/sc92031.c
index a284d6440538..a284d6440538 100644
--- a/drivers/net/ethernet/realtek/sc92031.c
+++ b/drivers/net/ethernet/silan/sc92031.c
diff --git a/drivers/net/ethernet/smsc/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c
index 4f15680849ff..edb24b0e337b 100644
--- a/drivers/net/ethernet/smsc/smsc9420.c
+++ b/drivers/net/ethernet/smsc/smsc9420.c
@@ -28,6 +28,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/crc32.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <asm/unaligned.h>
 #include "smsc9420.h"
diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index ac6f190743dd..22745d7bf530 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -29,15 +29,6 @@ config STMMAC_DA
          By default, the DMA arbitration scheme is based on Round-robin
          (rx:tx priority is 1:1).
-config STMMAC_DUAL_MAC
-        bool "STMMAC: dual mac support (EXPERIMENTAL)"
-        default n
-        depends on EXPERIMENTAL && STMMAC_ETH && !STMMAC_TIMER
-        ---help---
-          Some ST SoCs (for example the stx7141 and stx7200c2) have two
-          Ethernet Controllers. This option turns on the second Ethernet
-          device on this kind of platforms.
 config STMMAC_TIMER
        bool "STMMAC Timer optimisation"
        default n
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.c b/drivers/net/ethernet/toshiba/ps3_gelic_net.c
index ddb33cfd3543..7bf1e2015784 100644
--- a/drivers/net/ethernet/toshiba/ps3_gelic_net.c
+++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.c
@@ -1674,6 +1674,9 @@ static int __devinit ps3_gelic_driver_probe(struct ps3_system_bus_device *dev)
        int result;
        pr_debug("%s: called\n", __func__);
+        udbg_shutdown_ps3gelic();
        result = ps3_open_hv_device(dev);
        if (result) {
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.h b/drivers/net/ethernet/toshiba/ps3_gelic_net.h
index d3fadfbc3bcc..a93df6ac1909 100644
--- a/drivers/net/ethernet/toshiba/ps3_gelic_net.h
+++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.h
@@ -359,6 +359,12 @@ static inline void *port_priv(struct gelic_port *port)
        return port->priv;
 }
+#ifdef CONFIG_PPC_EARLY_DEBUG_PS3GELIC
+extern void udbg_shutdown_ps3gelic(void);
+#else
+static inline void udbg_shutdown_ps3gelic(void) {}
+#endif
 extern int gelic_card_set_irq_mask(struct gelic_card *card, u64 mask);
 /* shared netdev ops */
 extern void gelic_card_up(struct gelic_card *card);
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 4d1658e78dee..caf3659e173c 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -716,8 +716,8 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
                cur_p = &lp->tx_bd_v[lp->tx_bd_tail];
                cur_p->phys = dma_map_single(ndev->dev.parent,
                                             skb_frag_address(frag),
-                                             frag_size(frag), DMA_TO_DEVICE);
+                                             skb_frag_size(frag), DMA_TO_DEVICE);
-                cur_p->len = frag_size(frag);
+                cur_p->len = skb_frag_size(frag);
                cur_p->app0 = 0;
                frag++;
        }
diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
index ec96d910e9a3..f45c85a84261 100644
--- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
@@ -35,6 +35,7 @@
 #include <linux/platform_device.h>
 #include <linux/ptp_classify.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <mach/ixp46x_ts.h>
 #include <mach/npe.h>
 #include <mach/qmgr.h>
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index a40fab44b9ae..d423d18b4ad6 100644
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -314,7 +314,7 @@ config TOSHIBA_FIR
 config AU1000_FIR
        tristate "Alchemy Au1000 SIR/FIR"
-        depends on SOC_AU1000 && IRDA
+        depends on IRDA && MIPS_ALCHEMY
 config SMC_IRCC_FIR
        tristate "SMSC IrCC (EXPERIMENTAL)"
diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
index a4eae750a414..f414ffb5b728 100644
--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
@@ -14,6 +14,7 @@
 *
 */
 #include <linux/phy.h>
+#include <linux/module.h>
 #define RTL821x_PHYSR           0x11
 #define RTL821x_PHYSR_DUPLEX    0x2000
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
index 3bb131137033..7145714a5ec9 100644
--- a/drivers/net/rionet.c
+++ b/drivers/net/rionet.c
@@ -88,8 +88,8 @@ static struct rio_dev **rionet_active;
 #define dev_rionet_capable(dev) \
        is_rionet_capable(dev->src_ops, dev->dst_ops)
-#define RIONET_MAC_MATCH(x)     (*(u32 *)x == 0x00010001)
+#define RIONET_MAC_MATCH(x)     (!memcmp((x), "\00\01\00\01", 4))
-#define RIONET_GET_DESTID(x)    (*(u16 *)(x + 4))
+#define RIONET_GET_DESTID(x)    ((*((u8 *)x + 4) << 8) | *((u8 *)x + 5))
 static int rionet_rx_clean(struct net_device *ndev)
 {
diff --git a/drivers/net/usb/lg-vl600.c b/drivers/net/usb/lg-vl600.c
index 1e7221951056..d43db32f9478 100644
--- a/drivers/net/usb/lg-vl600.c
+++ b/drivers/net/usb/lg-vl600.c
@@ -27,6 +27,7 @@
 #include <linux/if_ether.h>
 #include <linux/if_arp.h>
 #include <linux/inetdevice.h>
+#include <linux/module.h>
 /*
 * The device has a CDC ACM port for modem control (it claims to be
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 5b23767ea817..ef883e97cee0 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -17,6 +17,7 @@
 #include <net/dst.h>
 #include <net/xfrm.h>
 #include <linux/veth.h>
+#include <linux/module.h>
 #define DRV_NAME        "veth"
 #define DRV_VERSION     "1.0"
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 91039ab16728..6ee8410443c4 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -925,12 +925,10 @@ static void virtnet_update_status(struct virtnet_info *vi)
 {
        u16 v;
-        if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_STATUS))
+        if (virtio_config_val(vi->vdev, VIRTIO_NET_F_STATUS,
-                return;
-        vi->vdev->config->get(vi->vdev,
                              offsetof(struct virtio_net_config, status),
-                              &v, sizeof(v));
+                              &v) < 0)
+                return;
        /* Ignore unknown (future) status bits */
        v &= VIRTIO_NET_S_LINK_UP;
@@ -1006,11 +1004,9 @@ static int virtnet_probe(struct virtio_device *vdev)
        }
        /* Configuration may specify what MAC to use.  Otherwise random. */
-        if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC)) {
+        if (virtio_config_val_len(vdev, VIRTIO_NET_F_MAC,
-                vdev->config->get(vdev,
                                  offsetof(struct virtio_net_config, mac),
-                                  dev->dev_addr, dev->addr_len);
+                                  dev->dev_addr, dev->addr_len) < 0)
-        } else
                random_ether_addr(dev->dev_addr);
        /* Set up our device-specific information */
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index b771ebac0f01..d96bfb1ac20b 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -24,6 +24,7 @@
 *
 */
+#include <linux/module.h>
 #include <net/ip6_checksum.h>
 #include "vmxnet3_int.h"
diff --git a/drivers/net/wimax/i2400m/control.c b/drivers/net/wimax/i2400m/control.c
index 727d728649b7..2fea02b35b2d 100644
--- a/drivers/net/wimax/i2400m/control.c
+++ b/drivers/net/wimax/i2400m/control.c
@@ -78,6 +78,8 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/wimax/i2400m.h>
+#include <linux/export.h>
+#include <linux/moduleparam.h>
 #define D_SUBMODULE control
diff --git a/drivers/net/wimax/i2400m/debugfs.c b/drivers/net/wimax/i2400m/debugfs.c
index 9c70b5fa3f51..129ba36bd04d 100644
--- a/drivers/net/wimax/i2400m/debugfs.c
+++ b/drivers/net/wimax/i2400m/debugfs.c
@@ -26,6 +26,7 @@
 #include <linux/etherdevice.h>
 #include <linux/spinlock.h>
 #include <linux/device.h>
+#include <linux/export.h>
 #include "i2400m.h"
diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c
index 85dadd5bf4be..7cbd7d231e11 100644
--- a/drivers/net/wimax/i2400m/fw.c
+++ b/drivers/net/wimax/i2400m/fw.c
@@ -158,6 +158,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/usb.h>
+#include <linux/export.h>
 #include "i2400m.h"
diff --git a/drivers/net/wimax/i2400m/netdev.c b/drivers/net/wimax/i2400m/netdev.c
index 2edd8fe1c1f3..64a110604ad3 100644
--- a/drivers/net/wimax/i2400m/netdev.c
+++ b/drivers/net/wimax/i2400m/netdev.c
@@ -76,6 +76,7 @@
 #include <linux/slab.h>
 #include <linux/netdevice.h>
 #include <linux/ethtool.h>
+#include <linux/export.h>
 #include "i2400m.h"
diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
index 2f94a872101f..37becfcc98f2 100644
--- a/drivers/net/wimax/i2400m/rx.c
+++ b/drivers/net/wimax/i2400m/rx.c
@@ -149,6 +149,8 @@
 #include <linux/if_arp.h>
 #include <linux/netdevice.h>
 #include <linux/workqueue.h>
+#include <linux/export.h>
+#include <linux/moduleparam.h>
 #include "i2400m.h"
diff --git a/drivers/net/wimax/i2400m/sdio.c b/drivers/net/wimax/i2400m/sdio.c
index be428cae28d8..21a9edd6e75d 100644
--- a/drivers/net/wimax/i2400m/sdio.c
+++ b/drivers/net/wimax/i2400m/sdio.c
@@ -55,6 +55,7 @@
 #include <linux/mmc/sdio_func.h>
 #include "i2400m-sdio.h"
 #include <linux/wimax/i2400m.h>
+#include <linux/module.h>
 #define D_SUBMODULE main
 #include "sdio-debug-levels.h"
diff --git a/drivers/net/wimax/i2400m/tx.c b/drivers/net/wimax/i2400m/tx.c
index 4b30ed11d785..4b9ecb20deec 100644
--- a/drivers/net/wimax/i2400m/tx.c
+++ b/drivers/net/wimax/i2400m/tx.c
@@ -245,6 +245,7 @@
 */
 #include <linux/netdevice.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "i2400m.h"
diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c
index 9a644d052f1e..2c1b8b687646 100644
--- a/drivers/net/wimax/i2400m/usb.c
+++ b/drivers/net/wimax/i2400m/usb.c
@@ -67,6 +67,7 @@
 #include <linux/wimax/i2400m.h>
 #include <linux/debugfs.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #define D_SUBMODULE usb
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index 3b752d9fb3cd..f5ce5623da99 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -25,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/crc32.h>
 #include <linux/eeprom_93cx6.h>
+#include <linux/module.h>
 #include <net/mac80211.h>
 #include "adm8211.h"
diff --git a/drivers/net/wireless/ath/Kconfig b/drivers/net/wireless/ath/Kconfig
index 073548836413..09602241901b 100644
--- a/drivers/net/wireless/ath/Kconfig
+++ b/drivers/net/wireless/ath/Kconfig
@@ -1,6 +1,6 @@
 menuconfig ATH_COMMON
        tristate "Atheros Wireless Cards"
-        depends on CFG80211
+        depends on CFG80211 && (!UML || BROKEN)
        ---help---
          This will enable the support for the Atheros wireless drivers.
          ath5k, ath9k, ath9k_htc and ar9170 drivers share some common code, this option
diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index fce8c904eea9..8c5ce8b0c734 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -57,8 +57,9 @@
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGES.
 */
+#include <linux/export.h>
+#include <linux/moduleparam.h>
-#include <linux/module.h>
 #include <linux/seq_file.h>
 #include <linux/list.h>
 #include "debug.h"
diff --git a/drivers/net/wireless/ath/ath5k/pci.c b/drivers/net/wireless/ath/ath5k/pci.c
index c1dff2ced044..dfa48eb7d953 100644
--- a/drivers/net/wireless/ath/ath5k/pci.c
+++ b/drivers/net/wireless/ath/ath5k/pci.c
@@ -18,6 +18,7 @@
 #include <linux/pci.h>
 #include <linux/pci-aspm.h>
 #include <linux/etherdevice.h>
+#include <linux/module.h>
 #include "../ath.h"
 #include "ath5k.h"
 #include "debug.h"
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 3aff36bad5d3..f517eb8f7b44 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -14,6 +14,8 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
+#include <linux/moduleparam.h>
 #include "core.h"
 #include "cfg80211.h"
 #include "debug.h"
diff --git a/drivers/net/wireless/ath/ath6kl/debug.c b/drivers/net/wireless/ath/ath6kl/debug.c
index ba3f23d71150..7879b5314285 100644
--- a/drivers/net/wireless/ath/ath6kl/debug.c
+++ b/drivers/net/wireless/ath/ath6kl/debug.c
@@ -19,6 +19,7 @@
 #include <linux/circ_buf.h>
 #include <linux/fs.h>
 #include <linux/vmalloc.h>
+#include <linux/export.h>
 #include "debug.h"
 #include "target.h"
diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c
index f1dc311ee0c7..066d4f88807f 100644
--- a/drivers/net/wireless/ath/ath6kl/sdio.c
+++ b/drivers/net/wireless/ath/ath6kl/sdio.c
@@ -14,6 +14,7 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
+#include <linux/module.h>
 #include <linux/mmc/card.h>
 #include <linux/mmc/mmc.h>
 #include <linux/mmc/host.h>
diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c
index 85a54cd2b083..5e47ca6d16a8 100644
--- a/drivers/net/wireless/ath/ath9k/ahb.c
+++ b/drivers/net/wireless/ath/ath9k/ahb.c
@@ -19,6 +19,7 @@
 #include <linux/nl80211.h>
 #include <linux/platform_device.h>
 #include <linux/ath9k_platform.h>
+#include <linux/module.h>
 #include "ath9k.h"
 static const struct platform_device_id ath9k_platform_id_table[] = {
diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c
index 2776c3c1f506..a639b94f7643 100644
--- a/drivers/net/wireless/ath/ath9k/ani.c
+++ b/drivers/net/wireless/ath/ath9k/ani.c
@@ -15,6 +15,7 @@
 */
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include "hw.h"
 #include "hw-ops.h"
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_hw.c b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
index 626d547d2f06..11f192a1ceb7 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
@@ -14,6 +14,7 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
+#include <linux/moduleparam.h>
 #include "hw.h"
 #include "ar5008_initvals.h"
 #include "ar9001_initvals.h"
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
index f7d8e516a2a9..b5920168606d 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
@@ -15,6 +15,7 @@
 */
 #include "hw.h"
+#include <linux/export.h>
 #define AR_BufLen           0x00000fff
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
index b363cc06cfd9..ccde784a842f 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
@@ -13,6 +13,7 @@
 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
+#include <linux/export.h>
 #include "hw.h"
 #include "ar9003_mac.h"
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
index 0c462c904cbe..a4450cba0653 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
@@ -14,6 +14,7 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
+#include <linux/export.h>
 #include "hw.h"
 #include "ar9003_phy.h"
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index fe96997921d3..2330e7ede199 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -14,6 +14,7 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
+#include <linux/export.h>
 #include "hw.h"
 #include "ar9003_phy.h"
diff --git a/drivers/net/wireless/ath/ath9k/btcoex.c b/drivers/net/wireless/ath/ath9k/btcoex.c
index 6635c377dc00..012263968d64 100644
--- a/drivers/net/wireless/ath/ath9k/btcoex.c
+++ b/drivers/net/wireless/ath/ath9k/btcoex.c
@@ -14,6 +14,7 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
+#include <linux/export.h>
 #include "hw.h"
 enum ath_bt_mode {
diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c
index ebaf304f464b..99538810a312 100644
--- a/drivers/net/wireless/ath/ath9k/calib.c
+++ b/drivers/net/wireless/ath/ath9k/calib.c
@@ -16,6 +16,7 @@
 #include "hw.h"
 #include "hw-ops.h"
+#include <linux/export.h>
 /* Common calibration code */
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index 327aa28f6030..2741203e803f 100644
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -16,6 +16,7 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <linux/export.h>
 #include <asm/unaligned.h>
 #include "ath9k.h"
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index f16d2033081f..4952ad8c4e8c 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -16,6 +16,7 @@
 #include <linux/io.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <asm/unaligned.h>
 #include "hw.h"
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index af1b32549531..d4c909f8e474 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -17,6 +17,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/ath9k_platform.h>
+#include <linux/module.h>
 #include "ath9k.h"
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c
index 6a8fdf33a527..ecdb6fd29079 100644
--- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
@@ -16,6 +16,7 @@
 #include "hw.h"
 #include "hw-ops.h"
+#include <linux/export.h>
 static void ath9k_hw_set_txq_interrupts(struct ath_hw *ah,
                                        struct ath9k_tx_queue_info *qi)
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index edb0b4b3da3a..2dcdf63cb390 100644
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -18,6 +18,7 @@
 #include <linux/pci.h>
 #include <linux/pci-aspm.h>
 #include <linux/ath9k_platform.h>
+#include <linux/module.h>
 #include "ath9k.h"
 static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index 8448281dd069..888abc2be3a5 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -16,6 +16,7 @@
 */
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "ath9k.h"
diff --git a/drivers/net/wireless/ath/carl9170/fw.c b/drivers/net/wireless/ath/carl9170/fw.c
index f4cae1cccbff..cba9d0435dc4 100644
--- a/drivers/net/wireless/ath/carl9170/fw.c
+++ b/drivers/net/wireless/ath/carl9170/fw.c
@@ -23,6 +23,7 @@
 #include <linux/kernel.h>
 #include <linux/firmware.h>
 #include <linux/crc32.h>
+#include <linux/module.h>
 #include "carl9170.h"
 #include "fwcmd.h"
 #include "version.h"
diff --git a/drivers/net/wireless/ath/debug.c b/drivers/net/wireless/ath/debug.c
index 5367b1086e09..508eccf5d982 100644
--- a/drivers/net/wireless/ath/debug.c
+++ b/drivers/net/wireless/ath/debug.c
@@ -14,6 +14,7 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
+#include <linux/export.h>
 #include "ath.h"
 const char *ath_opmode_to_string(enum nl80211_iftype opmode)
diff --git a/drivers/net/wireless/ath/hw.c b/drivers/net/wireless/ath/hw.c
index 3f508e59f146..19befb331073 100644
--- a/drivers/net/wireless/ath/hw.c
+++ b/drivers/net/wireless/ath/hw.c
@@ -14,6 +14,7 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
+#include <linux/export.h>
 #include <asm/unaligned.h>
 #include "ath.h"
diff --git a/drivers/net/wireless/ath/key.c b/drivers/net/wireless/ath/key.c
index 17b0efd86f9a..4cf7c5eb4813 100644
--- a/drivers/net/wireless/ath/key.c
+++ b/drivers/net/wireless/ath/key.c
@@ -15,6 +15,7 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
+#include <linux/export.h>
 #include <asm/unaligned.h>
 #include <net/mac80211.h>
diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c
index 028310f263c8..85fa9cc73502 100644
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
@@ -15,6 +15,7 @@
 */
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <net/cfg80211.h>
 #include <net/mac80211.h>
 #include "regd.h"
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 7cf4125a1624..5634d9a9965b 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -34,7 +34,7 @@
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/if_arp.h>
 #include <linux/etherdevice.h>
 #include <linux/firmware.h>
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c
index 12b6b4067a39..714cad649c45 100644
--- a/drivers/net/wireless/b43/pcmcia.c
+++ b/drivers/net/wireless/b43/pcmcia.c
@@ -25,6 +25,7 @@
 #include <linux/ssb/ssb.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ciscode.h>
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index a3b72cd72c66..20f02437af8c 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -31,7 +31,7 @@
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/if_arp.h>
 #include <linux/etherdevice.h>
 #include <linux/firmware.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index bff9dcd6fadc..89ff94da556a 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -17,6 +17,7 @@
 #include <linux/types.h>
 #include <linux/netdevice.h>
+#include <linux/export.h>
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
 #include <linux/sched.h>
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index ac8d02bd34f2..0d8a9cdf897a 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -21,6 +21,7 @@
 #include <linux/sched.h>
 #include <linux/firmware.h>
 #include <linux/interrupt.h>
+#include <linux/module.h>
 #include <net/mac80211.h>
 #include <defs.h>
 #include "nicpci.h"
diff --git a/drivers/net/wireless/hostap/hostap_80211_rx.c b/drivers/net/wireless/hostap/hostap_80211_rx.c
index e0b3e8d406b3..df7050abe717 100644
--- a/drivers/net/wireless/hostap/hostap_80211_rx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_rx.c
@@ -1,5 +1,6 @@
 #include <linux/etherdevice.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <net/lib80211.h>
 #include <linux/if_arp.h>
diff --git a/drivers/net/wireless/hostap/hostap_80211_tx.c b/drivers/net/wireless/hostap/hostap_80211_tx.c
index c34a3b7f1292..344a981a052e 100644
--- a/drivers/net/wireless/hostap/hostap_80211_tx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_tx.c
@@ -1,4 +1,5 @@
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "hostap_80211.h"
 #include "hostap_common.h"
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index 3d05dc15c6b8..e1f410277242 100644
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -21,6 +21,8 @@
 #include <linux/random.h>
 #include <linux/if_arp.h>
 #include <linux/slab.h>
+#include <linux/export.h>
+#include <linux/moduleparam.h>
 #include "hostap_wlan.h"
 #include "hostap.h"
diff --git a/drivers/net/wireless/hostap/hostap_info.c b/drivers/net/wireless/hostap/hostap_info.c
index d737091cf6ac..47932b28aac1 100644
--- a/drivers/net/wireless/hostap/hostap_info.c
+++ b/drivers/net/wireless/hostap/hostap_info.c
@@ -3,6 +3,7 @@
 #include <linux/if_arp.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "hostap_wlan.h"
 #include "hostap.h"
 #include "hostap_ap.h"
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index 12de46407c71..045a93645a3d 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -5,6 +5,7 @@
 #include <linux/sched.h>
 #include <linux/ethtool.h>
 #include <linux/if_arp.h>
+#include <linux/module.h>
 #include <net/lib80211.h>
 #include "hostap_wlan.h"
diff --git a/drivers/net/wireless/hostap/hostap_proc.c b/drivers/net/wireless/hostap/hostap_proc.c
index 005ff25a405f..75ef8f04aabe 100644
--- a/drivers/net/wireless/hostap/hostap_proc.c
+++ b/drivers/net/wireless/hostap/hostap_proc.c
@@ -2,6 +2,7 @@
 #include <linux/types.h>
 #include <linux/proc_fs.h>
+#include <linux/export.h>
 #include <net/lib80211.h>
 #include "hostap_wlan.h"
diff --git a/drivers/net/wireless/iwlegacy/iwl-debugfs.c b/drivers/net/wireless/iwlegacy/iwl-debugfs.c
index 996996a71657..1407dca70def 100644
--- a/drivers/net/wireless/iwlegacy/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlegacy/iwl-debugfs.c
@@ -26,6 +26,7 @@
 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
 *****************************************************************************/
 #include <linux/ieee80211.h>
+#include <linux/export.h>
 #include <net/mac80211.h>
diff --git a/drivers/net/wireless/iwlegacy/iwl-rx.c b/drivers/net/wireless/iwlegacy/iwl-rx.c
index 9b5d0abe8be9..f4d21ec22497 100644
--- a/drivers/net/wireless/iwlegacy/iwl-rx.c
+++ b/drivers/net/wireless/iwlegacy/iwl-rx.c
@@ -29,6 +29,7 @@
 #include <linux/etherdevice.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <net/mac80211.h>
 #include <asm/unaligned.h>
 #include "iwl-eeprom.h"
diff --git a/drivers/net/wireless/iwlegacy/iwl-scan.c b/drivers/net/wireless/iwlegacy/iwl-scan.c
index a6b5222fc59e..521b73b527d3 100644
--- a/drivers/net/wireless/iwlegacy/iwl-scan.c
+++ b/drivers/net/wireless/iwlegacy/iwl-scan.c
@@ -28,6 +28,7 @@
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/etherdevice.h>
+#include <linux/export.h>
 #include <net/mac80211.h>
 #include "iwl-eeprom.h"
diff --git a/drivers/net/wireless/iwlegacy/iwl-sta.c b/drivers/net/wireless/iwlegacy/iwl-sta.c
index 66f0fb2bbe00..f10df3e2813a 100644
--- a/drivers/net/wireless/iwlegacy/iwl-sta.c
+++ b/drivers/net/wireless/iwlegacy/iwl-sta.c
@@ -31,6 +31,7 @@
 #include <linux/etherdevice.h>
 #include <linux/sched.h>
 #include <linux/lockdep.h>
+#include <linux/export.h>
 #include "iwl-dev.h"
 #include "iwl-core.h"
diff --git a/drivers/net/wireless/iwlegacy/iwl-tx.c b/drivers/net/wireless/iwlegacy/iwl-tx.c
index ef9e268bf8a0..c0dfb1a4e968 100644
--- a/drivers/net/wireless/iwlegacy/iwl-tx.c
+++ b/drivers/net/wireless/iwlegacy/iwl-tx.c
@@ -30,6 +30,7 @@
 #include <linux/etherdevice.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <net/mac80211.h>
 #include "iwl-eeprom.h"
 #include "iwl-dev.h"
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c
index 3b6cc66365e5..f0c623ade3ff 100644
--- a/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
@@ -60,6 +60,7 @@
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 *****************************************************************************/
+#include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/pci-aspm.h>
diff --git a/drivers/net/wireless/iwmc3200wifi/commands.c b/drivers/net/wireless/iwmc3200wifi/commands.c
index 50dee6a0a5ca..bd75078c454b 100644
--- a/drivers/net/wireless/iwmc3200wifi/commands.c
+++ b/drivers/net/wireless/iwmc3200wifi/commands.c
@@ -42,6 +42,7 @@
 #include <linux/ieee80211.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/moduleparam.h>
 #include "iwm.h"
 #include "bus.h"
diff --git a/drivers/net/wireless/iwmc3200wifi/debugfs.c b/drivers/net/wireless/iwmc3200wifi/debugfs.c
index 0a0cc9667cd6..87eef5773a02 100644
--- a/drivers/net/wireless/iwmc3200wifi/debugfs.c
+++ b/drivers/net/wireless/iwmc3200wifi/debugfs.c
@@ -25,6 +25,7 @@
 #include <linux/kernel.h>
 #include <linux/bitops.h>
 #include <linux/debugfs.h>
+#include <linux/export.h>
 #include "iwm.h"
 #include "bus.h"
diff --git a/drivers/net/wireless/iwmc3200wifi/main.c b/drivers/net/wireless/iwmc3200wifi/main.c
index 362002735b12..98a179f98ea1 100644
--- a/drivers/net/wireless/iwmc3200wifi/main.c
+++ b/drivers/net/wireless/iwmc3200wifi/main.c
@@ -42,6 +42,7 @@
 #include <linux/ieee80211.h>
 #include <linux/wireless.h>
 #include <linux/slab.h>
+#include <linux/moduleparam.h>
 #include "iwm.h"
 #include "debug.h"
diff --git a/drivers/net/wireless/iwmc3200wifi/sdio.c b/drivers/net/wireless/iwmc3200wifi/sdio.c
index 56383e7be835..764b40dd24ad 100644
--- a/drivers/net/wireless/iwmc3200wifi/sdio.c
+++ b/drivers/net/wireless/iwmc3200wifi/sdio.c
@@ -63,6 +63,7 @@
 */
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/netdevice.h>
 #include <linux/debugfs.h>
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index e08ab1de3d9d..d798bcc0d83a 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -8,6 +8,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/if_arp.h>
+#include <linux/export.h>
 #include "decl.h"
 #include "cfg.h"
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index 1af182778844..d8d8f0d0899f 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -5,6 +5,7 @@
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "decl.h"
 #include "cmd.h"
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c
index c962e21762dc..9804ebc892d4 100644
--- a/drivers/net/wireless/libertas/if_sdio.c
+++ b/drivers/net/wireless/libertas/if_sdio.c
@@ -29,7 +29,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/kernel.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/firmware.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c
index 622ae6de0d8b..11b69b300dc0 100644
--- a/drivers/net/wireless/libertas/if_spi.c
+++ b/drivers/net/wireless/libertas/if_spi.c
@@ -21,7 +21,7 @@
 #include <linux/hardirq.h>
 #include <linux/interrupt.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/firmware.h>
 #include <linux/jiffies.h>
 #include <linux/list.h>
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index 8147f1e2a0b0..db879c364ebf 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -5,7 +5,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/delay.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/firmware.h>
 #include <linux/netdevice.h>
 #include <linux/slab.h>
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index b03779bcd547..4ae99a40dbf7 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -6,7 +6,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
 #include <linux/hardirq.h>
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 62e10eeadd7e..c7366b07b568 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -8,6 +8,7 @@
 #include <linux/hardirq.h>
 #include <linux/slab.h>
 #include <linux/types.h>
+#include <linux/export.h>
 #include <net/cfg80211.h>
 #include "defs.h"
diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c
index 8f127520d786..c025f9c18282 100644
--- a/drivers/net/wireless/libertas/tx.c
+++ b/drivers/net/wireless/libertas/tx.c
@@ -5,6 +5,7 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/sched.h>
+#include <linux/export.h>
 #include <net/cfg80211.h>
 #include "host.h"
diff --git a/drivers/net/wireless/libertas_tf/cmd.c b/drivers/net/wireless/libertas_tf/cmd.c
index 13557fe0bf95..909ac3685010 100644
--- a/drivers/net/wireless/libertas_tf/cmd.c
+++ b/drivers/net/wireless/libertas_tf/cmd.c
@@ -11,6 +11,7 @@
 #include <linux/hardirq.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "libertas_tf.h"
diff --git a/drivers/net/wireless/libertas_tf/if_usb.c b/drivers/net/wireless/libertas_tf/if_usb.c
index ba7d96584cb6..68202e63873a 100644
--- a/drivers/net/wireless/libertas_tf/if_usb.c
+++ b/drivers/net/wireless/libertas_tf/if_usb.c
@@ -15,7 +15,7 @@
 #include "if_usb.h"
 #include <linux/delay.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/firmware.h>
 #include <linux/netdevice.h>
 #include <linux/slab.h>
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c
index acc461aa385e..ceb51b6e6702 100644
--- a/drivers/net/wireless/libertas_tf/main.c
+++ b/drivers/net/wireless/libertas_tf/main.c
@@ -13,6 +13,7 @@
 #include <linux/slab.h>
 #include <linux/etherdevice.h>
+#include <linux/module.h>
 #include "libertas_tf.h"
 #define DRIVER_RELEASE_VERSION "004.p0"
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 68455a2307cb..523ad55a2885 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -26,6 +26,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/etherdevice.h>
 #include <linux/debugfs.h>
+#include <linux/module.h>
 #include <net/genetlink.h>
 #include "mac80211_hwsim.h"
diff --git a/drivers/net/wireless/orinoco/fw.c b/drivers/net/wireless/orinoco/fw.c
index 527cf5333db5..4df8cf64b56c 100644
--- a/drivers/net/wireless/orinoco/fw.c
+++ b/drivers/net/wireless/orinoco/fw.c
@@ -6,6 +6,7 @@
 #include <linux/slab.h>
 #include <linux/firmware.h>
 #include <linux/device.h>
+#include <linux/module.h>
 #include "hermes.h"
 #include "hermes_dld.h"
diff --git a/drivers/net/wireless/p54/eeprom.c b/drivers/net/wireless/p54/eeprom.c
index 8b6f363b3f7d..fa8ce5104781 100644
--- a/drivers/net/wireless/p54/eeprom.c
+++ b/drivers/net/wireless/p54/eeprom.c
@@ -24,6 +24,7 @@
 #include <net/mac80211.h>
 #include <linux/crc-ccitt.h>
+#include <linux/export.h>
 #include "p54.h"
 #include "eeprom.h"
diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/p54/fwio.c
index 53a3408931be..18e82b31afa6 100644
--- a/drivers/net/wireless/p54/fwio.c
+++ b/drivers/net/wireless/p54/fwio.c
@@ -20,6 +20,7 @@
 #include <linux/slab.h>
 #include <linux/firmware.h>
 #include <linux/etherdevice.h>
+#include <linux/export.h>
 #include <net/mac80211.h>
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index ad9ae04d07aa..db4d9a02f264 100644
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -20,6 +20,7 @@
 #include <linux/slab.h>
 #include <linux/firmware.h>
 #include <linux/etherdevice.h>
+#include <linux/module.h>
 #include <net/mac80211.h>
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index 1b753173680f..b1f51a215792 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -20,6 +20,7 @@
 #include <linux/etherdevice.h>
 #include <linux/delay.h>
 #include <linux/completion.h>
+#include <linux/module.h>
 #include <net/mac80211.h>
 #include "p54.h"
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index a8f3bc740dfa..9b6096866427 100644
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
@@ -20,6 +20,7 @@
 #include <linux/etherdevice.h>
 #include <linux/delay.h>
 #include <linux/crc32.h>
+#include <linux/module.h>
 #include <net/mac80211.h>
 #include "p54.h"
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c
index f485784a60ae..6ed9c323e3cb 100644
--- a/drivers/net/wireless/p54/txrx.c
+++ b/drivers/net/wireless/p54/txrx.c
@@ -16,6 +16,7 @@
 * published by the Free Software Foundation.
 */
+#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/firmware.h>
 #include <linux/etherdevice.h>
diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c
index 0082015ff664..2f14a5fb0cbb 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
 #include <linux/eeprom_93cx6.h>
+#include <linux/module.h>
 #include <net/mac80211.h>
 #include "rtl8180.h"
diff --git a/drivers/net/wireless/rtl818x/rtl8187/dev.c b/drivers/net/wireless/rtl818x/rtl8187/dev.c
index 24873b55b55c..4a78f9e39dfa 100644
--- a/drivers/net/wireless/rtl818x/rtl8187/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
 #include <linux/eeprom_93cx6.h>
+#include <linux/module.h>
 #include <net/mac80211.h>
 #include "rtl8187.h"
diff --git a/drivers/net/wireless/rtlwifi/Kconfig b/drivers/net/wireless/rtlwifi/Kconfig
index 45e14760c16e..d6c42e69bdbd 100644
--- a/drivers/net/wireless/rtlwifi/Kconfig
+++ b/drivers/net/wireless/rtlwifi/Kconfig
@@ -12,7 +12,7 @@ config RTL8192CE
 config RTL8192SE
        tristate "Realtek RTL8192SE/RTL8191SE PCIe Wireless Network Adapter"
-        depends on MAC80211 && EXPERIMENTAL
+        depends on MAC80211 && EXPERIMENTAL && PCI
        select FW_LOADER
        select RTLWIFI
        ---help---
@@ -23,7 +23,7 @@ config RTL8192SE
 config RTL8192DE
        tristate "Realtek RTL8192DE/RTL8188DE PCIe Wireless Network Adapter"
-        depends on MAC80211 && EXPERIMENTAL
+        depends on MAC80211 && EXPERIMENTAL && PCI
        select FW_LOADER
        select RTLWIFI
        ---help---
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index d4fdd2a5a739..b4ce93436d2e 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -30,6 +30,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/ip.h>
+#include <linux/module.h>
 #include "wifi.h"
 #include "rc.h"
 #include "base.h"
diff --git a/drivers/net/wireless/rtlwifi/cam.c b/drivers/net/wireless/rtlwifi/cam.c
index 7babb6acd957..dc36d7461caa 100644
--- a/drivers/net/wireless/rtlwifi/cam.c
+++ b/drivers/net/wireless/rtlwifi/cam.c
@@ -29,6 +29,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#include <linux/export.h>
 #include "wifi.h"
 #include "cam.h"
diff --git a/drivers/net/wireless/rtlwifi/efuse.c b/drivers/net/wireless/rtlwifi/efuse.c
index 3fc21f60bb04..ed1058b71587 100644
--- a/drivers/net/wireless/rtlwifi/efuse.c
+++ b/drivers/net/wireless/rtlwifi/efuse.c
@@ -27,6 +27,7 @@
 *
 *****************************************************************************/
+#include <linux/export.h>
 #include "wifi.h"
 #include "efuse.h"
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 177a8e669241..eb61061821e4 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -27,6 +27,7 @@
 *
 *****************************************************************************/
+#include <linux/export.h>
 #include "core.h"
 #include "wifi.h"
 #include "pci.h"
diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c
index a693feffbe72..db5262844543 100644
--- a/drivers/net/wireless/rtlwifi/ps.c
+++ b/drivers/net/wireless/rtlwifi/ps.c
@@ -27,6 +27,7 @@
 *
 *****************************************************************************/
+#include <linux/export.h>
 #include "wifi.h"
 #include "base.h"
 #include "ps.h"
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
index a00774e7090d..72a98cab6f69 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
@@ -27,6 +27,7 @@
 *
 *****************************************************************************/
+#include <linux/export.h>
 #include "dm_common.h"
 #include "phy_common.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
index 49a064bdbce6..950c65a15b8a 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
@@ -30,6 +30,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/firmware.h>
+#include <linux/export.h>
 #include "../wifi.h"
 #include "../pci.h"
 #include "../base.h"
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/main.c b/drivers/net/wireless/rtlwifi/rtl8192c/main.c
index 2f624fc27499..605ff191aeb7 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/main.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/main.c
@@ -27,6 +27,7 @@
 *
 *****************************************************************************/
+#include <linux/module.h>
 #include "../wifi.h"
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
index 3b11642d3f7d..1f07558debf2 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
@@ -27,6 +27,7 @@
 *
 *****************************************************************************/
+#include <linux/export.h>
 #include "../wifi.h"
 #include "../rtl8192ce/reg.h"
 #include "../rtl8192ce/def.h"
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
index a48404cc2b96..f2aa33dc4d78 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
@@ -28,6 +28,7 @@
 *****************************************************************************/
 #include <linux/vmalloc.h>
+#include <linux/module.h>
 #include "../wifi.h"
 #include "../core.h"
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
index feed1ed8d9b6..c244f2f1b83f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
@@ -42,6 +42,7 @@
 #include "led.h"
 #include "hw.h"
 #include <linux/vmalloc.h>
+#include <linux/module.h>
 MODULE_AUTHOR("Georgia          <georgia@realtek.com>");
 MODULE_AUTHOR("Ziv Huang        <ziv_huang@realtek.com>");
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
index 691f80092185..149493f4c25c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
@@ -30,6 +30,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/vmalloc.h>
+#include <linux/module.h>
 #include "../wifi.h"
 #include "../core.h"
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
index 3ec9a0d41baf..92f49d522c56 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
@@ -30,6 +30,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/vmalloc.h>
+#include <linux/module.h>
 #include "../wifi.h"
 #include "../core.h"
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c
index b42c2e2b2055..54cb8a60514d 100644
--- a/drivers/net/wireless/rtlwifi/usb.c
+++ b/drivers/net/wireless/rtlwifi/usb.c
@@ -28,6 +28,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/usb.h>
+#include <linux/export.h>
 #include "core.h"
 #include "wifi.h"
 #include "usb.h"
diff --git a/drivers/net/wireless/wl12xx/boot.c b/drivers/net/wireless/wl12xx/boot.c
index d4e628db76b0..681337914976 100644
--- a/drivers/net/wireless/wl12xx/boot.c
+++ b/drivers/net/wireless/wl12xx/boot.c
@@ -23,6 +23,7 @@
 #include <linux/slab.h>
 #include <linux/wl12xx.h>
+#include <linux/export.h>
 #include "acx.h"
 #include "reg.h"
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index cf0d69dd7be5..785bdbe38f2a 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -28,6 +28,7 @@
 #include <linux/skbuff.h>
 #include <linux/usb.h>
 #include <linux/workqueue.h>
+#include <linux/module.h>
 #include <net/mac80211.h>
 #include <asm/unaligned.h>
diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
index 161f207786a4..94b79c3338c4 100644
--- a/drivers/net/xen-netback/common.h
+++ b/drivers/net/xen-netback/common.h
@@ -58,10 +58,6 @@ struct xenvif {
        u8               fe_dev_addr[6];
        /* Physical parameters of the comms window. */
-        grant_handle_t   tx_shmem_handle;
-        grant_ref_t      tx_shmem_ref;
-        grant_handle_t   rx_shmem_handle;
-        grant_ref_t      rx_shmem_ref;
        unsigned int     irq;
        /* List of frontends to notify after a batch of frames sent. */
@@ -70,8 +66,6 @@ struct xenvif {
        /* The shared rings and indexes. */
        struct xen_netif_tx_back_ring tx;
        struct xen_netif_rx_back_ring rx;
-        struct vm_struct *tx_comms_area;
-        struct vm_struct *rx_comms_area;
        /* Frontend feature information. */
        u8 can_sg:1;
@@ -106,6 +100,11 @@ struct xenvif {
        wait_queue_head_t waiting_to_free;
 };
+static inline struct xenbus_device *xenvif_to_xenbus_device(struct xenvif *vif)
+{
+        return to_xenbus_device(vif->dev->dev.parent);
+}
 #define XEN_NETIF_TX_RING_SIZE __CONST_RING_SIZE(xen_netif_tx, PAGE_SIZE)
 #define XEN_NETIF_RX_RING_SIZE __CONST_RING_SIZE(xen_netif_rx, PAGE_SIZE)
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index d5508957200e..0cb594c86090 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -1589,88 +1589,42 @@ static int xen_netbk_kthread(void *data)
 void xen_netbk_unmap_frontend_rings(struct xenvif *vif)
 {
-        struct gnttab_unmap_grant_ref op;
+        if (vif->tx.sring)
+                xenbus_unmap_ring_vfree(xenvif_to_xenbus_device(vif),
-        if (vif->tx.sring) {
+                                        vif->tx.sring);
-                gnttab_set_unmap_op(&op, (unsigned long)vif->tx_comms_area->addr,
+        if (vif->rx.sring)
-                                    GNTMAP_host_map, vif->tx_shmem_handle);
+                xenbus_unmap_ring_vfree(xenvif_to_xenbus_device(vif),
+                                        vif->rx.sring);
-                if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1))
-                        BUG();
-        }
-        if (vif->rx.sring) {
-                gnttab_set_unmap_op(&op, (unsigned long)vif->rx_comms_area->addr,
-                                    GNTMAP_host_map, vif->rx_shmem_handle);
-                if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1))
-                        BUG();
-        }
-        if (vif->rx_comms_area)
-                free_vm_area(vif->rx_comms_area);
-        if (vif->tx_comms_area)
-                free_vm_area(vif->tx_comms_area);
 }
 int xen_netbk_map_frontend_rings(struct xenvif *vif,
                                 grant_ref_t tx_ring_ref,
                                 grant_ref_t rx_ring_ref)
 {
-        struct gnttab_map_grant_ref op;
+        void *addr;
        struct xen_netif_tx_sring *txs;
        struct xen_netif_rx_sring *rxs;
        int err = -ENOMEM;
-        vif->tx_comms_area = alloc_vm_area(PAGE_SIZE);
+        err = xenbus_map_ring_valloc(xenvif_to_xenbus_device(vif),
-        if (vif->tx_comms_area == NULL)
+                                     tx_ring_ref, &addr);
+        if (err)
                goto err;
-        vif->rx_comms_area = alloc_vm_area(PAGE_SIZE);
+        txs = (struct xen_netif_tx_sring *)addr;
-        if (vif->rx_comms_area == NULL)
-                goto err;
-        gnttab_set_map_op(&op, (unsigned long)vif->tx_comms_area->addr,
-                          GNTMAP_host_map, tx_ring_ref, vif->domid);
-        if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
-                BUG();
-        if (op.status) {
-                netdev_warn(vif->dev,
-                            "failed to map tx ring. err=%d status=%d\n",
-                            err, op.status);
-                err = op.status;
-                goto err;
-        }
-        vif->tx_shmem_ref    = tx_ring_ref;
-        vif->tx_shmem_handle = op.handle;
-        txs = (struct xen_netif_tx_sring *)vif->tx_comms_area->addr;
        BACK_RING_INIT(&vif->tx, txs, PAGE_SIZE);
-        gnttab_set_map_op(&op, (unsigned long)vif->rx_comms_area->addr,
+        err = xenbus_map_ring_valloc(xenvif_to_xenbus_device(vif),
-                          GNTMAP_host_map, rx_ring_ref, vif->domid);
+                                     rx_ring_ref, &addr);
+        if (err)
-        if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
-                BUG();
-        if (op.status) {
-                netdev_warn(vif->dev,
-                            "failed to map rx ring. err=%d status=%d\n",
-                            err, op.status);
-                err = op.status;
                goto err;
-        }
-        vif->rx_shmem_ref     = rx_ring_ref;
-        vif->rx_shmem_handle  = op.handle;
-        vif->rx_req_cons_peek = 0;
-        rxs = (struct xen_netif_rx_sring *)vif->rx_comms_area->addr;
+        rxs = (struct xen_netif_rx_sring *)addr;
        BACK_RING_INIT(&vif->rx, rxs, PAGE_SIZE);
+        vif->rx_req_cons_peek = 0;
        return 0;
 err:
diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
index 5b0f1ff80361..06c3642e5bdb 100644
--- a/drivers/nfc/nfcwilink.c
+++ b/drivers/nfc/nfcwilink.c
@@ -27,6 +27,7 @@
 *
 */
 #include <linux/platform_device.h>
+#include <linux/module.h>
 #include <linux/nfc.h>
 #include <net/nfc/nci.h>
 #include <net/nfc/nci_core.h>
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index aeec35bc3789..fd85fa298e0f 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -681,9 +681,14 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
        if (p != NULL && l > 0)
                strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
+        /*
+         * CONFIG_CMDLINE is meant to be a default in case nothing else
+         * managed to set the command line, unless CONFIG_CMDLINE_FORCE
+         * is set in which case we override whatever was found earlier.
+         */
 #ifdef CONFIG_CMDLINE
 #ifndef CONFIG_CMDLINE_FORCE
-        if (p == NULL || l == 0 || (l == 1 && (*p) == 0))
+        if (!((char *)data)[0])
 #endif
                strlcpy(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
 #endif /* CONFIG_CMDLINE */
diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c
index bb184717588f..ffab033d207e 100644
--- a/drivers/of/of_net.c
+++ b/drivers/of/of_net.c
@@ -9,6 +9,7 @@
 #include <linux/kernel.h>
 #include <linux/of_net.h>
 #include <linux/phy.h>
+#include <linux/export.h>
 /**
 * It maps 'enum phy_interface_t' found in include/linux/phy.h
diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c
index 3701b62c1d5e..13e37e2d8ec1 100644
--- a/drivers/of/of_pci.c
+++ b/drivers/of/of_pci.c
@@ -1,4 +1,5 @@
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/of.h>
 #include <linux/of_pci.h>
 #include <asm/prom.h>
diff --git a/drivers/of/of_pci_irq.c b/drivers/of/of_pci_irq.c
index ac1ec54e4fd5..93125163dea2 100644
--- a/drivers/of/of_pci_irq.c
+++ b/drivers/of/of_pci_irq.c
@@ -1,6 +1,7 @@
 #include <linux/kernel.h>
 #include <linux/of_pci.h>
 #include <linux/of_irq.h>
+#include <linux/export.h>
 #include <asm/prom.h>
 /**
diff --git a/drivers/of/of_spi.c b/drivers/of/of_spi.c
index 1dbce58a58b0..6dbc074e4876 100644
--- a/drivers/of/of_spi.c
+++ b/drivers/of/of_spi.c
@@ -6,6 +6,7 @@
 * tree.
 */
+#include <linux/module.h>
 #include <linux/of.h>
 #include <linux/device.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index ed5a6d3c26aa..cbd5d701c7e0 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -310,18 +310,21 @@ static const struct of_dev_auxdata *of_dev_lookup(const struct of_dev_auxdata *l
                                 struct device_node *np)
 {
        struct resource res;
-        if (lookup) {
-                for(; lookup->name != NULL; lookup++) {
+        if (!lookup)
-                        if (!of_device_is_compatible(np, lookup->compatible))
+                return NULL;
-                                continue;
-                        if (of_address_to_resource(np, 0, &res))
+        for(; lookup->name != NULL; lookup++) {
-                                continue;
+                if (!of_device_is_compatible(np, lookup->compatible))
-                        if (res.start != lookup->phys_addr)
+                        continue;
-                                continue;
+                if (of_address_to_resource(np, 0, &res))
-                        pr_debug("%s: devname=%s\n", np->full_name, lookup->name);
+                        continue;
-                        return lookup;
+                if (res.start != lookup->phys_addr)
-                }
+                        continue;
+                pr_debug("%s: devname=%s\n", np->full_name, lookup->name);
+                return lookup;
        }
        return NULL;
 }
@@ -329,8 +332,9 @@ static const struct of_dev_auxdata *of_dev_lookup(const struct of_dev_auxdata *l
 * of_platform_bus_create() - Create a device for a node and its children.
 * @bus: device node of the bus to instantiate
 * @matches: match table for bus nodes
- * disallow recursive creation of child buses
+ * @lookup: auxdata table for matching id and platform_data with device nodes
 * @parent: parent for new device, or NULL for top level.
+ * @strict: require compatible property
 *
 * Creates a platform_device for the provided device_node, and optionally
 * recursively create devices for all the child nodes.
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 75a80e46b391..8b490d77054f 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -44,6 +44,7 @@
 #include <linux/seq_file.h>
 #include <linux/scatterlist.h>
 #include <linux/iommu-helper.h>
+#include <linux/export.h>
 #include <asm/byteorder.h>
 #include <asm/cache.h>          /* for L1_CACHE_BYTES */
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index a6f762188bc3..8644d5372e7f 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -39,6 +39,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/module.h>
 #include <asm/ropes.h>
 #include <asm/mckinley.h>       /* for proc_mckinley_root */
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index cec66064ee4b..b6f9749b4fa7 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -51,17 +51,6 @@ config XEN_PCIDEV_FRONTEND
          The PCI device frontend driver allows the kernel to import arbitrary
          PCI devices from a PCI backend to support PCI driver domains.
-config XEN_PCIDEV_FE_DEBUG
-        bool "Xen PCI Frontend debugging"
-        depends on XEN_PCIDEV_FRONTEND && PCI_DEBUG
-        help
-          Say Y here if you want the Xen PCI frontend to produce a bunch of debug
-          messages to the system log.  Select this if you are having a
-          problem with Xen PCI frontend support and want to see more of what is
-          going on.
-          When in doubt, say N.
 config HT_IRQ
        bool "Interrupts on hypertransport devices"
        default y
diff --git a/drivers/pci/ats.c b/drivers/pci/ats.c
index f727a09eb72f..7ec56fb0bd78 100644
--- a/drivers/pci/ats.c
+++ b/drivers/pci/ats.c
@@ -10,6 +10,7 @@
 *   PASID support added by Joerg Roedel <joerg.roedel@amd.com>
 */
+#include <linux/export.h>
 #include <linux/pci-ats.h>
 #include <linux/pci.h>
diff --git a/drivers/pci/hotplug-pci.c b/drivers/pci/hotplug-pci.c
index 4d4a64478404..d3509cdeb554 100644
--- a/drivers/pci/hotplug-pci.c
+++ b/drivers/pci/hotplug-pci.c
@@ -1,6 +1,7 @@
 /* Core PCI functionality used only by PCI hotplug */
 #include <linux/pci.h>
+#include <linux/export.h>
 #include "pci.h"
diff --git a/drivers/pci/hotplug/pciehp_acpi.c b/drivers/pci/hotplug/pciehp_acpi.c
index 5f7226223a62..376d70d17176 100644
--- a/drivers/pci/hotplug/pciehp_acpi.c
+++ b/drivers/pci/hotplug/pciehp_acpi.c
@@ -27,6 +27,7 @@
 #include <linux/pci.h>
 #include <linux/pci_hotplug.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include "pciehp.h"
 #define PCIEHP_DETECT_PCIE      (0)
diff --git a/drivers/pci/hotplug/pcihp_slot.c b/drivers/pci/hotplug/pcihp_slot.c
index 3ffd9c1acc0a..8c05a18c9770 100644
--- a/drivers/pci/hotplug/pcihp_slot.c
+++ b/drivers/pci/hotplug/pcihp_slot.c
@@ -24,6 +24,7 @@
 */
 #include <linux/pci.h>
+#include <linux/export.h>
 #include <linux/pci_hotplug.h>
 static struct hpp_type0 pci_default_type0 = {
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index 1d002b1c2bf4..c56a9413e1af 100644
--- a/drivers/pci/hotplug/rpadlpar_core.c
+++ b/drivers/pci/hotplug/rpadlpar_core.c
@@ -18,6 +18,7 @@
 #undef DEBUG
 #include <linux/init.h>
+#include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/string.h>
 #include <linux/vmalloc.h>
diff --git a/drivers/pci/htirq.c b/drivers/pci/htirq.c
index db057b6fe0c8..6e373ea57b32 100644
--- a/drivers/pci/htirq.c
+++ b/drivers/pci/htirq.c
@@ -9,6 +9,7 @@
 #include <linux/irq.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/htirq.h>
diff --git a/drivers/pci/ioapic.c b/drivers/pci/ioapic.c
index 203508b227b7..5775638ac017 100644
--- a/drivers/pci/ioapic.c
+++ b/drivers/pci/ioapic.c
@@ -17,6 +17,7 @@
 */
 #include <linux/pci.h>
+#include <linux/export.h>
 #include <linux/acpi.h>
 #include <linux/slab.h>
 #include <acpi/acpi_bus.h>
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index 9b4e88c636f8..b82c155d7b37 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -11,6 +11,7 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/mutex.h>
+#include <linux/export.h>
 #include <linux/string.h>
 #include <linux/delay.h>
 #include <linux/pci-ats.h>
diff --git a/drivers/pci/irq.c b/drivers/pci/irq.c
index de01174aff06..e5f69a43b1b1 100644
--- a/drivers/pci/irq.c
+++ b/drivers/pci/irq.c
@@ -7,6 +7,7 @@
 #include <linux/acpi.h>
 #include <linux/device.h>
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/pci.h>
 static void pci_note_irq_problem(struct pci_dev *pdev, const char *reason)
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 2f10328bf661..0e6d04d7ba4f 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -11,6 +11,7 @@
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
+#include <linux/export.h>
 #include <linux/ioport.h>
 #include <linux/pci.h>
 #include <linux/proc_fs.h>
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 7bcf12adced7..106be0d08f81 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -19,6 +19,7 @@
 #include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/stat.h>
+#include <linux/export.h>
 #include <linux/topology.h>
 #include <linux/mm.h>
 #include <linux/fs.h>
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 7285145ac1c9..64765474676f 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -17,6 +17,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index 36864a935d68..48ebdb237f3f 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -7,6 +7,7 @@
 * PCI ROM access routines
 */
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 51a9095c7da4..5717509becbe 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -18,6 +18,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/pci.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
index 968cfea04f74..ac6412fb8d6f 100644
--- a/drivers/pci/slot.c
+++ b/drivers/pci/slot.c
@@ -7,6 +7,7 @@
 #include <linux/kobject.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/err.h>
 #include "pci.h"
diff --git a/drivers/pci/vpd.c b/drivers/pci/vpd.c
index a5a5ca17cfe6..39b79070335d 100644
--- a/drivers/pci/vpd.c
+++ b/drivers/pci/vpd.c
@@ -6,6 +6,7 @@
 */
 #include <linux/pci.h>
+#include <linux/export.h>
 int pci_vpd_find_tag(const u8 *buf, unsigned int off, unsigned int len, u8 rdt)
 {
diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c
index 01757f18a208..3e49df6d5e3b 100644
--- a/drivers/pcmcia/db1xxx_ss.c
+++ b/drivers/pcmcia/db1xxx_ss.c
@@ -24,6 +24,7 @@
 #include <linux/gpio.h>
 #include <linux/interrupt.h>
 #include <linux/pm.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/resource.h>
 #include <linux/slab.h>
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index 2c540542b5af..a87e2728b2c3 100644
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -231,6 +231,7 @@ void pxa2xx_configure_sockets(struct device *dev)
        __raw_writel(mecr, MECR);
 }
+EXPORT_SYMBOL(pxa2xx_configure_sockets);
 static const char *skt_names[] = {
        "PCMCIA socket 0",
diff --git a/drivers/pcmcia/pxa2xx_cm_x255.c b/drivers/pcmcia/pxa2xx_cm_x255.c
index 63f4d5211ed2..0b4f946cf13a 100644
--- a/drivers/pcmcia/pxa2xx_cm_x255.c
+++ b/drivers/pcmcia/pxa2xx_cm_x255.c
@@ -14,6 +14,7 @@
 #include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
+#include <linux/export.h>
 #include <asm/mach-types.h>
diff --git a/drivers/pcmcia/pxa2xx_cm_x270.c b/drivers/pcmcia/pxa2xx_cm_x270.c
index 6ee42b4c3e68..923f315926ef 100644
--- a/drivers/pcmcia/pxa2xx_cm_x270.c
+++ b/drivers/pcmcia/pxa2xx_cm_x270.c
@@ -14,6 +14,7 @@
 #include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
+#include <linux/export.h>
 #include <asm/mach-types.h>
diff --git a/drivers/pcmcia/pxa2xx_cm_x2xx.c b/drivers/pcmcia/pxa2xx_cm_x2xx.c
index 4f09506ad8d4..6e7dcfd22ede 100644
--- a/drivers/pcmcia/pxa2xx_cm_x2xx.c
+++ b/drivers/pcmcia/pxa2xx_cm_x2xx.c
@@ -12,9 +12,8 @@
 #include <linux/module.h>
-#include <asm/system.h>
 #include <asm/mach-types.h>
-#include <mach/system.h>
+#include <mach/hardware.h>
 int cmx255_pcmcia_init(void);
 int cmx270_pcmcia_init(void);
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 423522d87313..eadef9e191ea 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -12,6 +12,7 @@
 #define pr_fmt(fmt) "pinctrl core: " fmt
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/slab.h>
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c
index c86665369a22..48870e504231 100644
--- a/drivers/platform/x86/intel_scu_ipc.c
+++ b/drivers/platform/x86/intel_scu_ipc.c
@@ -24,6 +24,7 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/sfi.h>
+#include <linux/module.h>
 #include <asm/mrst.h>
 #include <asm/intel_scu_ipc.h>
diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
index 6f40bf202dc7..2264331bd48e 100644
--- a/drivers/platform/x86/msi-wmi.c
+++ b/drivers/platform/x86/msi-wmi.c
@@ -28,6 +28,7 @@
 #include <linux/acpi.h>
 #include <linux/backlight.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>");
 MODULE_DESCRIPTION("MSI laptop WMI hotkeys driver");
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 9b88be42b6cd..a134c26870b0 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -36,6 +36,7 @@
 #include <linux/list.h>
 #include <linux/acpi.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index ca84d5099ce7..b00c17612a89 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -19,6 +19,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
+#include <linux/export.h>
 #include <linux/acpi.h>
 #include <linux/pnp.h>
 #include <linux/slab.h>
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 57de051a74b3..9f88641e67f9 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -70,6 +70,7 @@ config BATTERY_DS2760
 config BATTERY_DS2780
        tristate "DS2780 battery driver"
+        depends on HAS_IOMEM
        select W1
        select W1_SLAVE_DS2780
        help
diff --git a/drivers/power/ds2780_battery.c b/drivers/power/ds2780_battery.c
index 1fefe82e12e3..91a783d72360 100644
--- a/drivers/power/ds2780_battery.c
+++ b/drivers/power/ds2780_battery.c
@@ -39,6 +39,7 @@ struct ds2780_device_info {
        struct device *dev;
        struct power_supply bat;
        struct device *w1_dev;
+        struct task_struct *mutex_holder;
 };
 enum current_types {
@@ -49,8 +50,8 @@ enum current_types {
 static const char model[] = "DS2780";
 static const char manufacturer[] = "Maxim/Dallas";
-static inline struct ds2780_device_info *to_ds2780_device_info(
+static inline struct ds2780_device_info *
-        struct power_supply *psy)
+to_ds2780_device_info(struct power_supply *psy)
 {
        return container_of(psy, struct ds2780_device_info, bat);
 }
@@ -60,17 +61,28 @@ static inline struct power_supply *to_power_supply(struct device *dev)
        return dev_get_drvdata(dev);
 }
-static inline int ds2780_read8(struct device *dev, u8 *val, int addr)
+static inline int ds2780_battery_io(struct ds2780_device_info *dev_info,
+        char *buf, int addr, size_t count, int io)
 {
-        return w1_ds2780_io(dev, val, addr, sizeof(u8), 0);
+        if (dev_info->mutex_holder == current)
+                return w1_ds2780_io_nolock(dev_info->w1_dev, buf, addr, count, io);
+        else
+                return w1_ds2780_io(dev_info->w1_dev, buf, addr, count, io);
+}
+static inline int ds2780_read8(struct ds2780_device_info *dev_info, u8 *val,
+        int addr)
+{
+        return ds2780_battery_io(dev_info, val, addr, sizeof(u8), 0);
 }
-static int ds2780_read16(struct device *dev, s16 *val, int addr)
+static int ds2780_read16(struct ds2780_device_info *dev_info, s16 *val,
+        int addr)
 {
        int ret;
        u8 raw[2];
-        ret = w1_ds2780_io(dev, raw, addr, sizeof(u8) * 2, 0);
+        ret = ds2780_battery_io(dev_info, raw, addr, sizeof(raw), 0);
        if (ret < 0)
                return ret;
@@ -79,16 +91,16 @@ static int ds2780_read16(struct device *dev, s16 *val, int addr)
        return 0;
 }
-static inline int ds2780_read_block(struct device *dev, u8 *val, int addr,
+static inline int ds2780_read_block(struct ds2780_device_info *dev_info,
-        size_t count)
+        u8 *val, int addr, size_t count)
 {
-        return w1_ds2780_io(dev, val, addr, count, 0);
+        return ds2780_battery_io(dev_info, val, addr, count, 0);
 }
-static inline int ds2780_write(struct device *dev, u8 *val, int addr,
+static inline int ds2780_write(struct ds2780_device_info *dev_info, u8 *val,
-        size_t count)
+        int addr, size_t count)
 {
-        return w1_ds2780_io(dev, val, addr, count, 1);
+        return ds2780_battery_io(dev_info, val, addr, count, 1);
 }
 static inline int ds2780_store_eeprom(struct device *dev, int addr)
@@ -122,7 +134,7 @@ static int ds2780_set_sense_register(struct ds2780_device_info *dev_info,
 {
        int ret;
-        ret = ds2780_write(dev_info->w1_dev, &conductance,
+        ret = ds2780_write(dev_info, &conductance,
                                DS2780_RSNSP_REG, sizeof(u8));
        if (ret < 0)
                return ret;
@@ -134,7 +146,7 @@ static int ds2780_set_sense_register(struct ds2780_device_info *dev_info,
 static int ds2780_get_rsgain_register(struct ds2780_device_info *dev_info,
        u16 *rsgain)
 {
-        return ds2780_read16(dev_info->w1_dev, rsgain, DS2780_RSGAIN_MSB_REG);
+        return ds2780_read16(dev_info, rsgain, DS2780_RSGAIN_MSB_REG);
 }
 /* Set RSGAIN value from 0 to 1.999 in steps of 0.001 */
@@ -144,8 +156,8 @@ static int ds2780_set_rsgain_register(struct ds2780_device_info *dev_info,
        int ret;
        u8 raw[] = {rsgain >> 8, rsgain & 0xFF};
-        ret = ds2780_write(dev_info->w1_dev, raw,
+        ret = ds2780_write(dev_info, raw,
-                                DS2780_RSGAIN_MSB_REG, sizeof(u8) * 2);
+                                DS2780_RSGAIN_MSB_REG, sizeof(raw));
        if (ret < 0)
                return ret;
@@ -167,7 +179,7 @@ static int ds2780_get_voltage(struct ds2780_device_info *dev_info,
         * Bits 2 - 0 of the voltage value are in bits 7 - 5 of the
         * voltage LSB register
         */
-        ret = ds2780_read16(dev_info->w1_dev, &voltage_raw,
+        ret = ds2780_read16(dev_info, &voltage_raw,
                                DS2780_VOLT_MSB_REG);
        if (ret < 0)
                return ret;
@@ -196,7 +208,7 @@ static int ds2780_get_temperature(struct ds2780_device_info *dev_info,
         * Bits 2 - 0 of the temperature value are in bits 7 - 5 of the
         * temperature LSB register
         */
-        ret = ds2780_read16(dev_info->w1_dev, &temperature_raw,
+        ret = ds2780_read16(dev_info, &temperature_raw,
                                DS2780_TEMP_MSB_REG);
        if (ret < 0)
                return ret;
@@ -222,13 +234,13 @@ static int ds2780_get_current(struct ds2780_device_info *dev_info,
         * The units of measurement for current are dependent on the value of
         * the sense resistor.
         */
-        ret = ds2780_read8(dev_info->w1_dev, &sense_res_raw, DS2780_RSNSP_REG);
+        ret = ds2780_read8(dev_info, &sense_res_raw, DS2780_RSNSP_REG);
        if (ret < 0)
                return ret;
        if (sense_res_raw == 0) {
                dev_err(dev_info->dev, "sense resistor value is 0\n");
-                return -ENXIO;
+                return -EINVAL;
        }
        sense_res = 1000 / sense_res_raw;
@@ -248,7 +260,7 @@ static int ds2780_get_current(struct ds2780_device_info *dev_info,
         * Bits 7 - 0 of the current value are in bits 7 - 0 of the current
         * LSB register
         */
-        ret = ds2780_read16(dev_info->w1_dev, &current_raw, reg_msb);
+        ret = ds2780_read16(dev_info, &current_raw, reg_msb);
        if (ret < 0)
                return ret;
@@ -267,7 +279,7 @@ static int ds2780_get_accumulated_current(struct ds2780_device_info *dev_info,
         * The units of measurement for accumulated current are dependent on
         * the value of the sense resistor.
         */
-        ret = ds2780_read8(dev_info->w1_dev, &sense_res_raw, DS2780_RSNSP_REG);
+        ret = ds2780_read8(dev_info, &sense_res_raw, DS2780_RSNSP_REG);
        if (ret < 0)
                return ret;
@@ -285,7 +297,7 @@ static int ds2780_get_accumulated_current(struct ds2780_device_info *dev_info,
         * Bits 7 - 0 of the ACR value are in bits 7 - 0 of the ACR
         * LSB register
         */
-        ret = ds2780_read16(dev_info->w1_dev, &current_raw, DS2780_ACR_MSB_REG);
+        ret = ds2780_read16(dev_info, &current_raw, DS2780_ACR_MSB_REG);
        if (ret < 0)
                return ret;
@@ -299,7 +311,7 @@ static int ds2780_get_capacity(struct ds2780_device_info *dev_info,
        int ret;
        u8 raw;
-        ret = ds2780_read8(dev_info->w1_dev, &raw, DS2780_RARC_REG);
+        ret = ds2780_read8(dev_info, &raw, DS2780_RARC_REG);
        if (ret < 0)
                return ret;
@@ -345,7 +357,7 @@ static int ds2780_get_charge_now(struct ds2780_device_info *dev_info,
         * Bits 7 - 0 of the RAAC value are in bits 7 - 0 of the RAAC
         * LSB register
         */
-        ret = ds2780_read16(dev_info->w1_dev, &charge_raw, DS2780_RAAC_MSB_REG);
+        ret = ds2780_read16(dev_info, &charge_raw, DS2780_RAAC_MSB_REG);
        if (ret < 0)
                return ret;
@@ -356,7 +368,7 @@ static int ds2780_get_charge_now(struct ds2780_device_info *dev_info,
 static int ds2780_get_control_register(struct ds2780_device_info *dev_info,
        u8 *control_reg)
 {
-        return ds2780_read8(dev_info->w1_dev, control_reg, DS2780_CONTROL_REG);
+        return ds2780_read8(dev_info, control_reg, DS2780_CONTROL_REG);
 }
 static int ds2780_set_control_register(struct ds2780_device_info *dev_info,
@@ -364,7 +376,7 @@ static int ds2780_set_control_register(struct ds2780_device_info *dev_info,
 {
        int ret;
-        ret = ds2780_write(dev_info->w1_dev, &control_reg,
+        ret = ds2780_write(dev_info, &control_reg,
                                DS2780_CONTROL_REG, sizeof(u8));
        if (ret < 0)
                return ret;
@@ -503,7 +515,7 @@ static ssize_t ds2780_get_sense_resistor_value(struct device *dev,
        struct power_supply *psy = to_power_supply(dev);
        struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
-        ret = ds2780_read8(dev_info->w1_dev, &sense_resistor, DS2780_RSNSP_REG);
+        ret = ds2780_read8(dev_info, &sense_resistor, DS2780_RSNSP_REG);
        if (ret < 0)
                return ret;
@@ -584,7 +596,7 @@ static ssize_t ds2780_get_pio_pin(struct device *dev,
        struct power_supply *psy = to_power_supply(dev);
        struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
-        ret = ds2780_read8(dev_info->w1_dev, &sfr, DS2780_SFR_REG);
+        ret = ds2780_read8(dev_info, &sfr, DS2780_SFR_REG);
        if (ret < 0)
                return ret;
@@ -611,7 +623,7 @@ static ssize_t ds2780_set_pio_pin(struct device *dev,
                return -EINVAL;
        }
-        ret = ds2780_write(dev_info->w1_dev, &new_setting,
+        ret = ds2780_write(dev_info, &new_setting,
                                DS2780_SFR_REG, sizeof(u8));
        if (ret < 0)
                return ret;
@@ -632,7 +644,7 @@ static ssize_t ds2780_read_param_eeprom_bin(struct file *filp,
                DS2780_EEPROM_BLOCK1_END -
                DS2780_EEPROM_BLOCK1_START + 1 - off);
-        return ds2780_read_block(dev_info->w1_dev, buf,
+        return ds2780_read_block(dev_info, buf,
                                DS2780_EEPROM_BLOCK1_START + off, count);
 }
@@ -650,7 +662,7 @@ static ssize_t ds2780_write_param_eeprom_bin(struct file *filp,
                DS2780_EEPROM_BLOCK1_END -
                DS2780_EEPROM_BLOCK1_START + 1 - off);
-        ret = ds2780_write(dev_info->w1_dev, buf,
+        ret = ds2780_write(dev_info, buf,
                                DS2780_EEPROM_BLOCK1_START + off, count);
        if (ret < 0)
                return ret;
@@ -685,9 +697,8 @@ static ssize_t ds2780_read_user_eeprom_bin(struct file *filp,
                DS2780_EEPROM_BLOCK0_END -
                DS2780_EEPROM_BLOCK0_START + 1 - off);
-        return ds2780_read_block(dev_info->w1_dev, buf,
+        return ds2780_read_block(dev_info, buf,
                                DS2780_EEPROM_BLOCK0_START + off, count);
 }
 static ssize_t ds2780_write_user_eeprom_bin(struct file *filp,
@@ -704,7 +715,7 @@ static ssize_t ds2780_write_user_eeprom_bin(struct file *filp,
                DS2780_EEPROM_BLOCK0_END -
                DS2780_EEPROM_BLOCK0_START + 1 - off);
-        ret = ds2780_write(dev_info->w1_dev, buf,
+        ret = ds2780_write(dev_info, buf,
                                DS2780_EEPROM_BLOCK0_START + off, count);
        if (ret < 0)
                return ret;
@@ -768,6 +779,7 @@ static int __devinit ds2780_battery_probe(struct platform_device *pdev)
        dev_info->bat.properties        = ds2780_battery_props;
        dev_info->bat.num_properties    = ARRAY_SIZE(ds2780_battery_props);
        dev_info->bat.get_property      = ds2780_battery_get_property;
+        dev_info->mutex_holder          = current;
        ret = power_supply_register(&pdev->dev, &dev_info->bat);
        if (ret) {
@@ -797,6 +809,8 @@ static int __devinit ds2780_battery_probe(struct platform_device *pdev)
                goto fail_remove_bin_file;
        }
+        dev_info->mutex_holder = NULL;
        return 0;
 fail_remove_bin_file:
@@ -816,6 +830,8 @@ static int __devexit ds2780_battery_remove(struct platform_device *pdev)
 {
        struct ds2780_device_info *dev_info = platform_get_drvdata(pdev);
+        dev_info->mutex_holder = current;
        /* remove attributes */
        sysfs_remove_group(&dev_info->bat.dev->kobj, &ds2780_attr_group);
diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c
index 98bfab35b8e9..9f0183c73076 100644
--- a/drivers/power/max17042_battery.c
+++ b/drivers/power/max17042_battery.c
@@ -23,6 +23,7 @@
 */
 #include <linux/init.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/mod_devicetable.h>
diff --git a/drivers/power/max8903_charger.c b/drivers/power/max8903_charger.c
index a9b0209a2f55..2595145f3bff 100644
--- a/drivers/power/max8903_charger.c
+++ b/drivers/power/max8903_charger.c
@@ -22,6 +22,7 @@
 #include <linux/gpio.h>
 #include <linux/interrupt.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/power_supply.h>
 #include <linux/platform_device.h>
diff --git a/drivers/power/max8997_charger.c b/drivers/power/max8997_charger.c
index ffc5033ea9c9..a23317d75c5a 100644
--- a/drivers/power/max8997_charger.c
+++ b/drivers/power/max8997_charger.c
@@ -19,6 +19,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
+#include <linux/module.h>
 #include <linux/err.h>
 #include <linux/module.h>
 #include <linux/slab.h>
diff --git a/drivers/power/max8998_charger.c b/drivers/power/max8998_charger.c
index ef8efadb58cb..93e3bb47a3a8 100644
--- a/drivers/power/max8998_charger.c
+++ b/drivers/power/max8998_charger.c
@@ -19,6 +19,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
+#include <linux/module.h>
 #include <linux/err.h>
 #include <linux/module.h>
 #include <linux/slab.h>
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 605514afc29f..e15d4c9d3988 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -14,6 +14,7 @@
 #include <linux/ctype.h>
 #include <linux/power_supply.h>
 #include <linux/slab.h>
+#include <linux/stat.h>
 #include "power_supply.h"
diff --git a/drivers/pps/clients/Kconfig b/drivers/pps/clients/Kconfig
index 8520a7f4dd62..445197d4a8c4 100644
--- a/drivers/pps/clients/Kconfig
+++ b/drivers/pps/clients/Kconfig
@@ -29,4 +29,13 @@ config PPS_CLIENT_PARPORT
          If you say yes here you get support for a PPS source connected
          with the interrupt pin of your parallel port.
+config PPS_CLIENT_GPIO
+        tristate "PPS client using GPIO"
+        depends on PPS && GENERIC_HARDIRQS
+        help
+          If you say yes here you get support for a PPS source using
+          GPIO. To be useful you must also register a platform device
+          specifying the GPIO pin and other options, usually in your board
+          setup.
 endif
diff --git a/drivers/pps/clients/Makefile b/drivers/pps/clients/Makefile
index 4feb7e9e71ee..a461d15f4a2e 100644
--- a/drivers/pps/clients/Makefile
+++ b/drivers/pps/clients/Makefile
@@ -5,5 +5,6 @@
 obj-$(CONFIG_PPS_CLIENT_KTIMER) += pps-ktimer.o
 obj-$(CONFIG_PPS_CLIENT_LDISC)  += pps-ldisc.o
 obj-$(CONFIG_PPS_CLIENT_PARPORT) += pps_parport.o
+obj-$(CONFIG_PPS_CLIENT_GPIO)   += pps-gpio.o
 ccflags-$(CONFIG_PPS_DEBUG) := -DDEBUG
diff --git a/drivers/pps/clients/pps-gpio.c b/drivers/pps/clients/pps-gpio.c
new file mode 100644
index 000000000000..655055545479
--- /dev/null
+++ b/drivers/pps/clients/pps-gpio.c
@@ -0,0 +1,227 @@
+/*
+ * pps-gpio.c -- PPS client driver using GPIO
+ *
+ *
+ * Copyright (C) 2010 Ricardo Martins <rasm@fe.up.pt>
+ * Copyright (C) 2011 James Nuss <jamesnuss@nanometrics.ca>
+ *
+ *   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.
+ */
+#define PPS_GPIO_NAME "pps-gpio"
+#define pr_fmt(fmt) PPS_GPIO_NAME ": " fmt
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/pps_kernel.h>
+#include <linux/pps-gpio.h>
+#include <linux/gpio.h>
+#include <linux/list.h>
+/* Info for each registered platform device */
+struct pps_gpio_device_data {
+        int irq;                        /* IRQ used as PPS source */
+        struct pps_device *pps;         /* PPS source device */
+        struct pps_source_info info;    /* PPS source information */
+        const struct pps_gpio_platform_data *pdata;
+};
+/*
+ * Report the PPS event
+ */
+static irqreturn_t pps_gpio_irq_handler(int irq, void *data)
+{
+        const struct pps_gpio_device_data *info;
+        struct pps_event_time ts;
+        int rising_edge;
+        /* Get the time stamp first */
+        pps_get_ts(&ts);
+        info = data;
+        rising_edge = gpio_get_value(info->pdata->gpio_pin);
+        if ((rising_edge && !info->pdata->assert_falling_edge) ||
+                        (!rising_edge && info->pdata->assert_falling_edge))
+                pps_event(info->pps, &ts, PPS_CAPTUREASSERT, NULL);
+        else if (info->pdata->capture_clear &&
+                        ((rising_edge && info->pdata->assert_falling_edge) ||
+                         (!rising_edge && !info->pdata->assert_falling_edge)))
+                pps_event(info->pps, &ts, PPS_CAPTURECLEAR, NULL);
+        return IRQ_HANDLED;
+}
+static int pps_gpio_setup(struct platform_device *pdev)
+{
+        int ret;
+        const struct pps_gpio_platform_data *pdata = pdev->dev.platform_data;
+        ret = gpio_request(pdata->gpio_pin, pdata->gpio_label);
+        if (ret) {
+                pr_warning("failed to request GPIO %u\n", pdata->gpio_pin);
+                return -EINVAL;
+        }
+        ret = gpio_direction_input(pdata->gpio_pin);
+        if (ret) {
+                pr_warning("failed to set pin direction\n");
+                gpio_free(pdata->gpio_pin);
+                return -EINVAL;
+        }
+        return 0;
+}
+static unsigned long
+get_irqf_trigger_flags(const struct pps_gpio_platform_data *pdata)
+{
+        unsigned long flags = pdata->assert_falling_edge ?
+                IRQF_TRIGGER_FALLING : IRQF_TRIGGER_RISING;
+        if (pdata->capture_clear) {
+                flags |= ((flags & IRQF_TRIGGER_RISING) ?
+                                IRQF_TRIGGER_FALLING : IRQF_TRIGGER_RISING);
+        }
+        return flags;
+}
+static int pps_gpio_probe(struct platform_device *pdev)
+{
+        struct pps_gpio_device_data *data;
+        int irq;
+        int ret;
+        int err;
+        int pps_default_params;
+        const struct pps_gpio_platform_data *pdata = pdev->dev.platform_data;
+        /* GPIO setup */
+        ret = pps_gpio_setup(pdev);
+        if (ret)
+                return -EINVAL;
+        /* IRQ setup */
+        irq = gpio_to_irq(pdata->gpio_pin);
+        if (irq < 0) {
+                pr_err("failed to map GPIO to IRQ: %d\n", irq);
+                err = -EINVAL;
+                goto return_error;
+        }
+        /* allocate space for device info */
+        data = kzalloc(sizeof(struct pps_gpio_device_data), GFP_KERNEL);
+        if (data == NULL) {
+                err = -ENOMEM;
+                goto return_error;
+        }
+        /* initialize PPS specific parts of the bookkeeping data structure. */
+        data->info.mode = PPS_CAPTUREASSERT | PPS_OFFSETASSERT |
+                PPS_ECHOASSERT | PPS_CANWAIT | PPS_TSFMT_TSPEC;
+        if (pdata->capture_clear)
+                data->info.mode |= PPS_CAPTURECLEAR | PPS_OFFSETCLEAR |
+                        PPS_ECHOCLEAR;
+        data->info.owner = THIS_MODULE;
+        snprintf(data->info.name, PPS_MAX_NAME_LEN - 1, "%s.%d",
+                 pdev->name, pdev->id);
+        /* register PPS source */
+        pps_default_params = PPS_CAPTUREASSERT | PPS_OFFSETASSERT;
+        if (pdata->capture_clear)
+                pps_default_params |= PPS_CAPTURECLEAR | PPS_OFFSETCLEAR;
+        data->pps = pps_register_source(&data->info, pps_default_params);
+        if (data->pps == NULL) {
+                kfree(data);
+                pr_err("failed to register IRQ %d as PPS source\n", irq);
+                err = -EINVAL;
+                goto return_error;
+        }
+        data->irq = irq;
+        data->pdata = pdata;
+        /* register IRQ interrupt handler */
+        ret = request_irq(irq, pps_gpio_irq_handler,
+                        get_irqf_trigger_flags(pdata), data->info.name, data);
+        if (ret) {
+                pps_unregister_source(data->pps);
+                kfree(data);
+                pr_err("failed to acquire IRQ %d\n", irq);
+                err = -EINVAL;
+                goto return_error;
+        }
+        platform_set_drvdata(pdev, data);
+        dev_info(data->pps->dev, "Registered IRQ %d as PPS source\n", irq);
+        return 0;
+return_error:
+        gpio_free(pdata->gpio_pin);
+        return err;
+}
+static int pps_gpio_remove(struct platform_device *pdev)
+{
+        struct pps_gpio_device_data *data = platform_get_drvdata(pdev);
+        const struct pps_gpio_platform_data *pdata = data->pdata;
+        platform_set_drvdata(pdev, NULL);
+        free_irq(data->irq, data);
+        gpio_free(pdata->gpio_pin);
+        pps_unregister_source(data->pps);
+        pr_info("removed IRQ %d as PPS source\n", data->irq);
+        kfree(data);
+        return 0;
+}
+static struct platform_driver pps_gpio_driver = {
+        .probe          = pps_gpio_probe,
+        .remove         =  __devexit_p(pps_gpio_remove),
+        .driver         = {
+                .name   = PPS_GPIO_NAME,
+                .owner  = THIS_MODULE
+        },
+};
+static int __init pps_gpio_init(void)
+{
+        int ret = platform_driver_register(&pps_gpio_driver);
+        if (ret < 0)
+                pr_err("failed to register platform driver\n");
+        return ret;
+}
+static void __exit pps_gpio_exit(void)
+{
+        platform_driver_unregister(&pps_gpio_driver);
+        pr_debug("unregistered platform driver\n");
+}
+module_init(pps_gpio_init);
+module_exit(pps_gpio_exit);
+MODULE_AUTHOR("Ricardo Martins <rasm@fe.up.pt>");
+MODULE_AUTHOR("James Nuss <jamesnuss@nanometrics.ca>");
+MODULE_DESCRIPTION("Use GPIO pin as PPS source");
+MODULE_LICENSE("GPL");
+MODULE_VERSION("1.0.0");
diff --git a/drivers/pps/clients/pps-ktimer.c b/drivers/pps/clients/pps-ktimer.c
index 82583b0ff82d..436b4e4e71a1 100644
--- a/drivers/pps/clients/pps-ktimer.c
+++ b/drivers/pps/clients/pps-ktimer.c
@@ -52,17 +52,6 @@ static void pps_ktimer_event(unsigned long ptr)
 }
 /*
- * The echo function
- */
-static void pps_ktimer_echo(struct pps_device *pps, int event, void *data)
-{
-        dev_info(pps->dev, "echo %s %s\n",
-                event & PPS_CAPTUREASSERT ? "assert" : "",
-                event & PPS_CAPTURECLEAR ? "clear" : "");
-}
-/*
 * The PPS info struct
 */
@@ -72,7 +61,6 @@ static struct pps_source_info pps_ktimer_info = {
        .mode           = PPS_CAPTUREASSERT | PPS_OFFSETASSERT |
                          PPS_ECHOASSERT |
                          PPS_CANWAIT | PPS_TSFMT_TSPEC,
-        .echo           = pps_ktimer_echo,
        .owner          = THIS_MODULE,
 };
diff --git a/drivers/pps/clients/pps_parport.c b/drivers/pps/clients/pps_parport.c
index c571d6dd8f61..e1b4705ae3ec 100644
--- a/drivers/pps/clients/pps_parport.c
+++ b/drivers/pps/clients/pps_parport.c
@@ -133,14 +133,6 @@ out_both:
        return;
 }
-/* the PPS echo function */
-static void pps_echo(struct pps_device *pps, int event, void *data)
-{
-        dev_info(pps->dev, "echo %s %s\n",
-                event & PPS_CAPTUREASSERT ? "assert" : "",
-                event & PPS_CAPTURECLEAR ? "clear" : "");
-}
 static void parport_attach(struct parport *port)
 {
        struct pps_client_pp *device;
@@ -151,7 +143,6 @@ static void parport_attach(struct parport *port)
                                  PPS_OFFSETASSERT | PPS_OFFSETCLEAR | \
                                  PPS_ECHOASSERT | PPS_ECHOCLEAR | \
                                  PPS_CANWAIT | PPS_TSFMT_TSPEC,
-                .echo           = pps_echo,
                .owner          = THIS_MODULE,
                .dev            = NULL
        };
diff --git a/drivers/pps/kapi.c b/drivers/pps/kapi.c
index a4e8eb9fece6..f197e8ea185c 100644
--- a/drivers/pps/kapi.c
+++ b/drivers/pps/kapi.c
@@ -52,6 +52,14 @@ static void pps_add_offset(struct pps_ktime *ts, struct pps_ktime *offset)
        ts->sec += offset->sec;
 }
+static void pps_echo_client_default(struct pps_device *pps, int event,
+                void *data)
+{
+        dev_info(pps->dev, "echo %s %s\n",
+                event & PPS_CAPTUREASSERT ? "assert" : "",
+                event & PPS_CAPTURECLEAR ? "clear" : "");
+}
 /*
 * Exported functions
 */
@@ -80,13 +88,6 @@ struct pps_device *pps_register_source(struct pps_source_info *info,
                err = -EINVAL;
                goto pps_register_source_exit;
        }
-        if ((info->mode & (PPS_ECHOASSERT | PPS_ECHOCLEAR)) != 0 &&
-                        info->echo == NULL) {
-                pr_err("%s: echo function is not defined\n",
-                                        info->name);
-                err = -EINVAL;
-                goto pps_register_source_exit;
-        }
        if ((info->mode & (PPS_TSFMT_TSPEC | PPS_TSFMT_NTPFP)) == 0) {
                pr_err("%s: unspecified time format\n",
                                        info->name);
@@ -108,6 +109,11 @@ struct pps_device *pps_register_source(struct pps_source_info *info,
        pps->params.mode = default_params;
        pps->info = *info;
+        /* check for default echo function */
+        if ((pps->info.mode & (PPS_ECHOASSERT | PPS_ECHOCLEAR)) &&
+                        pps->info.echo == NULL)
+                pps->info.echo = pps_echo_client_default;
        init_waitqueue_head(&pps->queue);
        spin_lock_init(&pps->lock);
diff --git a/drivers/ps3/ps3stor_lib.c b/drivers/ps3/ps3stor_lib.c
index af0afa1db4a8..cc328dec946b 100644
--- a/drivers/ps3/ps3stor_lib.c
+++ b/drivers/ps3/ps3stor_lib.c
@@ -19,6 +19,7 @@
 */
 #include <linux/dma-mapping.h>
+#include <linux/module.h>
 #include <asm/lv1call.h>
 #include <asm/ps3stor.h>
diff --git a/drivers/ps3/sys-manager-core.c b/drivers/ps3/sys-manager-core.c
index 474225852b63..0e41737ea835 100644
--- a/drivers/ps3/sys-manager-core.c
+++ b/drivers/ps3/sys-manager-core.c
@@ -19,6 +19,7 @@
 */
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <asm/lv1call.h>
 #include <asm/ps3.h>
diff --git a/drivers/rapidio/Kconfig b/drivers/rapidio/Kconfig
index 070211a5955c..bc8719238793 100644
--- a/drivers/rapidio/Kconfig
+++ b/drivers/rapidio/Kconfig
@@ -1,6 +1,8 @@
 #
 # RapidIO configuration
 #
+source "drivers/rapidio/devices/Kconfig"
 config RAPIDIO_DISC_TIMEOUT
        int "Discovery timeout duration (seconds)"
        depends on RAPIDIO
@@ -20,8 +22,6 @@ config RAPIDIO_ENABLE_RX_TX_PORTS
          ports for Input/Output direction to allow other traffic
          than Maintenance transfers.
-source "drivers/rapidio/switches/Kconfig"
 config RAPIDIO_DEBUG
        bool "RapidIO subsystem debug messages"
        depends on RAPIDIO
@@ -32,3 +32,5 @@ config RAPIDIO_DEBUG
          going on.
          If you are unsure about this, say N here.
+source "drivers/rapidio/switches/Kconfig"
diff --git a/drivers/rapidio/Makefile b/drivers/rapidio/Makefile
index 89b8eca825b5..ec3fb8121004 100644
--- a/drivers/rapidio/Makefile
+++ b/drivers/rapidio/Makefile
@@ -4,5 +4,6 @@
 obj-y += rio.o rio-access.o rio-driver.o rio-scan.o rio-sysfs.o
 obj-$(CONFIG_RAPIDIO)           += switches/
+obj-$(CONFIG_RAPIDIO)           += devices/
 subdir-ccflags-$(CONFIG_RAPIDIO_DEBUG) := -DDEBUG
diff --git a/drivers/rapidio/devices/Kconfig b/drivers/rapidio/devices/Kconfig
new file mode 100644
index 000000000000..12a9d7f7040b
--- /dev/null
+++ b/drivers/rapidio/devices/Kconfig
@@ -0,0 +1,10 @@
+#
+# RapidIO master port configuration
+#
+config RAPIDIO_TSI721
+        bool "IDT Tsi721 PCI Express SRIO Controller support"
+        depends on RAPIDIO && PCIEPORTBUS
+        default "n"
+        ---help---
+          Include support for IDT Tsi721 PCI Express Serial RapidIO controller.
diff --git a/drivers/rapidio/devices/Makefile b/drivers/rapidio/devices/Makefile
new file mode 100644
index 000000000000..3b7b4e2dff7c
--- /dev/null
+++ b/drivers/rapidio/devices/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for RapidIO devices
+#
+obj-$(CONFIG_RAPIDIO_TSI721)    += tsi721.o
diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c
new file mode 100644
index 000000000000..5225930a10cd
--- /dev/null
+++ b/drivers/rapidio/devices/tsi721.c
@@ -0,0 +1,2360 @@
+/*
+ * RapidIO mport driver for Tsi721 PCIExpress-to-SRIO bridge
+ *
+ * Copyright 2011 Integrated Device Technology, Inc.
+ * Alexandre Bounine <alexandre.bounine@idt.com>
+ * Chul Kim <chul.kim@idt.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.
+ */
+#include <linux/io.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/rio.h>
+#include <linux/rio_drv.h>
+#include <linux/dma-mapping.h>
+#include <linux/interrupt.h>
+#include <linux/kfifo.h>
+#include <linux/delay.h>
+#include "tsi721.h"
+#define DEBUG_PW        /* Inbound Port-Write debugging */
+static void tsi721_omsg_handler(struct tsi721_device *priv, int ch);
+static void tsi721_imsg_handler(struct tsi721_device *priv, int ch);
+/**
+ * tsi721_lcread - read from local SREP config space
+ * @mport: RapidIO master port info
+ * @index: ID of RapdiIO interface
+ * @offset: Offset into configuration space
+ * @len: Length (in bytes) of the maintenance transaction
+ * @data: Value to be read into
+ *
+ * Generates a local SREP space read. Returns %0 on
+ * success or %-EINVAL on failure.
+ */
+static int tsi721_lcread(struct rio_mport *mport, int index, u32 offset,
+                         int len, u32 *data)
+{
+        struct tsi721_device *priv = mport->priv;
+        if (len != sizeof(u32))
+                return -EINVAL; /* only 32-bit access is supported */
+        *data = ioread32(priv->regs + offset);
+        return 0;
+}
+/**
+ * tsi721_lcwrite - write into local SREP config space
+ * @mport: RapidIO master port info
+ * @index: ID of RapdiIO interface
+ * @offset: Offset into configuration space
+ * @len: Length (in bytes) of the maintenance transaction
+ * @data: Value to be written
+ *
+ * Generates a local write into SREP configuration space. Returns %0 on
+ * success or %-EINVAL on failure.
+ */
+static int tsi721_lcwrite(struct rio_mport *mport, int index, u32 offset,
+                          int len, u32 data)
+{
+        struct tsi721_device *priv = mport->priv;
+        if (len != sizeof(u32))
+                return -EINVAL; /* only 32-bit access is supported */
+        iowrite32(data, priv->regs + offset);
+        return 0;
+}
+/**
+ * tsi721_maint_dma - Helper function to generate RapidIO maintenance
+ *                    transactions using designated Tsi721 DMA channel.
+ * @priv: pointer to tsi721 private data
+ * @sys_size: RapdiIO transport system size
+ * @destid: Destination ID of transaction
+ * @hopcount: Number of hops to target device
+ * @offset: Offset into configuration space
+ * @len: Length (in bytes) of the maintenance transaction
+ * @data: Location to be read from or write into
+ * @do_wr: Operation flag (1 == MAINT_WR)
+ *
+ * Generates a RapidIO maintenance transaction (Read or Write).
+ * Returns %0 on success and %-EINVAL or %-EFAULT on failure.
+ */
+static int tsi721_maint_dma(struct tsi721_device *priv, u32 sys_size,
+                        u16 destid, u8 hopcount, u32 offset, int len,
+                        u32 *data, int do_wr)
+{
+        struct tsi721_dma_desc *bd_ptr;
+        u32 rd_count, swr_ptr, ch_stat;
+        int i, err = 0;
+        u32 op = do_wr ? MAINT_WR : MAINT_RD;
+        if (offset > (RIO_MAINT_SPACE_SZ - len) || (len != sizeof(u32)))
+                return -EINVAL;
+        bd_ptr = priv->bdma[TSI721_DMACH_MAINT].bd_base;
+        rd_count = ioread32(
+                        priv->regs + TSI721_DMAC_DRDCNT(TSI721_DMACH_MAINT));
+        /* Initialize DMA descriptor */
+        bd_ptr[0].type_id = cpu_to_le32((DTYPE2 << 29) | (op << 19) | destid);
+        bd_ptr[0].bcount = cpu_to_le32((sys_size << 26) | 0x04);
+        bd_ptr[0].raddr_lo = cpu_to_le32((hopcount << 24) | offset);
+        bd_ptr[0].raddr_hi = 0;
+        if (do_wr)
+                bd_ptr[0].data[0] = cpu_to_be32p(data);
+        else
+                bd_ptr[0].data[0] = 0xffffffff;
+        mb();
+        /* Start DMA operation */
+        iowrite32(rd_count + 2,
+                priv->regs + TSI721_DMAC_DWRCNT(TSI721_DMACH_MAINT));
+        ioread32(priv->regs + TSI721_DMAC_DWRCNT(TSI721_DMACH_MAINT));
+        i = 0;
+        /* Wait until DMA transfer is finished */
+        while ((ch_stat = ioread32(priv->regs +
+                TSI721_DMAC_STS(TSI721_DMACH_MAINT))) & TSI721_DMAC_STS_RUN) {
+                udelay(1);
+                if (++i >= 5000000) {
+                        dev_dbg(&priv->pdev->dev,
+                                "%s : DMA[%d] read timeout ch_status=%x\n",
+                                __func__, TSI721_DMACH_MAINT, ch_stat);
+                        if (!do_wr)
+                                *data = 0xffffffff;
+                        err = -EIO;
+                        goto err_out;
+                }
+        }
+        if (ch_stat & TSI721_DMAC_STS_ABORT) {
+                /* If DMA operation aborted due to error,
+                 * reinitialize DMA channel
+                 */
+                dev_dbg(&priv->pdev->dev, "%s : DMA ABORT ch_stat=%x\n",
+                        __func__, ch_stat);
+                dev_dbg(&priv->pdev->dev, "OP=%d : destid=%x hc=%x off=%x\n",
+                        do_wr ? MAINT_WR : MAINT_RD, destid, hopcount, offset);
+                iowrite32(TSI721_DMAC_INT_ALL,
+                        priv->regs + TSI721_DMAC_INT(TSI721_DMACH_MAINT));
+                iowrite32(TSI721_DMAC_CTL_INIT,
+                        priv->regs + TSI721_DMAC_CTL(TSI721_DMACH_MAINT));
+                udelay(10);
+                iowrite32(0, priv->regs +
+                                TSI721_DMAC_DWRCNT(TSI721_DMACH_MAINT));
+                udelay(1);
+                if (!do_wr)
+                        *data = 0xffffffff;
+                err = -EIO;
+                goto err_out;
+        }
+        if (!do_wr)
+                *data = be32_to_cpu(bd_ptr[0].data[0]);
+        /*
+         * Update descriptor status FIFO RD pointer.
+         * NOTE: Skipping check and clear FIFO entries because we are waiting
+         * for transfer to be completed.
+         */
+        swr_ptr = ioread32(priv->regs + TSI721_DMAC_DSWP(TSI721_DMACH_MAINT));
+        iowrite32(swr_ptr, priv->regs + TSI721_DMAC_DSRP(TSI721_DMACH_MAINT));
+err_out:
+        return err;
+}
+/**
+ * tsi721_cread_dma - Generate a RapidIO maintenance read transaction
+ *                    using Tsi721 BDMA engine.
+ * @mport: RapidIO master port control structure
+ * @index: ID of RapdiIO interface
+ * @destid: Destination ID of transaction
+ * @hopcount: Number of hops to target device
+ * @offset: Offset into configuration space
+ * @len: Length (in bytes) of the maintenance transaction
+ * @val: Location to be read into
+ *
+ * Generates a RapidIO maintenance read transaction.
+ * Returns %0 on success and %-EINVAL or %-EFAULT on failure.
+ */
+static int tsi721_cread_dma(struct rio_mport *mport, int index, u16 destid,
+                        u8 hopcount, u32 offset, int len, u32 *data)
+{
+        struct tsi721_device *priv = mport->priv;
+        return tsi721_maint_dma(priv, mport->sys_size, destid, hopcount,
+                                offset, len, data, 0);
+}
+/**
+ * tsi721_cwrite_dma - Generate a RapidIO maintenance write transaction
+ *                     using Tsi721 BDMA engine
+ * @mport: RapidIO master port control structure
+ * @index: ID of RapdiIO interface
+ * @destid: Destination ID of transaction
+ * @hopcount: Number of hops to target device
+ * @offset: Offset into configuration space
+ * @len: Length (in bytes) of the maintenance transaction
+ * @val: Value to be written
+ *
+ * Generates a RapidIO maintenance write transaction.
+ * Returns %0 on success and %-EINVAL or %-EFAULT on failure.
+ */
+static int tsi721_cwrite_dma(struct rio_mport *mport, int index, u16 destid,
+                         u8 hopcount, u32 offset, int len, u32 data)
+{
+        struct tsi721_device *priv = mport->priv;
+        u32 temp = data;
+        return tsi721_maint_dma(priv, mport->sys_size, destid, hopcount,
+                                offset, len, &temp, 1);
+}
+/**
+ * tsi721_pw_handler - Tsi721 inbound port-write interrupt handler
+ * @mport: RapidIO master port structure
+ *
+ * Handles inbound port-write interrupts. Copies PW message from an internal
+ * buffer into PW message FIFO and schedules deferred routine to process
+ * queued messages.
+ */
+static int
+tsi721_pw_handler(struct rio_mport *mport)
+{
+        struct tsi721_device *priv = mport->priv;
+        u32 pw_stat;
+        u32 pw_buf[TSI721_RIO_PW_MSG_SIZE/sizeof(u32)];
+        pw_stat = ioread32(priv->regs + TSI721_RIO_PW_RX_STAT);
+        if (pw_stat & TSI721_RIO_PW_RX_STAT_PW_VAL) {
+                pw_buf[0] = ioread32(priv->regs + TSI721_RIO_PW_RX_CAPT(0));
+                pw_buf[1] = ioread32(priv->regs + TSI721_RIO_PW_RX_CAPT(1));
+                pw_buf[2] = ioread32(priv->regs + TSI721_RIO_PW_RX_CAPT(2));
+                pw_buf[3] = ioread32(priv->regs + TSI721_RIO_PW_RX_CAPT(3));
+                /* Queue PW message (if there is room in FIFO),
+                 * otherwise discard it.
+                 */
+                spin_lock(&priv->pw_fifo_lock);
+                if (kfifo_avail(&priv->pw_fifo) >= TSI721_RIO_PW_MSG_SIZE)
+                        kfifo_in(&priv->pw_fifo, pw_buf,
+                                                TSI721_RIO_PW_MSG_SIZE);
+                else
+                        priv->pw_discard_count++;
+                spin_unlock(&priv->pw_fifo_lock);
+        }
+        /* Clear pending PW interrupts */
+        iowrite32(TSI721_RIO_PW_RX_STAT_PW_DISC | TSI721_RIO_PW_RX_STAT_PW_VAL,
+                  priv->regs + TSI721_RIO_PW_RX_STAT);
+        schedule_work(&priv->pw_work);
+        return 0;
+}
+static void tsi721_pw_dpc(struct work_struct *work)
+{
+        struct tsi721_device *priv = container_of(work, struct tsi721_device,
+                                                    pw_work);
+        u32 msg_buffer[RIO_PW_MSG_SIZE/sizeof(u32)]; /* Use full size PW message
+                                                        buffer for RIO layer */
+        /*
+         * Process port-write messages
+         */
+        while (kfifo_out_spinlocked(&priv->pw_fifo, (unsigned char *)msg_buffer,
+                         TSI721_RIO_PW_MSG_SIZE, &priv->pw_fifo_lock)) {
+                /* Process one message */
+#ifdef DEBUG_PW
+                {
+                u32 i;
+                pr_debug("%s : Port-Write Message:", __func__);
+                for (i = 0; i < RIO_PW_MSG_SIZE/sizeof(u32); ) {
+                        pr_debug("0x%02x: %08x %08x %08x %08x", i*4,
+                                msg_buffer[i], msg_buffer[i + 1],
+                                msg_buffer[i + 2], msg_buffer[i + 3]);
+                        i += 4;
+                }
+                pr_debug("\n");
+                }
+#endif
+                /* Pass the port-write message to RIO core for processing */
+                rio_inb_pwrite_handler((union rio_pw_msg *)msg_buffer);
+        }
+}
+/**
+ * tsi721_pw_enable - enable/disable port-write interface init
+ * @mport: Master port implementing the port write unit
+ * @enable:    1=enable; 0=disable port-write message handling
+ */
+static int tsi721_pw_enable(struct rio_mport *mport, int enable)
+{
+        struct tsi721_device *priv = mport->priv;
+        u32 rval;
+        rval = ioread32(priv->regs + TSI721_RIO_EM_INT_ENABLE);
+        if (enable)
+                rval |= TSI721_RIO_EM_INT_ENABLE_PW_RX;
+        else
+                rval &= ~TSI721_RIO_EM_INT_ENABLE_PW_RX;
+        /* Clear pending PW interrupts */
+        iowrite32(TSI721_RIO_PW_RX_STAT_PW_DISC | TSI721_RIO_PW_RX_STAT_PW_VAL,
+                  priv->regs + TSI721_RIO_PW_RX_STAT);
+        /* Update enable bits */
+        iowrite32(rval, priv->regs + TSI721_RIO_EM_INT_ENABLE);
+        return 0;
+}
+/**
+ * tsi721_dsend - Send a RapidIO doorbell
+ * @mport: RapidIO master port info
+ * @index: ID of RapidIO interface
+ * @destid: Destination ID of target device
+ * @data: 16-bit info field of RapidIO doorbell
+ *
+ * Sends a RapidIO doorbell message. Always returns %0.
+ */
+static int tsi721_dsend(struct rio_mport *mport, int index,
+                        u16 destid, u16 data)
+{
+        struct tsi721_device *priv = mport->priv;
+        u32 offset;
+        offset = (((mport->sys_size) ? RIO_TT_CODE_16 : RIO_TT_CODE_8) << 18) |
+                 (destid << 2);
+        dev_dbg(&priv->pdev->dev,
+                "Send Doorbell 0x%04x to destID 0x%x\n", data, destid);
+        iowrite16be(data, priv->odb_base + offset);
+        return 0;
+}
+/**
+ * tsi721_dbell_handler - Tsi721 doorbell interrupt handler
+ * @mport: RapidIO master port structure
+ *
+ * Handles inbound doorbell interrupts. Copies doorbell entry from an internal
+ * buffer into DB message FIFO and schedules deferred  routine to process
+ * queued DBs.
+ */
+static int
+tsi721_dbell_handler(struct rio_mport *mport)
+{
+        struct tsi721_device *priv = mport->priv;
+        u32 regval;
+        /* Disable IDB interrupts */
+        regval = ioread32(priv->regs + TSI721_SR_CHINTE(IDB_QUEUE));
+        regval &= ~TSI721_SR_CHINT_IDBQRCV;
+        iowrite32(regval,
+                priv->regs + TSI721_SR_CHINTE(IDB_QUEUE));
+        schedule_work(&priv->idb_work);
+        return 0;
+}
+static void tsi721_db_dpc(struct work_struct *work)
+{
+        struct tsi721_device *priv = container_of(work, struct tsi721_device,
+                                                    idb_work);
+        struct rio_mport *mport;
+        struct rio_dbell *dbell;
+        int found = 0;
+        u32 wr_ptr, rd_ptr;
+        u64 *idb_entry;
+        u32 regval;
+        union {
+                u64 msg;
+                u8  bytes[8];
+        } idb;
+        /*
+         * Process queued inbound doorbells
+         */
+        mport = priv->mport;
+        wr_ptr = ioread32(priv->regs + TSI721_IDQ_WP(IDB_QUEUE));
+        rd_ptr = ioread32(priv->regs + TSI721_IDQ_RP(IDB_QUEUE));
+        while (wr_ptr != rd_ptr) {
+                idb_entry = (u64 *)(priv->idb_base +
+                                        (TSI721_IDB_ENTRY_SIZE * rd_ptr));
+                rd_ptr++;
+                idb.msg = *idb_entry;
+                *idb_entry = 0;
+                /* Process one doorbell */
+                list_for_each_entry(dbell, &mport->dbells, node) {
+                        if ((dbell->res->start <= DBELL_INF(idb.bytes)) &&
+                            (dbell->res->end >= DBELL_INF(idb.bytes))) {
+                                found = 1;
+                                break;
+                        }
+                }
+                if (found) {
+                        dbell->dinb(mport, dbell->dev_id, DBELL_SID(idb.bytes),
+                                    DBELL_TID(idb.bytes), DBELL_INF(idb.bytes));
+                } else {
+                        dev_dbg(&priv->pdev->dev,
+                                "spurious inb doorbell, sid %2.2x tid %2.2x"
+                                " info %4.4x\n", DBELL_SID(idb.bytes),
+                                DBELL_TID(idb.bytes), DBELL_INF(idb.bytes));
+                }
+        }
+        iowrite32(rd_ptr & (IDB_QSIZE - 1),
+                priv->regs + TSI721_IDQ_RP(IDB_QUEUE));
+        /* Re-enable IDB interrupts */
+        regval = ioread32(priv->regs + TSI721_SR_CHINTE(IDB_QUEUE));
+        regval |= TSI721_SR_CHINT_IDBQRCV;
+        iowrite32(regval,
+                priv->regs + TSI721_SR_CHINTE(IDB_QUEUE));
+}
+/**
+ * tsi721_irqhandler - Tsi721 interrupt handler
+ * @irq: Linux interrupt number
+ * @ptr: Pointer to interrupt-specific data (mport structure)
+ *
+ * Handles Tsi721 interrupts signaled using MSI and INTA. Checks reported
+ * interrupt events and calls an event-specific handler(s).
+ */
+static irqreturn_t tsi721_irqhandler(int irq, void *ptr)
+{
+        struct rio_mport *mport = (struct rio_mport *)ptr;
+        struct tsi721_device *priv = mport->priv;
+        u32 dev_int;
+        u32 dev_ch_int;
+        u32 intval;
+        u32 ch_inte;
+        dev_int = ioread32(priv->regs + TSI721_DEV_INT);
+        if (!dev_int)
+                return IRQ_NONE;
+        dev_ch_int = ioread32(priv->regs + TSI721_DEV_CHAN_INT);
+        if (dev_int & TSI721_DEV_INT_SR2PC_CH) {
+                /* Service SR2PC Channel interrupts */
+                if (dev_ch_int & TSI721_INT_SR2PC_CHAN(IDB_QUEUE)) {
+                        /* Service Inbound Doorbell interrupt */
+                        intval = ioread32(priv->regs +
+                                                TSI721_SR_CHINT(IDB_QUEUE));
+                        if (intval & TSI721_SR_CHINT_IDBQRCV)
+                                tsi721_dbell_handler(mport);
+                        else
+                                dev_info(&priv->pdev->dev,
+                                        "Unsupported SR_CH_INT %x\n", intval);
+                        /* Clear interrupts */
+                        iowrite32(intval,
+                                priv->regs + TSI721_SR_CHINT(IDB_QUEUE));
+                        ioread32(priv->regs + TSI721_SR_CHINT(IDB_QUEUE));
+                }
+        }
+        if (dev_int & TSI721_DEV_INT_SMSG_CH) {
+                int ch;
+                /*
+                 * Service channel interrupts from Messaging Engine
+                 */
+                if (dev_ch_int & TSI721_INT_IMSG_CHAN_M) { /* Inbound Msg */
+                        /* Disable signaled OB MSG Channel interrupts */
+                        ch_inte = ioread32(priv->regs + TSI721_DEV_CHAN_INTE);
+                        ch_inte &= ~(dev_ch_int & TSI721_INT_IMSG_CHAN_M);
+                        iowrite32(ch_inte, priv->regs + TSI721_DEV_CHAN_INTE);
+                        /*
+                         * Process Inbound Message interrupt for each MBOX
+                         */
+                        for (ch = 4; ch < RIO_MAX_MBOX + 4; ch++) {
+                                if (!(dev_ch_int & TSI721_INT_IMSG_CHAN(ch)))
+                                        continue;
+                                tsi721_imsg_handler(priv, ch);
+                        }
+                }
+                if (dev_ch_int & TSI721_INT_OMSG_CHAN_M) { /* Outbound Msg */
+                        /* Disable signaled OB MSG Channel interrupts */
+                        ch_inte = ioread32(priv->regs + TSI721_DEV_CHAN_INTE);
+                        ch_inte &= ~(dev_ch_int & TSI721_INT_OMSG_CHAN_M);
+                        iowrite32(ch_inte, priv->regs + TSI721_DEV_CHAN_INTE);
+                        /*
+                         * Process Outbound Message interrupts for each MBOX
+                         */
+                        for (ch = 0; ch < RIO_MAX_MBOX; ch++) {
+                                if (!(dev_ch_int & TSI721_INT_OMSG_CHAN(ch)))
+                                        continue;
+                                tsi721_omsg_handler(priv, ch);
+                        }
+                }
+        }
+        if (dev_int & TSI721_DEV_INT_SRIO) {
+                /* Service SRIO MAC interrupts */
+                intval = ioread32(priv->regs + TSI721_RIO_EM_INT_STAT);
+                if (intval & TSI721_RIO_EM_INT_STAT_PW_RX)
+                        tsi721_pw_handler(mport);
+        }
+        return IRQ_HANDLED;
+}
+static void tsi721_interrupts_init(struct tsi721_device *priv)
+{
+        u32 intr;
+        /* Enable IDB interrupts */
+        iowrite32(TSI721_SR_CHINT_ALL,
+                priv->regs + TSI721_SR_CHINT(IDB_QUEUE));
+        iowrite32(TSI721_SR_CHINT_IDBQRCV,
+                priv->regs + TSI721_SR_CHINTE(IDB_QUEUE));
+        iowrite32(TSI721_INT_SR2PC_CHAN(IDB_QUEUE),
+                priv->regs + TSI721_DEV_CHAN_INTE);
+        /* Enable SRIO MAC interrupts */
+        iowrite32(TSI721_RIO_EM_DEV_INT_EN_INT,
+                priv->regs + TSI721_RIO_EM_DEV_INT_EN);
+        if (priv->flags & TSI721_USING_MSIX)
+                intr = TSI721_DEV_INT_SRIO;
+        else
+                intr = TSI721_DEV_INT_SR2PC_CH | TSI721_DEV_INT_SRIO |
+                        TSI721_DEV_INT_SMSG_CH;
+        iowrite32(intr, priv->regs + TSI721_DEV_INTE);
+        ioread32(priv->regs + TSI721_DEV_INTE);
+}
+#ifdef CONFIG_PCI_MSI
+/**
+ * tsi721_omsg_msix - MSI-X interrupt handler for outbound messaging
+ * @irq: Linux interrupt number
+ * @ptr: Pointer to interrupt-specific data (mport structure)
+ *
+ * Handles outbound messaging interrupts signaled using MSI-X.
+ */
+static irqreturn_t tsi721_omsg_msix(int irq, void *ptr)
+{
+        struct tsi721_device *priv = ((struct rio_mport *)ptr)->priv;
+        int mbox;
+        mbox = (irq - priv->msix[TSI721_VECT_OMB0_DONE].vector) % RIO_MAX_MBOX;
+        tsi721_omsg_handler(priv, mbox);
+        return IRQ_HANDLED;
+}
+/**
+ * tsi721_imsg_msix - MSI-X interrupt handler for inbound messaging
+ * @irq: Linux interrupt number
+ * @ptr: Pointer to interrupt-specific data (mport structure)
+ *
+ * Handles inbound messaging interrupts signaled using MSI-X.
+ */
+static irqreturn_t tsi721_imsg_msix(int irq, void *ptr)
+{
+        struct tsi721_device *priv = ((struct rio_mport *)ptr)->priv;
+        int mbox;
+        mbox = (irq - priv->msix[TSI721_VECT_IMB0_RCV].vector) % RIO_MAX_MBOX;
+        tsi721_imsg_handler(priv, mbox + 4);
+        return IRQ_HANDLED;
+}
+/**
+ * tsi721_srio_msix - Tsi721 MSI-X SRIO MAC interrupt handler
+ * @irq: Linux interrupt number
+ * @ptr: Pointer to interrupt-specific data (mport structure)
+ *
+ * Handles Tsi721 interrupts from SRIO MAC.
+ */
+static irqreturn_t tsi721_srio_msix(int irq, void *ptr)
+{
+        struct tsi721_device *priv = ((struct rio_mport *)ptr)->priv;
+        u32 srio_int;
+        /* Service SRIO MAC interrupts */
+        srio_int = ioread32(priv->regs + TSI721_RIO_EM_INT_STAT);
+        if (srio_int & TSI721_RIO_EM_INT_STAT_PW_RX)
+                tsi721_pw_handler((struct rio_mport *)ptr);
+        return IRQ_HANDLED;
+}
+/**
+ * tsi721_sr2pc_ch_msix - Tsi721 MSI-X SR2PC Channel interrupt handler
+ * @irq: Linux interrupt number
+ * @ptr: Pointer to interrupt-specific data (mport structure)
+ *
+ * Handles Tsi721 interrupts from SR2PC Channel.
+ * NOTE: At this moment services only one SR2PC channel associated with inbound
+ * doorbells.
+ */
+static irqreturn_t tsi721_sr2pc_ch_msix(int irq, void *ptr)
+{
+        struct tsi721_device *priv = ((struct rio_mport *)ptr)->priv;
+        u32 sr_ch_int;
+        /* Service Inbound DB interrupt from SR2PC channel */
+        sr_ch_int = ioread32(priv->regs + TSI721_SR_CHINT(IDB_QUEUE));
+        if (sr_ch_int & TSI721_SR_CHINT_IDBQRCV)
+                tsi721_dbell_handler((struct rio_mport *)ptr);
+        /* Clear interrupts */
+        iowrite32(sr_ch_int, priv->regs + TSI721_SR_CHINT(IDB_QUEUE));
+        /* Read back to ensure that interrupt was cleared */
+        sr_ch_int = ioread32(priv->regs + TSI721_SR_CHINT(IDB_QUEUE));
+        return IRQ_HANDLED;
+}
+/**
+ * tsi721_request_msix - register interrupt service for MSI-X mode.
+ * @mport: RapidIO master port structure
+ *
+ * Registers MSI-X interrupt service routines for interrupts that are active
+ * immediately after mport initialization. Messaging interrupt service routines
+ * should be registered during corresponding open requests.
+ */
+static int tsi721_request_msix(struct rio_mport *mport)
+{
+        struct tsi721_device *priv = mport->priv;
+        int err = 0;
+        err = request_irq(priv->msix[TSI721_VECT_IDB].vector,
+                        tsi721_sr2pc_ch_msix, 0,
+                        priv->msix[TSI721_VECT_IDB].irq_name, (void *)mport);
+        if (err)
+                goto out;
+        err = request_irq(priv->msix[TSI721_VECT_PWRX].vector,
+                        tsi721_srio_msix, 0,
+                        priv->msix[TSI721_VECT_PWRX].irq_name, (void *)mport);
+        if (err)
+                free_irq(
+                        priv->msix[TSI721_VECT_IDB].vector,
+                        (void *)mport);
+out:
+        return err;
+}
+/**
+ * tsi721_enable_msix - Attempts to enable MSI-X support for Tsi721.
+ * @priv: pointer to tsi721 private data
+ *
+ * Configures MSI-X support for Tsi721. Supports only an exact number
+ * of requested vectors.
+ */
+static int tsi721_enable_msix(struct tsi721_device *priv)
+{
+        struct msix_entry entries[TSI721_VECT_MAX];
+        int err;
+        int i;
+        entries[TSI721_VECT_IDB].entry = TSI721_MSIX_SR2PC_IDBQ_RCV(IDB_QUEUE);
+        entries[TSI721_VECT_PWRX].entry = TSI721_MSIX_SRIO_MAC_INT;
+        /*
+         * Initialize MSI-X entries for Messaging Engine:
+         * this driver supports four RIO mailboxes (inbound and outbound)
+         * NOTE: Inbound message MBOX 0...4 use IB channels 4...7. Therefore
+         * offset +4 is added to IB MBOX number.
+         */
+        for (i = 0; i < RIO_MAX_MBOX; i++) {
+                entries[TSI721_VECT_IMB0_RCV + i].entry =
+                                        TSI721_MSIX_IMSG_DQ_RCV(i + 4);
+                entries[TSI721_VECT_IMB0_INT + i].entry =
+                                        TSI721_MSIX_IMSG_INT(i + 4);
+                entries[TSI721_VECT_OMB0_DONE + i].entry =
+                                        TSI721_MSIX_OMSG_DONE(i);
+                entries[TSI721_VECT_OMB0_INT + i].entry =
+                                        TSI721_MSIX_OMSG_INT(i);
+        }
+        err = pci_enable_msix(priv->pdev, entries, ARRAY_SIZE(entries));
+        if (err) {
+                if (err > 0)
+                        dev_info(&priv->pdev->dev,
+                                 "Only %d MSI-X vectors available, "
+                                 "not using MSI-X\n", err);
+                return err;
+        }
+        /*
+         * Copy MSI-X vector information into tsi721 private structure
+         */
+        priv->msix[TSI721_VECT_IDB].vector = entries[TSI721_VECT_IDB].vector;
+        snprintf(priv->msix[TSI721_VECT_IDB].irq_name, IRQ_DEVICE_NAME_MAX,
+                 DRV_NAME "-idb@pci:%s", pci_name(priv->pdev));
+        priv->msix[TSI721_VECT_PWRX].vector = entries[TSI721_VECT_PWRX].vector;
+        snprintf(priv->msix[TSI721_VECT_PWRX].irq_name, IRQ_DEVICE_NAME_MAX,
+                 DRV_NAME "-pwrx@pci:%s", pci_name(priv->pdev));
+        for (i = 0; i < RIO_MAX_MBOX; i++) {
+                priv->msix[TSI721_VECT_IMB0_RCV + i].vector =
+                                entries[TSI721_VECT_IMB0_RCV + i].vector;
+                snprintf(priv->msix[TSI721_VECT_IMB0_RCV + i].irq_name,
+                         IRQ_DEVICE_NAME_MAX, DRV_NAME "-imbr%d@pci:%s",
+                         i, pci_name(priv->pdev));
+                priv->msix[TSI721_VECT_IMB0_INT + i].vector =
+                                entries[TSI721_VECT_IMB0_INT + i].vector;
+                snprintf(priv->msix[TSI721_VECT_IMB0_INT + i].irq_name,
+                         IRQ_DEVICE_NAME_MAX, DRV_NAME "-imbi%d@pci:%s",
+                         i, pci_name(priv->pdev));
+                priv->msix[TSI721_VECT_OMB0_DONE + i].vector =
+                                entries[TSI721_VECT_OMB0_DONE + i].vector;
+                snprintf(priv->msix[TSI721_VECT_OMB0_DONE + i].irq_name,
+                         IRQ_DEVICE_NAME_MAX, DRV_NAME "-ombd%d@pci:%s",
+                         i, pci_name(priv->pdev));
+                priv->msix[TSI721_VECT_OMB0_INT + i].vector =
+                                entries[TSI721_VECT_OMB0_INT + i].vector;
+                snprintf(priv->msix[TSI721_VECT_OMB0_INT + i].irq_name,
+                         IRQ_DEVICE_NAME_MAX, DRV_NAME "-ombi%d@pci:%s",
+                         i, pci_name(priv->pdev));
+        }
+        return 0;
+}
+#endif /* CONFIG_PCI_MSI */
+static int tsi721_request_irq(struct rio_mport *mport)
+{
+        struct tsi721_device *priv = mport->priv;
+        int err;
+#ifdef CONFIG_PCI_MSI
+        if (priv->flags & TSI721_USING_MSIX)
+                err = tsi721_request_msix(mport);
+        else
+#endif
+                err = request_irq(priv->pdev->irq, tsi721_irqhandler,
+                          (priv->flags & TSI721_USING_MSI) ? 0 : IRQF_SHARED,
+                          DRV_NAME, (void *)mport);
+        if (err)
+                dev_err(&priv->pdev->dev,
+                        "Unable to allocate interrupt, Error: %d\n", err);
+        return err;
+}
+/**
+ * tsi721_init_pc2sr_mapping - initializes outbound (PCIe->SRIO)
+ * translation regions.
+ * @priv: pointer to tsi721 private data
+ *
+ * Disables SREP translation regions.
+ */
+static void tsi721_init_pc2sr_mapping(struct tsi721_device *priv)
+{
+        int i;
+        /* Disable all PC2SR translation windows */
+        for (i = 0; i < TSI721_OBWIN_NUM; i++)
+                iowrite32(0, priv->regs + TSI721_OBWINLB(i));
+}
+/**
+ * tsi721_init_sr2pc_mapping - initializes inbound (SRIO->PCIe)
+ * translation regions.
+ * @priv: pointer to tsi721 private data
+ *
+ * Disables inbound windows.
+ */
+static void tsi721_init_sr2pc_mapping(struct tsi721_device *priv)
+{
+        int i;
+        /* Disable all SR2PC inbound windows */
+        for (i = 0; i < TSI721_IBWIN_NUM; i++)
+                iowrite32(0, priv->regs + TSI721_IBWINLB(i));
+}
+/**
+ * tsi721_port_write_init - Inbound port write interface init
+ * @priv: pointer to tsi721 private data
+ *
+ * Initializes inbound port write handler.
+ * Returns %0 on success or %-ENOMEM on failure.
+ */
+static int tsi721_port_write_init(struct tsi721_device *priv)
+{
+        priv->pw_discard_count = 0;
+        INIT_WORK(&priv->pw_work, tsi721_pw_dpc);
+        spin_lock_init(&priv->pw_fifo_lock);
+        if (kfifo_alloc(&priv->pw_fifo,
+                        TSI721_RIO_PW_MSG_SIZE * 32, GFP_KERNEL)) {
+                dev_err(&priv->pdev->dev, "PW FIFO allocation failed\n");
+                return -ENOMEM;
+        }
+        /* Use reliable port-write capture mode */
+        iowrite32(TSI721_RIO_PW_CTL_PWC_REL, priv->regs + TSI721_RIO_PW_CTL);
+        return 0;
+}
+static int tsi721_doorbell_init(struct tsi721_device *priv)
+{
+        /* Outbound Doorbells do not require any setup.
+         * Tsi721 uses dedicated PCI BAR1 to generate doorbells.
+         * That BAR1 was mapped during the probe routine.
+         */
+        /* Initialize Inbound Doorbell processing DPC and queue */
+        priv->db_discard_count = 0;
+        INIT_WORK(&priv->idb_work, tsi721_db_dpc);
+        /* Allocate buffer for inbound doorbells queue */
+        priv->idb_base = dma_alloc_coherent(&priv->pdev->dev,
+                                IDB_QSIZE * TSI721_IDB_ENTRY_SIZE,
+                                &priv->idb_dma, GFP_KERNEL);
+        if (!priv->idb_base)
+                return -ENOMEM;
+        memset(priv->idb_base, 0, IDB_QSIZE * TSI721_IDB_ENTRY_SIZE);
+        dev_dbg(&priv->pdev->dev, "Allocated IDB buffer @ %p (phys = %llx)\n",
+                priv->idb_base, (unsigned long long)priv->idb_dma);
+        iowrite32(TSI721_IDQ_SIZE_VAL(IDB_QSIZE),
+                priv->regs + TSI721_IDQ_SIZE(IDB_QUEUE));
+        iowrite32(((u64)priv->idb_dma >> 32),
+                priv->regs + TSI721_IDQ_BASEU(IDB_QUEUE));
+        iowrite32(((u64)priv->idb_dma & TSI721_IDQ_BASEL_ADDR),
+                priv->regs + TSI721_IDQ_BASEL(IDB_QUEUE));
+        /* Enable accepting all inbound doorbells */
+        iowrite32(0, priv->regs + TSI721_IDQ_MASK(IDB_QUEUE));
+        iowrite32(TSI721_IDQ_INIT, priv->regs + TSI721_IDQ_CTL(IDB_QUEUE));
+        iowrite32(0, priv->regs + TSI721_IDQ_RP(IDB_QUEUE));
+        return 0;
+}
+static void tsi721_doorbell_free(struct tsi721_device *priv)
+{
+        if (priv->idb_base == NULL)
+                return;
+        /* Free buffer allocated for inbound doorbell queue */
+        dma_free_coherent(&priv->pdev->dev, IDB_QSIZE * TSI721_IDB_ENTRY_SIZE,
+                          priv->idb_base, priv->idb_dma);
+        priv->idb_base = NULL;
+}
+static int tsi721_bdma_ch_init(struct tsi721_device *priv, int chnum)
+{
+        struct tsi721_dma_desc *bd_ptr;
+        u64             *sts_ptr;
+        dma_addr_t      bd_phys, sts_phys;
+        int             sts_size;
+        int             bd_num = priv->bdma[chnum].bd_num;
+        dev_dbg(&priv->pdev->dev, "Init Block DMA Engine, CH%d\n", chnum);
+        /*
+         * Initialize DMA channel for maintenance requests
+         */
+        /* Allocate space for DMA descriptors */
+        bd_ptr = dma_alloc_coherent(&priv->pdev->dev,
+                                        bd_num * sizeof(struct tsi721_dma_desc),
+                                        &bd_phys, GFP_KERNEL);
+        if (!bd_ptr)
+                return -ENOMEM;
+        priv->bdma[chnum].bd_phys = bd_phys;
+        priv->bdma[chnum].bd_base = bd_ptr;
+        memset(bd_ptr, 0, bd_num * sizeof(struct tsi721_dma_desc));
+        dev_dbg(&priv->pdev->dev, "DMA descriptors @ %p (phys = %llx)\n",
+                bd_ptr, (unsigned long long)bd_phys);
+        /* Allocate space for descriptor status FIFO */
+        sts_size = (bd_num >= TSI721_DMA_MINSTSSZ) ?
+                                        bd_num : TSI721_DMA_MINSTSSZ;
+        sts_size = roundup_pow_of_two(sts_size);
+        sts_ptr = dma_alloc_coherent(&priv->pdev->dev,
+                                     sts_size * sizeof(struct tsi721_dma_sts),
+                                     &sts_phys, GFP_KERNEL);
+        if (!sts_ptr) {
+                /* Free space allocated for DMA descriptors */
+                dma_free_coherent(&priv->pdev->dev,
+                                  bd_num * sizeof(struct tsi721_dma_desc),
+                                  bd_ptr, bd_phys);
+                priv->bdma[chnum].bd_base = NULL;
+                return -ENOMEM;
+        }
+        priv->bdma[chnum].sts_phys = sts_phys;
+        priv->bdma[chnum].sts_base = sts_ptr;
+        priv->bdma[chnum].sts_size = sts_size;
+        memset(sts_ptr, 0, sts_size);
+        dev_dbg(&priv->pdev->dev,
+                "desc status FIFO @ %p (phys = %llx) size=0x%x\n",
+                sts_ptr, (unsigned long long)sts_phys, sts_size);
+        /* Initialize DMA descriptors ring */
+        bd_ptr[bd_num - 1].type_id = cpu_to_le32(DTYPE3 << 29);
+        bd_ptr[bd_num - 1].next_lo = cpu_to_le32((u64)bd_phys &
+                                                 TSI721_DMAC_DPTRL_MASK);
+        bd_ptr[bd_num - 1].next_hi = cpu_to_le32((u64)bd_phys >> 32);
+        /* Setup DMA descriptor pointers */
+        iowrite32(((u64)bd_phys >> 32),
+                priv->regs + TSI721_DMAC_DPTRH(chnum));
+        iowrite32(((u64)bd_phys & TSI721_DMAC_DPTRL_MASK),
+                priv->regs + TSI721_DMAC_DPTRL(chnum));
+        /* Setup descriptor status FIFO */
+        iowrite32(((u64)sts_phys >> 32),
+                priv->regs + TSI721_DMAC_DSBH(chnum));
+        iowrite32(((u64)sts_phys & TSI721_DMAC_DSBL_MASK),
+                priv->regs + TSI721_DMAC_DSBL(chnum));
+        iowrite32(TSI721_DMAC_DSSZ_SIZE(sts_size),
+                priv->regs + TSI721_DMAC_DSSZ(chnum));
+        /* Clear interrupt bits */
+        iowrite32(TSI721_DMAC_INT_ALL,
+                priv->regs + TSI721_DMAC_INT(chnum));
+        ioread32(priv->regs + TSI721_DMAC_INT(chnum));
+        /* Toggle DMA channel initialization */
+        iowrite32(TSI721_DMAC_CTL_INIT, priv->regs + TSI721_DMAC_CTL(chnum));
+        ioread32(priv->regs + TSI721_DMAC_CTL(chnum));
+        udelay(10);
+        return 0;
+}
+static int tsi721_bdma_ch_free(struct tsi721_device *priv, int chnum)
+{
+        u32 ch_stat;
+        if (priv->bdma[chnum].bd_base == NULL)
+                return 0;
+        /* Check if DMA channel still running */
+        ch_stat = ioread32(priv->regs + TSI721_DMAC_STS(chnum));
+        if (ch_stat & TSI721_DMAC_STS_RUN)
+                return -EFAULT;
+        /* Put DMA channel into init state */
+        iowrite32(TSI721_DMAC_CTL_INIT,
+                priv->regs + TSI721_DMAC_CTL(chnum));
+        /* Free space allocated for DMA descriptors */
+        dma_free_coherent(&priv->pdev->dev,
+                priv->bdma[chnum].bd_num * sizeof(struct tsi721_dma_desc),
+                priv->bdma[chnum].bd_base, priv->bdma[chnum].bd_phys);
+        priv->bdma[chnum].bd_base = NULL;
+        /* Free space allocated for status FIFO */
+        dma_free_coherent(&priv->pdev->dev,
+                priv->bdma[chnum].sts_size * sizeof(struct tsi721_dma_sts),
+                priv->bdma[chnum].sts_base, priv->bdma[chnum].sts_phys);
+        priv->bdma[chnum].sts_base = NULL;
+        return 0;
+}
+static int tsi721_bdma_init(struct tsi721_device *priv)
+{
+        /* Initialize BDMA channel allocated for RapidIO maintenance read/write
+         * request generation
+         */
+        priv->bdma[TSI721_DMACH_MAINT].bd_num = 2;
+        if (tsi721_bdma_ch_init(priv, TSI721_DMACH_MAINT)) {
+                dev_err(&priv->pdev->dev, "Unable to initialize maintenance DMA"
+                        " channel %d, aborting\n", TSI721_DMACH_MAINT);
+                return -ENOMEM;
+        }
+        return 0;
+}
+static void tsi721_bdma_free(struct tsi721_device *priv)
+{
+        tsi721_bdma_ch_free(priv, TSI721_DMACH_MAINT);
+}
+/* Enable Inbound Messaging Interrupts */
+static void
+tsi721_imsg_interrupt_enable(struct tsi721_device *priv, int ch,
+                                  u32 inte_mask)
+{
+        u32 rval;
+        if (!inte_mask)
+                return;
+        /* Clear pending Inbound Messaging interrupts */
+        iowrite32(inte_mask, priv->regs + TSI721_IBDMAC_INT(ch));
+        /* Enable Inbound Messaging interrupts */
+        rval = ioread32(priv->regs + TSI721_IBDMAC_INTE(ch));
+        iowrite32(rval | inte_mask, priv->regs + TSI721_IBDMAC_INTE(ch));
+        if (priv->flags & TSI721_USING_MSIX)
+                return; /* Finished if we are in MSI-X mode */
+        /*
+         * For MSI and INTA interrupt signalling we need to enable next levels
+         */
+        /* Enable Device Channel Interrupt */
+        rval = ioread32(priv->regs + TSI721_DEV_CHAN_INTE);
+        iowrite32(rval | TSI721_INT_IMSG_CHAN(ch),
+                  priv->regs + TSI721_DEV_CHAN_INTE);
+}
+/* Disable Inbound Messaging Interrupts */
+static void
+tsi721_imsg_interrupt_disable(struct tsi721_device *priv, int ch,
+                                   u32 inte_mask)
+{
+        u32 rval;
+        if (!inte_mask)
+                return;
+        /* Clear pending Inbound Messaging interrupts */
+        iowrite32(inte_mask, priv->regs + TSI721_IBDMAC_INT(ch));
+        /* Disable Inbound Messaging interrupts */
+        rval = ioread32(priv->regs + TSI721_IBDMAC_INTE(ch));
+        rval &= ~inte_mask;
+        iowrite32(rval, priv->regs + TSI721_IBDMAC_INTE(ch));
+        if (priv->flags & TSI721_USING_MSIX)
+                return; /* Finished if we are in MSI-X mode */
+        /*
+         * For MSI and INTA interrupt signalling we need to disable next levels
+         */
+        /* Disable Device Channel Interrupt */
+        rval = ioread32(priv->regs + TSI721_DEV_CHAN_INTE);
+        rval &= ~TSI721_INT_IMSG_CHAN(ch);
+        iowrite32(rval, priv->regs + TSI721_DEV_CHAN_INTE);
+}
+/* Enable Outbound Messaging interrupts */
+static void
+tsi721_omsg_interrupt_enable(struct tsi721_device *priv, int ch,
+                                  u32 inte_mask)
+{
+        u32 rval;
+        if (!inte_mask)
+                return;
+        /* Clear pending Outbound Messaging interrupts */
+        iowrite32(inte_mask, priv->regs + TSI721_OBDMAC_INT(ch));
+        /* Enable Outbound Messaging channel interrupts */
+        rval = ioread32(priv->regs + TSI721_OBDMAC_INTE(ch));
+        iowrite32(rval | inte_mask, priv->regs + TSI721_OBDMAC_INTE(ch));
+        if (priv->flags & TSI721_USING_MSIX)
+                return; /* Finished if we are in MSI-X mode */
+        /*
+         * For MSI and INTA interrupt signalling we need to enable next levels
+         */
+        /* Enable Device Channel Interrupt */
+        rval = ioread32(priv->regs + TSI721_DEV_CHAN_INTE);
+        iowrite32(rval | TSI721_INT_OMSG_CHAN(ch),
+                  priv->regs + TSI721_DEV_CHAN_INTE);
+}
+/* Disable Outbound Messaging interrupts */
+static void
+tsi721_omsg_interrupt_disable(struct tsi721_device *priv, int ch,
+                                   u32 inte_mask)
+{
+        u32 rval;
+        if (!inte_mask)
+                return;
+        /* Clear pending Outbound Messaging interrupts */
+        iowrite32(inte_mask, priv->regs + TSI721_OBDMAC_INT(ch));
+        /* Disable Outbound Messaging interrupts */
+        rval = ioread32(priv->regs + TSI721_OBDMAC_INTE(ch));
+        rval &= ~inte_mask;
+        iowrite32(rval, priv->regs + TSI721_OBDMAC_INTE(ch));
+        if (priv->flags & TSI721_USING_MSIX)
+                return; /* Finished if we are in MSI-X mode */
+        /*
+         * For MSI and INTA interrupt signalling we need to disable next levels
+         */
+        /* Disable Device Channel Interrupt */
+        rval = ioread32(priv->regs + TSI721_DEV_CHAN_INTE);
+        rval &= ~TSI721_INT_OMSG_CHAN(ch);
+        iowrite32(rval, priv->regs + TSI721_DEV_CHAN_INTE);
+}
+/**
+ * tsi721_add_outb_message - Add message to the Tsi721 outbound message queue
+ * @mport: Master port with outbound message queue
+ * @rdev: Target of outbound message
+ * @mbox: Outbound mailbox
+ * @buffer: Message to add to outbound queue
+ * @len: Length of message
+ */
+static int
+tsi721_add_outb_message(struct rio_mport *mport, struct rio_dev *rdev, int mbox,
+                        void *buffer, size_t len)
+{
+        struct tsi721_device *priv = mport->priv;
+        struct tsi721_omsg_desc *desc;
+        u32 tx_slot;
+        if (!priv->omsg_init[mbox] ||
+            len > TSI721_MSG_MAX_SIZE || len < 8)
+                return -EINVAL;
+        tx_slot = priv->omsg_ring[mbox].tx_slot;
+        /* Copy copy message into transfer buffer */
+        memcpy(priv->omsg_ring[mbox].omq_base[tx_slot], buffer, len);
+        if (len & 0x7)
+                len += 8;
+        /* Build descriptor associated with buffer */
+        desc = priv->omsg_ring[mbox].omd_base;
+        desc[tx_slot].type_id = cpu_to_le32((DTYPE4 << 29) | rdev->destid);
+        if (tx_slot % 4 == 0)
+                desc[tx_slot].type_id |= cpu_to_le32(TSI721_OMD_IOF);
+        desc[tx_slot].msg_info =
+                cpu_to_le32((mport->sys_size << 26) | (mbox << 22) |
+                            (0xe << 12) | (len & 0xff8));
+        desc[tx_slot].bufptr_lo =
+                cpu_to_le32((u64)priv->omsg_ring[mbox].omq_phys[tx_slot] &
+                            0xffffffff);
+        desc[tx_slot].bufptr_hi =
+                cpu_to_le32((u64)priv->omsg_ring[mbox].omq_phys[tx_slot] >> 32);
+        priv->omsg_ring[mbox].wr_count++;
+        /* Go to next descriptor */
+        if (++priv->omsg_ring[mbox].tx_slot == priv->omsg_ring[mbox].size) {
+                priv->omsg_ring[mbox].tx_slot = 0;
+                /* Move through the ring link descriptor at the end */
+                priv->omsg_ring[mbox].wr_count++;
+        }
+        mb();
+        /* Set new write count value */
+        iowrite32(priv->omsg_ring[mbox].wr_count,
+                priv->regs + TSI721_OBDMAC_DWRCNT(mbox));
+        ioread32(priv->regs + TSI721_OBDMAC_DWRCNT(mbox));
+        return 0;
+}
+/**
+ * tsi721_omsg_handler - Outbound Message Interrupt Handler
+ * @priv: pointer to tsi721 private data
+ * @ch:   number of OB MSG channel to service
+ *
+ * Services channel interrupts from outbound messaging engine.
+ */
+static void tsi721_omsg_handler(struct tsi721_device *priv, int ch)
+{
+        u32 omsg_int;
+        spin_lock(&priv->omsg_ring[ch].lock);
+        omsg_int = ioread32(priv->regs + TSI721_OBDMAC_INT(ch));
+        if (omsg_int & TSI721_OBDMAC_INT_ST_FULL)
+                dev_info(&priv->pdev->dev,
+                        "OB MBOX%d: Status FIFO is full\n", ch);
+        if (omsg_int & (TSI721_OBDMAC_INT_DONE | TSI721_OBDMAC_INT_IOF_DONE)) {
+                u32 srd_ptr;
+                u64 *sts_ptr, last_ptr = 0, prev_ptr = 0;
+                int i, j;
+                u32 tx_slot;
+                /*
+                 * Find last successfully processed descriptor
+                 */
+                /* Check and clear descriptor status FIFO entries */
+                srd_ptr = priv->omsg_ring[ch].sts_rdptr;
+                sts_ptr = priv->omsg_ring[ch].sts_base;
+                j = srd_ptr * 8;
+                while (sts_ptr[j]) {
+                        for (i = 0; i < 8 && sts_ptr[j]; i++, j++) {
+                                prev_ptr = last_ptr;
+                                last_ptr = le64_to_cpu(sts_ptr[j]);
+                                sts_ptr[j] = 0;
+                        }
+                        ++srd_ptr;
+                        srd_ptr %= priv->omsg_ring[ch].sts_size;
+                        j = srd_ptr * 8;
+                }
+                if (last_ptr == 0)
+                        goto no_sts_update;
+                priv->omsg_ring[ch].sts_rdptr = srd_ptr;
+                iowrite32(srd_ptr, priv->regs + TSI721_OBDMAC_DSRP(ch));
+                if (!priv->mport->outb_msg[ch].mcback)
+                        goto no_sts_update;
+                /* Inform upper layer about transfer completion */
+                tx_slot = (last_ptr - (u64)priv->omsg_ring[ch].omd_phys)/
+                                                sizeof(struct tsi721_omsg_desc);
+                /*
+                 * Check if this is a Link Descriptor (LD).
+                 * If yes, ignore LD and use descriptor processed
+                 * before LD.
+                 */
+                if (tx_slot == priv->omsg_ring[ch].size) {
+                        if (prev_ptr)
+                                tx_slot = (prev_ptr -
+                                        (u64)priv->omsg_ring[ch].omd_phys)/
+                                                sizeof(struct tsi721_omsg_desc);
+                        else
+                                goto no_sts_update;
+                }
+                /* Move slot index to the next message to be sent */
+                ++tx_slot;
+                if (tx_slot == priv->omsg_ring[ch].size)
+                        tx_slot = 0;
+                BUG_ON(tx_slot >= priv->omsg_ring[ch].size);
+                priv->mport->outb_msg[ch].mcback(priv->mport,
+                                priv->omsg_ring[ch].dev_id, ch,
+                                tx_slot);
+        }
+no_sts_update:
+        if (omsg_int & TSI721_OBDMAC_INT_ERROR) {
+                /*
+                * Outbound message operation aborted due to error,
+                * reinitialize OB MSG channel
+                */
+                dev_dbg(&priv->pdev->dev, "OB MSG ABORT ch_stat=%x\n",
+                        ioread32(priv->regs + TSI721_OBDMAC_STS(ch)));
+                iowrite32(TSI721_OBDMAC_INT_ERROR,
+                                priv->regs + TSI721_OBDMAC_INT(ch));
+                iowrite32(TSI721_OBDMAC_CTL_INIT,
+                                priv->regs + TSI721_OBDMAC_CTL(ch));
+                ioread32(priv->regs + TSI721_OBDMAC_CTL(ch));
+                /* Inform upper level to clear all pending tx slots */
+                if (priv->mport->outb_msg[ch].mcback)
+                        priv->mport->outb_msg[ch].mcback(priv->mport,
+                                        priv->omsg_ring[ch].dev_id, ch,
+                                        priv->omsg_ring[ch].tx_slot);
+                /* Synch tx_slot tracking */
+                iowrite32(priv->omsg_ring[ch].tx_slot,
+                        priv->regs + TSI721_OBDMAC_DRDCNT(ch));
+                ioread32(priv->regs + TSI721_OBDMAC_DRDCNT(ch));
+                priv->omsg_ring[ch].wr_count = priv->omsg_ring[ch].tx_slot;
+                priv->omsg_ring[ch].sts_rdptr = 0;
+        }
+        /* Clear channel interrupts */
+        iowrite32(omsg_int, priv->regs + TSI721_OBDMAC_INT(ch));
+        if (!(priv->flags & TSI721_USING_MSIX)) {
+                u32 ch_inte;
+                /* Re-enable channel interrupts */
+                ch_inte = ioread32(priv->regs + TSI721_DEV_CHAN_INTE);
+                ch_inte |= TSI721_INT_OMSG_CHAN(ch);
+                iowrite32(ch_inte, priv->regs + TSI721_DEV_CHAN_INTE);
+        }
+        spin_unlock(&priv->omsg_ring[ch].lock);
+}
+/**
+ * tsi721_open_outb_mbox - Initialize Tsi721 outbound mailbox
+ * @mport: Master port implementing Outbound Messaging Engine
+ * @dev_id: Device specific pointer to pass on event
+ * @mbox: Mailbox to open
+ * @entries: Number of entries in the outbound mailbox ring
+ */
+static int tsi721_open_outb_mbox(struct rio_mport *mport, void *dev_id,
+                                 int mbox, int entries)
+{
+        struct tsi721_device *priv = mport->priv;
+        struct tsi721_omsg_desc *bd_ptr;
+        int i, rc = 0;
+        if ((entries < TSI721_OMSGD_MIN_RING_SIZE) ||
+            (entries > (TSI721_OMSGD_RING_SIZE)) ||
+            (!is_power_of_2(entries)) || mbox >= RIO_MAX_MBOX) {
+                rc = -EINVAL;
+                goto out;
+        }
+        priv->omsg_ring[mbox].dev_id = dev_id;
+        priv->omsg_ring[mbox].size = entries;
+        priv->omsg_ring[mbox].sts_rdptr = 0;
+        spin_lock_init(&priv->omsg_ring[mbox].lock);
+        /* Outbound Msg Buffer allocation based on
+           the number of maximum descriptor entries */
+        for (i = 0; i < entries; i++) {
+                priv->omsg_ring[mbox].omq_base[i] =
+                        dma_alloc_coherent(
+                                &priv->pdev->dev, TSI721_MSG_BUFFER_SIZE,
+                                &priv->omsg_ring[mbox].omq_phys[i],
+                                GFP_KERNEL);
+                if (priv->omsg_ring[mbox].omq_base[i] == NULL) {
+                        dev_dbg(&priv->pdev->dev,
+                                "Unable to allocate OB MSG data buffer for"
+                                " MBOX%d\n", mbox);
+                        rc = -ENOMEM;
+                        goto out_buf;
+                }
+        }
+        /* Outbound message descriptor allocation */
+        priv->omsg_ring[mbox].omd_base = dma_alloc_coherent(
+                                &priv->pdev->dev,
+                                (entries + 1) * sizeof(struct tsi721_omsg_desc),
+                                &priv->omsg_ring[mbox].omd_phys, GFP_KERNEL);
+        if (priv->omsg_ring[mbox].omd_base == NULL) {
+                dev_dbg(&priv->pdev->dev,
+                        "Unable to allocate OB MSG descriptor memory "
+                        "for MBOX%d\n", mbox);
+                rc = -ENOMEM;
+                goto out_buf;
+        }
+        priv->omsg_ring[mbox].tx_slot = 0;
+        /* Outbound message descriptor status FIFO allocation */
+        priv->omsg_ring[mbox].sts_size = roundup_pow_of_two(entries + 1);
+        priv->omsg_ring[mbox].sts_base = dma_alloc_coherent(&priv->pdev->dev,
+                        priv->omsg_ring[mbox].sts_size *
+                                                sizeof(struct tsi721_dma_sts),
+                        &priv->omsg_ring[mbox].sts_phys, GFP_KERNEL);
+        if (priv->omsg_ring[mbox].sts_base == NULL) {
+                dev_dbg(&priv->pdev->dev,
+                        "Unable to allocate OB MSG descriptor status FIFO "
+                        "for MBOX%d\n", mbox);
+                rc = -ENOMEM;
+                goto out_desc;
+        }
+        memset(priv->omsg_ring[mbox].sts_base, 0,
+                entries * sizeof(struct tsi721_dma_sts));
+        /*
+         * Configure Outbound Messaging Engine
+         */
+        /* Setup Outbound Message descriptor pointer */
+        iowrite32(((u64)priv->omsg_ring[mbox].omd_phys >> 32),
+                        priv->regs + TSI721_OBDMAC_DPTRH(mbox));
+        iowrite32(((u64)priv->omsg_ring[mbox].omd_phys &
+                                        TSI721_OBDMAC_DPTRL_MASK),
+                        priv->regs + TSI721_OBDMAC_DPTRL(mbox));
+        /* Setup Outbound Message descriptor status FIFO */
+        iowrite32(((u64)priv->omsg_ring[mbox].sts_phys >> 32),
+                        priv->regs + TSI721_OBDMAC_DSBH(mbox));
+        iowrite32(((u64)priv->omsg_ring[mbox].sts_phys &
+                                        TSI721_OBDMAC_DSBL_MASK),
+                        priv->regs + TSI721_OBDMAC_DSBL(mbox));
+        iowrite32(TSI721_DMAC_DSSZ_SIZE(priv->omsg_ring[mbox].sts_size),
+                priv->regs + (u32)TSI721_OBDMAC_DSSZ(mbox));
+        /* Enable interrupts */
+#ifdef CONFIG_PCI_MSI
+        if (priv->flags & TSI721_USING_MSIX) {
+                /* Request interrupt service if we are in MSI-X mode */
+                rc = request_irq(
+                        priv->msix[TSI721_VECT_OMB0_DONE + mbox].vector,
+                        tsi721_omsg_msix, 0,
+                        priv->msix[TSI721_VECT_OMB0_DONE + mbox].irq_name,
+                        (void *)mport);
+                if (rc) {
+                        dev_dbg(&priv->pdev->dev,
+                                "Unable to allocate MSI-X interrupt for "
+                                "OBOX%d-DONE\n", mbox);
+                        goto out_stat;
+                }
+                rc = request_irq(priv->msix[TSI721_VECT_OMB0_INT + mbox].vector,
+                        tsi721_omsg_msix, 0,
+                        priv->msix[TSI721_VECT_OMB0_INT + mbox].irq_name,
+                        (void *)mport);
+                if (rc) {
+                        dev_dbg(&priv->pdev->dev,
+                                "Unable to allocate MSI-X interrupt for "
+                                "MBOX%d-INT\n", mbox);
+                        free_irq(
+                                priv->msix[TSI721_VECT_OMB0_DONE + mbox].vector,
+                                (void *)mport);
+                        goto out_stat;
+                }
+        }
+#endif /* CONFIG_PCI_MSI */
+        tsi721_omsg_interrupt_enable(priv, mbox, TSI721_OBDMAC_INT_ALL);
+        /* Initialize Outbound Message descriptors ring */
+        bd_ptr = priv->omsg_ring[mbox].omd_base;
+        bd_ptr[entries].type_id = cpu_to_le32(DTYPE5 << 29);
+        bd_ptr[entries].msg_info = 0;
+        bd_ptr[entries].next_lo =
+                cpu_to_le32((u64)priv->omsg_ring[mbox].omd_phys &
+                TSI721_OBDMAC_DPTRL_MASK);
+        bd_ptr[entries].next_hi =
+                cpu_to_le32((u64)priv->omsg_ring[mbox].omd_phys >> 32);
+        priv->omsg_ring[mbox].wr_count = 0;
+        mb();
+        /* Initialize Outbound Message engine */
+        iowrite32(TSI721_OBDMAC_CTL_INIT, priv->regs + TSI721_OBDMAC_CTL(mbox));
+        ioread32(priv->regs + TSI721_OBDMAC_DWRCNT(mbox));
+        udelay(10);
+        priv->omsg_init[mbox] = 1;
+        return 0;
+#ifdef CONFIG_PCI_MSI
+out_stat:
+        dma_free_coherent(&priv->pdev->dev,
+                priv->omsg_ring[mbox].sts_size * sizeof(struct tsi721_dma_sts),
+                priv->omsg_ring[mbox].sts_base,
+                priv->omsg_ring[mbox].sts_phys);
+        priv->omsg_ring[mbox].sts_base = NULL;
+#endif /* CONFIG_PCI_MSI */
+out_desc:
+        dma_free_coherent(&priv->pdev->dev,
+                (entries + 1) * sizeof(struct tsi721_omsg_desc),
+                priv->omsg_ring[mbox].omd_base,
+                priv->omsg_ring[mbox].omd_phys);
+        priv->omsg_ring[mbox].omd_base = NULL;
+out_buf:
+        for (i = 0; i < priv->omsg_ring[mbox].size; i++) {
+                if (priv->omsg_ring[mbox].omq_base[i]) {
+                        dma_free_coherent(&priv->pdev->dev,
+                                TSI721_MSG_BUFFER_SIZE,
+                                priv->omsg_ring[mbox].omq_base[i],
+                                priv->omsg_ring[mbox].omq_phys[i]);
+                        priv->omsg_ring[mbox].omq_base[i] = NULL;
+                }
+        }
+out:
+        return rc;
+}
+/**
+ * tsi721_close_outb_mbox - Close Tsi721 outbound mailbox
+ * @mport: Master port implementing the outbound message unit
+ * @mbox: Mailbox to close
+ */
+static void tsi721_close_outb_mbox(struct rio_mport *mport, int mbox)
+{
+        struct tsi721_device *priv = mport->priv;
+        u32 i;
+        if (!priv->omsg_init[mbox])
+                return;
+        priv->omsg_init[mbox] = 0;
+        /* Disable Interrupts */
+        tsi721_omsg_interrupt_disable(priv, mbox, TSI721_OBDMAC_INT_ALL);
+#ifdef CONFIG_PCI_MSI
+        if (priv->flags & TSI721_USING_MSIX) {
+                free_irq(priv->msix[TSI721_VECT_OMB0_DONE + mbox].vector,
+                         (void *)mport);
+                free_irq(priv->msix[TSI721_VECT_OMB0_INT + mbox].vector,
+                         (void *)mport);
+        }
+#endif /* CONFIG_PCI_MSI */
+        /* Free OMSG Descriptor Status FIFO */
+        dma_free_coherent(&priv->pdev->dev,
+                priv->omsg_ring[mbox].sts_size * sizeof(struct tsi721_dma_sts),
+                priv->omsg_ring[mbox].sts_base,
+                priv->omsg_ring[mbox].sts_phys);
+        priv->omsg_ring[mbox].sts_base = NULL;
+        /* Free OMSG descriptors */
+        dma_free_coherent(&priv->pdev->dev,
+                (priv->omsg_ring[mbox].size + 1) *
+                        sizeof(struct tsi721_omsg_desc),
+                priv->omsg_ring[mbox].omd_base,
+                priv->omsg_ring[mbox].omd_phys);
+        priv->omsg_ring[mbox].omd_base = NULL;
+        /* Free message buffers */
+        for (i = 0; i < priv->omsg_ring[mbox].size; i++) {
+                if (priv->omsg_ring[mbox].omq_base[i]) {
+                        dma_free_coherent(&priv->pdev->dev,
+                                TSI721_MSG_BUFFER_SIZE,
+                                priv->omsg_ring[mbox].omq_base[i],
+                                priv->omsg_ring[mbox].omq_phys[i]);
+                        priv->omsg_ring[mbox].omq_base[i] = NULL;
+                }
+        }
+}
+/**
+ * tsi721_imsg_handler - Inbound Message Interrupt Handler
+ * @priv: pointer to tsi721 private data
+ * @ch: inbound message channel number to service
+ *
+ * Services channel interrupts from inbound messaging engine.
+ */
+static void tsi721_imsg_handler(struct tsi721_device *priv, int ch)
+{
+        u32 mbox = ch - 4;
+        u32 imsg_int;
+        spin_lock(&priv->imsg_ring[mbox].lock);
+        imsg_int = ioread32(priv->regs + TSI721_IBDMAC_INT(ch));
+        if (imsg_int & TSI721_IBDMAC_INT_SRTO)
+                dev_info(&priv->pdev->dev, "IB MBOX%d SRIO timeout\n",
+                        mbox);
+        if (imsg_int & TSI721_IBDMAC_INT_PC_ERROR)
+                dev_info(&priv->pdev->dev, "IB MBOX%d PCIe error\n",
+                        mbox);
+        if (imsg_int & TSI721_IBDMAC_INT_FQ_LOW)
+                dev_info(&priv->pdev->dev,
+                        "IB MBOX%d IB free queue low\n", mbox);
+        /* Clear IB channel interrupts */
+        iowrite32(imsg_int, priv->regs + TSI721_IBDMAC_INT(ch));
+        /* If an IB Msg is received notify the upper layer */
+        if (imsg_int & TSI721_IBDMAC_INT_DQ_RCV &&
+                priv->mport->inb_msg[mbox].mcback)
+                priv->mport->inb_msg[mbox].mcback(priv->mport,
+                                priv->imsg_ring[mbox].dev_id, mbox, -1);
+        if (!(priv->flags & TSI721_USING_MSIX)) {
+                u32 ch_inte;
+                /* Re-enable channel interrupts */
+                ch_inte = ioread32(priv->regs + TSI721_DEV_CHAN_INTE);
+                ch_inte |= TSI721_INT_IMSG_CHAN(ch);
+                iowrite32(ch_inte, priv->regs + TSI721_DEV_CHAN_INTE);
+        }
+        spin_unlock(&priv->imsg_ring[mbox].lock);
+}
+/**
+ * tsi721_open_inb_mbox - Initialize Tsi721 inbound mailbox
+ * @mport: Master port implementing the Inbound Messaging Engine
+ * @dev_id: Device specific pointer to pass on event
+ * @mbox: Mailbox to open
+ * @entries: Number of entries in the inbound mailbox ring
+ */
+static int tsi721_open_inb_mbox(struct rio_mport *mport, void *dev_id,
+                                int mbox, int entries)
+{
+        struct tsi721_device *priv = mport->priv;
+        int ch = mbox + 4;
+        int i;
+        u64 *free_ptr;
+        int rc = 0;
+        if ((entries < TSI721_IMSGD_MIN_RING_SIZE) ||
+            (entries > TSI721_IMSGD_RING_SIZE) ||
+            (!is_power_of_2(entries)) || mbox >= RIO_MAX_MBOX) {
+                rc = -EINVAL;
+                goto out;
+        }
+        /* Initialize IB Messaging Ring */
+        priv->imsg_ring[mbox].dev_id = dev_id;
+        priv->imsg_ring[mbox].size = entries;
+        priv->imsg_ring[mbox].rx_slot = 0;
+        priv->imsg_ring[mbox].desc_rdptr = 0;
+        priv->imsg_ring[mbox].fq_wrptr = 0;
+        for (i = 0; i < priv->imsg_ring[mbox].size; i++)
+                priv->imsg_ring[mbox].imq_base[i] = NULL;
+        spin_lock_init(&priv->imsg_ring[mbox].lock);
+        /* Allocate buffers for incoming messages */
+        priv->imsg_ring[mbox].buf_base =
+                dma_alloc_coherent(&priv->pdev->dev,
+                                   entries * TSI721_MSG_BUFFER_SIZE,
+                                   &priv->imsg_ring[mbox].buf_phys,
+                                   GFP_KERNEL);
+        if (priv->imsg_ring[mbox].buf_base == NULL) {
+                dev_err(&priv->pdev->dev,
+                        "Failed to allocate buffers for IB MBOX%d\n", mbox);
+                rc = -ENOMEM;
+                goto out;
+        }
+        /* Allocate memory for circular free list */
+        priv->imsg_ring[mbox].imfq_base =
+                dma_alloc_coherent(&priv->pdev->dev,
+                                   entries * 8,
+                                   &priv->imsg_ring[mbox].imfq_phys,
+                                   GFP_KERNEL);
+        if (priv->imsg_ring[mbox].imfq_base == NULL) {
+                dev_err(&priv->pdev->dev,
+                        "Failed to allocate free queue for IB MBOX%d\n", mbox);
+                rc = -ENOMEM;
+                goto out_buf;
+        }
+        /* Allocate memory for Inbound message descriptors */
+        priv->imsg_ring[mbox].imd_base =
+                dma_alloc_coherent(&priv->pdev->dev,
+                                   entries * sizeof(struct tsi721_imsg_desc),
+                                   &priv->imsg_ring[mbox].imd_phys, GFP_KERNEL);
+        if (priv->imsg_ring[mbox].imd_base == NULL) {
+                dev_err(&priv->pdev->dev,
+                        "Failed to allocate descriptor memory for IB MBOX%d\n",
+                        mbox);
+                rc = -ENOMEM;
+                goto out_dma;
+        }
+        /* Fill free buffer pointer list */
+        free_ptr = priv->imsg_ring[mbox].imfq_base;
+        for (i = 0; i < entries; i++)
+                free_ptr[i] = cpu_to_le64(
+                                (u64)(priv->imsg_ring[mbox].buf_phys) +
+                                i * 0x1000);
+        mb();
+        /*
+         * For mapping of inbound SRIO Messages into appropriate queues we need
+         * to set Inbound Device ID register in the messaging engine. We do it
+         * once when first inbound mailbox is requested.
+         */
+        if (!(priv->flags & TSI721_IMSGID_SET)) {
+                iowrite32((u32)priv->mport->host_deviceid,
+                        priv->regs + TSI721_IB_DEVID);
+                priv->flags |= TSI721_IMSGID_SET;
+        }
+        /*
+         * Configure Inbound Messaging channel (ch = mbox + 4)
+         */
+        /* Setup Inbound Message free queue */
+        iowrite32(((u64)priv->imsg_ring[mbox].imfq_phys >> 32),
+                priv->regs + TSI721_IBDMAC_FQBH(ch));
+        iowrite32(((u64)priv->imsg_ring[mbox].imfq_phys &
+                        TSI721_IBDMAC_FQBL_MASK),
+                priv->regs+TSI721_IBDMAC_FQBL(ch));
+        iowrite32(TSI721_DMAC_DSSZ_SIZE(entries),
+                priv->regs + TSI721_IBDMAC_FQSZ(ch));
+        /* Setup Inbound Message descriptor queue */
+        iowrite32(((u64)priv->imsg_ring[mbox].imd_phys >> 32),
+                priv->regs + TSI721_IBDMAC_DQBH(ch));
+        iowrite32(((u32)priv->imsg_ring[mbox].imd_phys &
+                   (u32)TSI721_IBDMAC_DQBL_MASK),
+                priv->regs+TSI721_IBDMAC_DQBL(ch));
+        iowrite32(TSI721_DMAC_DSSZ_SIZE(entries),
+                priv->regs + TSI721_IBDMAC_DQSZ(ch));
+        /* Enable interrupts */
+#ifdef CONFIG_PCI_MSI
+        if (priv->flags & TSI721_USING_MSIX) {
+                /* Request interrupt service if we are in MSI-X mode */
+                rc = request_irq(priv->msix[TSI721_VECT_IMB0_RCV + mbox].vector,
+                        tsi721_imsg_msix, 0,
+                        priv->msix[TSI721_VECT_IMB0_RCV + mbox].irq_name,
+                        (void *)mport);
+                if (rc) {
+                        dev_dbg(&priv->pdev->dev,
+                                "Unable to allocate MSI-X interrupt for "
+                                "IBOX%d-DONE\n", mbox);
+                        goto out_desc;
+                }
+                rc = request_irq(priv->msix[TSI721_VECT_IMB0_INT + mbox].vector,
+                        tsi721_imsg_msix, 0,
+                        priv->msix[TSI721_VECT_IMB0_INT + mbox].irq_name,
+                        (void *)mport);
+                if (rc) {
+                        dev_dbg(&priv->pdev->dev,
+                                "Unable to allocate MSI-X interrupt for "
+                                "IBOX%d-INT\n", mbox);
+                        free_irq(
+                                priv->msix[TSI721_VECT_IMB0_RCV + mbox].vector,
+                                (void *)mport);
+                        goto out_desc;
+                }
+        }
+#endif /* CONFIG_PCI_MSI */
+        tsi721_imsg_interrupt_enable(priv, ch, TSI721_IBDMAC_INT_ALL);
+        /* Initialize Inbound Message Engine */
+        iowrite32(TSI721_IBDMAC_CTL_INIT, priv->regs + TSI721_IBDMAC_CTL(ch));
+        ioread32(priv->regs + TSI721_IBDMAC_CTL(ch));
+        udelay(10);
+        priv->imsg_ring[mbox].fq_wrptr = entries - 1;
+        iowrite32(entries - 1, priv->regs + TSI721_IBDMAC_FQWP(ch));
+        priv->imsg_init[mbox] = 1;
+        return 0;
+#ifdef CONFIG_PCI_MSI
+out_desc:
+        dma_free_coherent(&priv->pdev->dev,
+                priv->imsg_ring[mbox].size * sizeof(struct tsi721_imsg_desc),
+                priv->imsg_ring[mbox].imd_base,
+                priv->imsg_ring[mbox].imd_phys);
+        priv->imsg_ring[mbox].imd_base = NULL;
+#endif /* CONFIG_PCI_MSI */
+out_dma:
+        dma_free_coherent(&priv->pdev->dev,
+                priv->imsg_ring[mbox].size * 8,
+                priv->imsg_ring[mbox].imfq_base,
+                priv->imsg_ring[mbox].imfq_phys);
+        priv->imsg_ring[mbox].imfq_base = NULL;
+out_buf:
+        dma_free_coherent(&priv->pdev->dev,
+                priv->imsg_ring[mbox].size * TSI721_MSG_BUFFER_SIZE,
+                priv->imsg_ring[mbox].buf_base,
+                priv->imsg_ring[mbox].buf_phys);
+        priv->imsg_ring[mbox].buf_base = NULL;
+out:
+        return rc;
+}
+/**
+ * tsi721_close_inb_mbox - Shut down Tsi721 inbound mailbox
+ * @mport: Master port implementing the Inbound Messaging Engine
+ * @mbox: Mailbox to close
+ */
+static void tsi721_close_inb_mbox(struct rio_mport *mport, int mbox)
+{
+        struct tsi721_device *priv = mport->priv;
+        u32 rx_slot;
+        int ch = mbox + 4;
+        if (!priv->imsg_init[mbox]) /* mbox isn't initialized yet */
+                return;
+        priv->imsg_init[mbox] = 0;
+        /* Disable Inbound Messaging Engine */
+        /* Disable Interrupts */
+        tsi721_imsg_interrupt_disable(priv, ch, TSI721_OBDMAC_INT_MASK);
+#ifdef CONFIG_PCI_MSI
+        if (priv->flags & TSI721_USING_MSIX) {
+                free_irq(priv->msix[TSI721_VECT_IMB0_RCV + mbox].vector,
+                                (void *)mport);
+                free_irq(priv->msix[TSI721_VECT_IMB0_INT + mbox].vector,
+                                (void *)mport);
+        }
+#endif /* CONFIG_PCI_MSI */
+        /* Clear Inbound Buffer Queue */
+        for (rx_slot = 0; rx_slot < priv->imsg_ring[mbox].size; rx_slot++)
+                priv->imsg_ring[mbox].imq_base[rx_slot] = NULL;
+        /* Free memory allocated for message buffers */
+        dma_free_coherent(&priv->pdev->dev,
+                priv->imsg_ring[mbox].size * TSI721_MSG_BUFFER_SIZE,
+                priv->imsg_ring[mbox].buf_base,
+                priv->imsg_ring[mbox].buf_phys);
+        priv->imsg_ring[mbox].buf_base = NULL;
+        /* Free memory allocated for free pointr list */
+        dma_free_coherent(&priv->pdev->dev,
+                priv->imsg_ring[mbox].size * 8,
+                priv->imsg_ring[mbox].imfq_base,
+                priv->imsg_ring[mbox].imfq_phys);
+        priv->imsg_ring[mbox].imfq_base = NULL;
+        /* Free memory allocated for RX descriptors */
+        dma_free_coherent(&priv->pdev->dev,
+                priv->imsg_ring[mbox].size * sizeof(struct tsi721_imsg_desc),
+                priv->imsg_ring[mbox].imd_base,
+                priv->imsg_ring[mbox].imd_phys);
+        priv->imsg_ring[mbox].imd_base = NULL;
+}
+/**
+ * tsi721_add_inb_buffer - Add buffer to the Tsi721 inbound message queue
+ * @mport: Master port implementing the Inbound Messaging Engine
+ * @mbox: Inbound mailbox number
+ * @buf: Buffer to add to inbound queue
+ */
+static int tsi721_add_inb_buffer(struct rio_mport *mport, int mbox, void *buf)
+{
+        struct tsi721_device *priv = mport->priv;
+        u32 rx_slot;
+        int rc = 0;
+        rx_slot = priv->imsg_ring[mbox].rx_slot;
+        if (priv->imsg_ring[mbox].imq_base[rx_slot]) {
+                dev_err(&priv->pdev->dev,
+                        "Error adding inbound buffer %d, buffer exists\n",
+                        rx_slot);
+                rc = -EINVAL;
+                goto out;
+        }
+        priv->imsg_ring[mbox].imq_base[rx_slot] = buf;
+        if (++priv->imsg_ring[mbox].rx_slot == priv->imsg_ring[mbox].size)
+                priv->imsg_ring[mbox].rx_slot = 0;
+out:
+        return rc;
+}
+/**
+ * tsi721_get_inb_message - Fetch inbound message from the Tsi721 MSG Queue
+ * @mport: Master port implementing the Inbound Messaging Engine
+ * @mbox: Inbound mailbox number
+ *
+ * Returns pointer to the message on success or NULL on failure.
+ */
+static void *tsi721_get_inb_message(struct rio_mport *mport, int mbox)
+{
+        struct tsi721_device *priv = mport->priv;
+        struct tsi721_imsg_desc *desc;
+        u32 rx_slot;
+        void *rx_virt = NULL;
+        u64 rx_phys;
+        void *buf = NULL;
+        u64 *free_ptr;
+        int ch = mbox + 4;
+        int msg_size;
+        if (!priv->imsg_init[mbox])
+                return NULL;
+        desc = priv->imsg_ring[mbox].imd_base;
+        desc += priv->imsg_ring[mbox].desc_rdptr;
+        if (!(le32_to_cpu(desc->msg_info) & TSI721_IMD_HO))
+                goto out;
+        rx_slot = priv->imsg_ring[mbox].rx_slot;
+        while (priv->imsg_ring[mbox].imq_base[rx_slot] == NULL) {
+                if (++rx_slot == priv->imsg_ring[mbox].size)
+                        rx_slot = 0;
+        }
+        rx_phys = ((u64)le32_to_cpu(desc->bufptr_hi) << 32) |
+                        le32_to_cpu(desc->bufptr_lo);
+        rx_virt = priv->imsg_ring[mbox].buf_base +
+                  (rx_phys - (u64)priv->imsg_ring[mbox].buf_phys);
+        buf = priv->imsg_ring[mbox].imq_base[rx_slot];
+        msg_size = le32_to_cpu(desc->msg_info) & TSI721_IMD_BCOUNT;
+        if (msg_size == 0)
+                msg_size = RIO_MAX_MSG_SIZE;
+        memcpy(buf, rx_virt, msg_size);
+        priv->imsg_ring[mbox].imq_base[rx_slot] = NULL;
+        desc->msg_info &= cpu_to_le32(~TSI721_IMD_HO);
+        if (++priv->imsg_ring[mbox].desc_rdptr == priv->imsg_ring[mbox].size)
+                priv->imsg_ring[mbox].desc_rdptr = 0;
+        iowrite32(priv->imsg_ring[mbox].desc_rdptr,
+                priv->regs + TSI721_IBDMAC_DQRP(ch));
+        /* Return free buffer into the pointer list */
+        free_ptr = priv->imsg_ring[mbox].imfq_base;
+        free_ptr[priv->imsg_ring[mbox].fq_wrptr] = cpu_to_le64(rx_phys);
+        if (++priv->imsg_ring[mbox].fq_wrptr == priv->imsg_ring[mbox].size)
+                priv->imsg_ring[mbox].fq_wrptr = 0;
+        iowrite32(priv->imsg_ring[mbox].fq_wrptr,
+                priv->regs + TSI721_IBDMAC_FQWP(ch));
+out:
+        return buf;
+}
+/**
+ * tsi721_messages_init - Initialization of Messaging Engine
+ * @priv: pointer to tsi721 private data
+ *
+ * Configures Tsi721 messaging engine.
+ */
+static int tsi721_messages_init(struct tsi721_device *priv)
+{
+        int     ch;
+        iowrite32(0, priv->regs + TSI721_SMSG_ECC_LOG);
+        iowrite32(0, priv->regs + TSI721_RETRY_GEN_CNT);
+        iowrite32(0, priv->regs + TSI721_RETRY_RX_CNT);
+        /* Set SRIO Message Request/Response Timeout */
+        iowrite32(TSI721_RQRPTO_VAL, priv->regs + TSI721_RQRPTO);
+        /* Initialize Inbound Messaging Engine Registers */
+        for (ch = 0; ch < TSI721_IMSG_CHNUM; ch++) {
+                /* Clear interrupt bits */
+                iowrite32(TSI721_IBDMAC_INT_MASK,
+                        priv->regs + TSI721_IBDMAC_INT(ch));
+                /* Clear Status */
+                iowrite32(0, priv->regs + TSI721_IBDMAC_STS(ch));
+                iowrite32(TSI721_SMSG_ECC_COR_LOG_MASK,
+                                priv->regs + TSI721_SMSG_ECC_COR_LOG(ch));
+                iowrite32(TSI721_SMSG_ECC_NCOR_MASK,
+                                priv->regs + TSI721_SMSG_ECC_NCOR(ch));
+        }
+        return 0;
+}
+/**
+ * tsi721_disable_ints - disables all device interrupts
+ * @priv: pointer to tsi721 private data
+ */
+static void tsi721_disable_ints(struct tsi721_device *priv)
+{
+        int ch;
+        /* Disable all device level interrupts */
+        iowrite32(0, priv->regs + TSI721_DEV_INTE);
+        /* Disable all Device Channel interrupts */
+        iowrite32(0, priv->regs + TSI721_DEV_CHAN_INTE);
+        /* Disable all Inbound Msg Channel interrupts */
+        for (ch = 0; ch < TSI721_IMSG_CHNUM; ch++)
+                iowrite32(0, priv->regs + TSI721_IBDMAC_INTE(ch));
+        /* Disable all Outbound Msg Channel interrupts */
+        for (ch = 0; ch < TSI721_OMSG_CHNUM; ch++)
+                iowrite32(0, priv->regs + TSI721_OBDMAC_INTE(ch));
+        /* Disable all general messaging interrupts */
+        iowrite32(0, priv->regs + TSI721_SMSG_INTE);
+        /* Disable all BDMA Channel interrupts */
+        for (ch = 0; ch < TSI721_DMA_MAXCH; ch++)
+                iowrite32(0, priv->regs + TSI721_DMAC_INTE(ch));
+        /* Disable all general BDMA interrupts */
+        iowrite32(0, priv->regs + TSI721_BDMA_INTE);
+        /* Disable all SRIO Channel interrupts */
+        for (ch = 0; ch < TSI721_SRIO_MAXCH; ch++)
+                iowrite32(0, priv->regs + TSI721_SR_CHINTE(ch));
+        /* Disable all general SR2PC interrupts */
+        iowrite32(0, priv->regs + TSI721_SR2PC_GEN_INTE);
+        /* Disable all PC2SR interrupts */
+        iowrite32(0, priv->regs + TSI721_PC2SR_INTE);
+        /* Disable all I2C interrupts */
+        iowrite32(0, priv->regs + TSI721_I2C_INT_ENABLE);
+        /* Disable SRIO MAC interrupts */
+        iowrite32(0, priv->regs + TSI721_RIO_EM_INT_ENABLE);
+        iowrite32(0, priv->regs + TSI721_RIO_EM_DEV_INT_EN);
+}
+/**
+ * tsi721_setup_mport - Setup Tsi721 as RapidIO subsystem master port
+ * @priv: pointer to tsi721 private data
+ *
+ * Configures Tsi721 as RapidIO master port.
+ */
+static int __devinit tsi721_setup_mport(struct tsi721_device *priv)
+{
+        struct pci_dev *pdev = priv->pdev;
+        int err = 0;
+        struct rio_ops *ops;
+        struct rio_mport *mport;
+        ops = kzalloc(sizeof(struct rio_ops), GFP_KERNEL);
+        if (!ops) {
+                dev_dbg(&pdev->dev, "Unable to allocate memory for rio_ops\n");
+                return -ENOMEM;
+        }
+        ops->lcread = tsi721_lcread;
+        ops->lcwrite = tsi721_lcwrite;
+        ops->cread = tsi721_cread_dma;
+        ops->cwrite = tsi721_cwrite_dma;
+        ops->dsend = tsi721_dsend;
+        ops->open_inb_mbox = tsi721_open_inb_mbox;
+        ops->close_inb_mbox = tsi721_close_inb_mbox;
+        ops->open_outb_mbox = tsi721_open_outb_mbox;
+        ops->close_outb_mbox = tsi721_close_outb_mbox;
+        ops->add_outb_message = tsi721_add_outb_message;
+        ops->add_inb_buffer = tsi721_add_inb_buffer;
+        ops->get_inb_message = tsi721_get_inb_message;
+        mport = kzalloc(sizeof(struct rio_mport), GFP_KERNEL);
+        if (!mport) {
+                kfree(ops);
+                dev_dbg(&pdev->dev, "Unable to allocate memory for mport\n");
+                return -ENOMEM;
+        }
+        mport->ops = ops;
+        mport->index = 0;
+        mport->sys_size = 0; /* small system */
+        mport->phy_type = RIO_PHY_SERIAL;
+        mport->priv = (void *)priv;
+        mport->phys_efptr = 0x100;
+        INIT_LIST_HEAD(&mport->dbells);
+        rio_init_dbell_res(&mport->riores[RIO_DOORBELL_RESOURCE], 0, 0xffff);
+        rio_init_mbox_res(&mport->riores[RIO_INB_MBOX_RESOURCE], 0, 0);
+        rio_init_mbox_res(&mport->riores[RIO_OUTB_MBOX_RESOURCE], 0, 0);
+        strcpy(mport->name, "Tsi721 mport");
+        /* Hook up interrupt handler */
+#ifdef CONFIG_PCI_MSI
+        if (!tsi721_enable_msix(priv))
+                priv->flags |= TSI721_USING_MSIX;
+        else if (!pci_enable_msi(pdev))
+                priv->flags |= TSI721_USING_MSI;
+        else
+                dev_info(&pdev->dev,
+                         "MSI/MSI-X is not available. Using legacy INTx.\n");
+#endif /* CONFIG_PCI_MSI */
+        err = tsi721_request_irq(mport);
+        if (!err) {
+                tsi721_interrupts_init(priv);
+                ops->pwenable = tsi721_pw_enable;
+        } else
+                dev_err(&pdev->dev, "Unable to get assigned PCI IRQ "
+                        "vector %02X err=0x%x\n", pdev->irq, err);
+        /* Enable SRIO link */
+        iowrite32(ioread32(priv->regs + TSI721_DEVCTL) |
+                  TSI721_DEVCTL_SRBOOT_CMPL,
+                  priv->regs + TSI721_DEVCTL);
+        rio_register_mport(mport);
+        priv->mport = mport;
+        if (mport->host_deviceid >= 0)
+                iowrite32(RIO_PORT_GEN_HOST | RIO_PORT_GEN_MASTER |
+                          RIO_PORT_GEN_DISCOVERED,
+                          priv->regs + (0x100 + RIO_PORT_GEN_CTL_CSR));
+        else
+                iowrite32(0, priv->regs + (0x100 + RIO_PORT_GEN_CTL_CSR));
+        return 0;
+}
+static int __devinit tsi721_probe(struct pci_dev *pdev,
+                                  const struct pci_device_id *id)
+{
+        struct tsi721_device *priv;
+        int i;
+        int err;
+        u32 regval;
+        priv = kzalloc(sizeof(struct tsi721_device), GFP_KERNEL);
+        if (priv == NULL) {
+                dev_err(&pdev->dev, "Failed to allocate memory for device\n");
+                err = -ENOMEM;
+                goto err_exit;
+        }
+        err = pci_enable_device(pdev);
+        if (err) {
+                dev_err(&pdev->dev, "Failed to enable PCI device\n");
+                goto err_clean;
+        }
+        priv->pdev = pdev;
+#ifdef DEBUG
+        for (i = 0; i <= PCI_STD_RESOURCE_END; i++) {
+                dev_dbg(&pdev->dev, "res[%d] @ 0x%llx (0x%lx, 0x%lx)\n",
+                        i, (unsigned long long)pci_resource_start(pdev, i),
+                        (unsigned long)pci_resource_len(pdev, i),
+                        pci_resource_flags(pdev, i));
+        }
+#endif
+        /*
+         * Verify BAR configuration
+         */
+        /* BAR_0 (registers) must be 512KB+ in 32-bit address space */
+        if (!(pci_resource_flags(pdev, BAR_0) & IORESOURCE_MEM) ||
+            pci_resource_flags(pdev, BAR_0) & IORESOURCE_MEM_64 ||
+            pci_resource_len(pdev, BAR_0) < TSI721_REG_SPACE_SIZE) {
+                dev_err(&pdev->dev,
+                        "Missing or misconfigured CSR BAR0, aborting.\n");
+                err = -ENODEV;
+                goto err_disable_pdev;
+        }
+        /* BAR_1 (outbound doorbells) must be 16MB+ in 32-bit address space */
+        if (!(pci_resource_flags(pdev, BAR_1) & IORESOURCE_MEM) ||
+            pci_resource_flags(pdev, BAR_1) & IORESOURCE_MEM_64 ||
+            pci_resource_len(pdev, BAR_1) < TSI721_DB_WIN_SIZE) {
+                dev_err(&pdev->dev,
+                        "Missing or misconfigured Doorbell BAR1, aborting.\n");
+                err = -ENODEV;
+                goto err_disable_pdev;
+        }
+        /*
+         * BAR_2 and BAR_4 (outbound translation) must be in 64-bit PCIe address
+         * space.
+         * NOTE: BAR_2 and BAR_4 are not used by this version of driver.
+         * It may be a good idea to keep them disabled using HW configuration
+         * to save PCI memory space.
+         */
+        if ((pci_resource_flags(pdev, BAR_2) & IORESOURCE_MEM) &&
+            (pci_resource_flags(pdev, BAR_2) & IORESOURCE_MEM_64)) {
+                dev_info(&pdev->dev, "Outbound BAR2 is not used but enabled.\n");
+        }
+        if ((pci_resource_flags(pdev, BAR_4) & IORESOURCE_MEM) &&
+            (pci_resource_flags(pdev, BAR_4) & IORESOURCE_MEM_64)) {
+                dev_info(&pdev->dev, "Outbound BAR4 is not used but enabled.\n");
+        }
+        err = pci_request_regions(pdev, DRV_NAME);
+        if (err) {
+                dev_err(&pdev->dev, "Cannot obtain PCI resources, "
+                        "aborting.\n");
+                goto err_disable_pdev;
+        }
+        pci_set_master(pdev);
+        priv->regs = pci_ioremap_bar(pdev, BAR_0);
+        if (!priv->regs) {
+                dev_err(&pdev->dev,
+                        "Unable to map device registers space, aborting\n");
+                err = -ENOMEM;
+                goto err_free_res;
+        }
+        priv->odb_base = pci_ioremap_bar(pdev, BAR_1);
+        if (!priv->odb_base) {
+                dev_err(&pdev->dev,
+                        "Unable to map outbound doorbells space, aborting\n");
+                err = -ENOMEM;
+                goto err_unmap_bars;
+        }
+        /* Configure DMA attributes. */
+        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
+                if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
+                        dev_info(&pdev->dev, "Unable to set DMA mask\n");
+                        goto err_unmap_bars;
+                }
+                if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)))
+                        dev_info(&pdev->dev, "Unable to set consistent DMA mask\n");
+        } else {
+                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
+                if (err)
+                        dev_info(&pdev->dev, "Unable to set consistent DMA mask\n");
+        }
+        /* Clear "no snoop" and "relaxed ordering" bits. */
+        pci_read_config_dword(pdev, 0x40 + PCI_EXP_DEVCTL, &regval);
+        regval &= ~(PCI_EXP_DEVCTL_RELAX_EN | PCI_EXP_DEVCTL_NOSNOOP_EN);
+        pci_write_config_dword(pdev, 0x40 + PCI_EXP_DEVCTL, regval);
+        /*
+         * FIXUP: correct offsets of MSI-X tables in the MSI-X Capability Block
+         */
+        pci_write_config_dword(pdev, TSI721_PCIECFG_EPCTL, 0x01);
+        pci_write_config_dword(pdev, TSI721_PCIECFG_MSIXTBL,
+                                                TSI721_MSIXTBL_OFFSET);
+        pci_write_config_dword(pdev, TSI721_PCIECFG_MSIXPBA,
+                                                TSI721_MSIXPBA_OFFSET);
+        pci_write_config_dword(pdev, TSI721_PCIECFG_EPCTL, 0);
+        /* End of FIXUP */
+        tsi721_disable_ints(priv);
+        tsi721_init_pc2sr_mapping(priv);
+        tsi721_init_sr2pc_mapping(priv);
+        if (tsi721_bdma_init(priv)) {
+                dev_err(&pdev->dev, "BDMA initialization failed, aborting\n");
+                err = -ENOMEM;
+                goto err_unmap_bars;
+        }
+        err = tsi721_doorbell_init(priv);
+        if (err)
+                goto err_free_bdma;
+        tsi721_port_write_init(priv);
+        err = tsi721_messages_init(priv);
+        if (err)
+                goto err_free_consistent;
+        err = tsi721_setup_mport(priv);
+        if (err)
+                goto err_free_consistent;
+        return 0;
+err_free_consistent:
+        tsi721_doorbell_free(priv);
+err_free_bdma:
+        tsi721_bdma_free(priv);
+err_unmap_bars:
+        if (priv->regs)
+                iounmap(priv->regs);
+        if (priv->odb_base)
+                iounmap(priv->odb_base);
+err_free_res:
+        pci_release_regions(pdev);
+        pci_clear_master(pdev);
+err_disable_pdev:
+        pci_disable_device(pdev);
+err_clean:
+        kfree(priv);
+err_exit:
+        return err;
+}
+static DEFINE_PCI_DEVICE_TABLE(tsi721_pci_tbl) = {
+        { PCI_DEVICE(PCI_VENDOR_ID_IDT, PCI_DEVICE_ID_TSI721) },
+        { 0, }  /* terminate list */
+};
+MODULE_DEVICE_TABLE(pci, tsi721_pci_tbl);
+static struct pci_driver tsi721_driver = {
+        .name           = "tsi721",
+        .id_table       = tsi721_pci_tbl,
+        .probe          = tsi721_probe,
+};
+static int __init tsi721_init(void)
+{
+        return pci_register_driver(&tsi721_driver);
+}
+static void __exit tsi721_exit(void)
+{
+        pci_unregister_driver(&tsi721_driver);
+}
+device_initcall(tsi721_init);
diff --git a/drivers/rapidio/devices/tsi721.h b/drivers/rapidio/devices/tsi721.h
new file mode 100644
index 000000000000..58be4deb1402
--- /dev/null
+++ b/drivers/rapidio/devices/tsi721.h
@@ -0,0 +1,766 @@
+/*
+ * Tsi721 PCIExpress-to-SRIO bridge definitions
+ *
+ * Copyright 2011, Integrated Device Technology, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the 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 __TSI721_H
+#define __TSI721_H
+#define DRV_NAME        "tsi721"
+#define DEFAULT_HOPCOUNT        0xff
+#define DEFAULT_DESTID          0xff
+/* PCI device ID */
+#define PCI_DEVICE_ID_TSI721            0x80ab
+#define BAR_0   0
+#define BAR_1   1
+#define BAR_2   2
+#define BAR_4   4
+#define TSI721_PC2SR_BARS       2
+#define TSI721_PC2SR_WINS       8
+#define TSI721_PC2SR_ZONES      8
+#define TSI721_MAINT_WIN        0 /* Window for outbound maintenance requests */
+#define IDB_QUEUE               0 /* Inbound Doorbell Queue to use */
+#define IDB_QSIZE               512 /* Inbound Doorbell Queue size */
+/* Memory space sizes */
+#define TSI721_REG_SPACE_SIZE           (512 * 1024) /* 512K */
+#define TSI721_DB_WIN_SIZE              (16 * 1024 * 1024) /* 16MB */
+#define  RIO_TT_CODE_8          0x00000000
+#define  RIO_TT_CODE_16         0x00000001
+#define TSI721_DMA_MAXCH        8
+#define TSI721_DMA_MINSTSSZ     32
+#define TSI721_DMA_STSBLKSZ     8
+#define TSI721_SRIO_MAXCH       8
+#define DBELL_SID(buf)          (((u8)buf[2] << 8) | (u8)buf[3])
+#define DBELL_TID(buf)          (((u8)buf[4] << 8) | (u8)buf[5])
+#define DBELL_INF(buf)          (((u8)buf[0] << 8) | (u8)buf[1])
+#define TSI721_RIO_PW_MSG_SIZE  16  /* Tsi721 saves only 16 bytes of PW msg */
+/* Register definitions */
+/*
+ * Registers in PCIe configuration space
+ */
+#define TSI721_PCIECFG_MSIXTBL  0x0a4
+#define TSI721_MSIXTBL_OFFSET   0x2c000
+#define TSI721_PCIECFG_MSIXPBA  0x0a8
+#define TSI721_MSIXPBA_OFFSET   0x2a000
+#define TSI721_PCIECFG_EPCTL    0x400
+/*
+ * Event Management Registers
+ */
+#define TSI721_RIO_EM_INT_STAT          0x10910
+#define TSI721_RIO_EM_INT_STAT_PW_RX    0x00010000
+#define TSI721_RIO_EM_INT_ENABLE        0x10914
+#define TSI721_RIO_EM_INT_ENABLE_PW_RX  0x00010000
+#define TSI721_RIO_EM_DEV_INT_EN        0x10930
+#define TSI721_RIO_EM_DEV_INT_EN_INT    0x00000001
+/*
+ * Port-Write Block Registers
+ */
+#define TSI721_RIO_PW_CTL               0x10a04
+#define TSI721_RIO_PW_CTL_PW_TIMER      0xf0000000
+#define TSI721_RIO_PW_CTL_PWT_DIS       (0 << 28)
+#define TSI721_RIO_PW_CTL_PWT_103       (1 << 28)
+#define TSI721_RIO_PW_CTL_PWT_205       (1 << 29)
+#define TSI721_RIO_PW_CTL_PWT_410       (1 << 30)
+#define TSI721_RIO_PW_CTL_PWT_820       (1 << 31)
+#define TSI721_RIO_PW_CTL_PWC_MODE      0x01000000
+#define TSI721_RIO_PW_CTL_PWC_CONT      0x00000000
+#define TSI721_RIO_PW_CTL_PWC_REL       0x01000000
+#define TSI721_RIO_PW_RX_STAT           0x10a10
+#define TSI721_RIO_PW_RX_STAT_WR_SIZE   0x0000f000
+#define TSI_RIO_PW_RX_STAT_WDPTR        0x00000100
+#define TSI721_RIO_PW_RX_STAT_PW_SHORT  0x00000008
+#define TSI721_RIO_PW_RX_STAT_PW_TRUNC  0x00000004
+#define TSI721_RIO_PW_RX_STAT_PW_DISC   0x00000002
+#define TSI721_RIO_PW_RX_STAT_PW_VAL    0x00000001
+#define TSI721_RIO_PW_RX_CAPT(x)        (0x10a20 + (x)*4)
+/*
+ * Inbound Doorbells
+ */
+#define TSI721_IDB_ENTRY_SIZE   64
+#define TSI721_IDQ_CTL(x)       (0x20000 + (x) * 1000)
+#define TSI721_IDQ_SUSPEND      0x00000002
+#define TSI721_IDQ_INIT         0x00000001
+#define TSI721_IDQ_STS(x)       (0x20004 + (x) * 1000)
+#define TSI721_IDQ_RUN          0x00200000
+#define TSI721_IDQ_MASK(x)      (0x20008 + (x) * 1000)
+#define TSI721_IDQ_MASK_MASK    0xffff0000
+#define TSI721_IDQ_MASK_PATT    0x0000ffff
+#define TSI721_IDQ_RP(x)        (0x2000c + (x) * 1000)
+#define TSI721_IDQ_RP_PTR       0x0007ffff
+#define TSI721_IDQ_WP(x)        (0x20010 + (x) * 1000)
+#define TSI721_IDQ_WP_PTR       0x0007ffff
+#define TSI721_IDQ_BASEL(x)     (0x20014 + (x) * 1000)
+#define TSI721_IDQ_BASEL_ADDR   0xffffffc0
+#define TSI721_IDQ_BASEU(x)     (0x20018 + (x) * 1000)
+#define TSI721_IDQ_SIZE(x)      (0x2001c + (x) * 1000)
+#define TSI721_IDQ_SIZE_VAL(size)       (__fls(size) - 4)
+#define TSI721_IDQ_SIZE_MIN     512
+#define TSI721_IDQ_SIZE_MAX     (512 * 1024)
+#define TSI721_SR_CHINT(x)      (0x20040 + (x) * 1000)
+#define TSI721_SR_CHINTE(x)     (0x20044 + (x) * 1000)
+#define TSI721_SR_CHINTSET(x)   (0x20048 + (x) * 1000)
+#define TSI721_SR_CHINT_ODBOK   0x00000020
+#define TSI721_SR_CHINT_IDBQRCV 0x00000010
+#define TSI721_SR_CHINT_SUSP    0x00000008
+#define TSI721_SR_CHINT_ODBTO   0x00000004
+#define TSI721_SR_CHINT_ODBRTRY 0x00000002
+#define TSI721_SR_CHINT_ODBERR  0x00000001
+#define TSI721_SR_CHINT_ALL     0x0000003f
+#define TSI721_IBWIN_NUM        8
+#define TSI721_IBWINLB(x)       (0x29000 + (x) * 20)
+#define TSI721_IBWINLB_BA       0xfffff000
+#define TSI721_IBWINLB_WEN      0x00000001
+#define TSI721_SR2PC_GEN_INTE   0x29800
+#define TSI721_SR2PC_PWE        0x29804
+#define TSI721_SR2PC_GEN_INT    0x29808
+#define TSI721_DEV_INTE         0x29840
+#define TSI721_DEV_INT          0x29844
+#define TSI721_DEV_INTSET       0x29848
+#define TSI721_DEV_INT_SMSG_CH  0x00000800
+#define TSI721_DEV_INT_SMSG_NCH 0x00000400
+#define TSI721_DEV_INT_SR2PC_CH 0x00000200
+#define TSI721_DEV_INT_SRIO     0x00000020
+#define TSI721_DEV_CHAN_INTE    0x2984c
+#define TSI721_DEV_CHAN_INT     0x29850
+#define TSI721_INT_SR2PC_CHAN_M 0xff000000
+#define TSI721_INT_SR2PC_CHAN(x) (1 << (24 + (x)))
+#define TSI721_INT_IMSG_CHAN_M  0x00ff0000
+#define TSI721_INT_IMSG_CHAN(x) (1 << (16 + (x)))
+#define TSI721_INT_OMSG_CHAN_M  0x0000ff00
+#define TSI721_INT_OMSG_CHAN(x) (1 << (8 + (x)))
+/*
+ * PC2SR block registers
+ */
+#define TSI721_OBWIN_NUM        TSI721_PC2SR_WINS
+#define TSI721_OBWINLB(x)       (0x40000 + (x) * 20)
+#define TSI721_OBWINLB_BA       0xffff8000
+#define TSI721_OBWINLB_WEN      0x00000001
+#define TSI721_OBWINUB(x)       (0x40004 + (x) * 20)
+#define TSI721_OBWINSZ(x)       (0x40008 + (x) * 20)
+#define TSI721_OBWINSZ_SIZE     0x00001f00
+#define TSI721_OBWIN_SIZE(size) (__fls(size) - 15)
+#define TSI721_ZONE_SEL         0x41300
+#define TSI721_ZONE_SEL_RD_WRB  0x00020000
+#define TSI721_ZONE_SEL_GO      0x00010000
+#define TSI721_ZONE_SEL_WIN     0x00000038
+#define TSI721_ZONE_SEL_ZONE    0x00000007
+#define TSI721_LUT_DATA0        0x41304
+#define TSI721_LUT_DATA0_ADD    0xfffff000
+#define TSI721_LUT_DATA0_RDTYPE 0x00000f00
+#define TSI721_LUT_DATA0_NREAD  0x00000100
+#define TSI721_LUT_DATA0_MNTRD  0x00000200
+#define TSI721_LUT_DATA0_RDCRF  0x00000020
+#define TSI721_LUT_DATA0_WRCRF  0x00000010
+#define TSI721_LUT_DATA0_WRTYPE 0x0000000f
+#define TSI721_LUT_DATA0_NWR    0x00000001
+#define TSI721_LUT_DATA0_MNTWR  0x00000002
+#define TSI721_LUT_DATA0_NWR_R  0x00000004
+#define TSI721_LUT_DATA1        0x41308
+#define TSI721_LUT_DATA2        0x4130c
+#define TSI721_LUT_DATA2_HC     0xff000000
+#define TSI721_LUT_DATA2_ADD65  0x000c0000
+#define TSI721_LUT_DATA2_TT     0x00030000
+#define TSI721_LUT_DATA2_DSTID  0x0000ffff
+#define TSI721_PC2SR_INTE       0x41310
+#define TSI721_DEVCTL           0x48004
+#define TSI721_DEVCTL_SRBOOT_CMPL       0x00000004
+#define TSI721_I2C_INT_ENABLE   0x49120
+/*
+ * Block DMA Engine Registers
+ *   x = 0..7
+ */
+#define TSI721_DMAC_DWRCNT(x)   (0x51000 + (x) * 0x1000)
+#define TSI721_DMAC_DRDCNT(x)   (0x51004 + (x) * 0x1000)
+#define TSI721_DMAC_CTL(x)      (0x51008 + (x) * 0x1000)
+#define TSI721_DMAC_CTL_SUSP    0x00000002
+#define TSI721_DMAC_CTL_INIT    0x00000001
+#define TSI721_DMAC_INT(x)      (0x5100c + (x) * 0x1000)
+#define TSI721_DMAC_INT_STFULL  0x00000010
+#define TSI721_DMAC_INT_DONE    0x00000008
+#define TSI721_DMAC_INT_SUSP    0x00000004
+#define TSI721_DMAC_INT_ERR     0x00000002
+#define TSI721_DMAC_INT_IOFDONE 0x00000001
+#define TSI721_DMAC_INT_ALL     0x0000001f
+#define TSI721_DMAC_INTSET(x)   (0x51010 + (x) * 0x1000)
+#define TSI721_DMAC_STS(x)      (0x51014 + (x) * 0x1000)
+#define TSI721_DMAC_STS_ABORT   0x00400000
+#define TSI721_DMAC_STS_RUN     0x00200000
+#define TSI721_DMAC_STS_CS      0x001f0000
+#define TSI721_DMAC_INTE(x)     (0x51018 + (x) * 0x1000)
+#define TSI721_DMAC_DPTRL(x)    (0x51024 + (x) * 0x1000)
+#define TSI721_DMAC_DPTRL_MASK  0xffffffe0
+#define TSI721_DMAC_DPTRH(x)    (0x51028 + (x) * 0x1000)
+#define TSI721_DMAC_DSBL(x)     (0x5102c + (x) * 0x1000)
+#define TSI721_DMAC_DSBL_MASK   0xffffffc0
+#define TSI721_DMAC_DSBH(x)     (0x51030 + (x) * 0x1000)
+#define TSI721_DMAC_DSSZ(x)     (0x51034 + (x) * 0x1000)
+#define TSI721_DMAC_DSSZ_SIZE_M 0x0000000f
+#define TSI721_DMAC_DSSZ_SIZE(size)     (__fls(size) - 4)
+#define TSI721_DMAC_DSRP(x)     (0x51038 + (x) * 0x1000)
+#define TSI721_DMAC_DSRP_MASK   0x0007ffff
+#define TSI721_DMAC_DSWP(x)     (0x5103c + (x) * 0x1000)
+#define TSI721_DMAC_DSWP_MASK   0x0007ffff
+#define TSI721_BDMA_INTE        0x5f000
+/*
+ * Messaging definitions
+ */
+#define TSI721_MSG_BUFFER_SIZE          RIO_MAX_MSG_SIZE
+#define TSI721_MSG_MAX_SIZE             RIO_MAX_MSG_SIZE
+#define TSI721_IMSG_MAXCH               8
+#define TSI721_IMSG_CHNUM               TSI721_IMSG_MAXCH
+#define TSI721_IMSGD_MIN_RING_SIZE      32
+#define TSI721_IMSGD_RING_SIZE          512
+#define TSI721_OMSG_CHNUM               4 /* One channel per MBOX */
+#define TSI721_OMSGD_MIN_RING_SIZE      32
+#define TSI721_OMSGD_RING_SIZE          512
+/*
+ * Outbound Messaging Engine Registers
+ *   x = 0..7
+ */
+#define TSI721_OBDMAC_DWRCNT(x)         (0x61000 + (x) * 0x1000)
+#define TSI721_OBDMAC_DRDCNT(x)         (0x61004 + (x) * 0x1000)
+#define TSI721_OBDMAC_CTL(x)            (0x61008 + (x) * 0x1000)
+#define TSI721_OBDMAC_CTL_MASK          0x00000007
+#define TSI721_OBDMAC_CTL_RETRY_THR     0x00000004
+#define TSI721_OBDMAC_CTL_SUSPEND       0x00000002
+#define TSI721_OBDMAC_CTL_INIT          0x00000001
+#define TSI721_OBDMAC_INT(x)            (0x6100c + (x) * 0x1000)
+#define TSI721_OBDMAC_INTSET(x)         (0x61010 + (x) * 0x1000)
+#define TSI721_OBDMAC_INTE(x)           (0x61018 + (x) * 0x1000)
+#define TSI721_OBDMAC_INT_MASK          0x0000001F
+#define TSI721_OBDMAC_INT_ST_FULL       0x00000010
+#define TSI721_OBDMAC_INT_DONE          0x00000008
+#define TSI721_OBDMAC_INT_SUSPENDED     0x00000004
+#define TSI721_OBDMAC_INT_ERROR         0x00000002
+#define TSI721_OBDMAC_INT_IOF_DONE      0x00000001
+#define TSI721_OBDMAC_INT_ALL           TSI721_OBDMAC_INT_MASK
+#define TSI721_OBDMAC_STS(x)            (0x61014 + (x) * 0x1000)
+#define TSI721_OBDMAC_STS_MASK          0x007f0000
+#define TSI721_OBDMAC_STS_ABORT         0x00400000
+#define TSI721_OBDMAC_STS_RUN           0x00200000
+#define TSI721_OBDMAC_STS_CS            0x001f0000
+#define TSI721_OBDMAC_PWE(x)            (0x6101c + (x) * 0x1000)
+#define TSI721_OBDMAC_PWE_MASK          0x00000002
+#define TSI721_OBDMAC_PWE_ERROR_EN      0x00000002
+#define TSI721_OBDMAC_DPTRL(x)          (0x61020 + (x) * 0x1000)
+#define TSI721_OBDMAC_DPTRL_MASK        0xfffffff0
+#define TSI721_OBDMAC_DPTRH(x)          (0x61024 + (x) * 0x1000)
+#define TSI721_OBDMAC_DPTRH_MASK        0xffffffff
+#define TSI721_OBDMAC_DSBL(x)           (0x61040 + (x) * 0x1000)
+#define TSI721_OBDMAC_DSBL_MASK         0xffffffc0
+#define TSI721_OBDMAC_DSBH(x)           (0x61044 + (x) * 0x1000)
+#define TSI721_OBDMAC_DSBH_MASK         0xffffffff
+#define TSI721_OBDMAC_DSSZ(x)           (0x61048 + (x) * 0x1000)
+#define TSI721_OBDMAC_DSSZ_MASK         0x0000000f
+#define TSI721_OBDMAC_DSRP(x)           (0x6104c + (x) * 0x1000)
+#define TSI721_OBDMAC_DSRP_MASK         0x0007ffff
+#define TSI721_OBDMAC_DSWP(x)           (0x61050 + (x) * 0x1000)
+#define TSI721_OBDMAC_DSWP_MASK         0x0007ffff
+#define TSI721_RQRPTO                   0x60010
+#define TSI721_RQRPTO_MASK              0x00ffffff
+#define TSI721_RQRPTO_VAL               400     /* Response TO value */
+/*
+ * Inbound Messaging Engine Registers
+ *   x = 0..7
+ */
+#define TSI721_IB_DEVID_GLOBAL          0xffff
+#define TSI721_IBDMAC_FQBL(x)           (0x61200 + (x) * 0x1000)
+#define TSI721_IBDMAC_FQBL_MASK         0xffffffc0
+#define TSI721_IBDMAC_FQBH(x)           (0x61204 + (x) * 0x1000)
+#define TSI721_IBDMAC_FQBH_MASK         0xffffffff
+#define TSI721_IBDMAC_FQSZ_ENTRY_INX    TSI721_IMSGD_RING_SIZE
+#define TSI721_IBDMAC_FQSZ(x)           (0x61208 + (x) * 0x1000)
+#define TSI721_IBDMAC_FQSZ_MASK         0x0000000f
+#define TSI721_IBDMAC_FQRP(x)           (0x6120c + (x) * 0x1000)
+#define TSI721_IBDMAC_FQRP_MASK         0x0007ffff
+#define TSI721_IBDMAC_FQWP(x)           (0x61210 + (x) * 0x1000)
+#define TSI721_IBDMAC_FQWP_MASK         0x0007ffff
+#define TSI721_IBDMAC_FQTH(x)           (0x61214 + (x) * 0x1000)
+#define TSI721_IBDMAC_FQTH_MASK         0x0007ffff
+#define TSI721_IB_DEVID                 0x60020
+#define TSI721_IB_DEVID_MASK            0x0000ffff
+#define TSI721_IBDMAC_CTL(x)            (0x61240 + (x) * 0x1000)
+#define TSI721_IBDMAC_CTL_MASK          0x00000003
+#define TSI721_IBDMAC_CTL_SUSPEND       0x00000002
+#define TSI721_IBDMAC_CTL_INIT          0x00000001
+#define TSI721_IBDMAC_STS(x)            (0x61244 + (x) * 0x1000)
+#define TSI721_IBDMAC_STS_MASK          0x007f0000
+#define TSI721_IBSMAC_STS_ABORT         0x00400000
+#define TSI721_IBSMAC_STS_RUN           0x00200000
+#define TSI721_IBSMAC_STS_CS            0x001f0000
+#define TSI721_IBDMAC_INT(x)            (0x61248 + (x) * 0x1000)
+#define TSI721_IBDMAC_INTSET(x)         (0x6124c + (x) * 0x1000)
+#define TSI721_IBDMAC_INTE(x)           (0x61250 + (x) * 0x1000)
+#define TSI721_IBDMAC_INT_MASK          0x0000100f
+#define TSI721_IBDMAC_INT_SRTO          0x00001000
+#define TSI721_IBDMAC_INT_SUSPENDED     0x00000008
+#define TSI721_IBDMAC_INT_PC_ERROR      0x00000004
+#define TSI721_IBDMAC_INT_FQ_LOW        0x00000002
+#define TSI721_IBDMAC_INT_DQ_RCV        0x00000001
+#define TSI721_IBDMAC_INT_ALL           TSI721_IBDMAC_INT_MASK
+#define TSI721_IBDMAC_PWE(x)            (0x61254 + (x) * 0x1000)
+#define TSI721_IBDMAC_PWE_MASK          0x00001700
+#define TSI721_IBDMAC_PWE_SRTO          0x00001000
+#define TSI721_IBDMAC_PWE_ILL_FMT       0x00000400
+#define TSI721_IBDMAC_PWE_ILL_DEC       0x00000200
+#define TSI721_IBDMAC_PWE_IMP_SP        0x00000100
+#define TSI721_IBDMAC_DQBL(x)           (0x61300 + (x) * 0x1000)
+#define TSI721_IBDMAC_DQBL_MASK         0xffffffc0
+#define TSI721_IBDMAC_DQBL_ADDR         0xffffffc0
+#define TSI721_IBDMAC_DQBH(x)           (0x61304 + (x) * 0x1000)
+#define TSI721_IBDMAC_DQBH_MASK         0xffffffff
+#define TSI721_IBDMAC_DQRP(x)           (0x61308 + (x) * 0x1000)
+#define TSI721_IBDMAC_DQRP_MASK         0x0007ffff
+#define TSI721_IBDMAC_DQWR(x)           (0x6130c + (x) * 0x1000)
+#define TSI721_IBDMAC_DQWR_MASK         0x0007ffff
+#define TSI721_IBDMAC_DQSZ(x)           (0x61314 + (x) * 0x1000)
+#define TSI721_IBDMAC_DQSZ_MASK         0x0000000f
+/*
+ * Messaging Engine Interrupts
+ */
+#define TSI721_SMSG_PWE                 0x6a004
+#define TSI721_SMSG_INTE                0x6a000
+#define TSI721_SMSG_INT                 0x6a008
+#define TSI721_SMSG_INTSET              0x6a010
+#define TSI721_SMSG_INT_MASK            0x0086ffff
+#define TSI721_SMSG_INT_UNS_RSP         0x00800000
+#define TSI721_SMSG_INT_ECC_NCOR        0x00040000
+#define TSI721_SMSG_INT_ECC_COR         0x00020000
+#define TSI721_SMSG_INT_ECC_NCOR_CH     0x0000ff00
+#define TSI721_SMSG_INT_ECC_COR_CH      0x000000ff
+#define TSI721_SMSG_ECC_LOG             0x6a014
+#define TSI721_SMSG_ECC_LOG_MASK        0x00070007
+#define TSI721_SMSG_ECC_LOG_ECC_NCOR_M  0x00070000
+#define TSI721_SMSG_ECC_LOG_ECC_COR_M   0x00000007
+#define TSI721_RETRY_GEN_CNT            0x6a100
+#define TSI721_RETRY_GEN_CNT_MASK       0xffffffff
+#define TSI721_RETRY_RX_CNT             0x6a104
+#define TSI721_RETRY_RX_CNT_MASK        0xffffffff
+#define TSI721_SMSG_ECC_COR_LOG(x)      (0x6a300 + (x) * 4)
+#define TSI721_SMSG_ECC_COR_LOG_MASK    0x000000ff
+#define TSI721_SMSG_ECC_NCOR(x)         (0x6a340 + (x) * 4)
+#define TSI721_SMSG_ECC_NCOR_MASK       0x000000ff
+/*
+ * Block DMA Descriptors
+ */
+struct tsi721_dma_desc {
+        __le32 type_id;
+#define TSI721_DMAD_DEVID       0x0000ffff
+#define TSI721_DMAD_CRF         0x00010000
+#define TSI721_DMAD_PRIO        0x00060000
+#define TSI721_DMAD_RTYPE       0x00780000
+#define TSI721_DMAD_IOF         0x08000000
+#define TSI721_DMAD_DTYPE       0xe0000000
+        __le32 bcount;
+#define TSI721_DMAD_BCOUNT1     0x03ffffff /* if DTYPE == 1 */
+#define TSI721_DMAD_BCOUNT2     0x0000000f /* if DTYPE == 2 */
+#define TSI721_DMAD_TT          0x0c000000
+#define TSI721_DMAD_RADDR0      0xc0000000
+        union {
+                __le32 raddr_lo;           /* if DTYPE == (1 || 2) */
+                __le32 next_lo;            /* if DTYPE == 3 */
+        };
+#define TSI721_DMAD_CFGOFF      0x00ffffff
+#define TSI721_DMAD_HOPCNT      0xff000000
+        union {
+                __le32 raddr_hi;           /* if DTYPE == (1 || 2) */
+                __le32 next_hi;            /* if DTYPE == 3 */
+        };
+        union {
+                struct {                   /* if DTYPE == 1 */
+                        __le32 bufptr_lo;
+                        __le32 bufptr_hi;
+                        __le32 s_dist;
+                        __le32 s_size;
+                } t1;
+                __le32 data[4];            /* if DTYPE == 2 */
+                u32    reserved[4];        /* if DTYPE == 3 */
+        };
+} __aligned(32);
+/*
+ * Inbound Messaging Descriptor
+ */
+struct tsi721_imsg_desc {
+        __le32 type_id;
+#define TSI721_IMD_DEVID        0x0000ffff
+#define TSI721_IMD_CRF          0x00010000
+#define TSI721_IMD_PRIO         0x00060000
+#define TSI721_IMD_TT           0x00180000
+#define TSI721_IMD_DTYPE        0xe0000000
+        __le32 msg_info;
+#define TSI721_IMD_BCOUNT       0x00000ff8
+#define TSI721_IMD_SSIZE        0x0000f000
+#define TSI721_IMD_LETER        0x00030000
+#define TSI721_IMD_XMBOX        0x003c0000
+#define TSI721_IMD_MBOX         0x00c00000
+#define TSI721_IMD_CS           0x78000000
+#define TSI721_IMD_HO           0x80000000
+        __le32 bufptr_lo;
+        __le32 bufptr_hi;
+        u32    reserved[12];
+} __aligned(64);
+/*
+ * Outbound Messaging Descriptor
+ */
+struct tsi721_omsg_desc {
+        __le32 type_id;
+#define TSI721_OMD_DEVID        0x0000ffff
+#define TSI721_OMD_CRF          0x00010000
+#define TSI721_OMD_PRIO         0x00060000
+#define TSI721_OMD_IOF          0x08000000
+#define TSI721_OMD_DTYPE        0xe0000000
+#define TSI721_OMD_RSRVD        0x17f80000
+        __le32 msg_info;
+#define TSI721_OMD_BCOUNT       0x00000ff8
+#define TSI721_OMD_SSIZE        0x0000f000
+#define TSI721_OMD_LETER        0x00030000
+#define TSI721_OMD_XMBOX        0x003c0000
+#define TSI721_OMD_MBOX         0x00c00000
+#define TSI721_OMD_TT           0x0c000000
+        union {
+                __le32 bufptr_lo;       /* if DTYPE == 4 */
+                __le32 next_lo;         /* if DTYPE == 5 */
+        };
+        union {
+                __le32 bufptr_hi;       /* if DTYPE == 4 */
+                __le32 next_hi;         /* if DTYPE == 5 */
+        };
+} __aligned(16);
+struct tsi721_dma_sts {
+        __le64  desc_sts[8];
+} __aligned(64);
+struct tsi721_desc_sts_fifo {
+        union {
+                __le64  da64;
+                struct {
+                        __le32  lo;
+                        __le32  hi;
+                } da32;
+        } stat[8];
+} __aligned(64);
+/* Descriptor types for BDMA and Messaging blocks */
+enum dma_dtype {
+        DTYPE1 = 1, /* Data Transfer DMA Descriptor */
+        DTYPE2 = 2, /* Immediate Data Transfer DMA Descriptor */
+        DTYPE3 = 3, /* Block Pointer DMA Descriptor */
+        DTYPE4 = 4, /* Outbound Msg DMA Descriptor */
+        DTYPE5 = 5, /* OB Messaging Block Pointer Descriptor */
+        DTYPE6 = 6  /* Inbound Messaging Descriptor */
+};
+enum dma_rtype {
+        NREAD = 0,
+        LAST_NWRITE_R = 1,
+        ALL_NWRITE = 2,
+        ALL_NWRITE_R = 3,
+        MAINT_RD = 4,
+        MAINT_WR = 5
+};
+/*
+ * mport Driver Definitions
+ */
+#define TSI721_DMA_CHNUM        TSI721_DMA_MAXCH
+#define TSI721_DMACH_MAINT      0       /* DMA channel for maint requests */
+#define TSI721_DMACH_MAINT_NBD  32      /* Number of BDs for maint requests */
+#define MSG_DMA_ENTRY_INX_TO_SIZE(x)    ((0x10 << (x)) & 0xFFFF0)
+enum tsi721_smsg_int_flag {
+        SMSG_INT_NONE           = 0x00000000,
+        SMSG_INT_ECC_COR_CH     = 0x000000ff,
+        SMSG_INT_ECC_NCOR_CH    = 0x0000ff00,
+        SMSG_INT_ECC_COR        = 0x00020000,
+        SMSG_INT_ECC_NCOR       = 0x00040000,
+        SMSG_INT_UNS_RSP        = 0x00800000,
+        SMSG_INT_ALL            = 0x0006ffff
+};
+/* Structures */
+struct tsi721_bdma_chan {
+        int             bd_num;         /* number of buffer descriptors */
+        void            *bd_base;       /* start of DMA descriptors */
+        dma_addr_t      bd_phys;
+        void            *sts_base;      /* start of DMA BD status FIFO */
+        dma_addr_t      sts_phys;
+        int             sts_size;
+};
+struct tsi721_imsg_ring {
+        u32             size;
+        /* VA/PA of data buffers for incoming messages */
+        void            *buf_base;
+        dma_addr_t      buf_phys;
+        /* VA/PA of circular free buffer list */
+        void            *imfq_base;
+        dma_addr_t      imfq_phys;
+        /* VA/PA of Inbound message descriptors */
+        void            *imd_base;
+        dma_addr_t      imd_phys;
+         /* Inbound Queue buffer pointers */
+        void            *imq_base[TSI721_IMSGD_RING_SIZE];
+        u32             rx_slot;
+        void            *dev_id;
+        u32             fq_wrptr;
+        u32             desc_rdptr;
+        spinlock_t      lock;
+};
+struct tsi721_omsg_ring {
+        u32             size;
+        /* VA/PA of OB Msg descriptors */
+        void            *omd_base;
+        dma_addr_t      omd_phys;
+        /* VA/PA of OB Msg data buffers */
+        void            *omq_base[TSI721_OMSGD_RING_SIZE];
+        dma_addr_t      omq_phys[TSI721_OMSGD_RING_SIZE];
+        /* VA/PA of OB Msg descriptor status FIFO */
+        void            *sts_base;
+        dma_addr_t      sts_phys;
+        u32             sts_size; /* # of allocated status entries */
+        u32             sts_rdptr;
+        u32             tx_slot;
+        void            *dev_id;
+        u32             wr_count;
+        spinlock_t      lock;
+};
+enum tsi721_flags {
+        TSI721_USING_MSI        = (1 << 0),
+        TSI721_USING_MSIX       = (1 << 1),
+        TSI721_IMSGID_SET       = (1 << 2),
+};
+#ifdef CONFIG_PCI_MSI
+/*
+ * MSI-X Table Entries (0 ... 69)
+ */
+#define TSI721_MSIX_DMACH_DONE(x)       (0 + (x))
+#define TSI721_MSIX_DMACH_INT(x)        (8 + (x))
+#define TSI721_MSIX_BDMA_INT            16
+#define TSI721_MSIX_OMSG_DONE(x)        (17 + (x))
+#define TSI721_MSIX_OMSG_INT(x)         (25 + (x))
+#define TSI721_MSIX_IMSG_DQ_RCV(x)      (33 + (x))
+#define TSI721_MSIX_IMSG_INT(x)         (41 + (x))
+#define TSI721_MSIX_MSG_INT             49
+#define TSI721_MSIX_SR2PC_IDBQ_RCV(x)   (50 + (x))
+#define TSI721_MSIX_SR2PC_CH_INT(x)     (58 + (x))
+#define TSI721_MSIX_SR2PC_INT           66
+#define TSI721_MSIX_PC2SR_INT           67
+#define TSI721_MSIX_SRIO_MAC_INT        68
+#define TSI721_MSIX_I2C_INT             69
+/* MSI-X vector and init table entry indexes */
+enum tsi721_msix_vect {
+        TSI721_VECT_IDB,
+        TSI721_VECT_PWRX, /* PW_RX is part of SRIO MAC Interrupt reporting */
+        TSI721_VECT_OMB0_DONE,
+        TSI721_VECT_OMB1_DONE,
+        TSI721_VECT_OMB2_DONE,
+        TSI721_VECT_OMB3_DONE,
+        TSI721_VECT_OMB0_INT,
+        TSI721_VECT_OMB1_INT,
+        TSI721_VECT_OMB2_INT,
+        TSI721_VECT_OMB3_INT,
+        TSI721_VECT_IMB0_RCV,
+        TSI721_VECT_IMB1_RCV,
+        TSI721_VECT_IMB2_RCV,
+        TSI721_VECT_IMB3_RCV,
+        TSI721_VECT_IMB0_INT,
+        TSI721_VECT_IMB1_INT,
+        TSI721_VECT_IMB2_INT,
+        TSI721_VECT_IMB3_INT,
+        TSI721_VECT_MAX
+};
+#define IRQ_DEVICE_NAME_MAX     64
+struct msix_irq {
+        u16     vector;
+        char    irq_name[IRQ_DEVICE_NAME_MAX];
+};
+#endif /* CONFIG_PCI_MSI */
+struct tsi721_device {
+        struct pci_dev  *pdev;
+        struct rio_mport *mport;
+        u32             flags;
+        void __iomem    *regs;
+#ifdef CONFIG_PCI_MSI
+        struct msix_irq msix[TSI721_VECT_MAX];
+#endif
+        /* Doorbells */
+        void __iomem    *odb_base;
+        void            *idb_base;
+        dma_addr_t      idb_dma;
+        struct work_struct idb_work;
+        u32             db_discard_count;
+        /* Inbound Port-Write */
+        struct work_struct pw_work;
+        struct kfifo    pw_fifo;
+        spinlock_t      pw_fifo_lock;
+        u32             pw_discard_count;
+        /* BDMA Engine */
+        struct tsi721_bdma_chan bdma[TSI721_DMA_CHNUM];
+        /* Inbound Messaging */
+        int             imsg_init[TSI721_IMSG_CHNUM];
+        struct tsi721_imsg_ring imsg_ring[TSI721_IMSG_CHNUM];
+        /* Outbound Messaging */
+        int             omsg_init[TSI721_OMSG_CHNUM];
+        struct tsi721_omsg_ring omsg_ring[TSI721_OMSG_CHNUM];
+};
+#endif
diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index ebe77dd87daf..2bebd791a092 100644
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -516,7 +516,7 @@ static struct rio_dev __devinit *rio_setup_device(struct rio_net *net,
        return rdev;
 cleanup:
-        if (rio_is_switch(rdev))
+        if (rswitch)
                kfree(rswitch->route_table);
        kfree(rdev);
@@ -923,7 +923,7 @@ static int __devinit rio_enum_peer(struct rio_net *net, struct rio_mport *port,
 * rio_enum_complete- Tests if enumeration of a network is complete
 * @port: Master port to send transaction
 *
- * Tests the Component Tag CSR for non-zero value (enumeration
+ * Tests the PGCCSR discovered bit for non-zero value (enumeration
 * complete flag). Return %1 if enumeration is complete or %0 if
 * enumeration is incomplete.
 */
@@ -933,7 +933,7 @@ static int rio_enum_complete(struct rio_mport *port)
        rio_local_read_config_32(port, port->phys_efptr + RIO_PORT_GEN_CTL_CSR,
                                 &regval);
-        return (regval & RIO_PORT_GEN_MASTER) ? 1 : 0;
+        return (regval & RIO_PORT_GEN_DISCOVERED) ? 1 : 0;
 }
 /**
diff --git a/drivers/rapidio/switches/idt_gen2.c b/drivers/rapidio/switches/idt_gen2.c
index 043ee3136e40..809b7a3336ba 100644
--- a/drivers/rapidio/switches/idt_gen2.c
+++ b/drivers/rapidio/switches/idt_gen2.c
@@ -10,6 +10,7 @@
 * option) any later version.
 */
+#include <linux/stat.h>
 #include <linux/rio.h>
 #include <linux/rio_drv.h>
 #include <linux/rio_ids.h>
diff --git a/drivers/regulator/88pm8607.c b/drivers/regulator/88pm8607.c
index e821b2159b4b..ca0d608f8248 100644
--- a/drivers/regulator/88pm8607.c
+++ b/drivers/regulator/88pm8607.c
@@ -16,6 +16,7 @@
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
 #include <linux/mfd/88pm860x.h>
+#include <linux/module.h>
 struct pm8607_regulator_info {
        struct regulator_desc   desc;
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 02f3c2333c83..6e1ae69646b3 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -13,6 +13,7 @@
 */
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/ab8500.h>
diff --git a/drivers/regulator/bq24022.c b/drivers/regulator/bq24022.c
index 068d488a4f71..e24d1b7d97a8 100644
--- a/drivers/regulator/bq24022.c
+++ b/drivers/regulator/bq24022.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/err.h>
+#include <linux/module.h>
 #include <linux/gpio.h>
 #include <linux/regulator/bq24022.h>
 #include <linux/regulator/driver.h>
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 67fa2a3297ad..669d02160221 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -28,6 +28,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
+#include <linux/module.h>
 #define CREATE_TRACE_POINTS
 #include <trace/events/regulator.h>
diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c
index 362e08221085..e23ddfa8b2c6 100644
--- a/drivers/regulator/da903x.c
+++ b/drivers/regulator/da903x.c
@@ -12,6 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/err.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
diff --git a/drivers/regulator/db8500-prcmu.c b/drivers/regulator/db8500-prcmu.c
index 2bb8f451cc06..78329751af54 100644
--- a/drivers/regulator/db8500-prcmu.c
+++ b/drivers/regulator/db8500-prcmu.c
@@ -13,10 +13,11 @@
 #include <linux/err.h>
 #include <linux/spinlock.h>
 #include <linux/platform_device.h>
-#include <linux/mfd/db8500-prcmu.h>
+#include <linux/mfd/dbx500-prcmu.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
 #include <linux/regulator/db8500-prcmu.h>
+#include <linux/module.h>
 /*
 * power state reference count
diff --git a/drivers/regulator/dummy.c b/drivers/regulator/dummy.c
index f6ef6694ab98..b8f520513ce7 100644
--- a/drivers/regulator/dummy.c
+++ b/drivers/regulator/dummy.c
@@ -16,6 +16,7 @@
 */
 #include <linux/err.h>
+#include <linux/export.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index 2fe9d99c9f23..21ecf212a522 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -20,6 +20,7 @@
 #include <linux/err.h>
 #include <linux/mutex.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/fixed.h>
diff --git a/drivers/regulator/lp3971.c b/drivers/regulator/lp3971.c
index 0f22ef12601c..72b16b5f3db6 100644
--- a/drivers/regulator/lp3971.c
+++ b/drivers/regulator/lp3971.c
@@ -16,6 +16,7 @@
 #include <linux/err.h>
 #include <linux/i2c.h>
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/lp3971.h>
 #include <linux/slab.h>
diff --git a/drivers/regulator/lp3972.c b/drivers/regulator/lp3972.c
index 6aa1b506fb5d..fbc5e3741bef 100644
--- a/drivers/regulator/lp3972.c
+++ b/drivers/regulator/lp3972.c
@@ -12,6 +12,7 @@
 #include <linux/bug.h>
 #include <linux/err.h>
 #include <linux/i2c.h>
+#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/lp3972.h>
diff --git a/drivers/regulator/max8925-regulator.c b/drivers/regulator/max8925-regulator.c
index e4dbd667c043..cc9ec0e03271 100644
--- a/drivers/regulator/max8925-regulator.c
+++ b/drivers/regulator/max8925-regulator.c
@@ -9,6 +9,7 @@
 * published by the Free Software Foundation.
 */
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/err.h>
 #include <linux/i2c.h>
diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c
index ad6628ca94f4..6176129a27e5 100644
--- a/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@ -26,6 +26,7 @@
 #include <linux/err.h>
 #include <linux/gpio.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
diff --git a/drivers/regulator/mc13783-regulator.c b/drivers/regulator/mc13783-regulator.c
index 730f43ad415b..8479082e1aea 100644
--- a/drivers/regulator/mc13783-regulator.c
+++ b/drivers/regulator/mc13783-regulator.c
@@ -18,6 +18,7 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/err.h>
+#include <linux/module.h>
 #include "mc13xxx.h"
 #define MC13783_REG_SWITCHERS5                  29
@@ -336,9 +337,9 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev)
 {
        struct mc13xxx_regulator_priv *priv;
        struct mc13xxx *mc13783 = dev_get_drvdata(pdev->dev.parent);
-        struct mc13783_regulator_platform_data *pdata =
+        struct mc13xxx_regulator_platform_data *pdata =
                dev_get_platdata(&pdev->dev);
-        struct mc13783_regulator_init_data *init_data;
+        struct mc13xxx_regulator_init_data *init_data;
        int i, ret;
        dev_dbg(&pdev->dev, "%s id %d\n", __func__, pdev->id);
@@ -381,7 +382,7 @@ err:
 static int __devexit mc13783_regulator_remove(struct platform_device *pdev)
 {
        struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);
-        struct mc13783_regulator_platform_data *pdata =
+        struct mc13xxx_regulator_platform_data *pdata =
                dev_get_platdata(&pdev->dev);
        int i;
diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
index 3285d41842f2..023d17d022cf 100644
--- a/drivers/regulator/mc13892-regulator.c
+++ b/drivers/regulator/mc13892-regulator.c
@@ -18,6 +18,7 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/err.h>
+#include <linux/module.h>
 #include "mc13xxx.h"
 #define MC13892_REVISION                        7
diff --git a/drivers/regulator/mc13xxx-regulator-core.c b/drivers/regulator/mc13xxx-regulator-core.c
index bc27ab136378..6532853a6ef5 100644
--- a/drivers/regulator/mc13xxx-regulator-core.c
+++ b/drivers/regulator/mc13xxx-regulator-core.c
@@ -23,6 +23,7 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/err.h>
+#include <linux/module.h>
 #include "mc13xxx.h"
 static int mc13xxx_regulator_enable(struct regulator_dev *rdev)
diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c
index dbcf09d5080c..14b9389dd52a 100644
--- a/drivers/regulator/tps6586x-regulator.c
+++ b/drivers/regulator/tps6586x-regulator.c
@@ -14,6 +14,7 @@
 */
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/err.h>
 #include <linux/slab.h>
diff --git a/drivers/regulator/userspace-consumer.c b/drivers/regulator/userspace-consumer.c
index 9d5ba9357597..fc6655146999 100644
--- a/drivers/regulator/userspace-consumer.c
+++ b/drivers/regulator/userspace-consumer.c
@@ -18,6 +18,7 @@
 #include <linux/err.h>
 #include <linux/mutex.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
 #include <linux/regulator/userspace-consumer.h>
diff --git a/drivers/regulator/virtual.c b/drivers/regulator/virtual.c
index 69e550f57638..858c1f861ba5 100644
--- a/drivers/regulator/virtual.c
+++ b/drivers/regulator/virtual.c
@@ -16,6 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 struct virtual_consumer_data {
        struct mutex lock;
diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c
index 0f12c70bebc9..71632ddc3781 100644
--- a/drivers/regulator/wm8400-regulator.c
+++ b/drivers/regulator/wm8400-regulator.c
@@ -15,6 +15,7 @@
 #include <linux/bug.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/regulator/driver.h>
 #include <linux/mfd/wm8400-private.h>
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 5a538fc1cc85..53eb4e55b289 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -8,7 +8,7 @@ config RTC_LIB
 menuconfig RTC_CLASS
        bool "Real Time Clock"
        default n
-        depends on !S390
+        depends on !S390 && !UML
        select RTC_LIB
        help
          Generic RTC class support. If you say yes here, you will
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index 01a7df5317c1..e8326f26fa2f 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -21,16 +21,13 @@
 #include "rtc-core.h"
-static DEFINE_IDR(rtc_idr);
+static DEFINE_IDA(rtc_ida);
-static DEFINE_MUTEX(idr_lock);
 struct class *rtc_class;
 static void rtc_device_release(struct device *dev)
 {
        struct rtc_device *rtc = to_rtc_device(dev);
-        mutex_lock(&idr_lock);
+        ida_simple_remove(&rtc_ida, rtc->id);
-        idr_remove(&rtc_idr, rtc->id);
-        mutex_unlock(&idr_lock);
        kfree(rtc);
 }
@@ -146,25 +143,16 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
        struct rtc_wkalrm alrm;
        int id, err;
-        if (idr_pre_get(&rtc_idr, GFP_KERNEL) == 0) {
+        id = ida_simple_get(&rtc_ida, 0, 0, GFP_KERNEL);
-                err = -ENOMEM;
+        if (id < 0) {
+                err = id;
                goto exit;
        }
-        mutex_lock(&idr_lock);
-        err = idr_get_new(&rtc_idr, NULL, &id);
-        mutex_unlock(&idr_lock);
-        if (err < 0)
-                goto exit;
-        id = id & MAX_ID_MASK;
        rtc = kzalloc(sizeof(struct rtc_device), GFP_KERNEL);
        if (rtc == NULL) {
                err = -ENOMEM;
-                goto exit_idr;
+                goto exit_ida;
        }
        rtc->id = id;
@@ -222,10 +210,8 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
 exit_kfree:
        kfree(rtc);
-exit_idr:
+exit_ida:
-        mutex_lock(&idr_lock);
+        ida_simple_remove(&rtc_ida, id);
-        idr_remove(&rtc_idr, id);
-        mutex_unlock(&idr_lock);
 exit:
        dev_err(dev, "rtc core: unable to register %s, err = %d\n",
@@ -276,7 +262,7 @@ static void __exit rtc_exit(void)
 {
        rtc_dev_exit();
        class_destroy(rtc_class);
-        idr_destroy(&rtc_idr);
+        ida_destroy(&rtc_ida);
 }
 subsys_initcall(rtc_init);
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 44e91e598f8d..8e286259a007 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -13,6 +13,7 @@
 #include <linux/rtc.h>
 #include <linux/sched.h>
+#include <linux/module.h>
 #include <linux/log2.h>
 #include <linux/workqueue.h>
diff --git a/drivers/rtc/rtc-dm355evm.c b/drivers/rtc/rtc-dm355evm.c
index 58d4e18530da..2322c43af201 100644
--- a/drivers/rtc/rtc-dm355evm.c
+++ b/drivers/rtc/rtc-dm355evm.c
@@ -14,6 +14,7 @@
 #include <linux/platform_device.h>
 #include <linux/i2c/dm355evm_msp.h>
+#include <linux/module.h>
 /*
diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c
index 57fbcc149ba7..3a33b1fdbe0f 100644
--- a/drivers/rtc/rtc-ds1305.c
+++ b/drivers/rtc/rtc-ds1305.c
@@ -17,6 +17,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/ds1305.h>
+#include <linux/module.h>
 /*
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index b2005b44e4f7..62b0763b7b9a 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -34,6 +34,7 @@ enum ds_type {
        ds_1388,
        ds_3231,
        m41t00,
+        mcp7941x,
        rx_8025,
        // rs5c372 too?  different address...
 };
@@ -43,6 +44,7 @@ enum ds_type {
 #define DS1307_REG_SECS         0x00    /* 00-59 */
 #       define DS1307_BIT_CH            0x80
 #       define DS1340_BIT_nEOSC         0x80
+#       define MCP7941X_BIT_ST          0x80
 #define DS1307_REG_MIN          0x01    /* 00-59 */
 #define DS1307_REG_HOUR         0x02    /* 00-23, or 1-12{am,pm} */
 #       define DS1307_BIT_12HR          0x40    /* in REG_HOUR */
@@ -50,6 +52,7 @@ enum ds_type {
 #       define DS1340_BIT_CENTURY_EN    0x80    /* in REG_HOUR */
 #       define DS1340_BIT_CENTURY       0x40    /* in REG_HOUR */
 #define DS1307_REG_WDAY         0x03    /* 01-07 */
+#       define MCP7941X_BIT_VBATEN      0x08
 #define DS1307_REG_MDAY         0x04    /* 01-31 */
 #define DS1307_REG_MONTH        0x05    /* 01-12 */
 #       define DS1337_BIT_CENTURY       0x80    /* in REG_MONTH */
@@ -137,6 +140,8 @@ static const struct chip_desc chips[] = {
 },
 [m41t00] = {
 },
+[mcp7941x] = {
+},
 [rx_8025] = {
 }, };
@@ -149,6 +154,7 @@ static const struct i2c_device_id ds1307_id[] = {
        { "ds1340", ds_1340 },
        { "ds3231", ds_3231 },
        { "m41t00", m41t00 },
+        { "mcp7941x", mcp7941x },
        { "pt7c4338", ds_1307 },
        { "rx8025", rx_8025 },
        { }
@@ -365,6 +371,10 @@ static int ds1307_set_time(struct device *dev, struct rtc_time *t)
                buf[DS1307_REG_HOUR] |= DS1340_BIT_CENTURY_EN
                                | DS1340_BIT_CENTURY;
                break;
+        case mcp7941x:
+                buf[DS1307_REG_SECS] |= MCP7941X_BIT_ST;
+                buf[DS1307_REG_WDAY] |= MCP7941X_BIT_VBATEN;
+                break;
        default:
                break;
        }
@@ -809,6 +819,23 @@ read_rtc:
                        dev_warn(&client->dev, "SET TIME!\n");
                }
                break;
+        case mcp7941x:
+                /* make sure that the backup battery is enabled */
+                if (!(ds1307->regs[DS1307_REG_WDAY] & MCP7941X_BIT_VBATEN)) {
+                        i2c_smbus_write_byte_data(client, DS1307_REG_WDAY,
+                                        ds1307->regs[DS1307_REG_WDAY]
+                                        | MCP7941X_BIT_VBATEN);
+                }
+                /* clock halted?  turn it on, so clock can tick. */
+                if (!(tmp & MCP7941X_BIT_ST)) {
+                        i2c_smbus_write_byte_data(client, DS1307_REG_SECS,
+                                        MCP7941X_BIT_ST);
+                        dev_warn(&client->dev, "SET TIME!\n");
+                        goto read_rtc;
+                }
+                break;
        case rx_8025:
        case ds_1337:
        case ds_1339:
diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c
index 568ad30617e7..586c244a05d8 100644
--- a/drivers/rtc/rtc-ds1511.c
+++ b/drivers/rtc/rtc-ds1511.c
@@ -23,6 +23,7 @@
 #include <linux/rtc.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
+#include <linux/module.h>
 #define DRV_VERSION "0.6"
diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c
index fee41b97c9e8..1350029044e6 100644
--- a/drivers/rtc/rtc-ds1553.c
+++ b/drivers/rtc/rtc-ds1553.c
@@ -18,6 +18,7 @@
 #include <linux/rtc.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
+#include <linux/module.h>
 #define DRV_VERSION "0.3"
diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c
index 06dfb54f99b6..a319402a5447 100644
--- a/drivers/rtc/rtc-ds1672.c
+++ b/drivers/rtc/rtc-ds1672.c
@@ -11,6 +11,7 @@
 #include <linux/i2c.h>
 #include <linux/rtc.h>
+#include <linux/module.h>
 #define DRV_VERSION "0.4"
diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c
index d84a448dd754..e3e0f92b60f0 100644
--- a/drivers/rtc/rtc-ds1742.c
+++ b/drivers/rtc/rtc-ds1742.c
@@ -21,6 +21,7 @@
 #include <linux/rtc.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
+#include <linux/module.h>
 #define DRV_VERSION "0.4"
diff --git a/drivers/rtc/rtc-em3027.c b/drivers/rtc/rtc-em3027.c
index d8e1c2578553..8414dea5fb14 100644
--- a/drivers/rtc/rtc-em3027.c
+++ b/drivers/rtc/rtc-em3027.c
@@ -14,6 +14,7 @@
 #include <linux/i2c.h>
 #include <linux/rtc.h>
 #include <linux/bcd.h>
+#include <linux/module.h>
 /* Registers */
 #define EM3027_REG_ON_OFF_CTRL  0x00
diff --git a/drivers/rtc/rtc-isl12022.c b/drivers/rtc/rtc-isl12022.c
index ddbc797ea6cd..6186833973ee 100644
--- a/drivers/rtc/rtc-isl12022.c
+++ b/drivers/rtc/rtc-isl12022.c
@@ -15,6 +15,7 @@
 #include <linux/bcd.h>
 #include <linux/rtc.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #define DRV_VERSION "0.1"
diff --git a/drivers/rtc/rtc-mc13xxx.c b/drivers/rtc/rtc-mc13xxx.c
index a1a278bc340d..9d0c3b478d55 100644
--- a/drivers/rtc/rtc-mc13xxx.c
+++ b/drivers/rtc/rtc-mc13xxx.c
@@ -309,7 +309,7 @@ static irqreturn_t mc13xxx_rtc_reset_handler(int irq, void *dev)
        return IRQ_HANDLED;
 }
-static int __devinit mc13xxx_rtc_probe(struct platform_device *pdev)
+static int __init mc13xxx_rtc_probe(struct platform_device *pdev)
 {
        int ret;
        struct mc13xxx_rtc *priv;
@@ -378,7 +378,7 @@ err_reset_irq_request:
        return ret;
 }
-static int __devexit mc13xxx_rtc_remove(struct platform_device *pdev)
+static int __exit mc13xxx_rtc_remove(struct platform_device *pdev)
 {
        struct mc13xxx_rtc *priv = platform_get_drvdata(pdev);
@@ -410,7 +410,7 @@ const struct platform_device_id mc13xxx_rtc_idtable[] = {
 static struct platform_driver mc13xxx_rtc_driver = {
        .id_table = mc13xxx_rtc_idtable,
-        .remove = __devexit_p(mc13xxx_rtc_remove),
+        .remove = __exit_p(mc13xxx_rtc_remove),
        .driver = {
                .name = DRIVER_NAME,
                .owner = THIS_MODULE,
diff --git a/drivers/rtc/rtc-mv.c b/drivers/rtc/rtc-mv.c
index 60627a764514..768e2edb9678 100644
--- a/drivers/rtc/rtc-mv.c
+++ b/drivers/rtc/rtc-mv.c
@@ -14,6 +14,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/gfp.h>
+#include <linux/module.h>
 #define RTC_TIME_REG_OFFS       0
diff --git a/drivers/rtc/rtc-pcf2123.c b/drivers/rtc/rtc-pcf2123.c
index 71bab0ef5443..2ee3bbf7e5ea 100644
--- a/drivers/rtc/rtc-pcf2123.c
+++ b/drivers/rtc/rtc-pcf2123.c
@@ -42,6 +42,7 @@
 #include <linux/slab.h>
 #include <linux/rtc.h>
 #include <linux/spi/spi.h>
+#include <linux/module.h>
 #define DRV_VERSION "0.6"
diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c
index b42c0c679266..606fdfab34e2 100644
--- a/drivers/rtc/rtc-pcf8563.c
+++ b/drivers/rtc/rtc-pcf8563.c
@@ -18,6 +18,7 @@
 #include <linux/bcd.h>
 #include <linux/rtc.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #define DRV_VERSION "0.4.3"
diff --git a/drivers/rtc/rtc-rs5c348.c b/drivers/rtc/rtc-rs5c348.c
index 368d0e63cf83..971bc8e08da6 100644
--- a/drivers/rtc/rtc-rs5c348.c
+++ b/drivers/rtc/rtc-rs5c348.c
@@ -23,6 +23,7 @@
 #include <linux/rtc.h>
 #include <linux/workqueue.h>
 #include <linux/spi/spi.h>
+#include <linux/module.h>
 #define DRV_VERSION "0.2"
diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c
index 85c1b848dd72..d29f5432c6e8 100644
--- a/drivers/rtc/rtc-rs5c372.c
+++ b/drivers/rtc/rtc-rs5c372.c
@@ -14,6 +14,7 @@
 #include <linux/rtc.h>
 #include <linux/bcd.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #define DRV_VERSION "0.6"
diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c
index 3b943673cd3e..ed3e9b599031 100644
--- a/drivers/rtc/rtc-stk17ta8.c
+++ b/drivers/rtc/rtc-stk17ta8.c
@@ -21,6 +21,7 @@
 #include <linux/rtc.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
+#include <linux/module.h>
 #define DRV_VERSION "0.1"
diff --git a/drivers/rtc/rtc-tx4939.c b/drivers/rtc/rtc-tx4939.c
index ec6313d15359..aac0ffed4345 100644
--- a/drivers/rtc/rtc-tx4939.c
+++ b/drivers/rtc/rtc-tx4939.c
@@ -11,6 +11,7 @@
 #include <linux/rtc.h>
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
+#include <linux/module.h>
 #include <linux/io.h>
 #include <linux/gfp.h>
 #include <asm/txx9/tx4939.h>
diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c
index b00aad2620d4..8c051d3179db 100644
--- a/drivers/rtc/rtc-x1205.c
+++ b/drivers/rtc/rtc-x1205.c
@@ -21,6 +21,7 @@
 #include <linux/bcd.h>
 #include <linux/rtc.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 #define DRV_VERSION "1.0.8"
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 9b43ae94beba..a5a55da2a1ac 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -27,7 +27,7 @@
 static int dcssblk_open(struct block_device *bdev, fmode_t mode);
 static int dcssblk_release(struct gendisk *disk, fmode_t mode);
-static int dcssblk_make_request(struct request_queue *q, struct bio *bio);
+static void dcssblk_make_request(struct request_queue *q, struct bio *bio);
 static int dcssblk_direct_access(struct block_device *bdev, sector_t secnum,
                                 void **kaddr, unsigned long *pfn);
@@ -814,7 +814,7 @@ out:
        return rc;
 }
-static int
+static void
 dcssblk_make_request(struct request_queue *q, struct bio *bio)
 {
        struct dcssblk_dev_info *dev_info;
@@ -871,10 +871,9 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio)
                bytes_done += bvec->bv_len;
        }
        bio_endio(bio, 0);
-        return 0;
+        return;
 fail:
        bio_io_error(bio);
-        return 0;
 }
 static int
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c
index 1f6a4d894e73..98f3e4ade924 100644
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@ -181,7 +181,7 @@ static unsigned long xpram_highest_page_index(void)
 /*
 * Block device make request function.
 */
-static int xpram_make_request(struct request_queue *q, struct bio *bio)
+static void xpram_make_request(struct request_queue *q, struct bio *bio)
 {
        xpram_device_t *xdev = bio->bi_bdev->bd_disk->private_data;
        struct bio_vec *bvec;
@@ -221,10 +221,9 @@ static int xpram_make_request(struct request_queue *q, struct bio *bio)
        }
        set_bit(BIO_UPTODATE, &bio->bi_flags);
        bio_endio(bio, 0);
-        return 0;
+        return;
 fail:
        bio_io_error(bio);
-        return 0;
 }
 static int xpram_getgeo(struct block_device *bdev, struct hd_geometry *geo)
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c
index f6489eb7e976..e71298158f9e 100644
--- a/drivers/s390/char/fs3270.c
+++ b/drivers/s390/char/fs3270.c
@@ -11,6 +11,7 @@
 #include <linux/console.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/module.h>
 #include <linux/list.h>
 #include <linux/slab.h>
 #include <linux/types.h>
diff --git a/drivers/s390/char/sclp_cpi_sys.c b/drivers/s390/char/sclp_cpi_sys.c
index 4a51e3f09689..bd1b9c919051 100644
--- a/drivers/s390/char/sclp_cpi_sys.c
+++ b/drivers/s390/char/sclp_cpi_sys.c
@@ -21,6 +21,7 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/completion.h>
+#include <linux/export.h>
 #include <asm/ebcdic.h>
 #include <asm/sclp.h>
diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c
index 31a3ccbb6495..75bde6a8b7dc 100644
--- a/drivers/s390/char/vmcp.c
+++ b/drivers/s390/char/vmcp.c
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <asm/compat.h>
 #include <asm/cpcmd.h>
 #include <asm/debug.h>
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index d291a54acfad..85f4a9a5d12e 100644
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@ -13,6 +13,7 @@
 #include <linux/cdev.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <asm/uaccess.h>
 #include <asm/cio.h>
diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c
index 2d32233943a9..e792436c9270 100644
--- a/drivers/s390/cio/chp.c
+++ b/drivers/s390/cio/chp.c
@@ -10,6 +10,8 @@
 #include <linux/bug.h>
 #include <linux/workqueue.h>
 #include <linux/spinlock.h>
+#include <linux/export.h>
+#include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/jiffies.h>
 #include <linux/wait.h>
diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c
index ed68245f9741..29021f4e96b6 100644
--- a/drivers/s390/cio/qdio_debug.c
+++ b/drivers/s390/cio/qdio_debug.c
@@ -7,6 +7,8 @@
 */
 #include <linux/seq_file.h>
 #include <linux/debugfs.h>
+#include <linux/uaccess.h>
+#include <linux/export.h>
 #include <asm/debug.h>
 #include "qdio_debug.h"
 #include "qdio.h"
diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c
index d9a46a429bcc..2acc01f90a6a 100644
--- a/drivers/s390/cio/qdio_setup.c
+++ b/drivers/s390/cio/qdio_setup.c
@@ -8,6 +8,7 @@
 */
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <asm/qdio.h>
 #include "cio.h"
diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c
index 3c2c923d5c0a..94f49ffa70ba 100644
--- a/drivers/s390/kvm/kvm_virtio.c
+++ b/drivers/s390/kvm/kvm_virtio.c
@@ -20,6 +20,7 @@
 #include <linux/virtio_console.h>
 #include <linux/interrupt.h>
 #include <linux/virtio_ring.h>
+#include <linux/export.h>
 #include <linux/pfn.h>
 #include <asm/io.h>
 #include <asm/kvm_para.h>
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index 645b0fcbb370..086018109662 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -31,6 +31,7 @@
 #include <linux/miscdevice.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include "zfcp_ext.h"
 #include "zfcp_fc.h"
 #include "zfcp_reqlist.h"
diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c
index e8b7cee62046..96f13ad88123 100644
--- a/drivers/s390/scsi/zfcp_ccw.c
+++ b/drivers/s390/scsi/zfcp_ccw.c
@@ -9,6 +9,7 @@
 #define KMSG_COMPONENT "zfcp"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+#include <linux/module.h>
 #include "zfcp_ext.h"
 #include "zfcp_reqlist.h"
diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c
index 967e7b70e977..a9a816e4aa55 100644
--- a/drivers/s390/scsi/zfcp_dbf.c
+++ b/drivers/s390/scsi/zfcp_dbf.c
@@ -9,6 +9,7 @@
 #define KMSG_COMPONENT "zfcp"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+#include <linux/module.h>
 #include <linux/ctype.h>
 #include <linux/slab.h>
 #include <asm/debug.h>
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c
index df9e69f54742..e14da5751d32 100644
--- a/drivers/s390/scsi/zfcp_qdio.c
+++ b/drivers/s390/scsi/zfcp_qdio.c
@@ -10,6 +10,7 @@
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/slab.h>
+#include <linux/module.h>
 #include "zfcp_ext.h"
 #include "zfcp_qdio.h"
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 09126a9d62ff..11f07f888223 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -9,6 +9,7 @@
 #define KMSG_COMPONENT "zfcp"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+#include <linux/module.h>
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <scsi/fc/fc_fcp.h>
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index aa573c39f596..06ea3bcfdd2a 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -617,20 +617,6 @@ config SCSI_ARCMSR
          To compile this driver as a module, choose M here: the
          module will be called arcmsr (modprobe arcmsr).
-config SCSI_ARCMSR_AER
-        bool "Enable PCI Error Recovery Capability in Areca Driver(ARCMSR)"
-        depends on SCSI_ARCMSR && PCIEAER
-        default n
-        help
-          The advanced error reporting(AER) capability is "NOT" provided by
-          ARC1200/1201/1202 SATA RAID controllers cards.
-          If your card is one of ARC1200/1201/1202, please use the default setting, n.
-          If your card is other models, you could pick it
-          on condition that the kernel version is greater than 2.6.19.
-          This function is maintained driver by Nick Cheng. If you have any
-          problems or suggestion, you are welcome to contact with <nick.cheng@areca.com.tw>.
-          To enable this function, choose Y here.
 source "drivers/scsi/megaraid/Kconfig.megaraid"
 source "drivers/scsi/mpt2sas/Kconfig"
diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c
index 1bb5d3f0e260..79a30633d4aa 100644
--- a/drivers/scsi/a2091.c
+++ b/drivers/scsi/a2091.c
@@ -5,6 +5,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/zorro.h>
+#include <linux/module.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c
index d9468027fb61..e29fe0e708f8 100644
--- a/drivers/scsi/a3000.c
+++ b/drivers/scsi/a3000.c
@@ -6,6 +6,7 @@
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
+#include <linux/module.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 061995741444..409f5805bdd6 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -34,6 +34,7 @@
 #include <linux/blkdev.h>
 #include <asm/uaccess.h>
 #include <linux/highmem.h> /* For flush_kernel_dcache_page */
+#include <linux/module.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 7b0a8ab71049..379c696dac19 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -27,6 +27,7 @@
 #include <linux/kernel.h>
 #include <linux/semaphore.h>
 #include <linux/iscsi_boot_sysfs.h>
+#include <linux/module.h>
 #include <scsi/libiscsi.h>
 #include <scsi/scsi_transport_iscsi.h>
diff --git a/drivers/scsi/bfa/bfad_debugfs.c b/drivers/scsi/bfa/bfad_debugfs.c
index b412e0300dd4..dee1a094c2c2 100644
--- a/drivers/scsi/bfa/bfad_debugfs.c
+++ b/drivers/scsi/bfa/bfad_debugfs.c
@@ -16,6 +16,7 @@
 */
 #include <linux/debugfs.h>
+#include <linux/export.h>
 #include "bfad_drv.h"
 #include "bfad_im.h"
diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c
index 01312381639f..e5db649e8eb7 100644
--- a/drivers/scsi/bfa/bfad_im.c
+++ b/drivers/scsi/bfa/bfad_im.c
@@ -19,6 +19,8 @@
 *  bfad_im.c Linux driver IM module.
 */
+#include <linux/export.h>
 #include "bfad_drv.h"
 #include "bfad_im.h"
 #include "bfa_fcs.h"
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index 63de1c7cd0cb..049ea907e04a 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -62,7 +62,7 @@
 #include "bnx2fc_constants.h"
 #define BNX2FC_NAME             "bnx2fc"
-#define BNX2FC_VERSION          "1.0.8"
+#define BNX2FC_VERSION          "1.0.9"
 #define PFX                     "bnx2fc: "
@@ -145,6 +145,9 @@
 #define REC_RETRY_COUNT                 1
 #define BNX2FC_NUM_ERR_BITS             63
+#define BNX2FC_RELOGIN_WAIT_TIME        200
+#define BNX2FC_RELOGIN_WAIT_CNT         10
 /* bnx2fc driver uses only one instance of fcoe_percpu_s */
 extern struct fcoe_percpu_s bnx2fc_global;
diff --git a/drivers/scsi/bnx2fc/bnx2fc_els.c b/drivers/scsi/bnx2fc/bnx2fc_els.c
index fd382fe33f6e..ce0ce3e32f33 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_els.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_els.c
@@ -268,17 +268,6 @@ void bnx2fc_srr_compl(struct bnx2fc_els_cb_arg *cb_arg)
        orig_io_req = cb_arg->aborted_io_req;
        srr_req = cb_arg->io_req;
-        if (test_bit(BNX2FC_FLAG_IO_COMPL, &orig_io_req->req_flags)) {
-                BNX2FC_IO_DBG(srr_req, "srr_compl: xid - 0x%x completed",
-                        orig_io_req->xid);
-                goto srr_compl_done;
-        }
-        if (test_bit(BNX2FC_FLAG_ISSUE_ABTS, &orig_io_req->req_flags)) {
-                BNX2FC_IO_DBG(srr_req, "rec abts in prog "
-                       "orig_io - 0x%x\n",
-                        orig_io_req->xid);
-                goto srr_compl_done;
-        }
        if (test_and_clear_bit(BNX2FC_FLAG_ELS_TIMEOUT, &srr_req->req_flags)) {
                /* SRR timedout */
                BNX2FC_IO_DBG(srr_req, "srr timed out, abort "
@@ -290,6 +279,12 @@ void bnx2fc_srr_compl(struct bnx2fc_els_cb_arg *cb_arg)
                                "failed. issue cleanup\n");
                        bnx2fc_initiate_cleanup(srr_req);
                }
+                if (test_bit(BNX2FC_FLAG_IO_COMPL, &orig_io_req->req_flags) ||
+                    test_bit(BNX2FC_FLAG_ISSUE_ABTS, &orig_io_req->req_flags)) {
+                        BNX2FC_IO_DBG(srr_req, "srr_compl:xid 0x%x flags = %lx",
+                                      orig_io_req->xid, orig_io_req->req_flags);
+                        goto srr_compl_done;
+                }
                orig_io_req->srr_retry++;
                if (orig_io_req->srr_retry <= SRR_RETRY_COUNT) {
                        struct bnx2fc_rport *tgt = orig_io_req->tgt;
@@ -311,6 +306,12 @@ void bnx2fc_srr_compl(struct bnx2fc_els_cb_arg *cb_arg)
                }
                goto srr_compl_done;
        }
+        if (test_bit(BNX2FC_FLAG_IO_COMPL, &orig_io_req->req_flags) ||
+            test_bit(BNX2FC_FLAG_ISSUE_ABTS, &orig_io_req->req_flags)) {
+                BNX2FC_IO_DBG(srr_req, "srr_compl:xid - 0x%x flags = %lx",
+                              orig_io_req->xid, orig_io_req->req_flags);
+                goto srr_compl_done;
+        }
        mp_req = &(srr_req->mp_req);
        fc_hdr = &(mp_req->resp_fc_hdr);
        resp_len = mp_req->resp_len;
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index 85bcc4b55965..8c6156a10d90 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -22,7 +22,7 @@ DEFINE_PER_CPU(struct bnx2fc_percpu_s, bnx2fc_percpu);
 #define DRV_MODULE_NAME         "bnx2fc"
 #define DRV_MODULE_VERSION      BNX2FC_VERSION
-#define DRV_MODULE_RELDATE      "Oct 02, 2011"
+#define DRV_MODULE_RELDATE      "Oct 21, 2011"
 static char version[] __devinitdata =
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index 0c64d184d731..84a78af83f90 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -1103,7 +1103,10 @@ int bnx2fc_eh_abort(struct scsi_cmnd *sc_cmd)
        struct fc_rport_libfc_priv *rp = rport->dd_data;
        struct bnx2fc_cmd *io_req;
        struct fc_lport *lport;
+        struct fc_rport_priv *rdata;
        struct bnx2fc_rport *tgt;
+        int logo_issued;
+        int wait_cnt = 0;
        int rc = FAILED;
@@ -1192,8 +1195,40 @@ int bnx2fc_eh_abort(struct scsi_cmnd *sc_cmd)
        } else {
                printk(KERN_ERR PFX "eh_abort: io_req (xid = 0x%x) "
                                "already in abts processing\n", io_req->xid);
+                if (cancel_delayed_work(&io_req->timeout_work))
+                        kref_put(&io_req->refcount,
+                                 bnx2fc_cmd_release); /* drop timer hold */
+                bnx2fc_initiate_cleanup(io_req);
+                spin_unlock_bh(&tgt->tgt_lock);
+                wait_for_completion(&io_req->tm_done);
+                spin_lock_bh(&tgt->tgt_lock);
+                io_req->wait_for_comp = 0;
+                rdata = io_req->tgt->rdata;
+                logo_issued = test_and_set_bit(BNX2FC_FLAG_EXPL_LOGO,
+                                               &tgt->flags);
                kref_put(&io_req->refcount, bnx2fc_cmd_release);
                spin_unlock_bh(&tgt->tgt_lock);
+                if (!logo_issued) {
+                        BNX2FC_IO_DBG(io_req, "Expl logo - tgt flags = 0x%lx\n",
+                                      tgt->flags);
+                        mutex_lock(&lport->disc.disc_mutex);
+                        lport->tt.rport_logoff(rdata);
+                        mutex_unlock(&lport->disc.disc_mutex);
+                        do {
+                                msleep(BNX2FC_RELOGIN_WAIT_TIME);
+                                /*
+                                 * If session not recovered, let SCSI-ml
+                                 * escalate error recovery.
+                                 */
+                                if (wait_cnt++ > BNX2FC_RELOGIN_WAIT_CNT)
+                                        return FAILED;
+                        } while (!test_bit(BNX2FC_FLAG_SESSION_READY,
+                                           &tgt->flags));
+                }
                return SUCCESS;
        }
        if (rc == FAILED) {
@@ -1275,6 +1310,8 @@ void bnx2fc_process_cleanup_compl(struct bnx2fc_cmd *io_req,
                   io_req->refcount.refcount.counter, io_req->cmd_type);
        bnx2fc_scsi_done(io_req, DID_ERROR);
        kref_put(&io_req->refcount, bnx2fc_cmd_release);
+        if (io_req->wait_for_comp)
+                complete(&io_req->tm_done);
 }
 void bnx2fc_process_abts_compl(struct bnx2fc_cmd *io_req,
diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
index c363a4b260fd..c10f74a566f2 100644
--- a/drivers/scsi/cxgbi/libcxgbi.c
+++ b/drivers/scsi/cxgbi/libcxgbi.c
@@ -25,6 +25,7 @@
 #include <net/dst.h>
 #include <net/route.h>
 #include <linux/inetdevice.h>   /* ip_dev_find */
+#include <linux/module.h>
 #include <net/tcp.h>
 static unsigned int dbg_level;
diff --git a/drivers/scsi/device_handler/scsi_dh.c b/drivers/scsi/device_handler/scsi_dh.c
index 7c05fd9dccfd..23149b9e297c 100644
--- a/drivers/scsi/device_handler/scsi_dh.c
+++ b/drivers/scsi/device_handler/scsi_dh.c
@@ -22,6 +22,7 @@
 */
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <scsi/scsi_dh.h>
 #include "../scsi_priv.h"
@@ -441,7 +442,15 @@ int scsi_dh_activate(struct request_queue *q, activate_complete fn, void *data)
        spin_lock_irqsave(q->queue_lock, flags);
        sdev = q->queuedata;
-        if (sdev && sdev->scsi_dh_data)
+        if (!sdev) {
+                spin_unlock_irqrestore(q->queue_lock, flags);
+                err = SCSI_DH_NOSYS;
+                if (fn)
+                        fn(data, err);
+                return err;
+        }
+        if (sdev->scsi_dh_data)
                scsi_dh = sdev->scsi_dh_data->scsi_dh;
        dev = get_device(&sdev->sdev_gendev);
        if (!scsi_dh || !dev ||
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
index 627f4b5e5176..4ef021291a4d 100644
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -21,6 +21,7 @@
 */
 #include <linux/slab.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_dh.h>
@@ -507,7 +508,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h)
        int len, k, off, valid_states = 0;
        unsigned char *ucp;
        unsigned err;
-        unsigned long expiry, interval = 1;
+        unsigned long expiry, interval = 1000;
        expiry = round_jiffies_up(jiffies + ALUA_FAILOVER_TIMEOUT);
 retry:
@@ -734,6 +735,7 @@ static int alua_bus_attach(struct scsi_device *sdev)
        spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
        sdev->scsi_dh_data = scsi_dh_data;
        spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
+        sdev_printk(KERN_NOTICE, sdev, "%s: Attached\n", ALUA_DH_NAME);
        return 0;
diff --git a/drivers/scsi/device_handler/scsi_dh_emc.c b/drivers/scsi/device_handler/scsi_dh_emc.c
index 48441f6908a4..591186cf1896 100644
--- a/drivers/scsi/device_handler/scsi_dh_emc.c
+++ b/drivers/scsi/device_handler/scsi_dh_emc.c
@@ -21,6 +21,7 @@
 * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_dh.h>
diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
index b479f1eef968..0f86a18b157d 100644
--- a/drivers/scsi/device_handler/scsi_dh_hp_sw.c
+++ b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
@@ -22,6 +22,7 @@
 */
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_dbg.h>
 #include <scsi/scsi_eh.h>
diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c
index 82d612f0c49d..1d3127920063 100644
--- a/drivers/scsi/device_handler/scsi_dh_rdac.c
+++ b/drivers/scsi/device_handler/scsi_dh_rdac.c
@@ -24,6 +24,7 @@
 #include <scsi/scsi_dh.h>
 #include <linux/workqueue.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #define RDAC_NAME "rdac"
 #define RDAC_RETRY_COUNT 5
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 61384ee4049b..cefbe44bb84a 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -2347,14 +2347,11 @@ static void fcoe_flogi_resp(struct fc_seq *seq, struct fc_frame *fp, void *arg)
                goto done;
        mac = fr_cb(fp)->granted_mac;
-        if (is_zero_ether_addr(mac)) {
+        /* pre-FIP */
-                /* pre-FIP */
+        if (is_zero_ether_addr(mac))
-                if (fcoe_ctlr_recv_flogi(fip, lport, fp)) {
+                fcoe_ctlr_recv_flogi(fip, lport, fp);
-                        fc_frame_free(fp);
+        if (!is_zero_ether_addr(mac))
-                        return;
+                fcoe_update_src_mac(lport, mac);
-                }
-        }
-        fcoe_update_src_mac(lport, mac);
 done:
        fc_lport_flogi_resp(seq, fp, lport);
 }
diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c
index 50bb54150a78..488fbc648656 100644
--- a/drivers/scsi/gvp11.c
+++ b/drivers/scsi/gvp11.c
@@ -5,6 +5,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/zorro.h>
+#include <linux/module.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 4f7a5829ea4c..351dc0b86fab 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -286,6 +286,7 @@ static void scsi_host_dev_release(struct device *dev)
 {
        struct Scsi_Host *shost = dev_to_shost(dev);
        struct device *parent = dev->parent;
+        struct request_queue *q;
        scsi_proc_hostdir_rm(shost->hostt);
@@ -293,9 +294,11 @@ static void scsi_host_dev_release(struct device *dev)
                kthread_stop(shost->ehandler);
        if (shost->work_q)
                destroy_workqueue(shost->work_q);
-        if (shost->uspace_req_q) {
+        q = shost->uspace_req_q;
-                kfree(shost->uspace_req_q->queuedata);
+        if (q) {
-                scsi_free_queue(shost->uspace_req_q);
+                kfree(q->queuedata);
+                q->queuedata = NULL;
+                scsi_free_queue(q);
        }
        scsi_destroy_command_freelist(shost);
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 9825ecf34957..e76107b2ade3 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -48,6 +48,7 @@
 #include <linux/bitmap.h>
 #include <linux/atomic.h>
 #include <linux/kthread.h>
+#include <linux/jiffies.h>
 #include "hpsa_cmd.h"
 #include "hpsa.h"
@@ -127,6 +128,10 @@ static struct board_type products[] = {
 static int number_of_controllers;
+static struct list_head hpsa_ctlr_list = LIST_HEAD_INIT(hpsa_ctlr_list);
+static spinlock_t lockup_detector_lock;
+static struct task_struct *hpsa_lockup_detector;
 static irqreturn_t do_hpsa_intr_intx(int irq, void *dev_id);
 static irqreturn_t do_hpsa_intr_msi(int irq, void *dev_id);
 static int hpsa_ioctl(struct scsi_device *dev, int cmd, void *arg);
@@ -484,6 +489,7 @@ static struct scsi_host_template hpsa_driver_template = {
 #endif
        .sdev_attrs = hpsa_sdev_attrs,
        .shost_attrs = hpsa_shost_attrs,
+        .max_sectors = 8192,
 };
@@ -566,16 +572,16 @@ static int hpsa_find_target_lun(struct ctlr_info *h,
         * assumes h->devlock is held
         */
        int i, found = 0;
-        DECLARE_BITMAP(lun_taken, HPSA_MAX_SCSI_DEVS_PER_HBA);
+        DECLARE_BITMAP(lun_taken, HPSA_MAX_DEVICES);
-        memset(&lun_taken[0], 0, HPSA_MAX_SCSI_DEVS_PER_HBA >> 3);
+        memset(&lun_taken[0], 0, HPSA_MAX_DEVICES >> 3);
        for (i = 0; i < h->ndevices; i++) {
                if (h->dev[i]->bus == bus && h->dev[i]->target != -1)
                        set_bit(h->dev[i]->target, lun_taken);
        }
-        for (i = 0; i < HPSA_MAX_SCSI_DEVS_PER_HBA; i++) {
+        for (i = 0; i < HPSA_MAX_DEVICES; i++) {
                if (!test_bit(i, lun_taken)) {
                        /* *bus = 1; */
                        *target = i;
@@ -598,7 +604,7 @@ static int hpsa_scsi_add_entry(struct ctlr_info *h, int hostno,
        unsigned char addr1[8], addr2[8];
        struct hpsa_scsi_dev_t *sd;
-        if (n >= HPSA_MAX_SCSI_DEVS_PER_HBA) {
+        if (n >= HPSA_MAX_DEVICES) {
                dev_err(&h->pdev->dev, "too many devices, some will be "
                        "inaccessible.\n");
                return -1;
@@ -673,7 +679,7 @@ static void hpsa_scsi_replace_entry(struct ctlr_info *h, int hostno,
        struct hpsa_scsi_dev_t *removed[], int *nremoved)
 {
        /* assumes h->devlock is held */
-        BUG_ON(entry < 0 || entry >= HPSA_MAX_SCSI_DEVS_PER_HBA);
+        BUG_ON(entry < 0 || entry >= HPSA_MAX_DEVICES);
        removed[*nremoved] = h->dev[entry];
        (*nremoved)++;
@@ -702,7 +708,7 @@ static void hpsa_scsi_remove_entry(struct ctlr_info *h, int hostno, int entry,
        int i;
        struct hpsa_scsi_dev_t *sd;
-        BUG_ON(entry < 0 || entry >= HPSA_MAX_SCSI_DEVS_PER_HBA);
+        BUG_ON(entry < 0 || entry >= HPSA_MAX_DEVICES);
        sd = h->dev[entry];
        removed[*nremoved] = h->dev[entry];
@@ -814,10 +820,8 @@ static void adjust_hpsa_scsi_table(struct ctlr_info *h, int hostno,
        int nadded, nremoved;
        struct Scsi_Host *sh = NULL;
-        added = kzalloc(sizeof(*added) * HPSA_MAX_SCSI_DEVS_PER_HBA,
+        added = kzalloc(sizeof(*added) * HPSA_MAX_DEVICES, GFP_KERNEL);
-                GFP_KERNEL);
+        removed = kzalloc(sizeof(*removed) * HPSA_MAX_DEVICES, GFP_KERNEL);
-        removed = kzalloc(sizeof(*removed) * HPSA_MAX_SCSI_DEVS_PER_HBA,
-                GFP_KERNEL);
        if (!added || !removed) {
                dev_warn(&h->pdev->dev, "out of memory in "
@@ -1338,6 +1342,22 @@ static inline void hpsa_scsi_do_simple_cmd_core(struct ctlr_info *h,
        wait_for_completion(&wait);
 }
+static void hpsa_scsi_do_simple_cmd_core_if_no_lockup(struct ctlr_info *h,
+        struct CommandList *c)
+{
+        unsigned long flags;
+        /* If controller lockup detected, fake a hardware error. */
+        spin_lock_irqsave(&h->lock, flags);
+        if (unlikely(h->lockup_detected)) {
+                spin_unlock_irqrestore(&h->lock, flags);
+                c->err_info->CommandStatus = CMD_HARDWARE_ERR;
+        } else {
+                spin_unlock_irqrestore(&h->lock, flags);
+                hpsa_scsi_do_simple_cmd_core(h, c);
+        }
+}
 static void hpsa_scsi_do_simple_cmd_with_retry(struct ctlr_info *h,
        struct CommandList *c, int data_direction)
 {
@@ -1735,7 +1755,6 @@ static int add_msa2xxx_enclosure_device(struct ctlr_info *h,
        if (is_scsi_rev_5(h))
                return 0; /* p1210m doesn't need to do this. */
-#define MAX_MSA2XXX_ENCLOSURES 32
        if (*nmsa2xxx_enclosures >= MAX_MSA2XXX_ENCLOSURES) {
                dev_warn(&h->pdev->dev, "Maximum number of MSA2XXX "
                        "enclosures exceeded.  Check your hardware "
@@ -1846,8 +1865,7 @@ static void hpsa_update_scsi_devices(struct ctlr_info *h, int hostno)
        int raid_ctlr_position;
        DECLARE_BITMAP(lunzerobits, HPSA_MAX_TARGETS_PER_CTLR);
-        currentsd = kzalloc(sizeof(*currentsd) * HPSA_MAX_SCSI_DEVS_PER_HBA,
+        currentsd = kzalloc(sizeof(*currentsd) * HPSA_MAX_DEVICES, GFP_KERNEL);
-                GFP_KERNEL);
        physdev_list = kzalloc(reportlunsize, GFP_KERNEL);
        logdev_list = kzalloc(reportlunsize, GFP_KERNEL);
        tmpdevice = kzalloc(sizeof(*tmpdevice), GFP_KERNEL);
@@ -1870,6 +1888,13 @@ static void hpsa_update_scsi_devices(struct ctlr_info *h, int hostno)
        /* Allocate the per device structures */
        for (i = 0; i < ndevs_to_allocate; i++) {
+                if (i >= HPSA_MAX_DEVICES) {
+                        dev_warn(&h->pdev->dev, "maximum devices (%d) exceeded."
+                                "  %d devices ignored.\n", HPSA_MAX_DEVICES,
+                                ndevs_to_allocate - HPSA_MAX_DEVICES);
+                        break;
+                }
                currentsd[i] = kzalloc(sizeof(*currentsd[i]), GFP_KERNEL);
                if (!currentsd[i]) {
                        dev_warn(&h->pdev->dev, "out of memory at %s:%d\n",
@@ -1956,7 +1981,7 @@ static void hpsa_update_scsi_devices(struct ctlr_info *h, int hostno)
                default:
                        break;
                }
-                if (ncurrent >= HPSA_MAX_SCSI_DEVS_PER_HBA)
+                if (ncurrent >= HPSA_MAX_DEVICES)
                        break;
        }
        adjust_hpsa_scsi_table(h, hostno, currentsd, ncurrent);
@@ -2048,8 +2073,14 @@ static int hpsa_scsi_queue_command_lck(struct scsi_cmnd *cmd,
        }
        memcpy(scsi3addr, dev->scsi3addr, sizeof(scsi3addr));
-        /* Need a lock as this is being allocated from the pool */
        spin_lock_irqsave(&h->lock, flags);
+        if (unlikely(h->lockup_detected)) {
+                spin_unlock_irqrestore(&h->lock, flags);
+                cmd->result = DID_ERROR << 16;
+                done(cmd);
+                return 0;
+        }
+        /* Need a lock as this is being allocated from the pool */
        c = cmd_alloc(h);
        spin_unlock_irqrestore(&h->lock, flags);
        if (c == NULL) {                        /* trouble... */
@@ -2601,7 +2632,7 @@ static int hpsa_passthru_ioctl(struct ctlr_info *h, void __user *argp)
                c->SG[0].Len = iocommand.buf_size;
                c->SG[0].Ext = 0; /* we are not chaining*/
        }
-        hpsa_scsi_do_simple_cmd_core(h, c);
+        hpsa_scsi_do_simple_cmd_core_if_no_lockup(h, c);
        if (iocommand.buf_size > 0)
                hpsa_pci_unmap(h->pdev, c, 1, PCI_DMA_BIDIRECTIONAL);
        check_ioctl_unit_attention(h, c);
@@ -2724,7 +2755,7 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp)
                        c->SG[i].Ext = 0;
                }
        }
-        hpsa_scsi_do_simple_cmd_core(h, c);
+        hpsa_scsi_do_simple_cmd_core_if_no_lockup(h, c);
        if (sg_used)
                hpsa_pci_unmap(h->pdev, c, sg_used, PCI_DMA_BIDIRECTIONAL);
        check_ioctl_unit_attention(h, c);
@@ -2872,6 +2903,8 @@ static void fill_cmd(struct CommandList *c, u8 cmd, struct ctlr_info *h,
                        c->Request.Timeout = 0;
                        c->Request.CDB[0] = BMIC_WRITE;
                        c->Request.CDB[6] = BMIC_CACHE_FLUSH;
+                        c->Request.CDB[7] = (size >> 8) & 0xFF;
+                        c->Request.CDB[8] = size & 0xFF;
                        break;
                case TEST_UNIT_READY:
                        c->Request.CDBLen = 6;
@@ -3091,6 +3124,7 @@ static irqreturn_t hpsa_intx_discard_completions(int irq, void *dev_id)
        if (interrupt_not_for_us(h))
                return IRQ_NONE;
        spin_lock_irqsave(&h->lock, flags);
+        h->last_intr_timestamp = get_jiffies_64();
        while (interrupt_pending(h)) {
                raw_tag = get_next_completion(h);
                while (raw_tag != FIFO_EMPTY)
@@ -3110,6 +3144,7 @@ static irqreturn_t hpsa_msix_discard_completions(int irq, void *dev_id)
                return IRQ_NONE;
        spin_lock_irqsave(&h->lock, flags);
+        h->last_intr_timestamp = get_jiffies_64();
        raw_tag = get_next_completion(h);
        while (raw_tag != FIFO_EMPTY)
                raw_tag = next_command(h);
@@ -3126,6 +3161,7 @@ static irqreturn_t do_hpsa_intr_intx(int irq, void *dev_id)
        if (interrupt_not_for_us(h))
                return IRQ_NONE;
        spin_lock_irqsave(&h->lock, flags);
+        h->last_intr_timestamp = get_jiffies_64();
        while (interrupt_pending(h)) {
                raw_tag = get_next_completion(h);
                while (raw_tag != FIFO_EMPTY) {
@@ -3146,6 +3182,7 @@ static irqreturn_t do_hpsa_intr_msi(int irq, void *dev_id)
        u32 raw_tag;
        spin_lock_irqsave(&h->lock, flags);
+        h->last_intr_timestamp = get_jiffies_64();
        raw_tag = get_next_completion(h);
        while (raw_tag != FIFO_EMPTY) {
                if (hpsa_tag_contains_index(raw_tag))
@@ -3300,6 +3337,13 @@ static int hpsa_controller_hard_reset(struct pci_dev *pdev,
                pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
                pmcsr |= PCI_D0;
                pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr);
+                /*
+                 * The P600 requires a small delay when changing states.
+                 * Otherwise we may think the board did not reset and we bail.
+                 * This for kdump only and is particular to the P600.
+                 */
+                msleep(500);
        }
        return 0;
 }
@@ -4083,6 +4127,149 @@ static void hpsa_undo_allocations_after_kdump_soft_reset(struct ctlr_info *h)
        kfree(h);
 }
+static void remove_ctlr_from_lockup_detector_list(struct ctlr_info *h)
+{
+        assert_spin_locked(&lockup_detector_lock);
+        if (!hpsa_lockup_detector)
+                return;
+        if (h->lockup_detected)
+                return; /* already stopped the lockup detector */
+        list_del(&h->lockup_list);
+}
+/* Called when controller lockup detected. */
+static void fail_all_cmds_on_list(struct ctlr_info *h, struct list_head *list)
+{
+        struct CommandList *c = NULL;
+        assert_spin_locked(&h->lock);
+        /* Mark all outstanding commands as failed and complete them. */
+        while (!list_empty(list)) {
+                c = list_entry(list->next, struct CommandList, list);
+                c->err_info->CommandStatus = CMD_HARDWARE_ERR;
+                finish_cmd(c, c->Header.Tag.lower);
+        }
+}
+static void controller_lockup_detected(struct ctlr_info *h)
+{
+        unsigned long flags;
+        assert_spin_locked(&lockup_detector_lock);
+        remove_ctlr_from_lockup_detector_list(h);
+        h->access.set_intr_mask(h, HPSA_INTR_OFF);
+        spin_lock_irqsave(&h->lock, flags);
+        h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
+        spin_unlock_irqrestore(&h->lock, flags);
+        dev_warn(&h->pdev->dev, "Controller lockup detected: 0x%08x\n",
+                        h->lockup_detected);
+        pci_disable_device(h->pdev);
+        spin_lock_irqsave(&h->lock, flags);
+        fail_all_cmds_on_list(h, &h->cmpQ);
+        fail_all_cmds_on_list(h, &h->reqQ);
+        spin_unlock_irqrestore(&h->lock, flags);
+}
+#define HEARTBEAT_SAMPLE_INTERVAL (10 * HZ)
+#define HEARTBEAT_CHECK_MINIMUM_INTERVAL (HEARTBEAT_SAMPLE_INTERVAL / 2)
+static void detect_controller_lockup(struct ctlr_info *h)
+{
+        u64 now;
+        u32 heartbeat;
+        unsigned long flags;
+        assert_spin_locked(&lockup_detector_lock);
+        now = get_jiffies_64();
+        /* If we've received an interrupt recently, we're ok. */
+        if (time_after64(h->last_intr_timestamp +
+                                (HEARTBEAT_CHECK_MINIMUM_INTERVAL), now))
+                return;
+        /*
+         * If we've already checked the heartbeat recently, we're ok.
+         * This could happen if someone sends us a signal. We
+         * otherwise don't care about signals in this thread.
+         */
+        if (time_after64(h->last_heartbeat_timestamp +
+                                (HEARTBEAT_CHECK_MINIMUM_INTERVAL), now))
+                return;
+        /* If heartbeat has not changed since we last looked, we're not ok. */
+        spin_lock_irqsave(&h->lock, flags);
+        heartbeat = readl(&h->cfgtable->HeartBeat);
+        spin_unlock_irqrestore(&h->lock, flags);
+        if (h->last_heartbeat == heartbeat) {
+                controller_lockup_detected(h);
+                return;
+        }
+        /* We're ok. */
+        h->last_heartbeat = heartbeat;
+        h->last_heartbeat_timestamp = now;
+}
+static int detect_controller_lockup_thread(void *notused)
+{
+        struct ctlr_info *h;
+        unsigned long flags;
+        while (1) {
+                struct list_head *this, *tmp;
+                schedule_timeout_interruptible(HEARTBEAT_SAMPLE_INTERVAL);
+                if (kthread_should_stop())
+                        break;
+                spin_lock_irqsave(&lockup_detector_lock, flags);
+                list_for_each_safe(this, tmp, &hpsa_ctlr_list) {
+                        h = list_entry(this, struct ctlr_info, lockup_list);
+                        detect_controller_lockup(h);
+                }
+                spin_unlock_irqrestore(&lockup_detector_lock, flags);
+        }
+        return 0;
+}
+static void add_ctlr_to_lockup_detector_list(struct ctlr_info *h)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&lockup_detector_lock, flags);
+        list_add_tail(&h->lockup_list, &hpsa_ctlr_list);
+        spin_unlock_irqrestore(&lockup_detector_lock, flags);
+}
+static void start_controller_lockup_detector(struct ctlr_info *h)
+{
+        /* Start the lockup detector thread if not already started */
+        if (!hpsa_lockup_detector) {
+                spin_lock_init(&lockup_detector_lock);
+                hpsa_lockup_detector =
+                        kthread_run(detect_controller_lockup_thread,
+                                                NULL, "hpsa");
+        }
+        if (!hpsa_lockup_detector) {
+                dev_warn(&h->pdev->dev,
+                        "Could not start lockup detector thread\n");
+                return;
+        }
+        add_ctlr_to_lockup_detector_list(h);
+}
+static void stop_controller_lockup_detector(struct ctlr_info *h)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&lockup_detector_lock, flags);
+        remove_ctlr_from_lockup_detector_list(h);
+        /* If the list of ctlr's to monitor is empty, stop the thread */
+        if (list_empty(&hpsa_ctlr_list)) {
+                kthread_stop(hpsa_lockup_detector);
+                hpsa_lockup_detector = NULL;
+        }
+        spin_unlock_irqrestore(&lockup_detector_lock, flags);
+}
 static int __devinit hpsa_init_one(struct pci_dev *pdev,
                                    const struct pci_device_id *ent)
 {
@@ -4120,7 +4307,6 @@ reinit_after_soft_reset:
                return -ENOMEM;
        h->pdev = pdev;
-        h->busy_initializing = 1;
        h->intr_mode = hpsa_simple_mode ? SIMPLE_MODE_INT : PERF_MODE_INT;
        INIT_LIST_HEAD(&h->cmpQ);
        INIT_LIST_HEAD(&h->reqQ);
@@ -4229,7 +4415,7 @@ reinit_after_soft_reset:
        hpsa_hba_inquiry(h);
        hpsa_register_scsi(h);  /* hook ourselves into SCSI subsystem */
-        h->busy_initializing = 0;
+        start_controller_lockup_detector(h);
        return 1;
 clean4:
@@ -4238,7 +4424,6 @@ clean4:
        free_irq(h->intr[h->intr_mode], h);
 clean2:
 clean1:
-        h->busy_initializing = 0;
        kfree(h);
        return rc;
 }
@@ -4293,10 +4478,11 @@ static void __devexit hpsa_remove_one(struct pci_dev *pdev)
        struct ctlr_info *h;
        if (pci_get_drvdata(pdev) == NULL) {
-                dev_err(&pdev->dev, "unable to remove device \n");
+                dev_err(&pdev->dev, "unable to remove device\n");
                return;
        }
        h = pci_get_drvdata(pdev);
+        stop_controller_lockup_detector(h);
        hpsa_unregister_scsi(h);        /* unhook from SCSI subsystem */
        hpsa_shutdown(pdev);
        iounmap(h->vaddr);
diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
index 7f53ceaa7239..91edafb8c7e6 100644
--- a/drivers/scsi/hpsa.h
+++ b/drivers/scsi/hpsa.h
@@ -95,8 +95,6 @@ struct ctlr_info {
        unsigned long           *cmd_pool_bits;
        int                     nr_allocs;
        int                     nr_frees;
-        int                     busy_initializing;
-        int                     busy_scanning;
        int                     scan_finished;
        spinlock_t              scan_lock;
        wait_queue_head_t       scan_wait_queue;
@@ -104,8 +102,7 @@ struct ctlr_info {
        struct Scsi_Host *scsi_host;
        spinlock_t devlock; /* to protect hba[ctlr]->dev[];  */
        int ndevices; /* number of used elements in .dev[] array. */
-#define HPSA_MAX_SCSI_DEVS_PER_HBA 256
+        struct hpsa_scsi_dev_t *dev[HPSA_MAX_DEVICES];
-        struct hpsa_scsi_dev_t *dev[HPSA_MAX_SCSI_DEVS_PER_HBA];
        /*
         * Performant mode tables.
         */
@@ -124,6 +121,11 @@ struct ctlr_info {
        unsigned char reply_pool_wraparound;
        u32 *blockFetchTable;
        unsigned char *hba_inquiry_data;
+        u64 last_intr_timestamp;
+        u32 last_heartbeat;
+        u64 last_heartbeat_timestamp;
+        u32 lockup_detected;
+        struct list_head lockup_list;
 };
 #define HPSA_ABORT_MSG 0
 #define HPSA_DEVICE_RESET_MSG 1
diff --git a/drivers/scsi/hpsa_cmd.h b/drivers/scsi/hpsa_cmd.h
index 55d741b019db..3fd4715935c2 100644
--- a/drivers/scsi/hpsa_cmd.h
+++ b/drivers/scsi/hpsa_cmd.h
@@ -123,8 +123,11 @@ union u64bit {
 /* FIXME this is a per controller value (barf!) */
 #define HPSA_MAX_TARGETS_PER_CTLR 16
-#define HPSA_MAX_LUN 256
+#define HPSA_MAX_LUN 1024
 #define HPSA_MAX_PHYS_LUN 1024
+#define MAX_MSA2XXX_ENCLOSURES 32
+#define HPSA_MAX_DEVICES (HPSA_MAX_PHYS_LUN + HPSA_MAX_LUN + \
+        MAX_MSA2XXX_ENCLOSURES + 1) /* + 1 is for the controller itself */
 /* SCSI-3 Commands */
 #pragma pack(1)
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 73e24b48dced..fd860d952b28 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -9123,6 +9123,8 @@ static struct pci_device_id ipr_pci_table[] __devinitdata = {
        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2,
                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B2, 0, 0, 0 },
        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2,
+                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57C3, 0, 0, 0 },
+        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2,
                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57C4, 0, 0, 0 },
        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_ASIC_E2,
                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B4, 0, 0, 0 },
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index 6d257e0dd6a5..ac84736c1b9c 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -82,6 +82,7 @@
 #define IPR_SUBS_DEV_ID_57B4    0x033B
 #define IPR_SUBS_DEV_ID_57B2    0x035F
+#define IPR_SUBS_DEV_ID_57C3    0x0353
 #define IPR_SUBS_DEV_ID_57C4    0x0354
 #define IPR_SUBS_DEV_ID_57C6    0x0357
 #define IPR_SUBS_DEV_ID_57CC    0x035C
diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c
index f07f30fada1b..e7fe9c4c85b8 100644
--- a/drivers/scsi/isci/host.c
+++ b/drivers/scsi/isci/host.c
@@ -1350,7 +1350,7 @@ static void isci_user_parameters_get(struct sci_user_parameters *u)
        u->stp_max_occupancy_timeout = stp_max_occ_to;
        u->ssp_max_occupancy_timeout = ssp_max_occ_to;
        u->no_outbound_task_timeout = no_outbound_task_to;
-        u->max_number_concurrent_device_spin_up = max_concurr_spinup;
+        u->max_concurr_spinup = max_concurr_spinup;
 }
 static void sci_controller_initial_state_enter(struct sci_base_state_machine *sm)
@@ -1661,7 +1661,7 @@ static void sci_controller_set_default_config_parameters(struct isci_host *ihost
        ihost->oem_parameters.controller.mode_type = SCIC_PORT_AUTOMATIC_CONFIGURATION_MODE;
        /* Default to APC mode. */
-        ihost->oem_parameters.controller.max_concurrent_dev_spin_up = 1;
+        ihost->oem_parameters.controller.max_concurr_spin_up = 1;
        /* Default to no SSC operation. */
        ihost->oem_parameters.controller.do_enable_ssc = false;
@@ -1787,7 +1787,8 @@ int sci_oem_parameters_validate(struct sci_oem_params *oem)
        } else
                return -EINVAL;
-        if (oem->controller.max_concurrent_dev_spin_up > MAX_CONCURRENT_DEVICE_SPIN_UP_COUNT)
+        if (oem->controller.max_concurr_spin_up > MAX_CONCURRENT_DEVICE_SPIN_UP_COUNT ||
+            oem->controller.max_concurr_spin_up < 1)
                return -EINVAL;
        return 0;
@@ -1810,6 +1811,16 @@ static enum sci_status sci_oem_parameters_set(struct isci_host *ihost)
        return SCI_FAILURE_INVALID_STATE;
 }
+static u8 max_spin_up(struct isci_host *ihost)
+{
+        if (ihost->user_parameters.max_concurr_spinup)
+                return min_t(u8, ihost->user_parameters.max_concurr_spinup,
+                             MAX_CONCURRENT_DEVICE_SPIN_UP_COUNT);
+        else
+                return min_t(u8, ihost->oem_parameters.controller.max_concurr_spin_up,
+                             MAX_CONCURRENT_DEVICE_SPIN_UP_COUNT);
+}
 static void power_control_timeout(unsigned long data)
 {
        struct sci_timer *tmr = (struct sci_timer *)data;
@@ -1839,8 +1850,7 @@ static void power_control_timeout(unsigned long data)
                if (iphy == NULL)
                        continue;
-                if (ihost->power_control.phys_granted_power >=
+                if (ihost->power_control.phys_granted_power >= max_spin_up(ihost))
-                    ihost->oem_parameters.controller.max_concurrent_dev_spin_up)
                        break;
                ihost->power_control.requesters[i] = NULL;
@@ -1865,8 +1875,7 @@ void sci_controller_power_control_queue_insert(struct isci_host *ihost,
 {
        BUG_ON(iphy == NULL);
-        if (ihost->power_control.phys_granted_power <
+        if (ihost->power_control.phys_granted_power < max_spin_up(ihost)) {
-            ihost->oem_parameters.controller.max_concurrent_dev_spin_up) {
                ihost->power_control.phys_granted_power++;
                sci_phy_consume_power_handler(iphy);
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
index 43fe840fbe9c..a97edabcb85a 100644
--- a/drivers/scsi/isci/init.c
+++ b/drivers/scsi/isci/init.c
@@ -118,7 +118,7 @@ unsigned char phy_gen = 3;
 module_param(phy_gen, byte, 0);
 MODULE_PARM_DESC(phy_gen, "PHY generation (1: 1.5Gbps 2: 3.0Gbps 3: 6.0Gbps)");
-unsigned char max_concurr_spinup = 1;
+unsigned char max_concurr_spinup;
 module_param(max_concurr_spinup, byte, 0);
 MODULE_PARM_DESC(max_concurr_spinup, "Max concurrent device spinup");
diff --git a/drivers/scsi/isci/port.c b/drivers/scsi/isci/port.c
index 8e59c8865dcd..ac7f27749f97 100644
--- a/drivers/scsi/isci/port.c
+++ b/drivers/scsi/isci/port.c
@@ -145,48 +145,15 @@ static void sci_port_bcn_enable(struct isci_port *iport)
        }
 }
-/* called under sci_lock to stabilize phy:port associations */
-void isci_port_bcn_enable(struct isci_host *ihost, struct isci_port *iport)
-{
-        int i;
-        clear_bit(IPORT_BCN_BLOCKED, &iport->flags);
-        wake_up(&ihost->eventq);
-        if (!test_and_clear_bit(IPORT_BCN_PENDING, &iport->flags))
-                return;
-        for (i = 0; i < ARRAY_SIZE(iport->phy_table); i++) {
-                struct isci_phy *iphy = iport->phy_table[i];
-                if (!iphy)
-                        continue;
-                ihost->sas_ha.notify_port_event(&iphy->sas_phy,
-                                                PORTE_BROADCAST_RCVD);
-                break;
-        }
-}
 static void isci_port_bc_change_received(struct isci_host *ihost,
                                         struct isci_port *iport,
                                         struct isci_phy *iphy)
 {
-        if (iport && test_bit(IPORT_BCN_BLOCKED, &iport->flags)) {
+        dev_dbg(&ihost->pdev->dev,
-                dev_dbg(&ihost->pdev->dev,
+                "%s: isci_phy = %p, sas_phy = %p\n",
-                        "%s: disabled BCN; isci_phy = %p, sas_phy = %p\n",
+                __func__, iphy, &iphy->sas_phy);
-                        __func__, iphy, &iphy->sas_phy);
-                set_bit(IPORT_BCN_PENDING, &iport->flags);
-                atomic_inc(&iport->event);
-                wake_up(&ihost->eventq);
-        } else {
-                dev_dbg(&ihost->pdev->dev,
-                        "%s: isci_phy = %p, sas_phy = %p\n",
-                        __func__, iphy, &iphy->sas_phy);
-                ihost->sas_ha.notify_port_event(&iphy->sas_phy,
+        ihost->sas_ha.notify_port_event(&iphy->sas_phy, PORTE_BROADCAST_RCVD);
-                                                PORTE_BROADCAST_RCVD);
-        }
        sci_port_bcn_enable(iport);
 }
@@ -278,9 +245,6 @@ static void isci_port_link_down(struct isci_host *isci_host,
                /* check to see if this is the last phy on this port. */
                if (isci_phy->sas_phy.port &&
                    isci_phy->sas_phy.port->num_phys == 1) {
-                        atomic_inc(&isci_port->event);
-                        isci_port_bcn_enable(isci_host, isci_port);
                        /* change the state for all devices on this port.  The
                         * next task sent to this device will be returned as
                         * SAS_TASK_UNDELIVERED, and the scsi mid layer will
@@ -350,6 +314,34 @@ static void isci_port_stop_complete(struct isci_host *ihost,
        dev_dbg(&ihost->pdev->dev, "Port stop complete\n");
 }
+static bool is_port_ready_state(enum sci_port_states state)
+{
+        switch (state) {
+        case SCI_PORT_READY:
+        case SCI_PORT_SUB_WAITING:
+        case SCI_PORT_SUB_OPERATIONAL:
+        case SCI_PORT_SUB_CONFIGURING:
+                return true;
+        default:
+                return false;
+        }
+}
+/* flag dummy rnc hanling when exiting a ready state */
+static void port_state_machine_change(struct isci_port *iport,
+                                      enum sci_port_states state)
+{
+        struct sci_base_state_machine *sm = &iport->sm;
+        enum sci_port_states old_state = sm->current_state_id;
+        if (is_port_ready_state(old_state) && !is_port_ready_state(state))
+                iport->ready_exit = true;
+        sci_change_state(sm, state);
+        iport->ready_exit = false;
+}
 /**
 * isci_port_hard_reset_complete() - This function is called by the sci core
 *    when the hard reset complete notification has been received.
@@ -368,6 +360,26 @@ static void isci_port_hard_reset_complete(struct isci_port *isci_port,
        /* Save the status of the hard reset from the port. */
        isci_port->hard_reset_status = completion_status;
+        if (completion_status != SCI_SUCCESS) {
+                /* The reset failed.  The port state is now SCI_PORT_FAILED. */
+                if (isci_port->active_phy_mask == 0) {
+                        /* Generate the link down now to the host, since it
+                         * was intercepted by the hard reset state machine when
+                         * it really happened.
+                         */
+                        isci_port_link_down(isci_port->isci_host,
+                                            &isci_port->isci_host->phys[
+                                                   isci_port->last_active_phy],
+                                            isci_port);
+                }
+                /* Advance the port state so that link state changes will be
+                * noticed.
+                */
+                port_state_machine_change(isci_port, SCI_PORT_SUB_WAITING);
+        }
        complete_all(&isci_port->hard_reset_complete);
 }
@@ -657,6 +669,8 @@ void sci_port_deactivate_phy(struct isci_port *iport, struct isci_phy *iphy,
        struct isci_host *ihost = iport->owning_controller;
        iport->active_phy_mask &= ~(1 << iphy->phy_index);
+        if (!iport->active_phy_mask)
+                iport->last_active_phy = iphy->phy_index;
        iphy->max_negotiated_speed = SAS_LINK_RATE_UNKNOWN;
@@ -683,33 +697,6 @@ static void sci_port_invalid_link_up(struct isci_port *iport, struct isci_phy *i
        }
 }
-static bool is_port_ready_state(enum sci_port_states state)
-{
-        switch (state) {
-        case SCI_PORT_READY:
-        case SCI_PORT_SUB_WAITING:
-        case SCI_PORT_SUB_OPERATIONAL:
-        case SCI_PORT_SUB_CONFIGURING:
-                return true;
-        default:
-                return false;
-        }
-}
-/* flag dummy rnc hanling when exiting a ready state */
-static void port_state_machine_change(struct isci_port *iport,
-                                      enum sci_port_states state)
-{
-        struct sci_base_state_machine *sm = &iport->sm;
-        enum sci_port_states old_state = sm->current_state_id;
-        if (is_port_ready_state(old_state) && !is_port_ready_state(state))
-                iport->ready_exit = true;
-        sci_change_state(sm, state);
-        iport->ready_exit = false;
-}
 /**
 * sci_port_general_link_up_handler - phy can be assigned to port?
 * @sci_port: sci_port object for which has a phy that has gone link up.
@@ -1622,7 +1609,8 @@ void sci_port_construct(struct isci_port *iport, u8 index,
        iport->logical_port_index  = SCIC_SDS_DUMMY_PORT;
        iport->physical_port_index = index;
        iport->active_phy_mask     = 0;
-        iport->ready_exit             = false;
+        iport->last_active_phy     = 0;
+        iport->ready_exit          = false;
        iport->owning_controller = ihost;
@@ -1648,7 +1636,6 @@ void isci_port_init(struct isci_port *iport, struct isci_host *ihost, int index)
        init_completion(&iport->start_complete);
        iport->isci_host = ihost;
        isci_port_change_state(iport, isci_freed);
-        atomic_set(&iport->event, 0);
 }
 /**
@@ -1676,7 +1663,7 @@ int isci_port_perform_hard_reset(struct isci_host *ihost, struct isci_port *ipor
 {
        unsigned long flags;
        enum sci_status status;
-        int idx, ret = TMF_RESP_FUNC_COMPLETE;
+        int ret = TMF_RESP_FUNC_COMPLETE;
        dev_dbg(&ihost->pdev->dev, "%s: iport = %p\n",
                __func__, iport);
@@ -1697,8 +1684,13 @@ int isci_port_perform_hard_reset(struct isci_host *ihost, struct isci_port *ipor
                        "%s: iport = %p; hard reset completion\n",
                        __func__, iport);
-                if (iport->hard_reset_status != SCI_SUCCESS)
+                if (iport->hard_reset_status != SCI_SUCCESS) {
                        ret = TMF_RESP_FUNC_FAILED;
+                        dev_err(&ihost->pdev->dev,
+                                "%s: iport = %p; hard reset failed (0x%x)\n",
+                                __func__, iport, iport->hard_reset_status);
+                }
        } else {
                ret = TMF_RESP_FUNC_FAILED;
@@ -1718,18 +1710,6 @@ int isci_port_perform_hard_reset(struct isci_host *ihost, struct isci_port *ipor
                        "%s: iport = %p; hard reset failed "
                        "(0x%x) - driving explicit link fail for all phys\n",
                        __func__, iport, iport->hard_reset_status);
-                /* Down all phys in the port. */
-                spin_lock_irqsave(&ihost->scic_lock, flags);
-                for (idx = 0; idx < SCI_MAX_PHYS; ++idx) {
-                        struct isci_phy *iphy = iport->phy_table[idx];
-                        if (!iphy)
-                                continue;
-                        sci_phy_stop(iphy);
-                        sci_phy_start(iphy);
-                }
-                spin_unlock_irqrestore(&ihost->scic_lock, flags);
        }
        return ret;
 }
diff --git a/drivers/scsi/isci/port.h b/drivers/scsi/isci/port.h
index b50ecd4e8f9c..cb5ffbc38603 100644
--- a/drivers/scsi/isci/port.h
+++ b/drivers/scsi/isci/port.h
@@ -77,7 +77,6 @@ enum isci_status {
 /**
 * struct isci_port - isci direct attached sas port object
- * @event: counts bcns and port stop events (for bcn filtering)
 * @ready_exit: several states constitute 'ready'. When exiting ready we
 *              need to take extra port-teardown actions that are
 *              skipped when exiting to another 'ready' state.
@@ -92,10 +91,6 @@ enum isci_status {
 */
 struct isci_port {
        enum isci_status status;
-        #define IPORT_BCN_BLOCKED 0
-        #define IPORT_BCN_PENDING 1
-        unsigned long flags;
-        atomic_t event;
        struct isci_host *isci_host;
        struct asd_sas_port sas_port;
        struct list_head remote_dev_list;
@@ -109,6 +104,7 @@ struct isci_port {
        u8 logical_port_index;
        u8 physical_port_index;
        u8 active_phy_mask;
+        u8 last_active_phy;
        u16 reserved_rni;
        u16 reserved_tag;
        u32 started_request_count;
diff --git a/drivers/scsi/isci/probe_roms.h b/drivers/scsi/isci/probe_roms.h
index dc007e692f4e..2c75248ca326 100644
--- a/drivers/scsi/isci/probe_roms.h
+++ b/drivers/scsi/isci/probe_roms.h
@@ -112,7 +112,7 @@ struct sci_user_parameters {
         * This field specifies the maximum number of direct attached devices
         * that can have power supplied to them simultaneously.
         */
-        u8 max_number_concurrent_device_spin_up;
+        u8 max_concurr_spinup;
        /**
         * This field specifies the number of seconds to allow a phy to consume
@@ -219,7 +219,7 @@ struct sci_bios_oem_param_block_hdr {
 struct sci_oem_params {
        struct {
                uint8_t mode_type;
-                uint8_t max_concurrent_dev_spin_up;
+                uint8_t max_concurr_spin_up;
                uint8_t do_enable_ssc;
                uint8_t reserved;
        } controller;
diff --git a/drivers/scsi/isci/remote_device.c b/drivers/scsi/isci/remote_device.c
index fbf9ce28c3f5..b207cd3b15a0 100644
--- a/drivers/scsi/isci/remote_device.c
+++ b/drivers/scsi/isci/remote_device.c
@@ -1438,88 +1438,3 @@ int isci_remote_device_found(struct domain_device *domain_dev)
        return status == SCI_SUCCESS ? 0 : -ENODEV;
 }
-/**
- * isci_device_is_reset_pending() - This function will check if there is any
- *    pending reset condition on the device.
- * @request: This parameter is the isci_device object.
- *
- * true if there is a reset pending for the device.
- */
-bool isci_device_is_reset_pending(
-        struct isci_host *isci_host,
-        struct isci_remote_device *isci_device)
-{
-        struct isci_request *isci_request;
-        struct isci_request *tmp_req;
-        bool reset_is_pending = false;
-        unsigned long flags;
-        dev_dbg(&isci_host->pdev->dev,
-                "%s: isci_device = %p\n", __func__, isci_device);
-        spin_lock_irqsave(&isci_host->scic_lock, flags);
-        /* Check for reset on all pending requests. */
-        list_for_each_entry_safe(isci_request, tmp_req,
-                                 &isci_device->reqs_in_process, dev_node) {
-                dev_dbg(&isci_host->pdev->dev,
-                        "%s: isci_device = %p request = %p\n",
-                        __func__, isci_device, isci_request);
-                if (isci_request->ttype == io_task) {
-                        struct sas_task *task = isci_request_access_task(
-                                isci_request);
-                        spin_lock(&task->task_state_lock);
-                        if (task->task_state_flags & SAS_TASK_NEED_DEV_RESET)
-                                reset_is_pending = true;
-                        spin_unlock(&task->task_state_lock);
-                }
-        }
-        spin_unlock_irqrestore(&isci_host->scic_lock, flags);
-        dev_dbg(&isci_host->pdev->dev,
-                "%s: isci_device = %p reset_is_pending = %d\n",
-                __func__, isci_device, reset_is_pending);
-        return reset_is_pending;
-}
-/**
- * isci_device_clear_reset_pending() - This function will clear if any pending
- *    reset condition flags on the device.
- * @request: This parameter is the isci_device object.
- *
- * true if there is a reset pending for the device.
- */
-void isci_device_clear_reset_pending(struct isci_host *ihost, struct isci_remote_device *idev)
-{
-        struct isci_request *isci_request;
-        struct isci_request *tmp_req;
-        unsigned long flags = 0;
-        dev_dbg(&ihost->pdev->dev, "%s: idev=%p, ihost=%p\n",
-                 __func__, idev, ihost);
-        spin_lock_irqsave(&ihost->scic_lock, flags);
-        /* Clear reset pending on all pending requests. */
-        list_for_each_entry_safe(isci_request, tmp_req,
-                                 &idev->reqs_in_process, dev_node) {
-                dev_dbg(&ihost->pdev->dev, "%s: idev = %p request = %p\n",
-                         __func__, idev, isci_request);
-                if (isci_request->ttype == io_task) {
-                        unsigned long flags2;
-                        struct sas_task *task = isci_request_access_task(
-                                isci_request);
-                        spin_lock_irqsave(&task->task_state_lock, flags2);
-                        task->task_state_flags &= ~SAS_TASK_NEED_DEV_RESET;
-                        spin_unlock_irqrestore(&task->task_state_lock, flags2);
-                }
-        }
-        spin_unlock_irqrestore(&ihost->scic_lock, flags);
-}
diff --git a/drivers/scsi/isci/remote_device.h b/drivers/scsi/isci/remote_device.h
index e1747ea0d0ea..483ee50152f3 100644
--- a/drivers/scsi/isci/remote_device.h
+++ b/drivers/scsi/isci/remote_device.h
@@ -132,10 +132,7 @@ void isci_remote_device_nuke_requests(struct isci_host *ihost,
                                      struct isci_remote_device *idev);
 void isci_remote_device_gone(struct domain_device *domain_dev);
 int isci_remote_device_found(struct domain_device *domain_dev);
-bool isci_device_is_reset_pending(struct isci_host *ihost,
-                                  struct isci_remote_device *idev);
-void isci_device_clear_reset_pending(struct isci_host *ihost,
-                                     struct isci_remote_device *idev);
 /**
 * sci_remote_device_stop() - This method will stop both transmission and
 *    reception of link activity for the supplied remote device.  This method
diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c
index 565a9f0a9bc2..192cb48d849a 100644
--- a/drivers/scsi/isci/request.c
+++ b/drivers/scsi/isci/request.c
@@ -191,7 +191,7 @@ static void sci_task_request_build_ssp_task_iu(struct isci_request *ireq)
        task_iu->task_func = isci_tmf->tmf_code;
        task_iu->task_tag =
-                (ireq->ttype == tmf_task) ?
+                (test_bit(IREQ_TMF, &ireq->flags)) ?
                isci_tmf->io_tag :
                SCI_CONTROLLER_INVALID_IO_TAG;
 }
@@ -516,7 +516,7 @@ sci_io_request_construct_sata(struct isci_request *ireq,
        struct domain_device *dev = ireq->target_device->domain_dev;
        /* check for management protocols */
-        if (ireq->ttype == tmf_task) {
+        if (test_bit(IREQ_TMF, &ireq->flags)) {
                struct isci_tmf *tmf = isci_request_access_tmf(ireq);
                if (tmf->tmf_code == isci_tmf_sata_srst_high ||
@@ -632,7 +632,7 @@ enum sci_status sci_task_request_construct_sata(struct isci_request *ireq)
        enum sci_status status = SCI_SUCCESS;
        /* check for management protocols */
-        if (ireq->ttype == tmf_task) {
+        if (test_bit(IREQ_TMF, &ireq->flags)) {
                struct isci_tmf *tmf = isci_request_access_tmf(ireq);
                if (tmf->tmf_code == isci_tmf_sata_srst_high ||
@@ -2630,14 +2630,8 @@ static void isci_task_save_for_upper_layer_completion(
        switch (task_notification_selection) {
        case isci_perform_normal_io_completion:
                /* Normal notification (task_done) */
-                dev_dbg(&host->pdev->dev,
-                        "%s: Normal - task = %p, response=%d (%d), status=%d (%d)\n",
-                        __func__,
-                        task,
-                        task->task_status.resp, response,
-                        task->task_status.stat, status);
                /* Add to the completed list. */
                list_add(&request->completed_node,
                         &host->requests_to_complete);
@@ -2650,13 +2644,6 @@ static void isci_task_save_for_upper_layer_completion(
                /* No notification to libsas because this request is
                 * already in the abort path.
                 */
-                dev_dbg(&host->pdev->dev,
-                         "%s: Aborted - task = %p, response=%d (%d), status=%d (%d)\n",
-                         __func__,
-                         task,
-                         task->task_status.resp, response,
-                         task->task_status.stat, status);
                /* Wake up whatever process was waiting for this
                 * request to complete.
                 */
@@ -2673,30 +2660,22 @@ static void isci_task_save_for_upper_layer_completion(
        case isci_perform_error_io_completion:
                /* Use sas_task_abort */
-                dev_dbg(&host->pdev->dev,
-                         "%s: Error - task = %p, response=%d (%d), status=%d (%d)\n",
-                         __func__,
-                         task,
-                         task->task_status.resp, response,
-                         task->task_status.stat, status);
                /* Add to the aborted list. */
                list_add(&request->completed_node,
                         &host->requests_to_errorback);
                break;
        default:
-                dev_dbg(&host->pdev->dev,
-                         "%s: Unknown - task = %p, response=%d (%d), status=%d (%d)\n",
-                         __func__,
-                         task,
-                         task->task_status.resp, response,
-                         task->task_status.stat, status);
                /* Add to the error to libsas list. */
                list_add(&request->completed_node,
                         &host->requests_to_errorback);
                break;
        }
+        dev_dbg(&host->pdev->dev,
+                "%s: %d - task = %p, response=%d (%d), status=%d (%d)\n",
+                __func__, task_notification_selection, task,
+                (task) ? task->task_status.resp : 0, response,
+                (task) ? task->task_status.stat : 0, status);
 }
 static void isci_process_stp_response(struct sas_task *task, struct dev_to_host_fis *fis)
@@ -2728,9 +2707,9 @@ static void isci_request_io_request_complete(struct isci_host *ihost,
        struct sas_task *task = isci_request_access_task(request);
        struct ssp_response_iu *resp_iu;
        unsigned long task_flags;
-        struct isci_remote_device *idev = isci_lookup_device(task->dev);
+        struct isci_remote_device *idev = request->target_device;
-        enum service_response response       = SAS_TASK_UNDELIVERED;
+        enum service_response response = SAS_TASK_UNDELIVERED;
-        enum exec_status status         = SAS_ABORTED_TASK;
+        enum exec_status status = SAS_ABORTED_TASK;
        enum isci_request_status request_status;
        enum isci_completion_selection complete_to_host
                = isci_perform_normal_io_completion;
@@ -3061,7 +3040,6 @@ static void isci_request_io_request_complete(struct isci_host *ihost,
        /* complete the io request to the core. */
        sci_controller_complete_io(ihost, request->target_device, request);
-        isci_put_device(idev);
        /* set terminated handle so it cannot be completed or
         * terminated again, and to cause any calls into abort
@@ -3080,7 +3058,7 @@ static void sci_request_started_state_enter(struct sci_base_state_machine *sm)
        /* XXX as hch said always creating an internal sas_task for tmf
         * requests would simplify the driver
         */
-        task = ireq->ttype == io_task ? isci_request_access_task(ireq) : NULL;
+        task = (test_bit(IREQ_TMF, &ireq->flags)) ? NULL : isci_request_access_task(ireq);
        /* all unaccelerated request types (non ssp or ncq) handled with
         * substates
@@ -3564,7 +3542,7 @@ static struct isci_request *isci_io_request_from_tag(struct isci_host *ihost,
        ireq = isci_request_from_tag(ihost, tag);
        ireq->ttype_ptr.io_task_ptr = task;
-        ireq->ttype = io_task;
+        clear_bit(IREQ_TMF, &ireq->flags);
        task->lldd_task = ireq;
        return ireq;
@@ -3578,7 +3556,7 @@ struct isci_request *isci_tmf_request_from_tag(struct isci_host *ihost,
        ireq = isci_request_from_tag(ihost, tag);
        ireq->ttype_ptr.tmf_task_ptr = isci_tmf;
-        ireq->ttype = tmf_task;
+        set_bit(IREQ_TMF, &ireq->flags);
        return ireq;
 }
diff --git a/drivers/scsi/isci/request.h b/drivers/scsi/isci/request.h
index f720b97b7bb5..be38933dd6df 100644
--- a/drivers/scsi/isci/request.h
+++ b/drivers/scsi/isci/request.h
@@ -77,11 +77,6 @@ enum isci_request_status {
        dead        = 0x07
 };
-enum task_type {
-        io_task  = 0,
-        tmf_task = 1
-};
 enum sci_request_protocol {
        SCIC_NO_PROTOCOL,
        SCIC_SMP_PROTOCOL,
@@ -116,7 +111,6 @@ struct isci_request {
        #define IREQ_ACTIVE 3
        unsigned long flags;
        /* XXX kill ttype and ttype_ptr, allocate full sas_task */
-        enum task_type ttype;
        union ttype_ptr_union {
                struct sas_task *io_task_ptr;   /* When ttype==io_task  */
                struct isci_tmf *tmf_task_ptr;  /* When ttype==tmf_task */
diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c
index e2d9418683ce..66ad3dc89498 100644
--- a/drivers/scsi/isci/task.c
+++ b/drivers/scsi/isci/task.c
@@ -212,16 +212,27 @@ int isci_task_execute_task(struct sas_task *task, int num, gfp_t gfp_flags)
                                        task->task_state_flags &= ~SAS_TASK_AT_INITIATOR;
                                        spin_unlock_irqrestore(&task->task_state_lock, flags);
-                                        /* Indicate QUEUE_FULL so that the scsi
+                                        if (test_bit(IDEV_GONE, &idev->flags)) {
-                                        * midlayer retries. if the request
-                                        * failed for remote device reasons,
+                                                /* Indicate that the device
-                                        * it gets returned as
+                                                 * is gone.
-                                        * SAS_TASK_UNDELIVERED next time
+                                                 */
-                                        * through.
+                                                isci_task_refuse(ihost, task,
-                                        */
+                                                        SAS_TASK_UNDELIVERED,
-                                        isci_task_refuse(ihost, task,
+                                                        SAS_DEVICE_UNKNOWN);
-                                                         SAS_TASK_COMPLETE,
+                                        } else {
-                                                         SAS_QUEUE_FULL);
+                                                /* Indicate QUEUE_FULL so that
+                                                 * the scsi midlayer retries.
+                                                 * If the request failed for
+                                                 * remote device reasons, it
+                                                 * gets returned as
+                                                 * SAS_TASK_UNDELIVERED next
+                                                 * time through.
+                                                 */
+                                                isci_task_refuse(ihost, task,
+                                                        SAS_TASK_COMPLETE,
+                                                        SAS_QUEUE_FULL);
+                                        }
                                }
                        }
                }
@@ -243,7 +254,7 @@ static enum sci_status isci_sata_management_task_request_build(struct isci_reque
        struct isci_tmf *isci_tmf;
        enum sci_status status;
-        if (tmf_task != ireq->ttype)
+        if (!test_bit(IREQ_TMF, &ireq->flags))
                return SCI_FAILURE;
        isci_tmf = isci_request_access_tmf(ireq);
@@ -327,6 +338,60 @@ static struct isci_request *isci_task_request_build(struct isci_host *ihost,
        return ireq;
 }
+/**
+* isci_request_mark_zombie() - This function must be called with scic_lock held.
+*/
+static void isci_request_mark_zombie(struct isci_host *ihost, struct isci_request *ireq)
+{
+        struct completion *tmf_completion = NULL;
+        struct completion *req_completion;
+        /* Set the request state to "dead". */
+        ireq->status = dead;
+        req_completion = ireq->io_request_completion;
+        ireq->io_request_completion = NULL;
+        if (test_bit(IREQ_TMF, &ireq->flags)) {
+                /* Break links with the TMF request. */
+                struct isci_tmf *tmf = isci_request_access_tmf(ireq);
+                /* In the case where a task request is dying,
+                 * the thread waiting on the complete will sit and
+                 * timeout unless we wake it now.  Since the TMF
+                 * has a default error status, complete it here
+                 * to wake the waiting thread.
+                 */
+                if (tmf) {
+                        tmf_completion = tmf->complete;
+                        tmf->complete = NULL;
+                }
+                ireq->ttype_ptr.tmf_task_ptr = NULL;
+                dev_dbg(&ihost->pdev->dev, "%s: tmf_code %d, managed tag %#x\n",
+                        __func__, tmf->tmf_code, tmf->io_tag);
+        } else {
+                /* Break links with the sas_task - the callback is done
+                 * elsewhere.
+                 */
+                struct sas_task *task = isci_request_access_task(ireq);
+                if (task)
+                        task->lldd_task = NULL;
+                ireq->ttype_ptr.io_task_ptr = NULL;
+        }
+        dev_warn(&ihost->pdev->dev, "task context unrecoverable (tag: %#x)\n",
+                 ireq->io_tag);
+        /* Don't force waiting threads to timeout. */
+        if (req_completion)
+                complete(req_completion);
+        if (tmf_completion != NULL)
+                complete(tmf_completion);
+}
 static int isci_task_execute_tmf(struct isci_host *ihost,
                                 struct isci_remote_device *idev,
                                 struct isci_tmf *tmf, unsigned long timeout_ms)
@@ -364,6 +429,7 @@ static int isci_task_execute_tmf(struct isci_host *ihost,
        /* Assign the pointer to the TMF's completion kernel wait structure. */
        tmf->complete = &completion;
+        tmf->status = SCI_FAILURE_TIMEOUT;
        ireq = isci_task_request_build(ihost, idev, tag, tmf);
        if (!ireq)
@@ -399,18 +465,35 @@ static int isci_task_execute_tmf(struct isci_host *ihost,
                                               msecs_to_jiffies(timeout_ms));
        if (timeleft == 0) {
+                /* The TMF did not complete - this could be because
+                 * of an unplug.  Terminate the TMF request now.
+                 */
                spin_lock_irqsave(&ihost->scic_lock, flags);
                if (tmf->cb_state_func != NULL)
-                        tmf->cb_state_func(isci_tmf_timed_out, tmf, tmf->cb_data);
+                        tmf->cb_state_func(isci_tmf_timed_out, tmf,
+                                           tmf->cb_data);
-                sci_controller_terminate_request(ihost,
+                sci_controller_terminate_request(ihost, idev, ireq);
-                                                  idev,
-                                                  ireq);
                spin_unlock_irqrestore(&ihost->scic_lock, flags);
-                wait_for_completion(tmf->complete);
+                timeleft = wait_for_completion_timeout(
+                        &completion,
+                        msecs_to_jiffies(ISCI_TERMINATION_TIMEOUT_MSEC));
+                if (!timeleft) {
+                        /* Strange condition - the termination of the TMF
+                         * request timed-out.
+                         */
+                        spin_lock_irqsave(&ihost->scic_lock, flags);
+                        /* If the TMF status has not changed, kill it. */
+                        if (tmf->status == SCI_FAILURE_TIMEOUT)
+                                isci_request_mark_zombie(ihost, ireq);
+                        spin_unlock_irqrestore(&ihost->scic_lock, flags);
+                }
        }
        isci_print_tmf(tmf);
@@ -501,48 +584,17 @@ static enum isci_request_status isci_task_validate_request_to_abort(
        return old_state;
 }
-/**
+static int isci_request_is_dealloc_managed(enum isci_request_status stat)
-* isci_request_cleanup_completed_loiterer() - This function will take care of
-*    the final cleanup on any request which has been explicitly terminated.
-* @isci_host: This parameter specifies the ISCI host object
-* @isci_device: This is the device to which the request is pending.
-* @isci_request: This parameter specifies the terminated request object.
-* @task: This parameter is the libsas I/O request.
-*/
-static void isci_request_cleanup_completed_loiterer(
-        struct isci_host          *isci_host,
-        struct isci_remote_device *isci_device,
-        struct isci_request       *isci_request,
-        struct sas_task           *task)
 {
-        unsigned long flags;
+        switch (stat) {
+        case aborted:
-        dev_dbg(&isci_host->pdev->dev,
+        case aborting:
-                "%s: isci_device=%p, request=%p, task=%p\n",
+        case terminating:
-                __func__, isci_device, isci_request, task);
+        case completed:
+        case dead:
-        if (task != NULL) {
+                return true;
+        default:
-                spin_lock_irqsave(&task->task_state_lock, flags);
+                return false;
-                task->lldd_task = NULL;
-                task->task_state_flags &= ~SAS_TASK_NEED_DEV_RESET;
-                isci_set_task_doneflags(task);
-                /* If this task is not in the abort path, call task_done. */
-                if (!(task->task_state_flags & SAS_TASK_STATE_ABORTED)) {
-                        spin_unlock_irqrestore(&task->task_state_lock, flags);
-                        task->task_done(task);
-                } else
-                        spin_unlock_irqrestore(&task->task_state_lock, flags);
-        }
-        if (isci_request != NULL) {
-                spin_lock_irqsave(&isci_host->scic_lock, flags);
-                list_del_init(&isci_request->dev_node);
-                spin_unlock_irqrestore(&isci_host->scic_lock, flags);
        }
 }
@@ -563,11 +615,9 @@ static void isci_terminate_request_core(struct isci_host *ihost,
        enum sci_status status      = SCI_SUCCESS;
        bool was_terminated         = false;
        bool needs_cleanup_handling = false;
-        enum isci_request_status request_status;
        unsigned long     flags;
        unsigned long     termination_completed = 1;
        struct completion *io_request_completion;
-        struct sas_task   *task;
        dev_dbg(&ihost->pdev->dev,
                "%s: device = %p; request = %p\n",
@@ -577,10 +627,6 @@ static void isci_terminate_request_core(struct isci_host *ihost,
        io_request_completion = isci_request->io_request_completion;
-        task = (isci_request->ttype == io_task)
-                ? isci_request_access_task(isci_request)
-                : NULL;
        /* Note that we are not going to control
         * the target to abort the request.
         */
@@ -619,42 +665,27 @@ static void isci_terminate_request_core(struct isci_host *ihost,
                                __func__, isci_request, io_request_completion);
                        /* Wait here for the request to complete. */
-                        #define TERMINATION_TIMEOUT_MSEC 500
                        termination_completed
                                = wait_for_completion_timeout(
                                   io_request_completion,
-                                   msecs_to_jiffies(TERMINATION_TIMEOUT_MSEC));
+                                   msecs_to_jiffies(ISCI_TERMINATION_TIMEOUT_MSEC));
                        if (!termination_completed) {
                                /* The request to terminate has timed out.  */
-                                spin_lock_irqsave(&ihost->scic_lock,
+                                spin_lock_irqsave(&ihost->scic_lock, flags);
-                                                  flags);
                                /* Check for state changes. */
-                                if (!test_bit(IREQ_TERMINATED, &isci_request->flags)) {
+                                if (!test_bit(IREQ_TERMINATED,
+                                              &isci_request->flags)) {
                                        /* The best we can do is to have the
                                         * request die a silent death if it
                                         * ever really completes.
-                                         *
-                                         * Set the request state to "dead",
-                                         * and clear the task pointer so that
-                                         * an actual completion event callback
-                                         * doesn't do anything.
                                         */
-                                        isci_request->status = dead;
+                                        isci_request_mark_zombie(ihost,
-                                        isci_request->io_request_completion
+                                                                 isci_request);
-                                                = NULL;
+                                        needs_cleanup_handling = true;
-                                        if (isci_request->ttype == io_task) {
-                                                /* Break links with the
-                                                * sas_task.
-                                                */
-                                                isci_request->ttype_ptr.io_task_ptr
-                                                        = NULL;
-                                        }
                                } else
                                        termination_completed = 1;
@@ -691,29 +722,28 @@ static void isci_terminate_request_core(struct isci_host *ihost,
                         * needs to be detached and freed here.
                         */
                        spin_lock_irqsave(&isci_request->state_lock, flags);
-                        request_status = isci_request->status;
+                        needs_cleanup_handling
-                        if ((isci_request->ttype == io_task) /* TMFs are in their own thread */
+                                = isci_request_is_dealloc_managed(
-                            && ((request_status == aborted)
+                                        isci_request->status);
-                                || (request_status == aborting)
-                                || (request_status == terminating)
-                                || (request_status == completed)
-                                || (request_status == dead)
-                                )
-                            ) {
-                                /* The completion routine won't free a request in
-                                 * the aborted/aborting/etc. states, so we do
-                                 * it here.
-                                 */
-                                needs_cleanup_handling = true;
-                        }
                        spin_unlock_irqrestore(&isci_request->state_lock, flags);
                }
-                if (needs_cleanup_handling)
+                if (needs_cleanup_handling) {
-                        isci_request_cleanup_completed_loiterer(
-                                ihost, idev, isci_request, task);
+                        dev_dbg(&ihost->pdev->dev,
+                                "%s: cleanup isci_device=%p, request=%p\n",
+                                __func__, idev, isci_request);
+                        if (isci_request != NULL) {
+                                spin_lock_irqsave(&ihost->scic_lock, flags);
+                                isci_free_tag(ihost, isci_request->io_tag);
+                                isci_request_change_state(isci_request, unallocated);
+                                list_del_init(&isci_request->dev_node);
+                                spin_unlock_irqrestore(&ihost->scic_lock, flags);
+                        }
+                }
        }
 }
@@ -772,7 +802,9 @@ void isci_terminate_pending_requests(struct isci_host *ihost,
                dev_dbg(&ihost->pdev->dev,
                         "%s: idev=%p request=%p; task=%p old_state=%d\n",
                         __func__, idev, ireq,
-                        ireq->ttype == io_task ? isci_request_access_task(ireq) : NULL,
+                        (!test_bit(IREQ_TMF, &ireq->flags)
+                                ? isci_request_access_task(ireq)
+                                : NULL),
                        old_state);
                /* If the old_state is started:
@@ -889,22 +921,14 @@ int isci_task_lu_reset(struct domain_device *domain_device, u8 *lun)
                "%s: domain_device=%p, isci_host=%p; isci_device=%p\n",
                 __func__, domain_device, isci_host, isci_device);
-        if (isci_device)
+        if (!isci_device) {
-                set_bit(IDEV_EH, &isci_device->flags);
+                /* If the device is gone, stop the escalations. */
+                dev_dbg(&isci_host->pdev->dev, "%s: No dev\n", __func__);
-        /* If there is a device reset pending on any request in the
+                ret = TMF_RESP_FUNC_COMPLETE;
-         * device's list, fail this LUN reset request in order to
-         * escalate to the device reset.
-         */
-        if (!isci_device ||
-            isci_device_is_reset_pending(isci_host, isci_device)) {
-                dev_dbg(&isci_host->pdev->dev,
-                         "%s: No dev (%p), or "
-                         "RESET PENDING: domain_device=%p\n",
-                         __func__, isci_device, domain_device);
-                ret = TMF_RESP_FUNC_FAILED;
                goto out;
        }
+        set_bit(IDEV_EH, &isci_device->flags);
        /* Send the task management part of the reset. */
        if (sas_protocol_ata(domain_device->tproto)) {
@@ -1013,7 +1037,7 @@ int isci_task_abort_task(struct sas_task *task)
        struct isci_tmf           tmf;
        int                       ret = TMF_RESP_FUNC_FAILED;
        unsigned long             flags;
-        bool                      any_dev_reset = false;
+        int                       perform_termination = 0;
        /* Get the isci_request reference from the task.  Note that
         * this check does not depend on the pending request list
@@ -1035,89 +1059,34 @@ int isci_task_abort_task(struct sas_task *task)
        spin_unlock_irqrestore(&isci_host->scic_lock, flags);
        dev_dbg(&isci_host->pdev->dev,
-                "%s: task = %p\n", __func__, task);
+                "%s: dev = %p, task = %p, old_request == %p\n",
+                __func__, isci_device, task, old_request);
-        if (!isci_device || !old_request)
-                goto out;
-        set_bit(IDEV_EH, &isci_device->flags);
-        /* This version of the driver will fail abort requests for
-         * SATA/STP.  Failing the abort request this way will cause the
-         * SCSI error handler thread to escalate to LUN reset
-         */
-        if (sas_protocol_ata(task->task_proto)) {
-                dev_dbg(&isci_host->pdev->dev,
-                            " task %p is for a STP/SATA device;"
-                            " returning TMF_RESP_FUNC_FAILED\n"
-                            " to cause a LUN reset...\n", task);
-                goto out;
-        }
-        dev_dbg(&isci_host->pdev->dev,
+        if (isci_device)
-                "%s: old_request == %p\n", __func__, old_request);
+                set_bit(IDEV_EH, &isci_device->flags);
-        any_dev_reset = isci_device_is_reset_pending(isci_host, isci_device);
-        spin_lock_irqsave(&task->task_state_lock, flags);
-        any_dev_reset = any_dev_reset || (task->task_state_flags & SAS_TASK_NEED_DEV_RESET);
-        /* If the extraction of the request reference from the task
+        /* Device reset conditions signalled in task_state_flags are the
-         * failed, then the request has been completed (or if there is a
+         * responsbility of libsas to observe at the start of the error
-         * pending reset then this abort request function must be failed
+         * handler thread.
-         * in order to escalate to the target reset).
         */
-        if ((old_request == NULL) || any_dev_reset) {
+        if (!isci_device || !old_request) {
+                /* The request has already completed and there
-                /* If the device reset task flag is set, fail the task
+                * is nothing to do here other than to set the task
-                 * management request.  Otherwise, the original request
+                * done bit, and indicate that the task abort function
-                 * has completed.
+                * was sucessful.
-                 */
+                */
-                if (any_dev_reset) {
+                spin_lock_irqsave(&task->task_state_lock, flags);
+                task->task_state_flags |= SAS_TASK_STATE_DONE;
-                        /* Turn off the task's DONE to make sure this
+                task->task_state_flags &= ~(SAS_TASK_AT_INITIATOR |
-                         * task is escalated to a target reset.
+                                            SAS_TASK_STATE_PENDING);
-                         */
+                spin_unlock_irqrestore(&task->task_state_lock, flags);
-                        task->task_state_flags &= ~SAS_TASK_STATE_DONE;
-                        /* Make the reset happen as soon as possible. */
-                        task->task_state_flags |= SAS_TASK_NEED_DEV_RESET;
-                        spin_unlock_irqrestore(&task->task_state_lock, flags);
-                        /* Fail the task management request in order to
-                         * escalate to the target reset.
-                         */
-                        ret = TMF_RESP_FUNC_FAILED;
-                        dev_dbg(&isci_host->pdev->dev,
-                                "%s: Failing task abort in order to "
-                                "escalate to target reset because\n"
-                                "SAS_TASK_NEED_DEV_RESET is set for "
-                                "task %p on dev %p\n",
-                                __func__, task, isci_device);
-                } else {
-                        /* The request has already completed and there
-                         * is nothing to do here other than to set the task
-                         * done bit, and indicate that the task abort function
-                         * was sucessful.
-                         */
-                        isci_set_task_doneflags(task);
-                        spin_unlock_irqrestore(&task->task_state_lock, flags);
-                        ret = TMF_RESP_FUNC_COMPLETE;
+                ret = TMF_RESP_FUNC_COMPLETE;
-                        dev_dbg(&isci_host->pdev->dev,
+                dev_dbg(&isci_host->pdev->dev,
-                                "%s: abort task not needed for %p\n",
+                        "%s: abort task not needed for %p\n",
-                                __func__, task);
+                        __func__, task);
-                }
                goto out;
-        } else {
-                spin_unlock_irqrestore(&task->task_state_lock, flags);
        }
        spin_lock_irqsave(&isci_host->scic_lock, flags);
@@ -1146,24 +1115,44 @@ int isci_task_abort_task(struct sas_task *task)
                goto out;
        }
        if (task->task_proto == SAS_PROTOCOL_SMP ||
+            sas_protocol_ata(task->task_proto) ||
            test_bit(IREQ_COMPLETE_IN_TARGET, &old_request->flags)) {
                spin_unlock_irqrestore(&isci_host->scic_lock, flags);
                dev_dbg(&isci_host->pdev->dev,
-                        "%s: SMP request (%d)"
+                        "%s: %s request"
                        " or complete_in_target (%d), thus no TMF\n",
-                        __func__, (task->task_proto == SAS_PROTOCOL_SMP),
+                        __func__,
+                        ((task->task_proto == SAS_PROTOCOL_SMP)
+                                ? "SMP"
+                                : (sas_protocol_ata(task->task_proto)
+                                        ? "SATA/STP"
+                                        : "<other>")
+                         ),
                        test_bit(IREQ_COMPLETE_IN_TARGET, &old_request->flags));
-                /* Set the state on the task. */
+                if (test_bit(IREQ_COMPLETE_IN_TARGET, &old_request->flags)) {
-                isci_task_all_done(task);
+                        spin_lock_irqsave(&task->task_state_lock, flags);
+                        task->task_state_flags |= SAS_TASK_STATE_DONE;
-                ret = TMF_RESP_FUNC_COMPLETE;
+                        task->task_state_flags &= ~(SAS_TASK_AT_INITIATOR |
+                                                    SAS_TASK_STATE_PENDING);
+                        spin_unlock_irqrestore(&task->task_state_lock, flags);
+                        ret = TMF_RESP_FUNC_COMPLETE;
+                } else {
+                        spin_lock_irqsave(&task->task_state_lock, flags);
+                        task->task_state_flags &= ~(SAS_TASK_AT_INITIATOR |
+                                                    SAS_TASK_STATE_PENDING);
+                        spin_unlock_irqrestore(&task->task_state_lock, flags);
+                }
-                /* Stopping and SMP devices are not sent a TMF, and are not
+                /* STP and SMP devices are not sent a TMF, but the
-                 * reset, but the outstanding I/O request is terminated below.
+                 * outstanding I/O request is terminated below.  This is
+                 * because SATA/STP and SMP discovery path timeouts directly
+                 * call the abort task interface for cleanup.
                 */
+                perform_termination = 1;
        } else {
                /* Fill in the tmf stucture */
                isci_task_build_abort_task_tmf(&tmf, isci_tmf_ssp_task_abort,
@@ -1172,22 +1161,24 @@ int isci_task_abort_task(struct sas_task *task)
                spin_unlock_irqrestore(&isci_host->scic_lock, flags);
-                #define ISCI_ABORT_TASK_TIMEOUT_MS 500 /* half second timeout. */
+                #define ISCI_ABORT_TASK_TIMEOUT_MS 500 /* 1/2 second timeout */
                ret = isci_task_execute_tmf(isci_host, isci_device, &tmf,
                                            ISCI_ABORT_TASK_TIMEOUT_MS);
-                if (ret != TMF_RESP_FUNC_COMPLETE)
+                if (ret == TMF_RESP_FUNC_COMPLETE)
+                        perform_termination = 1;
+                else
                        dev_dbg(&isci_host->pdev->dev,
-                                "%s: isci_task_send_tmf failed\n",
+                                "%s: isci_task_send_tmf failed\n", __func__);
-                                __func__);
        }
-        if (ret == TMF_RESP_FUNC_COMPLETE) {
+        if (perform_termination) {
                set_bit(IREQ_COMPLETE_IN_TARGET, &old_request->flags);
                /* Clean up the request on our side, and wait for the aborted
                 * I/O to complete.
                 */
-                isci_terminate_request_core(isci_host, isci_device, old_request);
+                isci_terminate_request_core(isci_host, isci_device,
+                                            old_request);
        }
        /* Make sure we do not leave a reference to aborted_io_completion */
@@ -1288,7 +1279,8 @@ isci_task_request_complete(struct isci_host *ihost,
                           enum sci_task_status completion_status)
 {
        struct isci_tmf *tmf = isci_request_access_tmf(ireq);
-        struct completion *tmf_complete;
+        struct completion *tmf_complete = NULL;
+        struct completion *request_complete = ireq->io_request_completion;
        dev_dbg(&ihost->pdev->dev,
                "%s: request = %p, status=%d\n",
@@ -1296,255 +1288,53 @@ isci_task_request_complete(struct isci_host *ihost,
        isci_request_change_state(ireq, completed);
-        tmf->status = completion_status;
        set_bit(IREQ_COMPLETE_IN_TARGET, &ireq->flags);
-        if (tmf->proto == SAS_PROTOCOL_SSP) {
+        if (tmf) {
-                memcpy(&tmf->resp.resp_iu,
+                tmf->status = completion_status;
-                       &ireq->ssp.rsp,
-                       SSP_RESP_IU_MAX_SIZE);
+                if (tmf->proto == SAS_PROTOCOL_SSP) {
-        } else if (tmf->proto == SAS_PROTOCOL_SATA) {
+                        memcpy(&tmf->resp.resp_iu,
-                memcpy(&tmf->resp.d2h_fis,
+                               &ireq->ssp.rsp,
-                       &ireq->stp.rsp,
+                               SSP_RESP_IU_MAX_SIZE);
-                       sizeof(struct dev_to_host_fis));
+                } else if (tmf->proto == SAS_PROTOCOL_SATA) {
+                        memcpy(&tmf->resp.d2h_fis,
+                               &ireq->stp.rsp,
+                               sizeof(struct dev_to_host_fis));
+                }
+                /* PRINT_TMF( ((struct isci_tmf *)request->task)); */
+                tmf_complete = tmf->complete;
        }
-        /* PRINT_TMF( ((struct isci_tmf *)request->task)); */
-        tmf_complete = tmf->complete;
        sci_controller_complete_io(ihost, ireq->target_device, ireq);
        /* set the 'terminated' flag handle to make sure it cannot be terminated
         *  or completed again.
         */
        set_bit(IREQ_TERMINATED, &ireq->flags);
-        isci_request_change_state(ireq, unallocated);
+        /* As soon as something is in the terminate path, deallocation is
-        list_del_init(&ireq->dev_node);
+         * managed there.  Note that the final non-managed state of a task
+         * request is "completed".
-        /* The task management part completes last. */
+         */
-        complete(tmf_complete);
+        if ((ireq->status == completed) ||
-}
+            !isci_request_is_dealloc_managed(ireq->status)) {
+                isci_request_change_state(ireq, unallocated);
-static void isci_smp_task_timedout(unsigned long _task)
+                isci_free_tag(ihost, ireq->io_tag);
-{
+                list_del_init(&ireq->dev_node);
-        struct sas_task *task = (void *) _task;
-        unsigned long flags;
-        spin_lock_irqsave(&task->task_state_lock, flags);
-        if (!(task->task_state_flags & SAS_TASK_STATE_DONE))
-                task->task_state_flags |= SAS_TASK_STATE_ABORTED;
-        spin_unlock_irqrestore(&task->task_state_lock, flags);
-        complete(&task->completion);
-}
-static void isci_smp_task_done(struct sas_task *task)
-{
-        if (!del_timer(&task->timer))
-                return;
-        complete(&task->completion);
-}
-static int isci_smp_execute_task(struct isci_host *ihost,
-                                 struct domain_device *dev, void *req,
-                                 int req_size, void *resp, int resp_size)
-{
-        int res, retry;
-        struct sas_task *task = NULL;
-        for (retry = 0; retry < 3; retry++) {
-                task = sas_alloc_task(GFP_KERNEL);
-                if (!task)
-                        return -ENOMEM;
-                task->dev = dev;
-                task->task_proto = dev->tproto;
-                sg_init_one(&task->smp_task.smp_req, req, req_size);
-                sg_init_one(&task->smp_task.smp_resp, resp, resp_size);
-                task->task_done = isci_smp_task_done;
-                task->timer.data = (unsigned long) task;
-                task->timer.function = isci_smp_task_timedout;
-                task->timer.expires = jiffies + 10*HZ;
-                add_timer(&task->timer);
-                res = isci_task_execute_task(task, 1, GFP_KERNEL);
-                if (res) {
-                        del_timer(&task->timer);
-                        dev_dbg(&ihost->pdev->dev,
-                                "%s: executing SMP task failed:%d\n",
-                                __func__, res);
-                        goto ex_err;
-                }
-                wait_for_completion(&task->completion);
-                res = -ECOMM;
-                if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) {
-                        dev_dbg(&ihost->pdev->dev,
-                                "%s: smp task timed out or aborted\n",
-                                __func__);
-                        isci_task_abort_task(task);
-                        if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {
-                                dev_dbg(&ihost->pdev->dev,
-                                        "%s: SMP task aborted and not done\n",
-                                        __func__);
-                                goto ex_err;
-                        }
-                }
-                if (task->task_status.resp == SAS_TASK_COMPLETE &&
-                    task->task_status.stat == SAM_STAT_GOOD) {
-                        res = 0;
-                        break;
-                }
-                if (task->task_status.resp == SAS_TASK_COMPLETE &&
-                      task->task_status.stat == SAS_DATA_UNDERRUN) {
-                        /* no error, but return the number of bytes of
-                        * underrun */
-                        res = task->task_status.residual;
-                        break;
-                }
-                if (task->task_status.resp == SAS_TASK_COMPLETE &&
-                      task->task_status.stat == SAS_DATA_OVERRUN) {
-                        res = -EMSGSIZE;
-                        break;
-                } else {
-                        dev_dbg(&ihost->pdev->dev,
-                                "%s: task to dev %016llx response: 0x%x "
-                                "status 0x%x\n", __func__,
-                                SAS_ADDR(dev->sas_addr),
-                                task->task_status.resp,
-                                task->task_status.stat);
-                        sas_free_task(task);
-                        task = NULL;
-                }
-        }
-ex_err:
-        BUG_ON(retry == 3 && task != NULL);
-        sas_free_task(task);
-        return res;
-}
-#define DISCOVER_REQ_SIZE  16
-#define DISCOVER_RESP_SIZE 56
-int isci_smp_get_phy_attached_dev_type(struct isci_host *ihost,
-                                       struct domain_device *dev,
-                                       int phy_id, int *adt)
-{
-        struct smp_resp *disc_resp;
-        u8 *disc_req;
-        int res;
-        disc_resp = kzalloc(DISCOVER_RESP_SIZE, GFP_KERNEL);
-        if (!disc_resp)
-                return -ENOMEM;
-        disc_req = kzalloc(DISCOVER_REQ_SIZE, GFP_KERNEL);
-        if (disc_req) {
-                disc_req[0] = SMP_REQUEST;
-                disc_req[1] = SMP_DISCOVER;
-                disc_req[9] = phy_id;
-        } else {
-                kfree(disc_resp);
-                return -ENOMEM;
-        }
-        res = isci_smp_execute_task(ihost, dev, disc_req, DISCOVER_REQ_SIZE,
-                                    disc_resp, DISCOVER_RESP_SIZE);
-        if (!res) {
-                if (disc_resp->result != SMP_RESP_FUNC_ACC)
-                        res = disc_resp->result;
-                else
-                        *adt = disc_resp->disc.attached_dev_type;
        }
-        kfree(disc_req);
-        kfree(disc_resp);
-        return res;
-}
-static void isci_wait_for_smp_phy_reset(struct isci_remote_device *idev, int phy_num)
-{
-        struct domain_device *dev = idev->domain_dev;
-        struct isci_port *iport = idev->isci_port;
-        struct isci_host *ihost = iport->isci_host;
-        int res, iteration = 0, attached_device_type;
-        #define STP_WAIT_MSECS 25000
-        unsigned long tmo = msecs_to_jiffies(STP_WAIT_MSECS);
-        unsigned long deadline = jiffies + tmo;
-        enum {
-                SMP_PHYWAIT_PHYDOWN,
-                SMP_PHYWAIT_PHYUP,
-                SMP_PHYWAIT_DONE
-        } phy_state = SMP_PHYWAIT_PHYDOWN;
-        /* While there is time, wait for the phy to go away and come back */
-        while (time_is_after_jiffies(deadline) && phy_state != SMP_PHYWAIT_DONE) {
-                int event = atomic_read(&iport->event);
-                ++iteration;
-                tmo = wait_event_timeout(ihost->eventq,
-                                         event != atomic_read(&iport->event) ||
-                                         !test_bit(IPORT_BCN_BLOCKED, &iport->flags),
-                                         tmo);
-                /* link down, stop polling */
-                if (!test_bit(IPORT_BCN_BLOCKED, &iport->flags))
-                        break;
-                dev_dbg(&ihost->pdev->dev,
+        /* "request_complete" is set if the task was being terminated. */
-                        "%s: iport %p, iteration %d,"
+        if (request_complete)
-                        " phase %d: time_remaining %lu, bcns = %d\n",
+                complete(request_complete);
-                        __func__, iport, iteration, phy_state,
-                        tmo, test_bit(IPORT_BCN_PENDING, &iport->flags));
-                res = isci_smp_get_phy_attached_dev_type(ihost, dev, phy_num,
-                                                         &attached_device_type);
-                tmo = deadline - jiffies;
-                if (res) {
-                        dev_dbg(&ihost->pdev->dev,
-                                 "%s: iteration %d, phase %d:"
-                                 " SMP error=%d, time_remaining=%lu\n",
-                                 __func__, iteration, phy_state, res, tmo);
-                        break;
-                }
-                dev_dbg(&ihost->pdev->dev,
-                        "%s: iport %p, iteration %d,"
-                        " phase %d: time_remaining %lu, bcns = %d, "
-                        "attdevtype = %x\n",
-                        __func__, iport, iteration, phy_state,
-                        tmo, test_bit(IPORT_BCN_PENDING, &iport->flags),
-                        attached_device_type);
-                switch (phy_state) {
-                case SMP_PHYWAIT_PHYDOWN:
-                        /* Has the device gone away? */
-                        if (!attached_device_type)
-                                phy_state = SMP_PHYWAIT_PHYUP;
-                        break;
-                case SMP_PHYWAIT_PHYUP:
-                        /* Has the device come back? */
-                        if (attached_device_type)
-                                phy_state = SMP_PHYWAIT_DONE;
-                        break;
-                case SMP_PHYWAIT_DONE:
-                        break;
-                }
-        }
+        /* The task management part completes last. */
-        dev_dbg(&ihost->pdev->dev, "%s: done\n",  __func__);
+        if (tmf_complete)
+                complete(tmf_complete);
 }
 static int isci_reset_device(struct isci_host *ihost,
                             struct isci_remote_device *idev)
 {
        struct sas_phy *phy = sas_find_local_phy(idev->domain_dev);
-        struct isci_port *iport = idev->isci_port;
        enum sci_status status;
        unsigned long flags;
        int rc;
@@ -1564,13 +1354,6 @@ static int isci_reset_device(struct isci_host *ihost,
        }
        spin_unlock_irqrestore(&ihost->scic_lock, flags);
-        /* Make sure all pending requests are able to be fully terminated. */
-        isci_device_clear_reset_pending(ihost, idev);
-        /* If this is a device on an expander, disable BCN processing. */
-        if (!scsi_is_sas_phy_local(phy))
-                set_bit(IPORT_BCN_BLOCKED, &iport->flags);
        rc = sas_phy_reset(phy, true);
        /* Terminate in-progress I/O now. */
@@ -1581,21 +1364,6 @@ static int isci_reset_device(struct isci_host *ihost,
        status = sci_remote_device_reset_complete(idev);
        spin_unlock_irqrestore(&ihost->scic_lock, flags);
-        /* If this is a device on an expander, bring the phy back up. */
-        if (!scsi_is_sas_phy_local(phy)) {
-                /* A phy reset will cause the device to go away then reappear.
-                 * Since libsas will take action on incoming BCNs (eg. remove
-                 * a device going through an SMP phy-control driven reset),
-                 * we need to wait until the phy comes back up before letting
-                 * discovery proceed in libsas.
-                 */
-                isci_wait_for_smp_phy_reset(idev, phy->number);
-                spin_lock_irqsave(&ihost->scic_lock, flags);
-                isci_port_bcn_enable(ihost, idev->isci_port);
-                spin_unlock_irqrestore(&ihost->scic_lock, flags);
-        }
        if (status != SCI_SUCCESS) {
                dev_dbg(&ihost->pdev->dev,
                         "%s: sci_remote_device_reset_complete(%p) "
diff --git a/drivers/scsi/isci/task.h b/drivers/scsi/isci/task.h
index 15b18d158993..bc78c0a41d5c 100644
--- a/drivers/scsi/isci/task.h
+++ b/drivers/scsi/isci/task.h
@@ -58,6 +58,8 @@
 #include <scsi/sas_ata.h>
 #include "host.h"
+#define ISCI_TERMINATION_TIMEOUT_MSEC 500
 struct isci_request;
 /**
@@ -224,35 +226,6 @@ enum isci_completion_selection {
        isci_perform_error_io_completion        /* Use sas_task_abort */
 };
-static inline void isci_set_task_doneflags(
-        struct sas_task *task)
-{
-        /* Since no futher action will be taken on this task,
-         * make sure to mark it complete from the lldd perspective.
-         */
-        task->task_state_flags |= SAS_TASK_STATE_DONE;
-        task->task_state_flags &= ~SAS_TASK_AT_INITIATOR;
-        task->task_state_flags &= ~SAS_TASK_STATE_PENDING;
-}
-/**
- * isci_task_all_done() - This function clears the task bits to indicate the
- *    LLDD is done with the task.
- *
- *
- */
-static inline void isci_task_all_done(
-        struct sas_task *task)
-{
-        unsigned long flags;
-        /* Since no futher action will be taken on this task,
-         * make sure to mark it complete from the lldd perspective.
-         */
-        spin_lock_irqsave(&task->task_state_lock, flags);
-        isci_set_task_doneflags(task);
-        spin_unlock_irqrestore(&task->task_state_lock, flags);
-}
 /**
 * isci_task_set_completion_status() - This function sets the completion status
 *    for the request.
@@ -334,7 +307,9 @@ isci_task_set_completion_status(
                /* Fall through to the normal case... */
        case isci_perform_normal_io_completion:
                /* Normal notification (task_done) */
-                isci_set_task_doneflags(task);
+                task->task_state_flags |= SAS_TASK_STATE_DONE;
+                task->task_state_flags &= ~(SAS_TASK_AT_INITIATOR |
+                                            SAS_TASK_STATE_PENDING);
                break;
        default:
                WARN_ONCE(1, "unknown task_notification_selection: %d\n",
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 23e706673d06..7c34d8e7cc75 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -35,6 +35,7 @@
 #include <linux/delay.h>
 #include <linux/kfifo.h>
 #include <linux/scatterlist.h>
+#include <linux/module.h>
 #include <net/tcp.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
diff --git a/drivers/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c
index b9cb8140b398..7269e928824a 100644
--- a/drivers/scsi/libfc/fc_disc.c
+++ b/drivers/scsi/libfc/fc_disc.c
@@ -35,6 +35,7 @@
 #include <linux/timer.h>
 #include <linux/slab.h>
 #include <linux/err.h>
+#include <linux/export.h>
 #include <asm/unaligned.h>
 #include <scsi/fc/fc_gs.h>
diff --git a/drivers/scsi/libfc/fc_elsct.c b/drivers/scsi/libfc/fc_elsct.c
index 9b25969e2ad0..fb9161dc4ca6 100644
--- a/drivers/scsi/libfc/fc_elsct.c
+++ b/drivers/scsi/libfc/fc_elsct.c
@@ -21,6 +21,7 @@
 * Provide interface to send ELS/CT FC frames
 */
+#include <linux/export.h>
 #include <asm/unaligned.h>
 #include <scsi/fc/fc_gs.h>
 #include <scsi/fc/fc_ns.h>
diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
index 7c055fdca45d..9de9db27e874 100644
--- a/drivers/scsi/libfc/fc_exch.c
+++ b/drivers/scsi/libfc/fc_exch.c
@@ -26,6 +26,7 @@
 #include <linux/timer.h>
 #include <linux/slab.h>
 #include <linux/err.h>
+#include <linux/export.h>
 #include <scsi/fc/fc_fc2.h>
@@ -469,6 +470,7 @@ static int fc_seq_send(struct fc_lport *lport, struct fc_seq *sp,
        struct fc_frame_header *fh = fc_frame_header_get(fp);
        int error;
        u32 f_ctl;
+        u8 fh_type = fh->fh_type;
        ep = fc_seq_exch(sp);
        WARN_ON((ep->esb_stat & ESB_ST_SEQ_INIT) != ESB_ST_SEQ_INIT);
@@ -493,7 +495,7 @@ static int fc_seq_send(struct fc_lport *lport, struct fc_seq *sp,
         */
        error = lport->tt.frame_send(lport, fp);
-        if (fh->fh_type == FC_TYPE_BLS)
+        if (fh_type == FC_TYPE_BLS)
                return error;
        /*
@@ -1792,6 +1794,9 @@ restart:
                        goto restart;
                }
        }
+        pool->next_index = 0;
+        pool->left = FC_XID_UNKNOWN;
+        pool->right = FC_XID_UNKNOWN;
        spin_unlock_bh(&pool->lock);
 }
@@ -2280,6 +2285,7 @@ struct fc_exch_mgr *fc_exch_mgr_alloc(struct fc_lport *lport,
                goto free_mempool;
        for_each_possible_cpu(cpu) {
                pool = per_cpu_ptr(mp->pool, cpu);
+                pool->next_index = 0;
                pool->left = FC_XID_UNKNOWN;
                pool->right = FC_XID_UNKNOWN;
                spin_lock_init(&pool->lock);
diff --git a/drivers/scsi/libfc/fc_libfc.c b/drivers/scsi/libfc/fc_libfc.c
index b7735129f1f3..1bf9841ef154 100644
--- a/drivers/scsi/libfc/fc_libfc.c
+++ b/drivers/scsi/libfc/fc_libfc.c
@@ -21,6 +21,7 @@
 #include <linux/types.h>
 #include <linux/scatterlist.h>
 #include <linux/crc32.h>
+#include <linux/module.h>
 #include <scsi/libfc.h>
 #include <scsi/fc_encode.h>
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index 628f347404f9..e77094a587ed 100644
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -89,6 +89,7 @@
 #include <linux/timer.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <asm/unaligned.h>
@@ -1030,16 +1031,8 @@ static void fc_lport_enter_reset(struct fc_lport *lport)
                           FCH_EVT_LIPRESET, 0);
        fc_vports_linkchange(lport);
        fc_lport_reset_locked(lport);
-        if (lport->link_up) {
+        if (lport->link_up)
-                /*
-                 * Wait upto resource allocation time out before
-                 * doing re-login since incomplete FIP exchanged
-                 * from last session may collide with exchanges
-                 * in new session.
-                 */
-                msleep(lport->r_a_tov);
                fc_lport_enter_flogi(lport);
-        }
 }
 /**
@@ -1481,6 +1474,7 @@ void fc_lport_flogi_resp(struct fc_seq *sp, struct fc_frame *fp,
                         void *lp_arg)
 {
        struct fc_lport *lport = lp_arg;
+        struct fc_frame_header *fh;
        struct fc_els_flogi *flp;
        u32 did;
        u16 csp_flags;
@@ -1508,49 +1502,56 @@ void fc_lport_flogi_resp(struct fc_seq *sp, struct fc_frame *fp,
                goto err;
        }
+        fh = fc_frame_header_get(fp);
        did = fc_frame_did(fp);
-        if (fc_frame_payload_op(fp) == ELS_LS_ACC && did) {
+        if (fh->fh_r_ctl != FC_RCTL_ELS_REP || did == 0 ||
-                flp = fc_frame_payload_get(fp, sizeof(*flp));
+            fc_frame_payload_op(fp) != ELS_LS_ACC) {
-                if (flp) {
+                FC_LPORT_DBG(lport, "FLOGI not accepted or bad response\n");
-                        mfs = ntohs(flp->fl_csp.sp_bb_data) &
-                                FC_SP_BB_DATA_MASK;
-                        if (mfs >= FC_SP_MIN_MAX_PAYLOAD &&
-                            mfs < lport->mfs)
-                                lport->mfs = mfs;
-                        csp_flags = ntohs(flp->fl_csp.sp_features);
-                        r_a_tov = ntohl(flp->fl_csp.sp_r_a_tov);
-                        e_d_tov = ntohl(flp->fl_csp.sp_e_d_tov);
-                        if (csp_flags & FC_SP_FT_EDTR)
-                                e_d_tov /= 1000000;
-                        lport->npiv_enabled = !!(csp_flags & FC_SP_FT_NPIV_ACC);
-                        if ((csp_flags & FC_SP_FT_FPORT) == 0) {
-                                if (e_d_tov > lport->e_d_tov)
-                                        lport->e_d_tov = e_d_tov;
-                                lport->r_a_tov = 2 * e_d_tov;
-                                fc_lport_set_port_id(lport, did, fp);
-                                printk(KERN_INFO "host%d: libfc: "
-                                       "Port (%6.6x) entered "
-                                       "point-to-point mode\n",
-                                       lport->host->host_no, did);
-                                fc_lport_ptp_setup(lport, fc_frame_sid(fp),
-                                                   get_unaligned_be64(
-                                                           &flp->fl_wwpn),
-                                                   get_unaligned_be64(
-                                                           &flp->fl_wwnn));
-                        } else {
-                                lport->e_d_tov = e_d_tov;
-                                lport->r_a_tov = r_a_tov;
-                                fc_host_fabric_name(lport->host) =
-                                        get_unaligned_be64(&flp->fl_wwnn);
-                                fc_lport_set_port_id(lport, did, fp);
-                                fc_lport_enter_dns(lport);
-                        }
-                }
-        } else {
-                FC_LPORT_DBG(lport, "FLOGI RJT or bad response\n");
                fc_lport_error(lport, fp);
+                goto err;
+        }
+        flp = fc_frame_payload_get(fp, sizeof(*flp));
+        if (!flp) {
+                FC_LPORT_DBG(lport, "FLOGI bad response\n");
+                fc_lport_error(lport, fp);
+                goto err;
+        }
+        mfs = ntohs(flp->fl_csp.sp_bb_data) &
+                FC_SP_BB_DATA_MASK;
+        if (mfs >= FC_SP_MIN_MAX_PAYLOAD &&
+            mfs < lport->mfs)
+                lport->mfs = mfs;
+        csp_flags = ntohs(flp->fl_csp.sp_features);
+        r_a_tov = ntohl(flp->fl_csp.sp_r_a_tov);
+        e_d_tov = ntohl(flp->fl_csp.sp_e_d_tov);
+        if (csp_flags & FC_SP_FT_EDTR)
+                e_d_tov /= 1000000;
+        lport->npiv_enabled = !!(csp_flags & FC_SP_FT_NPIV_ACC);
+        if ((csp_flags & FC_SP_FT_FPORT) == 0) {
+                if (e_d_tov > lport->e_d_tov)
+                        lport->e_d_tov = e_d_tov;
+                lport->r_a_tov = 2 * e_d_tov;
+                fc_lport_set_port_id(lport, did, fp);
+                printk(KERN_INFO "host%d: libfc: "
+                       "Port (%6.6x) entered "
+                       "point-to-point mode\n",
+                       lport->host->host_no, did);
+                fc_lport_ptp_setup(lport, fc_frame_sid(fp),
+                                   get_unaligned_be64(
+                                           &flp->fl_wwpn),
+                                   get_unaligned_be64(
+                                           &flp->fl_wwnn));
+        } else {
+                lport->e_d_tov = e_d_tov;
+                lport->r_a_tov = r_a_tov;
+                fc_host_fabric_name(lport->host) =
+                        get_unaligned_be64(&flp->fl_wwnn);
+                fc_lport_set_port_id(lport, did, fp);
+                fc_lport_enter_dns(lport);
        }
 out:
diff --git a/drivers/scsi/libfc/fc_npiv.c b/drivers/scsi/libfc/fc_npiv.c
index f33b897e4784..9fbf78ed821b 100644
--- a/drivers/scsi/libfc/fc_npiv.c
+++ b/drivers/scsi/libfc/fc_npiv.c
@@ -22,6 +22,7 @@
 */
 #include <scsi/libfc.h>
+#include <linux/export.h>
 /**
 * fc_vport_create() - Create a new NPIV vport instance
diff --git a/drivers/scsi/libfc/fc_rport.c b/drivers/scsi/libfc/fc_rport.c
index 760db7619446..b9e434844a69 100644
--- a/drivers/scsi/libfc/fc_rport.c
+++ b/drivers/scsi/libfc/fc_rport.c
@@ -51,6 +51,7 @@
 #include <linux/rcupdate.h>
 #include <linux/timer.h>
 #include <linux/workqueue.h>
+#include <linux/export.h>
 #include <asm/unaligned.h>
 #include <scsi/libfc.h>
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index d7c76f2eb636..143bbe448bec 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/log2.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <asm/unaligned.h>
 #include <net/tcp.h>
 #include <scsi/scsi_cmnd.h>
diff --git a/drivers/scsi/libiscsi_tcp.c b/drivers/scsi/libiscsi_tcp.c
index 09b232fd9a1b..5715a3d0a3d3 100644
--- a/drivers/scsi/libiscsi_tcp.c
+++ b/drivers/scsi/libiscsi_tcp.c
@@ -36,6 +36,7 @@
 #include <linux/delay.h>
 #include <linux/kfifo.h>
 #include <linux/scatterlist.h>
+#include <linux/module.h>
 #include <net/tcp.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
diff --git a/drivers/scsi/libsas/sas_host_smp.c b/drivers/scsi/libsas/sas_host_smp.c
index e1aa17840c5b..bb8f49269a68 100644
--- a/drivers/scsi/libsas/sas_host_smp.c
+++ b/drivers/scsi/libsas/sas_host_smp.c
@@ -11,6 +11,7 @@
 #include <linux/scatterlist.h>
 #include <linux/blkdev.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "sas_internal.h"
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index b2c4a7731656..b6e233d9a0a1 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -25,6 +25,7 @@
 #include <linux/kthread.h>
 #include <linux/firmware.h>
+#include <linux/export.h>
 #include <linux/ctype.h>
 #include "sas_internal.h"
diff --git a/drivers/scsi/libsas/sas_task.c b/drivers/scsi/libsas/sas_task.c
index b13a3346894c..a78e5bd3e514 100644
--- a/drivers/scsi/libsas/sas_task.c
+++ b/drivers/scsi/libsas/sas_task.c
@@ -1,4 +1,5 @@
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <scsi/sas.h>
 #include <scsi/libsas.h>
diff --git a/drivers/scsi/libsrp.c b/drivers/scsi/libsrp.c
index ff6a28ce9b69..0707ecdbaa32 100644
--- a/drivers/scsi/libsrp.c
+++ b/drivers/scsi/libsrp.c
@@ -23,6 +23,7 @@
 #include <linux/kfifo.h>
 #include <linux/scatterlist.h>
 #include <linux/dma-mapping.h>
+#include <linux/module.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_tcq.h>
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 4b0333ee2d94..d0ebaeb7ef60 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/pci.h>
 #include <linux/interrupt.h>
+#include <linux/module.h>
 #include <linux/aer.h>
 #include <linux/gfp.h>
 #include <linux/kernel.h>
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
index 2cd844f7058f..28382596fb9a 100644
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -20,6 +20,7 @@
 #include <linux/blkdev.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 #include <linux/dma-mapping.h>
 #include <linux/idr.h>
 #include <linux/interrupt.h>
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 907c94b9245d..55bc4fc7376f 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -24,6 +24,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/idr.h>
 #include <linux/interrupt.h>
+#include <linux/module.h>
 #include <linux/kthread.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 5b8790b3cf4b..2e1e54e5c3ae 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -21,6 +21,7 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
+#include <linux/export.h>
 #include <linux/delay.h>
 #include <asm/unaligned.h>
diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c
index 6c42dff0f4d3..e6173376605d 100644
--- a/drivers/scsi/mac53c94.c
+++ b/drivers/scsi/mac53c94.c
@@ -17,6 +17,7 @@
 #include <linux/stat.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
+#include <linux/module.h>
 #include <asm/dbdma.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 8883ca36f932..35bd13879fed 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -71,6 +71,7 @@
 */
 #include <linux/slab.h>
+#include <linux/module.h>
 #include "megaraid_mbox.h"
 static int megaraid_init(void);
diff --git a/drivers/scsi/mpt2sas/mpi/mpi2.h b/drivers/scsi/mpt2sas/mpi/mpi2.h
index 3105d5e8d908..8dc1b32918dd 100644
--- a/drivers/scsi/mpt2sas/mpi/mpi2.h
+++ b/drivers/scsi/mpt2sas/mpi/mpi2.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2000-2010 LSI Corporation.
+ *  Copyright (c) 2000-2011 LSI Corporation.
 *
 *
 *           Name:  mpi2.h
@@ -8,7 +8,7 @@
 *                  scatter/gather formats.
 *  Creation Date:  June 21, 2006
 *
- *  mpi2.h Version:  02.00.18
+ *  mpi2.h Version:  02.00.20
 *
 *  Version History
 *  ---------------
@@ -66,6 +66,9 @@
 *  08-11-10  02.00.17  Bumped MPI2_HEADER_VERSION_UNIT.
 *  11-10-10  02.00.18  Bumped MPI2_HEADER_VERSION_UNIT.
 *                      Added MPI2_IEEE_SGE_FLAGS_SYSTEMPLBCPI_ADDR define.
+ *  02-23-11  02.00.19  Bumped MPI2_HEADER_VERSION_UNIT.
+ *                      Added MPI2_FUNCTION_SEND_HOST_MESSAGE.
+ *  03-09-11  02.00.20  Bumped MPI2_HEADER_VERSION_UNIT.
 *  --------------------------------------------------------------------------
 */
@@ -91,7 +94,7 @@
 #define MPI2_VERSION_02_00                  (0x0200)
 /* versioning for this MPI header set */
-#define MPI2_HEADER_VERSION_UNIT            (0x12)
+#define MPI2_HEADER_VERSION_UNIT            (0x14)
 #define MPI2_HEADER_VERSION_DEV             (0x00)
 #define MPI2_HEADER_VERSION_UNIT_MASK       (0xFF00)
 #define MPI2_HEADER_VERSION_UNIT_SHIFT      (8)
@@ -515,6 +518,8 @@ typedef union _MPI2_REPLY_DESCRIPTORS_UNION
 #define MPI2_FUNCTION_HOST_BASED_DISCOVERY_ACTION   (0x2F)
 /* Power Management Control */
 #define MPI2_FUNCTION_PWR_MGMT_CONTROL              (0x30)
+/* Send Host Message */
+#define MPI2_FUNCTION_SEND_HOST_MESSAGE             (0x31)
 /* beginning of product-specific range */
 #define MPI2_FUNCTION_MIN_PRODUCT_SPECIFIC          (0xF0)
 /* end of product-specific range */
diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h b/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h
index 61475a6480e3..cfd95b4e3004 100644
--- a/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h
+++ b/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h
@@ -1,12 +1,12 @@
 /*
- *  Copyright (c) 2000-2010 LSI Corporation.
+ *  Copyright (c) 2000-2011 LSI Corporation.
 *
 *
 *           Name:  mpi2_cnfg.h
 *          Title:  MPI Configuration messages and pages
 *  Creation Date:  November 10, 2006
 *
- *    mpi2_cnfg.h Version:  02.00.17
+ *    mpi2_cnfg.h Version:  02.00.19
 *
 *  Version History
 *  ---------------
@@ -134,6 +134,12 @@
 *                      to MPI2_CONFIG_PAGE_IO_UNIT_7.
 *                      Added MPI2_CONFIG_EXTPAGETYPE_EXT_MANUFACTURING define
 *                      and MPI2_CONFIG_PAGE_EXT_MAN_PS structure.
+ *  02-23-11  02.00.18  Added ProxyVF_ID field to MPI2_CONFIG_REQUEST.
+ *                      Added IO Unit Page 8, IO Unit Page 9,
+ *                      and IO Unit Page 10.
+ *                      Added SASNotifyPrimitiveMasks field to
+ *                      MPI2_CONFIG_PAGE_IOC_7.
+ *  03-09-11  02.00.19  Fixed IO Unit Page 10 (to match the spec).
 *  --------------------------------------------------------------------------
 */
@@ -329,7 +335,9 @@ typedef struct _MPI2_CONFIG_REQUEST
    U8                      VP_ID;                      /* 0x08 */
    U8                      VF_ID;                      /* 0x09 */
    U16                     Reserved1;                  /* 0x0A */
-    U32                     Reserved2;                  /* 0x0C */
+        U8                      Reserved2;                  /* 0x0C */
+        U8                      ProxyVF_ID;                 /* 0x0D */
+        U16                     Reserved4;                  /* 0x0E */
    U32                     Reserved3;                  /* 0x10 */
    MPI2_CONFIG_PAGE_HEADER Header;                     /* 0x14 */
    U32                     PageAddress;                /* 0x18 */
@@ -915,6 +923,120 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7 {
 #define MPI2_IOUNITPAGE7_BOARD_TEMP_FAHRENHEIT      (0x01)
 #define MPI2_IOUNITPAGE7_BOARD_TEMP_CELSIUS         (0x02)
+/* IO Unit Page 8 */
+#define MPI2_IOUNIT8_NUM_THRESHOLDS     (4)
+typedef struct _MPI2_IOUNIT8_SENSOR {
+        U16                     Flags;                /* 0x00 */
+        U16                     Reserved1;            /* 0x02 */
+        U16
+                Threshold[MPI2_IOUNIT8_NUM_THRESHOLDS]; /* 0x04 */
+        U32                     Reserved2;            /* 0x0C */
+        U32                     Reserved3;            /* 0x10 */
+        U32                     Reserved4;            /* 0x14 */
+} MPI2_IOUNIT8_SENSOR, MPI2_POINTER PTR_MPI2_IOUNIT8_SENSOR,
+Mpi2IOUnit8Sensor_t, MPI2_POINTER pMpi2IOUnit8Sensor_t;
+/* defines for IO Unit Page 8 Sensor Flags field */
+#define MPI2_IOUNIT8_SENSOR_FLAGS_T3_ENABLE         (0x0008)
+#define MPI2_IOUNIT8_SENSOR_FLAGS_T2_ENABLE         (0x0004)
+#define MPI2_IOUNIT8_SENSOR_FLAGS_T1_ENABLE         (0x0002)
+#define MPI2_IOUNIT8_SENSOR_FLAGS_T0_ENABLE         (0x0001)
+/*
+ * Host code (drivers, BIOS, utilities, etc.) should leave this define set to
+ * one and check the value returned for NumSensors at runtime.
+ */
+#ifndef MPI2_IOUNITPAGE8_SENSOR_ENTRIES
+#define MPI2_IOUNITPAGE8_SENSOR_ENTRIES     (1)
+#endif
+typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_8 {
+        MPI2_CONFIG_PAGE_HEADER Header;               /* 0x00 */
+        U32                     Reserved1;            /* 0x04 */
+        U32                     Reserved2;            /* 0x08 */
+        U8                      NumSensors;           /* 0x0C */
+        U8                      PollingInterval;      /* 0x0D */
+        U16                     Reserved3;            /* 0x0E */
+        MPI2_IOUNIT8_SENSOR
+                        Sensor[MPI2_IOUNITPAGE8_SENSOR_ENTRIES];/* 0x10 */
+} MPI2_CONFIG_PAGE_IO_UNIT_8, MPI2_POINTER PTR_MPI2_CONFIG_PAGE_IO_UNIT_8,
+Mpi2IOUnitPage8_t, MPI2_POINTER pMpi2IOUnitPage8_t;
+#define MPI2_IOUNITPAGE8_PAGEVERSION                    (0x00)
+/* IO Unit Page 9 */
+typedef struct _MPI2_IOUNIT9_SENSOR {
+        U16                     CurrentTemperature;     /* 0x00 */
+        U16                     Reserved1;              /* 0x02 */
+        U8                      Flags;                  /* 0x04 */
+        U8                      Reserved2;              /* 0x05 */
+        U16                     Reserved3;              /* 0x06 */
+        U32                     Reserved4;              /* 0x08 */
+        U32                     Reserved5;              /* 0x0C */
+} MPI2_IOUNIT9_SENSOR, MPI2_POINTER PTR_MPI2_IOUNIT9_SENSOR,
+Mpi2IOUnit9Sensor_t, MPI2_POINTER pMpi2IOUnit9Sensor_t;
+/* defines for IO Unit Page 9 Sensor Flags field */
+#define MPI2_IOUNIT9_SENSOR_FLAGS_TEMP_VALID        (0x01)
+/*
+ * Host code (drivers, BIOS, utilities, etc.) should leave this define set to
+ * one and check the value returned for NumSensors at runtime.
+ */
+#ifndef MPI2_IOUNITPAGE9_SENSOR_ENTRIES
+#define MPI2_IOUNITPAGE9_SENSOR_ENTRIES     (1)
+#endif
+typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_9 {
+        MPI2_CONFIG_PAGE_HEADER Header;                /* 0x00 */
+        U32                     Reserved1;             /* 0x04 */
+        U32                     Reserved2;             /* 0x08 */
+        U8                      NumSensors;            /* 0x0C */
+        U8                      Reserved4;             /* 0x0D */
+        U16                     Reserved3;             /* 0x0E */
+        MPI2_IOUNIT9_SENSOR
+                        Sensor[MPI2_IOUNITPAGE9_SENSOR_ENTRIES];/* 0x10 */
+} MPI2_CONFIG_PAGE_IO_UNIT_9, MPI2_POINTER PTR_MPI2_CONFIG_PAGE_IO_UNIT_9,
+Mpi2IOUnitPage9_t, MPI2_POINTER pMpi2IOUnitPage9_t;
+#define MPI2_IOUNITPAGE9_PAGEVERSION                    (0x00)
+/* IO Unit Page 10 */
+typedef struct _MPI2_IOUNIT10_FUNCTION {
+        U8                      CreditPercent;      /* 0x00 */
+        U8                      Reserved1;          /* 0x01 */
+        U16                     Reserved2;          /* 0x02 */
+} MPI2_IOUNIT10_FUNCTION, MPI2_POINTER PTR_MPI2_IOUNIT10_FUNCTION,
+Mpi2IOUnit10Function_t, MPI2_POINTER pMpi2IOUnit10Function_t;
+/*
+ * Host code (drivers, BIOS, utilities, etc.) should leave this define set to
+ * one and check the value returned for NumFunctions at runtime.
+ */
+#ifndef MPI2_IOUNITPAGE10_FUNCTION_ENTRIES
+#define MPI2_IOUNITPAGE10_FUNCTION_ENTRIES      (1)
+#endif
+typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_10 {
+        MPI2_CONFIG_PAGE_HEADER Header;                    /* 0x00 */
+        U8                      NumFunctions;             /* 0x04 */
+        U8                      Reserved1;              /* 0x05 */
+        U16                     Reserved2;              /* 0x06 */
+        U32                     Reserved3;              /* 0x08 */
+        U32                     Reserved4;              /* 0x0C */
+        MPI2_IOUNIT10_FUNCTION
+                Function[MPI2_IOUNITPAGE10_FUNCTION_ENTRIES];/* 0x10 */
+} MPI2_CONFIG_PAGE_IO_UNIT_10, MPI2_POINTER PTR_MPI2_CONFIG_PAGE_IO_UNIT_10,
+Mpi2IOUnitPage10_t, MPI2_POINTER pMpi2IOUnitPage10_t;
+#define MPI2_IOUNITPAGE10_PAGEVERSION                   (0x01)
 /****************************************************************************
@@ -1022,12 +1144,12 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_7
    U32                     Reserved1;                  /* 0x04 */
    U32                     EventMasks[MPI2_IOCPAGE7_EVENTMASK_WORDS];/* 0x08 */
    U16                     SASBroadcastPrimitiveMasks; /* 0x18 */
-    U16                     Reserved2;                  /* 0x1A */
+        U16                     SASNotifyPrimitiveMasks;    /* 0x1A */
    U32                     Reserved3;                  /* 0x1C */
 } MPI2_CONFIG_PAGE_IOC_7, MPI2_POINTER PTR_MPI2_CONFIG_PAGE_IOC_7,
  Mpi2IOCPage7_t, MPI2_POINTER pMpi2IOCPage7_t;
-#define MPI2_IOCPAGE7_PAGEVERSION                       (0x01)
+#define MPI2_IOCPAGE7_PAGEVERSION                       (0x02)
 /* IOC Page 8 */
@@ -2070,16 +2192,16 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_8 {
 #define MPI2_SASIOUNITPAGE8_PAGEVERSION     (0x00)
 /* defines for PowerManagementCapabilities field */
-#define MPI2_SASIOUNIT8_PM_HOST_PORT_WIDTH_MOD          (0x000001000)
+#define MPI2_SASIOUNIT8_PM_HOST_PORT_WIDTH_MOD          (0x00001000)
-#define MPI2_SASIOUNIT8_PM_HOST_SAS_SLUMBER_MODE        (0x000000800)
+#define MPI2_SASIOUNIT8_PM_HOST_SAS_SLUMBER_MODE        (0x00000800)
-#define MPI2_SASIOUNIT8_PM_HOST_SAS_PARTIAL_MODE        (0x000000400)
+#define MPI2_SASIOUNIT8_PM_HOST_SAS_PARTIAL_MODE        (0x00000400)
-#define MPI2_SASIOUNIT8_PM_HOST_SATA_SLUMBER_MODE       (0x000000200)
+#define MPI2_SASIOUNIT8_PM_HOST_SATA_SLUMBER_MODE       (0x00000200)
-#define MPI2_SASIOUNIT8_PM_HOST_SATA_PARTIAL_MODE       (0x000000100)
+#define MPI2_SASIOUNIT8_PM_HOST_SATA_PARTIAL_MODE       (0x00000100)
-#define MPI2_SASIOUNIT8_PM_IOUNIT_PORT_WIDTH_MOD        (0x000000010)
+#define MPI2_SASIOUNIT8_PM_IOUNIT_PORT_WIDTH_MOD        (0x00000010)
-#define MPI2_SASIOUNIT8_PM_IOUNIT_SAS_SLUMBER_MODE      (0x000000008)
+#define MPI2_SASIOUNIT8_PM_IOUNIT_SAS_SLUMBER_MODE      (0x00000008)
-#define MPI2_SASIOUNIT8_PM_IOUNIT_SAS_PARTIAL_MODE      (0x000000004)
+#define MPI2_SASIOUNIT8_PM_IOUNIT_SAS_PARTIAL_MODE      (0x00000004)
-#define MPI2_SASIOUNIT8_PM_IOUNIT_SATA_SLUMBER_MODE     (0x000000002)
+#define MPI2_SASIOUNIT8_PM_IOUNIT_SATA_SLUMBER_MODE     (0x00000002)
-#define MPI2_SASIOUNIT8_PM_IOUNIT_SATA_PARTIAL_MODE     (0x000000001)
+#define MPI2_SASIOUNIT8_PM_IOUNIT_SATA_PARTIAL_MODE     (0x00000001)
@@ -2266,6 +2388,7 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_DEV_0
 /* see mpi2_sas.h for values for SAS Device Page 0 DeviceInfo values */
 /* values for SAS Device Page 0 Flags field */
+#define MPI2_SAS_DEVICE0_FLAGS_UNAUTHORIZED_DEVICE          (0x8000)
 #define MPI2_SAS_DEVICE0_FLAGS_SLUMBER_PM_CAPABLE           (0x1000)
 #define MPI2_SAS_DEVICE0_FLAGS_PARTIAL_PM_CAPABLE           (0x0800)
 #define MPI2_SAS_DEVICE0_FLAGS_SATA_ASYNCHRONOUS_NOTIFY     (0x0400)
diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_ioc.h b/drivers/scsi/mpt2sas/mpi/mpi2_ioc.h
index 1f0c190d336e..93d9b6956d05 100644
--- a/drivers/scsi/mpt2sas/mpi/mpi2_ioc.h
+++ b/drivers/scsi/mpt2sas/mpi/mpi2_ioc.h
@@ -1,12 +1,12 @@
 /*
- *  Copyright (c) 2000-2010 LSI Corporation.
+ *  Copyright (c) 2000-2011 LSI Corporation.
 *
 *
 *           Name:  mpi2_ioc.h
 *          Title:  MPI IOC, Port, Event, FW Download, and FW Upload messages
 *  Creation Date:  October 11, 2006
 *
- *  mpi2_ioc.h Version:  02.00.16
+ *  mpi2_ioc.h Version:  02.00.17
 *
 *  Version History
 *  ---------------
@@ -104,6 +104,12 @@
 *  05-12-10  02.00.15  Marked Task Set Full Event as obsolete.
 *                      Added MPI2_EVENT_SAS_TOPO_LR_UNSUPPORTED_PHY define.
 *  11-10-10  02.00.16  Added MPI2_FW_DOWNLOAD_ITYPE_MIN_PRODUCT_SPECIFIC.
+ *  02-23-11  02.00.17  Added SAS NOTIFY Primitive event, and added
+ *                      SASNotifyPrimitiveMasks field to
+ *                      MPI2_EVENT_NOTIFICATION_REQUEST.
+ *                      Added Temperature Threshold Event.
+ *                      Added Host Message Event.
+ *                      Added Send Host Message request and reply.
 *  --------------------------------------------------------------------------
 */
@@ -421,7 +427,7 @@ typedef struct _MPI2_EVENT_NOTIFICATION_REQUEST
    U32                     Reserved6;                      /* 0x10 */
    U32                     EventMasks[MPI2_EVENT_NOTIFY_EVENTMASK_WORDS];/* 0x14 */
    U16                     SASBroadcastPrimitiveMasks;     /* 0x24 */
-    U16                     Reserved7;                      /* 0x26 */
+         U16                     SASNotifyPrimitiveMasks;        /* 0x26 */
    U32                     Reserved8;                      /* 0x28 */
 } MPI2_EVENT_NOTIFICATION_REQUEST,
  MPI2_POINTER PTR_MPI2_EVENT_NOTIFICATION_REQUEST,
@@ -476,6 +482,9 @@ typedef struct _MPI2_EVENT_NOTIFICATION_REPLY
 #define MPI2_EVENT_GPIO_INTERRUPT                   (0x0023)
 #define MPI2_EVENT_HOST_BASED_DISCOVERY_PHY         (0x0024)
 #define MPI2_EVENT_SAS_QUIESCE                      (0x0025)
+#define MPI2_EVENT_SAS_NOTIFY_PRIMITIVE             (0x0026)
+#define MPI2_EVENT_TEMP_THRESHOLD                   (0x0027)
+#define MPI2_EVENT_HOST_MESSAGE                     (0x0028)
 /* Log Entry Added Event data */
@@ -507,6 +516,39 @@ typedef struct _MPI2_EVENT_DATA_GPIO_INTERRUPT {
  MPI2_POINTER PTR_MPI2_EVENT_DATA_GPIO_INTERRUPT,
  Mpi2EventDataGpioInterrupt_t, MPI2_POINTER pMpi2EventDataGpioInterrupt_t;
+/* Temperature Threshold Event data */
+typedef struct _MPI2_EVENT_DATA_TEMPERATURE {
+        U16         Status;                             /* 0x00 */
+        U8          SensorNum;                          /* 0x02 */
+        U8          Reserved1;                          /* 0x03 */
+        U16         CurrentTemperature;                 /* 0x04 */
+        U16         Reserved2;                          /* 0x06 */
+        U32         Reserved3;                          /* 0x08 */
+        U32         Reserved4;                          /* 0x0C */
+} MPI2_EVENT_DATA_TEMPERATURE,
+MPI2_POINTER PTR_MPI2_EVENT_DATA_TEMPERATURE,
+Mpi2EventDataTemperature_t, MPI2_POINTER pMpi2EventDataTemperature_t;
+/* Temperature Threshold Event data Status bits */
+#define MPI2_EVENT_TEMPERATURE3_EXCEEDED            (0x0008)
+#define MPI2_EVENT_TEMPERATURE2_EXCEEDED            (0x0004)
+#define MPI2_EVENT_TEMPERATURE1_EXCEEDED            (0x0002)
+#define MPI2_EVENT_TEMPERATURE0_EXCEEDED            (0x0001)
+/* Host Message Event data */
+typedef struct _MPI2_EVENT_DATA_HOST_MESSAGE {
+        U8          SourceVF_ID;                        /* 0x00 */
+        U8          Reserved1;                          /* 0x01 */
+        U16         Reserved2;                          /* 0x02 */
+        U32         Reserved3;                          /* 0x04 */
+        U32         HostData[1];                        /* 0x08 */
+} MPI2_EVENT_DATA_HOST_MESSAGE, MPI2_POINTER PTR_MPI2_EVENT_DATA_HOST_MESSAGE,
+Mpi2EventDataHostMessage_t, MPI2_POINTER pMpi2EventDataHostMessage_t;
 /* Hard Reset Received Event data */
 typedef struct _MPI2_EVENT_DATA_HARD_RESET_RECEIVED
@@ -749,6 +791,24 @@ typedef struct _MPI2_EVENT_DATA_SAS_BROADCAST_PRIMITIVE
 #define MPI2_EVENT_PRIMITIVE_CHANGE0_RESERVED               (0x07)
 #define MPI2_EVENT_PRIMITIVE_CHANGE1_RESERVED               (0x08)
+/* SAS Notify Primitive Event data */
+typedef struct _MPI2_EVENT_DATA_SAS_NOTIFY_PRIMITIVE {
+        U8                      PhyNum;                     /* 0x00 */
+        U8                      Port;                       /* 0x01 */
+        U8                      Reserved1;                  /* 0x02 */
+        U8                      Primitive;                  /* 0x03 */
+} MPI2_EVENT_DATA_SAS_NOTIFY_PRIMITIVE,
+MPI2_POINTER PTR_MPI2_EVENT_DATA_SAS_NOTIFY_PRIMITIVE,
+Mpi2EventDataSasNotifyPrimitive_t,
+MPI2_POINTER pMpi2EventDataSasNotifyPrimitive_t;
+/* defines for the Primitive field */
+#define MPI2_EVENT_NOTIFY_ENABLE_SPINUP                     (0x01)
+#define MPI2_EVENT_NOTIFY_POWER_LOSS_EXPECTED               (0x02)
+#define MPI2_EVENT_NOTIFY_RESERVED1                         (0x03)
+#define MPI2_EVENT_NOTIFY_RESERVED2                         (0x04)
 /* SAS Initiator Device Status Change Event data */
@@ -1001,6 +1061,53 @@ typedef struct _MPI2_EVENT_ACK_REPLY
 /****************************************************************************
+*  SendHostMessage message
+****************************************************************************/
+/* SendHostMessage Request message */
+typedef struct _MPI2_SEND_HOST_MESSAGE_REQUEST {
+        U16                     HostDataLength;                 /* 0x00 */
+        U8                      ChainOffset;                    /* 0x02 */
+        U8                      Function;                       /* 0x03 */
+        U16                     Reserved1;                      /* 0x04 */
+        U8                      Reserved2;                      /* 0x06 */
+        U8                      MsgFlags;                       /* 0x07 */
+        U8                      VP_ID;                          /* 0x08 */
+        U8                      VF_ID;                          /* 0x09 */
+        U16                     Reserved3;                      /* 0x0A */
+        U8                      Reserved4;                      /* 0x0C */
+        U8                      DestVF_ID;                      /* 0x0D */
+        U16                     Reserved5;                      /* 0x0E */
+        U32                     Reserved6;                      /* 0x10 */
+        U32                     Reserved7;                      /* 0x14 */
+        U32                     Reserved8;                      /* 0x18 */
+        U32                     Reserved9;                      /* 0x1C */
+        U32                     Reserved10;                     /* 0x20 */
+        U32                     HostData[1];                    /* 0x24 */
+} MPI2_SEND_HOST_MESSAGE_REQUEST,
+MPI2_POINTER PTR_MPI2_SEND_HOST_MESSAGE_REQUEST,
+Mpi2SendHostMessageRequest_t, MPI2_POINTER pMpi2SendHostMessageRequest_t;
+/* SendHostMessage Reply message */
+typedef struct _MPI2_SEND_HOST_MESSAGE_REPLY {
+        U16                     HostDataLength;                 /* 0x00 */
+        U8                      MsgLength;                      /* 0x02 */
+        U8                      Function;                       /* 0x03 */
+        U16                     Reserved1;                      /* 0x04 */
+        U8                      Reserved2;                      /* 0x06 */
+        U8                      MsgFlags;                       /* 0x07 */
+        U8                      VP_ID;                          /* 0x08 */
+        U8                      VF_ID;                          /* 0x09 */
+        U16                     Reserved3;                      /* 0x0A */
+        U16                     Reserved4;                      /* 0x0C */
+        U16                     IOCStatus;                      /* 0x0E */
+        U32                     IOCLogInfo;                     /* 0x10 */
+} MPI2_SEND_HOST_MESSAGE_REPLY, MPI2_POINTER PTR_MPI2_SEND_HOST_MESSAGE_REPLY,
+Mpi2SendHostMessageReply_t, MPI2_POINTER pMpi2SendHostMessageReply_t;
+/****************************************************************************
 *  FWDownload message
 ****************************************************************************/
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index 81209ca87274..beda04a8404b 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -81,6 +81,15 @@ static int missing_delay[2] = {-1, -1};
 module_param_array(missing_delay, int, NULL, 0);
 MODULE_PARM_DESC(missing_delay, " device missing delay , io missing delay");
+static int mpt2sas_fwfault_debug;
+MODULE_PARM_DESC(mpt2sas_fwfault_debug, " enable detection of firmware fault "
+        "and halt firmware - (default=0)");
+static int disable_discovery = -1;
+module_param(disable_discovery, int, 0);
+MODULE_PARM_DESC(disable_discovery, " disable discovery ");
 /* diag_buffer_enable is bitwise
 * bit 0 set = TRACE
 * bit 1 set = SNAPSHOT
@@ -93,14 +102,6 @@ module_param(diag_buffer_enable, int, 0);
 MODULE_PARM_DESC(diag_buffer_enable, " post diag buffers "
    "(TRACE=1/SNAPSHOT=2/EXTENDED=4/default=0)");
-static int mpt2sas_fwfault_debug;
-MODULE_PARM_DESC(mpt2sas_fwfault_debug, " enable detection of firmware fault "
-    "and halt firmware - (default=0)");
-static int disable_discovery = -1;
-module_param(disable_discovery, int, 0);
-MODULE_PARM_DESC(disable_discovery, " disable discovery ");
 /**
 * _scsih_set_fwfault_debug - global setting of ioc->fwfault_debug.
 *
@@ -691,6 +692,7 @@ mpt2sas_base_done(struct MPT2SAS_ADAPTER *ioc, u16 smid, u8 msix_index,
                memcpy(ioc->base_cmds.reply, mpi_reply, mpi_reply->MsgLength*4);
        }
        ioc->base_cmds.status &= ~MPT2_CMD_PENDING;
        complete(&ioc->base_cmds.done);
        return 1;
 }
@@ -3470,6 +3472,58 @@ _base_send_ioc_init(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
 }
 /**
+ * mpt2sas_port_enable_done - command completion routine for port enable
+ * @ioc: per adapter object
+ * @smid: system request message index
+ * @msix_index: MSIX table index supplied by the OS
+ * @reply: reply message frame(lower 32bit addr)
+ *
+ * Return 1 meaning mf should be freed from _base_interrupt
+ *        0 means the mf is freed from this function.
+ */
+u8
+mpt2sas_port_enable_done(struct MPT2SAS_ADAPTER *ioc, u16 smid, u8 msix_index,
+        u32 reply)
+{
+        MPI2DefaultReply_t *mpi_reply;
+        u16 ioc_status;
+        mpi_reply = mpt2sas_base_get_reply_virt_addr(ioc, reply);
+        if (mpi_reply && mpi_reply->Function == MPI2_FUNCTION_EVENT_ACK)
+                return 1;
+        if (ioc->port_enable_cmds.status == MPT2_CMD_NOT_USED)
+                return 1;
+        ioc->port_enable_cmds.status |= MPT2_CMD_COMPLETE;
+        if (mpi_reply) {
+                ioc->port_enable_cmds.status |= MPT2_CMD_REPLY_VALID;
+                memcpy(ioc->port_enable_cmds.reply, mpi_reply,
+                    mpi_reply->MsgLength*4);
+        }
+        ioc->port_enable_cmds.status &= ~MPT2_CMD_PENDING;
+        ioc_status = le16_to_cpu(mpi_reply->IOCStatus) & MPI2_IOCSTATUS_MASK;
+        if (ioc_status != MPI2_IOCSTATUS_SUCCESS)
+                ioc->port_enable_failed = 1;
+        if (ioc->is_driver_loading) {
+                if (ioc_status == MPI2_IOCSTATUS_SUCCESS) {
+                        mpt2sas_port_enable_complete(ioc);
+                        return 1;
+                } else {
+                        ioc->start_scan_failed = ioc_status;
+                        ioc->start_scan = 0;
+                        return 1;
+                }
+        }
+        complete(&ioc->port_enable_cmds.done);
+        return 1;
+}
+/**
 * _base_send_port_enable - send port_enable(discovery stuff) to firmware
 * @ioc: per adapter object
 * @sleep_flag: CAN_SLEEP or NO_SLEEP
@@ -3480,67 +3534,151 @@ static int
 _base_send_port_enable(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
 {
        Mpi2PortEnableRequest_t *mpi_request;
-        u32 ioc_state;
+        Mpi2PortEnableReply_t *mpi_reply;
        unsigned long timeleft;
        int r = 0;
        u16 smid;
+        u16 ioc_status;
        printk(MPT2SAS_INFO_FMT "sending port enable !!\n", ioc->name);
-        if (ioc->base_cmds.status & MPT2_CMD_PENDING) {
+        if (ioc->port_enable_cmds.status & MPT2_CMD_PENDING) {
                printk(MPT2SAS_ERR_FMT "%s: internal command already in use\n",
                    ioc->name, __func__);
                return -EAGAIN;
        }
-        smid = mpt2sas_base_get_smid(ioc, ioc->base_cb_idx);
+        smid = mpt2sas_base_get_smid(ioc, ioc->port_enable_cb_idx);
        if (!smid) {
                printk(MPT2SAS_ERR_FMT "%s: failed obtaining a smid\n",
                    ioc->name, __func__);
                return -EAGAIN;
        }
-        ioc->base_cmds.status = MPT2_CMD_PENDING;
+        ioc->port_enable_cmds.status = MPT2_CMD_PENDING;
        mpi_request = mpt2sas_base_get_msg_frame(ioc, smid);
-        ioc->base_cmds.smid = smid;
+        ioc->port_enable_cmds.smid = smid;
        memset(mpi_request, 0, sizeof(Mpi2PortEnableRequest_t));
        mpi_request->Function = MPI2_FUNCTION_PORT_ENABLE;
-        mpi_request->VF_ID = 0; /* TODO */
-        mpi_request->VP_ID = 0;
+        init_completion(&ioc->port_enable_cmds.done);
        mpt2sas_base_put_smid_default(ioc, smid);
-        init_completion(&ioc->base_cmds.done);
+        timeleft = wait_for_completion_timeout(&ioc->port_enable_cmds.done,
-        timeleft = wait_for_completion_timeout(&ioc->base_cmds.done,
            300*HZ);
-        if (!(ioc->base_cmds.status & MPT2_CMD_COMPLETE)) {
+        if (!(ioc->port_enable_cmds.status & MPT2_CMD_COMPLETE)) {
                printk(MPT2SAS_ERR_FMT "%s: timeout\n",
                    ioc->name, __func__);
                _debug_dump_mf(mpi_request,
                    sizeof(Mpi2PortEnableRequest_t)/4);
-                if (ioc->base_cmds.status & MPT2_CMD_RESET)
+                if (ioc->port_enable_cmds.status & MPT2_CMD_RESET)
                        r = -EFAULT;
                else
                        r = -ETIME;
                goto out;
-        } else
+        }
-                dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: complete\n",
+        mpi_reply = ioc->port_enable_cmds.reply;
-                    ioc->name, __func__));
-        ioc_state = _base_wait_on_iocstate(ioc, MPI2_IOC_STATE_OPERATIONAL,
+        ioc_status = le16_to_cpu(mpi_reply->IOCStatus) & MPI2_IOCSTATUS_MASK;
-            60, sleep_flag);
+        if (ioc_status != MPI2_IOCSTATUS_SUCCESS) {
-        if (ioc_state) {
+                printk(MPT2SAS_ERR_FMT "%s: failed with (ioc_status=0x%08x)\n",
-                printk(MPT2SAS_ERR_FMT "%s: failed going to operational state "
+                    ioc->name, __func__, ioc_status);
-                    " (ioc_state=0x%x)\n", ioc->name, __func__, ioc_state);
                r = -EFAULT;
+                goto out;
        }
 out:
-        ioc->base_cmds.status = MPT2_CMD_NOT_USED;
+        ioc->port_enable_cmds.status = MPT2_CMD_NOT_USED;
-        printk(MPT2SAS_INFO_FMT "port enable: %s\n",
+        printk(MPT2SAS_INFO_FMT "port enable: %s\n", ioc->name, ((r == 0) ?
-            ioc->name, ((r == 0) ? "SUCCESS" : "FAILED"));
+            "SUCCESS" : "FAILED"));
        return r;
 }
 /**
+ * mpt2sas_port_enable - initiate firmware discovery (don't wait for reply)
+ * @ioc: per adapter object
+ *
+ * Returns 0 for success, non-zero for failure.
+ */
+int
+mpt2sas_port_enable(struct MPT2SAS_ADAPTER *ioc)
+{
+        Mpi2PortEnableRequest_t *mpi_request;
+        u16 smid;
+        printk(MPT2SAS_INFO_FMT "sending port enable !!\n", ioc->name);
+        if (ioc->port_enable_cmds.status & MPT2_CMD_PENDING) {
+                printk(MPT2SAS_ERR_FMT "%s: internal command already in use\n",
+                    ioc->name, __func__);
+                return -EAGAIN;
+        }
+        smid = mpt2sas_base_get_smid(ioc, ioc->port_enable_cb_idx);
+        if (!smid) {
+                printk(MPT2SAS_ERR_FMT "%s: failed obtaining a smid\n",
+                    ioc->name, __func__);
+                return -EAGAIN;
+        }
+        ioc->port_enable_cmds.status = MPT2_CMD_PENDING;
+        mpi_request = mpt2sas_base_get_msg_frame(ioc, smid);
+        ioc->port_enable_cmds.smid = smid;
+        memset(mpi_request, 0, sizeof(Mpi2PortEnableRequest_t));
+        mpi_request->Function = MPI2_FUNCTION_PORT_ENABLE;
+        mpt2sas_base_put_smid_default(ioc, smid);
+        return 0;
+}
+/**
+ * _base_determine_wait_on_discovery - desposition
+ * @ioc: per adapter object
+ *
+ * Decide whether to wait on discovery to complete. Used to either
+ * locate boot device, or report volumes ahead of physical devices.
+ *
+ * Returns 1 for wait, 0 for don't wait
+ */
+static int
+_base_determine_wait_on_discovery(struct MPT2SAS_ADAPTER *ioc)
+{
+        /* We wait for discovery to complete if IR firmware is loaded.
+         * The sas topology events arrive before PD events, so we need time to
+         * turn on the bit in ioc->pd_handles to indicate PD
+         * Also, it maybe required to report Volumes ahead of physical
+         * devices when MPI2_IOCPAGE8_IRFLAGS_LOW_VOLUME_MAPPING is set.
+         */
+        if (ioc->ir_firmware)
+                return 1;
+        /* if no Bios, then we don't need to wait */
+        if (!ioc->bios_pg3.BiosVersion)
+                return 0;
+        /* Bios is present, then we drop down here.
+         *
+         * If there any entries in the Bios Page 2, then we wait
+         * for discovery to complete.
+         */
+        /* Current Boot Device */
+        if ((ioc->bios_pg2.CurrentBootDeviceForm &
+            MPI2_BIOSPAGE2_FORM_MASK) ==
+            MPI2_BIOSPAGE2_FORM_NO_DEVICE_SPECIFIED &&
+        /* Request Boot Device */
+           (ioc->bios_pg2.ReqBootDeviceForm &
+            MPI2_BIOSPAGE2_FORM_MASK) ==
+            MPI2_BIOSPAGE2_FORM_NO_DEVICE_SPECIFIED &&
+        /* Alternate Request Boot Device */
+           (ioc->bios_pg2.ReqAltBootDeviceForm &
+            MPI2_BIOSPAGE2_FORM_MASK) ==
+            MPI2_BIOSPAGE2_FORM_NO_DEVICE_SPECIFIED)
+                return 0;
+        return 1;
+}
+/**
 * _base_unmask_events - turn on notification for this event
 * @ioc: per adapter object
 * @event: firmware event
@@ -3962,6 +4100,7 @@ _base_make_ioc_operational(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
 skip_init_reply_post_host_index:
        _base_unmask_interrupts(ioc);
        r = _base_event_notification(ioc, sleep_flag);
        if (r)
                return r;
@@ -3969,7 +4108,18 @@ _base_make_ioc_operational(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
        if (sleep_flag == CAN_SLEEP)
                _base_static_config_pages(ioc);
-        if (ioc->wait_for_port_enable_to_complete && ioc->is_warpdrive) {
+        if (ioc->is_driver_loading) {
+                ioc->wait_for_discovery_to_complete =
+                    _base_determine_wait_on_discovery(ioc);
+                return r; /* scan_start and scan_finished support */
+        }
+        if (ioc->wait_for_discovery_to_complete && ioc->is_warpdrive) {
                if (ioc->manu_pg10.OEMIdentifier  == 0x80) {
                        hide_flag = (u8) (ioc->manu_pg10.OEMSpecificFlags0 &
                            MFG_PAGE10_HIDE_SSDS_MASK);
@@ -3978,13 +4128,6 @@ _base_make_ioc_operational(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
                }
        }
-        if (ioc->wait_for_port_enable_to_complete) {
-                if (diag_buffer_enable != 0)
-                        mpt2sas_enable_diag_buffer(ioc, diag_buffer_enable);
-                if (disable_discovery > 0)
-                        return r;
-        }
        r = _base_send_port_enable(ioc, sleep_flag);
        if (r)
                return r;
@@ -4121,6 +4264,10 @@ mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc)
        ioc->base_cmds.reply = kzalloc(ioc->reply_sz, GFP_KERNEL);
        ioc->base_cmds.status = MPT2_CMD_NOT_USED;
+        /* port_enable command bits */
+        ioc->port_enable_cmds.reply = kzalloc(ioc->reply_sz, GFP_KERNEL);
+        ioc->port_enable_cmds.status = MPT2_CMD_NOT_USED;
        /* transport internal command bits */
        ioc->transport_cmds.reply = kzalloc(ioc->reply_sz, GFP_KERNEL);
        ioc->transport_cmds.status = MPT2_CMD_NOT_USED;
@@ -4162,8 +4309,6 @@ mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc)
                goto out_free_resources;
        }
-        init_completion(&ioc->shost_recovery_done);
        for (i = 0; i < MPI2_EVENT_NOTIFY_EVENTMASK_WORDS; i++)
                ioc->event_masks[i] = -1;
@@ -4186,7 +4331,6 @@ mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc)
                _base_update_missing_delay(ioc, missing_delay[0],
                    missing_delay[1]);
-        mpt2sas_base_start_watchdog(ioc);
        return 0;
 out_free_resources:
@@ -4204,6 +4348,7 @@ mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc)
        kfree(ioc->scsih_cmds.reply);
        kfree(ioc->config_cmds.reply);
        kfree(ioc->base_cmds.reply);
+        kfree(ioc->port_enable_cmds.reply);
        kfree(ioc->ctl_cmds.reply);
        kfree(ioc->ctl_cmds.sense);
        kfree(ioc->pfacts);
@@ -4243,6 +4388,7 @@ mpt2sas_base_detach(struct MPT2SAS_ADAPTER *ioc)
        kfree(ioc->ctl_cmds.reply);
        kfree(ioc->ctl_cmds.sense);
        kfree(ioc->base_cmds.reply);
+        kfree(ioc->port_enable_cmds.reply);
        kfree(ioc->tm_cmds.reply);
        kfree(ioc->transport_cmds.reply);
        kfree(ioc->scsih_cmds.reply);
@@ -4284,6 +4430,20 @@ _base_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase)
                        mpt2sas_base_free_smid(ioc, ioc->base_cmds.smid);
                        complete(&ioc->base_cmds.done);
                }
+                if (ioc->port_enable_cmds.status & MPT2_CMD_PENDING) {
+                        ioc->port_enable_failed = 1;
+                        ioc->port_enable_cmds.status |= MPT2_CMD_RESET;
+                        mpt2sas_base_free_smid(ioc, ioc->port_enable_cmds.smid);
+                        if (ioc->is_driver_loading) {
+                                ioc->start_scan_failed =
+                                    MPI2_IOCSTATUS_INTERNAL_ERROR;
+                                ioc->start_scan = 0;
+                                ioc->port_enable_cmds.status =
+                                                MPT2_CMD_NOT_USED;
+                        } else
+                                complete(&ioc->port_enable_cmds.done);
+                }
                if (ioc->config_cmds.status & MPT2_CMD_PENDING) {
                        ioc->config_cmds.status |= MPT2_CMD_RESET;
                        mpt2sas_base_free_smid(ioc, ioc->config_cmds.smid);
@@ -4349,7 +4509,6 @@ mpt2sas_base_hard_reset_handler(struct MPT2SAS_ADAPTER *ioc, int sleep_flag,
 {
        int r;
        unsigned long flags;
-        u8 pe_complete = ioc->wait_for_port_enable_to_complete;
        dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: enter\n", ioc->name,
            __func__));
@@ -4396,7 +4555,8 @@ mpt2sas_base_hard_reset_handler(struct MPT2SAS_ADAPTER *ioc, int sleep_flag,
        /* If this hard reset is called while port enable is active, then
         * there is no reason to call make_ioc_operational
         */
-        if (pe_complete) {
+        if (ioc->is_driver_loading && ioc->port_enable_failed) {
+                ioc->remove_host = 1;
                r = -EFAULT;
                goto out;
        }
@@ -4410,7 +4570,6 @@ mpt2sas_base_hard_reset_handler(struct MPT2SAS_ADAPTER *ioc, int sleep_flag,
        spin_lock_irqsave(&ioc->ioc_reset_in_progress_lock, flags);
        ioc->ioc_reset_in_progress_status = r;
        ioc->shost_recovery = 0;
-        complete(&ioc->shost_recovery_done);
        spin_unlock_irqrestore(&ioc->ioc_reset_in_progress_lock, flags);
        mutex_unlock(&ioc->reset_in_progress_mutex);
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h b/drivers/scsi/mpt2sas/mpt2sas_base.h
index 59354dba68c0..3c3babc7d260 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.h
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.h
@@ -69,11 +69,11 @@
 #define MPT2SAS_DRIVER_NAME             "mpt2sas"
 #define MPT2SAS_AUTHOR  "LSI Corporation <DL-MPTFusionLinux@lsi.com>"
 #define MPT2SAS_DESCRIPTION     "LSI MPT Fusion SAS 2.0 Device Driver"
-#define MPT2SAS_DRIVER_VERSION          "09.100.00.01"
+#define MPT2SAS_DRIVER_VERSION          "10.100.00.00"
-#define MPT2SAS_MAJOR_VERSION           09
+#define MPT2SAS_MAJOR_VERSION           10
 #define MPT2SAS_MINOR_VERSION           100
 #define MPT2SAS_BUILD_VERSION           00
-#define MPT2SAS_RELEASE_VERSION         01
+#define MPT2SAS_RELEASE_VERSION         00
 /*
 * Set MPT2SAS_SG_DEPTH value based on user input.
@@ -655,7 +655,12 @@ enum mutex_type {
 * @ignore_loginfos: ignore loginfos during task management
 * @remove_host: flag for when driver unloads, to avoid sending dev resets
 * @pci_error_recovery: flag to prevent ioc access until slot reset completes
- * @wait_for_port_enable_to_complete:
+ * @wait_for_discovery_to_complete: flag set at driver load time when
+ *                                               waiting on reporting devices
+ * @is_driver_loading: flag set at driver load time
+ * @port_enable_failed: flag set when port enable has failed
+ * @start_scan: flag set from scan_start callback, cleared from _mpt2sas_fw_work
+ * @start_scan_failed: means port enable failed, return's the ioc_status
 * @msix_enable: flag indicating msix is enabled
 * @msix_vector_count: number msix vectors
 * @cpu_msix_table: table for mapping cpus to msix index
@@ -790,15 +795,20 @@ struct MPT2SAS_ADAPTER {
        u8              shost_recovery;
        struct mutex    reset_in_progress_mutex;
-        struct completion       shost_recovery_done;
        spinlock_t      ioc_reset_in_progress_lock;
        u8              ioc_link_reset_in_progress;
-        int             ioc_reset_in_progress_status;
+        u8              ioc_reset_in_progress_status;
        u8              ignore_loginfos;
        u8              remove_host;
        u8              pci_error_recovery;
-        u8              wait_for_port_enable_to_complete;
+        u8              wait_for_discovery_to_complete;
+        struct completion       port_enable_done;
+        u8              is_driver_loading;
+        u8              port_enable_failed;
+        u8              start_scan;
+        u16             start_scan_failed;
        u8              msix_enable;
        u16             msix_vector_count;
@@ -814,11 +824,13 @@ struct MPT2SAS_ADAPTER {
        u8              scsih_cb_idx;
        u8              ctl_cb_idx;
        u8              base_cb_idx;
+        u8              port_enable_cb_idx;
        u8              config_cb_idx;
        u8              tm_tr_cb_idx;
        u8              tm_tr_volume_cb_idx;
        u8              tm_sas_control_cb_idx;
        struct _internal_cmd base_cmds;
+        struct _internal_cmd port_enable_cmds;
        struct _internal_cmd transport_cmds;
        struct _internal_cmd scsih_cmds;
        struct _internal_cmd tm_cmds;
@@ -1001,6 +1013,8 @@ void mpt2sas_base_release_callback_handler(u8 cb_idx);
 u8 mpt2sas_base_done(struct MPT2SAS_ADAPTER *ioc, u16 smid, u8 msix_index,
    u32 reply);
+u8 mpt2sas_port_enable_done(struct MPT2SAS_ADAPTER *ioc, u16 smid,
+        u8 msix_index,  u32 reply);
 void *mpt2sas_base_get_reply_virt_addr(struct MPT2SAS_ADAPTER *ioc, u32 phys_addr);
 u32 mpt2sas_base_get_iocstate(struct MPT2SAS_ADAPTER *ioc, int cooked);
@@ -1015,6 +1029,8 @@ void mpt2sas_base_validate_event_type(struct MPT2SAS_ADAPTER *ioc, u32 *event_ty
 void mpt2sas_halt_firmware(struct MPT2SAS_ADAPTER *ioc);
+int mpt2sas_port_enable(struct MPT2SAS_ADAPTER *ioc);
 /* scsih shared API */
 u8 mpt2sas_scsih_event_callback(struct MPT2SAS_ADAPTER *ioc, u8 msix_index,
    u32 reply);
@@ -1032,6 +1048,8 @@ struct _sas_node *mpt2sas_scsih_expander_find_by_sas_address(struct MPT2SAS_ADAP
 struct _sas_device *mpt2sas_scsih_sas_device_find_by_sas_address(
    struct MPT2SAS_ADAPTER *ioc, u64 sas_address);
+void mpt2sas_port_enable_complete(struct MPT2SAS_ADAPTER *ioc);
 void mpt2sas_scsih_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase);
 /* config shared API */
diff --git a/drivers/scsi/mpt2sas/mpt2sas_config.c b/drivers/scsi/mpt2sas/mpt2sas_config.c
index 2b1101076cfe..36ea0b2d8020 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_config.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_config.c
@@ -1356,6 +1356,9 @@ mpt2sas_config_get_volume_handle(struct MPT2SAS_ADAPTER *ioc, u16 pd_handle,
        Mpi2ConfigReply_t mpi_reply;
        int r, i, config_page_sz;
        u16 ioc_status;
+        int config_num;
+        u16 element_type;
+        u16 phys_disk_dev_handle;
        *volume_handle = 0;
        memset(&mpi_request, 0, sizeof(Mpi2ConfigRequest_t));
@@ -1371,35 +1374,53 @@ mpt2sas_config_get_volume_handle(struct MPT2SAS_ADAPTER *ioc, u16 pd_handle,
        if (r)
                goto out;
-        mpi_request.PageAddress =
-            cpu_to_le32(MPI2_RAID_PGAD_FORM_ACTIVE_CONFIG);
        mpi_request.Action = MPI2_CONFIG_ACTION_PAGE_READ_CURRENT;
        config_page_sz = (le16_to_cpu(mpi_reply.ExtPageLength) * 4);
        config_page = kmalloc(config_page_sz, GFP_KERNEL);
-        if (!config_page)
+        if (!config_page) {
-                goto out;
+                r = -1;
-        r = _config_request(ioc, &mpi_request, &mpi_reply,
-            MPT2_CONFIG_PAGE_DEFAULT_TIMEOUT, config_page,
-            config_page_sz);
-        if (r)
                goto out;
+        }
-        r = -1;
+        config_num = 0xff;
-        ioc_status = le16_to_cpu(mpi_reply.IOCStatus) & MPI2_IOCSTATUS_MASK;
+        while (1) {
-        if (ioc_status != MPI2_IOCSTATUS_SUCCESS)
+                mpi_request.PageAddress = cpu_to_le32(config_num +
-                goto out;
+                    MPI2_RAID_PGAD_FORM_GET_NEXT_CONFIGNUM);
-        for (i = 0; i < config_page->NumElements; i++) {
+                r = _config_request(ioc, &mpi_request, &mpi_reply,
-                if ((le16_to_cpu(config_page->ConfigElement[i].ElementFlags) &
+                    MPT2_CONFIG_PAGE_DEFAULT_TIMEOUT, config_page,
-                    MPI2_RAIDCONFIG0_EFLAGS_MASK_ELEMENT_TYPE) !=
+                    config_page_sz);
-                    MPI2_RAIDCONFIG0_EFLAGS_VOL_PHYS_DISK_ELEMENT)
+                if (r)
-                        continue;
+                        goto out;
-                if (le16_to_cpu(config_page->ConfigElement[i].
+                r = -1;
-                    PhysDiskDevHandle) == pd_handle) {
+                ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &
-                        *volume_handle = le16_to_cpu(config_page->
+                    MPI2_IOCSTATUS_MASK;
-                            ConfigElement[i].VolDevHandle);
+                if (ioc_status != MPI2_IOCSTATUS_SUCCESS)
-                        r = 0;
                        goto out;
+                for (i = 0; i < config_page->NumElements; i++) {
+                        element_type = le16_to_cpu(config_page->
+                            ConfigElement[i].ElementFlags) &
+                            MPI2_RAIDCONFIG0_EFLAGS_MASK_ELEMENT_TYPE;
+                        if (element_type ==
+                            MPI2_RAIDCONFIG0_EFLAGS_VOL_PHYS_DISK_ELEMENT ||
+                            element_type ==
+                            MPI2_RAIDCONFIG0_EFLAGS_OCE_ELEMENT) {
+                                phys_disk_dev_handle =
+                                    le16_to_cpu(config_page->ConfigElement[i].
+                                    PhysDiskDevHandle);
+                                if (phys_disk_dev_handle == pd_handle) {
+                                        *volume_handle =
+                                            le16_to_cpu(config_page->
+                                            ConfigElement[i].VolDevHandle);
+                                        r = 0;
+                                        goto out;
+                                }
+                        } else if (element_type ==
+                            MPI2_RAIDCONFIG0_EFLAGS_HOT_SPARE_ELEMENT) {
+                                *volume_handle = 0;
+                                r = 0;
+                                goto out;
+                        }
                }
+                config_num = config_page->ConfigNum;
        }
 out:
        kfree(config_page);
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
index 9adb0133d6fb..aabcb911706e 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
@@ -1207,6 +1207,9 @@ _ctl_do_reset(void __user *arg)
        if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc)
                return -ENODEV;
+        if (ioc->shost_recovery || ioc->pci_error_recovery ||
+                ioc->is_driver_loading)
+                return -EAGAIN;
        dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: enter\n", ioc->name,
            __func__));
@@ -2178,7 +2181,8 @@ _ctl_ioctl_main(struct file *file, unsigned int cmd, void __user *arg)
                    !ioc)
                        return -ENODEV;
-                if (ioc->shost_recovery || ioc->pci_error_recovery)
+                if (ioc->shost_recovery || ioc->pci_error_recovery ||
+                                ioc->is_driver_loading)
                        return -EAGAIN;
                if (_IOC_SIZE(cmd) == sizeof(struct mpt2_ioctl_command)) {
@@ -2297,7 +2301,8 @@ _ctl_compat_mpt_command(struct file *file, unsigned cmd, unsigned long arg)
        if (_ctl_verify_adapter(karg32.hdr.ioc_number, &ioc) == -1 || !ioc)
                return -ENODEV;
-        if (ioc->shost_recovery || ioc->pci_error_recovery)
+        if (ioc->shost_recovery || ioc->pci_error_recovery ||
+                        ioc->is_driver_loading)
                return -EAGAIN;
        memset(&karg, 0, sizeof(struct mpt2_ioctl_command));
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index 1da1aa1a11e2..8889b1babcac 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -71,6 +71,9 @@ static void _firmware_event_work(struct work_struct *work);
 static u8 _scsih_check_for_pending_tm(struct MPT2SAS_ADAPTER *ioc, u16 smid);
+static void _scsih_scan_start(struct Scsi_Host *shost);
+static int _scsih_scan_finished(struct Scsi_Host *shost, unsigned long time);
 /* global parameters */
 LIST_HEAD(mpt2sas_ioc_list);
@@ -79,6 +82,7 @@ static u8 scsi_io_cb_idx = -1;
 static u8 tm_cb_idx = -1;
 static u8 ctl_cb_idx = -1;
 static u8 base_cb_idx = -1;
+static u8 port_enable_cb_idx = -1;
 static u8 transport_cb_idx = -1;
 static u8 scsih_cb_idx = -1;
 static u8 config_cb_idx = -1;
@@ -103,6 +107,18 @@ static int max_lun = MPT2SAS_MAX_LUN;
 module_param(max_lun, int, 0);
 MODULE_PARM_DESC(max_lun, " max lun, default=16895 ");
+/* diag_buffer_enable is bitwise
+ * bit 0 set = TRACE
+ * bit 1 set = SNAPSHOT
+ * bit 2 set = EXTENDED
+ *
+ * Either bit can be set, or both
+ */
+static int diag_buffer_enable = -1;
+module_param(diag_buffer_enable, int, 0);
+MODULE_PARM_DESC(diag_buffer_enable, " post diag buffers "
+        "(TRACE=1/SNAPSHOT=2/EXTENDED=4/default=0)");
 /**
 * struct sense_info - common structure for obtaining sense keys
 * @skey: sense key
@@ -117,8 +133,8 @@ struct sense_info {
 #define MPT2SAS_TURN_ON_FAULT_LED (0xFFFC)
-#define MPT2SAS_RESCAN_AFTER_HOST_RESET (0xFFFF)
+#define MPT2SAS_PORT_ENABLE_COMPLETE (0xFFFD)
+#define MPT2SAS_REMOVE_UNRESPONDING_DEVICES (0xFFFF)
 /**
 * struct fw_event_work - firmware event struct
 * @list: link list framework
@@ -372,31 +388,34 @@ _scsih_get_sas_address(struct MPT2SAS_ADAPTER *ioc, u16 handle,
        Mpi2SasDevicePage0_t sas_device_pg0;
        Mpi2ConfigReply_t mpi_reply;
        u32 ioc_status;
+        *sas_address = 0;
        if (handle <= ioc->sas_hba.num_phys) {
                *sas_address = ioc->sas_hba.sas_address;
                return 0;
-        } else
+        }
-                *sas_address = 0;
        if ((mpt2sas_config_get_sas_device_pg0(ioc, &mpi_reply, &sas_device_pg0,
            MPI2_SAS_DEVICE_PGAD_FORM_HANDLE, handle))) {
-                printk(MPT2SAS_ERR_FMT "failure at %s:%d/%s()!\n",
+                printk(MPT2SAS_ERR_FMT "failure at %s:%d/%s()!\n", ioc->name,
-                    ioc->name, __FILE__, __LINE__, __func__);
+                __FILE__, __LINE__, __func__);
                return -ENXIO;
        }
-        ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &
+        ioc_status = le16_to_cpu(mpi_reply.IOCStatus) & MPI2_IOCSTATUS_MASK;
-            MPI2_IOCSTATUS_MASK;
+        if (ioc_status == MPI2_IOCSTATUS_SUCCESS) {
-        if (ioc_status != MPI2_IOCSTATUS_SUCCESS) {
+                *sas_address = le64_to_cpu(sas_device_pg0.SASAddress);
-                printk(MPT2SAS_ERR_FMT "handle(0x%04x), ioc_status(0x%04x)"
+                return 0;
-                    "\nfailure at %s:%d/%s()!\n", ioc->name, handle, ioc_status,
-                     __FILE__, __LINE__, __func__);
-                return -EIO;
        }
-        *sas_address = le64_to_cpu(sas_device_pg0.SASAddress);
+        /* we hit this becuase the given parent handle doesn't exist */
-        return 0;
+        if (ioc_status == MPI2_IOCSTATUS_CONFIG_INVALID_PAGE)
+                return -ENXIO;
+        /* else error case */
+        printk(MPT2SAS_ERR_FMT "handle(0x%04x), ioc_status(0x%04x), "
+            "failure at %s:%d/%s()!\n", ioc->name, handle, ioc_status,
+             __FILE__, __LINE__, __func__);
+        return -EIO;
 }
 /**
@@ -424,7 +443,11 @@ _scsih_determine_boot_device(struct MPT2SAS_ADAPTER *ioc,
        u16 slot;
         /* only process this function when driver loads */
-        if (!ioc->wait_for_port_enable_to_complete)
+        if (!ioc->is_driver_loading)
+                return;
+         /* no Bios, return immediately */
+        if (!ioc->bios_pg3.BiosVersion)
                return;
        if (!is_raid) {
@@ -587,8 +610,15 @@ _scsih_sas_device_add(struct MPT2SAS_ADAPTER *ioc,
        spin_unlock_irqrestore(&ioc->sas_device_lock, flags);
        if (!mpt2sas_transport_port_add(ioc, sas_device->handle,
-             sas_device->sas_address_parent))
+             sas_device->sas_address_parent)) {
                _scsih_sas_device_remove(ioc, sas_device);
+                } else if (!sas_device->starget) {
+                        if (!ioc->is_driver_loading)
+                                mpt2sas_transport_port_remove(ioc,
+                                sas_device->sas_address,
+                            sas_device->sas_address_parent);
+                        _scsih_sas_device_remove(ioc, sas_device);
+                }
 }
 /**
@@ -1400,6 +1430,10 @@ _scsih_slave_destroy(struct scsi_device *sdev)
 {
        struct MPT2SAS_TARGET *sas_target_priv_data;
        struct scsi_target *starget;
+        struct Scsi_Host *shost;
+        struct MPT2SAS_ADAPTER *ioc;
+        struct _sas_device *sas_device;
+        unsigned long flags;
        if (!sdev->hostdata)
                return;
@@ -1407,6 +1441,19 @@ _scsih_slave_destroy(struct scsi_device *sdev)
        starget = scsi_target(sdev);
        sas_target_priv_data = starget->hostdata;
        sas_target_priv_data->num_luns--;
+        shost = dev_to_shost(&starget->dev);
+        ioc = shost_priv(shost);
+        if (!(sas_target_priv_data->flags & MPT_TARGET_FLAGS_VOLUME)) {
+                spin_lock_irqsave(&ioc->sas_device_lock, flags);
+                sas_device = mpt2sas_scsih_sas_device_find_by_sas_address(ioc,
+                   sas_target_priv_data->sas_address);
+                if (sas_device)
+                        sas_device->starget = NULL;
+                spin_unlock_irqrestore(&ioc->sas_device_lock, flags);
+        }
        kfree(sdev->hostdata);
        sdev->hostdata = NULL;
 }
@@ -1598,8 +1645,10 @@ _scsih_set_level(struct scsi_device *sdev, struct _raid_device *raid_device)
 * _scsih_get_volume_capabilities - volume capabilities
 * @ioc: per adapter object
 * @sas_device: the raid_device object
+ *
+ * Returns 0 for success, else 1
 */
-static void
+static int
 _scsih_get_volume_capabilities(struct MPT2SAS_ADAPTER *ioc,
    struct _raid_device *raid_device)
 {
@@ -1612,9 +1661,10 @@ _scsih_get_volume_capabilities(struct MPT2SAS_ADAPTER *ioc,
        if ((mpt2sas_config_get_number_pds(ioc, raid_device->handle,
            &num_pds)) || !num_pds) {
-                printk(MPT2SAS_ERR_FMT "failure at %s:%d/%s()!\n",
+                dfailprintk(ioc, printk(MPT2SAS_WARN_FMT
-                    ioc->name, __FILE__, __LINE__, __func__);
+                    "failure at %s:%d/%s()!\n", ioc->name, __FILE__, __LINE__,
-                return;
+                    __func__));
+                return 1;
        }
        raid_device->num_pds = num_pds;
@@ -1622,17 +1672,19 @@ _scsih_get_volume_capabilities(struct MPT2SAS_ADAPTER *ioc,
            sizeof(Mpi2RaidVol0PhysDisk_t));
        vol_pg0 = kzalloc(sz, GFP_KERNEL);
        if (!vol_pg0) {
-                printk(MPT2SAS_ERR_FMT "failure at %s:%d/%s()!\n",
+                dfailprintk(ioc, printk(MPT2SAS_WARN_FMT
-                    ioc->name, __FILE__, __LINE__, __func__);
+                    "failure at %s:%d/%s()!\n", ioc->name, __FILE__, __LINE__,
-                return;
+                    __func__));
+                return 1;
        }
        if ((mpt2sas_config_get_raid_volume_pg0(ioc, &mpi_reply, vol_pg0,
             MPI2_RAID_VOLUME_PGAD_FORM_HANDLE, raid_device->handle, sz))) {
-                printk(MPT2SAS_ERR_FMT "failure at %s:%d/%s()!\n",
+                dfailprintk(ioc, printk(MPT2SAS_WARN_FMT
-                    ioc->name, __FILE__, __LINE__, __func__);
+                    "failure at %s:%d/%s()!\n", ioc->name, __FILE__, __LINE__,
+                    __func__));
                kfree(vol_pg0);
-                return;
+                return 1;
        }
        raid_device->volume_type = vol_pg0->VolumeType;
@@ -1652,6 +1704,7 @@ _scsih_get_volume_capabilities(struct MPT2SAS_ADAPTER *ioc,
        }
        kfree(vol_pg0);
+        return 0;
 }
 /**
 * _scsih_disable_ddio - Disable direct I/O for all the volumes
@@ -1922,13 +1975,20 @@ _scsih_slave_configure(struct scsi_device *sdev)
                     sas_target_priv_data->handle);
                spin_unlock_irqrestore(&ioc->raid_device_lock, flags);
                if (!raid_device) {
-                        printk(MPT2SAS_ERR_FMT "failure at %s:%d/%s()!\n",
+                        dfailprintk(ioc, printk(MPT2SAS_WARN_FMT
-                            ioc->name, __FILE__, __LINE__, __func__);
+                            "failure at %s:%d/%s()!\n", ioc->name, __FILE__,
-                        return 0;
+                            __LINE__, __func__));
+                        return 1;
                }
                _scsih_get_volume_capabilities(ioc, raid_device);
+                if (_scsih_get_volume_capabilities(ioc, raid_device)) {
+                        dfailprintk(ioc, printk(MPT2SAS_WARN_FMT
+                            "failure at %s:%d/%s()!\n", ioc->name, __FILE__,
+                            __LINE__, __func__));
+                        return 1;
+                }
                /*
                 * WARPDRIVE: Initialize the required data for Direct IO
                 */
@@ -2002,11 +2062,22 @@ _scsih_slave_configure(struct scsi_device *sdev)
        if (sas_device) {
                if (sas_target_priv_data->flags &
                    MPT_TARGET_FLAGS_RAID_COMPONENT) {
-                        mpt2sas_config_get_volume_handle(ioc,
+                        if (mpt2sas_config_get_volume_handle(ioc,
-                            sas_device->handle, &sas_device->volume_handle);
+                            sas_device->handle, &sas_device->volume_handle)) {
-                        mpt2sas_config_get_volume_wwid(ioc,
+                                dfailprintk(ioc, printk(MPT2SAS_WARN_FMT
+                                    "failure at %s:%d/%s()!\n", ioc->name,
+                                    __FILE__, __LINE__, __func__));
+                                return 1;
+                        }
+                        if (sas_device->volume_handle &&
+                            mpt2sas_config_get_volume_wwid(ioc,
                            sas_device->volume_handle,
-                            &sas_device->volume_wwid);
+                            &sas_device->volume_wwid)) {
+                                dfailprintk(ioc, printk(MPT2SAS_WARN_FMT
+                                    "failure at %s:%d/%s()!\n", ioc->name,
+                                    __FILE__, __LINE__, __func__));
+                                return 1;
+                        }
                }
                if (sas_device->device_info & MPI2_SAS_DEVICE_INFO_SSP_TARGET) {
                        qdepth = MPT2SAS_SAS_QUEUE_DEPTH;
@@ -2035,6 +2106,11 @@ _scsih_slave_configure(struct scsi_device *sdev)
                if (!ssp_target)
                        _scsih_display_sata_capabilities(ioc, sas_device, sdev);
+        } else {
+                dfailprintk(ioc, printk(MPT2SAS_WARN_FMT
+                    "failure at %s:%d/%s()!\n", ioc->name, __FILE__, __LINE__,
+                    __func__));
+                return 1;
        }
        _scsih_change_queue_depth(sdev, qdepth, SCSI_QDEPTH_DEFAULT);
@@ -2714,22 +2790,38 @@ _scsih_fw_event_free(struct MPT2SAS_ADAPTER *ioc, struct fw_event_work
 /**
- * _scsih_queue_rescan - queue a topology rescan from user context
+ * _scsih_error_recovery_delete_devices - remove devices not responding
 * @ioc: per adapter object
 *
 * Return nothing.
 */
 static void
-_scsih_queue_rescan(struct MPT2SAS_ADAPTER *ioc)
+_scsih_error_recovery_delete_devices(struct MPT2SAS_ADAPTER *ioc)
 {
        struct fw_event_work *fw_event;
-        if (ioc->wait_for_port_enable_to_complete)
+        if (ioc->is_driver_loading)
                return;
+        fw_event->event = MPT2SAS_REMOVE_UNRESPONDING_DEVICES;
+        fw_event->ioc = ioc;
+        _scsih_fw_event_add(ioc, fw_event);
+}
+/**
+ * mpt2sas_port_enable_complete - port enable completed (fake event)
+ * @ioc: per adapter object
+ *
+ * Return nothing.
+ */
+void
+mpt2sas_port_enable_complete(struct MPT2SAS_ADAPTER *ioc)
+{
+        struct fw_event_work *fw_event;
        fw_event = kzalloc(sizeof(struct fw_event_work), GFP_ATOMIC);
        if (!fw_event)
                return;
-        fw_event->event = MPT2SAS_RESCAN_AFTER_HOST_RESET;
+        fw_event->event = MPT2SAS_PORT_ENABLE_COMPLETE;
        fw_event->ioc = ioc;
        _scsih_fw_event_add(ioc, fw_event);
 }
@@ -2977,14 +3069,27 @@ _scsih_tm_tr_send(struct MPT2SAS_ADAPTER *ioc, u16 handle)
        Mpi2SCSITaskManagementRequest_t *mpi_request;
        u16 smid;
        struct _sas_device *sas_device;
-        struct MPT2SAS_TARGET *sas_target_priv_data;
+        struct MPT2SAS_TARGET *sas_target_priv_data = NULL;
+        u64 sas_address = 0;
        unsigned long flags;
        struct _tr_list *delayed_tr;
+        u32 ioc_state;
-        if (ioc->shost_recovery || ioc->remove_host ||
+        if (ioc->remove_host) {
-            ioc->pci_error_recovery) {
+                dewtprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: host has been "
-                dewtprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: host reset in "
+                    "removed: handle(0x%04x)\n", __func__, ioc->name, handle));
-                   "progress!\n", __func__, ioc->name));
+                return;
+        } else if (ioc->pci_error_recovery) {
+                dewtprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: host in pci "
+                    "error recovery: handle(0x%04x)\n", __func__, ioc->name,
+                    handle));
+                return;
+        }
+        ioc_state = mpt2sas_base_get_iocstate(ioc, 1);
+        if (ioc_state != MPI2_IOC_STATE_OPERATIONAL) {
+                dewtprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: host is not "
+                   "operational: handle(0x%04x)\n", __func__, ioc->name,
+                   handle));
                return;
        }
@@ -2998,13 +3103,18 @@ _scsih_tm_tr_send(struct MPT2SAS_ADAPTER *ioc, u16 handle)
             sas_device->starget->hostdata) {
                sas_target_priv_data = sas_device->starget->hostdata;
                sas_target_priv_data->deleted = 1;
-                dewtprintk(ioc, printk(MPT2SAS_INFO_FMT
+                sas_address = sas_device->sas_address;
-                    "setting delete flag: handle(0x%04x), "
-                    "sas_addr(0x%016llx)\n", ioc->name, handle,
-                    (unsigned long long) sas_device->sas_address));
        }
        spin_unlock_irqrestore(&ioc->sas_device_lock, flags);
+        if (sas_target_priv_data) {
+                dewtprintk(ioc, printk(MPT2SAS_INFO_FMT "setting delete flag: "
+                "handle(0x%04x), sas_addr(0x%016llx)\n", ioc->name, handle,
+                        (unsigned long long)sas_address));
+                _scsih_ublock_io_device(ioc, handle);
+                sas_target_priv_data->handle = MPT2SAS_INVALID_DEVICE_HANDLE;
+        }
        smid = mpt2sas_base_get_smid_hpr(ioc, ioc->tm_tr_cb_idx);
        if (!smid) {
                delayed_tr = kzalloc(sizeof(*delayed_tr), GFP_ATOMIC);
@@ -3185,11 +3295,21 @@ _scsih_tm_tr_complete(struct MPT2SAS_ADAPTER *ioc, u16 smid, u8 msix_index,
            mpt2sas_base_get_reply_virt_addr(ioc, reply);
        Mpi2SasIoUnitControlRequest_t *mpi_request;
        u16 smid_sas_ctrl;
+        u32 ioc_state;
-        if (ioc->shost_recovery || ioc->remove_host ||
+        if (ioc->remove_host) {
-            ioc->pci_error_recovery) {
+                dewtprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: host has been "
-                dewtprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: host reset in "
+                   "removed\n", __func__, ioc->name));
-                   "progress!\n", __func__, ioc->name));
+                return 1;
+        } else if (ioc->pci_error_recovery) {
+                dewtprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: host in pci "
+                    "error recovery\n", __func__, ioc->name));
+                return 1;
+        }
+        ioc_state = mpt2sas_base_get_iocstate(ioc, 1);
+        if (ioc_state != MPI2_IOC_STATE_OPERATIONAL) {
+                dewtprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: host is not "
+                    "operational\n", __func__, ioc->name));
                return 1;
        }
@@ -5099,7 +5219,7 @@ _scsih_add_device(struct MPT2SAS_ADAPTER *ioc, u16 handle, u8 phy_num, u8 is_pd)
        /* get device name */
        sas_device->device_name = le64_to_cpu(sas_device_pg0.DeviceName);
-        if (ioc->wait_for_port_enable_to_complete)
+        if (ioc->wait_for_discovery_to_complete)
                _scsih_sas_device_init_add(ioc, sas_device);
        else
                _scsih_sas_device_add(ioc, sas_device);
@@ -5135,6 +5255,9 @@ _scsih_remove_device(struct MPT2SAS_ADAPTER *ioc,
        if (sas_device_backup.starget && sas_device_backup.starget->hostdata) {
                sas_target_priv_data = sas_device_backup.starget->hostdata;
                sas_target_priv_data->deleted = 1;
+                _scsih_ublock_io_device(ioc, sas_device_backup.handle);
+                sas_target_priv_data->handle =
+                     MPT2SAS_INVALID_DEVICE_HANDLE;
        }
        _scsih_ublock_io_device(ioc, sas_device_backup.handle);
@@ -5288,7 +5411,7 @@ _scsih_sas_topology_change_event(struct MPT2SAS_ADAPTER *ioc,
                _scsih_sas_topology_change_event_debug(ioc, event_data);
 #endif
-        if (ioc->shost_recovery || ioc->remove_host || ioc->pci_error_recovery)
+        if (ioc->remove_host || ioc->pci_error_recovery)
                return;
        if (!ioc->sas_hba.num_phys)
@@ -5349,6 +5472,9 @@ _scsih_sas_topology_change_event(struct MPT2SAS_ADAPTER *ioc,
                switch (reason_code) {
                case MPI2_EVENT_SAS_TOPO_RC_PHY_CHANGED:
+                        if (ioc->shost_recovery)
+                                break;
                        if (link_rate == prev_link_rate)
                                break;
@@ -5362,6 +5488,9 @@ _scsih_sas_topology_change_event(struct MPT2SAS_ADAPTER *ioc,
                        break;
                case MPI2_EVENT_SAS_TOPO_RC_TARG_ADDED:
+                        if (ioc->shost_recovery)
+                                break;
                        mpt2sas_transport_update_links(ioc, sas_address,
                            handle, phy_number, link_rate);
@@ -5622,7 +5751,7 @@ broadcast_aen_retry:
        termination_count = 0;
        query_count = 0;
        for (smid = 1; smid <= ioc->scsiio_depth; smid++) {
-                if (ioc->ioc_reset_in_progress_status)
+                if (ioc->shost_recovery)
                        goto out;
                scmd = _scsih_scsi_lookup_get(ioc, smid);
                if (!scmd)
@@ -5644,7 +5773,7 @@ broadcast_aen_retry:
                lun = sas_device_priv_data->lun;
                query_count++;
-                if (ioc->ioc_reset_in_progress_status)
+                if (ioc->shost_recovery)
                        goto out;
                spin_unlock_irqrestore(&ioc->scsi_lookup_lock, flags);
@@ -5686,7 +5815,7 @@ broadcast_aen_retry:
                        goto broadcast_aen_retry;
                }
-                if (ioc->ioc_reset_in_progress_status)
+                if (ioc->shost_recovery)
                        goto out_no_lock;
                r = mpt2sas_scsih_issue_tm(ioc, handle, sdev->channel, sdev->id,
@@ -5725,7 +5854,7 @@ broadcast_aen_retry:
            ioc->name, __func__, query_count, termination_count));
        ioc->broadcast_aen_busy = 0;
-        if (!ioc->ioc_reset_in_progress_status)
+        if (!ioc->shost_recovery)
                _scsih_ublock_io_all_device(ioc);
        mutex_unlock(&ioc->tm_cmds.mutex);
 }
@@ -5789,8 +5918,11 @@ _scsih_reprobe_lun(struct scsi_device *sdev, void *no_uld_attach)
 static void
 _scsih_reprobe_target(struct scsi_target *starget, int no_uld_attach)
 {
-        struct MPT2SAS_TARGET *sas_target_priv_data = starget->hostdata;
+        struct MPT2SAS_TARGET *sas_target_priv_data;
+        if (starget == NULL)
+                return;
+        sas_target_priv_data = starget->hostdata;
        if (no_uld_attach)
                sas_target_priv_data->flags |= MPT_TARGET_FLAGS_RAID_COMPONENT;
        else
@@ -5845,7 +5977,7 @@ _scsih_sas_volume_add(struct MPT2SAS_ADAPTER *ioc,
        raid_device->handle = handle;
        raid_device->wwid = wwid;
        _scsih_raid_device_add(ioc, raid_device);
-        if (!ioc->wait_for_port_enable_to_complete) {
+        if (!ioc->wait_for_discovery_to_complete) {
                rc = scsi_add_device(ioc->shost, RAID_CHANNEL,
                    raid_device->id, 0);
                if (rc)
@@ -6127,6 +6259,10 @@ _scsih_sas_ir_config_change_event(struct MPT2SAS_ADAPTER *ioc,
                _scsih_sas_ir_config_change_event_debug(ioc, event_data);
 #endif
+        if (ioc->shost_recovery)
+                return;
        foreign_config = (le32_to_cpu(event_data->Flags) &
            MPI2_EVENT_IR_CHANGE_FLAGS_FOREIGN_CONFIG) ? 1 : 0;
@@ -6185,6 +6321,9 @@ _scsih_sas_ir_volume_event(struct MPT2SAS_ADAPTER *ioc,
        int rc;
        Mpi2EventDataIrVolume_t *event_data = fw_event->event_data;
+        if (ioc->shost_recovery)
+                return;
        if (event_data->ReasonCode != MPI2_EVENT_IR_VOLUME_RC_STATE_CHANGED)
                return;
@@ -6267,6 +6406,9 @@ _scsih_sas_ir_physical_disk_event(struct MPT2SAS_ADAPTER *ioc,
        Mpi2EventDataIrPhysicalDisk_t *event_data = fw_event->event_data;
        u64 sas_address;
+        if (ioc->shost_recovery)
+                return;
        if (event_data->ReasonCode != MPI2_EVENT_IR_PHYSDISK_RC_STATE_CHANGED)
                return;
@@ -6510,10 +6652,10 @@ _scsih_search_responding_sas_devices(struct MPT2SAS_ADAPTER *ioc)
        u32 device_info;
        u16 slot;
-        printk(MPT2SAS_INFO_FMT "%s\n", ioc->name, __func__);
+        printk(MPT2SAS_INFO_FMT "search for end-devices: start\n", ioc->name);
        if (list_empty(&ioc->sas_device_list))
-                return;
+                goto out;
        handle = 0xFFFF;
        while (!(mpt2sas_config_get_sas_device_pg0(ioc, &mpi_reply,
@@ -6532,6 +6674,9 @@ _scsih_search_responding_sas_devices(struct MPT2SAS_ADAPTER *ioc)
                _scsih_mark_responding_sas_device(ioc, sas_address, slot,
                    handle);
        }
+out:
+        printk(MPT2SAS_INFO_FMT "search for end-devices: complete\n",
+            ioc->name);
 }
 /**
@@ -6607,10 +6752,14 @@ _scsih_search_responding_raid_devices(struct MPT2SAS_ADAPTER *ioc)
        u16 handle;
        u8 phys_disk_num;
-        printk(MPT2SAS_INFO_FMT "%s\n", ioc->name, __func__);
+        if (!ioc->ir_firmware)
+                return;
+        printk(MPT2SAS_INFO_FMT "search for raid volumes: start\n",
+            ioc->name);
        if (list_empty(&ioc->raid_device_list))
-                return;
+                goto out;
        handle = 0xFFFF;
        while (!(mpt2sas_config_get_raid_volume_pg1(ioc, &mpi_reply,
@@ -6649,6 +6798,9 @@ _scsih_search_responding_raid_devices(struct MPT2SAS_ADAPTER *ioc)
                        set_bit(handle, ioc->pd_handles);
                }
        }
+out:
+        printk(MPT2SAS_INFO_FMT "search for responding raid volumes: "
+            "complete\n", ioc->name);
 }
 /**
@@ -6708,10 +6860,10 @@ _scsih_search_responding_expanders(struct MPT2SAS_ADAPTER *ioc)
        u64 sas_address;
        u16 handle;
-        printk(MPT2SAS_INFO_FMT "%s\n", ioc->name, __func__);
+        printk(MPT2SAS_INFO_FMT "search for expanders: start\n", ioc->name);
        if (list_empty(&ioc->sas_expander_list))
-                return;
+                goto out;
        handle = 0xFFFF;
        while (!(mpt2sas_config_get_expander_pg0(ioc, &mpi_reply, &expander_pg0,
@@ -6730,6 +6882,8 @@ _scsih_search_responding_expanders(struct MPT2SAS_ADAPTER *ioc)
                _scsih_mark_responding_expander(ioc, sas_address, handle);
        }
+ out:
+        printk(MPT2SAS_INFO_FMT "search for expanders: complete\n", ioc->name);
 }
 /**
@@ -6745,6 +6899,8 @@ _scsih_remove_unresponding_sas_devices(struct MPT2SAS_ADAPTER *ioc)
        struct _sas_node *sas_expander;
        struct _raid_device *raid_device, *raid_device_next;
+        printk(MPT2SAS_INFO_FMT "removing unresponding devices: start\n",
+            ioc->name);
        list_for_each_entry_safe(sas_device, sas_device_next,
            &ioc->sas_device_list, list) {
@@ -6764,6 +6920,9 @@ _scsih_remove_unresponding_sas_devices(struct MPT2SAS_ADAPTER *ioc)
                _scsih_remove_device(ioc, sas_device);
        }
+        if (!ioc->ir_firmware)
+                goto retry_expander_search;
        list_for_each_entry_safe(raid_device, raid_device_next,
            &ioc->raid_device_list, list) {
                if (raid_device->responding) {
@@ -6790,52 +6949,170 @@ _scsih_remove_unresponding_sas_devices(struct MPT2SAS_ADAPTER *ioc)
                mpt2sas_expander_remove(ioc, sas_expander->sas_address);
                goto retry_expander_search;
        }
+        printk(MPT2SAS_INFO_FMT "removing unresponding devices: complete\n",
+            ioc->name);
+        /* unblock devices */
+        _scsih_ublock_io_all_device(ioc);
+}
+static void
+_scsih_refresh_expander_links(struct MPT2SAS_ADAPTER *ioc,
+        struct _sas_node *sas_expander, u16 handle)
+{
+        Mpi2ExpanderPage1_t expander_pg1;
+        Mpi2ConfigReply_t mpi_reply;
+        int i;
+        for (i = 0 ; i < sas_expander->num_phys ; i++) {
+                if ((mpt2sas_config_get_expander_pg1(ioc, &mpi_reply,
+                    &expander_pg1, i, handle))) {
+                        printk(MPT2SAS_ERR_FMT "failure at %s:%d/%s()!\n",
+                            ioc->name, __FILE__, __LINE__, __func__);
+                        return;
+                }
+                mpt2sas_transport_update_links(ioc, sas_expander->sas_address,
+                    le16_to_cpu(expander_pg1.AttachedDevHandle), i,
+                    expander_pg1.NegotiatedLinkRate >> 4);
+        }
 }
 /**
- * _scsih_hide_unhide_sas_devices - add/remove device to/from OS
+ * _scsih_scan_for_devices_after_reset - scan for devices after host reset
 * @ioc: per adapter object
 *
 * Return nothing.
 */
 static void
-_scsih_hide_unhide_sas_devices(struct MPT2SAS_ADAPTER *ioc)
+_scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
 {
-        struct _sas_device *sas_device, *sas_device_next;
+        Mpi2ExpanderPage0_t expander_pg0;
+        Mpi2SasDevicePage0_t sas_device_pg0;
+        Mpi2RaidVolPage1_t volume_pg1;
+        Mpi2RaidVolPage0_t volume_pg0;
+        Mpi2RaidPhysDiskPage0_t pd_pg0;
+        Mpi2EventIrConfigElement_t element;
+        Mpi2ConfigReply_t mpi_reply;
+        u8 phys_disk_num;
+        u16 ioc_status;
+        u16 handle, parent_handle;
+        u64 sas_address;
+        struct _sas_device *sas_device;
+        struct _sas_node *expander_device;
+        static struct _raid_device *raid_device;
-        if (!ioc->is_warpdrive || ioc->mfg_pg10_hide_flag !=
+        printk(MPT2SAS_INFO_FMT "scan devices: start\n", ioc->name);
-            MFG_PAGE10_HIDE_IF_VOL_PRESENT)
-                return;
-        if (ioc->hide_drives) {
+        _scsih_sas_host_refresh(ioc);
-                if (_scsih_get_num_volumes(ioc))
-                        return;
+        /* expanders */
-                ioc->hide_drives = 0;
+        handle = 0xFFFF;
-                list_for_each_entry_safe(sas_device, sas_device_next,
+        while (!(mpt2sas_config_get_expander_pg0(ioc, &mpi_reply, &expander_pg0,
-                    &ioc->sas_device_list, list) {
+            MPI2_SAS_EXPAND_PGAD_FORM_GET_NEXT_HNDL, handle))) {
-                        if (!mpt2sas_transport_port_add(ioc, sas_device->handle,
+                ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &
-                                sas_device->sas_address_parent)) {
+                    MPI2_IOCSTATUS_MASK;
-                                _scsih_sas_device_remove(ioc, sas_device);
+                if (ioc_status == MPI2_IOCSTATUS_CONFIG_INVALID_PAGE)
-                        } else if (!sas_device->starget) {
+                        break;
-                                mpt2sas_transport_port_remove(ioc,
+                handle = le16_to_cpu(expander_pg0.DevHandle);
-                                    sas_device->sas_address,
+                expander_device = mpt2sas_scsih_expander_find_by_sas_address(
-                                    sas_device->sas_address_parent);
+                    ioc, le64_to_cpu(expander_pg0.SASAddress));
-                                _scsih_sas_device_remove(ioc, sas_device);
+                if (expander_device)
-                        }
+                        _scsih_refresh_expander_links(ioc, expander_device,
+                            handle);
+                else
+                        _scsih_expander_add(ioc, handle);
+        }
+        if (!ioc->ir_firmware)
+                goto skip_to_sas;
+        /* phys disk */
+        phys_disk_num = 0xFF;
+        while (!(mpt2sas_config_get_phys_disk_pg0(ioc, &mpi_reply,
+            &pd_pg0, MPI2_PHYSDISK_PGAD_FORM_GET_NEXT_PHYSDISKNUM,
+            phys_disk_num))) {
+                ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &
+                    MPI2_IOCSTATUS_MASK;
+                if (ioc_status == MPI2_IOCSTATUS_CONFIG_INVALID_PAGE)
+                        break;
+                phys_disk_num = pd_pg0.PhysDiskNum;
+                handle = le16_to_cpu(pd_pg0.DevHandle);
+                sas_device = _scsih_sas_device_find_by_handle(ioc, handle);
+                if (sas_device)
+                        continue;
+                if (mpt2sas_config_get_sas_device_pg0(ioc, &mpi_reply,
+                    &sas_device_pg0, MPI2_SAS_DEVICE_PGAD_FORM_HANDLE,
+                    handle) != 0)
+                        continue;
+                parent_handle = le16_to_cpu(sas_device_pg0.ParentDevHandle);
+                if (!_scsih_get_sas_address(ioc, parent_handle,
+                    &sas_address)) {
+                        mpt2sas_transport_update_links(ioc, sas_address,
+                            handle, sas_device_pg0.PhyNum,
+                            MPI2_SAS_NEG_LINK_RATE_1_5);
+                        set_bit(handle, ioc->pd_handles);
+                        _scsih_add_device(ioc, handle, 0, 1);
                }
-        } else {
+        }
-                if (!_scsih_get_num_volumes(ioc))
-                        return;
+        /* volumes */
-                ioc->hide_drives = 1;
+        handle = 0xFFFF;
-                list_for_each_entry_safe(sas_device, sas_device_next,
+        while (!(mpt2sas_config_get_raid_volume_pg1(ioc, &mpi_reply,
-                    &ioc->sas_device_list, list) {
+            &volume_pg1, MPI2_RAID_VOLUME_PGAD_FORM_GET_NEXT_HANDLE, handle))) {
-                        mpt2sas_transport_port_remove(ioc,
+                ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &
-                            sas_device->sas_address,
+                    MPI2_IOCSTATUS_MASK;
-                            sas_device->sas_address_parent);
+                if (ioc_status == MPI2_IOCSTATUS_CONFIG_INVALID_PAGE)
+                        break;
+                handle = le16_to_cpu(volume_pg1.DevHandle);
+                raid_device = _scsih_raid_device_find_by_wwid(ioc,
+                    le64_to_cpu(volume_pg1.WWID));
+                if (raid_device)
+                        continue;
+                if (mpt2sas_config_get_raid_volume_pg0(ioc, &mpi_reply,
+                    &volume_pg0, MPI2_RAID_VOLUME_PGAD_FORM_HANDLE, handle,
+                     sizeof(Mpi2RaidVolPage0_t)))
+                        continue;
+                if (volume_pg0.VolumeState == MPI2_RAID_VOL_STATE_OPTIMAL ||
+                    volume_pg0.VolumeState == MPI2_RAID_VOL_STATE_ONLINE ||
+                    volume_pg0.VolumeState == MPI2_RAID_VOL_STATE_DEGRADED) {
+                        memset(&element, 0, sizeof(Mpi2EventIrConfigElement_t));
+                        element.ReasonCode = MPI2_EVENT_IR_CHANGE_RC_ADDED;
+                        element.VolDevHandle = volume_pg1.DevHandle;
+                        _scsih_sas_volume_add(ioc, &element);
                }
        }
+ skip_to_sas:
+        /* sas devices */
+        handle = 0xFFFF;
+        while (!(mpt2sas_config_get_sas_device_pg0(ioc, &mpi_reply,
+            &sas_device_pg0, MPI2_SAS_DEVICE_PGAD_FORM_GET_NEXT_HANDLE,
+            handle))) {
+                ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &
+                    MPI2_IOCSTATUS_MASK;
+                if (ioc_status == MPI2_IOCSTATUS_CONFIG_INVALID_PAGE)
+                        break;
+                handle = le16_to_cpu(sas_device_pg0.DevHandle);
+                if (!(_scsih_is_end_device(
+                    le32_to_cpu(sas_device_pg0.DeviceInfo))))
+                        continue;
+                sas_device = mpt2sas_scsih_sas_device_find_by_sas_address(ioc,
+                    le64_to_cpu(sas_device_pg0.SASAddress));
+                if (sas_device)
+                        continue;
+                parent_handle = le16_to_cpu(sas_device_pg0.ParentDevHandle);
+                if (!_scsih_get_sas_address(ioc, parent_handle, &sas_address)) {
+                        mpt2sas_transport_update_links(ioc, sas_address, handle,
+                            sas_device_pg0.PhyNum, MPI2_SAS_NEG_LINK_RATE_1_5);
+                        _scsih_add_device(ioc, handle, 0, 0);
+                }
+        }
+        printk(MPT2SAS_INFO_FMT "scan devices: complete\n", ioc->name);
 }
 /**
 * mpt2sas_scsih_reset_handler - reset callback handler (for scsih)
 * @ioc: per adapter object
@@ -6871,7 +7148,6 @@ mpt2sas_scsih_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase)
                }
                _scsih_fw_event_cleanup_queue(ioc);
                _scsih_flush_running_cmds(ioc);
-                _scsih_queue_rescan(ioc);
                break;
        case MPT2_IOC_DONE_RESET:
                dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "
@@ -6881,6 +7157,13 @@ mpt2sas_scsih_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase)
                _scsih_search_responding_sas_devices(ioc);
                _scsih_search_responding_raid_devices(ioc);
                _scsih_search_responding_expanders(ioc);
+                if (!ioc->is_driver_loading) {
+                        _scsih_prep_device_scan(ioc);
+                        _scsih_search_responding_sas_devices(ioc);
+                        _scsih_search_responding_raid_devices(ioc);
+                        _scsih_search_responding_expanders(ioc);
+                        _scsih_error_recovery_delete_devices(ioc);
+                }
                break;
        }
 }
@@ -6898,7 +7181,6 @@ _firmware_event_work(struct work_struct *work)
 {
        struct fw_event_work *fw_event = container_of(work,
            struct fw_event_work, delayed_work.work);
-        unsigned long flags;
        struct MPT2SAS_ADAPTER *ioc = fw_event->ioc;
        /* the queue is being flushed so ignore this event */
@@ -6908,23 +7190,21 @@ _firmware_event_work(struct work_struct *work)
                return;
        }
-        if (fw_event->event == MPT2SAS_RESCAN_AFTER_HOST_RESET) {
+        switch (fw_event->event) {
-                _scsih_fw_event_free(ioc, fw_event);
+        case MPT2SAS_REMOVE_UNRESPONDING_DEVICES:
-                spin_lock_irqsave(&ioc->ioc_reset_in_progress_lock, flags);
+                while (scsi_host_in_recovery(ioc->shost))
-                if (ioc->shost_recovery) {
+                        ssleep(1);
-                        init_completion(&ioc->shost_recovery_done);
-                        spin_unlock_irqrestore(&ioc->ioc_reset_in_progress_lock,
-                            flags);
-                        wait_for_completion(&ioc->shost_recovery_done);
-                } else
-                        spin_unlock_irqrestore(&ioc->ioc_reset_in_progress_lock,
-                            flags);
                _scsih_remove_unresponding_sas_devices(ioc);
-                _scsih_hide_unhide_sas_devices(ioc);
+                _scsih_scan_for_devices_after_reset(ioc);
-                return;
+                break;
-        }
+        case MPT2SAS_PORT_ENABLE_COMPLETE:
+                ioc->start_scan = 0;
-        switch (fw_event->event) {
+                dewtprintk(ioc, printk(MPT2SAS_INFO_FMT "port enable: complete "
+                    "from worker thread\n", ioc->name));
+                break;
        case MPT2SAS_TURN_ON_FAULT_LED:
                _scsih_turn_on_fault_led(ioc, fw_event->device_handle);
                break;
@@ -7121,6 +7401,8 @@ static struct scsi_host_template scsih_driver_template = {
        .slave_configure                = _scsih_slave_configure,
        .target_destroy                 = _scsih_target_destroy,
        .slave_destroy                  = _scsih_slave_destroy,
+        .scan_finished                  = _scsih_scan_finished,
+        .scan_start                     = _scsih_scan_start,
        .change_queue_depth             = _scsih_change_queue_depth,
        .change_queue_type              = _scsih_change_queue_type,
        .eh_abort_handler               = _scsih_abort,
@@ -7381,7 +7663,12 @@ _scsih_probe_boot_devices(struct MPT2SAS_ADAPTER *ioc)
        unsigned long flags;
        int rc;
+         /* no Bios, return immediately */
+        if (!ioc->bios_pg3.BiosVersion)
+                return;
        device = NULL;
+        is_raid = 0;
        if (ioc->req_boot_device.device) {
                device =  ioc->req_boot_device.device;
                is_raid = ioc->req_boot_device.is_raid;
@@ -7417,8 +7704,9 @@ _scsih_probe_boot_devices(struct MPT2SAS_ADAPTER *ioc)
                    sas_device->sas_address_parent)) {
                        _scsih_sas_device_remove(ioc, sas_device);
                } else if (!sas_device->starget) {
-                        mpt2sas_transport_port_remove(ioc, sas_address,
+                        if (!ioc->is_driver_loading)
-                            sas_address_parent);
+                                mpt2sas_transport_port_remove(ioc, sas_address,
+                                        sas_address_parent);
                        _scsih_sas_device_remove(ioc, sas_device);
                }
        }
@@ -7462,22 +7750,28 @@ _scsih_probe_sas(struct MPT2SAS_ADAPTER *ioc)
        /* SAS Device List */
        list_for_each_entry_safe(sas_device, next, &ioc->sas_device_init_list,
            list) {
-                spin_lock_irqsave(&ioc->sas_device_lock, flags);
-                list_move_tail(&sas_device->list, &ioc->sas_device_list);
-                spin_unlock_irqrestore(&ioc->sas_device_lock, flags);
                if (ioc->hide_drives)
                        continue;
                if (!mpt2sas_transport_port_add(ioc, sas_device->handle,
                    sas_device->sas_address_parent)) {
-                        _scsih_sas_device_remove(ioc, sas_device);
+                        list_del(&sas_device->list);
+                        kfree(sas_device);
+                        continue;
                } else if (!sas_device->starget) {
-                        mpt2sas_transport_port_remove(ioc,
+                        if (!ioc->is_driver_loading)
-                            sas_device->sas_address,
+                                mpt2sas_transport_port_remove(ioc,
-                            sas_device->sas_address_parent);
+                                        sas_device->sas_address,
-                        _scsih_sas_device_remove(ioc, sas_device);
+                                        sas_device->sas_address_parent);
+                        list_del(&sas_device->list);
+                        kfree(sas_device);
+                        continue;
                }
+                spin_lock_irqsave(&ioc->sas_device_lock, flags);
+                list_move_tail(&sas_device->list, &ioc->sas_device_list);
+                spin_unlock_irqrestore(&ioc->sas_device_lock, flags);
        }
 }
@@ -7490,9 +7784,7 @@ _scsih_probe_sas(struct MPT2SAS_ADAPTER *ioc)
 static void
 _scsih_probe_devices(struct MPT2SAS_ADAPTER *ioc)
 {
-        u16 volume_mapping_flags =
+        u16 volume_mapping_flags;
-            le16_to_cpu(ioc->ioc_pg8.IRVolumeMappingFlags) &
-            MPI2_IOCPAGE8_IRFLAGS_MASK_VOLUME_MAPPING_MODE;
        if (!(ioc->facts.ProtocolFlags & MPI2_IOCFACTS_PROTOCOL_SCSI_INITIATOR))
                return;  /* return when IOC doesn't support initiator mode */
@@ -7500,18 +7792,93 @@ _scsih_probe_devices(struct MPT2SAS_ADAPTER *ioc)
        _scsih_probe_boot_devices(ioc);
        if (ioc->ir_firmware) {
-                if ((volume_mapping_flags &
+                volume_mapping_flags =
-                     MPI2_IOCPAGE8_IRFLAGS_HIGH_VOLUME_MAPPING)) {
+                    le16_to_cpu(ioc->ioc_pg8.IRVolumeMappingFlags) &
-                        _scsih_probe_sas(ioc);
+                    MPI2_IOCPAGE8_IRFLAGS_MASK_VOLUME_MAPPING_MODE;
+                if (volume_mapping_flags ==
+                    MPI2_IOCPAGE8_IRFLAGS_LOW_VOLUME_MAPPING) {
                        _scsih_probe_raid(ioc);
+                        _scsih_probe_sas(ioc);
                } else {
-                        _scsih_probe_raid(ioc);
                        _scsih_probe_sas(ioc);
+                        _scsih_probe_raid(ioc);
                }
        } else
                _scsih_probe_sas(ioc);
 }
+/**
+ * _scsih_scan_start - scsi lld callback for .scan_start
+ * @shost: SCSI host pointer
+ *
+ * The shost has the ability to discover targets on its own instead
+ * of scanning the entire bus.  In our implemention, we will kick off
+ * firmware discovery.
+ */
+static void
+_scsih_scan_start(struct Scsi_Host *shost)
+{
+        struct MPT2SAS_ADAPTER *ioc = shost_priv(shost);
+        int rc;
+        if (diag_buffer_enable != -1 && diag_buffer_enable != 0)
+                mpt2sas_enable_diag_buffer(ioc, diag_buffer_enable);
+        ioc->start_scan = 1;
+        rc = mpt2sas_port_enable(ioc);
+        if (rc != 0)
+                printk(MPT2SAS_INFO_FMT "port enable: FAILED\n", ioc->name);
+}
+/**
+ * _scsih_scan_finished - scsi lld callback for .scan_finished
+ * @shost: SCSI host pointer
+ * @time: elapsed time of the scan in jiffies
+ *
+ * This function will be called periodically until it returns 1 with the
+ * scsi_host and the elapsed time of the scan in jiffies. In our implemention,
+ * we wait for firmware discovery to complete, then return 1.
+ */
+static int
+_scsih_scan_finished(struct Scsi_Host *shost, unsigned long time)
+{
+        struct MPT2SAS_ADAPTER *ioc = shost_priv(shost);
+        if (time >= (300 * HZ)) {
+                ioc->base_cmds.status = MPT2_CMD_NOT_USED;
+                printk(MPT2SAS_INFO_FMT "port enable: FAILED with timeout "
+                    "(timeout=300s)\n", ioc->name);
+                ioc->is_driver_loading = 0;
+                return 1;
+        }
+        if (ioc->start_scan)
+                return 0;
+        if (ioc->start_scan_failed) {
+                printk(MPT2SAS_INFO_FMT "port enable: FAILED with "
+                    "(ioc_status=0x%08x)\n", ioc->name, ioc->start_scan_failed);
+                ioc->is_driver_loading = 0;
+                ioc->wait_for_discovery_to_complete = 0;
+                ioc->remove_host = 1;
+                return 1;
+        }
+        printk(MPT2SAS_INFO_FMT "port enable: SUCCESS\n", ioc->name);
+        ioc->base_cmds.status = MPT2_CMD_NOT_USED;
+        if (ioc->wait_for_discovery_to_complete) {
+                ioc->wait_for_discovery_to_complete = 0;
+                _scsih_probe_devices(ioc);
+        }
+        mpt2sas_base_start_watchdog(ioc);
+        ioc->is_driver_loading = 0;
+        return 1;
+}
 /**
 * _scsih_probe - attach and add scsi host
 * @pdev: PCI device struct
@@ -7548,6 +7915,7 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        ioc->tm_cb_idx = tm_cb_idx;
        ioc->ctl_cb_idx = ctl_cb_idx;
        ioc->base_cb_idx = base_cb_idx;
+        ioc->port_enable_cb_idx = port_enable_cb_idx;
        ioc->transport_cb_idx = transport_cb_idx;
        ioc->scsih_cb_idx = scsih_cb_idx;
        ioc->config_cb_idx = config_cb_idx;
@@ -7620,14 +7988,14 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                goto out_thread_fail;
        }
-        ioc->wait_for_port_enable_to_complete = 1;
+        ioc->is_driver_loading = 1;
        if ((mpt2sas_base_attach(ioc))) {
                printk(MPT2SAS_ERR_FMT "failure at %s:%d/%s()!\n",
                    ioc->name, __FILE__, __LINE__, __func__);
                goto out_attach_fail;
        }
-        ioc->wait_for_port_enable_to_complete = 0;
+        scsi_scan_host(shost);
        if (ioc->is_warpdrive) {
                if (ioc->mfg_pg10_hide_flag ==  MFG_PAGE10_EXPOSE_ALL_DISKS)
                        ioc->hide_drives = 0;
@@ -7650,6 +8018,7 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 out_thread_fail:
        list_del(&ioc->list);
        scsi_remove_host(shost);
+        scsi_host_put(shost);
 out_add_shost_fail:
        return -ENODEV;
 }
@@ -7896,6 +8265,8 @@ _scsih_init(void)
        /* base internal commands callback handler */
        base_cb_idx = mpt2sas_base_register_callback_handler(mpt2sas_base_done);
+        port_enable_cb_idx = mpt2sas_base_register_callback_handler(
+                mpt2sas_port_enable_done);
        /* transport internal commands callback handler */
        transport_cb_idx = mpt2sas_base_register_callback_handler(
@@ -7950,6 +8321,7 @@ _scsih_exit(void)
        mpt2sas_base_release_callback_handler(scsi_io_cb_idx);
        mpt2sas_base_release_callback_handler(tm_cb_idx);
        mpt2sas_base_release_callback_handler(base_cb_idx);
+        mpt2sas_base_release_callback_handler(port_enable_cb_idx);
        mpt2sas_base_release_callback_handler(transport_cb_idx);
        mpt2sas_base_release_callback_handler(scsih_cb_idx);
        mpt2sas_base_release_callback_handler(config_cb_idx);
diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
index 621b5e072758..6f589195746c 100644
--- a/drivers/scsi/mvsas/mv_init.c
+++ b/drivers/scsi/mvsas/mv_init.c
@@ -732,6 +732,16 @@ static struct pci_device_id __devinitdata mvs_pci_table[] = {
                .class_mask     = 0,
                .driver_data    = chip_9485,
        },
+        { PCI_VDEVICE(OCZ, 0x1021), chip_9485}, /* OCZ RevoDrive3 */
+        { PCI_VDEVICE(OCZ, 0x1022), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact model unknown) */
+        { PCI_VDEVICE(OCZ, 0x1040), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact model unknown) */
+        { PCI_VDEVICE(OCZ, 0x1041), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact model unknown) */
+        { PCI_VDEVICE(OCZ, 0x1042), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact model unknown) */
+        { PCI_VDEVICE(OCZ, 0x1043), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact model unknown) */
+        { PCI_VDEVICE(OCZ, 0x1044), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact model unknown) */
+        { PCI_VDEVICE(OCZ, 0x1080), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact model unknown) */
+        { PCI_VDEVICE(OCZ, 0x1083), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact model unknown) */
+        { PCI_VDEVICE(OCZ, 0x1084), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact model unknown) */
        { }     /* terminate list */
 };
diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c
index 86afb13f1e79..c06b8e5aa2cf 100644
--- a/drivers/scsi/osd/osd_initiator.c
+++ b/drivers/scsi/osd/osd_initiator.c
@@ -40,6 +40,7 @@
 */
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <scsi/osd_initiator.h>
 #include <scsi/osd_sec.h>
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index b86db84d6f32..5163edb925cb 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -4102,7 +4102,7 @@ static long pmcraid_chr_ioctl(
        struct pmcraid_ioctl_header *hdr = NULL;
        int retval = -ENOTTY;
-        hdr = kmalloc(GFP_KERNEL, sizeof(struct pmcraid_ioctl_header));
+        hdr = kmalloc(sizeof(struct pmcraid_ioctl_header), GFP_KERNEL);
        if (!hdr) {
                pmcraid_err("faile to allocate memory for ioctl header\n");
diff --git a/drivers/scsi/ps3rom.c b/drivers/scsi/ps3rom.c
index cd178b9e40cd..959f10055be7 100644
--- a/drivers/scsi/ps3rom.c
+++ b/drivers/scsi/ps3rom.c
@@ -20,6 +20,7 @@
 #include <linux/cdrom.h>
 #include <linux/highmem.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <scsi/scsi.h>
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 3474e86e98ab..2516adf1aeea 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -2279,7 +2279,7 @@ qla25xx_msix_rsp_q(int irq, void *dev_id)
        ha = rsp->hw;
        /* Clear the interrupt, if enabled, for this response queue */
-        if (rsp->options & ~BIT_6) {
+        if (!ha->flags.disable_msix_handshake) {
                reg = &ha->iobase->isp24;
                spin_lock_irqsave(&ha->hardware_lock, flags);
                WRT_REG_DWORD(&reg->hccr, HCCRX_CLR_RISC_INT);
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index fc3f168decb4..06bc26554a67 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -12,6 +12,7 @@
 #include <linux/blkdev.h>
 #include <linux/completion.h>
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/mempool.h>
 #include <linux/slab.h>
 #include <linux/init.h>
@@ -1698,6 +1699,15 @@ struct request_queue *scsi_alloc_queue(struct scsi_device *sdev)
 void scsi_free_queue(struct request_queue *q)
 {
+        unsigned long flags;
+        WARN_ON(q->queuedata);
+        /* cause scsi_request_fn() to kill all non-finished requests */
+        spin_lock_irqsave(q->queue_lock, flags);
+        q->request_fn(q);
+        spin_unlock_irqrestore(q->queue_lock, flags);
        blk_cleanup_queue(q);
 }
diff --git a/drivers/scsi/scsi_lib_dma.c b/drivers/scsi/scsi_lib_dma.c
index dcd128583b89..2ac3f3975f78 100644
--- a/drivers/scsi/scsi_lib_dma.c
+++ b/drivers/scsi/scsi_lib_dma.c
@@ -4,6 +4,7 @@
 #include <linux/blkdev.h>
 #include <linux/device.h>
+#include <linux/export.h>
 #include <linux/kernel.h>
 #include <scsi/scsi.h>
diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c
index 26a8a45584ef..44f76e8b58af 100644
--- a/drivers/scsi/scsi_netlink.c
+++ b/drivers/scsi/scsi_netlink.c
@@ -23,6 +23,7 @@
 #include <linux/security.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <net/sock.h>
 #include <net/netlink.h>
diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c
index d82a023a9015..d329f8b12e2b 100644
--- a/drivers/scsi/scsi_pm.c
+++ b/drivers/scsi/scsi_pm.c
@@ -6,6 +6,7 @@
 */
 #include <linux/pm_runtime.h>
+#include <linux/export.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 44e8ca398efa..72273a0e5666 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -322,6 +322,7 @@ out_device_destroy:
        scsi_device_set_state(sdev, SDEV_DEL);
        transport_destroy_device(&sdev->sdev_gendev);
        put_device(&sdev->sdev_dev);
+        scsi_free_queue(sdev->request_queue);
        put_device(&sdev->sdev_gendev);
 out:
        if (display_failure_msg)
diff --git a/drivers/scsi/scsi_tgt_if.c b/drivers/scsi/scsi_tgt_if.c
index 0172de197008..6209110f295d 100644
--- a/drivers/scsi/scsi_tgt_if.c
+++ b/drivers/scsi/scsi_tgt_if.c
@@ -22,6 +22,7 @@
 #include <linux/miscdevice.h>
 #include <linux/gfp.h>
 #include <linux/file.h>
+#include <linux/export.h>
 #include <net/tcp.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 1bcd65a509e6..96029e6d027f 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -520,7 +520,7 @@ fail_host_msg:
 /**
 * iscsi_bsg_host_add - Create and add the bsg hooks to receive requests
 * @shost: shost for iscsi_host
- * @cls_host: iscsi_cls_host adding the structures to
+ * @ihost: iscsi_cls_host adding the structures to
 */
 static int
 iscsi_bsg_host_add(struct Scsi_Host *shost, struct iscsi_cls_host *ihost)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index a7942e5c8be8..fa3a5918009c 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2590,18 +2590,16 @@ static int sd_probe(struct device *dev)
                spin_unlock(&sd_index_lock);
        } while (error == -EAGAIN);
-        if (error)
+        if (error) {
+                sdev_printk(KERN_WARNING, sdp, "sd_probe: memory exhausted.\n");
                goto out_put;
-        if (index >= SD_MAX_DISKS) {
-                error = -ENODEV;
-                sdev_printk(KERN_WARNING, sdp, "SCSI disk (sd) name space exhausted.\n");
-                goto out_free_index;
        }
        error = sd_format_disk_name("sd", index, gd->disk_name, DISK_NAME_LEN);
-        if (error)
+        if (error) {
+                sdev_printk(KERN_WARNING, sdp, "SCSI disk (sd) name length exceeded.\n");
                goto out_free_index;
+        }
        sdkp->device = sdp;
        sdkp->driver = &sd_template;
diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h
index 6ad798bfd52a..4163f2910e3d 100644
--- a/drivers/scsi/sd.h
+++ b/drivers/scsi/sd.h
@@ -9,12 +9,6 @@
 #define SD_MAJORS       16
 /*
- * This is limited by the naming scheme enforced in sd_probe,
- * add another character to it if you really need more disks.
- */
-#define SD_MAX_DISKS    (((26 * 26) + 26 + 1) * 26)
-/*
 * Time out in seconds for disks and Magneto-opticals (which are slower).
 */
 #define SD_TIMEOUT              (30 * HZ)
diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
index 8be30554119b..a3911c39ea50 100644
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
@@ -4,6 +4,7 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/blkdev.h>
+#include <linux/module.h>
 #include <linux/blkpg.h>
 #include <linux/cdrom.h>
 #include <linux/delay.h>
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 1871b8ae83ae..9b28f39bac26 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -462,14 +462,16 @@ static void st_scsi_execute_end(struct request *req, int uptodate)
 {
        struct st_request *SRpnt = req->end_io_data;
        struct scsi_tape *STp = SRpnt->stp;
+        struct bio *tmp;
        STp->buffer->cmdstat.midlevel_result = SRpnt->result = req->errors;
        STp->buffer->cmdstat.residual = req->resid_len;
+        tmp = SRpnt->bio;
        if (SRpnt->waiting)
                complete(SRpnt->waiting);
-        blk_rq_unmap_user(SRpnt->bio);
+        blk_rq_unmap_user(tmp);
        __blk_put_request(req->q, req);
 }
diff --git a/drivers/sfi/sfi_core.h b/drivers/sfi/sfi_core.h
index b7cf220d44ec..1d5cfe854cf7 100644
--- a/drivers/sfi/sfi_core.h
+++ b/drivers/sfi/sfi_core.h
@@ -55,6 +55,9 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+#include <linux/sysfs.h>
 struct sfi_table_key{
        char    *sig;
        char    *oem_id;
diff --git a/drivers/sh/intc/chip.c b/drivers/sh/intc/chip.c
index 33b2ed451e09..7b246efa94ea 100644
--- a/drivers/sh/intc/chip.c
+++ b/drivers/sh/intc/chip.c
@@ -186,7 +186,7 @@ static unsigned char intc_irq_sense_table[IRQ_TYPE_SENSE_MASK + 1] = {
    !defined(CONFIG_CPU_SUBTYPE_SH7709)
        [IRQ_TYPE_LEVEL_HIGH] = VALID(3),
 #endif
-#if defined(CONFIG_ARCH_SH7372)
+#if defined(CONFIG_ARM) /* all recent SH-Mobile / R-Mobile ARM support this */
        [IRQ_TYPE_EDGE_BOTH] = VALID(4),
 #endif
 };
@@ -202,11 +202,16 @@ static int intc_set_type(struct irq_data *data, unsigned int type)
        if (!value)
                return -EINVAL;
+        value &= ~SENSE_VALID_FLAG;
        ihp = intc_find_irq(d->sense, d->nr_sense, irq);
        if (ihp) {
+                /* PINT has 2-bit sense registers, should fail on EDGE_BOTH */
+                if (value >= (1 << _INTC_WIDTH(ihp->handle)))
+                        return -EINVAL;
                addr = INTC_REG(d, _INTC_ADDR_E(ihp->handle), 0);
-                intc_reg_fns[_INTC_FN(ihp->handle)](addr, ihp->handle,
+                intc_reg_fns[_INTC_FN(ihp->handle)](addr, ihp->handle, value);
-                                                    value & ~SENSE_VALID_FLAG);
        }
        return 0;
diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c
index c6ca115c71df..8b7a141ff35e 100644
--- a/drivers/sh/intc/core.c
+++ b/drivers/sh/intc/core.c
@@ -22,6 +22,7 @@
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <linux/slab.h>
+#include <linux/stat.h>
 #include <linux/interrupt.h>
 #include <linux/sh_intc.h>
 #include <linux/sysdev.h>
@@ -29,6 +30,7 @@
 #include <linux/list.h>
 #include <linux/spinlock.h>
 #include <linux/radix-tree.h>
+#include <linux/export.h>
 #include "internals.h"
 LIST_HEAD(intc_list);
diff --git a/drivers/sh/intc/dynamic.c b/drivers/sh/intc/dynamic.c
index a3677c9dfe36..5fea1ee8799a 100644
--- a/drivers/sh/intc/dynamic.c
+++ b/drivers/sh/intc/dynamic.c
@@ -14,6 +14,7 @@
 #include <linux/irq.h>
 #include <linux/bitmap.h>
 #include <linux/spinlock.h>
+#include <linux/module.h>
 #include "internals.h" /* only for activate_irq() damage.. */
 /*
diff --git a/drivers/sh/intc/userimask.c b/drivers/sh/intc/userimask.c
index e32304b66cf1..56bf9336b92b 100644
--- a/drivers/sh/intc/userimask.c
+++ b/drivers/sh/intc/userimask.c
@@ -13,6 +13,7 @@
 #include <linux/sysdev.h>
 #include <linux/init.h>
 #include <linux/io.h>
+#include <linux/stat.h>
 #include <asm/sizes.h>
 #include "internals.h"
diff --git a/drivers/sh/intc/virq.c b/drivers/sh/intc/virq.c
index 1e6e2d0353ea..c7ec49ffd9f6 100644
--- a/drivers/sh/intc/virq.c
+++ b/drivers/sh/intc/virq.c
@@ -14,6 +14,7 @@
 #include <linux/list.h>
 #include <linux/radix-tree.h>
 #include <linux/spinlock.h>
+#include <linux/export.h>
 #include "internals.h"
 static struct intc_map_entry intc_irq_xlate[NR_IRQS];
diff --git a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
index 1e20604257af..bec81c2404f7 100644
--- a/drivers/sh/maple/maple.c
+++ b/drivers/sh/maple/maple.c
@@ -20,6 +20,7 @@
 #include <linux/maple.h>
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 #include <asm/cacheflush.h>
 #include <asm/dma.h>
 #include <asm/io.h>
diff --git a/drivers/sh/pfc.c b/drivers/sh/pfc.c
index 75934e3ea34e..e67fe170d8d5 100644
--- a/drivers/sh/pfc.c
+++ b/drivers/sh/pfc.c
@@ -217,7 +217,7 @@ static int get_config_reg(struct pinmux_info *gpioc, pinmux_enum_t enum_id,
                if (!r_width)
                        break;
-                for (n = 0; n < (r_width / f_width) * 1 << f_width; n++) {
+                for (n = 0; n < (r_width / f_width) * (1 << f_width); n++) {
                        if (config_reg->enum_ids[n] == enum_id) {
                                *crp = config_reg;
                                *indexp = n;
@@ -577,6 +577,32 @@ static void sh_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
        sh_gpio_set_value(chip_to_pinmux(chip), offset, value);
 }
+static int sh_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
+{
+        struct pinmux_info *gpioc = chip_to_pinmux(chip);
+        pinmux_enum_t enum_id;
+        pinmux_enum_t *enum_ids;
+        int i, k, pos;
+        pos = 0;
+        enum_id = 0;
+        while (1) {
+                pos = get_gpio_enum_id(gpioc, offset, pos, &enum_id);
+                if (pos <= 0 || !enum_id)
+                        break;
+                for (i = 0; i < gpioc->gpio_irq_size; i++) {
+                        enum_ids = gpioc->gpio_irq[i].enum_ids;
+                        for (k = 0; enum_ids[k]; k++) {
+                                if (enum_ids[k] == enum_id)
+                                        return gpioc->gpio_irq[i].irq;
+                        }
+                }
+        }
+        return -ENOSYS;
+}
 int register_pinmux(struct pinmux_info *pip)
 {
        struct gpio_chip *chip = &pip->chip;
@@ -592,6 +618,7 @@ int register_pinmux(struct pinmux_info *pip)
        chip->get = sh_gpio_get;
        chip->direction_output = sh_gpio_direction_output;
        chip->set = sh_gpio_set;
+        chip->to_irq = sh_gpio_to_irq;
        WARN_ON(pip->first_gpio != 0); /* needs testing */
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 52e2900d9d8e..a1fd73df5416 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -88,7 +88,7 @@ config SPI_BFIN_SPORT
 config SPI_AU1550
        tristate "Au1550/Au12x0 SPI Controller"
-        depends on (SOC_AU1550 || SOC_AU1200) && EXPERIMENTAL
+        depends on MIPS_ALCHEMY && EXPERIMENTAL
        select SPI_BITBANG
        help
          If you say yes to this option, support will be included for the
diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c
index 881c1967741d..c00d00e96ee4 100644
--- a/drivers/spi/spi-altera.c
+++ b/drivers/spi/spi-altera.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/errno.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_bitbang.h>
diff --git a/drivers/spi/spi-au1550.c b/drivers/spi/spi-au1550.c
index bddee5f516b2..5784c8799616 100644
--- a/drivers/spi/spi-au1550.c
+++ b/drivers/spi/spi-au1550.c
@@ -25,6 +25,7 @@
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
+#include <linux/module.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/resource.h>
diff --git a/drivers/spi/spi-bitbang.c b/drivers/spi/spi-bitbang.c
index 02d57fbba295..aef59b1a15f7 100644
--- a/drivers/spi/spi-bitbang.c
+++ b/drivers/spi/spi-bitbang.c
@@ -20,6 +20,7 @@
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
+#include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/platform_device.h>
diff --git a/drivers/spi/spi-butterfly.c b/drivers/spi/spi-butterfly.c
index 9f907ec52def..5ed08e537433 100644
--- a/drivers/spi/spi-butterfly.c
+++ b/drivers/spi/spi-butterfly.c
@@ -20,6 +20,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 #include <linux/device.h>
 #include <linux/parport.h>
diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c
index fac399c3022c..db2f1ba06eab 100644
--- a/drivers/spi/spi-dw-mmio.c
+++ b/drivers/spi/spi-dw-mmio.c
@@ -15,6 +15,7 @@
 #include <linux/slab.h>
 #include <linux/spi/spi.h>
 #include <linux/scatterlist.h>
+#include <linux/module.h>
 #include "spi-dw.h"
diff --git a/drivers/spi/spi-dw-pci.c b/drivers/spi/spi-dw-pci.c
index c5f37f03ac8b..f64250ea1611 100644
--- a/drivers/spi/spi-dw-pci.c
+++ b/drivers/spi/spi-dw-pci.c
@@ -21,6 +21,7 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/spi/spi.h>
+#include <linux/module.h>
 #include "spi-dw.h"
diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c
index 296d94f4cf72..082458d73ce9 100644
--- a/drivers/spi/spi-dw.c
+++ b/drivers/spi/spi-dw.c
@@ -19,6 +19,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
+#include <linux/module.h>
 #include <linux/highmem.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
index 635ff08b377f..e093d3ec41ba 100644
--- a/drivers/spi/spi-gpio.c
+++ b/drivers/spi/spi-gpio.c
@@ -18,6 +18,7 @@
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
diff --git a/drivers/spi/spi-oc-tiny.c b/drivers/spi/spi-oc-tiny.c
index 897274e8715c..698018fd992b 100644
--- a/drivers/spi/spi-oc-tiny.c
+++ b/drivers/spi/spi-oc-tiny.c
@@ -18,6 +18,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/errno.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_bitbang.h>
diff --git a/drivers/spi/spi-omap-uwire.c b/drivers/spi/spi-omap-uwire.c
index 00a8e9d7dbe4..610f7391456e 100644
--- a/drivers/spi/spi-omap-uwire.c
+++ b/drivers/spi/spi-omap-uwire.c
@@ -45,6 +45,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_bitbang.h>
+#include <linux/module.h>
 #include <asm/system.h>
 #include <asm/irq.h>
diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c
index 9421a390a5e3..13448c832c44 100644
--- a/drivers/spi/spi-orion.c
+++ b/drivers/spi/spi-orion.c
@@ -17,6 +17,7 @@
 #include <linux/io.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/orion_spi.h>
+#include <linux/module.h>
 #include <asm/unaligned.h>
 #define DRIVER_NAME                     "orion_spi"
diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c
index 378e504f89eb..8caa07d58e69 100644
--- a/drivers/spi/spi-pxa2xx-pci.c
+++ b/drivers/spi/spi-pxa2xx-pci.c
@@ -5,6 +5,7 @@
 #include <linux/pci.h>
 #include <linux/platform_device.h>
 #include <linux/of_device.h>
+#include <linux/module.h>
 #include <linux/spi/pxa2xx_spi.h>
 struct ce4100_info {
diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c
index b857a3e7af94..fc064535f4fc 100644
--- a/drivers/spi/spi-s3c24xx.c
+++ b/drivers/spi/spi-s3c24xx.c
@@ -24,6 +24,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_bitbang.h>
+#include <linux/module.h>
 #include <plat/regs-spi.h>
 #include <mach/spi.h>
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 595dacc7645f..019a7163572f 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -131,6 +131,12 @@
 #define RXBUSY    (1<<2)
 #define TXBUSY    (1<<3)
+struct s3c64xx_spi_dma_data {
+        unsigned                ch;
+        enum dma_data_direction direction;
+        enum dma_ch     dmach;
+};
 /**
 * struct s3c64xx_spi_driver_data - Runtime info holder for SPI driver.
 * @clk: Pointer to the spi clock.
@@ -164,13 +170,14 @@ struct s3c64xx_spi_driver_data {
        struct work_struct              work;
        struct list_head                queue;
        spinlock_t                      lock;
-        enum dma_ch                     rx_dmach;
-        enum dma_ch                     tx_dmach;
        unsigned long                   sfr_start;
        struct completion               xfer_completion;
        unsigned                        state;
        unsigned                        cur_mode, cur_bpw;
        unsigned                        cur_speed;
+        struct s3c64xx_spi_dma_data     rx_dma;
+        struct s3c64xx_spi_dma_data     tx_dma;
+        struct samsung_dma_ops          *ops;
 };
 static struct s3c2410_dma_client s3c64xx_spi_dma_client = {
@@ -226,6 +233,78 @@ static void flush_fifo(struct s3c64xx_spi_driver_data *sdd)
        writel(val, regs + S3C64XX_SPI_CH_CFG);
 }
+static void s3c64xx_spi_dmacb(void *data)
+{
+        struct s3c64xx_spi_driver_data *sdd;
+        struct s3c64xx_spi_dma_data *dma = data;
+        unsigned long flags;
+        if (dma->direction == DMA_FROM_DEVICE)
+                sdd = container_of(data,
+                        struct s3c64xx_spi_driver_data, rx_dma);
+        else
+                sdd = container_of(data,
+                        struct s3c64xx_spi_driver_data, tx_dma);
+        spin_lock_irqsave(&sdd->lock, flags);
+        if (dma->direction == DMA_FROM_DEVICE) {
+                sdd->state &= ~RXBUSY;
+                if (!(sdd->state & TXBUSY))
+                        complete(&sdd->xfer_completion);
+        } else {
+                sdd->state &= ~TXBUSY;
+                if (!(sdd->state & RXBUSY))
+                        complete(&sdd->xfer_completion);
+        }
+        spin_unlock_irqrestore(&sdd->lock, flags);
+}
+static void prepare_dma(struct s3c64xx_spi_dma_data *dma,
+                                        unsigned len, dma_addr_t buf)
+{
+        struct s3c64xx_spi_driver_data *sdd;
+        struct samsung_dma_prep_info info;
+        if (dma->direction == DMA_FROM_DEVICE)
+                sdd = container_of((void *)dma,
+                        struct s3c64xx_spi_driver_data, rx_dma);
+        else
+                sdd = container_of((void *)dma,
+                        struct s3c64xx_spi_driver_data, tx_dma);
+        info.cap = DMA_SLAVE;
+        info.len = len;
+        info.fp = s3c64xx_spi_dmacb;
+        info.fp_param = dma;
+        info.direction = dma->direction;
+        info.buf = buf;
+        sdd->ops->prepare(dma->ch, &info);
+        sdd->ops->trigger(dma->ch);
+}
+static int acquire_dma(struct s3c64xx_spi_driver_data *sdd)
+{
+        struct samsung_dma_info info;
+        sdd->ops = samsung_dma_get_ops();
+        info.cap = DMA_SLAVE;
+        info.client = &s3c64xx_spi_dma_client;
+        info.width = sdd->cur_bpw / 8;
+        info.direction = sdd->rx_dma.direction;
+        info.fifo = sdd->sfr_start + S3C64XX_SPI_RX_DATA;
+        sdd->rx_dma.ch = sdd->ops->request(sdd->rx_dma.dmach, &info);
+        info.direction =  sdd->tx_dma.direction;
+        info.fifo = sdd->sfr_start + S3C64XX_SPI_TX_DATA;
+        sdd->tx_dma.ch = sdd->ops->request(sdd->tx_dma.dmach, &info);
+        return 1;
+}
 static void enable_datapath(struct s3c64xx_spi_driver_data *sdd,
                                struct spi_device *spi,
                                struct spi_transfer *xfer, int dma_mode)
@@ -258,10 +337,7 @@ static void enable_datapath(struct s3c64xx_spi_driver_data *sdd,
                chcfg |= S3C64XX_SPI_CH_TXCH_ON;
                if (dma_mode) {
                        modecfg |= S3C64XX_SPI_MODE_TXDMA_ON;
-                        s3c2410_dma_config(sdd->tx_dmach, sdd->cur_bpw / 8);
+                        prepare_dma(&sdd->tx_dma, xfer->len, xfer->tx_dma);
-                        s3c2410_dma_enqueue(sdd->tx_dmach, (void *)sdd,
-                                                xfer->tx_dma, xfer->len);
-                        s3c2410_dma_ctrl(sdd->tx_dmach, S3C2410_DMAOP_START);
                } else {
                        switch (sdd->cur_bpw) {
                        case 32:
@@ -293,10 +369,7 @@ static void enable_datapath(struct s3c64xx_spi_driver_data *sdd,
                        writel(((xfer->len * 8 / sdd->cur_bpw) & 0xffff)
                                        | S3C64XX_SPI_PACKET_CNT_EN,
                                        regs + S3C64XX_SPI_PACKET_CNT);
-                        s3c2410_dma_config(sdd->rx_dmach, sdd->cur_bpw / 8);
+                        prepare_dma(&sdd->rx_dma, xfer->len, xfer->rx_dma);
-                        s3c2410_dma_enqueue(sdd->rx_dmach, (void *)sdd,
-                                                xfer->rx_dma, xfer->len);
-                        s3c2410_dma_ctrl(sdd->rx_dmach, S3C2410_DMAOP_START);
                }
        }
@@ -482,46 +555,6 @@ static void s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd)
        }
 }
-static void s3c64xx_spi_dma_rxcb(struct s3c2410_dma_chan *chan, void *buf_id,
-                                 int size, enum s3c2410_dma_buffresult res)
-{
-        struct s3c64xx_spi_driver_data *sdd = buf_id;
-        unsigned long flags;
-        spin_lock_irqsave(&sdd->lock, flags);
-        if (res == S3C2410_RES_OK)
-                sdd->state &= ~RXBUSY;
-        else
-                dev_err(&sdd->pdev->dev, "DmaAbrtRx-%d\n", size);
-        /* If the other done */
-        if (!(sdd->state & TXBUSY))
-                complete(&sdd->xfer_completion);
-        spin_unlock_irqrestore(&sdd->lock, flags);
-}
-static void s3c64xx_spi_dma_txcb(struct s3c2410_dma_chan *chan, void *buf_id,
-                                 int size, enum s3c2410_dma_buffresult res)
-{
-        struct s3c64xx_spi_driver_data *sdd = buf_id;
-        unsigned long flags;
-        spin_lock_irqsave(&sdd->lock, flags);
-        if (res == S3C2410_RES_OK)
-                sdd->state &= ~TXBUSY;
-        else
-                dev_err(&sdd->pdev->dev, "DmaAbrtTx-%d \n", size);
-        /* If the other done */
-        if (!(sdd->state & RXBUSY))
-                complete(&sdd->xfer_completion);
-        spin_unlock_irqrestore(&sdd->lock, flags);
-}
 #define XFER_DMAADDR_INVALID DMA_BIT_MASK(32)
 static int s3c64xx_spi_map_mssg(struct s3c64xx_spi_driver_data *sdd,
@@ -696,12 +729,10 @@ static void handle_msg(struct s3c64xx_spi_driver_data *sdd,
                        if (use_dma) {
                                if (xfer->tx_buf != NULL
                                                && (sdd->state & TXBUSY))
-                                        s3c2410_dma_ctrl(sdd->tx_dmach,
+                                        sdd->ops->stop(sdd->tx_dma.ch);
-                                                        S3C2410_DMAOP_FLUSH);
                                if (xfer->rx_buf != NULL
                                                && (sdd->state & RXBUSY))
-                                        s3c2410_dma_ctrl(sdd->rx_dmach,
+                                        sdd->ops->stop(sdd->rx_dma.ch);
-                                                        S3C2410_DMAOP_FLUSH);
                        }
                        goto out;
@@ -739,30 +770,6 @@ out:
                msg->complete(msg->context);
 }
-static int acquire_dma(struct s3c64xx_spi_driver_data *sdd)
-{
-        if (s3c2410_dma_request(sdd->rx_dmach,
-                                        &s3c64xx_spi_dma_client, NULL) < 0) {
-                dev_err(&sdd->pdev->dev, "cannot get RxDMA\n");
-                return 0;
-        }
-        s3c2410_dma_set_buffdone_fn(sdd->rx_dmach, s3c64xx_spi_dma_rxcb);
-        s3c2410_dma_devconfig(sdd->rx_dmach, S3C2410_DMASRC_HW,
-                                        sdd->sfr_start + S3C64XX_SPI_RX_DATA);
-        if (s3c2410_dma_request(sdd->tx_dmach,
-                                        &s3c64xx_spi_dma_client, NULL) < 0) {
-                dev_err(&sdd->pdev->dev, "cannot get TxDMA\n");
-                s3c2410_dma_free(sdd->rx_dmach, &s3c64xx_spi_dma_client);
-                return 0;
-        }
-        s3c2410_dma_set_buffdone_fn(sdd->tx_dmach, s3c64xx_spi_dma_txcb);
-        s3c2410_dma_devconfig(sdd->tx_dmach, S3C2410_DMASRC_MEM,
-                                        sdd->sfr_start + S3C64XX_SPI_TX_DATA);
-        return 1;
-}
 static void s3c64xx_spi_work(struct work_struct *work)
 {
        struct s3c64xx_spi_driver_data *sdd = container_of(work,
@@ -799,8 +806,8 @@ static void s3c64xx_spi_work(struct work_struct *work)
        spin_unlock_irqrestore(&sdd->lock, flags);
        /* Free DMA channels */
-        s3c2410_dma_free(sdd->tx_dmach, &s3c64xx_spi_dma_client);
+        sdd->ops->release(sdd->rx_dma.ch, &s3c64xx_spi_dma_client);
-        s3c2410_dma_free(sdd->rx_dmach, &s3c64xx_spi_dma_client);
+        sdd->ops->release(sdd->tx_dma.ch, &s3c64xx_spi_dma_client);
 }
 static int s3c64xx_spi_transfer(struct spi_device *spi,
@@ -1017,8 +1024,10 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)
        sdd->cntrlr_info = sci;
        sdd->pdev = pdev;
        sdd->sfr_start = mem_res->start;
-        sdd->tx_dmach = dmatx_res->start;
+        sdd->tx_dma.dmach = dmatx_res->start;
-        sdd->rx_dmach = dmarx_res->start;
+        sdd->tx_dma.direction = DMA_TO_DEVICE;
+        sdd->rx_dma.dmach = dmarx_res->start;
+        sdd->rx_dma.direction = DMA_FROM_DEVICE;
        sdd->cur_bpw = 8;
@@ -1106,7 +1115,7 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)
                                        pdev->id, master->num_chipselect);
        dev_dbg(&pdev->dev, "\tIOmem=[0x%x-0x%x]\tDMA=[Rx-%d, Tx-%d]\n",
                                        mem_res->end, mem_res->start,
-                                        sdd->rx_dmach, sdd->tx_dmach);
+                                        sdd->rx_dma.dmach, sdd->tx_dma.dmach);
        return 0;
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index 0f4834ae28cd..1f466bc66d9d 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -19,6 +19,7 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/spi/spi-sh-sci.c b/drivers/spi/spi-sh-sci.c
index 8844bc342782..097e506042be 100644
--- a/drivers/spi/spi-sh-sci.c
+++ b/drivers/spi/spi-sh-sci.c
@@ -22,6 +22,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_bitbang.h>
+#include <linux/module.h>
 #include <asm/spi.h>
 #include <asm/io.h>
diff --git a/drivers/spi/spi-ti-ssp.c b/drivers/spi/spi-ti-ssp.c
index 7963c60063d6..3f6f6e81c655 100644
--- a/drivers/spi/spi-ti-ssp.c
+++ b/drivers/spi/spi-ti-ssp.c
@@ -22,6 +22,7 @@
 #include <linux/err.h>
 #include <linux/completion.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
 #include <linux/mfd/ti_ssp.h>
diff --git a/drivers/spi/spi-tle62x0.c b/drivers/spi/spi-tle62x0.c
index 940e73d1cf09..0ce5c12aab55 100644
--- a/drivers/spi/spi-tle62x0.c
+++ b/drivers/spi/spi-tle62x0.c
@@ -11,6 +11,7 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/spi/spi-txx9.c b/drivers/spi/spi-txx9.c
index f0a2ab0428a3..d5a3cbb646cb 100644
--- a/drivers/spi/spi-txx9.c
+++ b/drivers/spi/spi-txx9.c
@@ -25,6 +25,7 @@
 #include <linux/err.h>
 #include <linux/clk.h>
 #include <linux/io.h>
+#include <linux/module.h>
 #include <asm/gpio.h>
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 4d1b9f517ce8..77eae99af11c 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -29,6 +29,7 @@
 #include <linux/spi/spi.h>
 #include <linux/of_spi.h>
 #include <linux/pm_runtime.h>
+#include <linux/export.h>
 static void spidev_release(struct device *dev)
 {
diff --git a/drivers/ssb/b43_pci_bridge.c b/drivers/ssb/b43_pci_bridge.c
index bf53e44c82a1..bad7ba517a1c 100644
--- a/drivers/ssb/b43_pci_bridge.c
+++ b/drivers/ssb/b43_pci_bridge.c
@@ -11,6 +11,7 @@
 */
 #include <linux/pci.h>
+#include <linux/module.h>
 #include <linux/ssb/ssb.h>
 #include "ssb_private.h"
diff --git a/drivers/ssb/driver_chipcommon.c b/drivers/ssb/driver_chipcommon.c
index 5d9c97c24797..e9d2ca11283b 100644
--- a/drivers/ssb/driver_chipcommon.c
+++ b/drivers/ssb/driver_chipcommon.c
@@ -10,6 +10,7 @@
 #include <linux/ssb/ssb.h>
 #include <linux/ssb/ssb_regs.h>
+#include <linux/export.h>
 #include <linux/pci.h>
 #include "ssb_private.h"
diff --git a/drivers/ssb/driver_chipcommon_pmu.c b/drivers/ssb/driver_chipcommon_pmu.c
index 52901c14c68b..e5a2e0e9bc19 100644
--- a/drivers/ssb/driver_chipcommon_pmu.c
+++ b/drivers/ssb/driver_chipcommon_pmu.c
@@ -12,6 +12,7 @@
 #include <linux/ssb/ssb_regs.h>
 #include <linux/ssb/ssb_driver_chipcommon.h>
 #include <linux/delay.h>
+#include <linux/export.h>
 #include "ssb_private.h"
diff --git a/drivers/ssb/driver_gige.c b/drivers/ssb/driver_gige.c
index 3adb98dad70c..f30ea689933a 100644
--- a/drivers/ssb/driver_gige.c
+++ b/drivers/ssb/driver_gige.c
@@ -10,6 +10,7 @@
 #include <linux/ssb/ssb.h>
 #include <linux/ssb/ssb_driver_gige.h>
+#include <linux/export.h>
 #include <linux/pci.h>
 #include <linux/pci_regs.h>
 #include <linux/slab.h>
diff --git a/drivers/ssb/driver_pcicore.c b/drivers/ssb/driver_pcicore.c
index e6ac3177fbbe..84c934c0a545 100644
--- a/drivers/ssb/driver_pcicore.c
+++ b/drivers/ssb/driver_pcicore.c
@@ -10,6 +10,7 @@
 #include <linux/ssb/ssb.h>
 #include <linux/pci.h>
+#include <linux/export.h>
 #include <linux/delay.h>
 #include <linux/ssb/ssb_embedded.h>
diff --git a/drivers/ssb/embedded.c b/drivers/ssb/embedded.c
index eec3e267be4d..9ef124f9ee2d 100644
--- a/drivers/ssb/embedded.c
+++ b/drivers/ssb/embedded.c
@@ -8,6 +8,7 @@
 * Licensed under the GNU/GPL. See COPYING for details.
 */
+#include <linux/export.h>
 #include <linux/ssb/ssb.h>
 #include <linux/ssb/ssb_embedded.h>
 #include <linux/ssb/ssb_driver_pci.h>
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index d0cbdb0cf9d5..bb6317fb925c 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -12,6 +12,7 @@
 #include <linux/delay.h>
 #include <linux/io.h>
+#include <linux/module.h>
 #include <linux/ssb/ssb.h>
 #include <linux/ssb/ssb_regs.h>
 #include <linux/ssb/ssb_driver_gige.h>
diff --git a/drivers/ssb/pcihost_wrapper.c b/drivers/ssb/pcihost_wrapper.c
index 116a8116984b..af5448f5e2d2 100644
--- a/drivers/ssb/pcihost_wrapper.c
+++ b/drivers/ssb/pcihost_wrapper.c
@@ -12,6 +12,7 @@
 */
 #include <linux/pci.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/ssb/ssb.h>
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index d132c27dfb3f..25cdff36a78a 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -30,12 +30,6 @@ source "drivers/staging/et131x/Kconfig"
 source "drivers/staging/slicoss/Kconfig"
-source "drivers/staging/go7007/Kconfig"
-source "drivers/staging/cx25821/Kconfig"
-source "drivers/staging/cxd2099/Kconfig"
 source "drivers/staging/usbip/Kconfig"
 source "drivers/staging/winbond/Kconfig"
@@ -104,20 +98,12 @@ source "drivers/staging/wlags49_h25/Kconfig"
 source "drivers/staging/sm7xx/Kconfig"
-source "drivers/staging/dt3155v4l/Kconfig"
 source "drivers/staging/crystalhd/Kconfig"
 source "drivers/staging/cxt1e1/Kconfig"
 source "drivers/staging/xgifb/Kconfig"
-source "drivers/staging/lirc/Kconfig"
-source "drivers/staging/easycap/Kconfig"
-source "drivers/staging/solo6x10/Kconfig"
 source "drivers/staging/tidspbridge/Kconfig"
 source "drivers/staging/quickstart/Kconfig"
@@ -144,4 +130,6 @@ source "drivers/staging/mei/Kconfig"
 source "drivers/staging/nvec/Kconfig"
+source "drivers/staging/media/Kconfig"
 endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 936b7c22e18e..a25f3f26c7ff 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -4,12 +4,9 @@
 obj-$(CONFIG_STAGING)           += staging.o
 obj-y                           += serial/
+obj-y                           += media/
 obj-$(CONFIG_ET131X)            += et131x/
 obj-$(CONFIG_SLICOSS)           += slicoss/
-obj-$(CONFIG_VIDEO_GO7007)      += go7007/
-obj-$(CONFIG_VIDEO_CX25821)     += cx25821/
-obj-$(CONFIG_DVB_CXD2099)       += cxd2099/
-obj-$(CONFIG_LIRC_STAGING)      += lirc/
 obj-$(CONFIG_USBIP_CORE)        += usbip/
 obj-$(CONFIG_W35UND)            += winbond/
 obj-$(CONFIG_PRISM2_USB)        += wlan-ng/
@@ -44,12 +41,9 @@ obj-$(CONFIG_ZCACHE)		+= zcache/
 obj-$(CONFIG_WLAGS49_H2)        += wlags49_h2/
 obj-$(CONFIG_WLAGS49_H25)       += wlags49_h25/
 obj-$(CONFIG_FB_SM7XX)          += sm7xx/
-obj-$(CONFIG_VIDEO_DT3155)      += dt3155v4l/
 obj-$(CONFIG_CRYSTALHD)         += crystalhd/
 obj-$(CONFIG_CXT1E1)            += cxt1e1/
 obj-$(CONFIG_FB_XGI)            += xgifb/
-obj-$(CONFIG_EASYCAP)           += easycap/
-obj-$(CONFIG_SOLO6X10)          += solo6x10/
 obj-$(CONFIG_TIDSPBRIDGE)       += tidspbridge/
 obj-$(CONFIG_ACPI_QUICKSTART)   += quickstart/
 obj-$(CONFIG_SBE_2T3E3)         += sbe-2t3e3/
diff --git a/drivers/staging/cx25821/README b/drivers/staging/cx25821/README
deleted file mode 100644
index a9ba50b9888b..000000000000
--- a/drivers/staging/cx25821/README
+++ /dev/null
@@ -1,6 +0,0 @@
-Todo:
-        - checkpatch.pl cleanups
-        - sparse cleanups
-Please send patches to linux-media@vger.kernel.org
diff --git a/drivers/staging/cxt1e1/linux.c b/drivers/staging/cxt1e1/linux.c
index 24e009c0149b..911c0e4375fd 100644
--- a/drivers/staging/cxt1e1/linux.c
+++ b/drivers/staging/cxt1e1/linux.c
@@ -16,6 +16,7 @@
 #include <linux/types.h>
 #include <linux/netdevice.h>
+#include <linux/module.h>
 #include <linux/hdlc.h>
 #include <linux/if_arp.h>
 #include <linux/init.h>
diff --git a/drivers/staging/gma500/intel_i2c.c b/drivers/staging/gma500/intel_i2c.c
index e33432df510c..51cbf65268e6 100644
--- a/drivers/staging/gma500/intel_i2c.c
+++ b/drivers/staging/gma500/intel_i2c.c
@@ -20,6 +20,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
+#include <linux/export.h>
 #include "psb_drv.h"
 #include "psb_intel_reg.h"
diff --git a/drivers/staging/gma500/mdfld_dsi_output.c b/drivers/staging/gma500/mdfld_dsi_output.c
index 9050c0f78b15..3f979db2c3a5 100644
--- a/drivers/staging/gma500/mdfld_dsi_output.c
+++ b/drivers/staging/gma500/mdfld_dsi_output.c
@@ -32,6 +32,7 @@
 #include <asm/intel_scu_ipc.h>
 #include "mdfld_dsi_pkg_sender.h"
 #include <linux/pm_runtime.h>
+#include <linux/moduleparam.h>
 #define MDFLD_DSI_BRIGHTNESS_MAX_LEVEL 100
diff --git a/drivers/staging/gma500/mdfld_output.c b/drivers/staging/gma500/mdfld_output.c
index ee55f87ba1fd..eabf53d58f92 100644
--- a/drivers/staging/gma500/mdfld_output.c
+++ b/drivers/staging/gma500/mdfld_output.c
@@ -26,6 +26,7 @@
 */
 #include <linux/init.h>
+#include <linux/moduleparam.h>
 #include "mdfld_dsi_dbi.h"
 #include "mdfld_dsi_dpi.h"
 #include "mdfld_dsi_output.h"
@@ -167,4 +168,4 @@ void mdfld_output_setup(struct drm_device *dev)
                else
                        mdfld_dbi_dsr_init(dev);
        }
-}
-\ No newline at end of file
+}
diff --git a/drivers/staging/gma500/mid_bios.c b/drivers/staging/gma500/mid_bios.c
index 8cfe301f8fb2..ee3c0368e320 100644
--- a/drivers/staging/gma500/mid_bios.c
+++ b/drivers/staging/gma500/mid_bios.c
@@ -23,6 +23,7 @@
 * - Check ioremap failures
 */
+#include <linux/moduleparam.h>
 #include <drm/drmP.h>
 #include <drm/drm.h>
 #include "psb_drm.h"
diff --git a/drivers/staging/gma500/mrst_hdmi_i2c.c b/drivers/staging/gma500/mrst_hdmi_i2c.c
index 351b9d897b9f..36e7edc4d14c 100644
--- a/drivers/staging/gma500/mrst_hdmi_i2c.c
+++ b/drivers/staging/gma500/mrst_hdmi_i2c.c
@@ -29,6 +29,7 @@
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
+#include <linux/export.h>
 #include "psb_drv.h"
 #define HDMI_READ(reg)          readl(hdmi_dev->regs + (reg))
diff --git a/drivers/staging/gma500/psb_drv.c b/drivers/staging/gma500/psb_drv.c
index dc676c2ce810..986a04d16ba8 100644
--- a/drivers/staging/gma500/psb_drv.c
+++ b/drivers/staging/gma500/psb_drv.c
@@ -35,6 +35,7 @@
 #include <linux/notifier.h>
 #include <linux/spinlock.h>
 #include <linux/pm_runtime.h>
+#include <linux/module.h>
 #include <acpi/video.h>
 static int drm_psb_trap_pagefaults;
diff --git a/drivers/staging/iio/accel/adis16201_ring.c b/drivers/staging/iio/accel/adis16201_ring.c
index dbd883294d6c..0016ed378e3a 100644
--- a/drivers/staging/iio/accel/adis16201_ring.c
+++ b/drivers/staging/iio/accel/adis16201_ring.c
@@ -1,3 +1,4 @@
+#include <linux/export.h>
 #include <linux/interrupt.h>
 #include <linux/mutex.h>
 #include <linux/kernel.h>
diff --git a/drivers/staging/iio/accel/adis16201_trigger.c b/drivers/staging/iio/accel/adis16201_trigger.c
index f448258884c5..bce505e716d0 100644
--- a/drivers/staging/iio/accel/adis16201_trigger.c
+++ b/drivers/staging/iio/accel/adis16201_trigger.c
@@ -1,6 +1,7 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/spi/spi.h>
+#include <linux/export.h>
 #include "../iio.h"
 #include "../trigger.h"
diff --git a/drivers/staging/iio/accel/adis16203_ring.c b/drivers/staging/iio/accel/adis16203_ring.c
index 838d3012c87b..1fdfe6f6ac6e 100644
--- a/drivers/staging/iio/accel/adis16203_ring.c
+++ b/drivers/staging/iio/accel/adis16203_ring.c
@@ -1,3 +1,4 @@
+#include <linux/export.h>
 #include <linux/interrupt.h>
 #include <linux/mutex.h>
 #include <linux/kernel.h>
diff --git a/drivers/staging/iio/accel/adis16203_trigger.c b/drivers/staging/iio/accel/adis16203_trigger.c
index 50165f9ddc52..24bcb8e15c55 100644
--- a/drivers/staging/iio/accel/adis16203_trigger.c
+++ b/drivers/staging/iio/accel/adis16203_trigger.c
@@ -1,6 +1,7 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/spi/spi.h>
+#include <linux/export.h>
 #include "../iio.h"
 #include "../trigger.h"
diff --git a/drivers/staging/iio/accel/adis16204_ring.c b/drivers/staging/iio/accel/adis16204_ring.c
index 08551bb48f18..6fd3d8f51f2c 100644
--- a/drivers/staging/iio/accel/adis16204_ring.c
+++ b/drivers/staging/iio/accel/adis16204_ring.c
@@ -1,3 +1,4 @@
+#include <linux/export.h>
 #include <linux/interrupt.h>
 #include <linux/mutex.h>
 #include <linux/kernel.h>
diff --git a/drivers/staging/iio/accel/adis16204_trigger.c b/drivers/staging/iio/accel/adis16204_trigger.c
index 55b661c98d2d..6e542af02c09 100644
--- a/drivers/staging/iio/accel/adis16204_trigger.c
+++ b/drivers/staging/iio/accel/adis16204_trigger.c
@@ -1,6 +1,7 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/spi/spi.h>
+#include <linux/export.h>
 #include "../iio.h"
 #include "../trigger.h"
diff --git a/drivers/staging/iio/accel/adis16209_ring.c b/drivers/staging/iio/accel/adis16209_ring.c
index bb66364bef04..d17e39d95459 100644
--- a/drivers/staging/iio/accel/adis16209_ring.c
+++ b/drivers/staging/iio/accel/adis16209_ring.c
@@ -1,3 +1,4 @@
+#include <linux/export.h>
 #include <linux/interrupt.h>
 #include <linux/mutex.h>
 #include <linux/kernel.h>
diff --git a/drivers/staging/iio/accel/adis16209_trigger.c b/drivers/staging/iio/accel/adis16209_trigger.c
index 8df8a9791d5e..c5d82c1a55d9 100644
--- a/drivers/staging/iio/accel/adis16209_trigger.c
+++ b/drivers/staging/iio/accel/adis16209_trigger.c
@@ -1,6 +1,7 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/spi/spi.h>
+#include <linux/export.h>
 #include "../iio.h"
 #include "../trigger.h"
diff --git a/drivers/staging/iio/accel/adis16240_ring.c b/drivers/staging/iio/accel/adis16240_ring.c
index 34f1e7e6a56f..b907ca3f4fdf 100644
--- a/drivers/staging/iio/accel/adis16240_ring.c
+++ b/drivers/staging/iio/accel/adis16240_ring.c
@@ -1,3 +1,4 @@
+#include <linux/export.h>
 #include <linux/interrupt.h>
 #include <linux/mutex.h>
 #include <linux/kernel.h>
diff --git a/drivers/staging/iio/accel/adis16240_trigger.c b/drivers/staging/iio/accel/adis16240_trigger.c
index 13f1d142eea3..8e0ce568e64c 100644
--- a/drivers/staging/iio/accel/adis16240_trigger.c
+++ b/drivers/staging/iio/accel/adis16240_trigger.c
@@ -1,6 +1,7 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/spi/spi.h>
+#include <linux/export.h>
 #include "../iio.h"
 #include "../trigger.h"
diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
index 5c542dd04616..89527af8f4c5 100644
--- a/drivers/staging/iio/accel/lis3l02dq_ring.c
+++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
@@ -4,6 +4,7 @@
 #include <linux/kernel.h>
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "../iio.h"
 #include "../ring_sw.h"
diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c
index a831b92cd082..999f8f746cff 100644
--- a/drivers/staging/iio/adc/ad7793.c
+++ b/drivers/staging/iio/adc/ad7793.c
@@ -16,6 +16,7 @@
 #include <linux/err.h>
 #include <linux/sched.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 #include "../iio.h"
 #include "../sysfs.h"
diff --git a/drivers/staging/iio/dac/ad5686.c b/drivers/staging/iio/dac/ad5686.c
index 48389e1c19f1..974c6f5b60c4 100644
--- a/drivers/staging/iio/dac/ad5686.c
+++ b/drivers/staging/iio/dac/ad5686.c
@@ -15,6 +15,7 @@
 #include <linux/slab.h>
 #include <linux/sysfs.h>
 #include <linux/regulator/consumer.h>
+#include <linux/module.h>
 #include "../iio.h"
 #include "../sysfs.h"
diff --git a/drivers/staging/iio/gyro/adis16060_core.c b/drivers/staging/iio/gyro/adis16060_core.c
index 38cf3f4bf726..ff1b5a82b3d6 100644
--- a/drivers/staging/iio/gyro/adis16060_core.c
+++ b/drivers/staging/iio/gyro/adis16060_core.c
@@ -6,6 +6,7 @@
 * Licensed under the GPL-2 or later.
 */
+#include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
 #include <linux/device.h>
diff --git a/drivers/staging/iio/gyro/adis16260_ring.c b/drivers/staging/iio/gyro/adis16260_ring.c
index 679c15155716..52a9e784e7c8 100644
--- a/drivers/staging/iio/gyro/adis16260_ring.c
+++ b/drivers/staging/iio/gyro/adis16260_ring.c
@@ -1,3 +1,4 @@
+#include <linux/export.h>
 #include <linux/interrupt.h>
 #include <linux/mutex.h>
 #include <linux/kernel.h>
diff --git a/drivers/staging/iio/gyro/adis16260_trigger.c b/drivers/staging/iio/gyro/adis16260_trigger.c
index 2f2b2160f44d..8299cd18d705 100644
--- a/drivers/staging/iio/gyro/adis16260_trigger.c
+++ b/drivers/staging/iio/gyro/adis16260_trigger.c
@@ -1,6 +1,7 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/spi/spi.h>
+#include <linux/export.h>
 #include "../iio.h"
 #include "../trigger.h"
diff --git a/drivers/staging/iio/iio_simple_dummy_buffer.c b/drivers/staging/iio/iio_simple_dummy_buffer.c
index f0b36d25414d..edad0e7b4f4d 100644
--- a/drivers/staging/iio/iio_simple_dummy_buffer.c
+++ b/drivers/staging/iio/iio_simple_dummy_buffer.c
@@ -12,6 +12,7 @@
 */
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
diff --git a/drivers/staging/iio/imu/adis16400_ring.c b/drivers/staging/iio/imu/adis16400_ring.c
index c3682458d78d..fd886bf51a6d 100644
--- a/drivers/staging/iio/imu/adis16400_ring.c
+++ b/drivers/staging/iio/imu/adis16400_ring.c
@@ -4,6 +4,7 @@
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
 #include <linux/bitops.h>
+#include <linux/export.h>
 #include "../iio.h"
 #include "../ring_sw.h"
diff --git a/drivers/staging/iio/imu/adis16400_trigger.c b/drivers/staging/iio/imu/adis16400_trigger.c
index bf991531e0d6..5bf000757522 100644
--- a/drivers/staging/iio/imu/adis16400_trigger.c
+++ b/drivers/staging/iio/imu/adis16400_trigger.c
@@ -1,6 +1,7 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/spi/spi.h>
+#include <linux/export.h>
 #include "../iio.h"
 #include "../trigger.h"
diff --git a/drivers/staging/iio/industrialio-buffer.c b/drivers/staging/iio/industrialio-buffer.c
index 6dd5d7d629a1..9df0ce81dade 100644
--- a/drivers/staging/iio/industrialio-buffer.c
+++ b/drivers/staging/iio/industrialio-buffer.c
@@ -14,6 +14,7 @@
 * - Alternative access techniques?
 */
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/device.h>
 #include <linux/fs.h>
 #include <linux/cdev.h>
diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c
index 99ade658a2dc..00fa2ac5c459 100644
--- a/drivers/staging/iio/meter/ade7758_ring.c
+++ b/drivers/staging/iio/meter/ade7758_ring.c
@@ -5,6 +5,7 @@
 *
 * Licensed under the GPL-2.
 */
+#include <linux/export.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/staging/iio/meter/ade7758_trigger.c b/drivers/staging/iio/meter/ade7758_trigger.c
index 392dfe302443..b6569c706651 100644
--- a/drivers/staging/iio/meter/ade7758_trigger.c
+++ b/drivers/staging/iio/meter/ade7758_trigger.c
@@ -9,6 +9,7 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/spi/spi.h>
+#include <linux/export.h>
 #include "../iio.h"
 #include "../trigger.h"
diff --git a/drivers/staging/intel_sst/intel_sst.c b/drivers/staging/intel_sst/intel_sst.c
index c303d85011b0..ff9aaec0557f 100644
--- a/drivers/staging/intel_sst/intel_sst.c
+++ b/drivers/staging/intel_sst/intel_sst.c
@@ -37,6 +37,7 @@
 #include <linux/firmware.h>
 #include <linux/miscdevice.h>
 #include <linux/pm_runtime.h>
+#include <linux/module.h>
 #include <asm/mrst.h>
 #include "intel_sst.h"
 #include "intel_sst_ioctl.h"
diff --git a/drivers/staging/intel_sst/intel_sst_drv_interface.c b/drivers/staging/intel_sst/intel_sst_drv_interface.c
index 69daa1404b68..22bd29c0c439 100644
--- a/drivers/staging/intel_sst/intel_sst_drv_interface.c
+++ b/drivers/staging/intel_sst/intel_sst_drv_interface.c
@@ -33,6 +33,7 @@
 #include <linux/fs.h>
 #include <linux/firmware.h>
 #include <linux/pm_runtime.h>
+#include <linux/export.h>
 #include "intel_sst.h"
 #include "intel_sst_ioctl.h"
 #include "intel_sst_fw_ipc.h"
diff --git a/drivers/staging/line6/audio.c b/drivers/staging/line6/audio.c
index 61db1f99b0c8..8e7398393a59 100644
--- a/drivers/staging/line6/audio.c
+++ b/drivers/staging/line6/audio.c
@@ -11,6 +11,7 @@
 #include <sound/core.h>
 #include <sound/initval.h>
+#include <linux/export.h>
 #include "driver.h"
 #include "audio.h"
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
new file mode 100644
index 000000000000..7e5caa39ed3f
--- /dev/null
+++ b/drivers/staging/media/Kconfig
@@ -0,0 +1,37 @@
+menuconfig STAGING_MEDIA
+        bool "Media staging drivers"
+        default n
+        ---help---
+          This option allows you to select a number of media drivers that
+          don't have the "normal" Linux kernel quality level.
+          Most of them don't follow properly the V4L, DVB and/or RC API's,
+          so, they won't likely work fine with the existing applications.
+          That also means that, one fixed, their API's will change to match
+          the existing ones.
+          If you wish to work on these drivers, to help improve them, or
+          to report problems you have with them, please use the
+          linux-media@vger.kernel.org mailing list.
+          If in doubt, say N here.
+if STAGING_MEDIA
+# Please keep them in alphabetic order
+source "drivers/staging/media/as102/Kconfig"
+source "drivers/staging/media/cxd2099/Kconfig"
+source "drivers/staging/media/dt3155v4l/Kconfig"
+source "drivers/staging/media/easycap/Kconfig"
+source "drivers/staging/media/go7007/Kconfig"
+source "drivers/staging/media/solo6x10/Kconfig"
+# Keep LIRC at the end, as it has sub-menus
+source "drivers/staging/media/lirc/Kconfig"
+endif
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
new file mode 100644
index 000000000000..c69124cdb0d3
--- /dev/null
+++ b/drivers/staging/media/Makefile
@@ -0,0 +1,7 @@
+obj-$(CONFIG_DVB_AS102)         += as102/
+obj-$(CONFIG_DVB_CXD2099)       += cxd2099/
+obj-$(CONFIG_EASYCAP)           += easycap/
+obj-$(CONFIG_LIRC_STAGING)      += lirc/
+obj-$(CONFIG_SOLO6X10)          += solo6x10/
+obj-$(CONFIG_VIDEO_DT3155)      += dt3155v4l/
+obj-$(CONFIG_VIDEO_GO7007)      += go7007/
diff --git a/drivers/staging/media/as102/Kconfig b/drivers/staging/media/as102/Kconfig
new file mode 100644
index 000000000000..5865029db0f6
--- /dev/null
+++ b/drivers/staging/media/as102/Kconfig
@@ -0,0 +1,7 @@
+config DVB_AS102
+        tristate "Abilis AS102 DVB receiver"
+        depends on DVB_CORE && USB && I2C && INPUT
+        help
+          Choose Y or M here if you have a device containing an AS102
+          To compile this driver as a module, choose M here
diff --git a/drivers/staging/media/as102/Makefile b/drivers/staging/media/as102/Makefile
new file mode 100644
index 000000000000..e7dbb6f814d5
--- /dev/null
+++ b/drivers/staging/media/as102/Makefile
@@ -0,0 +1,6 @@
+dvb-as102-objs := as102_drv.o as102_fw.o as10x_cmd.o as10x_cmd_stream.o \
+                as102_fe.o as102_usb_drv.o as10x_cmd_cfg.o
+obj-$(CONFIG_DVB_AS102) += dvb-as102.o
+EXTRA_CFLAGS += -DCONFIG_AS102_USB -Idrivers/media/dvb/dvb-core
diff --git a/drivers/staging/media/as102/as102_drv.c b/drivers/staging/media/as102/as102_drv.c
new file mode 100644
index 000000000000..d335c7d6fa0f
--- /dev/null
+++ b/drivers/staging/media/as102/as102_drv.c
@@ -0,0 +1,351 @@
+/*
+ * Abilis Systems Single DVB-T Receiver
+ * Copyright (C) 2008 Pierrick Hascoet <pierrick.hascoet@abilis.com>
+ * Copyright (C) 2010 Devin Heitmueller <dheitmueller@kernellabs.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, 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.
+ */
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/mm.h>
+#include <linux/kref.h>
+#include <asm/uaccess.h>
+#include <linux/usb.h>
+/* header file for Usb device driver*/
+#include "as102_drv.h"
+#include "as102_fw.h"
+#include "dvbdev.h"
+int debug;
+module_param_named(debug, debug, int, 0644);
+MODULE_PARM_DESC(debug, "Turn on/off debugging (default: off)");
+int dual_tuner;
+module_param_named(dual_tuner, dual_tuner, int, 0644);
+MODULE_PARM_DESC(dual_tuner, "Activate Dual-Tuner config (default: off)");
+static int fw_upload = 1;
+module_param_named(fw_upload, fw_upload, int, 0644);
+MODULE_PARM_DESC(fw_upload, "Turn on/off default FW upload (default: on)");
+static int pid_filtering;
+module_param_named(pid_filtering, pid_filtering, int, 0644);
+MODULE_PARM_DESC(pid_filtering, "Activate HW PID filtering (default: off)");
+static int ts_auto_disable;
+module_param_named(ts_auto_disable, ts_auto_disable, int, 0644);
+MODULE_PARM_DESC(ts_auto_disable, "Stream Auto Enable on FW (default: off)");
+int elna_enable = 1;
+module_param_named(elna_enable, elna_enable, int, 0644);
+MODULE_PARM_DESC(elna_enable, "Activate eLNA (default: on)");
+#ifdef DVB_DEFINE_MOD_OPT_ADAPTER_NR
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+#endif
+static void as102_stop_stream(struct as102_dev_t *dev)
+{
+        struct as102_bus_adapter_t *bus_adap;
+        if (dev != NULL)
+                bus_adap = &dev->bus_adap;
+        else
+                return;
+        if (bus_adap->ops->stop_stream != NULL)
+                bus_adap->ops->stop_stream(dev);
+        if (ts_auto_disable) {
+                if (mutex_lock_interruptible(&dev->bus_adap.lock))
+                        return;
+                if (as10x_cmd_stop_streaming(bus_adap) < 0)
+                        dprintk(debug, "as10x_cmd_stop_streaming failed\n");
+                mutex_unlock(&dev->bus_adap.lock);
+        }
+}
+static int as102_start_stream(struct as102_dev_t *dev)
+{
+        struct as102_bus_adapter_t *bus_adap;
+        int ret = -EFAULT;
+        if (dev != NULL)
+                bus_adap = &dev->bus_adap;
+        else
+                return ret;
+        if (bus_adap->ops->start_stream != NULL)
+                ret = bus_adap->ops->start_stream(dev);
+        if (ts_auto_disable) {
+                if (mutex_lock_interruptible(&dev->bus_adap.lock))
+                        return -EFAULT;
+                ret = as10x_cmd_start_streaming(bus_adap);
+                mutex_unlock(&dev->bus_adap.lock);
+        }
+        return ret;
+}
+static int as10x_pid_filter(struct as102_dev_t *dev,
+                            int index, u16 pid, int onoff) {
+        struct as102_bus_adapter_t *bus_adap = &dev->bus_adap;
+        int ret = -EFAULT;
+        ENTER();
+        if (mutex_lock_interruptible(&dev->bus_adap.lock)) {
+                dprintk(debug, "mutex_lock_interruptible(lock) failed !\n");
+                return -EBUSY;
+        }
+        switch (onoff) {
+        case 0:
+            ret = as10x_cmd_del_PID_filter(bus_adap, (uint16_t) pid);
+            dprintk(debug, "DEL_PID_FILTER([%02d] 0x%04x) ret = %d\n",
+                    index, pid, ret);
+            break;
+        case 1:
+        {
+            struct as10x_ts_filter filter;
+            filter.type = TS_PID_TYPE_TS;
+            filter.idx = 0xFF;
+            filter.pid = pid;
+            ret = as10x_cmd_add_PID_filter(bus_adap, &filter);
+            dprintk(debug, "ADD_PID_FILTER([%02d -> %02d], 0x%04x) ret = %d\n",
+                    index, filter.idx, filter.pid, ret);
+            break;
+        }
+        }
+        mutex_unlock(&dev->bus_adap.lock);
+        LEAVE();
+        return ret;
+}
+static int as102_dvb_dmx_start_feed(struct dvb_demux_feed *dvbdmxfeed)
+{
+        int ret = 0;
+        struct dvb_demux *demux = dvbdmxfeed->demux;
+        struct as102_dev_t *as102_dev = demux->priv;
+        ENTER();
+        if (mutex_lock_interruptible(&as102_dev->sem))
+                return -ERESTARTSYS;
+        if (pid_filtering) {
+                as10x_pid_filter(as102_dev,
+                                dvbdmxfeed->index, dvbdmxfeed->pid, 1);
+        }
+        if (as102_dev->streaming++ == 0)
+                ret = as102_start_stream(as102_dev);
+        mutex_unlock(&as102_dev->sem);
+        LEAVE();
+        return ret;
+}
+static int as102_dvb_dmx_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
+{
+        struct dvb_demux *demux = dvbdmxfeed->demux;
+        struct as102_dev_t *as102_dev = demux->priv;
+        ENTER();
+        if (mutex_lock_interruptible(&as102_dev->sem))
+                return -ERESTARTSYS;
+        if (--as102_dev->streaming == 0)
+                as102_stop_stream(as102_dev);
+        if (pid_filtering) {
+                as10x_pid_filter(as102_dev,
+                                dvbdmxfeed->index, dvbdmxfeed->pid, 0);
+        }
+        mutex_unlock(&as102_dev->sem);
+        LEAVE();
+        return 0;
+}
+int as102_dvb_register(struct as102_dev_t *as102_dev)
+{
+        int ret = 0;
+        ENTER();
+        ret = dvb_register_adapter(&as102_dev->dvb_adap,
+                                   as102_dev->name,
+                                   THIS_MODULE,
+#if defined(CONFIG_AS102_USB)
+                                   &as102_dev->bus_adap.usb_dev->dev
+#elif defined(CONFIG_AS102_SPI)
+                                   &as102_dev->bus_adap.spi_dev->dev
+#else
+#error >>> dvb_register_adapter <<<
+#endif
+#ifdef DVB_DEFINE_MOD_OPT_ADAPTER_NR
+                                   , adapter_nr
+#endif
+                                   );
+        if (ret < 0) {
+                err("%s: dvb_register_adapter() failed (errno = %d)",
+                    __func__, ret);
+                goto failed;
+        }
+        as102_dev->dvb_dmx.priv = as102_dev;
+        as102_dev->dvb_dmx.filternum = pid_filtering ? 16 : 256;
+        as102_dev->dvb_dmx.feednum = 256;
+        as102_dev->dvb_dmx.start_feed = as102_dvb_dmx_start_feed;
+        as102_dev->dvb_dmx.stop_feed = as102_dvb_dmx_stop_feed;
+        as102_dev->dvb_dmx.dmx.capabilities = DMX_TS_FILTERING |
+                                              DMX_SECTION_FILTERING;
+        as102_dev->dvb_dmxdev.filternum = as102_dev->dvb_dmx.filternum;
+        as102_dev->dvb_dmxdev.demux = &as102_dev->dvb_dmx.dmx;
+        as102_dev->dvb_dmxdev.capabilities = 0;
+        ret = dvb_dmx_init(&as102_dev->dvb_dmx);
+        if (ret < 0) {
+                err("%s: dvb_dmx_init() failed (errno = %d)", __func__, ret);
+                goto failed;
+        }
+        ret = dvb_dmxdev_init(&as102_dev->dvb_dmxdev, &as102_dev->dvb_adap);
+        if (ret < 0) {
+                err("%s: dvb_dmxdev_init() failed (errno = %d)", __func__,
+                    ret);
+                goto failed;
+        }
+        ret = as102_dvb_register_fe(as102_dev, &as102_dev->dvb_fe);
+        if (ret < 0) {
+                err("%s: as102_dvb_register_frontend() failed (errno = %d)",
+                    __func__, ret);
+                goto failed;
+        }
+        /* init bus mutex for token locking */
+        mutex_init(&as102_dev->bus_adap.lock);
+        /* init start / stop stream mutex */
+        mutex_init(&as102_dev->sem);
+#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
+        /*
+         * try to load as102 firmware. If firmware upload failed, we'll be
+         * able to upload it later.
+         */
+        if (fw_upload)
+                try_then_request_module(as102_fw_upload(&as102_dev->bus_adap),
+                                "firmware_class");
+#endif
+failed:
+        LEAVE();
+        /* FIXME: free dvb_XXX */
+        return ret;
+}
+void as102_dvb_unregister(struct as102_dev_t *as102_dev)
+{
+        ENTER();
+        /* unregister as102 frontend */
+        as102_dvb_unregister_fe(&as102_dev->dvb_fe);
+        /* unregister demux device */
+        dvb_dmxdev_release(&as102_dev->dvb_dmxdev);
+        dvb_dmx_release(&as102_dev->dvb_dmx);
+        /* unregister dvb adapter */
+        dvb_unregister_adapter(&as102_dev->dvb_adap);
+        LEAVE();
+}
+static int __init as102_driver_init(void)
+{
+        int ret = 0;
+        ENTER();
+        /* register this driver with the low level subsystem */
+#if defined(CONFIG_AS102_USB)
+        ret = usb_register(&as102_usb_driver);
+        if (ret)
+                err("usb_register failed (ret = %d)", ret);
+#endif
+#if defined(CONFIG_AS102_SPI)
+        ret = spi_register_driver(&as102_spi_driver);
+        if (ret)
+                printk(KERN_ERR "spi_register failed (ret = %d)", ret);
+#endif
+        LEAVE();
+        return ret;
+}
+/*
+ * Mandatory function : Adds a special section to the module indicating
+ * where initialisation function is defined
+ */
+module_init(as102_driver_init);
+/**
+ * as102_driver_exit - as102 driver exit point
+ *
+ * This function is called when device has to be removed.
+ */
+static void __exit as102_driver_exit(void)
+{
+        ENTER();
+        /* deregister this driver with the low level bus subsystem */
+#if defined(CONFIG_AS102_USB)
+        usb_deregister(&as102_usb_driver);
+#endif
+#if defined(CONFIG_AS102_SPI)
+        spi_unregister_driver(&as102_spi_driver);
+#endif
+        LEAVE();
+}
+/*
+ * required function for unload: Adds a special section to the module
+ * indicating where unload function is defined
+ */
+module_exit(as102_driver_exit);
+/* modinfo details */
+MODULE_DESCRIPTION(DRIVER_FULL_NAME);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Pierrick Hascoet <pierrick.hascoet@abilis.com>");
+/* EOF - vim: set textwidth=80 ts=8 sw=8 sts=8 noet: */
diff --git a/drivers/staging/media/as102/as102_drv.h b/drivers/staging/media/as102/as102_drv.h
new file mode 100644
index 000000000000..bcda635b5a99
--- /dev/null
+++ b/drivers/staging/media/as102/as102_drv.h
@@ -0,0 +1,141 @@
+/*
+ * Abilis Systems Single DVB-T Receiver
+ * Copyright (C) 2008 Pierrick Hascoet <pierrick.hascoet@abilis.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, 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.
+ */
+#if defined(CONFIG_AS102_USB)
+#include <linux/usb.h>
+extern struct usb_driver as102_usb_driver;
+#endif
+#if defined(CONFIG_AS102_SPI)
+#include <linux/platform_device.h>
+#include <linux/spi/spi.h>
+#include <linux/cdev.h>
+extern struct spi_driver as102_spi_driver;
+#endif
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dmxdev.h"
+#define DRIVER_FULL_NAME "Abilis Systems as10x usb driver"
+#define DRIVER_NAME "as10x_usb"
+extern int debug;
+#define dprintk(debug, args...) \
+        do { if (debug) {       \
+                printk(KERN_DEBUG "%s: ",__FUNCTION__); \
+                printk(args);   \
+        } } while (0)
+#ifdef TRACE
+#define ENTER()                 printk(">> enter %s\n", __FUNCTION__)
+#define LEAVE()                 printk("<< leave %s\n", __FUNCTION__)
+#else
+#define ENTER()
+#define LEAVE()
+#endif
+#define AS102_DEVICE_MAJOR      192
+#define AS102_USB_BUF_SIZE      512
+#define MAX_STREAM_URB          32
+#include "as10x_cmd.h"
+#if defined(CONFIG_AS102_USB)
+#include "as102_usb_drv.h"
+#endif
+#if defined(CONFIG_AS102_SPI)
+#include "as10x_spi_drv.h"
+#endif
+struct as102_bus_adapter_t {
+#if defined(CONFIG_AS102_USB)
+        struct usb_device *usb_dev;
+#elif defined(CONFIG_AS102_SPI)
+        struct spi_device *spi_dev;
+        struct cdev cdev; /* spidev raw device */
+        struct timer_list timer;
+        struct completion xfer_done;
+#endif
+        /* bus token lock */
+        struct mutex lock;
+        /* low level interface for bus adapter */
+        union as10x_bus_token_t {
+#if defined(CONFIG_AS102_USB)
+                /* usb token */
+                struct as10x_usb_token_cmd_t usb;
+#endif
+#if defined(CONFIG_AS102_SPI)
+                /* spi token */
+                struct as10x_spi_token_cmd_t spi;
+#endif
+        } token;
+        /* token cmd xfer id */
+        uint16_t cmd_xid;
+        /* as10x command and response for dvb interface*/
+        struct as10x_cmd_t *cmd, *rsp;
+        /* bus adapter private ops callback */
+        struct as102_priv_ops_t *ops;
+};
+struct as102_dev_t {
+        const char *name;
+        struct as102_bus_adapter_t bus_adap;
+        struct list_head device_entry;
+        struct kref kref;
+        unsigned long minor;
+        struct dvb_adapter dvb_adap;
+        struct dvb_frontend dvb_fe;
+        struct dvb_demux dvb_dmx;
+        struct dmxdev dvb_dmxdev;
+        /* demodulator stats */
+        struct as10x_demod_stats demod_stats;
+        /* signal strength */
+        uint16_t signal_strength;
+        /* bit error rate */
+        uint32_t ber;
+        /* timer handle to trig ts stream download */
+        struct timer_list timer_handle;
+        struct mutex sem;
+        dma_addr_t dma_addr;
+        void *stream;
+        int streaming;
+        struct urb *stream_urb[MAX_STREAM_URB];
+};
+int as102_dvb_register(struct as102_dev_t *dev);
+void as102_dvb_unregister(struct as102_dev_t *dev);
+int as102_dvb_register_fe(struct as102_dev_t *dev, struct dvb_frontend *fe);
+int as102_dvb_unregister_fe(struct dvb_frontend *dev);
+/* EOF - vim: set textwidth=80 ts=8 sw=8 sts=8 noet: */
diff --git a/drivers/staging/media/as102/as102_fe.c b/drivers/staging/media/as102/as102_fe.c
new file mode 100644
index 000000000000..3550f905367e
--- /dev/null
+++ b/drivers/staging/media/as102/as102_fe.c
@@ -0,0 +1,603 @@
+/*
+ * Abilis Systems Single DVB-T Receiver
+ * Copyright (C) 2008 Pierrick Hascoet <pierrick.hascoet@abilis.com>
+ * Copyright (C) 2010 Devin Heitmueller <dheitmueller@kernellabs.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, 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.
+ */
+#include <linux/version.h>
+#include "as102_drv.h"
+#include "as10x_types.h"
+#include "as10x_cmd.h"
+extern int elna_enable;
+static void as10x_fe_copy_tps_parameters(struct dvb_frontend_parameters *dst,
+                                         struct as10x_tps *src);
+static void as102_fe_copy_tune_parameters(struct as10x_tune_args *dst,
+                                          struct dvb_frontend_parameters *src);
+static int as102_fe_set_frontend(struct dvb_frontend *fe,
+                                 struct dvb_frontend_parameters *params)
+{
+        int ret = 0;
+        struct as102_dev_t *dev;
+        struct as10x_tune_args tune_args = { 0 };
+        ENTER();
+        dev = (struct as102_dev_t *) fe->tuner_priv;
+        if (dev == NULL)
+                return -ENODEV;
+        if (mutex_lock_interruptible(&dev->bus_adap.lock))
+                return -EBUSY;
+        as102_fe_copy_tune_parameters(&tune_args, params);
+        /* send abilis command: SET_TUNE */
+        ret =  as10x_cmd_set_tune(&dev->bus_adap, &tune_args);
+        if (ret != 0)
+                dprintk(debug, "as10x_cmd_set_tune failed. (err = %d)\n", ret);
+        mutex_unlock(&dev->bus_adap.lock);
+        LEAVE();
+        return (ret < 0) ? -EINVAL : 0;
+}
+static int as102_fe_get_frontend(struct dvb_frontend *fe,
+                                 struct dvb_frontend_parameters *p) {
+        int ret = 0;
+        struct as102_dev_t *dev;
+        struct as10x_tps tps = { 0 };
+        ENTER();
+        dev = (struct as102_dev_t *) fe->tuner_priv;
+        if (dev == NULL)
+                return -EINVAL;
+        if (mutex_lock_interruptible(&dev->bus_adap.lock))
+                return -EBUSY;
+        /* send abilis command: GET_TPS */
+        ret = as10x_cmd_get_tps(&dev->bus_adap, &tps);
+        if (ret == 0)
+                as10x_fe_copy_tps_parameters(p, &tps);
+        mutex_unlock(&dev->bus_adap.lock);
+        LEAVE();
+        return (ret < 0) ? -EINVAL : 0;
+}
+static int as102_fe_get_tune_settings(struct dvb_frontend *fe,
+                        struct dvb_frontend_tune_settings *settings) {
+        ENTER();
+#if 0
+        dprintk(debug, "step_size    = %d\n", settings->step_size);
+        dprintk(debug, "max_drift    = %d\n", settings->max_drift);
+        dprintk(debug, "min_delay_ms = %d -> %d\n", settings->min_delay_ms,
+                1000);
+#endif
+        settings->min_delay_ms = 1000;
+        LEAVE();
+        return 0;
+}
+static int as102_fe_read_status(struct dvb_frontend *fe, fe_status_t *status)
+{
+        int ret = 0;
+        struct as102_dev_t *dev;
+        struct as10x_tune_status tstate = { 0 };
+        ENTER();
+        dev = (struct as102_dev_t *) fe->tuner_priv;
+        if (dev == NULL)
+                return -ENODEV;
+        if (mutex_lock_interruptible(&dev->bus_adap.lock))
+                return -EBUSY;
+        /* send abilis command: GET_TUNE_STATUS */
+        ret = as10x_cmd_get_tune_status(&dev->bus_adap, &tstate);
+        if (ret < 0) {
+                dprintk(debug, "as10x_cmd_get_tune_status failed (err = %d)\n",
+                        ret);
+                goto out;
+        }
+        dev->signal_strength  = tstate.signal_strength;
+        dev->ber  = tstate.BER;
+        switch (tstate.tune_state) {
+        case TUNE_STATUS_SIGNAL_DVB_OK:
+                *status = FE_HAS_SIGNAL | FE_HAS_CARRIER;
+                break;
+        case TUNE_STATUS_STREAM_DETECTED:
+                *status = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_SYNC;
+                break;
+        case TUNE_STATUS_STREAM_TUNED:
+                *status = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_SYNC |
+                        FE_HAS_LOCK;
+                break;
+        default:
+                *status = TUNE_STATUS_NOT_TUNED;
+        }
+        dprintk(debug, "tuner status: 0x%02x, strength %d, per: %d, ber: %d\n",
+                        tstate.tune_state, tstate.signal_strength,
+                        tstate.PER, tstate.BER);
+        if (*status & FE_HAS_LOCK) {
+                if (as10x_cmd_get_demod_stats(&dev->bus_adap,
+                        (struct as10x_demod_stats *) &dev->demod_stats) < 0) {
+                        memset(&dev->demod_stats, 0, sizeof(dev->demod_stats));
+                        dprintk(debug, "as10x_cmd_get_demod_stats failed "
+                                "(probably not tuned)\n");
+                } else {
+                        dprintk(debug,
+                                "demod status: fc: 0x%08x, bad fc: 0x%08x, "
+                                "bytes corrected: 0x%08x , MER: 0x%04x\n",
+                                dev->demod_stats.frame_count,
+                                dev->demod_stats.bad_frame_count,
+                                dev->demod_stats.bytes_fixed_by_rs,
+                                dev->demod_stats.mer);
+                }
+        } else {
+                memset(&dev->demod_stats, 0, sizeof(dev->demod_stats));
+        }
+out:
+        mutex_unlock(&dev->bus_adap.lock);
+        LEAVE();
+        return ret;
+}
+/*
+ * Note:
+ * - in AS102 SNR=MER
+ *   - the SNR will be returned in linear terms, i.e. not in dB
+ *   - the accuracy equals ±2dB for a SNR range from 4dB to 30dB
+ *   - the accuracy is >2dB for SNR values outside this range
+ */
+static int as102_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
+{
+        struct as102_dev_t *dev;
+        ENTER();
+        dev = (struct as102_dev_t *) fe->tuner_priv;
+        if (dev == NULL)
+                return -ENODEV;
+        *snr = dev->demod_stats.mer;
+        LEAVE();
+        return 0;
+}
+static int as102_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
+{
+        struct as102_dev_t *dev;
+        ENTER();
+        dev = (struct as102_dev_t *) fe->tuner_priv;
+        if (dev == NULL)
+                return -ENODEV;
+        *ber = dev->ber;
+        LEAVE();
+        return 0;
+}
+static int as102_fe_read_signal_strength(struct dvb_frontend *fe,
+                                         u16 *strength)
+{
+        struct as102_dev_t *dev;
+        ENTER();
+        dev = (struct as102_dev_t *) fe->tuner_priv;
+        if (dev == NULL)
+                return -ENODEV;
+        *strength = (((0xffff * 400) * dev->signal_strength + 41000) * 2);
+        LEAVE();
+        return 0;
+}
+static int as102_fe_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
+{
+        struct as102_dev_t *dev;
+        ENTER();
+        dev = (struct as102_dev_t *) fe->tuner_priv;
+        if (dev == NULL)
+                return -ENODEV;
+        if (dev->demod_stats.has_started)
+                *ucblocks = dev->demod_stats.bad_frame_count;
+        else
+                *ucblocks = 0;
+        LEAVE();
+        return 0;
+}
+static int as102_fe_ts_bus_ctrl(struct dvb_frontend *fe, int acquire)
+{
+        struct as102_dev_t *dev;
+        int ret;
+        ENTER();
+        dev = (struct as102_dev_t *) fe->tuner_priv;
+        if (dev == NULL)
+                return -ENODEV;
+        if (mutex_lock_interruptible(&dev->bus_adap.lock))
+                return -EBUSY;
+        if (acquire) {
+                if (elna_enable)
+                        as10x_cmd_set_context(&dev->bus_adap, 1010, 0xC0);
+                ret = as10x_cmd_turn_on(&dev->bus_adap);
+        } else {
+                ret = as10x_cmd_turn_off(&dev->bus_adap);
+        }
+        mutex_unlock(&dev->bus_adap.lock);
+        LEAVE();
+        return ret;
+}
+static struct dvb_frontend_ops as102_fe_ops = {
+        .info = {
+                .name                   = "Unknown AS102 device",
+                .type                   = FE_OFDM,
+                .frequency_min          = 174000000,
+                .frequency_max          = 862000000,
+                .frequency_stepsize     = 166667,
+                .caps = FE_CAN_INVERSION_AUTO
+                        | FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4
+                        | FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO
+                        | FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QPSK
+                        | FE_CAN_QAM_AUTO
+                        | FE_CAN_TRANSMISSION_MODE_AUTO
+                        | FE_CAN_GUARD_INTERVAL_AUTO
+                        | FE_CAN_HIERARCHY_AUTO
+                        | FE_CAN_RECOVER
+                        | FE_CAN_MUTE_TS
+        },
+        .set_frontend           = as102_fe_set_frontend,
+        .get_frontend           = as102_fe_get_frontend,
+        .get_tune_settings      = as102_fe_get_tune_settings,
+        .read_status            = as102_fe_read_status,
+        .read_snr               = as102_fe_read_snr,
+        .read_ber               = as102_fe_read_ber,
+        .read_signal_strength   = as102_fe_read_signal_strength,
+        .read_ucblocks          = as102_fe_read_ucblocks,
+        .ts_bus_ctrl            = as102_fe_ts_bus_ctrl,
+};
+int as102_dvb_unregister_fe(struct dvb_frontend *fe)
+{
+        /* unregister frontend */
+        dvb_unregister_frontend(fe);
+        /* detach frontend */
+        dvb_frontend_detach(fe);
+        return 0;
+}
+int as102_dvb_register_fe(struct as102_dev_t *as102_dev,
+                          struct dvb_frontend *dvb_fe)
+{
+        int errno;
+        struct dvb_adapter *dvb_adap;
+        if (as102_dev == NULL)
+                return -EINVAL;
+        /* extract dvb_adapter */
+        dvb_adap = &as102_dev->dvb_adap;
+        /* init frontend callback ops */
+        memcpy(&dvb_fe->ops, &as102_fe_ops, sizeof(struct dvb_frontend_ops));
+        strncpy(dvb_fe->ops.info.name, as102_dev->name,
+                sizeof(dvb_fe->ops.info.name));
+        /* register dbvb frontend */
+        errno = dvb_register_frontend(dvb_adap, dvb_fe);
+        if (errno == 0)
+                dvb_fe->tuner_priv = as102_dev;
+        return errno;
+}
+static void as10x_fe_copy_tps_parameters(struct dvb_frontend_parameters *dst,
+                                         struct as10x_tps *as10x_tps)
+{
+        struct dvb_ofdm_parameters *fe_tps = &dst->u.ofdm;
+        /* extract consteallation */
+        switch (as10x_tps->constellation) {
+        case CONST_QPSK:
+                fe_tps->constellation = QPSK;
+                break;
+        case CONST_QAM16:
+                fe_tps->constellation = QAM_16;
+                break;
+        case CONST_QAM64:
+                fe_tps->constellation = QAM_64;
+                break;
+        }
+        /* extract hierarchy */
+        switch (as10x_tps->hierarchy) {
+        case HIER_NONE:
+                fe_tps->hierarchy_information = HIERARCHY_NONE;
+                break;
+        case HIER_ALPHA_1:
+                fe_tps->hierarchy_information = HIERARCHY_1;
+                break;
+        case HIER_ALPHA_2:
+                fe_tps->hierarchy_information = HIERARCHY_2;
+                break;
+        case HIER_ALPHA_4:
+                fe_tps->hierarchy_information = HIERARCHY_4;
+                break;
+        }
+        /* extract code rate HP */
+        switch (as10x_tps->code_rate_HP) {
+        case CODE_RATE_1_2:
+                fe_tps->code_rate_HP = FEC_1_2;
+                break;
+        case CODE_RATE_2_3:
+                fe_tps->code_rate_HP = FEC_2_3;
+                break;
+        case CODE_RATE_3_4:
+                fe_tps->code_rate_HP = FEC_3_4;
+                break;
+        case CODE_RATE_5_6:
+                fe_tps->code_rate_HP = FEC_5_6;
+                break;
+        case CODE_RATE_7_8:
+                fe_tps->code_rate_HP = FEC_7_8;
+                break;
+        }
+        /* extract code rate LP */
+        switch (as10x_tps->code_rate_LP) {
+        case CODE_RATE_1_2:
+                fe_tps->code_rate_LP = FEC_1_2;
+                break;
+        case CODE_RATE_2_3:
+                fe_tps->code_rate_LP = FEC_2_3;
+                break;
+        case CODE_RATE_3_4:
+                fe_tps->code_rate_LP = FEC_3_4;
+                break;
+        case CODE_RATE_5_6:
+                fe_tps->code_rate_LP = FEC_5_6;
+                break;
+        case CODE_RATE_7_8:
+                fe_tps->code_rate_LP = FEC_7_8;
+                break;
+        }
+        /* extract guard interval */
+        switch (as10x_tps->guard_interval) {
+        case GUARD_INT_1_32:
+                fe_tps->guard_interval = GUARD_INTERVAL_1_32;
+                break;
+        case GUARD_INT_1_16:
+                fe_tps->guard_interval = GUARD_INTERVAL_1_16;
+                break;
+        case GUARD_INT_1_8:
+                fe_tps->guard_interval = GUARD_INTERVAL_1_8;
+                break;
+        case GUARD_INT_1_4:
+                fe_tps->guard_interval = GUARD_INTERVAL_1_4;
+                break;
+        }
+        /* extract transmission mode */
+        switch (as10x_tps->transmission_mode) {
+        case TRANS_MODE_2K:
+                fe_tps->transmission_mode = TRANSMISSION_MODE_2K;
+                break;
+        case TRANS_MODE_8K:
+                fe_tps->transmission_mode = TRANSMISSION_MODE_8K;
+                break;
+        }
+}
+static uint8_t as102_fe_get_code_rate(fe_code_rate_t arg)
+{
+        uint8_t c;
+        switch (arg) {
+        case FEC_1_2:
+                c = CODE_RATE_1_2;
+                break;
+        case FEC_2_3:
+                c = CODE_RATE_2_3;
+                break;
+        case FEC_3_4:
+                c = CODE_RATE_3_4;
+                break;
+        case FEC_5_6:
+                c = CODE_RATE_5_6;
+                break;
+        case FEC_7_8:
+                c = CODE_RATE_7_8;
+                break;
+        default:
+                c = CODE_RATE_UNKNOWN;
+                break;
+        }
+        return c;
+}
+static void as102_fe_copy_tune_parameters(struct as10x_tune_args *tune_args,
+                          struct dvb_frontend_parameters *params)
+{
+        /* set frequency */
+        tune_args->freq = params->frequency / 1000;
+        /* fix interleaving_mode */
+        tune_args->interleaving_mode = INTLV_NATIVE;
+        switch (params->u.ofdm.bandwidth) {
+        case BANDWIDTH_8_MHZ:
+                tune_args->bandwidth = BW_8_MHZ;
+                break;
+        case BANDWIDTH_7_MHZ:
+                tune_args->bandwidth = BW_7_MHZ;
+                break;
+        case BANDWIDTH_6_MHZ:
+                tune_args->bandwidth = BW_6_MHZ;
+                break;
+        default:
+                tune_args->bandwidth = BW_8_MHZ;
+        }
+        switch (params->u.ofdm.guard_interval) {
+        case GUARD_INTERVAL_1_32:
+                tune_args->guard_interval = GUARD_INT_1_32;
+                break;
+        case GUARD_INTERVAL_1_16:
+                tune_args->guard_interval = GUARD_INT_1_16;
+                break;
+        case GUARD_INTERVAL_1_8:
+                tune_args->guard_interval = GUARD_INT_1_8;
+                break;
+        case GUARD_INTERVAL_1_4:
+                tune_args->guard_interval = GUARD_INT_1_4;
+                break;
+        case GUARD_INTERVAL_AUTO:
+        default:
+                tune_args->guard_interval = GUARD_UNKNOWN;
+                break;
+        }
+        switch (params->u.ofdm.constellation) {
+        case QPSK:
+                tune_args->constellation = CONST_QPSK;
+                break;
+        case QAM_16:
+                tune_args->constellation = CONST_QAM16;
+                break;
+        case QAM_64:
+                tune_args->constellation = CONST_QAM64;
+                break;
+        default:
+                tune_args->constellation = CONST_UNKNOWN;
+                break;
+        }
+        switch (params->u.ofdm.transmission_mode) {
+        case TRANSMISSION_MODE_2K:
+                tune_args->transmission_mode = TRANS_MODE_2K;
+                break;
+        case TRANSMISSION_MODE_8K:
+                tune_args->transmission_mode = TRANS_MODE_8K;
+                break;
+        default:
+                tune_args->transmission_mode = TRANS_MODE_UNKNOWN;
+        }
+        switch (params->u.ofdm.hierarchy_information) {
+        case HIERARCHY_NONE:
+                tune_args->hierarchy = HIER_NONE;
+                break;
+        case HIERARCHY_1:
+                tune_args->hierarchy = HIER_ALPHA_1;
+                break;
+        case HIERARCHY_2:
+                tune_args->hierarchy = HIER_ALPHA_2;
+                break;
+        case HIERARCHY_4:
+                tune_args->hierarchy = HIER_ALPHA_4;
+                break;
+        case HIERARCHY_AUTO:
+                tune_args->hierarchy = HIER_UNKNOWN;
+                break;
+        }
+        dprintk(debug, "tuner parameters: freq: %d  bw: 0x%02x  gi: 0x%02x\n",
+                        params->frequency,
+                        tune_args->bandwidth,
+                        tune_args->guard_interval);
+        /*
+         * Detect a hierarchy selection
+         * if HP/LP are both set to FEC_NONE, HP will be selected.
+         */
+        if ((tune_args->hierarchy != HIER_NONE) &&
+                       ((params->u.ofdm.code_rate_LP == FEC_NONE) ||
+                        (params->u.ofdm.code_rate_HP == FEC_NONE))) {
+                if (params->u.ofdm.code_rate_LP == FEC_NONE) {
+                        tune_args->hier_select = HIER_HIGH_PRIORITY;
+                        tune_args->code_rate =
+                           as102_fe_get_code_rate(params->u.ofdm.code_rate_HP);
+                }
+                if (params->u.ofdm.code_rate_HP == FEC_NONE) {
+                        tune_args->hier_select = HIER_LOW_PRIORITY;
+                        tune_args->code_rate =
+                           as102_fe_get_code_rate(params->u.ofdm.code_rate_LP);
+                }
+                dprintk(debug, "\thierarchy: 0x%02x  "
+                                "selected: %s  code_rate_%s: 0x%02x\n",
+                        tune_args->hierarchy,
+                        tune_args->hier_select == HIER_HIGH_PRIORITY ?
+                        "HP" : "LP",
+                        tune_args->hier_select == HIER_HIGH_PRIORITY ?
+                        "HP" : "LP",
+                        tune_args->code_rate);
+        } else {
+                tune_args->code_rate =
+                        as102_fe_get_code_rate(params->u.ofdm.code_rate_HP);
+        }
+}
+/* EOF - vim: set textwidth=80 ts=8 sw=8 sts=8 noet: */
diff --git a/drivers/staging/media/as102/as102_fw.c b/drivers/staging/media/as102/as102_fw.c
new file mode 100644
index 000000000000..c019df933cc9
--- /dev/null
+++ b/drivers/staging/media/as102/as102_fw.c
@@ -0,0 +1,251 @@
+/*
+ * Abilis Systems Single DVB-T Receiver
+ * Copyright (C) 2008 Pierrick Hascoet <pierrick.hascoet@abilis.com>
+ * Copyright (C) 2010 Devin Heitmueller <dheitmueller@kernellabs.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, 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.
+ */
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/ctype.h>
+#include <linux/delay.h>
+#include <linux/firmware.h>
+#include "as102_drv.h"
+#include "as102_fw.h"
+#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
+char as102_st_fw1[] = "as102_data1_st.hex";
+char as102_st_fw2[] = "as102_data2_st.hex";
+char as102_dt_fw1[] = "as102_data1_dt.hex";
+char as102_dt_fw2[] = "as102_data2_dt.hex";
+static unsigned char atohx(unsigned char *dst, char *src)
+{
+        unsigned char value = 0;
+        char msb = tolower(*src) - '0';
+        char lsb = tolower(*(src + 1)) - '0';
+        if (msb > 9)
+                msb -= 7;
+        if (lsb > 9)
+                lsb -= 7;
+        *dst = value = ((msb & 0xF) << 4) | (lsb & 0xF);
+        return value;
+}
+/*
+ * Parse INTEL HEX firmware file to extract address and data.
+ */
+static int parse_hex_line(unsigned char *fw_data, unsigned char *addr,
+                          unsigned char *data, int *dataLength,
+                          unsigned char *addr_has_changed) {
+        int count = 0;
+        unsigned char *src, dst;
+        if (*fw_data++ != ':') {
+                printk(KERN_ERR "invalid firmware file\n");
+                return -EFAULT;
+        }
+        /* locate end of line */
+        for (src = fw_data; *src != '\n'; src += 2) {
+                atohx(&dst, src);
+                /* parse line to split addr / data */
+                switch (count) {
+                case 0:
+                        *dataLength = dst;
+                        break;
+                case 1:
+                        addr[2] = dst;
+                        break;
+                case 2:
+                        addr[3] = dst;
+                        break;
+                case 3:
+                        /* check if data is an address */
+                        if (dst == 0x04)
+                                *addr_has_changed = 1;
+                        else
+                                *addr_has_changed = 0;
+                        break;
+                case  4:
+                case  5:
+                        if (*addr_has_changed)
+                                addr[(count - 4)] = dst;
+                        else
+                                data[(count - 4)] = dst;
+                        break;
+                default:
+                        data[(count - 4)] = dst;
+                        break;
+                }
+                count++;
+        }
+        /* return read value + ':' + '\n' */
+        return (count * 2) + 2;
+}
+static int as102_firmware_upload(struct as102_bus_adapter_t *bus_adap,
+                                 unsigned char *cmd,
+                                 const struct firmware *firmware) {
+        struct as10x_fw_pkt_t fw_pkt;
+        int total_read_bytes = 0, errno = 0;
+        unsigned char addr_has_changed = 0;
+        ENTER();
+        for (total_read_bytes = 0; total_read_bytes < firmware->size; ) {
+                int read_bytes = 0, data_len = 0;
+                /* parse intel hex line */
+                read_bytes = parse_hex_line(
+                                (u8 *) (firmware->data + total_read_bytes),
+                                fw_pkt.raw.address,
+                                fw_pkt.raw.data,
+                                &data_len,
+                                &addr_has_changed);
+                if (read_bytes <= 0)
+                        goto error;
+                /* detect the end of file */
+                total_read_bytes += read_bytes;
+                if (total_read_bytes == firmware->size) {
+                        fw_pkt.u.request[0] = 0x00;
+                        fw_pkt.u.request[1] = 0x03;
+                        /* send EOF command */
+                        errno = bus_adap->ops->upload_fw_pkt(bus_adap,
+                                                             (uint8_t *)
+                                                             &fw_pkt, 2, 0);
+                        if (errno < 0)
+                                goto error;
+                } else {
+                        if (!addr_has_changed) {
+                                /* prepare command to send */
+                                fw_pkt.u.request[0] = 0x00;
+                                fw_pkt.u.request[1] = 0x01;
+                                data_len += sizeof(fw_pkt.u.request);
+                                data_len += sizeof(fw_pkt.raw.address);
+                                /* send cmd to device */
+                                errno = bus_adap->ops->upload_fw_pkt(bus_adap,
+                                                                     (uint8_t *)
+                                                                     &fw_pkt,
+                                                                     data_len,
+                                                                     0);
+                                if (errno < 0)
+                                        goto error;
+                        }
+                }
+        }
+error:
+        LEAVE();
+        return (errno == 0) ? total_read_bytes : errno;
+}
+int as102_fw_upload(struct as102_bus_adapter_t *bus_adap)
+{
+        int errno = -EFAULT;
+        const struct firmware *firmware;
+        unsigned char *cmd_buf = NULL;
+        char *fw1, *fw2;
+#if defined(CONFIG_AS102_USB)
+        struct usb_device *dev = bus_adap->usb_dev;
+#endif
+#if defined(CONFIG_AS102_SPI)
+        struct spi_device *dev = bus_adap->spi_dev;
+#endif
+        ENTER();
+        /* select fw file to upload */
+        if (dual_tuner) {
+                fw1 = as102_dt_fw1;
+                fw2 = as102_dt_fw2;
+        } else {
+                fw1 = as102_st_fw1;
+                fw2 = as102_st_fw2;
+        }
+#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
+        /* allocate buffer to store firmware upload command and data */
+        cmd_buf = kzalloc(MAX_FW_PKT_SIZE, GFP_KERNEL);
+        if (cmd_buf == NULL) {
+                errno = -ENOMEM;
+                goto error;
+        }
+        /* request kernel to locate firmware file: part1 */
+        errno = request_firmware(&firmware, fw1, &dev->dev);
+        if (errno < 0) {
+                printk(KERN_ERR "%s: unable to locate firmware file: %s\n",
+                                 DRIVER_NAME, fw1);
+                goto error;
+        }
+        /* initiate firmware upload */
+        errno = as102_firmware_upload(bus_adap, cmd_buf, firmware);
+        if (errno < 0) {
+                printk(KERN_ERR "%s: error during firmware upload part1\n",
+                                 DRIVER_NAME);
+                goto error;
+        }
+        printk(KERN_INFO "%s: fimrware: %s loaded with success\n",
+                         DRIVER_NAME, fw1);
+        release_firmware(firmware);
+        /* wait for boot to complete */
+        mdelay(100);
+        /* request kernel to locate firmware file: part2 */
+        errno = request_firmware(&firmware, fw2, &dev->dev);
+        if (errno < 0) {
+                printk(KERN_ERR "%s: unable to locate firmware file: %s\n",
+                                 DRIVER_NAME, fw2);
+                goto error;
+        }
+        /* initiate firmware upload */
+        errno = as102_firmware_upload(bus_adap, cmd_buf, firmware);
+        if (errno < 0) {
+                printk(KERN_ERR "%s: error during firmware upload part2\n",
+                                 DRIVER_NAME);
+                goto error;
+        }
+        printk(KERN_INFO "%s: fimrware: %s loaded with success\n",
+                        DRIVER_NAME, fw2);
+error:
+        /* free data buffer */
+        kfree(cmd_buf);
+        /* release firmware if needed */
+        if (firmware != NULL)
+                release_firmware(firmware);
+#endif
+        LEAVE();
+        return errno;
+}
+#endif
+/* EOF - vim: set textwidth=80 ts=8 sw=8 sts=8 noet: */
diff --git a/drivers/staging/media/as102/as102_fw.h b/drivers/staging/media/as102/as102_fw.h
new file mode 100644
index 000000000000..27e5347e2e19
--- /dev/null
+++ b/drivers/staging/media/as102/as102_fw.h
@@ -0,0 +1,42 @@
+/*
+ * Abilis Systems Single DVB-T Receiver
+ * Copyright (C) 2008 Pierrick Hascoet <pierrick.hascoet@abilis.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, 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.
+ */
+#define MAX_FW_PKT_SIZE 64
+extern int dual_tuner;
+#pragma pack(1)
+struct as10x_raw_fw_pkt {
+        unsigned char address[4];
+        unsigned char data[MAX_FW_PKT_SIZE - 6];
+};
+struct as10x_fw_pkt_t {
+        union {
+                unsigned char request[2];
+                unsigned char length[2];
+        } u;
+        struct as10x_raw_fw_pkt raw;
+};
+#pragma pack()
+#ifdef __KERNEL__
+int as102_fw_upload(struct as102_bus_adapter_t *bus_adap);
+#endif
+/* EOF - vim: set textwidth=80 ts=8 sw=8 sts=8 noet: */
diff --git a/drivers/staging/media/as102/as102_usb_drv.c b/drivers/staging/media/as102/as102_usb_drv.c
new file mode 100644
index 000000000000..264be2dbd2a4
--- /dev/null
+++ b/drivers/staging/media/as102/as102_usb_drv.c
@@ -0,0 +1,478 @@
+/*
+ * Abilis Systems Single DVB-T Receiver
+ * Copyright (C) 2008 Pierrick Hascoet <pierrick.hascoet@abilis.com>
+ * Copyright (C) 2010 Devin Heitmueller <dheitmueller@kernellabs.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, 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.
+ */
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/slab.h>
+#include <linux/mm.h>
+#include <linux/usb.h>
+#include "as102_drv.h"
+#include "as102_usb_drv.h"
+#include "as102_fw.h"
+static void as102_usb_disconnect(struct usb_interface *interface);
+static int as102_usb_probe(struct usb_interface *interface,
+                           const struct usb_device_id *id);
+static int as102_usb_start_stream(struct as102_dev_t *dev);
+static void as102_usb_stop_stream(struct as102_dev_t *dev);
+static int as102_open(struct inode *inode, struct file *file);
+static int as102_release(struct inode *inode, struct file *file);
+static struct usb_device_id as102_usb_id_table[] = {
+        { USB_DEVICE(AS102_USB_DEVICE_VENDOR_ID, AS102_USB_DEVICE_PID_0001) },
+        { USB_DEVICE(PCTV_74E_USB_VID, PCTV_74E_USB_PID) },
+        { USB_DEVICE(ELGATO_EYETV_DTT_USB_VID, ELGATO_EYETV_DTT_USB_PID) },
+        { USB_DEVICE(NBOX_DVBT_DONGLE_USB_VID, NBOX_DVBT_DONGLE_USB_PID) },
+        { } /* Terminating entry */
+};
+/* Note that this table must always have the same number of entries as the
+   as102_usb_id_table struct */
+static const char *as102_device_names[] = {
+        AS102_REFERENCE_DESIGN,
+        AS102_PCTV_74E,
+        AS102_ELGATO_EYETV_DTT_NAME,
+        AS102_NBOX_DVBT_DONGLE_NAME,
+        NULL /* Terminating entry */
+};
+struct usb_driver as102_usb_driver = {
+        .name       =  DRIVER_FULL_NAME,
+        .probe      =  as102_usb_probe,
+        .disconnect =  as102_usb_disconnect,
+        .id_table   =  as102_usb_id_table
+};
+static const struct file_operations as102_dev_fops = {
+        .owner   = THIS_MODULE,
+        .open    = as102_open,
+        .release = as102_release,
+};
+static struct usb_class_driver as102_usb_class_driver = {
+        .name           = "aton2-%d",
+        .fops           = &as102_dev_fops,
+        .minor_base     = AS102_DEVICE_MAJOR,
+};
+static int as102_usb_xfer_cmd(struct as102_bus_adapter_t *bus_adap,
+                              unsigned char *send_buf, int send_buf_len,
+                              unsigned char *recv_buf, int recv_buf_len)
+{
+        int ret = 0;
+        ENTER();
+        if (send_buf != NULL) {
+                ret = usb_control_msg(bus_adap->usb_dev,
+                                      usb_sndctrlpipe(bus_adap->usb_dev, 0),
+                                      AS102_USB_DEVICE_TX_CTRL_CMD,
+                                      USB_DIR_OUT | USB_TYPE_VENDOR |
+                                      USB_RECIP_DEVICE,
+                                      bus_adap->cmd_xid, /* value */
+                                      0, /* index */
+                                      send_buf, send_buf_len,
+                                      USB_CTRL_SET_TIMEOUT /* 200 */);
+                if (ret < 0) {
+                        dprintk(debug, "usb_control_msg(send) failed, err %i\n",
+                                        ret);
+                        return ret;
+                }
+                if (ret != send_buf_len) {
+                        dprintk(debug, "only wrote %d of %d bytes\n",
+                                        ret, send_buf_len);
+                        return -1;
+                }
+        }
+        if (recv_buf != NULL) {
+#ifdef TRACE
+                dprintk(debug, "want to read: %d bytes\n", recv_buf_len);
+#endif
+                ret = usb_control_msg(bus_adap->usb_dev,
+                                      usb_rcvctrlpipe(bus_adap->usb_dev, 0),
+                                      AS102_USB_DEVICE_RX_CTRL_CMD,
+                                      USB_DIR_IN | USB_TYPE_VENDOR |
+                                      USB_RECIP_DEVICE,
+                                      bus_adap->cmd_xid, /* value */
+                                      0, /* index */
+                                      recv_buf, recv_buf_len,
+                                      USB_CTRL_GET_TIMEOUT /* 200 */);
+                if (ret < 0) {
+                        dprintk(debug, "usb_control_msg(recv) failed, err %i\n",
+                                        ret);
+                        return ret;
+                }
+#ifdef TRACE
+                dprintk(debug, "read %d bytes\n", recv_buf_len);
+#endif
+        }
+        LEAVE();
+        return ret;
+}
+static int as102_send_ep1(struct as102_bus_adapter_t *bus_adap,
+                          unsigned char *send_buf,
+                          int send_buf_len,
+                          int swap32)
+{
+        int ret = 0, actual_len;
+        ret = usb_bulk_msg(bus_adap->usb_dev,
+                           usb_sndbulkpipe(bus_adap->usb_dev, 1),
+                           send_buf, send_buf_len, &actual_len, 200);
+        if (ret) {
+                dprintk(debug, "usb_bulk_msg(send) failed, err %i\n", ret);
+                return ret;
+        }
+        if (actual_len != send_buf_len) {
+                dprintk(debug, "only wrote %d of %d bytes\n",
+                                actual_len, send_buf_len);
+                return -1;
+        }
+        return ret ? ret : actual_len;
+}
+static int as102_read_ep2(struct as102_bus_adapter_t *bus_adap,
+                   unsigned char *recv_buf, int recv_buf_len)
+{
+        int ret = 0, actual_len;
+        if (recv_buf == NULL)
+                return -EINVAL;
+        ret = usb_bulk_msg(bus_adap->usb_dev,
+                           usb_rcvbulkpipe(bus_adap->usb_dev, 2),
+                           recv_buf, recv_buf_len, &actual_len, 200);
+        if (ret) {
+                dprintk(debug, "usb_bulk_msg(recv) failed, err %i\n", ret);
+                return ret;
+        }
+        if (actual_len != recv_buf_len) {
+                dprintk(debug, "only read %d of %d bytes\n",
+                                actual_len, recv_buf_len);
+                return -1;
+        }
+        return ret ? ret : actual_len;
+}
+struct as102_priv_ops_t as102_priv_ops = {
+        .upload_fw_pkt  = as102_send_ep1,
+        .xfer_cmd       = as102_usb_xfer_cmd,
+        .as102_read_ep2 = as102_read_ep2,
+        .start_stream   = as102_usb_start_stream,
+        .stop_stream    = as102_usb_stop_stream,
+};
+static int as102_submit_urb_stream(struct as102_dev_t *dev, struct urb *urb)
+{
+        int err;
+        usb_fill_bulk_urb(urb,
+                          dev->bus_adap.usb_dev,
+                          usb_rcvbulkpipe(dev->bus_adap.usb_dev, 0x2),
+                          urb->transfer_buffer,
+                          AS102_USB_BUF_SIZE,
+                          as102_urb_stream_irq,
+                          dev);
+        err = usb_submit_urb(urb, GFP_ATOMIC);
+        if (err)
+                dprintk(debug, "%s: usb_submit_urb failed\n", __func__);
+        return err;
+}
+void as102_urb_stream_irq(struct urb *urb)
+{
+        struct as102_dev_t *as102_dev = urb->context;
+        if (urb->actual_length > 0) {
+                dvb_dmx_swfilter(&as102_dev->dvb_dmx,
+                                 urb->transfer_buffer,
+                                 urb->actual_length);
+        } else {
+                if (urb->actual_length == 0)
+                        memset(urb->transfer_buffer, 0, AS102_USB_BUF_SIZE);
+        }
+        /* is not stopped, re-submit urb */
+        if (as102_dev->streaming)
+                as102_submit_urb_stream(as102_dev, urb);
+}
+static void as102_free_usb_stream_buffer(struct as102_dev_t *dev)
+{
+        int i;
+        ENTER();
+        for (i = 0; i < MAX_STREAM_URB; i++)
+                usb_free_urb(dev->stream_urb[i]);
+        usb_free_coherent(dev->bus_adap.usb_dev,
+                        MAX_STREAM_URB * AS102_USB_BUF_SIZE,
+                        dev->stream,
+                        dev->dma_addr);
+        LEAVE();
+}
+static int as102_alloc_usb_stream_buffer(struct as102_dev_t *dev)
+{
+        int i, ret = 0;
+        ENTER();
+        dev->stream = usb_alloc_coherent(dev->bus_adap.usb_dev,
+                                       MAX_STREAM_URB * AS102_USB_BUF_SIZE,
+                                       GFP_KERNEL,
+                                       &dev->dma_addr);
+        if (!dev->stream) {
+                dprintk(debug, "%s: usb_buffer_alloc failed\n", __func__);
+                return -ENOMEM;
+        }
+        memset(dev->stream, 0, MAX_STREAM_URB * AS102_USB_BUF_SIZE);
+        /* init urb buffers */
+        for (i = 0; i < MAX_STREAM_URB; i++) {
+                struct urb *urb;
+                urb = usb_alloc_urb(0, GFP_ATOMIC);
+                if (urb == NULL) {
+                        dprintk(debug, "%s: usb_alloc_urb failed\n", __func__);
+                        as102_free_usb_stream_buffer(dev);
+                        return -ENOMEM;
+                }
+                urb->transfer_buffer = dev->stream + (i * AS102_USB_BUF_SIZE);
+                urb->transfer_buffer_length = AS102_USB_BUF_SIZE;
+                dev->stream_urb[i] = urb;
+        }
+        LEAVE();
+        return ret;
+}
+static void as102_usb_stop_stream(struct as102_dev_t *dev)
+{
+        int i;
+        for (i = 0; i < MAX_STREAM_URB; i++)
+                usb_kill_urb(dev->stream_urb[i]);
+}
+static int as102_usb_start_stream(struct as102_dev_t *dev)
+{
+        int i, ret = 0;
+        for (i = 0; i < MAX_STREAM_URB; i++) {
+                ret = as102_submit_urb_stream(dev, dev->stream_urb[i]);
+                if (ret) {
+                        as102_usb_stop_stream(dev);
+                        return ret;
+                }
+        }
+        return 0;
+}
+static void as102_usb_release(struct kref *kref)
+{
+        struct as102_dev_t *as102_dev;
+        ENTER();
+        as102_dev = container_of(kref, struct as102_dev_t, kref);
+        if (as102_dev != NULL) {
+                usb_put_dev(as102_dev->bus_adap.usb_dev);
+                kfree(as102_dev);
+        }
+        LEAVE();
+}
+static void as102_usb_disconnect(struct usb_interface *intf)
+{
+        struct as102_dev_t *as102_dev;
+        ENTER();
+        /* extract as102_dev_t from usb_device private data */
+        as102_dev = usb_get_intfdata(intf);
+        /* unregister dvb layer */
+        as102_dvb_unregister(as102_dev);
+        /* free usb buffers */
+        as102_free_usb_stream_buffer(as102_dev);
+        usb_set_intfdata(intf, NULL);
+        /* usb unregister device */
+        usb_deregister_dev(intf, &as102_usb_class_driver);
+        /* decrement usage counter */
+        kref_put(&as102_dev->kref, as102_usb_release);
+        printk(KERN_INFO "%s: device has been disconnected\n", DRIVER_NAME);
+        LEAVE();
+}
+static int as102_usb_probe(struct usb_interface *intf,
+                           const struct usb_device_id *id)
+{
+        int ret;
+        struct as102_dev_t *as102_dev;
+        int i;
+        ENTER();
+        as102_dev = kzalloc(sizeof(struct as102_dev_t), GFP_KERNEL);
+        if (as102_dev == NULL) {
+                err("%s: kzalloc failed", __func__);
+                return -ENOMEM;
+        }
+        /* This should never actually happen */
+        if ((sizeof(as102_usb_id_table) / sizeof(struct usb_device_id)) !=
+            (sizeof(as102_device_names) / sizeof(const char *))) {
+                printk(KERN_ERR "Device names table invalid size");
+                return -EINVAL;
+        }
+        /* Assign the user-friendly device name */
+        for (i = 0; i < (sizeof(as102_usb_id_table) /
+                         sizeof(struct usb_device_id)); i++) {
+                if (id == &as102_usb_id_table[i])
+                        as102_dev->name = as102_device_names[i];
+        }
+        if (as102_dev->name == NULL)
+                as102_dev->name = "Unknown AS102 device";
+        /* set private callback functions */
+        as102_dev->bus_adap.ops = &as102_priv_ops;
+        /* init cmd token for usb bus */
+        as102_dev->bus_adap.cmd = &as102_dev->bus_adap.token.usb.c;
+        as102_dev->bus_adap.rsp = &as102_dev->bus_adap.token.usb.r;
+        /* init kernel device reference */
+        kref_init(&as102_dev->kref);
+        /* store as102 device to usb_device private data */
+        usb_set_intfdata(intf, (void *) as102_dev);
+        /* store in as102 device the usb_device pointer */
+        as102_dev->bus_adap.usb_dev = usb_get_dev(interface_to_usbdev(intf));
+        /* we can register the device now, as it is ready */
+        ret = usb_register_dev(intf, &as102_usb_class_driver);
+        if (ret < 0) {
+                /* something prevented us from registering this driver */
+                err("%s: usb_register_dev() failed (errno = %d)",
+                    __func__, ret);
+                goto failed;
+        }
+        printk(KERN_INFO "%s: device has been detected\n", DRIVER_NAME);
+        /* request buffer allocation for streaming */
+        ret = as102_alloc_usb_stream_buffer(as102_dev);
+        if (ret != 0)
+                goto failed;
+        /* register dvb layer */
+        ret = as102_dvb_register(as102_dev);
+        LEAVE();
+        return ret;
+failed:
+        usb_set_intfdata(intf, NULL);
+        kfree(as102_dev);
+        return ret;
+}
+static int as102_open(struct inode *inode, struct file *file)
+{
+        int ret = 0, minor = 0;
+        struct usb_interface *intf = NULL;
+        struct as102_dev_t *dev = NULL;
+        ENTER();
+        /* read minor from inode */
+        minor = iminor(inode);
+        /* fetch device from usb interface */
+        intf = usb_find_interface(&as102_usb_driver, minor);
+        if (intf == NULL) {
+                printk(KERN_ERR "%s: can't find device for minor %d\n",
+                                __func__, minor);
+                ret = -ENODEV;
+                goto exit;
+        }
+        /* get our device */
+        dev = usb_get_intfdata(intf);
+        if (dev == NULL) {
+                ret = -EFAULT;
+                goto exit;
+        }
+        /* save our device object in the file's private structure */
+        file->private_data = dev;
+        /* increment our usage count for the device */
+        kref_get(&dev->kref);
+exit:
+        LEAVE();
+        return ret;
+}
+static int as102_release(struct inode *inode, struct file *file)
+{
+        int ret = 0;
+        struct as102_dev_t *dev = NULL;
+        ENTER();
+        dev = file->private_data;
+        if (dev != NULL) {
+                /* decrement the count on our device */
+                kref_put(&dev->kref, as102_usb_release);
+        }
+        LEAVE();
+        return ret;
+}
+MODULE_DEVICE_TABLE(usb, as102_usb_id_table);
+/* EOF - vim: set textwidth=80 ts=8 sw=8 sts=8 noet: */
diff --git a/drivers/staging/media/as102/as102_usb_drv.h b/drivers/staging/media/as102/as102_usb_drv.h
new file mode 100644
index 000000000000..fb1fc41dcd79
--- /dev/null
+++ b/drivers/staging/media/as102/as102_usb_drv.h
@@ -0,0 +1,59 @@
+/*
+ * Abilis Systems Single DVB-T Receiver
+ * Copyright (C) 2008 Pierrick Hascoet <pierrick.hascoet@abilis.com>
+ * Copyright (C) 2010 Devin Heitmueller <dheitmueller@kernellabs.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, 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.
+ */
+#include <linux/version.h>
+#ifndef _AS102_USB_DRV_H_
+#define _AS102_USB_DRV_H_
+#define AS102_USB_DEVICE_TX_CTRL_CMD    0xF1
+#define AS102_USB_DEVICE_RX_CTRL_CMD    0xF2
+/* define these values to match the supported devices */
+/* Abilis system: "TITAN" */
+#define AS102_REFERENCE_DESIGN          "Abilis Systems DVB-Titan"
+#define AS102_USB_DEVICE_VENDOR_ID      0x1BA6
+#define AS102_USB_DEVICE_PID_0001       0x0001
+/* PCTV Systems: PCTV picoStick (74e) */
+#define AS102_PCTV_74E                  "PCTV Systems picoStick (74e)"
+#define PCTV_74E_USB_VID                0x2013
+#define PCTV_74E_USB_PID                0x0246
+/* Elgato: EyeTV DTT Deluxe */
+#define AS102_ELGATO_EYETV_DTT_NAME     "Elgato EyeTV DTT Deluxe"
+#define ELGATO_EYETV_DTT_USB_VID        0x0fd9
+#define ELGATO_EYETV_DTT_USB_PID        0x002c
+/* nBox: nBox DVB-T Dongle */
+#define AS102_NBOX_DVBT_DONGLE_NAME     "nBox DVB-T Dongle"
+#define NBOX_DVBT_DONGLE_USB_VID        0x0b89
+#define NBOX_DVBT_DONGLE_USB_PID        0x0007
+void as102_urb_stream_irq(struct urb *urb);
+struct as10x_usb_token_cmd_t {
+        /* token cmd */
+        struct as10x_cmd_t c;
+        /* token response */
+        struct as10x_cmd_t r;
+};
+#endif
+/* EOF - vim: set textwidth=80 ts=8 sw=8 sts=8 noet: */
diff --git a/drivers/staging/media/as102/as10x_cmd.c b/drivers/staging/media/as102/as10x_cmd.c
new file mode 100644
index 000000000000..0dcba8065780
--- /dev/null
+++ b/drivers/staging/media/as102/as10x_cmd.c
@@ -0,0 +1,452 @@
+/*
+ * Abilis Systems Single DVB-T Receiver
+ * Copyright (C) 2008 Pierrick Hascoet <pierrick.hascoet@abilis.com>
+ * Copyright (C) 2010 Devin Heitmueller <dheitmueller@kernellabs.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, 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.
+ */
+#include <linux/kernel.h>
+#include "as102_drv.h"
+#include "as10x_types.h"
+#include "as10x_cmd.h"
+/**
+ * as10x_cmd_turn_on - send turn on command to AS10x
+ * @phandle:   pointer to AS10x handle
+ *
+ * Return 0 when no error, < 0 in case of error.
+ */
+int as10x_cmd_turn_on(as10x_handle_t *phandle)
+{
+        int error;
+        struct as10x_cmd_t *pcmd, *prsp;
+        ENTER();
+        pcmd = phandle->cmd;
+        prsp = phandle->rsp;
+        /* prepare command */
+        as10x_cmd_build(pcmd, (++phandle->cmd_xid),
+                        sizeof(pcmd->body.turn_on.req));
+        /* fill command */
+        pcmd->body.turn_on.req.proc_id = cpu_to_le16(CONTROL_PROC_TURNON);
+        /* send command */
+        if (phandle->ops->xfer_cmd) {
+                error = phandle->ops->xfer_cmd(phandle, (uint8_t *) pcmd,
+                                               sizeof(pcmd->body.turn_on.req) +
+                                               HEADER_SIZE,
+                                               (uint8_t *) prsp,
+                                               sizeof(prsp->body.turn_on.rsp) +
+                                               HEADER_SIZE);
+        } else {
+                error = AS10X_CMD_ERROR;
+        }
+        if (error < 0)
+                goto out;
+        /* parse response */
+        error = as10x_rsp_parse(prsp, CONTROL_PROC_TURNON_RSP);
+out:
+        LEAVE();
+        return error;
+}
+/**
+ * as10x_cmd_turn_off - send turn off command to AS10x
+ * @phandle:   pointer to AS10x handle
+ *
+ * Return 0 on success or negative value in case of error.
+ */
+int as10x_cmd_turn_off(as10x_handle_t *phandle)
+{
+        int error;
+        struct as10x_cmd_t *pcmd, *prsp;
+        ENTER();
+        pcmd = phandle->cmd;
+        prsp = phandle->rsp;
+        /* prepare command */
+        as10x_cmd_build(pcmd, (++phandle->cmd_xid),
+                        sizeof(pcmd->body.turn_off.req));
+        /* fill command */
+        pcmd->body.turn_off.req.proc_id = cpu_to_le16(CONTROL_PROC_TURNOFF);
+        /* send command */
+        if (phandle->ops->xfer_cmd) {
+                error = phandle->ops->xfer_cmd(
+                        phandle, (uint8_t *) pcmd,
+                        sizeof(pcmd->body.turn_off.req) + HEADER_SIZE,
+                        (uint8_t *) prsp,
+                        sizeof(prsp->body.turn_off.rsp) + HEADER_SIZE);
+        } else {
+                error = AS10X_CMD_ERROR;
+        }
+        if (error < 0)
+                goto out;
+        /* parse response */
+        error = as10x_rsp_parse(prsp, CONTROL_PROC_TURNOFF_RSP);
+out:
+        LEAVE();
+        return error;
+}
+/**
+ * as10x_cmd_set_tune - send set tune command to AS10x
+ * @phandle: pointer to AS10x handle
+ * @ptune:   tune parameters
+ *
+ * Return 0 on success or negative value in case of error.
+ */
+int as10x_cmd_set_tune(as10x_handle_t *phandle, struct as10x_tune_args *ptune)
+{
+        int error;
+        struct as10x_cmd_t *preq, *prsp;
+        ENTER();
+        preq = phandle->cmd;
+        prsp = phandle->rsp;
+        /* prepare command */
+        as10x_cmd_build(preq, (++phandle->cmd_xid),
+                        sizeof(preq->body.set_tune.req));
+        /* fill command */
+        preq->body.set_tune.req.proc_id = cpu_to_le16(CONTROL_PROC_SETTUNE);
+        preq->body.set_tune.req.args.freq = cpu_to_le32(ptune->freq);
+        preq->body.set_tune.req.args.bandwidth = ptune->bandwidth;
+        preq->body.set_tune.req.args.hier_select = ptune->hier_select;
+        preq->body.set_tune.req.args.constellation = ptune->constellation;
+        preq->body.set_tune.req.args.hierarchy = ptune->hierarchy;
+        preq->body.set_tune.req.args.interleaving_mode  =
+                ptune->interleaving_mode;
+        preq->body.set_tune.req.args.code_rate  = ptune->code_rate;
+        preq->body.set_tune.req.args.guard_interval = ptune->guard_interval;
+        preq->body.set_tune.req.args.transmission_mode  =
+                ptune->transmission_mode;
+        /* send command */
+        if (phandle->ops->xfer_cmd) {
+                error = phandle->ops->xfer_cmd(phandle,
+                                               (uint8_t *) preq,
+                                               sizeof(preq->body.set_tune.req)
+                                               + HEADER_SIZE,
+                                               (uint8_t *) prsp,
+                                               sizeof(prsp->body.set_tune.rsp)
+                                               + HEADER_SIZE);
+        } else {
+                error = AS10X_CMD_ERROR;
+        }
+        if (error < 0)
+                goto out;
+        /* parse response */
+        error = as10x_rsp_parse(prsp, CONTROL_PROC_SETTUNE_RSP);
+out:
+        LEAVE();
+        return error;
+}
+/**
+ * as10x_cmd_get_tune_status - send get tune status command to AS10x
+ * @phandle: pointer to AS10x handle
+ * @pstatus: pointer to updated status structure of the current tune
+ *
+ * Return 0 on success or negative value in case of error.
+ */
+int as10x_cmd_get_tune_status(as10x_handle_t *phandle,
+                              struct as10x_tune_status *pstatus)
+{
+        int error;
+        struct as10x_cmd_t  *preq, *prsp;
+        ENTER();
+        preq = phandle->cmd;
+        prsp = phandle->rsp;
+        /* prepare command */
+        as10x_cmd_build(preq, (++phandle->cmd_xid),
+                        sizeof(preq->body.get_tune_status.req));
+        /* fill command */
+        preq->body.get_tune_status.req.proc_id =
+                cpu_to_le16(CONTROL_PROC_GETTUNESTAT);
+        /* send command */
+        if (phandle->ops->xfer_cmd) {
+                error = phandle->ops->xfer_cmd(
+                        phandle,
+                        (uint8_t *) preq,
+                        sizeof(preq->body.get_tune_status.req) + HEADER_SIZE,
+                        (uint8_t *) prsp,
+                        sizeof(prsp->body.get_tune_status.rsp) + HEADER_SIZE);
+        } else {
+                error = AS10X_CMD_ERROR;
+        }
+        if (error < 0)
+                goto out;
+        /* parse response */
+        error = as10x_rsp_parse(prsp, CONTROL_PROC_GETTUNESTAT_RSP);
+        if (error < 0)
+                goto out;
+        /* Response OK -> get response data */
+        pstatus->tune_state = prsp->body.get_tune_status.rsp.sts.tune_state;
+        pstatus->signal_strength  =
+                le16_to_cpu(prsp->body.get_tune_status.rsp.sts.signal_strength);
+        pstatus->PER = le16_to_cpu(prsp->body.get_tune_status.rsp.sts.PER);
+        pstatus->BER = le16_to_cpu(prsp->body.get_tune_status.rsp.sts.BER);
+out:
+        LEAVE();
+        return error;
+}
+/**
+ * send get TPS command to AS10x
+ * @phandle:   pointer to AS10x handle
+ * @ptps:      pointer to TPS parameters structure
+ *
+ * Return 0 on success or negative value in case of error.
+ */
+int as10x_cmd_get_tps(as10x_handle_t *phandle, struct as10x_tps *ptps)
+{
+        int error;
+        struct as10x_cmd_t *pcmd, *prsp;
+        ENTER();
+        pcmd = phandle->cmd;
+        prsp = phandle->rsp;
+        /* prepare command */
+        as10x_cmd_build(pcmd, (++phandle->cmd_xid),
+                        sizeof(pcmd->body.get_tps.req));
+        /* fill command */
+        pcmd->body.get_tune_status.req.proc_id =
+                cpu_to_le16(CONTROL_PROC_GETTPS);
+        /* send command */
+        if (phandle->ops->xfer_cmd) {
+                error = phandle->ops->xfer_cmd(phandle,
+                                               (uint8_t *) pcmd,
+                                               sizeof(pcmd->body.get_tps.req) +
+                                               HEADER_SIZE,
+                                               (uint8_t *) prsp,
+                                               sizeof(prsp->body.get_tps.rsp) +
+                                               HEADER_SIZE);
+        } else {
+                error = AS10X_CMD_ERROR;
+        }
+        if (error < 0)
+                goto out;
+        /* parse response */
+        error = as10x_rsp_parse(prsp, CONTROL_PROC_GETTPS_RSP);
+        if (error < 0)
+                goto out;
+        /* Response OK -> get response data */
+        ptps->constellation = prsp->body.get_tps.rsp.tps.constellation;
+        ptps->hierarchy = prsp->body.get_tps.rsp.tps.hierarchy;
+        ptps->interleaving_mode = prsp->body.get_tps.rsp.tps.interleaving_mode;
+        ptps->code_rate_HP = prsp->body.get_tps.rsp.tps.code_rate_HP;
+        ptps->code_rate_LP = prsp->body.get_tps.rsp.tps.code_rate_LP;
+        ptps->guard_interval = prsp->body.get_tps.rsp.tps.guard_interval;
+        ptps->transmission_mode  = prsp->body.get_tps.rsp.tps.transmission_mode;
+        ptps->DVBH_mask_HP = prsp->body.get_tps.rsp.tps.DVBH_mask_HP;
+        ptps->DVBH_mask_LP = prsp->body.get_tps.rsp.tps.DVBH_mask_LP;
+        ptps->cell_ID = le16_to_cpu(prsp->body.get_tps.rsp.tps.cell_ID);
+out:
+        LEAVE();
+        return error;
+}
+/**
+ * as10x_cmd_get_demod_stats - send get demod stats command to AS10x
+ * @phandle:       pointer to AS10x handle
+ * @pdemod_stats:  pointer to demod stats parameters structure
+ *
+ * Return 0 on success or negative value in case of error.
+ */
+int as10x_cmd_get_demod_stats(as10x_handle_t  *phandle,
+                              struct as10x_demod_stats *pdemod_stats)
+{
+        int error;
+        struct as10x_cmd_t *pcmd, *prsp;
+        ENTER();
+        pcmd = phandle->cmd;
+        prsp = phandle->rsp;
+        /* prepare command */
+        as10x_cmd_build(pcmd, (++phandle->cmd_xid),
+                        sizeof(pcmd->body.get_demod_stats.req));
+        /* fill command */
+        pcmd->body.get_demod_stats.req.proc_id =
+                cpu_to_le16(CONTROL_PROC_GET_DEMOD_STATS);
+        /* send command */
+        if (phandle->ops->xfer_cmd) {
+                error = phandle->ops->xfer_cmd(phandle,
+                                (uint8_t *) pcmd,
+                                sizeof(pcmd->body.get_demod_stats.req)
+                                + HEADER_SIZE,
+                                (uint8_t *) prsp,
+                                sizeof(prsp->body.get_demod_stats.rsp)
+                                + HEADER_SIZE);
+        } else {
+                error = AS10X_CMD_ERROR;
+        }
+        if (error < 0)
+                goto out;
+        /* parse response */
+        error = as10x_rsp_parse(prsp, CONTROL_PROC_GET_DEMOD_STATS_RSP);
+        if (error < 0)
+                goto out;
+        /* Response OK -> get response data */
+        pdemod_stats->frame_count =
+                le32_to_cpu(prsp->body.get_demod_stats.rsp.stats.frame_count);
+        pdemod_stats->bad_frame_count =
+                le32_to_cpu(prsp->body.get_demod_stats.rsp.stats.bad_frame_count);
+        pdemod_stats->bytes_fixed_by_rs =
+                le32_to_cpu(prsp->body.get_demod_stats.rsp.stats.bytes_fixed_by_rs);
+        pdemod_stats->mer =
+                le16_to_cpu(prsp->body.get_demod_stats.rsp.stats.mer);
+        pdemod_stats->has_started =
+                prsp->body.get_demod_stats.rsp.stats.has_started;
+out:
+        LEAVE();
+        return error;
+}
+/**
+ * as10x_cmd_get_impulse_resp - send get impulse response command to AS10x
+ * @phandle:  pointer to AS10x handle
+ * @is_ready: pointer to value indicating when impulse
+ *            response data is ready
+ *
+ * Return 0 on success or negative value in case of error.
+ */
+int as10x_cmd_get_impulse_resp(as10x_handle_t     *phandle,
+                               uint8_t *is_ready)
+{
+        int error;
+        struct as10x_cmd_t *pcmd, *prsp;
+        ENTER();
+        pcmd = phandle->cmd;
+        prsp = phandle->rsp;
+        /* prepare command */
+        as10x_cmd_build(pcmd, (++phandle->cmd_xid),
+                        sizeof(pcmd->body.get_impulse_rsp.req));
+        /* fill command */
+        pcmd->body.get_impulse_rsp.req.proc_id =
+                cpu_to_le16(CONTROL_PROC_GET_IMPULSE_RESP);
+        /* send command */
+        if (phandle->ops->xfer_cmd) {
+                error = phandle->ops->xfer_cmd(phandle,
+                                        (uint8_t *) pcmd,
+                                        sizeof(pcmd->body.get_impulse_rsp.req)
+                                        + HEADER_SIZE,
+                                        (uint8_t *) prsp,
+                                        sizeof(prsp->body.get_impulse_rsp.rsp)
+                                        + HEADER_SIZE);
+        } else {
+                error = AS10X_CMD_ERROR;
+        }
+        if (error < 0)
+                goto out;
+        /* parse response */
+        error = as10x_rsp_parse(prsp, CONTROL_PROC_GET_IMPULSE_RESP_RSP);
+        if (error < 0)
+                goto out;
+        /* Response OK -> get response data */
+        *is_ready = prsp->body.get_impulse_rsp.rsp.is_ready;
+out:
+        LEAVE();
+        return error;
+}
+/**
+ * as10x_cmd_build - build AS10x command header
+ * @pcmd:     pointer to AS10x command buffer
+ * @xid:      sequence id of the command
+ * @cmd_len:  length of the command
+ */
+void as10x_cmd_build(struct as10x_cmd_t *pcmd,
+                     uint16_t xid, uint16_t cmd_len)
+{
+        pcmd->header.req_id = cpu_to_le16(xid);
+        pcmd->header.prog = cpu_to_le16(SERVICE_PROG_ID);
+        pcmd->header.version = cpu_to_le16(SERVICE_PROG_VERSION);
+        pcmd->header.data_len = cpu_to_le16(cmd_len);
+}
+/**
+ * as10x_rsp_parse - Parse command response
+ * @prsp:       pointer to AS10x command buffer
+ * @proc_id:    id of the command
+ *
+ * Return 0 on success or negative value in case of error.
+ */
+int as10x_rsp_parse(struct as10x_cmd_t *prsp, uint16_t proc_id)
+{
+        int error;
+        /* extract command error code */
+        error = prsp->body.common.rsp.error;
+        if ((error == 0) &&
+            (le16_to_cpu(prsp->body.common.rsp.proc_id) == proc_id)) {
+                return 0;
+        }
+        return AS10X_CMD_ERROR;
+}
diff --git a/drivers/staging/media/as102/as10x_cmd.h b/drivers/staging/media/as102/as10x_cmd.h
new file mode 100644
index 000000000000..01a716380e0a
--- /dev/null
+++ b/drivers/staging/media/as102/as10x_cmd.h
@@ -0,0 +1,540 @@
+/*
+ * Abilis Systems Single DVB-T Receiver
+ * Copyright (C) 2008 Pierrick Hascoet <pierrick.hascoet@abilis.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, 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 _AS10X_CMD_H_
+#define _AS10X_CMD_H_
+#ifdef __KERNEL__
+#include <linux/kernel.h>
+#endif
+#include "as10x_types.h"
+/*********************************/
+/*       MACRO DEFINITIONS       */
+/*********************************/
+#define AS10X_CMD_ERROR -1
+#define SERVICE_PROG_ID        0x0002
+#define SERVICE_PROG_VERSION   0x0001
+#define HIER_NONE              0x00
+#define HIER_LOW_PRIORITY      0x01
+#define HEADER_SIZE (sizeof(struct as10x_cmd_header_t))
+/* context request types */
+#define GET_CONTEXT_DATA        1
+#define SET_CONTEXT_DATA        2
+/* ODSP suspend modes */
+#define CFG_MODE_ODSP_RESUME  0
+#define CFG_MODE_ODSP_SUSPEND 1
+/* Dump memory size */
+#define DUMP_BLOCK_SIZE_MAX   0x20
+/*********************************/
+/*     TYPE DEFINITION           */
+/*********************************/
+typedef enum {
+   CONTROL_PROC_TURNON               = 0x0001,
+   CONTROL_PROC_TURNON_RSP           = 0x0100,
+   CONTROL_PROC_SET_REGISTER         = 0x0002,
+   CONTROL_PROC_SET_REGISTER_RSP     = 0x0200,
+   CONTROL_PROC_GET_REGISTER         = 0x0003,
+   CONTROL_PROC_GET_REGISTER_RSP     = 0x0300,
+   CONTROL_PROC_SETTUNE              = 0x000A,
+   CONTROL_PROC_SETTUNE_RSP          = 0x0A00,
+   CONTROL_PROC_GETTUNESTAT          = 0x000B,
+   CONTROL_PROC_GETTUNESTAT_RSP      = 0x0B00,
+   CONTROL_PROC_GETTPS               = 0x000D,
+   CONTROL_PROC_GETTPS_RSP           = 0x0D00,
+   CONTROL_PROC_SETFILTER            = 0x000E,
+   CONTROL_PROC_SETFILTER_RSP        = 0x0E00,
+   CONTROL_PROC_REMOVEFILTER         = 0x000F,
+   CONTROL_PROC_REMOVEFILTER_RSP     = 0x0F00,
+   CONTROL_PROC_GET_IMPULSE_RESP     = 0x0012,
+   CONTROL_PROC_GET_IMPULSE_RESP_RSP = 0x1200,
+   CONTROL_PROC_START_STREAMING      = 0x0013,
+   CONTROL_PROC_START_STREAMING_RSP  = 0x1300,
+   CONTROL_PROC_STOP_STREAMING       = 0x0014,
+   CONTROL_PROC_STOP_STREAMING_RSP   = 0x1400,
+   CONTROL_PROC_GET_DEMOD_STATS      = 0x0015,
+   CONTROL_PROC_GET_DEMOD_STATS_RSP  = 0x1500,
+   CONTROL_PROC_ELNA_CHANGE_MODE     = 0x0016,
+   CONTROL_PROC_ELNA_CHANGE_MODE_RSP = 0x1600,
+   CONTROL_PROC_ODSP_CHANGE_MODE     = 0x0017,
+   CONTROL_PROC_ODSP_CHANGE_MODE_RSP = 0x1700,
+   CONTROL_PROC_AGC_CHANGE_MODE      = 0x0018,
+   CONTROL_PROC_AGC_CHANGE_MODE_RSP  = 0x1800,
+   CONTROL_PROC_CONTEXT              = 0x00FC,
+   CONTROL_PROC_CONTEXT_RSP          = 0xFC00,
+   CONTROL_PROC_DUMP_MEMORY          = 0x00FD,
+   CONTROL_PROC_DUMP_MEMORY_RSP      = 0xFD00,
+   CONTROL_PROC_DUMPLOG_MEMORY       = 0x00FE,
+   CONTROL_PROC_DUMPLOG_MEMORY_RSP   = 0xFE00,
+   CONTROL_PROC_TURNOFF              = 0x00FF,
+   CONTROL_PROC_TURNOFF_RSP          = 0xFF00
+} control_proc;
+#pragma pack(1)
+typedef union {
+   /* request */
+   struct {
+      /* request identifier */
+      uint16_t proc_id;
+   } req;
+   /* response */
+   struct {
+      /* response identifier */
+      uint16_t proc_id;
+      /* error */
+      uint8_t error;
+   } rsp;
+} TURN_ON;
+typedef union {
+   /* request */
+   struct {
+      /* request identifier */
+      uint16_t proc_id;
+   } req;
+   /* response */
+   struct {
+      /* response identifier */
+      uint16_t proc_id;
+      /* error */
+      uint8_t err;
+   } rsp;
+} TURN_OFF;
+typedef union {
+   /* request */
+   struct {
+      /* request identifier */
+      uint16_t proc_id;
+      /* tune params */
+      struct as10x_tune_args args;
+   } req;
+   /* response */
+   struct {
+      /* response identifier */
+      uint16_t proc_id;
+      /* response error */
+      uint8_t error;
+   } rsp;
+} SET_TUNE;
+typedef union {
+   /* request */
+   struct {
+      /* request identifier */
+      uint16_t proc_id;
+   } req;
+   /* response */
+   struct {
+      /* response identifier */
+      uint16_t proc_id;
+      /* response error */
+      uint8_t error;
+      /* tune status */
+      struct as10x_tune_status sts;
+   } rsp;
+} GET_TUNE_STATUS;
+typedef union {
+   /* request */
+   struct {
+      /* request identifier */
+      uint16_t proc_id;
+   } req;
+   /* response */
+   struct {
+      /* response identifier */
+      uint16_t proc_id;
+      /* response error */
+      uint8_t error;
+      /* tps details */
+      struct as10x_tps tps;
+   } rsp;
+} GET_TPS;
+typedef union {
+   /* request */
+   struct {
+      /* request identifier */
+      uint16_t  proc_id;
+   } req;
+   /* response */
+   struct {
+      /* response identifier */
+      uint16_t proc_id;
+      /* response error */
+      uint8_t error;
+   } rsp;
+} COMMON;
+typedef union {
+   /* request */
+   struct {
+      /* request identifier */
+      uint16_t  proc_id;
+      /* PID to filter */
+      uint16_t  pid;
+      /* stream type (MPE, PSI/SI or PES )*/
+      uint8_t stream_type;
+      /* PID index in filter table */
+      uint8_t idx;
+   } req;
+   /* response */
+   struct {
+      /* response identifier */
+      uint16_t proc_id;
+      /* response error */
+      uint8_t error;
+      /* Filter id */
+      uint8_t filter_id;
+   } rsp;
+} ADD_PID_FILTER;
+typedef union {
+   /* request */
+   struct {
+      /* request identifier */
+      uint16_t  proc_id;
+      /* PID to remove */
+      uint16_t  pid;
+   } req;
+   /* response */
+   struct {
+      /* response identifier */
+      uint16_t proc_id;
+      /* response error */
+      uint8_t error;
+   } rsp;
+} DEL_PID_FILTER;
+typedef union {
+   /* request */
+   struct {
+      /* request identifier */
+      uint16_t proc_id;
+   } req;
+   /* response */
+   struct {
+      /* response identifier */
+      uint16_t proc_id;
+      /* error */
+      uint8_t error;
+   } rsp;
+} START_STREAMING;
+typedef union {
+   /* request */
+   struct {
+      /* request identifier */
+      uint16_t proc_id;
+   } req;
+   /* response */
+   struct {
+      /* response identifier */
+      uint16_t proc_id;
+      /* error */
+      uint8_t error;
+   } rsp;
+} STOP_STREAMING;
+typedef union {
+   /* request */
+   struct {
+      /* request identifier */
+      uint16_t proc_id;
+   } req;
+   /* response */
+   struct {
+      /* response identifier */
+      uint16_t proc_id;
+      /* error */
+      uint8_t error;
+      /* demod stats */
+      struct as10x_demod_stats stats;
+   } rsp;
+} GET_DEMOD_STATS;
+typedef union {
+   /* request */
+   struct {
+      /* request identifier */
+      uint16_t proc_id;
+   } req;
+   /* response */
+   struct {
+      /* response identifier */
+      uint16_t proc_id;
+      /* error */
+      uint8_t error;
+      /* impulse response ready */
+      uint8_t is_ready;
+   } rsp;
+} GET_IMPULSE_RESP;
+typedef union {
+   /* request */
+   struct {
+      /* request identifier */
+      uint16_t proc_id;
+      /* value to write (for set context)*/
+      struct as10x_register_value reg_val;
+      /* context tag */
+      uint16_t tag;
+      /* context request type */
+      uint16_t type;
+   } req;
+   /* response */
+   struct {
+      /* response identifier */
+      uint16_t proc_id;
+      /* value read (for get context) */
+      struct as10x_register_value reg_val;
+      /* context request type */
+      uint16_t type;
+      /* error */
+      uint8_t error;
+   } rsp;
+} FW_CONTEXT;
+typedef union {
+   /* request */
+   struct {
+      /* response identifier */
+      uint16_t proc_id;
+      /* register description */
+      struct as10x_register_addr reg_addr;
+      /* register content */
+      struct as10x_register_value reg_val;
+   } req;
+   /* response */
+   struct {
+      /* response identifier */
+      uint16_t proc_id;
+      /* error */
+      uint8_t error;
+   } rsp;
+} SET_REGISTER;
+typedef union {
+   /* request */
+   struct {
+      /* response identifier */
+      uint16_t proc_id;
+      /* register description */
+      struct as10x_register_addr reg_addr;
+   } req;
+   /* response */
+   struct {
+      /* response identifier */
+      uint16_t proc_id;
+      /* error */
+      uint8_t error;
+      /* register content */
+      struct as10x_register_value reg_val;
+   } rsp;
+} GET_REGISTER;
+typedef union {
+   /* request */
+   struct {
+      /* request identifier */
+      uint16_t proc_id;
+      /* mode */
+      uint8_t mode;
+   } req;
+   /* response */
+   struct {
+      /* response identifier */
+      uint16_t proc_id;
+      /* error */
+      uint8_t error;
+   } rsp;
+} CFG_CHANGE_MODE;
+struct as10x_cmd_header_t {
+   uint16_t req_id;
+   uint16_t prog;
+   uint16_t version;
+   uint16_t data_len;
+};
+#define DUMP_BLOCK_SIZE 16
+typedef union {
+   /* request */
+   struct {
+      /* request identifier */
+      uint16_t proc_id;
+      /* dump memory type request */
+      uint8_t dump_req;
+      /* register description */
+      struct as10x_register_addr reg_addr;
+      /* nb blocks to read */
+      uint16_t num_blocks;
+   } req;
+   /* response */
+   struct {
+      /* response identifier */
+      uint16_t proc_id;
+      /* error */
+      uint8_t error;
+      /* dump response */
+      uint8_t dump_rsp;
+      /* data */
+      union {
+         uint8_t  data8[DUMP_BLOCK_SIZE];
+         uint16_t data16[DUMP_BLOCK_SIZE / sizeof(uint16_t)];
+         uint32_t data32[DUMP_BLOCK_SIZE / sizeof(uint32_t)];
+      } u;
+   } rsp;
+} DUMP_MEMORY;
+typedef union {
+   struct {
+      /* request identifier */
+      uint16_t proc_id;
+      /* dump memory type request */
+      uint8_t dump_req;
+   } req;
+   struct {
+      /* request identifier */
+      uint16_t proc_id;
+      /* error */
+      uint8_t error;
+      /* dump response */
+      uint8_t dump_rsp;
+      /* dump data */
+      uint8_t data[DUMP_BLOCK_SIZE];
+   } rsp;
+} DUMPLOG_MEMORY;
+typedef union {
+   /* request */
+   struct {
+      uint16_t proc_id;
+      uint8_t data[64 - sizeof(struct as10x_cmd_header_t) -2 /* proc_id */];
+   } req;
+   /* response */
+   struct {
+      uint16_t proc_id;
+      uint8_t error;
+      uint8_t data[64 - sizeof(struct as10x_cmd_header_t) /* header */
+                      - 2 /* proc_id */ - 1 /* rc */];
+   } rsp;
+} RAW_DATA;
+struct as10x_cmd_t {
+   /* header */
+   struct as10x_cmd_header_t header;
+   /* body */
+   union {
+      TURN_ON           turn_on;
+      TURN_OFF          turn_off;
+      SET_TUNE          set_tune;
+      GET_TUNE_STATUS   get_tune_status;
+      GET_TPS           get_tps;
+      COMMON            common;
+      ADD_PID_FILTER    add_pid_filter;
+      DEL_PID_FILTER    del_pid_filter;
+      START_STREAMING   start_streaming;
+      STOP_STREAMING    stop_streaming;
+      GET_DEMOD_STATS   get_demod_stats;
+      GET_IMPULSE_RESP  get_impulse_rsp;
+      FW_CONTEXT        context;
+      SET_REGISTER      set_register;
+      GET_REGISTER      get_register;
+      CFG_CHANGE_MODE   cfg_change_mode;
+      DUMP_MEMORY       dump_memory;
+      DUMPLOG_MEMORY    dumplog_memory;
+      RAW_DATA          raw_data;
+   } body;
+};
+struct as10x_token_cmd_t {
+   /* token cmd */
+   struct as10x_cmd_t c;
+   /* token response */
+   struct as10x_cmd_t r;
+};
+#pragma pack()
+/**************************/
+/* FUNCTION DECLARATION   */
+/**************************/
+void as10x_cmd_build(struct as10x_cmd_t *pcmd, uint16_t proc_id,
+                      uint16_t cmd_len);
+int as10x_rsp_parse(struct as10x_cmd_t *r, uint16_t proc_id);
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* as10x cmd */
+int as10x_cmd_turn_on(as10x_handle_t *phandle);
+int as10x_cmd_turn_off(as10x_handle_t *phandle);
+int as10x_cmd_set_tune(as10x_handle_t *phandle,
+                       struct as10x_tune_args *ptune);
+int as10x_cmd_get_tune_status(as10x_handle_t *phandle,
+                              struct as10x_tune_status *pstatus);
+int as10x_cmd_get_tps(as10x_handle_t *phandle,
+                      struct as10x_tps *ptps);
+int as10x_cmd_get_demod_stats(as10x_handle_t  *phandle,
+                              struct as10x_demod_stats *pdemod_stats);
+int as10x_cmd_get_impulse_resp(as10x_handle_t *phandle,
+                               uint8_t *is_ready);
+/* as10x cmd stream */
+int as10x_cmd_add_PID_filter(as10x_handle_t *phandle,
+                             struct as10x_ts_filter *filter);
+int as10x_cmd_del_PID_filter(as10x_handle_t *phandle,
+                             uint16_t pid_value);
+int as10x_cmd_start_streaming(as10x_handle_t *phandle);
+int as10x_cmd_stop_streaming(as10x_handle_t *phandle);
+/* as10x cmd cfg */
+int as10x_cmd_set_context(as10x_handle_t *phandle,
+                          uint16_t tag,
+                          uint32_t value);
+int as10x_cmd_get_context(as10x_handle_t *phandle,
+                          uint16_t tag,
+                          uint32_t *pvalue);
+int as10x_cmd_eLNA_change_mode(as10x_handle_t *phandle, uint8_t mode);
+int as10x_context_rsp_parse(struct as10x_cmd_t *prsp, uint16_t proc_id);
+#ifdef __cplusplus
+}
+#endif
+#endif
+/* EOF - vim: set textwidth=80 ts=3 sw=3 sts=3 et: */
diff --git a/drivers/staging/media/as102/as10x_cmd_cfg.c b/drivers/staging/media/as102/as10x_cmd_cfg.c
new file mode 100644
index 000000000000..ec6f69fcf399
--- /dev/null
+++ b/drivers/staging/media/as102/as10x_cmd_cfg.c
@@ -0,0 +1,215 @@
+/*
+ * Abilis Systems Single DVB-T Receiver
+ * Copyright (C) 2008 Pierrick Hascoet <pierrick.hascoet@abilis.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, 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.
+ */
+#include <linux/kernel.h>
+#include "as102_drv.h"
+#include "as10x_types.h"
+#include "as10x_cmd.h"
+/***************************/
+/* FUNCTION DEFINITION     */
+/***************************/
+/**
+ * as10x_cmd_get_context - Send get context command to AS10x
+ * @phandle:   pointer to AS10x handle
+ * @tag:       context tag
+ * @pvalue:    pointer where to store context value read
+ *
+ * Return 0 on success or negative value in case of error.
+ */
+int as10x_cmd_get_context(as10x_handle_t *phandle, uint16_t tag,
+                          uint32_t *pvalue)
+{
+        int  error;
+        struct as10x_cmd_t *pcmd, *prsp;
+        ENTER();
+        pcmd = phandle->cmd;
+        prsp = phandle->rsp;
+        /* prepare command */
+        as10x_cmd_build(pcmd, (++phandle->cmd_xid),
+                        sizeof(pcmd->body.context.req));
+        /* fill command */
+        pcmd->body.context.req.proc_id = cpu_to_le16(CONTROL_PROC_CONTEXT);
+        pcmd->body.context.req.tag = cpu_to_le16(tag);
+        pcmd->body.context.req.type = cpu_to_le16(GET_CONTEXT_DATA);
+        /* send command */
+        if (phandle->ops->xfer_cmd) {
+                error  = phandle->ops->xfer_cmd(phandle,
+                                                (uint8_t *) pcmd,
+                                                sizeof(pcmd->body.context.req)
+                                                + HEADER_SIZE,
+                                                (uint8_t *) prsp,
+                                                sizeof(prsp->body.context.rsp)
+                                                + HEADER_SIZE);
+        } else {
+                error = AS10X_CMD_ERROR;
+        }
+        if (error < 0)
+                goto out;
+        /* parse response: context command do not follow the common response */
+        /* structure -> specific handling response parse required            */
+        error = as10x_context_rsp_parse(prsp, CONTROL_PROC_CONTEXT_RSP);
+        if (error == 0) {
+                /* Response OK -> get response data */
+                *pvalue = le32_to_cpu(prsp->body.context.rsp.reg_val.u.value32);
+                /* value returned is always a 32-bit value */
+        }
+out:
+        LEAVE();
+        return error;
+}
+/**
+ * as10x_cmd_set_context - send set context command to AS10x
+ * @phandle:   pointer to AS10x handle
+ * @tag:       context tag
+ * @value:     value to set in context
+ *
+ * Return 0 on success or negative value in case of error.
+ */
+int as10x_cmd_set_context(as10x_handle_t *phandle, uint16_t tag,
+                          uint32_t value)
+{
+        int error;
+        struct as10x_cmd_t *pcmd, *prsp;
+        ENTER();
+        pcmd = phandle->cmd;
+        prsp = phandle->rsp;
+        /* prepare command */
+        as10x_cmd_build(pcmd, (++phandle->cmd_xid),
+                        sizeof(pcmd->body.context.req));
+        /* fill command */
+        pcmd->body.context.req.proc_id = cpu_to_le16(CONTROL_PROC_CONTEXT);
+        /* pcmd->body.context.req.reg_val.mode initialization is not required */
+        pcmd->body.context.req.reg_val.u.value32 = cpu_to_le32(value);
+        pcmd->body.context.req.tag = cpu_to_le16(tag);
+        pcmd->body.context.req.type = cpu_to_le16(SET_CONTEXT_DATA);
+        /* send command */
+        if (phandle->ops->xfer_cmd) {
+                error  = phandle->ops->xfer_cmd(phandle,
+                                                (uint8_t *) pcmd,
+                                                sizeof(pcmd->body.context.req)
+                                                + HEADER_SIZE,
+                                                (uint8_t *) prsp,
+                                                sizeof(prsp->body.context.rsp)
+                                                + HEADER_SIZE);
+        } else {
+                error = AS10X_CMD_ERROR;
+        }
+        if (error < 0)
+                goto out;
+        /* parse response: context command do not follow the common response */
+        /* structure -> specific handling response parse required            */
+        error = as10x_context_rsp_parse(prsp, CONTROL_PROC_CONTEXT_RSP);
+out:
+        LEAVE();
+        return error;
+}
+/**
+ * as10x_cmd_eLNA_change_mode - send eLNA change mode command to AS10x
+ * @phandle:   pointer to AS10x handle
+ * @mode:      mode selected:
+ *              - ON    : 0x0 => eLNA always ON
+ *              - OFF   : 0x1 => eLNA always OFF
+ *              - AUTO  : 0x2 => eLNA follow hysteresis parameters
+ *                               to be ON or OFF
+ *
+ * Return 0 on success or negative value in case of error.
+ */
+int as10x_cmd_eLNA_change_mode(as10x_handle_t *phandle, uint8_t mode)
+{
+        int error;
+        struct as10x_cmd_t *pcmd, *prsp;
+        ENTER();
+        pcmd = phandle->cmd;
+        prsp = phandle->rsp;
+        /* prepare command */
+        as10x_cmd_build(pcmd, (++phandle->cmd_xid),
+                        sizeof(pcmd->body.cfg_change_mode.req));
+        /* fill command */
+        pcmd->body.cfg_change_mode.req.proc_id =
+                cpu_to_le16(CONTROL_PROC_ELNA_CHANGE_MODE);
+        pcmd->body.cfg_change_mode.req.mode = mode;
+        /* send command */
+        if (phandle->ops->xfer_cmd) {
+                error  = phandle->ops->xfer_cmd(phandle, (uint8_t *) pcmd,
+                                sizeof(pcmd->body.cfg_change_mode.req)
+                                + HEADER_SIZE, (uint8_t *) prsp,
+                                sizeof(prsp->body.cfg_change_mode.rsp)
+                                + HEADER_SIZE);
+        } else {
+                error = AS10X_CMD_ERROR;
+        }
+        if (error < 0)
+                goto out;
+        /* parse response */
+        error = as10x_rsp_parse(prsp, CONTROL_PROC_ELNA_CHANGE_MODE_RSP);
+out:
+        LEAVE();
+        return error;
+}
+/**
+ * as10x_context_rsp_parse - Parse context command response
+ * @prsp:       pointer to AS10x command response buffer
+ * @proc_id:    id of the command
+ *
+ * Since the contex command reponse does not follow the common
+ * response, a specific parse function is required.
+ * Return 0 on success or negative value in case of error.
+ */
+int as10x_context_rsp_parse(struct as10x_cmd_t *prsp, uint16_t proc_id)
+{
+        int err;
+        err = prsp->body.context.rsp.error;
+        if ((err == 0) &&
+            (le16_to_cpu(prsp->body.context.rsp.proc_id) == proc_id)) {
+                return 0;
+        }
+        return AS10X_CMD_ERROR;
+}
diff --git a/drivers/staging/media/as102/as10x_cmd_stream.c b/drivers/staging/media/as102/as10x_cmd_stream.c
new file mode 100644
index 000000000000..045c70683193
--- /dev/null
+++ b/drivers/staging/media/as102/as10x_cmd_stream.c
@@ -0,0 +1,223 @@
+/*
+ * Abilis Systems Single DVB-T Receiver
+ * Copyright (C) 2008 Pierrick Hascoet <pierrick.hascoet@abilis.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, 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.
+ */
+#include <linux/kernel.h>
+#include "as102_drv.h"
+#include "as10x_cmd.h"
+/**
+ * as10x_cmd_add_PID_filter - send add filter command to AS10x
+ * @phandle:   pointer to AS10x handle
+ * @filter:    TSFilter filter for DVB-T
+ *
+ * Return 0 on success or negative value in case of error.
+ */
+int as10x_cmd_add_PID_filter(as10x_handle_t *phandle,
+                             struct as10x_ts_filter *filter)
+{
+        int error;
+        struct as10x_cmd_t *pcmd, *prsp;
+        ENTER();
+        pcmd = phandle->cmd;
+        prsp = phandle->rsp;
+        /* prepare command */
+        as10x_cmd_build(pcmd, (++phandle->cmd_xid),
+                        sizeof(pcmd->body.add_pid_filter.req));
+        /* fill command */
+        pcmd->body.add_pid_filter.req.proc_id =
+                cpu_to_le16(CONTROL_PROC_SETFILTER);
+        pcmd->body.add_pid_filter.req.pid = cpu_to_le16(filter->pid);
+        pcmd->body.add_pid_filter.req.stream_type = filter->type;
+        if (filter->idx < 16)
+                pcmd->body.add_pid_filter.req.idx = filter->idx;
+        else
+                pcmd->body.add_pid_filter.req.idx = 0xFF;
+        /* send command */
+        if (phandle->ops->xfer_cmd) {
+                error = phandle->ops->xfer_cmd(phandle, (uint8_t *) pcmd,
+                                sizeof(pcmd->body.add_pid_filter.req)
+                                + HEADER_SIZE, (uint8_t *) prsp,
+                                sizeof(prsp->body.add_pid_filter.rsp)
+                                + HEADER_SIZE);
+        } else {
+                error = AS10X_CMD_ERROR;
+        }
+        if (error < 0)
+                goto out;
+        /* parse response */
+        error = as10x_rsp_parse(prsp, CONTROL_PROC_SETFILTER_RSP);
+        if (error == 0) {
+                /* Response OK -> get response data */
+                filter->idx = prsp->body.add_pid_filter.rsp.filter_id;
+        }
+out:
+        LEAVE();
+        return error;
+}
+/**
+ * as10x_cmd_del_PID_filter - Send delete filter command to AS10x
+ * @phandle:      pointer to AS10x handle
+ * @pid_value:    PID to delete
+ *
+ * Return 0 on success or negative value in case of error.
+ */
+int as10x_cmd_del_PID_filter(as10x_handle_t *phandle,
+                             uint16_t pid_value)
+{
+        int error;
+        struct as10x_cmd_t *pcmd, *prsp;
+        ENTER();
+        pcmd = phandle->cmd;
+        prsp = phandle->rsp;
+        /* prepare command */
+        as10x_cmd_build(pcmd, (++phandle->cmd_xid),
+                        sizeof(pcmd->body.del_pid_filter.req));
+        /* fill command */
+        pcmd->body.del_pid_filter.req.proc_id =
+                cpu_to_le16(CONTROL_PROC_REMOVEFILTER);
+        pcmd->body.del_pid_filter.req.pid = cpu_to_le16(pid_value);
+        /* send command */
+        if (phandle->ops->xfer_cmd) {
+                error = phandle->ops->xfer_cmd(phandle, (uint8_t *) pcmd,
+                                sizeof(pcmd->body.del_pid_filter.req)
+                                + HEADER_SIZE, (uint8_t *) prsp,
+                                sizeof(prsp->body.del_pid_filter.rsp)
+                                + HEADER_SIZE);
+        } else {
+                error = AS10X_CMD_ERROR;
+        }
+        if (error < 0)
+                goto out;
+        /* parse response */
+        error = as10x_rsp_parse(prsp, CONTROL_PROC_REMOVEFILTER_RSP);
+out:
+        LEAVE();
+        return error;
+}
+/**
+ * as10x_cmd_start_streaming - Send start streaming command to AS10x
+ * @phandle:   pointer to AS10x handle
+ *
+ * Return 0 on success or negative value in case of error.
+ */
+int as10x_cmd_start_streaming(as10x_handle_t *phandle)
+{
+        int error;
+        struct as10x_cmd_t *pcmd, *prsp;
+        ENTER();
+        pcmd = phandle->cmd;
+        prsp = phandle->rsp;
+        /* prepare command */
+        as10x_cmd_build(pcmd, (++phandle->cmd_xid),
+                        sizeof(pcmd->body.start_streaming.req));
+        /* fill command */
+        pcmd->body.start_streaming.req.proc_id =
+                cpu_to_le16(CONTROL_PROC_START_STREAMING);
+        /* send command */
+        if (phandle->ops->xfer_cmd) {
+                error = phandle->ops->xfer_cmd(phandle, (uint8_t *) pcmd,
+                                sizeof(pcmd->body.start_streaming.req)
+                                + HEADER_SIZE, (uint8_t *) prsp,
+                                sizeof(prsp->body.start_streaming.rsp)
+                                + HEADER_SIZE);
+        } else {
+                error = AS10X_CMD_ERROR;
+        }
+        if (error < 0)
+                goto out;
+        /* parse response */
+        error = as10x_rsp_parse(prsp, CONTROL_PROC_START_STREAMING_RSP);
+out:
+        LEAVE();
+        return error;
+}
+/**
+ * as10x_cmd_stop_streaming - Send stop streaming command to AS10x
+ * @phandle:   pointer to AS10x handle
+ *
+ * Return 0 on success or negative value in case of error.
+ */
+int as10x_cmd_stop_streaming(as10x_handle_t *phandle)
+{
+        int8_t error;
+        struct as10x_cmd_t *pcmd, *prsp;
+        ENTER();
+        pcmd = phandle->cmd;
+        prsp = phandle->rsp;
+        /* prepare command */
+        as10x_cmd_build(pcmd, (++phandle->cmd_xid),
+                        sizeof(pcmd->body.stop_streaming.req));
+        /* fill command */
+        pcmd->body.stop_streaming.req.proc_id =
+                cpu_to_le16(CONTROL_PROC_STOP_STREAMING);
+        /* send command */
+        if (phandle->ops->xfer_cmd) {
+                error = phandle->ops->xfer_cmd(phandle, (uint8_t *) pcmd,
+                                sizeof(pcmd->body.stop_streaming.req)
+                                + HEADER_SIZE, (uint8_t *) prsp,
+                                sizeof(prsp->body.stop_streaming.rsp)
+                                + HEADER_SIZE);
+        } else {
+                error = AS10X_CMD_ERROR;
+        }
+        if (error < 0)
+                goto out;
+        /* parse response */
+        error = as10x_rsp_parse(prsp, CONTROL_PROC_STOP_STREAMING_RSP);
+out:
+        LEAVE();
+        return error;
+}
diff --git a/drivers/staging/media/as102/as10x_handle.h b/drivers/staging/media/as102/as10x_handle.h
new file mode 100644
index 000000000000..4f01a76e9829
--- /dev/null
+++ b/drivers/staging/media/as102/as10x_handle.h
@@ -0,0 +1,58 @@
+/*
+ * Abilis Systems Single DVB-T Receiver
+ * Copyright (C) 2008 Pierrick Hascoet <pierrick.hascoet@abilis.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, 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.
+ */
+#ifdef __KERNEL__
+struct as102_bus_adapter_t;
+struct as102_dev_t;
+#define as10x_handle_t struct as102_bus_adapter_t
+#include "as10x_cmd.h"
+/* values for "mode" field */
+#define REGMODE8         8
+#define REGMODE16        16
+#define REGMODE32        32
+struct as102_priv_ops_t {
+        int (*upload_fw_pkt) (struct as102_bus_adapter_t *bus_adap,
+                              unsigned char *buf, int buflen, int swap32);
+        int (*send_cmd) (struct as102_bus_adapter_t *bus_adap,
+                         unsigned char *buf, int buflen);
+        int (*xfer_cmd) (struct as102_bus_adapter_t *bus_adap,
+                         unsigned char *send_buf, int send_buf_len,
+                         unsigned char *recv_buf, int recv_buf_len);
+/*
+        int (*pid_filter) (struct as102_bus_adapter_t *bus_adap,
+                           int index, u16 pid, int onoff);
+*/
+        int (*start_stream) (struct as102_dev_t *dev);
+        void (*stop_stream) (struct as102_dev_t *dev);
+        int (*reset_target) (struct as102_bus_adapter_t *bus_adap);
+        int (*read_write)(struct as102_bus_adapter_t *bus_adap, uint8_t mode,
+                          uint32_t rd_addr, uint16_t rd_len,
+                          uint32_t wr_addr, uint16_t wr_len);
+        int (*as102_read_ep2) (struct as102_bus_adapter_t *bus_adap,
+                               unsigned char *recv_buf,
+                               int recv_buf_len);
+};
+#endif
diff --git a/drivers/staging/media/as102/as10x_types.h b/drivers/staging/media/as102/as10x_types.h
new file mode 100644
index 000000000000..3dedb3c1420a
--- /dev/null
+++ b/drivers/staging/media/as102/as10x_types.h
@@ -0,0 +1,198 @@
+/*
+ * Abilis Systems Single DVB-T Receiver
+ * Copyright (C) 2008 Pierrick Hascoet <pierrick.hascoet@abilis.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, 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 _AS10X_TYPES_H_
+#define _AS10X_TYPES_H_
+#include "as10x_handle.h"
+/*********************************/
+/*       MACRO DEFINITIONS       */
+/*********************************/
+/* bandwidth constant values */
+#define BW_5_MHZ           0x00
+#define BW_6_MHZ           0x01
+#define BW_7_MHZ           0x02
+#define BW_8_MHZ           0x03
+/* hierarchy priority selection values */
+#define HIER_NO_PRIORITY   0x00
+#define HIER_LOW_PRIORITY  0x01
+#define HIER_HIGH_PRIORITY 0x02
+/* constellation available values */
+#define CONST_QPSK         0x00
+#define CONST_QAM16        0x01
+#define CONST_QAM64        0x02
+#define CONST_UNKNOWN      0xFF
+/* hierarchy available values */
+#define HIER_NONE         0x00
+#define HIER_ALPHA_1      0x01
+#define HIER_ALPHA_2      0x02
+#define HIER_ALPHA_4      0x03
+#define HIER_UNKNOWN      0xFF
+/* interleaving available values */
+#define INTLV_NATIVE      0x00
+#define INTLV_IN_DEPTH    0x01
+#define INTLV_UNKNOWN     0xFF
+/* code rate available values */
+#define CODE_RATE_1_2     0x00
+#define CODE_RATE_2_3     0x01
+#define CODE_RATE_3_4     0x02
+#define CODE_RATE_5_6     0x03
+#define CODE_RATE_7_8     0x04
+#define CODE_RATE_UNKNOWN 0xFF
+/* guard interval available values */
+#define GUARD_INT_1_32    0x00
+#define GUARD_INT_1_16    0x01
+#define GUARD_INT_1_8     0x02
+#define GUARD_INT_1_4     0x03
+#define GUARD_UNKNOWN     0xFF
+/* transmission mode available values */
+#define TRANS_MODE_2K      0x00
+#define TRANS_MODE_8K      0x01
+#define TRANS_MODE_4K      0x02
+#define TRANS_MODE_UNKNOWN 0xFF
+/* DVBH signalling available values */
+#define TIMESLICING_PRESENT   0x01
+#define MPE_FEC_PRESENT       0x02
+/* tune state available */
+#define TUNE_STATUS_NOT_TUNED       0x00
+#define TUNE_STATUS_IDLE            0x01
+#define TUNE_STATUS_LOCKING         0x02
+#define TUNE_STATUS_SIGNAL_DVB_OK   0x03
+#define TUNE_STATUS_STREAM_DETECTED 0x04
+#define TUNE_STATUS_STREAM_TUNED    0x05
+#define TUNE_STATUS_ERROR           0xFF
+/* available TS FID filter types */
+#define TS_PID_TYPE_TS       0
+#define TS_PID_TYPE_PSI_SI   1
+#define TS_PID_TYPE_MPE      2
+/* number of echos available */
+#define MAX_ECHOS   15
+/* Context types */
+#define CONTEXT_LNA                   1010
+#define CONTEXT_ELNA_HYSTERESIS       4003
+#define CONTEXT_ELNA_GAIN             4004
+#define CONTEXT_MER_THRESHOLD         5005
+#define CONTEXT_MER_OFFSET            5006
+#define CONTEXT_IR_STATE              7000
+#define CONTEXT_TSOUT_MSB_FIRST       7004
+#define CONTEXT_TSOUT_FALLING_EDGE    7005
+/* Configuration modes */
+#define CFG_MODE_ON     0
+#define CFG_MODE_OFF    1
+#define CFG_MODE_AUTO   2
+#pragma pack(1)
+struct as10x_tps {
+   uint8_t constellation;
+   uint8_t hierarchy;
+   uint8_t interleaving_mode;
+   uint8_t code_rate_HP;
+   uint8_t code_rate_LP;
+   uint8_t guard_interval;
+   uint8_t transmission_mode;
+   uint8_t DVBH_mask_HP;
+   uint8_t DVBH_mask_LP;
+   uint16_t cell_ID;
+};
+struct as10x_tune_args {
+   /* frequency */
+   uint32_t freq;
+   /* bandwidth */
+   uint8_t bandwidth;
+   /* hierarchy selection */
+   uint8_t hier_select;
+   /* constellation */
+   uint8_t constellation;
+   /* hierarchy */
+   uint8_t hierarchy;
+   /* interleaving mode */
+   uint8_t interleaving_mode;
+   /* code rate */
+   uint8_t code_rate;
+   /* guard interval */
+   uint8_t guard_interval;
+   /* transmission mode */
+   uint8_t transmission_mode;
+};
+struct as10x_tune_status {
+   /* tune status */
+   uint8_t tune_state;
+   /* signal strength */
+   int16_t signal_strength;
+   /* packet error rate 10^-4 */
+   uint16_t PER;
+   /* bit error rate 10^-4 */
+   uint16_t BER;
+};
+struct as10x_demod_stats {
+   /* frame counter */
+   uint32_t frame_count;
+   /* Bad frame counter */
+   uint32_t bad_frame_count;
+   /* Number of wrong bytes fixed by Reed-Solomon */
+   uint32_t bytes_fixed_by_rs;
+   /* Averaged MER */
+   uint16_t mer;
+   /* statistics calculation state indicator (started or not) */
+   uint8_t has_started;
+};
+struct as10x_ts_filter {
+   uint16_t pid;  /** valid PID value 0x00 : 0x2000 */
+   uint8_t  type; /** Red TS_PID_TYPE_<N> values */
+   uint8_t  idx;  /** index in filtering table */
+};
+struct as10x_register_value {
+   uint8_t       mode;
+   union {
+      uint8_t    value8;    /* 8 bit value */
+      uint16_t   value16;   /* 16 bit value */
+      uint32_t   value32;   /* 32 bit value */
+   }u;
+};
+#pragma pack()
+struct as10x_register_addr {
+   /* register addr */
+   uint32_t addr;
+   /* register mode access */
+   uint8_t mode;
+};
+#endif
diff --git a/drivers/staging/cxd2099/Kconfig b/drivers/staging/media/cxd2099/Kconfig
index b48aefddc84c..b48aefddc84c 100644
--- a/drivers/staging/cxd2099/Kconfig
+++ b/drivers/staging/media/cxd2099/Kconfig
diff --git a/drivers/staging/cxd2099/Makefile b/drivers/staging/media/cxd2099/Makefile
index 64cfc77be357..64cfc77be357 100644
--- a/drivers/staging/cxd2099/Makefile
+++ b/drivers/staging/media/cxd2099/Makefile
diff --git a/drivers/staging/cxd2099/TODO b/drivers/staging/media/cxd2099/TODO
index 375bb6f8ee2c..375bb6f8ee2c 100644
--- a/drivers/staging/cxd2099/TODO
+++ b/drivers/staging/media/cxd2099/TODO
diff --git a/drivers/staging/cxd2099/cxd2099.c b/drivers/staging/media/cxd2099/cxd2099.c
index 1c04185bcfd7..1c04185bcfd7 100644
--- a/drivers/staging/cxd2099/cxd2099.c
+++ b/drivers/staging/media/cxd2099/cxd2099.c
diff --git a/drivers/staging/cxd2099/cxd2099.h b/drivers/staging/media/cxd2099/cxd2099.h
index 19c588a59588..19c588a59588 100644
--- a/drivers/staging/cxd2099/cxd2099.h
+++ b/drivers/staging/media/cxd2099/cxd2099.h
diff --git a/drivers/staging/dt3155v4l/Kconfig b/drivers/staging/media/dt3155v4l/Kconfig
index 226a1ca90b3c..226a1ca90b3c 100644
--- a/drivers/staging/dt3155v4l/Kconfig
+++ b/drivers/staging/media/dt3155v4l/Kconfig
diff --git a/drivers/staging/dt3155v4l/Makefile b/drivers/staging/media/dt3155v4l/Makefile
index ce7a3ec2faf3..ce7a3ec2faf3 100644
--- a/drivers/staging/dt3155v4l/Makefile
+++ b/drivers/staging/media/dt3155v4l/Makefile
diff --git a/drivers/staging/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c
index 04e93c49f03a..04e93c49f03a 100644
--- a/drivers/staging/dt3155v4l/dt3155v4l.c
+++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c
diff --git a/drivers/staging/dt3155v4l/dt3155v4l.h b/drivers/staging/media/dt3155v4l/dt3155v4l.h
index 2e4f89d402e4..2e4f89d402e4 100644
--- a/drivers/staging/dt3155v4l/dt3155v4l.h
+++ b/drivers/staging/media/dt3155v4l/dt3155v4l.h
diff --git a/drivers/staging/easycap/Kconfig b/drivers/staging/media/easycap/Kconfig
index a425a6f9cdca..a425a6f9cdca 100644
--- a/drivers/staging/easycap/Kconfig
+++ b/drivers/staging/media/easycap/Kconfig
diff --git a/drivers/staging/easycap/Makefile b/drivers/staging/media/easycap/Makefile
index a34e75f59c18..a34e75f59c18 100644
--- a/drivers/staging/easycap/Makefile
+++ b/drivers/staging/media/easycap/Makefile
diff --git a/drivers/staging/easycap/README b/drivers/staging/media/easycap/README
index 796b032384bd..796b032384bd 100644
--- a/drivers/staging/easycap/README
+++ b/drivers/staging/media/easycap/README
diff --git a/drivers/staging/easycap/easycap.h b/drivers/staging/media/easycap/easycap.h
index 7b256a948c27..7b256a948c27 100644
--- a/drivers/staging/easycap/easycap.h
+++ b/drivers/staging/media/easycap/easycap.h
diff --git a/drivers/staging/easycap/easycap_ioctl.c b/drivers/staging/media/easycap/easycap_ioctl.c
index c99addfb6242..c99addfb6242 100644
--- a/drivers/staging/easycap/easycap_ioctl.c
+++ b/drivers/staging/media/easycap/easycap_ioctl.c
diff --git a/drivers/staging/easycap/easycap_low.c b/drivers/staging/media/easycap/easycap_low.c
index 0385735ac6df..0385735ac6df 100644
--- a/drivers/staging/easycap/easycap_low.c
+++ b/drivers/staging/media/easycap/easycap_low.c
diff --git a/drivers/staging/easycap/easycap_main.c b/drivers/staging/media/easycap/easycap_main.c
index a45c0b507067..a45c0b507067 100644
--- a/drivers/staging/easycap/easycap_main.c
+++ b/drivers/staging/media/easycap/easycap_main.c
diff --git a/drivers/staging/easycap/easycap_settings.c b/drivers/staging/media/easycap/easycap_settings.c
index 70f59b13c34d..70f59b13c34d 100644
--- a/drivers/staging/easycap/easycap_settings.c
+++ b/drivers/staging/media/easycap/easycap_settings.c
diff --git a/drivers/staging/easycap/easycap_sound.c b/drivers/staging/media/easycap/easycap_sound.c
index b22bb39b5f69..b22bb39b5f69 100644
--- a/drivers/staging/easycap/easycap_sound.c
+++ b/drivers/staging/media/easycap/easycap_sound.c
diff --git a/drivers/staging/easycap/easycap_testcard.c b/drivers/staging/media/easycap/easycap_testcard.c
index 0f71470ace39..0f71470ace39 100644
--- a/drivers/staging/easycap/easycap_testcard.c
+++ b/drivers/staging/media/easycap/easycap_testcard.c
diff --git a/drivers/staging/go7007/Kconfig b/drivers/staging/media/go7007/Kconfig
index 7dfb2815b9ec..7dfb2815b9ec 100644
--- a/drivers/staging/go7007/Kconfig
+++ b/drivers/staging/media/go7007/Kconfig
diff --git a/drivers/staging/go7007/Makefile b/drivers/staging/media/go7007/Makefile
index 6ee837c56706..6ee837c56706 100644
--- a/drivers/staging/go7007/Makefile
+++ b/drivers/staging/media/go7007/Makefile
diff --git a/drivers/staging/go7007/README b/drivers/staging/media/go7007/README
index 48f447637817..48f447637817 100644
--- a/drivers/staging/go7007/README
+++ b/drivers/staging/media/go7007/README
diff --git a/drivers/staging/go7007/go7007-driver.c b/drivers/staging/media/go7007/go7007-driver.c
index 6c9279a6d606..6c9279a6d606 100644
--- a/drivers/staging/go7007/go7007-driver.c
+++ b/drivers/staging/media/go7007/go7007-driver.c
diff --git a/drivers/staging/go7007/go7007-fw.c b/drivers/staging/media/go7007/go7007-fw.c
index c9a6409edfe3..c9a6409edfe3 100644
--- a/drivers/staging/go7007/go7007-fw.c
+++ b/drivers/staging/media/go7007/go7007-fw.c
diff --git a/drivers/staging/go7007/go7007-i2c.c b/drivers/staging/media/go7007/go7007-i2c.c
index b8cfa1a6eaeb..b8cfa1a6eaeb 100644
--- a/drivers/staging/go7007/go7007-i2c.c
+++ b/drivers/staging/media/go7007/go7007-i2c.c
diff --git a/drivers/staging/go7007/go7007-priv.h b/drivers/staging/media/go7007/go7007-priv.h
index b58c394c6555..b58c394c6555 100644
--- a/drivers/staging/go7007/go7007-priv.h
+++ b/drivers/staging/media/go7007/go7007-priv.h
diff --git a/drivers/staging/go7007/go7007-usb.c b/drivers/staging/media/go7007/go7007-usb.c
index 3db3b0a91cc1..3db3b0a91cc1 100644
--- a/drivers/staging/go7007/go7007-usb.c
+++ b/drivers/staging/media/go7007/go7007-usb.c
diff --git a/drivers/staging/go7007/go7007-v4l2.c b/drivers/staging/media/go7007/go7007-v4l2.c
index 2b27d8da70a2..2b27d8da70a2 100644
--- a/drivers/staging/go7007/go7007-v4l2.c
+++ b/drivers/staging/media/go7007/go7007-v4l2.c
diff --git a/drivers/staging/go7007/go7007.h b/drivers/staging/media/go7007/go7007.h
index 7399c915a934..7399c915a934 100644
--- a/drivers/staging/go7007/go7007.h
+++ b/drivers/staging/media/go7007/go7007.h
diff --git a/drivers/staging/go7007/go7007.txt b/drivers/staging/media/go7007/go7007.txt
index 9db1f3952fd2..9db1f3952fd2 100644
--- a/drivers/staging/go7007/go7007.txt
+++ b/drivers/staging/media/go7007/go7007.txt
diff --git a/drivers/staging/go7007/s2250-board.c b/drivers/staging/media/go7007/s2250-board.c
index e7736a915530..e7736a915530 100644
--- a/drivers/staging/go7007/s2250-board.c
+++ b/drivers/staging/media/go7007/s2250-board.c
diff --git a/drivers/staging/go7007/s2250-loader.c b/drivers/staging/media/go7007/s2250-loader.c
index 4e132519e253..4e132519e253 100644
--- a/drivers/staging/go7007/s2250-loader.c
+++ b/drivers/staging/media/go7007/s2250-loader.c
diff --git a/drivers/staging/go7007/s2250-loader.h b/drivers/staging/media/go7007/s2250-loader.h
index b7c301af16cc..b7c301af16cc 100644
--- a/drivers/staging/go7007/s2250-loader.h
+++ b/drivers/staging/media/go7007/s2250-loader.h
diff --git a/drivers/staging/go7007/saa7134-go7007.c b/drivers/staging/media/go7007/saa7134-go7007.c
index cf7c34a99459..cf7c34a99459 100644
--- a/drivers/staging/go7007/saa7134-go7007.c
+++ b/drivers/staging/media/go7007/saa7134-go7007.c
diff --git a/drivers/staging/go7007/snd-go7007.c b/drivers/staging/media/go7007/snd-go7007.c
index deac938d8505..deac938d8505 100644
--- a/drivers/staging/go7007/snd-go7007.c
+++ b/drivers/staging/media/go7007/snd-go7007.c
diff --git a/drivers/staging/go7007/wis-i2c.h b/drivers/staging/media/go7007/wis-i2c.h
index 3c2b9be455df..3c2b9be455df 100644
--- a/drivers/staging/go7007/wis-i2c.h
+++ b/drivers/staging/media/go7007/wis-i2c.h
diff --git a/drivers/staging/go7007/wis-ov7640.c b/drivers/staging/media/go7007/wis-ov7640.c
index 6bc9470fecb6..6bc9470fecb6 100644
--- a/drivers/staging/go7007/wis-ov7640.c
+++ b/drivers/staging/media/go7007/wis-ov7640.c
diff --git a/drivers/staging/go7007/wis-saa7113.c b/drivers/staging/media/go7007/wis-saa7113.c
index 05e0e1083864..05e0e1083864 100644
--- a/drivers/staging/go7007/wis-saa7113.c
+++ b/drivers/staging/media/go7007/wis-saa7113.c
diff --git a/drivers/staging/go7007/wis-saa7115.c b/drivers/staging/media/go7007/wis-saa7115.c
index 46cff59e28b7..46cff59e28b7 100644
--- a/drivers/staging/go7007/wis-saa7115.c
+++ b/drivers/staging/media/go7007/wis-saa7115.c
diff --git a/drivers/staging/go7007/wis-sony-tuner.c b/drivers/staging/media/go7007/wis-sony-tuner.c
index 8f1b7d4f6a2e..8f1b7d4f6a2e 100644
--- a/drivers/staging/go7007/wis-sony-tuner.c
+++ b/drivers/staging/media/go7007/wis-sony-tuner.c
diff --git a/drivers/staging/go7007/wis-tw2804.c b/drivers/staging/media/go7007/wis-tw2804.c
index 9134f03e3cf0..9134f03e3cf0 100644
--- a/drivers/staging/go7007/wis-tw2804.c
+++ b/drivers/staging/media/go7007/wis-tw2804.c
diff --git a/drivers/staging/go7007/wis-tw9903.c b/drivers/staging/media/go7007/wis-tw9903.c
index 9230f4a80529..9230f4a80529 100644
--- a/drivers/staging/go7007/wis-tw9903.c
+++ b/drivers/staging/media/go7007/wis-tw9903.c
diff --git a/drivers/staging/go7007/wis-uda1342.c b/drivers/staging/media/go7007/wis-uda1342.c
index 0127be2f3be0..0127be2f3be0 100644
--- a/drivers/staging/go7007/wis-uda1342.c
+++ b/drivers/staging/media/go7007/wis-uda1342.c
diff --git a/drivers/staging/lirc/Kconfig b/drivers/staging/media/lirc/Kconfig
index 526ec0fc2f04..526ec0fc2f04 100644
--- a/drivers/staging/lirc/Kconfig
+++ b/drivers/staging/media/lirc/Kconfig
diff --git a/drivers/staging/lirc/Makefile b/drivers/staging/media/lirc/Makefile
index d76b0fa2af53..d76b0fa2af53 100644
--- a/drivers/staging/lirc/Makefile
+++ b/drivers/staging/media/lirc/Makefile
diff --git a/drivers/staging/lirc/TODO b/drivers/staging/media/lirc/TODO
index b6cb593f55c6..b6cb593f55c6 100644
--- a/drivers/staging/lirc/TODO
+++ b/drivers/staging/media/lirc/TODO
diff --git a/drivers/staging/lirc/TODO.lirc_zilog b/drivers/staging/media/lirc/TODO.lirc_zilog
index a97800a8e127..a97800a8e127 100644
--- a/drivers/staging/lirc/TODO.lirc_zilog
+++ b/drivers/staging/media/lirc/TODO.lirc_zilog
diff --git a/drivers/staging/lirc/lirc_bt829.c b/drivers/staging/media/lirc/lirc_bt829.c
index c5a0d27a02dc..c5a0d27a02dc 100644
--- a/drivers/staging/lirc/lirc_bt829.c
+++ b/drivers/staging/media/lirc/lirc_bt829.c
diff --git a/drivers/staging/lirc/lirc_ene0100.h b/drivers/staging/media/lirc/lirc_ene0100.h
index 06bebd6acc46..06bebd6acc46 100644
--- a/drivers/staging/lirc/lirc_ene0100.h
+++ b/drivers/staging/media/lirc/lirc_ene0100.h
diff --git a/drivers/staging/lirc/lirc_igorplugusb.c b/drivers/staging/media/lirc/lirc_igorplugusb.c
index 0dc2c2b22c2b..0dc2c2b22c2b 100644
--- a/drivers/staging/lirc/lirc_igorplugusb.c
+++ b/drivers/staging/media/lirc/lirc_igorplugusb.c
diff --git a/drivers/staging/lirc/lirc_imon.c b/drivers/staging/media/lirc/lirc_imon.c
index f5308d5929c6..f5308d5929c6 100644
--- a/drivers/staging/lirc/lirc_imon.c
+++ b/drivers/staging/media/lirc/lirc_imon.c
diff --git a/drivers/staging/lirc/lirc_parallel.c b/drivers/staging/media/lirc/lirc_parallel.c
index 792aac0a8e7b..792aac0a8e7b 100644
--- a/drivers/staging/lirc/lirc_parallel.c
+++ b/drivers/staging/media/lirc/lirc_parallel.c
diff --git a/drivers/staging/lirc/lirc_parallel.h b/drivers/staging/media/lirc/lirc_parallel.h
index 4bed6afe0632..4bed6afe0632 100644
--- a/drivers/staging/lirc/lirc_parallel.h
+++ b/drivers/staging/media/lirc/lirc_parallel.h
diff --git a/drivers/staging/lirc/lirc_sasem.c b/drivers/staging/media/lirc/lirc_sasem.c
index a2d18b0aa048..a2d18b0aa048 100644
--- a/drivers/staging/lirc/lirc_sasem.c
+++ b/drivers/staging/media/lirc/lirc_sasem.c
diff --git a/drivers/staging/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
index 8a060a8a7224..8a060a8a7224 100644
--- a/drivers/staging/lirc/lirc_serial.c
+++ b/drivers/staging/media/lirc/lirc_serial.c
diff --git a/drivers/staging/lirc/lirc_sir.c b/drivers/staging/media/lirc/lirc_sir.c
index 6903d3992eca..6903d3992eca 100644
--- a/drivers/staging/lirc/lirc_sir.c
+++ b/drivers/staging/media/lirc/lirc_sir.c
diff --git a/drivers/staging/lirc/lirc_ttusbir.c b/drivers/staging/media/lirc/lirc_ttusbir.c
index e4b329b8cafd..e4b329b8cafd 100644
--- a/drivers/staging/lirc/lirc_ttusbir.c
+++ b/drivers/staging/media/lirc/lirc_ttusbir.c
diff --git a/drivers/staging/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c
index 0302d82a12f7..0302d82a12f7 100644
--- a/drivers/staging/lirc/lirc_zilog.c
+++ b/drivers/staging/media/lirc/lirc_zilog.c
diff --git a/drivers/staging/solo6x10/Kconfig b/drivers/staging/media/solo6x10/Kconfig
index 03dcac4ea4d0..03dcac4ea4d0 100644
--- a/drivers/staging/solo6x10/Kconfig
+++ b/drivers/staging/media/solo6x10/Kconfig
diff --git a/drivers/staging/solo6x10/Makefile b/drivers/staging/media/solo6x10/Makefile
index 72816cf16704..72816cf16704 100644
--- a/drivers/staging/solo6x10/Makefile
+++ b/drivers/staging/media/solo6x10/Makefile
diff --git a/drivers/staging/solo6x10/TODO b/drivers/staging/media/solo6x10/TODO
index 7e6c4fa130df..7e6c4fa130df 100644
--- a/drivers/staging/solo6x10/TODO
+++ b/drivers/staging/media/solo6x10/TODO
diff --git a/drivers/staging/solo6x10/core.c b/drivers/staging/media/solo6x10/core.c
index f974f6412ad7..f974f6412ad7 100644
--- a/drivers/staging/solo6x10/core.c
+++ b/drivers/staging/media/solo6x10/core.c
diff --git a/drivers/staging/solo6x10/disp.c b/drivers/staging/media/solo6x10/disp.c
index 884c0eb757c4..884c0eb757c4 100644
--- a/drivers/staging/solo6x10/disp.c
+++ b/drivers/staging/media/solo6x10/disp.c
diff --git a/drivers/staging/solo6x10/enc.c b/drivers/staging/media/solo6x10/enc.c
index de502599bb19..de502599bb19 100644
--- a/drivers/staging/solo6x10/enc.c
+++ b/drivers/staging/media/solo6x10/enc.c
diff --git a/drivers/staging/solo6x10/g723.c b/drivers/staging/media/solo6x10/g723.c
index 59274bfca95b..2cd0de28a633 100644
--- a/drivers/staging/solo6x10/g723.c
+++ b/drivers/staging/media/solo6x10/g723.c
@@ -23,6 +23,7 @@
 #include <linux/kthread.h>
 #include <linux/slab.h>
 #include <linux/freezer.h>
+#include <linux/export.h>
 #include <sound/core.h>
 #include <sound/initval.h>
 #include <sound/pcm.h>
diff --git a/drivers/staging/solo6x10/gpio.c b/drivers/staging/media/solo6x10/gpio.c
index 0925e6f33a99..0925e6f33a99 100644
--- a/drivers/staging/solo6x10/gpio.c
+++ b/drivers/staging/media/solo6x10/gpio.c
diff --git a/drivers/staging/solo6x10/i2c.c b/drivers/staging/media/solo6x10/i2c.c
index ef95a500b4da..ef95a500b4da 100644
--- a/drivers/staging/solo6x10/i2c.c
+++ b/drivers/staging/media/solo6x10/i2c.c
diff --git a/drivers/staging/solo6x10/jpeg.h b/drivers/staging/media/solo6x10/jpeg.h
index 50defec318cc..50defec318cc 100644
--- a/drivers/staging/solo6x10/jpeg.h
+++ b/drivers/staging/media/solo6x10/jpeg.h
diff --git a/drivers/staging/solo6x10/offsets.h b/drivers/staging/media/solo6x10/offsets.h
index 3d7e569f1cf8..3d7e569f1cf8 100644
--- a/drivers/staging/solo6x10/offsets.h
+++ b/drivers/staging/media/solo6x10/offsets.h
diff --git a/drivers/staging/solo6x10/osd-font.h b/drivers/staging/media/solo6x10/osd-font.h
index 591e0e82e0e8..591e0e82e0e8 100644
--- a/drivers/staging/solo6x10/osd-font.h
+++ b/drivers/staging/media/solo6x10/osd-font.h
diff --git a/drivers/staging/solo6x10/p2m.c b/drivers/staging/media/solo6x10/p2m.c
index 56210f0fc5ec..56210f0fc5ec 100644
--- a/drivers/staging/solo6x10/p2m.c
+++ b/drivers/staging/media/solo6x10/p2m.c
diff --git a/drivers/staging/solo6x10/registers.h b/drivers/staging/media/solo6x10/registers.h
index aca544472c93..aca544472c93 100644
--- a/drivers/staging/solo6x10/registers.h
+++ b/drivers/staging/media/solo6x10/registers.h
diff --git a/drivers/staging/solo6x10/solo6x10.h b/drivers/staging/media/solo6x10/solo6x10.h
index abee7213202f..abee7213202f 100644
--- a/drivers/staging/solo6x10/solo6x10.h
+++ b/drivers/staging/media/solo6x10/solo6x10.h
diff --git a/drivers/staging/solo6x10/tw28.c b/drivers/staging/media/solo6x10/tw28.c
index db56b42c56c6..db56b42c56c6 100644
--- a/drivers/staging/solo6x10/tw28.c
+++ b/drivers/staging/media/solo6x10/tw28.c
diff --git a/drivers/staging/solo6x10/tw28.h b/drivers/staging/media/solo6x10/tw28.h
index a44a03afbd30..a44a03afbd30 100644
--- a/drivers/staging/solo6x10/tw28.h
+++ b/drivers/staging/media/solo6x10/tw28.h
diff --git a/drivers/staging/solo6x10/v4l2-enc.c b/drivers/staging/media/solo6x10/v4l2-enc.c
index bee7280bbed9..bee7280bbed9 100644
--- a/drivers/staging/solo6x10/v4l2-enc.c
+++ b/drivers/staging/media/solo6x10/v4l2-enc.c
diff --git a/drivers/staging/solo6x10/v4l2.c b/drivers/staging/media/solo6x10/v4l2.c
index 571c3a348d30..571c3a348d30 100644
--- a/drivers/staging/solo6x10/v4l2.c
+++ b/drivers/staging/media/solo6x10/v4l2.c
diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c
index f3c6060c96b8..7a1955583b7d 100644
--- a/drivers/staging/pohmelfs/inode.c
+++ b/drivers/staging/pohmelfs/inode.c
@@ -1197,7 +1197,7 @@ const struct inode_operations pohmelfs_file_inode_operations = {
 void pohmelfs_fill_inode(struct inode *inode, struct netfs_inode_info *info)
 {
        inode->i_mode = info->mode;
-        inode->i_nlink = info->nlink;
+        set_nlink(inode, info->nlink);
        inode->i_uid = info->uid;
        inode->i_gid = info->gid;
        inode->i_blocks = info->blocks;
diff --git a/drivers/staging/rts5139/rts51x_scsi.c b/drivers/staging/rts5139/rts51x_scsi.c
index 3b32f9e6e4f0..87c9cdc8bd29 100644
--- a/drivers/staging/rts5139/rts51x_scsi.c
+++ b/drivers/staging/rts5139/rts51x_scsi.c
@@ -28,6 +28,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <linux/export.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_eh.h>
diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c
index f4b53d103c54..3b7a847f4657 100644
--- a/drivers/staging/usbip/usbip_common.c
+++ b/drivers/staging/usbip/usbip_common.c
@@ -22,6 +22,7 @@
 #include <linux/fs.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <net/sock.h>
 #include "usbip_common.h"
diff --git a/drivers/staging/usbip/usbip_event.c b/drivers/staging/usbip/usbip_event.c
index ecd1862539cd..d332a34ddb6d 100644
--- a/drivers/staging/usbip/usbip_event.c
+++ b/drivers/staging/usbip/usbip_event.c
@@ -18,6 +18,7 @@
 */
 #include <linux/kthread.h>
+#include <linux/export.h>
 #include "usbip_common.h"
diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c
index a2e8bd452ed9..f958eb4f0d81 100644
--- a/drivers/staging/winbond/wbusb.c
+++ b/drivers/staging/winbond/wbusb.c
@@ -11,6 +11,7 @@
 */
 #include <net/mac80211.h>
 #include <linux/usb.h>
+#include <linux/module.h>
 #include "core.h"
 #include "mds_f.h"
diff --git a/drivers/staging/wlags49_h2/wl_cs.c b/drivers/staging/wlags49_h2/wl_cs.c
index 321580267fed..2faee2dd4bb1 100644
--- a/drivers/staging/wlags49_h2/wl_cs.c
+++ b/drivers/staging/wlags49_h2/wl_cs.c
@@ -82,6 +82,7 @@
 #include <linux/skbuff.h>
 #include <linux/if_arp.h>
 #include <linux/ioport.h>
+#include <linux/module.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index b9926ee0052c..09de99fbb7e0 100644
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -556,7 +556,7 @@ static inline int valid_io_request(struct zram *zram, struct bio *bio)
 /*
 * Handler function for all zram I/O requests.
 */
-static int zram_make_request(struct request_queue *queue, struct bio *bio)
+static void zram_make_request(struct request_queue *queue, struct bio *bio)
 {
        struct zram *zram = queue->queuedata;
@@ -575,13 +575,12 @@ static int zram_make_request(struct request_queue *queue, struct bio *bio)
        __zram_make_request(zram, bio, bio_data_dir(bio));
        up_read(&zram->init_lock);
-        return 0;
+        return;
 error_unlock:
        up_read(&zram->init_lock);
 error:
        bio_io_error(bio);
-        return 0;
 }
 void __zram_reset_device(struct zram *zram)
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 4d01768fcd90..0fd96c10271d 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -22,6 +22,7 @@
 #include <linux/kthread.h>
 #include <linux/crypto.h>
 #include <linux/completion.h>
+#include <linux/module.h>
 #include <asm/unaligned.h>
 #include <scsi/scsi_device.h>
 #include <scsi/iscsi_proto.h>
@@ -1079,7 +1080,9 @@ attach_cmd:
         */
        if (!cmd->immediate_data) {
                cmdsn_ret = iscsit_sequence_cmd(conn, cmd, hdr->cmdsn);
-                if (cmdsn_ret == CMDSN_ERROR_CANNOT_RECOVER)
+                if (cmdsn_ret == CMDSN_LOWER_THAN_EXP)
+                        return 0;
+                else if (cmdsn_ret == CMDSN_ERROR_CANNOT_RECOVER)
                        return iscsit_add_reject_from_cmd(
                                ISCSI_REASON_PROTOCOL_ERROR,
                                1, 0, buf, cmd);
@@ -1819,17 +1822,16 @@ attach:
                int cmdsn_ret = iscsit_sequence_cmd(conn, cmd, hdr->cmdsn);
                if (cmdsn_ret == CMDSN_HIGHER_THAN_EXP)
                        out_of_order_cmdsn = 1;
-                else if (cmdsn_ret == CMDSN_LOWER_THAN_EXP) {
+                else if (cmdsn_ret == CMDSN_LOWER_THAN_EXP)
                        return 0;
-                } else { /* (cmdsn_ret == CMDSN_ERROR_CANNOT_RECOVER) */
+                else if (cmdsn_ret == CMDSN_ERROR_CANNOT_RECOVER)
                        return iscsit_add_reject_from_cmd(
                                        ISCSI_REASON_PROTOCOL_ERROR,
                                        1, 0, buf, cmd);
-                }
        }
        iscsit_ack_from_expstatsn(conn, hdr->exp_statsn);
-        if (out_of_order_cmdsn)
+        if (out_of_order_cmdsn || !(hdr->opcode & ISCSI_OP_IMMEDIATE))
                return 0;
        /*
         * Found the referenced task, send to transport for processing.
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index f1643dbf6a92..db327845e46b 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -20,6 +20,7 @@
 ****************************************************************************/
 #include <linux/configfs.h>
+#include <linux/export.h>
 #include <target/target_core_base.h>
 #include <target/target_core_transport.h>
 #include <target/target_core_fabric_ops.h>
diff --git a/drivers/target/iscsi/iscsi_target_stat.c b/drivers/target/iscsi/iscsi_target_stat.c
index bbdbe9301b27..f1db83077e0a 100644
--- a/drivers/target/iscsi/iscsi_target_stat.c
+++ b/drivers/target/iscsi/iscsi_target_stat.c
@@ -20,6 +20,7 @@
 ******************************************************************************/
 #include <linux/configfs.h>
+#include <linux/export.h>
 #include <scsi/iscsi_proto.h>
 #include <target/target_core_base.h>
 #include <target/target_core_transport.h>
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index b15d8cbf630b..3df1c9b8ae6b 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -174,6 +174,24 @@ static int tcm_loop_new_cmd_map(struct se_cmd *se_cmd)
                sgl_bidi = sdb->table.sgl;
                sgl_bidi_count = sdb->table.nents;
        }
+        /*
+         * Because some userspace code via scsi-generic do not memset their
+         * associated read buffers, go ahead and do that here for type
+         * SCF_SCSI_CONTROL_SG_IO_CDB.  Also note that this is currently
+         * guaranteed to be a single SGL for SCF_SCSI_CONTROL_SG_IO_CDB
+         * by target core in transport_generic_allocate_tasks() ->
+         * transport_generic_cmd_sequencer().
+         */
+        if (se_cmd->se_cmd_flags & SCF_SCSI_CONTROL_SG_IO_CDB &&
+            se_cmd->data_direction == DMA_FROM_DEVICE) {
+                struct scatterlist *sg = scsi_sglist(sc);
+                unsigned char *buf = kmap(sg_page(sg)) + sg->offset;
+                if (buf != NULL) {
+                        memset(buf, 0, sg->length);
+                        kunmap(sg_page(sg));
+                }
+        }
        /* Tell the core about our preallocated memory */
        ret = transport_generic_map_mem_to_cmd(se_cmd, scsi_sglist(sc),
@@ -187,7 +205,7 @@ static int tcm_loop_new_cmd_map(struct se_cmd *se_cmd)
 /*
 * Called from struct target_core_fabric_ops->check_stop_free()
 */
-static void tcm_loop_check_stop_free(struct se_cmd *se_cmd)
+static int tcm_loop_check_stop_free(struct se_cmd *se_cmd)
 {
        /*
         * Do not release struct se_cmd's containing a valid TMR
@@ -195,12 +213,13 @@ static void tcm_loop_check_stop_free(struct se_cmd *se_cmd)
         * with transport_generic_free_cmd().
         */
        if (se_cmd->se_tmr_req)
-                return;
+                return 0;
        /*
         * Release the struct se_cmd, which will make a callback to release
         * struct tcm_loop_cmd * in tcm_loop_deallocate_core_cmd()
         */
        transport_generic_free_cmd(se_cmd, 0);
+        return 1;
 }
 static void tcm_loop_release_cmd(struct se_cmd *se_cmd)
diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c
index 8f4447749c71..88f2ad43ec8b 100644
--- a/drivers/target/target_core_alua.c
+++ b/drivers/target/target_core_alua.c
@@ -27,6 +27,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/configfs.h>
+#include <linux/export.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -58,8 +59,9 @@ struct t10_alua_lu_gp *default_lu_gp;
 *
 * See spc4r17 section 6.27
 */
-int core_emulate_report_target_port_groups(struct se_cmd *cmd)
+int target_emulate_report_target_port_groups(struct se_task *task)
 {
+        struct se_cmd *cmd = task->task_se_cmd;
        struct se_subsystem_dev *su_dev = cmd->se_dev->se_sub_dev;
        struct se_port *port;
        struct t10_alua_tg_pt_gp *tg_pt_gp;
@@ -164,6 +166,8 @@ int core_emulate_report_target_port_groups(struct se_cmd *cmd)
        transport_kunmap_first_data_page(cmd);
+        task->task_scsi_status = GOOD;
+        transport_complete_task(task, 1);
        return 0;
 }
@@ -172,8 +176,9 @@ int core_emulate_report_target_port_groups(struct se_cmd *cmd)
 *
 * See spc4r17 section 6.35
 */
-int core_emulate_set_target_port_groups(struct se_cmd *cmd)
+int target_emulate_set_target_port_groups(struct se_task *task)
 {
+        struct se_cmd *cmd = task->task_se_cmd;
        struct se_device *dev = cmd->se_dev;
        struct se_subsystem_dev *su_dev = dev->se_sub_dev;
        struct se_port *port, *l_port = cmd->se_lun->lun_sep;
@@ -341,7 +346,8 @@ int core_emulate_set_target_port_groups(struct se_cmd *cmd)
 out:
        transport_kunmap_first_data_page(cmd);
+        task->task_scsi_status = GOOD;
+        transport_complete_task(task, 1);
        return 0;
 }
diff --git a/drivers/target/target_core_alua.h b/drivers/target/target_core_alua.h
index c86f97a081ed..c5b4ecd3e745 100644
--- a/drivers/target/target_core_alua.h
+++ b/drivers/target/target_core_alua.h
@@ -66,8 +66,8 @@ extern struct kmem_cache *t10_alua_lu_gp_mem_cache;
 extern struct kmem_cache *t10_alua_tg_pt_gp_cache;
 extern struct kmem_cache *t10_alua_tg_pt_gp_mem_cache;
-extern int core_emulate_report_target_port_groups(struct se_cmd *);
+extern int target_emulate_report_target_port_groups(struct se_task *);
-extern int core_emulate_set_target_port_groups(struct se_cmd *);
+extern int target_emulate_set_target_port_groups(struct se_task *);
 extern int core_alua_check_nonop_delay(struct se_cmd *);
 extern int core_alua_do_port_transition(struct t10_alua_tg_pt_gp *,
                                struct se_device *, struct se_port *,
diff --git a/drivers/target/target_core_cdb.c b/drivers/target/target_core_cdb.c
index 38535eb13929..683ba02b8247 100644
--- a/drivers/target/target_core_cdb.c
+++ b/drivers/target/target_core_cdb.c
@@ -32,6 +32,7 @@
 #include <target/target_core_transport.h>
 #include <target/target_core_fabric_ops.h>
 #include "target_core_ua.h"
+#include "target_core_cdb.h"
 static void
 target_fill_alua_data(struct se_port *port, unsigned char *buf)
@@ -679,16 +680,18 @@ target_emulate_evpd_00(struct se_cmd *cmd, unsigned char *buf)
        return 0;
 }
-static int
+int target_emulate_inquiry(struct se_task *task)
-target_emulate_inquiry(struct se_cmd *cmd)
 {
+        struct se_cmd *cmd = task->task_se_cmd;
        struct se_device *dev = cmd->se_dev;
        unsigned char *buf;
        unsigned char *cdb = cmd->t_task_cdb;
        int p, ret;
-        if (!(cdb[1] & 0x1))
+        if (!(cdb[1] & 0x1)) {
-                return target_emulate_inquiry_std(cmd);
+                ret = target_emulate_inquiry_std(cmd);
+                goto out;
+        }
        /*
         * Make sure we at least have 4 bytes of INQUIRY response
@@ -707,22 +710,30 @@ target_emulate_inquiry(struct se_cmd *cmd)
        buf[0] = dev->transport->get_device_type(dev);
-        for (p = 0; p < ARRAY_SIZE(evpd_handlers); ++p)
+        for (p = 0; p < ARRAY_SIZE(evpd_handlers); ++p) {
                if (cdb[2] == evpd_handlers[p].page) {
                        buf[1] = cdb[2];
                        ret = evpd_handlers[p].emulate(cmd, buf);
-                        transport_kunmap_first_data_page(cmd);
+                        goto out_unmap;
-                        return ret;
                }
+        }
-        transport_kunmap_first_data_page(cmd);
        pr_err("Unknown VPD Code: 0x%02x\n", cdb[2]);
-        return -EINVAL;
+        ret = -EINVAL;
+out_unmap:
+        transport_kunmap_first_data_page(cmd);
+out:
+        if (!ret) {
+                task->task_scsi_status = GOOD;
+                transport_complete_task(task, 1);
+        }
+        return ret;
 }
-static int
+int target_emulate_readcapacity(struct se_task *task)
-target_emulate_readcapacity(struct se_cmd *cmd)
 {
+        struct se_cmd *cmd = task->task_se_cmd;
        struct se_device *dev = cmd->se_dev;
        unsigned char *buf;
        unsigned long long blocks_long = dev->transport->get_blocks(dev);
@@ -751,12 +762,14 @@ target_emulate_readcapacity(struct se_cmd *cmd)
        transport_kunmap_first_data_page(cmd);
+        task->task_scsi_status = GOOD;
+        transport_complete_task(task, 1);
        return 0;
 }
-static int
+int target_emulate_readcapacity_16(struct se_task *task)
-target_emulate_readcapacity_16(struct se_cmd *cmd)
 {
+        struct se_cmd *cmd = task->task_se_cmd;
        struct se_device *dev = cmd->se_dev;
        unsigned char *buf;
        unsigned long long blocks = dev->transport->get_blocks(dev);
@@ -784,6 +797,8 @@ target_emulate_readcapacity_16(struct se_cmd *cmd)
        transport_kunmap_first_data_page(cmd);
+        task->task_scsi_status = GOOD;
+        transport_complete_task(task, 1);
        return 0;
 }
@@ -922,14 +937,15 @@ target_modesense_dpofua(unsigned char *buf, int type)
        }
 }
-static int
+int target_emulate_modesense(struct se_task *task)
-target_emulate_modesense(struct se_cmd *cmd, int ten)
 {
+        struct se_cmd *cmd = task->task_se_cmd;
        struct se_device *dev = cmd->se_dev;
        char *cdb = cmd->t_task_cdb;
        unsigned char *rbuf;
        int type = dev->transport->get_device_type(dev);
-        int offset = (ten) ? 8 : 4;
+        int ten = (cmd->t_task_cdb[0] == MODE_SENSE_10);
+        int offset = ten ? 8 : 4;
        int length = 0;
        unsigned char buf[SE_MODE_PAGE_BUF];
@@ -995,12 +1011,14 @@ target_emulate_modesense(struct se_cmd *cmd, int ten)
        memcpy(rbuf, buf, offset);
        transport_kunmap_first_data_page(cmd);
+        task->task_scsi_status = GOOD;
+        transport_complete_task(task, 1);
        return 0;
 }
-static int
+int target_emulate_request_sense(struct se_task *task)
-target_emulate_request_sense(struct se_cmd *cmd)
 {
+        struct se_cmd *cmd = task->task_se_cmd;
        unsigned char *cdb = cmd->t_task_cdb;
        unsigned char *buf;
        u8 ua_asc = 0, ua_ascq = 0;
@@ -1059,7 +1077,8 @@ target_emulate_request_sense(struct se_cmd *cmd)
 end:
        transport_kunmap_first_data_page(cmd);
+        task->task_scsi_status = GOOD;
+        transport_complete_task(task, 1);
        return 0;
 }
@@ -1067,8 +1086,7 @@ end:
 * Used for TCM/IBLOCK and TCM/FILEIO for block/blk-lib.c level discard support.
 * Note this is not used for TCM/pSCSI passthrough
 */
-static int
+int target_emulate_unmap(struct se_task *task)
-target_emulate_unmap(struct se_task *task)
 {
        struct se_cmd *cmd = task->task_se_cmd;
        struct se_device *dev = cmd->se_dev;
@@ -1079,6 +1097,12 @@ target_emulate_unmap(struct se_task *task)
        int ret = 0, offset;
        unsigned short dl, bd_dl;
+        if (!dev->transport->do_discard) {
+                pr_err("UNMAP emulation not supported for: %s\n",
+                                dev->transport->name);
+                return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
+        }
        /* First UNMAP block descriptor starts at 8 byte offset */
        offset = 8;
        size -= 8;
@@ -1110,7 +1134,10 @@ target_emulate_unmap(struct se_task *task)
 err:
        transport_kunmap_first_data_page(cmd);
+        if (!ret) {
+                task->task_scsi_status = GOOD;
+                transport_complete_task(task, 1);
+        }
        return ret;
 }
@@ -1118,14 +1145,28 @@ err:
 * Used for TCM/IBLOCK and TCM/FILEIO for block/blk-lib.c level discard support.
 * Note this is not used for TCM/pSCSI passthrough
 */
-static int
+int target_emulate_write_same(struct se_task *task)
-target_emulate_write_same(struct se_task *task, u32 num_blocks)
 {
        struct se_cmd *cmd = task->task_se_cmd;
        struct se_device *dev = cmd->se_dev;
        sector_t range;
        sector_t lba = cmd->t_task_lba;
+        u32 num_blocks;
        int ret;
+        if (!dev->transport->do_discard) {
+                pr_err("WRITE_SAME emulation not supported"
+                                " for: %s\n", dev->transport->name);
+                return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
+        }
+        if (cmd->t_task_cdb[0] == WRITE_SAME)
+                num_blocks = get_unaligned_be16(&cmd->t_task_cdb[7]);
+        else if (cmd->t_task_cdb[0] == WRITE_SAME_16)
+                num_blocks = get_unaligned_be32(&cmd->t_task_cdb[10]);
+        else /* WRITE_SAME_32 via VARIABLE_LENGTH_CMD */
+                num_blocks = get_unaligned_be32(&cmd->t_task_cdb[28]);
        /*
         * Use the explicit range when non zero is supplied, otherwise calculate
         * the remaining range based on ->get_blocks() - starting LBA.
@@ -1144,127 +1185,30 @@ target_emulate_write_same(struct se_task *task, u32 num_blocks)
                return ret;
        }
+        task->task_scsi_status = GOOD;
+        transport_complete_task(task, 1);
        return 0;
 }
-int
+int target_emulate_synchronize_cache(struct se_task *task)
-transport_emulate_control_cdb(struct se_task *task)
 {
-        struct se_cmd *cmd = task->task_se_cmd;
+        struct se_device *dev = task->task_se_cmd->se_dev;
-        struct se_device *dev = cmd->se_dev;
-        unsigned short service_action;
-        int ret = 0;
-        switch (cmd->t_task_cdb[0]) {
+        if (!dev->transport->do_sync_cache) {
-        case INQUIRY:
+                pr_err("SYNCHRONIZE_CACHE emulation not supported"
-                ret = target_emulate_inquiry(cmd);
+                        " for: %s\n", dev->transport->name);
-                break;
-        case READ_CAPACITY:
-                ret = target_emulate_readcapacity(cmd);
-                break;
-        case MODE_SENSE:
-                ret = target_emulate_modesense(cmd, 0);
-                break;
-        case MODE_SENSE_10:
-                ret = target_emulate_modesense(cmd, 1);
-                break;
-        case SERVICE_ACTION_IN:
-                switch (cmd->t_task_cdb[1] & 0x1f) {
-                case SAI_READ_CAPACITY_16:
-                        ret = target_emulate_readcapacity_16(cmd);
-                        break;
-                default:
-                        pr_err("Unsupported SA: 0x%02x\n",
-                                cmd->t_task_cdb[1] & 0x1f);
-                        return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
-                }
-                break;
-        case REQUEST_SENSE:
-                ret = target_emulate_request_sense(cmd);
-                break;
-        case UNMAP:
-                if (!dev->transport->do_discard) {
-                        pr_err("UNMAP emulation not supported for: %s\n",
-                                        dev->transport->name);
-                        return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
-                }
-                ret = target_emulate_unmap(task);
-                break;
-        case WRITE_SAME:
-                if (!dev->transport->do_discard) {
-                        pr_err("WRITE_SAME emulation not supported"
-                                        " for: %s\n", dev->transport->name);
-                        return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
-                }
-                ret = target_emulate_write_same(task,
-                                get_unaligned_be16(&cmd->t_task_cdb[7]));
-                break;
-        case WRITE_SAME_16:
-                if (!dev->transport->do_discard) {
-                        pr_err("WRITE_SAME_16 emulation not supported"
-                                        " for: %s\n", dev->transport->name);
-                        return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
-                }
-                ret = target_emulate_write_same(task,
-                                get_unaligned_be32(&cmd->t_task_cdb[10]));
-                break;
-        case VARIABLE_LENGTH_CMD:
-                service_action =
-                        get_unaligned_be16(&cmd->t_task_cdb[8]);
-                switch (service_action) {
-                case WRITE_SAME_32:
-                        if (!dev->transport->do_discard) {
-                                pr_err("WRITE_SAME_32 SA emulation not"
-                                        " supported for: %s\n",
-                                        dev->transport->name);
-                                return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
-                        }
-                        ret = target_emulate_write_same(task,
-                                get_unaligned_be32(&cmd->t_task_cdb[28]));
-                        break;
-                default:
-                        pr_err("Unsupported VARIABLE_LENGTH_CMD SA:"
-                                        " 0x%02x\n", service_action);
-                        break;
-                }
-                break;
-        case SYNCHRONIZE_CACHE:
-        case 0x91: /* SYNCHRONIZE_CACHE_16: */
-                if (!dev->transport->do_sync_cache) {
-                        pr_err("SYNCHRONIZE_CACHE emulation not supported"
-                                " for: %s\n", dev->transport->name);
-                        return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
-                }
-                dev->transport->do_sync_cache(task);
-                break;
-        case ALLOW_MEDIUM_REMOVAL:
-        case ERASE:
-        case REZERO_UNIT:
-        case SEEK_10:
-        case SPACE:
-        case START_STOP:
-        case TEST_UNIT_READY:
-        case VERIFY:
-        case WRITE_FILEMARKS:
-                break;
-        default:
-                pr_err("Unsupported SCSI Opcode: 0x%02x for %s\n",
-                        cmd->t_task_cdb[0], dev->transport->name);
                return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
        }
-        if (ret < 0)
+        dev->transport->do_sync_cache(task);
-                return ret;
+        return 0;
-        /*
+}
-         * Handle the successful completion here unless a caller
-         * has explictly requested an asychronous completion.
-         */
-        if (!(cmd->se_cmd_flags & SCF_EMULATE_CDB_ASYNC)) {
-                task->task_scsi_status = GOOD;
-                transport_complete_task(task, 1);
-        }
-        return PYX_TRANSPORT_SENT_TO_TRANSPORT;
+int target_emulate_noop(struct se_task *task)
+{
+        task->task_scsi_status = GOOD;
+        transport_complete_task(task, 1);
+        return 0;
 }
 /*
diff --git a/drivers/target/target_core_cdb.h b/drivers/target/target_core_cdb.h
new file mode 100644
index 000000000000..ad6b1e393001
--- /dev/null
+++ b/drivers/target/target_core_cdb.h
@@ -0,0 +1,14 @@
+#ifndef TARGET_CORE_CDB_H
+#define TARGET_CORE_CDB_H
+int target_emulate_inquiry(struct se_task *task);
+int target_emulate_readcapacity(struct se_task *task);
+int target_emulate_readcapacity_16(struct se_task *task);
+int target_emulate_modesense(struct se_task *task);
+int target_emulate_request_sense(struct se_task *task);
+int target_emulate_unmap(struct se_task *task);
+int target_emulate_write_same(struct se_task *task);
+int target_emulate_synchronize_cache(struct se_task *task);
+int target_emulate_noop(struct se_task *task);
+#endif /* TARGET_CORE_CDB_H */
diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
index f870c3bcfd82..ba5edec2c5f8 100644
--- a/drivers/target/target_core_device.c
+++ b/drivers/target/target_core_device.c
@@ -35,6 +35,7 @@
 #include <linux/spinlock.h>
 #include <linux/kthread.h>
 #include <linux/in.h>
+#include <linux/export.h>
 #include <net/sock.h>
 #include <net/tcp.h>
 #include <scsi/scsi.h>
@@ -651,23 +652,15 @@ void core_dev_unexport(
        lun->lun_se_dev = NULL;
 }
-int transport_core_report_lun_response(struct se_cmd *se_cmd)
+int target_report_luns(struct se_task *se_task)
 {
+        struct se_cmd *se_cmd = se_task->task_se_cmd;
        struct se_dev_entry *deve;
        struct se_lun *se_lun;
        struct se_session *se_sess = se_cmd->se_sess;
-        struct se_task *se_task;
        unsigned char *buf;
        u32 cdb_offset = 0, lun_count = 0, offset = 8, i;
-        list_for_each_entry(se_task, &se_cmd->t_task_list, t_list)
-                break;
-        if (!se_task) {
-                pr_err("Unable to locate struct se_task for struct se_cmd\n");
-                return PYX_TRANSPORT_LU_COMM_FAILURE;
-        }
        buf = transport_kmap_first_data_page(se_cmd);
        /*
@@ -713,6 +706,8 @@ done:
        buf[2] = ((lun_count >> 8) & 0xff);
        buf[3] = (lun_count & 0xff);
+        se_task->task_scsi_status = GOOD;
+        transport_complete_task(se_task, 1);
        return PYX_TRANSPORT_SENT_TO_TRANSPORT;
 }
diff --git a/drivers/target/target_core_fabric_lib.c b/drivers/target/target_core_fabric_lib.c
index 39f021b855ef..ec4249be617e 100644
--- a/drivers/target/target_core_fabric_lib.c
+++ b/drivers/target/target_core_fabric_lib.c
@@ -29,6 +29,7 @@
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/spinlock.h>
+#include <linux/export.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
index 19a0be9c6570..67cd6fe05bfa 100644
--- a/drivers/target/target_core_file.c
+++ b/drivers/target/target_core_file.c
@@ -32,6 +32,7 @@
 #include <linux/blkdev.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
+#include <linux/module.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
diff --git a/drivers/target/target_core_hba.c b/drivers/target/target_core_hba.c
index 0639b975d6f5..c68019d6c406 100644
--- a/drivers/target/target_core_hba.c
+++ b/drivers/target/target_core_hba.c
@@ -32,6 +32,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/in.h>
+#include <linux/module.h>
 #include <net/sock.h>
 #include <net/tcp.h>
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index 41ad02b5fb87..7698efe29262 100644
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -37,6 +37,7 @@
 #include <linux/bio.h>
 #include <linux/genhd.h>
 #include <linux/file.h>
+#include <linux/module.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
index 0c4f783f924c..5a4ebfc3a54f 100644
--- a/drivers/target/target_core_pr.c
+++ b/drivers/target/target_core_pr.c
@@ -116,114 +116,21 @@ static int core_scsi2_reservation_check(struct se_cmd *cmd, u32 *pr_reg_type)
        return ret;
 }
-static int core_scsi2_reservation_release(struct se_cmd *cmd)
-{
-        struct se_device *dev = cmd->se_dev;
-        struct se_session *sess = cmd->se_sess;
-        struct se_portal_group *tpg = sess->se_tpg;
-        if (!sess || !tpg)
-                return 0;
-        spin_lock(&dev->dev_reservation_lock);
-        if (!dev->dev_reserved_node_acl || !sess) {
-                spin_unlock(&dev->dev_reservation_lock);
-                return 0;
-        }
-        if (dev->dev_reserved_node_acl != sess->se_node_acl) {
-                spin_unlock(&dev->dev_reservation_lock);
-                return 0;
-        }
-        dev->dev_reserved_node_acl = NULL;
-        dev->dev_flags &= ~DF_SPC2_RESERVATIONS;
-        if (dev->dev_flags & DF_SPC2_RESERVATIONS_WITH_ISID) {
-                dev->dev_res_bin_isid = 0;
-                dev->dev_flags &= ~DF_SPC2_RESERVATIONS_WITH_ISID;
-        }
-        pr_debug("SCSI-2 Released reservation for %s LUN: %u ->"
-                " MAPPED LUN: %u for %s\n", tpg->se_tpg_tfo->get_fabric_name(),
-                cmd->se_lun->unpacked_lun, cmd->se_deve->mapped_lun,
-                sess->se_node_acl->initiatorname);
-        spin_unlock(&dev->dev_reservation_lock);
-        return 0;
-}
-static int core_scsi2_reservation_reserve(struct se_cmd *cmd)
-{
-        struct se_device *dev = cmd->se_dev;
-        struct se_session *sess = cmd->se_sess;
-        struct se_portal_group *tpg = sess->se_tpg;
-        if ((cmd->t_task_cdb[1] & 0x01) &&
-            (cmd->t_task_cdb[1] & 0x02)) {
-                pr_err("LongIO and Obselete Bits set, returning"
-                                " ILLEGAL_REQUEST\n");
-                return PYX_TRANSPORT_ILLEGAL_REQUEST;
-        }
-        /*
-         * This is currently the case for target_core_mod passthrough struct se_cmd
-         * ops
-         */
-        if (!sess || !tpg)
-                return 0;
-        spin_lock(&dev->dev_reservation_lock);
-        if (dev->dev_reserved_node_acl &&
-           (dev->dev_reserved_node_acl != sess->se_node_acl)) {
-                pr_err("SCSI-2 RESERVATION CONFLIFT for %s fabric\n",
-                        tpg->se_tpg_tfo->get_fabric_name());
-                pr_err("Original reserver LUN: %u %s\n",
-                        cmd->se_lun->unpacked_lun,
-                        dev->dev_reserved_node_acl->initiatorname);
-                pr_err("Current attempt - LUN: %u -> MAPPED LUN: %u"
-                        " from %s \n", cmd->se_lun->unpacked_lun,
-                        cmd->se_deve->mapped_lun,
-                        sess->se_node_acl->initiatorname);
-                spin_unlock(&dev->dev_reservation_lock);
-                return PYX_TRANSPORT_RESERVATION_CONFLICT;
-        }
-        dev->dev_reserved_node_acl = sess->se_node_acl;
-        dev->dev_flags |= DF_SPC2_RESERVATIONS;
-        if (sess->sess_bin_isid != 0) {
-                dev->dev_res_bin_isid = sess->sess_bin_isid;
-                dev->dev_flags |= DF_SPC2_RESERVATIONS_WITH_ISID;
-        }
-        pr_debug("SCSI-2 Reserved %s LUN: %u -> MAPPED LUN: %u"
-                " for %s\n", tpg->se_tpg_tfo->get_fabric_name(),
-                cmd->se_lun->unpacked_lun, cmd->se_deve->mapped_lun,
-                sess->se_node_acl->initiatorname);
-        spin_unlock(&dev->dev_reservation_lock);
-        return 0;
-}
 static struct t10_pr_registration *core_scsi3_locate_pr_reg(struct se_device *,
                                        struct se_node_acl *, struct se_session *);
 static void core_scsi3_put_pr_reg(struct t10_pr_registration *);
-/*
+static int target_check_scsi2_reservation_conflict(struct se_cmd *cmd, int *ret)
- * Setup in target_core_transport.c:transport_generic_cmd_sequencer()
- * and called via struct se_cmd->transport_emulate_cdb() in TCM processing
- * thread context.
- */
-int core_scsi2_emulate_crh(struct se_cmd *cmd)
 {
        struct se_session *se_sess = cmd->se_sess;
        struct se_subsystem_dev *su_dev = cmd->se_dev->se_sub_dev;
        struct t10_pr_registration *pr_reg;
        struct t10_reservation *pr_tmpl = &su_dev->t10_pr;
-        unsigned char *cdb = &cmd->t_task_cdb[0];
        int crh = (su_dev->t10_pr.res_type == SPC3_PERSISTENT_RESERVATIONS);
        int conflict = 0;
-        if (!se_sess)
-                return 0;
        if (!crh)
-                goto after_crh;
+                return false;
        pr_reg = core_scsi3_locate_pr_reg(cmd->se_dev, se_sess->se_node_acl,
                        se_sess);
@@ -251,14 +158,16 @@ int core_scsi2_emulate_crh(struct se_cmd *cmd)
                 */
                if (pr_reg->pr_res_holder) {
                        core_scsi3_put_pr_reg(pr_reg);
-                        return 0;
+                        *ret = 0;
+                        return false;
                }
                if ((pr_reg->pr_res_type == PR_TYPE_WRITE_EXCLUSIVE_REGONLY) ||
                    (pr_reg->pr_res_type == PR_TYPE_EXCLUSIVE_ACCESS_REGONLY) ||
                    (pr_reg->pr_res_type == PR_TYPE_WRITE_EXCLUSIVE_ALLREG) ||
                    (pr_reg->pr_res_type == PR_TYPE_EXCLUSIVE_ACCESS_ALLREG)) {
                        core_scsi3_put_pr_reg(pr_reg);
-                        return 0;
+                        *ret = 0;
+                        return true;
                }
                core_scsi3_put_pr_reg(pr_reg);
                conflict = 1;
@@ -282,18 +191,118 @@ int core_scsi2_emulate_crh(struct se_cmd *cmd)
                pr_err("Received legacy SPC-2 RESERVE/RELEASE"
                        " while active SPC-3 registrations exist,"
                        " returning RESERVATION_CONFLICT\n");
-                return PYX_TRANSPORT_RESERVATION_CONFLICT;
+                *ret = PYX_TRANSPORT_RESERVATION_CONFLICT;
+                return true;
        }
-after_crh:
+        return false;
-        if ((cdb[0] == RESERVE) || (cdb[0] == RESERVE_10))
+}
-                return core_scsi2_reservation_reserve(cmd);
-        else if ((cdb[0] == RELEASE) || (cdb[0] == RELEASE_10))
+int target_scsi2_reservation_release(struct se_task *task)
-                return core_scsi2_reservation_release(cmd);
+{
-        else
+        struct se_cmd *cmd = task->task_se_cmd;
-                return PYX_TRANSPORT_INVALID_CDB_FIELD;
+        struct se_device *dev = cmd->se_dev;
+        struct se_session *sess = cmd->se_sess;
+        struct se_portal_group *tpg = sess->se_tpg;
+        int ret = 0;
+        if (!sess || !tpg)
+                goto out;
+        if (target_check_scsi2_reservation_conflict(cmd, &ret))
+                goto out;
+        ret = 0;
+        spin_lock(&dev->dev_reservation_lock);
+        if (!dev->dev_reserved_node_acl || !sess)
+                goto out_unlock;
+        if (dev->dev_reserved_node_acl != sess->se_node_acl)
+                goto out_unlock;
+        dev->dev_reserved_node_acl = NULL;
+        dev->dev_flags &= ~DF_SPC2_RESERVATIONS;
+        if (dev->dev_flags & DF_SPC2_RESERVATIONS_WITH_ISID) {
+                dev->dev_res_bin_isid = 0;
+                dev->dev_flags &= ~DF_SPC2_RESERVATIONS_WITH_ISID;
+        }
+        pr_debug("SCSI-2 Released reservation for %s LUN: %u ->"
+                " MAPPED LUN: %u for %s\n", tpg->se_tpg_tfo->get_fabric_name(),
+                cmd->se_lun->unpacked_lun, cmd->se_deve->mapped_lun,
+                sess->se_node_acl->initiatorname);
+out_unlock:
+        spin_unlock(&dev->dev_reservation_lock);
+out:
+        if (!ret) {
+                task->task_scsi_status = GOOD;
+                transport_complete_task(task, 1);
+        }
+        return ret;
+}
+int target_scsi2_reservation_reserve(struct se_task *task)
+{
+        struct se_cmd *cmd = task->task_se_cmd;
+        struct se_device *dev = cmd->se_dev;
+        struct se_session *sess = cmd->se_sess;
+        struct se_portal_group *tpg = sess->se_tpg;
+        int ret = 0;
+        if ((cmd->t_task_cdb[1] & 0x01) &&
+            (cmd->t_task_cdb[1] & 0x02)) {
+                pr_err("LongIO and Obselete Bits set, returning"
+                                " ILLEGAL_REQUEST\n");
+                ret = PYX_TRANSPORT_ILLEGAL_REQUEST;
+                goto out;
+        }
+        /*
+         * This is currently the case for target_core_mod passthrough struct se_cmd
+         * ops
+         */
+        if (!sess || !tpg)
+                goto out;
+        if (target_check_scsi2_reservation_conflict(cmd, &ret))
+                goto out;
+        ret = 0;
+        spin_lock(&dev->dev_reservation_lock);
+        if (dev->dev_reserved_node_acl &&
+           (dev->dev_reserved_node_acl != sess->se_node_acl)) {
+                pr_err("SCSI-2 RESERVATION CONFLIFT for %s fabric\n",
+                        tpg->se_tpg_tfo->get_fabric_name());
+                pr_err("Original reserver LUN: %u %s\n",
+                        cmd->se_lun->unpacked_lun,
+                        dev->dev_reserved_node_acl->initiatorname);
+                pr_err("Current attempt - LUN: %u -> MAPPED LUN: %u"
+                        " from %s \n", cmd->se_lun->unpacked_lun,
+                        cmd->se_deve->mapped_lun,
+                        sess->se_node_acl->initiatorname);
+                ret = PYX_TRANSPORT_RESERVATION_CONFLICT;
+                goto out_unlock;
+        }
+        dev->dev_reserved_node_acl = sess->se_node_acl;
+        dev->dev_flags |= DF_SPC2_RESERVATIONS;
+        if (sess->sess_bin_isid != 0) {
+                dev->dev_res_bin_isid = sess->sess_bin_isid;
+                dev->dev_flags |= DF_SPC2_RESERVATIONS_WITH_ISID;
+        }
+        pr_debug("SCSI-2 Reserved %s LUN: %u -> MAPPED LUN: %u"
+                " for %s\n", tpg->se_tpg_tfo->get_fabric_name(),
+                cmd->se_lun->unpacked_lun, cmd->se_deve->mapped_lun,
+                sess->se_node_acl->initiatorname);
+out_unlock:
+        spin_unlock(&dev->dev_reservation_lock);
+out:
+        if (!ret) {
+                task->task_scsi_status = GOOD;
+                transport_complete_task(task, 1);
+        }
+        return ret;
 }
 /*
 * Begin SPC-3/SPC-4 Persistent Reservations emulation support
 *
@@ -418,12 +427,12 @@ static int core_scsi3_pr_seq_non_holder(
                break;
        case RELEASE:
        case RELEASE_10:
-                /* Handled by CRH=1 in core_scsi2_emulate_crh() */
+                /* Handled by CRH=1 in target_scsi2_reservation_release() */
                ret = 0;
                break;
        case RESERVE:
        case RESERVE_10:
-                /* Handled by CRH=1 in core_scsi2_emulate_crh() */
+                /* Handled by CRH=1 in target_scsi2_reservation_reserve() */
                ret = 0;
                break;
        case TEST_UNIT_READY:
@@ -3739,12 +3748,33 @@ static unsigned long long core_scsi3_extract_reservation_key(unsigned char *cdb)
 /*
 * See spc4r17 section 6.14 Table 170
 */
-static int core_scsi3_emulate_pr_out(struct se_cmd *cmd, unsigned char *cdb)
+int target_scsi3_emulate_pr_out(struct se_task *task)
 {
+        struct se_cmd *cmd = task->task_se_cmd;
+        unsigned char *cdb = &cmd->t_task_cdb[0];
        unsigned char *buf;
        u64 res_key, sa_res_key;
        int sa, scope, type, aptpl;
        int spec_i_pt = 0, all_tg_pt = 0, unreg = 0;
+        int ret;
+        /*
+         * Following spc2r20 5.5.1 Reservations overview:
+         *
+         * If a logical unit has been reserved by any RESERVE command and is
+         * still reserved by any initiator, all PERSISTENT RESERVE IN and all
+         * PERSISTENT RESERVE OUT commands shall conflict regardless of
+         * initiator or service action and shall terminate with a RESERVATION
+         * CONFLICT status.
+         */
+        if (cmd->se_dev->dev_flags & DF_SPC2_RESERVATIONS) {
+                pr_err("Received PERSISTENT_RESERVE CDB while legacy"
+                        " SPC-2 reservation is held, returning"
+                        " RESERVATION_CONFLICT\n");
+                ret = PYX_TRANSPORT_RESERVATION_CONFLICT;
+                goto out;
+        }
        /*
         * FIXME: A NULL struct se_session pointer means an this is not coming from
         * a $FABRIC_MOD's nexus, but from internal passthrough ops.
@@ -3755,7 +3785,8 @@ static int core_scsi3_emulate_pr_out(struct se_cmd *cmd, unsigned char *cdb)
        if (cmd->data_length < 24) {
                pr_warn("SPC-PR: Received PR OUT parameter list"
                        " length too small: %u\n", cmd->data_length);
-                return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                ret = PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                goto out;
        }
        /*
         * From the PERSISTENT_RESERVE_OUT command descriptor block (CDB)
@@ -3788,8 +3819,11 @@ static int core_scsi3_emulate_pr_out(struct se_cmd *cmd, unsigned char *cdb)
        /*
         * SPEC_I_PT=1 is only valid for Service action: REGISTER
         */
-        if (spec_i_pt && ((cdb[1] & 0x1f) != PRO_REGISTER))
+        if (spec_i_pt && ((cdb[1] & 0x1f) != PRO_REGISTER)) {
-                return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                ret = PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                goto out;
+        }
        /*
         * From spc4r17 section 6.14:
         *
@@ -3803,7 +3837,8 @@ static int core_scsi3_emulate_pr_out(struct se_cmd *cmd, unsigned char *cdb)
            (cmd->data_length != 24)) {
                pr_warn("SPC-PR: Received PR OUT illegal parameter"
                        " list length: %u\n", cmd->data_length);
-                return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                ret = PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                goto out;
        }
        /*
         * (core_scsi3_emulate_pro_* function parameters
@@ -3812,35 +3847,47 @@ static int core_scsi3_emulate_pr_out(struct se_cmd *cmd, unsigned char *cdb)
         */
        switch (sa) {
        case PRO_REGISTER:
-                return core_scsi3_emulate_pro_register(cmd,
+                ret = core_scsi3_emulate_pro_register(cmd,
                        res_key, sa_res_key, aptpl, all_tg_pt, spec_i_pt, 0);
+                break;
        case PRO_RESERVE:
-                return core_scsi3_emulate_pro_reserve(cmd,
+                ret = core_scsi3_emulate_pro_reserve(cmd, type, scope, res_key);
-                        type, scope, res_key);
+                break;
        case PRO_RELEASE:
-                return core_scsi3_emulate_pro_release(cmd,
+                ret = core_scsi3_emulate_pro_release(cmd, type, scope, res_key);
-                        type, scope, res_key);
+                break;
        case PRO_CLEAR:
-                return core_scsi3_emulate_pro_clear(cmd, res_key);
+                ret = core_scsi3_emulate_pro_clear(cmd, res_key);
+                break;
        case PRO_PREEMPT:
-                return core_scsi3_emulate_pro_preempt(cmd, type, scope,
+                ret = core_scsi3_emulate_pro_preempt(cmd, type, scope,
                                        res_key, sa_res_key, 0);
+                break;
        case PRO_PREEMPT_AND_ABORT:
-                return core_scsi3_emulate_pro_preempt(cmd, type, scope,
+                ret = core_scsi3_emulate_pro_preempt(cmd, type, scope,
                                        res_key, sa_res_key, 1);
+                break;
        case PRO_REGISTER_AND_IGNORE_EXISTING_KEY:
-                return core_scsi3_emulate_pro_register(cmd,
+                ret = core_scsi3_emulate_pro_register(cmd,
                        0, sa_res_key, aptpl, all_tg_pt, spec_i_pt, 1);
+                break;
        case PRO_REGISTER_AND_MOVE:
-                return core_scsi3_emulate_pro_register_and_move(cmd, res_key,
+                ret = core_scsi3_emulate_pro_register_and_move(cmd, res_key,
                                sa_res_key, aptpl, unreg);
+                break;
        default:
                pr_err("Unknown PERSISTENT_RESERVE_OUT service"
                        " action: 0x%02x\n", cdb[1] & 0x1f);
-                return PYX_TRANSPORT_INVALID_CDB_FIELD;
+                ret = PYX_TRANSPORT_INVALID_CDB_FIELD;
+                break;
        }
-        return PYX_TRANSPORT_INVALID_CDB_FIELD;
+out:
+        if (!ret) {
+                task->task_scsi_status = GOOD;
+                transport_complete_task(task, 1);
+        }
+        return ret;
 }
 /*
@@ -4190,29 +4237,11 @@ static int core_scsi3_pri_read_full_status(struct se_cmd *cmd)
        return 0;
 }
-static int core_scsi3_emulate_pr_in(struct se_cmd *cmd, unsigned char *cdb)
+int target_scsi3_emulate_pr_in(struct se_task *task)
 {
-        switch (cdb[1] & 0x1f) {
+        struct se_cmd *cmd = task->task_se_cmd;
-        case PRI_READ_KEYS:
+        int ret;
-                return core_scsi3_pri_read_keys(cmd);
-        case PRI_READ_RESERVATION:
-                return core_scsi3_pri_read_reservation(cmd);
-        case PRI_REPORT_CAPABILITIES:
-                return core_scsi3_pri_report_capabilities(cmd);
-        case PRI_READ_FULL_STATUS:
-                return core_scsi3_pri_read_full_status(cmd);
-        default:
-                pr_err("Unknown PERSISTENT_RESERVE_IN service"
-                        " action: 0x%02x\n", cdb[1] & 0x1f);
-                return PYX_TRANSPORT_INVALID_CDB_FIELD;
-        }
-}
-int core_scsi3_emulate_pr(struct se_cmd *cmd)
-{
-        unsigned char *cdb = &cmd->t_task_cdb[0];
-        struct se_device *dev = cmd->se_dev;
        /*
         * Following spc2r20 5.5.1 Reservations overview:
         *
@@ -4222,16 +4251,38 @@ int core_scsi3_emulate_pr(struct se_cmd *cmd)
         * initiator or service action and shall terminate with a RESERVATION
         * CONFLICT status.
         */
-        if (dev->dev_flags & DF_SPC2_RESERVATIONS) {
+        if (cmd->se_dev->dev_flags & DF_SPC2_RESERVATIONS) {
                pr_err("Received PERSISTENT_RESERVE CDB while legacy"
                        " SPC-2 reservation is held, returning"
                        " RESERVATION_CONFLICT\n");
                return PYX_TRANSPORT_RESERVATION_CONFLICT;
        }
-        return (cdb[0] == PERSISTENT_RESERVE_OUT) ?
+        switch (cmd->t_task_cdb[1] & 0x1f) {
-               core_scsi3_emulate_pr_out(cmd, cdb) :
+        case PRI_READ_KEYS:
-               core_scsi3_emulate_pr_in(cmd, cdb);
+                ret = core_scsi3_pri_read_keys(cmd);
+                break;
+        case PRI_READ_RESERVATION:
+                ret = core_scsi3_pri_read_reservation(cmd);
+                break;
+        case PRI_REPORT_CAPABILITIES:
+                ret = core_scsi3_pri_report_capabilities(cmd);
+                break;
+        case PRI_READ_FULL_STATUS:
+                ret = core_scsi3_pri_read_full_status(cmd);
+                break;
+        default:
+                pr_err("Unknown PERSISTENT_RESERVE_IN service"
+                        " action: 0x%02x\n", cmd->t_task_cdb[1] & 0x1f);
+                ret = PYX_TRANSPORT_INVALID_CDB_FIELD;
+                break;
+        }
+        if (!ret) {
+                task->task_scsi_status = GOOD;
+                transport_complete_task(task, 1);
+        }
+        return ret;
 }
 static int core_pt_reservation_check(struct se_cmd *cmd, u32 *pr_res_type)
diff --git a/drivers/target/target_core_pr.h b/drivers/target/target_core_pr.h
index c8f47d064584..b97f6940dd05 100644
--- a/drivers/target/target_core_pr.h
+++ b/drivers/target/target_core_pr.h
@@ -47,7 +47,8 @@ extern struct kmem_cache *t10_pr_reg_cache;
 extern int core_pr_dump_initiator_port(struct t10_pr_registration *,
                        char *, u32);
-extern int core_scsi2_emulate_crh(struct se_cmd *);
+extern int target_scsi2_reservation_release(struct se_task *task);
+extern int target_scsi2_reservation_reserve(struct se_task *task);
 extern int core_scsi3_alloc_aptpl_registration(
                        struct t10_reservation *, u64,
                        unsigned char *, unsigned char *, u32,
@@ -61,7 +62,9 @@ extern void core_scsi3_free_all_registrations(struct se_device *);
 extern unsigned char *core_scsi3_pr_dump_type(int);
 extern int core_scsi3_check_cdb_abort_and_preempt(struct list_head *,
                                                  struct se_cmd *);
-extern int core_scsi3_emulate_pr(struct se_cmd *);
+extern int target_scsi3_emulate_pr_in(struct se_task *task);
+extern int target_scsi3_emulate_pr_out(struct se_task *task);
 extern int core_setup_reservations(struct se_device *, int);
 #endif /* TARGET_CORE_PR_H */
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
index dad671dee9e9..ed32e1efe429 100644
--- a/drivers/target/target_core_pscsi.c
+++ b/drivers/target/target_core_pscsi.c
@@ -36,6 +36,7 @@
 #include <linux/genhd.h>
 #include <linux/cdrom.h>
 #include <linux/file.h>
+#include <linux/module.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_cmnd.h>
@@ -1091,7 +1092,7 @@ static int pscsi_do_task(struct se_task *task)
                req = blk_make_request(pdv->pdv_sd->request_queue, hbio,
                                       GFP_KERNEL);
-                if (!req) {
+                if (IS_ERR(req)) {
                        pr_err("pSCSI: blk_make_request() failed\n");
                        goto fail;
                }
diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
index 570b144a1edb..217e29df6297 100644
--- a/drivers/target/target_core_tmr.c
+++ b/drivers/target/target_core_tmr.c
@@ -27,6 +27,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/list.h>
+#include <linux/export.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -118,7 +119,7 @@ static void core_tmr_drain_tmr_list(
                /*
                 * Allow the received TMR to return with FUNCTION_COMPLETE.
                 */
-                if (tmr && (tmr_p == tmr))
+                if (tmr_p == tmr)
                        continue;
                cmd = tmr_p->task_cmd;
@@ -147,19 +148,18 @@ static void core_tmr_drain_tmr_list(
                }
                spin_unlock(&cmd->t_state_lock);
-                list_move_tail(&tmr->tmr_list, &drain_tmr_list);
+                list_move_tail(&tmr_p->tmr_list, &drain_tmr_list);
        }
        spin_unlock_irqrestore(&dev->se_tmr_lock, flags);
-        while (!list_empty(&drain_tmr_list)) {
+        list_for_each_entry_safe(tmr_p, tmr_pp, &drain_tmr_list, tmr_list) {
-                tmr = list_entry(drain_tmr_list.next, struct se_tmr_req, tmr_list);
+                list_del_init(&tmr_p->tmr_list);
-                list_del(&tmr->tmr_list);
                cmd = tmr_p->task_cmd;
                pr_debug("LUN_RESET: %s releasing TMR %p Function: 0x%02x,"
                        " Response: 0x%02x, t_state: %d\n",
-                        (preempt_and_abort_list) ? "Preempt" : "", tmr,
+                        (preempt_and_abort_list) ? "Preempt" : "", tmr_p,
-                        tmr->function, tmr->response, cmd->t_state);
+                        tmr_p->function, tmr_p->response, cmd->t_state);
                transport_cmd_finish_abort(cmd, 1);
        }
@@ -330,16 +330,6 @@ static void core_tmr_drain_cmd_list(
                 */
                if (prout_cmd == cmd)
                        continue;
-                /*
-                 * Skip direct processing of TRANSPORT_FREE_CMD_INTR for
-                 * HW target mode fabrics.
-                 */
-                spin_lock(&cmd->t_state_lock);
-                if (cmd->t_state == TRANSPORT_FREE_CMD_INTR) {
-                        spin_unlock(&cmd->t_state_lock);
-                        continue;
-                }
-                spin_unlock(&cmd->t_state_lock);
                atomic_set(&cmd->t_transport_queue_active, 0);
                atomic_dec(&qobj->queue_cnt);
diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
index 49fd0a9b0a56..8ddd133025b9 100644
--- a/drivers/target/target_core_tpg.c
+++ b/drivers/target/target_core_tpg.c
@@ -32,6 +32,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/in.h>
+#include <linux/export.h>
 #include <net/sock.h>
 #include <net/tcp.h>
 #include <scsi/scsi.h>
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index d75255804481..3400ae6e93f8 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -36,6 +36,7 @@
 #include <linux/kthread.h>
 #include <linux/in.h>
 #include <linux/cdrom.h>
+#include <linux/module.h>
 #include <asm/unaligned.h>
 #include <net/sock.h>
 #include <net/tcp.h>
@@ -52,6 +53,7 @@
 #include <target/target_core_configfs.h>
 #include "target_core_alua.h"
+#include "target_core_cdb.h"
 #include "target_core_hba.h"
 #include "target_core_pr.h"
 #include "target_core_ua.h"
@@ -268,6 +270,9 @@ struct se_session *transport_init_session(void)
        }
        INIT_LIST_HEAD(&se_sess->sess_list);
        INIT_LIST_HEAD(&se_sess->sess_acl_list);
+        INIT_LIST_HEAD(&se_sess->sess_cmd_list);
+        INIT_LIST_HEAD(&se_sess->sess_wait_list);
+        spin_lock_init(&se_sess->sess_cmd_lock);
        return se_sess;
 }
@@ -514,13 +519,16 @@ static int transport_cmd_check_stop(
                         * Some fabric modules like tcm_loop can release
                         * their internally allocated I/O reference now and
                         * struct se_cmd now.
+                         *
+                         * Fabric modules are expected to return '1' here if the
+                         * se_cmd being passed is released at this point,
+                         * or zero if not being released.
                         */
                        if (cmd->se_tfo->check_stop_free != NULL) {
                                spin_unlock_irqrestore(
                                        &cmd->t_state_lock, flags);
-                                cmd->se_tfo->check_stop_free(cmd);
+                                return cmd->se_tfo->check_stop_free(cmd);
-                                return 1;
                        }
                }
                spin_unlock_irqrestore(&cmd->t_state_lock, flags);
@@ -730,6 +738,10 @@ void transport_complete_task(struct se_task *task, int success)
                complete(&task->task_stop_comp);
                return;
        }
+        if (!success)
+                cmd->t_tasks_failed = 1;
        /*
         * Decrement the outstanding t_task_cdbs_left count.  The last
         * struct se_task from struct se_cmd will complete itself into the
@@ -740,7 +752,7 @@ void transport_complete_task(struct se_task *task, int success)
                return;
        }
-        if (!success || cmd->t_tasks_failed) {
+        if (cmd->t_tasks_failed) {
                if (!task->task_error_status) {
                        task->task_error_status =
                                PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
@@ -908,7 +920,7 @@ void transport_remove_task_from_execute_queue(
 }
 /*
- * Handle QUEUE_FULL / -EAGAIN status
+ * Handle QUEUE_FULL / -EAGAIN and -ENOMEM status
 */
 static void target_qf_do_work(struct work_struct *work)
@@ -1498,11 +1510,12 @@ void transport_init_se_cmd(
        INIT_LIST_HEAD(&cmd->se_ordered_node);
        INIT_LIST_HEAD(&cmd->se_qf_node);
        INIT_LIST_HEAD(&cmd->se_queue_node);
+        INIT_LIST_HEAD(&cmd->se_cmd_list);
        INIT_LIST_HEAD(&cmd->t_task_list);
        init_completion(&cmd->transport_lun_fe_stop_comp);
        init_completion(&cmd->transport_lun_stop_comp);
        init_completion(&cmd->t_transport_stop_comp);
+        init_completion(&cmd->cmd_wait_comp);
        spin_lock_init(&cmd->t_state_lock);
        atomic_set(&cmd->transport_dev_active, 1);
@@ -1645,9 +1658,7 @@ int transport_handle_cdb_direct(
         * and call transport_generic_request_failure() if necessary..
         */
        ret = transport_generic_new_cmd(cmd);
-        if (ret == -EAGAIN)
+        if (ret < 0) {
-                return 0;
-        else if (ret < 0) {
                cmd->transport_error_status = ret;
                transport_generic_request_failure(cmd, 0,
                                (cmd->data_direction != DMA_TO_DEVICE));
@@ -1717,13 +1728,6 @@ int transport_generic_handle_tmr(
 }
 EXPORT_SYMBOL(transport_generic_handle_tmr);
-void transport_generic_free_cmd_intr(
-        struct se_cmd *cmd)
-{
-        transport_add_cmd_to_queue(cmd, TRANSPORT_FREE_CMD_INTR, false);
-}
-EXPORT_SYMBOL(transport_generic_free_cmd_intr);
 /*
 * If the task is active, request it to be stopped and sleep until it
 * has completed.
@@ -1886,7 +1890,7 @@ static void transport_generic_request_failure(
                                ASCQ_2CH_PREVIOUS_RESERVATION_CONFLICT_STATUS);
                ret = cmd->se_tfo->queue_status(cmd);
-                if (ret == -EAGAIN)
+                if (ret == -EAGAIN || ret == -ENOMEM)
                        goto queue_full;
                goto check_stop;
        case PYX_TRANSPORT_USE_SENSE_REASON:
@@ -1913,7 +1917,7 @@ static void transport_generic_request_failure(
        else {
                ret = transport_send_check_condition_and_sense(cmd,
                                cmd->scsi_sense_reason, 0);
-                if (ret == -EAGAIN)
+                if (ret == -EAGAIN || ret == -ENOMEM)
                        goto queue_full;
        }
@@ -2153,62 +2157,20 @@ check_depth:
                atomic_set(&cmd->t_transport_sent, 1);
        spin_unlock_irqrestore(&cmd->t_state_lock, flags);
-        /*
-         * The struct se_cmd->transport_emulate_cdb() function pointer is used
-         * to grab REPORT_LUNS and other CDBs we want to handle before they hit the
-         * struct se_subsystem_api->do_task() caller below.
-         */
-        if (cmd->transport_emulate_cdb) {
-                error = cmd->transport_emulate_cdb(cmd);
-                if (error != 0) {
-                        cmd->transport_error_status = error;
-                        spin_lock_irqsave(&cmd->t_state_lock, flags);
-                        task->task_flags &= ~TF_ACTIVE;
-                        spin_unlock_irqrestore(&cmd->t_state_lock, flags);
-                        atomic_set(&cmd->t_transport_sent, 0);
-                        transport_stop_tasks_for_cmd(cmd);
-                        atomic_inc(&dev->depth_left);
-                        transport_generic_request_failure(cmd, 0, 1);
-                        goto check_depth;
-                }
-                /*
-                 * Handle the successful completion for transport_emulate_cdb()
-                 * for synchronous operation, following SCF_EMULATE_CDB_ASYNC
-                 * Otherwise the caller is expected to complete the task with
-                 * proper status.
-                 */
-                if (!(cmd->se_cmd_flags & SCF_EMULATE_CDB_ASYNC)) {
-                        cmd->scsi_status = SAM_STAT_GOOD;
-                        task->task_scsi_status = GOOD;
-                        transport_complete_task(task, 1);
-                }
-        } else {
-                /*
-                 * Currently for all virtual TCM plugins including IBLOCK, FILEIO and
-                 * RAMDISK we use the internal transport_emulate_control_cdb() logic
-                 * with struct se_subsystem_api callers for the primary SPC-3 TYPE_DISK
-                 * LUN emulation code.
-                 *
-                 * For TCM/pSCSI and all other SCF_SCSI_DATA_SG_IO_CDB I/O tasks we
-                 * call ->do_task() directly and let the underlying TCM subsystem plugin
-                 * code handle the CDB emulation.
-                 */
-                if ((dev->transport->transport_type != TRANSPORT_PLUGIN_PHBA_PDEV) &&
-                    (!(task->task_se_cmd->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB)))
-                        error = transport_emulate_control_cdb(task);
-                else
-                        error = dev->transport->do_task(task);
-                if (error != 0) {
+        if (cmd->execute_task)
-                        cmd->transport_error_status = error;
+                error = cmd->execute_task(task);
-                        spin_lock_irqsave(&cmd->t_state_lock, flags);
+        else
-                        task->task_flags &= ~TF_ACTIVE;
+                error = dev->transport->do_task(task);
-                        spin_unlock_irqrestore(&cmd->t_state_lock, flags);
+        if (error != 0) {
-                        atomic_set(&cmd->t_transport_sent, 0);
+                cmd->transport_error_status = error;
-                        transport_stop_tasks_for_cmd(cmd);
+                spin_lock_irqsave(&cmd->t_state_lock, flags);
-                        atomic_inc(&dev->depth_left);
+                task->task_flags &= ~TF_ACTIVE;
-                        transport_generic_request_failure(cmd, 0, 1);
+                spin_unlock_irqrestore(&cmd->t_state_lock, flags);
-                }
+                atomic_set(&cmd->t_transport_sent, 0);
+                transport_stop_tasks_for_cmd(cmd);
+                atomic_inc(&dev->depth_left);
+                transport_generic_request_failure(cmd, 0, 1);
        }
        goto check_depth;
@@ -2642,6 +2604,13 @@ static int transport_generic_cmd_sequencer(
                 */
        }
+        /*
+         * If we operate in passthrough mode we skip most CDB emulation and
+         * instead hand the commands down to the physical SCSI device.
+         */
+        passthrough =
+                (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV);
        switch (cdb[0]) {
        case READ_6:
                sectors = transport_get_sectors_6(cdb, cmd, &sector_ret);
@@ -2721,9 +2690,12 @@ static int transport_generic_cmd_sequencer(
                cmd->t_task_lba = transport_lba_32(cdb);
                cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
-                if (dev->transport->transport_type ==
+                /*
-                                TRANSPORT_PLUGIN_PHBA_PDEV)
+                 * Do now allow BIDI commands for passthrough mode.
+                 */
+                if (passthrough)
                        goto out_unsupported_cdb;
                /*
                 * Setup BIDI XOR callback to be run after I/O completion.
                 */
@@ -2732,13 +2704,6 @@ static int transport_generic_cmd_sequencer(
                break;
        case VARIABLE_LENGTH_CMD:
                service_action = get_unaligned_be16(&cdb[8]);
-                /*
-                 * Determine if this is TCM/PSCSI device and we should disable
-                 * internal emulation for this CDB.
-                 */
-                passthrough = (dev->transport->transport_type ==
-                                        TRANSPORT_PLUGIN_PHBA_PDEV);
                switch (service_action) {
                case XDWRITEREAD_32:
                        sectors = transport_get_sectors_32(cdb, cmd, &sector_ret);
@@ -2752,8 +2717,12 @@ static int transport_generic_cmd_sequencer(
                        cmd->t_task_lba = transport_lba_64_ext(cdb);
                        cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
+                        /*
+                         * Do now allow BIDI commands for passthrough mode.
+                         */
                        if (passthrough)
                                goto out_unsupported_cdb;
                        /*
                         * Setup BIDI XOR callback to be run during after I/O
                         * completion.
@@ -2779,7 +2748,8 @@ static int transport_generic_cmd_sequencer(
                        if (target_check_write_same_discard(&cdb[10], dev) < 0)
                                goto out_invalid_cdb_field;
+                        if (!passthrough)
+                                cmd->execute_task = target_emulate_write_same;
                        break;
                default:
                        pr_err("VARIABLE_LENGTH_CMD service action"
@@ -2793,12 +2763,10 @@ static int transport_generic_cmd_sequencer(
                        /*
                         * Check for emulated MI_REPORT_TARGET_PGS.
                         */
-                        if (cdb[1] == MI_REPORT_TARGET_PGS) {
+                        if (cdb[1] == MI_REPORT_TARGET_PGS &&
-                                cmd->transport_emulate_cdb =
+                            su_dev->t10_alua.alua_type == SPC3_ALUA_EMULATED) {
-                                (su_dev->t10_alua.alua_type ==
+                                cmd->execute_task =
-                                 SPC3_ALUA_EMULATED) ?
+                                        target_emulate_report_target_port_groups;
-                                core_emulate_report_target_port_groups :
-                                NULL;
                        }
                        size = (cdb[6] << 24) | (cdb[7] << 16) |
                               (cdb[8] << 8) | cdb[9];
@@ -2819,8 +2787,15 @@ static int transport_generic_cmd_sequencer(
        case MODE_SENSE:
                size = cdb[4];
                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_SG_IO_CDB;
+                if (!passthrough)
+                        cmd->execute_task = target_emulate_modesense;
                break;
        case MODE_SENSE_10:
+                size = (cdb[7] << 8) + cdb[8];
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_SG_IO_CDB;
+                if (!passthrough)
+                        cmd->execute_task = target_emulate_modesense;
+                break;
        case GPCMD_READ_BUFFER_CAPACITY:
        case GPCMD_SEND_OPC:
        case LOG_SELECT:
@@ -2840,11 +2815,14 @@ static int transport_generic_cmd_sequencer(
                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_SG_IO_CDB;
                break;
        case PERSISTENT_RESERVE_IN:
+                if (su_dev->t10_pr.res_type == SPC3_PERSISTENT_RESERVATIONS)
+                        cmd->execute_task = target_scsi3_emulate_pr_in;
+                size = (cdb[7] << 8) + cdb[8];
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_SG_IO_CDB;
+                break;
        case PERSISTENT_RESERVE_OUT:
-                cmd->transport_emulate_cdb =
+                if (su_dev->t10_pr.res_type == SPC3_PERSISTENT_RESERVATIONS)
-                        (su_dev->t10_pr.res_type ==
+                        cmd->execute_task = target_scsi3_emulate_pr_out;
-                         SPC3_PERSISTENT_RESERVATIONS) ?
-                        core_scsi3_emulate_pr : NULL;
                size = (cdb[7] << 8) + cdb[8];
                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_SG_IO_CDB;
                break;
@@ -2863,12 +2841,10 @@ static int transport_generic_cmd_sequencer(
                         *
                         * Check for emulated MO_SET_TARGET_PGS.
                         */
-                        if (cdb[1] == MO_SET_TARGET_PGS) {
+                        if (cdb[1] == MO_SET_TARGET_PGS &&
-                                cmd->transport_emulate_cdb =
+                            su_dev->t10_alua.alua_type == SPC3_ALUA_EMULATED) {
-                                (su_dev->t10_alua.alua_type ==
+                                cmd->execute_task =
-                                        SPC3_ALUA_EMULATED) ?
+                                        target_emulate_set_target_port_groups;
-                                core_emulate_set_target_port_groups :
-                                NULL;
                        }
                        size = (cdb[6] << 24) | (cdb[7] << 16) |
@@ -2888,6 +2864,8 @@ static int transport_generic_cmd_sequencer(
                if (cmd->se_dev->dev_task_attr_type == SAM_TASK_ATTR_EMULATED)
                        cmd->sam_task_attr = MSG_HEAD_TAG;
                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_SG_IO_CDB;
+                if (!passthrough)
+                        cmd->execute_task = target_emulate_inquiry;
                break;
        case READ_BUFFER:
                size = (cdb[6] << 16) + (cdb[7] << 8) + cdb[8];
@@ -2896,6 +2874,8 @@ static int transport_generic_cmd_sequencer(
        case READ_CAPACITY:
                size = READ_CAP_LEN;
                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_SG_IO_CDB;
+                if (!passthrough)
+                        cmd->execute_task = target_emulate_readcapacity;
                break;
        case READ_MEDIA_SERIAL_NUMBER:
        case SECURITY_PROTOCOL_IN:
@@ -2904,6 +2884,21 @@ static int transport_generic_cmd_sequencer(
                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_SG_IO_CDB;
                break;
        case SERVICE_ACTION_IN:
+                switch (cmd->t_task_cdb[1] & 0x1f) {
+                case SAI_READ_CAPACITY_16:
+                        if (!passthrough)
+                                cmd->execute_task =
+                                        target_emulate_readcapacity_16;
+                        break;
+                default:
+                        if (passthrough)
+                                break;
+                        pr_err("Unsupported SA: 0x%02x\n",
+                                cmd->t_task_cdb[1] & 0x1f);
+                        goto out_unsupported_cdb;
+                }
+                /*FALLTHROUGH*/
        case ACCESS_CONTROL_IN:
        case ACCESS_CONTROL_OUT:
        case EXTENDED_COPY:
@@ -2934,6 +2929,8 @@ static int transport_generic_cmd_sequencer(
        case REQUEST_SENSE:
                size = cdb[4];
                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_SG_IO_CDB;
+                if (!passthrough)
+                        cmd->execute_task = target_emulate_request_sense;
                break;
        case READ_ELEMENT_STATUS:
                size = 65536 * cdb[7] + 256 * cdb[8] + cdb[9];
@@ -2961,10 +2958,8 @@ static int transport_generic_cmd_sequencer(
                 * is running in SPC_PASSTHROUGH, and wants reservations
                 * emulation disabled.
                 */
-                cmd->transport_emulate_cdb =
+                if (su_dev->t10_pr.res_type != SPC_PASSTHROUGH)
-                                (su_dev->t10_pr.res_type !=
+                        cmd->execute_task = target_scsi2_reservation_reserve;
-                                 SPC_PASSTHROUGH) ?
-                                core_scsi2_emulate_crh : NULL;
                cmd->se_cmd_flags |= SCF_SCSI_NON_DATA_CDB;
                break;
        case RELEASE:
@@ -2978,10 +2973,8 @@ static int transport_generic_cmd_sequencer(
                else
                        size = cmd->data_length;
-                cmd->transport_emulate_cdb =
+                if (su_dev->t10_pr.res_type != SPC_PASSTHROUGH)
-                                (su_dev->t10_pr.res_type !=
+                        cmd->execute_task = target_scsi2_reservation_release;
-                                 SPC_PASSTHROUGH) ?
-                                core_scsi2_emulate_crh : NULL;
                cmd->se_cmd_flags |= SCF_SCSI_NON_DATA_CDB;
                break;
        case SYNCHRONIZE_CACHE:
@@ -3002,16 +2995,9 @@ static int transport_generic_cmd_sequencer(
                size = transport_get_size(sectors, cdb, cmd);
                cmd->se_cmd_flags |= SCF_SCSI_NON_DATA_CDB;
-                /*
+                if (passthrough)
-                 * For TCM/pSCSI passthrough, skip cmd->transport_emulate_cdb()
-                 */
-                if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV)
                        break;
-                /*
-                 * Set SCF_EMULATE_CDB_ASYNC to ensure asynchronous operation
-                 * for SYNCHRONIZE_CACHE* Immed=1 case in __transport_execute_tasks()
-                 */
-                cmd->se_cmd_flags |= SCF_EMULATE_CDB_ASYNC;
                /*
                 * Check to ensure that LBA + Range does not exceed past end of
                 * device for IBLOCK and FILEIO ->do_sync_cache() backend calls
@@ -3020,10 +3006,13 @@ static int transport_generic_cmd_sequencer(
                        if (transport_cmd_get_valid_sectors(cmd) < 0)
                                goto out_invalid_cdb_field;
                }
+                cmd->execute_task = target_emulate_synchronize_cache;
                break;
        case UNMAP:
                size = get_unaligned_be16(&cdb[7]);
                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_SG_IO_CDB;
+                if (!passthrough)
+                        cmd->execute_task = target_emulate_unmap;
                break;
        case WRITE_SAME_16:
                sectors = transport_get_sectors_16(cdb, cmd, &sector_ret);
@@ -3042,6 +3031,8 @@ static int transport_generic_cmd_sequencer(
                if (target_check_write_same_discard(&cdb[1], dev) < 0)
                        goto out_invalid_cdb_field;
+                if (!passthrough)
+                        cmd->execute_task = target_emulate_write_same;
                break;
        case WRITE_SAME:
                sectors = transport_get_sectors_10(cdb, cmd, &sector_ret);
@@ -3063,26 +3054,31 @@ static int transport_generic_cmd_sequencer(
                 */
                if (target_check_write_same_discard(&cdb[1], dev) < 0)
                        goto out_invalid_cdb_field;
+                if (!passthrough)
+                        cmd->execute_task = target_emulate_write_same;
                break;
        case ALLOW_MEDIUM_REMOVAL:
-        case GPCMD_CLOSE_TRACK:
        case ERASE:
-        case INITIALIZE_ELEMENT_STATUS:
-        case GPCMD_LOAD_UNLOAD:
        case REZERO_UNIT:
        case SEEK_10:
-        case GPCMD_SET_SPEED:
        case SPACE:
        case START_STOP:
        case TEST_UNIT_READY:
        case VERIFY:
        case WRITE_FILEMARKS:
+                cmd->se_cmd_flags |= SCF_SCSI_NON_DATA_CDB;
+                if (!passthrough)
+                        cmd->execute_task = target_emulate_noop;
+                break;
+        case GPCMD_CLOSE_TRACK:
+        case INITIALIZE_ELEMENT_STATUS:
+        case GPCMD_LOAD_UNLOAD:
+        case GPCMD_SET_SPEED:
        case MOVE_MEDIUM:
                cmd->se_cmd_flags |= SCF_SCSI_NON_DATA_CDB;
                break;
        case REPORT_LUNS:
-                cmd->transport_emulate_cdb =
+                cmd->execute_task = target_report_luns;
-                                transport_core_report_lun_response;
                size = (cdb[6] << 24) | (cdb[7] << 16) | (cdb[8] << 8) | cdb[9];
                /*
                 * Do implict HEAD_OF_QUEUE processing for REPORT_LUNS
@@ -3134,6 +3130,11 @@ static int transport_generic_cmd_sequencer(
                cmd->data_length = size;
        }
+        /* reject any command that we don't have a handler for */
+        if (!(passthrough || cmd->execute_task ||
+             (cmd->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB)))
+                goto out_unsupported_cdb;
        /* Let's limit control cdbs to a page, for simplicity's sake. */
        if ((cmd->se_cmd_flags & SCF_SCSI_CONTROL_SG_IO_CDB) &&
            size > PAGE_SIZE)
@@ -3308,7 +3309,7 @@ static void target_complete_ok_work(struct work_struct *work)
                if (cmd->scsi_status) {
                        ret = transport_send_check_condition_and_sense(
                                        cmd, reason, 1);
-                        if (ret == -EAGAIN)
+                        if (ret == -EAGAIN || ret == -ENOMEM)
                                goto queue_full;
                        transport_lun_remove_cmd(cmd);
@@ -3333,7 +3334,7 @@ static void target_complete_ok_work(struct work_struct *work)
                spin_unlock(&cmd->se_lun->lun_sep_lock);
                ret = cmd->se_tfo->queue_data_in(cmd);
-                if (ret == -EAGAIN)
+                if (ret == -EAGAIN || ret == -ENOMEM)
                        goto queue_full;
                break;
        case DMA_TO_DEVICE:
@@ -3354,14 +3355,14 @@ static void target_complete_ok_work(struct work_struct *work)
                        }
                        spin_unlock(&cmd->se_lun->lun_sep_lock);
                        ret = cmd->se_tfo->queue_data_in(cmd);
-                        if (ret == -EAGAIN)
+                        if (ret == -EAGAIN || ret == -ENOMEM)
                                goto queue_full;
                        break;
                }
                /* Fall through for DMA_TO_DEVICE */
        case DMA_NONE:
                ret = cmd->se_tfo->queue_status(cmd);
-                if (ret == -EAGAIN)
+                if (ret == -EAGAIN || ret == -ENOMEM)
                        goto queue_full;
                break;
        default:
@@ -3890,7 +3891,10 @@ EXPORT_SYMBOL(transport_generic_process_write);
 static void transport_write_pending_qf(struct se_cmd *cmd)
 {
-        if (cmd->se_tfo->write_pending(cmd) == -EAGAIN) {
+        int ret;
+        ret = cmd->se_tfo->write_pending(cmd);
+        if (ret == -EAGAIN || ret == -ENOMEM) {
                pr_debug("Handling write_pending QUEUE__FULL: se_cmd: %p\n",
                         cmd);
                transport_handle_queue_full(cmd, cmd->se_dev);
@@ -3920,7 +3924,7 @@ static int transport_generic_write_pending(struct se_cmd *cmd)
         * frontend know that WRITE buffers are ready.
         */
        ret = cmd->se_tfo->write_pending(cmd);
-        if (ret == -EAGAIN)
+        if (ret == -EAGAIN || ret == -ENOMEM)
                goto queue_full;
        else if (ret < 0)
                return ret;
@@ -3931,7 +3935,7 @@ queue_full:
        pr_debug("Handling write_pending QUEUE__FULL: se_cmd: %p\n", cmd);
        cmd->t_state = TRANSPORT_COMPLETE_QF_WP;
        transport_handle_queue_full(cmd, cmd->se_dev);
-        return ret;
+        return 0;
 }
 /**
@@ -3949,6 +3953,14 @@ void transport_release_cmd(struct se_cmd *cmd)
                core_tmr_release_req(cmd->se_tmr_req);
        if (cmd->t_task_cdb != cmd->__t_task_cdb)
                kfree(cmd->t_task_cdb);
+        /*
+         * Check if target_wait_for_sess_cmds() is expecting to
+         * release se_cmd directly here..
+         */
+        if (cmd->check_release != 0 && cmd->se_tfo->check_release_cmd)
+                if (cmd->se_tfo->check_release_cmd(cmd) != 0)
+                        return;
        cmd->se_tfo->release_cmd(cmd);
 }
 EXPORT_SYMBOL(transport_release_cmd);
@@ -3976,6 +3988,114 @@ void transport_generic_free_cmd(struct se_cmd *cmd, int wait_for_tasks)
 }
 EXPORT_SYMBOL(transport_generic_free_cmd);
+/* target_get_sess_cmd - Add command to active ->sess_cmd_list
+ * @se_sess:    session to reference
+ * @se_cmd:     command descriptor to add
+ */
+void target_get_sess_cmd(struct se_session *se_sess, struct se_cmd *se_cmd)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&se_sess->sess_cmd_lock, flags);
+        list_add_tail(&se_cmd->se_cmd_list, &se_sess->sess_cmd_list);
+        se_cmd->check_release = 1;
+        spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags);
+}
+EXPORT_SYMBOL(target_get_sess_cmd);
+/* target_put_sess_cmd - Check for active I/O shutdown or list delete
+ * @se_sess:    session to reference
+ * @se_cmd:     command descriptor to drop
+ */
+int target_put_sess_cmd(struct se_session *se_sess, struct se_cmd *se_cmd)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&se_sess->sess_cmd_lock, flags);
+        if (list_empty(&se_cmd->se_cmd_list)) {
+                spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags);
+                WARN_ON(1);
+                return 0;
+        }
+        if (se_sess->sess_tearing_down && se_cmd->cmd_wait_set) {
+                spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags);
+                complete(&se_cmd->cmd_wait_comp);
+                return 1;
+        }
+        list_del(&se_cmd->se_cmd_list);
+        spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags);
+        return 0;
+}
+EXPORT_SYMBOL(target_put_sess_cmd);
+/* target_splice_sess_cmd_list - Split active cmds into sess_wait_list
+ * @se_sess:    session to split
+ */
+void target_splice_sess_cmd_list(struct se_session *se_sess)
+{
+        struct se_cmd *se_cmd;
+        unsigned long flags;
+        WARN_ON(!list_empty(&se_sess->sess_wait_list));
+        INIT_LIST_HEAD(&se_sess->sess_wait_list);
+        spin_lock_irqsave(&se_sess->sess_cmd_lock, flags);
+        se_sess->sess_tearing_down = 1;
+        list_splice_init(&se_sess->sess_cmd_list, &se_sess->sess_wait_list);
+        list_for_each_entry(se_cmd, &se_sess->sess_wait_list, se_cmd_list)
+                se_cmd->cmd_wait_set = 1;
+        spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags);
+}
+EXPORT_SYMBOL(target_splice_sess_cmd_list);
+/* target_wait_for_sess_cmds - Wait for outstanding descriptors
+ * @se_sess:    session to wait for active I/O
+ * @wait_for_tasks:     Make extra transport_wait_for_tasks call
+ */
+void target_wait_for_sess_cmds(
+        struct se_session *se_sess,
+        int wait_for_tasks)
+{
+        struct se_cmd *se_cmd, *tmp_cmd;
+        bool rc = false;
+        list_for_each_entry_safe(se_cmd, tmp_cmd,
+                                &se_sess->sess_wait_list, se_cmd_list) {
+                list_del(&se_cmd->se_cmd_list);
+                pr_debug("Waiting for se_cmd: %p t_state: %d, fabric state:"
+                        " %d\n", se_cmd, se_cmd->t_state,
+                        se_cmd->se_tfo->get_cmd_state(se_cmd));
+                if (wait_for_tasks) {
+                        pr_debug("Calling transport_wait_for_tasks se_cmd: %p t_state: %d,"
+                                " fabric state: %d\n", se_cmd, se_cmd->t_state,
+                                se_cmd->se_tfo->get_cmd_state(se_cmd));
+                        rc = transport_wait_for_tasks(se_cmd);
+                        pr_debug("After transport_wait_for_tasks se_cmd: %p t_state: %d,"
+                                " fabric state: %d\n", se_cmd, se_cmd->t_state,
+                                se_cmd->se_tfo->get_cmd_state(se_cmd));
+                }
+                if (!rc) {
+                        wait_for_completion(&se_cmd->cmd_wait_comp);
+                        pr_debug("After cmd_wait_comp: se_cmd: %p t_state: %d"
+                                " fabric state: %d\n", se_cmd, se_cmd->t_state,
+                                se_cmd->se_tfo->get_cmd_state(se_cmd));
+                }
+                se_cmd->se_tfo->release_cmd(se_cmd);
+        }
+}
+EXPORT_SYMBOL(target_wait_for_sess_cmds);
 /*      transport_lun_wait_for_tasks():
 *
 *      Called from ConfigFS context to stop the passed struct se_cmd to allow
@@ -4152,14 +4272,14 @@ int transport_clear_lun_from_sessions(struct se_lun *lun)
 * Called from frontend fabric context to wait for storage engine
 * to pause and/or release frontend generated struct se_cmd.
 */
-void transport_wait_for_tasks(struct se_cmd *cmd)
+bool transport_wait_for_tasks(struct se_cmd *cmd)
 {
        unsigned long flags;
        spin_lock_irqsave(&cmd->t_state_lock, flags);
        if (!(cmd->se_cmd_flags & SCF_SE_LUN_CMD) && !(cmd->se_tmr_req)) {
                spin_unlock_irqrestore(&cmd->t_state_lock, flags);
-                return;
+                return false;
        }
        /*
         * Only perform a possible wait_for_tasks if SCF_SUPPORTED_SAM_OPCODE
@@ -4167,7 +4287,7 @@ void transport_wait_for_tasks(struct se_cmd *cmd)
         */
        if (!(cmd->se_cmd_flags & SCF_SUPPORTED_SAM_OPCODE) && !cmd->se_tmr_req) {
                spin_unlock_irqrestore(&cmd->t_state_lock, flags);
-                return;
+                return false;
        }
        /*
         * If we are already stopped due to an external event (ie: LUN shutdown)
@@ -4210,7 +4330,7 @@ void transport_wait_for_tasks(struct se_cmd *cmd)
        if (!atomic_read(&cmd->t_transport_active) ||
             atomic_read(&cmd->t_transport_aborted)) {
                spin_unlock_irqrestore(&cmd->t_state_lock, flags);
-                return;
+                return false;
        }
        atomic_set(&cmd->t_transport_stop, 1);
@@ -4235,6 +4355,8 @@ void transport_wait_for_tasks(struct se_cmd *cmd)
                cmd->se_tfo->get_task_tag(cmd));
        spin_unlock_irqrestore(&cmd->t_state_lock, flags);
+        return true;
 }
 EXPORT_SYMBOL(transport_wait_for_tasks);
@@ -4583,9 +4705,7 @@ get_cmd:
                                break;
                        }
                        ret = transport_generic_new_cmd(cmd);
-                        if (ret == -EAGAIN)
+                        if (ret < 0) {
-                                break;
-                        else if (ret < 0) {
                                cmd->transport_error_status = ret;
                                transport_generic_request_failure(cmd,
                                        0, (cmd->data_direction !=
@@ -4595,9 +4715,6 @@ get_cmd:
                case TRANSPORT_PROCESS_WRITE:
                        transport_generic_process_write(cmd);
                        break;
-                case TRANSPORT_FREE_CMD_INTR:
-                        transport_generic_free_cmd(cmd, 0);
-                        break;
                case TRANSPORT_PROCESS_TMR:
                        transport_generic_do_tmr(cmd);
                        break;
diff --git a/drivers/target/tcm_fc/tcm_fc.h b/drivers/target/tcm_fc/tcm_fc.h
index 3749d8b4b423..e05c55100ec6 100644
--- a/drivers/target/tcm_fc/tcm_fc.h
+++ b/drivers/target/tcm_fc/tcm_fc.h
@@ -156,7 +156,7 @@ int ft_lport_notify(struct notifier_block *, unsigned long, void *);
 /*
 * IO methods.
 */
-void ft_check_stop_free(struct se_cmd *);
+int ft_check_stop_free(struct se_cmd *);
 void ft_release_cmd(struct se_cmd *);
 int ft_queue_status(struct se_cmd *);
 int ft_queue_data_in(struct se_cmd *);
diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c
index 6195026cc7b0..4fac37c4c615 100644
--- a/drivers/target/tcm_fc/tfc_cmd.c
+++ b/drivers/target/tcm_fc/tfc_cmd.c
@@ -112,9 +112,10 @@ void ft_release_cmd(struct se_cmd *se_cmd)
        ft_free_cmd(cmd);
 }
-void ft_check_stop_free(struct se_cmd *se_cmd)
+int ft_check_stop_free(struct se_cmd *se_cmd)
 {
        transport_generic_free_cmd(se_cmd, 0);
+        return 1;
 }
 /*
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
index 8816f53e004d..b3d17416d86a 100644
--- a/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@ -1,6 +1,6 @@
 config VT
        bool "Virtual terminal" if EXPERT
-        depends on !S390
+        depends on !S390 && !UML
        select INPUT
        default y
        ---help---
diff --git a/drivers/tty/hvc/Kconfig b/drivers/tty/hvc/Kconfig
index e371753ba921..4222035acfb7 100644
--- a/drivers/tty/hvc/Kconfig
+++ b/drivers/tty/hvc/Kconfig
@@ -34,6 +34,15 @@ config HVC_ISERIES
        help
          iSeries machines support a hypervisor virtual console.
+config HVC_OPAL
+        bool "OPAL Console support"
+        depends on PPC_POWERNV
+        select HVC_DRIVER
+        select HVC_IRQ
+        default y
+        help
+          PowerNV machines running under OPAL need that driver to get a console
 config HVC_RTAS
        bool "IBM RTAS Console support"
        depends on PPC_RTAS
diff --git a/drivers/tty/hvc/Makefile b/drivers/tty/hvc/Makefile
index e29205316376..89abf40bc73d 100644
--- a/drivers/tty/hvc/Makefile
+++ b/drivers/tty/hvc/Makefile
@@ -1,4 +1,5 @@
 obj-$(CONFIG_HVC_CONSOLE)       += hvc_vio.o hvsi_lib.o
+obj-$(CONFIG_HVC_OPAL)          += hvc_opal.o hvsi_lib.o
 obj-$(CONFIG_HVC_OLD_HVSI)      += hvsi.o
 obj-$(CONFIG_HVC_ISERIES)       += hvc_iseries.o
 obj-$(CONFIG_HVC_RTAS)          += hvc_rtas.o
diff --git a/drivers/tty/hvc/hvc_iseries.c b/drivers/tty/hvc/hvc_iseries.c
index 21c54955084e..3f4a897bf4d7 100644
--- a/drivers/tty/hvc/hvc_iseries.c
+++ b/drivers/tty/hvc/hvc_iseries.c
@@ -23,6 +23,7 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/console.h>
diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c
new file mode 100644
index 000000000000..7b38512d6c41
--- /dev/null
+++ b/drivers/tty/hvc/hvc_opal.c
@@ -0,0 +1,424 @@
+/*
+ * opal driver interface to hvc_console.c
+ *
+ * Copyright 2011 Benjamin Herrenschmidt <benh@kernel.crashing.org>, IBM Corp.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; 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
+ *
+ */
+#undef DEBUG
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/console.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <asm/hvconsole.h>
+#include <asm/prom.h>
+#include <asm/firmware.h>
+#include <asm/hvsi.h>
+#include <asm/udbg.h>
+#include <asm/opal.h>
+#include "hvc_console.h"
+static const char hvc_opal_name[] = "hvc_opal";
+static struct of_device_id hvc_opal_match[] __devinitdata = {
+        { .name = "serial", .compatible = "ibm,opal-console-raw" },
+        { .name = "serial", .compatible = "ibm,opal-console-hvsi" },
+        { },
+};
+typedef enum hv_protocol {
+        HV_PROTOCOL_RAW,
+        HV_PROTOCOL_HVSI
+} hv_protocol_t;
+struct hvc_opal_priv {
+        hv_protocol_t           proto;  /* Raw data or HVSI packets */
+        struct hvsi_priv        hvsi;   /* HVSI specific data */
+};
+static struct hvc_opal_priv *hvc_opal_privs[MAX_NR_HVC_CONSOLES];
+/* For early boot console */
+static struct hvc_opal_priv hvc_opal_boot_priv;
+static u32 hvc_opal_boot_termno;
+static const struct hv_ops hvc_opal_raw_ops = {
+        .get_chars = opal_get_chars,
+        .put_chars = opal_put_chars,
+        .notifier_add = notifier_add_irq,
+        .notifier_del = notifier_del_irq,
+        .notifier_hangup = notifier_hangup_irq,
+};
+static int hvc_opal_hvsi_get_chars(uint32_t vtermno, char *buf, int count)
+{
+        struct hvc_opal_priv *pv = hvc_opal_privs[vtermno];
+        if (WARN_ON(!pv))
+                return -ENODEV;
+        return hvsilib_get_chars(&pv->hvsi, buf, count);
+}
+static int hvc_opal_hvsi_put_chars(uint32_t vtermno, const char *buf, int count)
+{
+        struct hvc_opal_priv *pv = hvc_opal_privs[vtermno];
+        if (WARN_ON(!pv))
+                return -ENODEV;
+        return hvsilib_put_chars(&pv->hvsi, buf, count);
+}
+static int hvc_opal_hvsi_open(struct hvc_struct *hp, int data)
+{
+        struct hvc_opal_priv *pv = hvc_opal_privs[hp->vtermno];
+        int rc;
+        pr_devel("HVSI@%x: do open !\n", hp->vtermno);
+        rc = notifier_add_irq(hp, data);
+        if (rc)
+                return rc;
+        return hvsilib_open(&pv->hvsi, hp);
+}
+static void hvc_opal_hvsi_close(struct hvc_struct *hp, int data)
+{
+        struct hvc_opal_priv *pv = hvc_opal_privs[hp->vtermno];
+        pr_devel("HVSI@%x: do close !\n", hp->vtermno);
+        hvsilib_close(&pv->hvsi, hp);
+        notifier_del_irq(hp, data);
+}
+void hvc_opal_hvsi_hangup(struct hvc_struct *hp, int data)
+{
+        struct hvc_opal_priv *pv = hvc_opal_privs[hp->vtermno];
+        pr_devel("HVSI@%x: do hangup !\n", hp->vtermno);
+        hvsilib_close(&pv->hvsi, hp);
+        notifier_hangup_irq(hp, data);
+}
+static int hvc_opal_hvsi_tiocmget(struct hvc_struct *hp)
+{
+        struct hvc_opal_priv *pv = hvc_opal_privs[hp->vtermno];
+        if (!pv)
+                return -EINVAL;
+        return pv->hvsi.mctrl;
+}
+static int hvc_opal_hvsi_tiocmset(struct hvc_struct *hp, unsigned int set,
+                                unsigned int clear)
+{
+        struct hvc_opal_priv *pv = hvc_opal_privs[hp->vtermno];
+        pr_devel("HVSI@%x: Set modem control, set=%x,clr=%x\n",
+                 hp->vtermno, set, clear);
+        if (set & TIOCM_DTR)
+                hvsilib_write_mctrl(&pv->hvsi, 1);
+        else if (clear & TIOCM_DTR)
+                hvsilib_write_mctrl(&pv->hvsi, 0);
+        return 0;
+}
+static const struct hv_ops hvc_opal_hvsi_ops = {
+        .get_chars = hvc_opal_hvsi_get_chars,
+        .put_chars = hvc_opal_hvsi_put_chars,
+        .notifier_add = hvc_opal_hvsi_open,
+        .notifier_del = hvc_opal_hvsi_close,
+        .notifier_hangup = hvc_opal_hvsi_hangup,
+        .tiocmget = hvc_opal_hvsi_tiocmget,
+        .tiocmset = hvc_opal_hvsi_tiocmset,
+};
+static int __devinit hvc_opal_probe(struct platform_device *dev)
+{
+        const struct hv_ops *ops;
+        struct hvc_struct *hp;
+        struct hvc_opal_priv *pv;
+        hv_protocol_t proto;
+        unsigned int termno, boot = 0;
+        const __be32 *reg;
+        if (of_device_is_compatible(dev->dev.of_node, "ibm,opal-console-raw")) {
+                proto = HV_PROTOCOL_RAW;
+                ops = &hvc_opal_raw_ops;
+        } else if (of_device_is_compatible(dev->dev.of_node,
+                                           "ibm,opal-console-hvsi")) {
+                proto = HV_PROTOCOL_HVSI;
+                ops = &hvc_opal_hvsi_ops;
+        } else {
+                pr_err("hvc_opal: Unkown protocol for %s\n",
+                       dev->dev.of_node->full_name);
+                return -ENXIO;
+        }
+        reg = of_get_property(dev->dev.of_node, "reg", NULL);
+        termno = reg ? be32_to_cpup(reg) : 0;
+        /* Is it our boot one ? */
+        if (hvc_opal_privs[termno] == &hvc_opal_boot_priv) {
+                pv = hvc_opal_privs[termno];
+                boot = 1;
+        } else if (hvc_opal_privs[termno] == NULL) {
+                pv = kzalloc(sizeof(struct hvc_opal_priv), GFP_KERNEL);
+                if (!pv)
+                        return -ENOMEM;
+                pv->proto = proto;
+                hvc_opal_privs[termno] = pv;
+                if (proto == HV_PROTOCOL_HVSI)
+                        hvsilib_init(&pv->hvsi, opal_get_chars, opal_put_chars,
+                                     termno, 0);
+                /* Instanciate now to establish a mapping index==vtermno */
+                hvc_instantiate(termno, termno, ops);
+        } else {
+                pr_err("hvc_opal: Device %s has duplicate terminal number #%d\n",
+                       dev->dev.of_node->full_name, termno);
+                return -ENXIO;
+        }
+        pr_info("hvc%d: %s protocol on %s%s\n", termno,
+                proto == HV_PROTOCOL_RAW ? "raw" : "hvsi",
+                dev->dev.of_node->full_name,
+                boot ? " (boot console)" : "");
+        /* We don't do IRQ yet */
+        hp = hvc_alloc(termno, 0, ops, MAX_VIO_PUT_CHARS);
+        if (IS_ERR(hp))
+                return PTR_ERR(hp);
+        dev_set_drvdata(&dev->dev, hp);
+        return 0;
+}
+static int __devexit hvc_opal_remove(struct platform_device *dev)
+{
+        struct hvc_struct *hp = dev_get_drvdata(&dev->dev);
+        int rc, termno;
+        termno = hp->vtermno;
+        rc = hvc_remove(hp);
+        if (rc == 0) {
+                if (hvc_opal_privs[termno] != &hvc_opal_boot_priv)
+                        kfree(hvc_opal_privs[termno]);
+                hvc_opal_privs[termno] = NULL;
+        }
+        return rc;
+}
+static struct platform_driver hvc_opal_driver = {
+        .probe          = hvc_opal_probe,
+        .remove         = __devexit_p(hvc_opal_remove),
+        .driver         = {
+                .name   = hvc_opal_name,
+                .owner  = THIS_MODULE,
+                .of_match_table = hvc_opal_match,
+        }
+};
+static int __init hvc_opal_init(void)
+{
+        if (!firmware_has_feature(FW_FEATURE_OPAL))
+                return -ENODEV;
+        /* Register as a vio device to receive callbacks */
+        return platform_driver_register(&hvc_opal_driver);
+}
+module_init(hvc_opal_init);
+static void __exit hvc_opal_exit(void)
+{
+        platform_driver_unregister(&hvc_opal_driver);
+}
+module_exit(hvc_opal_exit);
+static void udbg_opal_putc(char c)
+{
+        unsigned int termno = hvc_opal_boot_termno;
+        int count = -1;
+        if (c == '\n')
+                udbg_opal_putc('\r');
+        do {
+                switch(hvc_opal_boot_priv.proto) {
+                case HV_PROTOCOL_RAW:
+                        count = opal_put_chars(termno, &c, 1);
+                        break;
+                case HV_PROTOCOL_HVSI:
+                        count = hvc_opal_hvsi_put_chars(termno, &c, 1);
+                        break;
+                }
+        } while(count == 0 || count == -EAGAIN);
+}
+static int udbg_opal_getc_poll(void)
+{
+        unsigned int termno = hvc_opal_boot_termno;
+        int rc = 0;
+        char c;
+        switch(hvc_opal_boot_priv.proto) {
+        case HV_PROTOCOL_RAW:
+                rc = opal_get_chars(termno, &c, 1);
+                break;
+        case HV_PROTOCOL_HVSI:
+                rc = hvc_opal_hvsi_get_chars(termno, &c, 1);
+                break;
+        }
+        if (!rc)
+                return -1;
+        return c;
+}
+static int udbg_opal_getc(void)
+{
+        int ch;
+        for (;;) {
+                ch = udbg_opal_getc_poll();
+                if (ch == -1) {
+                        /* This shouldn't be needed...but... */
+                        volatile unsigned long delay;
+                        for (delay=0; delay < 2000000; delay++)
+                                ;
+                } else {
+                        return ch;
+                }
+        }
+}
+static void udbg_init_opal_common(void)
+{
+        udbg_putc = udbg_opal_putc;
+        udbg_getc = udbg_opal_getc;
+        udbg_getc_poll = udbg_opal_getc_poll;
+        tb_ticks_per_usec = 0x200; /* Make udelay not suck */
+}
+void __init hvc_opal_init_early(void)
+{
+        struct device_node *stdout_node = NULL;
+        const u32 *termno;
+        const char *name = NULL;
+        const struct hv_ops *ops;
+        u32 index;
+        /* find the boot console from /chosen/stdout */
+        if (of_chosen)
+                name = of_get_property(of_chosen, "linux,stdout-path", NULL);
+        if (name) {
+                stdout_node = of_find_node_by_path(name);
+                if (!stdout_node) {
+                        pr_err("hvc_opal: Failed to locate default console!\n");
+                        return;
+                }
+        } else {
+                struct device_node *opal, *np;
+                /* Current OPAL takeover doesn't provide the stdout
+                 * path, so we hard wire it
+                 */
+                opal = of_find_node_by_path("/ibm,opal/consoles");
+                if (opal)
+                        pr_devel("hvc_opal: Found consoles in new location\n");
+                if (!opal) {
+                        opal = of_find_node_by_path("/ibm,opal");
+                        if (opal)
+                                pr_devel("hvc_opal: "
+                                         "Found consoles in old location\n");
+                }
+                if (!opal)
+                        return;
+                for_each_child_of_node(opal, np) {
+                        if (!strcmp(np->name, "serial")) {
+                                stdout_node = np;
+                                break;
+                        }
+                }
+                of_node_put(opal);
+        }
+        if (!stdout_node)
+                return;
+        termno = of_get_property(stdout_node, "reg", NULL);
+        index = termno ? *termno : 0;
+        if (index >= MAX_NR_HVC_CONSOLES)
+                return;
+        hvc_opal_privs[index] = &hvc_opal_boot_priv;
+        /* Check the protocol */
+        if (of_device_is_compatible(stdout_node, "ibm,opal-console-raw")) {
+                hvc_opal_boot_priv.proto = HV_PROTOCOL_RAW;
+                ops = &hvc_opal_raw_ops;
+                pr_devel("hvc_opal: Found RAW console\n");
+        }
+        else if (of_device_is_compatible(stdout_node,"ibm,opal-console-hvsi")) {
+                hvc_opal_boot_priv.proto = HV_PROTOCOL_HVSI;
+                ops = &hvc_opal_hvsi_ops;
+                hvsilib_init(&hvc_opal_boot_priv.hvsi, opal_get_chars,
+                             opal_put_chars, index, 1);
+                /* HVSI, perform the handshake now */
+                hvsilib_establish(&hvc_opal_boot_priv.hvsi);
+                pr_devel("hvc_opal: Found HVSI console\n");
+        } else
+                goto out;
+        hvc_opal_boot_termno = index;
+        udbg_init_opal_common();
+        add_preferred_console("hvc", index, NULL);
+        hvc_instantiate(index, index, ops);
+out:
+        of_node_put(stdout_node);
+}
+#ifdef CONFIG_PPC_EARLY_DEBUG_OPAL_RAW
+void __init udbg_init_debug_opal(void)
+{
+        u32 index = CONFIG_PPC_EARLY_DEBUG_OPAL_VTERMNO;
+        hvc_opal_privs[index] = &hvc_opal_boot_priv;
+        hvc_opal_boot_priv.proto = HV_PROTOCOL_RAW;
+        hvc_opal_boot_termno = index;
+        udbg_init_opal_common();
+}
+#endif /* CONFIG_PPC_EARLY_DEBUG_OPAL_RAW */
+#ifdef CONFIG_PPC_EARLY_DEBUG_OPAL_HVSI
+void __init udbg_init_debug_opal_hvsi(void)
+{
+        u32 index = CONFIG_PPC_EARLY_DEBUG_OPAL_VTERMNO;
+        hvc_opal_privs[index] = &hvc_opal_boot_priv;
+        hvc_opal_boot_termno = index;
+        udbg_init_opal_common();
+        hvsilib_init(&hvc_opal_boot_priv.hvsi, opal_get_chars, opal_put_chars,
+                     index, 1);
+        hvsilib_establish(&hvc_opal_boot_priv.hvsi);
+}
+#endif /* CONFIG_PPC_EARLY_DEBUG_OPAL_HVSI */
diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c
index 130aace67f31..fc3c3ad6c072 100644
--- a/drivers/tty/hvc/hvc_vio.c
+++ b/drivers/tty/hvc/hvc_vio.c
@@ -41,6 +41,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/console.h>
+#include <linux/module.h>
 #include <asm/hvconsole.h>
 #include <asm/vio.h>
diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
index 55882b5930a6..b9040bec36bd 100644
--- a/drivers/tty/hvc/hvcs.c
+++ b/drivers/tty/hvc/hvcs.c
@@ -1532,7 +1532,7 @@ static int __devinit hvcs_initialize(void)
                goto register_fail;
        }
-        hvcs_pi_buff = kmalloc(PAGE_SIZE, GFP_KERNEL);
+        hvcs_pi_buff = (unsigned long *) __get_free_page(GFP_KERNEL);
        if (!hvcs_pi_buff) {
                rc = -ENOMEM;
                goto buff_alloc_fail;
@@ -1548,7 +1548,7 @@ static int __devinit hvcs_initialize(void)
        return 0;
 kthread_fail:
-        kfree(hvcs_pi_buff);
+        free_page((unsigned long)hvcs_pi_buff);
 buff_alloc_fail:
        tty_unregister_driver(hvcs_tty_driver);
 register_fail:
@@ -1597,7 +1597,7 @@ static void __exit hvcs_module_exit(void)
        kthread_stop(hvcs_task);
        spin_lock(&hvcs_pi_lock);
-        kfree(hvcs_pi_buff);
+        free_page((unsigned long)hvcs_pi_buff);
        hvcs_pi_buff = NULL;
        spin_unlock(&hvcs_pi_lock);
diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
index bd9b09827b24..6f4dd83d8695 100644
--- a/drivers/tty/hvc/hvsi_lib.c
+++ b/drivers/tty/hvc/hvsi_lib.c
@@ -183,7 +183,7 @@ int hvsilib_get_chars(struct hvsi_priv *pv, char *buf, int count)
        unsigned int tries, read = 0;
        if (WARN_ON(!pv))
-                return 0;
+                return -ENXIO;
        /* If we aren't open, don't do anything in order to avoid races
         * with connection establishment. The hvc core will call this
@@ -234,7 +234,7 @@ int hvsilib_put_chars(struct hvsi_priv *pv, const char *buf, int count)
        int rc, adjcount = min(count, HVSI_MAX_OUTGOING_DATA);
        if (WARN_ON(!pv))
-                return 0;
+                return -ENODEV;
        dp.hdr.type = VS_DATA_PACKET_HEADER;
        dp.hdr.len = adjcount + sizeof(struct hvsi_header);
diff --git a/drivers/tty/serial/8250.c b/drivers/tty/serial/8250.c
index a87a56cb5417..eeadf1b8e093 100644
--- a/drivers/tty/serial/8250.c
+++ b/drivers/tty/serial/8250.c
@@ -450,24 +450,6 @@ static void au_serial_out(struct uart_port *p, int offset, int value)
        __raw_writel(value, p->membase + offset);
 }
-static unsigned int tsi_serial_in(struct uart_port *p, int offset)
-{
-        unsigned int tmp;
-        offset = map_8250_in_reg(p, offset) << p->regshift;
-        if (offset == UART_IIR) {
-                tmp = readl(p->membase + (UART_IIR & ~3));
-                return (tmp >> 16) & 0xff; /* UART_IIR % 4 == 2 */
-        } else
-                return readb(p->membase + offset);
-}
-static void tsi_serial_out(struct uart_port *p, int offset, int value)
-{
-        offset = map_8250_out_reg(p, offset) << p->regshift;
-        if (!((offset == UART_IER) && (value & UART_IER_UUE)))
-                writeb(value, p->membase + offset);
-}
 static unsigned int io_serial_in(struct uart_port *p, int offset)
 {
        offset = map_8250_in_reg(p, offset) << p->regshift;
@@ -508,11 +490,6 @@ static void set_io_from_upio(struct uart_port *p)
                p->serial_out = au_serial_out;
                break;
-        case UPIO_TSI:
-                p->serial_in = tsi_serial_in;
-                p->serial_out = tsi_serial_out;
-                break;
        default:
                p->serial_in = io_serial_in;
                p->serial_out = io_serial_out;
diff --git a/drivers/tty/serial/jsm/jsm_driver.c b/drivers/tty/serial/jsm/jsm_driver.c
index 648b6a3efa32..7c867a046c97 100644
--- a/drivers/tty/serial/jsm/jsm_driver.c
+++ b/drivers/tty/serial/jsm/jsm_driver.c
@@ -24,7 +24,7 @@
 *
 *
 ***********************************************************************/
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
index 87e7e6c876d4..2b42a01a81c6 100644
--- a/drivers/tty/serial/kgdboc.c
+++ b/drivers/tty/serial/kgdboc.c
@@ -19,6 +19,7 @@
 #include <linux/console.h>
 #include <linux/vt_kern.h>
 #include <linux/input.h>
+#include <linux/module.h>
 #define MAX_CONFIG_LEN          40
diff --git a/drivers/tty/serial/max3100.c b/drivers/tty/serial/max3100.c
index 2af5aa5f3a80..8a6cc8c30b5a 100644
--- a/drivers/tty/serial/max3100.c
+++ b/drivers/tty/serial/max3100.c
@@ -43,6 +43,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/device.h>
+#include <linux/module.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/tty/serial/max3107-aava.c b/drivers/tty/serial/max3107-aava.c
index d73aadd7a9ad..90c40f22ec70 100644
--- a/drivers/tty/serial/max3107-aava.c
+++ b/drivers/tty/serial/max3107-aava.c
@@ -36,6 +36,7 @@
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/sfi.h>
+#include <linux/module.h>
 #include <asm/mrst.h>
 #include "max3107.h"
diff --git a/drivers/tty/serial/max3107.c b/drivers/tty/serial/max3107.c
index db00b595cab0..7827000db4f5 100644
--- a/drivers/tty/serial/max3107.c
+++ b/drivers/tty/serial/max3107.c
@@ -36,6 +36,7 @@
 #include <linux/gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/freezer.h>
+#include <linux/module.h>
 #include "max3107.h"
 static const struct baud_table brg26_ext[] = {
diff --git a/drivers/tty/serial/nwpserial.c b/drivers/tty/serial/nwpserial.c
index 9beaff1cec24..dd4c31d1aee5 100644
--- a/drivers/tty/serial/nwpserial.c
+++ b/drivers/tty/serial/nwpserial.c
@@ -10,6 +10,7 @@
 *
 */
 #include <linux/init.h>
+#include <linux/export.h>
 #include <linux/console.h>
 #include <linux/serial.h>
 #include <linux/serial_reg.h>
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 9871c57b348e..1945c70539c2 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1446,12 +1446,8 @@ static bool filter(struct dma_chan *chan, void *slave)
        dev_dbg(chan->device->dev, "%s: slave ID %d\n", __func__,
                param->slave_id);
-        if (param->dma_dev == chan->device->dev) {
+        chan->private = param;
-                chan->private = param;
+        return true;
-                return true;
-        } else {
-                return false;
-        }
 }
 static void rx_timer_fn(unsigned long arg)
@@ -1477,10 +1473,10 @@ static void sci_request_dma(struct uart_port *port)
        dma_cap_mask_t mask;
        int nent;
-        dev_dbg(port->dev, "%s: port %d DMA %p\n", __func__,
+        dev_dbg(port->dev, "%s: port %d\n", __func__,
-                port->line, s->cfg->dma_dev);
+                port->line);
-        if (!s->cfg->dma_dev)
+        if (s->cfg->dma_slave_tx <= 0 || s->cfg->dma_slave_rx <= 0)
                return;
        dma_cap_zero(mask);
@@ -1490,7 +1486,6 @@ static void sci_request_dma(struct uart_port *port)
        /* Slave ID, e.g., SHDMA_SLAVE_SCIF0_TX */
        param->slave_id = s->cfg->dma_slave_tx;
-        param->dma_dev = s->cfg->dma_dev;
        s->cookie_tx = -EINVAL;
        chan = dma_request_channel(mask, filter, param);
@@ -1519,7 +1514,6 @@ static void sci_request_dma(struct uart_port *port)
        /* Slave ID, e.g., SHDMA_SLAVE_SCIF0_RX */
        param->slave_id = s->cfg->dma_slave_rx;
-        param->dma_dev = s->cfg->dma_dev;
        chan = dma_request_channel(mask, filter, param);
        dev_dbg(port->dev, "%s: RX: got channel %p\n", __func__, chan);
@@ -1564,9 +1558,6 @@ static void sci_free_dma(struct uart_port *port)
 {
        struct sci_port *s = to_sci_port(port);
-        if (!s->cfg->dma_dev)
-                return;
        if (s->chan_tx)
                sci_tx_dma_release(s, false);
        if (s->chan_rx)
@@ -1981,9 +1972,9 @@ static int __devinit sci_init_single(struct platform_device *dev,
        port->serial_in         = sci_serial_in;
        port->serial_out        = sci_serial_out;
-        if (p->dma_dev)
+        if (p->dma_slave_tx > 0 && p->dma_slave_rx > 0)
-                dev_dbg(port->dev, "DMA device %p, tx %d, rx %d\n",
+                dev_dbg(port->dev, "DMA tx %d, rx %d\n",
-                        p->dma_dev, p->dma_slave_tx, p->dma_slave_rx);
+                        p->dma_slave_tx, p->dma_slave_rx);
        return 0;
 }
diff --git a/drivers/tty/serial/timbuart.c b/drivers/tty/serial/timbuart.c
index a4b63bfeaa2f..e76c8b747fb8 100644
--- a/drivers/tty/serial/timbuart.c
+++ b/drivers/tty/serial/timbuart.c
@@ -29,6 +29,7 @@
 #include <linux/platform_device.h>
 #include <linux/ioport.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include "timbuart.h"
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 8c03b127fd03..b627363352e5 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -20,6 +20,7 @@
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <linux/of.h>
+#include <linux/module.h>
 #define XUARTPS_TTY_NAME        "ttyPS"
 #define XUARTPS_NAME            "xuartps"
diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c
index 66825c9f516a..7a367ff5122b 100644
--- a/drivers/tty/vt/vc_screen.c
+++ b/drivers/tty/vt/vc_screen.c
@@ -22,6 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/major.h>
 #include <linux/errno.h>
+#include <linux/export.h>
 #include <linux/tty.h>
 #include <linux/interrupt.h>
 #include <linux/mm.h>
diff --git a/drivers/uio/uio_pdrv.c b/drivers/uio/uio_pdrv.c
index bdc3db946122..ff5059517351 100644
--- a/drivers/uio/uio_pdrv.c
+++ b/drivers/uio/uio_pdrv.c
@@ -11,6 +11,7 @@
 #include <linux/platform_device.h>
 #include <linux/uio_driver.h>
 #include <linux/stringify.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #define DRIVER_NAME "uio_pdrv"
diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
index 0b2ed71e3bfa..25de302009a1 100644
--- a/drivers/uio/uio_pdrv_genirq.c
+++ b/drivers/uio/uio_pdrv_genirq.c
@@ -18,6 +18,7 @@
 #include <linux/uio_driver.h>
 #include <linux/spinlock.h>
 #include <linux/bitops.h>
+#include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/stringify.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 4ac2750491de..791f11bed606 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -62,7 +62,6 @@ config USB_ARCH_HAS_EHCI
        boolean
        default y if FSL_SOC
        default y if PPC_MPC512x
-        default y if SOC_AU1200
        default y if ARCH_IXP4XX
        default y if ARCH_W90X900
        default y if ARCH_AT91SAM9G45
diff --git a/drivers/usb/c67x00/c67x00-drv.c b/drivers/usb/c67x00/c67x00-drv.c
index 62050f7a4f97..57ae44cd0b88 100644
--- a/drivers/usb/c67x00/c67x00-drv.c
+++ b/drivers/usb/c67x00/c67x00-drv.c
@@ -38,6 +38,7 @@
 #include <linux/io.h>
 #include <linux/list.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <linux/usb.h>
 #include <linux/usb/c67x00.h>
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 3b029a0a4787..45887a0ff873 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -24,6 +24,7 @@
 #include <linux/device.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <linux/usb.h>
 #include <linux/usb/quirks.h>
 #include <linux/usb/hcd.h>
@@ -1667,6 +1668,11 @@ int usb_runtime_suspend(struct device *dev)
                return -EAGAIN;
        status = usb_suspend_both(udev, PMSG_AUTO_SUSPEND);
+        /* Allow a retry if autosuspend failed temporarily */
+        if (status == -EAGAIN || status == -EBUSY)
+                usb_mark_last_busy(udev);
        /* The PM core reacts badly unless the return code is 0,
         * -EAGAIN, or -EBUSY, so always return -EBUSY on an error.
         */
diff --git a/drivers/usb/core/notify.c b/drivers/usb/core/notify.c
index 7542dce3f5a1..7728c91dfa2e 100644
--- a/drivers/usb/core/notify.c
+++ b/drivers/usb/core/notify.c
@@ -10,6 +10,7 @@
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/notifier.h>
 #include <linux/usb.h>
 #include <linux/mutex.h>
diff --git a/drivers/usb/gadget/cdc2.c b/drivers/usb/gadget/cdc2.c
index 672674c2fb3d..725550f06fab 100644
--- a/drivers/usb/gadget/cdc2.c
+++ b/drivers/usb/gadget/cdc2.c
@@ -12,6 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/utsname.h>
+#include <linux/module.h>
 #include "u_ether.h"
 #include "u_serial.h"
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 8a5529d214fb..f71b0787983f 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -14,6 +14,7 @@
 #include <linux/kallsyms.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <linux/device.h>
 #include <linux/utsname.h>
diff --git a/drivers/usb/gadget/dbgp.c b/drivers/usb/gadget/dbgp.c
index f855ecf7a637..6256420089f3 100644
--- a/drivers/usb/gadget/dbgp.c
+++ b/drivers/usb/gadget/dbgp.c
@@ -9,6 +9,7 @@
 /* verbose messages */
 #include <linux/kernel.h>
 #include <linux/device.h>
+#include <linux/module.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index 6b1c20b6c9b2..acb38004eec0 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -20,6 +20,7 @@
 #include <linux/blkdev.h>
 #include <linux/pagemap.h>
+#include <linux/export.h>
 #include <asm/unaligned.h>
 #include <linux/usb/composite.h>
diff --git a/drivers/usb/gadget/f_obex.c b/drivers/usb/gadget/f_obex.c
index e3f74bf5da2d..5f400f66aa9b 100644
--- a/drivers/usb/gadget/f_obex.c
+++ b/drivers/usb/gadget/f_obex.c
@@ -17,6 +17,7 @@
 #include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/device.h>
+#include <linux/module.h>
 #include "u_serial.h"
 #include "gadget_chips.h"
diff --git a/drivers/usb/gadget/f_sourcesink.c b/drivers/usb/gadget/f_sourcesink.c
index 168906d2b5d4..7aa7ac82c02c 100644
--- a/drivers/usb/gadget/f_sourcesink.c
+++ b/drivers/usb/gadget/f_sourcesink.c
@@ -15,6 +15,7 @@
 #include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/device.h>
+#include <linux/module.h>
 #include "g_zero.h"
 #include "gadget_chips.h"
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index 3ac4f51cd0bb..f7e39b0365ce 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -243,6 +243,7 @@
 #include <linux/kref.h>
 #include <linux/kthread.h>
 #include <linux/limits.h>
+#include <linux/module.h>
 #include <linux/rwsem.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
diff --git a/drivers/usb/gadget/fusb300_udc.c b/drivers/usb/gadget/fusb300_udc.c
index e593f2849fa9..74da206c8406 100644
--- a/drivers/usb/gadget/fusb300_udc.c
+++ b/drivers/usb/gadget/fusb300_udc.c
@@ -13,6 +13,7 @@
 #include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index 8fcde37aa6d4..681bd038b1d8 100644
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -23,6 +23,7 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/utsname.h>
+#include <linux/module.h>
 #include <linux/device.h>
 #include <sound/core.h>
diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
index 3a4a664bab44..6597a6813e43 100644
--- a/drivers/usb/gadget/u_serial.c
+++ b/drivers/usb/gadget/u_serial.c
@@ -25,6 +25,7 @@
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "u_serial.h"
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index ed48a5d79e16..7ca290fcb070 100644
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -36,3 +36,4 @@ obj-$(CONFIG_USB_HWA_HCD)	+= hwa-hc.o
 obj-$(CONFIG_USB_IMX21_HCD)     += imx21-hcd.o
 obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o
 obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o
+obj-$(CONFIG_MIPS_ALCHEMY)      += alchemy-common.o
diff --git a/drivers/usb/host/alchemy-common.c b/drivers/usb/host/alchemy-common.c
new file mode 100644
index 000000000000..b4192c964d0d
--- /dev/null
+++ b/drivers/usb/host/alchemy-common.c
@@ -0,0 +1,337 @@
+/*
+ * USB block power/access management abstraction.
+ *
+ * Au1000+: The OHCI block control register is at the far end of the OHCI memory
+ *          area. Au1550 has OHCI on different base address. No need to handle
+ *          UDC here.
+ * Au1200:  one register to control access and clocks to O/EHCI, UDC and OTG
+ *          as well as the PHY for EHCI and UDC.
+ *
+ */
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/spinlock.h>
+#include <linux/syscore_ops.h>
+#include <asm/mach-au1x00/au1000.h>
+/* control register offsets */
+#define AU1000_OHCICFG  0x7fffc
+#define AU1550_OHCICFG  0x07ffc
+#define AU1200_USBCFG   0x04
+/* Au1000 USB block config bits */
+#define USBHEN_RD       (1 << 4)                /* OHCI reset-done indicator */
+#define USBHEN_CE       (1 << 3)                /* OHCI block clock enable */
+#define USBHEN_E        (1 << 2)                /* OHCI block enable */
+#define USBHEN_C        (1 << 1)                /* OHCI block coherency bit */
+#define USBHEN_BE       (1 << 0)                /* OHCI Big-Endian */
+/* Au1200 USB config bits */
+#define USBCFG_PFEN     (1 << 31)               /* prefetch enable (undoc) */
+#define USBCFG_RDCOMB   (1 << 30)               /* read combining (undoc) */
+#define USBCFG_UNKNOWN  (5 << 20)               /* unknown, leave this way */
+#define USBCFG_SSD      (1 << 23)               /* serial short detect en */
+#define USBCFG_PPE      (1 << 19)               /* HS PHY PLL */
+#define USBCFG_UCE      (1 << 18)               /* UDC clock enable */
+#define USBCFG_ECE      (1 << 17)               /* EHCI clock enable */
+#define USBCFG_OCE      (1 << 16)               /* OHCI clock enable */
+#define USBCFG_FLA(x)   (((x) & 0x3f) << 8)
+#define USBCFG_UCAM     (1 << 7)                /* coherent access (undoc) */
+#define USBCFG_GME      (1 << 6)                /* OTG mem access */
+#define USBCFG_DBE      (1 << 5)                /* UDC busmaster enable */
+#define USBCFG_DME      (1 << 4)                /* UDC mem enable */
+#define USBCFG_EBE      (1 << 3)                /* EHCI busmaster enable */
+#define USBCFG_EME      (1 << 2)                /* EHCI mem enable */
+#define USBCFG_OBE      (1 << 1)                /* OHCI busmaster enable */
+#define USBCFG_OME      (1 << 0)                /* OHCI mem enable */
+#define USBCFG_INIT_AU1200      (USBCFG_PFEN | USBCFG_RDCOMB | USBCFG_UNKNOWN |\
+                                 USBCFG_SSD | USBCFG_FLA(0x20) | USBCFG_UCAM | \
+                                 USBCFG_GME | USBCFG_DBE | USBCFG_DME |        \
+                                 USBCFG_EBE | USBCFG_EME | USBCFG_OBE |        \
+                                 USBCFG_OME)
+static DEFINE_SPINLOCK(alchemy_usb_lock);
+static inline void __au1200_ohci_control(void __iomem *base, int enable)
+{
+        unsigned long r = __raw_readl(base + AU1200_USBCFG);
+        if (enable) {
+                __raw_writel(r | USBCFG_OCE, base + AU1200_USBCFG);
+                wmb();
+                udelay(2000);
+        } else {
+                __raw_writel(r & ~USBCFG_OCE, base + AU1200_USBCFG);
+                wmb();
+                udelay(1000);
+        }
+}
+static inline void __au1200_ehci_control(void __iomem *base, int enable)
+{
+        unsigned long r = __raw_readl(base + AU1200_USBCFG);
+        if (enable) {
+                __raw_writel(r | USBCFG_ECE | USBCFG_PPE, base + AU1200_USBCFG);
+                wmb();
+                udelay(1000);
+        } else {
+                if (!(r & USBCFG_UCE))          /* UDC also off? */
+                        r &= ~USBCFG_PPE;       /* yes: disable HS PHY PLL */
+                __raw_writel(r & ~USBCFG_ECE, base + AU1200_USBCFG);
+                wmb();
+                udelay(1000);
+        }
+}
+static inline void __au1200_udc_control(void __iomem *base, int enable)
+{
+        unsigned long r = __raw_readl(base + AU1200_USBCFG);
+        if (enable) {
+                __raw_writel(r | USBCFG_UCE | USBCFG_PPE, base + AU1200_USBCFG);
+                wmb();
+        } else {
+                if (!(r & USBCFG_ECE))          /* EHCI also off? */
+                        r &= ~USBCFG_PPE;       /* yes: disable HS PHY PLL */
+                __raw_writel(r & ~USBCFG_UCE, base + AU1200_USBCFG);
+                wmb();
+        }
+}
+static inline int au1200_coherency_bug(void)
+{
+#if defined(CONFIG_DMA_COHERENT)
+        /* Au1200 AB USB does not support coherent memory */
+        if (!(read_c0_prid() & 0xff)) {
+                printk(KERN_INFO "Au1200 USB: this is chip revision AB !!\n");
+                printk(KERN_INFO "Au1200 USB: update your board or re-configure"
+                                 " the kernel\n");
+                return -ENODEV;
+        }
+#endif
+        return 0;
+}
+static inline int au1200_usb_control(int block, int enable)
+{
+        void __iomem *base =
+                        (void __iomem *)KSEG1ADDR(AU1200_USB_CTL_PHYS_ADDR);
+        int ret = 0;
+        switch (block) {
+        case ALCHEMY_USB_OHCI0:
+                ret = au1200_coherency_bug();
+                if (ret && enable)
+                        goto out;
+                __au1200_ohci_control(base, enable);
+                break;
+        case ALCHEMY_USB_UDC0:
+                __au1200_udc_control(base, enable);
+                break;
+        case ALCHEMY_USB_EHCI0:
+                ret = au1200_coherency_bug();
+                if (ret && enable)
+                        goto out;
+                __au1200_ehci_control(base, enable);
+                break;
+        default:
+                ret = -ENODEV;
+        }
+out:
+        return ret;
+}
+/* initialize USB block(s) to a known working state */
+static inline void au1200_usb_init(void)
+{
+        void __iomem *base =
+                        (void __iomem *)KSEG1ADDR(AU1200_USB_CTL_PHYS_ADDR);
+        __raw_writel(USBCFG_INIT_AU1200, base + AU1200_USBCFG);
+        wmb();
+        udelay(1000);
+}
+static inline void au1000_usb_init(unsigned long rb, int reg)
+{
+        void __iomem *base = (void __iomem *)KSEG1ADDR(rb + reg);
+        unsigned long r = __raw_readl(base);
+#if defined(__BIG_ENDIAN)
+        r |= USBHEN_BE;
+#endif
+        r |= USBHEN_C;
+        __raw_writel(r, base);
+        wmb();
+        udelay(1000);
+}
+static inline void __au1xx0_ohci_control(int enable, unsigned long rb, int creg)
+{
+        void __iomem *base = (void __iomem *)KSEG1ADDR(rb);
+        unsigned long r = __raw_readl(base + creg);
+        if (enable) {
+                __raw_writel(r | USBHEN_CE, base + creg);
+                wmb();
+                udelay(1000);
+                __raw_writel(r | USBHEN_CE | USBHEN_E, base + creg);
+                wmb();
+                udelay(1000);
+                /* wait for reset complete (read reg twice: au1500 erratum) */
+                while (__raw_readl(base + creg),
+                        !(__raw_readl(base + creg) & USBHEN_RD))
+                        udelay(1000);
+        } else {
+                __raw_writel(r & ~(USBHEN_CE | USBHEN_E), base + creg);
+                wmb();
+        }
+}
+static inline int au1000_usb_control(int block, int enable, unsigned long rb,
+                                     int creg)
+{
+        int ret = 0;
+        switch (block) {
+        case ALCHEMY_USB_OHCI0:
+                __au1xx0_ohci_control(enable, rb, creg);
+                break;
+        default:
+                ret = -ENODEV;
+        }
+        return ret;
+}
+/*
+ * alchemy_usb_control - control Alchemy on-chip USB blocks
+ * @block:      USB block to target
+ * @enable:     set 1 to enable a block, 0 to disable
+ */
+int alchemy_usb_control(int block, int enable)
+{
+        unsigned long flags;
+        int ret;
+        spin_lock_irqsave(&alchemy_usb_lock, flags);
+        switch (alchemy_get_cputype()) {
+        case ALCHEMY_CPU_AU1000:
+        case ALCHEMY_CPU_AU1500:
+        case ALCHEMY_CPU_AU1100:
+                ret = au1000_usb_control(block, enable,
+                                AU1000_USB_OHCI_PHYS_ADDR, AU1000_OHCICFG);
+                break;
+        case ALCHEMY_CPU_AU1550:
+                ret = au1000_usb_control(block, enable,
+                                AU1550_USB_OHCI_PHYS_ADDR, AU1550_OHCICFG);
+                break;
+        case ALCHEMY_CPU_AU1200:
+                ret = au1200_usb_control(block, enable);
+                break;
+        default:
+                ret = -ENODEV;
+        }
+        spin_unlock_irqrestore(&alchemy_usb_lock, flags);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(alchemy_usb_control);
+static unsigned long alchemy_usb_pmdata[2];
+static void au1000_usb_pm(unsigned long br, int creg, int susp)
+{
+        void __iomem *base = (void __iomem *)KSEG1ADDR(br);
+        if (susp) {
+                alchemy_usb_pmdata[0] = __raw_readl(base + creg);
+                /* There appears to be some undocumented reset register.... */
+                __raw_writel(0, base + 0x04);
+                wmb();
+                __raw_writel(0, base + creg);
+                wmb();
+        } else {
+                __raw_writel(alchemy_usb_pmdata[0], base + creg);
+                wmb();
+        }
+}
+static void au1200_usb_pm(int susp)
+{
+        void __iomem *base =
+                        (void __iomem *)KSEG1ADDR(AU1200_USB_OTG_PHYS_ADDR);
+        if (susp) {
+                /* save OTG_CAP/MUX registers which indicate port routing */
+                /* FIXME: write an OTG driver to do that */
+                alchemy_usb_pmdata[0] = __raw_readl(base + 0x00);
+                alchemy_usb_pmdata[1] = __raw_readl(base + 0x04);
+        } else {
+                /* restore access to all MMIO areas */
+                au1200_usb_init();
+                /* restore OTG_CAP/MUX registers */
+                __raw_writel(alchemy_usb_pmdata[0], base + 0x00);
+                __raw_writel(alchemy_usb_pmdata[1], base + 0x04);
+                wmb();
+        }
+}
+static void alchemy_usb_pm(int susp)
+{
+        switch (alchemy_get_cputype()) {
+        case ALCHEMY_CPU_AU1000:
+        case ALCHEMY_CPU_AU1500:
+        case ALCHEMY_CPU_AU1100:
+                au1000_usb_pm(AU1000_USB_OHCI_PHYS_ADDR, AU1000_OHCICFG, susp);
+                break;
+        case ALCHEMY_CPU_AU1550:
+                au1000_usb_pm(AU1550_USB_OHCI_PHYS_ADDR, AU1550_OHCICFG, susp);
+                break;
+        case ALCHEMY_CPU_AU1200:
+                au1200_usb_pm(susp);
+                break;
+        }
+}
+static int alchemy_usb_suspend(void)
+{
+        alchemy_usb_pm(1);
+        return 0;
+}
+static void alchemy_usb_resume(void)
+{
+        alchemy_usb_pm(0);
+}
+static struct syscore_ops alchemy_usb_pm_ops = {
+        .suspend        = alchemy_usb_suspend,
+        .resume         = alchemy_usb_resume,
+};
+static int __init alchemy_usb_init(void)
+{
+        switch (alchemy_get_cputype()) {
+        case ALCHEMY_CPU_AU1000:
+        case ALCHEMY_CPU_AU1500:
+        case ALCHEMY_CPU_AU1100:
+                au1000_usb_init(AU1000_USB_OHCI_PHYS_ADDR, AU1000_OHCICFG);
+                break;
+        case ALCHEMY_CPU_AU1550:
+                au1000_usb_init(AU1550_USB_OHCI_PHYS_ADDR, AU1550_OHCICFG);
+                break;
+        case ALCHEMY_CPU_AU1200:
+                au1200_usb_init();
+                break;
+        }
+        register_syscore_ops(&alchemy_usb_pm_ops);
+        return 0;
+}
+arch_initcall(alchemy_usb_init);
diff --git a/drivers/usb/host/ehci-au1xxx.c b/drivers/usb/host/ehci-au1xxx.c
index 65719e8d24e4..18bafa99fe57 100644
--- a/drivers/usb/host/ehci-au1xxx.c
+++ b/drivers/usb/host/ehci-au1xxx.c
@@ -14,61 +14,9 @@
 #include <linux/platform_device.h>
 #include <asm/mach-au1x00/au1000.h>
-#define USB_HOST_CONFIG   (USB_MSR_BASE + USB_MSR_MCFG)
-#define USB_MCFG_PFEN     (1<<31)
-#define USB_MCFG_RDCOMB   (1<<30)
-#define USB_MCFG_SSDEN    (1<<23)
-#define USB_MCFG_PHYPLLEN (1<<19)
-#define USB_MCFG_UCECLKEN (1<<18)
-#define USB_MCFG_EHCCLKEN (1<<17)
-#ifdef CONFIG_DMA_COHERENT
-#define USB_MCFG_UCAM     (1<<7)
-#else
-#define USB_MCFG_UCAM     (0)
-#endif
-#define USB_MCFG_EBMEN    (1<<3)
-#define USB_MCFG_EMEMEN   (1<<2)
-#define USBH_ENABLE_CE  (USB_MCFG_PHYPLLEN | USB_MCFG_EHCCLKEN)
-#define USBH_ENABLE_INIT (USB_MCFG_PFEN  | USB_MCFG_RDCOMB |    \
-                          USBH_ENABLE_CE | USB_MCFG_SSDEN  |    \
-                          USB_MCFG_UCAM  | USB_MCFG_EBMEN  |    \
-                          USB_MCFG_EMEMEN)
-#define USBH_DISABLE      (USB_MCFG_EBMEN | USB_MCFG_EMEMEN)
 extern int usb_disabled(void);
-static void au1xxx_start_ehc(void)
-{
-        /* enable clock to EHCI block and HS PHY PLL*/
-        au_writel(au_readl(USB_HOST_CONFIG) | USBH_ENABLE_CE, USB_HOST_CONFIG);
-        au_sync();
-        udelay(1000);
-        /* enable EHCI mmio */
-        au_writel(au_readl(USB_HOST_CONFIG) | USBH_ENABLE_INIT, USB_HOST_CONFIG);
-        au_sync();
-        udelay(1000);
-}
-static void au1xxx_stop_ehc(void)
-{
-        unsigned long c;
-        /* Disable mem */
-        au_writel(au_readl(USB_HOST_CONFIG) & ~USBH_DISABLE, USB_HOST_CONFIG);
-        au_sync();
-        udelay(1000);
-        /* Disable EHC clock. If the HS PHY is unused disable it too. */
-        c = au_readl(USB_HOST_CONFIG) & ~USB_MCFG_EHCCLKEN;
-        if (!(c & USB_MCFG_UCECLKEN))           /* UDC disabled? */
-                c &= ~USB_MCFG_PHYPLLEN;        /* yes: disable HS PHY PLL */
-        au_writel(c, USB_HOST_CONFIG);
-        au_sync();
-}
 static int au1xxx_ehci_setup(struct usb_hcd *hcd)
 {
        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
@@ -136,16 +84,6 @@ static int ehci_hcd_au1xxx_drv_probe(struct platform_device *pdev)
        if (usb_disabled())
                return -ENODEV;
-#if defined(CONFIG_SOC_AU1200) && defined(CONFIG_DMA_COHERENT)
-        /* Au1200 AB USB does not support coherent memory */
-        if (!(read_c0_prid() & 0xff)) {
-                printk(KERN_INFO "%s: this is chip revision AB!\n", pdev->name);
-                printk(KERN_INFO "%s: update your board or re-configure"
-                                 " the kernel\n", pdev->name);
-                return -ENODEV;
-        }
-#endif
        if (pdev->resource[1].flags != IORESOURCE_IRQ) {
                pr_debug("resource[1] is not IORESOURCE_IRQ");
                return -ENOMEM;
@@ -171,7 +109,11 @@ static int ehci_hcd_au1xxx_drv_probe(struct platform_device *pdev)
                goto err2;
        }
-        au1xxx_start_ehc();
+        if (alchemy_usb_control(ALCHEMY_USB_EHCI0, 1)) {
+                printk(KERN_INFO "%s: controller init failed!\n", pdev->name);
+                ret = -ENODEV;
+                goto err3;
+        }
        ehci = hcd_to_ehci(hcd);
        ehci->caps = hcd->regs;
@@ -187,7 +129,8 @@ static int ehci_hcd_au1xxx_drv_probe(struct platform_device *pdev)
                return ret;
        }
-        au1xxx_stop_ehc();
+        alchemy_usb_control(ALCHEMY_USB_EHCI0, 0);
+err3:
        iounmap(hcd->regs);
 err2:
        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
@@ -201,10 +144,10 @@ static int ehci_hcd_au1xxx_drv_remove(struct platform_device *pdev)
        struct usb_hcd *hcd = platform_get_drvdata(pdev);
        usb_remove_hcd(hcd);
+        alchemy_usb_control(ALCHEMY_USB_EHCI0, 0);
        iounmap(hcd->regs);
        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
        usb_put_hcd(hcd);
-        au1xxx_stop_ehc();
        platform_set_drvdata(pdev, NULL);
        return 0;
@@ -236,7 +179,7 @@ static int ehci_hcd_au1xxx_drv_suspend(struct device *dev)
        // could save FLADJ in case of Vaux power loss
        // ... we'd only use it to handle clock skew
-        au1xxx_stop_ehc();
+        alchemy_usb_control(ALCHEMY_USB_EHCI0, 0);
        return rc;
 }
@@ -246,7 +189,7 @@ static int ehci_hcd_au1xxx_drv_resume(struct device *dev)
        struct usb_hcd *hcd = dev_get_drvdata(dev);
        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-        au1xxx_start_ehc();
+        alchemy_usb_control(ALCHEMY_USB_EHCI0, 1);
        // maybe restore FLADJ
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 59e81615e09c..3ff9f82f7263 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1224,7 +1224,7 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER         ehci_hcd_sh_driver
 #endif
-#ifdef CONFIG_SOC_AU1200
+#ifdef CONFIG_MIPS_ALCHEMY
 #include "ehci-au1xxx.c"
 #define PLATFORM_DRIVER         ehci_hcd_au1xxx_driver
 #endif
diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c
index 79a66d622f9c..9037035ad1e4 100644
--- a/drivers/usb/host/fsl-mph-dr-of.c
+++ b/drivers/usb/host/fsl-mph-dr-of.c
@@ -16,6 +16,7 @@
 #include <linux/io.h>
 #include <linux/of_platform.h>
 #include <linux/clk.h>
+#include <linux/module.h>
 struct fsl_usb2_dev_data {
        char *dr_mode;          /* controller mode */
diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c
index 2c7fc830c9e4..a7dc1e1d45f2 100644
--- a/drivers/usb/host/isp1760-if.c
+++ b/drivers/usb/host/isp1760-if.c
@@ -11,6 +11,7 @@
 #include <linux/usb.h>
 #include <linux/io.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/usb/isp1760.h>
 #include <linux/usb/hcd.h>
diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c
index 6b7bc50dfeaa..9b66df8278f3 100644
--- a/drivers/usb/host/ohci-au1xxx.c
+++ b/drivers/usb/host/ohci-au1xxx.c
@@ -23,92 +23,9 @@
 #include <asm/mach-au1x00/au1000.h>
-#ifndef CONFIG_SOC_AU1200
-#define USBH_ENABLE_BE (1<<0)
-#define USBH_ENABLE_C  (1<<1)
-#define USBH_ENABLE_E  (1<<2)
-#define USBH_ENABLE_CE (1<<3)
-#define USBH_ENABLE_RD (1<<4)
-#ifdef __LITTLE_ENDIAN
-#define USBH_ENABLE_INIT (USBH_ENABLE_CE | USBH_ENABLE_E | USBH_ENABLE_C)
-#elif defined(__BIG_ENDIAN)
-#define USBH_ENABLE_INIT (USBH_ENABLE_CE | USBH_ENABLE_E | USBH_ENABLE_C | \
-                          USBH_ENABLE_BE)
-#else
-#error not byte order defined
-#endif
-#else   /* Au1200 */
-#define USB_HOST_CONFIG    (USB_MSR_BASE + USB_MSR_MCFG)
-#define USB_MCFG_PFEN     (1<<31)
-#define USB_MCFG_RDCOMB   (1<<30)
-#define USB_MCFG_SSDEN    (1<<23)
-#define USB_MCFG_OHCCLKEN (1<<16)
-#ifdef CONFIG_DMA_COHERENT
-#define USB_MCFG_UCAM     (1<<7)
-#else
-#define USB_MCFG_UCAM     (0)
-#endif
-#define USB_MCFG_OBMEN    (1<<1)
-#define USB_MCFG_OMEMEN   (1<<0)
-#define USBH_ENABLE_CE    USB_MCFG_OHCCLKEN
-#define USBH_ENABLE_INIT  (USB_MCFG_PFEN  | USB_MCFG_RDCOMB     |       \
-                           USBH_ENABLE_CE | USB_MCFG_SSDEN      |       \
-                           USB_MCFG_UCAM  |                             \
-                           USB_MCFG_OBMEN | USB_MCFG_OMEMEN)
-#define USBH_DISABLE      (USB_MCFG_OBMEN | USB_MCFG_OMEMEN)
-#endif  /* Au1200 */
 extern int usb_disabled(void);
-static void au1xxx_start_ohc(void)
-{
-        /* enable host controller */
-#ifndef CONFIG_SOC_AU1200
-        au_writel(USBH_ENABLE_CE, USB_HOST_CONFIG);
-        au_sync();
-        udelay(1000);
-        au_writel(au_readl(USB_HOST_CONFIG) | USBH_ENABLE_INIT, USB_HOST_CONFIG);
-        au_sync();
-        udelay(1000);
-        /* wait for reset complete (read register twice; see au1500 errata) */
-        while (au_readl(USB_HOST_CONFIG),
-                !(au_readl(USB_HOST_CONFIG) & USBH_ENABLE_RD))
-                udelay(1000);
-#else   /* Au1200 */
-        au_writel(au_readl(USB_HOST_CONFIG) | USBH_ENABLE_CE, USB_HOST_CONFIG);
-        au_sync();
-        udelay(1000);
-        au_writel(au_readl(USB_HOST_CONFIG) | USBH_ENABLE_INIT, USB_HOST_CONFIG);
-        au_sync();
-        udelay(2000);
-#endif  /* Au1200 */
-}
-static void au1xxx_stop_ohc(void)
-{
-#ifdef CONFIG_SOC_AU1200
-        /* Disable mem */
-        au_writel(au_readl(USB_HOST_CONFIG) & ~USBH_DISABLE, USB_HOST_CONFIG);
-        au_sync();
-        udelay(1000);
-#endif
-        /* Disable clock */
-        au_writel(au_readl(USB_HOST_CONFIG) & ~USBH_ENABLE_CE, USB_HOST_CONFIG);
-        au_sync();
-}
 static int __devinit ohci_au1xxx_start(struct usb_hcd *hcd)
 {
        struct ohci_hcd *ohci = hcd_to_ohci(hcd);
@@ -178,17 +95,6 @@ static int ohci_hcd_au1xxx_drv_probe(struct platform_device *pdev)
        if (usb_disabled())
                return -ENODEV;
-#if defined(CONFIG_SOC_AU1200) && defined(CONFIG_DMA_COHERENT)
-        /* Au1200 AB USB does not support coherent memory */
-        if (!(read_c0_prid() & 0xff)) {
-                printk(KERN_INFO "%s: this is chip revision AB !!\n",
-                        pdev->name);
-                printk(KERN_INFO "%s: update your board or re-configure "
-                                 "the kernel\n", pdev->name);
-                return -ENODEV;
-        }
-#endif
        if (pdev->resource[1].flags != IORESOURCE_IRQ) {
                pr_debug("resource[1] is not IORESOURCE_IRQ\n");
                return -ENOMEM;
@@ -214,7 +120,12 @@ static int ohci_hcd_au1xxx_drv_probe(struct platform_device *pdev)
                goto err2;
        }
-        au1xxx_start_ohc();
+        if (alchemy_usb_control(ALCHEMY_USB_OHCI0, 1)) {
+                printk(KERN_INFO "%s: controller init failed!\n", pdev->name);
+                ret = -ENODEV;
+                goto err3;
+        }
        ohci_hcd_init(hcd_to_ohci(hcd));
        ret = usb_add_hcd(hcd, pdev->resource[1].start,
@@ -224,7 +135,8 @@ static int ohci_hcd_au1xxx_drv_probe(struct platform_device *pdev)
                return ret;
        }
-        au1xxx_stop_ohc();
+        alchemy_usb_control(ALCHEMY_USB_OHCI0, 0);
+err3:
        iounmap(hcd->regs);
 err2:
        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
@@ -238,7 +150,7 @@ static int ohci_hcd_au1xxx_drv_remove(struct platform_device *pdev)
        struct usb_hcd *hcd = platform_get_drvdata(pdev);
        usb_remove_hcd(hcd);
-        au1xxx_stop_ohc();
+        alchemy_usb_control(ALCHEMY_USB_OHCI0, 0);
        iounmap(hcd->regs);
        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
        usb_put_hcd(hcd);
@@ -275,7 +187,7 @@ static int ohci_hcd_au1xxx_drv_suspend(struct device *dev)
        clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
-        au1xxx_stop_ohc();
+        alchemy_usb_control(ALCHEMY_USB_OHCI0, 0);
 bail:
        spin_unlock_irqrestore(&ohci->lock, flags);
@@ -286,7 +198,7 @@ static int ohci_hcd_au1xxx_drv_resume(struct device *dev)
 {
        struct usb_hcd *hcd = dev_get_drvdata(dev);
-        au1xxx_start_ohc();
+        alchemy_usb_control(ALCHEMY_USB_OHCI0, 1);
        set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
        ohci_finish_controller_resume(hcd);
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 629a96813fd6..27a3dec32fa2 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -13,6 +13,7 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/export.h>
 #include <linux/acpi.h>
 #include <linux/dmi.h>
 #include "pci-quirks.h"
diff --git a/drivers/usb/host/whci/debug.c b/drivers/usb/host/whci/debug.c
index 767af265e002..ba61dae9e4d2 100644
--- a/drivers/usb/host/whci/debug.c
+++ b/drivers/usb/host/whci/debug.c
@@ -19,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
+#include <linux/export.h>
 #include "../../wusbcore/wusbhc.h"
diff --git a/drivers/usb/host/whci/hcd.c b/drivers/usb/host/whci/hcd.c
index 9546f6cd01f0..1e141f755b26 100644
--- a/drivers/usb/host/whci/hcd.c
+++ b/drivers/usb/host/whci/hcd.c
@@ -17,6 +17,7 @@
 */
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/module.h>
 #include <linux/uwb/umc.h>
 #include "../../wusbcore/wusbhc.h"
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index 431efe72b1f7..430e88fd3f6c 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -20,6 +20,7 @@
 * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
+#include <linux/gfp.h>
 #include <asm/unaligned.h>
 #include "xhci.h"
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 9f51f88cc0f5..ef98b38626fb 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -22,6 +22,7 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include "xhci.h"
diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c
index a04b2ff9dd83..91cd85076a44 100644
--- a/drivers/usb/mon/mon_bin.c
+++ b/drivers/usb/mon/mon_bin.c
@@ -11,6 +11,7 @@
 #include <linux/types.h>
 #include <linux/fs.h>
 #include <linux/cdev.h>
+#include <linux/export.h>
 #include <linux/usb.h>
 #include <linux/poll.h>
 #include <linux/compat.h>
diff --git a/drivers/usb/mon/mon_stat.c b/drivers/usb/mon/mon_stat.c
index e5ce42bd316e..ebd6189a5014 100644
--- a/drivers/usb/mon/mon_stat.c
+++ b/drivers/usb/mon/mon_stat.c
@@ -9,6 +9,7 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <linux/usb.h>
 #include <linux/fs.h>
 #include <asm/uaccess.h>
diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c
index 1c3afcc11bd9..ad408251d955 100644
--- a/drivers/usb/mon/mon_text.c
+++ b/drivers/usb/mon/mon_text.c
@@ -9,6 +9,7 @@
 #include <linux/usb.h>
 #include <linux/slab.h>
 #include <linux/time.h>
+#include <linux/export.h>
 #include <linux/mutex.h>
 #include <linux/debugfs.h>
 #include <linux/scatterlist.h>
diff --git a/drivers/usb/otg/gpio_vbus.c b/drivers/usb/otg/gpio_vbus.c
index 52733d9959b4..fb644c107ded 100644
--- a/drivers/usb/otg/gpio_vbus.c
+++ b/drivers/usb/otg/gpio_vbus.c
@@ -11,6 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/usb.h>
diff --git a/drivers/usb/otg/otg.c b/drivers/usb/otg/otg.c
index fb7adeff9ffa..307c27bc51eb 100644
--- a/drivers/usb/otg/otg.c
+++ b/drivers/usb/otg/otg.c
@@ -10,6 +10,7 @@
 */
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/device.h>
 #include <linux/usb/otg.h>
diff --git a/drivers/usb/otg/ulpi.c b/drivers/usb/otg/ulpi.c
index 770d799d5afb..0b0466728fdc 100644
--- a/drivers/usb/otg/ulpi.c
+++ b/drivers/usb/otg/ulpi.c
@@ -25,6 +25,7 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <linux/usb.h>
 #include <linux/usb/otg.h>
 #include <linux/usb/ulpi.h>
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c
index aba201cb872c..b43d07df4c44 100644
--- a/drivers/usb/serial/aircable.c
+++ b/drivers/usb/serial/aircable.c
@@ -47,6 +47,7 @@
 #include <asm/unaligned.h>
 #include <linux/tty.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <linux/tty_flip.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
index b9bb24729c99..aa9367f5b421 100644
--- a/drivers/usb/serial/qcserial.c
+++ b/drivers/usb/serial/qcserial.c
@@ -13,6 +13,7 @@
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
+#include <linux/module.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 #include <linux/slab.h>
diff --git a/drivers/usb/storage/option_ms.c b/drivers/usb/storage/option_ms.c
index 89460181d122..e0f76bb05915 100644
--- a/drivers/usb/storage/option_ms.c
+++ b/drivers/usb/storage/option_ms.c
@@ -22,6 +22,7 @@
 #include <linux/usb.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include "usb.h"
 #include "transport.h"
diff --git a/drivers/usb/storage/protocol.c b/drivers/usb/storage/protocol.c
index fc310f75eada..93c1a4d86f51 100644
--- a/drivers/usb/storage/protocol.c
+++ b/drivers/usb/storage/protocol.c
@@ -43,6 +43,7 @@
 */
 #include <linux/highmem.h>
+#include <linux/export.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
diff --git a/drivers/usb/storage/sierra_ms.c b/drivers/usb/storage/sierra_ms.c
index 1deca07c8265..37539c89e3ba 100644
--- a/drivers/usb/storage/sierra_ms.c
+++ b/drivers/usb/storage/sierra_ms.c
@@ -3,6 +3,7 @@
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
 #include <linux/usb.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include "usb.h"
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index ff32390d61e5..0e5c91c6187f 100644
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -46,6 +46,7 @@
 #include <linux/sched.h>
 #include <linux/gfp.h>
 #include <linux/errno.h>
+#include <linux/export.h>
 #include <linux/usb/quirks.h>
diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 23f0dd9c36d4..1d10d5b8204c 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -11,6 +11,7 @@
 #include <linux/blkdev.h>
 #include <linux/slab.h>
 #include <linux/types.h>
+#include <linux/module.h>
 #include <linux/usb.h>
 #include <linux/usb/storage.h>
diff --git a/drivers/usb/wusbcore/devconnect.c b/drivers/usb/wusbcore/devconnect.c
index 7ec24e46b34b..231009af65a3 100644
--- a/drivers/usb/wusbcore/devconnect.c
+++ b/drivers/usb/wusbcore/devconnect.c
@@ -90,6 +90,7 @@
 #include <linux/ctype.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
+#include <linux/export.h>
 #include "wusbhc.h"
 static void wusbhc_devconnect_acked_work(struct work_struct *work);
diff --git a/drivers/usb/wusbcore/mmc.c b/drivers/usb/wusbcore/mmc.c
index 0a57ff0a0b0c..b8c72583c040 100644
--- a/drivers/usb/wusbcore/mmc.c
+++ b/drivers/usb/wusbcore/mmc.c
@@ -38,6 +38,7 @@
 */
 #include <linux/usb/wusb.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "wusbhc.h"
 /* Initialize the MMCIEs handling mechanism */
diff --git a/drivers/usb/wusbcore/rh.c b/drivers/usb/wusbcore/rh.c
index 39de3900ad20..59ff254dfb6f 100644
--- a/drivers/usb/wusbcore/rh.c
+++ b/drivers/usb/wusbcore/rh.c
@@ -70,6 +70,7 @@
 * wusbhc_rh_start_port_reset() ??? unimplemented
 */
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "wusbhc.h"
 /*
diff --git a/drivers/usb/wusbcore/security.c b/drivers/usb/wusbcore/security.c
index b60799b811c1..371f61733f05 100644
--- a/drivers/usb/wusbcore/security.c
+++ b/drivers/usb/wusbcore/security.c
@@ -26,6 +26,7 @@
 #include <linux/slab.h>
 #include <linux/usb/ch9.h>
 #include <linux/random.h>
+#include <linux/export.h>
 #include "wusbhc.h"
 static void wusbhc_set_gtk_callback(struct urb *urb);
diff --git a/drivers/usb/wusbcore/wa-hc.c b/drivers/usb/wusbcore/wa-hc.c
index 0d1863c9edde..9e4a92461688 100644
--- a/drivers/usb/wusbcore/wa-hc.c
+++ b/drivers/usb/wusbcore/wa-hc.c
@@ -23,6 +23,7 @@
 * FIXME: docs
 */
 #include <linux/slab.h>
+#include <linux/module.h>
 #include "wusbhc.h"
 #include "wa-hc.h"
diff --git a/drivers/usb/wusbcore/wa-rpipe.c b/drivers/usb/wusbcore/wa-rpipe.c
index 2acc7f504c51..f0d546c5a089 100644
--- a/drivers/usb/wusbcore/wa-rpipe.c
+++ b/drivers/usb/wusbcore/wa-rpipe.c
@@ -61,6 +61,7 @@
 #include <linux/atomic.h>
 #include <linux/bitmap.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "wusbhc.h"
 #include "wa-hc.h"
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
index 419334568be6..57c01ab09ad8 100644
--- a/drivers/usb/wusbcore/wa-xfer.c
+++ b/drivers/usb/wusbcore/wa-xfer.c
@@ -84,6 +84,7 @@
 #include <linux/slab.h>
 #include <linux/hash.h>
 #include <linux/ratelimit.h>
+#include <linux/export.h>
 #include "wa-hc.h"
 #include "wusbhc.h"
diff --git a/drivers/uwb/est.c b/drivers/uwb/est.c
index a2eaa3c33b0b..de81ebf51784 100644
--- a/drivers/uwb/est.c
+++ b/drivers/uwb/est.c
@@ -41,6 +41,7 @@
 */
 #include <linux/spinlock.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "uwb-internal.h"
diff --git a/drivers/uwb/i1480/dfu/dfu.c b/drivers/uwb/i1480/dfu/dfu.c
index da7b1d08003c..b08d1c2ee3fa 100644
--- a/drivers/uwb/i1480/dfu/dfu.c
+++ b/drivers/uwb/i1480/dfu/dfu.c
@@ -33,6 +33,7 @@
 #include <linux/device.h>
 #include <linux/uwb.h>
 #include <linux/random.h>
+#include <linux/export.h>
 /*
 * i1480_rceb_check - Check RCEB for expected field values
diff --git a/drivers/uwb/ie.c b/drivers/uwb/ie.c
index 30acec740425..902b0f2f961e 100644
--- a/drivers/uwb/ie.c
+++ b/drivers/uwb/ie.c
@@ -25,6 +25,7 @@
 */
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "uwb-internal.h"
 /**
diff --git a/drivers/uwb/lc-dev.c b/drivers/uwb/lc-dev.c
index 90113bafefca..5241f1d0ef7a 100644
--- a/drivers/uwb/lc-dev.c
+++ b/drivers/uwb/lc-dev.c
@@ -25,9 +25,11 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/device.h>
+#include <linux/export.h>
 #include <linux/err.h>
 #include <linux/kdev_t.h>
 #include <linux/random.h>
+#include <linux/stat.h>
 #include "uwb-internal.h"
 /* We initialize addresses to 0xff (invalid, as it is bcast) */
diff --git a/drivers/uwb/lc-rc.c b/drivers/uwb/lc-rc.c
index b4395f41a007..4d688c750801 100644
--- a/drivers/uwb/lc-rc.c
+++ b/drivers/uwb/lc-rc.c
@@ -36,6 +36,7 @@
 #include <linux/etherdevice.h>
 #include <linux/usb.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "uwb-internal.h"
diff --git a/drivers/uwb/neh.c b/drivers/uwb/neh.c
index 697e56a5bcdd..a269937be1b8 100644
--- a/drivers/uwb/neh.c
+++ b/drivers/uwb/neh.c
@@ -85,6 +85,7 @@
 #include <linux/timer.h>
 #include <linux/slab.h>
 #include <linux/err.h>
+#include <linux/export.h>
 #include "uwb-internal.h"
diff --git a/drivers/uwb/pal.c b/drivers/uwb/pal.c
index 99a19c199095..8ee7d90a8c68 100644
--- a/drivers/uwb/pal.c
+++ b/drivers/uwb/pal.c
@@ -18,6 +18,7 @@
 #include <linux/kernel.h>
 #include <linux/debugfs.h>
 #include <linux/uwb.h>
+#include <linux/export.h>
 #include "uwb-internal.h"
diff --git a/drivers/uwb/radio.c b/drivers/uwb/radio.c
index f0d55495f5e9..d58dfecf9a79 100644
--- a/drivers/uwb/radio.c
+++ b/drivers/uwb/radio.c
@@ -17,6 +17,7 @@
 */
 #include <linux/kernel.h>
 #include <linux/uwb.h>
+#include <linux/export.h>
 #include "uwb-internal.h"
diff --git a/drivers/uwb/reset.c b/drivers/uwb/reset.c
index 3de630b0f691..703228559e89 100644
--- a/drivers/uwb/reset.c
+++ b/drivers/uwb/reset.c
@@ -32,6 +32,7 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
+#include <linux/export.h>
 #include "uwb-internal.h"
diff --git a/drivers/uwb/rsv.c b/drivers/uwb/rsv.c
index 78c892233cf1..0b0d8bce842e 100644
--- a/drivers/uwb/rsv.c
+++ b/drivers/uwb/rsv.c
@@ -19,6 +19,7 @@
 #include <linux/uwb.h>
 #include <linux/slab.h>
 #include <linux/random.h>
+#include <linux/export.h>
 #include "uwb-internal.h"
diff --git a/drivers/uwb/scan.c b/drivers/uwb/scan.c
index 367aa12786b9..cbb6a5e703d2 100644
--- a/drivers/uwb/scan.c
+++ b/drivers/uwb/scan.c
@@ -36,6 +36,7 @@
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/slab.h>
+#include <linux/stat.h>
 #include "uwb-internal.h"
diff --git a/drivers/uwb/umc-bus.c b/drivers/uwb/umc-bus.c
index 5fad4e791b3e..82a84d53120f 100644
--- a/drivers/uwb/umc-bus.c
+++ b/drivers/uwb/umc-bus.c
@@ -8,6 +8,7 @@
 #include <linux/kernel.h>
 #include <linux/sysfs.h>
 #include <linux/workqueue.h>
+#include <linux/module.h>
 #include <linux/uwb/umc.h>
 #include <linux/pci.h>
diff --git a/drivers/uwb/umc-dev.c b/drivers/uwb/umc-dev.c
index b2948ec57878..4613c13cd851 100644
--- a/drivers/uwb/umc-dev.c
+++ b/drivers/uwb/umc-dev.c
@@ -6,6 +6,7 @@
 * This file is released under the GNU GPL v2.
 */
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/uwb/umc.h>
diff --git a/drivers/uwb/umc-drv.c b/drivers/uwb/umc-drv.c
index 367b5eb85d60..26d0ae1816bd 100644
--- a/drivers/uwb/umc-drv.c
+++ b/drivers/uwb/umc-drv.c
@@ -6,6 +6,7 @@
 * This file is released under the GNU GPL v2.
 */
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/uwb/umc.h>
 int __umc_driver_register(struct umc_driver *umc_drv, struct module *module,
diff --git a/drivers/uwb/whci.c b/drivers/uwb/whci.c
index b221142446a2..f48093e649e4 100644
--- a/drivers/uwb/whci.c
+++ b/drivers/uwb/whci.c
@@ -7,6 +7,7 @@
 */
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 8165c5577d71..d83e967e4e15 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1753,7 +1753,7 @@ endchoice
 config FB_AU1100
        bool "Au1100 LCD Driver"
-        depends on (FB = y) && MIPS && SOC_AU1100
+        depends on (FB = y) && MIPS_ALCHEMY
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -1764,7 +1764,7 @@ config FB_AU1100
 config FB_AU1200
        bool "Au1200 LCD Driver"
-        depends on (FB = y) && MIPS && SOC_AU1200
+        depends on (FB = y) && MIPS_ALCHEMY
        select FB_SYS_FILLRECT
        select FB_SYS_COPYAREA
        select FB_SYS_IMAGEBLIT
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 4ac48d9ee665..63409c122ae8 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -18,6 +18,7 @@
 #include <linux/delay.h>
 #include <linux/backlight.h>
 #include <linux/gfp.h>
+#include <linux/module.h>
 #include <mach/board.h>
 #include <mach/cpu.h>
diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c
index c04b94da81f7..1105fa1ed7f4 100644
--- a/drivers/video/backlight/88pm860x_bl.c
+++ b/drivers/video/backlight/88pm860x_bl.c
@@ -17,6 +17,7 @@
 #include <linux/i2c.h>
 #include <linux/backlight.h>
 #include <linux/mfd/88pm860x.h>
+#include <linux/module.h>
 #define MAX_BRIGHTNESS          (0xFF)
 #define MIN_BRIGHTNESS          (0)
diff --git a/drivers/video/backlight/adp5520_bl.c b/drivers/video/backlight/adp5520_bl.c
index d1aee730d7d8..dfb763e9147f 100644
--- a/drivers/video/backlight/adp5520_bl.c
+++ b/drivers/video/backlight/adp5520_bl.c
@@ -13,6 +13,7 @@
 #include <linux/backlight.h>
 #include <linux/mfd/adp5520.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 struct adp5520_bl {
        struct device *master;
diff --git a/drivers/video/backlight/ams369fg06.c b/drivers/video/backlight/ams369fg06.c
index 9f0a491e2a05..7838a23fbdd1 100644
--- a/drivers/video/backlight/ams369fg06.c
+++ b/drivers/video/backlight/ams369fg06.c
@@ -22,6 +22,7 @@
 */
 #include <linux/wait.h>
+#include <linux/module.h>
 #include <linux/fb.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
diff --git a/drivers/video/backlight/da903x_bl.c b/drivers/video/backlight/da903x_bl.c
index 62043f12a5a4..d68f14bbb687 100644
--- a/drivers/video/backlight/da903x_bl.c
+++ b/drivers/video/backlight/da903x_bl.c
@@ -19,6 +19,7 @@
 #include <linux/backlight.h>
 #include <linux/mfd/da903x.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #define DA9030_WLED_CONTROL     0x25
 #define DA9030_WLED_CP_EN       (1 << 6)
diff --git a/drivers/video/backlight/ep93xx_bl.c b/drivers/video/backlight/ep93xx_bl.c
index b0582917f0c8..c74a6f4baa12 100644
--- a/drivers/video/backlight/ep93xx_bl.c
+++ b/drivers/video/backlight/ep93xx_bl.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/module.h>
 #include <linux/io.h>
 #include <linux/fb.h>
 #include <linux/backlight.h>
diff --git a/drivers/video/backlight/l4f00242t03.c b/drivers/video/backlight/l4f00242t03.c
index 3543f1b7d5f1..4f5d1c4cb6ab 100644
--- a/drivers/video/backlight/l4f00242t03.c
+++ b/drivers/video/backlight/l4f00242t03.c
@@ -14,6 +14,7 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 #include <linux/gpio.h>
 #include <linux/lcd.h>
 #include <linux/slab.h>
diff --git a/drivers/video/backlight/ld9040.c b/drivers/video/backlight/ld9040.c
index 5934655eb1ff..da9a5ce0ccb8 100644
--- a/drivers/video/backlight/ld9040.c
+++ b/drivers/video/backlight/ld9040.c
@@ -30,6 +30,7 @@
 #include <linux/kernel.h>
 #include <linux/lcd.h>
 #include <linux/backlight.h>
+#include <linux/module.h>
 #include "ld9040_gamma.h"
diff --git a/drivers/video/backlight/lms283gf05.c b/drivers/video/backlight/lms283gf05.c
index 5d3cf33953ac..4ec78cfe26ea 100644
--- a/drivers/video/backlight/lms283gf05.c
+++ b/drivers/video/backlight/lms283gf05.c
@@ -17,6 +17,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/lms283gf05.h>
+#include <linux/module.h>
 struct lms283gf05_state {
        struct spi_device       *spi;
diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c
index 07e8e273ced0..7bbc802560ea 100644
--- a/drivers/video/backlight/max8925_bl.c
+++ b/drivers/video/backlight/max8925_bl.c
@@ -17,6 +17,7 @@
 #include <linux/backlight.h>
 #include <linux/mfd/max8925.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #define MAX_BRIGHTNESS          (0xff)
 #define MIN_BRIGHTNESS          (0)
diff --git a/drivers/video/backlight/s6e63m0.c b/drivers/video/backlight/s6e63m0.c
index 694e5aab0d69..e132157d8545 100644
--- a/drivers/video/backlight/s6e63m0.c
+++ b/drivers/video/backlight/s6e63m0.c
@@ -30,6 +30,7 @@
 #include <linux/kernel.h>
 #include <linux/lcd.h>
 #include <linux/backlight.h>
+#include <linux/module.h>
 #include "s6e63m0_gamma.h"
diff --git a/drivers/video/backlight/wm831x_bl.c b/drivers/video/backlight/wm831x_bl.c
index d4c6eb248ff9..fbe9e9316f3b 100644
--- a/drivers/video/backlight/wm831x_bl.c
+++ b/drivers/video/backlight/wm831x_bl.c
@@ -11,6 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/module.h>
 #include <linux/fb.h>
 #include <linux/backlight.h>
 #include <linux/slab.h>
diff --git a/drivers/video/carminefb.c b/drivers/video/carminefb.c
index cb09aa1fa138..2c76fdf23f2a 100644
--- a/drivers/video/carminefb.c
+++ b/drivers/video/carminefb.c
@@ -12,6 +12,7 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include "carminefb.h"
 #include "carminefb_regs.h"
diff --git a/drivers/video/cobalt_lcdfb.c b/drivers/video/cobalt_lcdfb.c
index e02764319ff7..f56699d8122a 100644
--- a/drivers/video/cobalt_lcdfb.c
+++ b/drivers/video/cobalt_lcdfb.c
@@ -24,6 +24,7 @@
 #include <linux/ioport.h>
 #include <linux/uaccess.h>
 #include <linux/platform_device.h>
+#include <linux/module.h>
 /*
 * Cursor position address
diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c
index 40e5f17d1e4b..2e830ec52a5a 100644
--- a/drivers/video/ep93xx-fb.c
+++ b/drivers/video/ep93xx-fb.c
@@ -18,6 +18,7 @@
 */
 #include <linux/platform_device.h>
+#include <linux/module.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/clk.h>
diff --git a/drivers/video/fb_ddc.c b/drivers/video/fb_ddc.c
index 4a874c8d039c..2b106f046fde 100644
--- a/drivers/video/fb_ddc.c
+++ b/drivers/video/fb_ddc.c
@@ -1,5 +1,5 @@
 /*
- * driver/vide/fb_ddc.c - DDC/EDID read support.
+ * drivers/video/fb_ddc.c - DDC/EDID read support.
 *
 *  Copyright (C) 2006 Dennis Munsie <dmunsie@cecropia.com>
 *
@@ -10,6 +10,7 @@
 #include <linux/delay.h>
 #include <linux/device.h>
+#include <linux/module.h>
 #include <linux/fb.h>
 #include <linux/i2c-algo-bit.h>
 #include <linux/slab.h>
diff --git a/drivers/video/fb_notify.c b/drivers/video/fb_notify.c
index 8c020389e4fa..74c2da528884 100644
--- a/drivers/video/fb_notify.c
+++ b/drivers/video/fb_notify.c
@@ -12,6 +12,7 @@
 */
 #include <linux/fb.h>
 #include <linux/notifier.h>
+#include <linux/export.h>
 static BLOCKING_NOTIFIER_HEAD(fb_notifier_list);
diff --git a/drivers/video/mb862xx/mb862xx-i2c.c b/drivers/video/mb862xx/mb862xx-i2c.c
index 934081d2b7ae..273769bb8deb 100644
--- a/drivers/video/mb862xx/mb862xx-i2c.c
+++ b/drivers/video/mb862xx/mb862xx-i2c.c
@@ -13,6 +13,7 @@
 #include <linux/i2c.h>
 #include <linux/io.h>
 #include <linux/delay.h>
+#include <linux/export.h>
 #include "mb862xxfb.h"
 #include "mb862xx_reg.h"
diff --git a/drivers/video/mb862xx/mb862xxfbdrv.c b/drivers/video/mb862xx/mb862xxfbdrv.c
index c16ff1d62e91..11a7a333701d 100644
--- a/drivers/video/mb862xx/mb862xxfbdrv.c
+++ b/drivers/video/mb862xx/mb862xxfbdrv.c
@@ -17,6 +17,7 @@
 #include <linux/fb.h>
 #include <linux/delay.h>
 #include <linux/uaccess.h>
+#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
index b9344772bac9..cb2ddf164c98 100644
--- a/drivers/video/msm/mdp.c
+++ b/drivers/video/msm/mdp.c
@@ -28,6 +28,7 @@
 #include <mach/msm_iomap.h>
 #include <mach/msm_fb.h>
 #include <linux/platform_device.h>
+#include <linux/export.h>
 #include "mdp_hw.h"
diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c
index 90e3bdd1b7ab..eb381db7fe51 100644
--- a/drivers/video/omap/lcd_mipid.c
+++ b/drivers/video/omap/lcd_mipid.c
@@ -23,6 +23,7 @@
 #include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <linux/spi/spi.h>
+#include <linux/module.h>
 #include <plat/lcd_mipid.h>
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index b3ddd743d8a6..25d8e5103193 100644
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -28,6 +28,7 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
+#include <linux/module.h>
 #include <plat/dma.h>
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 6892cfd2e3b7..3532782551cb 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -25,6 +25,7 @@
 #include <linux/kernel.h>
 #include <linux/dma-mapping.h>
 #include <linux/vmalloc.h>
+#include <linux/export.h>
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/jiffies.h>
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index 483888a85cfd..976ac23dcd0c 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
+#include <linux/export.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/platform_device.h>
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 43c04a9889c4..5abf8e7e7456 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -27,6 +27,7 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
+#include <linux/module.h>
 #include <linux/semaphore.h>
 #include <linux/seq_file.h>
 #include <linux/platform_device.h>
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 3e09726d32c7..17033457ee89 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/io.h>
+#include <linux/export.h>
 #include <linux/err.h>
 #include <linux/delay.h>
 #include <linux/seq_file.h>
diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c
index 1bd3703e42ff..1130c608a561 100644
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/drivers/video/omap2/dss/rfbi.c
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/dma-mapping.h>
+#include <linux/export.h>
 #include <linux/vmalloc.h>
 #include <linux/clk.h>
 #include <linux/io.h>
diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c
index 695dc04cabba..40305ad7841e 100644
--- a/drivers/video/omap2/dss/sdi.c
+++ b/drivers/video/omap2/dss/sdi.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/regulator/consumer.h>
+#include <linux/export.h>
 #include <video/omapdss.h>
 #include "dss.h"
diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c
index 6b1ac23dbbd3..df7bcce5b107 100644
--- a/drivers/video/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
@@ -27,6 +27,7 @@
 #include <linux/mm.h>
 #include <linux/omapfb.h>
 #include <linux/vmalloc.h>
+#include <linux/export.h>
 #include <video/omapdss.h>
 #include <plat/vrfb.h>
diff --git a/drivers/video/savage/savagefb_accel.c b/drivers/video/savage/savagefb_accel.c
index bbcc055d3bb7..bfefa6234cf0 100644
--- a/drivers/video/savage/savagefb_accel.c
+++ b/drivers/video/savage/savagefb_accel.c
@@ -11,6 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/fb.h>
+#include <linux/module.h>
 #include "savagefb.h"
diff --git a/drivers/video/sh_mipi_dsi.c b/drivers/video/sh_mipi_dsi.c
index 24640c8458ab..72ee96bc6b3e 100644
--- a/drivers/video/sh_mipi_dsi.c
+++ b/drivers/video/sh_mipi_dsi.c
@@ -17,6 +17,7 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/types.h>
+#include <linux/module.h>
 #include <video/mipi_display.h>
 #include <video/sh_mipi_dsi.h>
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index 3a41c013d031..facffc254976 100644
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -23,6 +23,7 @@
 #include <linux/console.h>
 #include <linux/backlight.h>
 #include <linux/gpio.h>
+#include <linux/module.h>
 #include <video/sh_mobile_lcdc.h>
 #include <video/sh_mobile_meram.h>
 #include <linux/atomic.h>
diff --git a/drivers/video/via/via-gpio.c b/drivers/video/via/via-gpio.c
index ab5341814c74..d69cfef7c338 100644
--- a/drivers/video/via/via-gpio.c
+++ b/drivers/video/via/via-gpio.c
@@ -10,6 +10,7 @@
 #include <linux/platform_device.h>
 #include <linux/via-core.h>
 #include <linux/via-gpio.h>
+#include <linux/export.h>
 /*
 * The ports we know about.  Note that the port-25 gpios are not
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index c8be8af0cc6d..2375e5bbf572 100644
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -33,6 +33,7 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/vmalloc.h>
+#include <linux/module.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <video/w100fb.h>
diff --git a/drivers/virt/fsl_hypervisor.c b/drivers/virt/fsl_hypervisor.c
index 3d9162151fd2..4939e0ccc4e5 100644
--- a/drivers/virt/fsl_hypervisor.c
+++ b/drivers/virt/fsl_hypervisor.c
@@ -706,6 +706,7 @@ static const struct file_operations fsl_hv_fops = {
        .poll = fsl_hv_poll,
        .read = fsl_hv_read,
        .unlocked_ioctl = fsl_hv_ioctl,
+        .compat_ioctl = fsl_hv_ioctl,
 };
 static struct miscdevice fsl_hv_misc_dev = {
diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig
index 57e493b1bd20..816ed08e7cf3 100644
--- a/drivers/virtio/Kconfig
+++ b/drivers/virtio/Kconfig
@@ -35,4 +35,15 @@ config VIRTIO_BALLOON
         If unsure, say M.
+ config VIRTIO_MMIO
+        tristate "Platform bus driver for memory mapped virtio devices (EXPERIMENTAL)"
+        depends on EXPERIMENTAL
+        select VIRTIO
+        select VIRTIO_RING
+        ---help---
+         This drivers provides support for memory mapped virtio
+         platform device driver.
+         If unsure, say N.
 endmenu
diff --git a/drivers/virtio/Makefile b/drivers/virtio/Makefile
index 6738c446c199..5a4c63cfd380 100644
--- a/drivers/virtio/Makefile
+++ b/drivers/virtio/Makefile
@@ -1,4 +1,5 @@
 obj-$(CONFIG_VIRTIO) += virtio.o
 obj-$(CONFIG_VIRTIO_RING) += virtio_ring.o
+obj-$(CONFIG_VIRTIO_MMIO) += virtio_mmio.o
 obj-$(CONFIG_VIRTIO_PCI) += virtio_pci.o
 obj-$(CONFIG_VIRTIO_BALLOON) += virtio_balloon.o
diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index efb35aa8309a..984c501c258f 100644
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -1,6 +1,7 @@
 #include <linux/virtio.h>
 #include <linux/spinlock.h>
 #include <linux/virtio_config.h>
+#include <linux/module.h>
 /* Unique numbering for virtio devices. */
 static unsigned int dev_index;
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index e058ace2a4ad..94fd738a7741 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -25,6 +25,7 @@
 #include <linux/freezer.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 struct virtio_balloon
 {
diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
new file mode 100644
index 000000000000..acc5e43c373e
--- /dev/null
+++ b/drivers/virtio/virtio_mmio.c
@@ -0,0 +1,479 @@
+/*
+ * Virtio memory mapped device driver
+ *
+ * Copyright 2011, ARM Ltd.
+ *
+ * This module allows virtio devices to be used over a virtual, memory mapped
+ * platform device.
+ *
+ * Registers layout (all 32-bit wide):
+ *
+ * offset d. name             description
+ * ------ -- ---------------- -----------------
+ *
+ * 0x000  R  MagicValue       Magic value "virt"
+ * 0x004  R  Version          Device version (current max. 1)
+ * 0x008  R  DeviceID         Virtio device ID
+ * 0x00c  R  VendorID         Virtio vendor ID
+ *
+ * 0x010  R  HostFeatures     Features supported by the host
+ * 0x014  W  HostFeaturesSel  Set of host features to access via HostFeatures
+ *
+ * 0x020  W  GuestFeatures    Features activated by the guest
+ * 0x024  W  GuestFeaturesSel Set of activated features to set via GuestFeatures
+ * 0x028  W  GuestPageSize    Size of guest's memory page in bytes
+ *
+ * 0x030  W  QueueSel         Queue selector
+ * 0x034  R  QueueNumMax      Maximum size of the currently selected queue
+ * 0x038  W  QueueNum         Queue size for the currently selected queue
+ * 0x03c  W  QueueAlign       Used Ring alignment for the current queue
+ * 0x040  RW QueuePFN         PFN for the currently selected queue
+ *
+ * 0x050  W  QueueNotify      Queue notifier
+ * 0x060  R  InterruptStatus  Interrupt status register
+ * 0x060  W  InterruptACK     Interrupt acknowledge register
+ * 0x070  RW Status           Device status register
+ *
+ * 0x100+ RW                  Device-specific configuration space
+ *
+ * Based on Virtio PCI driver by Anthony Liguori, copyright IBM Corp. 2007
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+#include <linux/highmem.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/virtio.h>
+#include <linux/virtio_config.h>
+#include <linux/virtio_mmio.h>
+#include <linux/virtio_ring.h>
+/* The alignment to use between consumer and producer parts of vring.
+ * Currently hardcoded to the page size. */
+#define VIRTIO_MMIO_VRING_ALIGN         PAGE_SIZE
+#define to_virtio_mmio_device(_plat_dev) \
+        container_of(_plat_dev, struct virtio_mmio_device, vdev)
+struct virtio_mmio_device {
+        struct virtio_device vdev;
+        struct platform_device *pdev;
+        void __iomem *base;
+        unsigned long version;
+        /* a list of queues so we can dispatch IRQs */
+        spinlock_t lock;
+        struct list_head virtqueues;
+};
+struct virtio_mmio_vq_info {
+        /* the actual virtqueue */
+        struct virtqueue *vq;
+        /* the number of entries in the queue */
+        unsigned int num;
+        /* the index of the queue */
+        int queue_index;
+        /* the virtual address of the ring queue */
+        void *queue;
+        /* the list node for the virtqueues list */
+        struct list_head node;
+};
+/* Configuration interface */
+static u32 vm_get_features(struct virtio_device *vdev)
+{
+        struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
+        /* TODO: Features > 32 bits */
+        writel(0, vm_dev->base + VIRTIO_MMIO_HOST_FEATURES_SEL);
+        return readl(vm_dev->base + VIRTIO_MMIO_HOST_FEATURES);
+}
+static void vm_finalize_features(struct virtio_device *vdev)
+{
+        struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
+        int i;
+        /* Give virtio_ring a chance to accept features. */
+        vring_transport_features(vdev);
+        for (i = 0; i < ARRAY_SIZE(vdev->features); i++) {
+                writel(i, vm_dev->base + VIRTIO_MMIO_GUEST_FEATURES_SET);
+                writel(vdev->features[i],
+                                vm_dev->base + VIRTIO_MMIO_GUEST_FEATURES);
+        }
+}
+static void vm_get(struct virtio_device *vdev, unsigned offset,
+                   void *buf, unsigned len)
+{
+        struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
+        u8 *ptr = buf;
+        int i;
+        for (i = 0; i < len; i++)
+                ptr[i] = readb(vm_dev->base + VIRTIO_MMIO_CONFIG + offset + i);
+}
+static void vm_set(struct virtio_device *vdev, unsigned offset,
+                   const void *buf, unsigned len)
+{
+        struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
+        const u8 *ptr = buf;
+        int i;
+        for (i = 0; i < len; i++)
+                writeb(ptr[i], vm_dev->base + VIRTIO_MMIO_CONFIG + offset + i);
+}
+static u8 vm_get_status(struct virtio_device *vdev)
+{
+        struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
+        return readl(vm_dev->base + VIRTIO_MMIO_STATUS) & 0xff;
+}
+static void vm_set_status(struct virtio_device *vdev, u8 status)
+{
+        struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
+        /* We should never be setting status to 0. */
+        BUG_ON(status == 0);
+        writel(status, vm_dev->base + VIRTIO_MMIO_STATUS);
+}
+static void vm_reset(struct virtio_device *vdev)
+{
+        struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
+        /* 0 status means a reset. */
+        writel(0, vm_dev->base + VIRTIO_MMIO_STATUS);
+}
+/* Transport interface */
+/* the notify function used when creating a virt queue */
+static void vm_notify(struct virtqueue *vq)
+{
+        struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vq->vdev);
+        struct virtio_mmio_vq_info *info = vq->priv;
+        /* We write the queue's selector into the notification register to
+         * signal the other end */
+        writel(info->queue_index, vm_dev->base + VIRTIO_MMIO_QUEUE_NOTIFY);
+}
+/* Notify all virtqueues on an interrupt. */
+static irqreturn_t vm_interrupt(int irq, void *opaque)
+{
+        struct virtio_mmio_device *vm_dev = opaque;
+        struct virtio_mmio_vq_info *info;
+        struct virtio_driver *vdrv = container_of(vm_dev->vdev.dev.driver,
+                        struct virtio_driver, driver);
+        unsigned long status;
+        unsigned long flags;
+        irqreturn_t ret = IRQ_NONE;
+        /* Read and acknowledge interrupts */
+        status = readl(vm_dev->base + VIRTIO_MMIO_INTERRUPT_STATUS);
+        writel(status, vm_dev->base + VIRTIO_MMIO_INTERRUPT_ACK);
+        if (unlikely(status & VIRTIO_MMIO_INT_CONFIG)
+                        && vdrv && vdrv->config_changed) {
+                vdrv->config_changed(&vm_dev->vdev);
+                ret = IRQ_HANDLED;
+        }
+        if (likely(status & VIRTIO_MMIO_INT_VRING)) {
+                spin_lock_irqsave(&vm_dev->lock, flags);
+                list_for_each_entry(info, &vm_dev->virtqueues, node)
+                        ret |= vring_interrupt(irq, info->vq);
+                spin_unlock_irqrestore(&vm_dev->lock, flags);
+        }
+        return ret;
+}
+static void vm_del_vq(struct virtqueue *vq)
+{
+        struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vq->vdev);
+        struct virtio_mmio_vq_info *info = vq->priv;
+        unsigned long flags, size;
+        spin_lock_irqsave(&vm_dev->lock, flags);
+        list_del(&info->node);
+        spin_unlock_irqrestore(&vm_dev->lock, flags);
+        vring_del_virtqueue(vq);
+        /* Select and deactivate the queue */
+        writel(info->queue_index, vm_dev->base + VIRTIO_MMIO_QUEUE_SEL);
+        writel(0, vm_dev->base + VIRTIO_MMIO_QUEUE_PFN);
+        size = PAGE_ALIGN(vring_size(info->num, VIRTIO_MMIO_VRING_ALIGN));
+        free_pages_exact(info->queue, size);
+        kfree(info);
+}
+static void vm_del_vqs(struct virtio_device *vdev)
+{
+        struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
+        struct virtqueue *vq, *n;
+        list_for_each_entry_safe(vq, n, &vdev->vqs, list)
+                vm_del_vq(vq);
+        free_irq(platform_get_irq(vm_dev->pdev, 0), vm_dev);
+}
+static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned index,
+                                  void (*callback)(struct virtqueue *vq),
+                                  const char *name)
+{
+        struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
+        struct virtio_mmio_vq_info *info;
+        struct virtqueue *vq;
+        unsigned long flags, size;
+        int err;
+        /* Select the queue we're interested in */
+        writel(index, vm_dev->base + VIRTIO_MMIO_QUEUE_SEL);
+        /* Queue shouldn't already be set up. */
+        if (readl(vm_dev->base + VIRTIO_MMIO_QUEUE_PFN)) {
+                err = -ENOENT;
+                goto error_available;
+        }
+        /* Allocate and fill out our active queue description */
+        info = kmalloc(sizeof(*info), GFP_KERNEL);
+        if (!info) {
+                err = -ENOMEM;
+                goto error_kmalloc;
+        }
+        info->queue_index = index;
+        /* Allocate pages for the queue - start with a queue as big as
+         * possible (limited by maximum size allowed by device), drop down
+         * to a minimal size, just big enough to fit descriptor table
+         * and two rings (which makes it "alignment_size * 2")
+         */
+        info->num = readl(vm_dev->base + VIRTIO_MMIO_QUEUE_NUM_MAX);
+        while (1) {
+                size = PAGE_ALIGN(vring_size(info->num,
+                                VIRTIO_MMIO_VRING_ALIGN));
+                /* Already smallest possible allocation? */
+                if (size <= VIRTIO_MMIO_VRING_ALIGN * 2) {
+                        err = -ENOMEM;
+                        goto error_alloc_pages;
+                }
+                info->queue = alloc_pages_exact(size, GFP_KERNEL | __GFP_ZERO);
+                if (info->queue)
+                        break;
+                info->num /= 2;
+        }
+        /* Activate the queue */
+        writel(info->num, vm_dev->base + VIRTIO_MMIO_QUEUE_NUM);
+        writel(VIRTIO_MMIO_VRING_ALIGN,
+                        vm_dev->base + VIRTIO_MMIO_QUEUE_ALIGN);
+        writel(virt_to_phys(info->queue) >> PAGE_SHIFT,
+                        vm_dev->base + VIRTIO_MMIO_QUEUE_PFN);
+        /* Create the vring */
+        vq = vring_new_virtqueue(info->num, VIRTIO_MMIO_VRING_ALIGN,
+                                 vdev, info->queue, vm_notify, callback, name);
+        if (!vq) {
+                err = -ENOMEM;
+                goto error_new_virtqueue;
+        }
+        vq->priv = info;
+        info->vq = vq;
+        spin_lock_irqsave(&vm_dev->lock, flags);
+        list_add(&info->node, &vm_dev->virtqueues);
+        spin_unlock_irqrestore(&vm_dev->lock, flags);
+        return vq;
+error_new_virtqueue:
+        writel(0, vm_dev->base + VIRTIO_MMIO_QUEUE_PFN);
+        free_pages_exact(info->queue, size);
+error_alloc_pages:
+        kfree(info);
+error_kmalloc:
+error_available:
+        return ERR_PTR(err);
+}
+static int vm_find_vqs(struct virtio_device *vdev, unsigned nvqs,
+                       struct virtqueue *vqs[],
+                       vq_callback_t *callbacks[],
+                       const char *names[])
+{
+        struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
+        unsigned int irq = platform_get_irq(vm_dev->pdev, 0);
+        int i, err;
+        err = request_irq(irq, vm_interrupt, IRQF_SHARED,
+                        dev_name(&vdev->dev), vm_dev);
+        if (err)
+                return err;
+        for (i = 0; i < nvqs; ++i) {
+                vqs[i] = vm_setup_vq(vdev, i, callbacks[i], names[i]);
+                if (IS_ERR(vqs[i])) {
+                        vm_del_vqs(vdev);
+                        return PTR_ERR(vqs[i]);
+                }
+        }
+        return 0;
+}
+static struct virtio_config_ops virtio_mmio_config_ops = {
+        .get            = vm_get,
+        .set            = vm_set,
+        .get_status     = vm_get_status,
+        .set_status     = vm_set_status,
+        .reset          = vm_reset,
+        .find_vqs       = vm_find_vqs,
+        .del_vqs        = vm_del_vqs,
+        .get_features   = vm_get_features,
+        .finalize_features = vm_finalize_features,
+};
+/* Platform device */
+static int __devinit virtio_mmio_probe(struct platform_device *pdev)
+{
+        struct virtio_mmio_device *vm_dev;
+        struct resource *mem;
+        unsigned long magic;
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!mem)
+                return -EINVAL;
+        if (!devm_request_mem_region(&pdev->dev, mem->start,
+                        resource_size(mem), pdev->name))
+                return -EBUSY;
+        vm_dev = devm_kzalloc(&pdev->dev, sizeof(*vm_dev), GFP_KERNEL);
+        if (!vm_dev)
+                return  -ENOMEM;
+        vm_dev->vdev.dev.parent = &pdev->dev;
+        vm_dev->vdev.config = &virtio_mmio_config_ops;
+        vm_dev->pdev = pdev;
+        INIT_LIST_HEAD(&vm_dev->virtqueues);
+        spin_lock_init(&vm_dev->lock);
+        vm_dev->base = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
+        if (vm_dev->base == NULL)
+                return -EFAULT;
+        /* Check magic value */
+        magic = readl(vm_dev->base + VIRTIO_MMIO_MAGIC_VALUE);
+        if (memcmp(&magic, "virt", 4) != 0) {
+                dev_warn(&pdev->dev, "Wrong magic value 0x%08lx!\n", magic);
+                return -ENODEV;
+        }
+        /* Check device version */
+        vm_dev->version = readl(vm_dev->base + VIRTIO_MMIO_VERSION);
+        if (vm_dev->version != 1) {
+                dev_err(&pdev->dev, "Version %ld not supported!\n",
+                                vm_dev->version);
+                return -ENXIO;
+        }
+        vm_dev->vdev.id.device = readl(vm_dev->base + VIRTIO_MMIO_DEVICE_ID);
+        vm_dev->vdev.id.vendor = readl(vm_dev->base + VIRTIO_MMIO_VENDOR_ID);
+        writel(PAGE_SIZE, vm_dev->base + VIRTIO_MMIO_GUEST_PAGE_SIZE);
+        platform_set_drvdata(pdev, vm_dev);
+        return register_virtio_device(&vm_dev->vdev);
+}
+static int __devexit virtio_mmio_remove(struct platform_device *pdev)
+{
+        struct virtio_mmio_device *vm_dev = platform_get_drvdata(pdev);
+        unregister_virtio_device(&vm_dev->vdev);
+        return 0;
+}
+/* Platform driver */
+static struct of_device_id virtio_mmio_match[] = {
+        { .compatible = "virtio,mmio", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, virtio_mmio_match);
+static struct platform_driver virtio_mmio_driver = {
+        .probe          = virtio_mmio_probe,
+        .remove         = __devexit_p(virtio_mmio_remove),
+        .driver         = {
+                .name   = "virtio-mmio",
+                .owner  = THIS_MODULE,
+                .of_match_table = virtio_mmio_match,
+        },
+};
+static int __init virtio_mmio_init(void)
+{
+        return platform_driver_register(&virtio_mmio_driver);
+}
+static void __exit virtio_mmio_exit(void)
+{
+        platform_driver_unregister(&virtio_mmio_driver);
+}
+module_init(virtio_mmio_init);
+module_exit(virtio_mmio_exit);
+MODULE_AUTHOR("Pawel Moll <pawel.moll@arm.com>");
+MODULE_DESCRIPTION("Platform bus driver for memory mapped virtio devices");
+MODULE_LICENSE("GPL");
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index 4bcc8b82640b..79a31e5b4b68 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -415,9 +415,13 @@ static struct virtqueue *setup_vq(struct virtio_device *vdev, unsigned index,
                }
        }
-        spin_lock_irqsave(&vp_dev->lock, flags);
+        if (callback) {
-        list_add(&info->node, &vp_dev->virtqueues);
+                spin_lock_irqsave(&vp_dev->lock, flags);
-        spin_unlock_irqrestore(&vp_dev->lock, flags);
+                list_add(&info->node, &vp_dev->virtqueues);
+                spin_unlock_irqrestore(&vp_dev->lock, flags);
+        } else {
+                INIT_LIST_HEAD(&info->node);
+        }
        return vq;
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 4acf88884f9b..c7a2c208f6ea 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -21,6 +21,7 @@
 #include <linux/virtio_config.h>
 #include <linux/device.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 /* virtio guest is communicating with a virtual "device" that actually runs on
 * a host processor.  Memory barriers are used to control SMP effects. */
diff --git a/drivers/w1/slaves/w1_ds2760.c b/drivers/w1/slaves/w1_ds2760.c
index 483d45180911..5754c9a4f58b 100644
--- a/drivers/w1/slaves/w1_ds2760.c
+++ b/drivers/w1/slaves/w1_ds2760.c
@@ -114,43 +114,7 @@ static struct bin_attribute w1_ds2760_bin_attr = {
        .read = w1_ds2760_read_bin,
 };
-static DEFINE_IDR(bat_idr);
+static DEFINE_IDA(bat_ida);
-static DEFINE_MUTEX(bat_idr_lock);
-static int new_bat_id(void)
-{
-        int ret;
-        while (1) {
-                int id;
-                ret = idr_pre_get(&bat_idr, GFP_KERNEL);
-                if (ret == 0)
-                        return -ENOMEM;
-                mutex_lock(&bat_idr_lock);
-                ret = idr_get_new(&bat_idr, NULL, &id);
-                mutex_unlock(&bat_idr_lock);
-                if (ret == 0) {
-                        ret = id & MAX_ID_MASK;
-                        break;
-                } else if (ret == -EAGAIN) {
-                        continue;
-                } else {
-                        break;
-                }
-        }
-        return ret;
-}
-static void release_bat_id(int id)
-{
-        mutex_lock(&bat_idr_lock);
-        idr_remove(&bat_idr, id);
-        mutex_unlock(&bat_idr_lock);
-}
 static int w1_ds2760_add_slave(struct w1_slave *sl)
 {
@@ -158,7 +122,7 @@ static int w1_ds2760_add_slave(struct w1_slave *sl)
        int id;
        struct platform_device *pdev;
-        id = new_bat_id();
+        id = ida_simple_get(&bat_ida, 0, 0, GFP_KERNEL);
        if (id < 0) {
                ret = id;
                goto noid;
@@ -187,7 +151,7 @@ bin_attr_failed:
 pdev_add_failed:
        platform_device_unregister(pdev);
 pdev_alloc_failed:
-        release_bat_id(id);
+        ida_simple_remove(&bat_ida, id);
 noid:
 success:
        return ret;
@@ -199,7 +163,7 @@ static void w1_ds2760_remove_slave(struct w1_slave *sl)
        int id = pdev->id;
        platform_device_unregister(pdev);
-        release_bat_id(id);
+        ida_simple_remove(&bat_ida, id);
        sysfs_remove_bin_file(&sl->dev.kobj, &w1_ds2760_bin_attr);
 }
@@ -217,14 +181,14 @@ static int __init w1_ds2760_init(void)
 {
        printk(KERN_INFO "1-Wire driver for the DS2760 battery monitor "
               " chip  - (c) 2004-2005, Szabolcs Gyurko\n");
-        idr_init(&bat_idr);
+        ida_init(&bat_ida);
        return w1_register_family(&w1_ds2760_family);
 }
 static void __exit w1_ds2760_exit(void)
 {
        w1_unregister_family(&w1_ds2760_family);
-        idr_destroy(&bat_idr);
+        ida_destroy(&bat_ida);
 }
 EXPORT_SYMBOL(w1_ds2760_read);
diff --git a/drivers/w1/slaves/w1_ds2780.c b/drivers/w1/slaves/w1_ds2780.c
index 274c8f38303f..39f78c0b143c 100644
--- a/drivers/w1/slaves/w1_ds2780.c
+++ b/drivers/w1/slaves/w1_ds2780.c
@@ -26,20 +26,14 @@
 #include "../w1_family.h"
 #include "w1_ds2780.h"
-int w1_ds2780_io(struct device *dev, char *buf, int addr, size_t count,
+static int w1_ds2780_do_io(struct device *dev, char *buf, int addr,
-                        int io)
+                        size_t count, int io)
 {
        struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
-        if (!dev)
+        if (addr > DS2780_DATA_SIZE || addr < 0)
-                return -ENODEV;
+                return 0;
-        mutex_lock(&sl->master->mutex);
-        if (addr > DS2780_DATA_SIZE || addr < 0) {
-                count = 0;
-                goto out;
-        }
        count = min_t(int, count, DS2780_DATA_SIZE - addr);
        if (w1_reset_select_slave(sl) == 0) {
@@ -47,7 +41,6 @@ int w1_ds2780_io(struct device *dev, char *buf, int addr, size_t count,
                        w1_write_8(sl->master, W1_DS2780_WRITE_DATA);
                        w1_write_8(sl->master, addr);
                        w1_write_block(sl->master, buf, count);
-                        /* XXX w1_write_block returns void, not n_written */
                } else {
                        w1_write_8(sl->master, W1_DS2780_READ_DATA);
                        w1_write_8(sl->master, addr);
@@ -55,13 +48,42 @@ int w1_ds2780_io(struct device *dev, char *buf, int addr, size_t count,
                }
        }
-out:
+        return count;
+}
+int w1_ds2780_io(struct device *dev, char *buf, int addr, size_t count,
+                        int io)
+{
+        struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
+        int ret;
+        if (!dev)
+                return -ENODEV;
+        mutex_lock(&sl->master->mutex);
+        ret = w1_ds2780_do_io(dev, buf, addr, count, io);
        mutex_unlock(&sl->master->mutex);
-        return count;
+        return ret;
 }
 EXPORT_SYMBOL(w1_ds2780_io);
+int w1_ds2780_io_nolock(struct device *dev, char *buf, int addr, size_t count,
+                        int io)
+{
+        int ret;
+        if (!dev)
+                return -ENODEV;
+        ret = w1_ds2780_do_io(dev, buf, addr, count, io);
+        return ret;
+}
+EXPORT_SYMBOL(w1_ds2780_io_nolock);
 int w1_ds2780_eeprom_cmd(struct device *dev, int addr, int cmd)
 {
        struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
@@ -99,43 +121,7 @@ static struct bin_attribute w1_ds2780_bin_attr = {
        .read = w1_ds2780_read_bin,
 };
-static DEFINE_IDR(bat_idr);
+static DEFINE_IDA(bat_ida);
-static DEFINE_MUTEX(bat_idr_lock);
-static int new_bat_id(void)
-{
-        int ret;
-        while (1) {
-                int id;
-                ret = idr_pre_get(&bat_idr, GFP_KERNEL);
-                if (ret == 0)
-                        return -ENOMEM;
-                mutex_lock(&bat_idr_lock);
-                ret = idr_get_new(&bat_idr, NULL, &id);
-                mutex_unlock(&bat_idr_lock);
-                if (ret == 0) {
-                        ret = id & MAX_ID_MASK;
-                        break;
-                } else if (ret == -EAGAIN) {
-                        continue;
-                } else {
-                        break;
-                }
-        }
-        return ret;
-}
-static void release_bat_id(int id)
-{
-        mutex_lock(&bat_idr_lock);
-        idr_remove(&bat_idr, id);
-        mutex_unlock(&bat_idr_lock);
-}
 static int w1_ds2780_add_slave(struct w1_slave *sl)
 {
@@ -143,7 +129,7 @@ static int w1_ds2780_add_slave(struct w1_slave *sl)
        int id;
        struct platform_device *pdev;
-        id = new_bat_id();
+        id = ida_simple_get(&bat_ida, 0, 0, GFP_KERNEL);
        if (id < 0) {
                ret = id;
                goto noid;
@@ -172,7 +158,7 @@ bin_attr_failed:
 pdev_add_failed:
        platform_device_unregister(pdev);
 pdev_alloc_failed:
-        release_bat_id(id);
+        ida_simple_remove(&bat_ida, id);
 noid:
        return ret;
 }
@@ -183,7 +169,7 @@ static void w1_ds2780_remove_slave(struct w1_slave *sl)
        int id = pdev->id;
        platform_device_unregister(pdev);
-        release_bat_id(id);
+        ida_simple_remove(&bat_ida, id);
        sysfs_remove_bin_file(&sl->dev.kobj, &w1_ds2780_bin_attr);
 }
@@ -199,14 +185,14 @@ static struct w1_family w1_ds2780_family = {
 static int __init w1_ds2780_init(void)
 {
-        idr_init(&bat_idr);
+        ida_init(&bat_ida);
        return w1_register_family(&w1_ds2780_family);
 }
 static void __exit w1_ds2780_exit(void)
 {
        w1_unregister_family(&w1_ds2780_family);
-        idr_destroy(&bat_idr);
+        ida_destroy(&bat_ida);
 }
 module_init(w1_ds2780_init);
diff --git a/drivers/w1/slaves/w1_ds2780.h b/drivers/w1/slaves/w1_ds2780.h
index a1fba79eb1b5..737379365021 100644
--- a/drivers/w1/slaves/w1_ds2780.h
+++ b/drivers/w1/slaves/w1_ds2780.h
@@ -124,6 +124,8 @@
 extern int w1_ds2780_io(struct device *dev, char *buf, int addr, size_t count,
                        int io);
+extern int w1_ds2780_io_nolock(struct device *dev, char *buf, int addr,
+                        size_t count, int io);
 extern int w1_ds2780_eeprom_cmd(struct device *dev, int addr, int cmd);
 #endif /* !_W1_DS2780_H */
diff --git a/drivers/w1/w1_family.c b/drivers/w1/w1_family.c
index 63359797c8b1..e9309778ee72 100644
--- a/drivers/w1/w1_family.c
+++ b/drivers/w1/w1_family.c
@@ -23,6 +23,7 @@
 #include <linux/list.h>
 #include <linux/sched.h>        /* schedule_timeout() */
 #include <linux/delay.h>
+#include <linux/export.h>
 #include "w1_family.h"
 #include "w1.h"
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index d220bce2cee4..68288355727a 100644
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -24,6 +24,8 @@
 #include <linux/delay.h>
 #include <linux/kthread.h>
 #include <linux/slab.h>
+#include <linux/export.h>
+#include <linux/moduleparam.h>
 #include "w1.h"
 #include "w1_log.h"
@@ -78,6 +80,7 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
        memcpy(&dev->dev, device, sizeof(struct device));
        dev_set_name(&dev->dev, "w1_bus_master%u", dev->id);
        snprintf(dev->name, sizeof(dev->name), "w1_bus_master%u", dev->id);
+        dev->dev.init_name = dev->name;
        dev->driver = driver;
diff --git a/drivers/w1/w1_io.c b/drivers/w1/w1_io.c
index 765b37b62a4f..3135b2c63998 100644
--- a/drivers/w1/w1_io.c
+++ b/drivers/w1/w1_io.c
@@ -158,13 +158,18 @@ EXPORT_SYMBOL_GPL(w1_write_8);
 static u8 w1_read_bit(struct w1_master *dev)
 {
        int result;
+        unsigned long flags;
+        /* sample timing is critical here */
+        local_irq_save(flags);
        dev->bus_master->write_bit(dev->bus_master->data, 0);
        w1_delay(6);
        dev->bus_master->write_bit(dev->bus_master->data, 1);
        w1_delay(9);
        result = dev->bus_master->read_bit(dev->bus_master->data);
+        local_irq_restore(flags);
        w1_delay(55);
        return result & 0x1;
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 86b0735e6aa0..6285867a9356 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -66,6 +66,7 @@ config SOFT_WATCHDOG
 config WM831X_WATCHDOG
        tristate "WM831x watchdog"
        depends on MFD_WM831X
+        select WATCHDOG_CORE
        help
          Support for the watchdog in the WM831x AudioPlus PMICs.  When
          the watchdog triggers the system will be reset.
@@ -170,6 +171,7 @@ config HAVE_S3C2410_WATCHDOG
 config S3C2410_WATCHDOG
        tristate "S3C2410 Watchdog"
        depends on ARCH_S3C2410 || HAVE_S3C2410_WATCHDOG
+        select WATCHDOG_CORE
        help
          Watchdog timer block in the Samsung SoCs. This will reboot
          the system when the timer expires with the watchdog enabled.
@@ -726,7 +728,7 @@ config SBC8360_WDT
 config SBC7240_WDT
        tristate "SBC Nano 7240 Watchdog Timer"
-        depends on X86_32
+        depends on X86_32 && !UML
        ---help---
          This is the driver for the hardware watchdog found on the IEI
          single board computers EPIC Nano 7240 (and likely others). This
@@ -1174,6 +1176,10 @@ config XEN_WDT
          by Xen 4.0 and newer.  The watchdog timeout period is normally one
          minute but can be changed with a boot-time parameter.
+config UML_WATCHDOG
+        tristate "UML watchdog"
+        depends on UML
 #
 # ISA-based Watchdog Cards
 #
diff --git a/drivers/watchdog/coh901327_wdt.c b/drivers/watchdog/coh901327_wdt.c
index 9291506b8b23..03f449a430d2 100644
--- a/drivers/watchdog/coh901327_wdt.c
+++ b/drivers/watchdog/coh901327_wdt.c
@@ -429,7 +429,7 @@ static int __init coh901327_probe(struct platform_device *pdev)
        writew(U300_WDOG_SR_RESET_STATUS_RESET, virtbase + U300_WDOG_SR);
        irq = platform_get_irq(pdev, 0);
-        if (request_irq(irq, coh901327_interrupt, IRQF_DISABLED,
+        if (request_irq(irq, coh901327_interrupt, 0,
                        DRV_NAME " Bark", pdev)) {
                ret = -EIO;
                goto out_no_irq;
diff --git a/drivers/watchdog/eurotechwdt.c b/drivers/watchdog/eurotechwdt.c
index f1d1da662fbe..41018d429abb 100644
--- a/drivers/watchdog/eurotechwdt.c
+++ b/drivers/watchdog/eurotechwdt.c
@@ -427,7 +427,7 @@ static int __init eurwdt_init(void)
 {
        int ret;
-        ret = request_irq(irq, eurwdt_interrupt, IRQF_DISABLED, "eurwdt", NULL);
+        ret = request_irq(irq, eurwdt_interrupt, 0, "eurwdt", NULL);
        if (ret) {
                printk(KERN_ERR "eurwdt: IRQ %d is not free.\n", irq);
                goto out;
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index 751a591684da..ba6ad662635a 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -1,7 +1,7 @@
 /*
 *      intel TCO Watchdog Driver
 *
- *      (c) Copyright 2006-2010 Wim Van Sebroeck <wim@iguana.be>.
+ *      (c) Copyright 2006-2011 Wim Van Sebroeck <wim@iguana.be>.
 *
 *      This program is free software; you can redistribute it and/or
 *      modify it under the terms of the GNU General Public License
@@ -44,7 +44,7 @@
 /* Module and version information */
 #define DRV_NAME        "iTCO_wdt"
-#define DRV_VERSION     "1.06"
+#define DRV_VERSION     "1.07"
 #define PFX             DRV_NAME ": "
 /* Includes */
@@ -384,6 +384,11 @@ MODULE_PARM_DESC(nowayout,
        "Watchdog cannot be stopped once started (default="
                                __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+static int turn_SMI_watchdog_clear_off = 0;
+module_param(turn_SMI_watchdog_clear_off, int, 0);
+MODULE_PARM_DESC(turn_SMI_watchdog_clear_off,
+        "Turn off SMI clearing watchdog (default=0)");
 /*
 * Some TCO specific functions
 */
@@ -808,10 +813,12 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,
                ret = -EIO;
                goto out_unmap;
        }
-        /* Bit 13: TCO_EN -> 0 = Disables TCO logic generating an SMI# */
+        if (turn_SMI_watchdog_clear_off) {
-        val32 = inl(SMI_EN);
+                /* Bit 13: TCO_EN -> 0 = Disables TCO logic generating an SMI# */
-        val32 &= 0xffffdfff;    /* Turn off SMI clearing watchdog */
+                val32 = inl(SMI_EN);
-        outl(val32, SMI_EN);
+                val32 &= 0xffffdfff;    /* Turn off SMI clearing watchdog */
+                outl(val32, SMI_EN);
+        }
        /* The TCO I/O registers reside in a 32-byte range pointed to
           by the TCOBASE value */
diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c
index 4dc31024d26c..82ccd36e2c90 100644
--- a/drivers/watchdog/mpcore_wdt.c
+++ b/drivers/watchdog/mpcore_wdt.c
@@ -367,8 +367,7 @@ static int __devinit mpcore_wdt_probe(struct platform_device *dev)
                goto err_misc;
        }
-        ret = request_irq(wdt->irq, mpcore_wdt_fire, IRQF_DISABLED,
+        ret = request_irq(wdt->irq, mpcore_wdt_fire, 0, "mpcore_wdt", wdt);
-                                                        "mpcore_wdt", wdt);
        if (ret) {
                dev_printk(KERN_ERR, wdt->dev,
                        "cannot register IRQ%d for watchdog\n", wdt->irq);
diff --git a/drivers/watchdog/octeon-wdt-main.c b/drivers/watchdog/octeon-wdt-main.c
index 945ee8300306..7c0d8630e641 100644
--- a/drivers/watchdog/octeon-wdt-main.c
+++ b/drivers/watchdog/octeon-wdt-main.c
@@ -402,7 +402,7 @@ static void octeon_wdt_setup_interrupt(int cpu)
        irq = OCTEON_IRQ_WDOG0 + core;
        if (request_irq(irq, octeon_wdt_poke_irq,
-                        IRQF_DISABLED, "octeon_wdt", octeon_wdt_poke_irq))
+                        IRQF_NO_THREAD, "octeon_wdt", octeon_wdt_poke_irq))
                panic("octeon_wdt: Couldn't obtain irq %d", irq);
        cpumask_set_cpu(cpu, &irq_enabled_cpus);
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 30da88f47cd3..5de7e4fa5b8a 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -27,9 +27,8 @@
 #include <linux/moduleparam.h>
 #include <linux/types.h>
 #include <linux/timer.h>
-#include <linux/miscdevice.h>
+#include <linux/miscdevice.h> /* for MODULE_ALIAS_MISCDEV */
 #include <linux/watchdog.h>
-#include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
@@ -38,6 +37,7 @@
 #include <linux/io.h>
 #include <linux/cpufreq.h>
 #include <linux/slab.h>
+#include <linux/err.h>
 #include <mach/map.h>
@@ -74,14 +74,12 @@ MODULE_PARM_DESC(soft_noboot, "Watchdog action, set to 1 to ignore reboots, "
                        "0 to reboot (default 0)");
 MODULE_PARM_DESC(debug, "Watchdog debug, set to >1 for debug (default 0)");
-static unsigned long open_lock;
 static struct device    *wdt_dev;       /* platform device attached to */
 static struct resource  *wdt_mem;
 static struct resource  *wdt_irq;
 static struct clk       *wdt_clock;
 static void __iomem     *wdt_base;
 static unsigned int      wdt_count;
-static char              expect_close;
 static DEFINE_SPINLOCK(wdt_lock);
 /* watchdog control routines */
@@ -93,11 +91,13 @@ static DEFINE_SPINLOCK(wdt_lock);
 /* functions */
-static void s3c2410wdt_keepalive(void)
+static int s3c2410wdt_keepalive(struct watchdog_device *wdd)
 {
        spin_lock(&wdt_lock);
        writel(wdt_count, wdt_base + S3C2410_WTCNT);
        spin_unlock(&wdt_lock);
+        return 0;
 }
 static void __s3c2410wdt_stop(void)
@@ -109,14 +109,16 @@ static void __s3c2410wdt_stop(void)
        writel(wtcon, wdt_base + S3C2410_WTCON);
 }
-static void s3c2410wdt_stop(void)
+static int s3c2410wdt_stop(struct watchdog_device *wdd)
 {
        spin_lock(&wdt_lock);
        __s3c2410wdt_stop();
        spin_unlock(&wdt_lock);
+        return 0;
 }
-static void s3c2410wdt_start(void)
+static int s3c2410wdt_start(struct watchdog_device *wdd)
 {
        unsigned long wtcon;
@@ -142,6 +144,8 @@ static void s3c2410wdt_start(void)
        writel(wdt_count, wdt_base + S3C2410_WTCNT);
        writel(wtcon, wdt_base + S3C2410_WTCON);
        spin_unlock(&wdt_lock);
+        return 0;
 }
 static inline int s3c2410wdt_is_running(void)
@@ -149,7 +153,7 @@ static inline int s3c2410wdt_is_running(void)
        return readl(wdt_base + S3C2410_WTCON) & S3C2410_WTCON_ENABLE;
 }
-static int s3c2410wdt_set_heartbeat(int timeout)
+static int s3c2410wdt_set_heartbeat(struct watchdog_device *wdd, unsigned timeout)
 {
        unsigned long freq = clk_get_rate(wdt_clock);
        unsigned int count;
@@ -182,8 +186,6 @@ static int s3c2410wdt_set_heartbeat(int timeout)
                }
        }
-        tmr_margin = timeout;
        DBG("%s: timeout=%d, divisor=%d, count=%d (%08x)\n",
            __func__, timeout, divisor, count, count/divisor);
@@ -201,70 +203,6 @@ static int s3c2410wdt_set_heartbeat(int timeout)
        return 0;
 }
-/*
- *      /dev/watchdog handling
- */
-static int s3c2410wdt_open(struct inode *inode, struct file *file)
-{
-        if (test_and_set_bit(0, &open_lock))
-                return -EBUSY;
-        if (nowayout)
-                __module_get(THIS_MODULE);
-        expect_close = 0;
-        /* start the timer */
-        s3c2410wdt_start();
-        return nonseekable_open(inode, file);
-}
-static int s3c2410wdt_release(struct inode *inode, struct file *file)
-{
-        /*
-         *      Shut off the timer.
-         *      Lock it in if it's a module and we set nowayout
-         */
-        if (expect_close == 42)
-                s3c2410wdt_stop();
-        else {
-                dev_err(wdt_dev, "Unexpected close, not stopping watchdog\n");
-                s3c2410wdt_keepalive();
-        }
-        expect_close = 0;
-        clear_bit(0, &open_lock);
-        return 0;
-}
-static ssize_t s3c2410wdt_write(struct file *file, const char __user *data,
-                                size_t len, loff_t *ppos)
-{
-        /*
-         *      Refresh the timer.
-         */
-        if (len) {
-                if (!nowayout) {
-                        size_t i;
-                        /* In case it was set long ago */
-                        expect_close = 0;
-                        for (i = 0; i != len; i++) {
-                                char c;
-                                if (get_user(c, data + i))
-                                        return -EFAULT;
-                                if (c == 'V')
-                                        expect_close = 42;
-                        }
-                }
-                s3c2410wdt_keepalive();
-        }
-        return len;
-}
 #define OPTIONS (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE)
 static const struct watchdog_info s3c2410_wdt_ident = {
@@ -273,53 +211,17 @@ static const struct watchdog_info s3c2410_wdt_ident = {
        .identity         =     "S3C2410 Watchdog",
 };
+static struct watchdog_ops s3c2410wdt_ops = {
-static long s3c2410wdt_ioctl(struct file *file, unsigned int cmd,
+        .owner = THIS_MODULE,
-                                                        unsigned long arg)
+        .start = s3c2410wdt_start,
-{
+        .stop = s3c2410wdt_stop,
-        void __user *argp = (void __user *)arg;
+        .ping = s3c2410wdt_keepalive,
-        int __user *p = argp;
+        .set_timeout = s3c2410wdt_set_heartbeat,
-        int new_margin;
-        switch (cmd) {
-        case WDIOC_GETSUPPORT:
-                return copy_to_user(argp, &s3c2410_wdt_ident,
-                        sizeof(s3c2410_wdt_ident)) ? -EFAULT : 0;
-        case WDIOC_GETSTATUS:
-        case WDIOC_GETBOOTSTATUS:
-                return put_user(0, p);
-        case WDIOC_KEEPALIVE:
-                s3c2410wdt_keepalive();
-                return 0;
-        case WDIOC_SETTIMEOUT:
-                if (get_user(new_margin, p))
-                        return -EFAULT;
-                if (s3c2410wdt_set_heartbeat(new_margin))
-                        return -EINVAL;
-                s3c2410wdt_keepalive();
-                return put_user(tmr_margin, p);
-        case WDIOC_GETTIMEOUT:
-                return put_user(tmr_margin, p);
-        default:
-                return -ENOTTY;
-        }
-}
-/* kernel interface */
-static const struct file_operations s3c2410wdt_fops = {
-        .owner          = THIS_MODULE,
-        .llseek         = no_llseek,
-        .write          = s3c2410wdt_write,
-        .unlocked_ioctl = s3c2410wdt_ioctl,
-        .open           = s3c2410wdt_open,
-        .release        = s3c2410wdt_release,
 };
-static struct miscdevice s3c2410wdt_miscdev = {
+static struct watchdog_device s3c2410_wdd = {
-        .minor          = WATCHDOG_MINOR,
+        .info = &s3c2410_wdt_ident,
-        .name           = "watchdog",
+        .ops = &s3c2410wdt_ops,
-        .fops           = &s3c2410wdt_fops,
 };
 /* interrupt handler code */
@@ -328,7 +230,7 @@ static irqreturn_t s3c2410wdt_irq(int irqno, void *param)
 {
        dev_info(wdt_dev, "watchdog timer expired (irq)\n");
-        s3c2410wdt_keepalive();
+        s3c2410wdt_keepalive(&s3c2410_wdd);
        return IRQ_HANDLED;
 }
@@ -349,14 +251,14 @@ static int s3c2410wdt_cpufreq_transition(struct notifier_block *nb,
                 * the watchdog is running.
                 */
-                s3c2410wdt_keepalive();
+                s3c2410wdt_keepalive(&s3c2410_wdd);
        } else if (val == CPUFREQ_POSTCHANGE) {
-                s3c2410wdt_stop();
+                s3c2410wdt_stop(&s3c2410_wdd);
-                ret = s3c2410wdt_set_heartbeat(tmr_margin);
+                ret = s3c2410wdt_set_heartbeat(&s3c2410_wdd, s3c2410_wdd.timeout);
                if (ret >= 0)
-                        s3c2410wdt_start();
+                        s3c2410wdt_start(&s3c2410_wdd);
                else
                        goto err;
        }
@@ -365,7 +267,8 @@ done:
        return 0;
 err:
-        dev_err(wdt_dev, "cannot set new value for timeout %d\n", tmr_margin);
+        dev_err(wdt_dev, "cannot set new value for timeout %d\n",
+                                s3c2410_wdd.timeout);
        return ret;
 }
@@ -396,10 +299,6 @@ static inline void s3c2410wdt_cpufreq_deregister(void)
 }
 #endif
-/* device interface */
 static int __devinit s3c2410wdt_probe(struct platform_device *pdev)
 {
        struct device *dev;
@@ -466,8 +365,8 @@ static int __devinit s3c2410wdt_probe(struct platform_device *pdev)
        /* see if we can actually set the requested timer margin, and if
         * not, try the default value */
-        if (s3c2410wdt_set_heartbeat(tmr_margin)) {
+        if (s3c2410wdt_set_heartbeat(&s3c2410_wdd, tmr_margin)) {
-                started = s3c2410wdt_set_heartbeat(
+                started = s3c2410wdt_set_heartbeat(&s3c2410_wdd,
                                        CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME);
                if (started == 0)
@@ -479,22 +378,21 @@ static int __devinit s3c2410wdt_probe(struct platform_device *pdev)
                                                        "cannot start\n");
        }
-        ret = misc_register(&s3c2410wdt_miscdev);
+        ret = watchdog_register_device(&s3c2410_wdd);
        if (ret) {
-                dev_err(dev, "cannot register miscdev on minor=%d (%d)\n",
+                dev_err(dev, "cannot register watchdog (%d)\n", ret);
-                        WATCHDOG_MINOR, ret);
                goto err_cpufreq;
        }
        if (tmr_atboot && started == 0) {
                dev_info(dev, "starting watchdog timer\n");
-                s3c2410wdt_start();
+                s3c2410wdt_start(&s3c2410_wdd);
        } else if (!tmr_atboot) {
                /* if we're not enabling the watchdog, then ensure it is
                 * disabled if it has been left running from the bootloader
                 * or other source */
-                s3c2410wdt_stop();
+                s3c2410wdt_stop(&s3c2410_wdd);
        }
        /* print out a statement of readiness */
@@ -530,7 +428,7 @@ static int __devinit s3c2410wdt_probe(struct platform_device *pdev)
 static int __devexit s3c2410wdt_remove(struct platform_device *dev)
 {
-        misc_deregister(&s3c2410wdt_miscdev);
+        watchdog_unregister_device(&s3c2410_wdd);
        s3c2410wdt_cpufreq_deregister();
@@ -550,7 +448,7 @@ static int __devexit s3c2410wdt_remove(struct platform_device *dev)
 static void s3c2410wdt_shutdown(struct platform_device *dev)
 {
-        s3c2410wdt_stop();
+        s3c2410wdt_stop(&s3c2410_wdd);
 }
 #ifdef CONFIG_PM
@@ -565,7 +463,7 @@ static int s3c2410wdt_suspend(struct platform_device *dev, pm_message_t state)
        wtdat_save = readl(wdt_base + S3C2410_WTDAT);
        /* Note that WTCNT doesn't need to be saved. */
-        s3c2410wdt_stop();
+        s3c2410wdt_stop(&s3c2410_wdd);
        return 0;
 }
diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c
index f31493e65b38..b01a30e5a663 100644
--- a/drivers/watchdog/sb_wdog.c
+++ b/drivers/watchdog/sb_wdog.c
@@ -300,7 +300,7 @@ static int __init sbwdog_init(void)
         * get the resources
         */
-        ret = request_irq(1, sbwdog_interrupt, IRQF_DISABLED | IRQF_SHARED,
+        ret = request_irq(1, sbwdog_interrupt, IRQF_SHARED,
                ident.identity, (void *)user_dog);
        if (ret) {
                printk(KERN_ERR "%s: failed to request irq 1 - %d\n",
@@ -350,7 +350,7 @@ void platform_wd_setup(void)
 {
        int ret;
-        ret = request_irq(1, sbwdog_interrupt, IRQF_DISABLED | IRQF_SHARED,
+        ret = request_irq(1, sbwdog_interrupt, IRQF_SHARED,
                "Kernel Watchdog", IOADDR(A_SCD_WDOG_CFG_0));
        if (ret) {
                printk(KERN_CRIT
diff --git a/drivers/watchdog/sc520_wdt.c b/drivers/watchdog/sc520_wdt.c
index 52b63f2f0dac..b2840409ebc7 100644
--- a/drivers/watchdog/sc520_wdt.c
+++ b/drivers/watchdog/sc520_wdt.c
@@ -398,7 +398,7 @@ static int __init sc520_wdt_init(void)
                                                        WATCHDOG_TIMEOUT);
        }
-        wdtmrctl = ioremap((unsigned long)(MMCR_BASE + OFFS_WDTMRCTL), 2);
+        wdtmrctl = ioremap(MMCR_BASE + OFFS_WDTMRCTL, 2);
        if (!wdtmrctl) {
                printk(KERN_ERR PFX "Unable to remap memory\n");
                rc = -ENOMEM;
diff --git a/drivers/watchdog/stmp3xxx_wdt.c b/drivers/watchdog/stmp3xxx_wdt.c
index b3421fd2cda8..ac2346a452e5 100644
--- a/drivers/watchdog/stmp3xxx_wdt.c
+++ b/drivers/watchdog/stmp3xxx_wdt.c
@@ -14,6 +14,7 @@
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
 #include <linux/uaccess.h>
+#include <linux/module.h>
 #include <mach/platform.h>
 #include <mach/regs-rtc.h>
diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
index e5c91d4404ed..dd5d67548758 100644
--- a/drivers/watchdog/w83627hf_wdt.c
+++ b/drivers/watchdog/w83627hf_wdt.c
@@ -142,7 +142,7 @@ static void w83627hf_init(void)
        w83627hf_unselect_wd_register();
 }
-static void wdt_ctrl(int timeout)
+static void wdt_set_time(int timeout)
 {
        spin_lock(&io_lock);
@@ -158,13 +158,13 @@ static void wdt_ctrl(int timeout)
 static int wdt_ping(void)
 {
-        wdt_ctrl(timeout);
+        wdt_set_time(timeout);
        return 0;
 }
 static int wdt_disable(void)
 {
-        wdt_ctrl(0);
+        wdt_set_time(0);
        return 0;
 }
@@ -176,6 +176,24 @@ static int wdt_set_heartbeat(int t)
        return 0;
 }
+static int wdt_get_time(void)
+{
+        int timeleft;
+        spin_lock(&io_lock);
+        w83627hf_select_wd_register();
+        outb_p(0xF6, WDT_EFER);    /* Select CRF6 */
+        timeleft = inb_p(WDT_EFDR); /* Read Timeout counter to CRF6 */
+        w83627hf_unselect_wd_register();
+        spin_unlock(&io_lock);
+        return timeleft;
+}
 static ssize_t wdt_write(struct file *file, const char __user *buf,
                                                size_t count, loff_t *ppos)
 {
@@ -202,7 +220,7 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
        void __user *argp = (void __user *)arg;
        int __user *p = argp;
-        int new_timeout;
+        int timeval;
        static const struct watchdog_info ident = {
                .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT |
                                                        WDIOF_MAGICCLOSE,
@@ -238,14 +256,17 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                wdt_ping();
                break;
        case WDIOC_SETTIMEOUT:
-                if (get_user(new_timeout, p))
+                if (get_user(timeval, p))
                        return -EFAULT;
-                if (wdt_set_heartbeat(new_timeout))
+                if (wdt_set_heartbeat(timeval))
                        return -EINVAL;
                wdt_ping();
                /* Fall */
        case WDIOC_GETTIMEOUT:
                return put_user(timeout, p);
+        case WDIOC_GETTIMELEFT:
+                timeval = wdt_get_time();
+                return put_user(timeval, p);
        default:
                return -ENOTTY;
        }
diff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c
index bb03e151a1d0..d2ef002be96b 100644
--- a/drivers/watchdog/wdt.c
+++ b/drivers/watchdog/wdt.c
@@ -612,7 +612,7 @@ static int __init wdt_init(void)
                goto out;
        }
-        ret = request_irq(irq, wdt_interrupt, IRQF_DISABLED, "wdt501p", NULL);
+        ret = request_irq(irq, wdt_interrupt, 0, "wdt501p", NULL);
        if (ret) {
                printk(KERN_ERR "wdt: IRQ %d is not free.\n", irq);
                goto outreg;
diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c
index 172dad6c7693..e0fc3baa9197 100644
--- a/drivers/watchdog/wdt_pci.c
+++ b/drivers/watchdog/wdt_pci.c
@@ -643,7 +643,7 @@ static int __devinit wdtpci_init_one(struct pci_dev *dev,
        irq = dev->irq;
        io = pci_resource_start(dev, 2);
-        if (request_irq(irq, wdtpci_interrupt, IRQF_DISABLED | IRQF_SHARED,
+        if (request_irq(irq, wdtpci_interrupt, IRQF_SHARED,
                         "wdt_pci", &wdtpci_miscdev)) {
                printk(KERN_ERR PFX "IRQ %d is not free\n", irq);
                goto out_reg;
diff --git a/drivers/watchdog/wm831x_wdt.c b/drivers/watchdog/wm831x_wdt.c
index 871caea4e1c6..7be38556aed0 100644
--- a/drivers/watchdog/wm831x_wdt.c
+++ b/drivers/watchdog/wm831x_wdt.c
@@ -12,8 +12,7 @@
 #include <linux/moduleparam.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/fs.h>
+#include <linux/slab.h>
-#include <linux/miscdevice.h>
 #include <linux/platform_device.h>
 #include <linux/watchdog.h>
 #include <linux/uaccess.h>
@@ -29,19 +28,19 @@ MODULE_PARM_DESC(nowayout,
                 "Watchdog cannot be stopped once started (default="
                 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
-static unsigned long wm831x_wdt_users;
+struct wm831x_wdt_drvdata {
-static struct miscdevice wm831x_wdt_miscdev;
+        struct watchdog_device wdt;
-static int wm831x_wdt_expect_close;
+        struct wm831x *wm831x;
-static DEFINE_MUTEX(wdt_mutex);
+        struct mutex lock;
-static struct wm831x *wm831x;
+        int update_gpio;
-static unsigned int update_gpio;
+        int update_state;
-static unsigned int update_state;
+};
 /* We can't use the sub-second values here but they're included
 * for completeness.  */
 static struct {
-        int time;  /* Seconds */
+        unsigned int time;  /* Seconds */
-        u16 val;   /* WDOG_TO value */
+        u16 val;            /* WDOG_TO value */
 } wm831x_wdt_cfgs[] = {
        {  1, 2 },
        {  2, 3 },
@@ -52,32 +51,13 @@ static struct {
        { 33, 7 },  /* Actually 32.768s so include both, others round down */
 };
-static int wm831x_wdt_set_timeout(struct wm831x *wm831x, u16 value)
+static int wm831x_wdt_start(struct watchdog_device *wdt_dev)
-{
-        int ret;
-        mutex_lock(&wdt_mutex);
-        ret = wm831x_reg_unlock(wm831x);
-        if (ret == 0) {
-                ret = wm831x_set_bits(wm831x, WM831X_WATCHDOG,
-                                      WM831X_WDOG_TO_MASK, value);
-                wm831x_reg_lock(wm831x);
-        } else {
-                dev_err(wm831x->dev, "Failed to unlock security key: %d\n",
-                        ret);
-        }
-        mutex_unlock(&wdt_mutex);
-        return ret;
-}
-static int wm831x_wdt_start(struct wm831x *wm831x)
 {
+        struct wm831x_wdt_drvdata *driver_data = watchdog_get_drvdata(wdt_dev);
+        struct wm831x *wm831x = driver_data->wm831x;
        int ret;
-        mutex_lock(&wdt_mutex);
+        mutex_lock(&driver_data->lock);
        ret = wm831x_reg_unlock(wm831x);
        if (ret == 0) {
@@ -89,16 +69,18 @@ static int wm831x_wdt_start(struct wm831x *wm831x)
                        ret);
        }
-        mutex_unlock(&wdt_mutex);
+        mutex_unlock(&driver_data->lock);
        return ret;
 }
-static int wm831x_wdt_stop(struct wm831x *wm831x)
+static int wm831x_wdt_stop(struct watchdog_device *wdt_dev)
 {
+        struct wm831x_wdt_drvdata *driver_data = watchdog_get_drvdata(wdt_dev);
+        struct wm831x *wm831x = driver_data->wm831x;
        int ret;
-        mutex_lock(&wdt_mutex);
+        mutex_lock(&driver_data->lock);
        ret = wm831x_reg_unlock(wm831x);
        if (ret == 0) {
@@ -110,26 +92,28 @@ static int wm831x_wdt_stop(struct wm831x *wm831x)
                        ret);
        }
-        mutex_unlock(&wdt_mutex);
+        mutex_unlock(&driver_data->lock);
        return ret;
 }
-static int wm831x_wdt_kick(struct wm831x *wm831x)
+static int wm831x_wdt_ping(struct watchdog_device *wdt_dev)
 {
+        struct wm831x_wdt_drvdata *driver_data = watchdog_get_drvdata(wdt_dev);
+        struct wm831x *wm831x = driver_data->wm831x;
        int ret;
        u16 reg;
-        mutex_lock(&wdt_mutex);
+        mutex_lock(&driver_data->lock);
-        if (update_gpio) {
+        if (driver_data->update_gpio) {
-                gpio_set_value_cansleep(update_gpio, update_state);
+                gpio_set_value_cansleep(driver_data->update_gpio,
-                update_state = !update_state;
+                                        driver_data->update_state);
+                driver_data->update_state = !driver_data->update_state;
                ret = 0;
                goto out;
        }
        reg = wm831x_reg_read(wm831x, WM831X_WATCHDOG);
        if (!(reg & WM831X_WDOG_RST_SRC)) {
@@ -150,182 +134,59 @@ static int wm831x_wdt_kick(struct wm831x *wm831x)
        }
 out:
-        mutex_unlock(&wdt_mutex);
+        mutex_unlock(&driver_data->lock);
        return ret;
 }
-static int wm831x_wdt_open(struct inode *inode, struct file *file)
+static int wm831x_wdt_set_timeout(struct watchdog_device *wdt_dev,
+                                  unsigned int timeout)
 {
-        int ret;
+        struct wm831x_wdt_drvdata *driver_data = watchdog_get_drvdata(wdt_dev);
+        struct wm831x *wm831x = driver_data->wm831x;
-        if (!wm831x)
+        int ret, i;
-                return -ENODEV;
-        if (test_and_set_bit(0, &wm831x_wdt_users))
-                return -EBUSY;
-        ret = wm831x_wdt_start(wm831x);
+        for (i = 0; i < ARRAY_SIZE(wm831x_wdt_cfgs); i++)
-        if (ret != 0)
+                if (wm831x_wdt_cfgs[i].time == timeout)
-                return ret;
+                        break;
+        if (i == ARRAY_SIZE(wm831x_wdt_cfgs))
-        return nonseekable_open(inode, file);
+                ret = -EINVAL;
-}
-static int wm831x_wdt_release(struct inode *inode, struct file *file)
+        ret = wm831x_reg_unlock(wm831x);
-{
+        if (ret == 0) {
-        if (wm831x_wdt_expect_close)
+                ret = wm831x_set_bits(wm831x, WM831X_WATCHDOG,
-                wm831x_wdt_stop(wm831x);
+                                      WM831X_WDOG_TO_MASK,
-        else {
+                                      wm831x_wdt_cfgs[i].val);
-                dev_warn(wm831x->dev, "Watchdog device closed uncleanly\n");
+                wm831x_reg_lock(wm831x);
-                wm831x_wdt_kick(wm831x);
+        } else {
+                dev_err(wm831x->dev, "Failed to unlock security key: %d\n",
+                        ret);
        }
-        clear_bit(0, &wm831x_wdt_users);
+        return ret;
-        return 0;
-}
-static ssize_t wm831x_wdt_write(struct file *file,
-                                const char __user *data, size_t count,
-                                loff_t *ppos)
-{
-        size_t i;
-        if (count) {
-                wm831x_wdt_kick(wm831x);
-                if (!nowayout) {
-                        /* In case it was set long ago */
-                        wm831x_wdt_expect_close = 0;
-                        /* scan to see whether or not we got the magic
-                           character */
-                        for (i = 0; i != count; i++) {
-                                char c;
-                                if (get_user(c, data + i))
-                                        return -EFAULT;
-                                if (c == 'V')
-                                        wm831x_wdt_expect_close = 42;
-                        }
-                }
-        }
-        return count;
 }
-static const struct watchdog_info ident = {
+static const struct watchdog_info wm831x_wdt_info = {
        .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,
        .identity = "WM831x Watchdog",
 };
-static long wm831x_wdt_ioctl(struct file *file, unsigned int cmd,
+static const struct watchdog_ops wm831x_wdt_ops = {
-                             unsigned long arg)
-{
-        int ret = -ENOTTY, time, i;
-        void __user *argp = (void __user *)arg;
-        int __user *p = argp;
-        u16 reg;
-        switch (cmd) {
-        case WDIOC_GETSUPPORT:
-                ret = copy_to_user(argp, &ident, sizeof(ident)) ? -EFAULT : 0;
-                break;
-        case WDIOC_GETSTATUS:
-        case WDIOC_GETBOOTSTATUS:
-                ret = put_user(0, p);
-                break;
-        case WDIOC_SETOPTIONS:
-        {
-                int options;
-                if (get_user(options, p))
-                        return -EFAULT;
-                ret = -EINVAL;
-                /* Setting both simultaneously means at least one must fail */
-                if (options == WDIOS_DISABLECARD)
-                        ret = wm831x_wdt_start(wm831x);
-                if (options == WDIOS_ENABLECARD)
-                        ret = wm831x_wdt_stop(wm831x);
-                break;
-        }
-        case WDIOC_KEEPALIVE:
-                ret = wm831x_wdt_kick(wm831x);
-                break;
-        case WDIOC_SETTIMEOUT:
-                ret = get_user(time, p);
-                if (ret)
-                        break;
-                if (time == 0) {
-                        if (nowayout)
-                                ret = -EINVAL;
-                        else
-                                wm831x_wdt_stop(wm831x);
-                        break;
-                }
-                for (i = 0; i < ARRAY_SIZE(wm831x_wdt_cfgs); i++)
-                        if (wm831x_wdt_cfgs[i].time == time)
-                                break;
-                if (i == ARRAY_SIZE(wm831x_wdt_cfgs))
-                        ret = -EINVAL;
-                else
-                        ret = wm831x_wdt_set_timeout(wm831x,
-                                                     wm831x_wdt_cfgs[i].val);
-                break;
-        case WDIOC_GETTIMEOUT:
-                reg = wm831x_reg_read(wm831x, WM831X_WATCHDOG);
-                reg &= WM831X_WDOG_TO_MASK;
-                for (i = 0; i < ARRAY_SIZE(wm831x_wdt_cfgs); i++)
-                        if (wm831x_wdt_cfgs[i].val == reg)
-                                break;
-                if (i == ARRAY_SIZE(wm831x_wdt_cfgs)) {
-                        dev_warn(wm831x->dev,
-                                 "Unknown watchdog configuration: %x\n", reg);
-                        ret = -EINVAL;
-                } else
-                        ret = put_user(wm831x_wdt_cfgs[i].time, p);
-        }
-        return ret;
-}
-static const struct file_operations wm831x_wdt_fops = {
        .owner = THIS_MODULE,
-        .llseek = no_llseek,
+        .start = wm831x_wdt_start,
-        .write = wm831x_wdt_write,
+        .stop = wm831x_wdt_stop,
-        .unlocked_ioctl = wm831x_wdt_ioctl,
+        .ping = wm831x_wdt_ping,
-        .open = wm831x_wdt_open,
+        .set_timeout = wm831x_wdt_set_timeout,
-        .release = wm831x_wdt_release,
-};
-static struct miscdevice wm831x_wdt_miscdev = {
-        .minor = WATCHDOG_MINOR,
-        .name = "watchdog",
-        .fops = &wm831x_wdt_fops,
 };
 static int __devinit wm831x_wdt_probe(struct platform_device *pdev)
 {
+        struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
        struct wm831x_pdata *chip_pdata;
        struct wm831x_watchdog_pdata *pdata;
-        int reg, ret;
+        struct wm831x_wdt_drvdata *driver_data;
+        struct watchdog_device *wm831x_wdt;
-        if (wm831x) {
+        int reg, ret, i;
-                dev_err(&pdev->dev, "wm831x watchdog already registered\n");
-                return -EBUSY;
-        }
-        wm831x = dev_get_drvdata(pdev->dev.parent);
        ret = wm831x_reg_read(wm831x, WM831X_WATCHDOG);
        if (ret < 0) {
@@ -338,6 +199,36 @@ static int __devinit wm831x_wdt_probe(struct platform_device *pdev)
        if (reg & WM831X_WDOG_DEBUG)
                dev_warn(wm831x->dev, "Watchdog is paused\n");
+        driver_data = kzalloc(sizeof(*driver_data), GFP_KERNEL);
+        if (!driver_data) {
+                dev_err(wm831x->dev, "Unable to alloacate watchdog device\n");
+                ret = -ENOMEM;
+                goto err;
+        }
+        mutex_init(&driver_data->lock);
+        driver_data->wm831x = wm831x;
+        wm831x_wdt = &driver_data->wdt;
+        wm831x_wdt->info = &wm831x_wdt_info;
+        wm831x_wdt->ops = &wm831x_wdt_ops;
+        watchdog_set_drvdata(wm831x_wdt, driver_data);
+        if (nowayout)
+                wm831x_wdt->status |= WDOG_NO_WAY_OUT;
+        reg = wm831x_reg_read(wm831x, WM831X_WATCHDOG);
+        reg &= WM831X_WDOG_TO_MASK;
+        for (i = 0; i < ARRAY_SIZE(wm831x_wdt_cfgs); i++)
+                if (wm831x_wdt_cfgs[i].val == reg)
+                        break;
+        if (i == ARRAY_SIZE(wm831x_wdt_cfgs))
+                dev_warn(wm831x->dev,
+                         "Unknown watchdog timeout: %x\n", reg);
+        else
+                wm831x_wdt->timeout = wm831x_wdt_cfgs[i].time;
        /* Apply any configuration */
        if (pdev->dev.parent->platform_data) {
                chip_pdata = pdev->dev.parent->platform_data;
@@ -361,7 +252,7 @@ static int __devinit wm831x_wdt_probe(struct platform_device *pdev)
                                dev_err(wm831x->dev,
                                        "Failed to request update GPIO: %d\n",
                                        ret);
-                                goto err;
+                                goto err_alloc;
                        }
                        ret = gpio_direction_output(pdata->update_gpio, 0);
@@ -372,7 +263,7 @@ static int __devinit wm831x_wdt_probe(struct platform_device *pdev)
                                goto err_gpio;
                        }
-                        update_gpio = pdata->update_gpio;
+                        driver_data->update_gpio = pdata->update_gpio;
                        /* Make sure the watchdog takes hardware updates */
                        reg |= WM831X_WDOG_RST_SRC;
@@ -389,33 +280,34 @@ static int __devinit wm831x_wdt_probe(struct platform_device *pdev)
                }
        }
-        wm831x_wdt_miscdev.parent = &pdev->dev;
+        ret = watchdog_register_device(&driver_data->wdt);
-        ret = misc_register(&wm831x_wdt_miscdev);
        if (ret != 0) {
-                dev_err(wm831x->dev, "Failed to register miscdev: %d\n", ret);
+                dev_err(wm831x->dev, "watchdog_register_device() failed: %d\n",
+                        ret);
                goto err_gpio;
        }
+        dev_set_drvdata(&pdev->dev, driver_data);
        return 0;
 err_gpio:
-        if (update_gpio) {
+        if (driver_data->update_gpio)
-                gpio_free(update_gpio);
+                gpio_free(driver_data->update_gpio);
-                update_gpio = 0;
+err_alloc:
-        }
+        kfree(driver_data);
 err:
        return ret;
 }
 static int __devexit wm831x_wdt_remove(struct platform_device *pdev)
 {
-        if (update_gpio) {
+        struct wm831x_wdt_drvdata *driver_data = dev_get_drvdata(&pdev->dev);
-                gpio_free(update_gpio);
-                update_gpio = 0;
+        watchdog_unregister_device(&driver_data->wdt);
-        }
-        misc_deregister(&wm831x_wdt_miscdev);
+        if (driver_data->update_gpio)
+                gpio_free(driver_data->update_gpio);
        return 0;
 }
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index 5876e1ae6c2d..1779338e1d86 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -39,6 +39,7 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/errno.h>
+#include <linux/module.h>
 #include <linux/mm.h>
 #include <linux/bootmem.h>
 #include <linux/pagemap.h>
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 0b5366b5be20..ce4fa0831860 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -9,6 +9,7 @@
 #include <linux/stop_machine.h>
 #include <linux/freezer.h>
 #include <linux/syscore_ops.h>
+#include <linux/export.h>
 #include <xen/xen.h>
 #include <xen/xenbus.h>
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index c984768d98ca..8e964b91c447 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -35,6 +35,7 @@
 #include <linux/bootmem.h>
 #include <linux/dma-mapping.h>
+#include <linux/export.h>
 #include <xen/swiotlb-xen.h>
 #include <xen/page.h>
 #include <xen/xen-ops.h>
diff --git a/drivers/xen/xen-pciback/conf_space.c b/drivers/xen/xen-pciback/conf_space.c
index 444345afbd5c..52fed16d8701 100644
--- a/drivers/xen/xen-pciback/conf_space.c
+++ b/drivers/xen/xen-pciback/conf_space.c
@@ -10,6 +10,7 @@
 */
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/pci.h>
 #include "pciback.h"
 #include "conf_space.h"
diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
index cdacf923e073..81c3ce6b8bbe 100644
--- a/drivers/xen/xenbus/xenbus_client.c
+++ b/drivers/xen/xenbus/xenbus_client.c
@@ -33,6 +33,7 @@
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/vmalloc.h>
+#include <linux/export.h>
 #include <asm/xen/hypervisor.h>
 #include <xen/interface/xen.h>
 #include <xen/interface/event_channel.h>
@@ -443,7 +444,7 @@ int xenbus_map_ring_valloc(struct xenbus_device *dev, int gnt_ref, void **vaddr)
        *vaddr = NULL;
-        area = xen_alloc_vm_area(PAGE_SIZE);
+        area = alloc_vm_area(PAGE_SIZE);
        if (!area)
                return -ENOMEM;
@@ -453,7 +454,7 @@ int xenbus_map_ring_valloc(struct xenbus_device *dev, int gnt_ref, void **vaddr)
                BUG();
        if (op.status != GNTST_okay) {
-                xen_free_vm_area(area);
+                free_vm_area(area);
                xenbus_dev_fatal(dev, op.status,
                                 "mapping in shared page %d from domain %d",
                                 gnt_ref, dev->otherend_id);
@@ -552,7 +553,7 @@ int xenbus_unmap_ring_vfree(struct xenbus_device *dev, void *vaddr)
                BUG();
        if (op.status == GNTST_okay)
-                xen_free_vm_area(area);
+                free_vm_area(area);
        else
                xenbus_dev_error(dev, op.status,
                                 "unmapping page at handle %d error %d",
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index cef9b0bf63d5..0e867eeecb04 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -46,6 +46,7 @@
 #include <linux/mutex.h>
 #include <linux/io.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
diff --git a/drivers/xen/xenbus/xenbus_probe_backend.c b/drivers/xen/xenbus/xenbus_probe_backend.c
index 32417b5064fd..c3c7cd195c11 100644
--- a/drivers/xen/xenbus/xenbus_probe_backend.c
+++ b/drivers/xen/xenbus/xenbus_probe_backend.c
@@ -42,6 +42,7 @@
 #include <linux/fcntl.h>
 #include <linux/mm.h>
 #include <linux/notifier.h>
+#include <linux/export.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
diff --git a/drivers/xen/xenbus/xenbus_probe_frontend.c b/drivers/xen/xenbus/xenbus_probe_frontend.c
index 540587e18a94..2f73195512b4 100644
--- a/drivers/xen/xenbus/xenbus_probe_frontend.c
+++ b/drivers/xen/xenbus/xenbus_probe_frontend.c
@@ -13,6 +13,7 @@
 #include <linux/kthread.h>
 #include <linux/mutex.h>
 #include <linux/io.h>
+#include <linux/module.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c
index e0c84725d3e9..988880dcee75 100644
--- a/drivers/zorro/proc.c
+++ b/drivers/zorro/proc.c
@@ -13,6 +13,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/init.h>
+#include <linux/export.h>
 #include <asm/uaccess.h>
 #include <asm/amigahw.h>
 #include <asm/setup.h>