From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754690AbbCFVwq (ORCPT ); Fri, 6 Mar 2015 16:52:46 -0500 Received: from mail-bn1bon0083.outbound.protection.outlook.com ([157.56.111.83]:11552 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754076AbbCFVwp (ORCPT ); Fri, 6 Mar 2015 16:52:45 -0500 X-Greylist: delayed 889 seconds by postgrey-1.27 at vger.kernel.org; Fri, 06 Mar 2015 16:52:44 EST From: To: CC: , , , Dinh Nguyen , Vince Bridgers , "David S. Miller" Subject: [PATCH] net: stmmac: make reset control an optional requirement Date: Fri, 6 Mar 2015 15:32:55 -0600 Message-ID: <1425677575-26181-1-git-send-email-dinguyen@opensource.altera.com> X-Mailer: git-send-email 2.2.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [64.129.157.38] X-ClientProxiedBy: DM2PR10CA0082.namprd10.prod.outlook.com (10.141.241.50) To CY1PR0301MB1194.namprd03.prod.outlook.com (25.160.165.25) Authentication-Results: st.com; dkim=none (message not signed) header.d=none; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1194; X-Microsoft-Antispam-PRVS: X-Forefront-Antispam-Report: BMV:0;SFV:NSPM;SFS:(10009020)(6009001)(53416004)(46102003)(92566002)(48376002)(47776003)(77156002)(66066001)(50226001)(86152002)(42186005)(50466002)(87976001)(575784001)(86362001)(40100003)(229853001)(2351001)(62966003)(33646002)(122386002)(19580405001)(19580395003)(50986999)(110136001);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR0301MB1194;H:linux-builds1.altera.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005006)(5001007);SRVR:CY1PR0301MB1194;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1194; X-Forefront-PRVS: 05079D8470 X-OriginatorOrg: opensource.altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Mar 2015 21:37:52.5507 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB1194 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dinh Nguyen 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 Cc: Vince Bridgers CC: David S. Miller --- drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c index e97074c..ecb0b9b 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 * STMMAC_RESOURCE_NAME); if (IS_ERR(dwmac->stmmac_rst)) { dev_info(dev, "Could not get reset control!\n"); - return -EINVAL; + if (PTR_ERR(dwmac->stmmac_rst) == -EPROBE_DEFER) + ret = -EPROBE_DEFER; + dwmac->stmmac_rst = NULL; } dwmac->interface = of_get_phy_mode(np); -- 2.2.1