i2c-algo-pca: Add PCA9665 support

Add support for the PCA9665 I2C controller.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

3 files changed, 19 insertions, 12 deletions

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 7f95905bbb9d..68650643d116 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -617,12 +617,12 @@ config I2C_ELEKTOR
           will be called i2c-elektor.
 
 config I2C_PCA_ISA
-        tristate "PCA9564 on an ISA bus"
+        tristate "PCA9564/PCA9665 on an ISA bus"
         depends on ISA
         select I2C_ALGOPCA
         default n
         help
-          This driver supports ISA boards using the Philips PCA9564
+          This driver supports ISA boards using the Philips PCA9564/PCA9665
           parallel bus to I2C bus controller.
 
           This driver can also be built as a module.  If so, the module
@@ -634,11 +634,11 @@ config I2C_PCA_ISA
           time).  If unsure, say N.
 
 config I2C_PCA_PLATFORM
-        tristate "PCA9564 as platform device"
+        tristate "PCA9564/PCA9665 as platform device"
         select I2C_ALGOPCA
         default n
         help
-          This driver supports a memory mapped Philips PCA9564
+          This driver supports a memory mapped Philips PCA9564/PCA9665
           parallel bus to I2C bus controller.
 
           This driver can also be built as a module.  If so, the module
diff --git a/drivers/i2c/busses/i2c-pca-isa.c b/drivers/i2c/busses/i2c-pca-isa.c
index c420a7c0f3e4..0cc8017b3f64 100644
--- a/drivers/i2c/busses/i2c-pca-isa.c
+++ b/drivers/i2c/busses/i2c-pca-isa.c
@@ -41,7 +41,7 @@ static int irq = -1;
 
 /* Data sheet recommends 59kHz for 100kHz operation due to variation
  * in the actual clock rate */
-static int clock  = I2C_PCA_CON_59kHz;
+static int clock  = 59000;
 
 static wait_queue_head_t pca_wait;
 
@@ -103,7 +103,7 @@ static struct i2c_algo_pca_data pca_isa_data = {
 static struct i2c_adapter pca_isa_ops = {
         .owner          = THIS_MODULE,
         .algo_data      = &pca_isa_data,
-        .name           = "PCA9564 ISA Adapter",
+        .name           = "PCA9564/PCA9665 ISA Adapter",
         .timeout        = 100,
 };
 
@@ -196,7 +196,7 @@ static void __exit pca_isa_exit(void)
 }
 
 MODULE_AUTHOR("Ian Campbell <icampbell@arcom.com>");
-MODULE_DESCRIPTION("ISA base PCA9564 driver");
+MODULE_DESCRIPTION("ISA base PCA9564/PCA9665 driver");
 MODULE_LICENSE("GPL");
 
 module_param(base, ulong, 0);
@@ -205,7 +205,13 @@ MODULE_PARM_DESC(base, "I/O base address");
 module_param(irq, int, 0);
 MODULE_PARM_DESC(irq, "IRQ");
 module_param(clock, int, 0);
-MODULE_PARM_DESC(clock, "Clock rate as described in table 1 of PCA9564 datasheet");
+MODULE_PARM_DESC(clock, "Clock rate in hertz.\n\t\t"
+                "For PCA9564: 330000,288000,217000,146000,"
+                "88000,59000,44000,36000\n"
+                "\t\tFor PCA9665:\tStandard: 60300 - 100099\n"
+                "\t\t\t\tFast: 100100 - 400099\n"
+                "\t\t\t\tFast+: 400100 - 10000099\n"
+                "\t\t\t\tTurbo: Up to 1265800");
 
 module_init(pca_isa_init);
 module_exit(pca_isa_exit);
diff --git a/drivers/i2c/busses/i2c-pca-platform.c b/drivers/i2c/busses/i2c-pca-platform.c
index 6bb15ad0a6b6..51d179bbddf9 100644
--- a/drivers/i2c/busses/i2c-pca-platform.c
+++ b/drivers/i2c/busses/i2c-pca-platform.c
@@ -172,8 +172,9 @@ static int __devinit i2c_pca_pf_probe(struct platform_device *pdev)
 
         i2c->adap.nr = pdev->id >= 0 ? pdev->id : 0;
         i2c->adap.owner = THIS_MODULE;
-        snprintf(i2c->adap.name, sizeof(i2c->adap.name), "PCA9564 at 0x%08lx",
-                (unsigned long) res->start);
+        snprintf(i2c->adap.name, sizeof(i2c->adap.name),
+                 "PCA9564/PCA9665 at 0x%08lx",
+                 (unsigned long) res->start);
         i2c->adap.algo_data = &i2c->algo_data;
         i2c->adap.dev.parent = &pdev->dev;
         i2c->adap.timeout = platform_data->timeout;
@@ -246,7 +247,7 @@ e_remap:
 e_alloc:
         release_mem_region(res->start, res_len(res));
 e_print:
-        printk(KERN_ERR "Registering PCA9564 FAILED! (%d)\n", ret);
+        printk(KERN_ERR "Registering PCA9564/PCA9665 FAILED! (%d)\n", ret);
         return ret;
 }
 
@@ -290,7 +291,7 @@ static void __exit i2c_pca_pf_exit(void)
 }
 
 MODULE_AUTHOR("Wolfram Sang <w.sang@pengutronix.de>");
-MODULE_DESCRIPTION("I2C-PCA9564 platform driver");
+MODULE_DESCRIPTION("I2C-PCA9564/PCA9665 platform driver");
 MODULE_LICENSE("GPL");
 
 module_init(i2c_pca_pf_init);