diff options
| author | Chen-Yu Tsai | 2014-01-17 14:24:41 +0100 |
|---|---|---|
| committer | David S. Miller | 2014-01-20 05:02:02 +0100 |
| commit | c5e4ddbdfa1134a36589c1466ed4abb85fe6f976 (patch) | |
| tree | 908c42eb77eb07e110352b4f26210fffe201760a /drivers/net/ethernet/stmicro/stmmac/stmmac.h | |
| parent | net: stmmac: Enable stmmac main clock when probing hardware (diff) | |
| download | kernel-qcow2-linux-c5e4ddbdfa1134a36589c1466ed4abb85fe6f976.tar.gz kernel-qcow2-linux-c5e4ddbdfa1134a36589c1466ed4abb85fe6f976.tar.xz kernel-qcow2-linux-c5e4ddbdfa1134a36589c1466ed4abb85fe6f976.zip | |
net: stmmac: Add support for optional reset control
The DWMAC has a reset assert line, which is used on some SoCs. Add an
optional reset control to stmmac driver core.
To support reset control deferred probing, this patch changes the driver
probe function to return the actual error, instead of just -EINVAL.
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/stmmac.h')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h index 73709e9ddcd1..c1c141fe15e7 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -32,6 +32,7 @@ #include <linux/pci.h> #include "common.h" #include <linux/ptp_clock_kernel.h> +#include <linux/reset.h> struct stmmac_priv { /* Frequently used values are kept adjacent for cache effect */ @@ -91,6 +92,7 @@ struct stmmac_priv { int wolopts; int wol_irq; struct clk *stmmac_clk; + struct reset_control *stmmac_rst; int clk_csr; struct timer_list eee_ctrl_timer; int lpi_irq; |