projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'topic/drm-misc-2015-07-23' of git://anongit.freedesktop.org/drm-intel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ethernet
/
stmicro
/
stmmac
/
stmmac.h
diff --git
a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index 73bab983edd96a47169bf4b1957e5fd13c28a3a0..1f3b33a6c6a8f8bd68f1b2313bc9ea93eb470ed4 100644
(file)
--- a/
drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/
drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@
-34,6
+34,14
@@
#include <linux/ptp_clock_kernel.h>
#include <linux/reset.h>
#include <linux/ptp_clock_kernel.h>
#include <linux/reset.h>
+struct stmmac_resources {
+ void __iomem *addr;
+ const char *mac;
+ int wol_irq;
+ int lpi_irq;
+ int irq;
+};
+
struct stmmac_tx_info {
dma_addr_t buf;
bool map_as_page;
struct stmmac_tx_info {
dma_addr_t buf;
bool map_as_page;
@@
-135,9
+143,9
@@
void stmmac_ptp_unregister(struct stmmac_priv *priv);
int stmmac_resume(struct net_device *ndev);
int stmmac_suspend(struct net_device *ndev);
int stmmac_dvr_remove(struct net_device *ndev);
int stmmac_resume(struct net_device *ndev);
int stmmac_suspend(struct net_device *ndev);
int stmmac_dvr_remove(struct net_device *ndev);
-
struct stmmac_priv *
stmmac_dvr_probe(struct device *device,
-
struct plat_stmmacenet_data *plat_dat,
-
void __iomem *addr
);
+
int
stmmac_dvr_probe(struct device *device,
+ struct plat_stmmacenet_data *plat_dat,
+
struct stmmac_resources *res
);
void stmmac_disable_eee_mode(struct stmmac_priv *priv);
bool stmmac_eee_init(struct stmmac_priv *priv);
void stmmac_disable_eee_mode(struct stmmac_priv *priv);
bool stmmac_eee_init(struct stmmac_priv *priv);