summaryrefslogtreecommitdiffstats
path: root/cpu/mpc85xx
diff options
context:
space:
mode:
authorwdenk <wdenk>2005-04-05 23:32:21 +0000
committerwdenk <wdenk>2005-04-05 23:32:21 +0000
commit3c2b3d454daa6024cc20d166b2f50efde169c7fe (patch)
treef66cfb007a5dec1d47a19b2cab8a9dc127468347 /cpu/mpc85xx
parentb304c96871c92d1ec8fa57dda36cc198660fd10e (diff)
downloadblackbird-obmc-uboot-3c2b3d454daa6024cc20d166b2f50efde169c7fe.tar.gz
blackbird-obmc-uboot-3c2b3d454daa6024cc20d166b2f50efde169c7fe.zip
* Patch by Ladislav Michl, 05 Apr 2005:
Add support for VoiceBlue board. * Patch by Ladislav Michl, 05 Apr 2005: Fix netboot_common() prototypes. * Cleanup.
Diffstat (limited to 'cpu/mpc85xx')
-rw-r--r--cpu/mpc85xx/tsec.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/cpu/mpc85xx/tsec.c b/cpu/mpc85xx/tsec.c
index eee5f25d64..d327a6decb 100644
--- a/cpu/mpc85xx/tsec.c
+++ b/cpu/mpc85xx/tsec.c
@@ -277,7 +277,7 @@ static int init_phy(struct eth_device *dev)
struct phy_info *curphy;
/* Assign a Physical address to the TBI */
-
+
{
volatile tsec_t *regs = (volatile tsec_t *)(TSEC_BASE_ADDR);
regs->tbipa = TBIPA_VALUE;
@@ -809,33 +809,33 @@ struct phy_info phy_info_dm9161 = {
uint mii_parse_lxt971_sr2(uint mii_reg, struct tsec_private *priv)
{
- unsigned int speed;
- if (priv->link) {
- speed = mii_reg & MIIM_LXT971_SR2_SPEED_MASK;
-
- switch (speed) {
- case MIIM_LXT971_SR2_10HDX:
- priv->speed = 10;
- priv->duplexity = 0;
- break;
- case MIIM_LXT971_SR2_10FDX:
- priv->speed = 10;
- priv->duplexity = 1;
- break;
- case MIIM_LXT971_SR2_100HDX:
- priv->speed = 100;
- priv->duplexity = 0;
- default:
- priv->speed = 100;
- priv->duplexity = 1;
- break;
- }
- } else {
- priv->speed = 0;
- priv->duplexity = 0;
- }
-
- return 0;
+ unsigned int speed;
+ if (priv->link) {
+ speed = mii_reg & MIIM_LXT971_SR2_SPEED_MASK;
+
+ switch (speed) {
+ case MIIM_LXT971_SR2_10HDX:
+ priv->speed = 10;
+ priv->duplexity = 0;
+ break;
+ case MIIM_LXT971_SR2_10FDX:
+ priv->speed = 10;
+ priv->duplexity = 1;
+ break;
+ case MIIM_LXT971_SR2_100HDX:
+ priv->speed = 100;
+ priv->duplexity = 0;
+ default:
+ priv->speed = 100;
+ priv->duplexity = 1;
+ break;
+ }
+ } else {
+ priv->speed = 0;
+ priv->duplexity = 0;
+ }
+
+ return 0;
}
static struct phy_info phy_info_lxt971 = {
OpenPOWER on IntegriCloud