]> git.ipfire.org Git - people/ms/u-boot.git/blobdiff - cpu/at91rm9200/at91rm9200_ether.c
* Patch by Masami Komiya, 30 Mar 2005:
[people/ms/u-boot.git] / cpu / at91rm9200 / at91rm9200_ether.c
index 47b57da08c82406765307d12fd5df035607f690a..2ec888f213fff102cc54686800827762c1a4c540 100644 (file)
@@ -60,205 +60,10 @@ typedef struct {
 #if (CONFIG_COMMANDS & CFG_CMD_NET)
 
 /* structure to interface the PHY */
-AT91S_PhyOps AT91S_Dm9161Ops;
-AT91PS_PhyOps pPhyOps;
+AT91S_PhyOps PhyOps;
 
 AT91PS_EMAC p_mac;
 
-/*************************** Phy layer functions ************************/
-/** functions to interface the DAVICOM 10/100Mbps ethernet phy **********/
-
-/*
- * Name:
- *     dm9161_IsPhyConnected
- * Description:
- *     Reads the 2 PHY ID registers
- * Arguments:
- *     p_mac - pointer to AT91S_EMAC struct
- * Return value:
- *     TRUE - if id read successfully
- *     FALSE- if error
- */
-static unsigned int dm9161_IsPhyConnected (AT91PS_EMAC p_mac)
-{
-       unsigned short Id1, Id2;
-
-       at91rm9200_EmacEnableMDIO (p_mac);
-       at91rm9200_EmacReadPhy (p_mac, DM9161_PHYID1, &Id1);
-       at91rm9200_EmacReadPhy (p_mac, DM9161_PHYID2, &Id2);
-       at91rm9200_EmacDisableMDIO (p_mac);
-
-       if ((Id1 == (DM9161_PHYID1_OUI >> 6)) &&
-               ((Id2 >> 10) == (DM9161_PHYID1_OUI & DM9161_LSB_MASK)))
-               return TRUE;
-
-       return FALSE;
-}
-
-/*
- * Name:
- *     dm9161_GetLinkSpeed
- * Description:
- *     Link parallel detection status of MAC is checked and set in the
- *     MAC configuration registers
- * Arguments:
- *     p_mac - pointer to MAC
- * Return value:
- *     TRUE - if link status set succesfully
- *     FALSE - if link status not set
- */
-static UCHAR dm9161_GetLinkSpeed (AT91PS_EMAC p_mac)
-{
-       unsigned short stat1, stat2;
-
-       if (!at91rm9200_EmacReadPhy (p_mac, DM9161_BMSR, &stat1))
-               return FALSE;
-
-       if (!(stat1 & DM9161_LINK_STATUS))      /* link status up? */
-               return FALSE;
-
-       if (!at91rm9200_EmacReadPhy (p_mac, DM9161_DSCSR, &stat2))
-               return FALSE;
-
-       if ((stat1 & DM9161_100BASE_TX_FD) && (stat2 & DM9161_100FDX)) {
-               /*set Emac for 100BaseTX and Full Duplex  */
-               p_mac->EMAC_CFG |= AT91C_EMAC_SPD | AT91C_EMAC_FD;
-               return TRUE;
-       }
-
-       if ((stat1 & DM9161_10BASE_T_FD) && (stat2 & DM9161_10FDX)) {
-               /*set MII for 10BaseT and Full Duplex  */
-               p_mac->EMAC_CFG = (p_mac->EMAC_CFG &
-                               ~(AT91C_EMAC_SPD | AT91C_EMAC_FD))
-                               | AT91C_EMAC_FD;
-               return TRUE;
-       }
-
-       if ((stat1 & DM9161_100BASE_T4_HD) && (stat2 & DM9161_100HDX)) {
-               /*set MII for 100BaseTX and Half Duplex  */
-               p_mac->EMAC_CFG = (p_mac->EMAC_CFG &
-                               ~(AT91C_EMAC_SPD | AT91C_EMAC_FD))
-                               | AT91C_EMAC_SPD;
-               return TRUE;
-       }
-
-       if ((stat1 & DM9161_10BASE_T_HD) && (stat2 & DM9161_10HDX)) {
-               /*set MII for 10BaseT and Half Duplex  */
-               p_mac->EMAC_CFG &= ~(AT91C_EMAC_SPD | AT91C_EMAC_FD);
-               return TRUE;
-       }
-       return FALSE;
-}
-
-
-/*
- * Name:
- *     dm9161_InitPhy
- * Description:
- *     MAC starts checking its link by using parallel detection and
- *     Autonegotiation and the same is set in the MAC configuration registers
- * Arguments:
- *     p_mac - pointer to struct AT91S_EMAC
- * Return value:
- *     TRUE - if link status set succesfully
- *     FALSE - if link status not set
- */
-static UCHAR dm9161_InitPhy (AT91PS_EMAC p_mac)
-{
-       UCHAR ret = TRUE;
-       unsigned short IntValue;
-
-       at91rm9200_EmacEnableMDIO (p_mac);
-
-       if (!dm9161_GetLinkSpeed (p_mac)) {
-               /* Try another time */
-               ret = dm9161_GetLinkSpeed (p_mac);
-       }
-
-       /* Disable PHY Interrupts */
-       at91rm9200_EmacReadPhy (p_mac, DM9161_MDINTR, &IntValue);
-       /* clear FDX, SPD, Link, INTR masks */
-       IntValue &= ~(DM9161_FDX_MASK | DM9161_SPD_MASK |
-                     DM9161_LINK_MASK | DM9161_INTR_MASK);
-       at91rm9200_EmacWritePhy (p_mac, DM9161_MDINTR, &IntValue);
-       at91rm9200_EmacDisableMDIO (p_mac);
-
-       return (ret);
-}
-
-
-/*
- * Name:
- *     dm9161_AutoNegotiate
- * Description:
- *     MAC Autonegotiates with the partner status of same is set in the
- *     MAC configuration registers
- * Arguments:
- *     dev - pointer to struct net_device
- * Return value:
- *     TRUE - if link status set successfully
- *     FALSE - if link status not set
- */
-static UCHAR dm9161_AutoNegotiate (AT91PS_EMAC p_mac, int *status)
-{
-       unsigned short value;
-       unsigned short PhyAnar;
-       unsigned short PhyAnalpar;
-
-       /* Set dm9161 control register */
-       if (!at91rm9200_EmacReadPhy (p_mac, DM9161_BMCR, &value))
-               return FALSE;
-       value &= ~DM9161_AUTONEG;       /* remove autonegotiation enable */
-       value |= DM9161_ISOLATE;        /* Electrically isolate PHY */
-       if (!at91rm9200_EmacWritePhy (p_mac, DM9161_BMCR, &value))
-               return FALSE;
-
-       /* Set the Auto_negotiation Advertisement Register */
-       /* MII advertising for Next page, 100BaseTxFD and HD, 10BaseTFD and HD, IEEE 802.3 */
-       PhyAnar = DM9161_NP | DM9161_TX_FDX | DM9161_TX_HDX |
-                 DM9161_10_FDX | DM9161_10_HDX | DM9161_AN_IEEE_802_3;
-       if (!at91rm9200_EmacWritePhy (p_mac, DM9161_ANAR, &PhyAnar))
-               return FALSE;
-
-       /* Read the Control Register     */
-       if (!at91rm9200_EmacReadPhy (p_mac, DM9161_BMCR, &value))
-               return FALSE;
-
-       value |= DM9161_SPEED_SELECT | DM9161_AUTONEG | DM9161_DUPLEX_MODE;
-       if (!at91rm9200_EmacWritePhy (p_mac, DM9161_BMCR, &value))
-               return FALSE;
-       /* Restart Auto_negotiation  */
-       value |= DM9161_RESTART_AUTONEG;
-       if (!at91rm9200_EmacWritePhy (p_mac, DM9161_BMCR, &value))
-               return FALSE;
-
-       /*check AutoNegotiate complete */
-       udelay (10000);
-       at91rm9200_EmacReadPhy (p_mac, DM9161_BMSR, &value);
-       if (!(value & DM9161_AUTONEG_COMP))
-               return FALSE;
-
-       /* Get the AutoNeg Link partner base page */
-       if (!at91rm9200_EmacReadPhy (p_mac, DM9161_ANLPAR, &PhyAnalpar))
-               return FALSE;
-
-       if ((PhyAnar & DM9161_TX_FDX) && (PhyAnalpar & DM9161_TX_FDX)) {
-               /*set MII for 100BaseTX and Full Duplex  */
-               p_mac->EMAC_CFG |= AT91C_EMAC_SPD | AT91C_EMAC_FD;
-               return TRUE;
-       }
-
-       if ((PhyAnar & DM9161_10_FDX) && (PhyAnalpar & DM9161_10_FDX)) {
-               /*set MII for 10BaseT and Full Duplex  */
-               p_mac->EMAC_CFG = (p_mac->EMAC_CFG &
-                               ~(AT91C_EMAC_SPD | AT91C_EMAC_FD))
-                               | AT91C_EMAC_FD;
-               return TRUE;
-       }
-       return FALSE;
-}
-
-
 /*********** EMAC Phy layer Management functions *************************/
 /*
  * Name:
@@ -270,7 +75,7 @@ static UCHAR dm9161_AutoNegotiate (AT91PS_EMAC p_mac, int *status)
  * Return value:
  *     none
  */
-static void at91rm9200_EmacEnableMDIO (AT91PS_EMAC p_mac)
+void at91rm9200_EmacEnableMDIO (AT91PS_EMAC p_mac)
 {
        /* Mac CTRL reg set for MDIO enable */
        p_mac->EMAC_CTL |= AT91C_EMAC_MPE;      /* Management port enable */
@@ -286,7 +91,7 @@ static void at91rm9200_EmacEnableMDIO (AT91PS_EMAC p_mac)
  * Return value:
  *     none
  */
-static void at91rm9200_EmacDisableMDIO (AT91PS_EMAC p_mac)
+void at91rm9200_EmacDisableMDIO (AT91PS_EMAC p_mac)
 {
        /* Mac CTRL reg set for MDIO disable */
        p_mac->EMAC_CTL &= ~AT91C_EMAC_MPE;     /* Management port disable */
@@ -305,13 +110,14 @@ static void at91rm9200_EmacDisableMDIO (AT91PS_EMAC p_mac)
  * Return value:
  *     TRUE - if data read successfully
  */
-static UCHAR at91rm9200_EmacReadPhy (AT91PS_EMAC p_mac,
+UCHAR at91rm9200_EmacReadPhy (AT91PS_EMAC p_mac,
                                     unsigned char RegisterAddress,
                                     unsigned short *pInput)
 {
        p_mac->EMAC_MAN = (AT91C_EMAC_HIGH & ~AT91C_EMAC_LOW) |
-                         (AT91C_EMAC_CODE_802_3) | (AT91C_EMAC_RW_R) |
-                         (RegisterAddress << 18);
+                         (AT91C_EMAC_RW_R) |
+                         (RegisterAddress << 18) |
+                         (AT91C_EMAC_CODE_802_3);
 
        udelay (10000);
 
@@ -333,39 +139,19 @@ static UCHAR at91rm9200_EmacReadPhy (AT91PS_EMAC p_mac,
  * Return value:
  *     TRUE - if data read successfully
  */
-static UCHAR at91rm9200_EmacWritePhy (AT91PS_EMAC p_mac,
-                                                                         unsigned char RegisterAddress,
-                                                                         unsigned short *pOutput)
+UCHAR at91rm9200_EmacWritePhy (AT91PS_EMAC p_mac,
+                                     unsigned char RegisterAddress,
+                                     unsigned short *pOutput)
 {
        p_mac->EMAC_MAN = (AT91C_EMAC_HIGH & ~AT91C_EMAC_LOW) |
                        AT91C_EMAC_CODE_802_3 | AT91C_EMAC_RW_W |
-                       (RegisterAddress << 18);
+                       (RegisterAddress << 18) | *pOutput;
 
        udelay (10000);
 
        return TRUE;
 }
 
-/*
- * Name:
- *     at91rm92000_GetPhyInterface
- * Description:
- *     Initialise the interface functions to the PHY
- * Arguments:
- *     None
- * Return value:
- *     None
- */
-void at91rm92000_GetPhyInterface (void)
-{
-       AT91S_Dm9161Ops.Init = dm9161_InitPhy;
-       AT91S_Dm9161Ops.IsPhyConnected = dm9161_IsPhyConnected;
-       AT91S_Dm9161Ops.GetLinkSpeed = dm9161_GetLinkSpeed;
-       AT91S_Dm9161Ops.AutoNegotiate = dm9161_AutoNegotiate;
-
-       pPhyOps = (AT91PS_PhyOps) & AT91S_Dm9161Ops;
-}
-
 
 rbf_t *rbfdt;
 rbf_t *rbfp;
@@ -377,14 +163,25 @@ int eth_init (bd_t * bd)
 
        p_mac = AT91C_BASE_EMAC;
 
-       *AT91C_PIOA_PDR = AT91C_PA16_EMDIO | AT91C_PA15_EMDC | AT91C_PA14_ERXER | AT91C_PA13_ERX1 | AT91C_PA12_ERX0 | AT91C_PA11_ECRS_ECRSDV | AT91C_PA10_ETX1 | AT91C_PA9_ETX0 | AT91C_PA8_ETXEN | AT91C_PA7_ETXCK_EREFCK;     /* PIO Disable Register */
-
-       *AT91C_PIOB_PDR = AT91C_PB25_EF100 |
-                       AT91C_PB19_ERXCK | AT91C_PB18_ECOL | AT91C_PB17_ERXDV |
-                       AT91C_PB16_ERX3 | AT91C_PB15_ERX2 | AT91C_PB14_ETXER |
-                       AT91C_PB13_ETX3 | AT91C_PB12_ETX2;
-
-       *AT91C_PIOB_BSR = AT91C_PB25_EF100 | AT91C_PB19_ERXCK | AT91C_PB18_ECOL | AT91C_PB17_ERXDV | AT91C_PB16_ERX3 | AT91C_PB15_ERX2 | AT91C_PB14_ETXER | AT91C_PB13_ETX3 | AT91C_PB12_ETX2;  /* Select B Register */
+       /* PIO Disable Register */
+       *AT91C_PIOA_PDR = AT91C_PA16_EMDIO | AT91C_PA15_EMDC | AT91C_PA14_ERXER |
+                         AT91C_PA13_ERX1 | AT91C_PA12_ERX0 | AT91C_PA11_ECRS_ECRSDV |
+                         AT91C_PA10_ETX1 | AT91C_PA9_ETX0 | AT91C_PA8_ETXEN |
+                         AT91C_PA7_ETXCK_EREFCK;
+
+#ifdef CONFIG_AT91C_USE_RMII
+       *AT91C_PIOB_PDR = AT91C_PB19_ERXCK;
+       *AT91C_PIOB_BSR = AT91C_PB19_ERXCK;
+#else
+       *AT91C_PIOB_PDR = AT91C_PB19_ERXCK | AT91C_PB18_ECOL | AT91C_PB17_ERXDV |
+                         AT91C_PB16_ERX3 | AT91C_PB15_ERX2 | AT91C_PB14_ETXER |
+                         AT91C_PB13_ETX3 | AT91C_PB12_ETX2;
+
+       /* Select B Register */
+       *AT91C_PIOB_BSR = AT91C_PB19_ERXCK | AT91C_PB18_ECOL |
+                         AT91C_PB17_ERXDV | AT91C_PB16_ERX3 | AT91C_PB15_ERX2 |
+                         AT91C_PB14_ETXER | AT91C_PB13_ETX3 | AT91C_PB12_ETX2;
+#endif
 
        *AT91C_PMC_PCER = 1 << AT91C_ID_EMAC;   /* Peripheral Clock Enable Register */
 
@@ -399,14 +196,30 @@ int eth_init (bd_t * bd)
        rbfdt[RBF_FRAMEMAX - 1].addr |= RBF_WRAP;
        rbfp = &rbfdt[0];
 
-       at91rm92000_GetPhyInterface ();
+       p_mac->EMAC_SA2L = (bd->bi_enetaddr[3] << 24) | (bd->bi_enetaddr[2] << 16)
+                        | (bd->bi_enetaddr[1] <<  8) | (bd->bi_enetaddr[0]);
+       p_mac->EMAC_SA2H = (bd->bi_enetaddr[5] <<  8) | (bd->bi_enetaddr[4]);
+
+       p_mac->EMAC_RBQP = (long) (&rbfdt[0]);
+       p_mac->EMAC_RSR &= ~(AT91C_EMAC_RSR_OVR | AT91C_EMAC_REC | AT91C_EMAC_BNA);
+
+       p_mac->EMAC_CFG = (p_mac->EMAC_CFG | AT91C_EMAC_CAF | AT91C_EMAC_NBC)
+                       & ~AT91C_EMAC_CLK;
+
+#ifdef CONFIG_AT91C_USE_RMII
+       p_mac->EMAC_CFG |= AT91C_EMAC_RMII;
+#endif
+
+       p_mac->EMAC_CTL |= AT91C_EMAC_TE | AT91C_EMAC_RE;
+
+       at91rm92000_GetPhyInterface (& PhyOps);
 
-       if (!pPhyOps->IsPhyConnected (p_mac))
+       if (!PhyOps.IsPhyConnected (p_mac))
                printf ("PHY not connected!!\n\r");
 
        /* MII management start from here */
        if (!(p_mac->EMAC_SR & AT91C_EMAC_LINK)) {
-               if (!(ret = pPhyOps->Init (p_mac))) {
+               if (!(ret = PhyOps.Init (p_mac))) {
                        printf ("MAC: error during MII initialization\n");
                        return 0;
                }
@@ -415,16 +228,6 @@ int eth_init (bd_t * bd)
                return 0;
        }
 
-       p_mac->EMAC_SA2L = (bd->bi_enetaddr[3] << 24) | (bd->bi_enetaddr[2] << 16)
-                        | (bd->bi_enetaddr[1] << 8) | (bd->bi_enetaddr[0]);
-       p_mac->EMAC_SA2H = (bd->bi_enetaddr[5] << 8) | (bd->bi_enetaddr[4]);
-
-       p_mac->EMAC_RBQP = (long) (&rbfdt[0]);
-       p_mac->EMAC_RSR &= ~(AT91C_EMAC_RSR_OVR | AT91C_EMAC_REC | AT91C_EMAC_BNA);
-       p_mac->EMAC_CFG = (p_mac->EMAC_CFG | AT91C_EMAC_CAF | AT91C_EMAC_NBC | AT91C_EMAC_RMII)
-                       & ~AT91C_EMAC_CLK;
-       p_mac->EMAC_CTL |= AT91C_EMAC_TE | AT91C_EMAC_RE;
-
        return 0;
 }
 
@@ -462,5 +265,25 @@ int eth_rx (void)
 void eth_halt (void)
 {
 };
+
+#if (CONFIG_COMMANDS & CFG_CMD_MII)
+int  miiphy_read(unsigned char addr, unsigned char reg, unsigned short * value)
+{
+       at91rm9200_EmacEnableMDIO (p_mac);
+       at91rm9200_EmacReadPhy (p_mac, reg, value);
+       at91rm9200_EmacDisableMDIO (p_mac);
+       return 0;
+}
+
+int  miiphy_write(unsigned char addr, unsigned char reg, unsigned short value)
+{
+       at91rm9200_EmacEnableMDIO (p_mac);
+       at91rm9200_EmacWritePhy (p_mac, reg, &value);
+       at91rm9200_EmacDisableMDIO (p_mac);
+       return 0;
+}
+#endif /* CONFIG_COMMANDS & CFG_CMD_MII */
+
 #endif /* CONFIG_COMMANDS & CFG_CMD_NET */
+
 #endif /* CONFIG_DRIVER_ETHER */