[Patch] net: dwc_eth_qos - works with fixed-phy

[Nicole Battenfeld]

Am 16.02.23 um 02:39 schrieb Marek Vasut:
> On 2/15/23 17:16, Elmar Psilog wrote:
>> Let the EQoS in imx8mp handle fixed-phy too.
>> Without that patch it lost track to the node to scan
>> speed and duplex.
>> Patch was created by Marek Vasut, just tested by me.
>>
>> Signed-off-by: Elmar Psilog <epsi at gmx.de>
>> ---
>> drivers/net/dwc_eth_qos.c
>> 1 file changed
>
> If you were to use 'git format-patch' and 'git send-email', those 
> tools would generate the correct Subject and diffstat etc. for you. 
> Also have a look at scripts/checkpatch.pl to validate whether a patch 
> is correct.
>
>> diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c
>> index afc47b56ff..10915d8e47 100644
>> --- a/drivers/net/dwc_eth_qos.c
>> +++ b/drivers/net/dwc_eth_qos.c
>> @@ -785,9 +785,21 @@ static int eqos_start(struct udevice *dev)
>>           */
>>          if (!eqos->phy) {
>>                  int addr = -1;
>> -               addr = eqos_get_phy_addr(eqos, dev);
>> -               eqos->phy = phy_connect(eqos->mii, addr, dev,
>> - eqos->config->interface(dev));
>> +               ofnode fixed_node;
>> +
>> +               if (IS_ENABLED(CONFIG_PHY_FIXED)) {
>> +                       fixed_node = 
>> ofnode_find_subnode(dev_ofnode(dev),
>> +                               "fixed-link");
>> +                       if (ofnode_valid(fixed_node)) {
>> +                               eqos->phy =
>> fixed_phy_create(dev_ofnode(dev));
>> +                               eqos->phy_of_node = fixed_node;
>> +                       }
>> +               }
>> +               if (!eqos->phy) {
>> +                       addr = eqos_get_phy_addr(eqos, dev);
>> +                       eqos->phy = phy_connect(eqos->mii, addr, dev,
>> eqos->config->interface(dev));
>> +               }
>> +
>>                  if (!eqos->phy) {
>>                          pr_err("phy_connect() failed");
>>                          goto err_stop_resets;
>
> +CC Ramon the network maintainer .


New attempt: used script to check and fix and used git format-patch.

Also base is latest trunk, not v2023.1 as before.

Hope this fits your needs, otherwise I afraid I need detailed instruction.

--
  drivers/net/dwc_eth_qos.c | 18 +++++++++++++++---
  1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c
index 112deb546d..d04362d6c6 100644
--- a/drivers/net/dwc_eth_qos.c
+++ b/drivers/net/dwc_eth_qos.c
@@ -788,9 +788,21 @@ static int eqos_start(struct udevice *dev)
       */
      if (!eqos->phy) {
          int addr = -1;
-        addr = eqos_get_phy_addr(eqos, dev);
-        eqos->phy = phy_connect(eqos->mii, addr, dev,
-                    eqos->config->interface(dev));
+        ofnode fixed_node;
+
+        if (IS_ENABLED(CONFIG_PHY_FIXED)) {
+            fixed_node = ofnode_find_subnode(dev_ofnode(dev), 
"fixed-link");
+            if (ofnode_valid(fixed_node)) {
+                eqos->phy = fixed_phy_create(dev_ofnode(dev));
+                eqos->phy_of_node = fixed_node;
+            }
+        }
+
+        if (!eqos->phy) {
+            addr = eqos_get_phy_addr(eqos, dev);
+            eqos->phy = phy_connect(eqos->mii, addr, dev, 
eqos->config->interface(dev));
+        }
+
          if (!eqos->phy) {
              pr_err("phy_connect() failed");
              goto err_stop_resets;
-- 
2.25.1