diff options
Diffstat (limited to 'drivers/net/stmmac/stmmac.h')
-rw-r--r-- | drivers/net/stmmac/stmmac.h | 40 |
1 files changed, 4 insertions, 36 deletions
diff --git a/drivers/net/stmmac/stmmac.h b/drivers/net/stmmac/stmmac.h index 79bdc2e1322..5f06c4706ab 100644 --- a/drivers/net/stmmac/stmmac.h +++ b/drivers/net/stmmac/stmmac.h | |||
@@ -20,7 +20,7 @@ | |||
20 | Author: Giuseppe Cavallaro <peppe.cavallaro@st.com> | 20 | Author: Giuseppe Cavallaro <peppe.cavallaro@st.com> |
21 | *******************************************************************************/ | 21 | *******************************************************************************/ |
22 | 22 | ||
23 | #define DRV_MODULE_VERSION "Apr_2010" | 23 | #define DRV_MODULE_VERSION "Nov_2010" |
24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
25 | #include <linux/stmmac.h> | 25 | #include <linux/stmmac.h> |
26 | 26 | ||
@@ -37,7 +37,6 @@ struct stmmac_priv { | |||
37 | unsigned int cur_tx; | 37 | unsigned int cur_tx; |
38 | unsigned int dirty_tx; | 38 | unsigned int dirty_tx; |
39 | unsigned int dma_tx_size; | 39 | unsigned int dma_tx_size; |
40 | int tx_coe; | ||
41 | int tx_coalesce; | 40 | int tx_coalesce; |
42 | 41 | ||
43 | struct dma_desc *dma_rx ; | 42 | struct dma_desc *dma_rx ; |
@@ -48,7 +47,6 @@ struct stmmac_priv { | |||
48 | struct sk_buff_head rx_recycle; | 47 | struct sk_buff_head rx_recycle; |
49 | 48 | ||
50 | struct net_device *dev; | 49 | struct net_device *dev; |
51 | int is_gmac; | ||
52 | dma_addr_t dma_rx_phy; | 50 | dma_addr_t dma_rx_phy; |
53 | unsigned int dma_rx_size; | 51 | unsigned int dma_rx_size; |
54 | unsigned int dma_buf_sz; | 52 | unsigned int dma_buf_sz; |
@@ -60,14 +58,11 @@ struct stmmac_priv { | |||
60 | struct napi_struct napi; | 58 | struct napi_struct napi; |
61 | 59 | ||
62 | phy_interface_t phy_interface; | 60 | phy_interface_t phy_interface; |
63 | int pbl; | ||
64 | int bus_id; | ||
65 | int phy_addr; | 61 | int phy_addr; |
66 | int phy_mask; | 62 | int phy_mask; |
67 | int (*phy_reset) (void *priv); | 63 | int (*phy_reset) (void *priv); |
68 | void (*fix_mac_speed) (void *priv, unsigned int speed); | 64 | int rx_coe; |
69 | void (*bus_setup)(void __iomem *ioaddr); | 65 | int no_csum_insertion; |
70 | void *bsp_priv; | ||
71 | 66 | ||
72 | int phy_irq; | 67 | int phy_irq; |
73 | struct phy_device *phydev; | 68 | struct phy_device *phydev; |
@@ -77,47 +72,20 @@ struct stmmac_priv { | |||
77 | unsigned int flow_ctrl; | 72 | unsigned int flow_ctrl; |
78 | unsigned int pause; | 73 | unsigned int pause; |
79 | struct mii_bus *mii; | 74 | struct mii_bus *mii; |
80 | int mii_clk_csr; | ||
81 | 75 | ||
82 | u32 msg_enable; | 76 | u32 msg_enable; |
83 | spinlock_t lock; | 77 | spinlock_t lock; |
84 | int wolopts; | 78 | int wolopts; |
85 | int wolenabled; | 79 | int wolenabled; |
86 | int shutdown; | ||
87 | #ifdef CONFIG_STMMAC_TIMER | 80 | #ifdef CONFIG_STMMAC_TIMER |
88 | struct stmmac_timer *tm; | 81 | struct stmmac_timer *tm; |
89 | #endif | 82 | #endif |
90 | #ifdef STMMAC_VLAN_TAG_USED | 83 | #ifdef STMMAC_VLAN_TAG_USED |
91 | struct vlan_group *vlgrp; | 84 | struct vlan_group *vlgrp; |
92 | #endif | 85 | #endif |
93 | int enh_desc; | 86 | struct plat_stmmacenet_data *plat; |
94 | int rx_coe; | ||
95 | int bugged_jumbo; | ||
96 | int no_csum_insertion; | ||
97 | }; | 87 | }; |
98 | 88 | ||
99 | #ifdef CONFIG_STM_DRIVERS | ||
100 | #include <linux/stm/pad.h> | ||
101 | static inline int stmmac_claim_resource(struct platform_device *pdev) | ||
102 | { | ||
103 | int ret = 0; | ||
104 | struct plat_stmmacenet_data *plat_dat = pdev->dev.platform_data; | ||
105 | |||
106 | /* Pad routing setup */ | ||
107 | if (IS_ERR(devm_stm_pad_claim(&pdev->dev, plat_dat->pad_config, | ||
108 | dev_name(&pdev->dev)))) { | ||
109 | printk(KERN_ERR "%s: Failed to request pads!\n", __func__); | ||
110 | ret = -ENODEV; | ||
111 | } | ||
112 | return ret; | ||
113 | } | ||
114 | #else | ||
115 | static inline int stmmac_claim_resource(struct platform_device *pdev) | ||
116 | { | ||
117 | return 0; | ||
118 | } | ||
119 | #endif | ||
120 | |||
121 | extern int stmmac_mdio_unregister(struct net_device *ndev); | 89 | extern int stmmac_mdio_unregister(struct net_device *ndev); |
122 | extern int stmmac_mdio_register(struct net_device *ndev); | 90 | extern int stmmac_mdio_register(struct net_device *ndev); |
123 | extern void stmmac_set_ethtool_ops(struct net_device *netdev); | 91 | extern void stmmac_set_ethtool_ops(struct net_device *netdev); |