Merge branch 'master' of git://git.denx.de/u-boot-net

[karo-tx-uboot.git] / drivers / net / tsec.c

diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 8ab6d07303be19e7d076f0ac6425fa8aea4f6d93..fbc9a6dd05b4a3178b80168cf316c173f866ee85 100644 (file)
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -305,8 +305,8 @@ static int init_phy(struct eth_device *dev)
        volatile tsec_t *regs = priv->regs;
 
        /* Assign a Physical address to the TBI */
-       regs->tbipa = CFG_TBIPA_VALUE;
-       phyregs->tbipa = CFG_TBIPA_VALUE;
+       regs->tbipa = CONFIG_SYS_TBIPA_VALUE;
+       phyregs->tbipa = CONFIG_SYS_TBIPA_VALUE;
        asm("sync");
 
        /* Reset MII (due to new addresses) */
@@ -1196,6 +1196,9 @@ struct phy_info phy_info_M88E1121R = {
                           {MIIM_88E1121_PHY_LED_CTRL, miim_read,
                            &mii_88E1121_set_led},
                           {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
+                          /* Disable IRQs and de-assert interrupt */
+                          {MIIM_88E1121_PHY_IRQ_EN, 0, NULL},
+                          {MIIM_88E1121_PHY_IRQ_STATUS, miim_read, NULL},
                           {miim_end,}
                           },
        (struct phy_cmd[]){     /* startup */
@@ -1357,15 +1360,17 @@ struct phy_info phy_info_VSC8601 = {
                                /* Override PHY config settings */
                                /* Configure some basic stuff */
                                {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
-#ifdef CFG_VSC8601_SKEWFIX
+#ifdef CONFIG_SYS_VSC8601_SKEWFIX
                                {MIIM_VSC8601_EPHY_CON,MIIM_VSC8601_EPHY_CON_INIT_SKEW,NULL},
-#if defined(CFG_VSC8601_SKEW_TX) && defined(CFG_VSC8601_SKEW_RX)
+#if defined(CONFIG_SYS_VSC8601_SKEW_TX) && defined(CONFIG_SYS_VSC8601_SKEW_RX)
                                {MIIM_EXT_PAGE_ACCESS,1,NULL},
-#define VSC8101_SKEW   (CFG_VSC8601_SKEW_TX<<14)|(CFG_VSC8601_SKEW_RX<<12)
+#define VSC8101_SKEW   (CONFIG_SYS_VSC8601_SKEW_TX<<14)|(CONFIG_SYS_VSC8601_SKEW_RX<<12)
                                {MIIM_VSC8601_SKEW_CTRL,VSC8101_SKEW,NULL},
                                {MIIM_EXT_PAGE_ACCESS,0,NULL},
 #endif
 #endif
+                               {MIIM_ANAR, MIIM_ANAR_INIT, NULL},
+                               {MIIM_CONTROL, MIIM_CONTROL_RESTART, &mii_cr_init},
                                {miim_end,}
                                 },
                (struct phy_cmd[]){     /* startup */