diff mbox series

PM: AVS: qcom-cpr: select CONFIG_NVMEM

Message ID 20210920100226.1448267-1-arnd@kernel.org (mailing list archive)
State Not Applicable
Headers show
Series PM: AVS: qcom-cpr: select CONFIG_NVMEM | expand

Commit Message

Arnd Bergmann Sept. 20, 2021, 10:02 a.m. UTC
From: Arnd Bergmann <arnd@arndb.de>

nvmem_cell_read_variable_le_u32 is only defined when CONFIG_NVMEM
is set, otherwise we end up with this build failure:

drivers/soc/qcom/cpr.c: In function 'cpr_populate_ring_osc_idx':
drivers/soc/qcom/cpr.c:814:23: error: implicit declaration of function 'nvmem_cell_read_variable_le_u32' [-Werror=implicit-function-declaration]
  814 |                 ret = nvmem_cell_read_variable_le_u32(drv->dev, fuses->ring_osc, &data);
      |                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Select the framwork from Kconfig.

Fixes: 6feba6a62c57 ("PM: AVS: qcom-cpr: Use nvmem_cell_read_variable_le_u32()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/soc/qcom/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Doug Anderson Sept. 20, 2021, 1:37 p.m. UTC | #1
Hi,

On Mon, Sep 20, 2021 at 3:02 AM Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> nvmem_cell_read_variable_le_u32 is only defined when CONFIG_NVMEM
> is set, otherwise we end up with this build failure:
>
> drivers/soc/qcom/cpr.c: In function 'cpr_populate_ring_osc_idx':
> drivers/soc/qcom/cpr.c:814:23: error: implicit declaration of function 'nvmem_cell_read_variable_le_u32' [-Werror=implicit-function-declaration]
>   814 |                 ret = nvmem_cell_read_variable_le_u32(drv->dev, fuses->ring_osc, &data);
>       |                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> Select the framwork from Kconfig.
>
> Fixes: 6feba6a62c57 ("PM: AVS: qcom-cpr: Use nvmem_cell_read_variable_le_u32()")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/soc/qcom/Kconfig | 1 +
>  1 file changed, 1 insertion(+)

A fix should have already landed for this error. See the patch:

https://lore.kernel.org/r/20210830083449.1.I38e95343209fe1f808c3b4860795a00a2b539701@changeid

...and Greg has applied it. I got a message 6 days ago saying it was in:

    git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
in the char-misc-linus branch.

That being said, if people think that we should _also_ select NVMEM
for this driver then I have no objections. The use of nvmem in this
driver predates my patch.

-Doug
Arnd Bergmann Sept. 20, 2021, 3:53 p.m. UTC | #2
On Mon, Sep 20, 2021 at 3:37 PM Doug Anderson <dianders@chromium.org> wrote:
>
> https://lore.kernel.org/r/20210830083449.1.I38e95343209fe1f808c3b4860795a00a2b539701@changeid
>
> ...and Greg has applied it. I got a message 6 days ago saying it was in:
>
>     git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
> in the char-misc-linus branch.
>
> That being said, if people think that we should _also_ select NVMEM
> for this driver then I have no objections. The use of nvmem in this
> driver predates my patch.

It's there, I was still testing on -rc1 when I made the patch and only
verified that all my patches still worked on rc2 before sending them
out, but did not cross-check whether a different fix was applied.

       Arnd
diff mbox series

Patch

diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig
index 79b568f82a1c..faf372c0fc71 100644
--- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@ -29,6 +29,7 @@  config QCOM_COMMAND_DB
 config QCOM_CPR
 	tristate "QCOM Core Power Reduction (CPR) support"
 	depends on ARCH_QCOM && HAS_IOMEM
+	select NVMEM
 	select PM_OPP
 	select REGMAP
 	help