bk://kernel.bkbits.net/gregkh/linux/i2c-2.6
ebs@ebshome.net|ChangeSet|20040519072634|54872 ebs

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/05/24 11:30:33-07:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-i2c
# 
# include/linux/pci_ids.h
#   2004/05/24 11:30:29-07:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/05/22 23:33:27-07:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-i2c
# 
# include/linux/pci_ids.h
#   2004/05/22 23:33:23-07:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/05/19 00:26:34-07:00 ebs@ebshome.net 
#   [PATCH] I2C PPC4xx IIC driver: 0-length transaction temporary fix
#   
#   this patch adds temporary fix for 0-length requests (e.g. SMBUS_QUICK) to PPC4xx
#   IIC driver. This i2c controller doesn't support such transactions and this patch
#   just restores previous driver version behavior making SMBUS_QUICK-based bus scan
#   at least partially usable. This is temporary kludge until correct bit-banging
#   emulation is implemented.
# 
# drivers/i2c/busses/i2c-ibm_iic.c
#   2004/05/17 12:29:23-07:00 ebs@ebshome.net +10 -0
#   I2C PPC4xx IIC driver: 0-length transaction temporary fix
# 
# ChangeSet
#   2004/05/19 00:26:13-07:00 ebs@ebshome.net 
#   [PATCH] I2C PPC4xx IIC driver: fix debug build with gcc3
#   
#   this patch fixes PPC4xx IIC driver debug mode build with gcc 3.x compiler.
#   Noticed by Evgenij Polyakov.
# 
# drivers/i2c/busses/i2c-ibm_iic.c
#   2004/05/17 12:28:35-07:00 ebs@ebshome.net +4 -4
#   I2C PPC4xx IIC driver: fix debug build with gcc3
# 
# ChangeSet
#   2004/05/19 00:25:54-07:00 ebs@ebshome.net 
#   [PATCH] I2C PPC4xx IIC driver: Kconfig cleanup
#   
#   this patch renames Kconfig entry for PPC4xx IIC driver making it more clear and
#   also adds a help text.
# 
# drivers/i2c/busses/Kconfig
#   2004/05/17 12:28:02-07:00 ebs@ebshome.net +7 -1
#   I2C PPC4xx IIC driver: Kconfig cleanup
# 
# ChangeSet
#   2004/05/19 00:25:35-07:00 ebs@ebshome.net 
#   [PATCH] I2C PPC4xx IIC driver: upgrade to new OCP infrastructre
#   
#   this patch changes IBM PPC4xx IIC driver to support new PPC OCP infrastructure
#   recently added to 2.6 kernel.
# 
# drivers/i2c/busses/i2c-ibm_iic.c
#   2004/05/17 12:26:52-07:00 ebs@ebshome.net +17 -13
#   I2C PPC4xx IIC driver: upgrade to new OCP infrastructre
# 
# ChangeSet
#   2004/05/19 00:25:14-07:00 khali@linux-fr.org 
#   [PATCH] I2C: Incomplete AT24RF08 corruption prevention in i2c eeprom
#   
#   The AT24RF08 corruption prevention trick that is found in the i2c eeprom
#   driver is not correct. The prevention is activated only conditionally,
#   while it should be done all the time.
# 
# drivers/i2c/chips/eeprom.c
#   2004/05/16 12:11:11-07:00 khali@linux-fr.org +3 -2
#   I2C: Incomplete AT24RF08 corruption prevention in i2c eeprom
# 
# ChangeSet
#   2004/05/19 00:24:54-07:00 faikuygur@tnn.net 
#   [PATCH] I2C: use idr_get_new to allocate a bus id in drivers/i2c/i2c-core.c
# 
# drivers/i2c/i2c-core.c
#   2004/05/16 04:55:29-07:00 faikuygur@tnn.net +17 -4
#   I2C: use idr_get_new to allocate a bus id in drivers/i2c/i2c-core.c
# 
# ChangeSet
#   2004/05/18 23:48:56-07:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-i2c
# 
# include/linux/pci_ids.h
#   2004/05/18 23:48:53-07:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/05/18 14:36:49-07:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-i2c
# 
# include/linux/pci_ids.h
#   2004/05/18 14:36:46-07:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/05/16 01:38:42-07:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-i2c
# 
# include/linux/pci_ids.h
#   2004/05/16 01:38:39-07:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/05/14 21:25:32-07:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-i2c
# 
# include/linux/pci_ids.h
#   2004/05/14 21:25:27-07:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/05/11 16:44:05-07:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-i2c
# 
# include/linux/pci_ids.h
#   2004/05/11 16:44:01-07:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/05/09 21:15:18-07:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-i2c
# 
# drivers/pci/quirks.c
#   2004/05/09 21:15:15-07:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/04/29 15:46:26-07:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-i2c
# 
# include/linux/pci_ids.h
#   2004/04/29 15:46:23-07:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/04/25 22:50:06-07:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-i2c
# 
# include/linux/pci_ids.h
#   2004/04/25 22:50:03-07:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/04/19 19:30:36-07:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-i2c
# 
# include/linux/pci_ids.h
#   2004/04/19 19:30:32-07:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# drivers/pci/quirks.c
#   2004/04/19 19:30:32-07:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/04/02 11:26:04-08:00 akpm@bix.(none) 
#   Merge bk://kernel.bkbits.net/gregkh/linux/i2c-2.6
#   into bix.(none):/usr/src/bk-i2c
# 
# include/linux/pci_ids.h
#   2004/04/02 11:26:01-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/03/31 19:14:08-08:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-i2c
# 
# include/linux/pci_ids.h
#   2004/03/31 19:14:06-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/03/26 12:13:35-08:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-i2c
# 
# include/linux/pci_ids.h
#   2004/03/26 12:13:32-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/03/16 20:13:31-08:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-i2c
# 
# include/linux/pci_ids.h
#   2004/03/16 20:13:11-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/03/15 22:33:45-08:00 akpm@bix.(none) 
#   Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-i2c
# 
# BitKeeper/deleted/.del-i2c-velleman.c~9a4fd0cf1e7a194c
#   2004/03/15 22:33:31-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# BitKeeper/deleted/.del-i2c-elv.c~3b5450cc3140a51a
#   2004/03/15 22:33:31-08:00 akpm@bix.(none) +0 -0
#   Auto merged
# 
# BitKeeper/deleted/.del-i2c-velleman.c~9a4fd0cf1e7a194c
#   2004/03/15 22:33:31-08:00 akpm@bix.(none) +0 -0
#   Merge rename: drivers/i2c/busses/i2c-velleman.c -> BitKeeper/deleted/.del-i2c-velleman.c~9a4fd0cf1e7a194c
# 
# BitKeeper/deleted/.del-i2c-elv.c~3b5450cc3140a51a
#   2004/03/15 22:33:31-08:00 akpm@bix.(none) +0 -0
#   Merge rename: drivers/i2c/busses/i2c-elv.c -> BitKeeper/deleted/.del-i2c-elv.c~3b5450cc3140a51a
# 
# ChangeSet
#   2004/03/08 12:11:41-08:00 akpm@mnm.(none) 
#   Merge bk://kernel.bkbits.net/gregkh/linux/i2c-2.6
#   into mnm.(none):/usr/src/bk-i2c
# 
# include/linux/pci_ids.h
#   2004/03/08 12:11:34-08:00 akpm@mnm.(none) +0 -0
#   Auto merged
# 
# drivers/pci/quirks.c
#   2004/03/08 12:11:34-08:00 akpm@mnm.(none) +0 -0
#   Auto merged
# 
# drivers/i2c/busses/i2c-velleman.c
#   2004/03/08 12:11:34-08:00 akpm@mnm.(none) +0 -0
#   Auto merged
# 
# drivers/i2c/busses/i2c-elv.c
#   2004/03/08 12:11:34-08:00 akpm@mnm.(none) +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/03/07 01:29:25-08:00 akpm@mnm.(none) 
#   Merge
# 
# drivers/i2c/busses/i2c-velleman.c
#   2004/03/07 01:29:23-08:00 akpm@mnm.(none) +0 -0
#   SCCS merged
# 
# drivers/i2c/busses/i2c-elv.c
#   2004/03/07 01:29:23-08:00 akpm@mnm.(none) +0 -0
#   SCCS merged
# 
# include/linux/pci_ids.h
#   2004/03/07 01:24:40-08:00 akpm@mnm.(none) +0 -0
#   Auto merged
# 
# drivers/pci/quirks.c
#   2004/03/07 01:24:40-08:00 akpm@mnm.(none) +0 -0
#   Auto merged
# 
diff -Nru a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
--- a/drivers/i2c/busses/Kconfig	2004-05-25 21:24:28 -07:00
+++ b/drivers/i2c/busses/Kconfig	2004-05-25 21:24:28 -07:00
@@ -118,8 +118,14 @@
 	  will be called i2c-i810.
 
 config I2C_IBM_IIC
-	tristate "IBM IIC I2C"
+	tristate "IBM PPC 4xx on-chip I2C interface"
 	depends on IBM_OCP && I2C
+	help
+	  Say Y here if you want to use IIC peripheral found on 
+	  embedded IBM PPC 4xx based systems. 
+
+	  This driver can also be built as a module.  If so, the module
+	  will be called i2c-ibm_iic.
 
 config I2C_IOP3XX
 	tristate "Intel XScale IOP3xx on-chip I2C interface"
diff -Nru a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
--- a/drivers/i2c/busses/i2c-ibm_iic.c	2004-05-25 21:24:28 -07:00
+++ b/drivers/i2c/busses/i2c-ibm_iic.c	2004-05-25 21:24:28 -07:00
@@ -3,7 +3,7 @@
  *
  * Support for the IIC peripheral on IBM PPC 4xx
  *
- * Copyright (c) 2003 Zultys Technologies.
+ * Copyright (c) 2003, 2004 Zultys Technologies.
  * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
  *
  * Based on original work by 
@@ -45,7 +45,7 @@
 
 #include "i2c-ibm_iic.h"
 
-#define DRIVER_VERSION "2.0"
+#define DRIVER_VERSION "2.01"
 
 MODULE_DESCRIPTION("IBM IIC driver v" DRIVER_VERSION);
 MODULE_LICENSE("GPL");
@@ -69,14 +69,14 @@
 #endif
 
 #if DBG_LEVEL > 0
-#  define DBG(x...)	printk(KERN_DEBUG "ibm-iic" ##x)
+#  define DBG(f,x...)	printk(KERN_DEBUG "ibm-iic" f, ##x)
 #else
-#  define DBG(x...)	((void)0)
+#  define DBG(f,x...)	((void)0)
 #endif
 #if DBG_LEVEL > 1
-#  define DBG2(x...) 	DBG( ##x )
+#  define DBG2(f,x...) 	DBG(f, ##x)
 #else
-#  define DBG2(x...) 	((void)0)
+#  define DBG2(f,x...) 	((void)0)
 #endif
 #if DBG_LEVEL > 2
 static void dump_iic_regs(const char* header, struct ibm_iic_private* dev)
@@ -455,6 +455,16 @@
 	}		
 	for (i = 0; i < num; ++i){
 		if (unlikely(msgs[i].len <= 0)){
+			if (num == 1 && !msgs[0].len){
+				/* Special case for I2C_SMBUS_QUICK emulation.
+				 * Although this logic is FAR FROM PERFECT, this 
+				 * is what previous driver version did.
+				 * IBM IIC doesn't support 0-length transactions
+				 * (except bit-banging through IICx_DIRECTCNTL).
+				 */
+				DBG("%d: zero-length msg kludge\n", dev->idx); 
+				return 0;
+			}
 			DBG("%d: invalid len %d in msg[%d]\n", dev->idx, 
 				msgs[i].len, i);
 			return -EINVAL;
@@ -549,19 +559,24 @@
 
 	struct ibm_iic_private* dev;
 	struct i2c_adapter* adap;
+	struct ocp_func_iic_data* iic_data = ocp->def->additions;
 	int ret;
-	bd_t* bd = (bd_t*)&__res;
 	
+	if (!iic_data)
+		printk(KERN_WARNING"ibm-iic%d: missing additional data!\n",
+			ocp->def->index);
+
 	if (!(dev = kmalloc(sizeof(*dev), GFP_KERNEL))){
-		printk(KERN_CRIT "ibm-iic: failed to allocate device data\n");
+		printk(KERN_CRIT "ibm-iic%d: failed to allocate device data\n",
+			ocp->def->index);
 		return -ENOMEM;
 	}
 
 	memset(dev, 0, sizeof(*dev));
-	dev->idx = ocp->num;
+	dev->idx = ocp->def->index;
 	ocp_set_drvdata(ocp, dev);
 	
-	if (!(dev->vaddr = ioremap(ocp->paddr, sizeof(struct iic_regs)))){
+	if (!(dev->vaddr = ioremap(ocp->def->paddr, sizeof(struct iic_regs)))){
 		printk(KERN_CRIT "ibm-iic%d: failed to ioremap device registers\n",
 			dev->idx);
 		ret = -ENXIO;
@@ -570,7 +585,7 @@
 	
 	init_waitqueue_head(&dev->wq);
 
-	dev->irq = iic_force_poll ? -1 : ocp->irq;
+	dev->irq = iic_force_poll ? -1 : ocp->def->irq;
 	if (dev->irq >= 0){
 		/* Disable interrupts until we finish intialization,
 		   assumes level-sensitive IRQ setup...
@@ -589,13 +604,12 @@
 			dev->idx);
 		
 	/* Board specific settings */
-	BUG_ON(dev->idx >= sizeof(bd->bi_iic_fast) / sizeof(bd->bi_iic_fast[0]));
-	dev->fast_mode = iic_force_fast ? 1 : bd->bi_iic_fast[dev->idx];
+	dev->fast_mode = iic_force_fast ? 1 : (iic_data ? iic_data->fast_mode : 0);
 	
 	/* clckdiv is the same for *all* IIC interfaces, 
 	 * but I'd rather make a copy than introduce another global. --ebs
 	 */
-	dev->clckdiv = iic_clckdiv(bd->bi_opb_busfreq);
+	dev->clckdiv = iic_clckdiv(ocp_sys_info.opb_bus_freq);
 	DBG("%d: clckdiv = %d\n", dev->idx, dev->clckdiv);
 	
 	/* Initialize IIC interface */
@@ -664,7 +678,7 @@
 
 static struct ocp_device_id ibm_iic_ids[] __devinitdata = 
 {
-	{ .vendor = OCP_VENDOR_IBM, .device = OCP_FUNC_IIC },
+	{ .vendor = OCP_VENDOR_IBM, .function = OCP_FUNC_IIC },
 	{ .vendor = OCP_VENDOR_INVALID }
 };
 
@@ -672,7 +686,7 @@
 
 static struct ocp_driver ibm_iic_driver =
 {
-	.name 		= "ocp_iic",
+	.name 		= "iic",
 	.id_table	= ibm_iic_ids,
 	.probe		= iic_probe,
 	.remove		= __devexit_p(iic_remove),
@@ -685,7 +699,7 @@
 static int __init iic_init(void)
 {
 	printk(KERN_INFO "IBM IIC driver v" DRIVER_VERSION "\n");
-	return ocp_module_init(&ibm_iic_driver);
+	return ocp_register_driver(&ibm_iic_driver);
 }
 
 static void __exit iic_exit(void)
diff -Nru a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c
--- a/drivers/i2c/chips/eeprom.c	2004-05-25 21:24:28 -07:00
+++ b/drivers/i2c/chips/eeprom.c	2004-05-25 21:24:28 -07:00
@@ -203,11 +203,12 @@
 	new_client->driver = &eeprom_driver;
 	new_client->flags = 0;
 
+	/* prevent 24RF08 corruption */
+	i2c_smbus_write_quick(new_client, 0);
+
 	/* Now, we do the remaining detection. It is not there, unless you force
 	   the checksum to work out. */
 	if (checksum) {
-		/* prevent 24RF08 corruption */
-		i2c_smbus_write_quick(new_client, 0);
 		cs = 0;
 		for (i = 0; i <= 0x3e; i++)
 			cs += i2c_smbus_read_byte_data(new_client, i);
diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
--- a/drivers/i2c/i2c-core.c	2004-05-25 21:24:28 -07:00
+++ b/drivers/i2c/i2c-core.c	2004-05-25 21:24:28 -07:00
@@ -28,6 +28,7 @@
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/init.h>
+#include <linux/idr.h>
 #include <linux/seq_file.h>
 #include <asm/uaccess.h>
 
@@ -35,6 +36,7 @@
 static LIST_HEAD(adapters);
 static LIST_HEAD(drivers);
 static DECLARE_MUTEX(core_lists);
+static DEFINE_IDR(i2c_adapter_idr);
 
 int i2c_device_probe(struct device *dev)
 {
@@ -113,13 +115,19 @@
  */
 int i2c_add_adapter(struct i2c_adapter *adap)
 {
-	static int nr = 0;
+	int id, res = 0;
 	struct list_head   *item;
 	struct i2c_driver  *driver;
 
 	down(&core_lists);
 
-	adap->nr = nr++;
+	if (idr_pre_get(&i2c_adapter_idr, GFP_KERNEL) == 0) {
+		res = -ENOMEM;
+		goto out_unlock;
+	}
+
+	id = idr_get_new(&i2c_adapter_idr, NULL);
+	adap->nr =  id & MAX_ID_MASK;
 	init_MUTEX(&adap->bus_lock);
 	init_MUTEX(&adap->clist_lock);
 	list_add_tail(&adap->list,&adapters);
@@ -151,10 +159,12 @@
 			/* We ignore the return code; if it fails, too bad */
 			driver->attach_adapter(adap);
 	}
-	up(&core_lists);
 
 	dev_dbg(&adap->dev, "registered as adapter #%d\n", adap->nr);
-	return 0;
+
+ out_unlock:
+	up(&core_lists);
+	return res;
 }
 
 
@@ -207,6 +217,9 @@
 	/* wait for sysfs to drop all references */
 	wait_for_completion(&adap->dev_released);
 	wait_for_completion(&adap->class_dev_released);
+
+	/* free dynamically allocated bus id */
+	idr_remove(&i2c_adapter_idr, adap->nr);
 
 	dev_dbg(&adap->dev, "adapter unregistered\n");
 
