From: peter.chen@freescale.com (Peter Chen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v13 02/14] usb: chipidea: imx: remove vbus regulator operation
Date: Fri, 26 Jul 2013 17:18:18 +0800 [thread overview]
Message-ID: <1374830310-21765-3-git-send-email-peter.chen@freescale.com> (raw)
In-Reply-To: <1374830310-21765-1-git-send-email-peter.chen@freescale.com>
Since we have added vbus reguatlor operation at common
host file (chipidea/host.c), the glue layer vbus operation
isn't needed any more.
Tested-by: Marek Vasut <marex@denx.de>
Signed-off-by: Peter Chen <peter.chen@freescale.com>
---
drivers/usb/chipidea/ci_hdrc_imx.c | 30 +++++++-----------------------
1 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index 14362c0..d06355e 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -31,7 +31,6 @@ struct ci_hdrc_imx_data {
struct usb_phy *phy;
struct platform_device *ci_pdev;
struct clk *clk;
- struct regulator *reg_vbus;
};
static const struct usbmisc_ops *usbmisc_ops;
@@ -141,22 +140,13 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
goto err_clk;
}
- /* we only support host now, so enable vbus here */
- data->reg_vbus = devm_regulator_get(&pdev->dev, "vbus");
- if (!IS_ERR(data->reg_vbus)) {
- ret = regulator_enable(data->reg_vbus);
- if (ret) {
- dev_err(&pdev->dev,
- "Failed to enable vbus regulator, err=%d\n",
- ret);
- goto err_clk;
- }
- } else {
- data->reg_vbus = NULL;
- }
-
pdata.phy = data->phy;
+ /* Get the vbus regulator */
+ pdata.reg_vbus = devm_regulator_get(&pdev->dev, "vbus");
+ if (IS_ERR(pdata.reg_vbus))
+ pdata.reg_vbus = NULL;
+
if (!pdev->dev.dma_mask)
pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
if (!pdev->dev.coherent_dma_mask)
@@ -167,7 +157,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
if (ret) {
dev_err(&pdev->dev,
"usbmisc init failed, ret=%d\n", ret);
- goto err;
+ goto err_clk;
}
}
@@ -179,7 +169,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
dev_err(&pdev->dev,
"Can't register ci_hdrc platform device, err=%d\n",
ret);
- goto err;
+ goto err_clk;
}
if (usbmisc_ops && usbmisc_ops->post) {
@@ -200,9 +190,6 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
disable_device:
ci_hdrc_remove_device(data->ci_pdev);
-err:
- if (data->reg_vbus)
- regulator_disable(data->reg_vbus);
err_clk:
clk_disable_unprepare(data->clk);
return ret;
@@ -215,9 +202,6 @@ static int ci_hdrc_imx_remove(struct platform_device *pdev)
pm_runtime_disable(&pdev->dev);
ci_hdrc_remove_device(data->ci_pdev);
- if (data->reg_vbus)
- regulator_disable(data->reg_vbus);
-
if (data->phy) {
usb_phy_shutdown(data->phy);
module_put(data->phy->dev->driver->owner);
--
1.7.0.4
next prev parent reply other threads:[~2013-07-26 9:18 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-26 9:18 [PATCH v13 00/14] Add tested id switch and vbus connect detect support for Chipidea Peter Chen
2013-07-26 9:18 ` [PATCH v13 01/14] usb: chipidea: add vbus regulator control Peter Chen
2013-07-26 9:18 ` Peter Chen [this message]
2013-07-29 22:30 ` [PATCH v13 02/14] usb: chipidea: imx: remove vbus regulator operation Michael Grzeschik
2013-07-30 1:46 ` Peter Chen
2013-07-26 9:18 ` [PATCH v13 03/14] usb: chipidea: imx: add return value check for devm_regulator_get Peter Chen
2013-07-29 22:47 ` Michael Grzeschik
2013-07-30 1:50 ` Peter Chen
2013-07-26 9:18 ` [PATCH v13 04/14] usb: chipidea: udc: otg_set_peripheral is useless for some chipidea users Peter Chen
2013-07-26 9:18 ` [PATCH v13 05/14] usb: chipidea: otg: Add otg file used to access otgsc Peter Chen
2013-07-26 9:18 ` [PATCH v13 06/14] usb: chipidea: Add role init and destory APIs Peter Chen
2013-07-26 9:18 ` [PATCH v13 07/14] usb: chipidea: add flag CI_HDRC_DUAL_ROLE_NOT_OTG Peter Chen
2013-07-26 9:18 ` [PATCH v13 08/14] usb: chipidea: disable all interrupts and clear all interrupts status Peter Chen
2013-07-26 9:18 ` [PATCH v13 09/14] usb: chipidea: move otg relate things to otg file Peter Chen
2013-07-26 9:18 ` [PATCH v13 10/14] usb: chipidea: add vbus interrupt handler Peter Chen
2013-07-26 9:18 ` [PATCH v13 11/14] usb: chipidea: add wait vbus lower than OTGSC_BSV before role starts Peter Chen
2013-07-26 9:18 ` [PATCH v13 12/14] usb: chipidea: udc: misuse flag CI_HDRC_REGS_SHARED and CI_HDRC_PULLUP_ON_VBUS Peter Chen
2013-07-26 9:18 ` [PATCH v13 13/14] usb: chipidea: udc: .pullup is valid when vbus is on at CI_HDRC_PULLUP_ON_VBUS Peter Chen
2013-07-26 9:18 ` [PATCH v13 14/14] usb: chipidea: udc: fix the oops when plugs in usb cable after rmmod gadget Peter Chen
2013-07-31 14:14 ` [PATCH v13 00/14] Add tested id switch and vbus connect detect support for Chipidea Chen Peter-B29397
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=1374830310-21765-3-git-send-email-peter.chen@freescale.com \
--to=peter.chen@freescale.com \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).