[patch 2.6.26-rc8] gpio: pca953x (i2c) handles max7310 too

[patch 2.6.26-rc8] gpio: pca953x (i2c) handles max7310 too

[David Brownell]

The pca953x driver can handle another 8-bit I/O expander, the
max7310.  This patch adds that chip to the list of supported IDs
in that driver, and expands the Kconfig helptext accordingly.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
---
Yes:  the max7310 is I2C, the max7310 is SPI.
Almost like they're trying to spread confusion...

 drivers/gpio/Kconfig   |   14 ++++++++++----
 drivers/gpio/pca953x.c |    2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

--- a/drivers/gpio/Kconfig	2008-06-18 19:40:30.000000000 -0700
+++ b/drivers/gpio/Kconfig	2008-06-18 19:48:04.000000000 -0700
@@ -43,12 +43,18 @@ config GPIO_SYSFS
 comment "I2C GPIO expanders:"
 
 config GPIO_PCA953X
-	tristate "PCA953x I/O ports"
+	tristate "PCA953x, PCA955x, and MAX7310 I/O ports"
 	depends on I2C
 	help
-	  Say yes here to support the PCA9534 (8-bit), PCA9535 (16-bit),
-	  PCA9536 (4-bit), PCA9537 (4-bit), PCA9538 (8-bit), and PCA9539
-	  (16-bit) I/O ports. These parts are made by NXP and TI.
+	  Say yes here to provide access to several register-oriented
+	  SMBus I/O expanders, made mostly by NXP or TI.  Compatible
+	  models include:
+
+	  4 bits:	pca9536, pca9537
+
+	  8 bits:	max7310, pca9534, pca9538, pca9554, pca9557
+
+	  16 bits:	pca9535, pca9539, pca9555
 
 	  This driver can also be built as a module.  If so, the module
 	  will be called pca953x.
--- a/drivers/gpio/pca953x.c	2008-06-18 19:08:22.000000000 -0700
+++ b/drivers/gpio/pca953x.c	2008-06-18 19:08:30.000000000 -0700
@@ -33,7 +33,7 @@ static const struct i2c_device_id pca953
 	{ "pca9554", 8, },
 	{ "pca9555", 16, },
 	{ "pca9557", 8, },
-	/* REVISIT several pca955x parts should work here too */
+	{ "max7310", 8, },
 	{ }
 };
 MODULE_DEVICE_TABLE(i2c, pca953x_id);