From: Andrew Lunn <andrew@lunn.ch>
To: Christophe Roullier <christophe.roullier@st.com>
Cc: robh@kernel.org, davem@davemloft.net, joabreu@synopsys.com,
mark.rutland@arm.com, mcoquelin.stm32@gmail.com,
alexandre.torgue@st.com, peppe.cavallaro@st.com,
linux-stm32@st-md-mailman.stormreply.com,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org
Subject: Re: [PATCH V2 net-next 1/4] net: ethernet: stmmac: Add support for syscfg clock
Date: Tue, 5 Nov 2019 18:47:53 +0100 [thread overview]
Message-ID: <20191105174753.GH17620@lunn.ch> (raw)
In-Reply-To: <20191105124505.4738-2-christophe.roullier@st.com>
On Tue, Nov 05, 2019 at 01:45:02PM +0100, Christophe Roullier wrote:
> Add optional support for syscfg clock in dwmac-stm32.c
> Now Syscfg clock is activated automatically when syscfg
> registers are used
>
> Signed-off-by: Christophe Roullier <christophe.roullier@st.com>
> ---
> .../net/ethernet/stmicro/stmmac/dwmac-stm32.c | 32 ++++++++++++-------
> 1 file changed, 21 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
> index 4ef041bdf6a1..df7e9e913041 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
> @@ -152,19 +152,24 @@ static int stm32mp1_clk_prepare(struct stm32_dwmac *dwmac, bool prepare)
> int ret = 0;
>
> if (prepare) {
> - ret = clk_prepare_enable(dwmac->syscfg_clk);
> - if (ret)
> - return ret;
> -
> + if (dwmac->syscfg_clk) {
> + ret = clk_prepare_enable(dwmac->syscfg_clk);
> + if (ret)
> + return ret;
> + }
Hi Christophe
All the clk_ API functions are happy to take a NULL point and then do
nothing. So you don't need these changes.
> - /* Clock for sysconfig */
> + /* Optional Clock for sysconfig */
> dwmac->syscfg_clk = devm_clk_get(dev, "syscfg-clk");
> if (IS_ERR(dwmac->syscfg_clk)) {
> - dev_err(dev, "No syscfg clock provided...\n");
> - return PTR_ERR(dwmac->syscfg_clk);
> + err = PTR_ERR(dwmac->syscfg_clk);
> + if (err != -ENOENT)
> + return err;
> + dwmac->syscfg_clk = NULL;
> }
>
> + err = 0;
> +
That should be all you need. Just set dwmac->syscfg_clk to NULL and
the rest should work.
Andrew
next prev parent reply other threads:[~2019-11-05 17:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-05 12:45 [PATCH V2 net-next 0/4] net: ethernet: stmmac: cleanup clock and optimization Christophe Roullier
2019-11-05 12:45 ` [PATCH V2 net-next 1/4] net: ethernet: stmmac: Add support for syscfg clock Christophe Roullier
2019-11-05 17:47 ` Andrew Lunn [this message]
2019-11-05 12:45 ` [PATCH V2 net-next 2/4] ARM: dts: stm32: remove syscfg clock on stm32mp157c ethernet Christophe Roullier
2019-11-05 12:45 ` [PATCH V2 net-next 3/4] ARM: dts: stm32: adjust slew rate for Ethernet Christophe Roullier
2019-11-05 12:45 ` [PATCH V2 net-next 4/4] ARM: dts: stm32: Enable gating of the MAC TX clock during TX low-power mode on stm32mp157c Christophe Roullier
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=20191105174753.GH17620@lunn.ch \
--to=andrew@lunn.ch \
--cc=alexandre.torgue@st.com \
--cc=christophe.roullier@st.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=joabreu@synopsys.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mark.rutland@arm.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=peppe.cavallaro@st.com \
--cc=robh@kernel.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).