124 files changed, 2969 insertions, 766 deletions
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index 63a17b55b39b..7a0f4aa4fa1e 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -20,7 +20,7 @@
 *
 *
 * ACPI based HotPlug driver that supports Memory Hotplug
- * This driver fields notifications from firmare for memory add
+ * This driver fields notifications from firmware for memory add
 * and remove operations and alerts the VM of the affected memory
 * ranges.
 */
diff --git a/drivers/acpi/executer/exprep.c b/drivers/acpi/executer/exprep.c
index 5d438c32989d..a7dc87ecee37 100644
--- a/drivers/acpi/executer/exprep.c
+++ b/drivers/acpi/executer/exprep.c
@@ -404,7 +404,7 @@ acpi_ex_prep_common_field_object(union acpi_operand_object *obj_desc,
 *
 * RETURN:      Status
 *
- * DESCRIPTION: Construct an union acpi_operand_object of type def_field and
+ * DESCRIPTION: Construct a union acpi_operand_object of type def_field and
 *              connect it to the parent Node.
 *
 ******************************************************************************/
diff --git a/drivers/acpi/executer/exresolv.c b/drivers/acpi/executer/exresolv.c
index 89571b92a522..60e8c47128e9 100644
--- a/drivers/acpi/executer/exresolv.c
+++ b/drivers/acpi/executer/exresolv.c
@@ -146,7 +146,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
        stack_desc = *stack_ptr;
-        /* This is an union acpi_operand_object    */
+        /* This is a union acpi_operand_object    */
        switch (ACPI_GET_OBJECT_TYPE(stack_desc)) {
        case ACPI_TYPE_LOCAL_REFERENCE:
diff --git a/drivers/acpi/executer/exstore.c b/drivers/acpi/executer/exstore.c
index 3318df4cbd98..1c118ba78adb 100644
--- a/drivers/acpi/executer/exstore.c
+++ b/drivers/acpi/executer/exstore.c
@@ -274,7 +274,7 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
 *
 * PARAMETERS:  *source_desc        - Value to be stored
 *              *dest_desc          - Where to store it.  Must be an NS node
- *                                    or an union acpi_operand_object of type
+ *                                    or a union acpi_operand_object of type
 *                                    Reference;
 *              walk_state          - Current walk state
 *
diff --git a/drivers/acpi/resources/rscreate.c b/drivers/acpi/resources/rscreate.c
index c0bbfa2c4193..08b8d73e6ee5 100644
--- a/drivers/acpi/resources/rscreate.c
+++ b/drivers/acpi/resources/rscreate.c
@@ -124,7 +124,7 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,
 *
 * FUNCTION:    acpi_rs_create_pci_routing_table
 *
- * PARAMETERS:  package_object          - Pointer to an union acpi_operand_object
+ * PARAMETERS:  package_object          - Pointer to a union acpi_operand_object
 *                                        package
 *              output_buffer           - Pointer to the user's buffer
 *
diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c
index c354e7a42bcd..4bef3cfbaccb 100644
--- a/drivers/acpi/utilities/utobject.c
+++ b/drivers/acpi/utilities/utobject.c
@@ -297,7 +297,7 @@ union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size)
 *
 * RETURN:      TRUE if object is valid, FALSE otherwise
 *
- * DESCRIPTION: Validate a pointer to be an union acpi_operand_object
+ * DESCRIPTION: Validate a pointer to be a union acpi_operand_object
 *
 ******************************************************************************/
@@ -389,7 +389,7 @@ void acpi_ut_delete_object_desc(union acpi_operand_object *object)
 {
        ACPI_FUNCTION_TRACE_PTR(ut_delete_object_desc, object);
-        /* Object must be an union acpi_operand_object    */
+        /* Object must be a union acpi_operand_object    */
        if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND) {
                ACPI_ERROR((AE_INFO,
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index fecca4223f8e..f178a450ec08 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -56,6 +56,7 @@
 #include <linux/workqueue.h>
 #include <linux/scatterlist.h>
 #include <linux/io.h>
+#include <linux/async.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_host.h>
@@ -5909,6 +5910,54 @@ void ata_host_init(struct ata_host *host, struct device *dev,
        host->ops = ops;
 }
+static void async_port_probe(void *data, async_cookie_t cookie)
+{
+        int rc;
+        struct ata_port *ap = data;
+        /* probe */
+        if (ap->ops->error_handler) {
+                struct ata_eh_info *ehi = &ap->link.eh_info;
+                unsigned long flags;
+                ata_port_probe(ap);
+                /* kick EH for boot probing */
+                spin_lock_irqsave(ap->lock, flags);
+                ehi->probe_mask |= ATA_ALL_DEVICES;
+                ehi->action |= ATA_EH_RESET | ATA_EH_LPM;
+                ehi->flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET;
+                ap->pflags &= ~ATA_PFLAG_INITIALIZING;
+                ap->pflags |= ATA_PFLAG_LOADING;
+                ata_port_schedule_eh(ap);
+                spin_unlock_irqrestore(ap->lock, flags);
+                /* wait for EH to finish */
+                ata_port_wait_eh(ap);
+        } else {
+                DPRINTK("ata%u: bus probe begin\n", ap->print_id);
+                rc = ata_bus_probe(ap);
+                DPRINTK("ata%u: bus probe end\n", ap->print_id);
+                if (rc) {
+                        /* FIXME: do something useful here?
+                         * Current libata behavior will
+                         * tear down everything when
+                         * the module is removed
+                         * or the h/w is unplugged.
+                         */
+                }
+        }
+        /* in order to keep device order, we need to synchronize at this point */
+        async_synchronize_cookie(cookie);
+        ata_scsi_scan_host(ap, 1);
+}
 /**
 *      ata_host_register - register initialized ATA host
 *      @host: ATA host to register
@@ -5988,52 +6037,9 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
        DPRINTK("probe begin\n");
        for (i = 0; i < host->n_ports; i++) {
                struct ata_port *ap = host->ports[i];
+                async_schedule(async_port_probe, ap);
-                /* probe */
-                if (ap->ops->error_handler) {
-                        struct ata_eh_info *ehi = &ap->link.eh_info;
-                        unsigned long flags;
-                        ata_port_probe(ap);
-                        /* kick EH for boot probing */
-                        spin_lock_irqsave(ap->lock, flags);
-                        ehi->probe_mask |= ATA_ALL_DEVICES;
-                        ehi->action |= ATA_EH_RESET | ATA_EH_LPM;
-                        ehi->flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET;
-                        ap->pflags &= ~ATA_PFLAG_INITIALIZING;
-                        ap->pflags |= ATA_PFLAG_LOADING;
-                        ata_port_schedule_eh(ap);
-                        spin_unlock_irqrestore(ap->lock, flags);
-                        /* wait for EH to finish */
-                        ata_port_wait_eh(ap);
-                } else {
-                        DPRINTK("ata%u: bus probe begin\n", ap->print_id);
-                        rc = ata_bus_probe(ap);
-                        DPRINTK("ata%u: bus probe end\n", ap->print_id);
-                        if (rc) {
-                                /* FIXME: do something useful here?
-                                 * Current libata behavior will
-                                 * tear down everything when
-                                 * the module is removed
-                                 * or the h/w is unplugged.
-                                 */
-                        }
-                }
-        }
-        /* probes are done, now scan each port's disk(s) */
-        DPRINTK("host probe begin\n");
-        for (i = 0; i < host->n_ports; i++) {
-                struct ata_port *ap = host->ports[i];
-                ata_scsi_scan_host(ap, 1);
        }
+        DPRINTK("probe end\n");
        return 0;
 }
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index d8e8c49c0cbd..8f006f96ff53 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -54,7 +54,7 @@ config FIRMWARE_IN_KERNEL
          such firmware, and do not wish to use an initrd.
          This single option controls the inclusion of firmware for
-          every driver which uses request_firmare() and ships its
+          every driver which uses request_firmware() and ships its
          firmware in the kernel source tree, to avoid a proliferation
          of 'Include firmware for xxx device' options.
diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index a8bc1cbcfa7c..a778fb52b11f 100644
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -28,6 +28,7 @@
 #include <linux/mm.h>
 #include <linux/cpu.h>
 #include <linux/module.h>
+#include <linux/hardirq.h>
 #include <linux/topology.h>
 #define define_one_ro(_name)            \
diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index 39ad820b2350..af7c13ca9493 100644
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -769,7 +769,7 @@ static int pc_open(struct tty_struct *tty, struct file *filp)
        /* Check status of board configured in system.  */
        /*
-         * I check to see if the epca_setup routine detected an user error. It
+         * I check to see if the epca_setup routine detected a user error. It
         * might be better to put this in pc_init, but for the moment it goes
         * here.
         */
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index 5f076aef74fa..a8c8d9c19d74 100644
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -83,7 +83,7 @@ config CPU_FREQ_DEFAULT_GOV_USERSPACE
        select CPU_FREQ_GOV_USERSPACE
        help
          Use the CPUFreq governor 'userspace' as default. This allows
-          you to set the CPU frequency manually or when an userspace 
+          you to set the CPU frequency manually or when a userspace 
          program shall be able to set the CPU dynamically without having
          to enable the userspace governor manually.
@@ -138,7 +138,7 @@ config CPU_FREQ_GOV_USERSPACE
        tristate "'userspace' governor for userspace frequency scaling"
        help
          Enable this cpufreq governor when you either want to set the
-          CPU frequency manually or when an userspace program shall
+          CPU frequency manually or when a userspace program shall
          be able to set the CPU dynamically, like on LART 
          <http://www.lartmaker.nl/>.
diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
index 418c18f07e9d..799f94424c8a 100644
--- a/drivers/firewire/fw-card.c
+++ b/drivers/firewire/fw-card.c
@@ -75,7 +75,7 @@ generate_config_rom(struct fw_card *card, size_t *config_rom_length)
         * controller, block reads to the config rom accesses the host
         * memory, but quadlet read access the hardware bus info block
         * registers.  That's just crack, but it means we should make
-         * sure the contents of bus info block in host memory mathces
+         * sure the contents of bus info block in host memory matches
         * the version stored in the OHCI registers.
         */
@@ -189,6 +189,17 @@ static const char gap_count_table[] = {
        63, 5, 7, 8, 10, 13, 16, 18, 21, 24, 26, 29, 32, 35, 37, 40
 };
+void
+fw_schedule_bm_work(struct fw_card *card, unsigned long delay)
+{
+        int scheduled;
+        fw_card_get(card);
+        scheduled = schedule_delayed_work(&card->work, delay);
+        if (!scheduled)
+                fw_card_put(card);
+}
 static void
 fw_card_bm_work(struct work_struct *work)
 {
@@ -206,7 +217,7 @@ fw_card_bm_work(struct work_struct *work)
        if (local_node == NULL) {
                spin_unlock_irqrestore(&card->lock, flags);
-                return;
+                goto out_put_card;
        }
        fw_node_get(local_node);
        fw_node_get(root_node);
@@ -280,7 +291,7 @@ fw_card_bm_work(struct work_struct *work)
                 * this task 100ms from now.
                 */
                spin_unlock_irqrestore(&card->lock, flags);
-                schedule_delayed_work(&card->work, DIV_ROUND_UP(HZ, 10));
+                fw_schedule_bm_work(card, DIV_ROUND_UP(HZ, 10));
                goto out;
        }
@@ -355,6 +366,8 @@ fw_card_bm_work(struct work_struct *work)
                fw_device_put(root_device);
        fw_node_put(root_node);
        fw_node_put(local_node);
+ out_put_card:
+        fw_card_put(card);
 }
 static void
@@ -510,7 +523,6 @@ fw_core_remove_card(struct fw_card *card)
        fw_card_put(card);
        wait_for_completion(&card->done);
-        cancel_delayed_work_sync(&card->work);
        WARN_ON(!list_empty(&card->transaction_list));
        del_timer_sync(&card->flush_timer);
 }
diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c
index 6b9be42c7b98..c173be383725 100644
--- a/drivers/firewire/fw-device.c
+++ b/drivers/firewire/fw-device.c
@@ -617,7 +617,7 @@ static int shutdown_unit(struct device *device, void *data)
 */
 DECLARE_RWSEM(fw_device_rwsem);
-static DEFINE_IDR(fw_device_idr);
+DEFINE_IDR(fw_device_idr);
 int fw_cdev_major;
 struct fw_device *fw_device_get_by_devt(dev_t devt)
@@ -689,7 +689,7 @@ static void fw_device_init(struct work_struct *work)
                        fw_notify("giving up on config rom for node id %x\n",
                                  device->node_id);
                        if (device->node == device->card->root_node)
-                                schedule_delayed_work(&device->card->work, 0);
+                                fw_schedule_bm_work(device->card, 0);
                        fw_device_release(&device->device);
                }
                return;
@@ -758,7 +758,7 @@ static void fw_device_init(struct work_struct *work)
         * pretty harmless.
         */
        if (device->node == device->card->root_node)
-                schedule_delayed_work(&device->card->work, 0);
+                fw_schedule_bm_work(device->card, 0);
        return;
@@ -892,7 +892,7 @@ static void fw_device_refresh(struct work_struct *work)
        fw_device_shutdown(work);
 out:
        if (node_id == card->root_node->node_id)
-                schedule_delayed_work(&card->work, 0);
+                fw_schedule_bm_work(card, 0);
 }
 void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h
index 42305bbac72f..df51732608d9 100644
--- a/drivers/firewire/fw-device.h
+++ b/drivers/firewire/fw-device.h
@@ -21,6 +21,7 @@
 #include <linux/fs.h>
 #include <linux/cdev.h>
+#include <linux/idr.h>
 #include <linux/rwsem.h>
 #include <asm/atomic.h>
@@ -99,6 +100,7 @@ void fw_device_cdev_update(struct fw_device *device);
 void fw_device_cdev_remove(struct fw_device *device);
 extern struct rw_semaphore fw_device_rwsem;
+extern struct idr fw_device_idr;
 extern int fw_cdev_major;
 /*
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index e54403ee59e7..e88d5067448c 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -670,17 +670,6 @@ static void sbp2_agent_reset_no_wait(struct sbp2_logical_unit *lu)
                        &d, sizeof(d), complete_agent_reset_write_no_wait, t);
 }
-static void sbp2_set_generation(struct sbp2_logical_unit *lu, int generation)
-{
-        struct fw_card *card = fw_device(lu->tgt->unit->device.parent)->card;
-        unsigned long flags;
-        /* serialize with comparisons of lu->generation and card->generation */
-        spin_lock_irqsave(&card->lock, flags);
-        lu->generation = generation;
-        spin_unlock_irqrestore(&card->lock, flags);
-}
 static inline void sbp2_allow_block(struct sbp2_logical_unit *lu)
 {
        /*
@@ -884,7 +873,7 @@ static void sbp2_login(struct work_struct *work)
                goto out;
        generation    = device->generation;
-        smp_rmb();    /* node_id must not be older than generation */
+        smp_rmb();    /* node IDs must not be older than generation */
        node_id       = device->node_id;
        local_node_id = device->card->node_id;
@@ -908,7 +897,8 @@ static void sbp2_login(struct work_struct *work)
        tgt->node_id      = node_id;
        tgt->address_high = local_node_id << 16;
-        sbp2_set_generation(lu, generation);
+        smp_wmb();        /* node IDs must not be older than generation */
+        lu->generation    = generation;
        lu->command_block_agent_address =
                ((u64)(be32_to_cpu(response.command_block_agent.high) & 0xffff)
@@ -1201,7 +1191,7 @@ static void sbp2_reconnect(struct work_struct *work)
                goto out;
        generation    = device->generation;
-        smp_rmb();    /* node_id must not be older than generation */
+        smp_rmb();    /* node IDs must not be older than generation */
        node_id       = device->node_id;
        local_node_id = device->card->node_id;
@@ -1228,7 +1218,8 @@ static void sbp2_reconnect(struct work_struct *work)
        tgt->node_id      = node_id;
        tgt->address_high = local_node_id << 16;
-        sbp2_set_generation(lu, generation);
+        smp_wmb();        /* node IDs must not be older than generation */
+        lu->generation    = generation;
        fw_notify("%s: reconnected to LUN %04x (%d retries)\n",
                  tgt->bus_id, lu->lun, lu->retries);
diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c
index 5e204713002d..c9be6e6948c4 100644
--- a/drivers/firewire/fw-topology.c
+++ b/drivers/firewire/fw-topology.c
@@ -355,6 +355,9 @@ report_lost_node(struct fw_card *card,
 {
        fw_node_event(card, node, FW_NODE_DESTROYED);
        fw_node_put(node);
+        /* Topology has changed - reset bus manager retry counter */
+        card->bm_retries = 0;
 }
 static void
@@ -374,6 +377,9 @@ report_found_node(struct fw_card *card,
        }
        fw_node_event(card, node, FW_NODE_CREATED);
+        /* Topology has changed - reset bus manager retry counter */
+        card->bm_retries = 0;
 }
 void fw_destroy_nodes(struct fw_card *card)
@@ -514,14 +520,6 @@ fw_core_handle_bus_reset(struct fw_card *card,
        spin_lock_irqsave(&card->lock, flags);
-        /*
-         * If the new topology has a different self_id_count the topology
-         * changed, either nodes were added or removed. In that case we
-         * reset the IRM reset counter.
-         */
-        if (card->self_id_count != self_id_count)
-                card->bm_retries = 0;
        card->node_id = node_id;
        /*
         * Update node_id before generation to prevent anybody from using
@@ -530,7 +528,7 @@ fw_core_handle_bus_reset(struct fw_card *card,
        smp_wmb();
        card->generation = generation;
        card->reset_jiffies = jiffies;
-        schedule_delayed_work(&card->work, 0);
+        fw_schedule_bm_work(card, 0);
        local_node = build_tree(card, self_ids, self_id_count);
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
index 2884f876397b..699ac041f39a 100644
--- a/drivers/firewire/fw-transaction.c
+++ b/drivers/firewire/fw-transaction.c
@@ -19,6 +19,7 @@
 */
 #include <linux/completion.h>
+#include <linux/idr.h>
 #include <linux/kernel.h>
 #include <linux/kref.h>
 #include <linux/module.h>
@@ -971,6 +972,7 @@ static void __exit fw_core_cleanup(void)
 {
        unregister_chrdev(fw_cdev_major, "firewire");
        bus_unregister(&fw_bus_type);
+        idr_destroy(&fw_device_idr);
 }
 module_init(fw_core_init);
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
index 839466f0a795..c9ab12a15f6e 100644
--- a/drivers/firewire/fw-transaction.h
+++ b/drivers/firewire/fw-transaction.h
@@ -237,14 +237,6 @@ struct fw_card {
        int link_speed;
        int config_rom_generation;
-        /*
-         * We need to store up to 4 self ID for a maximum of 63
-         * devices plus 3 words for the topology map header.
-         */
-        int self_id_count;
-        u32 topology_map[252 + 3];
-        u32 broadcast_channel;
        spinlock_t lock; /* Take this lock when handling the lists in
                          * this struct. */
        struct fw_node *local_node;
@@ -262,6 +254,9 @@ struct fw_card {
        struct delayed_work work;
        int bm_retries;
        int bm_generation;
+        u32 broadcast_channel;
+        u32 topology_map[(CSR_TOPOLOGY_MAP_END - CSR_TOPOLOGY_MAP) / 4];
 };
 static inline struct fw_card *fw_card_get(struct fw_card *card)
@@ -278,6 +273,8 @@ static inline void fw_card_put(struct fw_card *card)
        kref_put(&card->kref, fw_card_release);
 }
+extern void fw_schedule_bm_work(struct fw_card *card, unsigned long delay);
 /*
 * The iso packet format allows for an immediate header/payload part
 * stored in 'header' immediately after the packet info plus an
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 6a98f9f572b0..d73eea382ab3 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -874,12 +874,14 @@ int hiddev_connect(struct hid_device *hid, unsigned int force)
        INIT_LIST_HEAD(&hiddev->list);
        spin_lock_init(&hiddev->list_lock);
        mutex_init(&hiddev->existancelock);
+        hid->hiddev = hiddev;
        hiddev->hid = hid;
        hiddev->exist = 1;
        retval = usb_register_dev(usbhid->intf, &hiddev_class);
        if (retval) {
                err_hid("Not able to get a minor for this device.");
+                hid->hiddev = NULL;
                kfree(hiddev);
                return -1;
        } else {
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index c709e821f04b..4b33bc82cc24 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -284,11 +284,12 @@ config SENSORS_F71805F
          will be called f71805f.
 config SENSORS_F71882FG
-        tristate "Fintek F71882FG and F71883FG"
+        tristate "Fintek F71862FG, F71882FG and F8000"
        depends on EXPERIMENTAL
        help
          If you say yes here you get support for hardware monitoring
-          features of the Fintek F71882FG and F71883FG Super-I/O chips.
+          features of the Fintek F71882FG/F71883FG, F71862FG/71863FG
+          and F8000 Super-I/O chips.
          This driver can also be built as a module.  If so, the module
          will be called f71882fg.
@@ -304,9 +305,13 @@ config SENSORS_F75375S
          will be called f75375s.
 config SENSORS_FSCHER
-        tristate "FSC Hermes"
+        tristate "FSC Hermes (DEPRECATED)"
        depends on X86 && I2C
        help
+          This driver is DEPRECATED please use the new merged fschmd
+          ("FSC Poseidon, Scylla, Hermes, Heimdall and Heracles") driver
+          instead.
          If you say yes here you get support for Fujitsu Siemens
          Computers Hermes sensor chips.
@@ -314,9 +319,13 @@ config SENSORS_FSCHER
          will be called fscher.
 config SENSORS_FSCPOS
-        tristate "FSC Poseidon"
+        tristate "FSC Poseidon (DEPRECATED)"
        depends on X86 && I2C
        help
+          This driver is DEPRECATED please use the new merged fschmd
+          ("FSC Poseidon, Scylla, Hermes, Heimdall and Heracles") driver
+          instead.
          If you say yes here you get support for Fujitsu Siemens
          Computers Poseidon sensor chips.
@@ -325,14 +334,15 @@ config SENSORS_FSCPOS
 config SENSORS_FSCHMD
        tristate "FSC Poseidon, Scylla, Hermes, Heimdall and Heracles"
-        depends on X86 && I2C && EXPERIMENTAL
+        depends on X86 && I2C
        help
          If you say yes here you get support for various Fujitsu Siemens
-          Computers sensor chips.
+          Computers sensor chips, including support for the integrated
+          watchdog.
-          This is a new merged driver for FSC sensor chips which is intended
+          This is a merged driver for FSC sensor chips replacing the fscpos,
-          as a replacment for the fscpos, fscscy and fscher drivers and adds
+          fscscy and fscher drivers and adding support for several other FSC
-          support for several other FCS sensor chips.
+          sensor chips.
          This driver can also be built as a module.  If so, the module
          will be called fschmd.
@@ -399,7 +409,8 @@ config SENSORS_IT87
        select HWMON_VID
        help
          If you say yes here you get support for ITE IT8705F, IT8712F,
-          IT8716F, IT8718F and IT8726F sensor chips, and the SiS960 clone.
+          IT8716F, IT8718F, IT8720F and IT8726F sensor chips, and the
+          SiS960 clone.
          This driver can also be built as a module.  If so, the module
          will be called it87.
@@ -417,11 +428,12 @@ config SENSORS_LM63
          will be called lm63.
 config SENSORS_LM70
-        tristate "National Semiconductor LM70"
+        tristate "National Semiconductor LM70 / Texas Instruments TMP121"
        depends on SPI_MASTER && EXPERIMENTAL
        help
          If you say yes here you get support for the National Semiconductor
-          LM70 digital temperature sensor chip.
+          LM70 and Texas Instruments TMP121/TMP123 digital temperature
+          sensor chips.
          This driver can also be built as a module.  If so, the module
          will be called lm70.
@@ -548,6 +560,17 @@ config SENSORS_LM93
          This driver can also be built as a module.  If so, the module
          will be called lm93.
+config SENSORS_LTC4245
+        tristate "Linear Technology LTC4245"
+        depends on I2C && EXPERIMENTAL
+        default n
+        help
+          If you say yes here you get support for Linear Technology LTC4245
+          Multiple Supply Hot Swap Controller I2C interface.
+          This driver can also be built as a module. If so, the module will
+          be called ltc4245.
 config SENSORS_MAX1111
        tristate "Maxim MAX1111 Multichannel, Serial 8-bit ADC chip"
        depends on SPI_MASTER
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 58fc5be5355d..8fd124eff646 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -62,6 +62,7 @@ obj-$(CONFIG_SENSORS_LM87)	+= lm87.o
 obj-$(CONFIG_SENSORS_LM90)      += lm90.o
 obj-$(CONFIG_SENSORS_LM92)      += lm92.o
 obj-$(CONFIG_SENSORS_LM93)      += lm93.o
+obj-$(CONFIG_SENSORS_LTC4245)   += ltc4245.o
 obj-$(CONFIG_SENSORS_MAX1111)   += max1111.o
 obj-$(CONFIG_SENSORS_MAX1619)   += max1619.o
 obj-$(CONFIG_SENSORS_MAX6650)   += max6650.o
diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c
index 8a45a2e6ba8a..8acf82977e7b 100644
--- a/drivers/hwmon/asb100.c
+++ b/drivers/hwmon/asb100.c
@@ -53,7 +53,10 @@ static const unsigned short normal_i2c[] = { 0x2d, I2C_CLIENT_END };
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(asb100);
-I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "
+static unsigned short force_subclients[4];
+module_param_array(force_subclients, short, NULL, 0);
+MODULE_PARM_DESC(force_subclients, "List of subclient addresses: "
        "{bus, clientaddr, subclientaddr1, subclientaddr2}");
 /* Voltage IN registers 0-6 */
diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c
index 27a5d397f9a1..3df202a9ad72 100644
--- a/drivers/hwmon/dme1737.c
+++ b/drivers/hwmon/dme1737.c
@@ -34,6 +34,7 @@
 #include <linux/hwmon-vid.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
+#include <linux/acpi.h>
 #include <asm/io.h>
 /* ISA device, if found */
@@ -2361,6 +2362,10 @@ static int __init dme1737_isa_device_add(unsigned short addr)
        };
        int err;
+        err = acpi_check_resource_conflict(&res);
+        if (err)
+                goto exit;
        if (!(pdev = platform_device_alloc("dme1737", addr))) {
                printk(KERN_ERR "dme1737: Failed to allocate device.\n");
                err = -ENOMEM;
diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c
index 7a14a2dbb752..899876579253 100644
--- a/drivers/hwmon/f71805f.c
+++ b/drivers/hwmon/f71805f.c
@@ -39,6 +39,7 @@
 #include <linux/mutex.h>
 #include <linux/sysfs.h>
 #include <linux/ioport.h>
+#include <linux/acpi.h>
 #include <asm/io.h>
 static unsigned short force_id;
@@ -1455,6 +1456,10 @@ static int __init f71805f_device_add(unsigned short address,
        }
        res.name = pdev->name;
+        err = acpi_check_resource_conflict(&res);
+        if (err)
+                goto exit_device_put;
        err = platform_device_add_resources(pdev, &res, 1);
        if (err) {
                printk(KERN_ERR DRVNAME ": Device resource addition failed "
diff --git a/drivers/hwmon/f71882fg.c b/drivers/hwmon/f71882fg.c
index 67067e9a323e..609cafff86bc 100644
--- a/drivers/hwmon/f71882fg.c
+++ b/drivers/hwmon/f71882fg.c
@@ -1,6 +1,6 @@
 /***************************************************************************
 *   Copyright (C) 2006 by Hans Edgington <hans@edgington.nl>              *
- *   Copyright (C) 2007 by Hans de Goede  <j.w.r.degoede@hhs.nl>           *
+ *   Copyright (C) 2007,2008 by Hans de Goede <hdegoede@redhat.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  *
@@ -27,11 +27,12 @@
 #include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
-#include <asm/io.h>
+#include <linux/io.h>
+#include <linux/acpi.h>
 #define DRVNAME "f71882fg"
-#define SIO_F71882FG_LD_HWM     0x04    /* Hardware monitor logical device*/
+#define SIO_F71882FG_LD_HWM     0x04    /* Hardware monitor logical device */
 #define SIO_UNLOCK_KEY          0x87    /* Key to enable Super-I/O */
 #define SIO_LOCK_KEY            0xAA    /* Key to diasble Super-I/O */
@@ -43,7 +44,9 @@
 #define SIO_REG_ADDR            0x60    /* Logical device address (2 bytes) */
 #define SIO_FINTEK_ID           0x1934  /* Manufacturers ID */
+#define SIO_F71862_ID           0x0601  /* Chipset ID */
 #define SIO_F71882_ID           0x0541  /* Chipset ID */
+#define SIO_F8000_ID            0x0581  /* Chipset ID */
 #define REGION_LENGTH           8
 #define ADDR_REG_OFFSET         5
@@ -51,25 +54,36 @@
 #define F71882FG_REG_PECI               0x0A
-#define F71882FG_REG_IN_STATUS          0x12
+#define F71882FG_REG_IN_STATUS          0x12 /* f71882fg only */
-#define F71882FG_REG_IN_BEEP            0x13
+#define F71882FG_REG_IN_BEEP            0x13 /* f71882fg only */
 #define F71882FG_REG_IN(nr)             (0x20  + (nr))
-#define F71882FG_REG_IN1_HIGH           0x32
+#define F71882FG_REG_IN1_HIGH           0x32 /* f71882fg only */
 #define F71882FG_REG_FAN(nr)            (0xA0 + (16 * (nr)))
+#define F71882FG_REG_FAN_TARGET(nr)     (0xA2 + (16 * (nr)))
+#define F71882FG_REG_FAN_FULL_SPEED(nr) (0xA4 + (16 * (nr)))
 #define F71882FG_REG_FAN_STATUS         0x92
 #define F71882FG_REG_FAN_BEEP           0x93
-#define F71882FG_REG_TEMP(nr)           (0x72 + 2 * (nr))
+#define F71882FG_REG_TEMP(nr)           (0x70 + 2 * (nr))
-#define F71882FG_REG_TEMP_OVT(nr)       (0x82 + 2 * (nr))
+#define F71882FG_REG_TEMP_OVT(nr)       (0x80 + 2 * (nr))
-#define F71882FG_REG_TEMP_HIGH(nr)      (0x83 + 2 * (nr))
+#define F71882FG_REG_TEMP_HIGH(nr)      (0x81 + 2 * (nr))
 #define F71882FG_REG_TEMP_STATUS        0x62
 #define F71882FG_REG_TEMP_BEEP          0x63
-#define F71882FG_REG_TEMP_HYST1         0x6C
+#define F71882FG_REG_TEMP_HYST(nr)      (0x6C + (nr))
-#define F71882FG_REG_TEMP_HYST23        0x6D
 #define F71882FG_REG_TEMP_TYPE          0x6B
 #define F71882FG_REG_TEMP_DIODE_OPEN    0x6F
+#define F71882FG_REG_PWM(nr)            (0xA3 + (16 * (nr)))
+#define F71882FG_REG_PWM_TYPE           0x94
+#define F71882FG_REG_PWM_ENABLE         0x96
+#define F71882FG_REG_FAN_HYST(nr)       (0x98 + (nr))
+#define F71882FG_REG_POINT_PWM(pwm, point)      (0xAA + (point) + (16 * (pwm)))
+#define F71882FG_REG_POINT_TEMP(pwm, point)     (0xA6 + (point) + (16 * (pwm)))
+#define F71882FG_REG_POINT_MAPPING(nr)          (0xAF + 16 * (nr))
 #define F71882FG_REG_START              0x01
 #define FAN_MIN_DETECT                  366 /* Lowest detectable fanspeed */
@@ -78,7 +92,15 @@ static unsigned short force_id;
 module_param(force_id, ushort, 0);
 MODULE_PARM_DESC(force_id, "Override the detected device ID");
-static struct platform_device *f71882fg_pdev = NULL;
+enum chips { f71862fg, f71882fg, f8000 };
+static const char *f71882fg_names[] = {
+        "f71862fg",
+        "f71882fg",
+        "f8000",
+};
+static struct platform_device *f71882fg_pdev;
 /* Super-I/O Function prototypes */
 static inline int superio_inb(int base, int reg);
@@ -87,8 +109,13 @@ static inline void superio_enter(int base);
 static inline void superio_select(int base, int ld);
 static inline void superio_exit(int base);
+struct f71882fg_sio_data {
+        enum chips type;
+};
 struct f71882fg_data {
        unsigned short addr;
+        enum chips type;
        struct device *hwmon_dev;
        struct mutex update_lock;
@@ -102,19 +129,30 @@ struct f71882fg_data {
        u8      in_status;
        u8      in_beep;
        u16     fan[4];
+        u16     fan_target[4];
+        u16     fan_full_speed[4];
        u8      fan_status;
        u8      fan_beep;
-        u8      temp[3];
+        /* Note: all models have only 3 temperature channels, but on some
-        u8      temp_ovt[3];
+           they are addressed as 0-2 and on others as 1-3, so for coding
-        u8      temp_high[3];
+           convenience we reserve space for 4 channels */
-        u8      temp_hyst[3];
+        u8      temp[4];
-        u8      temp_type[3];
+        u8      temp_ovt[4];
+        u8      temp_high[4];
+        u8      temp_hyst[2]; /* 2 hysts stored per reg */
+        u8      temp_type[4];
        u8      temp_status;
        u8      temp_beep;
        u8      temp_diode_open;
+        u8      pwm[4];
+        u8      pwm_enable;
+        u8      pwm_auto_point_hyst[2];
+        u8      pwm_auto_point_mapping[4];
+        u8      pwm_auto_point_pwm[4][5];
+        u8      pwm_auto_point_temp[4][4];
 };
-/* Sysfs in*/
+/* Sysfs in */
 static ssize_t show_in(struct device *dev, struct device_attribute *devattr,
        char *buf);
 static ssize_t show_in_max(struct device *dev, struct device_attribute
@@ -130,6 +168,10 @@ static ssize_t show_in_alarm(struct device *dev, struct device_attribute
 /* Sysfs Fan */
 static ssize_t show_fan(struct device *dev, struct device_attribute *devattr,
        char *buf);
+static ssize_t show_fan_full_speed(struct device *dev,
+        struct device_attribute *devattr, char *buf);
+static ssize_t store_fan_full_speed(struct device *dev,
+        struct device_attribute *devattr, const char *buf, size_t count);
 static ssize_t show_fan_beep(struct device *dev, struct device_attribute
        *devattr, char *buf);
 static ssize_t store_fan_beep(struct device *dev, struct device_attribute
@@ -163,16 +205,41 @@ static ssize_t show_temp_alarm(struct device *dev, struct device_attribute
        *devattr, char *buf);
 static ssize_t show_temp_fault(struct device *dev, struct device_attribute
        *devattr, char *buf);
+/* PWM and Auto point control */
+static ssize_t show_pwm(struct device *dev, struct device_attribute *devattr,
+        char *buf);
+static ssize_t store_pwm(struct device *dev, struct device_attribute *devattr,
+        const char *buf, size_t count);
+static ssize_t show_pwm_enable(struct device *dev,
+        struct device_attribute *devattr, char *buf);
+static ssize_t store_pwm_enable(struct device *dev,
+        struct device_attribute *devattr, const char *buf, size_t count);
+static ssize_t show_pwm_interpolate(struct device *dev,
+        struct device_attribute *devattr, char *buf);
+static ssize_t store_pwm_interpolate(struct device *dev,
+        struct device_attribute *devattr, const char *buf, size_t count);
+static ssize_t show_pwm_auto_point_channel(struct device *dev,
+        struct device_attribute *devattr, char *buf);
+static ssize_t store_pwm_auto_point_channel(struct device *dev,
+        struct device_attribute *devattr, const char *buf, size_t count);
+static ssize_t show_pwm_auto_point_temp_hyst(struct device *dev,
+        struct device_attribute *devattr, char *buf);
+static ssize_t store_pwm_auto_point_temp_hyst(struct device *dev,
+        struct device_attribute *devattr, const char *buf, size_t count);
+static ssize_t show_pwm_auto_point_pwm(struct device *dev,
+        struct device_attribute *devattr, char *buf);
+static ssize_t store_pwm_auto_point_pwm(struct device *dev,
+        struct device_attribute *devattr, const char *buf, size_t count);
+static ssize_t show_pwm_auto_point_temp(struct device *dev,
+        struct device_attribute *devattr, char *buf);
+static ssize_t store_pwm_auto_point_temp(struct device *dev,
+        struct device_attribute *devattr, const char *buf, size_t count);
 /* Sysfs misc */
 static ssize_t show_name(struct device *dev, struct device_attribute *devattr,
        char *buf);
 static int __devinit f71882fg_probe(struct platform_device * pdev);
-static int __devexit f71882fg_remove(struct platform_device *pdev);
+static int f71882fg_remove(struct platform_device *pdev);
-static int __init f71882fg_init(void);
-static int __init f71882fg_find(int sioaddr, unsigned short *address);
-static int __init f71882fg_device_add(unsigned short address);
-static void __exit f71882fg_exit(void);
 static struct platform_driver f71882fg_driver = {
        .driver = {
@@ -183,86 +250,531 @@ static struct platform_driver f71882fg_driver = {
        .remove         = __devexit_p(f71882fg_remove),
 };
-static struct device_attribute f71882fg_dev_attr[] =
+static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
-{
-        __ATTR( name, S_IRUGO, show_name, NULL ),
+/* Temp and in attr common to both the f71862fg and f71882fg */
+static struct sensor_device_attribute_2 f718x2fg_in_temp_attr[] = {
+        SENSOR_ATTR_2(in0_input, S_IRUGO, show_in, NULL, 0, 0),
+        SENSOR_ATTR_2(in1_input, S_IRUGO, show_in, NULL, 0, 1),
+        SENSOR_ATTR_2(in2_input, S_IRUGO, show_in, NULL, 0, 2),
+        SENSOR_ATTR_2(in3_input, S_IRUGO, show_in, NULL, 0, 3),
+        SENSOR_ATTR_2(in4_input, S_IRUGO, show_in, NULL, 0, 4),
+        SENSOR_ATTR_2(in5_input, S_IRUGO, show_in, NULL, 0, 5),
+        SENSOR_ATTR_2(in6_input, S_IRUGO, show_in, NULL, 0, 6),
+        SENSOR_ATTR_2(in7_input, S_IRUGO, show_in, NULL, 0, 7),
+        SENSOR_ATTR_2(in8_input, S_IRUGO, show_in, NULL, 0, 8),
+        SENSOR_ATTR_2(temp1_input, S_IRUGO, show_temp, NULL, 0, 1),
+        SENSOR_ATTR_2(temp1_max, S_IRUGO|S_IWUSR, show_temp_max,
+                store_temp_max, 0, 1),
+        SENSOR_ATTR_2(temp1_max_hyst, S_IRUGO|S_IWUSR, show_temp_max_hyst,
+                store_temp_max_hyst, 0, 1),
+        /* Should really be temp1_max_alarm, but older versions did not handle
+           the max and crit alarms separately and lm_sensors v2 depends on the
+           presence of temp#_alarm files. The same goes for temp2/3 _alarm. */
+        SENSOR_ATTR_2(temp1_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 1),
+        SENSOR_ATTR_2(temp1_max_beep, S_IRUGO|S_IWUSR, show_temp_beep,
+                store_temp_beep, 0, 1),
+        SENSOR_ATTR_2(temp1_crit, S_IRUGO|S_IWUSR, show_temp_crit,
+                store_temp_crit, 0, 1),
+        SENSOR_ATTR_2(temp1_crit_hyst, S_IRUGO, show_temp_crit_hyst, NULL,
+                0, 1),
+        SENSOR_ATTR_2(temp1_crit_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 5),
+        SENSOR_ATTR_2(temp1_crit_beep, S_IRUGO|S_IWUSR, show_temp_beep,
+                store_temp_beep, 0, 5),
+        SENSOR_ATTR_2(temp1_type, S_IRUGO, show_temp_type, NULL, 0, 1),
+        SENSOR_ATTR_2(temp1_fault, S_IRUGO, show_temp_fault, NULL, 0, 1),
+        SENSOR_ATTR_2(temp2_input, S_IRUGO, show_temp, NULL, 0, 2),
+        SENSOR_ATTR_2(temp2_max, S_IRUGO|S_IWUSR, show_temp_max,
+                store_temp_max, 0, 2),
+        SENSOR_ATTR_2(temp2_max_hyst, S_IRUGO|S_IWUSR, show_temp_max_hyst,
+                store_temp_max_hyst, 0, 2),
+        /* Should be temp2_max_alarm, see temp1_alarm note */
+        SENSOR_ATTR_2(temp2_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 2),
+        SENSOR_ATTR_2(temp2_max_beep, S_IRUGO|S_IWUSR, show_temp_beep,
+                store_temp_beep, 0, 2),
+        SENSOR_ATTR_2(temp2_crit, S_IRUGO|S_IWUSR, show_temp_crit,
+                store_temp_crit, 0, 2),
+        SENSOR_ATTR_2(temp2_crit_hyst, S_IRUGO, show_temp_crit_hyst, NULL,
+                0, 2),
+        SENSOR_ATTR_2(temp2_crit_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 6),
+        SENSOR_ATTR_2(temp2_crit_beep, S_IRUGO|S_IWUSR, show_temp_beep,
+                store_temp_beep, 0, 6),
+        SENSOR_ATTR_2(temp2_type, S_IRUGO, show_temp_type, NULL, 0, 2),
+        SENSOR_ATTR_2(temp2_fault, S_IRUGO, show_temp_fault, NULL, 0, 2),
+        SENSOR_ATTR_2(temp3_input, S_IRUGO, show_temp, NULL, 0, 3),
+        SENSOR_ATTR_2(temp3_max, S_IRUGO|S_IWUSR, show_temp_max,
+                store_temp_max, 0, 3),
+        SENSOR_ATTR_2(temp3_max_hyst, S_IRUGO|S_IWUSR, show_temp_max_hyst,
+                store_temp_max_hyst, 0, 3),
+        /* Should be temp3_max_alarm, see temp1_alarm note */
+        SENSOR_ATTR_2(temp3_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 3),
+        SENSOR_ATTR_2(temp3_max_beep, S_IRUGO|S_IWUSR, show_temp_beep,
+                store_temp_beep, 0, 3),
+        SENSOR_ATTR_2(temp3_crit, S_IRUGO|S_IWUSR, show_temp_crit,
+                store_temp_crit, 0, 3),
+        SENSOR_ATTR_2(temp3_crit_hyst, S_IRUGO, show_temp_crit_hyst, NULL,
+                0, 3),
+        SENSOR_ATTR_2(temp3_crit_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 7),
+        SENSOR_ATTR_2(temp3_crit_beep, S_IRUGO|S_IWUSR, show_temp_beep,
+                store_temp_beep, 0, 7),
+        SENSOR_ATTR_2(temp3_type, S_IRUGO, show_temp_type, NULL, 0, 3),
+        SENSOR_ATTR_2(temp3_fault, S_IRUGO, show_temp_fault, NULL, 0, 3),
+};
+/* Temp and in attr found only on the f71882fg */
+static struct sensor_device_attribute_2 f71882fg_in_temp_attr[] = {
+        SENSOR_ATTR_2(in1_max, S_IRUGO|S_IWUSR, show_in_max, store_in_max,
+                0, 1),
+        SENSOR_ATTR_2(in1_beep, S_IRUGO|S_IWUSR, show_in_beep, store_in_beep,
+                0, 1),
+        SENSOR_ATTR_2(in1_alarm, S_IRUGO, show_in_alarm, NULL, 0, 1),
+};
+/* Temp and in attr for the f8000
+   Note on the f8000 temp_ovt (crit) is used as max, and temp_high (max)
+   is used as hysteresis value to clear alarms
+ */
+static struct sensor_device_attribute_2 f8000_in_temp_attr[] = {
+        SENSOR_ATTR_2(in0_input, S_IRUGO, show_in, NULL, 0, 0),
+        SENSOR_ATTR_2(in1_input, S_IRUGO, show_in, NULL, 0, 1),
+        SENSOR_ATTR_2(in2_input, S_IRUGO, show_in, NULL, 0, 2),
+        SENSOR_ATTR_2(temp1_input, S_IRUGO, show_temp, NULL, 0, 0),
+        SENSOR_ATTR_2(temp1_max, S_IRUGO|S_IWUSR, show_temp_crit,
+                store_temp_crit, 0, 0),
+        SENSOR_ATTR_2(temp1_max_hyst, S_IRUGO|S_IWUSR, show_temp_max,
+                store_temp_max, 0, 0),
+        SENSOR_ATTR_2(temp1_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 4),
+        SENSOR_ATTR_2(temp2_input, S_IRUGO, show_temp, NULL, 0, 1),
+        SENSOR_ATTR_2(temp2_max, S_IRUGO|S_IWUSR, show_temp_crit,
+                store_temp_crit, 0, 1),
+        SENSOR_ATTR_2(temp2_max_hyst, S_IRUGO|S_IWUSR, show_temp_max,
+                store_temp_max, 0, 1),
+        SENSOR_ATTR_2(temp2_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 5),
+        SENSOR_ATTR_2(temp2_type, S_IRUGO, show_temp_type, NULL, 0, 1),
+        SENSOR_ATTR_2(temp3_input, S_IRUGO, show_temp, NULL, 0, 2),
+        SENSOR_ATTR_2(temp3_max, S_IRUGO|S_IWUSR, show_temp_crit,
+                store_temp_crit, 0, 2),
+        SENSOR_ATTR_2(temp3_max_hyst, S_IRUGO|S_IWUSR, show_temp_max,
+                store_temp_max, 0, 2),
+        SENSOR_ATTR_2(temp3_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 6),
+};
+/* Fan / PWM attr common to all models */
+static struct sensor_device_attribute_2 fxxxx_fan_attr[] = {
+        SENSOR_ATTR_2(fan1_input, S_IRUGO, show_fan, NULL, 0, 0),
+        SENSOR_ATTR_2(fan1_full_speed, S_IRUGO|S_IWUSR,
+                      show_fan_full_speed,
+                      store_fan_full_speed, 0, 0),
+        SENSOR_ATTR_2(fan1_alarm, S_IRUGO, show_fan_alarm, NULL, 0, 0),
+        SENSOR_ATTR_2(fan2_input, S_IRUGO, show_fan, NULL, 0, 1),
+        SENSOR_ATTR_2(fan2_full_speed, S_IRUGO|S_IWUSR,
+                      show_fan_full_speed,
+                      store_fan_full_speed, 0, 1),
+        SENSOR_ATTR_2(fan2_alarm, S_IRUGO, show_fan_alarm, NULL, 0, 1),
+        SENSOR_ATTR_2(fan3_input, S_IRUGO, show_fan, NULL, 0, 2),
+        SENSOR_ATTR_2(fan3_full_speed, S_IRUGO|S_IWUSR,
+                      show_fan_full_speed,
+                      store_fan_full_speed, 0, 2),
+        SENSOR_ATTR_2(fan3_alarm, S_IRUGO, show_fan_alarm, NULL, 0, 2),
+        SENSOR_ATTR_2(pwm1, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0, 0),
+        SENSOR_ATTR_2(pwm1_enable, S_IRUGO|S_IWUSR, show_pwm_enable,
+                      store_pwm_enable, 0, 0),
+        SENSOR_ATTR_2(pwm1_interpolate, S_IRUGO|S_IWUSR,
+                      show_pwm_interpolate, store_pwm_interpolate, 0, 0),
+        SENSOR_ATTR_2(pwm1_auto_channels_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_channel,
+                      store_pwm_auto_point_channel, 0, 0),
+        SENSOR_ATTR_2(pwm2, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0, 1),
+        SENSOR_ATTR_2(pwm2_enable, S_IRUGO|S_IWUSR, show_pwm_enable,
+                      store_pwm_enable, 0, 1),
+        SENSOR_ATTR_2(pwm2_interpolate, S_IRUGO|S_IWUSR,
+                      show_pwm_interpolate, store_pwm_interpolate, 0, 1),
+        SENSOR_ATTR_2(pwm2_auto_channels_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_channel,
+                      store_pwm_auto_point_channel, 0, 1),
+        SENSOR_ATTR_2(pwm3_interpolate, S_IRUGO|S_IWUSR,
+                      show_pwm_interpolate, store_pwm_interpolate, 0, 2),
+        SENSOR_ATTR_2(pwm3_auto_channels_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_channel,
+                      store_pwm_auto_point_channel, 0, 2),
 };
-static struct sensor_device_attribute f71882fg_in_temp_attr[] =
+/* Fan / PWM attr for the f71862fg, less pwms and less zones per pwm than the
-{
+   f71882fg */
-        SENSOR_ATTR(in0_input, S_IRUGO, show_in, NULL, 0),
+static struct sensor_device_attribute_2 f71862fg_fan_attr[] = {
-        SENSOR_ATTR(in1_input, S_IRUGO, show_in, NULL, 1),
+        SENSOR_ATTR_2(fan1_beep, S_IRUGO|S_IWUSR, show_fan_beep,
-        SENSOR_ATTR(in1_max, S_IRUGO|S_IWUSR, show_in_max, store_in_max, 1),
+                store_fan_beep, 0, 0),
-        SENSOR_ATTR(in1_beep, S_IRUGO|S_IWUSR, show_in_beep, store_in_beep, 1),
+        SENSOR_ATTR_2(fan2_beep, S_IRUGO|S_IWUSR, show_fan_beep,
-        SENSOR_ATTR(in1_alarm, S_IRUGO, show_in_alarm, NULL, 1),
+                store_fan_beep, 0, 1),
-        SENSOR_ATTR(in2_input, S_IRUGO, show_in, NULL, 2),
+        SENSOR_ATTR_2(fan3_beep, S_IRUGO|S_IWUSR, show_fan_beep,
-        SENSOR_ATTR(in3_input, S_IRUGO, show_in, NULL, 3),
+                store_fan_beep, 0, 2),
-        SENSOR_ATTR(in4_input, S_IRUGO, show_in, NULL, 4),
-        SENSOR_ATTR(in5_input, S_IRUGO, show_in, NULL, 5),
+        SENSOR_ATTR_2(pwm1_auto_point1_pwm, S_IRUGO|S_IWUSR,
-        SENSOR_ATTR(in6_input, S_IRUGO, show_in, NULL, 6),
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-        SENSOR_ATTR(in7_input, S_IRUGO, show_in, NULL, 7),
+                      1, 0),
-        SENSOR_ATTR(in8_input, S_IRUGO, show_in, NULL, 8),
+        SENSOR_ATTR_2(pwm1_auto_point2_pwm, S_IRUGO|S_IWUSR,
-        SENSOR_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0),
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-        SENSOR_ATTR(temp1_max, S_IRUGO|S_IWUSR, show_temp_max,
+                      4, 0),
-                store_temp_max, 0),
+        SENSOR_ATTR_2(pwm1_auto_point1_temp, S_IRUGO|S_IWUSR,
-        SENSOR_ATTR(temp1_max_hyst, S_IRUGO|S_IWUSR, show_temp_max_hyst,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-                store_temp_max_hyst, 0),
+                      0, 0),
-        SENSOR_ATTR(temp1_crit, S_IRUGO|S_IWUSR, show_temp_crit,
+        SENSOR_ATTR_2(pwm1_auto_point2_temp, S_IRUGO|S_IWUSR,
-                store_temp_crit, 0),
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-        SENSOR_ATTR(temp1_crit_hyst, S_IRUGO, show_temp_crit_hyst, NULL, 0),
+                      3, 0),
-        SENSOR_ATTR(temp1_type, S_IRUGO, show_temp_type, NULL, 0),
+        SENSOR_ATTR_2(pwm1_auto_point1_temp_hyst, S_IRUGO|S_IWUSR,
-        SENSOR_ATTR(temp1_beep, S_IRUGO|S_IWUSR, show_temp_beep,
+                      show_pwm_auto_point_temp_hyst,
-                store_temp_beep, 0),
+                      store_pwm_auto_point_temp_hyst,
-        SENSOR_ATTR(temp1_alarm, S_IRUGO, show_temp_alarm, NULL, 0),
+                      0, 0),
-        SENSOR_ATTR(temp1_fault, S_IRUGO, show_temp_fault, NULL, 0),
+        SENSOR_ATTR_2(pwm1_auto_point2_temp_hyst, S_IRUGO,
-        SENSOR_ATTR(temp2_input, S_IRUGO, show_temp, NULL, 1),
+                      show_pwm_auto_point_temp_hyst, NULL, 3, 0),
-        SENSOR_ATTR(temp2_max, S_IRUGO|S_IWUSR, show_temp_max,
-                store_temp_max, 1),
+        SENSOR_ATTR_2(pwm2_auto_point1_pwm, S_IRUGO|S_IWUSR,
-        SENSOR_ATTR(temp2_max_hyst, S_IRUGO|S_IWUSR, show_temp_max_hyst,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                store_temp_max_hyst, 1),
+                      1, 1),
-        SENSOR_ATTR(temp2_crit, S_IRUGO|S_IWUSR, show_temp_crit,
+        SENSOR_ATTR_2(pwm2_auto_point2_pwm, S_IRUGO|S_IWUSR,
-                store_temp_crit, 1),
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-        SENSOR_ATTR(temp2_crit_hyst, S_IRUGO, show_temp_crit_hyst, NULL, 1),
+                      4, 1),
-        SENSOR_ATTR(temp2_type, S_IRUGO, show_temp_type, NULL, 1),
+        SENSOR_ATTR_2(pwm2_auto_point1_temp, S_IRUGO|S_IWUSR,
-        SENSOR_ATTR(temp2_beep, S_IRUGO|S_IWUSR, show_temp_beep,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-                store_temp_beep, 1),
+                      0, 1),
-        SENSOR_ATTR(temp2_alarm, S_IRUGO, show_temp_alarm, NULL, 1),
+        SENSOR_ATTR_2(pwm2_auto_point2_temp, S_IRUGO|S_IWUSR,
-        SENSOR_ATTR(temp2_fault, S_IRUGO, show_temp_fault, NULL, 1),
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-        SENSOR_ATTR(temp3_input, S_IRUGO, show_temp, NULL, 2),
+                      3, 1),
-        SENSOR_ATTR(temp3_max, S_IRUGO|S_IWUSR, show_temp_max,
+        SENSOR_ATTR_2(pwm2_auto_point1_temp_hyst, S_IRUGO|S_IWUSR,
-                store_temp_max, 2),
+                      show_pwm_auto_point_temp_hyst,
-        SENSOR_ATTR(temp3_max_hyst, S_IRUGO|S_IWUSR, show_temp_max_hyst,
+                      store_pwm_auto_point_temp_hyst,
-                store_temp_max_hyst, 2),
+                      0, 1),
-        SENSOR_ATTR(temp3_crit, S_IRUGO|S_IWUSR, show_temp_crit,
+        SENSOR_ATTR_2(pwm2_auto_point2_temp_hyst, S_IRUGO,
-                store_temp_crit, 2),
+                      show_pwm_auto_point_temp_hyst, NULL, 3, 1),
-        SENSOR_ATTR(temp3_crit_hyst, S_IRUGO, show_temp_crit_hyst, NULL, 2),
-        SENSOR_ATTR(temp3_type, S_IRUGO, show_temp_type, NULL, 2),
+        SENSOR_ATTR_2(pwm3, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0, 2),
-        SENSOR_ATTR(temp3_beep, S_IRUGO|S_IWUSR, show_temp_beep,
+        SENSOR_ATTR_2(pwm3_enable, S_IRUGO|S_IWUSR, show_pwm_enable,
-                store_temp_beep, 2),
+                      store_pwm_enable, 0, 2),
-        SENSOR_ATTR(temp3_alarm, S_IRUGO, show_temp_alarm, NULL, 2),
+        SENSOR_ATTR_2(pwm3_auto_point1_pwm, S_IRUGO|S_IWUSR,
-        SENSOR_ATTR(temp3_fault, S_IRUGO, show_temp_fault, NULL, 2)
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      1, 2),
+        SENSOR_ATTR_2(pwm3_auto_point2_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      4, 2),
+        SENSOR_ATTR_2(pwm3_auto_point1_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      0, 2),
+        SENSOR_ATTR_2(pwm3_auto_point2_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      3, 2),
+        SENSOR_ATTR_2(pwm3_auto_point1_temp_hyst, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp_hyst,
+                      store_pwm_auto_point_temp_hyst,
+                      0, 2),
+        SENSOR_ATTR_2(pwm3_auto_point2_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 3, 2),
 };
-static struct sensor_device_attribute f71882fg_fan_attr[] =
+/* Fan / PWM attr for the f71882fg */
-{
+static struct sensor_device_attribute_2 f71882fg_fan_attr[] = {
-        SENSOR_ATTR(fan1_input, S_IRUGO, show_fan, NULL, 0),
+        SENSOR_ATTR_2(fan1_beep, S_IRUGO|S_IWUSR, show_fan_beep,
-        SENSOR_ATTR(fan1_beep, S_IRUGO|S_IWUSR, show_fan_beep,
+                store_fan_beep, 0, 0),
-                store_fan_beep, 0),
+        SENSOR_ATTR_2(fan2_beep, S_IRUGO|S_IWUSR, show_fan_beep,
-        SENSOR_ATTR(fan1_alarm, S_IRUGO, show_fan_alarm, NULL, 0),
+                store_fan_beep, 0, 1),
-        SENSOR_ATTR(fan2_input, S_IRUGO, show_fan, NULL, 1),
+        SENSOR_ATTR_2(fan3_beep, S_IRUGO|S_IWUSR, show_fan_beep,
-        SENSOR_ATTR(fan2_beep, S_IRUGO|S_IWUSR, show_fan_beep,
+                store_fan_beep, 0, 2),
-                store_fan_beep, 1),
+        SENSOR_ATTR_2(fan4_input, S_IRUGO, show_fan, NULL, 0, 3),
-        SENSOR_ATTR(fan2_alarm, S_IRUGO, show_fan_alarm, NULL, 1),
+        SENSOR_ATTR_2(fan4_full_speed, S_IRUGO|S_IWUSR,
-        SENSOR_ATTR(fan3_input, S_IRUGO, show_fan, NULL, 2),
+                      show_fan_full_speed,
-        SENSOR_ATTR(fan3_beep, S_IRUGO|S_IWUSR, show_fan_beep,
+                      store_fan_full_speed, 0, 3),
-                store_fan_beep, 2),
+        SENSOR_ATTR_2(fan4_beep, S_IRUGO|S_IWUSR, show_fan_beep,
-        SENSOR_ATTR(fan3_alarm, S_IRUGO, show_fan_alarm, NULL, 2),
+                store_fan_beep, 0, 3),
-        SENSOR_ATTR(fan4_input, S_IRUGO, show_fan, NULL, 3),
+        SENSOR_ATTR_2(fan4_alarm, S_IRUGO, show_fan_alarm, NULL, 0, 3),
-        SENSOR_ATTR(fan4_beep, S_IRUGO|S_IWUSR, show_fan_beep,
-                store_fan_beep, 3),
+        SENSOR_ATTR_2(pwm1_auto_point1_pwm, S_IRUGO|S_IWUSR,
-        SENSOR_ATTR(fan4_alarm, S_IRUGO, show_fan_alarm, NULL, 3)
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      0, 0),
+        SENSOR_ATTR_2(pwm1_auto_point2_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      1, 0),
+        SENSOR_ATTR_2(pwm1_auto_point3_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      2, 0),
+        SENSOR_ATTR_2(pwm1_auto_point4_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      3, 0),
+        SENSOR_ATTR_2(pwm1_auto_point5_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      4, 0),
+        SENSOR_ATTR_2(pwm1_auto_point1_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      0, 0),
+        SENSOR_ATTR_2(pwm1_auto_point2_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      1, 0),
+        SENSOR_ATTR_2(pwm1_auto_point3_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      2, 0),
+        SENSOR_ATTR_2(pwm1_auto_point4_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      3, 0),
+        SENSOR_ATTR_2(pwm1_auto_point1_temp_hyst, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp_hyst,
+                      store_pwm_auto_point_temp_hyst,
+                      0, 0),
+        SENSOR_ATTR_2(pwm1_auto_point2_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 1, 0),
+        SENSOR_ATTR_2(pwm1_auto_point3_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 2, 0),
+        SENSOR_ATTR_2(pwm1_auto_point4_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 3, 0),
+        SENSOR_ATTR_2(pwm2_auto_point1_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      0, 1),
+        SENSOR_ATTR_2(pwm2_auto_point2_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      1, 1),
+        SENSOR_ATTR_2(pwm2_auto_point3_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      2, 1),
+        SENSOR_ATTR_2(pwm2_auto_point4_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      3, 1),
+        SENSOR_ATTR_2(pwm2_auto_point5_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      4, 1),
+        SENSOR_ATTR_2(pwm2_auto_point1_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      0, 1),
+        SENSOR_ATTR_2(pwm2_auto_point2_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      1, 1),
+        SENSOR_ATTR_2(pwm2_auto_point3_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      2, 1),
+        SENSOR_ATTR_2(pwm2_auto_point4_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      3, 1),
+        SENSOR_ATTR_2(pwm2_auto_point1_temp_hyst, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp_hyst,
+                      store_pwm_auto_point_temp_hyst,
+                      0, 1),
+        SENSOR_ATTR_2(pwm2_auto_point2_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 1, 1),
+        SENSOR_ATTR_2(pwm2_auto_point3_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 2, 1),
+        SENSOR_ATTR_2(pwm2_auto_point4_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 3, 1),
+        SENSOR_ATTR_2(pwm3, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0, 2),
+        SENSOR_ATTR_2(pwm3_enable, S_IRUGO|S_IWUSR, show_pwm_enable,
+                      store_pwm_enable, 0, 2),
+        SENSOR_ATTR_2(pwm3_auto_point1_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      0, 2),
+        SENSOR_ATTR_2(pwm3_auto_point2_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      1, 2),
+        SENSOR_ATTR_2(pwm3_auto_point3_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      2, 2),
+        SENSOR_ATTR_2(pwm3_auto_point4_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      3, 2),
+        SENSOR_ATTR_2(pwm3_auto_point5_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      4, 2),
+        SENSOR_ATTR_2(pwm3_auto_point1_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      0, 2),
+        SENSOR_ATTR_2(pwm3_auto_point2_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      1, 2),
+        SENSOR_ATTR_2(pwm3_auto_point3_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      2, 2),
+        SENSOR_ATTR_2(pwm3_auto_point4_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      3, 2),
+        SENSOR_ATTR_2(pwm3_auto_point1_temp_hyst, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp_hyst,
+                      store_pwm_auto_point_temp_hyst,
+                      0, 2),
+        SENSOR_ATTR_2(pwm3_auto_point2_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 1, 2),
+        SENSOR_ATTR_2(pwm3_auto_point3_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 2, 2),
+        SENSOR_ATTR_2(pwm3_auto_point4_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 3, 2),
+        SENSOR_ATTR_2(pwm4, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0, 3),
+        SENSOR_ATTR_2(pwm4_enable, S_IRUGO|S_IWUSR, show_pwm_enable,
+                      store_pwm_enable, 0, 3),
+        SENSOR_ATTR_2(pwm4_interpolate, S_IRUGO|S_IWUSR,
+                      show_pwm_interpolate, store_pwm_interpolate, 0, 3),
+        SENSOR_ATTR_2(pwm4_auto_channels_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_channel,
+                      store_pwm_auto_point_channel, 0, 3),
+        SENSOR_ATTR_2(pwm4_auto_point1_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      0, 3),
+        SENSOR_ATTR_2(pwm4_auto_point2_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      1, 3),
+        SENSOR_ATTR_2(pwm4_auto_point3_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      2, 3),
+        SENSOR_ATTR_2(pwm4_auto_point4_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      3, 3),
+        SENSOR_ATTR_2(pwm4_auto_point5_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      4, 3),
+        SENSOR_ATTR_2(pwm4_auto_point1_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      0, 3),
+        SENSOR_ATTR_2(pwm4_auto_point2_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      1, 3),
+        SENSOR_ATTR_2(pwm4_auto_point3_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      2, 3),
+        SENSOR_ATTR_2(pwm4_auto_point4_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      3, 3),
+        SENSOR_ATTR_2(pwm4_auto_point1_temp_hyst, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp_hyst,
+                      store_pwm_auto_point_temp_hyst,
+                      0, 3),
+        SENSOR_ATTR_2(pwm4_auto_point2_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 1, 3),
+        SENSOR_ATTR_2(pwm4_auto_point3_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 2, 3),
+        SENSOR_ATTR_2(pwm4_auto_point4_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 3, 3),
 };
+/* Fan / PWM attr for the f8000, zones mapped to temp instead of to pwm!
+   Also the register block at offset A0 maps to TEMP1 (so our temp2, as the
+   F8000 starts counting temps at 0), B0 maps the TEMP2 and C0 maps to TEMP0 */
+static struct sensor_device_attribute_2 f8000_fan_attr[] = {
+        SENSOR_ATTR_2(fan4_input, S_IRUGO, show_fan, NULL, 0, 3),
+        SENSOR_ATTR_2(pwm3, S_IRUGO, show_pwm, NULL, 0, 2),
+        SENSOR_ATTR_2(temp1_auto_point1_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      0, 2),
+        SENSOR_ATTR_2(temp1_auto_point2_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      1, 2),
+        SENSOR_ATTR_2(temp1_auto_point3_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      2, 2),
+        SENSOR_ATTR_2(temp1_auto_point4_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      3, 2),
+        SENSOR_ATTR_2(temp1_auto_point5_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      4, 2),
+        SENSOR_ATTR_2(temp1_auto_point1_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      0, 2),
+        SENSOR_ATTR_2(temp1_auto_point2_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      1, 2),
+        SENSOR_ATTR_2(temp1_auto_point3_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      2, 2),
+        SENSOR_ATTR_2(temp1_auto_point4_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      3, 2),
+        SENSOR_ATTR_2(temp1_auto_point1_temp_hyst, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp_hyst,
+                      store_pwm_auto_point_temp_hyst,
+                      0, 2),
+        SENSOR_ATTR_2(temp1_auto_point2_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 1, 2),
+        SENSOR_ATTR_2(temp1_auto_point3_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 2, 2),
+        SENSOR_ATTR_2(temp1_auto_point4_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 3, 2),
+        SENSOR_ATTR_2(temp2_auto_point1_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      0, 0),
+        SENSOR_ATTR_2(temp2_auto_point2_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      1, 0),
+        SENSOR_ATTR_2(temp2_auto_point3_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      2, 0),
+        SENSOR_ATTR_2(temp2_auto_point4_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      3, 0),
+        SENSOR_ATTR_2(temp2_auto_point5_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      4, 0),
+        SENSOR_ATTR_2(temp2_auto_point1_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      0, 0),
+        SENSOR_ATTR_2(temp2_auto_point2_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      1, 0),
+        SENSOR_ATTR_2(temp2_auto_point3_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      2, 0),
+        SENSOR_ATTR_2(temp2_auto_point4_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      3, 0),
+        SENSOR_ATTR_2(temp2_auto_point1_temp_hyst, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp_hyst,
+                      store_pwm_auto_point_temp_hyst,
+                      0, 0),
+        SENSOR_ATTR_2(temp2_auto_point2_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 1, 0),
+        SENSOR_ATTR_2(temp2_auto_point3_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 2, 0),
+        SENSOR_ATTR_2(temp2_auto_point4_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 3, 0),
+        SENSOR_ATTR_2(temp3_auto_point1_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      0, 1),
+        SENSOR_ATTR_2(temp3_auto_point2_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      1, 1),
+        SENSOR_ATTR_2(temp3_auto_point3_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      2, 1),
+        SENSOR_ATTR_2(temp3_auto_point4_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      3, 1),
+        SENSOR_ATTR_2(temp3_auto_point5_pwm, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                      4, 1),
+        SENSOR_ATTR_2(temp3_auto_point1_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      0, 1),
+        SENSOR_ATTR_2(temp3_auto_point2_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      1, 1),
+        SENSOR_ATTR_2(temp3_auto_point3_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      2, 1),
+        SENSOR_ATTR_2(temp3_auto_point4_temp, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                      3, 1),
+        SENSOR_ATTR_2(temp3_auto_point1_temp_hyst, S_IRUGO|S_IWUSR,
+                      show_pwm_auto_point_temp_hyst,
+                      store_pwm_auto_point_temp_hyst,
+                      0, 1),
+        SENSOR_ATTR_2(temp3_auto_point2_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 1, 1),
+        SENSOR_ATTR_2(temp3_auto_point3_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 2, 1),
+        SENSOR_ATTR_2(temp3_auto_point4_temp_hyst, S_IRUGO,
+                      show_pwm_auto_point_temp_hyst, NULL, 3, 1),
+};
 /* Super I/O functions */
 static inline int superio_inb(int base, int reg)
@@ -299,11 +811,16 @@ static inline void superio_exit(int base)
        outb(SIO_LOCK_KEY, base);
 }
-static inline u16 fan_from_reg(u16 reg)
+static inline int fan_from_reg(u16 reg)
 {
        return reg ? (1500000 / reg) : 0;
 }
+static inline u16 fan_to_reg(int fan)
+{
+        return fan ? (1500000 / fan) : 0;
+}
 static u8 f71882fg_read8(struct f71882fg_data *data, u8 reg)
 {
        u8 val;
@@ -332,52 +849,111 @@ static void f71882fg_write8(struct f71882fg_data *data, u8 reg, u8 val)
        outb(val, data->addr + DATA_REG_OFFSET);
 }
-static struct f71882fg_data *f71882fg_update_device(struct device * dev)
+static void f71882fg_write16(struct f71882fg_data *data, u8 reg, u16 val)
+{
+        outb(reg++, data->addr + ADDR_REG_OFFSET);
+        outb(val >> 8, data->addr + DATA_REG_OFFSET);
+        outb(reg, data->addr + ADDR_REG_OFFSET);
+        outb(val & 255, data->addr + DATA_REG_OFFSET);
+}
+static struct f71882fg_data *f71882fg_update_device(struct device *dev)
 {
        struct f71882fg_data *data = dev_get_drvdata(dev);
-        int nr, reg, reg2;
+        int nr, reg = 0, reg2;
+        int nr_fans = (data->type == f71882fg) ? 4 : 3;
+        int nr_ins = (data->type == f8000) ? 3 : 9;
+        int temp_start = (data->type == f8000) ? 0 : 1;
        mutex_lock(&data->update_lock);
        /* Update once every 60 seconds */
        if ( time_after(jiffies, data->last_limits + 60 * HZ ) ||
                        !data->valid) {
-                data->in1_max = f71882fg_read8(data, F71882FG_REG_IN1_HIGH);
+                if (data->type == f71882fg) {
-                data->in_beep = f71882fg_read8(data, F71882FG_REG_IN_BEEP);
+                        data->in1_max =
+                                f71882fg_read8(data, F71882FG_REG_IN1_HIGH);
+                        data->in_beep =
+                                f71882fg_read8(data, F71882FG_REG_IN_BEEP);
+                }
                /* Get High & boundary temps*/
-                for (nr = 0; nr < 3; nr++) {
+                for (nr = temp_start; nr < 3 + temp_start; nr++) {
                        data->temp_ovt[nr] = f71882fg_read8(data,
                                                F71882FG_REG_TEMP_OVT(nr));
                        data->temp_high[nr] = f71882fg_read8(data,
                                                F71882FG_REG_TEMP_HIGH(nr));
                }
-                /* Have to hardcode hyst*/
+                if (data->type != f8000) {
-                data->temp_hyst[0] = f71882fg_read8(data,
+                        data->fan_beep = f71882fg_read8(data,
-                                                F71882FG_REG_TEMP_HYST1) >> 4;
+                                                F71882FG_REG_FAN_BEEP);
-                /* Hyst temps 2 & 3 stored in same register */
+                        data->temp_beep = f71882fg_read8(data,
-                reg = f71882fg_read8(data, F71882FG_REG_TEMP_HYST23);
+                                                F71882FG_REG_TEMP_BEEP);
-                data->temp_hyst[1] = reg & 0x0F;
+                        data->temp_hyst[0] = f71882fg_read8(data,
-                data->temp_hyst[2] = reg >> 4;
+                                                F71882FG_REG_TEMP_HYST(0));
+                        data->temp_hyst[1] = f71882fg_read8(data,
-                /* Have to hardcode type, because temp1 is special */
+                                                F71882FG_REG_TEMP_HYST(1));
-                reg  = f71882fg_read8(data, F71882FG_REG_TEMP_TYPE);
+                        /* Have to hardcode type, because temp1 is special */
+                        reg  = f71882fg_read8(data, F71882FG_REG_TEMP_TYPE);
+                        data->temp_type[2] = (reg & 0x04) ? 2 : 4;
+                        data->temp_type[3] = (reg & 0x08) ? 2 : 4;
+                }
                reg2 = f71882fg_read8(data, F71882FG_REG_PECI);
                if ((reg2 & 0x03) == 0x01)
-                        data->temp_type[0] = 6 /* PECI */;
+                        data->temp_type[1] = 6 /* PECI */;
                else if ((reg2 & 0x03) == 0x02)
-                        data->temp_type[0] = 5 /* AMDSI */;
+                        data->temp_type[1] = 5 /* AMDSI */;
+                else if (data->type != f8000)
+                        data->temp_type[1] = (reg & 0x02) ? 2 : 4;
                else
-                        data->temp_type[0] = (reg & 0x02) ? 2 : 4;
+                        data->temp_type[1] = 2; /* F8000 only supports BJT */
-                data->temp_type[1] = (reg & 0x04) ? 2 : 4;
+                data->pwm_enable = f71882fg_read8(data,
-                data->temp_type[2] = (reg & 0x08) ? 2 : 4;
+                                                  F71882FG_REG_PWM_ENABLE);
+                data->pwm_auto_point_hyst[0] =
-                data->temp_beep = f71882fg_read8(data, F71882FG_REG_TEMP_BEEP);
+                        f71882fg_read8(data, F71882FG_REG_FAN_HYST(0));
+                data->pwm_auto_point_hyst[1] =
-                data->fan_beep = f71882fg_read8(data, F71882FG_REG_FAN_BEEP);
+                        f71882fg_read8(data, F71882FG_REG_FAN_HYST(1));
+                for (nr = 0; nr < nr_fans; nr++) {
+                        data->pwm_auto_point_mapping[nr] =
+                            f71882fg_read8(data,
+                                           F71882FG_REG_POINT_MAPPING(nr));
+                        if (data->type != f71862fg) {
+                                int point;
+                                for (point = 0; point < 5; point++) {
+                                        data->pwm_auto_point_pwm[nr][point] =
+                                                f71882fg_read8(data,
+                                                        F71882FG_REG_POINT_PWM
+                                                        (nr, point));
+                                }
+                                for (point = 0; point < 4; point++) {
+                                        data->pwm_auto_point_temp[nr][point] =
+                                                f71882fg_read8(data,
+                                                        F71882FG_REG_POINT_TEMP
+                                                        (nr, point));
+                                }
+                        } else {
+                                data->pwm_auto_point_pwm[nr][1] =
+                                        f71882fg_read8(data,
+                                                F71882FG_REG_POINT_PWM
+                                                (nr, 1));
+                                data->pwm_auto_point_pwm[nr][4] =
+                                        f71882fg_read8(data,
+                                                F71882FG_REG_POINT_PWM
+                                                (nr, 4));
+                                data->pwm_auto_point_temp[nr][0] =
+                                        f71882fg_read8(data,
+                                                F71882FG_REG_POINT_TEMP
+                                                (nr, 0));
+                                data->pwm_auto_point_temp[nr][3] =
+                                        f71882fg_read8(data,
+                                                F71882FG_REG_POINT_TEMP
+                                                (nr, 3));
+                        }
+                }
                data->last_limits = jiffies;
        }
@@ -387,19 +963,32 @@ static struct f71882fg_data *f71882fg_update_device(struct device * dev)
                                                F71882FG_REG_TEMP_STATUS);
                data->temp_diode_open = f71882fg_read8(data,
                                                F71882FG_REG_TEMP_DIODE_OPEN);
-                for (nr = 0; nr < 3; nr++)
+                for (nr = temp_start; nr < 3 + temp_start; nr++)
                        data->temp[nr] = f71882fg_read8(data,
                                                F71882FG_REG_TEMP(nr));
                data->fan_status = f71882fg_read8(data,
                                                F71882FG_REG_FAN_STATUS);
-                for (nr = 0; nr < 4; nr++)
+                for (nr = 0; nr < nr_fans; nr++) {
                        data->fan[nr] = f71882fg_read16(data,
                                                F71882FG_REG_FAN(nr));
+                        data->fan_target[nr] =
+                            f71882fg_read16(data, F71882FG_REG_FAN_TARGET(nr));
+                        data->fan_full_speed[nr] =
+                            f71882fg_read16(data,
+                                            F71882FG_REG_FAN_FULL_SPEED(nr));
+                        data->pwm[nr] =
+                            f71882fg_read8(data, F71882FG_REG_PWM(nr));
+                }
-                data->in_status = f71882fg_read8(data,
+                /* The f8000 can monitor 1 more fan, but has no pwm for it */
+                if (data->type == f8000)
+                        data->fan[3] = f71882fg_read16(data,
+                                                F71882FG_REG_FAN(3));
+                if (data->type == f71882fg)
+                        data->in_status = f71882fg_read8(data,
                                                F71882FG_REG_IN_STATUS);
-                for (nr = 0; nr < 9; nr++)
+                for (nr = 0; nr < nr_ins; nr++)
                        data->in[nr] = f71882fg_read8(data,
                                                F71882FG_REG_IN(nr));
@@ -417,7 +1006,7 @@ static ssize_t show_fan(struct device *dev, struct device_attribute *devattr,
        char *buf)
 {
        struct f71882fg_data *data = f71882fg_update_device(dev);
-        int nr = to_sensor_dev_attr(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->index;
        int speed = fan_from_reg(data->fan[nr]);
        if (speed == FAN_MIN_DETECT)
@@ -426,11 +1015,39 @@ static ssize_t show_fan(struct device *dev, struct device_attribute *devattr,
        return sprintf(buf, "%d\n", speed);
 }
+static ssize_t show_fan_full_speed(struct device *dev,
+                                   struct device_attribute *devattr, char *buf)
+{
+        struct f71882fg_data *data = f71882fg_update_device(dev);
+        int nr = to_sensor_dev_attr_2(devattr)->index;
+        int speed = fan_from_reg(data->fan_full_speed[nr]);
+        return sprintf(buf, "%d\n", speed);
+}
+static ssize_t store_fan_full_speed(struct device *dev,
+                                    struct device_attribute *devattr,
+                                    const char *buf, size_t count)
+{
+        struct f71882fg_data *data = dev_get_drvdata(dev);
+        int nr = to_sensor_dev_attr_2(devattr)->index;
+        long val = simple_strtol(buf, NULL, 10);
+        val = SENSORS_LIMIT(val, 23, 1500000);
+        val = fan_to_reg(val);
+        mutex_lock(&data->update_lock);
+        f71882fg_write16(data, F71882FG_REG_FAN_FULL_SPEED(nr), val);
+        data->fan_full_speed[nr] = val;
+        mutex_unlock(&data->update_lock);
+        return count;
+}
 static ssize_t show_fan_beep(struct device *dev, struct device_attribute
        *devattr, char *buf)
 {
        struct f71882fg_data *data = f71882fg_update_device(dev);
-        int nr = to_sensor_dev_attr(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->index;
        if (data->fan_beep & (1 << nr))
                return sprintf(buf, "1\n");
@@ -442,10 +1059,11 @@ static ssize_t store_fan_beep(struct device *dev, struct device_attribute
        *devattr, const char *buf, size_t count)
 {
        struct f71882fg_data *data = dev_get_drvdata(dev);
-        int nr = to_sensor_dev_attr(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->index;
-        int val = simple_strtoul(buf, NULL, 10);
+        unsigned long val = simple_strtoul(buf, NULL, 10);
        mutex_lock(&data->update_lock);
+        data->fan_beep = f71882fg_read8(data, F71882FG_REG_FAN_BEEP);
        if (val)
                data->fan_beep |= 1 << nr;
        else
@@ -461,7 +1079,7 @@ static ssize_t show_fan_alarm(struct device *dev, struct device_attribute
        *devattr, char *buf)
 {
        struct f71882fg_data *data = f71882fg_update_device(dev);
-        int nr = to_sensor_dev_attr(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->index;
        if (data->fan_status & (1 << nr))
                return sprintf(buf, "1\n");
@@ -473,7 +1091,7 @@ static ssize_t show_in(struct device *dev, struct device_attribute *devattr,
        char *buf)
 {
        struct f71882fg_data *data = f71882fg_update_device(dev);
-        int nr = to_sensor_dev_attr(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->index;
        return sprintf(buf, "%d\n", data->in[nr] * 8);
 }
@@ -490,10 +1108,8 @@ static ssize_t store_in_max(struct device *dev, struct device_attribute
        *devattr, const char *buf, size_t count)
 {
        struct f71882fg_data *data = dev_get_drvdata(dev);
-        int val = simple_strtoul(buf, NULL, 10) / 8;
+        long val = simple_strtol(buf, NULL, 10) / 8;
+        val = SENSORS_LIMIT(val, 0, 255);
-        if (val > 255)
-                val = 255;
        mutex_lock(&data->update_lock);
        f71882fg_write8(data, F71882FG_REG_IN1_HIGH, val);
@@ -507,7 +1123,7 @@ static ssize_t show_in_beep(struct device *dev, struct device_attribute
        *devattr, char *buf)
 {
        struct f71882fg_data *data = f71882fg_update_device(dev);
-        int nr = to_sensor_dev_attr(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->index;
        if (data->in_beep & (1 << nr))
                return sprintf(buf, "1\n");
@@ -519,10 +1135,11 @@ static ssize_t store_in_beep(struct device *dev, struct device_attribute
        *devattr, const char *buf, size_t count)
 {
        struct f71882fg_data *data = dev_get_drvdata(dev);
-        int nr = to_sensor_dev_attr(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->index;
-        int val = simple_strtoul(buf, NULL, 10);
+        unsigned long val = simple_strtoul(buf, NULL, 10);
        mutex_lock(&data->update_lock);
+        data->in_beep = f71882fg_read8(data, F71882FG_REG_IN_BEEP);
        if (val)
                data->in_beep |= 1 << nr;
        else
@@ -538,7 +1155,7 @@ static ssize_t show_in_alarm(struct device *dev, struct device_attribute
        *devattr, char *buf)
 {
        struct f71882fg_data *data = f71882fg_update_device(dev);
-        int nr = to_sensor_dev_attr(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->index;
        if (data->in_status & (1 << nr))
                return sprintf(buf, "1\n");
@@ -550,7 +1167,7 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
        char *buf)
 {
        struct f71882fg_data *data = f71882fg_update_device(dev);
-        int nr = to_sensor_dev_attr(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->index;
        return sprintf(buf, "%d\n", data->temp[nr] * 1000);
 }
@@ -559,7 +1176,7 @@ static ssize_t show_temp_max(struct device *dev, struct device_attribute
        *devattr, char *buf)
 {
        struct f71882fg_data *data = f71882fg_update_device(dev);
-        int nr = to_sensor_dev_attr(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->index;
        return sprintf(buf, "%d\n", data->temp_high[nr] * 1000);
 }
@@ -568,11 +1185,9 @@ static ssize_t store_temp_max(struct device *dev, struct device_attribute
        *devattr, const char *buf, size_t count)
 {
        struct f71882fg_data *data = dev_get_drvdata(dev);
-        int nr = to_sensor_dev_attr(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->index;
-        int val = simple_strtoul(buf, NULL, 10) / 1000;
+        long val = simple_strtol(buf, NULL, 10) / 1000;
+        val = SENSORS_LIMIT(val, 0, 255);
-        if (val > 255)
-                val = 255;
        mutex_lock(&data->update_lock);
        f71882fg_write8(data, F71882FG_REG_TEMP_HIGH(nr), val);
@@ -586,48 +1201,46 @@ static ssize_t show_temp_max_hyst(struct device *dev, struct device_attribute
        *devattr, char *buf)
 {
        struct f71882fg_data *data = f71882fg_update_device(dev);
-        int nr = to_sensor_dev_attr(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->index;
+        int temp_max_hyst;
+        mutex_lock(&data->update_lock);
+        if (nr & 1)
+                temp_max_hyst = data->temp_hyst[nr / 2] >> 4;
+        else
+                temp_max_hyst = data->temp_hyst[nr / 2] & 0x0f;
+        temp_max_hyst = (data->temp_high[nr] - temp_max_hyst) * 1000;
+        mutex_unlock(&data->update_lock);
-        return sprintf(buf, "%d\n",
+        return sprintf(buf, "%d\n", temp_max_hyst);
-                (data->temp_high[nr] - data->temp_hyst[nr]) * 1000);
 }
 static ssize_t store_temp_max_hyst(struct device *dev, struct device_attribute
        *devattr, const char *buf, size_t count)
 {
        struct f71882fg_data *data = dev_get_drvdata(dev);
-        int nr = to_sensor_dev_attr(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->index;
-        int val = simple_strtoul(buf, NULL, 10) / 1000;
+        long val = simple_strtol(buf, NULL, 10) / 1000;
        ssize_t ret = count;
+        u8 reg;
        mutex_lock(&data->update_lock);
        /* convert abs to relative and check */
+        data->temp_high[nr] = f71882fg_read8(data, F71882FG_REG_TEMP_HIGH(nr));
+        val = SENSORS_LIMIT(val, data->temp_high[nr] - 15,
+                            data->temp_high[nr]);
        val = data->temp_high[nr] - val;
-        if (val < 0 || val > 15) {
-                ret = -EINVAL;
-                goto store_temp_max_hyst_exit;
-        }
-        data->temp_hyst[nr] = val;
        /* convert value to register contents */
-        switch (nr) {
+        reg = f71882fg_read8(data, F71882FG_REG_TEMP_HYST(nr / 2));
-                case 0:
+        if (nr & 1)
-                        val = val << 4;
+                reg = (reg & 0x0f) | (val << 4);
-                        break;
+        else
-                case 1:
+                reg = (reg & 0xf0) | val;
-                        val = val | (data->temp_hyst[2] << 4);
+        f71882fg_write8(data, F71882FG_REG_TEMP_HYST(nr / 2), reg);
-                        break;
+        data->temp_hyst[nr / 2] = reg;
-                case 2:
-                        val = data->temp_hyst[1] | (val << 4);
-                        break;
-        }
-        f71882fg_write8(data, nr ? F71882FG_REG_TEMP_HYST23 :
-                F71882FG_REG_TEMP_HYST1, val);
-store_temp_max_hyst_exit:
        mutex_unlock(&data->update_lock);
        return ret;
 }
@@ -636,7 +1249,7 @@ static ssize_t show_temp_crit(struct device *dev, struct device_attribute
        *devattr, char *buf)
 {
        struct f71882fg_data *data = f71882fg_update_device(dev);
-        int nr = to_sensor_dev_attr(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->index;
        return sprintf(buf, "%d\n", data->temp_ovt[nr] * 1000);
 }
@@ -645,11 +1258,9 @@ static ssize_t store_temp_crit(struct device *dev, struct device_attribute
        *devattr, const char *buf, size_t count)
 {
        struct f71882fg_data *data = dev_get_drvdata(dev);
-        int nr = to_sensor_dev_attr(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->index;
-        int val = simple_strtoul(buf, NULL, 10) / 1000;
+        long val = simple_strtol(buf, NULL, 10) / 1000;
+        val = SENSORS_LIMIT(val, 0, 255);
-        if (val > 255)
-                val = 255;
        mutex_lock(&data->update_lock);
        f71882fg_write8(data, F71882FG_REG_TEMP_OVT(nr), val);
@@ -663,17 +1274,25 @@ static ssize_t show_temp_crit_hyst(struct device *dev, struct device_attribute
        *devattr, char *buf)
 {
        struct f71882fg_data *data = f71882fg_update_device(dev);
-        int nr = to_sensor_dev_attr(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->index;
+        int temp_crit_hyst;
+        mutex_lock(&data->update_lock);
+        if (nr & 1)
+                temp_crit_hyst = data->temp_hyst[nr / 2] >> 4;
+        else
+                temp_crit_hyst = data->temp_hyst[nr / 2] & 0x0f;
+        temp_crit_hyst = (data->temp_ovt[nr] - temp_crit_hyst) * 1000;
+        mutex_unlock(&data->update_lock);
-        return sprintf(buf, "%d\n",
+        return sprintf(buf, "%d\n", temp_crit_hyst);
-                (data->temp_ovt[nr] - data->temp_hyst[nr]) * 1000);
 }
 static ssize_t show_temp_type(struct device *dev, struct device_attribute
        *devattr, char *buf)
 {
        struct f71882fg_data *data = f71882fg_update_device(dev);
-        int nr = to_sensor_dev_attr(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->index;
        return sprintf(buf, "%d\n", data->temp_type[nr]);
 }
@@ -682,9 +1301,9 @@ static ssize_t show_temp_beep(struct device *dev, struct device_attribute
        *devattr, char *buf)
 {
        struct f71882fg_data *data = f71882fg_update_device(dev);
-        int nr = to_sensor_dev_attr(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->index;
-        if (data->temp_beep & (1 << (nr + 1)))
+        if (data->temp_beep & (1 << nr))
                return sprintf(buf, "1\n");
        else
                return sprintf(buf, "0\n");
@@ -694,14 +1313,15 @@ static ssize_t store_temp_beep(struct device *dev, struct device_attribute
        *devattr, const char *buf, size_t count)
 {
        struct f71882fg_data *data = dev_get_drvdata(dev);
-        int nr = to_sensor_dev_attr(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->index;
-        int val = simple_strtoul(buf, NULL, 10);
+        unsigned long val = simple_strtoul(buf, NULL, 10);
        mutex_lock(&data->update_lock);
+        data->temp_beep = f71882fg_read8(data, F71882FG_REG_TEMP_BEEP);
        if (val)
-                data->temp_beep |= 1 << (nr + 1);
+                data->temp_beep |= 1 << nr;
        else
-                data->temp_beep &= ~(1 << (nr + 1));
+                data->temp_beep &= ~(1 << nr);
        f71882fg_write8(data, F71882FG_REG_TEMP_BEEP, data->temp_beep);
        mutex_unlock(&data->update_lock);
@@ -713,9 +1333,9 @@ static ssize_t show_temp_alarm(struct device *dev, struct device_attribute
        *devattr, char *buf)
 {
        struct f71882fg_data *data = f71882fg_update_device(dev);
-        int nr = to_sensor_dev_attr(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->index;
-        if (data->temp_status & (1 << (nr + 1)))
+        if (data->temp_status & (1 << nr))
                return sprintf(buf, "1\n");
        else
                return sprintf(buf, "0\n");
@@ -725,113 +1345,528 @@ static ssize_t show_temp_fault(struct device *dev, struct device_attribute
        *devattr, char *buf)
 {
        struct f71882fg_data *data = f71882fg_update_device(dev);
-        int nr = to_sensor_dev_attr(devattr)->index;
+        int nr = to_sensor_dev_attr_2(devattr)->index;
-        if (data->temp_diode_open & (1 << (nr + 1)))
+        if (data->temp_diode_open & (1 << nr))
                return sprintf(buf, "1\n");
        else
                return sprintf(buf, "0\n");
 }
+static ssize_t show_pwm(struct device *dev,
+                        struct device_attribute *devattr, char *buf)
+{
+        struct f71882fg_data *data = f71882fg_update_device(dev);
+        int val, nr = to_sensor_dev_attr_2(devattr)->index;
+        mutex_lock(&data->update_lock);
+        if (data->pwm_enable & (1 << (2 * nr)))
+                /* PWM mode */
+                val = data->pwm[nr];
+        else {
+                /* RPM mode */
+                val = 255 * fan_from_reg(data->fan_target[nr])
+                        / fan_from_reg(data->fan_full_speed[nr]);
+        }
+        mutex_unlock(&data->update_lock);
+        return sprintf(buf, "%d\n", val);
+}
+static ssize_t store_pwm(struct device *dev,
+                         struct device_attribute *devattr, const char *buf,
+                         size_t count)
+{
+        struct f71882fg_data *data = dev_get_drvdata(dev);
+        int nr = to_sensor_dev_attr_2(devattr)->index;
+        long val = simple_strtol(buf, NULL, 10);
+        val = SENSORS_LIMIT(val, 0, 255);
+        mutex_lock(&data->update_lock);
+        data->pwm_enable = f71882fg_read8(data, F71882FG_REG_PWM_ENABLE);
+        if ((data->type == f8000 && ((data->pwm_enable >> 2 * nr) & 3) != 2) ||
+            (data->type != f8000 && !((data->pwm_enable >> 2 * nr) & 2))) {
+                count = -EROFS;
+                goto leave;
+        }
+        if (data->pwm_enable & (1 << (2 * nr))) {
+                /* PWM mode */
+                f71882fg_write8(data, F71882FG_REG_PWM(nr), val);
+                data->pwm[nr] = val;
+        } else {
+                /* RPM mode */
+                int target, full_speed;
+                full_speed = f71882fg_read16(data,
+                                             F71882FG_REG_FAN_FULL_SPEED(nr));
+                target = fan_to_reg(val * fan_from_reg(full_speed) / 255);
+                f71882fg_write16(data, F71882FG_REG_FAN_TARGET(nr), target);
+                data->fan_target[nr] = target;
+                data->fan_full_speed[nr] = full_speed;
+        }
+leave:
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+static ssize_t show_pwm_enable(struct device *dev,
+                               struct device_attribute *devattr, char *buf)
+{
+        int result = 0;
+        struct f71882fg_data *data = f71882fg_update_device(dev);
+        int nr = to_sensor_dev_attr_2(devattr)->index;
+        switch ((data->pwm_enable >> 2 * nr) & 3) {
+        case 0:
+        case 1:
+                result = 2; /* Normal auto mode */
+                break;
+        case 2:
+                result = 1; /* Manual mode */
+                break;
+        case 3:
+                if (data->type == f8000)
+                        result = 3; /* Thermostat mode */
+                else
+                        result = 1; /* Manual mode */
+                break;
+        }
+        return sprintf(buf, "%d\n", result);
+}
+static ssize_t store_pwm_enable(struct device *dev, struct device_attribute
+                                *devattr, const char *buf, size_t count)
+{
+        struct f71882fg_data *data = dev_get_drvdata(dev);
+        int nr = to_sensor_dev_attr_2(devattr)->index;
+        long val = simple_strtol(buf, NULL, 10);
+        mutex_lock(&data->update_lock);
+        data->pwm_enable = f71882fg_read8(data, F71882FG_REG_PWM_ENABLE);
+        /* Special case for F8000 auto PWM mode / Thermostat mode */
+        if (data->type == f8000 && ((data->pwm_enable >> 2 * nr) & 1)) {
+                switch (val) {
+                case 2:
+                        data->pwm_enable &= ~(2 << (2 * nr));
+                        break;          /* Normal auto mode */
+                case 3:
+                        data->pwm_enable |= 2 << (2 * nr);
+                        break;          /* Thermostat mode */
+                default:
+                        count = -EINVAL;
+                        goto leave;
+                }
+        } else {
+                switch (val) {
+                case 1:
+                        data->pwm_enable |= 2 << (2 * nr);
+                        break;          /* Manual */
+                case 2:
+                        data->pwm_enable &= ~(2 << (2 * nr));
+                        break;          /* Normal auto mode */
+                default:
+                        count = -EINVAL;
+                        goto leave;
+                }
+        }
+        f71882fg_write8(data, F71882FG_REG_PWM_ENABLE, data->pwm_enable);
+leave:
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+static ssize_t show_pwm_auto_point_pwm(struct device *dev,
+                                       struct device_attribute *devattr,
+                                       char *buf)
+{
+        int result;
+        struct f71882fg_data *data = f71882fg_update_device(dev);
+        int pwm = to_sensor_dev_attr_2(devattr)->index;
+        int point = to_sensor_dev_attr_2(devattr)->nr;
+        mutex_lock(&data->update_lock);
+        if (data->pwm_enable & (1 << (2 * pwm))) {
+                /* PWM mode */
+                result = data->pwm_auto_point_pwm[pwm][point];
+        } else {
+                /* RPM mode */
+                result = 32 * 255 / (32 + data->pwm_auto_point_pwm[pwm][point]);
+        }
+        mutex_unlock(&data->update_lock);
+        return sprintf(buf, "%d\n", result);
+}
+static ssize_t store_pwm_auto_point_pwm(struct device *dev,
+                                        struct device_attribute *devattr,
+                                        const char *buf, size_t count)
+{
+        struct f71882fg_data *data = dev_get_drvdata(dev);
+        int pwm = to_sensor_dev_attr_2(devattr)->index;
+        int point = to_sensor_dev_attr_2(devattr)->nr;
+        long val = simple_strtol(buf, NULL, 10);
+        val = SENSORS_LIMIT(val, 0, 255);
+        mutex_lock(&data->update_lock);
+        data->pwm_enable = f71882fg_read8(data, F71882FG_REG_PWM_ENABLE);
+        if (data->pwm_enable & (1 << (2 * pwm))) {
+                /* PWM mode */
+        } else {
+                /* RPM mode */
+                if (val < 29)   /* Prevent negative numbers */
+                        val = 255;
+                else
+                        val = (255 - val) * 32 / val;
+        }
+        f71882fg_write8(data, F71882FG_REG_POINT_PWM(pwm, point), val);
+        data->pwm_auto_point_pwm[pwm][point] = val;
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+static ssize_t show_pwm_auto_point_temp_hyst(struct device *dev,
+                                             struct device_attribute *devattr,
+                                             char *buf)
+{
+        int result = 0;
+        struct f71882fg_data *data = f71882fg_update_device(dev);
+        int nr = to_sensor_dev_attr_2(devattr)->index;
+        int point = to_sensor_dev_attr_2(devattr)->nr;
+        mutex_lock(&data->update_lock);
+        if (nr & 1)
+                result = data->pwm_auto_point_hyst[nr / 2] >> 4;
+        else
+                result = data->pwm_auto_point_hyst[nr / 2] & 0x0f;
+        result = 1000 * (data->pwm_auto_point_temp[nr][point] - result);
+        mutex_unlock(&data->update_lock);
+        return sprintf(buf, "%d\n", result);
+}
+static ssize_t store_pwm_auto_point_temp_hyst(struct device *dev,
+                                              struct device_attribute *devattr,
+                                              const char *buf, size_t count)
+{
+        struct f71882fg_data *data = dev_get_drvdata(dev);
+        int nr = to_sensor_dev_attr_2(devattr)->index;
+        int point = to_sensor_dev_attr_2(devattr)->nr;
+        long val = simple_strtol(buf, NULL, 10) / 1000;
+        u8 reg;
+        mutex_lock(&data->update_lock);
+        data->pwm_auto_point_temp[nr][point] =
+                f71882fg_read8(data, F71882FG_REG_POINT_TEMP(nr, point));
+        val = SENSORS_LIMIT(val, data->pwm_auto_point_temp[nr][point] - 15,
+                                data->pwm_auto_point_temp[nr][point]);
+        val = data->pwm_auto_point_temp[nr][point] - val;
+        reg = f71882fg_read8(data, F71882FG_REG_FAN_HYST(nr / 2));
+        if (nr & 1)
+                reg = (reg & 0x0f) | (val << 4);
+        else
+                reg = (reg & 0xf0) | val;
+        f71882fg_write8(data, F71882FG_REG_FAN_HYST(nr / 2), reg);
+        data->pwm_auto_point_hyst[nr / 2] = reg;
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+static ssize_t show_pwm_interpolate(struct device *dev,
+                                    struct device_attribute *devattr, char *buf)
+{
+        int result;
+        struct f71882fg_data *data = f71882fg_update_device(dev);
+        int nr = to_sensor_dev_attr_2(devattr)->index;
+        result = (data->pwm_auto_point_mapping[nr] >> 4) & 1;
+        return sprintf(buf, "%d\n", result);
+}
+static ssize_t store_pwm_interpolate(struct device *dev,
+                                     struct device_attribute *devattr,
+                                     const char *buf, size_t count)
+{
+        struct f71882fg_data *data = dev_get_drvdata(dev);
+        int nr = to_sensor_dev_attr_2(devattr)->index;
+        unsigned long val = simple_strtoul(buf, NULL, 10);
+        mutex_lock(&data->update_lock);
+        data->pwm_auto_point_mapping[nr] =
+                f71882fg_read8(data, F71882FG_REG_POINT_MAPPING(nr));
+        if (val)
+                val = data->pwm_auto_point_mapping[nr] | (1 << 4);
+        else
+                val = data->pwm_auto_point_mapping[nr] & (~(1 << 4));
+        f71882fg_write8(data, F71882FG_REG_POINT_MAPPING(nr), val);
+        data->pwm_auto_point_mapping[nr] = val;
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+static ssize_t show_pwm_auto_point_channel(struct device *dev,
+                                           struct device_attribute *devattr,
+                                           char *buf)
+{
+        int result;
+        struct f71882fg_data *data = f71882fg_update_device(dev);
+        int nr = to_sensor_dev_attr_2(devattr)->index;
+        int temp_start = (data->type == f8000) ? 0 : 1;
+        result = 1 << ((data->pwm_auto_point_mapping[nr] & 3) - temp_start);
+        return sprintf(buf, "%d\n", result);
+}
+static ssize_t store_pwm_auto_point_channel(struct device *dev,
+                                            struct device_attribute *devattr,
+                                            const char *buf, size_t count)
+{
+        struct f71882fg_data *data = dev_get_drvdata(dev);
+        int nr = to_sensor_dev_attr_2(devattr)->index;
+        int temp_start = (data->type == f8000) ? 0 : 1;
+        long val = simple_strtol(buf, NULL, 10);
+        switch (val) {
+        case 1:
+                val = 0;
+                break;
+        case 2:
+                val = 1;
+                break;
+        case 4:
+                val = 2;
+                break;
+        default:
+                return -EINVAL;
+        }
+        val += temp_start;
+        mutex_lock(&data->update_lock);
+        data->pwm_auto_point_mapping[nr] =
+                f71882fg_read8(data, F71882FG_REG_POINT_MAPPING(nr));
+        val = (data->pwm_auto_point_mapping[nr] & 0xfc) | val;
+        f71882fg_write8(data, F71882FG_REG_POINT_MAPPING(nr), val);
+        data->pwm_auto_point_mapping[nr] = val;
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+static ssize_t show_pwm_auto_point_temp(struct device *dev,
+                                        struct device_attribute *devattr,
+                                        char *buf)
+{
+        int result;
+        struct f71882fg_data *data = f71882fg_update_device(dev);
+        int pwm = to_sensor_dev_attr_2(devattr)->index;
+        int point = to_sensor_dev_attr_2(devattr)->nr;
+        result = data->pwm_auto_point_temp[pwm][point];
+        return sprintf(buf, "%d\n", 1000 * result);
+}
+static ssize_t store_pwm_auto_point_temp(struct device *dev,
+                                         struct device_attribute *devattr,
+                                         const char *buf, size_t count)
+{
+        struct f71882fg_data *data = dev_get_drvdata(dev);
+        int pwm = to_sensor_dev_attr_2(devattr)->index;
+        int point = to_sensor_dev_attr_2(devattr)->nr;
+        long val = simple_strtol(buf, NULL, 10) / 1000;
+        val = SENSORS_LIMIT(val, 0, 255);
+        mutex_lock(&data->update_lock);
+        f71882fg_write8(data, F71882FG_REG_POINT_TEMP(pwm, point), val);
+        data->pwm_auto_point_temp[pwm][point] = val;
+        mutex_unlock(&data->update_lock);
+        return count;
+}
 static ssize_t show_name(struct device *dev, struct device_attribute *devattr,
        char *buf)
 {
-        return sprintf(buf, DRVNAME "\n");
+        struct f71882fg_data *data = dev_get_drvdata(dev);
+        return sprintf(buf, "%s\n", f71882fg_names[data->type]);
 }
+static int __devinit f71882fg_create_sysfs_files(struct platform_device *pdev,
+        struct sensor_device_attribute_2 *attr, int count)
+{
+        int err, i;
+        for (i = 0; i < count; i++) {
+                err = device_create_file(&pdev->dev, &attr[i].dev_attr);
+                if (err)
+                        return err;
+        }
+        return 0;
+}
-static int __devinit f71882fg_probe(struct platform_device * pdev)
+static int __devinit f71882fg_probe(struct platform_device *pdev)
 {
        struct f71882fg_data *data;
-        int err, i;
+        struct f71882fg_sio_data *sio_data = pdev->dev.platform_data;
+        int err, i, nr_fans = (sio_data->type == f71882fg) ? 4 : 3;
        u8 start_reg;
-        if (!(data = kzalloc(sizeof(struct f71882fg_data), GFP_KERNEL)))
+        data = kzalloc(sizeof(struct f71882fg_data), GFP_KERNEL);
+        if (!data)
                return -ENOMEM;
        data->addr = platform_get_resource(pdev, IORESOURCE_IO, 0)->start;
+        data->type = sio_data->type;
        mutex_init(&data->update_lock);
        platform_set_drvdata(pdev, data);
-        /* Register sysfs interface files */
+        start_reg = f71882fg_read8(data, F71882FG_REG_START);
-        for (i = 0; i < ARRAY_SIZE(f71882fg_dev_attr); i++) {
+        if (start_reg & 0x04) {
-                err = device_create_file(&pdev->dev, &f71882fg_dev_attr[i]);
+                dev_warn(&pdev->dev, "Hardware monitor is powered down\n");
-                if (err)
+                err = -ENODEV;
-                        goto exit_unregister_sysfs;
+                goto exit_free;
+        }
+        if (!(start_reg & 0x03)) {
+                dev_warn(&pdev->dev, "Hardware monitoring not activated\n");
+                err = -ENODEV;
+                goto exit_free;
        }
-        start_reg = f71882fg_read8(data, F71882FG_REG_START);
+        data->pwm_enable = f71882fg_read8(data, F71882FG_REG_PWM_ENABLE);
+        /* If it is a 71862 and the fan / pwm part is enabled sanity check
+           the pwm settings */
+        if (data->type == f71862fg && (start_reg & 0x02)) {
+                if ((data->pwm_enable & 0x15) != 0x15) {
+                        dev_err(&pdev->dev,
+                                "Invalid (reserved) pwm settings: 0x%02x\n",
+                                (unsigned int)data->pwm_enable);
+                        err = -ENODEV;
+                        goto exit_free;
+                }
+        }
+        /* Register sysfs interface files */
+        err = device_create_file(&pdev->dev, &dev_attr_name);
+        if (err)
+                goto exit_unregister_sysfs;
        if (start_reg & 0x01) {
-                for (i = 0; i < ARRAY_SIZE(f71882fg_in_temp_attr); i++) {
+                switch (data->type) {
-                        err = device_create_file(&pdev->dev,
+                case f71882fg:
-                                        &f71882fg_in_temp_attr[i].dev_attr);
+                        err = f71882fg_create_sysfs_files(pdev,
+                                        f71882fg_in_temp_attr,
+                                        ARRAY_SIZE(f71882fg_in_temp_attr));
                        if (err)
                                goto exit_unregister_sysfs;
+                        /* fall through! */
+                case f71862fg:
+                        err = f71882fg_create_sysfs_files(pdev,
+                                        f718x2fg_in_temp_attr,
+                                        ARRAY_SIZE(f718x2fg_in_temp_attr));
+                        break;
+                case f8000:
+                        err = f71882fg_create_sysfs_files(pdev,
+                                        f8000_in_temp_attr,
+                                        ARRAY_SIZE(f8000_in_temp_attr));
+                        break;
                }
+                if (err)
+                        goto exit_unregister_sysfs;
        }
        if (start_reg & 0x02) {
-                for (i = 0; i < ARRAY_SIZE(f71882fg_fan_attr); i++) {
+                err = f71882fg_create_sysfs_files(pdev, fxxxx_fan_attr,
-                        err = device_create_file(&pdev->dev,
+                                        ARRAY_SIZE(fxxxx_fan_attr));
-                                        &f71882fg_fan_attr[i].dev_attr);
+                if (err)
-                        if (err)
+                        goto exit_unregister_sysfs;
-                                goto exit_unregister_sysfs;
+                switch (data->type) {
+                case f71862fg:
+                        err = f71882fg_create_sysfs_files(pdev,
+                                        f71862fg_fan_attr,
+                                        ARRAY_SIZE(f71862fg_fan_attr));
+                        break;
+                case f71882fg:
+                        err = f71882fg_create_sysfs_files(pdev,
+                                        f71882fg_fan_attr,
+                                        ARRAY_SIZE(f71882fg_fan_attr));
+                        break;
+                case f8000:
+                        err = f71882fg_create_sysfs_files(pdev,
+                                        f8000_fan_attr,
+                                        ARRAY_SIZE(f8000_fan_attr));
+                        break;
                }
+                if (err)
+                        goto exit_unregister_sysfs;
+                for (i = 0; i < nr_fans; i++)
+                        dev_info(&pdev->dev, "Fan: %d is in %s mode\n", i + 1,
+                                 (data->pwm_enable & (1 << 2 * i)) ?
+                                 "duty-cycle" : "RPM");
        }
        data->hwmon_dev = hwmon_device_register(&pdev->dev);
        if (IS_ERR(data->hwmon_dev)) {
                err = PTR_ERR(data->hwmon_dev);
+                data->hwmon_dev = NULL;
                goto exit_unregister_sysfs;
        }
        return 0;
 exit_unregister_sysfs:
-        for (i = 0; i < ARRAY_SIZE(f71882fg_dev_attr); i++)
+        f71882fg_remove(pdev); /* Will unregister the sysfs files for us */
-                device_remove_file(&pdev->dev, &f71882fg_dev_attr[i]);
+        return err; /* f71882fg_remove() also frees our data */
+exit_free:
-        for (i = 0; i < ARRAY_SIZE(f71882fg_in_temp_attr); i++)
-                device_remove_file(&pdev->dev,
-                                        &f71882fg_in_temp_attr[i].dev_attr);
-        for (i = 0; i < ARRAY_SIZE(f71882fg_fan_attr); i++)
-                device_remove_file(&pdev->dev, &f71882fg_fan_attr[i].dev_attr);
        kfree(data);
        return err;
 }
-static int __devexit f71882fg_remove(struct platform_device *pdev)
+static int f71882fg_remove(struct platform_device *pdev)
 {
        int i;
        struct f71882fg_data *data = platform_get_drvdata(pdev);
        platform_set_drvdata(pdev, NULL);
-        hwmon_device_unregister(data->hwmon_dev);
+        if (data->hwmon_dev)
+                hwmon_device_unregister(data->hwmon_dev);
+        /* Note we are not looping over all attr arrays we have as the ones
+           below are supersets of the ones skipped. */
+        device_remove_file(&pdev->dev, &dev_attr_name);
-        for (i = 0; i < ARRAY_SIZE(f71882fg_dev_attr); i++)
+        for (i = 0; i < ARRAY_SIZE(f718x2fg_in_temp_attr); i++)
-                device_remove_file(&pdev->dev, &f71882fg_dev_attr[i]);
+                device_remove_file(&pdev->dev,
+                                        &f718x2fg_in_temp_attr[i].dev_attr);
        for (i = 0; i < ARRAY_SIZE(f71882fg_in_temp_attr); i++)
                device_remove_file(&pdev->dev,
                                        &f71882fg_in_temp_attr[i].dev_attr);
+        for (i = 0; i < ARRAY_SIZE(fxxxx_fan_attr); i++)
+                device_remove_file(&pdev->dev, &fxxxx_fan_attr[i].dev_attr);
        for (i = 0; i < ARRAY_SIZE(f71882fg_fan_attr); i++)
                device_remove_file(&pdev->dev, &f71882fg_fan_attr[i].dev_attr);
+        for (i = 0; i < ARRAY_SIZE(f8000_fan_attr); i++)
+                device_remove_file(&pdev->dev, &f8000_fan_attr[i].dev_attr);
        kfree(data);
        return 0;
 }
-static int __init f71882fg_find(int sioaddr, unsigned short *address)
+static int __init f71882fg_find(int sioaddr, unsigned short *address,
+        struct f71882fg_sio_data *sio_data)
 {
        int err = -ENODEV;
        u16 devid;
-        u8 start_reg;
-        struct f71882fg_data data;
        superio_enter(sioaddr);
@@ -842,7 +1877,17 @@ static int __init f71882fg_find(int sioaddr, unsigned short *address)
        }
        devid = force_id ? force_id : superio_inw(sioaddr, SIO_REG_DEVID);
-        if (devid != SIO_F71882_ID) {
+        switch (devid) {
+        case SIO_F71862_ID:
+                sio_data->type = f71862fg;
+                break;
+        case SIO_F71882_ID:
+                sio_data->type = f71882fg;
+                break;
+        case SIO_F8000_ID:
+                sio_data->type = f8000;
+                break;
+        default:
                printk(KERN_INFO DRVNAME ": Unsupported Fintek device\n");
                goto exit;
        }
@@ -861,24 +1906,17 @@ static int __init f71882fg_find(int sioaddr, unsigned short *address)
        }
        *address &= ~(REGION_LENGTH - 1);       /* Ignore 3 LSB */
-        data.addr = *address;
-        start_reg = f71882fg_read8(&data, F71882FG_REG_START);
-        if (!(start_reg & 0x03)) {
-                printk(KERN_WARNING DRVNAME
-                        ": Hardware monitoring not activated\n");
-                goto exit;
-        }
        err = 0;
-        printk(KERN_INFO DRVNAME ": Found F71882FG chip at %#x, revision %d\n",
+        printk(KERN_INFO DRVNAME ": Found %s chip at %#x, revision %d\n",
-                (unsigned int)*address,
+                f71882fg_names[sio_data->type], (unsigned int)*address,
                (int)superio_inb(sioaddr, SIO_REG_DEVREV));
 exit:
        superio_exit(sioaddr);
        return err;
 }
-static int __init f71882fg_device_add(unsigned short address)
+static int __init f71882fg_device_add(unsigned short address,
+        const struct f71882fg_sio_data *sio_data)
 {
        struct resource res = {
                .start  = address,
@@ -892,12 +1930,23 @@ static int __init f71882fg_device_add(unsigned short address)
                return -ENOMEM;
        res.name = f71882fg_pdev->name;
+        err = acpi_check_resource_conflict(&res);
+        if (err)
+                return err;
        err = platform_device_add_resources(f71882fg_pdev, &res, 1);
        if (err) {
                printk(KERN_ERR DRVNAME ": Device resource addition failed\n");
                goto exit_device_put;
        }
+        err = platform_device_add_data(f71882fg_pdev, sio_data,
+                                       sizeof(struct f71882fg_sio_data));
+        if (err) {
+                printk(KERN_ERR DRVNAME ": Platform data allocation failed\n");
+                goto exit_device_put;
+        }
        err = platform_device_add(f71882fg_pdev);
        if (err) {
                printk(KERN_ERR DRVNAME ": Device addition failed\n");
@@ -916,14 +1965,20 @@ static int __init f71882fg_init(void)
 {
        int err = -ENODEV;
        unsigned short address;
+        struct f71882fg_sio_data sio_data;
+        memset(&sio_data, 0, sizeof(sio_data));
-        if (f71882fg_find(0x2e, &address) && f71882fg_find(0x4e, &address))
+        if (f71882fg_find(0x2e, &address, &sio_data) &&
+            f71882fg_find(0x4e, &address, &sio_data))
                goto exit;
-        if ((err = platform_driver_register(&f71882fg_driver)))
+        err = platform_driver_register(&f71882fg_driver);
+        if (err)
                goto exit;
-        if ((err = f71882fg_device_add(address)))
+        err = f71882fg_device_add(address, &sio_data);
+        if (err)
                goto exit_driver;
        return 0;
@@ -941,7 +1996,7 @@ static void __exit f71882fg_exit(void)
 }
 MODULE_DESCRIPTION("F71882FG Hardware Monitoring Driver");
-MODULE_AUTHOR("Hans Edgington (hans@edgington.nl)");
+MODULE_AUTHOR("Hans Edgington, Hans de Goede (hdegoede@redhat.com)");
 MODULE_LICENSE("GPL");
 module_init(f71882fg_init);
diff --git a/drivers/hwmon/fschmd.c b/drivers/hwmon/fschmd.c
index 967170368933..d07f4ef75092 100644
--- a/drivers/hwmon/fschmd.c
+++ b/drivers/hwmon/fschmd.c
@@ -1,6 +1,6 @@
 /* fschmd.c
 *
- * Copyright (C) 2007 Hans de Goede <j.w.r.degoede@hhs.nl>
+ * Copyright (C) 2007,2008 Hans de Goede <hdegoede@redhat.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
@@ -42,11 +42,20 @@
 #include <linux/mutex.h>
 #include <linux/sysfs.h>
 #include <linux/dmi.h>
+#include <linux/fs.h>
+#include <linux/watchdog.h>
+#include <linux/miscdevice.h>
+#include <linux/uaccess.h>
+#include <linux/kref.h>
 /* Addresses to scan */
 static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
 /* Insmod parameters */
+static int nowayout = WATCHDOG_NOWAYOUT;
+module_param(nowayout, int, 0);
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
+        __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
 I2C_CLIENT_INSMOD_5(fscpos, fscher, fscscy, fschrc, fschmd);
 /*
@@ -63,19 +72,26 @@ I2C_CLIENT_INSMOD_5(fscpos, fscher, fscscy, fschrc, fschmd);
 #define FSCHMD_REG_EVENT_STATE          0x04
 #define FSCHMD_REG_CONTROL              0x05
-#define FSCHMD_CONTROL_ALERT_LED_MASK   0x01
+#define FSCHMD_CONTROL_ALERT_LED        0x01
-/* watchdog (support to be implemented) */
+/* watchdog */
 #define FSCHMD_REG_WDOG_PRESET          0x28
 #define FSCHMD_REG_WDOG_STATE           0x23
 #define FSCHMD_REG_WDOG_CONTROL         0x21
+#define FSCHMD_WDOG_CONTROL_TRIGGER     0x10
+#define FSCHMD_WDOG_CONTROL_STARTED     0x10 /* the same as trigger */
+#define FSCHMD_WDOG_CONTROL_STOP        0x20
+#define FSCHMD_WDOG_CONTROL_RESOLUTION  0x40
+#define FSCHMD_WDOG_STATE_CARDRESET     0x02
 /* voltages, weird order is to keep the same order as the old drivers */
 static const u8 FSCHMD_REG_VOLT[3] = { 0x45, 0x42, 0x48 };
 /* minimum pwm at which the fan is driven (pwm can by increased depending on
   the temp. Notice that for the scy some fans share there minimum speed.
-   Also notice that with the scy the sensor order is different then with the
+   Also notice that with the scy the sensor order is different than with the
   other chips, this order was in the 2.4 driver and kept for consistency. */
 static const u8 FSCHMD_REG_FAN_MIN[5][6] = {
        { 0x55, 0x65 },                                 /* pos */
@@ -115,8 +131,8 @@ static const u8 FSCHMD_REG_FAN_RIPPLE[5][6] = {
 static const int FSCHMD_NO_FAN_SENSORS[5] = { 3, 3, 6, 4, 5 };
 /* Fan status register bitmasks */
-#define FSCHMD_FAN_ALARM_MASK           0x04 /* called fault by FSC! */
+#define FSCHMD_FAN_ALARM        0x04 /* called fault by FSC! */
-#define FSCHMD_FAN_NOT_PRESENT_MASK     0x08 /* not documented */
+#define FSCHMD_FAN_NOT_PRESENT  0x08 /* not documented */
 /* actual temperature registers */
@@ -158,14 +174,11 @@ static const u8 FSCHER_REG_TEMP_AUTOP2[] =	{ 0x75, 0x85, 0x95 }; */
 static const int FSCHMD_NO_TEMP_SENSORS[5] = { 3, 3, 4, 3, 5 };
 /* temp status register bitmasks */
-#define FSCHMD_TEMP_WORKING_MASK        0x01
+#define FSCHMD_TEMP_WORKING     0x01
-#define FSCHMD_TEMP_ALERT_MASK          0x02
+#define FSCHMD_TEMP_ALERT       0x02
 /* there only really is an alarm if the sensor is working and alert == 1 */
 #define FSCHMD_TEMP_ALARM_MASK \
-        (FSCHMD_TEMP_WORKING_MASK | FSCHMD_TEMP_ALERT_MASK)
+        (FSCHMD_TEMP_WORKING | FSCHMD_TEMP_ALERT)
-/* our driver name */
-#define FSCHMD_NAME "fschmd"
 /*
 * Functions declarations
@@ -195,7 +208,7 @@ MODULE_DEVICE_TABLE(i2c, fschmd_id);
 static struct i2c_driver fschmd_driver = {
        .class          = I2C_CLASS_HWMON,
        .driver = {
-                .name   = FSCHMD_NAME,
+                .name   = "fschmd",
        },
        .probe          = fschmd_probe,
        .remove         = fschmd_remove,
@@ -209,14 +222,26 @@ static struct i2c_driver fschmd_driver = {
 */
 struct fschmd_data {
+        struct i2c_client *client;
        struct device *hwmon_dev;
        struct mutex update_lock;
+        struct mutex watchdog_lock;
+        struct list_head list; /* member of the watchdog_data_list */
+        struct kref kref;
+        struct miscdevice watchdog_miscdev;
        int kind;
+        unsigned long watchdog_is_open;
+        char watchdog_expect_close;
+        char watchdog_name[10]; /* must be unique to avoid sysfs conflict */
        char valid; /* zero until following fields are valid */
        unsigned long last_updated; /* in jiffies */
        /* register values */
+        u8 revision;            /* chip revision */
        u8 global_control;      /* global control register */
+        u8 watchdog_control;    /* watchdog control register */
+        u8 watchdog_state;      /* watchdog status register */
+        u8 watchdog_preset;     /* watchdog counter preset on trigger val */
        u8 volt[3];             /* 12, 5, battery voltage */
        u8 temp_act[5];         /* temperature */
        u8 temp_status[5];      /* status of sensor */
@@ -228,11 +253,28 @@ struct fschmd_data {
 };
 /* Global variables to hold information read from special DMI tables, which are
-   available on FSC machines with an fscher or later chip. */
+   available on FSC machines with an fscher or later chip. There is no need to
+   protect these with a lock as they are only modified from our attach function
+   which always gets called with the i2c-core lock held and never accessed
+   before the attach function is done with them. */
 static int dmi_mult[3] = { 490, 200, 100 };
 static int dmi_offset[3] = { 0, 0, 0 };
 static int dmi_vref = -1;
+/* Somewhat ugly :( global data pointer list with all fschmd devices, so that
+   we can find our device data as when using misc_register there is no other
+   method to get to ones device data from the open fop. */
+static LIST_HEAD(watchdog_data_list);
+/* Note this lock not only protect list access, but also data.kref access */
+static DEFINE_MUTEX(watchdog_data_mutex);
+/* Release our data struct when we're detached from the i2c client *and* all
+   references to our watchdog device are released */
+static void fschmd_release_resources(struct kref *ref)
+{
+        struct fschmd_data *data = container_of(ref, struct fschmd_data, kref);
+        kfree(data);
+}
 /*
 * Sysfs attr show / store functions
@@ -300,7 +342,7 @@ static ssize_t show_temp_fault(struct device *dev,
        struct fschmd_data *data = fschmd_update_device(dev);
        /* bit 0 set means sensor working ok, so no fault! */
-        if (data->temp_status[index] & FSCHMD_TEMP_WORKING_MASK)
+        if (data->temp_status[index] & FSCHMD_TEMP_WORKING)
                return sprintf(buf, "0\n");
        else
                return sprintf(buf, "1\n");
@@ -385,7 +427,7 @@ static ssize_t show_fan_alarm(struct device *dev,
        int index = to_sensor_dev_attr(devattr)->index;
        struct fschmd_data *data = fschmd_update_device(dev);
-        if (data->fan_status[index] & FSCHMD_FAN_ALARM_MASK)
+        if (data->fan_status[index] & FSCHMD_FAN_ALARM)
                return sprintf(buf, "1\n");
        else
                return sprintf(buf, "0\n");
@@ -397,7 +439,7 @@ static ssize_t show_fan_fault(struct device *dev,
        int index = to_sensor_dev_attr(devattr)->index;
        struct fschmd_data *data = fschmd_update_device(dev);
-        if (data->fan_status[index] & FSCHMD_FAN_NOT_PRESENT_MASK)
+        if (data->fan_status[index] & FSCHMD_FAN_NOT_PRESENT)
                return sprintf(buf, "1\n");
        else
                return sprintf(buf, "0\n");
@@ -449,7 +491,7 @@ static ssize_t show_alert_led(struct device *dev,
 {
        struct fschmd_data *data = fschmd_update_device(dev);
-        if (data->global_control & FSCHMD_CONTROL_ALERT_LED_MASK)
+        if (data->global_control & FSCHMD_CONTROL_ALERT_LED)
                return sprintf(buf, "1\n");
        else
                return sprintf(buf, "0\n");
@@ -467,9 +509,9 @@ static ssize_t store_alert_led(struct device *dev,
        reg = i2c_smbus_read_byte_data(to_i2c_client(dev), FSCHMD_REG_CONTROL);
        if (v)
-                reg |= FSCHMD_CONTROL_ALERT_LED_MASK;
+                reg |= FSCHMD_CONTROL_ALERT_LED;
        else
-                reg &= ~FSCHMD_CONTROL_ALERT_LED_MASK;
+                reg &= ~FSCHMD_CONTROL_ALERT_LED;
        i2c_smbus_write_byte_data(to_i2c_client(dev), FSCHMD_REG_CONTROL, reg);
@@ -551,7 +593,265 @@ static struct sensor_device_attribute fschmd_fan_attr[] = {
 /*
- * Real code
+ * Watchdog routines
+ */
+static int watchdog_set_timeout(struct fschmd_data *data, int timeout)
+{
+        int ret, resolution;
+        int kind = data->kind + 1; /* 0-x array index -> 1-x module param */
+        /* 2 second or 60 second resolution? */
+        if (timeout <= 510 || kind == fscpos || kind == fscscy)
+                resolution = 2;
+        else
+                resolution = 60;
+        if (timeout < resolution || timeout > (resolution * 255))
+                return -EINVAL;
+        mutex_lock(&data->watchdog_lock);
+        if (!data->client) {
+                ret = -ENODEV;
+                goto leave;
+        }
+        if (resolution == 2)
+                data->watchdog_control &= ~FSCHMD_WDOG_CONTROL_RESOLUTION;
+        else
+                data->watchdog_control |= FSCHMD_WDOG_CONTROL_RESOLUTION;
+        data->watchdog_preset = DIV_ROUND_UP(timeout, resolution);
+        /* Write new timeout value */
+        i2c_smbus_write_byte_data(data->client, FSCHMD_REG_WDOG_PRESET,
+                data->watchdog_preset);
+        /* Write new control register, do not trigger! */
+        i2c_smbus_write_byte_data(data->client, FSCHMD_REG_WDOG_CONTROL,
+                data->watchdog_control & ~FSCHMD_WDOG_CONTROL_TRIGGER);
+        ret = data->watchdog_preset * resolution;
+leave:
+        mutex_unlock(&data->watchdog_lock);
+        return ret;
+}
+static int watchdog_get_timeout(struct fschmd_data *data)
+{
+        int timeout;
+        mutex_lock(&data->watchdog_lock);
+        if (data->watchdog_control & FSCHMD_WDOG_CONTROL_RESOLUTION)
+                timeout = data->watchdog_preset * 60;
+        else
+                timeout = data->watchdog_preset * 2;
+        mutex_unlock(&data->watchdog_lock);
+        return timeout;
+}
+static int watchdog_trigger(struct fschmd_data *data)
+{
+        int ret = 0;
+        mutex_lock(&data->watchdog_lock);
+        if (!data->client) {
+                ret = -ENODEV;
+                goto leave;
+        }
+        data->watchdog_control |= FSCHMD_WDOG_CONTROL_TRIGGER;
+        i2c_smbus_write_byte_data(data->client, FSCHMD_REG_WDOG_CONTROL,
+                                        data->watchdog_control);
+leave:
+        mutex_unlock(&data->watchdog_lock);
+        return ret;
+}
+static int watchdog_stop(struct fschmd_data *data)
+{
+        int ret = 0;
+        mutex_lock(&data->watchdog_lock);
+        if (!data->client) {
+                ret = -ENODEV;
+                goto leave;
+        }
+        data->watchdog_control &= ~FSCHMD_WDOG_CONTROL_STARTED;
+        /* Don't store the stop flag in our watchdog control register copy, as
+           its a write only bit (read always returns 0) */
+        i2c_smbus_write_byte_data(data->client, FSCHMD_REG_WDOG_CONTROL,
+                data->watchdog_control | FSCHMD_WDOG_CONTROL_STOP);
+leave:
+        mutex_unlock(&data->watchdog_lock);
+        return ret;
+}
+static int watchdog_open(struct inode *inode, struct file *filp)
+{
+        struct fschmd_data *pos, *data = NULL;
+        /* We get called from drivers/char/misc.c with misc_mtx hold, and we
+           call misc_register() from fschmd_probe() with watchdog_data_mutex
+           hold, as misc_register() takes the misc_mtx lock, this is a possible
+           deadlock, so we use mutex_trylock here. */
+        if (!mutex_trylock(&watchdog_data_mutex))
+                return -ERESTARTSYS;
+        list_for_each_entry(pos, &watchdog_data_list, list) {
+                if (pos->watchdog_miscdev.minor == iminor(inode)) {
+                        data = pos;
+                        break;
+                }
+        }
+        /* Note we can never not have found data, so we don't check for this */
+        kref_get(&data->kref);
+        mutex_unlock(&watchdog_data_mutex);
+        if (test_and_set_bit(0, &data->watchdog_is_open))
+                return -EBUSY;
+        /* Start the watchdog */
+        watchdog_trigger(data);
+        filp->private_data = data;
+        return nonseekable_open(inode, filp);
+}
+static int watchdog_release(struct inode *inode, struct file *filp)
+{
+        struct fschmd_data *data = filp->private_data;
+        if (data->watchdog_expect_close) {
+                watchdog_stop(data);
+                data->watchdog_expect_close = 0;
+        } else {
+                watchdog_trigger(data);
+                dev_crit(&data->client->dev,
+                        "unexpected close, not stopping watchdog!\n");
+        }
+        clear_bit(0, &data->watchdog_is_open);
+        mutex_lock(&watchdog_data_mutex);
+        kref_put(&data->kref, fschmd_release_resources);
+        mutex_unlock(&watchdog_data_mutex);
+        return 0;
+}
+static ssize_t watchdog_write(struct file *filp, const char __user *buf,
+        size_t count, loff_t *offset)
+{
+        size_t ret;
+        struct fschmd_data *data = filp->private_data;
+        if (count) {
+                if (!nowayout) {
+                        size_t i;
+                        /* Clear it in case it was set with a previous write */
+                        data->watchdog_expect_close = 0;
+                        for (i = 0; i != count; i++) {
+                                char c;
+                                if (get_user(c, buf + i))
+                                        return -EFAULT;
+                                if (c == 'V')
+                                        data->watchdog_expect_close = 1;
+                        }
+                }
+                ret = watchdog_trigger(data);
+                if (ret < 0)
+                        return ret;
+        }
+        return count;
+}
+static int watchdog_ioctl(struct inode *inode, struct file *filp,
+        unsigned int cmd, unsigned long arg)
+{
+        static struct watchdog_info ident = {
+                .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT |
+                                WDIOF_CARDRESET,
+                .identity = "FSC watchdog"
+        };
+        int i, ret = 0;
+        struct fschmd_data *data = filp->private_data;
+        switch (cmd) {
+        case WDIOC_GETSUPPORT:
+                ident.firmware_version = data->revision;
+                if (!nowayout)
+                        ident.options |= WDIOF_MAGICCLOSE;
+                if (copy_to_user((void __user *)arg, &ident, sizeof(ident)))
+                        ret = -EFAULT;
+                break;
+        case WDIOC_GETSTATUS:
+                ret = put_user(0, (int __user *)arg);
+                break;
+        case WDIOC_GETBOOTSTATUS:
+                if (data->watchdog_state & FSCHMD_WDOG_STATE_CARDRESET)
+                        ret = put_user(WDIOF_CARDRESET, (int __user *)arg);
+                else
+                        ret = put_user(0, (int __user *)arg);
+                break;
+        case WDIOC_KEEPALIVE:
+                ret = watchdog_trigger(data);
+                break;
+        case WDIOC_GETTIMEOUT:
+                i = watchdog_get_timeout(data);
+                ret = put_user(i, (int __user *)arg);
+                break;
+        case WDIOC_SETTIMEOUT:
+                if (get_user(i, (int __user *)arg)) {
+                        ret = -EFAULT;
+                        break;
+                }
+                ret = watchdog_set_timeout(data, i);
+                if (ret > 0)
+                        ret = put_user(ret, (int __user *)arg);
+                break;
+        case WDIOC_SETOPTIONS:
+                if (get_user(i, (int __user *)arg)) {
+                        ret = -EFAULT;
+                        break;
+                }
+                if (i & WDIOS_DISABLECARD)
+                        ret = watchdog_stop(data);
+                else if (i & WDIOS_ENABLECARD)
+                        ret = watchdog_trigger(data);
+                else
+                        ret = -EINVAL;
+                break;
+        default:
+                ret = -ENOTTY;
+        }
+        return ret;
+}
+static struct file_operations watchdog_fops = {
+        .owner = THIS_MODULE,
+        .llseek = no_llseek,
+        .open = watchdog_open,
+        .release = watchdog_release,
+        .write = watchdog_write,
+        .ioctl = watchdog_ioctl,
+};
+/*
+ * Detect, register, unregister and update device functions
 */
 /* DMI decode routine to read voltage scaling factors from special DMI tables,
@@ -661,9 +961,9 @@ static int fschmd_probe(struct i2c_client *client,
                        const struct i2c_device_id *id)
 {
        struct fschmd_data *data;
-        u8 revision;
        const char * const names[5] = { "Poseidon", "Hermes", "Scylla",
                                        "Heracles", "Heimdall" };
+        const int watchdog_minors[] = { WATCHDOG_MINOR, 212, 213, 214, 215 };
        int i, err;
        enum chips kind = id->driver_data;
@@ -673,6 +973,13 @@ static int fschmd_probe(struct i2c_client *client,
        i2c_set_clientdata(client, data);
        mutex_init(&data->update_lock);
+        mutex_init(&data->watchdog_lock);
+        INIT_LIST_HEAD(&data->list);
+        kref_init(&data->kref);
+        /* Store client pointer in our data struct for watchdog usage
+           (where the client is found through a data ptr instead of the
+           otherway around) */
+        data->client = client;
        if (kind == fscpos) {
                /* The Poseidon has hardwired temp limits, fill these
@@ -683,16 +990,27 @@ static int fschmd_probe(struct i2c_client *client,
        }
        /* Read the special DMI table for fscher and newer chips */
-        if (kind == fscher || kind >= fschrc) {
+        if ((kind == fscher || kind >= fschrc) && dmi_vref == -1) {
                dmi_walk(fschmd_dmi_decode);
                if (dmi_vref == -1) {
-                        printk(KERN_WARNING FSCHMD_NAME
+                        dev_warn(&client->dev,
-                                ": Couldn't get voltage scaling factors from "
+                                "Couldn't get voltage scaling factors from "
                                "BIOS DMI table, using builtin defaults\n");
                        dmi_vref = 33;
                }
        }
+        /* Read in some never changing registers */
+        data->revision = i2c_smbus_read_byte_data(client, FSCHMD_REG_REVISION);
+        data->global_control = i2c_smbus_read_byte_data(client,
+                                        FSCHMD_REG_CONTROL);
+        data->watchdog_control = i2c_smbus_read_byte_data(client,
+                                        FSCHMD_REG_WDOG_CONTROL);
+        data->watchdog_state = i2c_smbus_read_byte_data(client,
+                                        FSCHMD_REG_WDOG_STATE);
+        data->watchdog_preset = i2c_smbus_read_byte_data(client,
+                                        FSCHMD_REG_WDOG_PRESET);
        /* i2c kind goes from 1-5, we want from 0-4 to address arrays */
        data->kind = kind - 1;
@@ -735,9 +1053,43 @@ static int fschmd_probe(struct i2c_client *client,
                goto exit_detach;
        }
-        revision = i2c_smbus_read_byte_data(client, FSCHMD_REG_REVISION);
+        /* We take the data_mutex lock early so that watchdog_open() cannot
-        printk(KERN_INFO FSCHMD_NAME ": Detected FSC %s chip, revision: %d\n",
+           run when misc_register() has completed, but we've not yet added
-                names[data->kind], (int) revision);
+           our data to the watchdog_data_list (and set the default timeout) */
+        mutex_lock(&watchdog_data_mutex);
+        for (i = 0; i < ARRAY_SIZE(watchdog_minors); i++) {
+                /* Register our watchdog part */
+                snprintf(data->watchdog_name, sizeof(data->watchdog_name),
+                        "watchdog%c", (i == 0) ? '\0' : ('0' + i));
+                data->watchdog_miscdev.name = data->watchdog_name;
+                data->watchdog_miscdev.fops = &watchdog_fops;
+                data->watchdog_miscdev.minor = watchdog_minors[i];
+                err = misc_register(&data->watchdog_miscdev);
+                if (err == -EBUSY)
+                        continue;
+                if (err) {
+                        data->watchdog_miscdev.minor = 0;
+                        dev_err(&client->dev,
+                                "Registering watchdog chardev: %d\n", err);
+                        break;
+                }
+                list_add(&data->list, &watchdog_data_list);
+                watchdog_set_timeout(data, 60);
+                dev_info(&client->dev,
+                        "Registered watchdog chardev major 10, minor: %d\n",
+                        watchdog_minors[i]);
+                break;
+        }
+        if (i == ARRAY_SIZE(watchdog_minors)) {
+                data->watchdog_miscdev.minor = 0;
+                dev_warn(&client->dev, "Couldn't register watchdog chardev "
+                        "(due to no free minor)\n");
+        }
+        mutex_unlock(&watchdog_data_mutex);
+        dev_info(&client->dev, "Detected FSC %s chip, revision: %d\n",
+                names[data->kind], (int) data->revision);
        return 0;
@@ -751,6 +1103,24 @@ static int fschmd_remove(struct i2c_client *client)
        struct fschmd_data *data = i2c_get_clientdata(client);
        int i;
+        /* Unregister the watchdog (if registered) */
+        if (data->watchdog_miscdev.minor) {
+                misc_deregister(&data->watchdog_miscdev);
+                if (data->watchdog_is_open) {
+                        dev_warn(&client->dev,
+                                "i2c client detached with watchdog open! "
+                                "Stopping watchdog.\n");
+                        watchdog_stop(data);
+                }
+                mutex_lock(&watchdog_data_mutex);
+                list_del(&data->list);
+                mutex_unlock(&watchdog_data_mutex);
+                /* Tell the watchdog code the client is gone */
+                mutex_lock(&data->watchdog_lock);
+                data->client = NULL;
+                mutex_unlock(&data->watchdog_lock);
+        }
        /* Check if registered in case we're called from fschmd_detect
           to cleanup after an error */
        if (data->hwmon_dev)
@@ -765,7 +1135,10 @@ static int fschmd_remove(struct i2c_client *client)
                device_remove_file(&client->dev,
                                        &fschmd_fan_attr[i].dev_attr);
-        kfree(data);
+        mutex_lock(&watchdog_data_mutex);
+        kref_put(&data->kref, fschmd_release_resources);
+        mutex_unlock(&watchdog_data_mutex);
        return 0;
 }
@@ -798,7 +1171,7 @@ static struct fschmd_data *fschmd_update_device(struct device *dev)
                                        data->temp_act[i] < data->temp_max[i])
                                i2c_smbus_write_byte_data(client,
                                        FSCHMD_REG_TEMP_STATE[data->kind][i],
-                                        FSCHMD_TEMP_ALERT_MASK);
+                                        FSCHMD_TEMP_ALERT);
                }
                for (i = 0; i < FSCHMD_NO_FAN_SENSORS[data->kind]; i++) {
@@ -816,28 +1189,17 @@ static struct fschmd_data *fschmd_update_device(struct device *dev)
                                        FSCHMD_REG_FAN_MIN[data->kind][i]);
                        /* reset fan status if speed is back to > 0 */
-                        if ((data->fan_status[i] & FSCHMD_FAN_ALARM_MASK) &&
+                        if ((data->fan_status[i] & FSCHMD_FAN_ALARM) &&
                                        data->fan_act[i])
                                i2c_smbus_write_byte_data(client,
                                        FSCHMD_REG_FAN_STATE[data->kind][i],
-                                        FSCHMD_FAN_ALARM_MASK);
+                                        FSCHMD_FAN_ALARM);
                }
                for (i = 0; i < 3; i++)
                        data->volt[i] = i2c_smbus_read_byte_data(client,
                                                FSCHMD_REG_VOLT[i]);
-                data->global_control = i2c_smbus_read_byte_data(client,
-                                                FSCHMD_REG_CONTROL);
-                /* To be implemented in the future
-                data->watchdog[0] = i2c_smbus_read_byte_data(client,
-                                                FSCHMD_REG_WDOG_PRESET);
-                data->watchdog[1] = i2c_smbus_read_byte_data(client,
-                                                FSCHMD_REG_WDOG_STATE);
-                data->watchdog[2] = i2c_smbus_read_byte_data(client,
-                                                FSCHMD_REG_WDOG_CONTROL); */
                data->last_updated = jiffies;
                data->valid = 1;
        }
@@ -857,7 +1219,7 @@ static void __exit fschmd_exit(void)
        i2c_del_driver(&fschmd_driver);
 }
-MODULE_AUTHOR("Hans de Goede <j.w.r.degoede@hhs.nl>");
+MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
 MODULE_DESCRIPTION("FSC Poseidon, Hermes, Scylla, Heracles and "
                        "Heimdall driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/hwmon/i5k_amb.c b/drivers/hwmon/i5k_amb.c
index 2ede9388096b..27d7f72a5f11 100644
--- a/drivers/hwmon/i5k_amb.c
+++ b/drivers/hwmon/i5k_amb.c
@@ -490,6 +490,13 @@ static unsigned long chipset_ids[] = {
        0
 };
+static struct pci_device_id i5k_amb_ids[] __devinitdata = {
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5000_ERR) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR) },
+        { 0, }
+};
+MODULE_DEVICE_TABLE(pci, i5k_amb_ids);
 static int __devinit i5k_amb_probe(struct platform_device *pdev)
 {
        struct i5k_amb_data *data;
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index b74c95735f95..95a99c590da2 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -14,6 +14,7 @@
              IT8712F  Super I/O chip w/LPC interface
              IT8716F  Super I/O chip w/LPC interface
              IT8718F  Super I/O chip w/LPC interface
+              IT8720F  Super I/O chip w/LPC interface
              IT8726F  Super I/O chip w/LPC interface
              Sis950   A clone of the IT8705F
@@ -48,11 +49,12 @@
 #include <linux/sysfs.h>
 #include <linux/string.h>
 #include <linux/dmi.h>
+#include <linux/acpi.h>
 #include <asm/io.h>
 #define DRVNAME "it87"
-enum chips { it87, it8712, it8716, it8718 };
+enum chips { it87, it8712, it8716, it8718, it8720 };
 static unsigned short force_id;
 module_param(force_id, ushort, 0);
@@ -64,7 +66,10 @@ static struct platform_device *pdev;
 #define DEV     0x07    /* Register: Logical device select */
 #define VAL     0x2f    /* The value to read/write */
 #define PME     0x04    /* The device with the fan registers in it */
-#define GPIO    0x07    /* The device with the IT8718F VID value in it */
+/* The device with the IT8718F/IT8720F VID value in it */
+#define GPIO    0x07
 #define DEVID   0x20    /* Register: Device ID */
 #define DEVREV  0x22    /* Register: Device Revision */
@@ -113,6 +118,7 @@ superio_exit(void)
 #define IT8705F_DEVID 0x8705
 #define IT8716F_DEVID 0x8716
 #define IT8718F_DEVID 0x8718
+#define IT8720F_DEVID 0x8720
 #define IT8726F_DEVID 0x8726
 #define IT87_ACT_REG  0x30
 #define IT87_BASE_REG 0x60
@@ -150,8 +156,8 @@ static int fix_pwm_polarity;
 #define IT87_REG_ALARM2        0x02
 #define IT87_REG_ALARM3        0x03
-/* The IT8718F has the VID value in a different register, in Super-I/O
+/* The IT8718F and IT8720F have the VID value in a different register, in
-   configuration space. */
+   Super-I/O configuration space. */
 #define IT87_REG_VID           0x0a
 /* The IT8705F and IT8712F earlier than revision 0x08 use register 0x0b
   for fan divisors. Later IT8712F revisions must use 16-bit tachometer
@@ -282,7 +288,8 @@ static inline int has_16bit_fans(const struct it87_data *data)
        return (data->type == it87 && data->revision >= 0x03)
            || (data->type == it8712 && data->revision >= 0x08)
            || data->type == it8716
-            || data->type == it8718;
+            || data->type == it8718
+            || data->type == it8720;
 }
 static int it87_probe(struct platform_device *pdev);
@@ -992,6 +999,9 @@ static int __init it87_find(unsigned short *address,
        case IT8718F_DEVID:
                sio_data->type = it8718;
                break;
+        case IT8720F_DEVID:
+                sio_data->type = it8720;
+                break;
        case 0xffff:    /* No device at all */
                goto exit;
        default:
@@ -1022,7 +1032,8 @@ static int __init it87_find(unsigned short *address,
                int reg;
                superio_select(GPIO);
-                if (chip_type == it8718)
+                if ((chip_type == it8718) ||
+                    (chip_type == it8720))
                        sio_data->vid_value = superio_inb(IT87_SIO_VID_REG);
                reg = superio_inb(IT87_SIO_PINX2_REG);
@@ -1068,6 +1079,7 @@ static int __devinit it87_probe(struct platform_device *pdev)
                "it8712",
                "it8716",
                "it8718",
+                "it8720",
        };
        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
@@ -1226,7 +1238,7 @@ static int __devinit it87_probe(struct platform_device *pdev)
        }
        if (data->type == it8712 || data->type == it8716
-         || data->type == it8718) {
+         || data->type == it8718 || data->type == it8720) {
                data->vrm = vid_which_vrm();
                /* VID reading from Super-I/O config space if available */
                data->vid = sio_data->vid_value;
@@ -1374,7 +1386,7 @@ static void __devinit it87_init_device(struct platform_device *pdev)
                        it87_write_value(data, IT87_REG_TEMP_HIGH(i), 127);
        }
-        /* Check if temperature channnels are reset manually or by some reason */
+        /* Check if temperature channels are reset manually or by some reason */
        tmp = it87_read_value(data, IT87_REG_TEMP_ENABLE);
        if ((tmp & 0x3f) == 0) {
                /* Temp1,Temp3=thermistor; Temp2=thermal diode */
@@ -1513,7 +1525,8 @@ static struct it87_data *it87_update_device(struct device *dev)
                data->sensor = it87_read_value(data, IT87_REG_TEMP_ENABLE);
                /* The 8705 does not have VID capability.
-                   The 8718 does not use IT87_REG_VID for the same purpose. */
+                   The 8718 and the 8720 don't use IT87_REG_VID for the
+                   same purpose. */
                if (data->type == it8712 || data->type == it8716) {
                        data->vid = it87_read_value(data, IT87_REG_VID);
                        /* The older IT8712F revisions had only 5 VID pins,
@@ -1540,6 +1553,10 @@ static int __init it87_device_add(unsigned short address,
        };
        int err;
+        err = acpi_check_resource_conflict(&res);
+        if (err)
+                goto exit;
        pdev = platform_device_alloc(DRVNAME, address);
        if (!pdev) {
                err = -ENOMEM;
@@ -1608,7 +1625,7 @@ static void __exit sm_it87_exit(void)
 MODULE_AUTHOR("Chris Gauthron, "
              "Jean Delvare <khali@linux-fr.org>");
-MODULE_DESCRIPTION("IT8705F/8712F/8716F/8718F/8726F, SiS950 driver");
+MODULE_DESCRIPTION("IT8705F/8712F/8716F/8718F/8720F/8726F, SiS950 driver");
 module_param(update_vbat, bool, 0);
 MODULE_PARM_DESC(update_vbat, "Update vbat if set else return powerup value");
 module_param(fix_pwm_polarity, bool, 0);
diff --git a/drivers/hwmon/lm70.c b/drivers/hwmon/lm70.c
index d435f003292d..ae6204f33214 100644
--- a/drivers/hwmon/lm70.c
+++ b/drivers/hwmon/lm70.c
@@ -37,9 +37,13 @@
 #define DRVNAME         "lm70"
+#define LM70_CHIP_LM70          0       /* original NS LM70 */
+#define LM70_CHIP_TMP121        1       /* TI TMP121/TMP123 */
 struct lm70 {
        struct device *hwmon_dev;
        struct mutex lock;
+        unsigned int chip;
 };
 /* sysfs hook function */
@@ -47,7 +51,7 @@ static ssize_t lm70_sense_temp(struct device *dev,
                struct device_attribute *attr, char *buf)
 {
        struct spi_device *spi = to_spi_device(dev);
-        int status, val;
+        int status, val = 0;
        u8 rxbuf[2];
        s16 raw=0;
        struct lm70 *p_lm70 = dev_get_drvdata(&spi->dev);
@@ -65,12 +69,12 @@ static ssize_t lm70_sense_temp(struct device *dev,
                "spi_write_then_read failed with status %d\n", status);
                goto out;
        }
-        dev_dbg(dev, "rxbuf[1] : 0x%x rxbuf[0] : 0x%x\n", rxbuf[1], rxbuf[0]);
+        raw = (rxbuf[0] << 8) + rxbuf[1];
+        dev_dbg(dev, "rxbuf[0] : 0x%02x rxbuf[1] : 0x%02x raw=0x%04x\n",
-        raw = (rxbuf[1] << 8) + rxbuf[0];
+                rxbuf[0], rxbuf[1], raw);
-        dev_dbg(dev, "raw=0x%x\n", raw);
        /*
+         * LM70:
         * The "raw" temperature read into rxbuf[] is a 16-bit signed 2's
         * complement value. Only the MSB 11 bits (1 sign + 10 temperature
         * bits) are meaningful; the LSB 5 bits are to be discarded.
@@ -80,8 +84,21 @@ static ssize_t lm70_sense_temp(struct device *dev,
         * by 0.25. Also multiply by 1000 to represent in millidegrees
         * Celsius.
         * So it's equivalent to multiplying by 0.25 * 1000 = 250.
+         *
+         * TMP121/TMP123:
+         * 13 bits of 2's complement data, discard LSB 3 bits,
+         * resolution 0.0625 degrees celsius.
         */
-        val = ((int)raw/32) * 250;
+        switch (p_lm70->chip) {
+        case LM70_CHIP_LM70:
+                val = ((int)raw / 32) * 250;
+                break;
+        case LM70_CHIP_TMP121:
+                val = ((int)raw / 8) * 625 / 10;
+                break;
+        }
        status = sprintf(buf, "%d\n", val); /* millidegrees Celsius */
 out:
        mutex_unlock(&p_lm70->lock);
@@ -93,27 +110,39 @@ static DEVICE_ATTR(temp1_input, S_IRUGO, lm70_sense_temp, NULL);
 static ssize_t lm70_show_name(struct device *dev, struct device_attribute
                              *devattr, char *buf)
 {
-        return sprintf(buf, "lm70\n");
+        struct lm70 *p_lm70 = dev_get_drvdata(dev);
+        int ret;
+        switch (p_lm70->chip) {
+        case LM70_CHIP_LM70:
+                ret = sprintf(buf, "lm70\n");
+                break;
+        case LM70_CHIP_TMP121:
+                ret = sprintf(buf, "tmp121\n");
+                break;
+        default:
+                ret = -EINVAL;
+        }
+        return ret;
 }
 static DEVICE_ATTR(name, S_IRUGO, lm70_show_name, NULL);
 /*----------------------------------------------------------------------*/
-static int __devinit lm70_probe(struct spi_device *spi)
+static int __devinit common_probe(struct spi_device *spi, int chip)
 {
        struct lm70 *p_lm70;
        int status;
-        /* signaling is SPI_MODE_0 on a 3-wire link (shared SI/SO) */
+        /* NOTE:  we assume 8-bit words, and convert to 16 bits manually */
-        if ((spi->mode & (SPI_CPOL|SPI_CPHA)) || !(spi->mode & SPI_3WIRE))
-                return -EINVAL;
        p_lm70 = kzalloc(sizeof *p_lm70, GFP_KERNEL);
        if (!p_lm70)
                return -ENOMEM;
        mutex_init(&p_lm70->lock);
+        p_lm70->chip = chip;
        /* sysfs hook */
        p_lm70->hwmon_dev = hwmon_device_register(&spi->dev);
@@ -141,6 +170,24 @@ out_dev_reg_failed:
        return status;
 }
+static int __devinit lm70_probe(struct spi_device *spi)
+{
+        /* signaling is SPI_MODE_0 on a 3-wire link (shared SI/SO) */
+        if ((spi->mode & (SPI_CPOL | SPI_CPHA)) || !(spi->mode & SPI_3WIRE))
+                return -EINVAL;
+        return common_probe(spi, LM70_CHIP_LM70);
+}
+static int __devinit tmp121_probe(struct spi_device *spi)
+{
+        /* signaling is SPI_MODE_0 with only MISO connected */
+        if (spi->mode & (SPI_CPOL | SPI_CPHA))
+                return -EINVAL;
+        return common_probe(spi, LM70_CHIP_TMP121);
+}
 static int __devexit lm70_remove(struct spi_device *spi)
 {
        struct lm70 *p_lm70 = dev_get_drvdata(&spi->dev);
@@ -154,6 +201,15 @@ static int __devexit lm70_remove(struct spi_device *spi)
        return 0;
 }
+static struct spi_driver tmp121_driver = {
+        .driver = {
+                .name   = "tmp121",
+                .owner  = THIS_MODULE,
+        },
+        .probe  = tmp121_probe,
+        .remove = __devexit_p(lm70_remove),
+};
 static struct spi_driver lm70_driver = {
        .driver = {
                .name   = "lm70",
@@ -165,17 +221,26 @@ static struct spi_driver lm70_driver = {
 static int __init init_lm70(void)
 {
-        return spi_register_driver(&lm70_driver);
+        int ret = spi_register_driver(&lm70_driver);
+        if (ret)
+                return ret;
+        ret = spi_register_driver(&tmp121_driver);
+        if (ret)
+                spi_unregister_driver(&lm70_driver);
+        return ret;
 }
 static void __exit cleanup_lm70(void)
 {
        spi_unregister_driver(&lm70_driver);
+        spi_unregister_driver(&tmp121_driver);
 }
 module_init(init_lm70);
 module_exit(cleanup_lm70);
 MODULE_AUTHOR("Kaiwan N Billimoria");
-MODULE_DESCRIPTION("National Semiconductor LM70 Linux driver");
+MODULE_DESCRIPTION("NS LM70 / TI TMP121/TMP123 Linux driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/hwmon/ltc4245.c b/drivers/hwmon/ltc4245.c
new file mode 100644
index 000000000000..034b2c515848
--- /dev/null
+++ b/drivers/hwmon/ltc4245.c
@@ -0,0 +1,567 @@
+/*
+ * Driver for Linear Technology LTC4245 I2C Multiple Supply Hot Swap Controller
+ *
+ * Copyright (C) 2008 Ira W. Snyder <iws@ovro.caltech.edu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This driver is based on the ds1621 and ina209 drivers.
+ *
+ * Datasheet:
+ * http://www.linear.com/pc/downloadDocument.do?navId=H0,C1,C1003,C1006,C1140,P19392,D13517
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+/* Valid addresses are 0x20 - 0x3f
+ *
+ * For now, we do not probe, since some of these addresses
+ * are known to be unfriendly to probing */
+static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
+/* Insmod parameters */
+I2C_CLIENT_INSMOD_1(ltc4245);
+/* Here are names of the chip's registers (a.k.a. commands) */
+enum ltc4245_cmd {
+        LTC4245_STATUS                  = 0x00, /* readonly */
+        LTC4245_ALERT                   = 0x01,
+        LTC4245_CONTROL                 = 0x02,
+        LTC4245_ON                      = 0x03,
+        LTC4245_FAULT1                  = 0x04,
+        LTC4245_FAULT2                  = 0x05,
+        LTC4245_GPIO                    = 0x06,
+        LTC4245_ADCADR                  = 0x07,
+        LTC4245_12VIN                   = 0x10,
+        LTC4245_12VSENSE                = 0x11,
+        LTC4245_12VOUT                  = 0x12,
+        LTC4245_5VIN                    = 0x13,
+        LTC4245_5VSENSE                 = 0x14,
+        LTC4245_5VOUT                   = 0x15,
+        LTC4245_3VIN                    = 0x16,
+        LTC4245_3VSENSE                 = 0x17,
+        LTC4245_3VOUT                   = 0x18,
+        LTC4245_VEEIN                   = 0x19,
+        LTC4245_VEESENSE                = 0x1a,
+        LTC4245_VEEOUT                  = 0x1b,
+        LTC4245_GPIOADC1                = 0x1c,
+        LTC4245_GPIOADC2                = 0x1d,
+        LTC4245_GPIOADC3                = 0x1e,
+};
+struct ltc4245_data {
+        struct device *hwmon_dev;
+        struct mutex update_lock;
+        bool valid;
+        unsigned long last_updated; /* in jiffies */
+        /* Control registers */
+        u8 cregs[0x08];
+        /* Voltage registers */
+        u8 vregs[0x0f];
+};
+static struct ltc4245_data *ltc4245_update_device(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct ltc4245_data *data = i2c_get_clientdata(client);
+        s32 val;
+        int i;
+        mutex_lock(&data->update_lock);
+        if (time_after(jiffies, data->last_updated + HZ) || !data->valid) {
+                dev_dbg(&client->dev, "Starting ltc4245 update\n");
+                /* Read control registers -- 0x00 to 0x07 */
+                for (i = 0; i < ARRAY_SIZE(data->cregs); i++) {
+                        val = i2c_smbus_read_byte_data(client, i);
+                        if (unlikely(val < 0))
+                                data->cregs[i] = 0;
+                        else
+                                data->cregs[i] = val;
+                }
+                /* Read voltage registers -- 0x10 to 0x1f */
+                for (i = 0; i < ARRAY_SIZE(data->vregs); i++) {
+                        val = i2c_smbus_read_byte_data(client, i+0x10);
+                        if (unlikely(val < 0))
+                                data->vregs[i] = 0;
+                        else
+                                data->vregs[i] = val;
+                }
+                data->last_updated = jiffies;
+                data->valid = 1;
+        }
+        mutex_unlock(&data->update_lock);
+        return data;
+}
+/* Return the voltage from the given register in millivolts */
+static int ltc4245_get_voltage(struct device *dev, u8 reg)
+{
+        struct ltc4245_data *data = ltc4245_update_device(dev);
+        const u8 regval = data->vregs[reg - 0x10];
+        u32 voltage = 0;
+        switch (reg) {
+        case LTC4245_12VIN:
+        case LTC4245_12VOUT:
+                voltage = regval * 55;
+                break;
+        case LTC4245_5VIN:
+        case LTC4245_5VOUT:
+                voltage = regval * 22;
+                break;
+        case LTC4245_3VIN:
+        case LTC4245_3VOUT:
+                voltage = regval * 15;
+                break;
+        case LTC4245_VEEIN:
+        case LTC4245_VEEOUT:
+                voltage = regval * -55;
+                break;
+        case LTC4245_GPIOADC1:
+        case LTC4245_GPIOADC2:
+        case LTC4245_GPIOADC3:
+                voltage = regval * 10;
+                break;
+        default:
+                /* If we get here, the developer messed up */
+                WARN_ON_ONCE(1);
+                break;
+        }
+        return voltage;
+}
+/* Return the current in the given sense register in milliAmperes */
+static unsigned int ltc4245_get_current(struct device *dev, u8 reg)
+{
+        struct ltc4245_data *data = ltc4245_update_device(dev);
+        const u8 regval = data->vregs[reg - 0x10];
+        unsigned int voltage;
+        unsigned int curr;
+        /* The strange looking conversions that follow are fixed-point
+         * math, since we cannot do floating point in the kernel.
+         *
+         * Step 1: convert sense register to microVolts
+         * Step 2: convert voltage to milliAmperes
+         *
+         * If you play around with the V=IR equation, you come up with
+         * the following: X uV / Y mOhm == Z mA
+         *
+         * With the resistors that are fractions of a milliOhm, we multiply
+         * the voltage and resistance by 10, to shift the decimal point.
+         * Now we can use the normal division operator again.
+         */
+        switch (reg) {
+        case LTC4245_12VSENSE:
+                voltage = regval * 250; /* voltage in uV */
+                curr = voltage / 50; /* sense resistor 50 mOhm */
+                break;
+        case LTC4245_5VSENSE:
+                voltage = regval * 125; /* voltage in uV */
+                curr = (voltage * 10) / 35; /* sense resistor 3.5 mOhm */
+                break;
+        case LTC4245_3VSENSE:
+                voltage = regval * 125; /* voltage in uV */
+                curr = (voltage * 10) / 25; /* sense resistor 2.5 mOhm */
+                break;
+        case LTC4245_VEESENSE:
+                voltage = regval * 250; /* voltage in uV */
+                curr = voltage / 100; /* sense resistor 100 mOhm */
+                break;
+        default:
+                /* If we get here, the developer messed up */
+                WARN_ON_ONCE(1);
+                curr = 0;
+                break;
+        }
+        return curr;
+}
+static ssize_t ltc4245_show_voltage(struct device *dev,
+                                    struct device_attribute *da,
+                                    char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+        const int voltage = ltc4245_get_voltage(dev, attr->index);
+        return snprintf(buf, PAGE_SIZE, "%d\n", voltage);
+}
+static ssize_t ltc4245_show_current(struct device *dev,
+                                    struct device_attribute *da,
+                                    char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+        const unsigned int curr = ltc4245_get_current(dev, attr->index);
+        return snprintf(buf, PAGE_SIZE, "%u\n", curr);
+}
+static ssize_t ltc4245_show_power(struct device *dev,
+                                  struct device_attribute *da,
+                                  char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+        const unsigned int curr = ltc4245_get_current(dev, attr->index);
+        const int output_voltage = ltc4245_get_voltage(dev, attr->index+1);
+        /* current in mA * voltage in mV == power in uW */
+        const unsigned int power = abs(output_voltage * curr);
+        return snprintf(buf, PAGE_SIZE, "%u\n", power);
+}
+static ssize_t ltc4245_show_alarm(struct device *dev,
+                                          struct device_attribute *da,
+                                          char *buf)
+{
+        struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(da);
+        struct ltc4245_data *data = ltc4245_update_device(dev);
+        const u8 reg = data->cregs[attr->index];
+        const u32 mask = attr->nr;
+        return snprintf(buf, PAGE_SIZE, "%u\n", (reg & mask) ? 1 : 0);
+}
+/* These macros are used below in constructing device attribute objects
+ * for use with sysfs_create_group() to make a sysfs device file
+ * for each register.
+ */
+#define LTC4245_VOLTAGE(name, ltc4245_cmd_idx) \
+        static SENSOR_DEVICE_ATTR(name, S_IRUGO, \
+        ltc4245_show_voltage, NULL, ltc4245_cmd_idx)
+#define LTC4245_CURRENT(name, ltc4245_cmd_idx) \
+        static SENSOR_DEVICE_ATTR(name, S_IRUGO, \
+        ltc4245_show_current, NULL, ltc4245_cmd_idx)
+#define LTC4245_POWER(name, ltc4245_cmd_idx) \
+        static SENSOR_DEVICE_ATTR(name, S_IRUGO, \
+        ltc4245_show_power, NULL, ltc4245_cmd_idx)
+#define LTC4245_ALARM(name, mask, reg) \
+        static SENSOR_DEVICE_ATTR_2(name, S_IRUGO, \
+        ltc4245_show_alarm, NULL, (mask), reg)
+/* Construct a sensor_device_attribute structure for each register */
+/* Input voltages */
+LTC4245_VOLTAGE(in1_input,                      LTC4245_12VIN);
+LTC4245_VOLTAGE(in2_input,                      LTC4245_5VIN);
+LTC4245_VOLTAGE(in3_input,                      LTC4245_3VIN);
+LTC4245_VOLTAGE(in4_input,                      LTC4245_VEEIN);
+/* Input undervoltage alarms */
+LTC4245_ALARM(in1_min_alarm,    (1 << 0),       LTC4245_FAULT1);
+LTC4245_ALARM(in2_min_alarm,    (1 << 1),       LTC4245_FAULT1);
+LTC4245_ALARM(in3_min_alarm,    (1 << 2),       LTC4245_FAULT1);
+LTC4245_ALARM(in4_min_alarm,    (1 << 3),       LTC4245_FAULT1);
+/* Currents (via sense resistor) */
+LTC4245_CURRENT(curr1_input,                    LTC4245_12VSENSE);
+LTC4245_CURRENT(curr2_input,                    LTC4245_5VSENSE);
+LTC4245_CURRENT(curr3_input,                    LTC4245_3VSENSE);
+LTC4245_CURRENT(curr4_input,                    LTC4245_VEESENSE);
+/* Overcurrent alarms */
+LTC4245_ALARM(curr1_max_alarm,  (1 << 4),       LTC4245_FAULT1);
+LTC4245_ALARM(curr2_max_alarm,  (1 << 5),       LTC4245_FAULT1);
+LTC4245_ALARM(curr3_max_alarm,  (1 << 6),       LTC4245_FAULT1);
+LTC4245_ALARM(curr4_max_alarm,  (1 << 7),       LTC4245_FAULT1);
+/* Output voltages */
+LTC4245_VOLTAGE(in5_input,                      LTC4245_12VOUT);
+LTC4245_VOLTAGE(in6_input,                      LTC4245_5VOUT);
+LTC4245_VOLTAGE(in7_input,                      LTC4245_3VOUT);
+LTC4245_VOLTAGE(in8_input,                      LTC4245_VEEOUT);
+/* Power Bad alarms */
+LTC4245_ALARM(in5_min_alarm,    (1 << 0),       LTC4245_FAULT2);
+LTC4245_ALARM(in6_min_alarm,    (1 << 1),       LTC4245_FAULT2);
+LTC4245_ALARM(in7_min_alarm,    (1 << 2),       LTC4245_FAULT2);
+LTC4245_ALARM(in8_min_alarm,    (1 << 3),       LTC4245_FAULT2);
+/* GPIO voltages */
+LTC4245_VOLTAGE(in9_input,                      LTC4245_GPIOADC1);
+LTC4245_VOLTAGE(in10_input,                     LTC4245_GPIOADC2);
+LTC4245_VOLTAGE(in11_input,                     LTC4245_GPIOADC3);
+/* Power Consumption (virtual) */
+LTC4245_POWER(power1_input,                     LTC4245_12VSENSE);
+LTC4245_POWER(power2_input,                     LTC4245_5VSENSE);
+LTC4245_POWER(power3_input,                     LTC4245_3VSENSE);
+LTC4245_POWER(power4_input,                     LTC4245_VEESENSE);
+/* Finally, construct an array of pointers to members of the above objects,
+ * as required for sysfs_create_group()
+ */
+static struct attribute *ltc4245_attributes[] = {
+        &sensor_dev_attr_in1_input.dev_attr.attr,
+        &sensor_dev_attr_in2_input.dev_attr.attr,
+        &sensor_dev_attr_in3_input.dev_attr.attr,
+        &sensor_dev_attr_in4_input.dev_attr.attr,
+        &sensor_dev_attr_in1_min_alarm.dev_attr.attr,
+        &sensor_dev_attr_in2_min_alarm.dev_attr.attr,
+        &sensor_dev_attr_in3_min_alarm.dev_attr.attr,
+        &sensor_dev_attr_in4_min_alarm.dev_attr.attr,
+        &sensor_dev_attr_curr1_input.dev_attr.attr,
+        &sensor_dev_attr_curr2_input.dev_attr.attr,
+        &sensor_dev_attr_curr3_input.dev_attr.attr,
+        &sensor_dev_attr_curr4_input.dev_attr.attr,
+        &sensor_dev_attr_curr1_max_alarm.dev_attr.attr,
+        &sensor_dev_attr_curr2_max_alarm.dev_attr.attr,
+        &sensor_dev_attr_curr3_max_alarm.dev_attr.attr,
+        &sensor_dev_attr_curr4_max_alarm.dev_attr.attr,
+        &sensor_dev_attr_in5_input.dev_attr.attr,
+        &sensor_dev_attr_in6_input.dev_attr.attr,
+        &sensor_dev_attr_in7_input.dev_attr.attr,
+        &sensor_dev_attr_in8_input.dev_attr.attr,
+        &sensor_dev_attr_in5_min_alarm.dev_attr.attr,
+        &sensor_dev_attr_in6_min_alarm.dev_attr.attr,
+        &sensor_dev_attr_in7_min_alarm.dev_attr.attr,
+        &sensor_dev_attr_in8_min_alarm.dev_attr.attr,
+        &sensor_dev_attr_in9_input.dev_attr.attr,
+        &sensor_dev_attr_in10_input.dev_attr.attr,
+        &sensor_dev_attr_in11_input.dev_attr.attr,
+        &sensor_dev_attr_power1_input.dev_attr.attr,
+        &sensor_dev_attr_power2_input.dev_attr.attr,
+        &sensor_dev_attr_power3_input.dev_attr.attr,
+        &sensor_dev_attr_power4_input.dev_attr.attr,
+        NULL,
+};
+static const struct attribute_group ltc4245_group = {
+        .attrs = ltc4245_attributes,
+};
+static int ltc4245_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
+{
+        struct ltc4245_data *data;
+        int ret;
+        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        if (!data) {
+                ret = -ENOMEM;
+                goto out_kzalloc;
+        }
+        i2c_set_clientdata(client, data);
+        mutex_init(&data->update_lock);
+        /* Initialize the LTC4245 chip */
+        /* TODO */
+        /* Register sysfs hooks */
+        ret = sysfs_create_group(&client->dev.kobj, &ltc4245_group);
+        if (ret)
+                goto out_sysfs_create_group;
+        data->hwmon_dev = hwmon_device_register(&client->dev);
+        if (IS_ERR(data->hwmon_dev)) {
+                ret = PTR_ERR(data->hwmon_dev);
+                goto out_hwmon_device_register;
+        }
+        return 0;
+out_hwmon_device_register:
+        sysfs_remove_group(&client->dev.kobj, &ltc4245_group);
+out_sysfs_create_group:
+        kfree(data);
+out_kzalloc:
+        return ret;
+}
+static int ltc4245_remove(struct i2c_client *client)
+{
+        struct ltc4245_data *data = i2c_get_clientdata(client);
+        hwmon_device_unregister(data->hwmon_dev);
+        sysfs_remove_group(&client->dev.kobj, &ltc4245_group);
+        kfree(data);
+        return 0;
+}
+/* Check that some bits in a control register appear at all possible
+ * locations without changing value
+ *
+ * @client: the i2c client to use
+ * @reg: the register to read
+ * @bits: the bits to check (0xff checks all bits,
+ *                           0x03 checks only the last two bits)
+ *
+ * return -ERRNO if the register read failed
+ * return -ENODEV if the register value doesn't stay constant at all
+ * possible addresses
+ *
+ * return 0 for success
+ */
+static int ltc4245_check_control_reg(struct i2c_client *client, u8 reg, u8 bits)
+{
+        int i;
+        s32 v, voff1, voff2;
+        /* Read register and check for error */
+        v = i2c_smbus_read_byte_data(client, reg);
+        if (v < 0)
+                return v;
+        v &= bits;
+        for (i = 0x00; i < 0xff; i += 0x20) {
+                voff1 = i2c_smbus_read_byte_data(client, reg + i);
+                if (voff1 < 0)
+                        return voff1;
+                voff2 = i2c_smbus_read_byte_data(client, reg + i + 0x08);
+                if (voff2 < 0)
+                        return voff2;
+                voff1 &= bits;
+                voff2 &= bits;
+                if (v != voff1 || v != voff2)
+                        return -ENODEV;
+        }
+        return 0;
+}
+static int ltc4245_detect(struct i2c_client *client,
+                          int kind,
+                          struct i2c_board_info *info)
+{
+        struct i2c_adapter *adapter = client->adapter;
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+                return -ENODEV;
+        if (kind < 0) {         /* probed detection - check the chip type */
+                s32 v;          /* 8 bits from the chip, or -ERRNO */
+                /* Chip registers 0x00-0x07 are control registers
+                 * Chip registers 0x10-0x1f are data registers
+                 *
+                 * Address bits b7-b5 are ignored. This makes the chip "repeat"
+                 * in steps of 0x20. Any control registers should appear with
+                 * the same values across all duplicated addresses.
+                 *
+                 * Register 0x02 bit b2 is reserved, expect 0
+                 * Register 0x07 bits b7 to b4 are reserved, expect 0
+                 *
+                 * Registers 0x01, 0x02 are control registers and should not
+                 * change on their own.
+                 *
+                 * Register 0x06 bits b6 and b7 are control bits, and should
+                 * not change on their own.
+                 *
+                 * Register 0x07 bits b3 to b0 are control bits, and should
+                 * not change on their own.
+                 */
+                /* read register 0x02 reserved bit, expect 0 */
+                v = i2c_smbus_read_byte_data(client, LTC4245_CONTROL);
+                if (v < 0 || (v & 0x04) != 0)
+                        return -ENODEV;
+                /* read register 0x07 reserved bits, expect 0 */
+                v = i2c_smbus_read_byte_data(client, LTC4245_ADCADR);
+                if (v < 0 || (v & 0xf0) != 0)
+                        return -ENODEV;
+                /* check that the alert register appears at all locations */
+                if (ltc4245_check_control_reg(client, LTC4245_ALERT, 0xff))
+                        return -ENODEV;
+                /* check that the control register appears at all locations */
+                if (ltc4245_check_control_reg(client, LTC4245_CONTROL, 0xff))
+                        return -ENODEV;
+                /* check that register 0x06 bits b6 and b7 stay constant */
+                if (ltc4245_check_control_reg(client, LTC4245_GPIO, 0xc0))
+                        return -ENODEV;
+                /* check that register 0x07 bits b3-b0 stay constant */
+                if (ltc4245_check_control_reg(client, LTC4245_ADCADR, 0x0f))
+                        return -ENODEV;
+        }
+        strlcpy(info->type, "ltc4245", I2C_NAME_SIZE);
+        dev_info(&adapter->dev, "ltc4245 %s at address 0x%02x\n",
+                        kind < 0 ? "probed" : "forced",
+                        client->addr);
+        return 0;
+}
+static const struct i2c_device_id ltc4245_id[] = {
+        { "ltc4245", ltc4245 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, ltc4245_id);
+/* This is the driver that will be inserted */
+static struct i2c_driver ltc4245_driver = {
+        .class          = I2C_CLASS_HWMON,
+        .driver = {
+                .name   = "ltc4245",
+        },
+        .probe          = ltc4245_probe,
+        .remove         = ltc4245_remove,
+        .id_table       = ltc4245_id,
+        .detect         = ltc4245_detect,
+        .address_data   = &addr_data,
+};
+static int __init ltc4245_init(void)
+{
+        return i2c_add_driver(&ltc4245_driver);
+}
+static void __exit ltc4245_exit(void)
+{
+        i2c_del_driver(&ltc4245_driver);
+}
+MODULE_AUTHOR("Ira W. Snyder <iws@ovro.caltech.edu>");
+MODULE_DESCRIPTION("LTC4245 driver");
+MODULE_LICENSE("GPL");
+module_init(ltc4245_init);
+module_exit(ltc4245_exit);
diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c
index 5fbfa34c110e..fb052fea3744 100644
--- a/drivers/hwmon/pc87360.c
+++ b/drivers/hwmon/pc87360.c
@@ -43,6 +43,7 @@
 #include <linux/hwmon-vid.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
+#include <linux/acpi.h>
 #include <asm/io.h>
 static u8 devid;
@@ -1627,6 +1628,11 @@ static int __init pc87360_device_add(unsigned short address)
                        continue;
                res.start = extra_isa[i];
                res.end = extra_isa[i] + PC87360_EXTENT - 1;
+                err = acpi_check_resource_conflict(&res);
+                if (err)
+                        goto exit_device_put;
                err = platform_device_add_resources(pdev, &res, 1);
                if (err) {
                        printk(KERN_ERR "pc87360: Device resource[%d] "
diff --git a/drivers/hwmon/pc87427.c b/drivers/hwmon/pc87427.c
index 7265f22ae5cd..3a8a0f7a7736 100644
--- a/drivers/hwmon/pc87427.c
+++ b/drivers/hwmon/pc87427.c
@@ -32,6 +32,7 @@
 #include <linux/mutex.h>
 #include <linux/sysfs.h>
 #include <linux/ioport.h>
+#include <linux/acpi.h>
 #include <asm/io.h>
 static unsigned short force_id;
@@ -524,6 +525,10 @@ static int __init pc87427_device_add(unsigned short address)
        };
        int err;
+        err = acpi_check_resource_conflict(&res);
+        if (err)
+                goto exit;
        pdev = platform_device_alloc(DRVNAME, address);
        if (!pdev) {
                err = -ENOMEM;
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index a276806f3d53..aa2e8318f167 100644
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -62,6 +62,7 @@
 #include <linux/jiffies.h>
 #include <linux/mutex.h>
 #include <linux/sysfs.h>
+#include <linux/acpi.h>
 #include <asm/io.h>
@@ -727,6 +728,10 @@ static int __devinit sis5595_device_add(unsigned short address)
        };
        int err;
+        err = acpi_check_resource_conflict(&res);
+        if (err)
+                goto exit;
        pdev = platform_device_alloc("sis5595", address);
        if (!pdev) {
                err = -ENOMEM;
diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c
index eb03544c731c..6f6d52b4fb64 100644
--- a/drivers/hwmon/smsc47b397.c
+++ b/drivers/hwmon/smsc47b397.c
@@ -36,6 +36,7 @@
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/mutex.h>
+#include <linux/acpi.h>
 #include <asm/io.h>
 static unsigned short force_id;
@@ -303,6 +304,10 @@ static int __init smsc47b397_device_add(unsigned short address)
        };
        int err;
+        err = acpi_check_resource_conflict(&res);
+        if (err)
+                goto exit;
        pdev = platform_device_alloc(DRVNAME, address);
        if (!pdev) {
                err = -ENOMEM;
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index d1b498548736..a92dbb97ee99 100644
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -37,6 +37,7 @@
 #include <linux/init.h>
 #include <linux/mutex.h>
 #include <linux/sysfs.h>
+#include <linux/acpi.h>
 #include <asm/io.h>
 static unsigned short force_id;
@@ -705,6 +706,10 @@ static int __init smsc47m1_device_add(unsigned short address,
        };
        int err;
+        err = acpi_check_resource_conflict(&res);
+        if (err)
+                goto exit;
        pdev = platform_device_alloc(DRVNAME, address);
        if (!pdev) {
                err = -ENOMEM;
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index f1ee5e731968..a022aedcaacb 100644
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -41,6 +41,7 @@
 #include <linux/init.h>
 #include <linux/mutex.h>
 #include <linux/sysfs.h>
+#include <linux/acpi.h>
 #include <asm/io.h>
@@ -783,6 +784,10 @@ static int __devinit via686a_device_add(unsigned short address)
        };
        int err;
+        err = acpi_check_resource_conflict(&res);
+        if (err)
+                goto exit;
        pdev = platform_device_alloc("via686a", address);
        if (!pdev) {
                err = -ENOMEM;
diff --git a/drivers/hwmon/vt1211.c b/drivers/hwmon/vt1211.c
index 12b43590fa53..b0ce37852281 100644
--- a/drivers/hwmon/vt1211.c
+++ b/drivers/hwmon/vt1211.c
@@ -32,6 +32,7 @@
 #include <linux/err.h>
 #include <linux/mutex.h>
 #include <linux/ioport.h>
+#include <linux/acpi.h>
 #include <asm/io.h>
 static int uch_config = -1;
@@ -1259,6 +1260,10 @@ static int __init vt1211_device_add(unsigned short address)
        }
        res.name = pdev->name;
+        err = acpi_check_resource_conflict(&res);
+        if (err)
+                goto EXIT;
        err = platform_device_add_resources(pdev, &res, 1);
        if (err) {
                printk(KERN_ERR DRVNAME ": Device resource addition failed "
diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
index 5bc57275cae8..9982b45fbb14 100644
--- a/drivers/hwmon/vt8231.c
+++ b/drivers/hwmon/vt8231.c
@@ -35,6 +35,7 @@
 #include <linux/hwmon-vid.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
+#include <linux/acpi.h>
 #include <asm/io.h>
 static int force_addr;
@@ -894,6 +895,10 @@ static int __devinit vt8231_device_add(unsigned short address)
        };
        int err;
+        err = acpi_check_resource_conflict(&res);
+        if (err)
+                goto exit;
        pdev = platform_device_alloc("vt8231", address);
        if (!pdev) {
                err = -ENOMEM;
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 075164dd65a7..cb808d015361 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -48,6 +48,7 @@
 #include <linux/hwmon-vid.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
+#include <linux/acpi.h>
 #include <asm/io.h>
 #include "lm75.h"
@@ -502,7 +503,7 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
                }
                for (i = 0; i < 4; i++) {
-                        /* pwmcfg, tolarance mapped for i=0, i=1 to same reg */
+                        /* pwmcfg, tolerance mapped for i=0, i=1 to same reg */
                        if (i != 1) {
                                pwmcfg = w83627ehf_read_value(data,
                                                W83627EHF_REG_PWM_ENABLE[i]);
@@ -1544,6 +1545,11 @@ static int __init sensors_w83627ehf_init(void)
        res.start = address + IOREGION_OFFSET;
        res.end = address + IOREGION_OFFSET + IOREGION_LENGTH - 1;
        res.flags = IORESOURCE_IO;
+        err = acpi_check_resource_conflict(&res);
+        if (err)
+                goto exit;
        err = platform_device_add_resources(pdev, &res, 1);
        if (err) {
                printk(KERN_ERR DRVNAME ": Device resource addition failed "
diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c
index b30e5796cb26..389150ba30d3 100644
--- a/drivers/hwmon/w83627hf.c
+++ b/drivers/hwmon/w83627hf.c
@@ -50,6 +50,7 @@
 #include <linux/err.h>
 #include <linux/mutex.h>
 #include <linux/ioport.h>
+#include <linux/acpi.h>
 #include <asm/io.h>
 #include "lm75.h"
@@ -1793,6 +1794,10 @@ static int __init w83627hf_device_add(unsigned short address,
        };
        int err;
+        err = acpi_check_resource_conflict(&res);
+        if (err)
+                goto exit;
        pdev = platform_device_alloc(DRVNAME, address);
        if (!pdev) {
                err = -ENOMEM;
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index fc12bd412e3a..dbfb30c588d8 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -58,7 +58,10 @@ static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
                                                0x2e, 0x2f, I2C_CLIENT_END };
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_4(w83781d, w83782d, w83783s, as99127f);
-I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "
+static unsigned short force_subclients[4];
+module_param_array(force_subclients, short, NULL, 0);
+MODULE_PARM_DESC(force_subclients, "List of subclient addresses: "
                    "{bus, clientaddr, subclientaddr1, subclientaddr2}");
 static int reset;
diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c
index 5768def8a4f2..97851c5ba3a3 100644
--- a/drivers/hwmon/w83791d.c
+++ b/drivers/hwmon/w83791d.c
@@ -53,7 +53,10 @@ static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(w83791d);
-I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "
+static unsigned short force_subclients[4];
+module_param_array(force_subclients, short, NULL, 0);
+MODULE_PARM_DESC(force_subclients, "List of subclient addresses: "
                        "{bus, clientaddr, subclientaddr1, subclientaddr2}");
 static int reset;
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c
index cf94c5b0c879..2be16194ddf3 100644
--- a/drivers/hwmon/w83792d.c
+++ b/drivers/hwmon/w83792d.c
@@ -51,7 +51,10 @@ static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(w83792d);
-I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "
+static unsigned short force_subclients[4];
+module_param_array(force_subclients, short, NULL, 0);
+MODULE_PARM_DESC(force_subclients, "List of subclient addresses: "
                        "{bus, clientaddr, subclientaddr1, subclientaddr2}");
 static int init;
diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c
index 0a739f1c69be..47dd398f7258 100644
--- a/drivers/hwmon/w83793.c
+++ b/drivers/hwmon/w83793.c
@@ -42,7 +42,10 @@ static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(w83793);
-I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "
+static unsigned short force_subclients[4];
+module_param_array(force_subclients, short, NULL, 0);
+MODULE_PARM_DESC(force_subclients, "List of subclient addresses: "
                       "{bus, clientaddr, subclientaddr1, subclientaddr2}");
 static int reset;
diff --git a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c
index fc3e5b026423..dd9e796fad69 100644
--- a/drivers/i2c/busses/i2c-ali1563.c
+++ b/drivers/i2c/busses/i2c-ali1563.c
@@ -399,8 +399,8 @@ static int __devinit ali1563_probe(struct pci_dev * dev,
        if ((error = ali1563_setup(dev)))
                goto exit;
        ali1563_adapter.dev.parent = &dev->dev;
-        sprintf(ali1563_adapter.name,"SMBus ALi 1563 Adapter @ %04x",
+        snprintf(ali1563_adapter.name, sizeof(ali1563_adapter.name),
-                ali1563_smba);
+                 "SMBus ALi 1563 Adapter @ %04x", ali1563_smba);
        if ((error = i2c_add_adapter(&ali1563_adapter)))
                goto exit_shutdown;
        return 0;
diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
index 8ba2bcf727d3..378fcb5d5783 100644
--- a/drivers/i2c/busses/i2c-amd756-s4882.c
+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
@@ -197,8 +197,8 @@ static int __init amd756_s4882_init(void)
        for (i = 1; i < 5; i++) {
                s4882_algo[i] = *(amd756_smbus.algo);
                s4882_adapter[i] = amd756_smbus;
-                sprintf(s4882_adapter[i].name,
+                snprintf(s4882_adapter[i].name, sizeof(s4882_adapter[i].name),
-                        "SMBus 8111 adapter (CPU%d)", i-1);
+                         "SMBus 8111 adapter (CPU%d)", i-1);
                s4882_adapter[i].algo = s4882_algo+i;
                s4882_adapter[i].dev.parent = amd756_smbus.dev.parent;
        }
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
index 424dad6f18d8..36bee5b9c952 100644
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
@@ -380,8 +380,9 @@ static int __devinit amd756_probe(struct pci_dev *pdev,
        /* set up the sysfs linkage to our parent device */
        amd756_smbus.dev.parent = &pdev->dev;
-        sprintf(amd756_smbus.name, "SMBus %s adapter at %04x",
+        snprintf(amd756_smbus.name, sizeof(amd756_smbus.name),
-                chipname[id->driver_data], amd756_ioport);
+                 "SMBus %s adapter at %04x", chipname[id->driver_data],
+                 amd756_ioport);
        error = i2c_add_adapter(&amd756_smbus);
        if (error) {
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index 9efb02137254..67d9dc5b351b 100644
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -222,7 +222,7 @@ static int __devinit at91_i2c_probe(struct platform_device *pdev)
                rc = -ENOMEM;
                goto fail2;
        }
-        sprintf(adapter->name, "AT91");
+        snprintf(adapter->name, sizeof(adapter->name), "AT91");
        adapter->algo = &at91_algorithm;
        adapter->class = I2C_CLASS_HWMON;
        adapter->dev.parent = &pdev->dev;
diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c
index 3c855ff2992f..3fd2c417c1e0 100644
--- a/drivers/i2c/busses/i2c-bfin-twi.c
+++ b/drivers/i2c/busses/i2c-bfin-twi.c
@@ -656,7 +656,7 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
        strlcpy(p_adap->name, pdev->name, sizeof(p_adap->name));
        p_adap->algo = &bfin_twi_algorithm;
        p_adap->algo_data = iface;
-        p_adap->class = I2C_CLASS_ALL;
+        p_adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
        p_adap->dev.parent = &pdev->dev;
        rc = peripheral_request_list(pin_req[pdev->id], "i2c-bfin-twi");
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 5123eb69a971..526625eaa84b 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -64,7 +64,7 @@
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/acpi.h>
-#include <asm/io.h>
+#include <linux/io.h>
 /* I801 SMBus address offsets */
 #define SMBHSTSTS       (0 + i801_smba)
@@ -583,6 +583,40 @@ static struct pci_device_id i801_ids[] = {
 MODULE_DEVICE_TABLE (pci, i801_ids);
+#if defined CONFIG_INPUT_APANEL || defined CONFIG_INPUT_APANEL_MODULE
+static unsigned char apanel_addr;
+/* Scan the system ROM for the signature "FJKEYINF" */
+static __init const void __iomem *bios_signature(const void __iomem *bios)
+{
+        ssize_t offset;
+        const unsigned char signature[] = "FJKEYINF";
+        for (offset = 0; offset < 0x10000; offset += 0x10) {
+                if (check_signature(bios + offset, signature,
+                                    sizeof(signature)-1))
+                        return bios + offset;
+        }
+        return NULL;
+}
+static void __init input_apanel_init(void)
+{
+        void __iomem *bios;
+        const void __iomem *p;
+        bios = ioremap(0xF0000, 0x10000); /* Can't fail */
+        p = bios_signature(bios);
+        if (p) {
+                /* just use the first address */
+                apanel_addr = readb(p + 8 + 3) >> 1;
+        }
+        iounmap(bios);
+}
+#else
+static void __init input_apanel_init(void) {}
+#endif
 static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
        unsigned char temp;
@@ -667,6 +701,19 @@ static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id
                dev_err(&dev->dev, "Failed to add SMBus adapter\n");
                goto exit_release;
        }
+        /* Register optional slaves */
+#if defined CONFIG_INPUT_APANEL || defined CONFIG_INPUT_APANEL_MODULE
+        if (apanel_addr) {
+                struct i2c_board_info info;
+                memset(&info, 0, sizeof(struct i2c_board_info));
+                info.addr = apanel_addr;
+                strlcpy(info.type, "fujitsu_apanel", I2C_NAME_SIZE);
+                i2c_new_device(&i801_adapter, &info);
+        }
+#endif
        return 0;
 exit_release:
@@ -717,6 +764,7 @@ static struct pci_driver i801_driver = {
 static int __init i2c_i801_init(void)
 {
+        input_apanel_init();
        return pci_register_driver(&i801_driver);
 }
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 587f5b2380d4..6af68146c342 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1076,10 +1076,10 @@ static int i2c_pxa_probe(struct platform_device *dev)
 #ifdef CONFIG_I2C_PXA_SLAVE
        printk(KERN_INFO "I2C: %s: PXA I2C adapter, slave address %d\n",
-               i2c->adap.dev.bus_id, i2c->slave_addr);
+               dev_name(&i2c->adap.dev), i2c->slave_addr);
 #else
        printk(KERN_INFO "I2C: %s: PXA I2C adapter\n",
-               i2c->adap.dev.bus_id);
+               dev_name(&i2c->adap.dev));
 #endif
        return 0;
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index f69f91ffb469..5b7f95641ba4 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -906,7 +906,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, i2c);
-        dev_info(&pdev->dev, "%s: S3C I2C adapter\n", i2c->adap.dev.bus_id);
+        dev_info(&pdev->dev, "%s: S3C I2C adapter\n", dev_name(&i2c->adap.dev));
        return 0;
 err_cpufreq:
diff --git a/drivers/i2c/busses/i2c-sh7760.c b/drivers/i2c/busses/i2c-sh7760.c
index 5e0e254976de..baa28b73ae42 100644
--- a/drivers/i2c/busses/i2c-sh7760.c
+++ b/drivers/i2c/busses/i2c-sh7760.c
@@ -475,7 +475,7 @@ static int __devinit sh7760_i2c_probe(struct platform_device *pdev)
        id->adap.nr = pdev->id;
        id->adap.algo = &sh7760_i2c_algo;
-        id->adap.class = I2C_CLASS_ALL;
+        id->adap.class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
        id->adap.retries = 3;
        id->adap.algo_data = id;
        id->adap.dev.parent = &pdev->dev;
diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
index 6c3d60b939bf..1c01083b01b5 100644
--- a/drivers/i2c/busses/i2c-sh_mobile.c
+++ b/drivers/i2c/busses/i2c-sh_mobile.c
@@ -500,7 +500,7 @@ static int sh_mobile_i2c_hook_irqs(struct platform_device *dev, int hook)
        while ((res = platform_get_resource(dev, IORESOURCE_IRQ, k))) {
                for (n = res->start; hook && n <= res->end; n++) {
                        if (request_irq(n, sh_mobile_i2c_isr, IRQF_DISABLED,
-                                        dev->dev.bus_id, dev))
+                                        dev_name(&dev->dev), dev))
                                goto rollback;
                }
                k++;
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c
index dfc2d5eb6a68..8ce2daff985c 100644
--- a/drivers/i2c/busses/i2c-sis5595.c
+++ b/drivers/i2c/busses/i2c-sis5595.c
@@ -389,8 +389,8 @@ static int __devinit sis5595_probe(struct pci_dev *dev, const struct pci_device_
        /* set up the sysfs linkage to our parent device */
        sis5595_adapter.dev.parent = &dev->dev;
-        sprintf(sis5595_adapter.name, "SMBus SIS5595 adapter at %04x",
+        snprintf(sis5595_adapter.name, sizeof(sis5595_adapter.name),
-                sis5595_base + SMB_INDEX);
+                 "SMBus SIS5595 adapter at %04x", sis5595_base + SMB_INDEX);
        err = i2c_add_adapter(&sis5595_adapter);
        if (err) {
                release_region(sis5595_base + SMB_INDEX, 2);
diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c
index e7c4b790da54..9c9c016ff2b5 100644
--- a/drivers/i2c/busses/i2c-sis630.c
+++ b/drivers/i2c/busses/i2c-sis630.c
@@ -487,8 +487,8 @@ static int __devinit sis630_probe(struct pci_dev *dev, const struct pci_device_i
        /* set up the sysfs linkage to our parent device */
        sis630_adapter.dev.parent = &dev->dev;
-        sprintf(sis630_adapter.name, "SMBus SIS630 adapter at %04x",
+        snprintf(sis630_adapter.name, sizeof(sis630_adapter.name),
-                acpi_base + SMB_STS);
+                 "SMBus SIS630 adapter at %04x", acpi_base + SMB_STS);
        return i2c_add_adapter(&sis630_adapter);
 }
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index c6a63f46bc15..b1c9abe24c7b 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -459,7 +459,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
                pr_debug("I2C adapter driver [%s] forgot to specify "
                         "physical device\n", adap->name);
        }
-        sprintf(adap->dev.bus_id, "i2c-%d", adap->nr);
+        dev_set_name(&adap->dev, "i2c-%d", adap->nr);
        adap->dev.release = &i2c_adapter_dev_release;
        adap->dev.class = &i2c_adapter_class;
        res = device_register(&adap->dev);
@@ -845,8 +845,8 @@ int i2c_attach_client(struct i2c_client *client)
        } else
                client->dev.release = i2c_client_dev_release;
-        snprintf(&client->dev.bus_id[0], sizeof(client->dev.bus_id),
+        dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adapter),
-                "%d-%04x", i2c_adapter_id(adapter), client->addr);
+                     client->addr);
        res = device_register(&client->dev);
        if (res)
                goto out_err;
@@ -856,7 +856,7 @@ int i2c_attach_client(struct i2c_client *client)
        mutex_unlock(&adapter->clist_lock);
        dev_dbg(&adapter->dev, "client [%s] registered with bus id %s\n",
-                client->name, client->dev.bus_id);
+                client->name, dev_name(&client->dev));
        if (adapter->client_register)  {
                if (adapter->client_register(client)) {
diff --git a/drivers/ieee1394/csr.c b/drivers/ieee1394/csr.c
index c90be4070e40..31400c8ae051 100644
--- a/drivers/ieee1394/csr.c
+++ b/drivers/ieee1394/csr.c
@@ -68,22 +68,22 @@ static struct hpsb_highlevel csr_highlevel = {
        .host_reset =   host_reset,
 };
-static struct hpsb_address_ops map_ops = {
+const static struct hpsb_address_ops map_ops = {
        .read = read_maps,
 };
-static struct hpsb_address_ops fcp_ops = {
+const static struct hpsb_address_ops fcp_ops = {
        .write = write_fcp,
 };
-static struct hpsb_address_ops reg_ops = {
+const static struct hpsb_address_ops reg_ops = {
        .read = read_regs,
        .write = write_regs,
        .lock = lock_regs,
        .lock64 = lock64_regs,
 };
-static struct hpsb_address_ops config_rom_ops = {
+const static struct hpsb_address_ops config_rom_ops = {
        .read = read_config_rom,
 };
@@ -217,7 +217,7 @@ static void add_host(struct hpsb_host *host)
        host->csr.generation = 2;
-        bus_info[1] = __constant_cpu_to_be32(0x31333934);
+        bus_info[1] = IEEE1394_BUSID_MAGIC;
        bus_info[2] = cpu_to_be32((hpsb_disable_irm ? 0 : 1 << CSR_IRMC_SHIFT) |
                                  (1 << CSR_CMC_SHIFT) |
                                  (1 << CSR_ISC_SHIFT) |
@@ -250,7 +250,7 @@ static void remove_host(struct hpsb_host *host)
 {
        quadlet_t bus_info[CSR_BUS_INFO_SIZE];
-        bus_info[1] = __constant_cpu_to_be32(0x31333934);
+        bus_info[1] = IEEE1394_BUSID_MAGIC;
        bus_info[2] = cpu_to_be32((0 << CSR_IRMC_SHIFT) |
                                  (0 << CSR_CMC_SHIFT) |
                                  (0 << CSR_ISC_SHIFT) |
diff --git a/drivers/ieee1394/csr.h b/drivers/ieee1394/csr.h
index f11546550d84..90fb3f2192c3 100644
--- a/drivers/ieee1394/csr.h
+++ b/drivers/ieee1394/csr.h
@@ -50,11 +50,11 @@
 #define CSR_MAX_ROM_SHIFT               8
 #define CSR_GENERATION_SHIFT            4
-#define CSR_SET_BUS_INFO_GENERATION(csr, gen)                           \
+static inline void csr_set_bus_info_generation(struct csr1212_csr *csr, u8 gen)
-        ((csr)->bus_info_data[2] =                                      \
+{
-                cpu_to_be32((be32_to_cpu((csr)->bus_info_data[2]) &     \
+        csr->bus_info_data[2] &= ~cpu_to_be32(0xf << CSR_GENERATION_SHIFT);
-                             ~(0xf << CSR_GENERATION_SHIFT)) |          \
+        csr->bus_info_data[2] |= cpu_to_be32((u32)gen << CSR_GENERATION_SHIFT);
-                            (gen) << CSR_GENERATION_SHIFT))
+}
 struct csr_control {
        spinlock_t lock;
diff --git a/drivers/ieee1394/csr1212.c b/drivers/ieee1394/csr1212.c
index 5e38a68b8af2..a6dfeb0b3372 100644
--- a/drivers/ieee1394/csr1212.c
+++ b/drivers/ieee1394/csr1212.c
@@ -1077,15 +1077,10 @@ static int csr1212_parse_bus_info_block(struct csr1212_csr *csr)
        int i;
        int ret;
-        /* IEEE 1212 says that the entire bus info block should be readable in
-         * a single transaction regardless of the max_rom value.
-         * Unfortunately, many IEEE 1394 devices do not abide by that, so the
-         * bus info block will be read 1 quadlet at a time.  The rest of the
-         * ConfigROM will be read according to the max_rom field. */
        for (i = 0; i < csr->bus_info_len; i += sizeof(u32)) {
                ret = csr->ops->bus_read(csr, CSR1212_CONFIG_ROM_SPACE_BASE + i,
-                        sizeof(u32), &csr->cache_head->data[bytes_to_quads(i)],
+                                &csr->cache_head->data[bytes_to_quads(i)],
-                        csr->private);
+                                csr->private);
                if (ret != CSR1212_SUCCESS)
                        return ret;
@@ -1104,8 +1099,8 @@ static int csr1212_parse_bus_info_block(struct csr1212_csr *csr)
         * a time. */
        for (i = csr->bus_info_len; i <= csr->crc_len; i += sizeof(u32)) {
                ret = csr->ops->bus_read(csr, CSR1212_CONFIG_ROM_SPACE_BASE + i,
-                        sizeof(u32), &csr->cache_head->data[bytes_to_quads(i)],
+                                &csr->cache_head->data[bytes_to_quads(i)],
-                        csr->private);
+                                csr->private);
                if (ret != CSR1212_SUCCESS)
                        return ret;
        }
@@ -1289,7 +1284,7 @@ csr1212_read_keyval(struct csr1212_csr *csr, struct csr1212_keyval *kv)
                if (csr->ops->bus_read(csr,
                                       CSR1212_REGISTER_SPACE_BASE + kv->offset,
-                                       sizeof(u32), &q, csr->private))
+                                       &q, csr->private))
                        return -EIO;
                kv->value.leaf.len = be32_to_cpu(q) >> 16;
@@ -1372,17 +1367,8 @@ csr1212_read_keyval(struct csr1212_csr *csr, struct csr1212_keyval *kv)
                addr = (CSR1212_CSR_ARCH_REG_SPACE_BASE + cache->offset +
                        cr->offset_end) & ~(csr->max_rom - 1);
-                if (csr->ops->bus_read(csr, addr, csr->max_rom, cache_ptr,
+                if (csr->ops->bus_read(csr, addr, cache_ptr, csr->private))
-                                       csr->private)) {
+                        return -EIO;
-                        if (csr->max_rom == 4)
-                                /* We've got problems! */
-                                return -EIO;
-                        /* Apperently the max_rom value was a lie, set it to
-                         * do quadlet reads and try again. */
-                        csr->max_rom = 4;
-                        continue;
-                }
                cr->offset_end += csr->max_rom - (cr->offset_end &
                                                  (csr->max_rom - 1));
@@ -1433,7 +1419,6 @@ csr1212_get_keyval(struct csr1212_csr *csr, struct csr1212_keyval *kv)
 int csr1212_parse_csr(struct csr1212_csr *csr)
 {
-        static const int mr_map[] = { 4, 64, 1024, 0 };
        struct csr1212_dentry *dentry;
        int ret;
@@ -1443,15 +1428,13 @@ int csr1212_parse_csr(struct csr1212_csr *csr)
        if (ret != CSR1212_SUCCESS)
                return ret;
-        if (!csr->ops->get_max_rom) {
+        /*
-                csr->max_rom = mr_map[0];       /* default value */
+         * There has been a buggy firmware with bus_info_block.max_rom > 0
-        } else {
+         * spotted which actually only supported quadlet read requests to the
-                int i = csr->ops->get_max_rom(csr->bus_info_data,
+         * config ROM.  Therefore read everything quadlet by quadlet regardless
-                                              csr->private);
+         * of what the bus info block says.
-                if (i & ~0x3)
+         */
-                        return -EINVAL;
+        csr->max_rom = 4;
-                csr->max_rom = mr_map[i];
-        }
        csr->cache_head->layout_head = csr->root_kv;
        csr->cache_head->layout_tail = csr->root_kv;
diff --git a/drivers/ieee1394/csr1212.h b/drivers/ieee1394/csr1212.h
index 043039fc63ec..a892d922dbc9 100644
--- a/drivers/ieee1394/csr1212.h
+++ b/drivers/ieee1394/csr1212.h
@@ -181,7 +181,7 @@ struct csr1212_csr_rom_cache {
 struct csr1212_csr {
        size_t bus_info_len;    /* bus info block length in bytes */
        size_t crc_len;         /* crc length in bytes */
-        u32 *bus_info_data;     /* bus info data incl bus name and EUI */
+        __be32 *bus_info_data;  /* bus info data incl bus name and EUI */
        void *private;          /* private, bus specific data */
        struct csr1212_bus_ops *ops;
@@ -200,7 +200,7 @@ struct csr1212_bus_ops {
         * entries located in the Units Space.  Must return 0 on success
         * anything else indicates an error. */
        int (*bus_read) (struct csr1212_csr *csr, u64 addr,
-                         u16 length, void *buffer, void *private);
+                         void *buffer, void *private);
        /* This function is used by csr1212 to allocate a region in units space
         * in the event that Config ROM entries don't all fit in the predefined
@@ -211,11 +211,6 @@ struct csr1212_bus_ops {
        /* This function is used by csr1212 to release a region in units space
         * that is no longer needed. */
        void (*release_addr) (u64 addr, void *private);
-        /* This function is used by csr1212 to determine the max read request
-         * supported by a remote node when reading the ConfigROM space.  Must
-         * return 0, 1, or 2 per IEEE 1212.  */
-        int (*get_max_rom) (u32 *bus_info, void *private);
 };
diff --git a/drivers/ieee1394/dv1394-private.h b/drivers/ieee1394/dv1394-private.h
index 7d1d2845b420..18b92cbf4a9f 100644
--- a/drivers/ieee1394/dv1394-private.h
+++ b/drivers/ieee1394/dv1394-private.h
@@ -77,11 +77,11 @@ static inline void fill_cip_header(struct CIP_header *cip,
   See the Texas Instruments OHCI 1394 chipset documentation.
 */
-struct output_more_immediate { u32 q[8]; };
+struct output_more_immediate { __le32 q[8]; };
-struct output_more { u32 q[4]; };
+struct output_more { __le32 q[4]; };
-struct output_last { u32 q[4]; };
+struct output_last { __le32 q[4]; };
-struct input_more { u32 q[4]; };
+struct input_more { __le32 q[4]; };
-struct input_last { u32 q[4]; };
+struct input_last { __le32 q[4]; };
 /* outputs */
@@ -92,9 +92,9 @@ static inline void fill_output_more_immediate(struct output_more_immediate *omi,
                                              unsigned int  payload_size)
 {
        omi->q[0] = cpu_to_le32(0x02000000 | 8); /* OUTPUT_MORE_IMMEDIATE; 8 is the size of the IT header */
-        omi->q[1] = 0;
+        omi->q[1] = cpu_to_le32(0);
-        omi->q[2] = 0;
+        omi->q[2] = cpu_to_le32(0);
-        omi->q[3] = 0;
+        omi->q[3] = cpu_to_le32(0);
        /* IT packet header */
        omi->q[4] = cpu_to_le32(  (0x0 << 16)  /* IEEE1394_SPEED_100 */
@@ -106,8 +106,8 @@ static inline void fill_output_more_immediate(struct output_more_immediate *omi,
        /* reserved field; mimic behavior of my Sony DSR-40 */
        omi->q[5] = cpu_to_le32((payload_size << 16) | (0x7F << 8) | 0xA0);
-        omi->q[6] = 0;
+        omi->q[6] = cpu_to_le32(0);
-        omi->q[7] = 0;
+        omi->q[7] = cpu_to_le32(0);
 }
 static inline void fill_output_more(struct output_more *om,
@@ -116,8 +116,8 @@ static inline void fill_output_more(struct output_more *om,
 {
        om->q[0] = cpu_to_le32(data_size);
        om->q[1] = cpu_to_le32(data_phys_addr);
-        om->q[2] = 0;
+        om->q[2] = cpu_to_le32(0);
-        om->q[3] = 0;
+        om->q[3] = cpu_to_le32(0);
 }
 static inline void fill_output_last(struct output_last *ol,
@@ -140,8 +140,8 @@ static inline void fill_output_last(struct output_last *ol,
        ol->q[0] = cpu_to_le32(temp);
        ol->q[1] = cpu_to_le32(data_phys_addr);
-        ol->q[2] = 0;
+        ol->q[2] = cpu_to_le32(0);
-        ol->q[3] = 0;
+        ol->q[3] = cpu_to_le32(0);
 }
 /* inputs */
@@ -161,8 +161,8 @@ static inline void fill_input_more(struct input_more *im,
        im->q[0] = cpu_to_le32(temp);
        im->q[1] = cpu_to_le32(data_phys_addr);
-        im->q[2] = 0; /* branchAddress and Z not use in packet-per-buffer mode */
+        im->q[2] = cpu_to_le32(0); /* branchAddress and Z not use in packet-per-buffer mode */
-        im->q[3] = 0; /* xferStatus & resCount, resCount must be initialize to data_size */
+        im->q[3] = cpu_to_le32(0); /* xferStatus & resCount, resCount must be initialize to data_size */
 }
 
 static inline void fill_input_last(struct input_last *il,
@@ -331,7 +331,7 @@ struct frame {
        /* points to status/timestamp field of first DMA packet */
        /* (we'll check it later to monitor timestamp accuracy) */
-        u32 *frame_begin_timestamp;
+        __le32 *frame_begin_timestamp;
        /* the timestamp we assigned to the first packet in the frame */
        u32 assigned_timestamp;
@@ -348,15 +348,15 @@ struct frame {
           that can cause interrupts. We'll check these from the
           interrupt handler.
        */
-        u32 *mid_frame_timestamp;
+        __le32 *mid_frame_timestamp;
-        u32 *frame_end_timestamp;
+        __le32 *frame_end_timestamp;
        /* branch address field of final packet. This is effectively
           the "tail" in the chain of DMA descriptor blocks.
           We will fill it with the address of the first DMA descriptor
           block in the subsequent frame, once it is ready.
        */
-        u32 *frame_end_branch;
+        __le32 *frame_end_branch;
        /* the number of descriptors in the first descriptor block
           of the frame. Needed to start DMA */
@@ -365,10 +365,10 @@ struct frame {
 struct packet {
-        u16     timestamp;
+        __le16  timestamp;
        u16     invalid;
        u16     iso_header;
-        u16     data_length;
+        __le16  data_length;
        u32     cip_h1;
        u32     cip_h2;
        unsigned char data[480];
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index c19f23267157..a329e6bd5d2d 100644
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -265,7 +265,7 @@ static void frame_prepare(struct video_card *video, unsigned int this_frame)
        /* these flags denote packets that need special attention */
        int empty_packet, first_packet, last_packet, mid_packet;
-        u32 *branch_address, *last_branch_address = NULL;
+        __le32 *branch_address, *last_branch_address = NULL;
        unsigned long data_p;
        int first_packet_empty = 0;
        u32 cycleTimer, ct_sec, ct_cyc, ct_off;
@@ -848,7 +848,7 @@ static void receive_packets(struct video_card *video)
        dma_addr_t block_dma = 0;
        struct packet *data = NULL;
        dma_addr_t data_dma = 0;
-        u32 *last_branch_address = NULL;
+        __le32 *last_branch_address = NULL;
        unsigned long irq_flags;
        int want_interrupt = 0;
        struct frame *f = NULL;
@@ -2110,17 +2110,17 @@ static void ir_tasklet_func(unsigned long data)
                        f = video->frames[next_i / MAX_PACKETS];
                        next = &(f->descriptor_pool[next_i % MAX_PACKETS]);
                        next_dma = ((unsigned long) block - (unsigned long) f->descriptor_pool) + f->descriptor_pool_dma;
-                        next->u.in.il.q[0] |= 3 << 20; /* enable interrupt */
+                        next->u.in.il.q[0] |= cpu_to_le32(3 << 20); /* enable interrupt */
-                        next->u.in.il.q[2] = 0; /* disable branch */
+                        next->u.in.il.q[2] = cpu_to_le32(0); /* disable branch */
                        /* link previous to next */
                        prev_i = (next_i == 0) ? (MAX_PACKETS * video->n_frames - 1) : (next_i - 1);
                        f = video->frames[prev_i / MAX_PACKETS];
                        prev = &(f->descriptor_pool[prev_i % MAX_PACKETS]);
                        if (prev_i % (MAX_PACKETS/2)) {
-                                prev->u.in.il.q[0] &= ~(3 << 20); /* no interrupt */
+                                prev->u.in.il.q[0] &= ~cpu_to_le32(3 << 20); /* no interrupt */
                        } else {
-                                prev->u.in.il.q[0] |= 3 << 20; /* enable interrupt */
+                                prev->u.in.il.q[0] |= cpu_to_le32(3 << 20); /* enable interrupt */
                        }
                        prev->u.in.il.q[2] = cpu_to_le32(next_dma | 1); /* set Z=1 */
                        wmb();
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index 20128692b339..a074bfd5f825 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -92,7 +92,7 @@ struct partial_datagram {
        struct list_head list;
        u16 dgl;
        u16 dg_size;
-        u16 ether_type;
+        __be16 ether_type;
        struct sk_buff *skb;
        char *pbuf;
        struct list_head frag_info;
@@ -181,7 +181,7 @@ static void ether1394_remove_host(struct hpsb_host *host);
 static void ether1394_host_reset(struct hpsb_host *host);
 /* Function for incoming 1394 packets */
-static struct hpsb_address_ops addr_ops = {
+const static struct hpsb_address_ops addr_ops = {
        .write =        ether1394_write,
 };
@@ -767,7 +767,7 @@ static int ether1394_header_parse(const struct sk_buff *skb,
 static int ether1394_header_cache(const struct neighbour *neigh,
                                  struct hh_cache *hh)
 {
-        unsigned short type = hh->hh_type;
+        __be16 type = hh->hh_type;
        struct net_device *dev = neigh->dev;
        struct eth1394hdr *eth =
                (struct eth1394hdr *)((u8 *)hh->hh_data + 16 - ETH1394_HLEN);
@@ -795,7 +795,7 @@ static void ether1394_header_cache_update(struct hh_cache *hh,
 ******************************************/
 /* Copied from net/ethernet/eth.c */
-static u16 ether1394_type_trans(struct sk_buff *skb, struct net_device *dev)
+static __be16 ether1394_type_trans(struct sk_buff *skb, struct net_device *dev)
 {
        struct eth1394hdr *eth;
        unsigned char *rawp;
@@ -829,17 +829,17 @@ static u16 ether1394_type_trans(struct sk_buff *skb, struct net_device *dev)
 /* Parse an encapsulated IP1394 header into an ethernet frame packet.
 * We also perform ARP translation here, if need be.  */
-static u16 ether1394_parse_encap(struct sk_buff *skb, struct net_device *dev,
+static __be16 ether1394_parse_encap(struct sk_buff *skb, struct net_device *dev,
                                 nodeid_t srcid, nodeid_t destid,
-                                 u16 ether_type)
+                                 __be16 ether_type)
 {
        struct eth1394_priv *priv = netdev_priv(dev);
-        u64 dest_hw;
+        __be64 dest_hw;
-        unsigned short ret = 0;
+        __be16 ret = 0;
        /* Setup our hw addresses. We use these to build the ethernet header. */
        if (destid == (LOCAL_BUS | ALL_NODES))
-                dest_hw = ~0ULL;  /* broadcast */
+                dest_hw = ~cpu_to_be64(0);  /* broadcast */
        else
                dest_hw = cpu_to_be64((u64)priv->host->csr.guid_hi << 32 |
                                      priv->host->csr.guid_lo);
@@ -873,7 +873,7 @@ static u16 ether1394_parse_encap(struct sk_buff *skb, struct net_device *dev,
                node = eth1394_find_node_guid(&priv->ip_node_list,
                                              be64_to_cpu(guid));
                if (!node)
-                        return 0;
+                        return cpu_to_be16(0);
                node_info =
                    (struct eth1394_node_info *)node->ud->device.driver_data;
@@ -1063,7 +1063,7 @@ static int ether1394_data_handler(struct net_device *dev, int srcid, int destid,
        unsigned long flags;
        struct eth1394_priv *priv = netdev_priv(dev);
        union eth1394_hdr *hdr = (union eth1394_hdr *)buf;
-        u16 ether_type = 0;  /* initialized to clear warning */
+        __be16 ether_type = cpu_to_be16(0);  /* initialized to clear warning */
        int hdr_len;
        struct unit_directory *ud = priv->ud_list[NODEID_TO_NODE(srcid)];
        struct eth1394_node_info *node_info;
@@ -1259,7 +1259,7 @@ static int ether1394_write(struct hpsb_host *host, int srcid, int destid,
 static void ether1394_iso(struct hpsb_iso *iso)
 {
-        quadlet_t *data;
+        __be32 *data;
        char *buf;
        struct eth1394_host_info *hi;
        struct net_device *dev;
@@ -1283,7 +1283,7 @@ static void ether1394_iso(struct hpsb_iso *iso)
        for (i = 0; i < nready; i++) {
                struct hpsb_iso_packet_info *info =
                        &iso->infos[(iso->first_packet + i) % iso->buf_packets];
-                data = (quadlet_t *)(iso->data_buf.kvirt + info->offset);
+                data = (__be32 *)(iso->data_buf.kvirt + info->offset);
                /* skip over GASP header */
                buf = (char *)data + 8;
@@ -1614,7 +1614,7 @@ static int ether1394_tx(struct sk_buff *skb, struct net_device *dev)
                if (max_payload < dg_size + hdr_type_len[ETH1394_HDR_LF_UF])
                        priv->bc_dgl++;
        } else {
-                __be64 guid = get_unaligned((u64 *)hdr_buf.h_dest);
+                __be64 guid = get_unaligned((__be64 *)hdr_buf.h_dest);
                node = eth1394_find_node_guid(&priv->ip_node_list,
                                              be64_to_cpu(guid));
diff --git a/drivers/ieee1394/eth1394.h b/drivers/ieee1394/eth1394.h
index 4f3e2dd46f00..e1b5ea80f623 100644
--- a/drivers/ieee1394/eth1394.h
+++ b/drivers/ieee1394/eth1394.h
@@ -82,7 +82,7 @@ struct eth1394_priv {
 struct eth1394hdr {
        unsigned char   h_dest[ETH1394_ALEN];   /* destination eth1394 addr     */
-        unsigned short  h_proto;                /* packet type ID field */
+        __be16          h_proto;                /* packet type ID field */
 }  __attribute__((packed));
 static inline struct eth1394hdr *eth1394_hdr(const struct sk_buff *skb)
@@ -99,13 +99,13 @@ typedef enum {ETH1394_GASP, ETH1394_WRREQ} eth1394_tx_type;
 struct eth1394_uf_hdr {
        u16 lf:2;
        u16 res:14;
-        u16 ether_type;         /* Ethernet packet type */
+        __be16 ether_type;              /* Ethernet packet type */
 } __attribute__((packed));
 #elif defined __LITTLE_ENDIAN_BITFIELD
 struct eth1394_uf_hdr {
        u16 res:14;
        u16 lf:2;
-        u16 ether_type;
+        __be16 ether_type;
 } __attribute__((packed));
 #else
 #error Unknown bit field type
@@ -117,7 +117,7 @@ struct eth1394_ff_hdr {
        u16 lf:2;
        u16 res1:2;
        u16 dg_size:12;         /* Datagram size */
-        u16 ether_type;         /* Ethernet packet type */
+        __be16 ether_type;              /* Ethernet packet type */
        u16 dgl;                /* Datagram label */
        u16 res2;
 } __attribute__((packed));
@@ -126,7 +126,7 @@ struct eth1394_ff_hdr {
        u16 dg_size:12;
        u16 res1:2;
        u16 lf:2;
-        u16 ether_type;
+        __be16 ether_type;
        u16 dgl;
        u16 res2;
 } __attribute__((packed));
@@ -207,11 +207,11 @@ struct eth1394_arp {
        u16 opcode;             /* ARP Opcode   */
        /* Above is exactly the same format as struct arphdr */
-        u64 s_uniq_id;          /* Sender's 64bit EUI                   */
+        __be64 s_uniq_id;       /* Sender's 64bit EUI           */
        u8 max_rec;             /* Sender's max packet size             */
        u8 sspd;                /* Sender's max speed                   */
-        u16 fifo_hi;            /* hi 16bits of sender's FIFO addr      */
+        __be16 fifo_hi;         /* hi 16bits of sender's FIFO addr      */
-        u32 fifo_lo;            /* lo 32bits of sender's FIFO addr      */
+        __be32 fifo_lo;         /* lo 32bits of sender's FIFO addr      */
        u32 sip;                /* Sender's IP Address                  */
        u32 tip;                /* IP Address of requested hw addr      */
 };
diff --git a/drivers/ieee1394/highlevel.c b/drivers/ieee1394/highlevel.c
index 272543a42a43..600e391c8fe7 100644
--- a/drivers/ieee1394/highlevel.c
+++ b/drivers/ieee1394/highlevel.c
@@ -320,7 +320,7 @@ void hpsb_unregister_highlevel(struct hpsb_highlevel *hl)
 */
 u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl,
                                         struct hpsb_host *host,
-                                         struct hpsb_address_ops *ops,
+                                         const struct hpsb_address_ops *ops,
                                         u64 size, u64 alignment,
                                         u64 start, u64 end)
 {
@@ -407,7 +407,8 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl,
 * are automatically deallocated together with the hpsb_highlevel @hl.
 */
 int hpsb_register_addrspace(struct hpsb_highlevel *hl, struct hpsb_host *host,
-                            struct hpsb_address_ops *ops, u64 start, u64 end)
+                            const struct hpsb_address_ops *ops,
+                            u64 start, u64 end)
 {
        struct hpsb_address_serve *as;
        struct list_head *lh;
@@ -420,7 +421,7 @@ int hpsb_register_addrspace(struct hpsb_highlevel *hl, struct hpsb_host *host,
                return 0;
        }
-        as = kmalloc(sizeof(*as), GFP_ATOMIC);
+        as = kmalloc(sizeof(*as), GFP_KERNEL);
        if (!as)
                return 0;
@@ -477,7 +478,7 @@ int hpsb_unregister_addrspace(struct hpsb_highlevel *hl, struct hpsb_host *host,
        return retval;
 }
-static struct hpsb_address_ops dummy_ops;
+const static struct hpsb_address_ops dummy_ops;
 /* dummy address spaces as lower and upper bounds of the host's a.s. list */
 static void init_hpsb_highlevel(struct hpsb_host *host)
diff --git a/drivers/ieee1394/highlevel.h b/drivers/ieee1394/highlevel.h
index bc5d0854c17e..9dba89fc60ad 100644
--- a/drivers/ieee1394/highlevel.h
+++ b/drivers/ieee1394/highlevel.h
@@ -15,7 +15,7 @@ struct hpsb_host;
 struct hpsb_address_serve {
        struct list_head host_list;     /* per host list */
        struct list_head hl_list;       /* hpsb_highlevel list */
-        struct hpsb_address_ops *op;
+        const struct hpsb_address_ops *op;
        struct hpsb_host *host;
        u64 start;      /* first address handled, quadlet aligned */
        u64 end;        /* first address behind, quadlet aligned */
@@ -119,11 +119,12 @@ void hpsb_unregister_highlevel(struct hpsb_highlevel *hl);
 u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl,
                                         struct hpsb_host *host,
-                                         struct hpsb_address_ops *ops,
+                                         const struct hpsb_address_ops *ops,
                                         u64 size, u64 alignment,
                                         u64 start, u64 end);
 int hpsb_register_addrspace(struct hpsb_highlevel *hl, struct hpsb_host *host,
-                            struct hpsb_address_ops *ops, u64 start, u64 end);
+                            const struct hpsb_address_ops *ops,
+                            u64 start, u64 end);
 int hpsb_unregister_addrspace(struct hpsb_highlevel *hl, struct hpsb_host *host,
                              u64 start);
diff --git a/drivers/ieee1394/hosts.c b/drivers/ieee1394/hosts.c
index 237d0c9d69c6..e947d8ffac85 100644
--- a/drivers/ieee1394/hosts.c
+++ b/drivers/ieee1394/hosts.c
@@ -34,18 +34,18 @@ static void delayed_reset_bus(struct work_struct *work)
 {
        struct hpsb_host *host =
                container_of(work, struct hpsb_host, delayed_reset.work);
-        int generation = host->csr.generation + 1;
+        u8 generation = host->csr.generation + 1;
        /* The generation field rolls over to 2 rather than 0 per IEEE
         * 1394a-2000. */
        if (generation > 0xf || generation < 2)
                generation = 2;
-        CSR_SET_BUS_INFO_GENERATION(host->csr.rom, generation);
+        csr_set_bus_info_generation(host->csr.rom, generation);
        if (csr1212_generate_csr_image(host->csr.rom) != CSR1212_SUCCESS) {
                /* CSR image creation failed.
                 * Reset generation field and do not issue a bus reset. */
-                CSR_SET_BUS_INFO_GENERATION(host->csr.rom,
+                csr_set_bus_info_generation(host->csr.rom,
                                            host->csr.generation);
                return;
        }
diff --git a/drivers/ieee1394/hosts.h b/drivers/ieee1394/hosts.h
index dd229950acca..49c359022c54 100644
--- a/drivers/ieee1394/hosts.h
+++ b/drivers/ieee1394/hosts.h
@@ -154,7 +154,7 @@ struct hpsb_host_driver {
         * to set the hardware ConfigROM if the hardware supports handling
         * reads to the ConfigROM on its own. */
        void (*set_hw_config_rom)(struct hpsb_host *host,
-                                  quadlet_t *config_rom);
+                                  __be32 *config_rom);
        /* This function shall implement packet transmission based on
         * packet->type.  It shall CRC both parts of the packet (unless
diff --git a/drivers/ieee1394/ieee1394.h b/drivers/ieee1394/ieee1394.h
index 40492074c013..e0ae0d3d747f 100644
--- a/drivers/ieee1394/ieee1394.h
+++ b/drivers/ieee1394/ieee1394.h
@@ -121,6 +121,9 @@ extern const char *hpsb_speedto_str[];
 #include <asm/byteorder.h>
+/* '1' '3' '9' '4' in ASCII */
+#define IEEE1394_BUSID_MAGIC    cpu_to_be32(0x31333934)
 #ifdef __BIG_ENDIAN_BITFIELD
 struct selfid {
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index 79ef5fd928ae..906c5a98d814 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -67,7 +67,7 @@ static int nodemgr_check_speed(struct nodemgr_csr_info *ci, u64 addr,
        for (i = IEEE1394_SPEED_100; i <= old_speed; i++) {
                *speed = i;
                error = hpsb_read(ci->host, ci->nodeid, ci->generation, addr,
-                                  &q, sizeof(quadlet_t));
+                                  &q, 4);
                if (error)
                        break;
                *buffer = q;
@@ -85,7 +85,7 @@ static int nodemgr_check_speed(struct nodemgr_csr_info *ci, u64 addr,
        return error;
 }
-static int nodemgr_bus_read(struct csr1212_csr *csr, u64 addr, u16 length,
+static int nodemgr_bus_read(struct csr1212_csr *csr, u64 addr,
                            void *buffer, void *__ci)
 {
        struct nodemgr_csr_info *ci = (struct nodemgr_csr_info*)__ci;
@@ -93,7 +93,7 @@ static int nodemgr_bus_read(struct csr1212_csr *csr, u64 addr, u16 length,
        for (i = 1; ; i++) {
                error = hpsb_read(ci->host, ci->nodeid, ci->generation, addr,
-                                  buffer, length);
+                                  buffer, 4);
                if (!error) {
                        ci->speed_unverified = 0;
                        break;
@@ -104,7 +104,7 @@ static int nodemgr_bus_read(struct csr1212_csr *csr, u64 addr, u16 length,
                /* The ieee1394_core guessed the node's speed capability from
                 * the self ID.  Check whether a lower speed works. */
-                if (ci->speed_unverified && length == sizeof(quadlet_t)) {
+                if (ci->speed_unverified) {
                        error = nodemgr_check_speed(ci, addr, buffer);
                        if (!error)
                                break;
@@ -115,20 +115,8 @@ static int nodemgr_bus_read(struct csr1212_csr *csr, u64 addr, u16 length,
        return error;
 }
-#define OUI_FREECOM_TECHNOLOGIES_GMBH 0x0001db
-static int nodemgr_get_max_rom(quadlet_t *bus_info_data, void *__ci)
-{
-        /* Freecom FireWire Hard Drive firmware bug */
-        if (be32_to_cpu(bus_info_data[3]) >> 8 == OUI_FREECOM_TECHNOLOGIES_GMBH)
-                return 0;
-        return (be32_to_cpu(bus_info_data[2]) >> 8) & 0x3;
-}
 static struct csr1212_bus_ops nodemgr_csr_ops = {
        .bus_read =     nodemgr_bus_read,
-        .get_max_rom =  nodemgr_get_max_rom
 };
diff --git a/drivers/ieee1394/nodemgr.h b/drivers/ieee1394/nodemgr.h
index 4f287a3561ba..15ea09733e84 100644
--- a/drivers/ieee1394/nodemgr.h
+++ b/drivers/ieee1394/nodemgr.h
@@ -31,9 +31,6 @@ struct csr1212_keyval;
 struct hpsb_host;
 struct ieee1394_device_id;
-/* '1' '3' '9' '4' in ASCII */
-#define IEEE1394_BUSID_MAGIC    __constant_cpu_to_be32(0x31333934)
 /* This is the start of a Node entry structure. It should be a stable API
 * for which to gather info from the Node Manager about devices attached
 * to the bus.  */
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index e509e13cb7a7..65c1429e4129 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -2973,7 +2973,7 @@ alloc_dma_trm_ctx(struct ti_ohci *ohci, struct dma_trm_ctx *d,
        return 0;
 }
-static void ohci_set_hw_config_rom(struct hpsb_host *host, quadlet_t *config_rom)
+static void ohci_set_hw_config_rom(struct hpsb_host *host, __be32 *config_rom)
 {
        struct ti_ohci *ohci = host->hostdata;
@@ -3199,15 +3199,16 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,
        /* Now enable LPS, which we need in order to start accessing
         * most of the registers.  In fact, on some cards (ALI M5251),
         * accessing registers in the SClk domain without LPS enabled
-         * will lock up the machine.  Wait 50msec to make sure we have
+         * will lock up the machine. */
-         * full link enabled.  */
        reg_write(ohci, OHCI1394_HCControlSet, OHCI1394_HCControl_LPS);
        /* Disable and clear interrupts */
        reg_write(ohci, OHCI1394_IntEventClear, 0xffffffff);
        reg_write(ohci, OHCI1394_IntMaskClear, 0xffffffff);
-        mdelay(50);
+        /* Flush MMIO writes and wait to make sure we have full link enabled. */
+        reg_read(ohci, OHCI1394_Version);
+        msleep(50);
        /* Determine the number of available IR and IT contexts. */
        ohci->nb_iso_rcv_ctx =
@@ -3233,8 +3234,9 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,
         * we need to get to that "no event", so enough should be initialized
         * by that point.
         */
-        if (request_irq(dev->irq, ohci_irq_handler, IRQF_SHARED,
+        err = request_irq(dev->irq, ohci_irq_handler, IRQF_SHARED,
-                         OHCI1394_DRIVER_NAME, ohci)) {
+                          OHCI1394_DRIVER_NAME, ohci);
+        if (err) {
                PRINT_G(KERN_ERR, "Failed to allocate interrupt %d", dev->irq);
                goto err;
        }
@@ -3381,6 +3383,7 @@ static int ohci1394_pci_suspend(struct pci_dev *dev, pm_message_t state)
        ohci_devctl(ohci->host, RESET_BUS, LONG_RESET_NO_FORCE_ROOT);
        ohci_soft_reset(ohci);
+        free_irq(dev->irq, ohci);
        err = pci_save_state(dev);
        if (err) {
                PRINT(KERN_ERR, "pci_save_state failed with %d", err);
@@ -3420,7 +3423,16 @@ static int ohci1394_pci_resume(struct pci_dev *dev)
        reg_write(ohci, OHCI1394_HCControlSet, OHCI1394_HCControl_LPS);
        reg_write(ohci, OHCI1394_IntEventClear, 0xffffffff);
        reg_write(ohci, OHCI1394_IntMaskClear, 0xffffffff);
-        mdelay(50);
+        reg_read(ohci, OHCI1394_Version);
+        msleep(50);
+        err = request_irq(dev->irq, ohci_irq_handler, IRQF_SHARED,
+                          OHCI1394_DRIVER_NAME, ohci);
+        if (err) {
+                PRINT_G(KERN_ERR, "Failed to allocate interrupt %d", dev->irq);
+                return err;
+        }
        ohci_initialize(ohci);
        hpsb_resume_host(ohci->host);
diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c
index 7aee1ac97c80..dc15cadb06ef 100644
--- a/drivers/ieee1394/pcilynx.c
+++ b/drivers/ieee1394/pcilynx.c
@@ -1463,7 +1463,7 @@ static int __devinit add_card(struct pci_dev *dev,
                                /* info_length, crc_length and 1394 magic number to check, if it is really a bus info block */
                                if (((be32_to_cpu(lynx->bus_info_block[0]) & 0xffff0000) == 0x04040000) &&
-                                    (lynx->bus_info_block[1] == __constant_cpu_to_be32(0x31333934)))
+                                    (lynx->bus_info_block[1] == IEEE1394_BUSID_MAGIC))
                                {
                                        PRINT(KERN_DEBUG, lynx->id, "read a valid bus info block from");
                                } else {
diff --git a/drivers/ieee1394/pcilynx.h b/drivers/ieee1394/pcilynx.h
index ec27321f6724..693a169acea3 100644
--- a/drivers/ieee1394/pcilynx.h
+++ b/drivers/ieee1394/pcilynx.h
@@ -52,7 +52,7 @@ struct ti_lynx {
        void __iomem *local_rom;
        void __iomem *local_ram;
        void __iomem *aux_port;
-        quadlet_t bus_info_block[5];
+        __be32 bus_info_block[5];
        /*
         * use local RAM of LOCALRAM_SIZE bytes for PCLs, which allows for
diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index bf7e761c12b1..bad66c65b0d6 100644
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -90,7 +90,7 @@ static int arm_lock(struct hpsb_host *host, int nodeid, quadlet_t * store,
 static int arm_lock64(struct hpsb_host *host, int nodeid, octlet_t * store,
                      u64 addr, octlet_t data, octlet_t arg, int ext_tcode,
                      u16 flags);
-static struct hpsb_address_ops arm_ops = {
+const static struct hpsb_address_ops arm_ops = {
        .read = arm_read,
        .write = arm_write,
        .lock = arm_lock,
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index a373c18cf7b8..ab1034ccb7fb 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -265,7 +265,7 @@ static struct hpsb_highlevel sbp2_highlevel = {
        .host_reset     = sbp2_host_reset,
 };
-static struct hpsb_address_ops sbp2_ops = {
+const static struct hpsb_address_ops sbp2_ops = {
        .write          = sbp2_handle_status_write
 };
@@ -275,7 +275,7 @@ static int sbp2_handle_physdma_write(struct hpsb_host *, int, int, quadlet_t *,
 static int sbp2_handle_physdma_read(struct hpsb_host *, int, quadlet_t *, u64,
                                    size_t, u16);
-static struct hpsb_address_ops sbp2_physdma_ops = {
+const static struct hpsb_address_ops sbp2_physdma_ops = {
        .read           = sbp2_handle_physdma_read,
        .write          = sbp2_handle_physdma_write,
 };
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index a3c5af1d7ec0..de5263beab4a 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -367,7 +367,7 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
                if (err)
                        goto out;
        } else {
-                /* Can't be smaller then the number of outstanding CQEs */
+                /* Can't be smaller than the number of outstanding CQEs */
                outst_cqe = mlx4_ib_get_outstanding_cqes(cq);
                if (entries < outst_cqe + 1) {
                        err = 0;
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index f6e9f39a527b..c3c8b9bc40ae 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -65,7 +65,7 @@ MODULE_PARM_DESC(extra, "Enable extra LEDs and keys on IBM RapidAcces, EzKey and
 /*
 * Scancode to keycode tables. These are just the default setting, and
- * are loadable via an userland utility.
+ * are loadable via a userland utility.
 */
 static const unsigned short atkbd_set2_keycode[512] = {
diff --git a/drivers/input/misc/apanel.c b/drivers/input/misc/apanel.c
index d82f7f727f7a..71b82434264d 100644
--- a/drivers/input/misc/apanel.c
+++ b/drivers/input/misc/apanel.c
@@ -57,7 +57,7 @@ static enum apanel_chip device_chip[APANEL_DEV_MAX];
 struct apanel {
        struct input_polled_dev *ipdev;
-        struct i2c_client client;
+        struct i2c_client *client;
        unsigned short keymap[MAX_PANEL_KEYS];
        u16    nkeys;
        u16    led_bits;
@@ -66,16 +66,7 @@ struct apanel {
 };
-static int apanel_probe(struct i2c_adapter *, int, int);
+static int apanel_probe(struct i2c_client *, const struct i2c_device_id *);
-/* for now, we only support one address */
-static unsigned short normal_i2c[] = {0, I2C_CLIENT_END};
-static unsigned short ignore = I2C_CLIENT_END;
-static struct i2c_client_address_data addr_data = {
-        .normal_i2c     = normal_i2c,
-        .probe          = &ignore,
-        .ignore         = &ignore,
-};
 static void report_key(struct input_dev *input, unsigned keycode)
 {
@@ -103,12 +94,12 @@ static void apanel_poll(struct input_polled_dev *ipdev)
        s32 data;
        int i;
-        data = i2c_smbus_read_word_data(&ap->client, cmd);
+        data = i2c_smbus_read_word_data(ap->client, cmd);
        if (data < 0)
                return; /* ignore errors (due to ACPI??) */
        /* write back to clear latch */
-        i2c_smbus_write_word_data(&ap->client, cmd, 0);
+        i2c_smbus_write_word_data(ap->client, cmd, 0);
        if (!data)
                return;
@@ -124,7 +115,7 @@ static void led_update(struct work_struct *work)
 {
        struct apanel *ap = container_of(work, struct apanel, led_work);
-        i2c_smbus_write_word_data(&ap->client, 0x10, ap->led_bits);
+        i2c_smbus_write_word_data(ap->client, 0x10, ap->led_bits);
 }
 static void mail_led_set(struct led_classdev *led,
@@ -140,7 +131,7 @@ static void mail_led_set(struct led_classdev *led,
        schedule_work(&ap->led_work);
 }
-static int apanel_detach_client(struct i2c_client *client)
+static int apanel_remove(struct i2c_client *client)
 {
        struct apanel *ap = i2c_get_clientdata(client);
@@ -148,43 +139,33 @@ static int apanel_detach_client(struct i2c_client *client)
                led_classdev_unregister(&ap->mail_led);
        input_unregister_polled_device(ap->ipdev);
-        i2c_detach_client(&ap->client);
        input_free_polled_device(ap->ipdev);
        return 0;
 }
-/* Function is invoked for every i2c adapter. */
-static int apanel_attach_adapter(struct i2c_adapter *adap)
-{
-        dev_dbg(&adap->dev, APANEL ": attach adapter id=%d\n", adap->id);
-        /* Our device is connected only to i801 on laptop */
-        if (adap->id != I2C_HW_SMBUS_I801)
-                return -ENODEV;
-        return i2c_probe(adap, &addr_data, apanel_probe);
-}
 static void apanel_shutdown(struct i2c_client *client)
 {
-        apanel_detach_client(client);
+        apanel_remove(client);
 }
+static struct i2c_device_id apanel_id[] = {
+        { "fujitsu_apanel", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, apanel_id);
 static struct i2c_driver apanel_driver = {
        .driver = {
                .name = APANEL,
        },
-        .attach_adapter = &apanel_attach_adapter,
+        .probe          = &apanel_probe,
-        .detach_client  = &apanel_detach_client,
+        .remove         = &apanel_remove,
        .shutdown       = &apanel_shutdown,
+        .id_table       = apanel_id,
 };
 static struct apanel apanel = {
-        .client = {
-                .driver = &apanel_driver,
-                .name   = APANEL,
-        },
        .keymap = {
                [0] = KEY_MAIL,
                [1] = KEY_WWW,
@@ -204,7 +185,8 @@ static struct apanel apanel = {
 };
 /* NB: Only one panel on the i2c. */
-static int apanel_probe(struct i2c_adapter *bus, int address, int kind)
+static int apanel_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
 {
        struct apanel *ap;
        struct input_polled_dev *ipdev;
@@ -212,9 +194,6 @@ static int apanel_probe(struct i2c_adapter *bus, int address, int kind)
        u8 cmd = device_chip[APANEL_DEV_APPBTN] == CHIP_OZ992C ? 0 : 8;
        int i, err = -ENOMEM;
-        dev_dbg(&bus->dev, APANEL ": probe adapter %p addr %d kind %d\n",
-                bus, address, kind);
        ap = &apanel;
        ipdev = input_allocate_polled_device();
@@ -222,18 +201,13 @@ static int apanel_probe(struct i2c_adapter *bus, int address, int kind)
                goto out1;
        ap->ipdev = ipdev;
-        ap->client.adapter = bus;
+        ap->client = client;
-        ap->client.addr = address;
-        i2c_set_clientdata(&ap->client, ap);
-        err = i2c_attach_client(&ap->client);
+        i2c_set_clientdata(client, ap);
-        if (err)
-                goto out2;
-        err = i2c_smbus_write_word_data(&ap->client, cmd, 0);
+        err = i2c_smbus_write_word_data(client, cmd, 0);
        if (err) {
-                dev_warn(&ap->client.dev, APANEL ": smbus write error %d\n",
+                dev_warn(&client->dev, APANEL ": smbus write error %d\n",
                         err);
                goto out3;
        }
@@ -246,7 +220,7 @@ static int apanel_probe(struct i2c_adapter *bus, int address, int kind)
        idev->name = APANEL_NAME " buttons";
        idev->phys = "apanel/input0";
        idev->id.bustype = BUS_HOST;
-        idev->dev.parent = &ap->client.dev;
+        idev->dev.parent = &client->dev;
        set_bit(EV_KEY, idev->evbit);
@@ -264,7 +238,7 @@ static int apanel_probe(struct i2c_adapter *bus, int address, int kind)
        INIT_WORK(&ap->led_work, led_update);
        if (device_chip[APANEL_DEV_LED] != CHIP_NONE) {
-                err = led_classdev_register(&ap->client.dev, &ap->mail_led);
+                err = led_classdev_register(&client->dev, &ap->mail_led);
                if (err)
                        goto out4;
        }
@@ -273,8 +247,6 @@ static int apanel_probe(struct i2c_adapter *bus, int address, int kind)
 out4:
        input_unregister_polled_device(ipdev);
 out3:
-        i2c_detach_client(&ap->client);
-out2:
        input_free_polled_device(ipdev);
 out1:
        return err;
@@ -301,6 +273,7 @@ static int __init apanel_init(void)
        void __iomem *bios;
        const void __iomem *p;
        u8 devno;
+        unsigned char i2c_addr;
        int found = 0;
        bios = ioremap(0xF0000, 0x10000); /* Can't fail */
@@ -313,7 +286,7 @@ static int __init apanel_init(void)
        /* just use the first address */
        p += 8;
-        normal_i2c[0] = readb(p+3) >> 1;
+        i2c_addr = readb(p + 3) >> 1;
        for ( ; (devno = readb(p)) & 0x7f; p += 4) {
                unsigned char method, slave, chip;
@@ -322,7 +295,7 @@ static int __init apanel_init(void)
                chip = readb(p + 2);
                slave = readb(p + 3) >> 1;
-                if (slave != normal_i2c[0]) {
+                if (slave != i2c_addr) {
                        pr_notice(APANEL ": only one SMBus slave "
                                  "address supported, skiping device...\n");
                        continue;
diff --git a/drivers/input/touchscreen/da9034-ts.c b/drivers/input/touchscreen/da9034-ts.c
index 4342e77814b5..fa67d782c3c3 100644
--- a/drivers/input/touchscreen/da9034-ts.c
+++ b/drivers/input/touchscreen/da9034-ts.c
@@ -16,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/input.h>
+#include <linux/workqueue.h>
 #include <linux/mfd/da903x.h>
 #define DA9034_MANUAL_CTRL      0x50
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index b52659620d50..173cf55c64d0 100644
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -138,7 +138,7 @@ config PMAC_BACKLIGHT
          Say Y here to enable Macintosh specific extensions of the generic
          backlight code. With this enabled, the brightness keys on older
          PowerBooks will be enabled so you can change the screen brightness.
-          Newer models should use an userspace daemon like pbbuttonsd.
+          Newer models should use a userspace daemon like pbbuttonsd.
 config PMAC_BACKLIGHT_LEGACY
        bool "Provide legacy ioctl's on /dev/pmu for the backlight"
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 34a39d2e4703..46fd573a4f15 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -569,7 +569,6 @@ static int cafe_smbus_setup(struct cafe_camera *cam)
        cafe_smbus_enable_irq(cam);
        adap->id = I2C_HW_SMBUS_CAFE;
-        adap->class = I2C_CLASS_CAM_DIGITAL;
        adap->owner = THIS_MODULE;
        adap->client_register = cafe_smbus_attach;
        adap->client_unregister = cafe_smbus_detach;
diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c
index ca26b0c50cf2..05c14a29375a 100644
--- a/drivers/media/video/ov7670.c
+++ b/drivers/media/video/ov7670.c
@@ -1347,7 +1347,6 @@ static struct i2c_driver ov7670_driver = {
                .name = "ov7670",
        },
        .id             = I2C_DRIVERID_OV7670,
-        .class          = I2C_CLASS_CAM_DIGITAL,
        .attach_adapter = ov7670_attach,
        .detach_client  = ov7670_detach,
        .command        = ov7670_command,
diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
index 2c4acbf5a4fe..c841f4e4fbe4 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -405,7 +405,6 @@ static struct i2c_driver driver = {
                .name =         "ovcamchip",
        },
        .id =                   I2C_DRIVERID_OVCAMCHIP,
-        .class =                I2C_CLASS_CAM_DIGITAL,
        .attach_adapter =       ovcamchip_attach,
        .detach_client =        ovcamchip_detach,
        .command =              ovcamchip_command,
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c
index a3997b7d4366..105a832531f2 100644
--- a/drivers/media/video/w9968cf.c
+++ b/drivers/media/video/w9968cf.c
@@ -1553,7 +1553,6 @@ static int w9968cf_i2c_init(struct w9968cf_device* cam)
        static struct i2c_adapter adap = {
                .id =                I2C_HW_SMBUS_W9968CF,
-                .class =             I2C_CLASS_CAM_DIGITAL,
                .owner =             THIS_MODULE,
                .client_register =   w9968cf_i2c_attach_inform,
                .client_unregister = w9968cf_i2c_detach_inform,
diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/message/i2o/i2o_scsi.c
index 1bcdbbb9e7d3..3d45817e6dcd 100644
--- a/drivers/message/i2o/i2o_scsi.c
+++ b/drivers/message/i2o/i2o_scsi.c
@@ -390,7 +390,7 @@ static int i2o_scsi_reply(struct i2o_controller *c, u32 m,
 *      @i2o_dev: the I2O device which was added
 *
 *      If a I2O device is added we catch the notification, because I2O classes
- *      other then SCSI peripheral will not be received through
+ *      other than SCSI peripheral will not be received through
 *      i2o_scsi_probe().
 */
 static void i2o_scsi_notify_device_add(struct i2o_device *i2o_dev)
diff --git a/drivers/misc/ibmasm/event.c b/drivers/misc/ibmasm/event.c
index fda6a4d3bf23..68a0a5b94795 100644
--- a/drivers/misc/ibmasm/event.c
+++ b/drivers/misc/ibmasm/event.c
@@ -50,7 +50,7 @@ static void wake_up_event_readers(struct service_processor *sp)
 * Store the event in the circular event buffer, wake up any sleeping
 * event readers.
 * There is no reader marker in the buffer, therefore readers are
- * responsible for keeping up with the writer, or they will loose events.
+ * responsible for keeping up with the writer, or they will lose events.
 */
 void ibmasm_receive_event(struct service_processor *sp, void *data, unsigned int data_size)
 {
diff --git a/drivers/misc/phantom.c b/drivers/misc/phantom.c
index abdebe347383..fa57b67593ae 100644
--- a/drivers/misc/phantom.c
+++ b/drivers/misc/phantom.c
@@ -6,7 +6,7 @@
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
 *
- *  You need an userspace library to cooperate with this driver. It (and other
+ *  You need a userspace library to cooperate with this driver. It (and other
 *  info) may be obtained here:
 *  http://www.fi.muni.cz/~xslaby/phantom.html
 *  or alternatively, you might use OpenHaptics provided by Sensable.
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 7a3f2436b011..1e97916914ad 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -25,8 +25,8 @@
 #include <linux/stat.h>
 #include <linux/mmc/host.h>
+#include <linux/atmel-mci.h>
-#include <asm/atmel-mci.h>
 #include <asm/io.h>
 #include <asm/unaligned.h>
diff --git a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c
index d38bca64bb15..d2fd550f7e09 100644
--- a/drivers/mtd/devices/pmc551.c
+++ b/drivers/mtd/devices/pmc551.c
@@ -34,7 +34,7 @@
 *      aperture size, not the dram size, and the V370PDC supplies no
 *      other method for memory size discovery.  This problem is
 *      mostly only relevant when compiled as a module, as the
- *      unloading of the module with an aperture size smaller then
+ *      unloading of the module with an aperture size smaller than
 *      the ram will cause the driver to detect the onboard memory
 *      size to be equal to the aperture size when the module is
 *      reloaded.  Soooo, to help, the module supports an msize
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 048a606cebde..25def348e5ba 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -717,7 +717,7 @@ write_error:
 * to the real data size, although the @buf buffer has to contain the
 * alignment. In all other cases, @len has to be aligned.
 *
- * It is prohibited to write more then once to logical eraseblocks of static
+ * It is prohibited to write more than once to logical eraseblocks of static
 * volumes. This function returns zero in case of success and a negative error
 * code in case of failure.
 */
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index a74118c05745..fe81039f2a7c 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -465,7 +465,7 @@ out:
 * This function synchronously erases physical eraseblock @pnum. If @torture
 * flag is not zero, the physical eraseblock is checked by means of writing
 * different patterns to it and reading them back. If the torturing is enabled,
- * the physical eraseblock is erased more then once.
+ * the physical eraseblock is erased more than once.
 *
 * This function returns the number of erasures made in case of success, %-EIO
 * if the erasure failed or the torturing test failed, and other negative error
diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c
index 41d47e1cf15c..ecde202a5a12 100644
--- a/drivers/mtd/ubi/scan.c
+++ b/drivers/mtd/ubi/scan.c
@@ -478,7 +478,7 @@ int ubi_scan_add_used(struct ubi_device *ubi, struct ubi_scan_info *si,
                        return 0;
                } else {
                        /*
-                         * This logical eraseblock is older then the one found
+                         * This logical eraseblock is older than the one found
                         * previously.
                         */
                        if (cmp_res & 4)
diff --git a/drivers/mtd/ubi/ubi-media.h b/drivers/mtd/ubi/ubi-media.h
index 2ad940409053..8419fdccc79c 100644
--- a/drivers/mtd/ubi/ubi-media.h
+++ b/drivers/mtd/ubi/ubi-media.h
@@ -135,7 +135,7 @@ enum {
 * The erase counter header takes 64 bytes and has a plenty of unused space for
 * future usage. The unused fields are zeroed. The @version field is used to
 * indicate the version of UBI implementation which is supposed to be able to
- * work with this UBI image. If @version is greater then the current UBI
+ * work with this UBI image. If @version is greater than the current UBI
 * version, the image is rejected. This may be useful in future if something
 * is changed radically. This field is duplicated in the volume identifier
 * header.
@@ -187,7 +187,7 @@ struct ubi_ec_hdr {
 * (sequence number) is used to distinguish between older and newer versions of
 * logical eraseblocks.
 *
- * There are 2 situations when there may be more then one physical eraseblock
+ * There are 2 situations when there may be more than one physical eraseblock
 * corresponding to the same logical eraseblock, i.e., having the same @vol_id
 * and @lnum values in the volume identifier header. Suppose we have a logical
 * eraseblock L and it is mapped to the physical eraseblock P.
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index 333c8941552f..1afc61e7455d 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -577,7 +577,7 @@ static int init_volumes(struct ubi_device *ubi, const struct ubi_scan_info *si,
                if (vtbl[i].flags & UBI_VTBL_AUTORESIZE_FLG) {
                        /* Auto re-size flag may be set only for one volume */
                        if (ubi->autoresize_vol_id != -1) {
-                                ubi_err("more then one auto-resize volume (%d "
+                                ubi_err("more than one auto-resize volume (%d "
                                        "and %d)", ubi->autoresize_vol_id, i);
                                kfree(vol);
                                return -EINVAL;
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index 14901cb82c18..891534f8210d 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -128,7 +128,7 @@
 * situation when the picked physical eraseblock is constantly erased after the
 * data is written to it. So, we have a constant which limits the highest erase
 * counter of the free physical eraseblock to pick. Namely, the WL sub-system
- * does not pick eraseblocks with erase counter greater then the lowest erase
+ * does not pick eraseblocks with erase counter greater than the lowest erase
 * counter plus %WL_FREE_MAX_DIFF.
 */
 #define WL_FREE_MAX_DIFF (2*UBI_WL_THRESHOLD)
@@ -917,7 +917,7 @@ static int ensure_wear_leveling(struct ubi_device *ubi)
                /*
                 * We schedule wear-leveling only if the difference between the
                 * lowest erase counter of used physical eraseblocks and a high
-                 * erase counter of free physical eraseblocks is greater then
+                 * erase counter of free physical eraseblocks is greater than
                 * %UBI_WL_THRESHOLD.
                 */
                e1 = rb_entry(rb_first(&ubi->used), struct ubi_wl_entry, u.rb);
diff --git a/drivers/net/bnx2x_link.c b/drivers/net/bnx2x_link.c
index 67de94f1f30e..fefa6ab13064 100644
--- a/drivers/net/bnx2x_link.c
+++ b/drivers/net/bnx2x_link.c
@@ -3359,7 +3359,7 @@ static u8 bnx2x_format_ver(u32 num, u8 *str, u16 len)
        u8 shift = 8*4;
        u8 digit;
        if (len < 10) {
-                /* Need more then 10chars for this format */
+                /* Need more than 10chars for this format */
                *str_ptr = '\0';
                return -EINVAL;
        }
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index d04eef53571e..e1a3fc1303ee 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -6758,7 +6758,7 @@ static s32 e1000_get_cable_length(struct e1000_hw *hw, u16 *min_length,
 * returns: - E1000_ERR_XXX
 *            E1000_SUCCESS
 *
- * For phy's older then IGP, this function simply reads the polarity bit in the
+ * For phy's older than IGP, this function simply reads the polarity bit in the
 * Phy Status register.  For IGP phy's, this bit is valid only if link speed is
 * 10 Mbps.  If the link speed is 100 Mbps there is no polarity so this bit will
 * return 0.  If the link speed is 1000 Mbps the polarity status is in the
@@ -6834,7 +6834,7 @@ static s32 e1000_check_polarity(struct e1000_hw *hw,
 * returns: - E1000_ERR_XXX
 *            E1000_SUCCESS
 *
- * For phy's older then IGP, this function reads the Downshift bit in the Phy
+ * For phy's older than IGP, this function reads the Downshift bit in the Phy
 * Specific Status register.  For IGP phy's, it reads the Downgrade bit in the
 * Link Health register.  In IGP this bit is latched high, so the driver must
 * read it immediately after link is established.
diff --git a/drivers/net/slip.h b/drivers/net/slip.h
index 853e0f6ec710..9ea5c11287d2 100644
--- a/drivers/net/slip.h
+++ b/drivers/net/slip.h
@@ -75,7 +75,7 @@ struct slip {
  unsigned long         tx_errors;      /* Planned stuff                */
  unsigned long         rx_dropped;     /* No memory for skb            */
  unsigned long         tx_dropped;     /* When MTU change              */
-  unsigned long         rx_over_errors; /* Frame bigger then SLIP buf.  */
+  unsigned long         rx_over_errors; /* Frame bigger than SLIP buf.  */
 #ifdef SL_INCLUDE_CSLIP
  unsigned long         tx_compressed;
  unsigned long         rx_compressed;
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
index a10a83a11d9f..a7a4dc4d6313 100644
--- a/drivers/net/tehuti.c
+++ b/drivers/net/tehuti.c
@@ -1004,7 +1004,7 @@ static inline void bdx_rxdb_free_elem(struct rxdb *db, int n)
 * skb for rx. It assumes that Rx is desabled in HW
 * funcs are grouped for better cache usage
 *
- * RxD fifo is smaller then RxF fifo by design. Upon high load, RxD will be
+ * RxD fifo is smaller than RxF fifo by design. Upon high load, RxD will be
 * filled and packets will be dropped by nic without getting into host or
 * cousing interrupt. Anyway, in that condition, host has no chance to proccess
 * all packets, but dropping in nic is cheaper, since it takes 0 cpu cycles
@@ -1826,7 +1826,7 @@ static void bdx_tx_free(struct bdx_priv *priv)
 *
 * Pushes desc to TxD fifo and overlaps it if needed.
 * NOTE: this func does not check for available space. this is responsibility
- *    of the caller. Neither does it check that data size is smaller then
+ *    of the caller. Neither does it check that data size is smaller than
 *    fifo size.
 */
 static void bdx_tx_push_desc(struct bdx_priv *priv, void *data, int size)
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index a011666342ff..50eb29ce3c87 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -3064,7 +3064,7 @@ static int smctr_load_node_addr(struct net_device *dev)
 * will consequently cause a timeout.
 *
 * NOTE 1: If the monitor_state is MS_BEACON_TEST_STATE, all transmit
- * queues other then the one used for the lobe_media_test should be
+ * queues other than the one used for the lobe_media_test should be
 * disabled.!?
 *
 * NOTE 2: If the monitor_state is MS_BEACON_TEST_STATE and the receive_mask
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 350157fcd080..4223672c4432 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -3836,7 +3836,7 @@ static int reset_atmel_card(struct net_device *dev)
           This routine is also responsible for initialising some
           hardware-specific fields in the atmel_private structure,
           including a copy of the firmware's hostinfo stucture
-           which is the route into the rest of the firmare datastructures. */
+           which is the route into the rest of the firmware datastructures. */
        struct atmel_private *priv = netdev_priv(dev);
        u8 configuration;
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 1667065b86a7..823c2bf5e31e 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -1332,7 +1332,7 @@ static int ipw2100_power_cycle_adapter(struct ipw2100_priv *priv)
                       IPW_AUX_HOST_RESET_REG_STOP_MASTER);
        /* Step 2. Wait for stop Master Assert
-         *         (not more then 50us, otherwise ret error */
+         *         (not more than 50us, otherwise ret error */
        i = 5;
        do {
                udelay(IPW_WAIT_RESET_MASTER_ASSERT_COMPLETE_DELAY);
@@ -1830,7 +1830,7 @@ static void ipw2100_down(struct ipw2100_priv *priv)
                cancel_delayed_work(&priv->rf_kill);
        }
-        /* Kill the firmare hang check timer */
+        /* Kill the firmware hang check timer */
        if (!priv->stop_hang_check) {
                priv->stop_hang_check = 1;
                cancel_delayed_work(&priv->hang_check);
diff --git a/drivers/net/wireless/rt2x00/rt2x00crypto.c b/drivers/net/wireless/rt2x00/rt2x00crypto.c
index 37ad0d2fb64c..aee9cba13eb3 100644
--- a/drivers/net/wireless/rt2x00/rt2x00crypto.c
+++ b/drivers/net/wireless/rt2x00/rt2x00crypto.c
@@ -184,8 +184,8 @@ void rt2x00crypto_rx_insert_iv(struct sk_buff *skb, unsigned int align,
         * Make room for new data, note that we increase both
         * headsize and tailsize when required. The tailsize is
         * only needed when ICV data needs to be inserted and
-         * the padding is smaller then the ICV data.
+         * the padding is smaller than the ICV data.
-         * When alignment requirements is greater then the
+         * When alignment requirements is greater than the
         * ICV data we must trim the skb to the correct size
         * because we need to remove the extra bytes.
         */
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index dd0de3a9ed4e..7015f2480550 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -236,7 +236,7 @@ struct strip {
        unsigned long tx_errors;        /* Planned stuff                */
        unsigned long rx_dropped;       /* No memory for skb            */
        unsigned long tx_dropped;       /* When MTU change              */
-        unsigned long rx_over_errors;   /* Frame bigger then STRIP buf. */
+        unsigned long rx_over_errors;   /* Frame bigger than STRIP buf. */
        unsigned long pps_timer;        /* Timer to determine pps       */
        unsigned long rx_pps_count;     /* Counter to determine pps     */
diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c
index 23a07fe15a2c..0b6b7730c716 100644
--- a/drivers/rtc/rtc-ds1511.c
+++ b/drivers/rtc/rtc-ds1511.c
@@ -630,7 +630,7 @@ ds1511_rtc_init(void)
 static void __exit
 ds1511_rtc_exit(void)
 {
-        return platform_driver_unregister(&ds1511_rtc_driver);
+        platform_driver_unregister(&ds1511_rtc_driver);
 }
 module_init(ds1511_rtc_init);
diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c
index dc0b6224ad9b..7d1547b0070e 100644
--- a/drivers/rtc/rtc-stk17ta8.c
+++ b/drivers/rtc/rtc-stk17ta8.c
@@ -399,7 +399,7 @@ static __init int stk17ta8_init(void)
 static __exit void stk17ta8_exit(void)
 {
-        return platform_driver_unregister(&stk17ta8_rtc_driver);
+        platform_driver_unregister(&stk17ta8_rtc_driver);
 }
 module_init(stk17ta8_init);
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index 892e2878d61b..f8e05ce98621 100644
--- a/drivers/s390/block/dasd_eer.c
+++ b/drivers/s390/block/dasd_eer.c
@@ -535,8 +535,8 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)
            eerb->buffer_page_count > INT_MAX / PAGE_SIZE) {
                kfree(eerb);
                MESSAGE(KERN_WARNING, "can't open device since module "
-                        "parameter eer_pages is smaller then 1 or"
+                        "parameter eer_pages is smaller than 1 or"
-                        " bigger then %d", (int)(INT_MAX / PAGE_SIZE));
+                        " bigger than %d", (int)(INT_MAX / PAGE_SIZE));
                unlock_kernel();
                return -EINVAL;
        }
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index aabbeb909cc6..d8a2289fcb69 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -427,7 +427,7 @@ static int vmlogrdr_receive_data(struct vmlogrdr_priv_t *priv)
                        buffer = priv->buffer + sizeof(int);
                }
                /*
-                 * If the record is bigger then our buffer, we receive only
+                 * If the record is bigger than our buffer, we receive only
                 * a part of it. We can get the rest later.
                 */
                if (iucv_data_count > NET_BUFFER_SIZE)
@@ -437,7 +437,7 @@ static int vmlogrdr_receive_data(struct vmlogrdr_priv_t *priv)
                                          0, buffer, iucv_data_count,
                                          &priv->residual_length);
                spin_unlock_bh(&priv->priv_lock);
-                /* An rc of 5 indicates that the record was bigger then
+                /* An rc of 5 indicates that the record was bigger than
                 * the buffer, which is OK for us. A 9 indicates that the
                 * record was purged befor we could receive it.
                 */
diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index 3c298c7253ee..964769f66eac 100644
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -633,7 +633,7 @@ static int orc_device_reset(struct orc_host * host, struct scsi_cmnd *cmd, unsig
                return FAILED;
        }
-        /* Reset device is handled by the firmare, we fill in an SCB and
+        /* Reset device is handled by the firmware, we fill in an SCB and
           fire it at the controller, it does the rest */
        scb->opcode = ORC_BUSDEVRST;
        scb->target = target;
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 8c64494444bf..311ed6dea726 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -1964,10 +1964,10 @@ lpfc_set_disctmo(struct lpfc_vport *vport)
        uint32_t tmo;
        if (vport->port_state == LPFC_LOCAL_CFG_LINK) {
-                /* For FAN, timeout should be greater then edtov */
+                /* For FAN, timeout should be greater than edtov */
                tmo = (((phba->fc_edtov + 999) / 1000) + 1);
        } else {
-                /* Normal discovery timeout should be > then ELS/CT timeout
+                /* Normal discovery timeout should be > than ELS/CT timeout
                 * FC spec states we need 3 * ratov for CT requests
                 */
                tmo = ((phba->fc_ratov * 3) + 3);
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 01dfdc8696f8..a36a120561e2 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -420,7 +420,7 @@ lpfc_sli_next_iocb_slot (struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
                if (unlikely(pring->local_getidx >= max_cmd_idx)) {
                        lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
                                        "0315 Ring %d issue: portCmdGet %d "
-                                        "is bigger then cmd ring %d\n",
+                                        "is bigger than cmd ring %d\n",
                                        pring->ringno,
                                        pring->local_getidx, max_cmd_idx);
@@ -1628,12 +1628,12 @@ lpfc_sli_rsp_pointers_error(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
 {
        struct lpfc_pgp *pgp = &phba->port_gp[pring->ringno];
        /*
-         * Ring <ringno> handler: portRspPut <portRspPut> is bigger then
+         * Ring <ringno> handler: portRspPut <portRspPut> is bigger than
         * rsp ring <portRspMax>
         */
        lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
                        "0312 Ring %d handler: portRspPut %d "
-                        "is bigger then rsp ring %d\n",
+                        "is bigger than rsp ring %d\n",
                        pring->ringno, le32_to_cpu(pgp->rspPutInx),
                        pring->numRiocb);
@@ -2083,12 +2083,12 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,
        portRspPut = le32_to_cpu(pgp->rspPutInx);
        if (portRspPut >= portRspMax) {
                /*
-                 * Ring <ringno> handler: portRspPut <portRspPut> is bigger then
+                 * Ring <ringno> handler: portRspPut <portRspPut> is bigger than
                 * rsp ring <portRspMax>
                 */
                lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
                                "0303 Ring %d handler: portRspPut %d "
-                                "is bigger then rsp ring %d\n",
+                                "is bigger than rsp ring %d\n",
                                pring->ringno, portRspPut, portRspMax);
                phba->link_state = LPFC_HBA_ERROR;
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 7dc62deb4087..9fdcd60c5493 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -1967,8 +1967,8 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor)
                        scb->state |= aor;
                        /*
-                         * Check if this command has firmare owenership. If
+                         * Check if this command has firmware ownership. If
-                         * yes, we cannot reset this command. Whenever, f/w
+                         * yes, we cannot reset this command. Whenever f/w
                         * completes this command, we will return appropriate
                         * status from ISR.
                         */
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 8cb9240596ab..df09820e8916 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -128,7 +128,7 @@
        - Integrate ql12160_set_target_parameters() with 1280 version
        - Make qla1280_setup() non static
        - Do not call qla1280_check_for_dead_scsi_bus() on every I/O request
-          sent to the card - this command pauses the firmare!!!
+          sent to the card - this command pauses the firmware!!!
    Rev  3.23.15 Beta March 19, 2002, Jes Sorensen
        - Clean up qla1280.h - remove obsolete QL_DEBUG_LEVEL_x definitions
        - Remove a pile of pointless and confusing (srb_t **) and
@@ -659,7 +659,7 @@ static int qla1280_read_nvram(struct scsi_qla_host *ha)
        /* The firmware interface is, um, interesting, in that the
         * actual firmware image on the chip is little endian, thus,
         * the process of taking that image to the CPU would end up
-         * little endian.  However, the firmare interface requires it
+         * little endian.  However, the firmware interface requires it
         * to be read a word (two bytes) at a time.
         *
         * The net result of this would be that the word (and
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index c577d79bd7e8..051b0f5e8c8e 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -392,7 +392,7 @@ int qla4xxx_get_firmware_status(struct scsi_qla_host * ha)
                ha->iocb_hiwat -= IOCB_HIWAT_CUSHION;
        else
                dev_info(&ha->pdev->dev, "WARNING!!!  You have less than %d "
-                           "firmare IOCBs available (%d).\n",
+                           "firmware IOCBs available (%d).\n",
                           IOCB_HIWAT_CUSHION, ha->iocb_hiwat);
        return QLA_SUCCESS;
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 381838ebd460..d86ebea9350a 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1650,7 +1650,7 @@ int scsi_error_handler(void *data)
         * We use TASK_INTERRUPTIBLE so that the thread is not
         * counted against the load average as a running process.
         * We never actually get interrupted because kthread_run
-         * disables singal delivery for the created thread.
+         * disables signal delivery for the created thread.
         */
        set_current_state(TASK_INTERRUPTIBLE);
        while (!kthread_should_stop()) {
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 18486b51668d..17914a346f71 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -32,6 +32,7 @@
 #include <linux/delay.h>
 #include <linux/kthread.h>
 #include <linux/spinlock.h>
+#include <linux/async.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -179,6 +180,8 @@ int scsi_complete_async_scans(void)
        spin_unlock(&async_scan_lock);
        kfree(data);
+        /* Synchronize async operations globally */
+        async_synchronize_full();
        return 0;
 }
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 62b28d58e65e..e035c1114010 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -48,6 +48,7 @@
 #include <linux/delay.h>
 #include <linux/mutex.h>
 #include <linux/string_helpers.h>
+#include <linux/async.h>
 #include <asm/uaccess.h>
 #include <scsi/scsi.h>
@@ -1802,6 +1803,71 @@ static int sd_format_disk_name(char *prefix, int index, char *buf, int buflen)
        return 0;
 }
+/*
+ * The asynchronous part of sd_probe
+ */
+static void sd_probe_async(void *data, async_cookie_t cookie)
+{
+        struct scsi_disk *sdkp = data;
+        struct scsi_device *sdp;
+        struct gendisk *gd;
+        u32 index;
+        struct device *dev;
+        sdp = sdkp->device;
+        gd = sdkp->disk;
+        index = sdkp->index;
+        dev = &sdp->sdev_gendev;
+        if (!sdp->request_queue->rq_timeout) {
+                if (sdp->type != TYPE_MOD)
+                        blk_queue_rq_timeout(sdp->request_queue, SD_TIMEOUT);
+                else
+                        blk_queue_rq_timeout(sdp->request_queue,
+                                             SD_MOD_TIMEOUT);
+        }
+        device_initialize(&sdkp->dev);
+        sdkp->dev.parent = &sdp->sdev_gendev;
+        sdkp->dev.class = &sd_disk_class;
+        strncpy(sdkp->dev.bus_id, sdp->sdev_gendev.bus_id, BUS_ID_SIZE);
+        if (device_add(&sdkp->dev))
+                goto out_free_index;
+        get_device(&sdp->sdev_gendev);
+        if (index < SD_MAX_DISKS) {
+                gd->major = sd_major((index & 0xf0) >> 4);
+                gd->first_minor = ((index & 0xf) << 4) | (index & 0xfff00);
+                gd->minors = SD_MINORS;
+        }
+        gd->fops = &sd_fops;
+        gd->private_data = &sdkp->driver;
+        gd->queue = sdkp->device->request_queue;
+        sd_revalidate_disk(gd);
+        blk_queue_prep_rq(sdp->request_queue, sd_prep_fn);
+        gd->driverfs_dev = &sdp->sdev_gendev;
+        gd->flags = GENHD_FL_EXT_DEVT | GENHD_FL_DRIVERFS;
+        if (sdp->removable)
+                gd->flags |= GENHD_FL_REMOVABLE;
+        dev_set_drvdata(dev, sdkp);
+        add_disk(gd);
+        sd_dif_config_host(sdkp);
+        sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n",
+                  sdp->removable ? "removable " : "");
+        return;
+ out_free_index:
+        ida_remove(&sd_index_ida, index);
+}
 /**
 *      sd_probe - called during driver initialization and whenever a
 *      new scsi device is attached to the system. It is called once
@@ -1865,48 +1931,7 @@ static int sd_probe(struct device *dev)
        sdkp->openers = 0;
        sdkp->previous_state = 1;
-        if (!sdp->request_queue->rq_timeout) {
+        async_schedule(sd_probe_async, sdkp);
-                if (sdp->type != TYPE_MOD)
-                        blk_queue_rq_timeout(sdp->request_queue, SD_TIMEOUT);
-                else
-                        blk_queue_rq_timeout(sdp->request_queue,
-                                             SD_MOD_TIMEOUT);
-        }
-        device_initialize(&sdkp->dev);
-        sdkp->dev.parent = &sdp->sdev_gendev;
-        sdkp->dev.class = &sd_disk_class;
-        strncpy(sdkp->dev.bus_id, sdp->sdev_gendev.bus_id, BUS_ID_SIZE);
-        if (device_add(&sdkp->dev))
-                goto out_free_index;
-        get_device(&sdp->sdev_gendev);
-        if (index < SD_MAX_DISKS) {
-                gd->major = sd_major((index & 0xf0) >> 4);
-                gd->first_minor = ((index & 0xf) << 4) | (index & 0xfff00);
-                gd->minors = SD_MINORS;
-        }
-        gd->fops = &sd_fops;
-        gd->private_data = &sdkp->driver;
-        gd->queue = sdkp->device->request_queue;
-        sd_revalidate_disk(gd);
-        blk_queue_prep_rq(sdp->request_queue, sd_prep_fn);
-        gd->driverfs_dev = &sdp->sdev_gendev;
-        gd->flags = GENHD_FL_EXT_DEVT | GENHD_FL_DRIVERFS;
-        if (sdp->removable)
-                gd->flags |= GENHD_FL_REMOVABLE;
-        dev_set_drvdata(dev, sdkp);
-        add_disk(gd);
-        sd_dif_config_host(sdkp);
-        sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n",
-                  sdp->removable ? "removable " : "");
        return 0;
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index daa00567bc44..1889a63ebc22 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -3123,7 +3123,7 @@ static int __init serial8250_init(void)
        if (nr_uarts > UART_NR)
                nr_uarts = UART_NR;
-        printk(KERN_INFO "Serial: 8250/16550 driver"
+        printk(KERN_INFO "Serial: 8250/16550 driver, "
                "%d ports, IRQ sharing %sabled\n", nr_uarts,
                share_irqs ? "en" : "dis");
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index 8b2c619a09f2..e642c22c80e2 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -1203,7 +1203,7 @@ static void e100_disable_txdma_channel(struct e100_serial *info)
        unsigned long flags;
        /* Disable output DMA channel for the serial port in question
-         * ( set to something other then serialX)
+         * ( set to something other than serialX)
         */
        local_irq_save(flags);
        DFLOW(DEBUG_LOG(info->line, "disable_txdma_channel %i\n", info->line));
@@ -1266,7 +1266,7 @@ static void e100_disable_rxdma_channel(struct e100_serial *info)
        unsigned long flags;
        /* Disable input DMA channel for the serial port in question
-         * ( set to something other then serialX)
+         * ( set to something other than serialX)
         */
        local_irq_save(flags);
        if (info->line == 0) {
diff --git a/drivers/spi/spi_lm70llp.c b/drivers/spi/spi_lm70llp.c
index af6526767e2a..568c781ad91c 100644
--- a/drivers/spi/spi_lm70llp.c
+++ b/drivers/spi/spi_lm70llp.c
@@ -1,5 +1,5 @@
 /*
- * spi_lm70llp.c - driver for lm70llp eval board for the LM70 sensor
+ * spi_lm70llp.c - driver for LM70EVAL-LLP board for the LM70 sensor
 *
 * Copyright (C) 2006 Kaiwan N Billimoria <kaiwan@designergraphix.com>
 *
@@ -40,8 +40,12 @@
 * master controller driver.  The hwmon/lm70 driver is a "SPI protocol
 * driver", layered on top of this one and usable without the lm70llp.
 *
+ * Datasheet and Schematic:
 * The LM70 is a temperature sensor chip from National Semiconductor; its
 * datasheet is available at http://www.national.com/pf/LM/LM70.html
+ * The schematic for this particular board (the LM70EVAL-LLP) is
+ * available (on page 4) here:
+ *  http://www.national.com/appinfo/tempsensors/files/LM70LLPEVALmanual.pdf
 *
 * Also see Documentation/spi/spi-lm70llp.  The SPI<->parport code here is
 * (heavily) based on spi-butterfly by David Brownell.
@@ -64,7 +68,7 @@
 *
 * Note that parport pin 13 actually gets inverted by the transistor
 * arrangement which lets either the parport or the LM70 drive the
- * SI/SO signal.
+ * SI/SO signal (see the schematic for details).
 */
 #define DRVNAME         "spi-lm70llp"
@@ -106,12 +110,16 @@ static inline struct spi_lm70llp *spidev_to_pp(struct spi_device *spi)
 static inline void deassertCS(struct spi_lm70llp *pp)
 {
        u8 data = parport_read_data(pp->port);
+        data &= ~0x80;          /* pull D7/SI-out low while de-asserted */
        parport_write_data(pp->port, data | nCS);
 }
 static inline void assertCS(struct spi_lm70llp *pp)
 {
        u8 data = parport_read_data(pp->port);
+        data |= 0x80;           /* pull D7/SI-out high so lm70 drives SO-in */
        parport_write_data(pp->port, data & ~nCS);
 }
@@ -184,22 +192,7 @@ static void lm70_chipselect(struct spi_device *spi, int value)
 */
 static u32 lm70_txrx(struct spi_device *spi, unsigned nsecs, u32 word, u8 bits)
 {
-        static u32 sio=0;
+        return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);
-        static int first_time=1;
-        /* First time: perform SPI bitbang and return the LSB of
-         * the result of the SPI call.
-         */
-        if (first_time) {
-                sio = bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);
-                first_time=0;
-                return (sio & 0x00ff);
-        }
-        /* Return the MSB of the result of the SPI call */
-        else {
-                first_time=1;
-                return (sio >> 8);
-        }
 }
 static void spi_lm70llp_attach(struct parport *p)
@@ -293,10 +286,9 @@ static void spi_lm70llp_attach(struct parport *p)
                status = -ENODEV;
                goto out_bitbang_stop;
        }
-        pp->spidev_lm70->bits_per_word = 16;
+        pp->spidev_lm70->bits_per_word = 8;
        lm70llp = pp;
        return;
 out_bitbang_stop:
@@ -326,7 +318,6 @@ static void spi_lm70llp_detach(struct parport *p)
        /* power down */
        parport_write_data(pp->port, 0);
-        msleep(10);
        parport_release(pp->pd);
        parport_unregister_device(pp->pd);
diff --git a/drivers/uwb/i1480/dfu/usb.c b/drivers/uwb/i1480/dfu/usb.c
index 686795e97195..c7080d497311 100644
--- a/drivers/uwb/i1480/dfu/usb.c
+++ b/drivers/uwb/i1480/dfu/usb.c
@@ -387,7 +387,7 @@ int i1480_usb_probe(struct usb_interface *iface, const struct usb_device_id *id)
                goto error_create;
        }
-        /* setup the fops and upload the firmare */
+        /* setup the fops and upload the firmware */
        i1480->pre_fw_name = "i1480-pre-phy-0.0.bin";
        i1480->mac_fw_name = "i1480-usb-0.0.bin";
        i1480->mac_fw_name_deprecate = "ptc-0.0.bin";
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index e6210725b9ab..d012edda6d11 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -1332,7 +1332,7 @@ static void vgacon_save_screen(struct vc_data *c)
                c->vc_y = screen_info.orig_y;
        }
-        /* We can't copy in more then the size of the video buffer,
+        /* We can't copy in more than the size of the video buffer,
         * or we'll be copying in VGA BIOS */
        if (!vga_is_gfx)