From e4299adb7a89c48b47ab59a119476fe4fcf909ea Mon Sep 17 00:00:00 2001
From: Sebastien Jan <s-jan@ti.com>
Date: Wed, 5 May 2010 08:45:52 +0000
Subject: [PATCH] --- yaml --- r: 194783 b: refs/heads/master c:
 7d9974666e0dc2cbbeac80fa4d550df0bbea6fad h: refs/heads/master i:   194781:
 8169021fda1707af56b0769f7f73e6715d3cd8a8   194779:
 79fe5a4eee2b98b6485d5355ab44385791e374d7   194775:
 1026620307eec6cd54692c777c33316b991466e5   194767:
 8018f66f522745fbb44dd26e1b2ffbdcc651f3bb   194751:
 09f4376661c7bbf39189b9dbaacf7f59303b31bf v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/net/ks8851.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 13759778af88..903f4c146a41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d951f7250305adaea5f25398b70023681183d0cb
+refs/heads/master: 7d9974666e0dc2cbbeac80fa4d550df0bbea6fad
diff --git a/trunk/drivers/net/ks8851.c b/trunk/drivers/net/ks8851.c
index b8ed1ee37ac1..623171f37d99 100644
--- a/trunk/drivers/net/ks8851.c
+++ b/trunk/drivers/net/ks8851.c
@@ -78,7 +78,9 @@ union ks8851_tx_hdr {
  * @msg_enable: The message flags controlling driver output (see ethtool).
  * @fid: Incrementing frame id tag.
  * @rc_ier: Cached copy of KS_IER.
+ * @rc_ccr: Cached copy of KS_CCR.
  * @rc_rxqcr: Cached copy of KS_RXQCR.
+ * @eeprom_size: Companion eeprom size in Bytes, 0 if no eeprom
  *
  * The @lock ensures that the chip is protected when certain operations are
  * in progress. When the read or write packet transfer is in progress, most
@@ -109,6 +111,8 @@ struct ks8851_net {
 
 	u16			rc_ier;
 	u16			rc_rxqcr;
+	u16			rc_ccr;
+	u16			eeprom_size;
 
 	struct mii_if_info	mii;
 	struct ks8851_rxctrl	rxctrl;
@@ -1269,6 +1273,14 @@ static int __devinit ks8851_probe(struct spi_device *spi)
 		goto err_id;
 	}
 
+	/* cache the contents of the CCR register for EEPROM, etc. */
+	ks->rc_ccr = ks8851_rdreg16(ks, KS_CCR);
+
+	if (ks->rc_ccr & CCR_EEPROM)
+		ks->eeprom_size = 128;
+	else
+		ks->eeprom_size = 0;
+
 	ks8851_read_selftest(ks);
 	ks8851_init_mac(ks);