diff options
| author | Sebastien Jan <s-jan@ti.com> | 2010-05-05 08:45:52 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-05 21:27:44 -0700 |
| commit | 7d9974666e0dc2cbbeac80fa4d550df0bbea6fad (patch) | |
| tree | 0898cfd2ae49e3eece28c0632ded527e2b269032 /drivers | |
| parent | d951f7250305adaea5f25398b70023681183d0cb (diff) | |
| download | blackbird-op-linux-7d9974666e0dc2cbbeac80fa4d550df0bbea6fad.tar.gz blackbird-op-linux-7d9974666e0dc2cbbeac80fa4d550df0bbea6fad.zip | |
ks8851: Add caching of CCR register
CCR register contains information on companion eeprom availability.
Signed-off-by: Sebastien Jan <s-jan@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ks8851.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/ks8851.c b/drivers/net/ks8851.c index b8ed1ee37ac1..623171f37d99 100644 --- a/drivers/net/ks8851.c +++ b/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); |
