From: Kishon Vijay Abraham I <kishon@ti.com>
To: <gregkh@linuxfoundation.org>
Cc: <kishon@ti.com>, <linux-kernel@vger.kernel.org>
Subject: [PATCH 12/28] phy: core: Support regulator supply for PHY power
Date: Tue, 22 Jul 2014 16:26:35 +0530 [thread overview]
Message-ID: <1406026611-30493-13-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1406026611-30493-1-git-send-email-kishon@ti.com>
From: Roger Quadros <rogerq@ti.com>
Some PHYs can be powered by an external power regulator.
e.g. USB_HS PHY on DRA7 SoC. Make the PHY core support a
power regulator.
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
drivers/phy/phy-core.c | 26 ++++++++++++++++++++++++++
include/linux/phy/phy.h | 2 ++
2 files changed, 28 insertions(+)
diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index 49c4465..75c9739 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -21,6 +21,7 @@
#include <linux/phy/phy.h>
#include <linux/idr.h>
#include <linux/pm_runtime.h>
+#include <linux/regulator/consumer.h>
static struct class *phy_class;
static DEFINE_MUTEX(phy_provider_mutex);
@@ -226,6 +227,12 @@ int phy_power_on(struct phy *phy)
if (!phy)
return 0;
+ if (phy->pwr) {
+ ret = regulator_enable(phy->pwr);
+ if (ret)
+ return ret;
+ }
+
ret = phy_pm_runtime_get_sync(phy);
if (ret < 0 && ret != -ENOTSUPP)
return ret;
@@ -247,6 +254,8 @@ int phy_power_on(struct phy *phy)
out:
mutex_unlock(&phy->mutex);
phy_pm_runtime_put_sync(phy);
+ if (phy->pwr)
+ regulator_disable(phy->pwr);
return ret;
}
@@ -272,6 +281,9 @@ int phy_power_off(struct phy *phy)
mutex_unlock(&phy->mutex);
phy_pm_runtime_put(phy);
+ if (phy->pwr)
+ regulator_disable(phy->pwr);
+
return 0;
}
EXPORT_SYMBOL_GPL(phy_power_off);
@@ -588,6 +600,16 @@ struct phy *phy_create(struct device *dev, const struct phy_ops *ops,
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);
@@ -617,6 +639,9 @@ put_dev:
put_device(&phy->dev); /* calls phy_release() which frees resources */
return ERR_PTR(ret);
+free_ida:
+ ida_simple_remove(&phy_ida, phy->id);
+
free_phy:
kfree(phy);
return ERR_PTR(ret);
@@ -800,6 +825,7 @@ static void phy_release(struct device *dev)
phy = to_phy(dev);
dev_vdbg(dev, "releasing '%s'\n", dev_name(dev));
+ regulator_put(phy->pwr);
ida_simple_remove(&phy_ida, phy->id);
kfree(phy);
}
diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h
index 2760744..9a86945 100644
--- a/include/linux/phy/phy.h
+++ b/include/linux/phy/phy.h
@@ -18,6 +18,7 @@
#include <linux/of.h>
#include <linux/device.h>
#include <linux/pm_runtime.h>
+#include <linux/regulator/consumer.h>
struct phy;
@@ -65,6 +66,7 @@ struct phy {
int init_count;
int power_count;
struct phy_attrs attrs;
+ struct regulator *pwr;
};
/**
--
1.7.9.5
next prev parent reply other threads:[~2014-07-22 10:57 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-22 10:56 [GIT PULL 00/28] PHY: for 3.17 Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 01/28] phy: miphy365x: Add MiPHY365x header file for DT x Driver defines Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 02/28] phy: exynos-dp-video: Use PTR_ERR_OR_ZERO Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 03/28] phy: exynos-mipi-video: " Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 04/28] phy: sun4i-usb: " Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 05/28] phy: exynos5-usbdrd: Make local functions static Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 06/28] phy: phy-samsung-usb2: Change phy power on/power off sequence Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 07/28] phy: phy-omap-pipe3: Add support for PCIe PHY Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 08/28] phy: pipe3: insert delay to enumerate in GEN2 mode Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 09/28] Documentation: Document Hisilicon hix5hd2 sata PHY Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 10/28] phy: add hix5hd2-sata-phy driver Kishon Vijay Abraham I
2014-07-24 11:27 ` Paul Bolle
2014-07-22 10:56 ` [PATCH 11/28] drivers: phy: exynos-usb2: add support for Exynos 3250 Kishon Vijay Abraham I
2014-07-22 10:56 ` Kishon Vijay Abraham I [this message]
2014-07-22 10:56 ` [PATCH 13/28] phy: core: Add phy-supply to DT binding documentation Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 14/28] phy: Kconfig: Re-organize Exynos USB 2.0 PHY configs Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 15/28] phy: Kconfig: Update config for Exynos USB DRD Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 16/28] phy: qcom: Add driver for QCOM APQ8064 SATA PHY Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 17/28] phy: qcom: Add APQ8064 SATA PHY device tree bindings Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 18/28] phy: Remove ARCH_KIRKWOOD dependency Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 19/28] phy: add a driver for the Berlin SATA PHY Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 20/28] Documentation: bindings: add " Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 21/28] phy: core: Fix of_phy_provider_lookup to return PHY provider for sub node Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 22/28] phy: core: Let node ptr of PHY point to PHY and not of PHY provider Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 23/28] phy: qcom-apq8064: fix possible timeout without check Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 24/28] phy: qcom: Add driver for QCOM IPQ806x SATA PHY Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 25/28] phy: qcom: Add device tree bindings for " Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 26/28] phy: miphy365x: Add Device Tree bindings for the MiPHY365x Kishon Vijay Abraham I
2014-07-22 10:56 ` [PATCH 27/28] phy: miphy365x: Provide support for the MiPHY356x Generic PHY Kishon Vijay Abraham I
2014-07-24 10:36 ` Paul Bolle
2014-07-22 10:56 ` [PATCH 28/28] phy: miphy365x: Represent each PHY channel as a DT subnode Kishon Vijay Abraham I
2014-07-22 23:33 ` [GIT PULL 00/28] PHY: for 3.17 Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1406026611-30493-13-git-send-email-kishon@ti.com \
--to=kishon@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®