---

yaml --- r: 92700 b: refs/heads/master c: 28930fa h: refs/heads/master v: v3
git-mirror · Apr 24, 2008 · 857d6c4 · 857d6c4
1 parent 51c4b18
commit 857d6c4
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 265a6510629ab39f33ece43a857089dd37978184
+refs/heads/master: 28930fa9af9be77abe3d8bce3193908bf266efc6
diff --git a/trunk/drivers/media/video/au0828/au0828-cards.c b/trunk/drivers/media/video/au0828/au0828-cards.c
@@ -75,6 +75,45 @@ int au0828_tuner_callback(void *priv, int command, int arg)
 	return 0; /* Should never be here */
 }
 
+static void hauppauge_eeprom(struct au0828_dev *dev, u8 *eeprom_data)
+{
+	struct tveeprom tv;
+
+	tveeprom_hauppauge_analog(&dev->i2c_client, &tv, eeprom_data);
+
+	/* Make sure we support the board model */
+	switch (tv.model)
+	{
+	case 72001: /* WinTV-HVR950q (Retail, IR, ATSC/QAM and basic analog video */
+		break;
+	default:
+		printk("%s: warning: unknown hauppauge model #%d\n", __FUNCTION__, tv.model);
+		break;
+	}
+
+	printk(KERN_INFO "%s: hauppauge eeprom: model=%d\n", __FUNCTION__, tv.model);
+}
+
+
+void au0828_card_setup(struct au0828_dev *dev)
+{
+
+	static u8 eeprom[256];
+
+	if (dev->i2c_rc == 0) {
+		dev->i2c_client.addr = 0xa0 >> 1;
+		tveeprom_read(&dev->i2c_client, eeprom, sizeof(eeprom));
+	}
+
+	switch(dev->board) {
+	case AU0828_BOARD_HAUPPAUGE_HVR850:
+	case AU0828_BOARD_HAUPPAUGE_HVR950Q:
+		if (dev->i2c_rc == 0)
+			hauppauge_eeprom(dev, eeprom+0xa0);
+		break;
+	}
+}
+
 /*
  * The bridge has between 8 and 12 gpios.
  * Regs 1 and 0 deal with output enables.

diff --git a/trunk/drivers/media/video/au0828/au0828-core.c b/trunk/drivers/media/video/au0828/au0828-core.c
@@ -210,6 +210,9 @@ static int au0828_usb_probe (struct usb_interface *interface,
 	/* I2C */
 	au0828_i2c_register(dev);
 
+	/* Setup */
+	au0828_card_setup(dev);
+
 	/* Digital TV */
 	au0828_dvb_register(dev);
 

diff --git a/trunk/drivers/media/video/au0828/au0828.h b/trunk/drivers/media/video/au0828/au0828.h
@@ -22,6 +22,7 @@
 #include <linux/usb.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
+#include <media/tveeprom.h>
 
 /* DVB */
 #include "demux.h"
@@ -103,6 +104,7 @@ extern struct usb_device_id au0828_usb_id_table[];
 extern const unsigned int au0828_bcount;
 extern void au0828_gpio_setup(struct au0828_dev *dev);
 extern int au0828_tuner_callback(void *priv, int command, int arg);
+extern void au0828_card_setup(struct au0828_dev *dev);
 
 /* ----------------------------------------------------------- */
 /* au0828-i2c.c */