← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/net/atl1c/atl1c_hw.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/atl1c/atl1c_hw.c
345
345
 */
346
346
static int atl1c_phy_setup_adv(struct atl1c_hw *hw)
347
347
{
348
 
        u16 mii_adv_data = ADVERTISE_DEFAULT_CAP & ~ADVERTISE_SPEED_MASK;
 
348
        u16 mii_adv_data = ADVERTISE_DEFAULT_CAP & ~ADVERTISE_ALL;
349
349
        u16 mii_giga_ctrl_data = GIGA_CR_1000T_DEFAULT_CAP &
350
350
                                ~GIGA_CR_1000T_SPEED_MASK;
351
351
 
373
373
        }
374
374
 
375
375
        if (atl1c_write_phy_reg(hw, MII_ADVERTISE, mii_adv_data) != 0 ||
376
 
            atl1c_write_phy_reg(hw, MII_GIGA_CR, mii_giga_ctrl_data) != 0)
 
376
            atl1c_write_phy_reg(hw, MII_CTRL1000, mii_giga_ctrl_data) != 0)
377
377
                return -1;
378
378
        return 0;
379
379
}
517
517
                                        "Error Setting up Auto-Negotiation\n");
518
518
                        return ret_val;
519
519
                }
520
 
                mii_bmcr_data |= BMCR_AUTO_NEG_EN | BMCR_RESTART_AUTO_NEG;
 
520
                mii_bmcr_data |= BMCR_ANENABLE | BMCR_ANRESTART;
521
521
                break;
522
522
        case MEDIA_TYPE_100M_FULL:
523
 
                mii_bmcr_data |= BMCR_SPEED_100 | BMCR_FULL_DUPLEX;
 
523
                mii_bmcr_data |= BMCR_SPEED100 | BMCR_FULLDPLX;
524
524
                break;
525
525
        case MEDIA_TYPE_100M_HALF:
526
 
                mii_bmcr_data |= BMCR_SPEED_100;
 
526
                mii_bmcr_data |= BMCR_SPEED100;
527
527
                break;
528
528
        case MEDIA_TYPE_10M_FULL:
529
 
                mii_bmcr_data |= BMCR_SPEED_10 | BMCR_FULL_DUPLEX;
 
529
                mii_bmcr_data |= BMCR_FULLDPLX;
530
530
                break;
531
531
        case MEDIA_TYPE_10M_HALF:
532
 
                mii_bmcr_data |= BMCR_SPEED_10;
533
532
                break;
534
533
        default:
535
534
                if (netif_msg_link(adapter))
657
656
        err = atl1c_phy_setup_adv(hw);
658
657
        if (err)
659
658
                return err;
660
 
        mii_bmcr_data |= BMCR_AUTO_NEG_EN | BMCR_RESTART_AUTO_NEG;
 
659
        mii_bmcr_data |= BMCR_ANENABLE | BMCR_ANRESTART;
661
660
 
662
661
        return atl1c_write_phy_reg(hw, MII_BMCR, mii_bmcr_data);
663
662
}