phy: Use _nodev naming convention if non-device clients

Clients that are requesting some of uclass API's
without a device (with ofnode) usually have _nodev
naming convention.

- clk_get_by_index_nodev
- clk_get_by_name_nodev
- reset_get_by_index_nodev
- gpio_request_by_name_nodev

So, update the same naming convention PHY framework.

This doesn't change the existing functionality.

Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Tom Rini <trini@konsulko.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>

diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c
index 3da99017a5a51dd52fffcc00250b026f4054e2f1..b591c924eadaf6a8095467e6188c95890af694fa 100644 (file)
--- a/arch/arm/mach-meson/board-gx.c
+++ b/arch/arm/mach-meson/board-gx.c
@@ -183,7 +183,8 @@ int board_usb_init(int index, enum usb_init_type init)
 
        /* get the PHYs */
        for (i = 0; i < 2; i++) {
-               ret = generic_phy_get_by_node(dwc2_node, i, &usb_phys[i]);
+               ret = generic_phy_get_by_index_nodev(dwc2_node, i,
+                                                    &usb_phys[i]);
                if (ret && ret != -ENOENT) {
                        pr_err("Failed to get USB PHY%d for %s\n",
                               i, ofnode_get_name(dwc2_node));

diff --git a/drivers/phy/phy-uclass.c b/drivers/phy/phy-uclass.c
index 6ab78448af31822b1a856b2e4209fbb2b850bcf7..1fded5ebf42f9d7856415a7aa4ac49cfc8bbf6bb 100644 (file)
--- a/drivers/phy/phy-uclass.c
+++ b/drivers/phy/phy-uclass.c
@@ -32,7 +32,7 @@ static int generic_phy_xlate_offs_flags(struct phy *phy,
        return 0;
 }
 
-int generic_phy_get_by_node(ofnode node, int index, struct phy *phy)
+int generic_phy_get_by_index_nodev(ofnode node, int index, struct phy *phy)
 {
        struct ofnode_phandle_args args;
        struct phy_ops *ops;
@@ -94,7 +94,7 @@ err:
 int generic_phy_get_by_index(struct udevice *dev, int index,
                             struct phy *phy)
 {
-       return generic_phy_get_by_node(dev_ofnode(dev), index, phy);
+       return generic_phy_get_by_index_nodev(dev_ofnode(dev), index, phy);
 }
 
 int generic_phy_get_by_name(struct udevice *dev, const char *phy_name,

diff --git a/include/generic-phy.h b/include/generic-phy.h
index 6d7cf5303bf3956dea68270530ee2e2a32363f25..5ab34cda03d859f6254ca44029009ee8d4dc431e 100644 (file)
--- a/include/generic-phy.h
+++ b/include/generic-phy.h
@@ -213,12 +213,15 @@ int generic_phy_get_by_index(struct udevice *user, int index,
                             struct phy *phy);
 
 /**
- * generic_phy_get_by_node() - Get a PHY device by integer index on ofnode
+ * generic_phy_get_by_index_nodev() - Get a PHY device by integer index
+ * without a device
  *
  * @node:      The client ofnode.
  * @index:     The index in the list of available PHYs
  * @phy:       A pointer to the PHY port
  *
+ * This is a version of generic_phy_get_by_index() that does not use a device.
+ *
  * This looks up a PHY device for a client device based on its ofnode and on
  * its position in the list of the possible PHYs.
  *
@@ -237,7 +240,7 @@ int generic_phy_get_by_index(struct udevice *user, int index,
  *
  * @return 0 if OK, or a negative error code
  */
-int generic_phy_get_by_node(ofnode node, int index, struct phy *phy);
+int generic_phy_get_by_index_nodev(ofnode node, int index, struct phy *phy);
 
 /**
  * generic_phy_get_by_name() - Get a PHY device by its name.