|
 |
10aaea1 |
From 8bfbdce4d7da6353d1039148a4c90dd463f1fb8f Mon Sep 17 00:00:00 2001
|
|
|
10aaea1 |
From: Laura Abbott <labbott@redhat.com>
|
|
|
10aaea1 |
Date: Thu, 27 Jul 2017 13:52:17 -0700
|
|
|
10aaea1 |
Subject: [PATCH] Revert "xgene: Don't fail probe, if there is no clk resource
|
|
|
10aaea1 |
for SGMII interfaces"
|
|
|
10aaea1 |
|
|
|
10aaea1 |
This reverts commit 0db01097cabd97897d123b4c5d805d1a7b061d82.
|
|
|
10aaea1 |
|
|
|
10aaea1 |
Signed-off-by: Laura Abbott <labbott@redhat.com>
|
|
|
10aaea1 |
---
|
|
|
10aaea1 |
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 22 ++++++++++------------
|
|
|
10aaea1 |
1 file changed, 10 insertions(+), 12 deletions(-)
|
|
|
10aaea1 |
|
|
|
10aaea1 |
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
|
|
|
10aaea1 |
index 86058a9f3417..d3906f6b01bd 100644
|
|
|
10aaea1 |
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
|
|
|
10aaea1 |
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
|
|
|
10aaea1 |
@@ -1785,18 +1785,16 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
|
|
|
10aaea1 |
|
|
|
10aaea1 |
xgene_enet_gpiod_get(pdata);
|
|
|
10aaea1 |
|
|
|
10aaea1 |
- if (pdata->phy_mode != PHY_INTERFACE_MODE_SGMII) {
|
|
|
10aaea1 |
- pdata->clk = devm_clk_get(&pdev->dev, NULL);
|
|
|
10aaea1 |
- if (IS_ERR(pdata->clk)) {
|
|
|
10aaea1 |
- /* Abort if the clock is defined but couldn't be
|
|
|
10aaea1 |
- * retrived. Always abort if the clock is missing on
|
|
|
10aaea1 |
- * DT system as the driver can't cope with this case.
|
|
|
10aaea1 |
- */
|
|
|
10aaea1 |
- if (PTR_ERR(pdata->clk) != -ENOENT || dev->of_node)
|
|
|
10aaea1 |
- return PTR_ERR(pdata->clk);
|
|
|
10aaea1 |
- /* Firmware may have set up the clock already. */
|
|
|
10aaea1 |
- dev_info(dev, "clocks have been setup already\n");
|
|
|
10aaea1 |
- }
|
|
|
10aaea1 |
+ pdata->clk = devm_clk_get(&pdev->dev, NULL);
|
|
|
10aaea1 |
+ if (IS_ERR(pdata->clk)) {
|
|
|
10aaea1 |
+ /* Abort if the clock is defined but couldn't be retrived.
|
|
|
10aaea1 |
+ * Always abort if the clock is missing on DT system as
|
|
|
10aaea1 |
+ * the driver can't cope with this case.
|
|
|
10aaea1 |
+ */
|
|
|
10aaea1 |
+ if (PTR_ERR(pdata->clk) != -ENOENT || dev->of_node)
|
|
|
10aaea1 |
+ return PTR_ERR(pdata->clk);
|
|
|
10aaea1 |
+ /* Firmware may have set up the clock already. */
|
|
|
10aaea1 |
+ dev_info(dev, "clocks have been setup already\n");
|
|
|
10aaea1 |
}
|
|
|
10aaea1 |
|
|
|
10aaea1 |
if (pdata->phy_mode != PHY_INTERFACE_MODE_XGMII)
|
|
|
10aaea1 |
--
|
|
|
10aaea1 |
2.13.0
|
|
|
10aaea1 |
|