From 48035c2161de1853fe83ea40ae3ea606a4344e57 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Mon, 26 Nov 2007 13:01:30 +0000
Subject: [PATCH] Drop detection of the Philips Semiconductors PCA9540. This is
 an I2C multiplexer, it should be handled transparently at the kernel level.
 On top of that, it can't be detected reliably, and the pca9540 driver doesn't
 even exist in Linux 2.6.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5045 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 CHANGES                    |  3 +++
 prog/detect/sensors-detect | 24 ------------------------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5a825cdd..0962c09c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 lm-sensors CHANGES file
 -----------------------
 
+SVN
+  sensors-detect: Drop PCA9540 detection
+
 3.0.0 (2007-11-24)
   Makefile: Fix MODULE_DIR usage in etc
             Fix build on PPC
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
index 6f8adecd..a59d9bfa 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -1461,12 +1461,6 @@ use vars qw(@pci_adapters_sis5595 @pci_adapters_sis645 @pci_adapters_sis96x);
        i2c_addrs => [0x2f],
        i2c_detect => sub { fintek_detect(7, @_); },
      },
-     {
-       name => "Philips Semiconductors PCA9540",
-       driver => "pca9540",
-       i2c_addrs => [0x70],
-       i2c_detect => sub { pca9540_detect(@_); },
-     },
      {
        name => "Smart Battery",
        driver => "smartbatt",
@@ -5213,24 +5207,6 @@ sub fintek_detect
   return 7;
 }
 
-# $_[0]: A reference to the file descriptor to access this chip.
-# $_[1]: Address
-# Returns: undef if not detected, 1 if detected
-# Detection is rather difficult, since the PCA9540 has a single register.
-# Fortunately, no other device is known to live at this address.
-sub pca9540_detect
-{
-	my ($file, $addr) = @_;
-	my $reg = i2c_smbus_read_byte($file);
-
-	return if ($reg & 0xfa);
-	return if $reg != i2c_smbus_read_byte($file);
-	return if $reg != i2c_smbus_read_byte($file);
-	return if $reg != i2c_smbus_read_byte($file);
-
-	return 1;
-}
-
 # This checks for non-FFFF values for temperature, voltage, and current.
 # The address (0x0b) is specified by the SMBus standard so it's likely
 # that this really is a smart battery.