c06fb25d1f
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
From 16724d6ea40a2c9315f5a0d81005dfa4d7a6da24 Mon Sep 17 00:00:00 2001
|
|
From: Luca Weiss <luca.weiss@fairphone.com>
|
|
Date: Fri, 20 Oct 2023 11:55:40 +0100
|
|
Subject: [PATCH] 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>
|
|
---
|
|
drivers/nvmem/qfprom.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/nvmem/qfprom.c
|
|
+++ b/drivers/nvmem/qfprom.c
|
|
@@ -424,12 +424,12 @@ static int qfprom_probe(struct platform_
|
|
if (IS_ERR(priv->vcc))
|
|
return PTR_ERR(priv->vcc);
|
|
|
|
- priv->secclk = devm_clk_get(dev, "core");
|
|
+ priv->secclk = devm_clk_get_optional(dev, "core");
|
|
if (IS_ERR(priv->secclk))
|
|
return dev_err_probe(dev, PTR_ERR(priv->secclk), "Error getting clock\n");
|
|
|
|
- /* Only enable writing if we have SoC data. */
|
|
- if (priv->soc_data)
|
|
+ /* Only enable writing if we have SoC data and a valid clock */
|
|
+ if (priv->soc_data && priv->secclk)
|
|
econfig.reg_write = qfprom_reg_write;
|
|
}
|
|
|