ramips: ethernet: ralink: add struct fe_priv as context to fe_reset()

[openwrt/staging/dedeckeh.git] / target / linux / ramips / files / drivers / net / ethernet / ralink / soc_rt2880.c

diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt2880.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt2880.c
index 43467310bde0c02ba0a62dbc69a38eed8d88a81b..ab3ac1e4f3714f57b28c2bbee4b32c5b20af687e 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt2880.c
+++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt2880.c
@@ -1,5 +1,4 @@
-/*
- *   This program is free software; you can redistribute it and/or modify
+/*   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; version 2 of the License
  *
@@ -8,35 +7,33 @@
  *   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, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- *   Copyright (C) 2009-2013 John Crispin <blogic@openwrt.org>
+ *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
+ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
+ *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
  */
 
 #include <linux/module.h>
 
 #include <asm/mach-ralink/ralink_regs.h>
 
-#include "ralink_soc_eth.h"
+#include "mtk_eth_soc.h"
 #include "mdio_rt2880.h"
 
 #define RT2880_RESET_FE                        BIT(18)
 
 static void rt2880_init_data(struct fe_soc_data *data,
-               struct net_device *netdev)
+                            struct net_device *netdev)
 {
        struct fe_priv *priv = netdev_priv(netdev);
 
        priv->flags = FE_FLAG_PADDING_64B | FE_FLAG_PADDING_BUG |
-               FE_FLAG_JUMBO_FRAME;
+               FE_FLAG_JUMBO_FRAME | FE_FLAG_CALIBRATE_CLK;
        netdev->hw_features = NETIF_F_SG | NETIF_F_HW_VLAN_CTAG_TX;
-       /* maybe have hardware bug. */
-       //netdev->hw_features |= NETIF_F_IP_CSUM | NETIF_F_RXCSUM;
+       /* this should work according to the datasheet but actually does not*/
+       /* netdev->hw_features |= NETIF_F_IP_CSUM | NETIF_F_RXCSUM; */
 }
 
-void rt2880_fe_reset(void)
+void rt2880_fe_reset(struct fe_priv *priv)
 {
        fe_reset(RT2880_RESET_FE);
 }
@@ -57,15 +54,14 @@ static int rt2880_fwd_config(struct fe_priv *priv)
 }
 
 struct fe_soc_data rt2880_data = {
-       .mac = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55 },
        .init_data = rt2880_init_data,
        .reset_fe = rt2880_fe_reset,
        .fwd_config = rt2880_fwd_config,
        .pdma_glo_cfg = FE_PDMA_SIZE_8DWORDS,
        .checksum_bit = RX_DMA_L4VALID,
-       .tx_udf_bit = TX_DMA_UDF,
        .rx_int = FE_RX_DONE_INT,
        .tx_int = FE_TX_DONE_INT,
+       .status_int = FE_CNT_GDM_AF,
        .mdio_read = rt2880_mdio_read,
        .mdio_write = rt2880_mdio_write,
        .mdio_adjust_link = rt2880_mdio_link_adjust,