mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-25 03:46:17 +00:00
Code Issues Releases Wiki Activity

TI DaVinci EMAC: Fix incorrect reference to EMAC_CTRL registers.

Browse source 
The EMAC modules control registers vary as per the version of the
EMAC module. EMAC_CTRL_EWCTL,EMAC_CTRL_EWINTTCNT are available
only on EMAC_VERSION_1. The emac_dump_regs() function accesses
these indiscriminately. This patch fixes the issue.

Signed-off-by: Sriramakrishnan <srk@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sriram 2010-07-29 02:34:00 +00:00 committed by David S. Miller
parent 3725b1fe0b
commit e994762f7a
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/net/davinci_emac.c
View file

@ -564,9 +564,11 @@ static void emac_dump_regs(struct emac_priv *priv)
/* Print important registers in EMAC */ /* Print important registers in EMAC */
dev_info(emac_dev, "EMAC Basic registers\n"); dev_info(emac_dev, "EMAC Basic registers\n");
dev_info(emac_dev, "EMAC: EWCTL: %08X, EWINTTCNT: %08X\n", if (priv->version == EMAC_VERSION_1) {
emac_ctrl_read(EMAC_CTRL_EWCTL), dev_info(emac_dev, "EMAC: EWCTL: %08X, EWINTTCNT: %08X\n",
emac_ctrl_read(EMAC_CTRL_EWINTTCNT)); emac_ctrl_read(EMAC_CTRL_EWCTL),
emac_ctrl_read(EMAC_CTRL_EWINTTCNT));
}
dev_info(emac_dev, "EMAC: TXID: %08X %s, RXID: %08X %s\n", dev_info(emac_dev, "EMAC: TXID: %08X %s, RXID: %08X %s\n",
emac_read(EMAC_TXIDVER), emac_read(EMAC_TXIDVER),
((emac_read(EMAC_TXCONTROL)) ? "enabled" : "disabled"), ((emac_read(EMAC_TXCONTROL)) ? "enabled" : "disabled"),