Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[uclinux-h8/linux.git] / drivers / net / ethernet / renesas / sh_eth.h

diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h
index 1bf930d..5dee19b 100644 (file)
--- a/drivers/net/ethernet/renesas/sh_eth.h
+++ b/drivers/net/ethernet/renesas/sh_eth.h
@@ -184,6 +184,7 @@ enum GECMR_BIT {
 
 /* EDMR */
 enum DMAC_M_BIT {
+       EDMR_NBST = 0x80,
        EDMR_EL = 0x40, /* Litte endian */
        EDMR_DL1 = 0x20, EDMR_DL0 = 0x10,
        EDMR_SRST_GETHER = 0x03,
@@ -242,7 +243,7 @@ enum EESR_BIT {
        EESR_CND        = 0x00000800,
        EESR_DLC        = 0x00000400,
        EESR_CD         = 0x00000200,
-       EESR_RTO        = 0x00000100,
+       EESR_TRO        = 0x00000100,
        EESR_RMAF       = 0x00000080,
        EESR_CEEF       = 0x00000040,
        EESR_CELF       = 0x00000020,
@@ -262,7 +263,7 @@ enum EESR_BIT {
                                 EESR_CERF)  /* Recv frame CRC error */
 
 #define DEFAULT_TX_CHECK       (EESR_FTC | EESR_CND | EESR_DLC | EESR_CD | \
-                                EESR_RTO)
+                                EESR_TRO)
 #define DEFAULT_EESR_ERR_CHECK (EESR_TWB | EESR_TABT | EESR_RABT | EESR_RFE | \
                                 EESR_RDE | EESR_RFRMER | EESR_ADE | \
                                 EESR_TFE | EESR_TDE)
@@ -498,20 +499,21 @@ struct sh_eth_cpu_data {
 
        /* hardware features */
        unsigned long irq_flags; /* IRQ configuration flags */
-       unsigned no_psr:1;      /* EtherC DO NOT have PSR */
-       unsigned apr:1;         /* EtherC have APR */
-       unsigned mpr:1;         /* EtherC have MPR */
-       unsigned tpauser:1;     /* EtherC have TPAUSER */
-       unsigned bculr:1;       /* EtherC have BCULR */
-       unsigned tsu:1;         /* EtherC have TSU */
-       unsigned hw_swap:1;     /* E-DMAC have DE bit in EDMR */
-       unsigned rpadir:1;      /* E-DMAC have RPADIR */
-       unsigned no_trimd:1;    /* E-DMAC DO NOT have TRIMD */
-       unsigned no_ade:1;      /* E-DMAC DO NOT have ADE bit in EESR */
+       unsigned no_psr:1;      /* EtherC DOES NOT have PSR */
+       unsigned apr:1;         /* EtherC has APR */
+       unsigned mpr:1;         /* EtherC has MPR */
+       unsigned tpauser:1;     /* EtherC has TPAUSER */
+       unsigned bculr:1;       /* EtherC has BCULR */
+       unsigned tsu:1;         /* EtherC has TSU */
+       unsigned hw_swap:1;     /* E-DMAC has DE bit in EDMR */
+       unsigned nbst:1;        /* E-DMAC has NBST bit in EDMR */
+       unsigned rpadir:1;      /* E-DMAC has RPADIR */
+       unsigned no_trimd:1;    /* E-DMAC DOES NOT have TRIMD */
+       unsigned no_ade:1;      /* E-DMAC DOES NOT have ADE bit in EESR */
        unsigned no_xdfar:1;    /* E-DMAC DOES NOT have RDFAR/TDFAR */
        unsigned xdfar_rw:1;    /* E-DMAC has writeable RDFAR/TDFAR */
        unsigned hw_checksum:1; /* E-DMAC has CSMR */
-       unsigned select_mii:1;  /* EtherC have RMII_MII (MII select register) */
+       unsigned select_mii:1;  /* EtherC has RMII_MII (MII select register) */
        unsigned rmiimode:1;    /* EtherC has RMIIMODE register */
        unsigned rtrate:1;      /* EtherC has RTRATE register */
        unsigned magic:1;       /* EtherC has ECMR.MPDE and ECSR.MPD */