1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
From 01fc2236f7fe0c094c26635e738331abec0ac103 Mon Sep 17 00:00:00 2001
From: costi <constantin.tudor@freescale.com>
Date: Tue, 7 Mar 2017 16:13:07 +0200
Subject: [PATCH] staging: fsl-dpaa2/mac: Remove link type from phy sel logic
Signed-off-by: Constantin Tudor <constantin.tudor@nxp.com>
---
drivers/staging/fsl-dpaa2/mac/mac.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
--- a/drivers/staging/fsl-dpaa2/mac/mac.c
+++ b/drivers/staging/fsl-dpaa2/mac/mac.c
@@ -545,8 +545,11 @@ static int dpaa2_mac_probe(struct fsl_mc
/* probe the PHY as a fixed-link if the link type declared in DPC
* explicitly mandates this
*/
- if (priv->attr.link_type == DPMAC_LINK_TYPE_FIXED)
+
+ phy_node = of_parse_phandle(dpmac_node, "phy-handle", 0);
+ if (!phy_node) {
goto probe_fixed_link;
+ }
if (priv->attr.eth_if < ARRAY_SIZE(dpaa2_mac_iface_mode)) {
if_mode = dpaa2_mac_iface_mode[priv->attr.eth_if];
@@ -559,14 +562,6 @@ static int dpaa2_mac_probe(struct fsl_mc
}
/* try to connect to the PHY */
- phy_node = of_parse_phandle(dpmac_node, "phy-handle", 0);
- if (!phy_node) {
- if (!phy_node) {
- dev_err(dev, "dpmac node has no phy-handle property\n");
- err = -ENODEV;
- goto err_no_phy;
- }
- }
netdev->phydev = of_phy_connect(netdev, phy_node,
&dpaa2_mac_link_changed, 0, if_mode);
if (!netdev->phydev) {
|
