From: Gregory CLEMENT <gregory.clement@bootlin.com> To: Manu Gautam <mgautam@codeaurora.org> Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, "Mathias Nyman" <mathias.nyman@intel.com>, linux-usb@vger.kernel.org, "Andrew Lunn" <andrew@lunn.ch>, "Jason Cooper" <jason@lakedaemon.net>, "Antoine Tenart" <antoine.tenart@bootlin.com>, "Hanna Hawa" <hannah@marvell.com>, "Omri Itach" <omrii@marvell.com>, "Nadav Haklai" <nadavh@marvell.com>, "Shadi Ammouri" <shadi@marvell.com>, "Igal Liberman" <igall@marvell.com>, "Thomas Petazzoni" <thomas.petazzoni@bootlin.com>, "Miquèl Raynal" <miquel.raynal@bootlin.com>, "Marcin Wojtas" <mw@semihalf.com>, linux-arm-kernel@lists.infradead.org, "Sebastian Hesselbarth" <sebastian.hesselbarth@gmail.com> Subject: [2/2] usb: host: xhci-plat: Fix clock resource by adding a register clock Date: Wed, 28 Feb 2018 17:24:12 +0100 [thread overview] Message-ID: <87zi3tdqvn.fsf@bootlin.com> (raw) Hi Manu, On mer., févr. 28 2018, Manu Gautam <mgautam@codeaurora.org> wrote: > Hi, > > > On 2/14/2018 9:46 PM, Gregory CLEMENT wrote: >> On Armada 7K/8K we need to explicitly enable the register clock. This >> clock is optional because not all the SoCs using this IP need it but at >> least for Armada 7K/8K it is actually mandatory. >> >> The change was done at xhci-plat level and not at a xhci-mvebu.c because, >> it is expected that other SoC would have this kind of constraint. >> >> The binding documentation is updating accordingly. >> >> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> >> --- >> Documentation/devicetree/bindings/usb/usb-xhci.txt | 5 +++- >> drivers/usb/host/xhci-plat.c | 33 ++++++++++++++++++---- >> drivers/usb/host/xhci.h | 3 +- >> 3 files changed, 33 insertions(+), 8 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt >> index e2ea59bbca93..e4b14511f4f8 100644 >> --- a/Documentation/devicetree/bindings/usb/usb-xhci.txt >> +++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt >> @@ -27,7 +27,10 @@ Required properties: >> - interrupts: one XHCI interrupt should be described here. >> >> Optional properties: >> - - clocks: reference to a clock >> + - clocks: reference to the clocks >> + - clock-names: mandatory if there is a second clock, in this case >> + the name must be "core" for the first clock and "reg" for the >> + second one >> - usb2-lpm-disable: indicate if we don't want to enable USB2 HW LPM >> - usb3-lpm-capable: determines if platform is USB3 LPM capable >> - quirk-broken-port-ped: set if the controller has broken port disable mechanism >> diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c >> index 79afaac57ef6..fd0c399013a2 100644 >> --- a/drivers/usb/host/xhci-plat.c >> +++ b/drivers/usb/host/xhci-plat.c >> @@ -157,6 +157,7 @@ static int xhci_plat_probe(struct platform_device *pdev) >> struct resource *res; >> struct usb_hcd *hcd; >> struct clk *clk; >> + struct clk *reg_clk; >> int ret; >> int irq; >> >> @@ -226,17 +227,27 @@ static int xhci_plat_probe(struct platform_device *pdev) >> hcd->rsrc_len = resource_size(res); >> >> /* >> - * Not all platforms have a clk so it is not an error if the >> - * clock does not exists. >> + * Not all platforms have clks so it is not an error if the >> + * clock do not exist. >> */ >> + reg_clk = devm_clk_get(&pdev->dev, "reg"); >> + if (!IS_ERR(reg_clk)) { >> + ret = clk_prepare_enable(reg_clk); >> + if (ret) >> + goto put_hcd; >> + } else if (PTR_ERR(reg_clk) == -EPROBE_DEFER) { >> + ret = -EPROBE_DEFER; >> + goto put_hcd; >> + } >> + > > How about using clk_bulk_ APIs? I didn't know this API, but after having a look on it, it didn't match what I need. Indeed the second clock is "optional" to handle the backward compatibility. With the clk_bulk_ APIS all the clocks are mandatory. Thanks, Gregory > >> clk = devm_clk_get(&pdev->dev, NULL); >> if (!IS_ERR(clk)) { >> ret = clk_prepare_enable(clk); >> > > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: gregory.clement@bootlin.com (Gregory CLEMENT) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] usb: host: xhci-plat: Fix clock resource by adding a register clock Date: Wed, 28 Feb 2018 17:24:12 +0100 [thread overview] Message-ID: <87zi3tdqvn.fsf@bootlin.com> (raw) In-Reply-To: <da059a0e-d6f3-73e4-b58d-b3db074c0601@codeaurora.org> (Manu Gautam's message of "Wed, 28 Feb 2018 21:39:05 +0530") Hi Manu, On mer., f?vr. 28 2018, Manu Gautam <mgautam@codeaurora.org> wrote: > Hi, > > > On 2/14/2018 9:46 PM, Gregory CLEMENT wrote: >> On Armada 7K/8K we need to explicitly enable the register clock. This >> clock is optional because not all the SoCs using this IP need it but at >> least for Armada 7K/8K it is actually mandatory. >> >> The change was done at xhci-plat level and not at a xhci-mvebu.c because, >> it is expected that other SoC would have this kind of constraint. >> >> The binding documentation is updating accordingly. >> >> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> >> --- >> Documentation/devicetree/bindings/usb/usb-xhci.txt | 5 +++- >> drivers/usb/host/xhci-plat.c | 33 ++++++++++++++++++---- >> drivers/usb/host/xhci.h | 3 +- >> 3 files changed, 33 insertions(+), 8 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt >> index e2ea59bbca93..e4b14511f4f8 100644 >> --- a/Documentation/devicetree/bindings/usb/usb-xhci.txt >> +++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt >> @@ -27,7 +27,10 @@ Required properties: >> - interrupts: one XHCI interrupt should be described here. >> >> Optional properties: >> - - clocks: reference to a clock >> + - clocks: reference to the clocks >> + - clock-names: mandatory if there is a second clock, in this case >> + the name must be "core" for the first clock and "reg" for the >> + second one >> - usb2-lpm-disable: indicate if we don't want to enable USB2 HW LPM >> - usb3-lpm-capable: determines if platform is USB3 LPM capable >> - quirk-broken-port-ped: set if the controller has broken port disable mechanism >> diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c >> index 79afaac57ef6..fd0c399013a2 100644 >> --- a/drivers/usb/host/xhci-plat.c >> +++ b/drivers/usb/host/xhci-plat.c >> @@ -157,6 +157,7 @@ static int xhci_plat_probe(struct platform_device *pdev) >> struct resource *res; >> struct usb_hcd *hcd; >> struct clk *clk; >> + struct clk *reg_clk; >> int ret; >> int irq; >> >> @@ -226,17 +227,27 @@ static int xhci_plat_probe(struct platform_device *pdev) >> hcd->rsrc_len = resource_size(res); >> >> /* >> - * Not all platforms have a clk so it is not an error if the >> - * clock does not exists. >> + * Not all platforms have clks so it is not an error if the >> + * clock do not exist. >> */ >> + reg_clk = devm_clk_get(&pdev->dev, "reg"); >> + if (!IS_ERR(reg_clk)) { >> + ret = clk_prepare_enable(reg_clk); >> + if (ret) >> + goto put_hcd; >> + } else if (PTR_ERR(reg_clk) == -EPROBE_DEFER) { >> + ret = -EPROBE_DEFER; >> + goto put_hcd; >> + } >> + > > How about using clk_bulk_ APIs? I didn't know this API, but after having a look on it, it didn't match what I need. Indeed the second clock is "optional" to handle the backward compatibility. With the clk_bulk_ APIS all the clocks are mandatory. Thanks, Gregory > >> clk = devm_clk_get(&pdev->dev, NULL); >> if (!IS_ERR(clk)) { >> ret = clk_prepare_enable(clk); >> > > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- Gregory Clement, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering http://bootlin.com
next reply other threads:[~2018-02-28 16:24 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-02-28 16:24 Gregory CLEMENT [this message] 2018-02-28 16:24 ` [PATCH 2/2] usb: host: xhci-plat: Fix clock resource by adding a register clock Gregory CLEMENT -- strict thread matches above, loose matches on Subject: below -- 2018-03-14 15:56 [2/2] " Gregory CLEMENT 2018-03-14 15:56 ` [PATCH 2/2] " Gregory CLEMENT 2018-02-28 16:09 [2/2] " Manu Gautam 2018-02-28 16:09 ` [PATCH 2/2] " Manu Gautam 2018-02-14 16:16 [1/2] usb: host: xhci-plat: Remove useless test before clk_disable_unprepare Gregory CLEMENT 2018-02-14 16:16 ` [PATCH 1/2] " Gregory CLEMENT 2018-02-14 16:16 [PATCH 0/2] Allow xhci-plat using a second clock Gregory CLEMENT 2018-02-14 16:16 ` [2/2] usb: host: xhci-plat: Fix clock resource by adding a register clock Gregory CLEMENT 2018-02-14 16:16 ` [PATCH 2/2] " Gregory CLEMENT 2018-02-28 16:05 ` [2/2] " Mathias Nyman 2018-02-28 16:05 ` [PATCH 2/2] " Mathias Nyman 2018-03-13 10:58 ` Gregory CLEMENT 2018-02-28 14:02 ` [PATCH 0/2] Allow xhci-plat using a second clock Gregory CLEMENT 2018-04-18 14:20 ` Gregory CLEMENT 2018-04-19 5:59 ` Mathias Nyman 2018-04-19 13:43 ` Gregory CLEMENT
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=87zi3tdqvn.fsf@bootlin.com \ --to=gregory.clement@bootlin.com \ --cc=andrew@lunn.ch \ --cc=antoine.tenart@bootlin.com \ --cc=gregkh@linuxfoundation.org \ --cc=hannah@marvell.com \ --cc=igall@marvell.com \ --cc=jason@lakedaemon.net \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-usb@vger.kernel.org \ --cc=mathias.nyman@intel.com \ --cc=mgautam@codeaurora.org \ --cc=miquel.raynal@bootlin.com \ --cc=mw@semihalf.com \ --cc=nadavh@marvell.com \ --cc=omrii@marvell.com \ --cc=sebastian.hesselbarth@gmail.com \ --cc=shadi@marvell.com \ --cc=thomas.petazzoni@bootlin.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.