Changeset 1501

Timestamp:

08/22/02 04:15:07 (11 years ago)

Author:

mds

Message:

remove VT8231 support from via686a and move to a new dedicated driver.

This driver is a copy of vt1211, which is almost identical.
The vt1211 is a super i/o chip and the vt8231 is a PCI chip.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• doc/chips/via686a (modified) (2 diffs)
• doc/chips/vt8231 (added)
• kernel/chips/Module.mk (modified) (1 diff)
• kernel/chips/via686a.c (modified) (3 diffs)
• kernel/chips/vt8231.c (added)
• kernel/include/sensors.h (modified) (1 diff)

lm-sensors/trunk/CHANGES

@@ -28 +28 @@
   Module i2c-sis630: new
   Module lm92: Fix in-kernel initialization
+  Module via686a: Remove VT8231 support
+  Module vt8231: new
   Module w83781: recognize Asus "ASB100 Bach" as AS99127F
   Program dmidecode: new

lm-sensors/trunk/doc/chips/via686a

@@ -9 +9 @@
     Addresses scanned: ISA in PCI-space encoded address
     Datasheet: Sometimes available at the Via site http://www.via.com.tw.
-
-  * Via VT8231  Southbridge Integrated Hardware Monitor
-    Prefix: via686a
-    Addresses scanned: ISA in PCI-space encoded address
-    Datasheet: On request from Via
 
 Authors: Kyösti Mälkki <kmalkki@cc.hut.fi>,
@@ -36 +31 @@
 
 The driver does not distinguish between the chips and reports
-all as a 686A. Features specific to the 8231 are not yet supported.
+all as a 686A.
 
 The Via 686a southbridge has integrated hardware monitor functionality.

lm-sensors/trunk/kernel/chips/Module.mk

@@ -27 +27 @@
 KERNELCHIPSTARGETS :=
 KERNELCHIPSTARGETS += $(MODULE_DIR)/smbus-arp.o
+KERNELCHIPSTARGETS += $(MODULE_DIR)/vt8231.o
 
 

lm-sensors/trunk/kernel/chips/via686a.c

@@ -26 +26 @@
 
 /*
-    Supports the Via VT82C686A, VT82C686B, and VT8231 south bridges.
+    Supports the Via VT82C686A, VT82C686B south bridges.
     Reports all as a 686A.
-    8231-specific features not yet supported.
     See doc/chips/via686a for details.
     Warning - only supports a single device.
@@ -81 +80 @@
 
 /* Insmod parameters */
-SENSORS_INSMOD_2(via686a, vt8231);
+SENSORS_INSMOD_1(via686a);
 
 /*
@@ -535 +534 @@
                                          PCI_DEVICE_ID_VIA_82C686_4,
                                          NULL)))
-                if (!(s_bridge = pci_find_device(PCI_VENDOR_ID_VIA,
-                                                 0x8235,
-                                                 NULL))) return -ENODEV;
+                return -ENODEV;
 
         if (PCIBIOS_SUCCESSFUL !=

lm-sensors/trunk/kernel/include/sensors.h

@@ -633 +633 @@
 #define LM92_TEMP_INPUT                 0x80
 
+#define VT8231_SYSCTL_IN0 1000
+#define VT8231_SYSCTL_IN1 1001
+#define VT8231_SYSCTL_IN2 1002
+#define VT8231_SYSCTL_IN3 1003
+#define VT8231_SYSCTL_IN4 1004
+#define VT8231_SYSCTL_IN5 1005
+#define VT8231_SYSCTL_IN6 1006
+#define VT8231_SYSCTL_FAN1 1101
+#define VT8231_SYSCTL_FAN2 1102
+#define VT8231_SYSCTL_TEMP 1200
+#define VT8231_SYSCTL_TEMP2 1201
+#define VT8231_SYSCTL_TEMP3 1202
+#define VT8231_SYSCTL_TEMP4 1203
+#define VT8231_SYSCTL_TEMP5 1204
+#define VT8231_SYSCTL_TEMP6 1205
+#define VT8231_SYSCTL_TEMP7 1206
+#define VT8231_SYSCTL_VID       1300
+#define VT8231_SYSCTL_PWM1      1401
+#define VT8231_SYSCTL_PWM2      1402
+#define VT8231_SYSCTL_VRM       1600
+#define VT8231_SYSCTL_UCH       1700
+#define VT8231_SYSCTL_FAN_DIV 2000
+#define VT8231_SYSCTL_ALARMS 2001
+
+#define VT8231_ALARM_IN1 0x01
+#define VT8231_ALARM_IN2 0x02
+#define VT8231_ALARM_IN5 0x04
+#define VT8231_ALARM_IN3 0x08
+#define VT8231_ALARM_TEMP 0x10
+#define VT8231_ALARM_FAN1 0x40
+#define VT8231_ALARM_FAN2 0x80
+#define VT8231_ALARM_IN4 0x100
+#define VT8231_ALARM_IN6 0x200
+#define VT8231_ALARM_TEMP2 0x800
+#define VT8231_ALARM_CHAS 0x1000
+#define VT8231_ALARM_TEMP3 0x8000
+/* duplicates */
+#define VT8231_ALARM_IN0 VT8231_ALARM_TEMP
+#define VT8231_ALARM_TEMP4 VT8231_ALARM_IN1
+#define VT8231_ALARM_TEMP5 VT8231_ALARM_IN2
+#define VT8231_ALARM_TEMP6 VT8231_ALARM_IN3
+#define VT8231_ALARM_TEMP7 VT8231_ALARM_IN4
+
 #endif                          /* def SENSORS_SENSORS_H */