Merge branch 'u-boot/master' into u-boot-arm/master

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

diff --git a/drivers/net/calxedaxgmac.c b/drivers/net/calxedaxgmac.c
index 00e26c2adc2d543374a5018d5b13ae6036d1ef8d..ff94865c5da038422b1b919670fa233b411d6f5a 100644 (file)
--- a/drivers/net/calxedaxgmac.c
+++ b/drivers/net/calxedaxgmac.c
@@ -1,19 +1,9 @@
 /*
  * Copyright 2010-2011 Calxeda, Inc.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier:    GPL-2.0+
  */
+
 #include <common.h>
 #include <malloc.h>
 #include <linux/compiler.h>
@@ -400,7 +390,7 @@ static int xgmac_init(struct eth_device *dev, bd_t * bis)
        /* set flow control parameters and store and forward mode */
        value = (FIFO_MINUS_12K << XGMAC_CORE_OMR_RFD_SHIFT) |
                (FIFO_MINUS_4K << XGMAC_CORE_OMR_RFA_SHIFT) |
-               XGMAC_CORE_OMR_EFC | XGMAC_CORE_OMR_TSF | XGMAC_CORE_OMR_RSF;
+               XGMAC_CORE_OMR_EFC | XGMAC_CORE_OMR_TSF;
        writel(value, &regs->core_opmode);
 
        /* enable pause frames */
@@ -434,7 +424,7 @@ static int xgmac_init(struct eth_device *dev, bd_t * bis)
        return 0;
 }
 
-static int xgmac_tx(struct eth_device *dev, volatile void *packet, int length)
+static int xgmac_tx(struct eth_device *dev, void *packet, int length)
 {
        struct xgmac_regs *regs = (struct xgmac_regs *)dev->iobase;
        struct calxeda_eth_dev *priv = dev->priv;
@@ -442,7 +432,7 @@ static int xgmac_tx(struct eth_device *dev, volatile void *packet, int length)
        struct xgmac_dma_desc *txdesc = &priv->tx_chain[currdesc];
        int timeout;
 
-       desc_set_buf_addr_and_size(txdesc, (void *)packet, length);
+       desc_set_buf_addr_and_size(txdesc, packet, length);
        desc_set_tx_owner(txdesc, TXDESC_FIRST_SEG |
                TXDESC_LAST_SEG | TXDESC_CRC_EN_APPEND);
 
@@ -476,7 +466,7 @@ static int xgmac_rx(struct eth_device *dev)
 
        length = desc_get_rx_frame_len(rxdesc);
 
-       NetReceive((volatile unsigned char *)desc_get_buf_addr(rxdesc), length);
+       NetReceive(desc_get_buf_addr(rxdesc), length);
 
        /* set descriptor back to owned by XGMAC */
        desc_set_rx_owner(rxdesc);