[lm-sensors] First shot at Asus M2N-SLI Deluxe config file

[lm-sensors] First shot at Asus M2N-SLI Deluxe config file

[Matt Roberds]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 164 bytes --]

All,

Here's a first shot at a config file for an Asus M2N-SLI Deluxe
motherboard.  It may also work for other versions of the M2N-SLI; I
don't know.

Matt Roberds

[-- Attachment #2: Asus M2N-SLI Deluxe config --]
[-- Type: TEXT/PLAIN, Size: 1717 bytes --]

# First cut at a minimal sensors3.conf for Asus M2N-SLI Deluxe motherboard
# Matt Roberds, 20 Feb 2008


chip "it8716-*"

# Voltages

    label  in0  "VCore"
    label  in1  "VDDR"
    ignore in2             # 3.3 V?
    label  in3  "+5V"      # VCC
    label  in4  "+12V"
    label  in5  "-12V"
    label  in6  "-5V"
    label  in7  "5VSB"     # VCCH
    label  in8  "VBat"

    compute in3  ((6.8/10)+1)*@ , @/((6.8/10)+1)
    compute in4  ((30/10)+1)*@  , @/((30/10)+1)
    compute in7  ((6.8/10)+1)*@ , @/((6.8/10)+1)

# in5 and in6 appear to be wrong (I get around -17 V and -9 V with these
# 'compute' lines), but I'm not sure how to adjust the 'compute' lines.

    compute in5  (1+232/56)*@ - 4.096*232/56 , (@ + 4.096*232/56)/(1+232/56)
    compute in6  (1+120/56)*@ - 4.096*120/56 , (@ + 4.096*120/56)/(1+120/56)

# Temperatures

# Not sure.  temp1 always reads close to what k8temp reports for Core0.
# temp3 always reads approximate ambient temperature.  temp2 is between
# temp1 and temp3.

# Fans

    label  fan1 "CPU Fan"
    label  fan2 "Chassis Fan 1"
    label  fan3 "Power Supply Fan"


chip "ADT7475-*"

# For some reason, ignoring vccp, remote1, and remote2 doesn't work.  Is
# it because they have ALARM set?

# Voltages

    ignore vccp
    label  vcc  "+3.3V"

# Temperatures

# Not 100% sure.  remote1 and 2 don't appear to be hooked up; local is
# on board the adt7475 chip itself.

    ignore remote1
    ignore remote2

# Fans

    label  fan1 "Chassis Fan 4"
    label  fan2 "Chassis Fan 2"
    label  fan3 "Chassis Fan 3"
    ignore fan4


chip "k8temp-*"

   label temp1 "Core0 Temp"
   label temp3 "Core1 Temp"


[-- Attachment #3: Type: text/plain, Size: 153 bytes --]

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] First shot at Asus M2N-SLI Deluxe config file

[Jean Delvare]

Hi Matt,

On Wed, 20 Feb 2008 18:30:58 -0600 (CST), Matt Roberds wrote:
> Here's a first shot at a config file for an Asus M2N-SLI Deluxe
> motherboard.  It may also work for other versions of the M2N-SLI; I
> don't know.

Note, I have a configuration file for the Asus M2N32-SLI; it might have
common points with your board:
http://khali.linux-fr.org/devel/lm-sensors/sensors-Asus-M2N32-SLI.conf

Once you have a good configuration file for your board, you could add
it to the wiki:
http://www.lm-sensors.org/wiki/Configurations/Asus

Comments on your configuration file:

> # First cut at a minimal sensors3.conf for Asus M2N-SLI Deluxe motherboard
> # Matt Roberds, 20 Feb 2008
> 
> 
> chip "it8716-*"
> 
> # Voltages
> 
>     label  in0  "VCore"
>     label  in1  "VDDR"
>     ignore in2             # 3.3 V?

I would be very surprised if +3.3V wasn't monitored. Doesn't it show in
the BIOS?

>     label  in3  "+5V"      # VCC
>     label  in4  "+12V"
>     label  in5  "-12V"
>     label  in6  "-5V"
>     label  in7  "5VSB"     # VCCH
>     label  in8  "VBat"
> 
>     compute in3  ((6.8/10)+1)*@ , @/((6.8/10)+1)
>     compute in4  ((30/10)+1)*@  , @/((30/10)+1)
>     compute in7  ((6.8/10)+1)*@ , @/((6.8/10)+1)
> 
> # in5 and in6 appear to be wrong (I get around -17 V and -9 V with these
> # 'compute' lines), but I'm not sure how to adjust the 'compute' lines.
> 
>     compute in5  (1+232/56)*@ - 4.096*232/56 , (@ + 4.096*232/56)/(1+232/56)
>     compute in6  (1+120/56)*@ - 4.096*120/56 , (@ + 4.096*120/56)/(1+120/56)

Most modern motherboards do not monitor -5V, and in general they don't
monitor -12V either. Look in your BIOS, it probably doesn't display
these either. So either these voltage inputs are unused, or they are
used for something else. Try commenting out the compute statements and
see if the raw voltage value rings a bell. Comparing with what the BIOS
displays might help as well.

> 
> # Temperatures
> 
> # Not sure.  temp1 always reads close to what k8temp reports for Core0.
> # temp3 always reads approximate ambient temperature.  temp2 is between
> # temp1 and temp3.

What does the BIOS display?

> 
> # Fans
> 
>     label  fan1 "CPU Fan"
>     label  fan2 "Chassis Fan 1"
>     label  fan3 "Power Supply Fan"
> 
> 
> chip "ADT7475-*"
> 
> # For some reason, ignoring vccp, remote1, and remote2 doesn't work.  Is
> # it because they have ALARM set?

"vccp", "remote1" and "remote2" are not standard sysfs names, so I am
not surprised that libsensors doesn't recognize them. Should be in<N>
and temp<N>.

> 
> # Voltages
> 
>     ignore vccp
>     label  vcc  "+3.3V"

"vcc" isn't a standard name either, I guess that this label statement
has no effect?

> 
> # Temperatures
> 
> # Not 100% sure.  remote1 and 2 don't appear to be hooked up; local is
> # on board the adt7475 chip itself.
> 
>     ignore remote1
>     ignore remote2
> 
> # Fans
> 
>     label  fan1 "Chassis Fan 4"
>     label  fan2 "Chassis Fan 2"
>     label  fan3 "Chassis Fan 3"
>     ignore fan4
> 
> 
> chip "k8temp-*"
> 
>    label temp1 "Core0 Temp"
>    label temp3 "Core1 Temp"
> 


-- 
Jean Delvare

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] First shot at Asus M2N-SLI Deluxe config file

[Hans de Goede]

Matt Roberds wrote:
> All,
> 
> Here's a first shot at a config file for an Asus M2N-SLI Deluxe
> motherboard.  It may also work for other versions of the M2N-SLI; I
> don't know.
> 

I do, it won't work the "Asus M2N-SLI" and the "Asus M2N-SLI Deluxe" are 2 
completely different boards, don't know why Asus choose these confusing names, 
but that is how things are.

Regards,

Hans


_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] First shot at Asus M2N-SLI Deluxe config file

[Matt Roberds]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1975 bytes --]

On Thu, 21 Feb 2008, Jean Delvare wrote:
> On Wed, 20 Feb 2008 18:30:58 -0600 (CST), Matt Roberds wrote:
>> Here's a first shot at a config file for an Asus M2N-SLI Deluxe
>> motherboard.

My second shot is attached.  I have changed the name to inlclude the
"deluxe" designation.  This second shot also requires a small patch to
Jordan Crouse's latest adt7475.c driver to work; a diff is attached as
well.

>> chip "it8716-*"
>>
>>     ignore in2             # 3.3 V?
>
> I would be very surprised if +3.3V wasn't monitored. Doesn't it show
> in the BIOS?

It shows in the BIOS, but appears to be monitored by the adt7475 chip,
not the it8716.  This input always reads 0 V on the it8716.

> Most modern motherboards do not monitor -5V, and in general they don't
> monitor -12V either. Look in your BIOS, it probably doesn't display
> these either.

Running it with no compute lines gave 0 V, and the BIOS only reports
VCore, +3.3V, +5V, and +12V values, so I set the -5V and -12V to ignore.

>> # Not sure.  temp1 always reads close to what k8temp reports for Core0.
>> # temp3 always reads approximate ambient temperature.  temp2 is between
>> # temp1 and temp3.
>
> What does the BIOS display?

It only displays two temperatures: CPU and MB.  I have revised the
labels based on the temperature readings and the labels in your
M2N32-SLI configuration.

>> chip "ADT7475-*"
>>
>> # For some reason, ignoring vccp, remote1, and remote2 doesn't work.
>> # Is it because they have ALARM set?
>
> "vccp", "remote1" and "remote2" are not standard sysfs names, so I am
> not surprised that libsensors doesn't recognize them. Should be in<N>
> and temp<N>.

Those names are coming from the adt7475 driver.  I modified Jordan
Crouse's latest driver to report the standard names; a diff is attached.

>>     label  vcc  "+3.3V"
>
> "vcc" isn't a standard name either, I guess that this label statement
> has no effect?

Correct.  With the attached diff, it works again.

Matt Roberds

[-- Attachment #2: Second shot at ASUS M2N-SLI Deluxe config file --]
[-- Type: TEXT/PLAIN, Size: 2178 bytes --]

# Second cut at a minimal sensors3.conf for Asus M2N-SLI Deluxe motherboard
# Based on existing entries in sensors3.conf and Jean Delvare's configuration
# for the Asus M2N32-SLI
# Matt Roberds, 21 Feb 2008


chip "it8716-*"

# Voltages

    label  in0  "VCore"
    label  in1  "VDDR"     # Not in BIOS
    ignore in2             # 3.3 V is monitored by adt7475
    label  in3  "+5V"      # VCC
    label  in4  "+12V"
    ignore in5             # -12 V not monitored
    ignore in6             #  -5 V not monitored
    label  in7  "5VSB"     # Not in BIOS
    label  in8  "VBat"     # Not in BIOS

    # Vcore, VDDR, and Vbat are connected directly, so no compute
    # line is needed for these. For +5V, +12V and 5VSB, the default
    # resistors seem to have been used.
    compute in3  ((6.8/10)+1)*@ , @/((6.8/10)+1)
    compute in4  ((30/10)+1)*@  , @/((30/10)+1)
    compute in7  ((6.8/10)+1)*@ , @/((6.8/10)+1)

# Temperatures

# Not sure.  temp1 always reads close to what k8temp reports for Core0,
# and to what the BIOS reports as the CPU temperature.  temp2 is between
# temp1 and temp3; it is close to what the BIOS reports as the motherboard
# temperature.  temp3 always reads approximate ambient temperature.

    label temp1 "CPU Temp"
    label temp2 "MB Temp"
    label temp3 "MB Temp"

# Fans

    label  fan1 "CPU Fan"
    label  fan2 "Chassis Fan 1"
    label  fan3 "Power Supply Fan"

    # Ignore fans you don't have
#   ignore fan2
#   ignore fan3


chip "adt7475-*"

# Note: this section depends on some further hacks I have made to
# Jordan Crouse's driver

# Voltages

    ignore in1
    label  in2  "+3.3V"

# Temperatures

# temp1 and temp3 don't appear to be hooked up; temp2 is on board the
# adt7475 chip itself.

    ignore temp1
    label  temp2  "ADT7475 Temp"
    ignore temp3

# Fans

    label  fan1 "Chassis Fan 4"
    label  fan2 "Chassis Fan 2"
    label  fan3 "Chassis Fan 3"
    ignore fan4

    # Ignore fans you don't have
#   ignore fan1
#   ignore fan2
#   ignore fan3


chip "k8temp-*"

   label temp1 "core0 temp"
   label temp3 "core1 temp"


[-- Attachment #3: Patch of J Crouse's adt7475.c; std sysfs names, ADT lowcase --]
[-- Type: TEXT/x-diff, Size: 1724 bytes --]

*** adt7475-jc-1.c	2008-01-24 10:24:14.000000000 -0600
--- adt7475-mcr-1.c	2008-02-21 07:47:25.000000000 -0600
***************
*** 218,225 ****
  
  	switch(sattr->nr) {
  		case LABEL:
! 			return sprintf(buf, "%s\n",
! 				sattr->index == 0 ? "vccp" : "vcc");
  		case ALARM:
  			return sprintf(buf, "%d\n",
  				(data->alarms >> (sattr->index + 1)) & 1);
--- 218,225 ----
  
  	switch(sattr->nr) {
  		case LABEL:
! 			return sprintf(buf, "in%s\n",
! 				sattr->index == 0 ? "1" : "2");
  		case ALARM:
  			return sprintf(buf, "%d\n",
  				(data->alarms >> (sattr->index + 1)) & 1);
***************
*** 257,263 ****
  static ssize_t show_temp(struct device *dev, struct device_attribute *attr,
  			 char *buf)
  {
! 	static const char *labels[] = {"remote1", "local", "remote2"};
  
  	struct adt7475_data *data = adt7475_update_device(dev);
  	struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
--- 257,264 ----
  static ssize_t show_temp(struct device *dev, struct device_attribute *attr,
  			 char *buf)
  {
! 	static const char *labels[] = {"temp1", "temp2", "temp3"};
!   /* was remote1, local, remote2 - mcr */
  
  	struct adt7475_data *data = adt7475_update_device(dev);
  	struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
***************
*** 750,756 ****
  	const char *name;
  	struct attribute_group group;
  } adt7475_chips[ADT7475_MAX_ID] = {
! 	{ .name = "ADT7475",
  	  .group = {
  		  .attrs = adt7475_attrs,
  	  }
--- 751,757 ----
  	const char *name;
  	struct attribute_group group;
  } adt7475_chips[ADT7475_MAX_ID] = {
! 	{ .name = "adt7475",
  	  .group = {
  		  .attrs = adt7475_attrs,
  	  }

[-- Attachment #4: Type: text/plain, Size: 153 bytes --]

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] First shot at Asus M2N-SLI Deluxe config file

[Jordan Crouse]

[-- Attachment #1: Type: text/plain, Size: 663 bytes --]

On 21/02/08 08:19 -0600, Matt Roberds wrote:
> On Thu, 21 Feb 2008, Jean Delvare wrote:
>> On Wed, 20 Feb 2008 18:30:58 -0600 (CST), Matt Roberds wrote:
>>> Here's a first shot at a config file for an Asus M2N-SLI Deluxe
>>> motherboard.
>
> My second shot is attached.  I have changed the name to inlclude the
> "deluxe" designation.  This second shot also requires a small patch to
> Jordan Crouse's latest adt7475.c driver to work; a diff is attached as
> well.

Thanks.  Patch integrated into the driver and I also removed the URL to
the datasheet due to the upstream churn.  Full patch is attached.

CCing Mark to put this into his queue for 2.6.26.

Jordan

[-- Attachment #2: adt7475.patch --]
[-- Type: text/plain, Size: 36971 bytes --]

[PATCH] hwmon:  Add a driver for the ADT7475 thermal sensor

From: Jordan Crouse <jordan.crouse@amd.com>

HWMON driver for the ADT7475 thermal sensor.

Signed-off-by: Jordan Crouse <jordan.crouse@amd.com>
---

 Documentation/hwmon/adt7475 |  110 +++++
 drivers/hwmon/Kconfig       |   10 
 drivers/hwmon/Makefile      |    2 
 drivers/hwmon/adt7475.c     |  958 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 1080 insertions(+), 0 deletions(-)

diff --git a/Documentation/hwmon/adt7475 b/Documentation/hwmon/adt7475
new file mode 100644
index 0000000..491e5e0
--- /dev/null
+++ b/Documentation/hwmon/adt7475
@@ -0,0 +1,110 @@
+This describes the interface for the ADT7475 driver:
+
+(there are 4 fans, numbered fan1 to fan4):
+
+fanX_input              Read the current speed of the fan (in RPMs)
+fanX_min                Read/write the minimum speed of the fan.  Dropping
+	   		below this sets an alarm.
+
+(there are three PWMs, numbered pwm1 to pwm3):
+
+pwmX                    Read/write the current duty cycle of the PWM.  Writes
+     			only have effect when auto mode is turned off (see
+			below).
+
+pwmX_enable             Read/write the PWM configuration based on the following
+                        table:
+
+		        0 - Remote1 temp controls PWMx (auto mode)
+		        1 - local temp controls PWMx (auto mode)
+	 	        2 - remote2 temp controls PWMx (auto mode)
+                        3 - PWMx runs at full speed
+                        4 - PWMx is disabled
+                        5 - Use fastest speed calculated by local and remote2
+                        6 - Use fastest speed calculated by all three channels
+                        7 - Manual mode
+
+pwmX_freq               Read/write the PWM frequency.  The value returned is
+	  	        an index into the following table:
+
+		        0x0 - 11.0 Hz
+		        0x1 - 14.7 Hz
+		        0x2 - 22.1 Hz
+		        0x3 - 29.4 Hz
+		        0x4 - 35.3 Hz
+		        0x5 - 44.1 Hz
+		        0x6 - 58.8 Hz
+		        0x7 - 88.2 Hz
+
+pwmX_max                Read/write the maximum PWM duty cycle.  The PWM
+                        duty cycle will never exceed this.
+
+pwmX_min                Read/write the minimum PWM duty cycle in automatic mode
+
+(there are three temperature settings numbered temp1 to temp3):
+
+tempX_input             Read the current temperature.  The value is in milli
+			degrees of Celsius.
+
+tempX_label		Returns the "name" of the sensor as described in the
+			datasheet (remote1, local, or remote2)
+
+tempX_max               Read/write the upper temperature limit - exceeding this
+	                will cause an alarm.
+
+tempX_min               Read/write the lower temperature limit - exceeding this
+                        will cause an alarm.
+
+tempX_offset            Read/write the temperature adjustment offset
+
+tempX_crit_max        Read/write the THERM limit for remote1.  Exceeding this
+                        causes the chip to force the processor off.
+
+tempX_auto_min   	Read/write the minimum temperature where the fans will
+                        turn on in automatic mode.
+
+tempX_auto_range  	Read/write the range over which the automatic fan
+			control will be executed.  The value returned is a
+			index into the following table:
+
+			0x0 - 2 C
+			0x1 - 2.5 C
+			0x2 - 3.33 C
+			0x3 - 4 C
+			0x4 - 5 C
+			0x5 - 6.67 C
+			0x6 - 8 C
+			0x7 - 10 C
+			0x8 - 13.33 C
+			0x9 - 16 C
+			0xA - 20 C
+			0xB - 26.67 C
+			0xC - 32 C
+			0xD - 40 C
+			0xE - 53.33 C
+			0xF - 80 C
+
+tempX_crit_hyst 	set the temperature range below crit_max where the
+                        fans will stay on - this helps drive the temperature
+                        low enough so it doesn't stay near the edge and
+                        cause THERM to keep tripping.
+
+tempX_alarm		Read a 1 if the max/min alarm is set
+tempX_crit_alarm	Read a 1 if the critical limit is exceeded
+tempX_fault		Read a 1 if either temp1 or temp3 diode has a fault
+
+(There are two voltage settings, in1 and in2):
+
+inX_input               Read the current voltage on VCC.  Value is in
+			millivolts.
+
+inX_min                 read/write the minimum voltage limit.
+			Dropping below this causes an alarm.
+
+inX_max   		read/write the maximum voltage limit.
+			Exceeding this causes an alarm.
+
+inX_label		Return the name of the input as specified in the
+			datasheet (vcc or vccp)
+
+inX_alarm		Read a 1 if the max/min alarm is set.
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 368879f..131b812 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -153,6 +153,16 @@ config SENSORS_ADT7473
 	  This driver can also be built as a module. If so, the module
 	  will be called adt7473.
 
+config SENSORS_ADT7475
+	tristate "Analog Devices ADT7475"
+	depends on I2C && EXPERIMENTAL
+	help
+	  If you say yes here you get support for the Analog Devices
+	  ADT7475 temperature monitoring chips.
+
+	  This driver can also be build as a module.  If so, the module
+	  will be called adt7475.
+
 config SENSORS_K8TEMP
 	tristate "AMD Athlon64/FX or Opteron temperature sensor"
 	depends on X86 && PCI && EXPERIMENTAL
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 3bdb05a..41567be 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -25,6 +25,8 @@ obj-$(CONFIG_SENSORS_ADM9240)	+= adm9240.o
 obj-$(CONFIG_SENSORS_ADS7828)	+= ads7828.o
 obj-$(CONFIG_SENSORS_ADT7470)	+= adt7470.o
 obj-$(CONFIG_SENSORS_ADT7473)	+= adt7473.o
+obj-$(CONFIG_SENSORS_ADT7475)   += adt7475.o
+
 obj-$(CONFIG_SENSORS_APPLESMC)	+= applesmc.o
 obj-$(CONFIG_SENSORS_AMS)	+= ams/
 obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o
diff --git a/drivers/hwmon/adt7475.c b/drivers/hwmon/adt7475.c
new file mode 100644
index 0000000..b2fdbb9
--- /dev/null
+++ b/drivers/hwmon/adt7475.c
@@ -0,0 +1,958 @@
+/*
+ * adt7475 - Thermal sensor driver for the ADT7475 chip and derivatives
+ * Copyright (C) 2007-2008, Advanced Micro Devices, Inc.
+ *
+ * Derived from the lm83 driver by Jean Delvare
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+
+/* Indexes for the sysfs hooks */
+
+#define INPUT     0
+#define MIN       1
+#define MAX       2
+#define CONTROL   3
+#define OFFSET    3
+#define AUTOMIN   4
+#define FREQ      4
+#define THERM     5
+#define HYSTERSIS 6
+#define RANGE     7
+#define LABEL     8
+#define ALARM     9
+#define CRIT_ALARM 10
+#define FAULT      11
+
+
+/* 7475 Common Registers */
+
+#define REG_VOLTAGE_BASE        0x21
+#define REG_TEMP_BASE           0x25
+#define REG_TACH_BASE		0x28
+#define REG_PWM_BASE            0x30
+#define REG_PWM_MAX_BASE        0x38
+
+#define REG_DEVID               0x3D
+#define REG_VENDID              0x3E
+
+#define REG_CONFIG1             0x40
+#define REG_STATUS1             0x41
+#define REG_STATUS2             0x42
+
+/* Not all the alarm bits are enabled - mask the ones we don't use */
+#define ALARM_MASK              0xFE76
+
+#define REG_VOLTAGE_MIN_BASE    0x46
+#define REG_VOLTAGE_MAX_BASE    0x47
+
+#define REG_TEMP_MIN_BASE       0x4E
+#define REG_TEMP_MAX_BASE	0x4F
+
+#define REG_TACH_MIN_BASE	0x54
+
+#define REG_PWM_CONFIG_BASE     0x5C
+
+#define REG_TEMP_TRANGE_BASE    0x5F
+
+#define REG_ACOUSTICS1          0x62
+#define REG_ACOUSTICS2          0x63
+
+#define REG_PWM_MIN_BASE        0x64
+
+#define REG_TEMP_TMIN_BASE      0x67
+#define REG_TEMP_THERM_BASE     0x6A
+
+#define REG_REMOTE1_HYSTERSIS   0x6D
+#define REG_REMOTE2_HYSTERSIS   0x6E
+
+#define REG_TEMP_OFFSET_BASE    0x70
+
+#define REG_CONFIG2             0x73
+#define REG_INTERRUPT_MASK1     0x74
+#define REG_INTERRUPT_MASK2     0x75
+#define REG_EXTEND1             0x76
+#define REG_EXTEND2             0x77
+#define REG_CONFIG3             0x78
+#define REG_THERM_TIMER_STATUS  0x79
+#define REG_THERM_TIMER_LIMIT   0x7A
+#define REG_TACH_PULSES         0x7B
+#define REG_CONFIG5             0x7C
+
+#define CONFIG5_TWOSCOMP        0x01
+#define CONFIG5_TEMPOFFSET      0x02
+
+#define REG_CONFIG4             0x7D
+
+/* ADT7475 Settings */
+
+#define ADT7475_VOLTAGE_COUNT   2
+#define ADT7475_TEMP_COUNT      3
+#define ADT7475_TACH_COUNT	4
+#define ADT7475_PWM_COUNT       3
+
+/* 7475 specific registers */
+
+#define REG_CONFIG6             0x10
+#define REG_CONFIG7             0x11
+
+
+/* Macro to read the registers */
+
+#define adt7475_read(reg) i2c_smbus_read_byte_data(client, (reg))
+
+/* Macros to easily index the registers */
+
+#define TACH_REG(idx) (REG_TACH_BASE + ((idx) * 2))
+#define TACH_MIN_REG(idx) (REG_TACH_MIN_BASE + ((idx) * 2))
+
+#define PWM_REG(idx) (REG_PWM_BASE + (idx))
+#define PWM_MAX_REG(idx) (REG_PWM_MAX_BASE + (idx))
+#define PWM_MIN_REG(idx) (REG_PWM_MIN_BASE + (idx))
+#define PWM_CONFIG_REG(idx) (REG_PWM_CONFIG_BASE + (idx))
+
+#define VOLTAGE_REG(idx) (REG_VOLTAGE_BASE + (idx))
+#define VOLTAGE_MIN_REG(idx) (REG_VOLTAGE_MIN_BASE + ((idx) * 2))
+#define VOLTAGE_MAX_REG(idx) (REG_VOLTAGE_MAX_BASE + ((idx) * 2))
+
+#define TEMP_REG(idx) (REG_TEMP_BASE + (idx))
+#define TEMP_MIN_REG(idx) (REG_TEMP_MIN_BASE + ((idx) * 2))
+#define TEMP_MAX_REG(idx) (REG_TEMP_MAX_BASE + ((idx) * 2))
+#define TEMP_TMIN_REG(idx) (REG_TEMP_TMIN_BASE + (idx))
+#define TEMP_THERM_REG(idx) (REG_TEMP_THERM_BASE + (idx))
+#define TEMP_OFFSET_REG(idx) (REG_TEMP_OFFSET_BASE + (idx))
+#define TEMP_TRANGE_REG(idx) (REG_TEMP_TRANGE_BASE + (idx))
+
+/* Convert the tach reading into RPMs */
+
+#define TACH2RPM(val) ((90000 * 60) / (val))
+#define RPM2TACH(val) ((90000 * 60) / (val))
+
+/* Convert the voltage registers into mW */
+
+#define REG2VCC(val) ((42 * (int)(val)) / 10)
+#define REG2VCCP(val) ((293 * (int)(val)) / 100)
+
+#define VCC2REG(val)  (((val) * 10) / 42)
+#define VCCP2REG(val) (((val) * 100) / 293)
+
+/* 2's complement temp conversion - this is used when CONFIG5 bit 0 is set */
+
+#define REG2TEMP(val) ((((val) >> 2) * 1000) + (((val) & 3) * 250))
+
+#define TEMP2REG(val) ((val) <= -128000 ? -128 : \
+		       (val) >= 127000 ? 127 : \
+                       (val) < 0 ? ((val) - 500) / 1000 : \
+                       ((val) + 500) / 1000)
+
+
+/* Offset 64 temp conversion - this is used when CONFIG5 bit 0 is clear */
+
+#define OFF64_REG2TEMP(val) (((((val) >> 2) - 64) * 1000) + (((val) & 3) * 250))
+#define OFF64_TEMP2REG(val) ((((val) + 64500) / 1000) << 2)
+
+static unsigned short normal_i2c[] = { 0x2e, I2C_CLIENT_END };
+
+I2C_CLIENT_INSMOD_1(adt7475);
+
+struct adt7475_data {
+	struct i2c_client client;
+	struct class_device *class_dev;
+	struct mutex lock;
+
+	int type;
+	char temptype;
+
+	char valid;
+	unsigned long updated;
+
+	u16 alarms;
+	u16 voltage[3][3];
+	s16 temp[6][3];
+	u16 tach[2][4];
+	u8  pwm[4][3];
+	u8  range[3];
+};
+
+static struct i2c_driver adt7475_driver;
+static struct adt7475_data *adt7475_update_device(struct device *dev);
+
+static u16 adt7475_read_word(struct i2c_client *client, int reg)
+{
+	u16 val;
+
+	val = i2c_smbus_read_byte_data(client, reg);
+	val |= (i2c_smbus_read_byte_data(client, reg + 1) << 8);
+
+	return val;
+}
+
+static void adt7475_write_word(struct i2c_client *client, int reg, u16 val)
+{
+	i2c_smbus_write_byte_data(client, reg + 1, val >> 8);
+	i2c_smbus_write_byte_data(client, reg, val & 0xFF);
+}
+
+static ssize_t show_voltage(struct device *dev, struct device_attribute *attr,
+			    char *buf)
+{
+	struct adt7475_data *data = adt7475_update_device(dev);
+	struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
+	unsigned short val = data->voltage[sattr->nr][sattr->index];
+
+	switch(sattr->nr) {
+		case LABEL:
+			return sprintf(buf, "%s\n",
+				sattr->index == 0 ? "1" : "2");
+		case ALARM:
+			return sprintf(buf, "%d\n",
+				(data->alarms >> (sattr->index + 1)) & 1);
+		default:
+			return sprintf(buf, "%d\n",
+				sattr->index == 0 ? REG2VCCP(val) : REG2VCC(val));
+	}
+}
+
+static ssize_t set_voltage(struct device *dev, struct device_attribute *attr,
+			   const char *buf, size_t count) {
+
+	struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
+	struct i2c_client *client = to_i2c_client(dev);
+	struct adt7475_data *data = i2c_get_clientdata(client);
+	long val = simple_strtol(buf, NULL, 10);
+	unsigned char reg;
+
+	mutex_lock(&data->lock);
+
+	data->voltage[sattr->nr][sattr->index] =
+		sattr->index ? VCC2REG(val) : VCCP2REG(val);
+
+	if (sattr->nr == MIN)
+		reg = VOLTAGE_MIN_REG(sattr->index);
+	else
+		reg = VOLTAGE_MAX_REG(sattr->index);
+
+	i2c_smbus_write_byte_data(client, reg, (u8) (data->voltage[sattr->nr][sattr->index] >> 2));
+	mutex_unlock(&data->lock);
+
+	return count;
+}
+
+static ssize_t show_temp(struct device *dev, struct device_attribute *attr,
+			 char *buf)
+{
+	static const char *labels[] = {"temp1", "temp2", "temp3"};
+
+	struct adt7475_data *data = adt7475_update_device(dev);
+	struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
+	unsigned short val = data->temp[sattr->nr][sattr->index];
+	int ret = 0;
+	u8 out;
+
+	switch(sattr->nr) {
+	case LABEL:
+		if (sattr->index <= 2)
+			ret = sprintf(buf, "%s\n", labels[sattr->index]);
+		break;
+
+	case HYSTERSIS:
+		if (sattr->index != 1)
+			out = (val >> 4) & 0xF;
+		else
+			out = (val & 0xF);
+
+		ret = sprintf(buf, "%d\n", out);
+		break;
+
+	case OFFSET:
+		/* Offset is always 2's complement, regardless of the setting in CONFIG5 */
+
+		if (data->temptype & CONFIG5_TEMPOFFSET)
+			ret = sprintf(buf, "%d\n", (s8) val);
+		else
+			ret = sprintf(buf, "%d\n", ((s8)val) >> 1);
+		break;
+
+	case ALARM:
+		ret = sprintf(buf, "%d\n",
+			(data->alarms >> (sattr->index + 4))  & 1);
+		break;
+
+	case CRIT_ALARM:
+		ret = sprintf(buf, "%d\n",
+			((data->alarms & 0x200) ? 1 : 0 ));
+		break;
+
+	case FAULT:
+		/* Note - only for remote1 and remote2 */
+
+		ret = sprintf(buf, "%d\n",
+			(data->alarms & (sattr->index ? 0x4000 : 0x8000)));
+		break;
+
+	default:
+		/* All other temp values are in the configured format */
+
+		ret = sprintf(buf, "%d\n",
+			      (data->temptype & CONFIG5_TWOSCOMP) ? REG2TEMP(val) : OFF64_REG2TEMP(val));
+	}
+
+	return ret;
+}
+
+static ssize_t set_temp(struct device *dev, struct device_attribute *attr,
+		       const char *buf, size_t count)
+{
+	struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
+	struct i2c_client *client = to_i2c_client(dev);
+	struct adt7475_data *data = i2c_get_clientdata(client);
+	long val = simple_strtol(buf, NULL, 10);
+	unsigned char reg = 0;
+	u8 out;
+	int l;
+
+	mutex_lock(&data->lock);
+
+	switch(sattr->nr) {
+	case OFFSET:
+		l = val;
+
+		if (data->temptype & CONFIG5_TEMPOFFSET) {
+			if (l > 127)
+				l = 127;
+			else if (l < -127)
+				l = -126;
+		}
+		else {
+			if (l > 64)
+				l = 64;
+			else if (l < -63)
+				l = -63;
+
+			l <<= 1;
+		}
+
+		out = data->temp[OFFSET][sattr->index] = (u8) l;
+		break;
+
+	case HYSTERSIS:
+		if (sattr->index != 1) {
+			data->temp[HYSTERSIS][sattr->index] &= 0xF0;
+			data->temp[HYSTERSIS][sattr->index] |= (val & 0xF) << 4;
+		}
+		else {
+			data->temp[HYSTERSIS][sattr->index] &= 0x0F;
+			data->temp[HYSTERSIS][sattr->index] |= (val & 0xF);
+		}
+
+		out = data->temp[HYSTERSIS][sattr->index];
+		break;
+
+	default:
+		data->temp[sattr->nr][sattr->index] =
+			(data->temptype & CONFIG5_TWOSCOMP) ? TEMP2REG(val) : OFF64_TEMP2REG(val);
+
+		/* We maintain an extra 2 digits of precision for simplicity - shift those back off
+		   before writing the value
+		*/
+
+		out = (u8) (data->temp[sattr->nr][sattr->index] >> 2);
+	}
+
+	switch(sattr->nr) {
+	case MIN:
+		reg = TEMP_MIN_REG(sattr->index);
+		break;
+	case MAX:
+		reg = TEMP_MAX_REG(sattr->index);
+		break;
+	case OFFSET:
+		reg = TEMP_OFFSET_REG(sattr->index);
+		break;
+	case AUTOMIN:
+		reg = TEMP_TMIN_REG(sattr->index);
+		break;
+	case THERM:
+		reg = TEMP_THERM_REG(sattr->index);
+		break;
+	case HYSTERSIS:
+		if (sattr->index != 2)
+			reg = REG_REMOTE1_HYSTERSIS;
+		else
+			reg = REG_REMOTE2_HYSTERSIS;
+
+		break;
+	}
+
+	i2c_smbus_write_byte_data(client, reg, out);
+
+	mutex_unlock(&data->lock);
+	return count;
+}
+
+static ssize_t show_range(struct device *dev, struct device_attribute *attr,
+			 char *buf)
+{
+	struct adt7475_data *data = adt7475_update_device(dev);
+	struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
+
+	unsigned short val = data->range[sattr->index];
+	return sprintf(buf, "%d\n", (val >> 4) & 0xF);
+}
+
+static ssize_t set_range(struct device *dev, struct device_attribute *attr,
+	const char *buf, size_t count)
+{
+	struct adt7475_data *data = adt7475_update_device(dev);
+	struct i2c_client *client = to_i2c_client(dev);
+	struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
+	long val = simple_strtol(buf, NULL, 10);
+
+	mutex_lock(&data->lock);
+
+	data->range[sattr->index] &= ~0xF0;
+	data->range[sattr->index] |= (val & 0xF) << 4;
+
+	i2c_smbus_write_byte_data(client, TEMP_TRANGE_REG(sattr->index),
+				  data->range[sattr->index]);
+
+	mutex_unlock(&data->lock);
+	return count;
+}
+
+static ssize_t show_tach(struct device *dev, struct device_attribute *attr,
+			 char *buf)
+{
+	struct adt7475_data *data = adt7475_update_device(dev);
+	struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
+
+
+	/* 0xFFFF means the period was invalid */
+
+	switch(sattr->nr) {
+		case ALARM:
+			return sprintf(buf, "%d\n",
+				(data->alarms >> (sattr->index + 10) & 1));
+		default:
+		if (data->tach[sattr->nr][sattr->index] == 0xFFFF)
+			return sprintf(buf, "0\n");
+		else
+			return sprintf(buf, "%d\n",
+			       TACH2RPM(data->tach[sattr->nr][sattr->index]));
+	}
+}
+
+
+
+
+static ssize_t set_tach(struct device *dev, struct device_attribute *attr,
+	const char *buf, size_t count)
+{
+
+	struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
+	struct i2c_client *client = to_i2c_client(dev);
+	struct adt7475_data *data = i2c_get_clientdata(client);
+
+	long val = simple_strtol(buf, NULL, 10);
+
+	mutex_lock(&data->lock);
+
+	data->tach[MIN][sattr->index] = (u16) RPM2TACH(val);
+
+	adt7475_write_word(client, TACH_MIN_REG(sattr->index),
+			   data->tach[MIN][sattr->index]);
+
+	mutex_unlock(&data->lock);
+	return count;
+}
+
+static ssize_t show_pwm(struct device *dev, struct device_attribute *attr,
+			 char *buf)
+{
+	struct adt7475_data *data = adt7475_update_device(dev);
+	struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
+
+	return sprintf(buf, "%d\n", data->pwm[sattr->nr][sattr->index]);
+}
+
+static ssize_t show_pwmctrl(struct device *dev, struct device_attribute *attr,
+			    char *buf)
+{
+	struct adt7475_data *data = adt7475_update_device(dev);
+	struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
+
+	return sprintf(buf, "%d\n", (data->pwm[CONTROL][sattr->index] >> 5) & 7);
+}
+
+static ssize_t show_pwmfreq(struct device *dev, struct device_attribute *attr,
+			    char *buf)
+{
+	struct adt7475_data *data = adt7475_update_device(dev);
+	struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
+
+	return sprintf(buf, "%d\n", data->range[sattr->index] & 3);
+}
+
+static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
+	const char *buf, size_t count)
+{
+
+	struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
+	struct i2c_client *client = to_i2c_client(dev);
+	struct adt7475_data *data = i2c_get_clientdata(client);
+
+	long val = simple_strtol(buf, NULL, 10);
+	unsigned char reg = 0;
+
+	mutex_lock(&data->lock);
+
+	data->pwm[sattr->nr][sattr->index] = (u8) val;
+
+	switch(sattr->nr) {
+	case INPUT:
+		/* If we are not in manual mode, then we shouldn't allow the user to set
+		   the pwm speed */
+
+		if (((data->pwm[CONTROL][sattr->index] >> 5) & 7) != 7)
+			return 0;
+
+		reg = PWM_REG(sattr->index);
+		break;
+
+	case MIN:
+		reg = PWM_MIN_REG(sattr->index);
+		break;
+
+	case MAX:
+		reg = PWM_MAX_REG(sattr->index);
+		break;
+	}
+
+	i2c_smbus_write_byte_data(client, reg, data->pwm[sattr->nr][sattr->index]);
+	mutex_unlock(&data->lock);
+
+	return count;
+}
+
+static ssize_t set_pwmctrl(struct device *dev, struct device_attribute *attr,
+	const char *buf, size_t count)
+{
+	struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
+	struct i2c_client *client = to_i2c_client(dev);
+	struct adt7475_data *data = i2c_get_clientdata(client);
+
+	long val = simple_strtol(buf, NULL, 10);
+
+	mutex_lock(&data->lock);
+
+	data->pwm[CONTROL][sattr->index] &= ~0xE0;
+	data->pwm[CONTROL][sattr->index] |= (val & 7) << 5;
+
+	i2c_smbus_write_byte_data(client, PWM_CONFIG_REG(sattr->index),
+				  data->pwm[CONTROL][sattr->index]);
+
+	mutex_unlock(&data->lock);
+	return count;
+}
+
+static ssize_t set_pwmfreq(struct device *dev, struct device_attribute *attr,
+	const char *buf, size_t count)
+{
+	struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
+	struct i2c_client *client = to_i2c_client(dev);
+	struct adt7475_data *data = i2c_get_clientdata(client);
+
+	long val = simple_strtol(buf, NULL, 10);
+
+	mutex_lock(&data->lock);
+
+	data->range[sattr->index] &= ~3;
+	data->range[sattr->index] |= val & 0x03;
+
+	i2c_smbus_write_byte_data(client, TEMP_TRANGE_REG(sattr->index),
+				  data->range[sattr->index]);
+
+	mutex_unlock(&data->lock);
+	return count;
+}
+
+static SENSOR_DEVICE_ATTR_2(in1_input, S_IRUGO, show_voltage, NULL, INPUT, 0);
+static SENSOR_DEVICE_ATTR_2(in1_max, S_IRUGO | S_IWUSR, show_voltage, set_voltage, MAX, 0);
+static SENSOR_DEVICE_ATTR_2(in1_min, S_IRUGO | S_IWUSR, show_voltage, set_voltage, MIN, 0);
+static SENSOR_DEVICE_ATTR_2(in1_label, S_IRUGO, show_voltage, NULL, LABEL, 0);
+static SENSOR_DEVICE_ATTR_2(in1_alarm, S_IRUGO, show_voltage, NULL, ALARM, 0);
+static SENSOR_DEVICE_ATTR_2(in2_input, S_IRUGO, show_voltage, NULL, INPUT, 1);
+static SENSOR_DEVICE_ATTR_2(in2_max, S_IRUGO | S_IWUSR, show_voltage, set_voltage, MAX, 1);
+static SENSOR_DEVICE_ATTR_2(in2_min, S_IRUGO | S_IWUSR, show_voltage, set_voltage, MIN, 1);
+static SENSOR_DEVICE_ATTR_2(in2_label, S_IRUGO, show_voltage, NULL, LABEL, 1);
+static SENSOR_DEVICE_ATTR_2(in2_alarm, S_IRUGO, show_voltage, NULL, ALARM, 1);
+static SENSOR_DEVICE_ATTR_2(temp1_input, S_IRUGO, show_temp, NULL, INPUT, 0);
+static SENSOR_DEVICE_ATTR_2(temp1_label, S_IRUGO, show_temp, NULL, LABEL, 0);
+static SENSOR_DEVICE_ATTR_2(temp1_alarm, S_IRUGO, show_temp, NULL, ALARM, 0);
+static SENSOR_DEVICE_ATTR_2(temp1_crit_alarm, S_IRUGO, show_temp, NULL, CRIT_ALARM, 0);
+static SENSOR_DEVICE_ATTR_2(temp1_fault, S_IRUGO, show_temp, NULL, FAULT, 0);
+static SENSOR_DEVICE_ATTR_2(temp1_max, S_IRUGO | S_IWUSR, show_temp, set_temp, MAX, 0);
+static SENSOR_DEVICE_ATTR_2(temp1_min, S_IRUGO | S_IWUSR, show_temp, set_temp, MIN, 0);
+static SENSOR_DEVICE_ATTR_2(temp1_offset, S_IRUGO | S_IWUSR, show_temp, set_temp, OFFSET, 0);
+static SENSOR_DEVICE_ATTR_2(temp1_auto_min, S_IRUGO | S_IWUSR, show_temp, set_temp, AUTOMIN, 0);
+static SENSOR_DEVICE_ATTR_2(temp1_auto_range, S_IRUGO | S_IWUSR, show_range, set_range, 0, 0);
+static SENSOR_DEVICE_ATTR_2(temp1_crit_max, S_IRUGO | S_IWUSR, show_temp, set_temp, THERM, 0);
+static SENSOR_DEVICE_ATTR_2(temp1_crit_hyst, S_IRUGO | S_IWUSR, show_temp, set_temp, HYSTERSIS, 0);
+static SENSOR_DEVICE_ATTR_2(temp2_input, S_IRUGO, show_temp, NULL, INPUT, 1);
+static SENSOR_DEVICE_ATTR_2(temp2_label, S_IRUGO, show_temp, NULL, LABEL, 1);
+static SENSOR_DEVICE_ATTR_2(temp2_alarm, S_IRUGO, show_temp, NULL, ALARM, 1);
+static SENSOR_DEVICE_ATTR_2(temp2_crit_alarm, S_IRUGO, show_temp, NULL, CRIT_ALARM, 1);
+static SENSOR_DEVICE_ATTR_2(temp2_max, S_IRUGO | S_IWUSR, show_temp, set_temp, MAX, 1);
+static SENSOR_DEVICE_ATTR_2(temp2_min, S_IRUGO | S_IWUSR, show_temp, set_temp, MIN, 1);
+static SENSOR_DEVICE_ATTR_2(temp2_offset, S_IRUGO | S_IWUSR, show_temp, set_temp, OFFSET, 1);
+static SENSOR_DEVICE_ATTR_2(temp2_auto_min, S_IRUGO | S_IWUSR, show_temp, set_temp, AUTOMIN, 1);
+static SENSOR_DEVICE_ATTR_2(temp2_auto_range, S_IRUGO | S_IWUSR, show_range, set_range, 0, 1);
+static SENSOR_DEVICE_ATTR_2(temp2_crit_max, S_IRUGO | S_IWUSR, show_temp, set_temp, THERM, 1);
+static SENSOR_DEVICE_ATTR_2(temp2_crit_hyst, S_IRUGO | S_IWUSR, show_temp, set_temp, HYSTERSIS, 1);
+static SENSOR_DEVICE_ATTR_2(temp3_input, S_IRUGO, show_temp, NULL, INPUT, 2);
+static SENSOR_DEVICE_ATTR_2(temp3_label, S_IRUGO, show_temp, NULL, LABEL, 2);
+static SENSOR_DEVICE_ATTR_2(temp3_alarm, S_IRUGO, show_temp, NULL, ALARM, 2);
+static SENSOR_DEVICE_ATTR_2(temp3_crit_alarm, S_IRUGO, show_temp, NULL, CRIT_ALARM, 2);
+static SENSOR_DEVICE_ATTR_2(temp3_fault, S_IRUGO, show_temp, NULL, FAULT, 2);
+static SENSOR_DEVICE_ATTR_2(temp3_max, S_IRUGO | S_IWUSR, show_temp, set_temp, MAX, 2);
+static SENSOR_DEVICE_ATTR_2(temp3_min, S_IRUGO | S_IWUSR, show_temp, set_temp, MIN, 2);
+static SENSOR_DEVICE_ATTR_2(temp3_offset, S_IRUGO | S_IWUSR, show_temp, set_temp, OFFSET, 2);
+static SENSOR_DEVICE_ATTR_2(temp3_auto_min, S_IRUGO | S_IWUSR, show_temp, set_temp, AUTOMIN, 2);
+static SENSOR_DEVICE_ATTR_2(temp3_auto_range, S_IRUGO | S_IWUSR, show_range, set_range, 0, 2);
+static SENSOR_DEVICE_ATTR_2(temp3_crit_max, S_IRUGO | S_IWUSR, show_temp, set_temp, THERM, 2);
+static SENSOR_DEVICE_ATTR_2(temp3_crit_hyst, S_IRUGO | S_IWUSR, show_temp, set_temp, HYSTERSIS, 2);
+static SENSOR_DEVICE_ATTR_2(fan1_input, S_IRUGO, show_tach, NULL, INPUT, 0);
+static SENSOR_DEVICE_ATTR_2(fan1_min, S_IRUGO | S_IWUSR, show_tach, set_tach, MIN, 0);
+static SENSOR_DEVICE_ATTR_2(fan1_alarm, S_IRUGO, show_tach, NULL, ALARM, 0);
+static SENSOR_DEVICE_ATTR_2(fan2_input, S_IRUGO, show_tach, NULL, INPUT, 1);
+static SENSOR_DEVICE_ATTR_2(fan2_min, S_IRUGO | S_IWUSR, show_tach, set_tach, MIN, 1);
+static SENSOR_DEVICE_ATTR_2(fan2_alarm, S_IRUGO, show_tach, NULL, ALARM, 1);
+static SENSOR_DEVICE_ATTR_2(fan3_input, S_IRUGO, show_tach, NULL, INPUT, 2);
+static SENSOR_DEVICE_ATTR_2(fan3_min, S_IRUGO | S_IWUSR, show_tach, set_tach, MIN, 2);
+static SENSOR_DEVICE_ATTR_2(fan3_alarm, S_IRUGO, show_tach, NULL, ALARM, 2);
+static SENSOR_DEVICE_ATTR_2(fan4_input, S_IRUGO, show_tach, NULL, INPUT, 3);
+static SENSOR_DEVICE_ATTR_2(fan4_min, S_IRUGO | S_IWUSR, show_tach, set_tach, MIN, 3);
+static SENSOR_DEVICE_ATTR_2(fan4_alarm, S_IRUGO, show_tach, NULL, ALARM, 3);
+static SENSOR_DEVICE_ATTR_2(pwm1, S_IRUGO | S_IWUSR, show_pwm, set_pwm, INPUT, 0);
+static SENSOR_DEVICE_ATTR_2(pwm1_freq, S_IRUGO | S_IWUSR, show_pwmfreq, set_pwmfreq, INPUT, 0);
+static SENSOR_DEVICE_ATTR_2(pwm1_enable, S_IRUGO | S_IWUSR, show_pwmctrl, set_pwmctrl, INPUT, 0);
+static SENSOR_DEVICE_ATTR_2(pwm1_max, S_IRUGO | S_IWUSR, show_pwm, set_pwm, MAX, 0);
+static SENSOR_DEVICE_ATTR_2(pwm1_min, S_IRUGO | S_IWUSR, show_pwm, set_pwm, MIN, 0);
+static SENSOR_DEVICE_ATTR_2(pwm2, S_IRUGO | S_IWUSR, show_pwm, set_pwm, INPUT, 1);
+static SENSOR_DEVICE_ATTR_2(pwm2_freq, S_IRUGO | S_IWUSR, show_pwmfreq, set_pwmfreq, INPUT, 1);
+static SENSOR_DEVICE_ATTR_2(pwm2_enable, S_IRUGO | S_IWUSR, show_pwmctrl, set_pwmctrl, INPUT, 1);
+static SENSOR_DEVICE_ATTR_2(pwm2_max, S_IRUGO | S_IWUSR, show_pwm, set_pwm, MAX, 1);
+static SENSOR_DEVICE_ATTR_2(pwm2_min, S_IRUGO | S_IWUSR, show_pwm, set_pwm, MIN, 1);
+static SENSOR_DEVICE_ATTR_2(pwm3, S_IRUGO | S_IWUSR, show_pwm, set_pwm, INPUT, 2);
+static SENSOR_DEVICE_ATTR_2(pwm3_freq, S_IRUGO | S_IWUSR, show_pwmfreq, set_pwmfreq, INPUT, 2);
+static SENSOR_DEVICE_ATTR_2(pwm3_enable, S_IRUGO | S_IWUSR, show_pwmctrl, set_pwmctrl, INPUT, 2);
+static SENSOR_DEVICE_ATTR_2(pwm3_max, S_IRUGO | S_IWUSR, show_pwm, set_pwm, MAX, 2);
+static SENSOR_DEVICE_ATTR_2(pwm3_min, S_IRUGO | S_IWUSR, show_pwm, set_pwm, MIN, 2);
+
+static struct attribute *adt7475_attrs[] = {
+	&sensor_dev_attr_in1_input.dev_attr.attr,
+	&sensor_dev_attr_in1_label.dev_attr.attr,
+	&sensor_dev_attr_in1_max.dev_attr.attr,
+	&sensor_dev_attr_in1_min.dev_attr.attr,
+	&sensor_dev_attr_in1_alarm.dev_attr.attr,
+	&sensor_dev_attr_in2_input.dev_attr.attr,
+	&sensor_dev_attr_in2_label.dev_attr.attr,
+	&sensor_dev_attr_in2_max.dev_attr.attr,
+	&sensor_dev_attr_in2_min.dev_attr.attr,
+	&sensor_dev_attr_in2_alarm.dev_attr.attr,
+	&sensor_dev_attr_temp1_input.dev_attr.attr,
+	&sensor_dev_attr_temp1_label.dev_attr.attr,
+	&sensor_dev_attr_temp1_alarm.dev_attr.attr,
+	&sensor_dev_attr_temp1_crit_alarm.dev_attr.attr,
+	&sensor_dev_attr_temp1_fault.dev_attr.attr,
+	&sensor_dev_attr_temp1_max.dev_attr.attr,
+	&sensor_dev_attr_temp1_min.dev_attr.attr,
+	&sensor_dev_attr_temp1_offset.dev_attr.attr,
+	&sensor_dev_attr_temp1_auto_min.dev_attr.attr,
+	&sensor_dev_attr_temp1_auto_range.dev_attr.attr,
+	&sensor_dev_attr_temp1_crit_max.dev_attr.attr,
+	&sensor_dev_attr_temp1_crit_hyst.dev_attr.attr,
+	&sensor_dev_attr_temp2_input.dev_attr.attr,
+	&sensor_dev_attr_temp2_label.dev_attr.attr,
+	&sensor_dev_attr_temp2_alarm.dev_attr.attr,
+	&sensor_dev_attr_temp2_crit_alarm.dev_attr.attr,
+	&sensor_dev_attr_temp2_max.dev_attr.attr,
+	&sensor_dev_attr_temp2_min.dev_attr.attr,
+	&sensor_dev_attr_temp2_offset.dev_attr.attr,
+	&sensor_dev_attr_temp2_auto_min.dev_attr.attr,
+	&sensor_dev_attr_temp2_auto_range.dev_attr.attr,
+	&sensor_dev_attr_temp2_crit_max.dev_attr.attr,
+	&sensor_dev_attr_temp2_crit_hyst.dev_attr.attr,
+	&sensor_dev_attr_temp3_input.dev_attr.attr,
+	&sensor_dev_attr_temp3_label.dev_attr.attr,
+	&sensor_dev_attr_temp3_fault.dev_attr.attr,
+	&sensor_dev_attr_temp3_alarm.dev_attr.attr,
+	&sensor_dev_attr_temp3_crit_alarm.dev_attr.attr,
+	&sensor_dev_attr_temp3_max.dev_attr.attr,
+	&sensor_dev_attr_temp3_min.dev_attr.attr,
+	&sensor_dev_attr_temp3_offset.dev_attr.attr,
+	&sensor_dev_attr_temp3_auto_min.dev_attr.attr,
+	&sensor_dev_attr_temp3_auto_range.dev_attr.attr,
+	&sensor_dev_attr_temp3_crit_max.dev_attr.attr,
+	&sensor_dev_attr_temp3_crit_hyst.dev_attr.attr,
+	&sensor_dev_attr_fan1_input.dev_attr.attr,
+	&sensor_dev_attr_fan1_min.dev_attr.attr,
+	&sensor_dev_attr_fan1_alarm.dev_attr.attr,
+	&sensor_dev_attr_fan2_input.dev_attr.attr,
+	&sensor_dev_attr_fan2_min.dev_attr.attr,
+	&sensor_dev_attr_fan2_alarm.dev_attr.attr,
+	&sensor_dev_attr_fan3_input.dev_attr.attr,
+	&sensor_dev_attr_fan3_min.dev_attr.attr,
+	&sensor_dev_attr_fan3_alarm.dev_attr.attr,
+	&sensor_dev_attr_fan4_input.dev_attr.attr,
+	&sensor_dev_attr_fan4_min.dev_attr.attr,
+	&sensor_dev_attr_fan4_alarm.dev_attr.attr,
+	&sensor_dev_attr_pwm1.dev_attr.attr,
+	&sensor_dev_attr_pwm1_freq.dev_attr.attr,
+	&sensor_dev_attr_pwm1_enable.dev_attr.attr,
+	&sensor_dev_attr_pwm1_max.dev_attr.attr,
+	&sensor_dev_attr_pwm1_min.dev_attr.attr,
+	&sensor_dev_attr_pwm2.dev_attr.attr,
+	&sensor_dev_attr_pwm2_freq.dev_attr.attr,
+	&sensor_dev_attr_pwm2_enable.dev_attr.attr,
+	&sensor_dev_attr_pwm2_max.dev_attr.attr,
+	&sensor_dev_attr_pwm2_min.dev_attr.attr,
+	&sensor_dev_attr_pwm3.dev_attr.attr,
+	&sensor_dev_attr_pwm3_freq.dev_attr.attr,
+	&sensor_dev_attr_pwm3_enable.dev_attr.attr,
+	&sensor_dev_attr_pwm3_max.dev_attr.attr,
+	&sensor_dev_attr_pwm3_min.dev_attr.attr,
+	NULL,
+};
+
+/* The list of chips we support - these index into the following structure */
+
+#define ADT7475 0
+#define ADT7475_MAX_ID 1
+
+static struct adt7475_chip {
+	const char *name;
+	struct attribute_group group;
+} adt7475_chips[ADT7475_MAX_ID] = {
+	{ .name = "adt7475",
+	  .group = {
+		  .attrs = adt7475_attrs,
+	  }
+	},
+};
+
+static int adt7475_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+	struct i2c_client *client;
+	struct adt7475_data *data;
+	unsigned char val;
+	int ret = 0;
+
+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
+		return 0;
+	}
+
+	/* Figure out what type of sensor is attached */
+	data = kzalloc(sizeof(*data), GFP_KERNEL);
+
+	if (data == NULL) {
+		return -ENOMEM;
+	}
+
+	client = &data->client;
+	i2c_set_clientdata(client, data);
+	client->addr = address;
+	client->adapter = adapter;
+	client->driver = &adt7475_driver;
+	client->flags = 0;
+
+	/* Check the company version first */
+
+	if (i2c_smbus_read_byte_data(client, REG_VENDID) != 0x41) {
+		dev_err(&adapter->dev, "This is not an adt7475 part\n");
+		goto efree;
+	}
+
+	/* Then check the part number */
+	val = i2c_smbus_read_byte_data(client, REG_DEVID);
+
+	if (val == 0x75)
+		data->type = ADT7475;
+	else {
+		dev_err(&adapter->dev,
+		"Couldn't detect a adt7475 part at 0x%02x\n", address);
+
+		goto efree;
+	}
+
+	/* Record how the temp registers are presented, either 2's complement
+	   or offset 64
+	*/
+
+	data->temptype = i2c_smbus_read_byte_data(client, REG_CONFIG5) & 3;
+
+	/* FIXME: Get the reading type */
+	/* FIXME:  Get the scale of the temprature readings */
+
+	strlcpy(client->name, adt7475_chips[data->type].name, I2C_NAME_SIZE);
+
+	data->valid = 0;
+        mutex_init(&data->lock);
+
+	ret = i2c_attach_client(client);
+
+	if (ret) {
+		goto efree;
+	}
+
+	ret = sysfs_create_group(&client->dev.kobj, &adt7475_chips[data->type].group);
+	if (ret) {
+		goto edetach;
+	}
+
+	data->class_dev = hwmon_device_register(&client->dev);
+
+	if (!IS_ERR(data->class_dev))
+		return 0;
+
+	ret = PTR_ERR(data->class_dev);
+
+	sysfs_remove_group(&client->dev.kobj, &adt7475_chips[data->type].group);
+ edetach:
+	i2c_detach_client(client);
+ efree:
+	kfree(data);
+	return ret;
+}
+
+static int adt7475_attach_adapter(struct i2c_adapter *adapter)
+{
+	if (!(adapter->class & I2C_CLASS_HWMON))
+		return 0;
+
+	return i2c_probe(adapter, &addr_data, adt7475_detect);
+}
+
+static int adt7475_detach_client(struct i2c_client *client)
+{
+	struct adt7475_data *data = i2c_get_clientdata(client);
+	int ret = 0;
+
+	hwmon_device_unregister(data->class_dev);
+	sysfs_remove_group(&client->dev.kobj, &adt7475_chips[data->type].group);
+
+	ret = i2c_detach_client(client);
+	if (!ret)
+		kfree(data);
+	return ret;
+}
+
+static struct i2c_driver adt7475_driver = {
+	.driver = {
+		.name   = "adt7475",
+	},
+	.attach_adapter = adt7475_attach_adapter,
+	.detach_client  = adt7475_detach_client,
+};
+
+static struct adt7475_data *adt7475_update_device(struct device *dev)
+{
+	struct i2c_client *client = to_i2c_client(dev);
+	struct adt7475_data *data = i2c_get_clientdata(client);
+	u8 ext;
+	int i;
+
+	mutex_lock(&data->lock);
+
+	if (!time_after(jiffies, data->updated + HZ * 2) && data->valid) {
+		mutex_unlock(&data->lock);
+		return data;
+	}
+
+	data->alarms = adt7475_read(REG_STATUS2) << 8;
+	data->alarms |= adt7475_read(REG_STATUS1);
+
+	ext = adt7475_read(REG_EXTEND1);
+
+	/* Get the voltage readings */
+
+	for(i = 0; i < ADT7475_VOLTAGE_COUNT; i++) {
+		data->voltage[INPUT][i] = (adt7475_read(VOLTAGE_REG(i)) << 2) |
+			((ext >> ((i + 1) * 2)) & 3);
+
+		/* Adjust these values so they match the input precision */
+
+		data->voltage[MIN][i] = adt7475_read(VOLTAGE_MIN_REG(i)) << 2;
+		data->voltage[MAX][i] = adt7475_read(VOLTAGE_MAX_REG(i)) << 2;
+	}
+
+	ext = adt7475_read(REG_EXTEND2);
+
+	for(i = 0; i < ADT7475_TEMP_COUNT; i++) {
+		data->temp[INPUT][i] = (adt7475_read(TEMP_REG(i)) << 2) |
+			((ext >> ((i + 1) * 2)) & 3);
+
+		/* Adjust these values so they match the input precision */
+
+		data->temp[MIN][i] = adt7475_read(TEMP_MIN_REG(i)) << 2;
+		data->temp[MAX][i] = adt7475_read(TEMP_MAX_REG(i)) << 2;
+		data->temp[AUTOMIN][i] = adt7475_read(TEMP_TMIN_REG(i)) << 2;
+		data->temp[THERM][i] = adt7475_read(TEMP_THERM_REG(i)) << 2;
+
+		data->temp[OFFSET][i] = adt7475_read(TEMP_OFFSET_REG(i));
+	}
+
+	data->temp[HYSTERSIS][0] = (u16) adt7475_read(REG_REMOTE1_HYSTERSIS);
+	data->temp[HYSTERSIS][1] = (u16) adt7475_read(REG_REMOTE1_HYSTERSIS);
+	data->temp[HYSTERSIS][2] = (u16) adt7475_read(REG_REMOTE2_HYSTERSIS);
+
+	for(i = 0; i < ADT7475_TACH_COUNT; i++) {
+		data->tach[INPUT][i] = adt7475_read_word(client, TACH_REG(i));
+		data->tach[MIN][i] = adt7475_read_word(client, TACH_MIN_REG(i));
+	}
+
+	for(i = 0; i < ADT7475_PWM_COUNT; i++) {
+		data->pwm[INPUT][i] = adt7475_read(PWM_REG(i));
+		data->pwm[MAX][i] = adt7475_read(PWM_MAX_REG(i));
+		data->pwm[MIN][i] = adt7475_read(PWM_MIN_REG(i));
+		data->pwm[CONTROL][i] = adt7475_read(PWM_CONFIG_REG(i));
+	}
+
+	data->range[0] =  adt7475_read(TEMP_TRANGE_REG(0));
+	data->range[1] =  adt7475_read(TEMP_TRANGE_REG(1));
+	data->range[2] =  adt7475_read(TEMP_TRANGE_REG(2));
+
+	data->updated = jiffies;
+	data->valid = 1;
+
+	mutex_unlock(&data->lock);
+
+	return data;
+}
+
+static int __init sensors_adt7475_init(void)
+{
+	return i2c_add_driver(&adt7475_driver);
+}
+
+static void __exit sensors_adt7475_exit(void)
+{
+	i2c_del_driver(&adt7475_driver);
+}
+
+MODULE_AUTHOR("Advanced Micro Devices, Inc");
+MODULE_DESCRIPTION("adt7475 driver");
+MODULE_LICENSE("GPL");
+
+module_init(sensors_adt7475_init);
+module_exit(sensors_adt7475_exit);

[-- Attachment #3: Type: text/plain, Size: 153 bytes --]

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] First shot at Asus M2N-SLI Deluxe config file

[Matt Roberds]

On Tue, 26 Feb 2008, Jordan Crouse wrote:
> On 21/02/08 08:19 -0600, Matt Roberds wrote:
>
>> My second shot is attached.  I have changed the name to inlclude the
>> "deluxe" designation.  This second shot also requires a small patch to
>> Jordan Crouse's latest adt7475.c driver to work; a diff is attached as
>> well.
>
> Thanks.  Patch integrated into the driver and I also removed the URL to
> the datasheet due to the upstream churn.  Full patch is attached.

Disclaimer: I haven't tried it yet.

Having said that, in show_voltage(), this patch has

> case LABEL:
>  return sprintf(buf, "%s\n",
>    sattr->index = 0 ? "1" : "2");

which I think should be

---
case LABEL:
  return sprintf(buf, "in%s\n",
    sattr->index = 0 ? "1" : "2");
---

Note the string constant "in".

Matt Roberds


_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] First shot at Asus M2N-SLI Deluxe config file

[Matt Roberds]

On Tue, 26 Feb 2008, Matt Roberds wrote:
> Disclaimer: I haven't tried it yet.

I tried it.  As is, you get (in part)

---
adt7475-i2c-5-2e
Adapter: SMBus nForce2 adapter at 1c40
1:         +0.00 V  (min =  +0.00 V, max =  +2.99 V)   ALARM
2:         +3.24 V  (min =  +0.00 V, max =  +4.28 V) 
---

so I think the "in" constant is needed to turn these into standard
names.

Matt Roberds


_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] First shot at Asus M2N-SLI Deluxe config file

[Hans de Goede]

Matt Roberds wrote:
> On Tue, 26 Feb 2008, Jordan Crouse wrote:
>> On 21/02/08 08:19 -0600, Matt Roberds wrote:
>>
>>> My second shot is attached.  I have changed the name to inlclude the
>>> "deluxe" designation.  This second shot also requires a small patch to
>>> Jordan Crouse's latest adt7475.c driver to work; a diff is attached as
>>> well.
>> Thanks.  Patch integrated into the driver and I also removed the URL to
>> the datasheet due to the upstream churn.  Full patch is attached.
> 
> Disclaimer: I haven't tried it yet.
> 
> Having said that, in show_voltage(), this patch has
> 
>> case LABEL:
>>  return sprintf(buf, "%s\n",
>>    sattr->index = 0 ? "1" : "2");
> 
> which I think should be
> 
> ---
> case LABEL:
>   return sprintf(buf, "in%s\n",
>     sattr->index = 0 ? "1" : "2");
> ---
> 
> Note the string constant "in".
> 

Ah, good catch.

Actually, the xxx_label attributes should be completely removed, those are only 
meant to be use by drivers which can give an end user presentable labels, other 
drivers should rely on a proper label being set in /etc/sensors.conf

Regards,

Hans

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] First shot at Asus M2N-SLI Deluxe config file

[Hans de Goede]

Jordan Crouse wrote:
> On 26/02/08 20:33 +0100, Hans de Goede wrote:
>> Matt Roberds wrote:
>>> On Tue, 26 Feb 2008, Jordan Crouse wrote:
>>>> On 21/02/08 08:19 -0600, Matt Roberds wrote:
>>>>
>>>>> My second shot is attached.  I have changed the name to inlclude the
>>>>> "deluxe" designation.  This second shot also requires a small patch to
>>>>> Jordan Crouse's latest adt7475.c driver to work; a diff is attached as
>>>>> well.
>>>> Thanks.  Patch integrated into the driver and I also removed the URL to
>>>> the datasheet due to the upstream churn.  Full patch is attached.
>>> Disclaimer: I haven't tried it yet.
>>> Having said that, in show_voltage(), this patch has
>>>> case LABEL:
>>>>  return sprintf(buf, "%s\n",
>>>>    sattr->index = 0 ? "1" : "2");
>>> which I think should be
>>> ---
>>> case LABEL:
>>>   return sprintf(buf, "in%s\n",
>>>     sattr->index = 0 ? "1" : "2");
>>> ---
>>> Note the string constant "in".
>> Ah, good catch.
>>
>> Actually, the xxx_label attributes should be completely removed, those are 
>> only meant to be use by drivers which can give an end user presentable 
>> labels, other drivers should rely on a proper label being set in 
>> /etc/sensors.conf
> 
> I don't understand the criteria - what do you mean by "presentable
> labels"?
> 

Sorry, I mean labels like:

Northbridge Temp
CPU Temp
Powersupply1 Temp

Etc, remote / local doesn't say much to the end user, as the user doesn't know 
where the adt7475 ic is located, nor where the remote temp diode will be, so 
the default temp1 temp2 labels will be as usefull as locale_temp and remote_temp.

Regards,

Hans

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] First shot at Asus M2N-SLI Deluxe config file

[Jordan Crouse]

On 26/02/08 20:33 +0100, Hans de Goede wrote:
> Matt Roberds wrote:
>> On Tue, 26 Feb 2008, Jordan Crouse wrote:
>>> On 21/02/08 08:19 -0600, Matt Roberds wrote:
>>>
>>>> My second shot is attached.  I have changed the name to inlclude the
>>>> "deluxe" designation.  This second shot also requires a small patch to
>>>> Jordan Crouse's latest adt7475.c driver to work; a diff is attached as
>>>> well.
>>> Thanks.  Patch integrated into the driver and I also removed the URL to
>>> the datasheet due to the upstream churn.  Full patch is attached.
>> Disclaimer: I haven't tried it yet.
>> Having said that, in show_voltage(), this patch has
>>> case LABEL:
>>>  return sprintf(buf, "%s\n",
>>>    sattr->index = 0 ? "1" : "2");
>> which I think should be
>> ---
>> case LABEL:
>>   return sprintf(buf, "in%s\n",
>>     sattr->index = 0 ? "1" : "2");
>> ---
>> Note the string constant "in".
>
> Ah, good catch.
>
> Actually, the xxx_label attributes should be completely removed, those are 
> only meant to be use by drivers which can give an end user presentable 
> labels, other drivers should rely on a proper label being set in 
> /etc/sensors.conf

I don't understand the criteria - what do you mean by "presentable
labels"?

Jordan

-- 
Jordan Crouse
Systems Software Development Engineer 
Advanced Micro Devices, Inc.



_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] First shot at Asus M2N-SLI Deluxe config file

[Hans de Goede]

Jordan Crouse wrote:
> On 26/02/08 21:39 +0100, Hans de Goede wrote:
>> Jordan Crouse wrote:
>>> On 26/02/08 20:33 +0100, Hans de Goede wrote:
>>>> Matt Roberds wrote:
>>>>> On Tue, 26 Feb 2008, Jordan Crouse wrote:
>>>>>> On 21/02/08 08:19 -0600, Matt Roberds wrote:
>>>>>>
>>>>>>> My second shot is attached.  I have changed the name to inlclude the
>>>>>>> "deluxe" designation.  This second shot also requires a small patch to
>>>>>>> Jordan Crouse's latest adt7475.c driver to work; a diff is attached as
>>>>>>> well.
>>>>>> Thanks.  Patch integrated into the driver and I also removed the URL to
>>>>>> the datasheet due to the upstream churn.  Full patch is attached.
>>>>> Disclaimer: I haven't tried it yet.
>>>>> Having said that, in show_voltage(), this patch has
>>>>>> case LABEL:
>>>>>>  return sprintf(buf, "%s\n",
>>>>>>    sattr->index = 0 ? "1" : "2");
>>>>> which I think should be
>>>>> ---
>>>>> case LABEL:
>>>>>   return sprintf(buf, "in%s\n",
>>>>>     sattr->index = 0 ? "1" : "2");
>>>>> ---
>>>>> Note the string constant "in".
>>>> Ah, good catch.
>>>>
>>>> Actually, the xxx_label attributes should be completely removed, those 
>>>> are only meant to be use by drivers which can give an end user 
>>>> presentable labels, other drivers should rely on a proper label being set 
>>>> in /etc/sensors.conf
>>> I don't understand the criteria - what do you mean by "presentable
>>> labels"?
>> Sorry, I mean labels like:
>>
>> Northbridge Temp
>> CPU Temp
>> Powersupply1 Temp
>>
>> Etc, remote / local doesn't say much to the end user, as the user doesn't 
>> know where the adt7475 ic is located, nor where the remote temp diode will 
>> be, so the default temp1 temp2 labels will be as usefull as locale_temp and 
>> remote_temp.
> 
> Okay - I understand.   So I should just get rid of all of the labels in
> the whole driver?  
> 

Yes, the foo#_label attributes are only there for the rare exception when the 
driver has knowledge about the pcb layouts used / about which motherboard it is 
operating on and which input is measuring what on that motherboard.

Regards,

Hans

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] First shot at Asus M2N-SLI Deluxe config file

[Jordan Crouse]

On 26/02/08 21:39 +0100, Hans de Goede wrote:
> Jordan Crouse wrote:
>> On 26/02/08 20:33 +0100, Hans de Goede wrote:
>>> Matt Roberds wrote:
>>>> On Tue, 26 Feb 2008, Jordan Crouse wrote:
>>>>> On 21/02/08 08:19 -0600, Matt Roberds wrote:
>>>>>
>>>>>> My second shot is attached.  I have changed the name to inlclude the
>>>>>> "deluxe" designation.  This second shot also requires a small patch to
>>>>>> Jordan Crouse's latest adt7475.c driver to work; a diff is attached as
>>>>>> well.
>>>>> Thanks.  Patch integrated into the driver and I also removed the URL to
>>>>> the datasheet due to the upstream churn.  Full patch is attached.
>>>> Disclaimer: I haven't tried it yet.
>>>> Having said that, in show_voltage(), this patch has
>>>>> case LABEL:
>>>>>  return sprintf(buf, "%s\n",
>>>>>    sattr->index = 0 ? "1" : "2");
>>>> which I think should be
>>>> ---
>>>> case LABEL:
>>>>   return sprintf(buf, "in%s\n",
>>>>     sattr->index = 0 ? "1" : "2");
>>>> ---
>>>> Note the string constant "in".
>>> Ah, good catch.
>>>
>>> Actually, the xxx_label attributes should be completely removed, those 
>>> are only meant to be use by drivers which can give an end user 
>>> presentable labels, other drivers should rely on a proper label being set 
>>> in /etc/sensors.conf
>> I don't understand the criteria - what do you mean by "presentable
>> labels"?
>
> Sorry, I mean labels like:
>
> Northbridge Temp
> CPU Temp
> Powersupply1 Temp
>
> Etc, remote / local doesn't say much to the end user, as the user doesn't 
> know where the adt7475 ic is located, nor where the remote temp diode will 
> be, so the default temp1 temp2 labels will be as usefull as locale_temp and 
> remote_temp.

Okay - I understand.   So I should just get rid of all of the labels in
the whole driver?  

Jordan

-- 
Jordan Crouse
Systems Software Development Engineer 
Advanced Micro Devices, Inc.



_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] First shot at Asus M2N-SLI Deluxe config file

[Jean Delvare]

Hi Matt,

On Thu, 21 Feb 2008 08:19:20 -0600 (CST), Matt Roberds wrote:
> On Wed, 20 Feb 2008 18:30:58 -0600 (CST), Matt Roberds wrote:
>> Here's a first shot at a config file for an Asus M2N-SLI Deluxe
>> motherboard.
> 
> My second shot is attached.  I have changed the name to inlclude the
> "deluxe" designation.  This second shot also requires a small patch to
> Jordan Crouse's latest adt7475.c driver to work; a diff is attached as
> well.

I've saved this as:
http://www.lm-sensors.org/wiki/Configurations/Asus/M2N-SLI%20Deluxe
so that it doesn't get lost.

-- 
Jean Delvare

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors