Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / net / tsi108_eth.h

diff --git a/drivers/net/tsi108_eth.h b/drivers/net/tsi108_eth.h
index 77a769df228ab9c40388b6071ee3a77fe0a533b1..5fee7d78dc6dd70c89de368f8e336c00e37da602 100644 (file)
--- a/drivers/net/tsi108_eth.h
+++ b/drivers/net/tsi108_eth.h
@@ -42,15 +42,6 @@
 #define TSI_READ_PHY(offset) \
        in_be32((data->phyregs + (offset)))
 
-/*
- * PHY Configuration Options
- *
- * NOTE: Enable set of definitions corresponding to your board type
- */
-#define PHY_MV88E      1       /* Marvel 88Exxxx PHY */
-#define PHY_BCM54XX    2       /* Broardcom BCM54xx PHY */
-#define TSI108_PHY_TYPE        PHY_MV88E
-
 /*
  * TSI108 GIGE port registers
  */
@@ -314,9 +305,9 @@
 #define TSI108_TX_CRC  (1 << 5)        /* Generate CRC for this packet */
 #define TSI108_TX_INT  (1 << 14)       /* Generate an IRQ after frag. processed */
 #define TSI108_TX_RETRY        (0xf << 16)     /* 4 bit field indicating num. of retries */
-#define TSI108_TX_COL  (1 << 20)       /* Set if a collision occured */
-#define TSI108_TX_LCOL (1 << 24)       /* Set if a late collision occured */
-#define TSI108_TX_UNDER        (1 << 25)       /* Set if a FIFO underrun occured */
+#define TSI108_TX_COL  (1 << 20)       /* Set if a collision occurred */
+#define TSI108_TX_LCOL (1 << 24)       /* Set if a late collision occurred */
+#define TSI108_TX_UNDER        (1 << 25)       /* Set if a FIFO underrun occurred */
 #define TSI108_TX_RLIM (1 << 26)       /* Set if the retry limit was reached */
 #define TSI108_TX_OK   (1 << 30)       /* Set if the frame TX was successful */
 #define TSI108_TX_OWN  (1 << 31)       /* Set if the device owns the descriptor */
@@ -341,7 +332,7 @@ typedef struct {
 #define TSI108_RX_RUNT (1 << 4)/* Packet is less than minimum size */
 #define TSI108_RX_HASH (1 << 7)/* Hash table match */
 #define TSI108_RX_BAD  (1 << 8)        /* Bad frame */
-#define TSI108_RX_OVER (1 << 9)        /* FIFO overrun occured */
+#define TSI108_RX_OVER (1 << 9)        /* FIFO overrun occurred */
 #define TSI108_RX_TRUNC        (1 << 11)       /* Packet truncated due to excess length */
 #define TSI108_RX_CRC  (1 << 12)       /* Packet had a CRC error */
 #define TSI108_RX_INT  (1 << 13)       /* Generate an IRQ after frag. processed */