mx6cuboxi: add eth support for SoMs revision 1.9+

The adin_get_phy_mode_override function does not compile, because it is
missing both declaration and implementation of phy_get_interface_by_name.

Remove the whole function for now, since the missing implementation is
not included in mainline Linux - and thus can not be copied.

Signed-off-by Josua Mayer <[email protected]>

---
 drivers/net/phy/adin.c | 34 ----------------------------------

 1 file changed, 34 deletions(-)

drivers/net/phy/adin.c +0 -0

index cff841ab3d..2433e76fea 100644
@@ -94,35 +94,6 @@ static u32 adin_get_reg_value(struct phy_device
 *phydev,
         return rc;
  }

-/**
- * adin_get_phy_mode_override - Get phy-mode override for adin PHY
- *
- * The function gets phy-mode string from property 'adi,phy-mode- override'
- * and return its index in phy_interface_strings table, or -1 in error case.
- */

drivers/net/phy/adin.c +0 -8

-int adin_get_phy_mode_override(struct phy_device *phydev)
-{
-       ofnode node = phy_get_ofnode(phydev);
-       const char *phy_mode_override;
-       const char *prop_phy_mode_override = "adi,phy-mode-override";
-       int override_interface;
-
-       phy_mode_override = ofnode_read_string(node,

prop_phy_mode_override);
-       if (!phy_mode_override)
-               return -ENODEV;

drivers/net/phy/adin.c +0 -5

-
-       debug("%s: %s = '%s'\n",
-             __func__, prop_phy_mode_override, phy_mode_override);
-
-       override_interface =

phy_get_interface_by_name(phy_mode_override);
-
-       if (override_interface < 0)
-               printf("%s: %s = '%s' is not valid\n", -                      __func__, prop_phy_mode_override, phy_mode_override);

drivers/net/phy/adin.c +0 -4

-
-       return override_interface;
-}
-

 static u16 adin_ext_read(struct phy_device *phydev, const u32 regnum)
 {
        u16 val;

drivers/net/phy/adin.c +0 -5

@@ -148,11 +119,6 @@ static int adin_config_rgmii_mode(struct
 phy_device *phydev)
  {
         u16 reg_val;
         u32 val;
-       int phy_mode_override = adin_get_phy_mode_override(phydev);
-
-       if (phy_mode_override >= 0) {
-               phydev->interface = (phy_interface_t)
 phy_mode_override;
-       }

        reg_val = adin_ext_read(phydev, ADIN1300_GE_RGMII_CFG);

Hi Josua,

Quoted 73 lines · Josua Mayer

The adin_get_phy_mode_override function does not compile, because it is
missing both declaration and implementation of phy_get_interface_by_name.

Remove the whole function for now, since the missing implementation is
not included in mainline Linux - and thus can not be copied.

Signed-off-by Josua Mayer <[email protected]>

---
  drivers/net/phy/adin.c | 34 ----------------------------------
  1 file changed, 34 deletions(-)

drivers/net/phy/adin.c +0 -4

index cff841ab3d..2433e76fea 100644
@@ -94,35 +94,6 @@ static u32 adin_get_reg_value(struct phy_device
 *phydev,
         return rc;
  }
 
-/**
- * adin_get_phy_mode_override - Get phy-mode override for adin PHY
- *
- * The function gets phy-mode string from property 'adi,phy-mode-

override'
- * and return its index in phy_interface_strings table, or -1 in error case.
- */

drivers/net/phy/adin.c +0 -8

-int adin_get_phy_mode_override(struct phy_device *phydev)
-{
-       ofnode node = phy_get_ofnode(phydev);
-       const char *phy_mode_override;
-       const char *prop_phy_mode_override = "adi,phy-mode-override";
-       int override_interface;
-
-       phy_mode_override = ofnode_read_string(node,

prop_phy_mode_override);
-       if (!phy_mode_override)
-               return -ENODEV;

drivers/net/phy/adin.c +0 -5

-
-       debug("%s: %s = '%s'\n",
-             __func__, prop_phy_mode_override, phy_mode_override);
-
-       override_interface =

phy_get_interface_by_name(phy_mode_override);
-
-       if (override_interface < 0)
-               printf("%s: %s = '%s' is not valid\n", -                      __func__, prop_phy_mode_override, phy_mode_override);

drivers/net/phy/adin.c +0 -4

-
-       return override_interface;
-}
-
  static u16 adin_ext_read(struct phy_device *phydev, const u32

regnum)
 {
        u16 val;

drivers/net/phy/adin.c +0 -5

@@ -148,11 +119,6 @@ static int adin_config_rgmii_mode(struct
 phy_device *phydev)
  {
         u16 reg_val;
         u32 val;
-       int phy_mode_override = adin_get_phy_mode_override(phydev);
-
-       if (phy_mode_override >= 0) {
-               phydev->interface = (phy_interface_t)
 phy_mode_override;
-       }
 

Quoted 2 lines

        reg_val = adin_ext_read(phydev, ADIN1300_GE_RGMII_CFG);

The patch that introduced adin_get_phy_mode_override was tested against the U-Boot master branch. Unfortunately, phy_get_interface_by_name was removed just a few days before by:
https://github.com/u-boot/u-boot/commit/123ca114e07ecf28aa2538748d733e2b22d8b8b5

Can we fix adin_get_phy_mode_override instead of removing it?

We can
implement part of ofnode_read_phy_mode. This needs to be tested, but for example:

drivers/net/phy/adin.c +0 -0

index cff841ab3d..6a05b9fd05 100644
@@ -100,27 +100,28 @@ static u32 adin_get_reg_value(struct phy_device
 *phydev,
   * The function gets phy-mode string from property 'adi,phy-mode-

override'
* and return its index in phy_interface_strings table, or -1 in error
case.
*/

drivers/net/phy/adin.c +2 -2

-int adin_get_phy_mode_override(struct phy_device *phydev)
+phy_interface_t adin_get_phy_mode_override(struct phy_device *phydev)
  {
         ofnode node = phy_get_ofnode(phydev);
         const char *phy_mode_override;
         const char *prop_phy_mode_override = "adi,phy-mode-override";
-       int override_interface;
+       int i;
 
         phy_mode_override = ofnode_read_string(node,

prop_phy_mode_override);

drivers/net/phy/adin.c +2 -2

+
         if (!phy_mode_override)
-               return -ENODEV;
+               return PHY_INTERFACE_MODE_NA;
 
         debug("%s: %s = '%s'\n",
               __func__, prop_phy_mode_override, phy_mode_override);
 
-       override_interface =

phy_get_interface_by_name(phy_mode_override);

drivers/net/phy/adin.c +2 -0

+       for (i = 0; i < PHY_INTERFACE_MODE_MAX; i++)
+               if (!strcmp(phy_mode_override,

phy_interface_strings[i]))

drivers/net/phy/adin.c +1 -3

+                       return i;
 
-       if (override_interface < 0)
-               printf("%s: %s = '%s' is not valid\n",
-                      __func__, prop_phy_mode_override,

phy_mode_override);
+ debug("%s: Invalid PHY interface '%s'\n", __func__,
phy_mode_override);

drivers/net/phy/adin.c +4 -4

-       return override_interface;
+       return PHY_INTERFACE_MODE_NA;
  }
 
  static u16 adin_ext_read(struct phy_device *phydev, const u32 regnum)

@@ -148,10 +149,10 @@ static int adin_config_rgmii_mode(struct
 phy_device *phydev)
  {
         u16 reg_val;
         u32 val;
-       int phy_mode_override = adin_get_phy_mode_override(phydev);
+       phy_interface_t phy_mode_override =
 adin_get_phy_mode_override(phydev);
 
-       if (phy_mode_override >= 0) {
-               phydev->interface = (phy_interface_t)
 phy_mode_override;
+       if (phy_mode_override != PHY_INTERFACE_MODE_NA) {
+               phydev->interface = phy_mode_override;

         }
  
         reg_val = adin_ext_read(phydev, ADIN1300_GE_RGMII_CFG);

Thanks,
Nate

Hi Nate,

Am 02.05.22 um 16:25 schrieb Nate Drude:

Quoted 84 lines

Hi Josua,

Quoted 81 lines · Josua Mayer

The adin_get_phy_mode_override function does not compile, because it
is
missing both declaration and implementation of phy_get_interface_by_name.

Remove the whole function for now, since the missing implementation
is
not included in mainline Linux - and thus can not be copied.

Signed-off-by Josua Mayer <[email protected]>

---
  drivers/net/phy/adin.c | 34 ----------------------------------

  1 file changed, 34 deletions(-)

drivers/net/phy/adin.c +0 -0

index cff841ab3d..2433e76fea 100644
@@ -94,35 +94,6 @@ static u32 adin_get_reg_value(struct

phy_device
*phydev,
         return rc;
  }

-/**
- * adin_get_phy_mode_override - Get phy-mode override for adin PHY
- *
- * The function gets phy-mode string from property 'adi,phy- mode-
override'
- * and return its index in phy_interface_strings table, or -1 in error case.
- */

drivers/net/phy/adin.c +0 -5

-int adin_get_phy_mode_override(struct phy_device *phydev)
-{
-       ofnode node = phy_get_ofnode(phydev);
-       const char *phy_mode_override;
-       const char *prop_phy_mode_override = "adi,phy-mode-

override";
-       int override_interface;
-
-       phy_mode_override = ofnode_read_string(node, prop_phy_mode_override);
-       if (!phy_mode_override)
-               return -ENODEV;
-
-       debug("%s: %s = '%s'\n",
-             __func__, prop_phy_mode_override, phy_mode_override);
-
-       override_interface = phy_get_interface_by_name(phy_mode_override);
-
-       if (override_interface < 0)
-               printf("%s: %s = '%s' is not valid\n", -                      __func__, prop_phy_mode_override, phy_mode_override);

drivers/net/phy/adin.c +0 -4

-
-       return override_interface;
-}
-

  static u16 adin_ext_read(struct phy_device *phydev, const u32 regnum)
  {
         u16 val;

drivers/net/phy/adin.c +0 -5

@@ -148,11 +119,6 @@ static int adin_config_rgmii_mode(struct
 phy_device *phydev)
   {
          u16 reg_val;
          u32 val;
-       int phy_mode_override =
 adin_get_phy_mode_override(phydev);
-
-       if (phy_mode_override >= 0) {
-               phydev->interface = (phy_interface_t)
 phy_mode_override;
-       }

Quoted 8 lines

Quoted 2 lines

         reg_val = adin_ext_read(phydev, ADIN1300_GE_RGMII_CFG);

The patch that introduced adin_get_phy_mode_override was tested against
the U-Boot master branch. Unfortunately, phy_get_interface_by_name was
removed just a few days before by:
https://eur03.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fu-boot%2Fu-boot%2Fcommit%2F123ca114e07ecf28aa2538748d733e2b22d8b8b5&amp;data=05%7C01%7CNate.D%40variscite.com%7C467af650626f4902ae2b08da2dab6225%7C399ae6ac38f44ef094a8440b0ad581de%7C1%7C0%7C637872511359995609%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&amp;sdata=Ok3YOO8rheEZuRa%2Fn04NZf37TsPQ7hzArUojFZ4QDUg%3D&amp;reserved=0

:(

Quoted 1 line

Can we fix adin_get_phy_mode_override instead of removing it?

I will take a look in the coming days and see if I understand how to fix
this.
I don't really mind if we fix it, or remove it - removing was the faster

way getting my patch-set out of course ...

Quoted 78 lines

We can
implement part of ofnode_read_phy_mode. This needs to be tested, but
for example:

drivers/net/phy/adin.c +0 -0

index cff841ab3d..6a05b9fd05 100644
@@ -100,27 +100,28 @@ static u32 adin_get_reg_value(struct

phy_device
*phydev,
   * The function gets phy-mode string from property 'adi,phy-mode- override'
   * and return its index in phy_interface_strings table, or -1 in error
case.
   */

drivers/net/phy/adin.c +1 -1

-int adin_get_phy_mode_override(struct phy_device *phydev)
+phy_interface_t adin_get_phy_mode_override(struct phy_device

*phydev)
  {
         ofnode node = phy_get_ofnode(phydev);
         const char *phy_mode_override;
         const char *prop_phy_mode_override = "adi,phy-mode- override";
-       int override_interface;
+       int i;

         phy_mode_override = ofnode_read_string(node, prop_phy_mode_override);
+
         if (!phy_mode_override)
-               return -ENODEV;
+               return PHY_INTERFACE_MODE_NA;

         debug("%s: %s = '%s'\n",
               __func__, prop_phy_mode_override, phy_mode_override);

-       override_interface = phy_get_interface_by_name(phy_mode_override);
+       for (i = 0; i < PHY_INTERFACE_MODE_MAX; i++) +               if (!strcmp(phy_mode_override, phy_interface_strings[i]))
+                       return i;

-       if (override_interface < 0)
-               printf("%s: %s = '%s' is not valid\n", -                      __func__, prop_phy_mode_override, phy_mode_override);
+       debug("%s: Invalid PHY interface '%s'\n", __func__, phy_mode_override);

-       return override_interface;
+       return PHY_INTERFACE_MODE_NA;
  }

  static u16 adin_ext_read(struct phy_device *phydev, const u32 regnum)

drivers/net/phy/adin.c +1 -1

@@ -148,10 +149,10 @@ static int adin_config_rgmii_mode(struct
 phy_device *phydev)
   {
          u16 reg_val;
          u32 val;
-       int phy_mode_override = adin_get_phy_mode_override(phydev);
+       phy_interface_t phy_mode_override =
 adin_get_phy_mode_override(phydev);

-       if (phy_mode_override >= 0) {
-               phydev->interface = (phy_interface_t) phy_mode_override;
+       if (phy_mode_override != PHY_INTERFACE_MODE_NA) { +               phydev->interface = phy_mode_override; }

         reg_val = adin_ext_read(phydev, ADIN1300_GE_RGMII_CFG);

Quoted 2 lines

Thanks,
Nate

Hi Josua,

Quoted 96 lines · Josua Mayer

Hi Nate,

Am 02.05.22 um 16:25 schrieb Nate Drude:

Quoted 84 lines

Hi Josua,

Quoted 81 lines · Josua Mayer

The adin_get_phy_mode_override function does not compile, because it
is
missing both declaration and implementation of phy_get_interface_by_name.

Remove the whole function for now, since the missing implementation
is
not included in mainline Linux - and thus can not be copied.

Signed-off-by Josua Mayer <[email protected]>

---
   drivers/net/phy/adin.c | 34 ----------------------------------
   1 file changed, 34 deletions(-)

drivers/net/phy/adin.c +0 -0

index cff841ab3d..2433e76fea 100644
@@ -94,35 +94,6 @@ static u32 adin_get_reg_value(struct

phy_device
*phydev,
         return rc;
  }

-/**
- * adin_get_phy_mode_override - Get phy-mode override for adin PHY
- *
- * The function gets phy-mode string from property 'adi,phy- mode-
override'
- * and return its index in phy_interface_strings table, or -1 in error case.
- */

drivers/net/phy/adin.c +0 -5

-int adin_get_phy_mode_override(struct phy_device *phydev)
-{
-       ofnode node = phy_get_ofnode(phydev);
-       const char *phy_mode_override;
-       const char *prop_phy_mode_override = "adi,phy-mode-

override";
-       int override_interface;
-
-       phy_mode_override = ofnode_read_string(node, prop_phy_mode_override);
-       if (!phy_mode_override)
-               return -ENODEV;
-
-       debug("%s: %s = '%s'\n",
-             __func__, prop_phy_mode_override, phy_mode_override);
-
-       override_interface = phy_get_interface_by_name(phy_mode_override);
-
-       if (override_interface < 0)
-               printf("%s: %s = '%s' is not valid\n", -                      __func__, prop_phy_mode_override, phy_mode_override);

drivers/net/phy/adin.c +0 -4

-
-       return override_interface;
-}
-
   static u16 adin_ext_read(struct phy_device *phydev, const u32

regnum)
  {
         u16 val;

drivers/net/phy/adin.c +0 -5

@@ -148,11 +119,6 @@ static int adin_config_rgmii_mode(struct
 phy_device *phydev)
   {
          u16 reg_val;
          u32 val;
-       int phy_mode_override =
 adin_get_phy_mode_override(phydev);
-
-       if (phy_mode_override >= 0) {
-               phydev->interface = (phy_interface_t)
 phy_mode_override;
-       }

Quoted 8 lines

Quoted 2 lines

         reg_val = adin_ext_read(phydev, ADIN1300_GE_RGMII_CFG);

The patch that introduced adin_get_phy_mode_override was tested against
the U-Boot master branch. Unfortunately, phy_get_interface_by_name was
removed just a few days before by:
https://eur03.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fu-boot%2Fu-boot%2Fcommit%2F123ca114e07ecf28aa2538748d733e2b22d8b8b5&amp;data=05%7C01%7CNate.D%40variscite.com%7C467af650626f4902ae2b08da2dab6225%7C399ae6ac38f44ef094a8440b0ad581de%7C1%7C0%7C637872511359995609%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&amp;sdata=Ok3YOO8rheEZuRa%2Fn04NZf37TsPQ7hzArUojFZ4QDUg%3D&amp;reserved=0

:(

Quoted 6 lines

Quoted 1 line

Can we fix adin_get_phy_mode_override instead of removing it?

I will take a look in the coming days and see if I understand how to fix
this.
I don't really mind if we fix it, or remove it - removing was the faster

If you prefer, I can submit a separate patch to fix it. I'll wait to hear from you to avoid duplicated work.

Quoted 77 lines

way getting my patch-set out of course ...

Quoted 76 lines

We can
implement part of ofnode_read_phy_mode. This needs to be tested, but
for example:

drivers/net/phy/adin.c +0 -0

index cff841ab3d..6a05b9fd05 100644
@@ -100,27 +100,28 @@ static u32 adin_get_reg_value(struct

phy_device
*phydev,
   * The function gets phy-mode string from property 'adi,phy-mode-
override'
   * and return its index in phy_interface_strings table, or -1 in
error
case.
   */

drivers/net/phy/adin.c +1 -1

-int adin_get_phy_mode_override(struct phy_device *phydev)
+phy_interface_t adin_get_phy_mode_override(struct phy_device

*phydev)
  {
         ofnode node = phy_get_ofnode(phydev); const char *phy_mode_override;
         const char *prop_phy_mode_override = "adi,phy-mode-
override";
-       int override_interface;
+       int i;

         phy_mode_override = ofnode_read_string(node,
prop_phy_mode_override);
+
         if (!phy_mode_override)
-               return -ENODEV;
+               return PHY_INTERFACE_MODE_NA;

         debug("%s: %s = '%s'\n",
               __func__, prop_phy_mode_override,
phy_mode_override);

-       override_interface = phy_get_interface_by_name(phy_mode_override); +       for (i = 0; i < PHY_INTERFACE_MODE_MAX; i++) +               if (!strcmp(phy_mode_override, phy_interface_strings[i]))
+                       return i;

-       if (override_interface < 0)
-               printf("%s: %s = '%s' is not valid\n", -                      __func__, prop_phy_mode_override, phy_mode_override);
+       debug("%s: Invalid PHY interface '%s'\n", __func__, phy_mode_override);

-       return override_interface;
+       return PHY_INTERFACE_MODE_NA;
  }

  static u16 adin_ext_read(struct phy_device *phydev, const u32
regnum)

drivers/net/phy/adin.c +3 -3

@@ -148,10 +149,10 @@ static int adin_config_rgmii_mode(struct
 phy_device *phydev)
   {
          u16 reg_val;
          u32 val;
-       int phy_mode_override = adin_get_phy_mode_override(phydev);
+       phy_interface_t phy_mode_override =
 adin_get_phy_mode_override(phydev);
 
-       if (phy_mode_override >= 0) {
-               phydev->interface = (phy_interface_t)
 phy_mode_override;
+       if (phy_mode_override != PHY_INTERFACE_MODE_NA) {
+               phydev->interface = phy_mode_override;

         }

Quoted 4 lines

Quoted 4 lines

         reg_val = adin_ext_read(phydev, ADIN1300_GE_RGMII_CFG);

Thanks,
Nate

Thanks,
Nate

\o/

Am 04.05.22 um 15:46 schrieb Nate Drude:

Quoted 98 lines

Hi Josua,

Quoted 95 lines · Josua Mayer

Hi Nate,

Am 02.05.22 um 16:25 schrieb Nate Drude:

Quoted 81 lines

Hi Josua,

Quoted 78 lines · Josua Mayer

The adin_get_phy_mode_override function does not compile, because it
is
missing both declaration and implementation of phy_get_interface_by_name.

Remove the whole function for now, since the missing implementation
is
not included in mainline Linux - and thus can not be copied.

Signed-off-by Josua Mayer <[email protected]>

---
   drivers/net/phy/adin.c | 34 ----------------------------------

   1 file changed, 34 deletions(-)

drivers/net/phy/adin.c +0 -0

index cff841ab3d..2433e76fea 100644
@@ -94,35 +94,6 @@ static u32 adin_get_reg_value(struct

phy_device
*phydev,
          return rc;
   }
   -/**
- * adin_get_phy_mode_override - Get phy-mode override for adin PHY
- *
- * The function gets phy-mode string from property 'adi,phy- mode-
override'
- * and return its index in phy_interface_strings table, or -1 in error case.
- */

drivers/net/phy/adin.c +0 -5

-int adin_get_phy_mode_override(struct phy_device *phydev)
-{
-       ofnode node = phy_get_ofnode(phydev);
-       const char *phy_mode_override;
-       const char *prop_phy_mode_override = "adi,phy-mode-

override";
-       int override_interface;
-
-       phy_mode_override = ofnode_read_string(node, prop_phy_mode_override);
-       if (!phy_mode_override)
-               return -ENODEV;
-
-       debug("%s: %s = '%s'\n",
-             __func__, prop_phy_mode_override, phy_mode_override);
-
-       override_interface = phy_get_interface_by_name(phy_mode_override);
-
-       if (override_interface < 0)
-               printf("%s: %s = '%s' is not valid\n", -                      __func__, prop_phy_mode_override, phy_mode_override);

drivers/net/phy/adin.c +0 -4

-
-       return override_interface;
-}
-

   static u16 adin_ext_read(struct phy_device *phydev, const u32 regnum)
   {
          u16 val;

drivers/net/phy/adin.c +0 -4

@@ -148,11 +119,6 @@ static int adin_config_rgmii_mode(struct
 phy_device *phydev)
    {
           u16 reg_val;
           u32 val;
-       int phy_mode_override =
 adin_get_phy_mode_override(phydev);
-
-       if (phy_mode_override >= 0) {
-               phydev->interface = (phy_interface_t)
 phy_mode_override;

Quoted 9 lines

Quoted 2 lines

drivers/net/phy/adin.c +0 -1

-       }

             reg_val = adin_ext_read(phydev, ADIN1300_GE_RGMII_CFG);

The patch that introduced adin_get_phy_mode_override was tested against
the U-Boot master branch. Unfortunately, phy_get_interface_by_name was
removed just a few days before by:
https://eur03.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fu-boot%2Fu-boot%2Fcommit%2F123ca114e07ecf28aa2538748d733e2b22d8b8b5&amp;data=05%7C01%7CNate.D%40variscite.com%7C467af650626f4902ae2b08da2dab6225%7C399ae6ac38f44ef094a8440b0ad581de%7C1%7C0%7C637872511359995609%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&amp;sdata=Ok3YOO8rheEZuRa%2Fn04NZf37TsPQ7hzArUojFZ4QDUg%3D&amp;reserved=0

:(

Quoted 1 line

Can we fix adin_get_phy_mode_override instead of removing it?

Quoted 7 lines

Quoted 5 lines

I will take a look in the coming days and see if I understand how to fix
this.
I don't really mind if we fix it, or remove it - removing was the faster

If you prefer, I can submit a separate patch to fix it. I'll wait to hear from you to avoid duplicated work.

I won't be able to look at this before Sunday, so feel free to work on it.

Quoted 76 lines

Quoted 71 lines

way getting my patch-set out of course ...

Quoted 70 lines

We can
implement part of ofnode_read_phy_mode. This needs to be tested, but
for example:

drivers/net/phy/adin.c +0 -0

index cff841ab3d..6a05b9fd05 100644
@@ -100,27 +100,28 @@ static u32 adin_get_reg_value(struct

phy_device
*phydev,
    * The function gets phy-mode string from property 'adi,phy-mode- override'
    * and return its index in phy_interface_strings table, or -1 in error
case.
    */

drivers/net/phy/adin.c +1 -1

-int adin_get_phy_mode_override(struct phy_device *phydev)
+phy_interface_t adin_get_phy_mode_override(struct phy_device

*phydev)
   {
          ofnode node = phy_get_ofnode(phydev);
          const char *phy_mode_override;
          const char *prop_phy_mode_override = "adi,phy-mode- override";
-       int override_interface;
+       int i;
             phy_mode_override = ofnode_read_string(node, prop_phy_mode_override);
+
          if (!phy_mode_override)
-               return -ENODEV;
+               return PHY_INTERFACE_MODE_NA;
             debug("%s: %s = '%s'\n",
                __func__, prop_phy_mode_override, phy_mode_override);
   -       override_interface = phy_get_interface_by_name(phy_mode_override);
+       for (i = 0; i < PHY_INTERFACE_MODE_MAX; i++)
+               if (!strcmp(phy_mode_override, phy_interface_strings[i]))
+                       return i;
   -       if (override_interface < 0)
-               printf("%s: %s = '%s' is not valid\n",
-                      __func__, prop_phy_mode_override, phy_mode_override);
+       debug("%s: Invalid PHY interface '%s'\n", __func__, phy_mode_override);
   -       return override_interface;
+       return PHY_INTERFACE_MODE_NA;
   }
      static u16 adin_ext_read(struct phy_device *phydev, const u32 regnum)

drivers/net/phy/adin.c +3 -2

@@ -148,10 +149,10 @@ static int adin_config_rgmii_mode(struct
 phy_device *phydev)
    {
           u16 reg_val;
           u32 val;
-       int phy_mode_override = adin_get_phy_mode_override(phydev);
+       phy_interface_t phy_mode_override =
 adin_get_phy_mode_override(phydev);
    -       if (phy_mode_override >= 0) {
-               phydev->interface = (phy_interface_t)
 phy_mode_override;
+       if (phy_mode_override != PHY_INTERFACE_MODE_NA) {
+               phydev->interface = phy_mode_override;

          }
             reg_val = adin_ext_read(phydev, ADIN1300_GE_RGMII_CFG);

Quoted 2 lines

Quoted 2 lines

Thanks,
Nate

Thanks,
Nate

As of Revision 1.9 the SolidRun i.MX6 SoMs ship with a new PHY - an ADIN1300 at address 1. This patchset carries many small parts to facilitate proper operation of the ethernet port in U-Boot as well as Linux:

1. Fix a compile error in the recently phy driver
2. Add support for configuring the clock output pins to the phy driver
3. update device-tree with support for the neew phy
4. support runtime patching of device-tree for Linux:
enables only the phy node detected during boot, to avoid warning messages during boot.
5. finally enable the phy driver in the cuboxi defconfig

Josua Mayer (5):
phy: adin: remove broken support for adi,phy-mode-override
phy: adin: add support for clock output
ARM: dts: imx6qdl-sr-som: add support for alternate phy addresses
mx6cuboxi: fixup dtb ethernet phy nodes before booting an OS
mx6cuboxi: enable driver for adin1300 phy

  arch/arm/dts/imx6qdl-sr-som.dtsi     | 17 +++++-
  board/solidrun/mx6cuboxi/mx6cuboxi.c | 78 +++++++++++++++++++++++++++
  configs/mx6cuboxi_defconfig          |  2 +
  drivers/net/phy/adin.c               | 80 ++++++++++++++++------------
  4 files changed, 141 insertions(+), 36 deletions(-)