diff options
author | Ganesan Ramalingam <ganesanr@broadcom.com> | 2014-08-21 19:51:24 +0530 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-30 14:00:11 -0700 |
commit | f8397bc69095f6111ed644b2f8ac725609f8a8bb (patch) | |
tree | f21e18afe99c4c539d9ebf7005a1f8f3c235b21d /drivers/staging/netlogic/xlr_net.h | |
parent | e1a083be73b4b5ac5481eb8104476ae7b386896d (diff) |
Staging: Netlogic: Move all the netdev under single parent device
XLR has one network controller and XLS has two network controllers, each
controller has 4 gmac devices. This patch initializes each controller as
a parent device and the four gmac devices of a controller are connected
to the parent controller as a child
Signed-off-by: Ganesan Ramalingam <ganesanr@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/netlogic/xlr_net.h')
-rw-r--r-- | drivers/staging/netlogic/xlr_net.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/staging/netlogic/xlr_net.h b/drivers/staging/netlogic/xlr_net.h index cea796633711..13e03f0a0a46 100644 --- a/drivers/staging/netlogic/xlr_net.h +++ b/drivers/staging/netlogic/xlr_net.h @@ -1069,14 +1069,20 @@ enum tsv_rsv_reg { CARRY_REG_2 = 0x4d, }; +struct xlr_adapter { + struct net_device *netdev[4]; +}; + struct xlr_net_priv { u32 __iomem *base_addr; struct net_device *ndev; + struct xlr_adapter *adapter; struct mii_bus *mii_bus; int num_rx_desc; int phy_addr; /* PHY addr on MDIO bus */ int pcs_id; /* PCS id on MDIO bus */ int port_id; /* Port(gmac/xgmac) number, i.e 0-7 */ + int tx_stnid; u32 __iomem *mii_addr; u32 __iomem *serdes_addr; u32 __iomem *pcs_addr; @@ -1096,4 +1102,4 @@ struct xlr_net_priv { u64 *class_3_spill; }; -void xlr_set_gmac_speed(struct xlr_net_priv *priv); +extern void xlr_set_gmac_speed(struct xlr_net_priv *priv); |