mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Fabio Baltieri <fabio.baltieri@linaro.org>
To: Felipe Balbi <balbi@ti.com>
Cc: Linus Walleij <linus.walleij@linaro.org>,
	Praveena Nadahally <praveen.nadahally@stericsson.com>,
	linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org,
	Fabio Baltieri <fabio.baltieri@linaro.org>
Subject: [PATCH 05/12] usb: phy: ab8500-usb: add regulator support
Date: Wed,  3 Apr 2013 10:45:06 +0200	[thread overview]
Message-ID: <1364978713-19612-6-git-send-email-fabio.baltieri@linaro.org> (raw)
In-Reply-To: <1364978713-19612-1-git-send-email-fabio.baltieri@linaro.org>

Add initial regulator support to ab8500-usb by introducing necessary
devm_regulator_get().

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
---
 drivers/usb/phy/phy-ab8500-usb.c | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/drivers/usb/phy/phy-ab8500-usb.c b/drivers/usb/phy/phy-ab8500-usb.c
index 1fd0780..4caa820 100644
--- a/drivers/usb/phy/phy-ab8500-usb.c
+++ b/drivers/usb/phy/phy-ab8500-usb.c
@@ -32,6 +32,7 @@
 #include <linux/mfd/abx500.h>
 #include <linux/mfd/abx500/ab8500.h>
 #include <linux/usb/musb-ux500.h>
+#include <linux/regulator/consumer.h>
 
 /* Bank AB8500_SYS_CTRL2_BLOCK */
 #define AB8500_MAIN_WD_CTRL_REG 0x01
@@ -126,6 +127,9 @@ struct ab8500_usb {
 	struct work_struct phy_dis_work;
 	unsigned long link_status_wait;
 	enum ab8500_usb_mode mode;
+	struct regulator *v_ape;
+	struct regulator *v_musb;
+	struct regulator *v_ulpi;
 	int previous_link_status_state;
 };
 
@@ -589,6 +593,34 @@ static int ab8500_usb_set_host(struct usb_otg *otg, struct usb_bus *host)
 	return 0;
 }
 
+static int ab8500_usb_regulator_get(struct ab8500_usb *ab)
+{
+	int err;
+
+	ab->v_ape = devm_regulator_get(ab->dev, "v-ape");
+	if (IS_ERR(ab->v_ape)) {
+		dev_err(ab->dev, "Could not get v-ape supply\n");
+		err = PTR_ERR(ab->v_ape);
+		return err;
+	}
+
+	ab->v_ulpi = devm_regulator_get(ab->dev, "vddulpivio18");
+	if (IS_ERR(ab->v_ulpi)) {
+		dev_err(ab->dev, "Could not get vddulpivio18 supply\n");
+		err = PTR_ERR(ab->v_ulpi);
+		return err;
+	}
+
+	ab->v_musb = devm_regulator_get(ab->dev, "musb_1v8");
+	if (IS_ERR(ab->v_musb)) {
+		dev_err(ab->dev, "Could not get musb_1v8 supply\n");
+		err = PTR_ERR(ab->v_musb);
+		return err;
+	}
+
+	return 0;
+}
+
 static int ab8500_usb_irq_setup(struct platform_device *pdev,
 		struct ab8500_usb *ab)
 {
@@ -686,6 +718,10 @@ static int ab8500_usb_probe(struct platform_device *pdev)
 	/* all: Disable phy when called from set_host and set_peripheral */
 	INIT_WORK(&ab->phy_dis_work, ab8500_usb_phy_disable_work);
 
+	err = ab8500_usb_regulator_get(ab);
+	if (err)
+		return err;
+
 	err = ab8500_usb_irq_setup(pdev, ab);
 	if (err < 0)
 		return err;
-- 
1.8.1.3


  parent reply	other threads:[~2013-04-03  8:47 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-03  8:45 [PATCH 00/12] second set of musb-ux500 and ab8500-usb updates Fabio Baltieri
2013-04-03  8:45 ` [PATCH 01/12] usb: musb: ux500_dma: drop references to U5500 Fabio Baltieri
2013-04-03  8:45 ` [PATCH 02/12] usb: phy: ab8500-usb: convert to devm_kzalloc Fabio Baltieri
2013-04-03  8:45 ` [PATCH 03/12] usb: phy: ab8500-usb: set phy tuning values Fabio Baltieri
2013-04-03  8:45 ` [PATCH 04/12] usb: phy: ab8500-usb: fix eye diagram for ab8500 v2.0 Fabio Baltieri
2013-04-03  8:53   ` Felipe Balbi
2013-04-03  8:58     ` Felipe Balbi
2013-04-03  9:12       ` Fabio Baltieri
2013-04-03  9:35         ` Felipe Balbi
2013-04-03  8:45 ` Fabio Baltieri [this message]
2013-04-03  8:45 ` [PATCH 06/12] usb: phy: ab8500-usb: split ab8500_usb_phy_ctrl Fabio Baltieri
2013-04-03  8:45 ` [PATCH 07/12] usb: phy: ab8500-usb: enable/disable regulator on phy events Fabio Baltieri
2013-04-03  8:45 ` [PATCH 08/12] usb: phy: ab8500-usb: fix unbalanced clock and regulator disable warnings Fabio Baltieri
2013-04-03  8:45 ` [PATCH 09/12] usb: phy: ab8500-usb: fix last notifier arguments Fabio Baltieri
2013-04-03  8:45 ` [PATCH 10/12] usb: phy: ab8500-usb: adopt pinctrl support Fabio Baltieri
2013-04-03  8:45 ` [PATCH 11/12] usb: phy: ab8500-usb: drop link status delayed work Fabio Baltieri
2013-04-03  8:45 ` [PATCH 12/12] usb: phy: ab8500-usb: call phy_dis_work only when necessary Fabio Baltieri

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=1364978713-19612-6-git-send-email-fabio.baltieri@linaro.org \
    --to=fabio.baltieri@linaro.org \
    --cc=balbi@ti.com \
    --cc=linus.walleij@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=praveen.nadahally@stericsson.com \
    /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®