Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (max6650) Add support for alarms
  hwmon: (f71882fg) Add support for the F71858F
  hwmon: (f71882fg) Add temp#_fault sysfs attr for f8000
  hwmon: (f71882fg) Sanity check f8000 pwm settings
  hwmon: (f71882fg) Cleanup f8000 pwm handling
  hwmon: PCI quirk for hwmon access on MSI MS-7031 board
  hwmon: (w83627ehf) Add W83627DHG-P support
  hwmon: (tmp401) Add documentation
  hwmon: (tmp401) Add support for TI's TMP411 sensors chip
  hwmon: (tmp401) Add support for TI's TMP401 sensor chip
  hwmon: (ibmaem) Automatically load on HC10 blade
  hwmon: Fix more __devexit_p glitches

1 files changed, 29 insertions, 0 deletions

diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c
index e15c3e7b07e9..29ea6753f3bb 100644
--- a/drivers/hwmon/hwmon.c
+++ b/drivers/hwmon/hwmon.c
@@ -18,6 +18,7 @@
 #include <linux/hwmon.h>
 #include <linux/gfp.h>
 #include <linux/spinlock.h>
+#include <linux/pci.h>
 
 #define HWMON_ID_PREFIX "hwmon"
 #define HWMON_ID_FORMAT HWMON_ID_PREFIX "%d"
@@ -86,8 +87,36 @@ void hwmon_device_unregister(struct device *dev)
                         "hwmon_device_unregister() failed: bad class ID!\n");
 }
 
+static void __init hwmon_pci_quirks(void)
+{
+#if defined CONFIG_X86 && defined CONFIG_PCI
+        struct pci_dev *sb;
+        u16 base;
+        u8 enable;
+
+        /* Open access to 0x295-0x296 on MSI MS-7031 */
+        sb = pci_get_device(PCI_VENDOR_ID_ATI, 0x436c, NULL);
+        if (sb &&
+            (sb->subsystem_vendor == 0x1462 &&  /* MSI */
+             sb->subsystem_device == 0x0031)) { /* MS-7031 */
+
+                pci_read_config_byte(sb, 0x48, &enable);
+                pci_read_config_word(sb, 0x64, &base);
+
+                if (base == 0 && !(enable & BIT(2))) {
+                        dev_info(&sb->dev,
+                                 "Opening wide generic port at 0x295\n");
+                        pci_write_config_word(sb, 0x64, 0x295);
+                        pci_write_config_byte(sb, 0x48, enable | BIT(2));
+                }
+        }
+#endif
+}
+
 static int __init hwmon_init(void)
 {
+        hwmon_pci_quirks();
+
         hwmon_class = class_create(THIS_MODULE, "hwmon");
         if (IS_ERR(hwmon_class)) {
                 printk(KERN_ERR "hwmon.c: couldn't create sysfs class\n");