From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752078AbbCTVZW (ORCPT <rfc822;w@1wt.eu>);
	Fri, 20 Mar 2015 17:25:22 -0400
Received: from mail-gw2-out.broadcom.com ([216.31.210.63]:10263 "EHLO
	mail-gw2-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751303AbbCTVZS (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 20 Mar 2015 17:25:18 -0400
X-IronPort-AV: E=Sophos;i="5.11,439,1422950400"; 
   d="scan'208";a="60016373"
From: Arun Ramamurthy <arun.ramamurthy@broadcom.com>
To: Kishon Vijay Abraham I <kishon@ti.com>, Rob Herring <robh+dt@kernel.org>,
        Pawel Moll <pawel.moll@arm.com>, Mark Rutland <mark.rutland@arm.com>,
        "Ian Campbell" <ijc+devicetree@hellion.org.uk>,
        Kumar Gala <galak@codeaurora.org>, Arnd Bergmann <arnd@arndb.de>,
        <devicetree@vger.kernel.org>
CC: <linux-arm-kernel@lists.infradead.org>,
        <bcm-kernel-feedback-list@broadcom.com>,
        <linux-kernel@vger.kernel.org>, Dmitry Torokhov <dtor@google.com>,
        Anatol Pomazau <anatol@google.com>,
        Jonathan Richardson <jonathar@broadcom.com>,
        Scott Branden <sbranden@broadcom.com>, Ray Jui <rjui@broadcom.com>,
        Arun Ramamurthy <arun.ramamurthy@broadcom.com>,
        Dmitry Torokhov <dtor@chromium.org>
Subject: [PATCH v1 1/3] phy: phy-core: allow specifying supply at port level
Date: Fri, 20 Mar 2015 14:25:25 -0700
Message-ID: <1426886727-537-2-git-send-email-arun.ramamurthy@broadcom.com>
X-Mailer: git-send-email 2.3.2
In-Reply-To: <1426886727-537-1-git-send-email-arun.ramamurthy@broadcom.com>
References: <1426886727-537-1-git-send-email-arun.ramamurthy@broadcom.com>
MIME-Version: 1.0
Content-Type: text/plain
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Multi-port phy's may have per-port power supplies. Let's change phy core
to first attempt to look up the supply at the port level, and then, if
not found, check parent device.

Reviewed-by: Ray Jui <rjui@broadcom.com>
Reviewed-by: Scott Branden <sbranden@broadcom.com>
Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
Signed-off-by: Arun Ramamurthy <arun.ramamurthy@broadcom.com>
---
 drivers/phy/phy-core.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index a12d353..b43bb6b 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -650,16 +650,6 @@ struct phy *phy_create(struct device *dev, struct device_node *node,
 		goto free_phy;
 	}
 
-	/* phy-supply */
-	phy->pwr = regulator_get_optional(dev, "phy");
-	if (IS_ERR(phy->pwr)) {
-		if (PTR_ERR(phy->pwr) == -EPROBE_DEFER) {
-			ret = -EPROBE_DEFER;
-			goto free_ida;
-		}
-		phy->pwr = NULL;
-	}
-
 	device_initialize(&phy->dev);
 	mutex_init(&phy->mutex);
 
@@ -673,6 +663,26 @@ struct phy *phy_create(struct device *dev, struct device_node *node,
 	if (ret)
 		goto put_dev;
 
+	/*
+	 * Locate phy-supply. We first try individual port and then,
+	 * if supply is not found, try parent device.
+	 */
+	phy->pwr = regulator_get_optional(&phy->dev, "phy");
+	if (IS_ERR(phy->pwr)) {
+		ret = PTR_ERR(phy->pwr);
+		if (ret == -EPROBE_DEFER)
+			goto free_ida;
+
+		phy->pwr = regulator_get_optional(phy->dev.parent, "phy");
+		if (IS_ERR(phy->pwr)) {
+			ret = PTR_ERR(phy->pwr);
+			if (ret == -EPROBE_DEFER)
+				goto free_ida;
+
+			phy->pwr = NULL;
+		}
+	}
+
 	ret = device_add(&phy->dev);
 	if (ret)
 		goto put_dev;
-- 
2.3.2