Skip to content

Commit 16724d6

Browse files
lweiss-fairphonegregkh
authored andcommitted
nvmem: qfprom: Mark core clk as optional
On some platforms like sc7280 on non-ChromeOS devices the core clock cannot be touched by Linux so we cannot provide it. Mark it as optional as accessing qfprom for reading works without it but we still prohibit writing if we cannot provide the clock. Signed-off-by: Luca Weiss <luca.weiss@fairphone.com> Reviewed-by: Douglas Anderson <dianders@chromium.org> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Link: https://lore.kernel.org/r/20231020105545.216052-2-srinivas.kandagatla@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 2399cde commit 16724d6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/nvmem/qfprom.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -423,12 +423,12 @@ static int qfprom_probe(struct platform_device *pdev)
423423
if (IS_ERR(priv->vcc))
424424
return PTR_ERR(priv->vcc);
425425

426-
priv->secclk = devm_clk_get(dev, "core");
426+
priv->secclk = devm_clk_get_optional(dev, "core");
427427
if (IS_ERR(priv->secclk))
428428
return dev_err_probe(dev, PTR_ERR(priv->secclk), "Error getting clock\n");
429429

430-
/* Only enable writing if we have SoC data. */
431-
if (priv->soc_data)
430+
/* Only enable writing if we have SoC data and a valid clock */
431+
if (priv->soc_data && priv->secclk)
432432
econfig.reg_write = qfprom_reg_write;
433433
}
434434

0 commit comments

Comments
 (0)