* usb: uhci: Add clk support to uhci-platform
@ 2018-01-12 5:51 Benjamin Herrenschmidt
0 siblings, 0 replies; 3+ messages in thread
From: Benjamin Herrenschmidt @ 2018-01-12 5:51 UTC (permalink / raw)
To: Alan Stern; +Cc: linux-usb, Greg KH
The Aspeed SoCs use uhci-platform. With the new dynamic clock
control framework, the corresponding IP block clock must be
properly enabled.
This is a simplified variant of what ehci-platform does, it
looks for *one* clock attached to the device, and if it's
there, enables it.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
drivers/usb/host/uhci-hcd.h | 3 +++
drivers/usb/host/uhci-platform.c | 15 +++++++++++++++
2 files changed, 18 insertions(+)
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/usb/host/uhci-hcd.h b/drivers/usb/host/uhci-hcd.h
index f1cc47292a59..7f9f33c8c232 100644
--- a/drivers/usb/host/uhci-hcd.h
+++ b/drivers/usb/host/uhci-hcd.h
@@ -4,6 +4,7 @@
#include <linux/list.h>
#include <linux/usb.h>
+#include <linux/clk.h>
#define usb_packetid(pipe) (usb_pipein(pipe) ? USB_PID_IN : USB_PID_OUT)
#define PIPE_DEVEP_MASK 0x0007ff00
@@ -447,6 +448,8 @@ struct uhci_hcd {
int total_load; /* Sum of array values */
short load[MAX_PHASE]; /* Periodic allocations */
+ struct clk *clk; /* (optional) clock source */
+
/* Reset host controller */
void (*reset_hc) (struct uhci_hcd *uhci);
int (*check_and_reset_hc) (struct uhci_hcd *uhci);
diff --git a/drivers/usb/host/uhci-platform.c b/drivers/usb/host/uhci-platform.c
index 6cb16d4b2257..7d959071f92b 100644
--- a/drivers/usb/host/uhci-platform.c
+++ b/drivers/usb/host/uhci-platform.c
@@ -119,6 +119,21 @@ static int uhci_hcd_platform_probe(struct platform_device *pdev)
"Enabled Aspeed implementation workarounds\n");
}
}
+
+ /* Get and enable clock if any specified */
+ uhci->clk = devm_clk_get(&pdev->dev, NULL);
+ if (IS_ERR(uhci->clk)) {
+ ret = PTR_ERR(uhci->clk);
+ goto err_rmr;
+ }
+ if (uhci->clk) {
+ ret = clk_prepare_enable(uhci->clk);
+ if (ret) {
+ dev_err(&pdev->dev, "Error couldn't enable clock (%d)\n", ret);
+ goto err_rmr;
+ }
+ }
+
ret = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_SHARED);
if (ret)
goto err_rmr;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* usb: uhci: Add clk support to uhci-platform
@ 2018-01-12 7:35 Sergei Shtylyov
0 siblings, 0 replies; 3+ messages in thread
From: Sergei Shtylyov @ 2018-01-12 7:35 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Alan Stern; +Cc: linux-usb, Greg KH
Hello!
On 1/12/2018 8:51 AM, Benjamin Herrenschmidt wrote:
> The Aspeed SoCs use uhci-platform. With the new dynamic clock
> control framework, the corresponding IP block clock must be
> properly enabled.
>
> This is a simplified variant of what ehci-platform does, it
> looks for *one* clock attached to the device, and if it's
> there, enables it.
>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
[...]
> diff --git a/drivers/usb/host/uhci-platform.c b/drivers/usb/host/uhci-platform.c
> index 6cb16d4b2257..7d959071f92b 100644
> --- a/drivers/usb/host/uhci-platform.c
> +++ b/drivers/usb/host/uhci-platform.c
> @@ -119,6 +119,21 @@ static int uhci_hcd_platform_probe(struct platform_device *pdev)
> "Enabled Aspeed implementation workarounds\n");
> }
> }
> +
> + /* Get and enable clock if any specified */
> + uhci->clk = devm_clk_get(&pdev->dev, NULL);
> + if (IS_ERR(uhci->clk)) {
> + ret = PTR_ERR(uhci->clk);
> + goto err_rmr;
> + }
Indent with tabs as elsewhere, please.
> + if (uhci->clk) {
> + ret = clk_prepare_enable(uhci->clk);
> + if (ret) {
> + dev_err(&pdev->dev, "Error couldn't enable clock (%d)\n", ret);
> + goto err_rmr;
> + }
> + }
> +
> ret = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_SHARED);
> if (ret)
> goto err_rmr;
>
[...]
MBR, Segei
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* usb: uhci: Add clk support to uhci-platform
@ 2018-01-12 22:27 Benjamin Herrenschmidt
0 siblings, 0 replies; 3+ messages in thread
From: Benjamin Herrenschmidt @ 2018-01-12 22:27 UTC (permalink / raw)
To: Sergei Shtylyov, Alan Stern; +Cc: linux-usb, Greg KH
On Fri, 2018-01-12 at 10:35 +0300, Sergei Shtylyov wrote:
> Hello!
>
> On 1/12/2018 8:51 AM, Benjamin Herrenschmidt wrote:
>
> > The Aspeed SoCs use uhci-platform. With the new dynamic clock
> > control framework, the corresponding IP block clock must be
> > properly enabled.
> >
> > This is a simplified variant of what ehci-platform does, it
> > looks for *one* clock attached to the device, and if it's
> > there, enables it.
> >
> > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
>
> [...]
> > diff --git a/drivers/usb/host/uhci-platform.c b/drivers/usb/host/uhci-platform.c
> > index 6cb16d4b2257..7d959071f92b 100644
> > --- a/drivers/usb/host/uhci-platform.c
> > +++ b/drivers/usb/host/uhci-platform.c
> > @@ -119,6 +119,21 @@ static int uhci_hcd_platform_probe(struct platform_device *pdev)
> > "Enabled Aspeed implementation workarounds\n");
> > }
> > }
> > +
> > + /* Get and enable clock if any specified */
> > + uhci->clk = devm_clk_get(&pdev->dev, NULL);
> > + if (IS_ERR(uhci->clk)) {
> > + ret = PTR_ERR(uhci->clk);
> > + goto err_rmr;
> > + }
>
> Indent with tabs as elsewhere, please.
Oops, there should have been, I suppose a copy/paste brought spaces
from the original file ;-) I'll fix that.
> > + if (uhci->clk) {
> > + ret = clk_prepare_enable(uhci->clk);
> > + if (ret) {
> > + dev_err(&pdev->dev, "Error couldn't enable clock (%d)\n", ret);
> > + goto err_rmr;
> > + }
> > + }
> > +
> > ret = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_SHARED);
> > if (ret)
> > goto err_rmr;
> >
>
> [...]
>
> MBR, Segei
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-01-12 22:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-12 5:51 usb: uhci: Add clk support to uhci-platform Benjamin Herrenschmidt
-- strict thread matches above, loose matches on Subject: below --
2018-01-12 7:35 Sergei Shtylyov
2018-01-12 22:27 Benjamin Herrenschmidt
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).