GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mpc8xx/fec.c: Fix GCC 4.6 build warnings

Browse source 
Fix:
fec.c: In function 'fec_pin_init':
fec.c:381:18: warning: variable 'fecp' set but not used
[-Wunused-but-set-variable]
fec.c: In function 'fec8xx_miiphy_write':
fec.c:1013:8: warning: variable 'rdreg' set but not used
[-Wunused-but-set-variable]

Note: The code was slightly rearranged, but no functional changes
attempted, i. e. no conversion to use I/O accessors.

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2011-11-04 15:55:21 +00:00
parent a9a62af1f9
commit 90357f1493
1 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
arch/powerpc/cpu/mpc8xx/fec.c
View file

@ -378,6 +378,23 @@ static void fec_pin_init(int fecidx)
{ {
bd_t *bd = gd->bd; bd_t *bd = gd->bd;
volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR; volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
/*
* Set MII speed to 2.5 MHz or slightly below.
*
* According to the MPC860T (Rev. D) Fast ethernet controller user
* manual (6.2.14),
* the MII management interface clock must be less than or equal
* to 2.5 MHz.
* This MDC frequency is equal to system clock / (2 * MII_SPEED).
* Then MII_SPEED = system_clock / 2 * 2,5 MHz.
*
* All MII configuration is done via FEC1 registers:
*/
immr->im_cpm.cp_fec1.fec_mii_speed = ((bd->bi_intfreq + 4999999) / 5000000) << 1;
#if defined(CONFIG_NETTA) || defined(CONFIG_NETPHONE) || defined(CONFIG_NETTA2)
{
volatile fec_t *fecp; volatile fec_t *fecp;
/* /*
@ -391,22 +408,9 @@ static void fec_pin_init(int fecidx)
else else
fecp = &immr->im_cpm.cp_fec2; fecp = &immr->im_cpm.cp_fec2;
/*
* Set MII speed to 2.5 MHz or slightly below.
* * According to the MPC860T (Rev. D) Fast ethernet controller user
* * manual (6.2.14),
* * the MII management interface clock must be less than or equal
* * to 2.5 MHz.
* * This MDC frequency is equal to system clock / (2 * MII_SPEED).
* * Then MII_SPEED = system_clock / 2 * 2,5 MHz.
*
* All MII configuration is done via FEC1 registers:
*/
immr->im_cpm.cp_fec1.fec_mii_speed = ((bd->bi_intfreq + 4999999) / 5000000) << 1;
#if defined(CONFIG_NETTA) || defined(CONFIG_NETPHONE) || defined(CONFIG_NETTA2)
/* our PHYs are the limit at 2.5 MHz */ /* our PHYs are the limit at 2.5 MHz */
fecp->fec_mii_speed <<= 1; fecp->fec_mii_speed <<= 1;
}
#endif #endif
#if defined(CONFIG_MPC885_FAMILY) && defined(WANT_MII) #if defined(CONFIG_MPC885_FAMILY) && defined(WANT_MII)
@ -1010,11 +1014,10 @@ int fec8xx_miiphy_read(const char *devname, unsigned char addr,
int fec8xx_miiphy_write(const char *devname, unsigned char addr, int fec8xx_miiphy_write(const char *devname, unsigned char addr,
unsigned char reg, unsigned short value) unsigned char reg, unsigned short value)
{ {
short rdreg; /* register working value */
#ifdef MII_DEBUG #ifdef MII_DEBUG
printf ("miiphy_write(0x%x) @ 0x%x = ", reg, addr); printf ("miiphy_write(0x%x) @ 0x%x = ", reg, addr);
#endif #endif
rdreg = mii_send(mk_mii_write(addr, reg, value)); (void)mii_send(mk_mii_write(addr, reg, value));
#ifdef MII_DEBUG #ifdef MII_DEBUG
printf ("0x%04x\n", value); printf ("0x%04x\n", value);