All of lore.kernel.org
 help / color / mirror / Atom feed
From: Guenter Roeck <guenter.roeck@ericsson.com>
To: lm-sensors@vger.kernel.org
Subject: [lm-sensors] [PATCH v2] sensors-detect: Add code to detect LM95245
Date: Sun, 10 Jul 2011 16:28:24 +0000	[thread overview]
Message-ID: <20110710162824.GA13134@ericsson.com> (raw)
In-Reply-To: <20110122171437.GA21444@ericsson.com>

v2: Fixed per review feedback. Tested code with LM95231 and LM95245.

---

Index: prog/detect/sensors-detect
=================================--- prog/detect/sensors-detect	(revision 5983)
+++ prog/detect/sensors-detect	(working copy)
@@ -1008,6 +1008,11 @@
 		i2c_addrs => [0x2b, 0x19, 0x2a],
 		i2c_detect => sub { lm95231_detect(@_, 1); },
 	}, {
+		name => "National Semiconductor LM95245",
+		driver => "lm95245",
+		i2c_addrs => [0x18, 0x19, 0x29, 0x4c, 0x4d],
+		i2c_detect => sub { lm95231_detect(@_, 2); },
+	}, {
 		name => "National Semiconductor LM63",
 		driver => "lm63",
 		i2c_addrs => [0x4c],
@@ -4540,12 +4545,14 @@
 	return 5;
 }
 
-# Chip to detect: 0 = LM95231, 1 = LM95241
+# Chip to detect: 0 = LM95231, 1 = LM95241, 2 = LM95245
 # Registers used:
 #   0x02: Status (3 unused bits)
 #   0x03: Configuration (3 unused bits)
-#   0x06: Remote diode filter control (6 unused bits)
-#   0x30: Remote diode model type select (6 unused bits)
+#   0x06: Remote diode filter control (6 unused bits, LM95231 and LM95241)
+#   0x30: Remote diode model type select (6 unused bits, LM95231 and LM95241)
+#   0x30: Local Temperature LSB (5 unused bits, LM95245)
+#   0x33: Status register 2 (6 unused bits, LM95245)
 #   0xfe: Manufacturer ID
 #   0xff: Revision ID
 sub lm95231_detect
@@ -4555,13 +4562,21 @@
 	my $cid = i2c_smbus_read_byte_data($file, 0xff);
 
 	return if $mid != 0x01;				# National Semiconductor
-	return if $chip = 0 && $cid != 0xa1;		# LM95231
-	return if $chip = 1 && $cid != 0xa4;		# LM95241
 
-	return if i2c_smbus_read_byte_data($file, 0x02) & 0x70;
-	return if i2c_smbus_read_byte_data($file, 0x03) & 0x89;
-	return if i2c_smbus_read_byte_data($file, 0x06) & 0xfa;
-	return if i2c_smbus_read_byte_data($file, 0x30) & 0xfa;
+	if ($chip = 0 || $chip = 1) {
+		return if $chip = 0 && $cid != 0xa1;	# LM95231
+		return if $chip = 1 && $cid != 0xa4;	# LM95241
+		return if i2c_smbus_read_byte_data($file, 0x02) & 0x70;
+		return if i2c_smbus_read_byte_data($file, 0x03) & 0x89;
+		return if i2c_smbus_read_byte_data($file, 0x06) & 0xfa;
+		return if i2c_smbus_read_byte_data($file, 0x30) & 0xfa;
+	} elsif ($chip = 2) {
+		return if $cid != 0xb3;			# LM95245
+		return if i2c_smbus_read_byte_data($file, 0x02) & 0x68;
+		return if i2c_smbus_read_byte_data($file, 0x03) & 0xa1;
+		return if i2c_smbus_read_byte_data($file, 0x30) & 0x1a;
+		return if i2c_smbus_read_byte_data($file, 0x33) & 0x3f;
+	}
 
 	return 6;
 }
Index: CHANGES
=================================--- CHANGES	(revision 5983)
+++ CHANGES	(working copy)
@@ -17,6 +17,7 @@
                   Add detection of ITE IT8772E
                   Don't advertise the ipmisensors driver
                   Add detection of SA56004
+                  Add detection of LM95245
 
 3.3.0 (2011-03-28)
   Makefile: Check for bison and flex

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

  parent reply	other threads:[~2011-07-10 16:28 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-22 17:14 [lm-sensors] [PATCH v2] sensors-detect: Add code to detect emc1023, Guenter Roeck
2011-01-22 17:51 ` [lm-sensors] [PATCH v2] sensors-detect: Add code to detect Jean Delvare
2011-07-10 16:28 ` Guenter Roeck [this message]
2011-07-10 18:26 ` Jean Delvare
2011-07-10 19:20 ` Guenter Roeck
2014-12-07  0:25 ` [lm-sensors] [PATCH v2] sensors-detect: Add code to detect TMP435 Guenter Roeck
2014-12-08 10:40 ` Jean Delvare
2014-12-08 14:11 ` Guenter Roeck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110710162824.GA13134@ericsson.com \
    --to=guenter.roeck@ericsson.com \
    --cc=lm-sensors@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.