From: Peter Senna Tschudin <peter.senna@collabora.com>
To: unlisted-recipients:; (no To-header on input)
Cc: Peter Senna Tschudin <peter.senna@collabora.com>,
Peter Chen <peter.chen@nxp.com>,
Stephen Boyd <sboyd@codeaurora.org>,
Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>,
Felipe Balbi <balbi@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org (open list:USB PHY LAYER),
linux-kernel@vger.kernel.org (open list)
Subject: [RFC] usb-phy-generic: Add support to SMSC USB3315
Date: Wed, 19 Apr 2017 08:14:13 +0200 [thread overview]
Message-ID: <20170419061413.20961-1-peter.senna@collabora.com> (raw)
We need the SMSC USB3315 clock and regulator to always be initialized.
We also need the PHY driver to take the PHY out of reset. This patch
extends the existing USB generic nop phy driver to include a new
initialization path.
A new compatible string "smsc,usb3315" is used to decide which
initialization path to use.
CC: Peter Chen <peter.chen@nxp.com>
CC: Stephen Boyd <sboyd@codeaurora.org>
CC: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
Signed-off-by: Peter Senna Tschudin <peter.senna@collabora.com>
---
This is a follow-up of previous discussion:
https://www.spinics.net/lists/linux-usb/msg146680.html
drivers/usb/phy/phy-generic.c | 33 +++++++++++++++++++++++++++++----
drivers/usb/phy/phy-generic.h | 1 +
2 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/phy/phy-generic.c b/drivers/usb/phy/phy-generic.c
index 89d6e7a..6ea9ce4 100644
--- a/drivers/usb/phy/phy-generic.c
+++ b/drivers/usb/phy/phy-generic.c
@@ -151,6 +151,9 @@ int usb_gen_phy_init(struct usb_phy *phy)
struct usb_phy_generic *nop = dev_get_drvdata(phy->dev);
int ret;
+ if (nop->init_done)
+ return 0;
+
if (!IS_ERR(nop->vcc)) {
if (regulator_enable(nop->vcc))
dev_err(phy->dev, "Failed to enable power\n");
@@ -164,6 +167,8 @@ int usb_gen_phy_init(struct usb_phy *phy)
nop_reset(nop);
+ nop->init_done = true;
+
return 0;
}
EXPORT_SYMBOL_GPL(usb_gen_phy_init);
@@ -216,18 +221,29 @@ static int nop_set_host(struct usb_otg *otg, struct usb_bus *host)
otg->host = host;
return 0;
}
+int smsc_usb3315_init(struct usb_phy_generic *nop)
+{
+ /*
+ * If the gpio for controlling reset state is not available, try again
+ * later
+ */
+ if(!nop->gpiod_reset)
+ return -EPROBE_DEFER;
+
+ return usb_gen_phy_init(&nop->phy);
+}
int usb_phy_gen_create_phy(struct device *dev, struct usb_phy_generic *nop,
struct usb_phy_generic_platform_data *pdata)
{
+ struct device_node *node = NULL;
enum usb_phy_type type = USB_PHY_TYPE_USB2;
int err = 0;
-
u32 clk_rate = 0;
bool needs_vcc = false;
if (dev->of_node) {
- struct device_node *node = dev->of_node;
+ node = dev->of_node;
if (of_property_read_u32(node, "clock-frequency", &clk_rate))
clk_rate = 0;
@@ -304,6 +320,12 @@ int usb_phy_gen_create_phy(struct device *dev, struct usb_phy_generic *nop,
nop->phy.otg->set_host = nop_set_host;
nop->phy.otg->set_peripheral = nop_set_peripheral;
+ if(node && of_device_is_compatible(node, "smsc,usb3315")) {
+ err = smsc_usb3315_init(nop);
+ if (err)
+ return err;
+ }
+
return 0;
}
EXPORT_SYMBOL_GPL(usb_phy_gen_create_phy);
@@ -318,6 +340,10 @@ static int usb_phy_generic_probe(struct platform_device *pdev)
if (!nop)
return -ENOMEM;
+ platform_set_drvdata(pdev, nop);
+
+ nop->init_done = false;
+
err = usb_phy_gen_create_phy(dev, nop, dev_get_platdata(&pdev->dev));
if (err)
return err;
@@ -346,8 +372,6 @@ static int usb_phy_generic_probe(struct platform_device *pdev)
return err;
}
- platform_set_drvdata(pdev, nop);
-
return 0;
}
@@ -362,6 +386,7 @@ static int usb_phy_generic_remove(struct platform_device *pdev)
static const struct of_device_id nop_xceiv_dt_ids[] = {
{ .compatible = "usb-nop-xceiv" },
+ { .compatible = "smsc,usb3315" },
{ }
};
diff --git a/drivers/usb/phy/phy-generic.h b/drivers/usb/phy/phy-generic.h
index 0d0eadd..db4ade6 100644
--- a/drivers/usb/phy/phy-generic.h
+++ b/drivers/usb/phy/phy-generic.h
@@ -14,6 +14,7 @@ struct usb_phy_generic {
struct gpio_desc *gpiod_vbus;
struct regulator *vbus_draw;
bool vbus_draw_enabled;
+ bool init_done;
unsigned long mA;
unsigned int vbus;
};
--
2.9.3
next reply other threads:[~2017-04-19 6:14 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-19 6:14 Peter Senna Tschudin [this message]
2017-04-19 10:03 ` [RFC] usb-phy-generic: Add support to SMSC USB3315 Sergei Shtylyov
2017-04-19 10:24 ` Peter Senna Tschudin
2017-04-19 17:23 ` Sergei Shtylyov
2017-04-20 8:50 ` Peter Chen
2017-05-23 18:16 ` Fabien Lahoudere
2017-05-23 21:00 ` Stephen Boyd
2017-05-25 10:36 ` Fabien Lahoudere
2017-05-26 9:00 ` Fabien Lahoudere
2017-06-02 22:00 ` Stephen Boyd
2017-06-05 8:57 ` Fabien Lahoudere
2017-06-05 9:43 ` Peter Chen
2017-06-05 9:52 ` Fabien Lahoudere
2017-06-06 1:55 ` Peter Chen
2017-06-06 17:36 ` Fabien Lahoudere
2017-06-07 1:43 ` Peter Chen
2017-06-07 15:00 ` Fabien Lahoudere
2017-06-08 12:27 ` Fabien Lahoudere
2017-06-09 8:26 ` Peter Chen
2017-06-09 11:17 ` Fabien Lahoudere
2017-06-12 1:20 ` Peter Chen
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=20170419061413.20961-1-peter.senna@collabora.com \
--to=peter.senna@collabora.com \
--cc=balbi@kernel.org \
--cc=fabien.lahoudere@collabora.co.uk \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=peter.chen@nxp.com \
--cc=sboyd@codeaurora.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).