Merge lp:~mfisch/ubuntu/trusty/lm-sensors/merge-to-3.3.4 into lp:ubuntu/trusty/lm-sensors

[Matt Fischer]

Sorry before I had this going to saucy, old habits I guess. Correct target now:

Merge to 3.3.4. We still maintain a small patch here to recommend upstart. This version has a new build dep on dh-systemd. I assume that's okay.

Here's a diff of the debian folder:

mfisch@virgon:~/tmp/lm-sensors/debian$ diff -r . ../../lm-sensors.debian/debian/
diff -r ./changelog ../../lm-sensors.debian/debian/changelog
1,8d0
< lm-sensors (1:3.3.4-2ubuntu1) trusty; urgency=low
<
< * Merge from Debian unstable (LP: #1256671). Remaining changes:
< - Add 100_recommend_using_upstart.patch: Recommend use of upstart rather
< than init-script.
<
< -- Matt Fischer <email address hidden> Mon, 02 Dec 2013 21:07:32 -0700
<
24,31d15
< lm-sensors (1:3.3.3-1ubuntu1) saucy; urgency=low
<
< * Merge from Debian unstable (LP: #1178520). Remaining changes:
< - Add 100_recommend_using_upstart.patch: Recommend use of upstart rather
< than init-script.
<
< -- Matthew Fischer <email address hidden> Thu, 09 May 2013 21:55:15 -0600
<
45,53d28
< lm-sensors (1:3.3.2-2ubuntu1) raring-proposed; urgency=low
<
< * Merge from Debian unstable (LP: #1075010). Remaining changes:
< - Add 100_recommend_using_upstart.patch: Recommend use of upstart rather
< than init-script.
< * Update 100_recommend_using_upstart.patch to reflect kmod transition.
<
< -- Logan Rosen <email address hidden> Mon, 05 Nov 2012 13:18:21 -0500
<
71,84d45
< lm-sensors (1:3.3.1-2ubuntu2) quantal; urgency=low
<
< * Rebuild for new armel compiler default of ARMv5t.
<
< -- Colin Watson <email address hidden> Fri, 05 Oct 2012 11:37:42 +0100
<
< lm-sensors (1:3.3.1-2ubuntu1) precise; urgency=low
<
< * Merge from debian testing, remaining changes are:
< - Add 100_recommend_using_upstart.patch: Recommend use of upstart rather
< than init-script.
<
< -- Chuck Short <email address hidden> Tue, 21 Feb 2012 08:53:20 -0500
<
1779a1741,1743
> Local variables:
> mode: debian-changelog
> End:
diff -r ./control ../../lm-sensors.debian/debian/control
5,6c5
< Maintainer: Ubuntu Developers <email address hidden>
< XSBC-Original-Maintainer: Aurelien Jarno <email address hidden>
---
> Maintainer: Aurelien Jarno <email address hidden>
Only in ./patches: 100_recommend_using_upstart.patch
diff -r ./patches/series ../../lm-sensors.debian/debian/patches/series
13d12
< 100_recommend_using_upstart.patch

[Martin Pitt (pitti)]

Thanks! Uploaded.

review: Approve

=== modified file '.pc/06-sensors-detect-debian.patch/prog/detect/sensors-detect'
--- .pc/06-sensors-detect-debian.patch/prog/detect/sensors-detect	2013-05-06 23:37:35 +0000
+++ .pc/06-sensors-detect-debian.patch/prog/detect/sensors-detect	2014-01-03 03:11:39 +0000
@@ -41,7 +41,7 @@
 use vars qw(@pci_adapters @chip_ids @ipmi_ifs @non_hwmon_chip_ids
 	    $i2c_addresses_to_scan $revision @i2c_byte_cache);
 
-$revision = '$Revision: 6085 $ ($Date: 2012-10-30 18:18:45 +0100 (mar. 30 oct. 2012) $)';
+$revision = '$Revision: 6170 $ ($Date: 2013-05-20 21:25:22 +0200 (lun. 20 mai 2013) $)';
 $revision =~ s/\$\w+: (.*?) \$/$1/g;
 $revision =~ s/ \([^()]*\)//;
 
@@ -637,8 +637,8 @@
 		i2c_addrs => [0x2c..0x2e],
 		i2c_detect => sub { adt7490_detect(@_); },
 	}, {
-		name => "Analog Devices ADT7410",
-		driver => "to-be-written",
+		name => "Analog Devices ADT7410/ADT7420",
+		driver => "adt7410",
 		i2c_addrs => [0x48..0x4b],
 		i2c_detect => sub { adt7410_detect(@_); },
 	}, {
@@ -803,11 +803,6 @@
 		i2c_addrs => [0x2c..0x2f],
 		i2c_detect => sub { adm9240_detect(@_, 0); },
 	}, {
-		name => "Dallas Semiconductor DS1621/DS1631",
-		driver => "ds1621",
-		i2c_addrs => [0x48..0x4f],
-		i2c_detect => sub { ds1621_detect(@_); },
-	}, {
 		name => "Dallas Semiconductor DS1780",
 		driver => "adm9240",
 		i2c_addrs => [0x2c..0x2f],
@@ -1023,6 +1018,16 @@
 		i2c_addrs => [0x4c, 0x4d],
 		i2c_detect => sub { tmp42x_detect(@_, 2); },
 	}, {
+		name => "Texas Instruments TMP431",
+		driver => "to-be-written",		# tmp401
+		i2c_addrs => [0x4c, 0x4d],
+		i2c_detect => sub { lm90_detect(@_, 16); },
+	}, {
+		name => "Texas Instruments TMP432",
+		driver => "to-be-written",		# tmp401
+		i2c_addrs => [0x4c, 0x4d],
+		i2c_detect => sub { lm90_detect(@_, 17); },
+	}, {
 		name => "Texas Instruments AMC6821",
 		driver => "amc6821",
 		i2c_addrs => [0x18..0x1a, 0x2c..0x2e, 0x4c..0x4e],
@@ -1033,6 +1038,11 @@
 		i2c_addrs => [0x2b, 0x19, 0x2a],
 		i2c_detect => sub { lm95231_detect(@_, 0); },
 	}, {
+		name => "National Semiconductor LM95234",
+		driver => "to-be-written",		# lm95234
+		i2c_addrs => [0x18, 0x4d, 0x4e],
+		i2c_detect => sub { lm95231_detect(@_, 3); },
+	}, {
 		name => "National Semiconductor LM95241",
 		driver => "lm95241",
 		i2c_addrs => [0x2b, 0x19, 0x2a],
@@ -1400,6 +1410,11 @@
 		i2c_addrs => [0x18..0x1f],
 		i2c_detect => sub { jedec_JC42_4_detect(@_, 7); },
 	}, {
+		name => "Microchip MCP98244",
+		driver => "jc42",
+		i2c_addrs => [0x18..0x1f],
+		i2c_detect => sub { jedec_JC42_4_detect(@_, 15); },
+	}, {
 		name => "Microchip MCP9843",
 		driver => "jc42",
 		i2c_addrs => [0x18..0x1f],
@@ -1945,6 +1960,10 @@
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
+		name => "Winbond W83627SF/GF Super IO",
+		driver => "not-a-sensor",
+		devid => 0x59,
+	}, {
 		name => "Winbond W83627THF/THG Super IO Sensors",
 		driver => "w83627hf",
 		devid => 0x82,
@@ -2019,7 +2038,7 @@
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
-		name => "Nuvoton W83677HG-I (NCT6771F/NCT6772F/NCT6775F) Super IO Sensors",
+		name => "Nuvoton W83677HG-I (NCT5572D/NCT6771F/NCT6772F/NCT6775F) Super IO Sensors",
 		driver => "w83627ehf",
 		devid => 0xB470,
 		devid_mask => 0xFFF0,
@@ -2030,27 +2049,24 @@
 		driver => "not-a-sensor",
 		devid => 0x61,
 	}, {
-		name => "Nuvoton NCT5577D Super IO Sensors",
-		driver => "to-be-written",
-		devid => 0xC331,
-		logdev => 0x0b,
-		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-	}, {
-		name => "Nuvoton NCT6776F Super IO Sensors",
-		driver => "w83627ehf",
-		devid => 0xC333,
-		logdev => 0x0b,
-		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-	}, {
-		name => "Nuvoton NCT6779D Super IO Sensors",
-		driver => "to-be-written",	# nct6775, new driver
-		devid => 0xC562,
-		logdev => 0x0b,
-		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-	}, {
-		name => "Nuvoton NCT6102D/NCT6106D Super IO Sensors",
-		driver => "to-be-written",	# nct6775, new driver
-		devid => 0x1061,
+		name => "Nuvoton NCT5577D/NCT6776F Super IO Sensors",
+		driver => "nct6775",
+		devid => 0xC330,
+		devid_mask => 0xFFF0,
+		logdev => 0x0b,
+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+	}, {
+		name => "Nuvoton NCT5532D/NCT6779D Super IO Sensors",
+		driver => "nct6775",
+		devid => 0xC560,
+		devid_mask => 0xFFF0,
+		logdev => 0x0b,
+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+	}, {
+		name => "Nuvoton NCT6102D/NCT6104D/NCT6106D Super IO Sensors",
+		driver => "to-be-written",	# nct6775
+		devid => 0xC450,
+		devid_mask => 0xFFF0,
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
@@ -2220,14 +2236,20 @@
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
+		name => "ITE IT8752F Super IO Sensors",
+		driver => "to-be-written",	# it87
+		devid => 0x8752,
+		logdev => 0x04,
+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+	}, {
 		name => "ITE IT8771E Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8771,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
 		name => "ITE IT8772E Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8772,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
@@ -2239,13 +2261,13 @@
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
 		name => "ITE IT8782F Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8782,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
 		name => "ITE IT8783F Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8783,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
@@ -2349,6 +2371,10 @@
 		driver => "fam15h_power",
 		detect => sub { amd_pci_detect('1604') },
 	}, {
+		name => "AMD Family 16h power sensors",
+		driver => "fam15h_power",
+		detect => sub { amd_pci_detect('1534') },
+	}, {
 		name => "Intel digital thermal sensor",
 		driver => "coretemp",
 		detect => \&coretemp_detect,
@@ -2463,9 +2489,12 @@
 
 sub initialize_ioports
 {
-	sysopen(IOPORTS, "/dev/port", O_RDWR)
-		or die "/dev/port: $!\n";
-	binmode(IOPORTS);
+	if (sysopen(IOPORTS, "/dev/port", O_RDWR)) {
+		binmode(IOPORTS);
+		return 1;
+	}
+	print STDERR "/dev/port: $!\n";
+	return 0;
 }
 
 sub close_ioports
@@ -2765,9 +2794,19 @@
 {
 	local $_;
 
+	# /sys/module contains built-in drivers too, but doesn't exist on
+	# older kernels (added in kernel 2.6.7)
+	if (opendir(local *MODULES, "$sysfs_root/module")) {
+		while (defined($_ = readdir(MODULES))) {
+			next if m/^\./;
+			$modules_list{$1} = 1 if m/^(\S*)/;
+		}
+		return;
+	}
+
+	# Fall back to /proc/modules as it is always available
 	open(local *INPUTFILE, "/proc/modules") or return;
 	while (<INPUTFILE>) {
-		tr/-/_/; # Probably not needed
 		$modules_list{$1} = 1 if m/^(\S*)/;
 	}
 }
@@ -3493,13 +3532,14 @@
 				print("Can't set I2C address for $dev\n"),
 				next;
 
-			initialize_ioports();
-			$alias_detect = $detected->[$isa]->{alias_detect};
-			$is_alias = &$alias_detect($detected->[$isa]->{isa_addr},
-						   \*FILE,
-						   $detected->[$i2c]->{i2c_addr});
+			if (initialize_ioports()) {
+				$alias_detect = $detected->[$isa]->{alias_detect};
+				$is_alias = &$alias_detect($detected->[$isa]->{isa_addr},
+							   \*FILE,
+							   $detected->[$i2c]->{i2c_addr});
+				close_ioports();
+			}
 			close(FILE);
-			close_ioports();
 
 			next unless $is_alias;
 			# This is an alias: copy the I2C data into the ISA
@@ -4312,47 +4352,6 @@
 	return ($chip == 0) ? 4 : 2;
 }
 
-# Registers used:
-#   0xAA: Temperature
-#   0xA1: High limit
-#   0xA2: Low limit
-#   0xA8: Counter
-#   0xA9: Slope
-#   0xAC: Configuration
-# Detection is weak. We check if bit 4 (NVB) is clear, because it is
-# unlikely to be set (would mean that EEPROM is currently being accessed).
-# We also check the value of the counter and slope registers, the datasheet
-# doesn't mention the possible values but the conversion formula together
-# with experimental evidence suggest possible sanity checks.
-# Not all devices enjoy SMBus read word transactions, so we do as much as
-# possible with read byte transactions first, and only use read word
-# transactions second.
-sub ds1621_detect
-{
-	my ($file, $addr) = @_;
-
-	my $conf = i2c_smbus_read_byte_data($file, 0xAC);
-	return if ($conf & 0x10);
-
-	my $temp = i2c_smbus_read_word_data($file, 0xAA);
-	return if $temp < 0 || ($temp & 0x0f00);
-	# On the DS1631, the following two checks are too strict in theory,
-	# but in practice I very much doubt that anyone will set temperature
-	# limits not a multiple of 0.5 degrees C.
-	my $high = i2c_smbus_read_word_data($file, 0xA1);
-	return if $high < 0 || ($high & 0x7f00);
-	my $low = i2c_smbus_read_word_data($file, 0xA2);
-	return if $low < 0 || ($low & 0x7f00);
-
-	return if ($temp == 0 && $high == 0 && $low == 0 && $conf == 0);
-
-	# Old versions of the DS1621 apparently don't have the counter and
-	# slope registers (or they return crap)
-	my $counter = i2c_smbus_read_byte_data($file, 0xA8);
-	my $slope = i2c_smbus_read_byte_data($file, 0xA9);
-	return ($slope == 0x10 && $counter <= $slope) ? 3 : 2;
-}
-
 # Chip to detect: 0 = LM80, 1 = LM96080
 # Registers used:
 #   0x00: Configuration register
@@ -4499,7 +4498,7 @@
 #		  8 = W83L771W/G, 9 = TMP401, 10 = TMP411,
 #		  11 = W83L771AWG/ASG, 12 = MAX6690,
 #		  13 = ADT7461A/NCT1008, 14 = SA56004,
-#		  15 = G781
+#		  15 = G781, 16 = TMP431, 17 = TMP432
 # Registers used:
 #   0x03: Configuration
 #   0x04: Conversion rate
@@ -4617,6 +4616,18 @@
 		return if $mid != 0x47;		# GMT
 		return 8 if $cid == 0x01;	# G781
 	}
+	if ($chip == 16) {
+		return if ($conf & 0x1B) != 0;
+		return if $rate > 0x0F;
+		return if $mid != 0x55;		# Texas Instruments
+		return 6 if ($cid == 0x31);	# TMP431A/B/C/D
+	}
+	if ($chip == 17) {
+		return if ($conf & 0x1B) != 0;
+		return if $rate > 0x0F;
+		return if $mid != 0x55;		# Texas Instruments
+		return 6 if ($cid == 0x32);	# TMP432A/B
+	}
 	return;
 }
 
@@ -4688,14 +4699,17 @@
 	return 5;
 }
 
-# Chip to detect: 0 = LM95231, 1 = LM95241, 2 = LM95245
+# Chip to detect: 0 = LM95231, 1 = LM95241, 2 = LM95245, 3 = LM95234
 # Registers used:
 #   0x02: Status (3 unused bits)
 #   0x03: Configuration (3 unused bits)
+#   0x04: Conversion rate (6 unused bits, LM95234)
 #   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)
+#   0x30: Diode model (4 unused bits, LM95234)
 #   0x33: Status register 2 (6 unused bits, LM95245)
+#   0x38: Diode model status (4 unused bits, LM95234)
 #   0xfe: Manufacturer ID
 #   0xff: Revision ID
 sub lm95231_detect
@@ -4719,6 +4733,13 @@
 		return if i2c_smbus_read_byte_data($file, 0x03) & 0xa1;
 		return if i2c_smbus_read_byte_data($file, 0x30) & 0x1f;
 		return if i2c_smbus_read_byte_data($file, 0x33) & 0x3f;
+	} elsif ($chip == 3) {
+		return if $cid != 0x79;			# LM95234
+		return if i2c_smbus_read_byte_data($file, 0x02) & 0x30;
+		return if i2c_smbus_read_byte_data($file, 0x03) & 0xbc;
+		return if i2c_smbus_read_byte_data($file, 0x04) & 0xfc;
+		return if i2c_smbus_read_byte_data($file, 0x30) & 0xe1;
+		return if i2c_smbus_read_byte_data($file, 0x38) & 0xe1;
 	}
 
 	return 6;
@@ -6030,7 +6051,7 @@
 #                 4 = TS3000/TSE2002, 5 = MAX6604, 6 = MCP98242,
 #                 7 = MCP98243, 8 = MCP9843, 9 = CAT6095 / CAT34TS02,
 #                 10 = STTS424E, 11 = STTS2002, 12 = STTS3000
-#                 13 = MCP9804, 14 = AT30TS00
+#                 13 = MCP9804, 14 = AT30TS00, 15 = MCP98244
 # Registers used:
 #   0x00: Capabilities
 #   0x01: Configuration
@@ -6099,6 +6120,9 @@
 	} elsif ($chip == 14) {
 		return unless $manid == 0x00;		# Atmel
 		return unless $devid == 0x82;		# AT30TS00
+	} elsif ($chip == 15) {
+		return unless $manid == 0x00;		# MCP
+		return unless $devid == 0x22;		# MCP98244
 	}
 
 	# Now, do it all again with words. Note that we get
@@ -6156,6 +6180,9 @@
 	} elsif ($chip == 14) {
 		return unless $manid == 0x1f00;		# Atmel
 		return unless ($devid & 0xfeff) == 0x0082; # AT30TS00
+	} elsif ($chip == 15) {
+		return unless $manid == 0x5400;		# MCP
+		return unless ($devid & 0xfcff) == 0x0022; # MCP98244
 	}
 
 	return 5;
@@ -6677,19 +6704,6 @@
 		print SYSCONFIG "BUS_MODULES=\"", join(" ", @{$bus_modules}), "\"\n"
 			if @{$bus_modules};
 		print SYSCONFIG "HWMON_MODULES=\"", join(" ", @{$hwmon_modules}), "\"\n";
-
-		print SYSCONFIG <<'EOT';
-
-# For compatibility reasons, modules are also listed individually as variables
-#    MODULE_0, MODULE_1, MODULE_2, etc.
-# You should use BUS_MODULES and HWMON_MODULES instead if possible.
-
-EOT
-		my $i = 0;
-		foreach (@{$bus_modules}, @{$hwmon_modules}) {
-			print SYSCONFIG "MODULE_$i=$_\n";
-			$i++;
-		}
 		close(SYSCONFIG);
 
 		if (-x "/bin/systemctl" && -d "/lib/systemd/system" &&
@@ -6814,10 +6828,11 @@
 		      "standard I/O ports to probe them. This is usually safe.\n";
 		print "Do you want to scan for Super I/O sensors? (YES/no): ";
 		unless (<STDIN> =~ /^\s*n/i) {
-			initialize_ioports();
-			$superio_features |= scan_superio(0x2e, 0x2f);
-			$superio_features |= scan_superio(0x4e, 0x4f);
-			close_ioports();
+			if (initialize_ioports()) {
+				$superio_features |= scan_superio(0x2e, 0x2f);
+				$superio_features |= scan_superio(0x4e, 0x4f);
+				close_ioports();
+			}
 		}
 		print "\n";
 
@@ -6830,9 +6845,10 @@
 			      "interfaces? (YES/no): ";
 			unless (<STDIN> =~ /^\s*n/i) {
 				if (!ipmi_from_smbios()) {
-					initialize_ioports();
-					scan_isa_bus(\@ipmi_ifs);
-					close_ioports();
+					if (initialize_ioports()) {
+						scan_isa_bus(\@ipmi_ifs);
+						close_ioports();
+					}
 				}
 			}
 			print "\n";
@@ -6846,9 +6862,10 @@
 		$input = <STDIN>;
 		unless ($input =~ /^\s*n/i
 		     || ($superio_features && $input !~ /^\s*y/i)) {
-			initialize_ioports();
-			scan_isa_bus(\@chip_ids);
-			close_ioports();
+			if (initialize_ioports()) {
+				scan_isa_bus(\@chip_ids);
+				close_ioports();
+			}
 		}
 		print "\n";
 	}

=== modified file '.pc/08-sensors-detect-lm85.patch/prog/detect/sensors-detect'
--- .pc/08-sensors-detect-lm85.patch/prog/detect/sensors-detect	2013-05-06 23:37:35 +0000
+++ .pc/08-sensors-detect-lm85.patch/prog/detect/sensors-detect	2014-01-03 03:11:39 +0000
@@ -41,7 +41,7 @@
 use vars qw(@pci_adapters @chip_ids @ipmi_ifs @non_hwmon_chip_ids
 	    $i2c_addresses_to_scan $revision @i2c_byte_cache);
 
-$revision = '$Revision: 6085 $ ($Date: 2012-10-30 18:18:45 +0100 (mar. 30 oct. 2012) $)';
+$revision = '$Revision: 6170 $ ($Date: 2013-05-20 21:25:22 +0200 (lun. 20 mai 2013) $)';
 $revision =~ s/\$\w+: (.*?) \$/$1/g;
 $revision =~ s/ \([^()]*\)//;
 
@@ -637,8 +637,8 @@
 		i2c_addrs => [0x2c..0x2e],
 		i2c_detect => sub { adt7490_detect(@_); },
 	}, {
-		name => "Analog Devices ADT7410",
-		driver => "to-be-written",
+		name => "Analog Devices ADT7410/ADT7420",
+		driver => "adt7410",
 		i2c_addrs => [0x48..0x4b],
 		i2c_detect => sub { adt7410_detect(@_); },
 	}, {
@@ -803,11 +803,6 @@
 		i2c_addrs => [0x2c..0x2f],
 		i2c_detect => sub { adm9240_detect(@_, 0); },
 	}, {
-		name => "Dallas Semiconductor DS1621/DS1631",
-		driver => "ds1621",
-		i2c_addrs => [0x48..0x4f],
-		i2c_detect => sub { ds1621_detect(@_); },
-	}, {
 		name => "Dallas Semiconductor DS1780",
 		driver => "adm9240",
 		i2c_addrs => [0x2c..0x2f],
@@ -1023,6 +1018,16 @@
 		i2c_addrs => [0x4c, 0x4d],
 		i2c_detect => sub { tmp42x_detect(@_, 2); },
 	}, {
+		name => "Texas Instruments TMP431",
+		driver => "to-be-written",		# tmp401
+		i2c_addrs => [0x4c, 0x4d],
+		i2c_detect => sub { lm90_detect(@_, 16); },
+	}, {
+		name => "Texas Instruments TMP432",
+		driver => "to-be-written",		# tmp401
+		i2c_addrs => [0x4c, 0x4d],
+		i2c_detect => sub { lm90_detect(@_, 17); },
+	}, {
 		name => "Texas Instruments AMC6821",
 		driver => "amc6821",
 		i2c_addrs => [0x18..0x1a, 0x2c..0x2e, 0x4c..0x4e],
@@ -1033,6 +1038,11 @@
 		i2c_addrs => [0x2b, 0x19, 0x2a],
 		i2c_detect => sub { lm95231_detect(@_, 0); },
 	}, {
+		name => "National Semiconductor LM95234",
+		driver => "to-be-written",		# lm95234
+		i2c_addrs => [0x18, 0x4d, 0x4e],
+		i2c_detect => sub { lm95231_detect(@_, 3); },
+	}, {
 		name => "National Semiconductor LM95241",
 		driver => "lm95241",
 		i2c_addrs => [0x2b, 0x19, 0x2a],
@@ -1400,6 +1410,11 @@
 		i2c_addrs => [0x18..0x1f],
 		i2c_detect => sub { jedec_JC42_4_detect(@_, 7); },
 	}, {
+		name => "Microchip MCP98244",
+		driver => "jc42",
+		i2c_addrs => [0x18..0x1f],
+		i2c_detect => sub { jedec_JC42_4_detect(@_, 15); },
+	}, {
 		name => "Microchip MCP9843",
 		driver => "jc42",
 		i2c_addrs => [0x18..0x1f],
@@ -1945,6 +1960,10 @@
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
+		name => "Winbond W83627SF/GF Super IO",
+		driver => "not-a-sensor",
+		devid => 0x59,
+	}, {
 		name => "Winbond W83627THF/THG Super IO Sensors",
 		driver => "w83627hf",
 		devid => 0x82,
@@ -2019,7 +2038,7 @@
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
-		name => "Nuvoton W83677HG-I (NCT6771F/NCT6772F/NCT6775F) Super IO Sensors",
+		name => "Nuvoton W83677HG-I (NCT5572D/NCT6771F/NCT6772F/NCT6775F) Super IO Sensors",
 		driver => "w83627ehf",
 		devid => 0xB470,
 		devid_mask => 0xFFF0,
@@ -2030,27 +2049,24 @@
 		driver => "not-a-sensor",
 		devid => 0x61,
 	}, {
-		name => "Nuvoton NCT5577D Super IO Sensors",
-		driver => "to-be-written",
-		devid => 0xC331,
-		logdev => 0x0b,
-		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-	}, {
-		name => "Nuvoton NCT6776F Super IO Sensors",
-		driver => "w83627ehf",
-		devid => 0xC333,
-		logdev => 0x0b,
-		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-	}, {
-		name => "Nuvoton NCT6779D Super IO Sensors",
-		driver => "to-be-written",	# nct6775, new driver
-		devid => 0xC562,
-		logdev => 0x0b,
-		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-	}, {
-		name => "Nuvoton NCT6102D/NCT6106D Super IO Sensors",
-		driver => "to-be-written",	# nct6775, new driver
-		devid => 0x1061,
+		name => "Nuvoton NCT5577D/NCT6776F Super IO Sensors",
+		driver => "nct6775",
+		devid => 0xC330,
+		devid_mask => 0xFFF0,
+		logdev => 0x0b,
+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+	}, {
+		name => "Nuvoton NCT5532D/NCT6779D Super IO Sensors",
+		driver => "nct6775",
+		devid => 0xC560,
+		devid_mask => 0xFFF0,
+		logdev => 0x0b,
+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+	}, {
+		name => "Nuvoton NCT6102D/NCT6104D/NCT6106D Super IO Sensors",
+		driver => "to-be-written",	# nct6775
+		devid => 0xC450,
+		devid_mask => 0xFFF0,
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
@@ -2220,14 +2236,20 @@
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
+		name => "ITE IT8752F Super IO Sensors",
+		driver => "to-be-written",	# it87
+		devid => 0x8752,
+		logdev => 0x04,
+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+	}, {
 		name => "ITE IT8771E Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8771,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
 		name => "ITE IT8772E Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8772,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
@@ -2239,13 +2261,13 @@
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
 		name => "ITE IT8782F Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8782,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
 		name => "ITE IT8783F Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8783,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
@@ -2349,6 +2371,10 @@
 		driver => "fam15h_power",
 		detect => sub { amd_pci_detect('1604') },
 	}, {
+		name => "AMD Family 16h power sensors",
+		driver => "fam15h_power",
+		detect => sub { amd_pci_detect('1534') },
+	}, {
 		name => "Intel digital thermal sensor",
 		driver => "coretemp",
 		detect => \&coretemp_detect,
@@ -2463,9 +2489,12 @@
 
 sub initialize_ioports
 {
-	sysopen(IOPORTS, "/dev/port", O_RDWR)
-		or die "/dev/port: $!\n";
-	binmode(IOPORTS);
+	if (sysopen(IOPORTS, "/dev/port", O_RDWR)) {
+		binmode(IOPORTS);
+		return 1;
+	}
+	print STDERR "/dev/port: $!\n";
+	return 0;
 }
 
 sub close_ioports
@@ -2765,9 +2794,19 @@
 {
 	local $_;
 
+	# /sys/module contains built-in drivers too, but doesn't exist on
+	# older kernels (added in kernel 2.6.7)
+	if (opendir(local *MODULES, "$sysfs_root/module")) {
+		while (defined($_ = readdir(MODULES))) {
+			next if m/^\./;
+			$modules_list{$1} = 1 if m/^(\S*)/;
+		}
+		return;
+	}
+
+	# Fall back to /proc/modules as it is always available
 	open(local *INPUTFILE, "/proc/modules") or return;
 	while (<INPUTFILE>) {
-		tr/-/_/; # Probably not needed
 		$modules_list{$1} = 1 if m/^(\S*)/;
 	}
 }
@@ -3493,13 +3532,14 @@
 				print("Can't set I2C address for $dev\n"),
 				next;
 
-			initialize_ioports();
-			$alias_detect = $detected->[$isa]->{alias_detect};
-			$is_alias = &$alias_detect($detected->[$isa]->{isa_addr},
-						   \*FILE,
-						   $detected->[$i2c]->{i2c_addr});
+			if (initialize_ioports()) {
+				$alias_detect = $detected->[$isa]->{alias_detect};
+				$is_alias = &$alias_detect($detected->[$isa]->{isa_addr},
+							   \*FILE,
+							   $detected->[$i2c]->{i2c_addr});
+				close_ioports();
+			}
 			close(FILE);
-			close_ioports();
 
 			next unless $is_alias;
 			# This is an alias: copy the I2C data into the ISA
@@ -4312,47 +4352,6 @@
 	return ($chip == 0) ? 4 : 2;
 }
 
-# Registers used:
-#   0xAA: Temperature
-#   0xA1: High limit
-#   0xA2: Low limit
-#   0xA8: Counter
-#   0xA9: Slope
-#   0xAC: Configuration
-# Detection is weak. We check if bit 4 (NVB) is clear, because it is
-# unlikely to be set (would mean that EEPROM is currently being accessed).
-# We also check the value of the counter and slope registers, the datasheet
-# doesn't mention the possible values but the conversion formula together
-# with experimental evidence suggest possible sanity checks.
-# Not all devices enjoy SMBus read word transactions, so we do as much as
-# possible with read byte transactions first, and only use read word
-# transactions second.
-sub ds1621_detect
-{
-	my ($file, $addr) = @_;
-
-	my $conf = i2c_smbus_read_byte_data($file, 0xAC);
-	return if ($conf & 0x10);
-
-	my $temp = i2c_smbus_read_word_data($file, 0xAA);
-	return if $temp < 0 || ($temp & 0x0f00);
-	# On the DS1631, the following two checks are too strict in theory,
-	# but in practice I very much doubt that anyone will set temperature
-	# limits not a multiple of 0.5 degrees C.
-	my $high = i2c_smbus_read_word_data($file, 0xA1);
-	return if $high < 0 || ($high & 0x7f00);
-	my $low = i2c_smbus_read_word_data($file, 0xA2);
-	return if $low < 0 || ($low & 0x7f00);
-
-	return if ($temp == 0 && $high == 0 && $low == 0 && $conf == 0);
-
-	# Old versions of the DS1621 apparently don't have the counter and
-	# slope registers (or they return crap)
-	my $counter = i2c_smbus_read_byte_data($file, 0xA8);
-	my $slope = i2c_smbus_read_byte_data($file, 0xA9);
-	return ($slope == 0x10 && $counter <= $slope) ? 3 : 2;
-}
-
 # Chip to detect: 0 = LM80, 1 = LM96080
 # Registers used:
 #   0x00: Configuration register
@@ -4499,7 +4498,7 @@
 #		  8 = W83L771W/G, 9 = TMP401, 10 = TMP411,
 #		  11 = W83L771AWG/ASG, 12 = MAX6690,
 #		  13 = ADT7461A/NCT1008, 14 = SA56004,
-#		  15 = G781
+#		  15 = G781, 16 = TMP431, 17 = TMP432
 # Registers used:
 #   0x03: Configuration
 #   0x04: Conversion rate
@@ -4617,6 +4616,18 @@
 		return if $mid != 0x47;		# GMT
 		return 8 if $cid == 0x01;	# G781
 	}
+	if ($chip == 16) {
+		return if ($conf & 0x1B) != 0;
+		return if $rate > 0x0F;
+		return if $mid != 0x55;		# Texas Instruments
+		return 6 if ($cid == 0x31);	# TMP431A/B/C/D
+	}
+	if ($chip == 17) {
+		return if ($conf & 0x1B) != 0;
+		return if $rate > 0x0F;
+		return if $mid != 0x55;		# Texas Instruments
+		return 6 if ($cid == 0x32);	# TMP432A/B
+	}
 	return;
 }
 
@@ -4688,14 +4699,17 @@
 	return 5;
 }
 
-# Chip to detect: 0 = LM95231, 1 = LM95241, 2 = LM95245
+# Chip to detect: 0 = LM95231, 1 = LM95241, 2 = LM95245, 3 = LM95234
 # Registers used:
 #   0x02: Status (3 unused bits)
 #   0x03: Configuration (3 unused bits)
+#   0x04: Conversion rate (6 unused bits, LM95234)
 #   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)
+#   0x30: Diode model (4 unused bits, LM95234)
 #   0x33: Status register 2 (6 unused bits, LM95245)
+#   0x38: Diode model status (4 unused bits, LM95234)
 #   0xfe: Manufacturer ID
 #   0xff: Revision ID
 sub lm95231_detect
@@ -4719,6 +4733,13 @@
 		return if i2c_smbus_read_byte_data($file, 0x03) & 0xa1;
 		return if i2c_smbus_read_byte_data($file, 0x30) & 0x1f;
 		return if i2c_smbus_read_byte_data($file, 0x33) & 0x3f;
+	} elsif ($chip == 3) {
+		return if $cid != 0x79;			# LM95234
+		return if i2c_smbus_read_byte_data($file, 0x02) & 0x30;
+		return if i2c_smbus_read_byte_data($file, 0x03) & 0xbc;
+		return if i2c_smbus_read_byte_data($file, 0x04) & 0xfc;
+		return if i2c_smbus_read_byte_data($file, 0x30) & 0xe1;
+		return if i2c_smbus_read_byte_data($file, 0x38) & 0xe1;
 	}
 
 	return 6;
@@ -6030,7 +6051,7 @@
 #                 4 = TS3000/TSE2002, 5 = MAX6604, 6 = MCP98242,
 #                 7 = MCP98243, 8 = MCP9843, 9 = CAT6095 / CAT34TS02,
 #                 10 = STTS424E, 11 = STTS2002, 12 = STTS3000
-#                 13 = MCP9804, 14 = AT30TS00
+#                 13 = MCP9804, 14 = AT30TS00, 15 = MCP98244
 # Registers used:
 #   0x00: Capabilities
 #   0x01: Configuration
@@ -6099,6 +6120,9 @@
 	} elsif ($chip == 14) {
 		return unless $manid == 0x00;		# Atmel
 		return unless $devid == 0x82;		# AT30TS00
+	} elsif ($chip == 15) {
+		return unless $manid == 0x00;		# MCP
+		return unless $devid == 0x22;		# MCP98244
 	}
 
 	# Now, do it all again with words. Note that we get
@@ -6156,6 +6180,9 @@
 	} elsif ($chip == 14) {
 		return unless $manid == 0x1f00;		# Atmel
 		return unless ($devid & 0xfeff) == 0x0082; # AT30TS00
+	} elsif ($chip == 15) {
+		return unless $manid == 0x5400;		# MCP
+		return unless ($devid & 0xfcff) == 0x0022; # MCP98244
 	}
 
 	return 5;
@@ -6754,10 +6781,11 @@
 		      "standard I/O ports to probe them. This is usually safe.\n";
 		print "Do you want to scan for Super I/O sensors? (YES/no): ";
 		unless (<STDIN> =~ /^\s*n/i) {
-			initialize_ioports();
-			$superio_features |= scan_superio(0x2e, 0x2f);
-			$superio_features |= scan_superio(0x4e, 0x4f);
-			close_ioports();
+			if (initialize_ioports()) {
+				$superio_features |= scan_superio(0x2e, 0x2f);
+				$superio_features |= scan_superio(0x4e, 0x4f);
+				close_ioports();
+			}
 		}
 		print "\n";
 
@@ -6770,9 +6798,10 @@
 			      "interfaces? (YES/no): ";
 			unless (<STDIN> =~ /^\s*n/i) {
 				if (!ipmi_from_smbios()) {
-					initialize_ioports();
-					scan_isa_bus(\@ipmi_ifs);
-					close_ioports();
+					if (initialize_ioports()) {
+						scan_isa_bus(\@ipmi_ifs);
+						close_ioports();
+					}
 				}
 			}
 			print "\n";
@@ -6786,9 +6815,10 @@
 		$input = <STDIN>;
 		unless ($input =~ /^\s*n/i
 		     || ($superio_features && $input !~ /^\s*y/i)) {
-			initialize_ioports();
-			scan_isa_bus(\@chip_ids);
-			close_ioports();
+			if (initialize_ioports()) {
+				scan_isa_bus(\@chip_ids);
+				close_ioports();
+			}
 		}
 		print "\n";
 	}

=== modified file '.pc/09-sensors-detect-sch5524.patch/prog/detect/sensors-detect'
--- .pc/09-sensors-detect-sch5524.patch/prog/detect/sensors-detect	2013-05-06 23:37:35 +0000
+++ .pc/09-sensors-detect-sch5524.patch/prog/detect/sensors-detect	2014-01-03 03:11:39 +0000
@@ -41,7 +41,7 @@
 use vars qw(@pci_adapters @chip_ids @ipmi_ifs @non_hwmon_chip_ids
 	    $i2c_addresses_to_scan $revision @i2c_byte_cache);
 
-$revision = '$Revision: 6085 $ ($Date: 2012-10-30 18:18:45 +0100 (mar. 30 oct. 2012) $)';
+$revision = '$Revision: 6170 $ ($Date: 2013-05-20 21:25:22 +0200 (lun. 20 mai 2013) $)';
 $revision =~ s/\$\w+: (.*?) \$/$1/g;
 $revision =~ s/ \([^()]*\)//;
 
@@ -637,8 +637,8 @@
 		i2c_addrs => [0x2c..0x2e],
 		i2c_detect => sub { adt7490_detect(@_); },
 	}, {
-		name => "Analog Devices ADT7410",
-		driver => "to-be-written",
+		name => "Analog Devices ADT7410/ADT7420",
+		driver => "adt7410",
 		i2c_addrs => [0x48..0x4b],
 		i2c_detect => sub { adt7410_detect(@_); },
 	}, {
@@ -803,11 +803,6 @@
 		i2c_addrs => [0x2c..0x2f],
 		i2c_detect => sub { adm9240_detect(@_, 0); },
 	}, {
-		name => "Dallas Semiconductor DS1621/DS1631",
-		driver => "ds1621",
-		i2c_addrs => [0x48..0x4f],
-		i2c_detect => sub { ds1621_detect(@_); },
-	}, {
 		name => "Dallas Semiconductor DS1780",
 		driver => "adm9240",
 		i2c_addrs => [0x2c..0x2f],
@@ -1023,6 +1018,16 @@
 		i2c_addrs => [0x4c, 0x4d],
 		i2c_detect => sub { tmp42x_detect(@_, 2); },
 	}, {
+		name => "Texas Instruments TMP431",
+		driver => "to-be-written",		# tmp401
+		i2c_addrs => [0x4c, 0x4d],
+		i2c_detect => sub { lm90_detect(@_, 16); },
+	}, {
+		name => "Texas Instruments TMP432",
+		driver => "to-be-written",		# tmp401
+		i2c_addrs => [0x4c, 0x4d],
+		i2c_detect => sub { lm90_detect(@_, 17); },
+	}, {
 		name => "Texas Instruments AMC6821",
 		driver => "amc6821",
 		i2c_addrs => [0x18..0x1a, 0x2c..0x2e, 0x4c..0x4e],
@@ -1033,6 +1038,11 @@
 		i2c_addrs => [0x2b, 0x19, 0x2a],
 		i2c_detect => sub { lm95231_detect(@_, 0); },
 	}, {
+		name => "National Semiconductor LM95234",
+		driver => "to-be-written",		# lm95234
+		i2c_addrs => [0x18, 0x4d, 0x4e],
+		i2c_detect => sub { lm95231_detect(@_, 3); },
+	}, {
 		name => "National Semiconductor LM95241",
 		driver => "lm95241",
 		i2c_addrs => [0x2b, 0x19, 0x2a],
@@ -1400,6 +1410,11 @@
 		i2c_addrs => [0x18..0x1f],
 		i2c_detect => sub { jedec_JC42_4_detect(@_, 7); },
 	}, {
+		name => "Microchip MCP98244",
+		driver => "jc42",
+		i2c_addrs => [0x18..0x1f],
+		i2c_detect => sub { jedec_JC42_4_detect(@_, 15); },
+	}, {
 		name => "Microchip MCP9843",
 		driver => "jc42",
 		i2c_addrs => [0x18..0x1f],
@@ -1945,6 +1960,10 @@
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
+		name => "Winbond W83627SF/GF Super IO",
+		driver => "not-a-sensor",
+		devid => 0x59,
+	}, {
 		name => "Winbond W83627THF/THG Super IO Sensors",
 		driver => "w83627hf",
 		devid => 0x82,
@@ -2019,7 +2038,7 @@
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
-		name => "Nuvoton W83677HG-I (NCT6771F/NCT6772F/NCT6775F) Super IO Sensors",
+		name => "Nuvoton W83677HG-I (NCT5572D/NCT6771F/NCT6772F/NCT6775F) Super IO Sensors",
 		driver => "w83627ehf",
 		devid => 0xB470,
 		devid_mask => 0xFFF0,
@@ -2030,27 +2049,24 @@
 		driver => "not-a-sensor",
 		devid => 0x61,
 	}, {
-		name => "Nuvoton NCT5577D Super IO Sensors",
-		driver => "to-be-written",
-		devid => 0xC331,
-		logdev => 0x0b,
-		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-	}, {
-		name => "Nuvoton NCT6776F Super IO Sensors",
-		driver => "w83627ehf",
-		devid => 0xC333,
-		logdev => 0x0b,
-		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-	}, {
-		name => "Nuvoton NCT6779D Super IO Sensors",
-		driver => "to-be-written",	# nct6775, new driver
-		devid => 0xC562,
-		logdev => 0x0b,
-		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-	}, {
-		name => "Nuvoton NCT6102D/NCT6106D Super IO Sensors",
-		driver => "to-be-written",	# nct6775, new driver
-		devid => 0x1061,
+		name => "Nuvoton NCT5577D/NCT6776F Super IO Sensors",
+		driver => "nct6775",
+		devid => 0xC330,
+		devid_mask => 0xFFF0,
+		logdev => 0x0b,
+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+	}, {
+		name => "Nuvoton NCT5532D/NCT6779D Super IO Sensors",
+		driver => "nct6775",
+		devid => 0xC560,
+		devid_mask => 0xFFF0,
+		logdev => 0x0b,
+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+	}, {
+		name => "Nuvoton NCT6102D/NCT6104D/NCT6106D Super IO Sensors",
+		driver => "to-be-written",	# nct6775
+		devid => 0xC450,
+		devid_mask => 0xFFF0,
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
@@ -2220,14 +2236,20 @@
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
+		name => "ITE IT8752F Super IO Sensors",
+		driver => "to-be-written",	# it87
+		devid => 0x8752,
+		logdev => 0x04,
+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+	}, {
 		name => "ITE IT8771E Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8771,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
 		name => "ITE IT8772E Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8772,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
@@ -2239,13 +2261,13 @@
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
 		name => "ITE IT8782F Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8782,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
 		name => "ITE IT8783F Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8783,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
@@ -2349,6 +2371,10 @@
 		driver => "fam15h_power",
 		detect => sub { amd_pci_detect('1604') },
 	}, {
+		name => "AMD Family 16h power sensors",
+		driver => "fam15h_power",
+		detect => sub { amd_pci_detect('1534') },
+	}, {
 		name => "Intel digital thermal sensor",
 		driver => "coretemp",
 		detect => \&coretemp_detect,
@@ -2463,9 +2489,12 @@
 
 sub initialize_ioports
 {
-	sysopen(IOPORTS, "/dev/port", O_RDWR)
-		or die "/dev/port: $!\n";
-	binmode(IOPORTS);
+	if (sysopen(IOPORTS, "/dev/port", O_RDWR)) {
+		binmode(IOPORTS);
+		return 1;
+	}
+	print STDERR "/dev/port: $!\n";
+	return 0;
 }
 
 sub close_ioports
@@ -2765,9 +2794,19 @@
 {
 	local $_;
 
+	# /sys/module contains built-in drivers too, but doesn't exist on
+	# older kernels (added in kernel 2.6.7)
+	if (opendir(local *MODULES, "$sysfs_root/module")) {
+		while (defined($_ = readdir(MODULES))) {
+			next if m/^\./;
+			$modules_list{$1} = 1 if m/^(\S*)/;
+		}
+		return;
+	}
+
+	# Fall back to /proc/modules as it is always available
 	open(local *INPUTFILE, "/proc/modules") or return;
 	while (<INPUTFILE>) {
-		tr/-/_/; # Probably not needed
 		$modules_list{$1} = 1 if m/^(\S*)/;
 	}
 }
@@ -3493,13 +3532,14 @@
 				print("Can't set I2C address for $dev\n"),
 				next;
 
-			initialize_ioports();
-			$alias_detect = $detected->[$isa]->{alias_detect};
-			$is_alias = &$alias_detect($detected->[$isa]->{isa_addr},
-						   \*FILE,
-						   $detected->[$i2c]->{i2c_addr});
+			if (initialize_ioports()) {
+				$alias_detect = $detected->[$isa]->{alias_detect};
+				$is_alias = &$alias_detect($detected->[$isa]->{isa_addr},
+							   \*FILE,
+							   $detected->[$i2c]->{i2c_addr});
+				close_ioports();
+			}
 			close(FILE);
-			close_ioports();
 
 			next unless $is_alias;
 			# This is an alias: copy the I2C data into the ISA
@@ -4312,47 +4352,6 @@
 	return ($chip == 0) ? 4 : 2;
 }
 
-# Registers used:
-#   0xAA: Temperature
-#   0xA1: High limit
-#   0xA2: Low limit
-#   0xA8: Counter
-#   0xA9: Slope
-#   0xAC: Configuration
-# Detection is weak. We check if bit 4 (NVB) is clear, because it is
-# unlikely to be set (would mean that EEPROM is currently being accessed).
-# We also check the value of the counter and slope registers, the datasheet
-# doesn't mention the possible values but the conversion formula together
-# with experimental evidence suggest possible sanity checks.
-# Not all devices enjoy SMBus read word transactions, so we do as much as
-# possible with read byte transactions first, and only use read word
-# transactions second.
-sub ds1621_detect
-{
-	my ($file, $addr) = @_;
-
-	my $conf = i2c_smbus_read_byte_data($file, 0xAC);
-	return if ($conf & 0x10);
-
-	my $temp = i2c_smbus_read_word_data($file, 0xAA);
-	return if $temp < 0 || ($temp & 0x0f00);
-	# On the DS1631, the following two checks are too strict in theory,
-	# but in practice I very much doubt that anyone will set temperature
-	# limits not a multiple of 0.5 degrees C.
-	my $high = i2c_smbus_read_word_data($file, 0xA1);
-	return if $high < 0 || ($high & 0x7f00);
-	my $low = i2c_smbus_read_word_data($file, 0xA2);
-	return if $low < 0 || ($low & 0x7f00);
-
-	return if ($temp == 0 && $high == 0 && $low == 0 && $conf == 0);
-
-	# Old versions of the DS1621 apparently don't have the counter and
-	# slope registers (or they return crap)
-	my $counter = i2c_smbus_read_byte_data($file, 0xA8);
-	my $slope = i2c_smbus_read_byte_data($file, 0xA9);
-	return ($slope == 0x10 && $counter <= $slope) ? 3 : 2;
-}
-
 # Chip to detect: 0 = LM80, 1 = LM96080
 # Registers used:
 #   0x00: Configuration register
@@ -4499,7 +4498,7 @@
 #		  8 = W83L771W/G, 9 = TMP401, 10 = TMP411,
 #		  11 = W83L771AWG/ASG, 12 = MAX6690,
 #		  13 = ADT7461A/NCT1008, 14 = SA56004,
-#		  15 = G781
+#		  15 = G781, 16 = TMP431, 17 = TMP432
 # Registers used:
 #   0x03: Configuration
 #   0x04: Conversion rate
@@ -4617,6 +4616,18 @@
 		return if $mid != 0x47;		# GMT
 		return 8 if $cid == 0x01;	# G781
 	}
+	if ($chip == 16) {
+		return if ($conf & 0x1B) != 0;
+		return if $rate > 0x0F;
+		return if $mid != 0x55;		# Texas Instruments
+		return 6 if ($cid == 0x31);	# TMP431A/B/C/D
+	}
+	if ($chip == 17) {
+		return if ($conf & 0x1B) != 0;
+		return if $rate > 0x0F;
+		return if $mid != 0x55;		# Texas Instruments
+		return 6 if ($cid == 0x32);	# TMP432A/B
+	}
 	return;
 }
 
@@ -4688,14 +4699,17 @@
 	return 5;
 }
 
-# Chip to detect: 0 = LM95231, 1 = LM95241, 2 = LM95245
+# Chip to detect: 0 = LM95231, 1 = LM95241, 2 = LM95245, 3 = LM95234
 # Registers used:
 #   0x02: Status (3 unused bits)
 #   0x03: Configuration (3 unused bits)
+#   0x04: Conversion rate (6 unused bits, LM95234)
 #   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)
+#   0x30: Diode model (4 unused bits, LM95234)
 #   0x33: Status register 2 (6 unused bits, LM95245)
+#   0x38: Diode model status (4 unused bits, LM95234)
 #   0xfe: Manufacturer ID
 #   0xff: Revision ID
 sub lm95231_detect
@@ -4719,6 +4733,13 @@
 		return if i2c_smbus_read_byte_data($file, 0x03) & 0xa1;
 		return if i2c_smbus_read_byte_data($file, 0x30) & 0x1f;
 		return if i2c_smbus_read_byte_data($file, 0x33) & 0x3f;
+	} elsif ($chip == 3) {
+		return if $cid != 0x79;			# LM95234
+		return if i2c_smbus_read_byte_data($file, 0x02) & 0x30;
+		return if i2c_smbus_read_byte_data($file, 0x03) & 0xbc;
+		return if i2c_smbus_read_byte_data($file, 0x04) & 0xfc;
+		return if i2c_smbus_read_byte_data($file, 0x30) & 0xe1;
+		return if i2c_smbus_read_byte_data($file, 0x38) & 0xe1;
 	}
 
 	return 6;
@@ -6030,7 +6051,7 @@
 #                 4 = TS3000/TSE2002, 5 = MAX6604, 6 = MCP98242,
 #                 7 = MCP98243, 8 = MCP9843, 9 = CAT6095 / CAT34TS02,
 #                 10 = STTS424E, 11 = STTS2002, 12 = STTS3000
-#                 13 = MCP9804, 14 = AT30TS00
+#                 13 = MCP9804, 14 = AT30TS00, 15 = MCP98244
 # Registers used:
 #   0x00: Capabilities
 #   0x01: Configuration
@@ -6099,6 +6120,9 @@
 	} elsif ($chip == 14) {
 		return unless $manid == 0x00;		# Atmel
 		return unless $devid == 0x82;		# AT30TS00
+	} elsif ($chip == 15) {
+		return unless $manid == 0x00;		# MCP
+		return unless $devid == 0x22;		# MCP98244
 	}
 
 	# Now, do it all again with words. Note that we get
@@ -6156,6 +6180,9 @@
 	} elsif ($chip == 14) {
 		return unless $manid == 0x1f00;		# Atmel
 		return unless ($devid & 0xfeff) == 0x0082; # AT30TS00
+	} elsif ($chip == 15) {
+		return unless $manid == 0x5400;		# MCP
+		return unless ($devid & 0xfcff) == 0x0022; # MCP98244
 	}
 
 	return 5;
@@ -6754,10 +6781,11 @@
 		      "standard I/O ports to probe them. This is usually safe.\n";
 		print "Do you want to scan for Super I/O sensors? (YES/no): ";
 		unless (<STDIN> =~ /^\s*n/i) {
-			initialize_ioports();
-			$superio_features |= scan_superio(0x2e, 0x2f);
-			$superio_features |= scan_superio(0x4e, 0x4f);
-			close_ioports();
+			if (initialize_ioports()) {
+				$superio_features |= scan_superio(0x2e, 0x2f);
+				$superio_features |= scan_superio(0x4e, 0x4f);
+				close_ioports();
+			}
 		}
 		print "\n";
 
@@ -6770,9 +6798,10 @@
 			      "interfaces? (YES/no): ";
 			unless (<STDIN> =~ /^\s*n/i) {
 				if (!ipmi_from_smbios()) {
-					initialize_ioports();
-					scan_isa_bus(\@ipmi_ifs);
-					close_ioports();
+					if (initialize_ioports()) {
+						scan_isa_bus(\@ipmi_ifs);
+						close_ioports();
+					}
 				}
 			}
 			print "\n";
@@ -6786,9 +6815,10 @@
 		$input = <STDIN>;
 		unless ($input =~ /^\s*n/i
 		     || ($superio_features && $input !~ /^\s*y/i)) {
-			initialize_ioports();
-			scan_isa_bus(\@chip_ids);
-			close_ioports();
+			if (initialize_ioports()) {
+				scan_isa_bus(\@chip_ids);
+				close_ioports();
+			}
 		}
 		print "\n";
 	}

=== removed directory '.pc/10-pwmconfig.patch'
=== removed directory '.pc/10-pwmconfig.patch/prog'
=== removed directory '.pc/10-pwmconfig.patch/prog/pwm'
=== removed file '.pc/10-pwmconfig.patch/prog/pwm/pwmconfig'
--- .pc/10-pwmconfig.patch/prog/pwm/pwmconfig	2013-05-06 23:37:35 +0000
+++ .pc/10-pwmconfig.patch/prog/pwm/pwmconfig	1970-01-01 00:00:00 +0000
@@ -1,1019 +0,0 @@
-#!/bin/bash
-#
-# pwmconfig
-# Tests the pwm outputs of sensors and configures fancontrol
-# Supported Linux kernel versions: 2.6.5 and later
-#
-#    Warning!!! This program will stop your fans, one at a time,
-#    for approximately 5 seconds each!!!
-#    This may cause your processor temperature to rise!!!
-#    Verify that all fans are running at normal speed after this
-#    program has exited!!!
-#
-#    Copyright (C) 2007-2009 Jean Delvare <[e-mail]>
-#
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-#    MA 02110-1301 USA.
-#
-#
-
-REVISION=$(echo '$Revision: 5857 $' | cut -d' ' -f2)
-REVDATE=$(echo '$Date: 2010-08-22 18:17:57 +0200 (dim. 22 août 2010) $' | cut -d' ' -f2)
-PIDFILE="/var/run/fancontrol.pid"
-
-if [ -f "$PIDFILE" ]
-then
-	echo "File $PIDFILE exists. This typically means that the"
-	echo "fancontrol deamon is running. You should stop it before running pwmconfig."
-	echo "If you are certain that fancontrol is not running, then you can delete"
-	echo "$PIDFILE manually."
-	exit 1
-fi
-
-if [ "`id -u`" != "0" ]
-then
-	echo "You need to be root to run this script."
-	exit 1
-fi
-
-echo "# pwmconfig revision $REVISION ($REVDATE)"
-echo 'This program will search your sensors for pulse width modulation (pwm)'
-echo 'controls, and test each one to see if it controls a fan on'
-echo 'your motherboard. Note that many motherboards do not have pwm'
-echo 'circuitry installed, even if your sensor chip supports pwm.'
-echo
-echo 'We will attempt to briefly stop each fan using the pwm controls.'
-echo 'The program will attempt to restore each fan to full speed'
-echo 'after testing. However, it is ** very important ** that you'
-echo 'physically verify that the fans have been to full speed'
-echo 'after the program has completed.'
-echo
-
-DELAY=5 # 3 seconds delay is too short for large fans, thus I increased it to 5
-MAX=255
-
-if [ -d "/sys/class/hwmon" ]
-then
-	SYSFS=2
-	DIR="/sys/class/hwmon"
-	PREFIX='hwmon*'
-elif [ -d "/sys/bus/i2c/devices" ]
-then
-	SYSFS=1
-	DIR="/sys/bus/i2c/devices"
-	PREFIX='*-*'
-else
-	echo $0: 'No sensors found! (modprobe sensor modules?)'
-	exit 1
-fi
-
-cd $DIR
-DEVICES=`echo $PREFIX`
-if [ "$PREFIX" = "$DEVICES" ]
-then
-	echo $0: 'No sensors found! (modprobe sensor modules?)'
-	exit 1
-fi
-
-# We may need to adjust the device path
-if [ "$SYSFS" = "2" ]
-then
-	OLD_DEVICES="$DEVICES"
-	DEVICES=""
-
-	for device in $OLD_DEVICES
-	do
-		if [ ! -r "$device/name" ]
-		then
-			device="$device/device"
-		fi
-		
-		DEVICES="$DEVICES $device"
-	done
-fi
-
-
-for device in $DEVICES
-do
-	# Find available fan control outputs
-	MATCH=$device/'pwm[1-9]'
-	device_pwm=`echo $MATCH`
-	if [ "$SYSFS" = "1" -a "$MATCH" = "$device_pwm" ]
-	then
-		# Deprecated naming scheme (used in kernels 2.6.5 to 2.6.9)
-		MATCH=$device/'fan[1-9]_pwm'
-		device_pwm=`echo $MATCH`
-	fi
-	if [ "$MATCH" != "$device_pwm" ]
-	then
-		PWM="$PWM $device_pwm"
-	fi
-
-	# Find available fan monitoring inputs
-	MATCH=$device/'fan[1-9]_input'
-	device_fan=`echo $MATCH`
-	if [ "$MATCH" != "$device_fan" ]
-	then
-		FAN="$FAN $device_fan"
-	fi
-done
-
-if [ -z "$PWM" ]
-then
-	echo $0: 'There are no pwm-capable sensor modules installed'
-	exit 1
-fi
-if [ -z "$FAN" ]
-then
-	echo $0: 'There are no fan-capable sensor modules installed'
-	exit 1
-fi
-
-# $1 = padding
-function print_devices()
-{
-	local name
-
-	for device in $DEVICES
-	do
-		name=`cat $device/name 2> /dev/null`
-		[ -z "$name" ] && name="unknown (no name attribute)"
-		echo "$1$device is $name"
-	done
-}
-
-# $1 = pwm file name
-function is_pwm_auto()
-{
-	ENABLE=${1}_enable
-	if [ -f $ENABLE ]
-	then
-		if [ "`cat $ENABLE`" -gt 1 ]
-		then
-			return 0
-		fi
-	fi
-
-	return 1
-}
-
-# $1 = pwm file name
-function pwmdisable()
-{
-	ENABLE=${1}_enable
-	# No enable file? Just set to max
-	if [ ! -f $ENABLE ]
-	then
-		echo $MAX > $1
-		return 0
-	fi
-
-	# Try pwmN_enable=0
-	echo 0 2>/dev/null > $ENABLE
-	if [ "`cat $ENABLE`" -eq 0 ]
-	then
-		# Success
-		return 0
-	fi
-
-	# It didn't work, try pwmN_enable=1 pwmN=255
-	echo 1 2>/dev/null > $ENABLE
-	if [ "`cat $ENABLE`" -ne 1 ]
-	then
-		echo "$ENABLE stuck to `cat $ENABLE`" >&2
-		return 1
-	fi
-
-	echo $MAX > $1
-	if [ "`cat $1`" -ge 190 ]
-	then
-		# Success
-		return 0
-	fi
-
-	# Nothing worked
-	echo "$1 stuck to `cat $1`" >&2
-	return 1
-}
-
-# $1 = pwm file name
-function pwmenable()
-{
-	ENABLE=${1}_enable
-	if [ -w $ENABLE ]
-	then
-		echo 1 2>/dev/null > $ENABLE
-		if [ $? -ne 0 ]
-		then
-			return 1
-		fi
-	fi
-	echo $MAX > $1
-}
-
-# $1 = pwm file name; $2 = pwm value 0-255
-function pwmset()
-{
-	echo $2 > $1
-}
-
-echo 'Found the following devices:'
-print_devices "   "
-echo
-
-echo 'Found the following PWM controls:'
-for i in $PWM
-do
-	echo "   $i"
-	if [ -w $i ]
-	then
-		# First check if PWM output is in automatic mode
-		if is_pwm_auto $i
-		then
-			echo "$i is currently setup for automatic speed control."
-			echo 'In general, automatic mode is preferred over manual mode, as'
-			echo 'it is more efficient and it reacts faster. Are you sure that'
-			echo -n 'you want to setup this output for manual control? (n) '
-			read X
-			if [ "$X" = "" -o "$X" != "y" -a "$X" != "Y" ]
-			then
-				continue
-			fi
-		fi
-
-		pwmdisable $i
-		if [ $? -ne 0 ]
-		then
-			echo "Manual control mode not supported, skipping $i."
-		elif [ "$GOODPWM" = "" ]
-		then
-			GOODPWM=$i
-		else
-			GOODPWM="$GOODPWM $i"
-		fi
-	else
-		echo "Can't write to $i, skipping."
-	fi
-done
-
-if [ "$GOODPWM" = "" ]
-then
-	echo 'There are no usable PWM outputs.'
-	exit 1
-fi
-
-echo
-echo "Giving the fans some time to reach full speed..."
-sleep $DELAY
-echo 'Found the following fan sensors:'
-for i in $FAN
-do
-	S=`cat $i`
-	if [ "$S" = "0" -o "$S" = "-1" ]
-	then
-		echo "   $i     current speed: 0 ... skipping!"
-	else
-		echo "   $i     current speed: $S RPM"
-		if [ "$GOODFAN" = "" ]
-		then
-			GOODFAN=$i
-			SPEEDS=$S
-		else
-			GOODFAN="$GOODFAN $i"
-			SPEEDS="$SPEEDS $S"
-		fi
-	fi
-done
-echo
-
-if [ "$GOODFAN" = "" ]
-then
-	echo 'There are no working fan sensors, all readings are 0.'
-	echo 'Make sure you have a 3-wire fan connected.'
-	echo 'You may also need to increase the fan divisors.'
-	echo 'See doc/fan-divisors for more information.'
-	exit 1
-fi
-
-echo 'Warning!!! This program will stop your fans, one at a time,'
-echo "for approximately $DELAY seconds each!!!"
-echo 'This may cause your processor temperature to rise!!!'
-echo 'If you do not want to do this hit control-C now!!!'
-echo -n 'Hit return to continue: '
-read X
-echo
-
-PLOTTER=gnuplot
-STEP=15
-PDELAY=2
-# Use a smaller step for low PWM values as this is typically where the
-# more important fan speed changes are happening.
-STEP2=2
-STEP2_BELOW=31
-
-function pwmdetail()
-{
-	P=$1
-	F=$2
-	PLOT=
-
-	type $PLOTTER > /dev/null 2>&1
-	if [ $? -eq 0 ]
-	then
-		echo -n "Would you like to generate a graphical plot using $PLOTTER (y)? "
-		read X
-		if [ "$X" = "y" -o "$X" = "Y" -o "$X" = "" ]
-		then
-			PLOT=y
-		fi
-	else
-		if [ -n "$DISPLAY" ]
-		then
-			echo "Note: If you had $PLOTTER installed, I could generate a graphical plot."
-		fi
-	fi
-
-	if [ "$PLOT" = "y" ]
-	then
-		TMP1=`mktemp -t pwmtest1.XXXXXXXXXX` || { echo "$0: Cannot create temporary file" >&2; exit 1; }
-		TMP2=`mktemp -t pwmtest2.XXXXXXXXXX` || { rm -f $TMP1 ; echo "$0: Cannot create temporary file" >&2; exit 1; }
-		echo "set xlabel \"PWM: $P\"" > $TMP1
-		echo "set ylabel \"FAN: $F (RPM)\"" >> $TMP1
-		echo 'set nokey' >> $TMP1
-		echo 'set xrange [0:255]' >> $TMP1
-		echo "plot \"$TMP2\" with lines" >> $TMP1
-		echo 'pause -1 "    Hit return to continue..."' >> $TMP1
-		> $TMP2
-	fi
-
-	local threshold=100000
-	let pwm=$MAX
-	pwmenable $P
-	while [ $pwm -ge 0 ]
-	do
-		pwmset $P $pwm
-		sleep $PDELAY
-		if [ $? -ne 0 ]
-		then
-			pwmdisable $P
-			echo '^C received, aborting...'
-			rm -f $TMP1 $TMP2
-			exit 1
-		fi
-		S=`cat $F`
-		# Fan speed should never increase significantly
-		if [ $S -gt $threshold ]
-		then
-			echo "    PWM $pwm FAN $S (probably incorrect)"
-		else
-			echo "    PWM $pwm FAN $S"
-			let threshold=S*6/5
-		fi
-
-		if [ "$PLOT" = "y" ]
-		then
-			echo "$pwm $S" >> $TMP2
-		fi
-		if [ "$S" = "0" -o "$S" = "-1" ]
-		then
-			pwmdisable $P
-			echo "    Fan Stopped at PWM = $pwm"
-			if [ $pwm -eq $MAX ]
-			then
-				echo "    This fan appears to stop when the PWM is enabled;"
-				echo "    perhaps the fan input shares a pin with the PWM output"
-				echo "    on the sensor chip."
-				echo "    You cannot control this fan with this PWM output."
-				rm -f $TMP1 $TMP2
-				echo
-				return 0
-			fi
-			break
-		fi
-		if [ $pwm -lt $STEP2_BELOW ]
-		then
-			let pwm=$pwm-$STEP2
-		else
-			let pwm=$pwm-$STEP
-		fi
-	done
-	pwmdisable $P
-	if [ "$PLOT" = "y" ]
-	then
-		$PLOTTER  $TMP1
-		rm -f $TMP1 $TMP2
-	fi
-	echo
-}
-
-for i in $GOODPWM
-do
-	echo Testing pwm control $i ...
-	pwmenable $i
-	if [ $? -ne 0 ]
-	then
-		echo "Manual control mode not supported, skipping."
-		continue
-	fi
-	pwmset $i 0
-	sleep $DELAY
-	if [ $? -ne 0 ]
-	then
-		pwmdisable $i
-		echo '^C received, restoring PWM and aborting...'
-		exit 1
-	fi
-
-	# Sample all current fan speeds at once, so that we can quickly
-	# disable PWM and return all fans to full speed
-	CURRENT_SPEEDS="`cat $GOODFAN`"
-	pwmdisable $i
-
-	let pwmactivecount=0
-	let count=1
-	for j in $GOODFAN
-	do
-		OS=`echo $SPEEDS | cut -d' ' -f$count`
-		S=`echo $CURRENT_SPEEDS | cut -d' ' -f$count`
-		echo "  $j ... speed was $OS now $S"
-		let threshold=2*$OS/3
-		if [ $S -lt $threshold ]
-		then
-			echo "    It appears that fan $j"
-			echo "    is controlled by pwm $i"
-#
-# a PWM can control more than one fan....
-#
-			if [ $pwmactivecount -eq 0 ]
-			then
-				let pwmactivecount=1
-				pwmactive="$i ${pwmactive}"
-				fanactive="$j ${fanactive}"
-				fanactive_min="$S ${fanactive_min}"
-
-				# Give all correlated fans time to return to full speed
-				sleep $DELAY
-				if [ $? -ne 0 ]
-				then
-					echo '^C received, aborting...'
-					exit 1
-				fi
-			else
-				fanactive="$j+${fanactive}" #not supported yet by fancontrol
-				fanactive_min="$S+${fanactive_min}"
-			fi
-			S=`cat $j`
-			if [ $S -lt $threshold ]
-			then
-				echo "    Fan $j has not returned to speed, please investigate!"
-			else
-				echo -n "Would you like to generate a detailed correlation (y)? "
-				read X
-				if [ "$X" = "y" -o "$X" = "Y" -o "$X" = "" ]
-				then
-					pwmdetail $i $j
-				fi
-			fi
-		else
-			echo "    no correlation"
-		fi
-		let count=count+1
-	done
-	echo
-	if [ "$pwmactivecount" = "0" ]
-	then
-		echo "No correlations were detected."
-		echo "There is either no fan connected to the output of $i,"
-		echo "or the connected fan has no rpm-signal connected to one of"
-		echo "the tested fan sensors. (Note: not all motherboards have"
-		echo "the pwm outputs connected to the fan connectors,"
-		echo "check out the hardware database on http://www.almico.com/forumindex.php)"
-		echo
-		echo -n "Did you see/hear a fan stopping during the above test (n)? "
-		read X
-		if [ "$X" = "y" -o "$X" = "Y" ]
-		then
-			pwmactive="$i ${pwmactive}"
-		fi
-		echo
-	fi
-done
-
-
-echo 'Testing is complete.'
-echo 'Please verify that all fans have returned to their normal speed.'
-echo
-echo 'The fancontrol script can automatically respond to temperature changes'
-echo 'of your system by changing fanspeeds.'
-echo -n 'Do you want to set up its configuration file now (y)? '
-
-read X
-if [ "$X" = "n" -o "$X" = "N" ]
-then
-	exit
-fi
-
-for device in $DEVICES
-do
-	# Find available temperature monitoring inputs
-	MATCH=$device/'temp[1-9]_input'
-	device_temp=`echo $MATCH`
-	if [ "$MATCH" != "$device_temp" ]
-	then
-		TEMPS="$TEMPS $device_temp"
-	fi
-done
-
-if [ -z "$TEMPS" ]
-then
-	echo $0: 'There are no temperature-capable sensor modules installed'
-	exit 1
-fi
-
-function DevicePath()
-{
-	if [ -h "$1/device" ]
-	then
-		readlink -f "$1/device" | sed -e 's/^\/sys\///'
-	fi
-}
-
-function DeviceName()
-{
-	if [ -r "$1/name" ]
-	then
-		cat "$1/name" | sed -e 's/[[:space:]=]/_/g'
-	elif [ -r "$1/device/name" ]
-	then
-		cat "$1/device/name" | sed -e 's/[[:space:]=]/_/g'
-	fi
-}
-
-function ValidateDevices()
-{
-	local OLD_DEVPATH="$1" OLD_DEVNAME="$2" outdated=0
-	local entry device name path
-
-	for entry in $OLD_DEVPATH
-	do
-		device=`echo "$entry" | sed -e 's/=[^=]*$//'`
-		path=`echo "$entry" | sed -e 's/^[^=]*=//'`
-
-		if [ "`DevicePath "$device"`" != "$path" ]
-		then
-			echo "Device path of $device has changed"
-			outdated=1
-		fi
-	done
-
-	for entry in $OLD_DEVNAME
-	do
-		device=`echo "$entry" | sed -e 's/=[^=]*$//'`
-		name=`echo "$entry" | sed -e 's/^[^=]*=//'`
-
-		if [ "`DeviceName "$device"`" != "$name" ]
-		then
-			echo "Device name of $device has changed"
-			outdated=1
-		fi
-	done
-
-	return $outdated
-}
-
-function AskPath()
-{
-	echo -n 'What should be the path to your fancontrol config file (/etc/fancontrol)? '
-
-	read FCCONFIG
-	if [ "$FCCONFIG" = "" ]
-	then
-		FCCONFIG="/etc/fancontrol"
-	fi
-}
-
-AskPath
-
-function ClearConfig()
-{
-	FCTEMPS=""
-	FCFANS=""
-	MINTEMP=""
-	MAXTEMP=""
-	MINSTART=""
-	MINSTOP=""
-	MINPWM=""
-	MAXPWM=""
-}
-
-function LoadConfig()
-{
-	local OLD_DEVPATH OLD_DEVNAME
-
-	# Nothing to do
-	if [ ! -f "$1" ]
-	then
-		ClearConfig
-		return 0
-	fi
-
-	echo "Loading configuration from $1 ..."
-	INTERVAL=`egrep '^INTERVAL=.*$' $1 | sed -e 's/INTERVAL= *//g'`
-	OLD_DEVPATH=`egrep '^DEVPATH=.*$' $1 | sed -e 's/DEVPATH= *//g'`
-	OLD_DEVNAME=`egrep '^DEVNAME=.*$' $1 | sed -e 's/DEVNAME= *//g'`
-	FCTEMPS=`egrep '^FCTEMPS=.*$' $1 | sed -e 's/FCTEMPS= *//g'`
-	FCFANS=`egrep '^FCFANS=.*$' $1 | sed -e 's/FCFANS= *//g'`
-	MINTEMP=`egrep '^MINTEMP=.*$' $1 | sed -e 's/MINTEMP= *//g'`
-	MAXTEMP=`egrep '^MAXTEMP=.*$' $1 | sed -e 's/MAXTEMP= *//g'`
-	MINSTART=`egrep '^MINSTART=.*$' $1 | sed -e 's/MINSTART= *//g'`
-	MINSTOP=`egrep '^MINSTOP=.*$' $1 | sed -e 's/MINSTOP= *//g'`
-	MINPWM=`egrep '^MINPWM=.*$' $1 | sed -e 's/MINPWM= *//g'`
-	MAXPWM=`egrep '^MAXPWM=.*$' $1 | sed -e 's/MAXPWM= *//g'`
-
-	# Check for configuration change
-	if ! ValidateDevices "$OLD_DEVPATH" "$OLD_DEVNAME"
-	then
-		echo "Configuration appears to be outdated, discarded"
-		ClearConfig
-		return 0
-	fi
-}
-
-LoadConfig $FCCONFIG
-
-# $1 = pwm value below which the fan is stopped
-function TestMinStart()
-{
-	echo
-	echo 'Now we increase the PWM value in 10-unit-steps.'
-	echo 'Let the fan stop completely, then press return until the'
-	echo "fan starts spinning. Then enter 'y'."
-	echo 'We will use this value +20 as the starting speed.'
-	let fanok=0
-	let fanval="$1"
-
-	pwmenable $pwms
-	until [ "$fanok" = "1" ]
-	do
-		if [ $fanval -gt 240 ] ; then let fanval=$MAX ; let fanok=1 ; fi
-		echo -n "Setting $pwms to $fanval..."
-		pwmset $pwms $fanval
-		read FANTEST
-		if [ "$FANTEST" != "" ] ; then let fanok=1 ; fi
-		let fanval=fanval+10
-	done
-	pwmdisable $pwms
-
-	let fanval=fanval+20
-	if [ $fanval -gt 240 ] ; then let fanval=$MAX ; fi
-	echo "OK, using $fanval"
-}
-
-# $1 = fan input to read the fan speed from
-function TestMinStop()
-{
-	local faninput=$1
-	local threshold=100000
-	local fanspeed
-
-	echo
-	echo 'Now we decrease the PWM value to figure out the lowest usable value.'
-	echo 'We will use a slightly greater value as the minimum speed.'
-	let fanval=$MAX
-
-	pwmenable $pwms
-	while [ $fanval -ge 0 ]
-	do
-		pwmset $pwms $fanval
-		sleep $PDELAY
-		fanspeed=`cat $faninput`
-		if [ $fanspeed -gt $threshold ]
-		then
-			echo "    PWM $fanval -> $fanspeed RPM (probably incorrect)"
-			break
-		else
-			echo "    PWM $fanval -> $fanspeed RPM"
-			if [ $fanspeed = "0" -o $fanspeed = "-1" ]
-			then
-				break
-			fi
-			let threshold=fanspeed*6/5
-		fi
-		if [ $fanval -lt $STEP2_BELOW ]
-		then
-			let fanval=$fanval-$STEP2
-		else
-			let fanval=$fanval-$STEP
-		fi
-	done
-	pwmdisable $pwms
-
-	if [ $fanval -lt $STEP2_BELOW ]
-	then
-		let 'fanval=fanval+2*STEP2'
-	else
-		let 'fanval=fanval+STEP'
-	fi
-	echo "OK, using $fanval"
-}
-
-# Remember the path and name of each device with at least one
-# reference (pwm, temp or fan) in the configuration file.
-# This function sets globals DEVPATH and DEVNAME as a side effect.
-function RememberDevices()
-{
-	local used entry device name path tempfandev pwmdev
-	DEVPATH=""
-	DEVNAME=""
-
-	for device in $DEVICES
-	do
-		device=`echo "$device" | sed -e 's/\/.*$//'`
-
-		used=0
-		for entry in $1 $2
-		do
-			pwmdev=`echo "$entry" | sed -e 's/\/.*$//'`
-			tempfandev=`echo "$entry" | sed -e 's/^[^=]*=//' -e 's/\/.*$//'`
-
-			if [ "$device" = "$pwmdev" -o "$device" = "$tempfandev" ]
-			then
-				used=1
-			fi
-		done
-		if [ "$used" -eq 0 ]
-		then
-			continue
-		fi
-
-		# Record the device path and name. This lets the fancontrol
-		# script check that they didn't change. If they did, then the
-		# configuration file can no longer be trusted.
-		path=`DevicePath "$device"`
-		if [ -z "$DEVPATH" ]
-		then
-			DEVPATH="$device=$path"
-		else
-			DEVPATH="$DEVPATH $device=$path"
-		fi
-
-		name=`DeviceName "$device"`
-		if [ -z "$DEVNAME" ]
-		then
-			DEVNAME="$device=$name"
-		else
-			DEVNAME="$DEVNAME $device=$name"
-		fi
-	done
-}
-
-function SaveConfig()
-{
-	RememberDevices "$FCTEMPS" "$FCFANS"
-
-	echo
-	echo "Saving configuration to $FCCONFIG..."
-	tmpfile=`mktemp -t pwmcfg.XXXXXXXXXX` || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
-	trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15
-	echo "# Configuration file generated by pwmconfig, changes will be lost" >$tmpfile
-	echo "INTERVAL=$INTERVAL" >>$tmpfile
-	echo "DEVPATH=$DEVPATH" >>$tmpfile
-	echo "DEVNAME=$DEVNAME" >>$tmpfile
-	echo "FCTEMPS=$FCTEMPS" >>$tmpfile
-	echo "FCFANS=$FCFANS" >>$tmpfile
-	echo "MINTEMP=$MINTEMP" >>$tmpfile
-	echo "MAXTEMP=$MAXTEMP" >>$tmpfile
-	echo "MINSTART=$MINSTART" >>$tmpfile
-	echo "MINSTOP=$MINSTOP" >>$tmpfile
-	[ -n "$MINPWM" ] && echo "MINPWM=$MINPWM" >>$tmpfile
-	[ -n "$MAXPWM" ] && echo "MAXPWM=$MAXPWM" >>$tmpfile
-	mv $tmpfile $FCCONFIG
-	chmod +r $FCCONFIG
-	#check if file was written correctly
-	echo 'Configuration saved'
-}
-
-INTERVAL=10
-PS3='select (1-n): '
-DEFMINTEMP=20
-DEFMAXTEMP=60
-DEFMINSTART=150
-DEFMINSTOP=100
-
-function filter_cfgvar()
-{
-	echo "$1" | sed -e 's/ /\n/g' \
-		  | egrep "$2" \
-		  | sed -e 's/.*=//g'
-}
-
-# "select" won't repeat the list of options, so we enclose it in a
-# never-ending loop so that it starts over again with each iteration.
-# I admit it's not exactly nice, but I do not have a better idea to
-# keep usability at an acceptable level.
-while [ 1 ] ; do
-echo
-echo 'Select fan output to configure, or other action:'
-select pwms in $pwmactive "Change INTERVAL" "Just quit" "Save and quit" "Show configuration"; do
-	case $pwms in
-	"Change INTERVAL")
-		echo
-		echo "Current interval is $INTERVAL seconds."
-		echo -n "Enter the interval at which fancontrol should update PWM values (in s): "
-		read INTERVAL #check user input here
-		break ;;
-	"Just quit")
-		exit ;;
-	"Save and quit")
-		SaveConfig
-		exit ;;
-	"Show configuration")
-		echo
-		echo "Common Settings:"
-		echo "INTERVAL=$INTERVAL"
-		for pwmo in $pwmactive
-		do
-			echo
-			echo "Settings of ${pwmo}:"
-			echo "  Depends on `filter_cfgvar "$FCTEMPS" "$pwmo"`"
-			echo "  Controls `filter_cfgvar "$FCFANS" "$pwmo"`"
-			echo "  MINTEMP=`filter_cfgvar "$MINTEMP" $pwmo`"
-			echo "  MAXTEMP=`filter_cfgvar "$MAXTEMP" "$pwmo"`"
-			echo "  MINSTART=`filter_cfgvar "$MINSTART" "$pwmo"`"
-			echo "  MINSTOP=`filter_cfgvar "$MINSTOP" "$pwmo"`"
-			XMINP=`filter_cfgvar "$MINPWM" "$pwmo"`
-			[ -n "$XMINP" ] && echo "  MINPWM=$XMINP"
-			XMAXP=`filter_cfgvar "$MAXPWM" "$pwmo"`
-			[ -n "$XMAXP" ] && echo "  MAXPWM=$XMAXP"
-		done
-		echo
-		break ;;
-
-	"`echo ${pwmactive} |sed -e 's/ /\n/g' | egrep "${pwms}"`" )
-		pwmsed=`echo ${pwms} | sed -e 's/\//\\\\\//g'` #escape / for sed
-		echo
-
-		echo 'Devices:'
-		print_devices ""
-		echo
-
-		echo 'Current temperature readings are as follows:'
-		for j in $TEMPS
-		do
-			S=`cat $j`
-			let S="$S / 1000"
-			echo "$j	$S"
-		done
-		FAN=`echo $fanactive|cut -d' ' -f$REPLY`
-		FAN_MIN=`echo $fanactive_min|cut -d' ' -f$REPLY`
-	       	FCFANS="`echo $FCFANS | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=$FAN"
-		echo
-		echo "Select a temperature sensor as source for ${pwms}:"
-		select tempss in $TEMPS "None (Do not affect this PWM output)"; do
-			if [ "$tempss" = "None (Do not affect this PWM output)" ]
-			then
-
-				break;
-			else
-				if [ "$FCTEMPS" = "" ]
-				then
-					FCTEMPS="${pwms}=${tempss}"
-				else
-					FCTEMPS="`echo $FCTEMPS | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=${tempss}"
-				fi
-			fi
-			echo
-			echo 'Enter the low temperature (degree C)'
-			echo -n "below which the fan should spin at minimum speed ($DEFMINTEMP): "
-			read XMT
-			if [ "$XMT" = "" ]
-			then
-				XMT=$DEFMINTEMP
-			fi
-			if [ "$MINTEMP" = "" ]
-			then
-				MINTEMP="${pwms}=${XMT}"
-			else
-				MINTEMP="`echo $MINTEMP | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=${XMT}"
-			fi
-			echo
-			echo 'Enter the high temperature (degree C)'
-			echo -n "over which the fan should spin at maximum speed ($DEFMAXTEMP): "
-			read XMT
-			if [ "$XMT" = "" ]
-			then
-				XMT=$DEFMAXTEMP
-			fi
-			if [ "$MAXTEMP" = "" ]
-			then
-				MAXTEMP="${pwms}=${XMT}"
-			else
-				MAXTEMP="`echo $MAXTEMP | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=${XMT}"
-			fi
-
-			if [ $FAN_MIN -eq 0 ]
-			then
-				echo
-				echo "Enter the minimum PWM value (0-$MAX)"
-				echo -n "at which the fan STOPS spinning (press t to test) ($DEFMINSTOP): "
-				read XMSTOP
-
-				if [ "$XMSTOP" = "" ]
-				then
-					XMSTOP=$DEFMINSTOP
-				fi
-				if [ "$XMSTOP" = "t" -o "$XMSTOP" = "T" ]
-				then
-					TestMinStop $FAN
-					XMSTOP=$fanval
-				fi
-			else
-				XMSTOP=0
-			fi
-			if [ "$MINSTOP" = "" ]
-			then
-				MINSTOP="${pwms}=${XMSTOP}"
-			else
-				MINSTOP="`echo $MINSTOP | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=${XMSTOP}"
-			fi
-
-			if [ $FAN_MIN -eq 0 ]
-			then
-				echo
-				echo "Enter the minimum PWM value ($XMSTOP-$MAX)"
-				echo -n "at which the fan STARTS spinning (press t to test) ($DEFMINSTART): "
-				read XMSTART
-
-				if [ "$XMSTART" = "" ]
-				then
-					XMSTART=$DEFMINSTART
-				fi
-				if [ "$XMSTART" = "t" -o "$XMSTART" = "T" ]
-				then
-					TestMinStart $XMSTOP
-					XMSTART=$fanval
-				fi
-			else
-				XMSTART=$DEFMINSTART
-			fi
-			if [ "$MINSTART" = "" ]
-			then
-				MINSTART="${pwms}=${XMSTART}"
-			else
-				MINSTART="`echo $MINSTART | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=${XMSTART}"
-			fi
-
-			if [ $XMSTOP -gt 0 ]
-			then
-				echo
-				echo "Enter the PWM value (0-$XMSTOP) to use when the temperature"
-				echo -n "is below the low temperature limit (0): "
-				read XMINP
-			else
-				XMINP=""
-			fi
-			if [ -n "$XMINP" ]
-			then
-				if [ "$MINPWM" = "" ]
-				then
-					MINPWM="${pwms}=${XMINP}"
-				else
-					MINPWM="`echo $MINPWM | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=${XMINP}"
-				fi
-			fi
-			echo
-			echo "Enter the PWM value ($XMSTOP-$MAX) to use when the temperature"
-			echo -n "is over the high temperature limit ($MAX): "
-			read XMAXP
-			if [ -n "$XMAXP" ]
-			then
-				if [ "$MAXPWM" = "" ]
-				then
-					MAXPWM="${pwms}=${XMAXP}"
-				else
-					MAXPWM="`echo $MAXPWM | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=${XMAXP}"
-				fi
-			fi
-			echo
-			break;
-		done
-		break ;;
-
-	*)
-		echo "No such option. Enter a number."
-		break ;;
-	esac
-done
-done

=== modified file '.pc/100_recommend_using_upstart.patch/prog/detect/sensors-detect'
--- .pc/100_recommend_using_upstart.patch/prog/detect/sensors-detect	2013-05-09 21:55:15 +0000
+++ .pc/100_recommend_using_upstart.patch/prog/detect/sensors-detect	2014-01-03 03:11:39 +0000
@@ -41,7 +41,7 @@
 use vars qw(@pci_adapters @chip_ids @ipmi_ifs @non_hwmon_chip_ids
 	    $i2c_addresses_to_scan $revision @i2c_byte_cache);
 
-$revision = '$Revision: 6085 $ ($Date: 2012-10-30 18:18:45 +0100 (mar. 30 oct. 2012) $)';
+$revision = '$Revision: 6170 $ ($Date: 2013-05-20 21:25:22 +0200 (lun. 20 mai 2013) $)';
 $revision =~ s/\$\w+: (.*?) \$/$1/g;
 $revision =~ s/ \([^()]*\)//;
 
@@ -637,8 +637,8 @@
 		i2c_addrs => [0x2c..0x2e],
 		i2c_detect => sub { adt7490_detect(@_); },
 	}, {
-		name => "Analog Devices ADT7410",
-		driver => "to-be-written",
+		name => "Analog Devices ADT7410/ADT7420",
+		driver => "adt7410",
 		i2c_addrs => [0x48..0x4b],
 		i2c_detect => sub { adt7410_detect(@_); },
 	}, {
@@ -803,11 +803,6 @@
 		i2c_addrs => [0x2c..0x2f],
 		i2c_detect => sub { adm9240_detect(@_, 0); },
 	}, {
-		name => "Dallas Semiconductor DS1621/DS1631",
-		driver => "ds1621",
-		i2c_addrs => [0x48..0x4f],
-		i2c_detect => sub { ds1621_detect(@_); },
-	}, {
 		name => "Dallas Semiconductor DS1780",
 		driver => "adm9240",
 		i2c_addrs => [0x2c..0x2f],
@@ -1023,6 +1018,16 @@
 		i2c_addrs => [0x4c, 0x4d],
 		i2c_detect => sub { tmp42x_detect(@_, 2); },
 	}, {
+		name => "Texas Instruments TMP431",
+		driver => "to-be-written",		# tmp401
+		i2c_addrs => [0x4c, 0x4d],
+		i2c_detect => sub { lm90_detect(@_, 16); },
+	}, {
+		name => "Texas Instruments TMP432",
+		driver => "to-be-written",		# tmp401
+		i2c_addrs => [0x4c, 0x4d],
+		i2c_detect => sub { lm90_detect(@_, 17); },
+	}, {
 		name => "Texas Instruments AMC6821",
 		driver => "amc6821",
 		i2c_addrs => [0x18..0x1a, 0x2c..0x2e, 0x4c..0x4e],
@@ -1033,6 +1038,11 @@
 		i2c_addrs => [0x2b, 0x19, 0x2a],
 		i2c_detect => sub { lm95231_detect(@_, 0); },
 	}, {
+		name => "National Semiconductor LM95234",
+		driver => "to-be-written",		# lm95234
+		i2c_addrs => [0x18, 0x4d, 0x4e],
+		i2c_detect => sub { lm95231_detect(@_, 3); },
+	}, {
 		name => "National Semiconductor LM95241",
 		driver => "lm95241",
 		i2c_addrs => [0x2b, 0x19, 0x2a],
@@ -1400,6 +1410,11 @@
 		i2c_addrs => [0x18..0x1f],
 		i2c_detect => sub { jedec_JC42_4_detect(@_, 7); },
 	}, {
+		name => "Microchip MCP98244",
+		driver => "jc42",
+		i2c_addrs => [0x18..0x1f],
+		i2c_detect => sub { jedec_JC42_4_detect(@_, 15); },
+	}, {
 		name => "Microchip MCP9843",
 		driver => "jc42",
 		i2c_addrs => [0x18..0x1f],
@@ -1950,6 +1965,10 @@
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
+		name => "Winbond W83627SF/GF Super IO",
+		driver => "not-a-sensor",
+		devid => 0x59,
+	}, {
 		name => "Winbond W83627THF/THG Super IO Sensors",
 		driver => "w83627hf",
 		devid => 0x82,
@@ -2024,7 +2043,7 @@
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
-		name => "Nuvoton W83677HG-I (NCT6771F/NCT6772F/NCT6775F) Super IO Sensors",
+		name => "Nuvoton W83677HG-I (NCT5572D/NCT6771F/NCT6772F/NCT6775F) Super IO Sensors",
 		driver => "w83627ehf",
 		devid => 0xB470,
 		devid_mask => 0xFFF0,
@@ -2035,27 +2054,24 @@
 		driver => "not-a-sensor",
 		devid => 0x61,
 	}, {
-		name => "Nuvoton NCT5577D Super IO Sensors",
-		driver => "to-be-written",
-		devid => 0xC331,
-		logdev => 0x0b,
-		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-	}, {
-		name => "Nuvoton NCT6776F Super IO Sensors",
-		driver => "w83627ehf",
-		devid => 0xC333,
-		logdev => 0x0b,
-		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-	}, {
-		name => "Nuvoton NCT6779D Super IO Sensors",
-		driver => "to-be-written",	# nct6775, new driver
-		devid => 0xC562,
-		logdev => 0x0b,
-		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-	}, {
-		name => "Nuvoton NCT6102D/NCT6106D Super IO Sensors",
-		driver => "to-be-written",	# nct6775, new driver
-		devid => 0x1061,
+		name => "Nuvoton NCT5577D/NCT6776F Super IO Sensors",
+		driver => "nct6775",
+		devid => 0xC330,
+		devid_mask => 0xFFF0,
+		logdev => 0x0b,
+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+	}, {
+		name => "Nuvoton NCT5532D/NCT6779D Super IO Sensors",
+		driver => "nct6775",
+		devid => 0xC560,
+		devid_mask => 0xFFF0,
+		logdev => 0x0b,
+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+	}, {
+		name => "Nuvoton NCT6102D/NCT6104D/NCT6106D Super IO Sensors",
+		driver => "to-be-written",	# nct6775
+		devid => 0xC450,
+		devid_mask => 0xFFF0,
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
@@ -2225,14 +2241,20 @@
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
+		name => "ITE IT8752F Super IO Sensors",
+		driver => "to-be-written",	# it87
+		devid => 0x8752,
+		logdev => 0x04,
+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+	}, {
 		name => "ITE IT8771E Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8771,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
 		name => "ITE IT8772E Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8772,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
@@ -2244,13 +2266,13 @@
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
 		name => "ITE IT8782F Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8782,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
 		name => "ITE IT8783F Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8783,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
@@ -2354,6 +2376,10 @@
 		driver => "fam15h_power",
 		detect => sub { amd_pci_detect('1604') },
 	}, {
+		name => "AMD Family 16h power sensors",
+		driver => "fam15h_power",
+		detect => sub { amd_pci_detect('1534') },
+	}, {
 		name => "Intel digital thermal sensor",
 		driver => "coretemp",
 		detect => \&coretemp_detect,
@@ -2468,9 +2494,12 @@
 
 sub initialize_ioports
 {
-	sysopen(IOPORTS, "/dev/port", O_RDWR)
-		or die "/dev/port: $!\n";
-	binmode(IOPORTS);
+	if (sysopen(IOPORTS, "/dev/port", O_RDWR)) {
+		binmode(IOPORTS);
+		return 1;
+	}
+	print STDERR "/dev/port: $!\n";
+	return 0;
 }
 
 sub close_ioports
@@ -2770,9 +2799,19 @@
 {
 	local $_;
 
+	# /sys/module contains built-in drivers too, but doesn't exist on
+	# older kernels (added in kernel 2.6.7)
+	if (opendir(local *MODULES, "$sysfs_root/module")) {
+		while (defined($_ = readdir(MODULES))) {
+			next if m/^\./;
+			$modules_list{$1} = 1 if m/^(\S*)/;
+		}
+		return;
+	}
+
+	# Fall back to /proc/modules as it is always available
 	open(local *INPUTFILE, "/proc/modules") or return;
 	while (<INPUTFILE>) {
-		tr/-/_/; # Probably not needed
 		$modules_list{$1} = 1 if m/^(\S*)/;
 	}
 }
@@ -3498,13 +3537,14 @@
 				print("Can't set I2C address for $dev\n"),
 				next;
 
-			initialize_ioports();
-			$alias_detect = $detected->[$isa]->{alias_detect};
-			$is_alias = &$alias_detect($detected->[$isa]->{isa_addr},
-						   \*FILE,
-						   $detected->[$i2c]->{i2c_addr});
+			if (initialize_ioports()) {
+				$alias_detect = $detected->[$isa]->{alias_detect};
+				$is_alias = &$alias_detect($detected->[$isa]->{isa_addr},
+							   \*FILE,
+							   $detected->[$i2c]->{i2c_addr});
+				close_ioports();
+			}
 			close(FILE);
-			close_ioports();
 
 			next unless $is_alias;
 			# This is an alias: copy the I2C data into the ISA
@@ -4317,47 +4357,6 @@
 	return ($chip == 0) ? 4 : 2;
 }
 
-# Registers used:
-#   0xAA: Temperature
-#   0xA1: High limit
-#   0xA2: Low limit
-#   0xA8: Counter
-#   0xA9: Slope
-#   0xAC: Configuration
-# Detection is weak. We check if bit 4 (NVB) is clear, because it is
-# unlikely to be set (would mean that EEPROM is currently being accessed).
-# We also check the value of the counter and slope registers, the datasheet
-# doesn't mention the possible values but the conversion formula together
-# with experimental evidence suggest possible sanity checks.
-# Not all devices enjoy SMBus read word transactions, so we do as much as
-# possible with read byte transactions first, and only use read word
-# transactions second.
-sub ds1621_detect
-{
-	my ($file, $addr) = @_;
-
-	my $conf = i2c_smbus_read_byte_data($file, 0xAC);
-	return if ($conf & 0x10);
-
-	my $temp = i2c_smbus_read_word_data($file, 0xAA);
-	return if $temp < 0 || ($temp & 0x0f00);
-	# On the DS1631, the following two checks are too strict in theory,
-	# but in practice I very much doubt that anyone will set temperature
-	# limits not a multiple of 0.5 degrees C.
-	my $high = i2c_smbus_read_word_data($file, 0xA1);
-	return if $high < 0 || ($high & 0x7f00);
-	my $low = i2c_smbus_read_word_data($file, 0xA2);
-	return if $low < 0 || ($low & 0x7f00);
-
-	return if ($temp == 0 && $high == 0 && $low == 0 && $conf == 0);
-
-	# Old versions of the DS1621 apparently don't have the counter and
-	# slope registers (or they return crap)
-	my $counter = i2c_smbus_read_byte_data($file, 0xA8);
-	my $slope = i2c_smbus_read_byte_data($file, 0xA9);
-	return ($slope == 0x10 && $counter <= $slope) ? 3 : 2;
-}
-
 # Chip to detect: 0 = LM80, 1 = LM96080
 # Registers used:
 #   0x00: Configuration register
@@ -4504,7 +4503,7 @@
 #		  8 = W83L771W/G, 9 = TMP401, 10 = TMP411,
 #		  11 = W83L771AWG/ASG, 12 = MAX6690,
 #		  13 = ADT7461A/NCT1008, 14 = SA56004,
-#		  15 = G781
+#		  15 = G781, 16 = TMP431, 17 = TMP432
 # Registers used:
 #   0x03: Configuration
 #   0x04: Conversion rate
@@ -4622,6 +4621,18 @@
 		return if $mid != 0x47;		# GMT
 		return 8 if $cid == 0x01;	# G781
 	}
+	if ($chip == 16) {
+		return if ($conf & 0x1B) != 0;
+		return if $rate > 0x0F;
+		return if $mid != 0x55;		# Texas Instruments
+		return 6 if ($cid == 0x31);	# TMP431A/B/C/D
+	}
+	if ($chip == 17) {
+		return if ($conf & 0x1B) != 0;
+		return if $rate > 0x0F;
+		return if $mid != 0x55;		# Texas Instruments
+		return 6 if ($cid == 0x32);	# TMP432A/B
+	}
 	return;
 }
 
@@ -4693,14 +4704,17 @@
 	return 5;
 }
 
-# Chip to detect: 0 = LM95231, 1 = LM95241, 2 = LM95245
+# Chip to detect: 0 = LM95231, 1 = LM95241, 2 = LM95245, 3 = LM95234
 # Registers used:
 #   0x02: Status (3 unused bits)
 #   0x03: Configuration (3 unused bits)
+#   0x04: Conversion rate (6 unused bits, LM95234)
 #   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)
+#   0x30: Diode model (4 unused bits, LM95234)
 #   0x33: Status register 2 (6 unused bits, LM95245)
+#   0x38: Diode model status (4 unused bits, LM95234)
 #   0xfe: Manufacturer ID
 #   0xff: Revision ID
 sub lm95231_detect
@@ -4724,6 +4738,13 @@
 		return if i2c_smbus_read_byte_data($file, 0x03) & 0xa1;
 		return if i2c_smbus_read_byte_data($file, 0x30) & 0x1f;
 		return if i2c_smbus_read_byte_data($file, 0x33) & 0x3f;
+	} elsif ($chip == 3) {
+		return if $cid != 0x79;			# LM95234
+		return if i2c_smbus_read_byte_data($file, 0x02) & 0x30;
+		return if i2c_smbus_read_byte_data($file, 0x03) & 0xbc;
+		return if i2c_smbus_read_byte_data($file, 0x04) & 0xfc;
+		return if i2c_smbus_read_byte_data($file, 0x30) & 0xe1;
+		return if i2c_smbus_read_byte_data($file, 0x38) & 0xe1;
 	}
 
 	return 6;
@@ -6035,7 +6056,7 @@
 #                 4 = TS3000/TSE2002, 5 = MAX6604, 6 = MCP98242,
 #                 7 = MCP98243, 8 = MCP9843, 9 = CAT6095 / CAT34TS02,
 #                 10 = STTS424E, 11 = STTS2002, 12 = STTS3000
-#                 13 = MCP9804, 14 = AT30TS00
+#                 13 = MCP9804, 14 = AT30TS00, 15 = MCP98244
 # Registers used:
 #   0x00: Capabilities
 #   0x01: Configuration
@@ -6104,6 +6125,9 @@
 	} elsif ($chip == 14) {
 		return unless $manid == 0x00;		# Atmel
 		return unless $devid == 0x82;		# AT30TS00
+	} elsif ($chip == 15) {
+		return unless $manid == 0x00;		# MCP
+		return unless $devid == 0x22;		# MCP98244
 	}
 
 	# Now, do it all again with words. Note that we get
@@ -6161,6 +6185,9 @@
 	} elsif ($chip == 14) {
 		return unless $manid == 0x1f00;		# Atmel
 		return unless ($devid & 0xfeff) == 0x0082; # AT30TS00
+	} elsif ($chip == 15) {
+		return unless $manid == 0x5400;		# MCP
+		return unless ($devid & 0xfcff) == 0x0022; # MCP98244
 	}
 
 	return 5;
@@ -6759,10 +6786,11 @@
 		      "standard I/O ports to probe them. This is usually safe.\n";
 		print "Do you want to scan for Super I/O sensors? (YES/no): ";
 		unless (<STDIN> =~ /^\s*n/i) {
-			initialize_ioports();
-			$superio_features |= scan_superio(0x2e, 0x2f);
-			$superio_features |= scan_superio(0x4e, 0x4f);
-			close_ioports();
+			if (initialize_ioports()) {
+				$superio_features |= scan_superio(0x2e, 0x2f);
+				$superio_features |= scan_superio(0x4e, 0x4f);
+				close_ioports();
+			}
 		}
 		print "\n";
 
@@ -6775,9 +6803,10 @@
 			      "interfaces? (YES/no): ";
 			unless (<STDIN> =~ /^\s*n/i) {
 				if (!ipmi_from_smbios()) {
-					initialize_ioports();
-					scan_isa_bus(\@ipmi_ifs);
-					close_ioports();
+					if (initialize_ioports()) {
+						scan_isa_bus(\@ipmi_ifs);
+						close_ioports();
+					}
 				}
 			}
 			print "\n";
@@ -6791,9 +6820,10 @@
 		$input = <STDIN>;
 		unless ($input =~ /^\s*n/i
 		     || ($superio_features && $input !~ /^\s*y/i)) {
-			initialize_ioports();
-			scan_isa_bus(\@chip_ids);
-			close_ioports();
+			if (initialize_ioports()) {
+				scan_isa_bus(\@chip_ids);
+				close_ioports();
+			}
 		}
 		print "\n";
 	}

=== modified file '.pc/11-fancontrol-check.patch/prog/pwm/fancontrol'
--- .pc/11-fancontrol-check.patch/prog/pwm/fancontrol	2012-04-23 19:00:39 +0000
+++ .pc/11-fancontrol-check.patch/prog/pwm/fancontrol	2014-01-03 03:11:39 +0000
@@ -43,9 +43,10 @@
 #DEBUG=1
 MAX=255
 
-declare -i pwmval
+function LoadConfig
+{
+	local fcvcount fcv
 
-function LoadConfig {
 	echo "Loading configuration from $1 ..."
 	if [ ! -r "$1" ]
 	then
@@ -206,8 +207,9 @@
 }
 
 # Check that all referenced sysfs files exist
-function CheckFiles {
-	local outdated=0
+function CheckFiles
+{
+	local outdated=0 fcvcount pwmo tsen fan
 
 	let fcvcount=0
 	while (( $fcvcount < ${#AFCPWM[@]} )) # go through all pwm outputs
@@ -289,11 +291,16 @@
 cd $DIR
 
 # Check for configuration change
-if [ -z "$DEVPATH" -o -z "$DEVNAME" ]
+if [ "$DIR" != "/" ] && [ -z "$DEVPATH" -o -z "$DEVNAME" ]
 then
 	echo "Configuration is too old, please run pwmconfig again" >&2
 	exit 1
 fi
+if [ "$DIR" = "/" -a -n "$DEVPATH" ]
+then
+	echo "Unneeded DEVPATH with absolute device paths" >&2
+	exit 1
+fi
 if ! ValidateDevices "$DEVPATH" "$DEVNAME"
 then
 	echo "Configuration appears to be outdated, please run pwmconfig again" >&2
@@ -311,7 +318,8 @@
 # $1 = pwm file name
 function pwmdisable()
 {
-	ENABLE=${1}_enable
+	local ENABLE=${1}_enable
+
 	# No enable file? Just set to max
 	if [ ! -f $ENABLE ]
 	then
@@ -344,7 +352,8 @@
 # $1 = pwm file name
 function pwmenable()
 {
-	ENABLE=${1}_enable
+	local ENABLE=${1}_enable
+
 	if [ -f $ENABLE ]
 	then
 		echo 1 > $ENABLE 2> /dev/null
@@ -358,7 +367,8 @@
 
 function restorefans()
 {
-	local status=$1
+	local status=$1 fcvcount pwmo
+
 	echo 'Aborting, restoring fans...'
 	let fcvcount=0
 	while (( $fcvcount < ${#AFCPWM[@]} )) # go through all pwm outputs
@@ -376,7 +386,13 @@
 trap 'restorefans 1' SIGHUP SIGINT
 
 # main function
-function UpdateFanSpeeds {
+function UpdateFanSpeeds
+{
+	local fcvcount
+	local pwmo tsens fan mint maxt minsa minso minpwm maxpwm
+	local tval pwmpval fanval min_fanval one_fan one_fanval
+	local -i pwmval
+
 	let fcvcount=0
 	while (( $fcvcount < ${#AFCPWM[@]} )) # go through all pwm outputs
 	do

=== modified file '.pc/12-sensors-detect-superio-x86.patch/prog/detect/sensors-detect'
--- .pc/12-sensors-detect-superio-x86.patch/prog/detect/sensors-detect	2013-05-06 23:37:35 +0000
+++ .pc/12-sensors-detect-superio-x86.patch/prog/detect/sensors-detect	2014-01-03 03:11:39 +0000
@@ -41,7 +41,7 @@
 use vars qw(@pci_adapters @chip_ids @ipmi_ifs @non_hwmon_chip_ids
 	    $i2c_addresses_to_scan $revision @i2c_byte_cache);
 
-$revision = '$Revision: 6085 $ ($Date: 2012-10-30 18:18:45 +0100 (mar. 30 oct. 2012) $)';
+$revision = '$Revision: 6170 $ ($Date: 2013-05-20 21:25:22 +0200 (lun. 20 mai 2013) $)';
 $revision =~ s/\$\w+: (.*?) \$/$1/g;
 $revision =~ s/ \([^()]*\)//;
 
@@ -637,8 +637,8 @@
 		i2c_addrs => [0x2c..0x2e],
 		i2c_detect => sub { adt7490_detect(@_); },
 	}, {
-		name => "Analog Devices ADT7410",
-		driver => "to-be-written",
+		name => "Analog Devices ADT7410/ADT7420",
+		driver => "adt7410",
 		i2c_addrs => [0x48..0x4b],
 		i2c_detect => sub { adt7410_detect(@_); },
 	}, {
@@ -803,11 +803,6 @@
 		i2c_addrs => [0x2c..0x2f],
 		i2c_detect => sub { adm9240_detect(@_, 0); },
 	}, {
-		name => "Dallas Semiconductor DS1621/DS1631",
-		driver => "ds1621",
-		i2c_addrs => [0x48..0x4f],
-		i2c_detect => sub { ds1621_detect(@_); },
-	}, {
 		name => "Dallas Semiconductor DS1780",
 		driver => "adm9240",
 		i2c_addrs => [0x2c..0x2f],
@@ -1023,6 +1018,16 @@
 		i2c_addrs => [0x4c, 0x4d],
 		i2c_detect => sub { tmp42x_detect(@_, 2); },
 	}, {
+		name => "Texas Instruments TMP431",
+		driver => "to-be-written",		# tmp401
+		i2c_addrs => [0x4c, 0x4d],
+		i2c_detect => sub { lm90_detect(@_, 16); },
+	}, {
+		name => "Texas Instruments TMP432",
+		driver => "to-be-written",		# tmp401
+		i2c_addrs => [0x4c, 0x4d],
+		i2c_detect => sub { lm90_detect(@_, 17); },
+	}, {
 		name => "Texas Instruments AMC6821",
 		driver => "amc6821",
 		i2c_addrs => [0x18..0x1a, 0x2c..0x2e, 0x4c..0x4e],
@@ -1033,6 +1038,11 @@
 		i2c_addrs => [0x2b, 0x19, 0x2a],
 		i2c_detect => sub { lm95231_detect(@_, 0); },
 	}, {
+		name => "National Semiconductor LM95234",
+		driver => "to-be-written",		# lm95234
+		i2c_addrs => [0x18, 0x4d, 0x4e],
+		i2c_detect => sub { lm95231_detect(@_, 3); },
+	}, {
 		name => "National Semiconductor LM95241",
 		driver => "lm95241",
 		i2c_addrs => [0x2b, 0x19, 0x2a],
@@ -1400,6 +1410,11 @@
 		i2c_addrs => [0x18..0x1f],
 		i2c_detect => sub { jedec_JC42_4_detect(@_, 7); },
 	}, {
+		name => "Microchip MCP98244",
+		driver => "jc42",
+		i2c_addrs => [0x18..0x1f],
+		i2c_detect => sub { jedec_JC42_4_detect(@_, 15); },
+	}, {
 		name => "Microchip MCP9843",
 		driver => "jc42",
 		i2c_addrs => [0x18..0x1f],
@@ -1950,6 +1965,10 @@
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
+		name => "Winbond W83627SF/GF Super IO",
+		driver => "not-a-sensor",
+		devid => 0x59,
+	}, {
 		name => "Winbond W83627THF/THG Super IO Sensors",
 		driver => "w83627hf",
 		devid => 0x82,
@@ -2024,7 +2043,7 @@
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
-		name => "Nuvoton W83677HG-I (NCT6771F/NCT6772F/NCT6775F) Super IO Sensors",
+		name => "Nuvoton W83677HG-I (NCT5572D/NCT6771F/NCT6772F/NCT6775F) Super IO Sensors",
 		driver => "w83627ehf",
 		devid => 0xB470,
 		devid_mask => 0xFFF0,
@@ -2035,27 +2054,24 @@
 		driver => "not-a-sensor",
 		devid => 0x61,
 	}, {
-		name => "Nuvoton NCT5577D Super IO Sensors",
-		driver => "to-be-written",
-		devid => 0xC331,
-		logdev => 0x0b,
-		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-	}, {
-		name => "Nuvoton NCT6776F Super IO Sensors",
-		driver => "w83627ehf",
-		devid => 0xC333,
-		logdev => 0x0b,
-		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-	}, {
-		name => "Nuvoton NCT6779D Super IO Sensors",
-		driver => "to-be-written",	# nct6775, new driver
-		devid => 0xC562,
-		logdev => 0x0b,
-		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-	}, {
-		name => "Nuvoton NCT6102D/NCT6106D Super IO Sensors",
-		driver => "to-be-written",	# nct6775, new driver
-		devid => 0x1061,
+		name => "Nuvoton NCT5577D/NCT6776F Super IO Sensors",
+		driver => "nct6775",
+		devid => 0xC330,
+		devid_mask => 0xFFF0,
+		logdev => 0x0b,
+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+	}, {
+		name => "Nuvoton NCT5532D/NCT6779D Super IO Sensors",
+		driver => "nct6775",
+		devid => 0xC560,
+		devid_mask => 0xFFF0,
+		logdev => 0x0b,
+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+	}, {
+		name => "Nuvoton NCT6102D/NCT6104D/NCT6106D Super IO Sensors",
+		driver => "to-be-written",	# nct6775
+		devid => 0xC450,
+		devid_mask => 0xFFF0,
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
@@ -2225,14 +2241,20 @@
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
+		name => "ITE IT8752F Super IO Sensors",
+		driver => "to-be-written",	# it87
+		devid => 0x8752,
+		logdev => 0x04,
+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+	}, {
 		name => "ITE IT8771E Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8771,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
 		name => "ITE IT8772E Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8772,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
@@ -2244,13 +2266,13 @@
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
 		name => "ITE IT8782F Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8782,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
 		name => "ITE IT8783F Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8783,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
@@ -2354,6 +2376,10 @@
 		driver => "fam15h_power",
 		detect => sub { amd_pci_detect('1604') },
 	}, {
+		name => "AMD Family 16h power sensors",
+		driver => "fam15h_power",
+		detect => sub { amd_pci_detect('1534') },
+	}, {
 		name => "Intel digital thermal sensor",
 		driver => "coretemp",
 		detect => \&coretemp_detect,
@@ -2468,9 +2494,12 @@
 
 sub initialize_ioports
 {
-	sysopen(IOPORTS, "/dev/port", O_RDWR)
-		or die "/dev/port: $!\n";
-	binmode(IOPORTS);
+	if (sysopen(IOPORTS, "/dev/port", O_RDWR)) {
+		binmode(IOPORTS);
+		return 1;
+	}
+	print STDERR "/dev/port: $!\n";
+	return 0;
 }
 
 sub close_ioports
@@ -2770,9 +2799,19 @@
 {
 	local $_;
 
+	# /sys/module contains built-in drivers too, but doesn't exist on
+	# older kernels (added in kernel 2.6.7)
+	if (opendir(local *MODULES, "$sysfs_root/module")) {
+		while (defined($_ = readdir(MODULES))) {
+			next if m/^\./;
+			$modules_list{$1} = 1 if m/^(\S*)/;
+		}
+		return;
+	}
+
+	# Fall back to /proc/modules as it is always available
 	open(local *INPUTFILE, "/proc/modules") or return;
 	while (<INPUTFILE>) {
-		tr/-/_/; # Probably not needed
 		$modules_list{$1} = 1 if m/^(\S*)/;
 	}
 }
@@ -3498,13 +3537,14 @@
 				print("Can't set I2C address for $dev\n"),
 				next;
 
-			initialize_ioports();
-			$alias_detect = $detected->[$isa]->{alias_detect};
-			$is_alias = &$alias_detect($detected->[$isa]->{isa_addr},
-						   \*FILE,
-						   $detected->[$i2c]->{i2c_addr});
+			if (initialize_ioports()) {
+				$alias_detect = $detected->[$isa]->{alias_detect};
+				$is_alias = &$alias_detect($detected->[$isa]->{isa_addr},
+							   \*FILE,
+							   $detected->[$i2c]->{i2c_addr});
+				close_ioports();
+			}
 			close(FILE);
-			close_ioports();
 
 			next unless $is_alias;
 			# This is an alias: copy the I2C data into the ISA
@@ -4317,47 +4357,6 @@
 	return ($chip == 0) ? 4 : 2;
 }
 
-# Registers used:
-#   0xAA: Temperature
-#   0xA1: High limit
-#   0xA2: Low limit
-#   0xA8: Counter
-#   0xA9: Slope
-#   0xAC: Configuration
-# Detection is weak. We check if bit 4 (NVB) is clear, because it is
-# unlikely to be set (would mean that EEPROM is currently being accessed).
-# We also check the value of the counter and slope registers, the datasheet
-# doesn't mention the possible values but the conversion formula together
-# with experimental evidence suggest possible sanity checks.
-# Not all devices enjoy SMBus read word transactions, so we do as much as
-# possible with read byte transactions first, and only use read word
-# transactions second.
-sub ds1621_detect
-{
-	my ($file, $addr) = @_;
-
-	my $conf = i2c_smbus_read_byte_data($file, 0xAC);
-	return if ($conf & 0x10);
-
-	my $temp = i2c_smbus_read_word_data($file, 0xAA);
-	return if $temp < 0 || ($temp & 0x0f00);
-	# On the DS1631, the following two checks are too strict in theory,
-	# but in practice I very much doubt that anyone will set temperature
-	# limits not a multiple of 0.5 degrees C.
-	my $high = i2c_smbus_read_word_data($file, 0xA1);
-	return if $high < 0 || ($high & 0x7f00);
-	my $low = i2c_smbus_read_word_data($file, 0xA2);
-	return if $low < 0 || ($low & 0x7f00);
-
-	return if ($temp == 0 && $high == 0 && $low == 0 && $conf == 0);
-
-	# Old versions of the DS1621 apparently don't have the counter and
-	# slope registers (or they return crap)
-	my $counter = i2c_smbus_read_byte_data($file, 0xA8);
-	my $slope = i2c_smbus_read_byte_data($file, 0xA9);
-	return ($slope == 0x10 && $counter <= $slope) ? 3 : 2;
-}
-
 # Chip to detect: 0 = LM80, 1 = LM96080
 # Registers used:
 #   0x00: Configuration register
@@ -4504,7 +4503,7 @@
 #		  8 = W83L771W/G, 9 = TMP401, 10 = TMP411,
 #		  11 = W83L771AWG/ASG, 12 = MAX6690,
 #		  13 = ADT7461A/NCT1008, 14 = SA56004,
-#		  15 = G781
+#		  15 = G781, 16 = TMP431, 17 = TMP432
 # Registers used:
 #   0x03: Configuration
 #   0x04: Conversion rate
@@ -4622,6 +4621,18 @@
 		return if $mid != 0x47;		# GMT
 		return 8 if $cid == 0x01;	# G781
 	}
+	if ($chip == 16) {
+		return if ($conf & 0x1B) != 0;
+		return if $rate > 0x0F;
+		return if $mid != 0x55;		# Texas Instruments
+		return 6 if ($cid == 0x31);	# TMP431A/B/C/D
+	}
+	if ($chip == 17) {
+		return if ($conf & 0x1B) != 0;
+		return if $rate > 0x0F;
+		return if $mid != 0x55;		# Texas Instruments
+		return 6 if ($cid == 0x32);	# TMP432A/B
+	}
 	return;
 }
 
@@ -4693,14 +4704,17 @@
 	return 5;
 }
 
-# Chip to detect: 0 = LM95231, 1 = LM95241, 2 = LM95245
+# Chip to detect: 0 = LM95231, 1 = LM95241, 2 = LM95245, 3 = LM95234
 # Registers used:
 #   0x02: Status (3 unused bits)
 #   0x03: Configuration (3 unused bits)
+#   0x04: Conversion rate (6 unused bits, LM95234)
 #   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)
+#   0x30: Diode model (4 unused bits, LM95234)
 #   0x33: Status register 2 (6 unused bits, LM95245)
+#   0x38: Diode model status (4 unused bits, LM95234)
 #   0xfe: Manufacturer ID
 #   0xff: Revision ID
 sub lm95231_detect
@@ -4724,6 +4738,13 @@
 		return if i2c_smbus_read_byte_data($file, 0x03) & 0xa1;
 		return if i2c_smbus_read_byte_data($file, 0x30) & 0x1f;
 		return if i2c_smbus_read_byte_data($file, 0x33) & 0x3f;
+	} elsif ($chip == 3) {
+		return if $cid != 0x79;			# LM95234
+		return if i2c_smbus_read_byte_data($file, 0x02) & 0x30;
+		return if i2c_smbus_read_byte_data($file, 0x03) & 0xbc;
+		return if i2c_smbus_read_byte_data($file, 0x04) & 0xfc;
+		return if i2c_smbus_read_byte_data($file, 0x30) & 0xe1;
+		return if i2c_smbus_read_byte_data($file, 0x38) & 0xe1;
 	}
 
 	return 6;
@@ -6035,7 +6056,7 @@
 #                 4 = TS3000/TSE2002, 5 = MAX6604, 6 = MCP98242,
 #                 7 = MCP98243, 8 = MCP9843, 9 = CAT6095 / CAT34TS02,
 #                 10 = STTS424E, 11 = STTS2002, 12 = STTS3000
-#                 13 = MCP9804, 14 = AT30TS00
+#                 13 = MCP9804, 14 = AT30TS00, 15 = MCP98244
 # Registers used:
 #   0x00: Capabilities
 #   0x01: Configuration
@@ -6104,6 +6125,9 @@
 	} elsif ($chip == 14) {
 		return unless $manid == 0x00;		# Atmel
 		return unless $devid == 0x82;		# AT30TS00
+	} elsif ($chip == 15) {
+		return unless $manid == 0x00;		# MCP
+		return unless $devid == 0x22;		# MCP98244
 	}
 
 	# Now, do it all again with words. Note that we get
@@ -6161,6 +6185,9 @@
 	} elsif ($chip == 14) {
 		return unless $manid == 0x1f00;		# Atmel
 		return unless ($devid & 0xfeff) == 0x0082; # AT30TS00
+	} elsif ($chip == 15) {
+		return unless $manid == 0x5400;		# MCP
+		return unless ($devid & 0xfcff) == 0x0022; # MCP98244
 	}
 
 	return 5;
@@ -6759,10 +6786,11 @@
 		      "standard I/O ports to probe them. This is usually safe.\n";
 		print "Do you want to scan for Super I/O sensors? (YES/no): ";
 		unless (<STDIN> =~ /^\s*n/i) {
-			initialize_ioports();
-			$superio_features |= scan_superio(0x2e, 0x2f);
-			$superio_features |= scan_superio(0x4e, 0x4f);
-			close_ioports();
+			if (initialize_ioports()) {
+				$superio_features |= scan_superio(0x2e, 0x2f);
+				$superio_features |= scan_superio(0x4e, 0x4f);
+				close_ioports();
+			}
 		}
 		print "\n";
 
@@ -6775,9 +6803,10 @@
 			      "interfaces? (YES/no): ";
 			unless (<STDIN> =~ /^\s*n/i) {
 				if (!ipmi_from_smbios()) {
-					initialize_ioports();
-					scan_isa_bus(\@ipmi_ifs);
-					close_ioports();
+					if (initialize_ioports()) {
+						scan_isa_bus(\@ipmi_ifs);
+						close_ioports();
+					}
 				}
 			}
 			print "\n";
@@ -6791,9 +6820,10 @@
 		$input = <STDIN>;
 		unless ($input =~ /^\s*n/i
 		     || ($superio_features && $input !~ /^\s*y/i)) {
-			initialize_ioports();
-			scan_isa_bus(\@chip_ids);
-			close_ioports();
+			if (initialize_ioports()) {
+				scan_isa_bus(\@chip_ids);
+				close_ioports();
+			}
 		}
 		print "\n";
 	}

=== modified file '.pc/14-2-digits-kernel.patch/prog/detect/sensors-detect'
--- .pc/14-2-digits-kernel.patch/prog/detect/sensors-detect	2013-05-06 23:37:35 +0000
+++ .pc/14-2-digits-kernel.patch/prog/detect/sensors-detect	2014-01-03 03:11:39 +0000
@@ -41,7 +41,7 @@
 use vars qw(@pci_adapters @chip_ids @ipmi_ifs @non_hwmon_chip_ids
 	    $i2c_addresses_to_scan $revision @i2c_byte_cache);
 
-$revision = '$Revision: 6085 $ ($Date: 2012-10-30 18:18:45 +0100 (mar. 30 oct. 2012) $)';
+$revision = '$Revision: 6170 $ ($Date: 2013-05-20 21:25:22 +0200 (lun. 20 mai 2013) $)';
 $revision =~ s/\$\w+: (.*?) \$/$1/g;
 $revision =~ s/ \([^()]*\)//;
 
@@ -637,8 +637,8 @@
 		i2c_addrs => [0x2c..0x2e],
 		i2c_detect => sub { adt7490_detect(@_); },
 	}, {
-		name => "Analog Devices ADT7410",
-		driver => "to-be-written",
+		name => "Analog Devices ADT7410/ADT7420",
+		driver => "adt7410",
 		i2c_addrs => [0x48..0x4b],
 		i2c_detect => sub { adt7410_detect(@_); },
 	}, {
@@ -803,11 +803,6 @@
 		i2c_addrs => [0x2c..0x2f],
 		i2c_detect => sub { adm9240_detect(@_, 0); },
 	}, {
-		name => "Dallas Semiconductor DS1621/DS1631",
-		driver => "ds1621",
-		i2c_addrs => [0x48..0x4f],
-		i2c_detect => sub { ds1621_detect(@_); },
-	}, {
 		name => "Dallas Semiconductor DS1780",
 		driver => "adm9240",
 		i2c_addrs => [0x2c..0x2f],
@@ -1023,6 +1018,16 @@
 		i2c_addrs => [0x4c, 0x4d],
 		i2c_detect => sub { tmp42x_detect(@_, 2); },
 	}, {
+		name => "Texas Instruments TMP431",
+		driver => "to-be-written",		# tmp401
+		i2c_addrs => [0x4c, 0x4d],
+		i2c_detect => sub { lm90_detect(@_, 16); },
+	}, {
+		name => "Texas Instruments TMP432",
+		driver => "to-be-written",		# tmp401
+		i2c_addrs => [0x4c, 0x4d],
+		i2c_detect => sub { lm90_detect(@_, 17); },
+	}, {
 		name => "Texas Instruments AMC6821",
 		driver => "amc6821",
 		i2c_addrs => [0x18..0x1a, 0x2c..0x2e, 0x4c..0x4e],
@@ -1033,6 +1038,11 @@
 		i2c_addrs => [0x2b, 0x19, 0x2a],
 		i2c_detect => sub { lm95231_detect(@_, 0); },
 	}, {
+		name => "National Semiconductor LM95234",
+		driver => "to-be-written",		# lm95234
+		i2c_addrs => [0x18, 0x4d, 0x4e],
+		i2c_detect => sub { lm95231_detect(@_, 3); },
+	}, {
 		name => "National Semiconductor LM95241",
 		driver => "lm95241",
 		i2c_addrs => [0x2b, 0x19, 0x2a],
@@ -1400,6 +1410,11 @@
 		i2c_addrs => [0x18..0x1f],
 		i2c_detect => sub { jedec_JC42_4_detect(@_, 7); },
 	}, {
+		name => "Microchip MCP98244",
+		driver => "jc42",
+		i2c_addrs => [0x18..0x1f],
+		i2c_detect => sub { jedec_JC42_4_detect(@_, 15); },
+	}, {
 		name => "Microchip MCP9843",
 		driver => "jc42",
 		i2c_addrs => [0x18..0x1f],
@@ -1950,6 +1965,10 @@
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
+		name => "Winbond W83627SF/GF Super IO",
+		driver => "not-a-sensor",
+		devid => 0x59,
+	}, {
 		name => "Winbond W83627THF/THG Super IO Sensors",
 		driver => "w83627hf",
 		devid => 0x82,
@@ -2024,7 +2043,7 @@
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
-		name => "Nuvoton W83677HG-I (NCT6771F/NCT6772F/NCT6775F) Super IO Sensors",
+		name => "Nuvoton W83677HG-I (NCT5572D/NCT6771F/NCT6772F/NCT6775F) Super IO Sensors",
 		driver => "w83627ehf",
 		devid => 0xB470,
 		devid_mask => 0xFFF0,
@@ -2035,27 +2054,24 @@
 		driver => "not-a-sensor",
 		devid => 0x61,
 	}, {
-		name => "Nuvoton NCT5577D Super IO Sensors",
-		driver => "to-be-written",
-		devid => 0xC331,
-		logdev => 0x0b,
-		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-	}, {
-		name => "Nuvoton NCT6776F Super IO Sensors",
-		driver => "w83627ehf",
-		devid => 0xC333,
-		logdev => 0x0b,
-		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-	}, {
-		name => "Nuvoton NCT6779D Super IO Sensors",
-		driver => "to-be-written",	# nct6775, new driver
-		devid => 0xC562,
-		logdev => 0x0b,
-		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-	}, {
-		name => "Nuvoton NCT6102D/NCT6106D Super IO Sensors",
-		driver => "to-be-written",	# nct6775, new driver
-		devid => 0x1061,
+		name => "Nuvoton NCT5577D/NCT6776F Super IO Sensors",
+		driver => "nct6775",
+		devid => 0xC330,
+		devid_mask => 0xFFF0,
+		logdev => 0x0b,
+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+	}, {
+		name => "Nuvoton NCT5532D/NCT6779D Super IO Sensors",
+		driver => "nct6775",
+		devid => 0xC560,
+		devid_mask => 0xFFF0,
+		logdev => 0x0b,
+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+	}, {
+		name => "Nuvoton NCT6102D/NCT6104D/NCT6106D Super IO Sensors",
+		driver => "to-be-written",	# nct6775
+		devid => 0xC450,
+		devid_mask => 0xFFF0,
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
@@ -2225,14 +2241,20 @@
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
+		name => "ITE IT8752F Super IO Sensors",
+		driver => "to-be-written",	# it87
+		devid => 0x8752,
+		logdev => 0x04,
+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+	}, {
 		name => "ITE IT8771E Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8771,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
 		name => "ITE IT8772E Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8772,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
@@ -2244,13 +2266,13 @@
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
 		name => "ITE IT8782F Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8782,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
 		name => "ITE IT8783F Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8783,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
@@ -2354,6 +2376,10 @@
 		driver => "fam15h_power",
 		detect => sub { amd_pci_detect('1604') },
 	}, {
+		name => "AMD Family 16h power sensors",
+		driver => "fam15h_power",
+		detect => sub { amd_pci_detect('1534') },
+	}, {
 		name => "Intel digital thermal sensor",
 		driver => "coretemp",
 		detect => \&coretemp_detect,
@@ -2468,9 +2494,12 @@
 
 sub initialize_ioports
 {
-	sysopen(IOPORTS, "/dev/port", O_RDWR)
-		or die "/dev/port: $!\n";
-	binmode(IOPORTS);
+	if (sysopen(IOPORTS, "/dev/port", O_RDWR)) {
+		binmode(IOPORTS);
+		return 1;
+	}
+	print STDERR "/dev/port: $!\n";
+	return 0;
 }
 
 sub close_ioports
@@ -2770,9 +2799,19 @@
 {
 	local $_;
 
+	# /sys/module contains built-in drivers too, but doesn't exist on
+	# older kernels (added in kernel 2.6.7)
+	if (opendir(local *MODULES, "$sysfs_root/module")) {
+		while (defined($_ = readdir(MODULES))) {
+			next if m/^\./;
+			$modules_list{$1} = 1 if m/^(\S*)/;
+		}
+		return;
+	}
+
+	# Fall back to /proc/modules as it is always available
 	open(local *INPUTFILE, "/proc/modules") or return;
 	while (<INPUTFILE>) {
-		tr/-/_/; # Probably not needed
 		$modules_list{$1} = 1 if m/^(\S*)/;
 	}
 }
@@ -3498,13 +3537,14 @@
 				print("Can't set I2C address for $dev\n"),
 				next;
 
-			initialize_ioports();
-			$alias_detect = $detected->[$isa]->{alias_detect};
-			$is_alias = &$alias_detect($detected->[$isa]->{isa_addr},
-						   \*FILE,
-						   $detected->[$i2c]->{i2c_addr});
+			if (initialize_ioports()) {
+				$alias_detect = $detected->[$isa]->{alias_detect};
+				$is_alias = &$alias_detect($detected->[$isa]->{isa_addr},
+							   \*FILE,
+							   $detected->[$i2c]->{i2c_addr});
+				close_ioports();
+			}
 			close(FILE);
-			close_ioports();
 
 			next unless $is_alias;
 			# This is an alias: copy the I2C data into the ISA
@@ -4317,47 +4357,6 @@
 	return ($chip == 0) ? 4 : 2;
 }
 
-# Registers used:
-#   0xAA: Temperature
-#   0xA1: High limit
-#   0xA2: Low limit
-#   0xA8: Counter
-#   0xA9: Slope
-#   0xAC: Configuration
-# Detection is weak. We check if bit 4 (NVB) is clear, because it is
-# unlikely to be set (would mean that EEPROM is currently being accessed).
-# We also check the value of the counter and slope registers, the datasheet
-# doesn't mention the possible values but the conversion formula together
-# with experimental evidence suggest possible sanity checks.
-# Not all devices enjoy SMBus read word transactions, so we do as much as
-# possible with read byte transactions first, and only use read word
-# transactions second.
-sub ds1621_detect
-{
-	my ($file, $addr) = @_;
-
-	my $conf = i2c_smbus_read_byte_data($file, 0xAC);
-	return if ($conf & 0x10);
-
-	my $temp = i2c_smbus_read_word_data($file, 0xAA);
-	return if $temp < 0 || ($temp & 0x0f00);
-	# On the DS1631, the following two checks are too strict in theory,
-	# but in practice I very much doubt that anyone will set temperature
-	# limits not a multiple of 0.5 degrees C.
-	my $high = i2c_smbus_read_word_data($file, 0xA1);
-	return if $high < 0 || ($high & 0x7f00);
-	my $low = i2c_smbus_read_word_data($file, 0xA2);
-	return if $low < 0 || ($low & 0x7f00);
-
-	return if ($temp == 0 && $high == 0 && $low == 0 && $conf == 0);
-
-	# Old versions of the DS1621 apparently don't have the counter and
-	# slope registers (or they return crap)
-	my $counter = i2c_smbus_read_byte_data($file, 0xA8);
-	my $slope = i2c_smbus_read_byte_data($file, 0xA9);
-	return ($slope == 0x10 && $counter <= $slope) ? 3 : 2;
-}
-
 # Chip to detect: 0 = LM80, 1 = LM96080
 # Registers used:
 #   0x00: Configuration register
@@ -4504,7 +4503,7 @@
 #		  8 = W83L771W/G, 9 = TMP401, 10 = TMP411,
 #		  11 = W83L771AWG/ASG, 12 = MAX6690,
 #		  13 = ADT7461A/NCT1008, 14 = SA56004,
-#		  15 = G781
+#		  15 = G781, 16 = TMP431, 17 = TMP432
 # Registers used:
 #   0x03: Configuration
 #   0x04: Conversion rate
@@ -4622,6 +4621,18 @@
 		return if $mid != 0x47;		# GMT
 		return 8 if $cid == 0x01;	# G781
 	}
+	if ($chip == 16) {
+		return if ($conf & 0x1B) != 0;
+		return if $rate > 0x0F;
+		return if $mid != 0x55;		# Texas Instruments
+		return 6 if ($cid == 0x31);	# TMP431A/B/C/D
+	}
+	if ($chip == 17) {
+		return if ($conf & 0x1B) != 0;
+		return if $rate > 0x0F;
+		return if $mid != 0x55;		# Texas Instruments
+		return 6 if ($cid == 0x32);	# TMP432A/B
+	}
 	return;
 }
 
@@ -4693,14 +4704,17 @@
 	return 5;
 }
 
-# Chip to detect: 0 = LM95231, 1 = LM95241, 2 = LM95245
+# Chip to detect: 0 = LM95231, 1 = LM95241, 2 = LM95245, 3 = LM95234
 # Registers used:
 #   0x02: Status (3 unused bits)
 #   0x03: Configuration (3 unused bits)
+#   0x04: Conversion rate (6 unused bits, LM95234)
 #   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)
+#   0x30: Diode model (4 unused bits, LM95234)
 #   0x33: Status register 2 (6 unused bits, LM95245)
+#   0x38: Diode model status (4 unused bits, LM95234)
 #   0xfe: Manufacturer ID
 #   0xff: Revision ID
 sub lm95231_detect
@@ -4724,6 +4738,13 @@
 		return if i2c_smbus_read_byte_data($file, 0x03) & 0xa1;
 		return if i2c_smbus_read_byte_data($file, 0x30) & 0x1f;
 		return if i2c_smbus_read_byte_data($file, 0x33) & 0x3f;
+	} elsif ($chip == 3) {
+		return if $cid != 0x79;			# LM95234
+		return if i2c_smbus_read_byte_data($file, 0x02) & 0x30;
+		return if i2c_smbus_read_byte_data($file, 0x03) & 0xbc;
+		return if i2c_smbus_read_byte_data($file, 0x04) & 0xfc;
+		return if i2c_smbus_read_byte_data($file, 0x30) & 0xe1;
+		return if i2c_smbus_read_byte_data($file, 0x38) & 0xe1;
 	}
 
 	return 6;
@@ -6035,7 +6056,7 @@
 #                 4 = TS3000/TSE2002, 5 = MAX6604, 6 = MCP98242,
 #                 7 = MCP98243, 8 = MCP9843, 9 = CAT6095 / CAT34TS02,
 #                 10 = STTS424E, 11 = STTS2002, 12 = STTS3000
-#                 13 = MCP9804, 14 = AT30TS00
+#                 13 = MCP9804, 14 = AT30TS00, 15 = MCP98244
 # Registers used:
 #   0x00: Capabilities
 #   0x01: Configuration
@@ -6104,6 +6125,9 @@
 	} elsif ($chip == 14) {
 		return unless $manid == 0x00;		# Atmel
 		return unless $devid == 0x82;		# AT30TS00
+	} elsif ($chip == 15) {
+		return unless $manid == 0x00;		# MCP
+		return unless $devid == 0x22;		# MCP98244
 	}
 
 	# Now, do it all again with words. Note that we get
@@ -6161,6 +6185,9 @@
 	} elsif ($chip == 14) {
 		return unless $manid == 0x1f00;		# Atmel
 		return unless ($devid & 0xfeff) == 0x0082; # AT30TS00
+	} elsif ($chip == 15) {
+		return unless $manid == 0x5400;		# MCP
+		return unless ($devid & 0xfcff) == 0x0022; # MCP98244
 	}
 
 	return 5;
@@ -6759,10 +6786,11 @@
 		      "standard I/O ports to probe them. This is usually safe.\n";
 		print "Do you want to scan for Super I/O sensors? (YES/no): ";
 		unless (<STDIN> =~ /^\s*n/i) {
-			initialize_ioports();
-			$superio_features |= scan_superio(0x2e, 0x2f);
-			$superio_features |= scan_superio(0x4e, 0x4f);
-			close_ioports();
+			if (initialize_ioports()) {
+				$superio_features |= scan_superio(0x2e, 0x2f);
+				$superio_features |= scan_superio(0x4e, 0x4f);
+				close_ioports();
+			}
 		}
 		print "\n";
 
@@ -6775,9 +6803,10 @@
 			      "interfaces? (YES/no): ";
 			unless (<STDIN> =~ /^\s*n/i) {
 				if (!ipmi_from_smbios()) {
-					initialize_ioports();
-					scan_isa_bus(\@ipmi_ifs);
-					close_ioports();
+					if (initialize_ioports()) {
+						scan_isa_bus(\@ipmi_ifs);
+						close_ioports();
+					}
 				}
 			}
 			print "\n";
@@ -6791,9 +6820,10 @@
 		$input = <STDIN>;
 		unless ($input =~ /^\s*n/i
 		     || ($superio_features && $input !~ /^\s*y/i)) {
-			initialize_ioports();
-			scan_isa_bus(\@chip_ids);
-			close_ioports();
+			if (initialize_ioports()) {
+				scan_isa_bus(\@chip_ids);
+				close_ioports();
+			}
 		}
 		print "\n";
 	}

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2013-05-09 21:55:15 +0000
+++ .pc/applied-patches	2014-01-03 03:11:39 +0000
@@ -7,7 +7,6 @@
 07-sensors3.conf-local-changes.patch
 08-sensors-detect-lm85.patch
 09-sensors-detect-sch5524.patch
-10-pwmconfig.patch
 11-fancontrol-check.patch
 12-sensors-detect-superio-x86.patch
 14-2-digits-kernel.patch

=== modified file 'CHANGES'
--- CHANGES	2013-05-09 21:55:15 +0000
+++ CHANGES	2014-01-03 03:11:39 +0000
@@ -1,6 +1,25 @@
 lm-sensors CHANGES file
 -----------------------
 
+3.3.4 (2013-05-27)
+  sensors.conf.5: Mention "sensors -u" to get the raw feature names
+  sensors: Clarify what option -u is good for
+  fancontrol: Fix handling of absolute paths in config
+  pwmconfig: Print the initial PWM values
+             Raise the detection threshold to 3/4
+             Properly deal with multiple fan control
+  sensors-detect: Add detection of AMD family 16h power sensors
+                  Map IT8771E, IT8772E, IT8782F and IT8783F to it87
+                  Use /sys/module instead of /proc/modules where available
+                  Drop legacy sysconfig configuration file syntax
+                  Stay alive when /dev/port is missing
+                  Add detection of IT8752F
+                  Add detection of MCP98244
+                  Add detection of LM95234
+                  Add detection of TMP431/TMP432
+                  Update Nuvoton chip information and NCT6106D chip detection
+                  Drop unreliable DS1621/DS1631 detection
+
 3.3.3 "Happy Birthday Sophie" (2012-11-06)
   documentation: Update fan-divisors, fan divisors are optional
   libsensors: Fix warning about library path not in /etc/ld.so.conf

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-09 21:55:15 +0000
+++ debian/changelog	2014-01-03 03:11:39 +0000
@@ -1,3 +1,26 @@
+lm-sensors (1:3.3.4-2ubuntu1) trusty; urgency=low
+
+  * Merge from Debian unstable (LP: #1256671). Remaining changes:
+    - Add 100_recommend_using_upstart.patch: Recommend use of upstart rather
+      than init-script.
+
+ -- Matt Fischer <[e-mail]>  Mon, 02 Dec 2013 21:07:32 -0700
+
+lm-sensors (1:3.3.4-2) unstable; urgency=low
+
+  * debian/fancontrol.init: pass the config file location as argument of
+    the fancontrol daemon (closes: #720213).
+
+ -- Aurelien Jarno <[e-mail]>  Tue, 27 Aug 2013 18:36:05 +0200
+
+lm-sensors (1:3.3.4-1) unstable; urgency=low
+
+  * New upstream version.
+  * Use dh-systemd to get proper systemd related maintainer scripts,
+    based on a patch from Michael Stapelberg (closes: #714190).
+
+ -- Aurelien Jarno <[e-mail]>  Sat, 29 Jun 2013 16:37:48 +0200
+
 lm-sensors (1:3.3.3-1ubuntu1) saucy; urgency=low
 
   * Merge from Debian unstable (LP: #1178520). Remaining changes:

=== modified file 'debian/control'
--- debian/control	2013-05-09 21:55:15 +0000
+++ debian/control	2014-01-03 03:11:39 +0000
@@ -1,7 +1,7 @@
 Source: lm-sensors
 Section: utils
 Priority: extra
-Build-Depends: debhelper (>= 8.1.3), bison, flex, librrd2-dev
+Build-Depends: debhelper (>= 8.1.3), bison, flex, librrd2-dev, dh-systemd (>= 1.3)
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Aurelien Jarno <[e-mail]>
 Standards-Version: 3.9.4

=== modified file 'debian/fancontrol.init'
--- debian/fancontrol.init	2011-06-20 21:25:57 +0000
+++ debian/fancontrol.init	2014-01-03 03:11:39 +0000
@@ -25,9 +25,9 @@
 case "$1" in
   start)
   	if [ -f $CONF ] ; then
-		if $DAEMON --check 1>/dev/null 2>/dev/null ; then
+		if $DAEMON --check $CONF 1>/dev/null 2>/dev/null ; then
 			log_daemon_msg "Starting $DESC" "$NAME"
-			start-stop-daemon --start --quiet --background --pidfile $PIDFILE --startas $DAEMON
+			start-stop-daemon --start --quiet --background --pidfile $PIDFILE --startas $DAEMON $CONF
 			log_end_msg $?
 		else
 			log_failure_msg "Not starting fancontrol, broken configuration file; please re-run pwmconfig."
@@ -40,7 +40,7 @@
 	;;
   stop)
 	log_daemon_msg "Stopping $DESC" "$NAME"
-	start-stop-daemon --stop --quiet --pidfile $PIDFILE --oknodo --startas $DAEMON
+	start-stop-daemon --stop --quiet --pidfile $PIDFILE --oknodo --startas $DAEMON $CONF
 	rm -f $PIDFILE
 	log_end_msg $?
 	;;
@@ -50,12 +50,12 @@
 	$0 start
 	;;
   force-reload)
-	if start-stop-daemon --stop --test --quiet --pidfile $PIDFILE --startas $DAEMON ; then
+	if start-stop-daemon --stop --test --quiet --pidfile $PIDFILE --startas $DAEMON $CONF ; then
 		$0 restart
 	fi
 	;;
   status)
-	status_of_proc $DAEMON $NAME && exit 0 || exit $?
+	status_of_proc $DAEMON $NAME $CONF && exit 0 || exit $?
 	;;
   *)
 	log_success_msg "Usage: /etc/init.d/fancontrol {start|stop|restart|force-reload|status}"

=== added file 'debian/fancontrol.service'
--- debian/fancontrol.service	1970-01-01 00:00:00 +0000
+++ debian/fancontrol.service	2014-01-03 03:11:39 +0000
@@ -0,0 +1,14 @@
+[Unit]
+Description=fan speed regulator
+# Run pwmconfig to create this file.
+ConditionPathExists=/etc/fancontrol
+After=lm-sensors.service
+Documentation=man:fancontrol(8) man:pwmconfig(8)
+
+[Service]
+ExecStartPre=/usr/sbin/fancontrol --check
+ExecStart=/usr/sbin/fancontrol
+PIDFile=/var/run/fancontrol.pid
+
+[Install]
+WantedBy=multi-user.target

=== modified file 'debian/lm-sensors.dirs'
--- debian/lm-sensors.dirs	2012-06-03 16:21:26 +0000
+++ debian/lm-sensors.dirs	2014-01-03 03:11:39 +0000
@@ -1,2 +1,1 @@
 usr/sbin
-lib/systemd/system/

=== modified file 'debian/lm-sensors.docs'
--- debian/lm-sensors.docs	2011-06-20 21:25:57 +0000
+++ debian/lm-sensors.docs	2014-01-03 03:11:39 +0000
@@ -1,6 +1,5 @@
 doc/donations
 doc/vid
-doc/chips
 doc/fan-divisors
 doc/developers/applications
 doc/temperature-sensors

=== modified file 'debian/lm-sensors.service'
--- debian/lm-sensors.service	2012-06-03 16:21:26 +0000
+++ debian/lm-sensors.service	2014-01-03 03:11:39 +0000
@@ -1,6 +1,5 @@
 [Unit]
 Description=Initialize hardware monitoring sensors
-After=syslog.target
 
 [Service]
 Type=oneshot

=== modified file 'debian/patches/06-sensors-detect-debian.patch'
--- debian/patches/06-sensors-detect-debian.patch	2013-05-06 23:37:35 +0000
+++ debian/patches/06-sensors-detect-debian.patch	2014-01-03 03:11:39 +0000
@@ -1,6 +1,6 @@
 ---
- prog/detect/sensors-detect |  120 +++++++++++----------------------------------
- 1 file changed, 30 insertions(+), 90 deletions(-)
+ prog/detect/sensors-detect |  107 ++++++++++++---------------------------------
+ 1 file changed, 30 insertions(+), 77 deletions(-)
 
 --- a/prog/detect/sensors-detect
 +++ b/prog/detect/sensors-detect
@@ -10,7 +10,7 @@
  #
  #    sensors-detect - Detect hardware monitoring chips
  #    Copyright (C) 1998 - 2002  Frodo Looijaard <[e-mail]>
-@@ -6652,99 +6652,39 @@
+@@ -6679,86 +6679,39 @@
  		}
  	}
  
@@ -53,19 +53,6 @@
 -		print SYSCONFIG "BUS_MODULES=\"", join(" ", @{$bus_modules}), "\"\n"
 -			if @{$bus_modules};
 -		print SYSCONFIG "HWMON_MODULES=\"", join(" ", @{$hwmon_modules}), "\"\n";
--
--		print SYSCONFIG <<'EOT';
--
--# For compatibility reasons, modules are also listed individually as variables
--#    MODULE_0, MODULE_1, MODULE_2, etc.
--# You should use BUS_MODULES and HWMON_MODULES instead if possible.
--
--EOT
--		my $i = 0;
--		foreach (@{$bus_modules}, @{$hwmon_modules}) {
--			print SYSCONFIG "MODULE_$i=$_\n";
--			$i++;
--		}
 -		close(SYSCONFIG);
 -
 -		if (-x "/bin/systemctl" && -d "/lib/systemd/system" &&

=== modified file 'debian/patches/09-sensors-detect-sch5524.patch'
--- debian/patches/09-sensors-detect-sch5524.patch	2012-04-23 19:00:39 +0000
+++ debian/patches/09-sensors-detect-sch5524.patch	2014-01-03 03:11:39 +0000
@@ -4,7 +4,7 @@
 
 --- a/prog/detect/sensors-detect
 +++ b/prog/detect/sensors-detect
-@@ -1861,6 +1861,11 @@
+@@ -1876,6 +1876,11 @@
  		driver => "not-a-sensor",
  		devid => 0x83,
  	}, {

=== removed file 'debian/patches/10-pwmconfig.patch'
--- debian/patches/10-pwmconfig.patch	2013-05-06 23:37:35 +0000
+++ debian/patches/10-pwmconfig.patch	1970-01-01 00:00:00 +0000
@@ -1,148 +0,0 @@
-fixes taken from revisions 6162 to 6166 upstream
----
- prog/pwm/pwmconfig |   42 +++++++++++++++++++++++++++++-------------
- 1 file changed, 29 insertions(+), 13 deletions(-)
-
---- a/prog/pwm/pwmconfig
-+++ b/prog/pwm/pwmconfig
-@@ -144,7 +144,7 @@
- # $1 = padding
- function print_devices()
- {
--	local name
-+	local name device
- 
- 	for device in $DEVICES
- 	do
-@@ -157,7 +157,8 @@
- # $1 = pwm file name
- function is_pwm_auto()
- {
--	ENABLE=${1}_enable
-+	local ENABLE=${1}_enable
-+
- 	if [ -f $ENABLE ]
- 	then
- 		if [ "`cat $ENABLE`" -gt 1 ]
-@@ -172,7 +173,8 @@
- # $1 = pwm file name
- function pwmdisable()
- {
--	ENABLE=${1}_enable
-+	local ENABLE=${1}_enable
-+
- 	# No enable file? Just set to max
- 	if [ ! -f $ENABLE ]
- 	then
-@@ -211,7 +213,8 @@
- # $1 = pwm file name
- function pwmenable()
- {
--	ENABLE=${1}_enable
-+	local ENABLE=${1}_enable
-+
- 	if [ -w $ENABLE ]
- 	then
- 		echo 1 2>/dev/null > $ENABLE
-@@ -236,7 +239,8 @@
- echo 'Found the following PWM controls:'
- for i in $PWM
- do
--	echo "   $i"
-+	P=`cat $i`
-+	echo "   $i           current value: $P"
- 	if [ -w $i ]
- 	then
- 		# First check if PWM output is in automatic mode
-@@ -325,9 +329,9 @@
- 
- function pwmdetail()
- {
--	P=$1
--	F=$2
--	PLOT=
-+	local P=$1 F=$2
-+	local X PLOT= TMP1 TMP2
-+	local threshold=100000 pwm S
- 
- 	type $PLOTTER > /dev/null 2>&1
- 	if [ $? -eq 0 ]
-@@ -358,7 +362,6 @@
- 		> $TMP2
- 	fi
- 
--	local threshold=100000
- 	let pwm=$MAX
- 	pwmenable $P
- 	while [ $pwm -ge 0 ]
-@@ -443,12 +446,13 @@
- 
- 	let pwmactivecount=0
- 	let count=1
-+	S_MIN=
- 	for j in $GOODFAN
- 	do
- 		OS=`echo $SPEEDS | cut -d' ' -f$count`
- 		S=`echo $CURRENT_SPEEDS | cut -d' ' -f$count`
- 		echo "  $j ... speed was $OS now $S"
--		let threshold=2*$OS/3
-+		let threshold=3*$OS/4
- 		if [ $S -lt $threshold ]
- 		then
- 			echo "    It appears that fan $j"
-@@ -461,7 +465,6 @@
- 				let pwmactivecount=1
- 				pwmactive="$i ${pwmactive}"
- 				fanactive="$j ${fanactive}"
--				fanactive_min="$S ${fanactive_min}"
- 
- 				# Give all correlated fans time to return to full speed
- 				sleep $DELAY
-@@ -471,9 +474,15 @@
- 					exit 1
- 				fi
- 			else
--				fanactive="$j+${fanactive}" #not supported yet by fancontrol
--				fanactive_min="$S+${fanactive_min}"
-+				fanactive="$j+${fanactive}"
- 			fi
-+
-+			# Keep track of the slowest fan controlled by one PWM
-+			if [ -z "$S_MIN" ] || [ $S -lt $S_MIN ]
-+			then
-+				S_MIN=$S
-+			fi
-+
- 			S=`cat $j`
- 			if [ $S -lt $threshold ]
- 			then
-@@ -506,8 +515,11 @@
- 		if [ "$X" = "y" -o "$X" = "Y" ]
- 		then
- 			pwmactive="$i ${pwmactive}"
-+			fanactive_min="0 $fanactive_min"
- 		fi
- 		echo
-+	else
-+		fanactive_min="$S_MIN $fanactive_min"
- 	fi
- done
- 
-@@ -656,6 +668,8 @@
- # $1 = pwm value below which the fan is stopped
- function TestMinStart()
- {
-+	local fanok FANTEST
-+
- 	echo
- 	echo 'Now we increase the PWM value in 10-unit-steps.'
- 	echo 'Let the fan stop completely, then press return until the'
-@@ -781,6 +795,8 @@
- 
- function SaveConfig()
- {
-+	local tmpfile
-+
- 	RememberDevices "$FCTEMPS" "$FCFANS"
- 
- 	echo

=== modified file 'debian/patches/11-fancontrol-check.patch'
--- debian/patches/11-fancontrol-check.patch	2012-04-23 19:00:39 +0000
+++ debian/patches/11-fancontrol-check.patch	2014-01-03 03:11:39 +0000
@@ -4,7 +4,7 @@
 
 --- a/prog/pwm/fancontrol
 +++ b/prog/pwm/fancontrol
-@@ -259,6 +259,17 @@
+@@ -261,6 +261,17 @@
  	return $outdated
  }
  

=== modified file 'debian/patches/12-sensors-detect-superio-x86.patch'
--- debian/patches/12-sensors-detect-superio-x86.patch	2013-05-06 23:37:35 +0000
+++ debian/patches/12-sensors-detect-superio-x86.patch	2014-01-03 03:11:39 +0000
@@ -4,7 +4,7 @@
 
 --- a/prog/detect/sensors-detect
 +++ b/prog/detect/sensors-detect
-@@ -6752,9 +6752,9 @@
+@@ -6779,9 +6779,9 @@
  	print "\n";
  
  	$superio_features = 0;

=== modified file 'debian/patches/14-2-digits-kernel.patch'
--- debian/patches/14-2-digits-kernel.patch	2013-05-06 23:37:35 +0000
+++ debian/patches/14-2-digits-kernel.patch	2014-01-03 03:11:39 +0000
@@ -4,7 +4,7 @@
 
 --- a/prog/detect/sensors-detect
 +++ b/prog/detect/sensors-detect
-@@ -2596,8 +2596,8 @@
+@@ -2625,8 +2625,8 @@
  
  sub initialize_kernel_version
  {

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-05-09 21:55:15 +0000
+++ debian/patches/series	2014-01-03 03:11:39 +0000
@@ -7,7 +7,6 @@
 07-sensors3.conf-local-changes.patch
 08-sensors-detect-lm85.patch
 09-sensors-detect-sch5524.patch
-10-pwmconfig.patch
 11-fancontrol-check.patch
 12-sensors-detect-superio-x86.patch
 14-2-digits-kernel.patch

=== modified file 'debian/rules'
--- debian/rules	2013-05-06 23:37:35 +0000
+++ debian/rules	2014-01-03 03:11:39 +0000
@@ -5,6 +5,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# support parallel build using DEB_BUILD_OPTIONS=parallel=N
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  MAKEFLAGS += -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+endif
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -71,7 +79,7 @@
 	# Install extra files as needed
 	install -m 0644 debian/sensord.logcheck debian/sensord/etc/logcheck/ignore.d.server/sensord
 	install -m 0644 debian/sensord.logcheck debian/sensord/etc/logcheck/ignore.d.workstation/sensord
-	install -m 0644 debian/lm-sensors.service debian/lm-sensors/lib/systemd/system/
+#	install -m 0644 debian/lm-sensors.service debian/lm-sensors/lib/systemd/system/
 
 	# Make sure /etc/sensors.d/ is not removed
 	touch debian/tmp/etc/sensors.d/.placeholder
@@ -100,7 +108,9 @@
 	dh_testroot
 	dh_installchangelogs -i CHANGES
 	dh_installdocs -i -XCVS
+	dh_systemd_enable -pfancontrol
 	dh_installinit -pfancontrol --restart-after-upgrade -- start 20 2 3 4 5 .
+	dh_systemd_start -pfancontrol
 	dh_installman -i
 	dh_link -i
 	dh_compress -i
@@ -117,8 +127,10 @@
 	dh_installchangelogs -s CHANGES
 	dh_installdocs -s -XCVS
 	dh_installexamples -s -XCVS -XModule.mk
+	dh_systemd_enable -plm-sensors
 	dh_installinit -plm-sensors --no-start -- start 47 S .
 	dh_installinit -psensord -- start 20 2 3 4 5 .
+	dh_systemd_start -plm-sensors
 	dh_installman -s
 	dh_link -s
 	dh_strip -s

=== removed directory 'doc/chips'
=== removed file 'doc/chips/MODPARMS'
--- doc/chips/MODPARMS	2011-06-20 21:25:57 +0000
+++ doc/chips/MODPARMS	1970-01-01 00:00:00 +0000
@@ -1,139 +0,0 @@
-Parameters for modprobe and insmod
-==================================
-
-PRELIMINARY WARNING:
-This documentation file is outdated and needs to be entirely reviewed
-and updated. Until then, don't blindly trust what you read here.
-
-==================================
-SUMMARY
-
-	[modprobe,insmod] module {parameter...}
-	Parameters:
-		force=bus,address{,bus,address}
-		force_addr=address{,address}
-		force_[chipname]=bus,address{,bus,address}
-		force_subclients=bus,caddr,saddr,saddr
-		ignore=bus,address{,bus,address}
-		ignore_range=bus,start,end{,bus,start,end}
-		probe=bus,address{,bus,address}
-		probe_range=bus,start,end{,bus,start,end}
-		init=[0,1] (default 1)
-
-	All arguments are in decimal unless prefixed by "0x".
-	No spaces are allowed.
-
-==================================
-OVERVIEW
-
-All chip drivers have a few modprobe module parameters in common.
-(Insmod can also be used, but we recommend modprobe so that
-other required modules are automatically loaded.) These
-parameters can be used when a module is inserted, to give some additional
-information about how it should function. In this case, they tell where
-the module should look for what chips. Usually, you don't need them, and
-if you do, you are often told by sensors-detect which ones you need.
-
-If a module doesn't load with no parameters, you may need to
-add parameters. Check 'dmesg' for clues to what went wrong.
-
-
-BUS NUMBERING
--------------
-I2C/SMBus adapters are numbered in the order they are inserted. If you want
-to know what number an adapter has, use the following command:
-
-  (for kernel 2.6.32 and newer)
-  grep . /sys/bus/i2c/devices/i2c-*/name
-
-  (for kernel 2.6.31 and older)
-  grep . /sys/class/i2c-adapter/i2c-*/name
-
-Alternatively, if you have installed i2c-tools, you can do:
-
-  modprobe i2c-dev
-  i2cdetect -l
-
-If you want 'any I2C bus', use '-1'.
-
-
-ADDRESS NUMBERING
------------------
-Each adapter has a number of addresses on I2C/SMBus adapters and/or the
-ISA bus that are always scanned if no modprobe parameters are given. The
-parameters below override those addresses that are scanned by default.
-
-All modprobe parameters described below take lists of positive integers
-(unsigned, in the range of 0 to 65535) as their arguments.  Integers
-are separated by comma's, and may be given as ordinary decimal numbers,
-as octal numbers (by starting them with a `0') or as hexadecimal numbers
-(by starting them with a `0x'). More information can be found by
-entering `man modprobe' or `man insmod'.
-So to summarize:
-	0x00 - 0x7f	Valid I2C Addresses
-	0x0000 - 0xffff	Valid ISA Bus Addresses
-
-
-==================================
-PARAMETER DETAILS
-
-`force', `force_*', `ignore' and `probe' parameters take pairs of numbers.
-Each first (odd) number is a bus number, each second (even) number is
-an (I2C or ISA) address.
-
-`ignore_range' and `probe_range' parameters take triples of numbers.
-Each first number is a bus number, each second number is the start address
-of a range, and each third number is the end address of a range. Ranges
-are always inclusive.
-
-`probe' and `probe_range' parameters tell the module to scan additional 
-addresses for a specific bus. These are treated just as the ordinary
-addresses scanned. This is useful for some chips that can be anywhere;
-to keep loading time (and false detections) down, only the most common
-addresses are scanned by default.
-
-`ignore' and `ignore_range' parameters tell the module not to scan
-specific addresses. They overrule the default addresses and any 
-addresses specified by `probe' and `probe_range' statements.
-
-The `force' parameter tells the module a supported chip is found at
-a specific address. It overrules all previously mentioned parameters.
-Sometimes, a chip can be in a specific internal state that makes
-detection impossible. If you specify it with the `force' parameter,
-it is first put into a recognizable state. Also, some detection routines
-are skipped. If the module supports several chips, it will still try
-to determine what chip is found on that address. If it can't determine
-this, the address will still not be used.
-
-There is a `force_*' parameter for each type of chip supported by a
-module. This is the strongest statement possible - it says that a
-specific type of chip is found on a specific address, and the module
-will skip all detection and recognition routines. This can lead to
-very strange results...
-
-`force_addr' is a parameter used for PCI sensor adapters.
-It is used to program the base address of the sensor registers.
-This is required if the BIOS does not initialize the base address.
-
-`force_subclients' is used to force the i2c addresses for subclients of
-a certain chip. Typical usage is `force_subclients=0,0x2d,0x4a,0x4b'
-to force the subclients of chip 0x2d on bus 0 to i2c addresses
-0x4a and 0x4b.
-This parameter is currently supported only by the w83781d driver
-and is useful for certain Tyan boards.
-
-`init' is used to tell a driver to bypass initializing a chip.
-This may be necessary if the BIOS has initialized the chip a certain way
-and the driver should not overwrite that initialization.
-It is also useful if normal initialization crashes the system.
-The default is 1, so the only useful value is `init=0'.
-This parameter is currently supported only by the w83781d driver.
-
-==================================
-EXAMPLE
-
-  # ISA address 0x390 contains a LM79
-  # Scan all I2C addresses (from 0 to 0x7f) for all I2C adapters
-  # But skip address 0x2d on adapter 0, and address 0x20 on adapter 1
-
-  modprobe lm78 force_lm79=9191,0x390 ignore=0,0x2d,1,0x20 probe_range=-1,0,0x7f

=== removed file 'doc/chips/SUMMARY'
--- doc/chips/SUMMARY	2011-07-17 13:27:11 +0000
+++ doc/chips/SUMMARY	1970-01-01 00:00:00 +0000
@@ -1,297 +0,0 @@
-SUMMARY OF SUPPORTED CHIPS
-==========================
-
-This is a summary of the sensor and non-sensor chips supported by this
-package. It lists the features of each supported chip. For further
-information on a particular driver, see the documentation in this
-directory.
-
-To determine what chips you have in your system, run 'sensors-detect'.
-
-If your sensor chip is not detected by sensors-detect, please contact us
-(see http://www.lm-sensors.org/wiki/AuthorsAndContributors). Only contact us
-if you know for sure that your system includes a sensor chip (for
-example if you have technical documentation mentioning it, or if the
-BIOS setup screen presents monitoring values, or if you can get
-hardware monitoring to work using a different OS). Do *not* contact us
-if you have no proof that your system includes sensors. Such systems
-tend to be rare these days, but do still exist. This is especially true
-of laptops. If there are no sensors, there's nothing we can do.
-
-If you contact us, please include the following in your mail:
- - The output of (as root) 'sensors-detect'. Make sure you unloaded
-   every chip driver beforehand (check that the sensors-detect script
-   does not complain that it couldn't probe some I2C addresses on any
-   given bus).
- - Dumps of the chips that might be hardware monitoring chips. To get
-   these, follow the following steps:
-   1* Run 'i2cdetect -l'. This will list all available I2C (or SMBus)
-      busses on your system.
-   2* For each bus listed, run (as root) 'i2cdetect N' where N is the
-      bus number.
-   3* For each bus, if there is anything in the ranges 0x20-0x2f or
-      0x48-0x4f, dump the contents of that chip with (as root)
-      'i2cdump N 0xXX', where N is the bus number and XX is the
-      responsive address. Chips in other address ranges are way less
-      likely to be hardware monitoring chips. In particular, do not
-      send dumps of addresses 0x08, 0x0c, 0x10, 0x30-0x37, 0x42, 0x44,
-      0x50-0x5f, 0x61 and 0x69. These are *not* hadware monitoring
-      chips.
- - The part numbers of the chips on your motherboard you think are the
-   sensor chips.
-
------------------------------------------------------------------------------
-
-SUPPORTED SENSOR CHIPS
-----------------------
-
-			Included Sensors	Controls Busses
-			----------------------	-------  -----------
-Driver  Chips		#temp	#vin	#fanin	pwm/dac	I2C	ISA
----------------------------------------------------------------------
-adm1021
-	adm1021		2	-	-	-	yes	no
-	adm1021a	2	-	-	-	yes	no
-	adm1023		2	-	-	-	yes	no
-	gl523sm		2	-	-	-	yes	no
-	lm84		2	-	-	-	yes	no
-	max1617		2	-	-	-	yes	no
-	max1617a	2	-	-	-	yes	no
-	tc1068		2	-	-	-	yes	no
-	tcm1617		2	-	-	-	yes	no
-	thmc10		2	-	-	-	yes	no
-	mc1066		2	-	-	-	yes	no
-	  (xeon - no detection - requires force_adm1021 parameter)
-	xeon		1	-	-	-	yes	no
-	  (the following chips are detected as a max1617)
-	ne1617		2	-	-	-	yes	no
-	ne1617a		2	-	-	-	yes	no
-
-adm1024
-	adm1024		3	6	-	1 dac	yes	no
-
-adm1025
-	adm1025		2	6	-	-	yes	no
-	ne1619		2	6	-	-	yes	no
-
-adm1026
-	adm1026		3	17	8	2 pwm+dac yes	no
-
-adm1031
-	adm1030		2	-	1	1 pwm	yes	no
-	adm1031		3	-	2	2 pwm	yes	no
-
-adm9240
-	adm9240		1	6	2	1 dac	yes	no
-	ds1780		1	6	2	1 dac	yes	no
-	lm81		1	6	2	1 dac	yes	no
-
-asb100
-	asb100		4	7	3	1	yes	no
-
-bmcsensors
-	bmcsensors	?	?	?	-	no	no
-
-ds1621
-	ds1621		1	-	-	-	yes	no
-	  (the following chip is detected as a ds1621)
-	ds1625		1	-	-	-	yes	no
-
-f71805f
-	f71805f		9	3	3	-	no	yes
-
-fscher
-	fscher		3	3	3	-	yes	no
-
-fscpos
-	fscpos		3	3	3	-	yes	no
-
-fscscy
-	fscscy		4	3	6	-	yes	no
-
-gl518sm
-	gl518sm (r00)	1	1-4	2	-	yes	no
-	gl518sm (r80)	1	4	2	-	yes	no
-
-gl520sm
-	gl520sm		1-2	4-5	2	-	yes	no
-
-it87
-	it8712		3	8	3	3 pwm	yes	yes
-	(the following are reported as an "it87")
-	it8705		3	8	3	3 pwm	yes	yes
-	sis950		3	8	3	3 pwm	yes	yes
-
-lm63
-	lm63		2	-	1	1 pwm	yes	no
-
-lm75
-	lm75		1	-	-	-	yes	no
-	  (the following chips are detected as an lm75)
-	ds75		1	-	-	-	yes	no
-	ds1775		1	-	-	-	yes	no
-	max6625		1	-	-	-	yes	no
-	max6626		1	-	-	-	yes	no
-	tcn75		1	-	-	-	yes	no
-
-lm78
-	lm78		1	7	3	-	yes	yes
-	lm78-j		1	7	3	-	yes	yes
-	lm79		1	7	3	-	yes	yes
-
-lm80
-	lm80		1	7	2	-	yes	no
-
-lm83
-	lm83		4	-	-	-	yes	no
-	lm82		2	-	-	-	yes	no
-
-lm85
-	lm85		3	5	4	3 pwm	yes	no
-	adm1027		3	5	4	3 pwm	yes	no
-	adt7463		3	5	4	3 pwm	yes	no
-	emc6d100	3	8	4	3 pwm	yes	no
-	(emc6d101 is reported as emc6d100)
-	emc6d101	3	8	4	3 pwm	yes	no
-	emc6d102	3	8	4	3 pwm	yes	no
-
-lm87
-	lm87		2-3	6-8	0-2	1 pwm	yes	no
-
-lm90
-	lm90		2	-	-	-	yes	no
-	lm99		2	-	-	-	yes	no
-	lm86		2	-	-	-	yes	no
-	adm1032		2	-	-	-	yes	no
-	max6657		2	-	-	-	yes	no
-	(lm89 is detected as an lm99)
-	lm89		2	-	-	-	yes	no
-	(max6658 and max6659 are detected as a max6657)
-	max6658		2	-	-	-	yes	no
-	max6659		2	-	-	-	yes	no
-	(adt7461 only works in ADM1032 compatibility mode)
-	adt7461		2	-	-	-	yes	no
-
-lm92
-	(all are reported as an "lm92")
-	lm92		1	-	-	-	yes	no
-	max6633		1	-	-	-	yes	no
-	max6634		1	-	-	-	yes	no
-	max6635		1	-	-	-	yes	no
-	(lm76 needs force parameter)
-	lm76		1	-	-	-	yes	no
-
-max1619
-	max1619		2	-	-	-	yes	no
-
-max6650
-	(all are reported as a "max6650")
-	max6650		-	-	1	1 pwm	yes	no
-	max6651		-	-	4	1 pwm	yes	no
-
-maxilife
-	maxilife-as	5	4	3	-	yes	no
-	maxilife-co	5	4	3	-	yes	no
-	maxilife-cg	5	4	3	-	yes	no
-
-mtp008
-	mtp008		3	7	3	3 pwm	yes	no
-
-pc87360
-	pc87360		-	-	2	2 pwm	no	yes (LPC)
-	pc87363		-	-	2	2 pwm	no	yes (LPC)
-	pc87364		-	-	3	3 pwm	no	yes (LPC)
-	pc87365		2	11	3	3 pwm	no	yes (LPC)
-	pc87366		3-4	11	3	3 pwm	no	yes (LPC)
-
-pcf8591
-	pcf8591		-	2-4	-	1 dac	yes	no
-
-sis5595
-	sis5595		0-1	4-5	2	-	no	yes
-
-smartbatt
-	smartbatt	1	1	-	-	yes	no
-
-smsc47m1
-	(all are reported as a "smsc47m1")
-	smsc47b27x	-	-	2	2	no	yes (LPC)
-	smsc47m10x	-	-	2	2	no	yes (LPC)
-	smsc47m112	-	-	2	2	no	yes (LPC)
-	smsc47m13x	-	-	2	2	no	yes (LPC)
-	smsc47m14x	-	-	2	2	no	yes (LPC)
-	smsc47m15x	-	-	2	2	no	yes (LPC)
-	smsc47m192	-	-	2	2	no	yes (LPC)
-	smsc47m997	-	-	2	2	no	yes (LPC)
-	(reported as a "smsc47m2")
-	smsc47m292	-	-	3	3	no	yes (LPC)
-
-thmc50
-	adm1022		3	2	-	1 dac	yes	no
-	thmc50		3	2	-	1 dac	yes	no
-
-via686a
-	via686a		3	5	2	-	no	yes
-	vt8231		3	5	2	-	no	yes
-
-vt1211
-	vt1211		2-7	1-6	2	2	no	yes (LPC)
-
-vt8231
-	vt8231		2-7	2-7	2	2	no	yes
-
-w83627hf
-	w83627hf	3	9	3	2 pwm	no	yes (LPC)
-	w83627thf	3	7	3	3 dac	no	yes (LPC)
-	w83637hf	3	7	2	3 pwm	no	yes (LPC)
-	w83687thf	3	7	3	3 pw/da	no	yes (LPC)
-	w83697hf	2	8	2	2 pwm	no	yes (LPC)
-
-w83781d
-	as99127f	3	7	3	-	yes	no
-	w83781d		3	7	3	-	yes	yes
-	w83782d		3	9	3	2-4 pwm	yes	yes
-	w83783s		1-2	5-6	3	2 pwm	yes	no
-	w83791d		3	10	5	5 pwm	yes	no
-	w83627hf	3	9	3	2 pwm	yes	yes (LPC)
-
-w83l785ts
-	w83l785ts	1	-	-	-	yes	no
-
-w83792d
-	w83792d		3	9	7	3 pwm	yes	no
-
-xeontemp
-	xeontemp	1	-	-	-	yes	no
-
-
------------------------------------------------------------------------------
-
-COMPANY ID LIST
----------------
-
-Many SMBus chips have a company ID at location 0x3E or 0xFE.
-
-Here is a partial list.
-This may help identify a chip after doing a 'i2cdump [bus] [address]'.
-
-0x01	National
-0x12C3	Asus (at 0x4F)
-0x1934	Fintek (at 0x5D-0x5E)
-0x23	Analog Devices (old products) or Fintek
-0x41	Analog Devices (new products)
-0x49	TI
-0x4D	Maxim
-0x54	On Semi
-0x5C	SMSC
-0x5D 	SMSC
-0x55	SMSC
-0x5CA3	Winbond (at 0x4F)
-0x61	Andigilog
-0x90	ITE (at 0x58)
-0xA1	Philips
-0xA3	Winbond (at 0x4F)
-0xC3	Asus (at 0x4F)
-0xDA	Dallas
-
-[A-Z]{3} at 0x00-0x02: Fujitsu-Siemens

=== modified file 'doc/developers/lm_sensors.lsm'
--- doc/developers/lm_sensors.lsm	2013-05-06 23:37:35 +0000
+++ doc/developers/lm_sensors.lsm	2014-01-03 03:11:39 +0000
@@ -1,7 +1,7 @@
 Begin4
 Title: lm_sensors
-Version: 3.3.3
-Entered-date: 2012-11-06
+Version: 3.3.4
+Entered-date: 2013-05-27
 Description: Hardware health monitoring package for Linux. It consists of 
              a library to allow applications to read sensors data more
              easily, and of an example program to pretty print this data.
@@ -11,8 +11,8 @@
 Author: [e-mail] (Jean Delvare)
 Maintained-by: [e-mail] (Jean Delvare)
 Primary-site: http://dl.lm-sensors.org /lm-sensors/releases/
-              lm_sensors-3.3.3.tar.bz2
-              lm_sensors-3.3.3.tar.bz2.sig
+              lm_sensors-3.3.4.tar.bz2
+              lm_sensors-3.3.4.tar.bz2.sig
 Alternate-site: ftp.netroedge.com /pub/lm-sensors/
 Copying-policy: GPL/LGPL
 End

=== added file 'doc/developers/smbus_company_id'
--- doc/developers/smbus_company_id	1970-01-01 00:00:00 +0000
+++ doc/developers/smbus_company_id	2014-01-03 03:11:39 +0000
@@ -0,0 +1,28 @@
+COMPANY ID LIST
+---------------
+
+Many SMBus chips have a company ID at location 0x3E or 0xFE.
+
+Here is a partial list.
+This may help identify a chip after doing a 'i2cdump [bus] [address]'.
+
+0x01	National Semiconductor
+0x12C3	Asus (at 0x4F)
+0x1934	Fintek (at 0x5D-0x5E)
+0x23	Analog Devices (old products) or Fintek
+0x41	Analog Devices (new products)
+0x49	TI
+0x4D	Maxim
+0x54	On Semi
+0x5C	SMSC
+0x5D 	SMSC
+0x55	SMSC
+0x5CA3	Winbond (at 0x4F)
+0x61	Andigilog
+0x90	ITE (at 0x58)
+0xA1	Philips
+0xA3	Winbond (at 0x4F)
+0xC3	Asus (at 0x4F)
+0xDA	Dallas
+
+[A-Z]{3} at 0x00-0x02: Fujitsu-Siemens

=== modified file 'doc/donations'
--- doc/donations	2012-11-05 13:18:21 +0000
+++ doc/donations	2014-01-03 03:11:39 +0000
@@ -36,9 +36,8 @@
 		Drivers developed: as99127f improvements	MDS
 
 Atipa		SuperMicro 370DLE w/ Serverworks, LM87		2000-09
-		Drivers developed: serverworks support added	Jean Delvare
+		Drivers developed: serverworks support added	trash
 		to i2c-piix4; lm87 testing and improvements
-		(on-board NIC broken)
 
 Fujitsu		Complete system for general project support	2001-11
 Siemens		(broken)					Phil
@@ -82,7 +81,7 @@
 		(broken)
 
 Wincor Nixdorf	Seagate Barracuda 7200.7 160GB harddisk drive	2004-10
-		(dead)						Jean Delvare
+								trash
 
 Aweta		Intel Server system				2005-09
 		Drivers developed: PC87431 (IPMI SMB)		MDS
@@ -105,8 +104,8 @@
 		(ICH5) SMBus with SPD EEPROMs connected, and
 		a Winbond W83627THF hardware monitoring chip.
 
-Observit	Intel D865GSA (dead), Celeron D-352,		2007-06
-		128 MB RAM					Jean Delvare
+Observit	Intel D865GSA, Celeron D-352,			2007-06
+		128 MB RAM					trash
 		Resulted in: backport of the w83627ehf driver
 		to Linux 2.4, improvements to the Linux 2.6
 		w83627ehf driver.

=== modified file 'doc/libsensors-API.txt'
--- doc/libsensors-API.txt	2013-05-06 23:37:35 +0000
+++ doc/libsensors-API.txt	2014-01-03 03:11:39 +0000
@@ -6,7 +6,7 @@
 authors can quickly figure out how to test for the availability of a
 given new feature.
 
-0x432	lm-sensors 3.3.2 to 3.3.3
+0x432	lm-sensors 3.3.2 to 3.3.4
 * Added support for new sysfs attributes
   enum sensors_subfeature_type SENSORS_SUBFEATURE_IN_AVERAGE
   enum sensors_subfeature_type SENSORS_SUBFEATURE_IN_LOWEST

=== modified file 'lib/sensors.conf.5'
--- lib/sensors.conf.5	2011-07-17 13:27:11 +0000
+++ lib/sensors.conf.5	2014-01-03 03:11:39 +0000
@@ -1,6 +1,6 @@
 .\" Copyright (C) 1998, 1999 Adrian Baugh <[e-mail]> and
 .\"                          Frodo Looijaard <[e-mail]>
-.\" Copyright (C) 2008, 2009 Jean Delvare <[e-mail]>
+.\" Copyright (C) 2008--2012 Jean Delvare <[e-mail]>
 .\"
 .\" Permission is granted to make and distribute verbatim copies of this
 .\" manual provided the copyright notice and this permission notice are
@@ -21,7 +21,7 @@
 .\"
 .\" References consulted:
 .\"     sensors.conf.eg by Frodo Looijaard
-.TH sensors.conf 5  "February 2009" "lm-sensors 3" "Linux User's Manual"
+.TH sensors.conf 5  "November 2012" "lm-sensors 3" "Linux User's Manual"
 .SH NAME
 sensors.conf \- libsensors configuration file
 
@@ -134,6 +134,10 @@
 The first argument is the feature name. The second argument is the feature
 description.
 
+Note that you must use the raw feature name, which is not necessarily the
+one displayed by "sensors" by default. Use "sensors \-u" to see the raw
+feature names. Same applies to all other statement types below.
+
 .SS IGNORE STATEMENT
 
 An

=== modified file 'prog/detect/sensors-detect'
--- prog/detect/sensors-detect	2013-05-09 21:55:15 +0000
+++ prog/detect/sensors-detect	2014-01-03 03:11:39 +0000
@@ -41,7 +41,7 @@
 use vars qw(@pci_adapters @chip_ids @ipmi_ifs @non_hwmon_chip_ids
 	    $i2c_addresses_to_scan $revision @i2c_byte_cache);
 
-$revision = '$Revision: 6085 $ ($Date: 2012-10-30 18:18:45 +0100 (mar. 30 oct. 2012) $)';
+$revision = '$Revision: 6170 $ ($Date: 2013-05-20 21:25:22 +0200 (lun. 20 mai 2013) $)';
 $revision =~ s/\$\w+: (.*?) \$/$1/g;
 $revision =~ s/ \([^()]*\)//;
 
@@ -637,8 +637,8 @@
 		i2c_addrs => [0x2c..0x2e],
 		i2c_detect => sub { adt7490_detect(@_); },
 	}, {
-		name => "Analog Devices ADT7410",
-		driver => "to-be-written",
+		name => "Analog Devices ADT7410/ADT7420",
+		driver => "adt7410",
 		i2c_addrs => [0x48..0x4b],
 		i2c_detect => sub { adt7410_detect(@_); },
 	}, {
@@ -803,11 +803,6 @@
 		i2c_addrs => [0x2c..0x2f],
 		i2c_detect => sub { adm9240_detect(@_, 0); },
 	}, {
-		name => "Dallas Semiconductor DS1621/DS1631",
-		driver => "ds1621",
-		i2c_addrs => [0x48..0x4f],
-		i2c_detect => sub { ds1621_detect(@_); },
-	}, {
 		name => "Dallas Semiconductor DS1780",
 		driver => "adm9240",
 		i2c_addrs => [0x2c..0x2f],
@@ -1023,6 +1018,16 @@
 		i2c_addrs => [0x4c, 0x4d],
 		i2c_detect => sub { tmp42x_detect(@_, 2); },
 	}, {
+		name => "Texas Instruments TMP431",
+		driver => "to-be-written",		# tmp401
+		i2c_addrs => [0x4c, 0x4d],
+		i2c_detect => sub { lm90_detect(@_, 16); },
+	}, {
+		name => "Texas Instruments TMP432",
+		driver => "to-be-written",		# tmp401
+		i2c_addrs => [0x4c, 0x4d],
+		i2c_detect => sub { lm90_detect(@_, 17); },
+	}, {
 		name => "Texas Instruments AMC6821",
 		driver => "amc6821",
 		i2c_addrs => [0x18..0x1a, 0x2c..0x2e, 0x4c..0x4e],
@@ -1033,6 +1038,11 @@
 		i2c_addrs => [0x2b, 0x19, 0x2a],
 		i2c_detect => sub { lm95231_detect(@_, 0); },
 	}, {
+		name => "National Semiconductor LM95234",
+		driver => "to-be-written",		# lm95234
+		i2c_addrs => [0x18, 0x4d, 0x4e],
+		i2c_detect => sub { lm95231_detect(@_, 3); },
+	}, {
 		name => "National Semiconductor LM95241",
 		driver => "lm95241",
 		i2c_addrs => [0x2b, 0x19, 0x2a],
@@ -1400,6 +1410,11 @@
 		i2c_addrs => [0x18..0x1f],
 		i2c_detect => sub { jedec_JC42_4_detect(@_, 7); },
 	}, {
+		name => "Microchip MCP98244",
+		driver => "jc42",
+		i2c_addrs => [0x18..0x1f],
+		i2c_detect => sub { jedec_JC42_4_detect(@_, 15); },
+	}, {
 		name => "Microchip MCP9843",
 		driver => "jc42",
 		i2c_addrs => [0x18..0x1f],
@@ -1950,6 +1965,10 @@
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
+		name => "Winbond W83627SF/GF Super IO",
+		driver => "not-a-sensor",
+		devid => 0x59,
+	}, {
 		name => "Winbond W83627THF/THG Super IO Sensors",
 		driver => "w83627hf",
 		devid => 0x82,
@@ -2024,7 +2043,7 @@
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
-		name => "Nuvoton W83677HG-I (NCT6771F/NCT6772F/NCT6775F) Super IO Sensors",
+		name => "Nuvoton W83677HG-I (NCT5572D/NCT6771F/NCT6772F/NCT6775F) Super IO Sensors",
 		driver => "w83627ehf",
 		devid => 0xB470,
 		devid_mask => 0xFFF0,
@@ -2035,27 +2054,24 @@
 		driver => "not-a-sensor",
 		devid => 0x61,
 	}, {
-		name => "Nuvoton NCT5577D Super IO Sensors",
-		driver => "to-be-written",
-		devid => 0xC331,
-		logdev => 0x0b,
-		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-	}, {
-		name => "Nuvoton NCT6776F Super IO Sensors",
-		driver => "w83627ehf",
-		devid => 0xC333,
-		logdev => 0x0b,
-		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-	}, {
-		name => "Nuvoton NCT6779D Super IO Sensors",
-		driver => "to-be-written",	# nct6775, new driver
-		devid => 0xC562,
-		logdev => 0x0b,
-		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
-	}, {
-		name => "Nuvoton NCT6102D/NCT6106D Super IO Sensors",
-		driver => "to-be-written",	# nct6775, new driver
-		devid => 0x1061,
+		name => "Nuvoton NCT5577D/NCT6776F Super IO Sensors",
+		driver => "nct6775",
+		devid => 0xC330,
+		devid_mask => 0xFFF0,
+		logdev => 0x0b,
+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+	}, {
+		name => "Nuvoton NCT5532D/NCT6779D Super IO Sensors",
+		driver => "nct6775",
+		devid => 0xC560,
+		devid_mask => 0xFFF0,
+		logdev => 0x0b,
+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+	}, {
+		name => "Nuvoton NCT6102D/NCT6104D/NCT6106D Super IO Sensors",
+		driver => "to-be-written",	# nct6775
+		devid => 0xC450,
+		devid_mask => 0xFFF0,
 		logdev => 0x0b,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
@@ -2225,14 +2241,20 @@
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
+		name => "ITE IT8752F Super IO Sensors",
+		driver => "to-be-written",	# it87
+		devid => 0x8752,
+		logdev => 0x04,
+		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+	}, {
 		name => "ITE IT8771E Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8771,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
 		name => "ITE IT8772E Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8772,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
@@ -2244,13 +2266,13 @@
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
 		name => "ITE IT8782F Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8782,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
 	}, {
 		name => "ITE IT8783F Super IO Sensors",
-		driver => "to-be-written",	# it87
+		driver => "it87",
 		devid => 0x8783,
 		logdev => 0x04,
 		features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
@@ -2354,6 +2376,10 @@
 		driver => "fam15h_power",
 		detect => sub { amd_pci_detect('1604') },
 	}, {
+		name => "AMD Family 16h power sensors",
+		driver => "fam15h_power",
+		detect => sub { amd_pci_detect('1534') },
+	}, {
 		name => "Intel digital thermal sensor",
 		driver => "coretemp",
 		detect => \&coretemp_detect,
@@ -2468,9 +2494,12 @@
 
 sub initialize_ioports
 {