From fbfc5f2e5ac10e1900fca1713c0e2467950f1027 Mon Sep 17 00:00:00 2001
From: Pierre Gronlier <ticapix@gmail.com>
Date: Mon, 26 Apr 2010 13:26:29 -0300
Subject: [PATCH] --- yaml --- r: 193084 b: refs/heads/master c:
 16bfdaa41be85512432212382f2600fcdf7c1c37 h: refs/heads/master v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/media/video/cx23885/cx23885-dvb.c | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 80df15409599..7507b9f7f704 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5013318ca4fd22e30fd891f234b60daa3ca2f62d
+refs/heads/master: 16bfdaa41be85512432212382f2600fcdf7c1c37
diff --git a/trunk/drivers/media/video/cx23885/cx23885-dvb.c b/trunk/drivers/media/video/cx23885/cx23885-dvb.c
index 939079d7bbb9..9e1460828b2f 100644
--- a/trunk/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/trunk/drivers/media/video/cx23885/cx23885-dvb.c
@@ -1006,6 +1006,22 @@ static int dvb_register(struct cx23885_tsport *port)
 		netup_ci_init(port);
 		break;
 		}
+	case CX23885_BOARD_TEVII_S470: {
+		u8 eeprom[256]; /* 24C02 i2c eeprom */
+
+		if (port->nr != 1)
+			break;
+
+		/* Read entire EEPROM */
+		dev->i2c_bus[0].i2c_client.addr = 0xa0 >> 1;
+		tveeprom_read(&dev->i2c_bus[0].i2c_client, eeprom, sizeof(eeprom));
+		printk(KERN_INFO "TeVii S470 MAC= "
+				"%02X:%02X:%02X:%02X:%02X:%02X\n",
+				eeprom[0xa0], eeprom[0xa1], eeprom[0xa2],
+				eeprom[0xa3], eeprom[0xa4], eeprom[0xa5]);
+		memcpy(port->frontends.adapter.proposed_mac, eeprom + 0xa0, 6);
+		break;
+		}
 	}
 
 	return ret;