sensors-detect: Add support for NCT6775F and

The following patch adds support for SE97 to sensors-detect. It also displays the new chip names for W83677HG-I (NCT677xF).

---
Index: prog/detect/sensors-detect
=================================> --- prog/detect/sensors-detect (revision 5850)
+++ prog/detect/sensors-detect (working copy)

(quoted diff) +15 -3

@@ -1190,6 +1190,11 @@ use vars qw(@i2c_adapter_names);
 		i2c_addrs => [0x18..0x1f],
 		i2c_detect => sub { jedec_JC42_4_detect(@_, 0); },
 	}, {
+		name => "NXP SE97/SE97B",
+		driver => "to-be-written",
+		i2c_addrs => [0x18..0x1f],
+		i2c_detect => sub { jedec_JC42_4_detect(@_, 1); },
+	}, {
 		name => "Smart Battery",
 		driver => "sbs", # ACPI driver, not sure if it always works
 		i2c_addrs => [0x0b],

@@ -1730,7 +1735,7 @@ use constant FEAT_SMBUS	=> (1 << 7);
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
-		name => "Nuvoton W83677HG-I Super IO Sensors",
+		name => "Nuvoton W83677HG-I (NCT6771F/NCT6772F/NCT6775F) Super IO Sensors",
 		driver => "to-be-written",	# Probably w83627ehf
 		devid => 0xB470,
 		devid_mask => 0xFFF0,

@@ -5309,7 +5314,7 @@ sub max6655_detect
 	return 6;
 }
 
-# Chip to detect: 0 = STTS424
+# Chip to detect: 0 = STTS424, 1 = SE97/SE97B
 # Registers used:
 #   0x00: Capabilities
 #   0x01: Configuration

@@ -5332,9 +5337,13 @@ sub jedec_JC42_4_detect
 	# Check for manufacturer and device ID
 	$manid = i2c_smbus_read_byte_data($file, 0x06);
 	$devid = i2c_smbus_read_byte_data($file, 0x07);
+
 	if ($chip = 0) {
 		return unless $manid = 0x10;		# STMicrolectronics
 		return unless $devid = 0x00;		# STTS424
+	} elsif ($chip = 1) {
+		return unless $manid = 0x11;		# NXP
+		return unless $devid = 0xa2;		# SE97
 	}
 
 	# Now, do it all again with words. Note that we get

@@ -5342,7 +5351,7 @@ sub jedec_JC42_4_detect
 
 	# Check for unused bits
 	$reg = i2c_smbus_read_word_data($file, 0x00);
-	return if $reg < 0 || $reg & 0xc0ff;
+	return if $reg < 0 || $reg & 0x00ff;
 
 	$manid = i2c_smbus_read_word_data($file, 0x06);
 	$devid = i2c_smbus_read_word_data($file, 0x07);

@@ -5350,6 +5359,9 @@ sub jedec_JC42_4_detect
 	if ($chip = 0) {
 		return unless $manid = 0x4a10;		# STMicrolectronics
 		return unless ($devid & 0xfeff) = 0x0000; # STTS424
+	} elsif ($chip = 1) {
+		return unless $manid = 0x3111;		# NXP
+		return unless ($devid & 0xfcff) = 0x00a2; # SE97
 	}
 
 	return 5;

Index: CHANGES
=================================> --- CHANGES (revision 5850)
+++ CHANGES (working copy)

Quoted 4 lines · Jean Delvare

Looks all sane, thanks for doing this. Shall I commit it, or should I create a developer account and let you commit it? You already have an account for the wiki, letting you commit to the repository is only one configuration line away. So it's as you prefer.

I really prefer the git way of doing things, meaning I prefer to have someone else have a close look at my code, and not commit my own junk myself. I also never worked with svn before, so I would be a bit concerned about screwing up the repository. Not really a good idea to make my first svn commit into a public repository.

So let's keep it as is for now, and go ahead and commit. We can revisit that when you get tired having to deal with my patches.

Any plans to switch to git ?

Quoted 6 lines · Guenter Roeck

Quoted 4 lines · Jean Delvare

Looks all sane, thanks for doing this. Shall I commit it, or should I create a developer account and let you commit it? You already have an account for the wiki, letting you commit to the repository is only one configuration line away. So it's as you prefer.

Quoted 5 lines

I really prefer the git way of doing things, meaning I prefer to have someone else have a close look at my code, and not commit my own junk myself. I also never worked with svn before, so I would be a bit concerned about screwing up the repository. Not really a good idea to make my first svn commit into a public repository.

SVN is really easy. It's almost the same as CVS if you've used CVS before. And it's definitely easier than git.

Quoted 2 lines

So let's keep it as is for now, and go ahead and commit. We can revisit that when you get tired having to deal with my patches.

I'm tired already ;)

Just joking. I'll be glad to review and commit your patches if such is your desire.

Quoted 13 lines · Jean Delvare

Quoted 11 lines · Guenter Roeck

Quoted 4 lines · Jean Delvare

Looks all sane, thanks for doing this. Shall I commit it, or should I create a developer account and let you commit it? You already have an account for the wiki, letting you commit to the repository is only one configuration line away. So it's as you prefer.

I really prefer the git way of doing things, meaning I prefer to have someone else have a close look at my code, and not commit my own junk myself. I also never worked with svn before, so I would be a bit concerned about screwing up the repository. Not really a good idea to make my first svn commit into a public repository.

Quoted 3 lines

SVN is really easy. It's almost the same as CVS if you've used CVS before. And it's definitely easier than git.

Easier than git - really ? After having worked with git for several years, I am still amazed (or, rather, I am more and more amazed) how easy and fast things are with git. Granted, one problem is that it is also very easy to screw up, which makes it very difficult to use with junior engineers ...

Quoted 7 lines

Quoted 2 lines

So let's keep it as is for now, and go ahead and commit. We can revisit that when you get tired having to deal with my patches.

I'm tired already ;)

Just joking. I'll be glad to review and commit your patches if such is your desire.

Let's at least stick with it for now.

This patch adds support for several JC42.4 compliant temperature sensors to sensors-detect.

---
Index: prog/detect/sensors-detect
=================================> --- prog/detect/sensors-detect (revision 5851)
+++ prog/detect/sensors-detect (working copy)

(quoted diff) +35 -0

@@ -1195,6 +1195,51 @@
 		i2c_addrs => [0x18..0x1f],
 		i2c_detect => sub { jedec_JC42_4_detect(@_, 1); },
 	}, {
+		name => "NXP SE98",
+		driver => "to-be-written",
+		i2c_addrs => [0x18..0x1f],
+		i2c_detect => sub { jedec_JC42_4_detect(@_, 2); },
+	}, {
+		name => "Analog Devices ADT7408",
+		driver => "to-be-written",
+		i2c_addrs => [0x18..0x1f],
+		i2c_detect => sub { jedec_JC42_4_detect(@_, 3); },
+	}, {
+		name => "IDT TS3000/TSE2002",
+		driver => "to-be-written",
+		i2c_addrs => [0x18..0x1f],
+		i2c_detect => sub { jedec_JC42_4_detect(@_, 4); },
+	}, {
+		name => "Maxim MAX6604",
+		driver => "to-be-written",
+		i2c_addrs => [0x18..0x1f],
+		i2c_detect => sub { jedec_JC42_4_detect(@_, 5); },
+	}, {
+		name => "Microchip MCP98242",
+		driver => "to-be-written",
+		i2c_addrs => [0x18..0x1f],
+		i2c_detect => sub { jedec_JC42_4_detect(@_, 6); },
+	}, {
+		name => "Microchip MCP98243",
+		driver => "to-be-written",
+		i2c_addrs => [0x18..0x1f],
+		i2c_detect => sub { jedec_JC42_4_detect(@_, 7); },
+	}, {
+		name => "Microchip MCP9843",
+		driver => "to-be-written",
+		i2c_addrs => [0x18..0x1f],
+		i2c_detect => sub { jedec_JC42_4_detect(@_, 8); },
+	}, {

(quoted diff) +60 -3

 		name => "Smart Battery",
 		driver => "sbs", # ACPI driver, not sure if it always works
 		i2c_addrs => [0x0b],

@@ -5314,7 +5359,10 @@
 	return 6;
 }
 
-# Chip to detect: 0 = STTS424, 1 = SE97/SE97B
+# Chip to detect: 0 = STTS424, 1 = SE97/SE97B, 2 = SE98, 3 = ADT7408,
+#                 4 = TS3000/TSE2002, 5 = MAX6604, 6 = MCP98242,
+#                 7 = MCP98243, 8 = MCP9843, 9 = CAT6095 / CAT34TS02,
+#                 10 = STTS424E
 # Registers used:
 #   0x00: Capabilities
 #   0x01: Configuration

@@ -5340,10 +5388,37 @@
 
 	if ($chip = 0) {
 		return unless $manid = 0x10;		# STMicrolectronics
-		return unless $devid = 0x00;		# STTS424
+		return unless $devid = 0x01;		# STTS424
 	} elsif ($chip = 1) {
 		return unless $manid = 0x11;		# NXP
 		return unless $devid = 0xa2;		# SE97
+	} elsif ($chip = 2) {
+		return unless $manid = 0x11;		# NXP
+		return unless $devid = 0xa1;		# SE98
+	} elsif ($chip = 3) {
+		return unless $manid = 0x11;		# ADT
+		return unless $devid = 0x08;		# ADT7408
+	} elsif ($chip = 4) {
+		return unless $manid = 0x00;		# IDT
+		return unless $devid = 0x29;		# TS3000/TSE2002
+	} elsif ($chip = 5) {
+		return unless $manid = 0x00;		# MAXIM
+		return unless $devid = 0x3e;		# MAX6604
+	} elsif ($chip = 6) {
+		return unless $manid = 0x00;		# MCP
+		return unless $devid = 0x20;		# MCP98242
+	} elsif ($chip = 7) {
+		return unless $manid = 0x00;		# MCP
+		return unless $devid = 0x21;		# MCP98243
+	} elsif ($chip = 8) {
+		return unless $manid = 0x00;		# MCP
+		return unless $devid = 0x00;		# MCP9843
+	} elsif ($chip = 9) {
+		return unless $manid = 0x1b;		# ONS
+		return unless $devid = 0x08;		# CAT6095 / CAT34TS02
+	} elsif ($chip = 10) {
+		return unless $manid = 0x10;		# STMicrolectronics
+		return unless $devid = 0x00;		# STTS424E02
 	}
 
 	# Now, do it all again with words. Note that we get

@@ -5358,10 +5433,37 @@
 	return if $manid < 0 || $devid < 0;
 	if ($chip = 0) {
 		return unless $manid = 0x4a10;		# STMicrolectronics
-		return unless ($devid & 0xfeff) = 0x0000; # STTS424
+		return unless ($devid & 0xfeff) = 0x0001; # STTS424
 	} elsif ($chip = 1) {
 		return unless $manid = 0x3111;		# NXP
 		return unless ($devid & 0xfcff) = 0x00a2; # SE97
+	} elsif ($chip = 2) {
+		return unless $manid = 0x3111;		# NXP
+		return unless ($devid & 0xfcff) = 0x00a1; # SE98
+	} elsif ($chip = 3) {
+		return unless $manid = 0xd411;		# ADT
+		return unless $devid = 0x0108;		# ADT7408
+	} elsif ($chip = 4) {
+		return unless $manid = 0xb300;		# IDT
+		return unless $devid = 0x0329;		# TS3000/TSE2002
+	} elsif ($chip = 5) {
+		return unless $manid = 0x4d00;		# MAXIM
+		return unless $devid = 0x003e;		# MAX6604
+	} elsif ($chip = 6) {
+		return unless $manid = 0x5400;		# MCP
+		return unless ($devid & 0xfcff) = 0x0020; # MCP98242
+	} elsif ($chip = 7) {
+		return unless $manid = 0x5400;		# MCP
+		return unless ($devid & 0xfcff) = 0x0021; # MCP98243
+	} elsif ($chip = 8) {
+		return unless $manid = 0x5400;		# MCP
+		return unless ($devid & 0xfcff) = 0x0000; # MCP9843
+	} elsif ($chip = 9) {
+		return unless $manid = 0x091b;		# ONS
+		return unless ($devid & 0xe0ff) = 0x0008; # CAT6095 / CAT34TS02
+	} elsif ($chip = 10) {
+		return unless $manid = 0x4a10;		# STMicrolectronics
+		return unless ($devid & 0xfeff) = 0x0000; # STTS424E02
 	}
 
 	return 5;

Index: CHANGES
=================================> --- CHANGES (revision 5851)
+++ CHANGES (working copy)

(quoted diff) +1 -0

@@ -20,6 +20,7 @@
                   Add support for STMicroelectronics STTS424
                   Add support for NXP SE97 / SE97B
                   Add reference to NCT6771F/NCT6772F/NCT6775F
+                  Add support for several JC42.4 compliant temperature sensors
 
 3.1.2 (2010-02-02)
   libsensors: Support upcoming sysfs path to i2c adapters

This patch adds support for max6695/96 to sensors-detect.

---
Index: prog/detect/sensors-detect
=================================> --- prog/detect/sensors-detect (revision 5857)
+++ prog/detect/sensors-detect (working copy)

(quoted diff) +18 -1

@@ -921,8 +921,13 @@
 		name => "Maxim MAX6680/MAX6681",
 		driver => "lm90",
 		i2c_addrs => [0x18..0x1a, 0x29..0x2b, 0x4c..0x4e],
-		i2c_detect => sub { lm90_detect(@_, 7); },
+		i2c_detect => sub { max6680_95_detect(@_, 0); },
 	}, {
+		name => "Maxim MAX6695/MAX6696",
+		driver => "lm90",
+		i2c_addrs => [0x18..0x1a, 0x29..0x2b, 0x4c..0x4e],
+		i2c_detect => sub { max6680_95_detect(@_, 1); },
+	}, {
 		name => "Winbond W83L771W/G",
 		driver => "to-be-written",
 		i2c_addrs => [0x4c],

@@ -4051,10 +4056,46 @@
 	return $confidence;
 }
 
+# Chip to detect: 0 = MAX6680/81, 1 = MAX6695/96
+# Registers used:
+#   0x03: Configuration
+#   0x04: Conversion rate
+#   0x12: Status2
+#   0x16: Overtemperature 2
+#   0xfe: Manufacturer ID
+#   0xff: Chip ID / die revision
+sub max6680_95_detect
+{
+	my ($file, $addr, $chip) = @_;
+	my $mid = i2c_smbus_read_byte_data($file, 0xfe);

(quoted diff) +15 -1

+		return if $mid != 0x4d;		# Maxim
+		return 8 if $cid = 0x01;	# MAX6680/MAX6681
+	}
+	if ($chip = 1) {
+		return if ($conf & 0x10) != 0;
+		return if ($status2 & 0x01) != 0;
+		return if $rate > 0x07;
+		return if $emerg = $rate;
+		return if $mid != 0x4d;		# Maxim
+		return 8 if $cid = 0x01;	# MAX6695/MAX6696
+	}
+	return;
+}
+
 # Chip to detect: 0 = LM90, 1 = LM89/LM99, 2 = LM86, 3 = ADM1032,
 #		  4 = MAX6654, 5 = ADT7461,
 #		  6 = MAX6646/MAX6647/MAX6648/MAX6649/MAX6692,
-#		  7 = MAX6680/MAX6681, 8 = W83L771W/G, 9 = TMP401, 10 = TMP411,
+#		  7 = unused, 8 = W83L771W/G, 9 = TMP401, 10 = TMP411,
 #		  11 = W83L771AWG/ASG, 12 = MAX6690
 # Registers used:
 #   0x03: Configuration

(quoted diff) +0 -0

 	if ($chip = 8) {
 		return if ($conf & 0x2a) != 0;

Hi Guenter,

Quoted 46 lines · Guenter Roeck

This patch adds support for max6695/96 to sensors-detect.

---
Index: prog/detect/sensors-detect
=================================> > --- prog/detect/sensors-detect (revision 5857)
+++ prog/detect/sensors-detect (working copy)

(quoted diff) +27 -1

@@ -921,8 +921,13 @@
 		name => "Maxim MAX6680/MAX6681",
 		driver => "lm90",
 		i2c_addrs => [0x18..0x1a, 0x29..0x2b, 0x4c..0x4e],
-		i2c_detect => sub { lm90_detect(@_, 7); },
+		i2c_detect => sub { max6680_95_detect(@_, 0); },
 	}, {
+		name => "Maxim MAX6695/MAX6696",
+		driver => "lm90",
+		i2c_addrs => [0x18..0x1a, 0x29..0x2b, 0x4c..0x4e],
+		i2c_detect => sub { max6680_95_detect(@_, 1); },
+	}, {
 		name => "Winbond W83L771W/G",
 		driver => "to-be-written",
 		i2c_addrs => [0x4c],

@@ -4051,10 +4056,46 @@
 	return $confidence;
 }
 
+# Chip to detect: 0 = MAX6680/81, 1 = MAX6695/96
+# Registers used:
+#   0x03: Configuration
+#   0x04: Conversion rate
+#   0x12: Status2
+#   0x16: Overtemperature 2
+#   0xfe: Manufacturer ID
+#   0xff: Chip ID / die revision
+sub max6680_95_detect
+{
+	my ($file, $addr, $chip) = @_;
+	my $mid = i2c_smbus_read_byte_data($file, 0xfe);
+	my $cid = i2c_smbus_read_byte_data($file, 0xff);
+	my $conf = i2c_smbus_read_byte_data($file, 0x03);
+	my $rate = i2c_smbus_read_byte_data($file, 0x04);
+	my $emerg = i2c_smbus_read_byte_data($file, 0x16);
+	my $status2 = i2c_smbus_read_byte_data($file, 0x12);
+
+	if ($chip = 0) {
+		return if ($conf & 0x03) != 0;
+		return if $rate > 0x07;

Review line 4080

Quoted 1 line

(quoted diff) +1 -0

+		return if $emerg != $rate;

Please take a look at max6657_detect(). Obviously you assume that the SMBus read commands above were executed in a specific order, which isn't actually guaranteed, because sensors-detect has a register cache to speed up detection. You really want to pass NO_CACHE as a third parameter if you want to by-pass the cache and thus ensure that the read order is as desired.

Also, as discussed before, comparing $emerg and $rate is likely to work in most cases, but isn't 100% reliable. You might want to consider the following sequence instead:

	my $mid = i2c_smbus_read_byte_data($file, 0xfe, NO_CACHE);
	my $emerg1 = i2c_smbus_read_byte_data($file, 0x16, NO_CACHE);
	my $rate = i2c_smbus_read_byte_data($file, 0x04, NO_CACHE);
	my $emerg2 = i2c_smbus_read_byte_data($file, 0x16, NO_CACHE);

	if ($emerg1 != $emerg2)
		# MAX6680/MAX6681
	else
		# MAX6695/MAX6696

This is guaranteed to work because $mid and $rate can't have the same value.

Quoted 29 lines

(quoted diff) +15 -2

+		return if $mid != 0x4d;		# Maxim
+		return 8 if $cid = 0x01;	# MAX6680/MAX6681
+	}
+	if ($chip = 1) {
+		return if ($conf & 0x10) != 0;
+		return if ($status2 & 0x01) != 0;
+		return if $rate > 0x07;
+		return if $emerg = $rate;
+		return if $mid != 0x4d;		# Maxim
+		return 8 if $cid = 0x01;	# MAX6695/MAX6696
+	}
+	return;
+}
+
 # Chip to detect: 0 = LM90, 1 = LM89/LM99, 2 = LM86, 3 = ADM1032,
 #		  4 = MAX6654, 5 = ADT7461,
 #		  6 = MAX6646/MAX6647/MAX6648/MAX6649/MAX6692,
-#		  7 = MAX6680/MAX6681, 8 = W83L771W/G, 9 = TMP401, 10 = TMP411,
+#		  7 = unused, 8 = W83L771W/G, 9 = TMP401, 10 = TMP411,
 #		  11 = W83L771AWG/ASG, 12 = MAX6690
 # Registers used:
 #   0x03: Configuration

@@ -4116,10 +4157,7 @@
 		return 8 if $cid = 0x59;	# MAX6648/MAX6692
 	}
 	if ($chip = 7) {
-		return if ($conf & 0x03) != 0;

Review line 4161

Quoted 5 lines

(quoted diff) +1 -3

-		return if $rate > 0x07;
-		return if $mid != 0x4d;		# Maxim
-		return 8 if $cid = 0x01;	# MAX6680/MAX6681
+		return;
 	}

Why not skip it altogether? And same for the comment above? These are arbitrary numbers, it's totally OK if they don't follow each other.

Review line 4163

Quoted 2 lines

(quoted diff) +0 -0

 	if ($chip = 8) {
 		return if ($conf & 0x2a) != 0;