From nobody Sun Apr 5 13:15:24 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1650AECAAD8 for ; Fri, 16 Sep 2022 12:21:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231623AbiIPMVi (ORCPT ); Fri, 16 Sep 2022 08:21:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231460AbiIPMVT (ORCPT ); Fri, 16 Sep 2022 08:21:19 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C79C3B14DE for ; Fri, 16 Sep 2022 05:21:16 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id az24-20020a05600c601800b003a842e4983cso15795808wmb.0 for ; Fri, 16 Sep 2022 05:21:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=j55fMh+OHOKODl1aHbY7wvu70GX+4q6XWj5jz6YZ/q8=; b=Yqq9ILdRmuoaZBtr0yI89aveS04xGGS14ncyoucBsgO+zD/0t3xIYC/8KWEnWKKpBI iuwQWHPgyruNM91BoCVySjPasuL5n4OtaZNKkmX9tYmpatcFrA+JJ4Nj8TnuLkq/bFeK aDNQRoF3vRz0bMAV2KeihcGO1JfXLolg7aUvaSybgMPLFLg5GDlElacFGrmFvH6jmQD1 SqRTfuVNYCIlRvvLtboMtJX9WgffsopMwHgnODmNieePaeEhvBEQuHKwaZ14+sofUIP6 OeAJ9ZlFskwrR7OCX65V4/J2olU01MyvxilnWUccl9BJSwMpo9BnmcwPVX+QwlN/kF8V iq8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=j55fMh+OHOKODl1aHbY7wvu70GX+4q6XWj5jz6YZ/q8=; b=e1/6CTOUI/abcrGttAy60hke6GZm29BUUZytZMAy9ncCgTacA/1g/mYoOLXWxxsF0h TSckszVqnryqnrtR71cBF6R2Cs17RRyj5iTLulfXflflrgwo5OQW4p21T66cZMfUnQrh mFaDjIeYx1hnbwfFftxPWMo5+5X+xoaE3SYw0PcZUrlCvh+HIv0bmPlmEYWkmE33nm/9 qi+jTB8rnRxfjbnO9kfLJt1u84ZmUOkxsclZVhG+DMd/g4pf3tODJF+2q76Ly/kdBjiT BbigX+kSj7KwmyE1MXgLF3q+H+02WIEC2AB/cetVuOXWMPG8NbVnVlF5qCSyPXEzgMN8 1+RQ== X-Gm-Message-State: ACrzQf0YKaOSchW61njmFJV6mAwogEH0ZhTdERhObx5HLzhOrP0XaVm+ 4Gg+fn0vSGih7k5QCrLVnt9Vzw== X-Google-Smtp-Source: AMsMyM5/8WlN0k/sZTbwMe9WFyeo2Pu150D60iIRw1aFG1LhFEUW+cDEmsDnUEhK5BWlnWicNkM94Q== X-Received: by 2002:a05:600c:434c:b0:3b4:82fb:5f78 with SMTP id r12-20020a05600c434c00b003b482fb5f78mr3163677wme.157.1663330874665; Fri, 16 Sep 2022 05:21:14 -0700 (PDT) Received: from srini-hackbase.lan (cpc90716-aztw32-2-0-cust825.18-1.cable.virginm.net. [86.26.103.58]) by smtp.gmail.com with ESMTPSA id u11-20020adfdb8b000000b0022add371ed2sm1540015wri.55.2022.09.16.05.21.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Sep 2022 05:21:14 -0700 (PDT) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Arnd Bergmann , Matthias Brugger , Srinivas Kandagatla Subject: [PATCH 07/13] nvmem: prefix all symbols with NVMEM_ Date: Fri, 16 Sep 2022 13:20:54 +0100 Message-Id: <20220916122100.170016-8-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220916122100.170016-1-srinivas.kandagatla@linaro.org> References: <20220916122100.170016-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rafa=C5=82 Mi=C5=82ecki This unifies all NVMEM symbols. They follow one style now. Signed-off-by: Rafa=C5=82 Mi=C5=82ecki Acked-by: Arnd Bergmann Reviewed-by: Matthias Brugger Signed-off-by: Srinivas Kandagatla Acked-by: Amit Kucheria --- arch/arm/configs/multi_v7_defconfig | 6 +++--- arch/arm/configs/qcom_defconfig | 2 +- arch/arm64/configs/defconfig | 10 +++++----- arch/mips/configs/ci20_defconfig | 2 +- drivers/cpufreq/Kconfig.arm | 2 +- drivers/nvmem/Kconfig | 24 ++++++++++++------------ drivers/nvmem/Makefile | 24 ++++++++++++------------ drivers/soc/mediatek/Kconfig | 2 +- drivers/thermal/qcom/Kconfig | 2 +- 9 files changed, 37 insertions(+), 37 deletions(-) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v= 7_defconfig index 12b35008571f..e52edcc8ec41 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -1193,11 +1193,11 @@ CONFIG_TI_PIPE3=3Dy CONFIG_TWL4030_USB=3Dm CONFIG_RAS=3Dy CONFIG_NVMEM_IMX_OCOTP=3Dy -CONFIG_QCOM_QFPROM=3Dy -CONFIG_ROCKCHIP_EFUSE=3Dm +CONFIG_NVMEM_QCOM_QFPROM=3Dy +CONFIG_NVMEM_ROCKCHIP_EFUSE=3Dm CONFIG_NVMEM_SUNXI_SID=3Dy CONFIG_NVMEM_VF610_OCOTP=3Dy -CONFIG_MESON_MX_EFUSE=3Dm +CONFIG_NVMEM_MESON_MX_EFUSE=3Dm CONFIG_NVMEM_RMEM=3Dm CONFIG_FSI=3Dm CONFIG_FSI_MASTER_GPIO=3Dm diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defcon= fig index 8a59441701a8..fb8c03bd80d7 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig @@ -278,7 +278,7 @@ CONFIG_PHY_QCOM_QMP=3Dy CONFIG_PHY_QCOM_USB_HS=3Dy CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=3Dy CONFIG_PHY_QCOM_USB_HSIC=3Dy -CONFIG_QCOM_QFPROM=3Dy +CONFIG_NVMEM_QCOM_QFPROM=3Dy CONFIG_INTERCONNECT=3Dy CONFIG_INTERCONNECT_QCOM=3Dy CONFIG_INTERCONNECT_QCOM_MSM8974=3Dm diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index d5b2d2dd4904..c6e82787cca3 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -1236,12 +1236,12 @@ CONFIG_QCOM_L3_PMU=3Dy CONFIG_HISI_PMU=3Dy CONFIG_NVMEM_IMX_OCOTP=3Dy CONFIG_NVMEM_IMX_OCOTP_SCU=3Dy -CONFIG_MTK_EFUSE=3Dy -CONFIG_QCOM_QFPROM=3Dy -CONFIG_ROCKCHIP_EFUSE=3Dy +CONFIG_NVMEM_MTK_EFUSE=3Dy +CONFIG_NVMEM_QCOM_QFPROM=3Dy +CONFIG_NVMEM_ROCKCHIP_EFUSE=3Dy CONFIG_NVMEM_SUNXI_SID=3Dy -CONFIG_UNIPHIER_EFUSE=3Dy -CONFIG_MESON_EFUSE=3Dm +CONFIG_NVMEM_UNIPHIER_EFUSE=3Dy +CONFIG_NVMEM_MESON_EFUSE=3Dm CONFIG_NVMEM_RMEM=3Dm CONFIG_NVMEM_LAYERSCAPE_SFP=3Dm CONFIG_FPGA=3Dy diff --git a/arch/mips/configs/ci20_defconfig b/arch/mips/configs/ci20_defc= onfig index cc69b215854e..e1b49f77414a 100644 --- a/arch/mips/configs/ci20_defconfig +++ b/arch/mips/configs/ci20_defconfig @@ -143,7 +143,7 @@ CONFIG_MEMORY=3Dy CONFIG_JZ4780_NEMC=3Dy CONFIG_PWM=3Dy CONFIG_PWM_JZ4740=3Dm -CONFIG_JZ4780_EFUSE=3Dy +CONFIG_NVMEM_JZ4780_EFUSE=3Dy CONFIG_JZ4770_PHY=3Dy CONFIG_EXT4_FS=3Dy # CONFIG_DNOTIFY is not set diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index 954749afb5fe..82e5de1f6f8c 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -153,7 +153,7 @@ config ARM_OMAP2PLUS_CPUFREQ config ARM_QCOM_CPUFREQ_NVMEM tristate "Qualcomm nvmem based CPUFreq" depends on ARCH_QCOM - depends on QCOM_QFPROM + depends on NVMEM_QCOM_QFPROM depends on QCOM_SMEM select PM_OPP help diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig index bab8a29c9861..691375c13381 100644 --- a/drivers/nvmem/Kconfig +++ b/drivers/nvmem/Kconfig @@ -52,7 +52,7 @@ config NVMEM_IMX_OCOTP_SCU This is a driver for the SCU On-Chip OTP Controller (OCOTP) available on i.MX8 SoCs. =20 -config JZ4780_EFUSE +config NVMEM_JZ4780_EFUSE tristate "JZ4780 EFUSE Memory Support" depends on MACH_INGENIC || COMPILE_TEST depends on HAS_IOMEM @@ -96,7 +96,7 @@ config NVMEM_MXS_OCOTP This driver can also be built as a module. If so, the module will be called nvmem-mxs-ocotp. =20 -config MTK_EFUSE +config NVMEM_MTK_EFUSE tristate "Mediatek SoCs EFUSE support" depends on ARCH_MEDIATEK || COMPILE_TEST depends on HAS_IOMEM @@ -107,7 +107,7 @@ config MTK_EFUSE This driver can also be built as a module. If so, the module will be called efuse-mtk. =20 -config MICROCHIP_OTPC +config NVMEM_MICROCHIP_OTPC tristate "Microchip OTPC support" depends on ARCH_AT91 || COMPILE_TEST help @@ -126,7 +126,7 @@ config NVMEM_NINTENDO_OTP This driver can also be built as a module. If so, the module will be called nvmem-nintendo-otp. =20 -config QCOM_QFPROM +config NVMEM_QCOM_QFPROM tristate "QCOM QFPROM Support" depends on ARCH_QCOM || COMPILE_TEST depends on HAS_IOMEM @@ -145,7 +145,7 @@ config NVMEM_SPMI_SDAM Qualcomm Technologies, Inc. PMICs. It provides the clients an interface to read/write to the SDAM module's shared memory. =20 -config ROCKCHIP_EFUSE +config NVMEM_ROCKCHIP_EFUSE tristate "Rockchip eFuse Support" depends on ARCH_ROCKCHIP || COMPILE_TEST depends on HAS_IOMEM @@ -156,7 +156,7 @@ config ROCKCHIP_EFUSE This driver can also be built as a module. If so, the module will be called nvmem_rockchip_efuse. =20 -config ROCKCHIP_OTP +config NVMEM_ROCKCHIP_OTP tristate "Rockchip OTP controller support" depends on ARCH_ROCKCHIP || COMPILE_TEST depends on HAS_IOMEM @@ -199,7 +199,7 @@ config NVMEM_SUNXI_SID This driver can also be built as a module. If so, the module will be called nvmem_sunxi_sid. =20 -config UNIPHIER_EFUSE +config NVMEM_UNIPHIER_EFUSE tristate "UniPhier SoCs eFuse support" depends on ARCH_UNIPHIER || COMPILE_TEST depends on HAS_IOMEM @@ -221,7 +221,7 @@ config NVMEM_VF610_OCOTP This driver can also be build as a module. If so, the module will be called nvmem-vf610-ocotp. =20 -config MESON_EFUSE +config NVMEM_MESON_EFUSE tristate "Amlogic Meson GX eFuse Support" depends on (ARCH_MESON || COMPILE_TEST) && MESON_SM help @@ -231,7 +231,7 @@ config MESON_EFUSE This driver can also be built as a module. If so, the module will be called nvmem_meson_efuse. =20 -config MESON_MX_EFUSE +config NVMEM_MESON_MX_EFUSE tristate "Amlogic Meson6/Meson8/Meson8b eFuse Support" depends on ARCH_MESON || COMPILE_TEST help @@ -251,13 +251,13 @@ config NVMEM_SNVS_LPGPR This driver can also be built as a module. If so, the module will be called nvmem-snvs-lpgpr. =20 -config RAVE_SP_EEPROM +config NVMEM_RAVE_SP_EEPROM tristate "Rave SP EEPROM Support" depends on RAVE_SP_CORE help Say y here to enable Rave SP EEPROM support. =20 -config SC27XX_EFUSE +config NVMEM_SC27XX_EFUSE tristate "Spreadtrum SC27XX eFuse Support" depends on MFD_SC27XX_PMIC || COMPILE_TEST depends on HAS_IOMEM @@ -278,7 +278,7 @@ config NVMEM_ZYNQMP =20 If sure, say yes. If unsure, say no. =20 -config SPRD_EFUSE +config NVMEM_SPRD_EFUSE tristate "Spreadtrum SoC eFuse Support" depends on ARCH_SPRD || COMPILE_TEST depends on HAS_IOMEM diff --git a/drivers/nvmem/Makefile b/drivers/nvmem/Makefile index 399f9972d45b..7ac988c6966e 100644 --- a/drivers/nvmem/Makefile +++ b/drivers/nvmem/Makefile @@ -15,7 +15,7 @@ obj-$(CONFIG_NVMEM_IMX_OCOTP) +=3D nvmem-imx-ocotp.o nvmem-imx-ocotp-y :=3D imx-ocotp.o obj-$(CONFIG_NVMEM_IMX_OCOTP_SCU) +=3D nvmem-imx-ocotp-scu.o nvmem-imx-ocotp-scu-y :=3D imx-ocotp-scu.o -obj-$(CONFIG_JZ4780_EFUSE) +=3D nvmem_jz4780_efuse.o +obj-$(CONFIG_NVMEM_JZ4780_EFUSE) +=3D nvmem_jz4780_efuse.o nvmem_jz4780_efuse-y :=3D jz4780-efuse.o obj-$(CONFIG_NVMEM_LPC18XX_EEPROM) +=3D nvmem_lpc18xx_eeprom.o nvmem_lpc18xx_eeprom-y :=3D lpc18xx_eeprom.o @@ -25,37 +25,37 @@ obj-$(CONFIG_NVMEM_MXS_OCOTP) +=3D nvmem-mxs-ocotp.o nvmem-mxs-ocotp-y :=3D mxs-ocotp.o obj-$(CONFIG_NVMEM_NINTENDO_OTP) +=3D nvmem-nintendo-otp.o nvmem-nintendo-otp-y :=3D nintendo-otp.o -obj-$(CONFIG_MTK_EFUSE) +=3D nvmem_mtk-efuse.o +obj-$(CONFIG_NVMEM_MTK_EFUSE) +=3D nvmem_mtk-efuse.o nvmem_mtk-efuse-y :=3D mtk-efuse.o -obj-$(CONFIG_QCOM_QFPROM) +=3D nvmem_qfprom.o +obj-$(CONFIG_NVMEM_QCOM_QFPROM) +=3D nvmem_qfprom.o nvmem_qfprom-y :=3D qfprom.o obj-$(CONFIG_NVMEM_SPMI_SDAM) +=3D nvmem_qcom-spmi-sdam.o nvmem_qcom-spmi-sdam-y +=3D qcom-spmi-sdam.o -obj-$(CONFIG_ROCKCHIP_EFUSE) +=3D nvmem_rockchip_efuse.o +obj-$(CONFIG_NVMEM_ROCKCHIP_EFUSE) +=3D nvmem_rockchip_efuse.o nvmem_rockchip_efuse-y :=3D rockchip-efuse.o -obj-$(CONFIG_ROCKCHIP_OTP) +=3D nvmem-rockchip-otp.o +obj-$(CONFIG_NVMEM_ROCKCHIP_OTP) +=3D nvmem-rockchip-otp.o nvmem-rockchip-otp-y :=3D rockchip-otp.o obj-$(CONFIG_NVMEM_SUNXI_SID) +=3D nvmem_sunxi_sid.o nvmem_stm32_romem-y :=3D stm32-romem.o obj-$(CONFIG_NVMEM_STM32_ROMEM) +=3D nvmem_stm32_romem.o nvmem_sunxi_sid-y :=3D sunxi_sid.o -obj-$(CONFIG_UNIPHIER_EFUSE) +=3D nvmem-uniphier-efuse.o +obj-$(CONFIG_NVMEM_UNIPHIER_EFUSE) +=3D nvmem-uniphier-efuse.o nvmem-uniphier-efuse-y :=3D uniphier-efuse.o obj-$(CONFIG_NVMEM_VF610_OCOTP) +=3D nvmem-vf610-ocotp.o nvmem-vf610-ocotp-y :=3D vf610-ocotp.o -obj-$(CONFIG_MESON_EFUSE) +=3D nvmem_meson_efuse.o +obj-$(CONFIG_NVMEM_MESON_EFUSE) +=3D nvmem_meson_efuse.o nvmem_meson_efuse-y :=3D meson-efuse.o -obj-$(CONFIG_MESON_MX_EFUSE) +=3D nvmem_meson_mx_efuse.o +obj-$(CONFIG_NVMEM_MESON_MX_EFUSE) +=3D nvmem_meson_mx_efuse.o nvmem_meson_mx_efuse-y :=3D meson-mx-efuse.o obj-$(CONFIG_NVMEM_SNVS_LPGPR) +=3D nvmem_snvs_lpgpr.o nvmem_snvs_lpgpr-y :=3D snvs_lpgpr.o -obj-$(CONFIG_RAVE_SP_EEPROM) +=3D nvmem-rave-sp-eeprom.o +obj-$(CONFIG_NVMEM_RAVE_SP_EEPROM) +=3D nvmem-rave-sp-eeprom.o nvmem-rave-sp-eeprom-y :=3D rave-sp-eeprom.o -obj-$(CONFIG_SC27XX_EFUSE) +=3D nvmem-sc27xx-efuse.o +obj-$(CONFIG_NVMEM_SC27XX_EFUSE) +=3D nvmem-sc27xx-efuse.o nvmem-sc27xx-efuse-y :=3D sc27xx-efuse.o obj-$(CONFIG_NVMEM_ZYNQMP) +=3D nvmem_zynqmp_nvmem.o nvmem_zynqmp_nvmem-y :=3D zynqmp_nvmem.o -obj-$(CONFIG_SPRD_EFUSE) +=3D nvmem_sprd_efuse.o +obj-$(CONFIG_NVMEM_SPRD_EFUSE) +=3D nvmem_sprd_efuse.o nvmem_sprd_efuse-y :=3D sprd-efuse.o obj-$(CONFIG_NVMEM_RMEM) +=3D nvmem-rmem.o nvmem-rmem-y :=3D rmem.o @@ -67,7 +67,7 @@ obj-$(CONFIG_NVMEM_SUNPLUS_OCOTP) +=3D nvmem_sunplus_ocot= p.o nvmem_sunplus_ocotp-y :=3D sunplus-ocotp.o obj-$(CONFIG_NVMEM_APPLE_EFUSES) +=3D nvmem-apple-efuses.o nvmem-apple-efuses-y :=3D apple-efuses.o -obj-$(CONFIG_MICROCHIP_OTPC) +=3D nvmem-microchip-otpc.o +obj-$(CONFIG_NVMEM_MICROCHIP_OTPC) +=3D nvmem-microchip-otpc.o nvmem-microchip-otpc-y :=3D microchip-otpc.o obj-$(CONFIG_NVMEM_U_BOOT_ENV) +=3D nvmem_u-boot-env.o nvmem_u-boot-env-y :=3D u-boot-env.o diff --git a/drivers/soc/mediatek/Kconfig b/drivers/soc/mediatek/Kconfig index 3c3eedea35f7..9b44dc3d9dff 100644 --- a/drivers/soc/mediatek/Kconfig +++ b/drivers/soc/mediatek/Kconfig @@ -75,7 +75,7 @@ config MTK_MMSYS =20 config MTK_SVS tristate "MediaTek Smart Voltage Scaling(SVS)" - depends on MTK_EFUSE && NVMEM + depends on NVMEM_MTK_EFUSE && NVMEM help The Smart Voltage Scaling(SVS) engine is a piece of hardware which has several controllers(banks) for calculating suitable diff --git a/drivers/thermal/qcom/Kconfig b/drivers/thermal/qcom/Kconfig index bfd889422dd3..2c7f3f9a26eb 100644 --- a/drivers/thermal/qcom/Kconfig +++ b/drivers/thermal/qcom/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config QCOM_TSENS tristate "Qualcomm TSENS Temperature Alarm" - depends on QCOM_QFPROM + depends on NVMEM_QCOM_QFPROM depends on ARCH_QCOM || COMPILE_TEST help This enables the thermal sysfs driver for the TSENS device. It shows --=20 2.25.1