From 117f27c098dcc38e048f376e56b7b1af6df236c4 Mon Sep 17 00:00:00 2001 From: "Mark D. Studebaker" Date: Fri, 25 Jan 2002 03:01:14 +0000 Subject: [PATCH] clarify operation of in0-2; rename /proc entries to standard in0-3. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1297 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 1 + doc/chips/gl518sm | 5 +++++ etc/sensors.conf.eg | 4 ++++ kernel/chips/gl518sm.c | 8 ++++---- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index b07a1cdc..bf2a181c 100644 --- a/CHANGES +++ b/CHANGES @@ -28,6 +28,7 @@ ask CVS about it: Module i2c-i810: Add support for 810E Module i2c-piix4: Check for uninitialized base address Module i2c-viapro: Check for uninitialized base address + Module gl518sm: Standardize /proc entries in0-3 Module lm87: Fix in0, in1, in5 initial limits; ain[1,2] -> in[6,7]; fan -> fan1; fix temp2 limit writes Module pcf8591: new diff --git a/doc/chips/gl518sm b/doc/chips/gl518sm index 2bf95d96..a0766395 100644 --- a/doc/chips/gl518sm +++ b/doc/chips/gl518sm @@ -40,6 +40,11 @@ Module Parameters Description ----------- +IMPORTANT: in0, in1, and in2 values (+5, +3, and +12) CANNOT be read + unless you use the slow 'iterate' method. Limits will still + work even when iterate=0. See below. This is a limitation + of the chip, not the driver. + This driver supports the Genesys Logic GL518SM chip. There are at least two revision of this chip, which we call revision 0x00 and 0x80. Revision 0x80 chips support the reading of voltages directly, 0x00 only for VIN3. diff --git a/etc/sensors.conf.eg b/etc/sensors.conf.eg index 33cfcf6b..5279ffff 100644 --- a/etc/sensors.conf.eg +++ b/etc/sensors.conf.eg @@ -523,6 +523,10 @@ chip "as99127f-*" chip "gl518sm-*" +# IMPORTANT: in0, in1, and in2 values (+5, +3, and +12) CANNOT be read +# unless you use the slow 'iterate' method. Limits will still +# work even when iterate=0. See ../doc/chips/gl518sm. +# # Factors and labels taken from GL518SM datasheet, they seem to give # reasonable values with EISCA connected Fan78 diff --git a/kernel/chips/gl518sm.c b/kernel/chips/gl518sm.c index 3fa86fc5..e5d576ff 100644 --- a/kernel/chips/gl518sm.c +++ b/kernel/chips/gl518sm.c @@ -256,13 +256,13 @@ static struct i2c_driver gl518_driver = { is done through one of the 'extra' fields which are initialized when a new copy is allocated. */ static ctl_table gl518_dir_table_template[] = { - {GL518_SYSCTL_VIN1, "vin1", NULL, 0, 0644, NULL, &i2c_proc_real, + {GL518_SYSCTL_VIN1, "in1", NULL, 0, 0644, NULL, &i2c_proc_real, &i2c_sysctl_real, NULL, &gl518_vin}, - {GL518_SYSCTL_VIN2, "vin2", NULL, 0, 0644, NULL, &i2c_proc_real, + {GL518_SYSCTL_VIN2, "in2", NULL, 0, 0644, NULL, &i2c_proc_real, &i2c_sysctl_real, NULL, &gl518_vin}, - {GL518_SYSCTL_VIN3, "vin3", NULL, 0, 0644, NULL, &i2c_proc_real, + {GL518_SYSCTL_VIN3, "in3", NULL, 0, 0644, NULL, &i2c_proc_real, &i2c_sysctl_real, NULL, &gl518_vin}, - {GL518_SYSCTL_VDD, "vdd", NULL, 0, 0644, NULL, &i2c_proc_real, + {GL518_SYSCTL_VDD, "in0", NULL, 0, 0644, NULL, &i2c_proc_real, &i2c_sysctl_real, NULL, &gl518_vin}, {GL518_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &i2c_proc_real, &i2c_sysctl_real, NULL, &gl518_fan},