From a1b2faed7cbaf23d4af8a629c4db1bebb8e99d1b Mon Sep 17 00:00:00 2001
From: Patrice Chotard <patrice.chotard@st.com>
Date: Wed, 27 Jun 2018 11:55:42 +0200
Subject: [PATCH] phy: Be able to get phy from PHY provider

In case of phy are provided from a PHY provider nodes as following:

usbphyc: usb-phy@5a006000 {
	compatible = "st,stm32mp1-usbphyc";
	reg = <0x5a006000 0x1000>;
	clocks = <&rcc_clk USBPHY_K>;
	resets = <&rcc_rst USBPHY_R>;
	#address-cells = <1>;
	#size-cells = <0>;

	usbphyc_port0: usb-phy@0 {
		reg = <0>;
		phy-supply = <&vdd_usb>;
		vdda1v1-supply = <&reg11>;
		vdda1v8-supply = <&reg18>
		#phy-cells = <0>;
	};

	usbphyc_port1: usb-phy@1 {
		reg = <1>;
		phy-supply = <&vdd_usb>;
		vdda1v1-supply = <&reg11>;
		vdda1v8-supply = <&reg18>
		#phy-cells = <1>;
	};
};

and PHY are called as following:

usbh_ehci: usbh-ehci@5800d000 {
	compatible = "generic-ehci";
	reg = <0x5800d000 0x1000>;
	clocks = <&rcc_clk USBH>;
	resets = <&rcc_rst USBH_R>;
	interrupts = <GIC_SPI 75 IRQ_TYPE_NONE>;
	companion = <&usbh_ohci>;
	phys = <&usbphyc_port0>;
	phy-names = "usb";
	status = "okay";
};

generic_phy_get_by_index() must be updated to first look for
PHY phandle as previously and in case of error looks for PHY
provider by finding the parent's current node which is the PHY
provider.
args (ofnode_phandle_args struct) must also be updated by inserting
the phy index into the PHY provider as args[0].

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
---
 drivers/phy/phy-uclass.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/drivers/phy/phy-uclass.c b/drivers/phy/phy-uclass.c
index c4b3e409b3..6162395e75 100644
--- a/drivers/phy/phy-uclass.c
+++ b/drivers/phy/phy-uclass.c
@@ -36,8 +36,8 @@ int generic_phy_get_by_index(struct udevice *dev, int index,
 {
 	struct ofnode_phandle_args args;
 	struct phy_ops *ops;
-	int ret;
 	struct udevice *phydev;
+	int i, ret;
 
 	debug("%s(dev=%p, index=%d, phy=%p)\n", __func__, dev, index, phy);
 
@@ -55,7 +55,20 @@ int generic_phy_get_by_index(struct udevice *dev, int index,
 	if (ret) {
 		debug("%s: uclass_get_device_by_ofnode failed: err=%d\n",
 		      __func__, ret);
-		return ret;
+
+		/* Check if args.node's parent is a PHY provider */
+		ret = uclass_get_device_by_ofnode(UCLASS_PHY,
+						  ofnode_get_parent(args.node),
+						  &phydev);
+		if (ret)
+			return ret;
+
+		/* insert phy idx at first position into args array */
+		for (i = args.args_count; i > 1 ; i--)
+			args.args[i] = args.args[i - 1];
+
+		args.args_count++;
+		args.args[0] = ofnode_read_u32_default(args.node, "reg", -1);
 	}
 
 	phy->dev = phydev;
-- 
2.39.5