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@xxxxxx>
> ---
> .../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
