Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / hwmon / asus_atk0110.c

diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
index 653db1bda9348ebaa62d8f17f93c46a4b8cdadda..b5e892017e0c57497f7726d59812a56144f35ea8 100644 (file)
--- a/drivers/hwmon/asus_atk0110.c
+++ b/drivers/hwmon/asus_atk0110.c
@@ -5,12 +5,15 @@
  * See COPYING in the top level directory of the kernel tree.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/debugfs.h>
 #include <linux/kernel.h>
 #include <linux/hwmon.h>
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/dmi.h>
 
 #include <acpi/acpi.h>
 #include <acpi/acpixf.h>
@@ -20,6 +23,21 @@
 
 #define ATK_HID "ATK0110"
 
+static bool new_if;
+module_param(new_if, bool, 0);
+MODULE_PARM_DESC(new_if, "Override detection heuristic and force the use of the new ATK0110 interface");
+
+static const struct dmi_system_id __initconst atk_force_new_if[] = {
+       {
+               /* Old interface has broken MCH temp monitoring */
+               .ident = "Asus Sabertooth X58",
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_NAME, "SABERTOOTH X58")
+               }
+       },
+       { }
+};
+
 /* Minimum time between readings, enforced in order to avoid
  * hogging the CPU.
  */
@@ -762,6 +780,7 @@ static const struct file_operations atk_debugfs_ggrp_fops = {
        .read           = atk_debugfs_ggrp_read,
        .open           = atk_debugfs_ggrp_open,
        .release        = atk_debugfs_ggrp_release,
+       .llseek         = no_llseek,
 };
 
 static void atk_debugfs_init(struct atk_data *data)
@@ -1299,7 +1318,9 @@ static int atk_probe_if(struct atk_data *data)
         * analysis of multiple DSDTs indicates that when both interfaces
         * are present the new one (GGRP/GITM) is not functional.
         */
-       if (data->rtmp_handle && data->rvlt_handle && data->rfan_handle)
+       if (new_if)
+               dev_info(dev, "Overriding interface detection\n");
+       if (data->rtmp_handle && data->rvlt_handle && data->rfan_handle && !new_if)
                data->old_interface = true;
        else if (data->enumerate_handle && data->read_handle &&
                        data->write_handle)
@@ -1413,14 +1434,16 @@ static int __init atk0110_init(void)
 
        /* Make sure it's safe to access the device through ACPI */
        if (!acpi_resources_are_enforced()) {
-               pr_err("atk: Resources not safely usable due to "
-                      "acpi_enforce_resources kernel parameter\n");
+               pr_err("Resources not safely usable due to acpi_enforce_resources kernel parameter\n");
                return -EBUSY;
        }
 
+       if (dmi_check_system(atk_force_new_if))
+               new_if = true;
+
        ret = acpi_bus_register_driver(&atk_driver);
        if (ret)
-               pr_info("atk: acpi_bus_register_driver failed: %d\n", ret);
+               pr_info("acpi_bus_register_driver failed: %d\n", ret);
 
        return ret;
 }