aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/stmicro
diff options
context:
space:
mode:
authorDinh Nguyen <dinguyen@opensource.altera.com>2015-03-06 18:48:28 -0500
committerDavid S. Miller <davem@davemloft.net>2015-03-08 22:52:45 -0400
commitcbe21d92e4d501e4895ef668b43fd8998c9b3b02 (patch)
treeb519210201802b87d675767c35bed0e555fae862 /drivers/net/ethernet/stmicro
parent9b974499e44536fd524dfad23f4f8477e6e243ab (diff)
net: stmmac: make reset control an optional requirement
Not having a reset control line to the ethernet controller should not be a hard failure. Instead, add support for deferred probing and just print out a debug statement. Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> Cc: Vince Bridgers <vbridger@opensource.altera.com> CC: David S. Miller <davem@davemloft.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro')
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
index e97074cd5800..5a36bd2c7837 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
@@ -91,7 +91,9 @@ static int socfpga_dwmac_parse_data(struct socfpga_dwmac *dwmac, struct device *
91 STMMAC_RESOURCE_NAME); 91 STMMAC_RESOURCE_NAME);
92 if (IS_ERR(dwmac->stmmac_rst)) { 92 if (IS_ERR(dwmac->stmmac_rst)) {
93 dev_info(dev, "Could not get reset control!\n"); 93 dev_info(dev, "Could not get reset control!\n");
94 return -EINVAL; 94 if (PTR_ERR(dwmac->stmmac_rst) == -EPROBE_DEFER)
95 return -EPROBE_DEFER;
96 dwmac->stmmac_rst = NULL;
95 } 97 }
96 98
97 dwmac->interface = of_get_phy_mode(np); 99 dwmac->interface = of_get_phy_mode(np);