tm6000, reset I2C bus function

diff -r 8f5129efe974 linux/drivers/staging/tm6000/tm6000-cards.c
@@ -378,13 +378,7 @@
 		tm6000_set_reg(dev, REQ_04_EN_DISABLE_MCU_INT,
 					0x02, arg);
 		msleep(10);
-		rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
-					TM6000_GPIO_CLK, 0);
-		if (rc < 0)
-			return rc;
-		msleep(10);
-		rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
-					TM6000_GPIO_CLK, 1);
+		rc = tm6000_i2c_reset(dev, 10);
 		break;
 	case XC2028_TUNER_RESET:
 		/* Reset codes during load firmware */

@@ -438,14 +432,7 @@
 			break;
 
 		case 2:
-			rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
-						TM6000_GPIO_CLK, 0);
-			if (rc < 0)
-				return rc;
-			msleep(100);
-			rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
-						TM6000_GPIO_CLK, 1);
-			msleep(100);
+			rc = tm6000_i2c_reset(dev, 100);
 			break;
 		}
 	}

diff -r 8f5129efe974 linux/drivers/staging/tm6000/tm6000-core.c
@@ -156,6 +156,22 @@
 		return rc;
 
 	return buf[3] | buf[2] << 8 | buf[1] << 16 | buf[0] << 24;
+}
+
+int tm6000_i2c_reset(struct tm6000_core *dev, u16 tsleep)
+{
+	int rc;
+
+	rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6000_GPIO_CLK, 0);
+	if (rc < 0)
+		return rc;
+
+	msleep(tsleep);
+
+	rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6000_GPIO_CLK, 1);
+	msleep(tsleep);
+
+	return rc;
 }
 
 void tm6000_set_fourcc_format(struct tm6000_core *dev)

diff -r 8f5129efe974 linux/drivers/staging/tm6000/tm6000.h
@@ -241,6 +241,8 @@
 int tm6000_get_reg16(struct tm6000_core *dev, u8 req, u16 value, u16 index);
 int tm6000_get_reg32(struct tm6000_core *dev, u8 req, u16 value, u16 index);
 int tm6000_set_reg (struct tm6000_core *dev, u8 req, u16 value, u16 index);
+int tm6000_i2c_reset(struct tm6000_core *dev, u16 tsleep);
+
 int tm6000_init (struct tm6000_core *dev);
 
 int tm6000_init_analog_mode (struct tm6000_core *dev);

diff -r 8f5129efe974 linux/drivers/staging/tm6000/tm6000-cards.c
@@ -378,13 +378,7 @@
 		tm6000_set_reg(dev, REQ_04_EN_DISABLE_MCU_INT,
 					0x02, arg);
 		msleep(10);
-		rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
-					TM6000_GPIO_CLK, 0);
-		if (rc < 0)
-			return rc;
-		msleep(10);
-		rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
-					TM6000_GPIO_CLK, 1);
+		rc = tm6000_i2c_reset(dev, 10);
 		break;
 	case XC2028_TUNER_RESET:
 		/* Reset codes during load firmware */

@@ -438,14 +432,7 @@
 			break;
 
 		case 2:
-			rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
-						TM6000_GPIO_CLK, 0);
-			if (rc < 0)
-				return rc;
-			msleep(100);
-			rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
-						TM6000_GPIO_CLK, 1);
-			msleep(100);
+			rc = tm6000_i2c_reset(dev, 100);
 			break;
 		}
 	}

diff -r 8f5129efe974 linux/drivers/staging/tm6000/tm6000-core.c
@@ -156,6 +156,22 @@
 		return rc;
 
 	return buf[3] | buf[2] << 8 | buf[1] << 16 | buf[0] << 24;
+}
+
+int tm6000_i2c_reset(struct tm6000_core *dev, u16 tsleep)
+{
+	int rc;
+
+	rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6000_GPIO_CLK, 0);
+	if (rc < 0)
+		return rc;
+
+	msleep(tsleep);
+
+	rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6000_GPIO_CLK, 1);
+	msleep(tsleep);
+
+	return rc;
 }
 
 void tm6000_set_fourcc_format(struct tm6000_core *dev)

diff -r 8f5129efe974 linux/drivers/staging/tm6000/tm6000.h
@@ -241,6 +241,8 @@
 int tm6000_get_reg16(struct tm6000_core *dev, u8 req, u16 value, u16 index);
 int tm6000_get_reg32(struct tm6000_core *dev, u8 req, u16 value, u16 index);
 int tm6000_set_reg (struct tm6000_core *dev, u8 req, u16 value, u16 index);
+int tm6000_i2c_reset(struct tm6000_core *dev, u16 tsleep);
+
 int tm6000_init (struct tm6000_core *dev);
 
 int tm6000_init_analog_mode (struct tm6000_core *dev);

diff -r 8f5129efe974 linux/drivers/staging/tm6000/tm6000-alsa.c
@@ -68,6 +68,9 @@
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
 static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1};
+
+static struct snd_card *snd_tm6000_cards[SNDRV_CARDS];
+static int devno;
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 10)
 static unsigned int dummy;

@@ -353,7 +356,8 @@
  * Alsa Constructor - Component probe
  */
 
-int tm6000_audio_init(struct tm6000_core *dev, int idx)
+//int tm6000_audio_init(struct tm6000_core *dev, int idx)
+int tm6000_audio_initdev(struct tm6000_core *dev, int idx)
 {
 	struct snd_card         *card;
 	struct snd_tm6000_card  *chip;

@@ -419,6 +423,7 @@
 	if (rc < 0)
 		goto error;
 
+	snd_tm6000_cards[idx] = card;
 
 	return 0;
 

@@ -426,14 +431,49 @@
 	snd_card_free(card);
 	return rc;
 }
-EXPORT_SYMBOL_GPL(tm6000_audio_init);
+//EXPORT_SYMBOL_GPL(tm6000_audio_init);
+#if 1
+static int tm6000_audio_init(void)
+{
+	struct tm6000_core *dev = NULL;
+	struct list_head *list;
 
-#if 0
+//	tm6000_dmasound_init = alsa_device_init;
+//	tm6000_dmasound_exit = alsa_device_exit;
+
+	printk(KERN_INFO "tm6000 ALSA driver for DMA sound loaded\n");
+
+	list_for_each(list,&tm6000_devlist) {
+		dev = list_entry(list, struct tm6000_core, devlist);
+		if (!tm6000_audio_initdev(dev, devno))
+			devno++;
+		else
+			printk(KERN_INFO "tm6000 ALSA: audio init failed\n");
+	}
+
+	if (dev == NULL)
+		printk(KERN_INFO "tm6000 ALSA: no tm6000 cards found\n");
+
+	return 0;
+
+}
+
 /*
  * module remove
  */
 static void tm6000_audio_fini(void)
 {
+	int idx;
+
+	for (idx = 0; idx < devno; idx++) {
+		snd_card_free(snd_tm6000_cards[idx]);
+	}
+
+//	tm6000_dmasound_init = NULL;
+//	tm6000_dmasound_exit = NULL;
+	printk(KERN_INFO "tm6000 ALSA driver for DMA sound unloaded\n");
+
+	return;
 }
 
 module_init(tm6000_audio_init);

diff -r 8f5129efe974 linux/drivers/staging/tm6000/tm6000-cards.c
@@ -56,6 +56,12 @@
 module_param_array(card,  int, NULL, 0444);
 
 static unsigned long tm6000_devused;
+
+DEFINE_MUTEX(tm6000_devlist_lock);
+EXPORT_SYMBOL(tm6000_devlist_lock);
+LIST_HEAD(tm6000_devlist);
+EXPORT_SYMBOL(tm6000_devlist);
+static LIST_HEAD(mops_list);
 
 #if 0
 /* This will be needed sooner or later, to allow selecting video mux entries */

@@ -723,6 +716,13 @@
 		}
 #endif
 	}
+
+	mutex_lock(&tm6000_devlist_lock);
+//	list_for_each_entry(mops, &mops_list, next)
+//		mpeg_ops_attach(mops, dev);
+	list_add_tail(&dev->devlist, &tm6000_devlist);
+	mutex_unlock(&tm6000_devlist_lock);
+
 	mutex_unlock(&dev->lock);
 	return 0;
 

@@ -957,6 +957,13 @@
 
 	mutex_lock(&dev->lock);
 
+	/* unregister */
+	mutex_lock(&tm6000_devlist_lock);
+	list_del(&dev->devlist);
+//	list_for_each_entry(mops, &mops_list, next)
+//		mpeg_ops_detach(mops, dev);
+	mutex_unlock(&tm6000_devlist_lock);
+
 #ifdef CONFIG_VIDEO_TM6000_DVB
 	if (dev->dvb) {
 		tm6000_dvb_unregister(dev);

@@ -991,6 +998,7 @@
 static int __init tm6000_module_init(void)
 {
 	int result;
+	INIT_LIST_HEAD(&tm6000_devlist);
 
 	printk(KERN_INFO "tm6000" " v4l2 driver version %d.%d.%d loaded\n",
 	       (TM6000_VERSION  >> 16) & 0xff,

diff -r 8f5129efe974 linux/drivers/staging/tm6000/tm6000.h
@@ -154,6 +154,7 @@
 	int				model;		/* index in the device_data struct */
 	int				devno;		/* marks the number of this device */
 	enum tm6000_devtype		dev_type;	/* type of device */
+	struct list_head		devlist;
 
 	v4l2_std_id                     norm;           /* Current norm */
 	int				width,height;	/* Selected resolution */

@@ -228,6 +229,8 @@
 			V4L2_STD_NTSC_M_JP|V4L2_STD_SECAM
 
 /* In tm6000-cards.c */
+extern struct list_head  tm6000_devlist;
+extern struct mutex tm6000_devlist_lock;
 
 int tm6000_tuner_callback (void *ptr, int component, int command, int arg);
 int tm6000_xc5000_callback (void *ptr, int component, int command, int arg);

@@ -289,7 +294,7 @@
 int tm6000_queue_init(struct tm6000_core *dev);
 
 /* In tm6000-alsa.c */
-int tm6000_audio_init(struct tm6000_core *dev, int idx);
+//int tm6000_audio_init(struct tm6000_core *dev, int idx);
 
 
 /* Debug stuff */